[Python-checkins] cpython (merge 3.5 -> default): merge 3.5
benjamin.peterson
python-checkins at python.org
Thu Jul 2 23:59:17 CEST 2015
https://hg.python.org/cpython/rev/14be2ab42294
changeset: 96764:14be2ab42294
parent: 96761:32486bb59e7e
parent: 96763:b1caa38c81ab
user: Benjamin Peterson <benjamin at python.org>
date: Thu Jul 02 16:58:38 2015 -0500
summary:
merge 3.5
files:
Lib/test/pickletester.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -1043,7 +1043,7 @@
# Issue 24552
global SimpleNewObj
save = SimpleNewObj
- o = object.__new__(SimpleNewObj)
+ o = SimpleNewObj.__new__(SimpleNewObj)
b = self.dumps(o, 4)
try:
SimpleNewObj = 42
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list