[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#22954)

Thu Nov 27 06:06:07 CET 2014

https://hg.python.org/cpython/rev/d502b5d60e00
changeset: 93612:d502b5d60e00
parent: 93610:7fe7ef360941
parent: 93611:a498e599ce6a
user: Benjamin Peterson <benjamin at python.org>
date: Wed Nov 26 23:03:34 2014 -0600
summary:
 merge 3.4 (#22954)
files:
 Objects/typeobject.c | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5381,7 +5381,7 @@
 "%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;
 }
 
-- 
Repository URL: https://hg.python.org/cpython
