From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 17 Mar 2012 01:15:54 +0000 (-0500)
Subject: simply this slightly
X-Git-Tag: v3.3.0a2~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a03ecfa50edd1f75bfffbe1d8849d629b8f5b43;p=thirdparty%2FPython%2Fcpython.git

simply this slightly
---

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index db0b042b8e54..b427040fbc35 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2949,13 +2949,13 @@ object_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         return NULL;
 
     if (type->tp_flags & Py_TPFLAGS_IS_ABSTRACT) {
-        static PyObject *comma = NULL;
         PyObject *abstract_methods = NULL;
         PyObject *builtins;
         PyObject *sorted;
         PyObject *sorted_methods = NULL;
         PyObject *joined = NULL;
-        _Py_IDENTIFIER(join);
+        PyObject *comma;
+        _Py_static_string(comma_id, ", ");
 
         /* Compute ", ".join(sorted(type.__abstractmethods__))
            into joined. */
@@ -2973,13 +2973,10 @@ object_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                                                       NULL);
         if (sorted_methods == NULL)
             goto error;
-        if (comma == NULL) {
-            comma = PyUnicode_InternFromString(", ");
-            if (comma == NULL)
-                goto error;
-        }
-        joined = _PyObject_CallMethodId(comma, &PyId_join,
-                                     "O",  sorted_methods);
+        comma = _PyUnicode_FromId(&comma_id);
+        if (comma == NULL)
+            goto error;
+        joined = PyUnicode_Join(comma, sorted_methods);
         if (joined == NULL)
             goto error;