diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-11-27 05:03:34 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-11-27 05:03:34 (GMT) |
| commit | 0a59d5563ecb632a61d8e45761824c76bfacbeea (patch) | |
| tree | da4990124df498694403b88d11e4139ca2c1e0c2 /Objects | |
| parent | 9b4cc6bc6b5af18e2f90adc2ef0c81847edbd8c5 (diff) | |
| parent | e823933f9f625607c1c17bb5ac174a0c1595875d (diff) | |
| download | cpython-0a59d5563ecb632a61d8e45761824c76bfacbeea.zip cpython-0a59d5563ecb632a61d8e45761824c76bfacbeea.tar.gz cpython-0a59d5563ecb632a61d8e45761824c76bfacbeea.tar.bz2 | |
merge 3.4 (#22954)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index ffd313d..941dedb 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -5381,7 +5381,7 @@ tp_new_wrapper(PyObject *self, PyObject *args, PyObject *kwds) "%s.__new__(%s) is not safe, use %s.__new__()", type->tp_name, subtype->tp_name, - staticbase == NULL ? "?" : staticbase->tp_name); + staticbase->tp_name); return NULL; } |