| commit | b32b998bf7ccc8718f1f086f2e3d2658f2e5b224 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Jul 02 16:58:31 2015 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Jul 02 16:58:31 2015 -0500 |
| tree | 570aad9f7383abad18339e62935c864c76960279 | |
| parent | 42e913aa3a6f777a8d40eb1d020e77906d0b1ba4 [diff] | |
| parent | d3a2a95125167564aed33286933dd224a1f47b7e [diff] |
merge 3.4
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 @@ # Issue 24552 global SimpleNewObj save = SimpleNewObj - o = object.__new__(SimpleNewObj) + o = SimpleNewObj.__new__(SimpleNewObj) b = self.dumps(o, 4) try: SimpleNewObj = 42