merge 3.2

benjaminp · benjaminp · commit d40528fe9a27 · 2012-09-02T16:37:09.000-04:00
diff --git a/Python/ast.c b/Python/ast.c
@@ -545,9 +545,9 @@ init_normalization(struct compiling *c)
 }
 
 static identifier
-new_identifier(const char* n, struct compiling *c)
+new_identifier(const char *n, struct compiling *c)
 {
-    PyObject* id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
+    PyObject *id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
     if (!id)
         return NULL;
     /* PyUnicode_DecodeUTF8 should always return a ready string. */

Original file line number	Diff line number	Diff line change
`@@ -545,9 +545,9 @@ init_normalization(struct compiling *c)`
`545`	`545`	`}`
`546`	`546`
`547`	`547`	`static identifier`
`548`		`-new_identifier(const char* n, struct compiling *c)`
	`548`	`+new_identifier(const char n, struct compiling c)`
`549`	`549`	`{`
`550`		`- PyObject* id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);`
	`550`	`+ PyObject *id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);`
`551`	`551`	`if (!id)`
`552`	`552`	`return NULL;`
`553`	`553`	`/* PyUnicode_DecodeUTF8 should always return a ready string. */`