From: Guido van Rossum <guido@python.org>
Date: Thu, 17 May 2007 21:15:39 +0000 (+0000)
Subject: Make test_new pass.
X-Git-Tag: v3.0a1~933
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbbd4fdba2c9589588410a4d1727c031234fc2a6;p=thirdparty%2FPython%2Fcpython.git

Make test_new pass.
---

diff --git a/Lib/test/test_new.py b/Lib/test/test_new.py
index 797a8c349f31..c919621d7c34 100644
--- a/Lib/test/test_new.py
+++ b/Lib/test/test_new.py
@@ -143,7 +143,7 @@ class NewTest(unittest.TestCase):
                 firstlineno, lnotab)
 
             # new.code used to be a way to mutate a tuple...
-            class S(str):
+            class S(str8):
                 pass
             t = (S("ab"),)
             d = new.code(argcount, kwonlyargcount, nlocals, stacksize,
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index adbb6d51ab3e..0069fc1bbc86 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -482,6 +482,11 @@ func_new(PyTypeObject* type, PyObject* args, PyObject* kw)
 			      &PyDict_Type, &globals,
 			      &name, &defaults, &closure))
 		return NULL;
+        if (PyUnicode_Check(name)) {
+		name = _PyUnicode_AsDefaultEncodedString(name, NULL);
+		if (name == NULL)
+			return NULL;
+	}
 	if (name != Py_None && !PyString_Check(name)) {
 		PyErr_SetString(PyExc_TypeError,
 				"arg 3 (name) must be None or string");