Mailman 3 December 2015 - Python-checkins

cpython (3.4): Added tag v3.4.4 for changeset 737efcadf5a6
by larry.hastings 21 Dec '15

21 Dec '15

https://hg.python.org/cpython/rev/39a314d76f2b changeset: 99648:39a314d76f2b branch: 3.4 user: Larry Hastings <larry(a)hastings.org> date: Sat Dec 19 19:31:20 2015 -0800 summary: Added tag v3.4.4 for changeset 737efcadf5a6 files: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -145,3 +145,4 @@ 69dd528ca6255a66c37cc5cf680e8357d108b036 v3.4.3rc1 b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3 04f3f725896c6961212c3a12e8ac25be6958f4fa v3.4.4rc1 +737efcadf5a678b184e0fa431aae11276bf06648 v3.4.4 -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Release bump for Python 3.4.4 final.
by larry.hastings 21 Dec '15

21 Dec '15

https://hg.python.org/cpython/rev/737efcadf5a6 changeset: 99647:737efcadf5a6 branch: 3.4 tag: v3.4.4 user: Larry Hastings <larry(a)hastings.org> date: Sat Dec 19 19:31:10 2015 -0800 summary: Release bump for Python 3.4.4 final. files: Include/patchlevel.h | 6 +++--- Misc/NEWS | 7 +++---- README | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Include/patchlevel.h b/Include/patchlevel.h --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -19,11 +19,11 @@ #define PY_MAJOR_VERSION 3 #define PY_MINOR_VERSION 4 #define PY_MICRO_VERSION 4 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA -#define PY_RELEASE_SERIAL 1 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "3.4.4rc1+" +#define PY_VERSION "3.4.4" /*--end constants--*/ /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -7,12 +7,11 @@ Release date: 2015/12/20 -Core and Builtins ------------------ - -Library +Windows ------- +- Issue #25844: Corrected =/== typo potentially leading to crash in launcher. + What's New in Python 3.4.4rc1? ============================== diff --git a/README b/README --- a/README +++ b/README @@ -1,4 +1,4 @@ -This is Python version 3.4.3 +This is Python version 3.4.4 ============================ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Issue #25766: Special method __bytes__() now works in str subclasses.
by serhiy.storchaka 20 Dec '15

20 Dec '15

https://hg.python.org/cpython/rev/af0b95fb1c19 changeset: 99644:af0b95fb1c19 parent: 99641:72016e8df85a parent: 99643:1e54adef4064 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 20 16:37:21 2015 +0200 summary: Issue #25766: Special method __bytes__() now works in str subclasses. files: Lib/test/test_bytes.py | 6 ++++++ Misc/NEWS | 2 ++ Objects/bytesobject.c | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -793,6 +793,12 @@ def __index__(self): return 42 self.assertEqual(bytes(A()), b'a') + # Issue #25766 + class A(str): + def __bytes__(self): + return b'abc' + self.assertEqual(bytes(A('\u20ac')), b'abc') + self.assertEqual(bytes(A('\u20ac'), 'iso8859-15'), b'\xa4') # Issue #24731 class A: def __bytes__(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,8 @@ Core and Builtins ----------------- +- Issue #25766: Special method __bytes__() now works in str subclasses. + - Issue #25421: __sizeof__ methods of builtin types now use dynamic basic size. This allows sys.getsize() to work correctly with their subclasses with __slots__ defined. diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -3320,11 +3320,11 @@ return PyBytes_FromStringAndSize(NULL, 0); } - if (PyUnicode_Check(x)) { + if (encoding != NULL) { /* Encode via the codec registry */ - if (encoding == NULL) { + if (!PyUnicode_Check(x)) { PyErr_SetString(PyExc_TypeError, - "string argument without an encoding"); + "encoding without a string argument"); return NULL; } new = PyUnicode_AsEncodedString(x, encoding, errors); @@ -3334,10 +3334,11 @@ return new; } - /* If it's not unicode, there can't be encoding or errors */ - if (encoding != NULL || errors != NULL) { + if (errors != NULL) { PyErr_SetString(PyExc_TypeError, - "encoding or errors without a string argument"); + PyUnicode_Check(x) ? + "string argument without an encoding" : + "errors without a string argument"); return NULL; } @@ -3362,6 +3363,11 @@ else if (PyErr_Occurred()) return NULL; + if (PyUnicode_Check(x)) { + PyErr_SetString(PyExc_TypeError, + "string argument without an encoding"); + return NULL; + } /* Is it an integer? */ size = PyNumber_AsSsize_t(x, PyExc_OverflowError); if (size == -1 && PyErr_Occurred()) { -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #25766: Special method __bytes__() now works in str subclasses.
by serhiy.storchaka 20 Dec '15

20 Dec '15

https://hg.python.org/cpython/rev/1e54adef4064 changeset: 99643:1e54adef4064 branch: 3.5 parent: 99640:5895cb9fc8d0 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 20 16:36:34 2015 +0200 summary: Issue #25766: Special method __bytes__() now works in str subclasses. files: Lib/test/test_bytes.py | 6 ++++++ Misc/NEWS | 2 ++ Objects/bytesobject.c | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -779,6 +779,12 @@ def __index__(self): return 42 self.assertEqual(bytes(A()), b'a') + # Issue #25766 + class A(str): + def __bytes__(self): + return b'abc' + self.assertEqual(bytes(A('\u20ac')), b'abc') + self.assertEqual(bytes(A('\u20ac'), 'iso8859-15'), b'\xa4') # Issue #24731 class A: def __bytes__(self): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,8 @@ Core and Builtins ----------------- +- Issue #25766: Special method __bytes__() now works in str subclasses. + - Issue #25421: __sizeof__ methods of builtin types now use dynamic basic size. This allows sys.getsize() to work correctly with their subclasses with __slots__ defined. diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -3175,11 +3175,11 @@ return PyBytes_FromStringAndSize(NULL, 0); } - if (PyUnicode_Check(x)) { + if (encoding != NULL) { /* Encode via the codec registry */ - if (encoding == NULL) { + if (!PyUnicode_Check(x)) { PyErr_SetString(PyExc_TypeError, - "string argument without an encoding"); + "encoding without a string argument"); return NULL; } new = PyUnicode_AsEncodedString(x, encoding, errors); @@ -3189,10 +3189,11 @@ return new; } - /* If it's not unicode, there can't be encoding or errors */ - if (encoding != NULL || errors != NULL) { + if (errors != NULL) { PyErr_SetString(PyExc_TypeError, - "encoding or errors without a string argument"); + PyUnicode_Check(x) ? + "string argument without an encoding" : + "errors without a string argument"); return NULL; } @@ -3217,6 +3218,11 @@ else if (PyErr_Occurred()) return NULL; + if (PyUnicode_Check(x)) { + PyErr_SetString(PyExc_TypeError, + "string argument without an encoding"); + return NULL; + } /* Is it an integer? */ size = PyNumber_AsSsize_t(x, PyExc_OverflowError); if (size == -1 && PyErr_Occurred()) { -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Fixed sizeof tests for dict and type (they were passed by accident).
by serhiy.storchaka 20 Dec '15

20 Dec '15

https://hg.python.org/cpython/rev/72016e8df85a changeset: 99641:72016e8df85a parent: 99639:6e114c4023f5 parent: 99640:5895cb9fc8d0 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 20 11:39:47 2015 +0200 summary: Fixed sizeof tests for dict and type (they were passed by accident). Added tests for dict views iterators. files: Lib/test/test_sys.py | 33 +++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -864,6 +864,7 @@ def test_objecttypes(self): # check all types defined in Objects/ + calcsize = struct.calcsize size = test.support.calcobjsize vsize = test.support.calcvobjsize check = self.check_sizeof @@ -915,17 +916,23 @@ # method-wrapper (descriptor object) check({}.__iter__, size('2P')) # dict - check({}, size('n2P' + '2nPn' + 8*'n2P')) + check({}, size('n2P') + calcsize('2nPn') + 8*calcsize('n2P')) longdict = {1:1, 2:2, 3:3, 4:4, 5:5, 6:6, 7:7, 8:8} - check(longdict, size('n2P' + '2nPn') + 16*struct.calcsize('n2P')) - # dictionary-keyiterator + check(longdict, size('n2P') + calcsize('2nPn') + 16*calcsize('n2P')) + # dictionary-keyview check({}.keys(), size('P')) - # dictionary-valueiterator + # dictionary-valueview check({}.values(), size('P')) - # dictionary-itemiterator + # dictionary-itemview check({}.items(), size('P')) # dictionary iterator check(iter({}), size('P2nPn')) + # dictionary-keyiterator + check(iter({}.keys()), size('P2nPn')) + # dictionary-valueiterator + check(iter({}.values()), size('P2nPn')) + # dictionary-itemiterator + check(iter({}.items()), size('P2nPn')) # dictproxy class C(object): pass check(C.__dict__, size('P')) @@ -1044,8 +1051,8 @@ check(set(sample), s) check(frozenset(sample), s) else: - check(set(sample), s + newsize*struct.calcsize('nP')) - check(frozenset(sample), s + newsize*struct.calcsize('nP')) + check(set(sample), s + newsize*calcsize('nP')) + check(frozenset(sample), s + newsize*calcsize('nP')) # setiterator check(iter(set()), size('P3n')) # slice @@ -1059,11 +1066,15 @@ # static type: PyTypeObject s = vsize('P2n15Pl4Pn9Pn11PIP') check(int, s) - # (PyTypeObject + PyAsyncMethods + PyNumberMethods + PyMappingMethods + - # PySequenceMethods + PyBufferProcs + 4P) - s = vsize('P2n17Pl4Pn9Pn11PIP') + struct.calcsize('34P 3P 3P 10P 2P 4P') + s = vsize('P2n15Pl4Pn9Pn11PIP' # PyTypeObject + '3P' # PyAsyncMethods + '36P' # PyNumberMethods + '3P' # PyMappingMethods + '10P' # PySequenceMethods + '2P' # PyBufferProcs + '4P') # Separate block for PyDictKeysObject with 4 entries - s += struct.calcsize("2nPn") + 4*struct.calcsize("n2P") + s += calcsize("2nPn") + 4*calcsize("n2P") # class class newstyleclass(object): pass check(newstyleclass, s) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Fixed sizeof tests for dict and type (they were passed by accident).
by serhiy.storchaka 20 Dec '15

20 Dec '15

https://hg.python.org/cpython/rev/5895cb9fc8d0 changeset: 99640:5895cb9fc8d0 branch: 3.5 parent: 99638:ad25fdb6c521 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 20 11:39:14 2015 +0200 summary: Fixed sizeof tests for dict and type (they were passed by accident). Added tests for dict views iterators. files: Lib/test/test_sys.py | 33 +++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -864,6 +864,7 @@ def test_objecttypes(self): # check all types defined in Objects/ + calcsize = struct.calcsize size = test.support.calcobjsize vsize = test.support.calcvobjsize check = self.check_sizeof @@ -915,17 +916,23 @@ # method-wrapper (descriptor object) check({}.__iter__, size('2P')) # dict - check({}, size('n2P' + '2nPn' + 8*'n2P')) + check({}, size('n2P') + calcsize('2nPn') + 8*calcsize('n2P')) longdict = {1:1, 2:2, 3:3, 4:4, 5:5, 6:6, 7:7, 8:8} - check(longdict, size('n2P' + '2nPn') + 16*struct.calcsize('n2P')) - # dictionary-keyiterator + check(longdict, size('n2P') + calcsize('2nPn') + 16*calcsize('n2P')) + # dictionary-keyview check({}.keys(), size('P')) - # dictionary-valueiterator + # dictionary-valueview check({}.values(), size('P')) - # dictionary-itemiterator + # dictionary-itemview check({}.items(), size('P')) # dictionary iterator check(iter({}), size('P2nPn')) + # dictionary-keyiterator + check(iter({}.keys()), size('P2nPn')) + # dictionary-valueiterator + check(iter({}.values()), size('P2nPn')) + # dictionary-itemiterator + check(iter({}.items()), size('P2nPn')) # dictproxy class C(object): pass check(C.__dict__, size('P')) @@ -1044,8 +1051,8 @@ check(set(sample), s) check(frozenset(sample), s) else: - check(set(sample), s + newsize*struct.calcsize('nP')) - check(frozenset(sample), s + newsize*struct.calcsize('nP')) + check(set(sample), s + newsize*calcsize('nP')) + check(frozenset(sample), s + newsize*calcsize('nP')) # setiterator check(iter(set()), size('P3n')) # slice @@ -1059,11 +1066,15 @@ # static type: PyTypeObject s = vsize('P2n15Pl4Pn9Pn11PIP') check(int, s) - # (PyTypeObject + PyAsyncMethods + PyNumberMethods + PyMappingMethods + - # PySequenceMethods + PyBufferProcs + 4P) - s = vsize('P2n17Pl4Pn9Pn11PIP') + struct.calcsize('34P 3P 3P 10P 2P 4P') + s = vsize('P2n15Pl4Pn9Pn11PIP' # PyTypeObject + '3P' # PyAsyncMethods + '36P' # PyNumberMethods + '3P' # PyMappingMethods + '10P' # PySequenceMethods + '2P' # PyBufferProcs + '4P') # Separate block for PyDictKeysObject with 4 entries - s += struct.calcsize("2nPn") + 4*struct.calcsize("n2P") + s += calcsize("2nPn") + 4*calcsize("n2P") # class class newstyleclass(object): pass check(newstyleclass, s) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Fixed sizeof tests for dict and type (they were passed by accident).
by serhiy.storchaka 20 Dec '15

20 Dec '15

https://hg.python.org/cpython/rev/b87fe3e4a3d8 changeset: 99642:b87fe3e4a3d8 branch: 2.7 parent: 99637:f3a095ad52fe user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 20 11:40:00 2015 +0200 summary: Fixed sizeof tests for dict and type (they were passed by accident). Added tests for dict views. files: Lib/test/test_sys.py | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -527,6 +527,7 @@ def test_objecttypes(self): # check all types defined in Objects/ + calcsize = struct.calcsize size = test.test_support.calcobjsize vsize = test.test_support.calcvobjsize check = self.check_sizeof @@ -590,9 +591,17 @@ # method-wrapper (descriptor object) check({}.__iter__, size('2P')) # dict - check({}, size('3P2P' + 8*'P2P')) + check({}, size('3P2P') + 8*calcsize('P2P')) x = {1:1, 2:2, 3:3, 4:4, 5:5, 6:6, 7:7, 8:8} - check(x, size('3P2P' + 8*'P2P') + 16*struct.calcsize('P2P')) + check(x, size('3P2P') + 8*calcsize('P2P') + 16*calcsize('P2P')) + # dictionary-keyview + check({}.viewkeys(), size('P')) + # dictionary-valueview + check({}.viewvalues(), size('P')) + # dictionary-itemview + check({}.viewitems(), size('P')) + # dictionary iterator + check(iter({}), size('P2PPP')) # dictionary-keyiterator check({}.iterkeys(), size('P2PPP')) # dictionary-valueiterator @@ -710,16 +719,16 @@ check(set(sample), s) check(frozenset(sample), s) else: - check(set(sample), s + newsize*struct.calcsize('lP')) - check(frozenset(sample), s + newsize*struct.calcsize('lP')) + check(set(sample), s + newsize*calcsize('lP')) + check(frozenset(sample), s + newsize*calcsize('lP')) # setiterator check(iter(set()), size('P3P')) # slice check(slice(1), size('3P')) # str vh = test.test_support._vheader - check('', struct.calcsize(vh + 'lic')) - check('abc', struct.calcsize(vh + 'lic') + 3) + check('', calcsize(vh + 'lic')) + check('abc', calcsize(vh + 'lic') + 3) # super check(super(int), size('3P')) # tuple @@ -728,9 +737,12 @@ # tupleiterator check(iter(()), size('lP')) # type - # (PyTypeObject + PyNumberMethods + PyMappingMethods + - # PySequenceMethods + PyBufferProcs) - s = vsize('P2P15Pl4PP9PP11PI') + struct.calcsize('41P 10P 3P 6P') + s = vsize('P2P15Pl4PP9PP11PI' # PyTypeObject + '39P' # PyNumberMethods + '3P' # PyMappingMethods + '10P' # PySequenceMethods + '6P' # PyBufferProcs + '2P') class newstyleclass(object): pass check(newstyleclass, s) -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (5115f39cc59f): sum=4
by solipsis＠pitrou.net 20 Dec '15

20 Dec '15

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

1 0

cpython (3.5): Don't create non-needed file.
by serhiy.storchaka 20 Dec '15

20 Dec '15

https://hg.python.org/cpython/rev/ad25fdb6c521 changeset: 99638:ad25fdb6c521 branch: 3.5 parent: 99634:a1388dbdd293 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 20 09:37:52 2015 +0200 summary: Don't create non-needed file. files: Lib/test/test_sys.py | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -814,11 +814,6 @@ self.longdigit = sys.int_info.sizeof_digit import _testcapi self.gc_headsize = _testcapi.SIZEOF_PYGC_HEAD - self.file = open(test.support.TESTFN, 'wb') - - def tearDown(self): - self.file.close() - test.support.unlink(test.support.TESTFN) check_sizeof = test.support.check_sizeof -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Create a file in SizeofTest only if needed.
by serhiy.storchaka 20 Dec '15

20 Dec '15

https://hg.python.org/cpython/rev/f3a095ad52fe changeset: 99637:f3a095ad52fe branch: 2.7 parent: 99635:ab97ff838e11 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 20 09:36:55 2015 +0200 summary: Create a file in SizeofTest only if needed. files: Lib/test/test_sys.py | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -484,11 +484,6 @@ self.longdigit = sys.long_info.sizeof_digit import _testcapi self.gc_headsize = _testcapi.SIZEOF_PYGC_HEAD - self.file = open(test.test_support.TESTFN, 'wb') - - def tearDown(self): - self.file.close() - test.test_support.unlink(test.test_support.TESTFN) check_sizeof = test.test_support.check_sizeof @@ -613,7 +608,12 @@ # enumerate check(enumerate([]), size('l3P')) # file - check(self.file, size('4P2i4P3i3P3i')) + f = file(test.test_support.TESTFN, 'wb') + try: + check(f, size('4P2i4P3i3P3i')) + finally: + f.close() + test.test_support.unlink(test.test_support.TESTFN) # float check(float(0), size('d')) # sys.floatinfo @@ -793,7 +793,12 @@ check(_ast.AST(), size('')) # imp.NullImporter import imp - check(imp.NullImporter(self.file.name), size('')) + f = open(test.test_support.TESTFN, 'wb') + try: + check(imp.NullImporter(f.name), size('')) + finally: + f.close() + test.test_support.unlink(test.test_support.TESTFN) try: raise TypeError except TypeError: -- Repository URL: https://hg.python.org/cpython

1 0