summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-07-02 21:58:38 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-07-02 21:58:38 (GMT)
commitac2ed9d8951eaeb9febc76650fa2ff1442d68317 (patch)
tree664439e54855208e63748317cf6ea7063e8c7c2b /Lib
parent09dd773c1330a313c867e6ece714d582df637cb0 (diff)
parentb32b998bf7ccc8718f1f086f2e3d2658f2e5b224 (diff)
downloadcpython-ac2ed9d8951eaeb9febc76650fa2ff1442d68317.zip
cpython-ac2ed9d8951eaeb9febc76650fa2ff1442d68317.tar.gz
cpython-ac2ed9d8951eaeb9febc76650fa2ff1442d68317.tar.bz2
merge 3.5
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/pickletester.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index cbe4607..78b5483 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -1043,7 +1043,7 @@ class AbstractPickleTests(unittest.TestCase):
# Issue 24552
global SimpleNewObj
save = SimpleNewObj
- o = object.__new__(SimpleNewObj)
+ o = SimpleNewObj.__new__(SimpleNewObj)
b = self.dumps(o, 4)
try:
SimpleNewObj = 42