Mailman 3 October 2015 - Python-checkins

cpython (merge 3.5 -> default): merge 3.5 (#25515)
by benjamin.peterson Oct. 30, 2015

Oct. 30, 2015

https://hg.python.org/cpython/rev/756d040aa8e8 changeset: 98891:756d040aa8e8 parent: 98888:30b6c3bbefc7 parent: 98890:70be1f9c9255 user: Benjamin Peterson <benjamin(a)python.org> date: Thu Oct 29 20:40:34 2015 -0700 summary: merge 3.5 (#25515) files: Lib/uuid.py | 26 ++++++-------------------- Misc/NEWS | 2 ++ 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Lib/uuid.py b/Lib/uuid.py --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -44,6 +44,8 @@ UUID('00010203-0405-0607-0809-0a0b0c0d0e0f') """ +import os + __author__ = 'Ka-Ping Yee <ping(a)zesty.ca>' RESERVED_NCS, RFC_4122, RESERVED_MICROSOFT, RESERVED_FUTURE = [ @@ -456,7 +458,7 @@ # If ctypes is available, use it to find system routines for UUID generation. # XXX This makes the module non-thread-safe! -_uuid_generate_random = _uuid_generate_time = _UuidCreate = None +_uuid_generate_time = _UuidCreate = None try: import ctypes, ctypes.util import sys @@ -471,12 +473,9 @@ lib = ctypes.CDLL(ctypes.util.find_library(libname)) except Exception: continue - if hasattr(lib, 'uuid_generate_random'): - _uuid_generate_random = lib.uuid_generate_random if hasattr(lib, 'uuid_generate_time'): _uuid_generate_time = lib.uuid_generate_time - if _uuid_generate_random is not None: - break # found everything we were looking for + break del _libnames # The uuid_generate_* functions are broken on MacOS X 10.5, as noted @@ -489,7 +488,7 @@ if sys.platform == 'darwin': import os if int(os.uname().release.split('.')[0]) >= 9: - _uuid_generate_random = _uuid_generate_time = None + _uuid_generate_time = None # On Windows prior to 2000, UuidCreate gives a UUID containing the # hardware address. On Windows 2000 and later, UuidCreate makes a @@ -600,20 +599,7 @@ def uuid4(): """Generate a random UUID.""" - - # When the system provides a version-4 UUID generator, use it. - if _uuid_generate_random: - _buffer = ctypes.create_string_buffer(16) - _uuid_generate_random(_buffer) - return UUID(bytes=bytes_(_buffer.raw)) - - # Otherwise, get randomness from urandom or the 'random' module. - try: - import os - return UUID(bytes=os.urandom(16), version=4) - except Exception: - import random - return UUID(int=random.getrandbits(128), version=4) + return UUID(bytes=os.urandom(16), version=4) def uuid5(namespace, name): """Generate a UUID from the SHA-1 hash of a namespace UUID and a name.""" diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -66,6 +66,8 @@ - Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties. Original patch by John Mark Vandenberg. +- Issue #25515: Always use os.urandom as a source of randomness in uuid.uuid4. + - Issue #21827: Fixed textwrap.dedent() for the case when largest common whitespace is a substring of smallest leading whitespace. Based on patch by Robert Li. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): always use os.urandom for the uuid4 algorithm (closes #25515)
by benjamin.peterson Oct. 30, 2015

Oct. 30, 2015

https://hg.python.org/cpython/rev/70be1f9c9255 changeset: 98890:70be1f9c9255 branch: 3.5 parent: 98887:0e0f3f5195f8 user: Benjamin Peterson <benjamin(a)python.org> date: Thu Oct 29 20:38:04 2015 -0700 summary: always use os.urandom for the uuid4 algorithm (closes #25515) files: Lib/uuid.py | 26 ++++++-------------------- Misc/NEWS | 2 ++ 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Lib/uuid.py b/Lib/uuid.py --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -44,6 +44,8 @@ UUID('00010203-0405-0607-0809-0a0b0c0d0e0f') """ +import os + __author__ = 'Ka-Ping Yee <ping(a)zesty.ca>' RESERVED_NCS, RFC_4122, RESERVED_MICROSOFT, RESERVED_FUTURE = [ @@ -456,7 +458,7 @@ # If ctypes is available, use it to find system routines for UUID generation. # XXX This makes the module non-thread-safe! -_uuid_generate_random = _uuid_generate_time = _UuidCreate = None +_uuid_generate_time = _UuidCreate = None try: import ctypes, ctypes.util import sys @@ -471,12 +473,9 @@ lib = ctypes.CDLL(ctypes.util.find_library(libname)) except Exception: continue - if hasattr(lib, 'uuid_generate_random'): - _uuid_generate_random = lib.uuid_generate_random if hasattr(lib, 'uuid_generate_time'): _uuid_generate_time = lib.uuid_generate_time - if _uuid_generate_random is not None: - break # found everything we were looking for + break del _libnames # The uuid_generate_* functions are broken on MacOS X 10.5, as noted @@ -489,7 +488,7 @@ if sys.platform == 'darwin': import os if int(os.uname().release.split('.')[0]) >= 9: - _uuid_generate_random = _uuid_generate_time = None + _uuid_generate_time = None # On Windows prior to 2000, UuidCreate gives a UUID containing the # hardware address. On Windows 2000 and later, UuidCreate makes a @@ -600,20 +599,7 @@ def uuid4(): """Generate a random UUID.""" - - # When the system provides a version-4 UUID generator, use it. - if _uuid_generate_random: - _buffer = ctypes.create_string_buffer(16) - _uuid_generate_random(_buffer) - return UUID(bytes=bytes_(_buffer.raw)) - - # Otherwise, get randomness from urandom or the 'random' module. - try: - import os - return UUID(bytes=os.urandom(16), version=4) - except Exception: - import random - return UUID(int=random.getrandbits(128), version=4) + return UUID(bytes=os.urandom(16), version=4) def uuid5(namespace, name): """Generate a UUID from the SHA-1 hash of a namespace UUID and a name.""" diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -48,6 +48,8 @@ - Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties. Original patch by John Mark Vandenberg. +- Issue #25515: Always use os.urandom as a source of randomness in uuid.uuid4. + - Issue #21827: Fixed textwrap.dedent() for the case when largest common whitespace is a substring of smallest leading whitespace. Based on patch by Robert Li. -- Repository URL: https://hg.python.org/cpython

1 0

Benchmark Results for Python 2.7 2015-10-29
by lp_benchmark_robot＠intel.com Oct. 29, 2015

Oct. 29, 2015

Results for project Python 2.7, build date 2015-10-29 13:25:31 +0000 commit: c307ae7b3d9fa4f36ba51c3069868ed96a894c07 revision date: 2015-10-28 19:39:36 +0000 environment: Haswell-EP cpu: Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz 2x18 cores, stepping 2, LLC 45 MB mem: 128 GB os: CentOS 7.1 kernel: Linux 3.10.0-229.4.2.el7.x86_64 Baseline results were generated using release v2.7.10, with hash 15c95b7d81dcf821daade360741e00714667653f from 2015-05-23 16:02:14+00:00 ---------------------------------------------------------------------------------- benchmark relative change since change since current rev run std_dev* last run baseline with PGO ---------------------------------------------------------------------------------- :-( django_v2 0.14% -3.01% 1.14% 10.77% :-) pybench 0.19% -0.12% 6.61% 7.14% :-| regex_v8 0.54% 0.05% -1.73% 6.58% :-) nbody 0.45% -0.05% 8.70% 3.36% :-) json_dump_v2 0.27% -0.62% 2.84% 13.84% :-| normal_startup 1.88% -0.29% -1.55% 2.73% :-| ssbench 0.73% -1.78% -1.31% 3.92% ---------------------------------------------------------------------------------- Note: Benchmark results for ssbench are measured in requests/second while all other are measured in seconds. * Relative Standard Deviation (Standard Deviation/Average) Our lab does a nightly source pull and build of the Python project and measures performance changes against the previous stable version and the previous nightly measurement. This is provided as a service to the community so that quality issues with current hardware can be identified quickly. Intel technologies' features and benefits depend on system configuration and may require enabled hardware, software or service activation. Performance varies depending on system configuration.

1 0

Benchmark Results for Python Default 2015-10-29
by lp_benchmark_robot＠intel.com Oct. 29, 2015

Oct. 29, 2015

Results for project Python default, build date 2015-10-29 12:24:59 +0000 commit: 30b6c3bbefc7f520008c724e5d5a14a0fe1f1920 revision date: 2015-10-29 07:53:33 +0000 environment: Haswell-EP cpu: Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz 2x18 cores, stepping 2, LLC 45 MB mem: 128 GB os: CentOS 7.1 kernel: Linux 3.10.0-229.4.2.el7.x86_64 Baseline results were generated using release v3.4.3, with hash b4cbecbc0781e89a309d03b60a1f75f8499250e6 from 2015-02-25 12:15:33+00:00 ---------------------------------------------------------------------------------- benchmark relative change since change since current rev run std_dev* last run baseline with PGO ---------------------------------------------------------------------------------- :-) django_v2 0.25% 1.67% 9.60% 14.50% :-( pybench 0.14% -0.12% -2.43% 9.41% :-( regex_v8 2.80% 1.49% -4.53% 5.98% :-( nbody 0.14% -0.15% -3.51% 11.44% :-( json_dump_v2 0.43% 0.08% -2.01% 8.95% :-| normal_startup 0.95% 0.06% -0.18% 5.47% ---------------------------------------------------------------------------------- Note: Benchmark results are measured in seconds. * Relative Standard Deviation (Standard Deviation/Average) Our lab does a nightly source pull and build of the Python project and measures performance changes against the previous stable version and the previous nightly measurement. This is provided as a service to the community so that quality issues with current hardware can be identified quickly. Intel technologies' features and benefits depend on system configuration and may require enabled hardware, software or service activation. Performance varies depending on system configuration.

1 0

Daily reference leaks (8d3932671e48): sum=61497
by solipsis＠pitrou.net Oct. 29, 2015

Oct. 29, 2015

results for 8d3932671e48 on branch "default" -------------------------------------------- test_asyncio leaked [0, 0, 3] memory blocks, sum=3 test_capi leaked [5411, 5411, 5411] references, sum=16233 test_capi leaked [1421, 1423, 1423] memory blocks, sum=4267 test_functools leaked [0, 2, 2] memory blocks, sum=4 test_threading leaked [10820, 10820, 10820] references, sum=32460 test_threading leaked [2842, 2844, 2844] memory blocks, sum=8530 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogYDVvGE', '--timeout', '7200']

1 0

cpython (3.5): Issue25506: Fixed a copy-pasting error in test_pprint.
by serhiy.storchaka Oct. 29, 2015

Oct. 29, 2015

https://hg.python.org/cpython/rev/0e0f3f5195f8 changeset: 98887:0e0f3f5195f8 branch: 3.5 parent: 98884:d104a663e794 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Oct 29 09:52:20 2015 +0200 summary: Issue25506: Fixed a copy-pasting error in test_pprint. Patch by John Mark Vandenberg. files: Lib/test/test_pprint.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_pprint.py b/Lib/test/test_pprint.py --- a/Lib/test/test_pprint.py +++ b/Lib/test/test_pprint.py @@ -961,7 +961,7 @@ 'quick': 1, 'the': 0}""") - def test_user_dict(self): + def test_user_list(self): d = collections.UserList() self.assertEqual(pprint.pformat(d, width=1), "[]") words = 'the quick brown fox jumped over a lazy dog'.split() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Issue25506: Fixed a copy-pasting error in test_pprint.
by serhiy.storchaka Oct. 29, 2015

Oct. 29, 2015

https://hg.python.org/cpython/rev/30b6c3bbefc7 changeset: 98888:30b6c3bbefc7 parent: 98886:8d2889a935b2 parent: 98887:0e0f3f5195f8 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Oct 29 09:53:33 2015 +0200 summary: Issue25506: Fixed a copy-pasting error in test_pprint. Patch by John Mark Vandenberg. files: Lib/test/test_pprint.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_pprint.py b/Lib/test/test_pprint.py --- a/Lib/test/test_pprint.py +++ b/Lib/test/test_pprint.py @@ -961,7 +961,7 @@ 'quick': 1, 'the': 0}""") - def test_user_dict(self): + def test_user_list(self): d = collections.UserList() self.assertEqual(pprint.pformat(d, width=1), "[]") words = 'the quick brown fox jumped over a lazy dog'.split() -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge default -> default): Merge heads
by serhiy.storchaka Oct. 29, 2015

Oct. 29, 2015

https://hg.python.org/cpython/rev/1ccc3ca98d39 changeset: 98885:1ccc3ca98d39 parent: 98883:e80d1e9737d4 parent: 98881:695c50c8cc92 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Oct 29 08:19:44 2015 +0200 summary: Merge heads files: Lib/getpass.py | 2 +- Lib/pickletools.py | 2 +- Lib/smtplib.py | 2 -- PC/testpy.py | 2 -- Parser/asdl_c.py | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Lib/getpass.py b/Lib/getpass.py --- a/Lib/getpass.py +++ b/Lib/getpass.py @@ -99,7 +99,7 @@ """Prompt for password with echo off, using Windows getch().""" if sys.stdin is not sys.__stdin__: return fallback_getpass(prompt, stream) - import msvcrt + for c in prompt: msvcrt.putwch(c) pw = "" diff --git a/Lib/pickletools.py b/Lib/pickletools.py --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -2794,7 +2794,7 @@ return doctest.testmod() if __name__ == "__main__": - import sys, argparse + import argparse parser = argparse.ArgumentParser( description='disassemble one or more pickle files') parser.add_argument( diff --git a/Lib/smtplib.py b/Lib/smtplib.py --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -1080,8 +1080,6 @@ # Test the sendmail method, which tests most of the others. # Note: This always sends to localhost. if __name__ == '__main__': - import sys - def prompt(prompt): sys.stdout.write(prompt + ": ") sys.stdout.flush() diff --git a/PC/testpy.py b/PC/testpy.py --- a/PC/testpy.py +++ b/PC/testpy.py @@ -18,8 +18,6 @@ a PC, you should add the dos_8x3 directory to your PYTHONPATH.""") sys.exit(1) -import os - for dir in sys.path: file = os.path.join(dir, "os.py") if os.path.isfile(file): diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -1289,7 +1289,6 @@ f.close() if __name__ == "__main__": - import sys import getopt INC_DIR = '' -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Null merge
by serhiy.storchaka Oct. 29, 2015

Oct. 29, 2015

https://hg.python.org/cpython/rev/8d2889a935b2 changeset: 98886:8d2889a935b2 parent: 98885:1ccc3ca98d39 parent: 98884:d104a663e794 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Oct 29 08:19:59 2015 +0200 summary: Null merge files: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties.
by serhiy.storchaka Oct. 29, 2015

Oct. 29, 2015

https://hg.python.org/cpython/rev/bbf00faf25ff changeset: 98882:bbf00faf25ff branch: 3.5 parent: 98878:3f29be82c944 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Thu Oct 29 08:15:50 2015 +0200 summary: Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties. Original patch by John Mark Vandenberg. files: Lib/inspect.py | 13 +++++++------ Lib/test/inspect_fodder.py | 7 ++++++- Lib/test/test_inspect.py | 4 ++-- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -527,17 +527,18 @@ cls = self else: cls = self.__class__ + # Should be tested before isdatadescriptor(). + elif isinstance(obj, property): + func = obj.fget + name = func.__name__ + cls = _findclass(func) + if cls is None or getattr(cls, name) is not obj: + return None elif ismethoddescriptor(obj) or isdatadescriptor(obj): name = obj.__name__ cls = obj.__objclass__ if getattr(cls, name) is not obj: return None - elif isinstance(obj, property): - func = f.fget - name = func.__name__ - cls = _findclass(func) - if cls is None or getattr(cls, name) is not obj: - return None else: return None diff --git a/Lib/test/inspect_fodder.py b/Lib/test/inspect_fodder.py --- a/Lib/test/inspect_fodder.py +++ b/Lib/test/inspect_fodder.py @@ -45,14 +45,17 @@ self.ex = sys.exc_info() self.tr = inspect.trace() + @property def contradiction(self): 'The automatic gainsaying.' pass -# line 48 +# line 53 class MalodorousPervert(StupidGit): def abuse(self, a, b, c): pass + + @property def contradiction(self): pass @@ -64,6 +67,8 @@ class FesteringGob(MalodorousPervert, ParrotDroppings): def abuse(self, a, b, c): pass + + @property def contradiction(self): pass 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 @@ -393,8 +393,8 @@ def test_getsource(self): self.assertSourceEqual(git.abuse, 29, 39) - self.assertSourceEqual(mod.StupidGit, 21, 50) - self.assertSourceEqual(mod.lobbest, 70, 71) + self.assertSourceEqual(mod.StupidGit, 21, 51) + self.assertSourceEqual(mod.lobbest, 75, 76) def test_getsourcefile(self): self.assertEqual(normcase(inspect.getsourcefile(mod.spam)), modfile) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1480,6 +1480,7 @@ Ville Vainio Andi Vajda Case Van Horsen +John Mark Vandenberg Kyle VanderBeek Andrew Vant Atul Varma diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -45,6 +45,9 @@ Library ------- +- Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties. + Original patch by John Mark Vandenberg. + - Issue #21827: Fixed textwrap.dedent() for the case when largest common whitespace is a substring of smallest leading whitespace. Based on patch by Robert Li. -- Repository URL: https://hg.python.org/cpython

1 0