From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 5 Jun 2010 00:38:22 +0000 (+0000)
Subject: remove PyType_Ready call; float should be initialized in interpreter startup
X-Git-Tag: v2.7rc1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a2acb5040efba7afa45d3680d0eeca45a263305;p=python

remove PyType_Ready call; float should be initialized in interpreter startup
---

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 898becd245..20d241ddc6 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -752,11 +752,6 @@ PyObject_Format(PyObject* obj, PyObject *format_spec)
         goto done;
     }
 
-    /* Make sure the type is initialized.  float gets initialized late */
-    if (Py_TYPE(obj)->tp_dict == NULL)
-        if (PyType_Ready(Py_TYPE(obj)) < 0)
-            goto done;
-
     /* Check for a __format__ method and call it. */
     if (PyInstance_Check(obj)) {
         /* We're an instance of a classic class */
@@ -826,7 +821,7 @@ done1:
     } else {
         /* Not an instance of a classic class, use the code
            from py3k */
-        static PyObject *format_cache;
+        static PyObject *format_cache = NULL;
 
         /* Find the (unbound!) __format__ method (a borrowed
            reference) */