cpython (merge 3.4 -> 3.5): merge 3.4
https://hg.python.org/cpython/rev/b1caa38c81ab changeset: 96763:b1caa38c81ab branch: 3.5 parent: 96760:24197b5f7126 parent: 96762:978bc1ff43a7 user: Benjamin Peterson <benjamin@python.org> date: Thu Jul 02 16:58:31 2015 -0500 summary: merge 3.4 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
participants (1)
-
benjamin.peterson