Mailman 3 October 2015 - Python-checkins

Daily reference leaks (2de616269f0e): sum=17880
by solipsis＠pitrou.net Oct. 30, 2015

Oct. 30, 2015

results for 2de616269f0e on branch "default" -------------------------------------------- test_capi leaked [1599, 1599, 1599] references, sum=4797 test_capi leaked [387, 389, 389] memory blocks, sum=1165 test_functools leaked [0, 2, 2] memory blocks, sum=4 test_threading leaked [3196, 3196, 3196] references, sum=9588 test_threading leaked [774, 776, 776] memory blocks, sum=2326 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogaRpZE5', '--timeout', '7200']

1 0

cpython (merge 3.5 -> default): Merge with 3.5
by terry.reedy Oct. 30, 2015

Oct. 30, 2015

https://hg.python.org/cpython/rev/282f8322fc1b changeset: 98899:282f8322fc1b parent: 98895:2de616269f0e parent: 98898:c548ad75160c user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Fri Oct 30 02:47:48 2015 -0400 summary: Merge with 3.5 files: Lib/idlelib/IOBinding.py | 14 ++++++++------ Lib/idlelib/idle_test/htest.py | 8 +++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py --- a/Lib/idlelib/IOBinding.py +++ b/Lib/idlelib/IOBinding.py @@ -1,17 +1,16 @@ +import codecs +from codecs import BOM_UTF8 import os +import re import shlex import sys -import codecs import tempfile + import tkinter.filedialog as tkFileDialog import tkinter.messagebox as tkMessageBox -import re -from tkinter import * from tkinter.simpledialog import askstring -from idlelib.configHandler import idleConf -from codecs import BOM_UTF8 # Try setting the locale, so that we can find out # what encoding to use @@ -525,7 +524,10 @@ self.editwin.update_recent_files_list(filename) def _io_binding(parent): # htest # - root = Tk() + from tkinter import Toplevel, Text + from idlelib.configHandler import idleConf + + root = Toplevel(parent) root.title("Test IOBinding") width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) root.geometry("+%d+%d"%(x, y + 150)) diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py --- a/Lib/idlelib/idle_test/htest.py +++ b/Lib/idlelib/idle_test/htest.py @@ -189,9 +189,11 @@ _io_binding_spec = { 'file': 'IOBinding', 'kwds': {}, - 'msg': "Test the following bindings\n" - "<Control-o> to display open window from file dialog.\n" - "<Control-s> to save the file\n" + 'msg': "Test the following bindings.\n" + "<Control-o> to open file from dialog.\n" + "Edit the file.\n" + "<Control-s> to save the file.\n" + "Check that changes were saved by opening the file elsewhere." } _multi_call_spec = { -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #25507: move test-specific imports to test function (idlelib.IOBinding).
by terry.reedy Oct. 30, 2015

Oct. 30, 2015

https://hg.python.org/cpython/rev/a37ea1d56e98 changeset: 98896:a37ea1d56e98 branch: 2.7 parent: 98892:31fd613a40aa user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Fri Oct 30 02:47:01 2015 -0400 summary: Issue #25507: move test-specific imports to test function (idlelib.IOBinding). files: Lib/idlelib/IOBinding.py | 18 ++++++++++-------- Lib/idlelib/idle_test/htest.py | 8 +++++--- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py --- a/Lib/idlelib/IOBinding.py +++ b/Lib/idlelib/IOBinding.py @@ -5,21 +5,18 @@ # end-of-line conventions, instead of relying on the standard library, # which will only understand the local convention. +import codecs +from codecs import BOM_UTF8 import os import pipes +import re import sys -import codecs import tempfile + import tkFileDialog import tkMessageBox -import re -from Tkinter import * from SimpleDialog import SimpleDialog -from idlelib.configHandler import idleConf - -from codecs import BOM_UTF8 - # Try setting the locale, so that we can find out # what encoding to use try: @@ -567,8 +564,12 @@ "Update recent file list on all editor windows" self.editwin.update_recent_files_list(filename) + def _io_binding(parent): # htest # - root = Tk() + from Tkinter import Toplevel, Text + from idlelib.configHandler import idleConf + + root = Toplevel(parent) root.title("Test IOBinding") width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) root.geometry("+%d+%d"%(x, y + 150)) @@ -585,6 +586,7 @@ self.text.event_generate("<<open-window-from-file>>") def save(self, event): self.text.event_generate("<<save-window>>") + def update_recent_files_list(s, f): pass text = Text(root) text.pack() diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py --- a/Lib/idlelib/idle_test/htest.py +++ b/Lib/idlelib/idle_test/htest.py @@ -189,9 +189,11 @@ _io_binding_spec = { 'file': 'IOBinding', 'kwds': {}, - 'msg': "Test the following bindings\n" - "<Control-o> to display open window from file dialog.\n" - "<Control-s> to save the file\n" + 'msg': "Test the following bindings.\n" + "<Control-o> to open file from dialog.\n" + "Edit the file.\n" + "<Control-s> to save the file.\n" + "Check that changes were saved by opening the file elsewhere." } _multi_call_spec = { -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> 3.5): Merge with 3.4
by terry.reedy Oct. 30, 2015

Oct. 30, 2015

https://hg.python.org/cpython/rev/c548ad75160c changeset: 98898:c548ad75160c branch: 3.5 parent: 98894:e6ab376f575e parent: 98897:38b6b7253ba1 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Fri Oct 30 02:47:33 2015 -0400 summary: Merge with 3.4 files: Lib/idlelib/IOBinding.py | 14 ++++++++------ Lib/idlelib/idle_test/htest.py | 8 +++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py --- a/Lib/idlelib/IOBinding.py +++ b/Lib/idlelib/IOBinding.py @@ -1,17 +1,16 @@ +import codecs +from codecs import BOM_UTF8 import os +import re import shlex import sys -import codecs import tempfile + import tkinter.filedialog as tkFileDialog import tkinter.messagebox as tkMessageBox -import re -from tkinter import * from tkinter.simpledialog import askstring -from idlelib.configHandler import idleConf -from codecs import BOM_UTF8 # Try setting the locale, so that we can find out # what encoding to use @@ -525,7 +524,10 @@ self.editwin.update_recent_files_list(filename) def _io_binding(parent): # htest # - root = Tk() + from tkinter import Toplevel, Text + from idlelib.configHandler import idleConf + + root = Toplevel(parent) root.title("Test IOBinding") width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) root.geometry("+%d+%d"%(x, y + 150)) diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py --- a/Lib/idlelib/idle_test/htest.py +++ b/Lib/idlelib/idle_test/htest.py @@ -189,9 +189,11 @@ _io_binding_spec = { 'file': 'IOBinding', 'kwds': {}, - 'msg': "Test the following bindings\n" - "<Control-o> to display open window from file dialog.\n" - "<Control-s> to save the file\n" + 'msg': "Test the following bindings.\n" + "<Control-o> to open file from dialog.\n" + "Edit the file.\n" + "<Control-s> to save the file.\n" + "Check that changes were saved by opening the file elsewhere." } _multi_call_spec = { -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Issue #25507: move test-specific imports to test function (idlelib.IOBinding).
by terry.reedy Oct. 30, 2015

Oct. 30, 2015

https://hg.python.org/cpython/rev/38b6b7253ba1 changeset: 98897:38b6b7253ba1 branch: 3.4 parent: 98893:114fb81a08e3 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Fri Oct 30 02:47:06 2015 -0400 summary: Issue #25507: move test-specific imports to test function (idlelib.IOBinding). files: Lib/idlelib/IOBinding.py | 14 ++++++++------ Lib/idlelib/idle_test/htest.py | 8 +++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py --- a/Lib/idlelib/IOBinding.py +++ b/Lib/idlelib/IOBinding.py @@ -1,17 +1,16 @@ +import codecs +from codecs import BOM_UTF8 import os +import re import shlex import sys -import codecs import tempfile + import tkinter.filedialog as tkFileDialog import tkinter.messagebox as tkMessageBox -import re -from tkinter import * from tkinter.simpledialog import askstring -from idlelib.configHandler import idleConf -from codecs import BOM_UTF8 # Try setting the locale, so that we can find out # what encoding to use @@ -525,7 +524,10 @@ self.editwin.update_recent_files_list(filename) def _io_binding(parent): # htest # - root = Tk() + from tkinter import Toplevel, Text + from idlelib.configHandler import idleConf + + root = Toplevel(parent) root.title("Test IOBinding") width, height, x, y = list(map(int, re.split('[x+]', parent.geometry()))) root.geometry("+%d+%d"%(x, y + 150)) diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py --- a/Lib/idlelib/idle_test/htest.py +++ b/Lib/idlelib/idle_test/htest.py @@ -189,9 +189,11 @@ _io_binding_spec = { 'file': 'IOBinding', 'kwds': {}, - 'msg': "Test the following bindings\n" - "<Control-o> to display open window from file dialog.\n" - "<Control-s> to save the file\n" + 'msg': "Test the following bindings.\n" + "<Control-o> to open file from dialog.\n" + "Edit the file.\n" + "<Control-s> to save the file.\n" + "Check that changes were saved by opening the file elsewhere." } _multi_call_spec = { -- Repository URL: https://hg.python.org/cpython

1 0

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

Oct. 30, 2015

https://hg.python.org/cpython/rev/2de616269f0e changeset: 98895:2de616269f0e parent: 98891:756d040aa8e8 parent: 98894:e6ab376f575e user: Benjamin Peterson <benjamin(a)python.org> date: Thu Oct 29 21:11:29 2015 -0700 summary: merge 3.5 (#25504) files: Tools/freeze/checkextensions_win32.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Tools/freeze/checkextensions_win32.py b/Tools/freeze/checkextensions_win32.py --- a/Tools/freeze/checkextensions_win32.py +++ b/Tools/freeze/checkextensions_win32.py @@ -118,7 +118,7 @@ for exc in exclude: if exc in module.sourceFiles: - modules.sourceFiles.remove(exc) + module.sourceFiles.remove(exc) return module -- Repository URL: https://hg.python.org/cpython

1 0

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

Oct. 30, 2015

https://hg.python.org/cpython/rev/e6ab376f575e changeset: 98894:e6ab376f575e branch: 3.5 parent: 98890:70be1f9c9255 parent: 98893:114fb81a08e3 user: Benjamin Peterson <benjamin(a)python.org> date: Thu Oct 29 21:11:22 2015 -0700 summary: merge 3.4 (#25504) files: Tools/freeze/checkextensions_win32.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Tools/freeze/checkextensions_win32.py b/Tools/freeze/checkextensions_win32.py --- a/Tools/freeze/checkextensions_win32.py +++ b/Tools/freeze/checkextensions_win32.py @@ -118,7 +118,7 @@ for exc in exclude: if exc in module.sourceFiles: - modules.sourceFiles.remove(exc) + module.sourceFiles.remove(exc) return module -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): fix usage of undefined name (#25504)
by benjamin.peterson Oct. 30, 2015

Oct. 30, 2015

https://hg.python.org/cpython/rev/31fd613a40aa changeset: 98892:31fd613a40aa branch: 2.7 parent: 98889:24bdc4940e81 user: Benjamin Peterson <benjamin(a)python.org> date: Thu Oct 29 21:10:57 2015 -0700 summary: fix usage of undefined name (#25504) files: Tools/freeze/checkextensions_win32.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Tools/freeze/checkextensions_win32.py b/Tools/freeze/checkextensions_win32.py --- a/Tools/freeze/checkextensions_win32.py +++ b/Tools/freeze/checkextensions_win32.py @@ -118,7 +118,7 @@ for exc in exclude: if exc in module.sourceFiles: - modules.sourceFiles.remove(exc) + module.sourceFiles.remove(exc) return module -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): fix usage of undefined name (#25504)
by benjamin.peterson Oct. 30, 2015

Oct. 30, 2015

https://hg.python.org/cpython/rev/114fb81a08e3 changeset: 98893:114fb81a08e3 branch: 3.4 parent: 98876:faeeb8dbe432 user: Benjamin Peterson <benjamin(a)python.org> date: Thu Oct 29 21:10:57 2015 -0700 summary: fix usage of undefined name (#25504) files: Tools/freeze/checkextensions_win32.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Tools/freeze/checkextensions_win32.py b/Tools/freeze/checkextensions_win32.py --- a/Tools/freeze/checkextensions_win32.py +++ b/Tools/freeze/checkextensions_win32.py @@ -118,7 +118,7 @@ for exc in exclude: if exc in module.sourceFiles: - modules.sourceFiles.remove(exc) + module.sourceFiles.remove(exc) return module -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): 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/24bdc4940e81 changeset: 98889:24bdc4940e81 branch: 2.7 parent: 98877:c307ae7b3d9f 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 | 27 ++++++--------------------- Misc/NEWS | 2 ++ 2 files changed, 8 insertions(+), 21 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 = [ @@ -438,7 +440,7 @@ # Thanks to Thomas Heller for ctypes and for his help with its use here. # If ctypes is available, use it to find system routines for UUID generation. -_uuid_generate_random = _uuid_generate_time = _UuidCreate = None +_uuid_generate_time = _UuidCreate = None try: import ctypes, ctypes.util import sys @@ -453,12 +455,9 @@ lib = ctypes.CDLL(ctypes.util.find_library(libname)) except: 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 @@ -471,7 +470,7 @@ if sys.platform == 'darwin': import os if int(os.uname()[2].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 @@ -582,21 +581,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=_buffer.raw) - - # Otherwise, get randomness from urandom or the 'random' module. - try: - import os - return UUID(bytes=os.urandom(16), version=4) - except: - import random - bytes = [chr(random.randrange(256)) for i in range(16)] - return UUID(bytes=bytes, 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 @@ -46,6 +46,8 @@ Library ------- +- 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