Switch PyArg_ParseTupleAndKeywords from "es" to "s".

anntzer · anntzer · commit ed719e28a24b · 2019-04-03T16:36:23.000+02:00
This avoids having to call PyMem_Free ourselves.

Note that all call sites either already use utf-8 (which "s" does), or
use ascii but then match the string against some ascii-only strings (or
glyph names), so the change is fine encoding-wise.
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -813,9 +813,9 @@ static CGFloat _get_device_scale(CGContextRef cr)
                                PyObject *args, PyObject *kwds)
 {
     char* title;
-    if(!PyArg_ParseTuple(args, "es", "UTF-8", &title))
+    if (!PyArg_ParseTuple(args, "s", &title)) {
         return NULL;
-
+    }
     Window* window = self->window;
     if(window)
     {
@@ -826,7 +826,6 @@ static CGFloat _get_device_scale(CGContextRef cr)
         [window setTitle: ns_title];
         [pool release];
     }
-    PyMem_Free(title);
     Py_RETURN_NONE;
 }
 
@@ -1370,17 +1369,16 @@ -(void)save_figure:(id)sender
     int result;
     const char* title;
     char* default_filename;
-    if(!PyArg_ParseTuple(args, "ses", &title, "UTF-8", &default_filename))
+    if (!PyArg_ParseTuple(args, "ss", &title, &default_filename)) {
         return NULL;
-
+    }
     NSSavePanel* panel = [NSSavePanel savePanel];
     [panel setTitle: [NSString stringWithCString: title
                                         encoding: NSASCIIStringEncoding]];
     NSString* ns_default_filename =
         [[NSString alloc]
          initWithCString: default_filename
          encoding: NSUTF8StringEncoding];
-    PyMem_Free(default_filename);
 #ifdef COMPILING_FOR_10_6
     [panel setNameFieldStringValue: ns_default_filename];
     result = [panel runModal];
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -1066,15 +1066,10 @@ static PyObject *PyFT2Font_get_name_index(PyFT2Font *self, PyObject *args, PyObj
 {
     char *glyphname;
     long name_index;
-
-    if (!PyArg_ParseTuple(args, "es:get_name_index", "ascii", &glyphname)) {
+    if (!PyArg_ParseTuple(args, "s:get_name_index", &glyphname)) {
         return NULL;
     }
-
     CALL_CPP("get_name_index", name_index = self->x->get_name_index(glyphname));
-
-    PyMem_Free(glyphname);
-
     return PyLong_FromLong(name_index);
 }
 
@@ -1114,8 +1109,7 @@ const char *PyFT2Font_get_sfnt_table__doc__ =
 static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObject *kwds)
 {
     char *tagname;
-
-    if (!PyArg_ParseTuple(args, "es:get_sfnt_table", "ascii", &tagname)) {
+    if (!PyArg_ParseTuple(args, "s:get_sfnt_table", "ascii", &tagname)) {
         return NULL;
     }
 
@@ -1128,8 +1122,6 @@ static PyObject *PyFT2Font_get_sfnt_table(PyFT2Font *self, PyObject *args, PyObj
         }
     }
 
-    PyMem_Free(tagname);
-
     void *table = FT_Get_Sfnt_Table(self->x->get_face(), (FT_Sfnt_Tag)tag);
     if (!table) {
         Py_RETURN_NONE;

Original file line number	Diff line number	Diff line change
`@@ -1066,15 +1066,10 @@ static PyObject PyFT2Font_get_name_index(PyFT2Font self, PyObject *args, PyObj`
`1066`	`1066`	`{`
`1067`	`1067`	`char *glyphname;`
`1068`	`1068`	`long name_index;`
`1069`		`-`
`1070`		`- if (!PyArg_ParseTuple(args, "es:get_name_index", "ascii", &glyphname)) {`
	`1069`	`+ if (!PyArg_ParseTuple(args, "s:get_name_index", &glyphname)) {`
`1071`	`1070`	`return NULL;`
`1072`	`1071`	`}`
`1073`		`-`
`1074`	`1072`	`CALL_CPP("get_name_index", name_index = self->x->get_name_index(glyphname));`
`1075`		`-`
`1076`		`- PyMem_Free(glyphname);`
`1077`		`-`
`1078`	`1073`	`return PyLong_FromLong(name_index);`
`1079`	`1074`	`}`
`1080`	`1075`
`@@ -1114,8 +1109,7 @@ const char *PyFT2Font_get_sfnt_table__doc__ =`
`1114`	`1109`	`static PyObject PyFT2Font_get_sfnt_table(PyFT2Font self, PyObject args, PyObject kwds)`
`1115`	`1110`	`{`
`1116`	`1111`	`char *tagname;`
`1117`		`-`
`1118`		`- if (!PyArg_ParseTuple(args, "es:get_sfnt_table", "ascii", &tagname)) {`
	`1112`	`+ if (!PyArg_ParseTuple(args, "s:get_sfnt_table", "ascii", &tagname)) {`
`1119`	`1113`	`return NULL;`
`1120`	`1114`	`}`
`1121`	`1115`
`@@ -1128,8 +1122,6 @@ static PyObject PyFT2Font_get_sfnt_table(PyFT2Font self, PyObject *args, PyObj`
`1128`	`1122`	`}`
`1129`	`1123`	`}`
`1130`	`1124`
`1131`		`- PyMem_Free(tagname);`
`1132`		`-`
`1133`	`1125`	`void *table = FT_Get_Sfnt_Table(self->x->get_face(), (FT_Sfnt_Tag)tag);`
`1134`	`1126`	`if (!table) {`
`1135`	`1127`	`Py_RETURN_NONE;`