Mailman 3 June 2014 - Python-checkins

cpython (merge 3.4 -> default): merge
by raymond.hettinger 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/3fa0d2b297c6 changeset: 91358:3fa0d2b297c6 parent: 91355:22cfc057a1f1 parent: 91357:a941bb617c2a user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 13:03:54 2014 -0700 summary: merge files: Doc/tutorial/classes.rst | 71 ++++++++++++++++++++++++++++ Misc/ACKS | 1 + 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -387,6 +387,77 @@ argument list. +.. _tut-class-and-instance-variables: + +Class and Instance Variables +---------------------------- + +Generally speaking, instance variables are for data unique to each instance +and class variables are for attributes and methods shared by all instances +of the class:: + + class Dog: + + kind = 'canine' # class variable shared by all instances + + def __init__(self, name): + self.name = name # instance variable unique to each instance + + >>> d = Dog('Fido') + >>> e = Dog('Buddy') + >>> d.kind # shared by all dogs + 'canine' + >>> e.kind # shared by all dogs + 'canine' + >>> d.name # unique to d + 'Fido' + >>> e.name # unique to e + 'Buddy' + +As discussed in :ref:`tut-object`, shared data can have possibly surprising +effects with involving :term:`mutable` objects such as lists and dictionaries. +For example, the *tricks* list in the following code should not be used as a +class variable because just a single list would be shared by all *Dog* +instances:: + + class Dog: + + tricks = [] # mistaken use of a class variable + + def __init__(self, name): + self.name = name + + def add_trick(self, trick): + self.tricks.append(trick) + + >>> d = Dog('Fido') + >>> e = Dog('Buddy') + >>> d.add_trick('roll over') + >>> e.add_trick('play dead') + >>> d.tricks # unexpectedly shared by all dogs + ['roll over', 'play dead'] + +Correct design of the class should use an instance variable instead:: + + class Dog: + + def __init__(self, name): + self.name = name + self.tricks = [] # creates a new empty list for each dog + + def add_trick(self, trick): + self.tricks.append(trick) + + >>> d = Dog('Fido') + >>> e = Dog('Buddy') + >>> d.add_trick('roll over') + >>> e.add_trick('play dead') + >>> d.tricks + ['roll over'] + >>> e.tricks + ['play dead'] + + .. _tut-remarks: Random Remarks diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -239,6 +239,7 @@ Lita Cho Anders Chrigström Tom Christiansen +Renee Chu Vadim Chugunov Mauro Cicognini David Cinege -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.4): merge
by raymond.hettinger 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/a941bb617c2a changeset: 91357:a941bb617c2a branch: 3.4 parent: 91356:8e5e04a1497f parent: 91353:fc68113cfb0c user: Raymond Hettinger <python(a)rcn.com> date: Tue Jun 24 13:03:24 2014 -0700 summary: merge files: Misc/ACKS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -415,6 +415,7 @@ Michael Foord Amaury Forgeot d'Arc Doug Fort +Chris Foster John Fouhy Andrew Francis Stefan Franke -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): Issue #11974: Add tutorial section on class and instance variables
by raymond.hettinger 24 Jun '14

24 Jun '14

http://hg.python.org/cpython/rev/8e5e04a1497f changeset: 91356:8e5e04a1497f branch: 3.4 parent: 91348:cc0f5d6ccb70 user: Raymond Hettinger <python(a)rcn.com> date: Mon Jun 23 18:08:01 2014 -0700 summary: Issue #11974: Add tutorial section on class and instance variables (Based on a patch from Renee Chu.) files: Doc/tutorial/classes.rst | 71 ++++++++++++++++++++++++++++ Misc/ACKS | 1 + 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -387,6 +387,77 @@ argument list. +.. _tut-class-and-instance-variables: + +Class and Instance Variables +---------------------------- + +Generally speaking, instance variables are for data unique to each instance +and class variables are for attributes and methods shared by all instances +of the class:: + + class Dog: + + kind = 'canine' # class variable shared by all instances + + def __init__(self, name): + self.name = name # instance variable unique to each instance + + >>> d = Dog('Fido') + >>> e = Dog('Buddy') + >>> d.kind # shared by all dogs + 'canine' + >>> e.kind # shared by all dogs + 'canine' + >>> d.name # unique to d + 'Fido' + >>> e.name # unique to e + 'Buddy' + +As discussed in :ref:`tut-object`, shared data can have possibly surprising +effects with involving :term:`mutable` objects such as lists and dictionaries. +For example, the *tricks* list in the following code should not be used as a +class variable because just a single list would be shared by all *Dog* +instances:: + + class Dog: + + tricks = [] # mistaken use of a class variable + + def __init__(self, name): + self.name = name + + def add_trick(self, trick): + self.tricks.append(trick) + + >>> d = Dog('Fido') + >>> e = Dog('Buddy') + >>> d.add_trick('roll over') + >>> e.add_trick('play dead') + >>> d.tricks # unexpectedly shared by all dogs + ['roll over', 'play dead'] + +Correct design of the class should use an instance variable instead:: + + class Dog: + + def __init__(self, name): + self.name = name + self.tricks = [] # creates a new empty list for each dog + + def add_trick(self, trick): + self.tricks.append(trick) + + >>> d = Dog('Fido') + >>> e = Dog('Buddy') + >>> d.add_trick('roll over') + >>> e.add_trick('play dead') + >>> d.tricks + ['roll over'] + >>> e.tricks + ['play dead'] + + .. _tut-remarks: Random Remarks diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -238,6 +238,7 @@ Lita Cho Anders Chrigström Tom Christiansen +Renee Chu Vadim Chugunov Mauro Cicognini David Cinege -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): merge 3.4
by benjamin.peterson 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/22cfc057a1f1 changeset: 91355:22cfc057a1f1 parent: 91354:e7fa8518e99a parent: 91353:fc68113cfb0c user: Benjamin Peterson <benjamin(a)python.org> date: Mon Jun 23 20:16:06 2014 -0700 summary: merge 3.4 files: Misc/ACKS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -415,6 +415,7 @@ Michael Foord Amaury Forgeot d'Arc Doug Fort +Chris Foster John Fouhy Andrew Francis Stefan Franke -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): null merge 3.4
by benjamin.peterson 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/e7fa8518e99a changeset: 91354:e7fa8518e99a parent: 91349:fa5b985f0920 parent: 91348:cc0f5d6ccb70 user: Benjamin Peterson <benjamin(a)python.org> date: Mon Jun 23 20:16:01 2014 -0700 summary: null merge 3.4 files: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): add Chris Foster
by benjamin.peterson 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/fc68113cfb0c changeset: 91353:fc68113cfb0c branch: 3.4 parent: 91348:cc0f5d6ccb70 user: Benjamin Peterson <benjamin(a)python.org> date: Mon Jun 23 20:14:46 2014 -0700 summary: add Chris Foster files: Misc/ACKS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -414,6 +414,7 @@ Michael Foord Amaury Forgeot d'Arc Doug Fort +Chris Foster John Fouhy Andrew Francis Stefan Franke -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): add Chris Foster
by benjamin.peterson 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/e04eefef7820 changeset: 91352:e04eefef7820 branch: 2.7 user: Benjamin Peterson <benjamin(a)python.org> date: Mon Jun 23 20:14:46 2014 -0700 summary: add Chris Foster files: Misc/ACKS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -412,6 +412,7 @@ Michael Foord Amaury Forgeot d'Arc Doug Fort +Chris Foster John Fouhy Andrew Francis Stefan Franke -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): avoid overflow with large buffer sizes and/or offsets (closes #21831)
by benjamin.peterson 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/8d963c7db507 changeset: 91351:8d963c7db507 branch: 2.7 user: Benjamin Peterson <benjamin(a)python.org> date: Mon Jun 23 20:12:27 2014 -0700 summary: avoid overflow with large buffer sizes and/or offsets (closes #21831) files: Lib/test/test_buffer.py | 6 ++++++ Misc/NEWS | 3 +++ Objects/bufferobject.c | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py --- a/Lib/test/test_buffer.py +++ b/Lib/test/test_buffer.py @@ -4,6 +4,7 @@ """ +import sys import unittest from test import test_support @@ -29,6 +30,11 @@ m = memoryview(b) # Should not raise an exception self.assertEqual(m.tobytes(), s) + def test_large_buffer_size_and_offset(self): + data = bytearray('hola mundo') + buf = buffer(data, sys.maxsize, sys.maxsize) + self.assertEqual(buf[:4096], "") + def test_main(): with test_support.check_py3k_warnings(("buffer.. not supported", diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #21831: Avoid integer overflow when large sizes and offsets are given to + the buffer type. + - Issue #1856: Avoid crashes and lockups when daemon threads run while the interpreter is shutting down; instead, these threads are now killed when they try to take the GIL. diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c --- a/Objects/bufferobject.c +++ b/Objects/bufferobject.c @@ -88,7 +88,7 @@ *size = count; else *size = self->b_size; - if (offset + *size > count) + if (*size > count - offset) *size = count - offset; } return 1; @@ -875,4 +875,4 @@ 0, /* tp_init */ 0, /* tp_alloc */ buffer_new, /* tp_new */ -}; \ No newline at end of file +}; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #11974: Add tutorial section on class and instance variables
by raymond.hettinger 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/8e0b7393e921 changeset: 91350:8e0b7393e921 branch: 2.7 parent: 91345:e28004fb30c0 user: Raymond Hettinger <python(a)rcn.com> date: Mon Jun 23 18:03:21 2014 -0700 summary: Issue #11974: Add tutorial section on class and instance variables (Based on a patch from Renee Chu.) files: Doc/tutorial/classes.rst | 71 ++++++++++++++++++++++++++++ Misc/ACKS | 1 + 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst --- a/Doc/tutorial/classes.rst +++ b/Doc/tutorial/classes.rst @@ -337,6 +337,77 @@ argument list. +.. _tut-class-and-instance-variables: + +Class and Instance Variables +---------------------------- + +Generally speaking, instance variables are for data unique to each instance +and class variables are for attributes and methods shared by all instances +of the class:: + + class Dog: + + kind = 'canine' # class variable shared by all instances + + def __init__(self, name): + self.name = name # instance variable unique to each instance + + >>> d = Dog('Fido') + >>> e = Dog('Buddy') + >>> d.kind # shared by all dogs + 'canine' + >>> e.kind # shared by all dogs + 'canine' + >>> d.name # unique to d + 'Fido' + >>> e.name # unique to e + 'Buddy' + +As discussed in :ref:`tut-object`, shared data can have possibly surprising +effects with involving :term:`mutable` objects such as lists and dictionaries. +For example, the *tricks* list in the following code should not be used as a +class variable because just a single list would be shared by all *Dog* +instances:: + + class Dog: + + tricks = [] # mistaken use of a class variable + + def __init__(self, name): + self.name = name + + def add_trick(self, trick): + self.tricks.append(trick) + + >>> d = Dog('Fido') + >>> e = Dog('Buddy') + >>> d.add_trick('roll over') + >>> e.add_trick('play dead') + >>> d.tricks # unexpectedly shared by all dogs + ['roll over', 'play dead'] + +Correct design of the class should use an instance variable instead:: + + class Dog: + + def __init__(self, name): + self.name = name + self.tricks = [] # creates a new empty list for each dog + + def add_trick(self, trick): + self.tricks.append(trick) + + >>> d = Dog('Fido') + >>> e = Dog('Buddy') + >>> d.add_trick('roll over') + >>> e.add_trick('play dead') + >>> d.tricks + ['roll over'] + >>> e.tricks + ['play dead'] + + .. _tut-remarks: Random Remarks diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -235,6 +235,7 @@ Matt Chisholm Anders Chrigström Tom Christiansen +Renee Chu Vadim Chugunov Mauro Cicognini David Cinege -- Repository URL: http://hg.python.org/cpython

1 0

cpython: inspect: Validate that __signature__ is None or an instance of Signature.
by yury.selivanov 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/fa5b985f0920 changeset: 91349:fa5b985f0920 parent: 91347:3fffe9681f60 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Mon Jun 23 10:23:50 2014 -0700 summary: inspect: Validate that __signature__ is None or an instance of Signature. Closes #21801. files: Lib/inspect.py | 4 ++++ Lib/test/test_inspect.py | 7 +++++++ Misc/NEWS | 3 +++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -1939,6 +1939,10 @@ pass else: if sig is not None: + if not isinstance(sig, Signature): + raise TypeError( + 'unexpected object {!r} in __signature__ ' + 'attribute'.format(sig)) return sig try: diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -3136,6 +3136,13 @@ self.assertEqual(lines[:-1], inspect.getsource(module).splitlines()) self.assertEqual(err, b'') + def test_custom_getattr(self): + def foo(): + pass + foo.__signature__ = 42 + with self.assertRaises(TypeError): + inspect.signature(foo) + @unittest.skipIf(ThreadPoolExecutor is None, 'threads required to test __qualname__ for source files') def test_qualname_source(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -498,6 +498,9 @@ - Issue #11571: Ensure that the turtle window becomes the topmost window when launched on OS X. +- Issue #21801: Validate that __signature__ is None or an instance of Signature. + + Extension Modules ----------------- -- Repository URL: http://hg.python.org/cpython

1 0