Mailman 3 April 2018 - Python-checkins

bpo-33224: PEP 479 fix for difflib.mdiff() (GH-6381) (GH-6391)
by Raymond Hettinger April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/8da15f09458fd4f4fe341861e41723892b… commit: 8da15f09458fd4f4fe341861e41723892b25a11b branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Raymond Hettinger <rhettinger(a)users.noreply.github.com> date: 2018-04-05T12:18:02-07:00 summary: bpo-33224: PEP 479 fix for difflib.mdiff() (GH-6381) (GH-6391) (cherry picked from commit 01b731fc2b04744a11e32f93aba8bfb9ddb3dd29) Co-authored-by: Raymond Hettinger <rhettinger(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Library/2018-04-04-23-41-30.bpo-33224.pyR0jB.rst M Lib/difflib.py M Lib/test/test_difflib.py diff --git a/Lib/difflib.py b/Lib/difflib.py index 72971d5b87a9..7cebd64978ea 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -1634,14 +1634,18 @@ def _line_pair_iterator(): lines_to_write -= 1 # Now yield the context lines after the change lines_to_write = context-1 - while(lines_to_write): - from_line, to_line, found_diff = next(line_pair_iterator) - # If another change within the context, extend the context - if found_diff: - lines_to_write = context-1 - else: - lines_to_write -= 1 - yield from_line, to_line, found_diff + try: + while(lines_to_write): + from_line, to_line, found_diff = next(line_pair_iterator) + # If another change within the context, extend the context + if found_diff: + lines_to_write = context-1 + else: + lines_to_write -= 1 + yield from_line, to_line, found_diff + except StopIteration: + # Catch exception from next() and return normally + return _file_template = """ diff --git a/Lib/test/test_difflib.py b/Lib/test/test_difflib.py index aaefe6db0291..745ccbd6659e 100644 --- a/Lib/test/test_difflib.py +++ b/Lib/test/test_difflib.py @@ -93,6 +93,14 @@ def test_added_tab_hint(self): self.assertEqual("+ \t\tI am a bug", diff[2]) self.assertEqual("? +\n", diff[3]) + def test_mdiff_catch_stop_iteration(self): + # Issue #33224 + self.assertEqual( + list(difflib._mdiff(["2"], ["3"], 1)), + [((1, '\x00-2\x01'), (1, '\x00+3\x01'), True)], + ) + + patch914575_from1 = """ 1. Beautiful is beTTer than ugly. 2. Explicit is better than implicit. diff --git a/Misc/NEWS.d/next/Library/2018-04-04-23-41-30.bpo-33224.pyR0jB.rst b/Misc/NEWS.d/next/Library/2018-04-04-23-41-30.bpo-33224.pyR0jB.rst new file mode 100644 index 000000000000..87ff100da4b6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-04-23-41-30.bpo-33224.pyR0jB.rst @@ -0,0 +1,2 @@ +Update difflib.mdiff() for PEP 479. Convert an uncaught StopIteration in a +generator into a return-statement.

1 0

bpo-33224: PEP 479 fix for difflib.mdiff() (GH-6381) (GH-6390)
by Raymond Hettinger April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/28c179094bcb7829d184fb3cfb3ef62650… commit: 28c179094bcb7829d184fb3cfb3ef626505b9f77 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Raymond Hettinger <rhettinger(a)users.noreply.github.com> date: 2018-04-05T11:45:33-07:00 summary: bpo-33224: PEP 479 fix for difflib.mdiff() (GH-6381) (GH-6390) files: A Misc/NEWS.d/next/Library/2018-04-04-23-41-30.bpo-33224.pyR0jB.rst M Lib/difflib.py M Lib/test/test_difflib.py diff --git a/Lib/difflib.py b/Lib/difflib.py index 043a169c28be..887c3c26cae4 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -1634,14 +1634,18 @@ def _line_pair_iterator(): lines_to_write -= 1 # Now yield the context lines after the change lines_to_write = context-1 - while(lines_to_write): - from_line, to_line, found_diff = next(line_pair_iterator) - # If another change within the context, extend the context - if found_diff: - lines_to_write = context-1 - else: - lines_to_write -= 1 - yield from_line, to_line, found_diff + try: + while(lines_to_write): + from_line, to_line, found_diff = next(line_pair_iterator) + # If another change within the context, extend the context + if found_diff: + lines_to_write = context-1 + else: + lines_to_write -= 1 + yield from_line, to_line, found_diff + except StopIteration: + # Catch exception from next() and return normally + return _file_template = """ diff --git a/Lib/test/test_difflib.py b/Lib/test/test_difflib.py index aaefe6db0291..745ccbd6659e 100644 --- a/Lib/test/test_difflib.py +++ b/Lib/test/test_difflib.py @@ -93,6 +93,14 @@ def test_added_tab_hint(self): self.assertEqual("+ \t\tI am a bug", diff[2]) self.assertEqual("? +\n", diff[3]) + def test_mdiff_catch_stop_iteration(self): + # Issue #33224 + self.assertEqual( + list(difflib._mdiff(["2"], ["3"], 1)), + [((1, '\x00-2\x01'), (1, '\x00+3\x01'), True)], + ) + + patch914575_from1 = """ 1. Beautiful is beTTer than ugly. 2. Explicit is better than implicit. diff --git a/Misc/NEWS.d/next/Library/2018-04-04-23-41-30.bpo-33224.pyR0jB.rst b/Misc/NEWS.d/next/Library/2018-04-04-23-41-30.bpo-33224.pyR0jB.rst new file mode 100644 index 000000000000..87ff100da4b6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-04-23-41-30.bpo-33224.pyR0jB.rst @@ -0,0 +1,2 @@ +Update difflib.mdiff() for PEP 479. Convert an uncaught StopIteration in a +generator into a return-statement.

1 0

bpo-33224: PEP 479 fix for difflib.mdiff() (GH-6381)
by Raymond Hettinger April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/01b731fc2b04744a11e32f93aba8bfb9dd… commit: 01b731fc2b04744a11e32f93aba8bfb9ddb3dd29 branch: master author: Raymond Hettinger <rhettinger(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-05T11:19:57-07:00 summary: bpo-33224: PEP 479 fix for difflib.mdiff() (GH-6381) files: A Misc/NEWS.d/next/Library/2018-04-04-23-41-30.bpo-33224.pyR0jB.rst M Lib/difflib.py M Lib/test/test_difflib.py diff --git a/Lib/difflib.py b/Lib/difflib.py index 043a169c28be..887c3c26cae4 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -1634,14 +1634,18 @@ def _line_pair_iterator(): lines_to_write -= 1 # Now yield the context lines after the change lines_to_write = context-1 - while(lines_to_write): - from_line, to_line, found_diff = next(line_pair_iterator) - # If another change within the context, extend the context - if found_diff: - lines_to_write = context-1 - else: - lines_to_write -= 1 - yield from_line, to_line, found_diff + try: + while(lines_to_write): + from_line, to_line, found_diff = next(line_pair_iterator) + # If another change within the context, extend the context + if found_diff: + lines_to_write = context-1 + else: + lines_to_write -= 1 + yield from_line, to_line, found_diff + except StopIteration: + # Catch exception from next() and return normally + return _file_template = """ diff --git a/Lib/test/test_difflib.py b/Lib/test/test_difflib.py index aaefe6db0291..745ccbd6659e 100644 --- a/Lib/test/test_difflib.py +++ b/Lib/test/test_difflib.py @@ -93,6 +93,14 @@ def test_added_tab_hint(self): self.assertEqual("+ \t\tI am a bug", diff[2]) self.assertEqual("? +\n", diff[3]) + def test_mdiff_catch_stop_iteration(self): + # Issue #33224 + self.assertEqual( + list(difflib._mdiff(["2"], ["3"], 1)), + [((1, '\x00-2\x01'), (1, '\x00+3\x01'), True)], + ) + + patch914575_from1 = """ 1. Beautiful is beTTer than ugly. 2. Explicit is better than implicit. diff --git a/Misc/NEWS.d/next/Library/2018-04-04-23-41-30.bpo-33224.pyR0jB.rst b/Misc/NEWS.d/next/Library/2018-04-04-23-41-30.bpo-33224.pyR0jB.rst new file mode 100644 index 000000000000..87ff100da4b6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-04-23-41-30.bpo-33224.pyR0jB.rst @@ -0,0 +1,2 @@ +Update difflib.mdiff() for PEP 479. Convert an uncaught StopIteration in a +generator into a return-statement.

1 0

bpo-15817: Expose command documentation to gdb help (GH-6384)
by Ned Deily April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/7286dbd8b20bd0a26fabe1a07ff368082a… commit: 7286dbd8b20bd0a26fabe1a07ff368082a9c5ed6 branch: master author: Skip Montanaro <skip.montanaro(a)gmail.com> committer: Ned Deily <nad(a)python.org> date: 2018-04-05T13:34:44-04:00 summary: bpo-15817: Expose command documentation to gdb help (GH-6384) Original patch by Alexander Belopolsky. Patch by Skip Montanaro. files: M Misc/gdbinit diff --git a/Misc/gdbinit b/Misc/gdbinit index 3b6fe50ef931..9f216215eac2 100644 --- a/Misc/gdbinit +++ b/Misc/gdbinit @@ -14,9 +14,11 @@ # with embedded macros that you may find superior to what is in here. # See Tools/gdb/libpython.py and http://bugs.python.org/issue8032. -# Prints a representation of the object to stderr, along with the -# number of reference counts it current has and the hex address the -# object is allocated at. The argument must be a PyObject* +document pyo + Prints a representation of the object to stderr, along with the + number of reference counts it currently has and the hex address the + object is allocated at. The argument must be a PyObject* +end define pyo # side effect of calling _PyObject_Dump is to dump the object's # info - assigning just prevents gdb from printing the @@ -24,14 +26,18 @@ define pyo set $_unused_void = _PyObject_Dump($arg0) end -# Prints a representation of the object to stderr, along with the -# number of reference counts it current has and the hex address the -# object is allocated at. The argument must be a PyGC_Head* +document pyg + Prints a representation of the object to stderr, along with the + number of reference counts it currently has and the hex address the + object is allocated at. The argument must be a PyGC_Head* +end define pyg print _PyGC_Dump($arg0) end -# print the local variables of the current frame +document pylocals + Print the local variables of the current frame. +end define pylocals set $_i = 0 while $_i < f->f_code->co_nlocals @@ -69,7 +75,9 @@ define lineno printf "%d", $__li end -# print the current frame - verbose +document pyframev + Print the current frame - verbose +end define pyframev pyframe pylocals @@ -126,7 +134,9 @@ end # the interpreter you may will have to change the functions you compare with # $pc. -# print the entire Python call stack +document pystack + Print the entire Python call stack +end define pystack while $pc < Py_Main || $pc > Py_GetArgcArgv if $pc > PyEval_EvalFrameEx && $pc < PyEval_EvalCodeEx @@ -137,7 +147,9 @@ define pystack select-frame 0 end -# print the entire Python call stack - verbose mode +document pystackv + Print the entire Python call stack - verbose mode +end define pystackv while $pc < Py_Main || $pc > Py_GetArgcArgv if $pc > PyEval_EvalFrameEx && $pc < PyEval_EvalCodeEx @@ -148,7 +160,9 @@ define pystackv select-frame 0 end -# generally useful macro to print a Unicode string +document pu + Generally useful macro to print a Unicode string +end def pu set $uni = $arg0 set $i = 0

1 0

bpo-33203: Ensure random.choice always raises IndexError on empty sequence (GH-6338) (GH-6388)
by Raymond Hettinger April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/e25af930a300c01aa043745058a8c7f6c3… commit: e25af930a300c01aa043745058a8c7f6c32d89ae branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Raymond Hettinger <rhettinger(a)users.noreply.github.com> date: 2018-04-05T09:24:27-07:00 summary: bpo-33203: Ensure random.choice always raises IndexError on empty sequence (GH-6338) (GH-6388) (cherry picked from commit 091e95e9004b794280ab35becec2c3e30dd5e96e) Co-authored-by: Wolfgang Maier <wolfgang.maier(a)biologie.uni-freiburg.de> files: A Misc/NEWS.d/next/Library/2018-04-05-11-09-45.bpo-33203.Hje9Py.rst M Lib/random.py M Lib/test/test_random.py diff --git a/Lib/random.py b/Lib/random.py index 0152e5ea12bf..7a2585e01ab3 100644 --- a/Lib/random.py +++ b/Lib/random.py @@ -241,6 +241,8 @@ def _randbelow(self, n, int=int, maxsize=1<<BPF, type=type, "enough bits to choose from a population range this large.\n" "To remove the range limitation, add a getrandbits() method.") return int(random() * n) + if n == 0: + raise ValueError("Boundary cannot be zero") rem = maxsize % n limit = (maxsize - rem) / maxsize # int(limit * maxsize) % n == 0 r = random() diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index 3e57a82b63e5..10f431a63eb7 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -644,7 +644,10 @@ def test_randbelow_overridden_random(self, random_mock): # Population range too large (n >= maxsize) self.gen._randbelow(maxsize+1, maxsize = maxsize) self.gen._randbelow(5640, maxsize = maxsize) - + # issue 33203: test that _randbelow raises ValueError on + # n == 0 also in its getrandbits-independent branch. + with self.assertRaises(ValueError): + self.gen._randbelow(0, maxsize=maxsize) # This might be going too far to test a single line, but because of our # noble aim of achieving 100% test coverage we need to write a case in # which the following line in Random._randbelow() gets executed: diff --git a/Misc/NEWS.d/next/Library/2018-04-05-11-09-45.bpo-33203.Hje9Py.rst b/Misc/NEWS.d/next/Library/2018-04-05-11-09-45.bpo-33203.Hje9Py.rst new file mode 100644 index 000000000000..ab6d17b5d1ba --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-05-11-09-45.bpo-33203.Hje9Py.rst @@ -0,0 +1,3 @@ +``random.Random.choice()`` now raises ``IndexError`` for empty sequences +consistently even when called from subclasses without a ``getrandbits()`` +implementation.

1 0

bpo-33203: Ensure random.choice always raises IndexError on empty sequence (GH-6338) (GH-6387)
by Raymond Hettinger April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/baf304e82e1b54dbeee6b78ddf168e33ed… commit: baf304e82e1b54dbeee6b78ddf168e33ed8d557a branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Raymond Hettinger <rhettinger(a)users.noreply.github.com> date: 2018-04-05T09:02:12-07:00 summary: bpo-33203: Ensure random.choice always raises IndexError on empty sequence (GH-6338) (GH-6387) (cherry picked from commit 091e95e9004b794280ab35becec2c3e30dd5e96e) Co-authored-by: Wolfgang Maier <wolfgang.maier(a)biologie.uni-freiburg.de> files: A Misc/NEWS.d/next/Library/2018-04-05-11-09-45.bpo-33203.Hje9Py.rst M Lib/random.py M Lib/test/test_random.py diff --git a/Lib/random.py b/Lib/random.py index 91065b7e3037..0bc24174e13f 100644 --- a/Lib/random.py +++ b/Lib/random.py @@ -242,6 +242,8 @@ def _randbelow(self, n, int=int, maxsize=1<<BPF, type=type, "enough bits to choose from a population range this large.\n" "To remove the range limitation, add a getrandbits() method.") return int(random() * n) + if n == 0: + raise ValueError("Boundary cannot be zero") rem = maxsize % n limit = (maxsize - rem) / maxsize # int(limit * maxsize) % n == 0 r = random() diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index 468c4a467e5d..eee245df48a1 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -651,7 +651,10 @@ def test_randbelow_overridden_random(self, random_mock): # Population range too large (n >= maxsize) self.gen._randbelow(maxsize+1, maxsize = maxsize) self.gen._randbelow(5640, maxsize = maxsize) - + # issue 33203: test that _randbelow raises ValueError on + # n == 0 also in its getrandbits-independent branch. + with self.assertRaises(ValueError): + self.gen._randbelow(0, maxsize=maxsize) # This might be going too far to test a single line, but because of our # noble aim of achieving 100% test coverage we need to write a case in # which the following line in Random._randbelow() gets executed: diff --git a/Misc/NEWS.d/next/Library/2018-04-05-11-09-45.bpo-33203.Hje9Py.rst b/Misc/NEWS.d/next/Library/2018-04-05-11-09-45.bpo-33203.Hje9Py.rst new file mode 100644 index 000000000000..ab6d17b5d1ba --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-05-11-09-45.bpo-33203.Hje9Py.rst @@ -0,0 +1,3 @@ +``random.Random.choice()`` now raises ``IndexError`` for empty sequences +consistently even when called from subclasses without a ``getrandbits()`` +implementation.

1 0

bpo-33203: Ensure random.choice always raises IndexError on empty sequence (GH-6338)
by Raymond Hettinger April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/091e95e9004b794280ab35becec2c3e30d… commit: 091e95e9004b794280ab35becec2c3e30dd5e96e branch: master author: Wolfgang Maier <wolfgang.maier(a)biologie.uni-freiburg.de> committer: Raymond Hettinger <rhettinger(a)users.noreply.github.com> date: 2018-04-05T08:19:44-07:00 summary: bpo-33203: Ensure random.choice always raises IndexError on empty sequence (GH-6338) files: A Misc/NEWS.d/next/Library/2018-04-05-11-09-45.bpo-33203.Hje9Py.rst M Lib/random.py M Lib/test/test_random.py diff --git a/Lib/random.py b/Lib/random.py index 91065b7e3037..0bc24174e13f 100644 --- a/Lib/random.py +++ b/Lib/random.py @@ -242,6 +242,8 @@ def _randbelow(self, n, int=int, maxsize=1<<BPF, type=type, "enough bits to choose from a population range this large.\n" "To remove the range limitation, add a getrandbits() method.") return int(random() * n) + if n == 0: + raise ValueError("Boundary cannot be zero") rem = maxsize % n limit = (maxsize - rem) / maxsize # int(limit * maxsize) % n == 0 r = random() diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index 468c4a467e5d..eee245df48a1 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -651,7 +651,10 @@ def test_randbelow_overridden_random(self, random_mock): # Population range too large (n >= maxsize) self.gen._randbelow(maxsize+1, maxsize = maxsize) self.gen._randbelow(5640, maxsize = maxsize) - + # issue 33203: test that _randbelow raises ValueError on + # n == 0 also in its getrandbits-independent branch. + with self.assertRaises(ValueError): + self.gen._randbelow(0, maxsize=maxsize) # This might be going too far to test a single line, but because of our # noble aim of achieving 100% test coverage we need to write a case in # which the following line in Random._randbelow() gets executed: diff --git a/Misc/NEWS.d/next/Library/2018-04-05-11-09-45.bpo-33203.Hje9Py.rst b/Misc/NEWS.d/next/Library/2018-04-05-11-09-45.bpo-33203.Hje9Py.rst new file mode 100644 index 000000000000..ab6d17b5d1ba --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-05-11-09-45.bpo-33203.Hje9Py.rst @@ -0,0 +1,3 @@ +``random.Random.choice()`` now raises ``IndexError`` for empty sequences +consistently even when called from subclasses without a ``getrandbits()`` +implementation.

1 0

Clean up and enhance frozen dataclass tests. (GH-6380)
by Miss Islington (bot) April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/83f564fd242c1af9dbe6d4273ad5058648… commit: 83f564fd242c1af9dbe6d4273ad50586489000e3 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-05T04:12:31-07:00 summary: Clean up and enhance frozen dataclass tests. (GH-6380) * Add a test for frozen with unhashable field value. * Improve a comment. (cherry picked from commit 74940913d26d9f94b8572eca794369841fa6d9b6) Co-authored-by: Eric V. Smith <ericvsmith(a)users.noreply.github.com> files: M Lib/test/test_dataclasses.py diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py index 26bfc4e75a00..2c890a2cbe92 100755 --- a/Lib/test/test_dataclasses.py +++ b/Lib/test/test_dataclasses.py @@ -2191,33 +2191,6 @@ def __repr__(self): self.assertEqual(repr(C(0)), 'x') -class TestFrozen(unittest.TestCase): - def test_overwriting_frozen(self): - # frozen uses __setattr__ and __delattr__. - with self.assertRaisesRegex(TypeError, - 'Cannot overwrite attribute __setattr__'): - @dataclass(frozen=True) - class C: - x: int - def __setattr__(self): - pass - - with self.assertRaisesRegex(TypeError, - 'Cannot overwrite attribute __delattr__'): - @dataclass(frozen=True) - class C: - x: int - def __delattr__(self): - pass - - @dataclass(frozen=False) - class C: - x: int - def __setattr__(self, name, value): - self.__dict__['x'] = value * 2 - self.assertEqual(C(10).x, 20) - - class TestEq(unittest.TestCase): def test_no_eq(self): # Test a class with no __eq__ and eq=False. @@ -2672,6 +2645,44 @@ class S(D): self.assertEqual(s.y, 10) self.assertEqual(s.cached, True) + def test_overwriting_frozen(self): + # frozen uses __setattr__ and __delattr__. + with self.assertRaisesRegex(TypeError, + 'Cannot overwrite attribute __setattr__'): + @dataclass(frozen=True) + class C: + x: int + def __setattr__(self): + pass + + with self.assertRaisesRegex(TypeError, + 'Cannot overwrite attribute __delattr__'): + @dataclass(frozen=True) + class C: + x: int + def __delattr__(self): + pass + + @dataclass(frozen=False) + class C: + x: int + def __setattr__(self, name, value): + self.__dict__['x'] = value * 2 + self.assertEqual(C(10).x, 20) + + def test_frozen_hash(self): + @dataclass(frozen=True) + class C: + x: Any + + # If x is immutable, we can compute the hash. No exception is + # raised. + hash(C(3)) + + # If x is mutable, computing the hash is an error. + with self.assertRaisesRegex(TypeError, 'unhashable type'): + hash(C({})) + class TestSlots(unittest.TestCase): def test_simple(self):

1 0

Clean up and enhance frozen dataclass tests. (GH-6380)
by Eric V. Smith April 5, 2018

April 5, 2018

https://github.com/python/cpython/commit/74940913d26d9f94b8572eca794369841f… commit: 74940913d26d9f94b8572eca794369841fa6d9b6 branch: master author: Eric V. Smith <ericvsmith(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-05T06:50:18-04:00 summary: Clean up and enhance frozen dataclass tests. (GH-6380) * Add a test for frozen with unhashable field value. * Improve a comment. files: M Lib/test/test_dataclasses.py diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py index 26bfc4e75a00..2c890a2cbe92 100755 --- a/Lib/test/test_dataclasses.py +++ b/Lib/test/test_dataclasses.py @@ -2191,33 +2191,6 @@ def __repr__(self): self.assertEqual(repr(C(0)), 'x') -class TestFrozen(unittest.TestCase): - def test_overwriting_frozen(self): - # frozen uses __setattr__ and __delattr__. - with self.assertRaisesRegex(TypeError, - 'Cannot overwrite attribute __setattr__'): - @dataclass(frozen=True) - class C: - x: int - def __setattr__(self): - pass - - with self.assertRaisesRegex(TypeError, - 'Cannot overwrite attribute __delattr__'): - @dataclass(frozen=True) - class C: - x: int - def __delattr__(self): - pass - - @dataclass(frozen=False) - class C: - x: int - def __setattr__(self, name, value): - self.__dict__['x'] = value * 2 - self.assertEqual(C(10).x, 20) - - class TestEq(unittest.TestCase): def test_no_eq(self): # Test a class with no __eq__ and eq=False. @@ -2672,6 +2645,44 @@ class S(D): self.assertEqual(s.y, 10) self.assertEqual(s.cached, True) + def test_overwriting_frozen(self): + # frozen uses __setattr__ and __delattr__. + with self.assertRaisesRegex(TypeError, + 'Cannot overwrite attribute __setattr__'): + @dataclass(frozen=True) + class C: + x: int + def __setattr__(self): + pass + + with self.assertRaisesRegex(TypeError, + 'Cannot overwrite attribute __delattr__'): + @dataclass(frozen=True) + class C: + x: int + def __delattr__(self): + pass + + @dataclass(frozen=False) + class C: + x: int + def __setattr__(self, name, value): + self.__dict__['x'] = value * 2 + self.assertEqual(C(10).x, 20) + + def test_frozen_hash(self): + @dataclass(frozen=True) + class C: + x: Any + + # If x is immutable, we can compute the hash. No exception is + # raised. + hash(C(3)) + + # If x is mutable, computing the hash is an error. + with self.assertRaisesRegex(TypeError, 'unhashable type'): + hash(C({})) + class TestSlots(unittest.TestCase): def test_simple(self):

1 0

Daily reference leaks (4243df51fe43): sum=4
by solipsis＠pitrou.net April 5, 2018

April 5, 2018

results for 4243df51fe43 on branch "default" -------------------------------------------- test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_forkserver leaked [-2, 2, 0] memory blocks, sum=0 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogUVLyTY', '--timeout', '7200']

1 0