diff options
author | Benjamin Peterson <benjamin@python.org> | 2009-04-18 20:54:08 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2009-04-18 20:54:08 (GMT) |
commit | ae937c021dfd3a2898c85212782457740c7ab6ab (patch) | |
tree | 6a081251f0deaa68818924a8e5f9069a1c55cbaa /Objects/frameobject.c | |
parent | 332424777f4bf213b1db1b7dcfa592d2fe5ae772 (diff) | |
download | cpython-ae937c021dfd3a2898c85212782457740c7ab6ab.zip cpython-ae937c021dfd3a2898c85212782457740c7ab6ab.tar.gz cpython-ae937c021dfd3a2898c85212782457740c7ab6ab.tar.bz2 |
Merged revisions 71722 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71722 | benjamin.peterson | 2009-04-18 15:12:47 -0500 (Sat, 18 Apr 2009) | 1 line
try to initalize all builtin types with PyType_Ready to avoid problems like #5787
........
Diffstat (limited to 'Objects/frameobject.c')
-rw-r--r-- | Objects/frameobject.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 52898cc..e29c647 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -577,7 +577,9 @@ static PyObject *builtin_object; int _PyFrame_Init() { builtin_object = PyUnicode_InternFromString("__builtins__"); - return (builtin_object != NULL); + if (builtin_object == NULL) + return 0; + return 1; } PyFrameObject * |