Mailman 3 May 2016 - Python-checkins

cpython (merge 3.5 -> default): issue26893: use mro() to examine class heirarchy
by ethan.furman May 1, 2016

May 1, 2016

https://hg.python.org/cpython/rev/7188de6b50ab changeset: 101204:7188de6b50ab parent: 101202:dbdd5bc4df99 parent: 101203:1b6581bae5a1 user: Ethan Furman <ethan(a)stoneleaf.us> date: Sun May 01 10:04:21 2016 -0700 summary: issue26893: use mro() to examine class heirarchy files: Lib/enum.py | 2 +- Lib/test/test_enum.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/Lib/enum.py b/Lib/enum.py --- a/Lib/enum.py +++ b/Lib/enum.py @@ -124,7 +124,7 @@ # save attributes from super classes so we know if we can take # the shortcut of storing members in the class dict - base_attributes = {a for b in bases for a in b.__dict__} + base_attributes = {a for b in enum_class.mro() for a in b.__dict__} # Reverse value->name map for hashable values. enum_class._value2member_map_ = {} diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -1591,6 +1591,19 @@ triple = 3 turkey = 3 + def test_unique_with_name(self): + @unique + class Silly(Enum): + one = 1 + two = 'dos' + name = 3 + @unique + class Sillier(IntEnum): + single = 1 + name = 2 + triple = 3 + value = 4 + expected_help_output_with_docs = """\ Help on class Color in module %s: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): issue26893: use mro() to examine class heirarchy
by ethan.furman May 1, 2016

May 1, 2016

https://hg.python.org/cpython/rev/1b6581bae5a1 changeset: 101203:1b6581bae5a1 branch: 3.5 parent: 101201:41afb83cffac user: Ethan Furman <ethan(a)stoneleaf.us> date: Sun May 01 10:03:53 2016 -0700 summary: issue26893: use mro() to examine class heirarchy files: Lib/enum.py | 2 +- Lib/test/test_enum.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/Lib/enum.py b/Lib/enum.py --- a/Lib/enum.py +++ b/Lib/enum.py @@ -118,7 +118,7 @@ # save attributes from super classes so we know if we can take # the shortcut of storing members in the class dict - base_attributes = {a for b in bases for a in b.__dict__} + base_attributes = {a for b in enum_class.mro() for a in b.__dict__} # Reverse value->name map for hashable values. enum_class._value2member_map_ = {} diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -1568,6 +1568,19 @@ triple = 3 turkey = 3 + def test_unique_with_name(self): + @unique + class Silly(Enum): + one = 1 + two = 'dos' + name = 3 + @unique + class Sillier(IntEnum): + single = 1 + name = 2 + triple = 3 + value = 4 + expected_help_output_with_docs = """\ Help on class Color in module %s: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Issue #26711: Fixed the comparison of plistlib.Data with other types.
by serhiy.storchaka May 1, 2016

May 1, 2016

https://hg.python.org/cpython/rev/dbdd5bc4df99 changeset: 101202:dbdd5bc4df99 parent: 101200:5b2edc905db4 parent: 101201:41afb83cffac user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun May 01 13:36:42 2016 +0300 summary: Issue #26711: Fixed the comparison of plistlib.Data with other types. files: Lib/plistlib.py | 4 ++-- Lib/test/test_plistlib.py | 6 +++--- Misc/NEWS | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Lib/plistlib.py b/Lib/plistlib.py --- a/Lib/plistlib.py +++ b/Lib/plistlib.py @@ -225,10 +225,10 @@ def __eq__(self, other): if isinstance(other, self.__class__): return self.data == other.data - elif isinstance(other, str): + elif isinstance(other, bytes): return self.data == other else: - return id(self) == id(other) + return NotImplemented def __repr__(self): return "%s(%s)" % (self.__class__.__name__, repr(self.data)) diff --git a/Lib/test/test_plistlib.py b/Lib/test/test_plistlib.py --- a/Lib/test/test_plistlib.py +++ b/Lib/test/test_plistlib.py @@ -514,15 +514,15 @@ cur = plistlib.loads(buf) self.assertEqual(cur, out_data) - self.assertNotEqual(cur, in_data) + self.assertEqual(cur, in_data) cur = plistlib.loads(buf, use_builtin_types=False) - self.assertNotEqual(cur, out_data) + self.assertEqual(cur, out_data) self.assertEqual(cur, in_data) with self.assertWarns(DeprecationWarning): cur = plistlib.readPlistFromBytes(buf) - self.assertNotEqual(cur, out_data) + self.assertEqual(cur, out_data) self.assertEqual(cur, in_data) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -256,6 +256,8 @@ Library ------- +- Issue #26711: Fixed the comparison of plistlib.Data with other types. + - Issue #24114: Fix an uninitialized variable in `ctypes.util`. The bug only occurs on SunOS when the ctypes implementation searches -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #26711: Fixed the comparison of plistlib.Data with other types.
by serhiy.storchaka May 1, 2016

May 1, 2016

https://hg.python.org/cpython/rev/41afb83cffac changeset: 101201:41afb83cffac branch: 3.5 parent: 101199:4f5e4155c259 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun May 01 13:36:16 2016 +0300 summary: Issue #26711: Fixed the comparison of plistlib.Data with other types. files: Lib/plistlib.py | 4 ++-- Lib/test/test_plistlib.py | 6 +++--- Misc/NEWS | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Lib/plistlib.py b/Lib/plistlib.py --- a/Lib/plistlib.py +++ b/Lib/plistlib.py @@ -225,10 +225,10 @@ def __eq__(self, other): if isinstance(other, self.__class__): return self.data == other.data - elif isinstance(other, str): + elif isinstance(other, bytes): return self.data == other else: - return id(self) == id(other) + return NotImplemented def __repr__(self): return "%s(%s)" % (self.__class__.__name__, repr(self.data)) diff --git a/Lib/test/test_plistlib.py b/Lib/test/test_plistlib.py --- a/Lib/test/test_plistlib.py +++ b/Lib/test/test_plistlib.py @@ -515,15 +515,15 @@ cur = plistlib.loads(buf) self.assertEqual(cur, out_data) - self.assertNotEqual(cur, in_data) + self.assertEqual(cur, in_data) cur = plistlib.loads(buf, use_builtin_types=False) - self.assertNotEqual(cur, out_data) + self.assertEqual(cur, out_data) self.assertEqual(cur, in_data) with self.assertWarns(DeprecationWarning): cur = plistlib.readPlistFromBytes(buf) - self.assertNotEqual(cur, out_data) + self.assertEqual(cur, out_data) self.assertEqual(cur, in_data) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -107,6 +107,8 @@ Library ------- +- Issue #26711: Fixed the comparison of plistlib.Data with other types. + - Issue #24114: Fix an uninitialized variable in `ctypes.util`. The bug only occurs on SunOS when the ctypes implementation searches -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Fixed declarations of _Py_DumpTraceback() and _Py_DumpTracebackThreads().
by serhiy.storchaka May 1, 2016

May 1, 2016

https://hg.python.org/cpython/rev/4f5e4155c259 changeset: 101199:4f5e4155c259 branch: 3.5 parent: 101197:469bc90e8922 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun May 01 13:06:43 2016 +0300 summary: Fixed declarations of _Py_DumpTraceback() and _Py_DumpTracebackThreads(). files: Include/traceback.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Include/traceback.h b/Include/traceback.h --- a/Include/traceback.h +++ b/Include/traceback.h @@ -48,7 +48,7 @@ This function is signal safe. */ -PyAPI_DATA(void) _Py_DumpTraceback( +PyAPI_FUNC(void) _Py_DumpTraceback( int fd, PyThreadState *tstate); @@ -62,7 +62,7 @@ This function is signal safe. */ -PyAPI_DATA(const char*) _Py_DumpTracebackThreads( +PyAPI_FUNC(const char*) _Py_DumpTracebackThreads( int fd, PyInterpreterState *interp, PyThreadState *current_thread); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Fixed declarations of _Py_DumpTraceback() and _Py_DumpTracebackThreads().
by serhiy.storchaka May 1, 2016

May 1, 2016

https://hg.python.org/cpython/rev/5b2edc905db4 changeset: 101200:5b2edc905db4 parent: 101198:634764b4675c parent: 101199:4f5e4155c259 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun May 01 13:07:14 2016 +0300 summary: Fixed declarations of _Py_DumpTraceback() and _Py_DumpTracebackThreads(). files: Include/traceback.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Include/traceback.h b/Include/traceback.h --- a/Include/traceback.h +++ b/Include/traceback.h @@ -48,7 +48,7 @@ This function is signal safe. */ -PyAPI_DATA(void) _Py_DumpTraceback( +PyAPI_FUNC(void) _Py_DumpTraceback( int fd, PyThreadState *tstate); @@ -75,7 +75,7 @@ This function is signal safe. */ -PyAPI_DATA(const char*) _Py_DumpTracebackThreads( +PyAPI_FUNC(const char*) _Py_DumpTracebackThreads( int fd, PyInterpreterState *interp, PyThreadState *current_tstate); -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (5b5fbce1db9c): sum=11
by solipsis＠pitrou.net May 1, 2016

May 1, 2016

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

1 0

cpython (3.5): Issue #26898: Fix typo in math.isclose() docstring
by berker.peksag May 1, 2016

May 1, 2016

https://hg.python.org/cpython/rev/469bc90e8922 changeset: 101197:469bc90e8922 branch: 3.5 parent: 101195:5871b48f4c2e user: Berker Peksag <berker.peksag(a)gmail.com> date: Sun May 01 11:27:37 2016 +0300 summary: Issue #26898: Fix typo in math.isclose() docstring Patch by Marco Buttu. files: Modules/mathmodule.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -2046,7 +2046,7 @@ } PyDoc_STRVAR(math_isclose_doc, -"is_close(a, b, *, rel_tol=1e-09, abs_tol=0.0) -> bool\n" +"isclose(a, b, *, rel_tol=1e-09, abs_tol=0.0) -> bool\n" "\n" "Determine whether two floating point numbers are close in value.\n" "\n" -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Issue #26898: Fix typo in math.isclose() docstring
by berker.peksag May 1, 2016

May 1, 2016

https://hg.python.org/cpython/rev/634764b4675c changeset: 101198:634764b4675c parent: 101196:94471357db08 parent: 101197:469bc90e8922 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sun May 01 11:27:59 2016 +0300 summary: Issue #26898: Fix typo in math.isclose() docstring Patch by Marco Buttu. files: Modules/mathmodule.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -2046,7 +2046,7 @@ } PyDoc_STRVAR(math_isclose_doc, -"is_close(a, b, *, rel_tol=1e-09, abs_tol=0.0) -> bool\n" +"isclose(a, b, *, rel_tol=1e-09, abs_tol=0.0) -> bool\n" "\n" "Determine whether two floating point numbers are close in value.\n" "\n" -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #23960: Cleanup args and kwargs on error in PyErr_SetImportError
by berker.peksag May 1, 2016

May 1, 2016

https://hg.python.org/cpython/rev/5871b48f4c2e changeset: 101195:5871b48f4c2e branch: 3.5 parent: 101193:db5baad7ad69 user: Berker Peksag <berker.peksag(a)gmail.com> date: Sun May 01 09:06:36 2016 +0300 summary: Issue #23960: Cleanup args and kwargs on error in PyErr_SetImportError Patch by Ofer Schwarz. files: Python/errors.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Python/errors.c b/Python/errors.c --- a/Python/errors.c +++ b/Python/errors.c @@ -727,9 +727,9 @@ PyTuple_SET_ITEM(args, 0, msg); if (PyDict_SetItemString(kwargs, "name", name) < 0) - return NULL; + goto done; if (PyDict_SetItemString(kwargs, "path", path) < 0) - return NULL; + goto done; error = PyObject_Call(PyExc_ImportError, args, kwargs); if (error != NULL) { @@ -737,9 +737,9 @@ Py_DECREF(error); } +done: Py_DECREF(args); Py_DECREF(kwargs); - return NULL; } -- Repository URL: https://hg.python.org/cpython

1 0