merge 3.5

2015-07-02 16:58:38 -05:00 · 2015-07-02 16:58:38 -05:00 · ac2ed9d895
parent 09dd773c13 b32b998bf7
commit ac2ed9d895
1 changed files with 1 additions and 1 deletions
--- 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