Mailman 3 November 2015 - Python-checkins

cpython (merge 3.4 -> 3.5): Removed debugging output of exception raised by __reduce__ method.
by serhiy.storchaka Nov. 30, 2015

Nov. 30, 2015

https://hg.python.org/cpython/rev/ef85dc8c0ba0 changeset: 99401:ef85dc8c0ba0 branch: 3.5 parent: 99397:f0469025df14 parent: 99400:65a23d24fd12 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Dec 01 00:39:45 2015 +0200 summary: Removed debugging output of exception raised by __reduce__ method. files: Lib/pickle.py | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/Lib/pickle.py b/Lib/pickle.py --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -1391,13 +1391,7 @@ stack = self.stack args = stack.pop() func = stack[-1] - try: - value = func(*args) - except: - print(sys.exc_info()) - print(func, args) - raise - stack[-1] = value + stack[-1] = func(*args) dispatch[REDUCE[0]] = load_reduce def load_pop(self): -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Removed debugging output of exception raised by __reduce__ method.
by serhiy.storchaka Nov. 30, 2015

Nov. 30, 2015

https://hg.python.org/cpython/rev/ac0f7ed0e94d changeset: 99402:ac0f7ed0e94d parent: 99398:0a36c8fe4703 parent: 99401:ef85dc8c0ba0 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Dec 01 00:40:50 2015 +0200 summary: Removed debugging output of exception raised by __reduce__ method. files: Lib/pickle.py | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/Lib/pickle.py b/Lib/pickle.py --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -1398,13 +1398,7 @@ stack = self.stack args = stack.pop() func = stack[-1] - try: - value = func(*args) - except: - print(sys.exc_info()) - print(func, args) - raise - stack[-1] = value + stack[-1] = func(*args) dispatch[REDUCE[0]] = load_reduce def load_pop(self): -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Removed debugging output of exception raised by __reduce__ method.
by serhiy.storchaka Nov. 30, 2015

Nov. 30, 2015

https://hg.python.org/cpython/rev/65a23d24fd12 changeset: 99400:65a23d24fd12 branch: 3.4 parent: 99396:67b341701f5e user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Dec 01 00:39:25 2015 +0200 summary: Removed debugging output of exception raised by __reduce__ method. files: Lib/pickle.py | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/Lib/pickle.py b/Lib/pickle.py --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -1388,13 +1388,7 @@ stack = self.stack args = stack.pop() func = stack[-1] - try: - value = func(*args) - except: - print(sys.exc_info()) - print(func, args) - raise - stack[-1] = value + stack[-1] = func(*args) dispatch[REDUCE[0]] = load_reduce def load_pop(self): -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Fixed reference leak when read truncated pickle.
by serhiy.storchaka Nov. 30, 2015

Nov. 30, 2015

https://hg.python.org/cpython/rev/6a35865eded4 changeset: 99399:6a35865eded4 branch: 2.7 parent: 99393:3d39e1e2dcb3 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Dec 01 00:32:49 2015 +0200 summary: Fixed reference leak when read truncated pickle. files: Modules/cPickle.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Modules/cPickle.c b/Modules/cPickle.c --- a/Modules/cPickle.c +++ b/Modules/cPickle.c @@ -3969,7 +3969,10 @@ if (!module_name) return -1; if ((len = self->readline_func(self, &s)) >= 0) { - if (len < 2) return bad_readline(); + if (len < 2) { + Py_DECREF(module_name); + return bad_readline(); + } if ((class_name = PyString_FromStringAndSize(s, len - 1))) { class = find_class(module_name, class_name, self->find_class); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Fixed reference leak when read truncated pickle.
by serhiy.storchaka Nov. 30, 2015

Nov. 30, 2015

https://hg.python.org/cpython/rev/67b341701f5e changeset: 99396:67b341701f5e branch: 3.4 parent: 99392:095d21df9374 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Dec 01 00:18:23 2015 +0200 summary: Fixed reference leak when read truncated pickle. files: Modules/_pickle.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -5115,8 +5115,10 @@ return -1; if ((len = _Unpickler_Readline(self, &s)) >= 0) { - if (len < 2) + if (len < 2) { + Py_DECREF(module_name); return bad_readline(); + } class_name = PyUnicode_DecodeASCII(s, len - 1, "strict"); if (class_name != NULL) { cls = find_class(self, module_name, class_name); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Fixed reference leak when read truncated pickle.
by serhiy.storchaka Nov. 30, 2015

Nov. 30, 2015

https://hg.python.org/cpython/rev/0a36c8fe4703 changeset: 99398:0a36c8fe4703 parent: 99395:962086677306 parent: 99397:f0469025df14 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Dec 01 00:20:49 2015 +0200 summary: Fixed reference leak when read truncated pickle. files: Modules/_pickle.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -5247,8 +5247,10 @@ return -1; if ((len = _Unpickler_Readline(self, &s)) >= 0) { - if (len < 2) + if (len < 2) { + Py_DECREF(module_name); return bad_readline(); + } class_name = PyUnicode_DecodeASCII(s, len - 1, "strict"); if (class_name != NULL) { cls = find_class(self, module_name, class_name); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.5): Fixed reference leak when read truncated pickle.
by serhiy.storchaka Nov. 30, 2015

Nov. 30, 2015

https://hg.python.org/cpython/rev/f0469025df14 changeset: 99397:f0469025df14 branch: 3.5 parent: 99394:fecb07050aae parent: 99396:67b341701f5e user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Dec 01 00:20:36 2015 +0200 summary: Fixed reference leak when read truncated pickle. files: Modules/_pickle.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -5184,8 +5184,10 @@ return -1; if ((len = _Unpickler_Readline(self, &s)) >= 0) { - if (len < 2) + if (len < 2) { + Py_DECREF(module_name); return bad_readline(); + } class_name = PyUnicode_DecodeASCII(s, len - 1, "strict"); if (class_name != NULL) { cls = find_class(self, module_name, class_name); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.5): Issue #25718: Fixed copying object with state with boolean value is false.
by serhiy.storchaka Nov. 30, 2015

Nov. 30, 2015

https://hg.python.org/cpython/rev/fecb07050aae changeset: 99394:fecb07050aae branch: 3.5 parent: 99384:4897438543da parent: 99392:095d21df9374 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Mon Nov 30 17:35:40 2015 +0200 summary: Issue #25718: Fixed copying object with state with boolean value is false. files: Lib/copy.py | 4 ++-- Lib/test/test_copy.py | 9 +++++++++ Misc/NEWS | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Lib/copy.py b/Lib/copy.py --- a/Lib/copy.py +++ b/Lib/copy.py @@ -279,7 +279,7 @@ if n > 2: state = info[2] else: - state = {} + state = None if n > 3: listiter = info[3] else: @@ -293,7 +293,7 @@ y = callable(*args) memo[id(x)] = y - if state: + if state is not None: if deep: state = deepcopy(state, memo) if hasattr(y, '__setstate__'): diff --git a/Lib/test/test_copy.py b/Lib/test/test_copy.py --- a/Lib/test/test_copy.py +++ b/Lib/test/test_copy.py @@ -213,6 +213,9 @@ return self.foo == other.foo x = C(42) self.assertEqual(copy.copy(x), x) + # State with boolean value is false (issue #25718) + x = C(0.0) + self.assertEqual(copy.copy(x), x) # The deepcopy() method @@ -517,6 +520,12 @@ self.assertEqual(y, x) self.assertIsNot(y, x) self.assertIsNot(y.foo, x.foo) + # State with boolean value is false (issue #25718) + x = C([]) + y = copy.deepcopy(x) + self.assertEqual(y, x) + self.assertIsNot(y, x) + self.assertIsNot(y.foo, x.foo) def test_deepcopy_reflexive_inst(self): class C: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -20,6 +20,8 @@ Library ------- +- Issue #25718: Fixed copying object with state with boolean value is false. + - Issue #10131: Fixed deep copying of minidom documents. Based on patch by Marian Ganisin. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Issue #25718: Fixed copying object with state with boolean value is false.
by serhiy.storchaka Nov. 30, 2015

Nov. 30, 2015

https://hg.python.org/cpython/rev/095d21df9374 changeset: 99392:095d21df9374 branch: 3.4 parent: 99382:d47e5b162072 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Mon Nov 30 17:20:02 2015 +0200 summary: Issue #25718: Fixed copying object with state with boolean value is false. files: Lib/copy.py | 4 ++-- Lib/test/test_copy.py | 9 +++++++++ Misc/NEWS | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Lib/copy.py b/Lib/copy.py --- a/Lib/copy.py +++ b/Lib/copy.py @@ -281,7 +281,7 @@ if n > 2: state = info[2] else: - state = {} + state = None if n > 3: listiter = info[3] else: @@ -295,7 +295,7 @@ y = callable(*args) memo[id(x)] = y - if state: + if state is not None: if deep: state = deepcopy(state, memo) if hasattr(y, '__setstate__'): diff --git a/Lib/test/test_copy.py b/Lib/test/test_copy.py --- a/Lib/test/test_copy.py +++ b/Lib/test/test_copy.py @@ -180,6 +180,9 @@ return self.foo == other.foo x = C(42) self.assertEqual(copy.copy(x), x) + # State with boolean value is false (issue #25718) + x = C(0.0) + self.assertEqual(copy.copy(x), x) # The deepcopy() method @@ -448,6 +451,12 @@ self.assertEqual(y, x) self.assertIsNot(y, x) self.assertIsNot(y.foo, x.foo) + # State with boolean value is false (issue #25718) + x = C([]) + y = copy.deepcopy(x) + self.assertEqual(y, x) + self.assertIsNot(y, x) + self.assertIsNot(y.foo, x.foo) def test_deepcopy_reflexive_inst(self): class C: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -113,6 +113,8 @@ Library ------- +- Issue #25718: Fixed copying object with state with boolean value is false. + - Issue #10131: Fixed deep copying of minidom documents. Based on patch by Marian Ganisin. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Issue #25718: Fixed copying object with state with boolean value is false.
by serhiy.storchaka Nov. 30, 2015

Nov. 30, 2015

https://hg.python.org/cpython/rev/962086677306 changeset: 99395:962086677306 parent: 99391:6b08429a3932 parent: 99394:fecb07050aae user: Serhiy Storchaka <storchaka(a)gmail.com> date: Mon Nov 30 17:37:13 2015 +0200 summary: Issue #25718: Fixed copying object with state with boolean value is false. files: Lib/copy.py | 4 ++-- Lib/test/test_copy.py | 9 +++++++++ Misc/NEWS | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Lib/copy.py b/Lib/copy.py --- a/Lib/copy.py +++ b/Lib/copy.py @@ -279,7 +279,7 @@ if n > 2: state = info[2] else: - state = {} + state = None if n > 3: listiter = info[3] else: @@ -293,7 +293,7 @@ y = callable(*args) memo[id(x)] = y - if state: + if state is not None: if deep: state = deepcopy(state, memo) if hasattr(y, '__setstate__'): diff --git a/Lib/test/test_copy.py b/Lib/test/test_copy.py --- a/Lib/test/test_copy.py +++ b/Lib/test/test_copy.py @@ -213,6 +213,9 @@ return self.foo == other.foo x = C(42) self.assertEqual(copy.copy(x), x) + # State with boolean value is false (issue #25718) + x = C(0.0) + self.assertEqual(copy.copy(x), x) # The deepcopy() method @@ -517,6 +520,12 @@ self.assertEqual(y, x) self.assertIsNot(y, x) self.assertIsNot(y.foo, x.foo) + # State with boolean value is false (issue #25718) + x = C([]) + y = copy.deepcopy(x) + self.assertEqual(y, x) + self.assertIsNot(y, x) + self.assertIsNot(y.foo, x.foo) def test_deepcopy_reflexive_inst(self): class C: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -107,6 +107,8 @@ Library ------- +- Issue #25718: Fixed copying object with state with boolean value is false. + - Issue #10131: Fixed deep copying of minidom documents. Based on patch by Marian Ganisin. -- Repository URL: https://hg.python.org/cpython

1 0