merge 3.2

benjaminp · benjaminp · commit 8a4b42b7f4ca · 2011-07-22T11:10:43.000-05:00
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
@@ -795,24 +795,22 @@ def visitModule(self, mod):
     return 0;
 }
 
-static int obj2ast_stringlike(PyObject* obj, PyObject** out, PyArena* arena,
-    const char *name)
+static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)
 {
-    if (!PyUnicode_CheckExact(name)) {
-        PyErr_Format(PyExc_TypeError, "AST %s must be of type str", name);
+    if (!PyUnicode_CheckExact(obj) && obj != Py_None) {
+        PyErr_SetString(PyExc_TypeError, "AST identifier must be of type str");
         return 1;
     }
     return obj2ast_object(obj, out, arena);
 }
 
-static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)
-{
-    return obj2ast_stringlike(obj, out, arena, "identifier");
-}
-
 static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)
 {
-    return obj2ast_stringlike(obj, out, arena, "string");
+    if (!PyUnicode_CheckExact(obj)) {
+        PyErr_SetString(PyExc_TypeError, "AST string must be of type str");
+        return 1;
+    }
+    return obj2ast_object(obj, out, arena);
 }
 
 static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
@@ -592,24 +592,22 @@ static int obj2ast_object(PyObject* obj, PyObject** out, PyArena* arena)
     return 0;
 }
 
-static int obj2ast_stringlike(PyObject* obj, PyObject** out, PyArena* arena,
-    const char *name)
+static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)
 {
-    if (!PyUnicode_CheckExact(name)) {
-        PyErr_Format(PyExc_TypeError, "AST %s must be of type str", name);
+    if (!PyUnicode_CheckExact(obj) && obj != Py_None) {
+        PyErr_SetString(PyExc_TypeError, "AST identifier must be of type str");
         return 1;
     }
     return obj2ast_object(obj, out, arena);
 }
 
-static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)
-{
-    return obj2ast_stringlike(obj, out, arena, "identifier");
-}
-
 static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)
 {
-    return obj2ast_stringlike(obj, out, arena, "string");
+    if (!PyUnicode_CheckExact(obj)) {
+        PyErr_SetString(PyExc_TypeError, "AST string must be of type str");
+        return 1;
+    }
+    return obj2ast_object(obj, out, arena);
 }
 
 static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)

Original file line number	Diff line number	Diff line change
`@@ -795,24 +795,22 @@ def visitModule(self, mod):`
`795`	`795`	`return 0;`
`796`	`796`	`}`
`797`	`797`
`798`		`-static int obj2ast_stringlike(PyObject* obj, PyObject** out, PyArena* arena,`
`799`		`- const char *name)`
	`798`	`+static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)`
`800`	`799`	`{`
`801`		`- if (!PyUnicode_CheckExact(name)) {`
`802`		`- PyErr_Format(PyExc_TypeError, "AST %s must be of type str", name);`
	`800`	`+ if (!PyUnicode_CheckExact(obj) && obj != Py_None) {`
	`801`	`+ PyErr_SetString(PyExc_TypeError, "AST identifier must be of type str");`
`803`	`802`	`return 1;`
`804`	`803`	`}`
`805`	`804`	`return obj2ast_object(obj, out, arena);`
`806`	`805`	`}`
`807`	`806`
`808`		`-static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)`
`809`		`-{`
`810`		`- return obj2ast_stringlike(obj, out, arena, "identifier");`
`811`		`-}`
`812`		`-`
`813`	`807`	`static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)`
`814`	`808`	`{`
`815`		`- return obj2ast_stringlike(obj, out, arena, "string");`
	`809`	`+ if (!PyUnicode_CheckExact(obj)) {`
	`810`	`+ PyErr_SetString(PyExc_TypeError, "AST string must be of type str");`
	`811`	`+ return 1;`
	`812`	`+ }`
	`813`	`+ return obj2ast_object(obj, out, arena);`
`816`	`814`	`}`
`817`	`815`
`818`	`816`	`static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)`
Original file line number	Diff line number	Diff line change
`@@ -592,24 +592,22 @@ static int obj2ast_object(PyObject* obj, PyObject** out, PyArena* arena)`
`592`	`592`	`return 0;`
`593`	`593`	`}`
`594`	`594`
`595`		`-static int obj2ast_stringlike(PyObject* obj, PyObject** out, PyArena* arena,`
`596`		`- const char *name)`
	`595`	`+static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)`
`597`	`596`	`{`
`598`		`- if (!PyUnicode_CheckExact(name)) {`
`599`		`- PyErr_Format(PyExc_TypeError, "AST %s must be of type str", name);`
	`597`	`+ if (!PyUnicode_CheckExact(obj) && obj != Py_None) {`
	`598`	`+ PyErr_SetString(PyExc_TypeError, "AST identifier must be of type str");`
`600`	`599`	`return 1;`
`601`	`600`	`}`
`602`	`601`	`return obj2ast_object(obj, out, arena);`
`603`	`602`	`}`
`604`	`603`
`605`		`-static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)`
`606`		`-{`
`607`		`- return obj2ast_stringlike(obj, out, arena, "identifier");`
`608`		`-}`
`609`		`-`
`610`	`604`	`static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)`
`611`	`605`	`{`
`612`		`- return obj2ast_stringlike(obj, out, arena, "string");`
	`606`	`+ if (!PyUnicode_CheckExact(obj)) {`
	`607`	`+ PyErr_SetString(PyExc_TypeError, "AST string must be of type str");`
	`608`	`+ return 1;`
	`609`	`+ }`
	`610`	`+ return obj2ast_object(obj, out, arena);`
`613`	`611`	`}`
`614`	`612`
`615`	`613`	`static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)`