[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #25718: Fixed copying object with state with boolean value is false.

Mon Nov 30 10:37:50 EST 2015

https://hg.python.org/cpython/rev/fecb07050aae
changeset: 99394:fecb07050aae
branch: 3.5
parent: 99384:4897438543da
parent: 99392:095d21df9374
user: Serhiy Storchaka <storchaka at 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
