Mailman 3 June 2014 - Python-checkins

cpython (3.4): 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/cc0f5d6ccb70 changeset: 91348:cc0f5d6ccb70 branch: 3.4 parent: 91346:389ef84c2823 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Mon Jun 23 10:21:04 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 | 2 ++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -1912,6 +1912,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 @@ -3048,6 +3048,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 @@ -105,6 +105,8 @@ - Issue #21538: The plistlib module now supports loading of binary plist files when reference or offset size is not a power of two. +- Issue #21801: Validate that __signature__ is None or an instance of Signature. + Build ----- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): (Merge 3.4) asyncio: Fix BaseEventLoop._assert_is_current_event_loop():
by victor.stinner 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/3fffe9681f60 changeset: 91347:3fffe9681f60 parent: 91344:8e3ef955dbc3 parent: 91346:389ef84c2823 user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Jun 23 15:14:50 2014 +0200 summary: (Merge 3.4) asyncio: Fix BaseEventLoop._assert_is_current_event_loop(): get_event_loop() raises an exception if there is no current loop files: Lib/asyncio/base_events.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -332,8 +332,11 @@ Should only be called when (self._debug == True). The caller is responsible for checking this condition for performance reasons. """ - current = events.get_event_loop() - if current is not None and current is not self: + try: + current = events.get_event_loop() + except AssertionError: + return + if current is not self: raise RuntimeError( "non-threadsafe operation invoked on an event loop other " "than the current one") -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): asyncio: Fix BaseEventLoop._assert_is_current_event_loop(): get_event_loop()
by victor.stinner 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/389ef84c2823 changeset: 91346:389ef84c2823 branch: 3.4 parent: 91343:404dcd29b0a6 user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Jun 23 15:14:13 2014 +0200 summary: asyncio: Fix BaseEventLoop._assert_is_current_event_loop(): get_event_loop() raises an exception if there is no current loop files: Lib/asyncio/base_events.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -332,8 +332,11 @@ Should only be called when (self._debug == True). The caller is responsible for checking this condition for performance reasons. """ - current = events.get_event_loop() - if current is not None and current is not self: + try: + current = events.get_event_loop() + except AssertionError: + return + if current is not self: raise RuntimeError( "non-threadsafe operation invoked on an event loop other " "than the current one") -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (81529993f60d): sum=15
by solipsis＠pitrou.net 23 Jun '14

23 Jun '14

results for 81529993f60d on branch "default" -------------------------------------------- test_asyncio leaked [0, 4, 0] memory blocks, sum=4 test_collections leaked [0, -2, 0] references, sum=-2 test_functools leaked [0, 0, 3] memory blocks, sum=3 test_io leaked [2, 2, 2] references, sum=6 test_site leaked [2, -2, 2] references, sum=2 test_site leaked [2, -2, 2] memory blocks, sum=2 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog55imk_', '-x']

1 0

cpython (2.7): adjust zipfile tests for splitdrive improvements
by benjamin.peterson 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/e28004fb30c0 changeset: 91345:e28004fb30c0 branch: 2.7 parent: 91342:b2e5d3a97452 user: Benjamin Peterson <benjamin(a)python.org> date: Sun Jun 22 20:26:07 2014 -0700 summary: adjust zipfile tests for splitdrive improvements files: Lib/test/test_zipfile.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -476,14 +476,14 @@ (r'C:/foo/bar', 'foo/bar'), (r'C://foo/bar', 'foo/bar'), (r'C:\foo\bar', 'foo/bar'), - (r'//conky/mountpoint/foo/bar', 'conky/mountpoint/foo/bar'), - (r'\\conky\mountpoint\foo\bar', 'conky/mountpoint/foo/bar'), + (r'//conky/mountpoint/foo/bar', 'foo/bar'), + (r'\\conky\mountpoint\foo\bar', 'foo/bar'), (r'///conky/mountpoint/foo/bar', 'conky/mountpoint/foo/bar'), (r'\\\conky\mountpoint\foo\bar', 'conky/mountpoint/foo/bar'), (r'//conky//mountpoint/foo/bar', 'conky/mountpoint/foo/bar'), (r'\\conky\\mountpoint\foo\bar', 'conky/mountpoint/foo/bar'), - (r'//?/C:/foo/bar', '_/C_/foo/bar'), - (r'\\?\C:\foo\bar', '_/C_/foo/bar'), + (r'//?/C:/foo/bar', 'foo/bar'), + (r'\\?\C:\foo\bar', 'foo/bar'), (r'C:/../C:/foo/bar', 'C_/foo/bar'), (r'a:b\c<d>e|f"g?h*i', 'b/c_d_e_f_g_h_i'), ('../../foo../../ba..r', 'foo/ba..r'), -- Repository URL: http://hg.python.org/cpython

1 0

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

23 Jun '14

http://hg.python.org/cpython/rev/8e3ef955dbc3 changeset: 91344:8e3ef955dbc3 parent: 91339:81529993f60d parent: 91343:404dcd29b0a6 user: Raymond Hettinger <python(a)rcn.com> date: Sun Jun 22 19:47:55 2014 -0700 summary: merge files: Lib/sre_parse.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -616,7 +616,8 @@ "%r" % name) gid = state.groupdict.get(name) if gid is None: - raise error("unknown group name") + msg = "unknown group name: {0!r}".format(name) + raise error(msg) subpatternappend((GROUPREF, gid)) continue else: @@ -669,7 +670,8 @@ if condname.isidentifier(): condgroup = state.groupdict.get(condname) if condgroup is None: - raise error("unknown group name") + msg = "unknown group name: {0!r}".format(condname) + raise error(msg) else: try: condgroup = int(condname) @@ -806,7 +808,8 @@ try: index = pattern.groupindex[name] except KeyError: - raise IndexError("unknown group name") + msg = "unknown group name: {0!r}".format(name) + raise IndexError(msg) addgroup(index) elif c == "0": if s.next in OCTDIGITS: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.4): Issue #8343: Named group error msgs did not show the group name.
by raymond.hettinger 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/404dcd29b0a6 changeset: 91343:404dcd29b0a6 branch: 3.4 parent: 91338:db7887f3e6a2 user: Raymond Hettinger <python(a)rcn.com> date: Sun Jun 22 19:47:22 2014 -0700 summary: Issue #8343: Named group error msgs did not show the group name. files: Lib/sre_parse.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -616,7 +616,8 @@ "%r" % name) gid = state.groupdict.get(name) if gid is None: - raise error("unknown group name") + msg = "unknown group name: {0!r}".format(name) + raise error(msg) subpatternappend((GROUPREF, gid)) continue else: @@ -669,7 +670,8 @@ if condname.isidentifier(): condgroup = state.groupdict.get(condname) if condgroup is None: - raise error("unknown group name") + msg = "unknown group name: {0!r}".format(condname) + raise error(msg) else: try: condgroup = int(condname) @@ -806,7 +808,8 @@ try: index = pattern.groupindex[name] except KeyError: - raise IndexError("unknown group name") + msg = "unknown group name: {0!r}".format(name) + raise IndexError(msg) addgroup(index) elif c == "0": if s.next in OCTDIGITS: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Display the name not the group itself
by raymond.hettinger 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/b2e5d3a97452 changeset: 91342:b2e5d3a97452 branch: 2.7 user: Raymond Hettinger <python(a)rcn.com> date: Sun Jun 22 19:45:07 2014 -0700 summary: Display the name not the group itself files: Lib/sre_parse.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -621,7 +621,7 @@ if isname(condname): condgroup = state.groupdict.get(condname) if condgroup is None: - msg = "unknown group name: {0!r}".format(condgroup) + msg = "unknown group name: {0!r}".format(condname) raise error(msg) else: try: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #8343: Named group error msgs did not show the group name.
by raymond.hettinger 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/9c7b50a36b42 changeset: 91341:9c7b50a36b42 branch: 2.7 user: Raymond Hettinger <python(a)rcn.com> date: Sun Jun 22 19:33:19 2014 -0700 summary: Issue #8343: Named group error msgs did not show the group name. files: Lib/sre_parse.py | 9 ++++++--- Misc/NEWS | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -567,7 +567,8 @@ "%r" % name) gid = state.groupdict.get(name) if gid is None: - raise error, "unknown group name" + msg = "unknown group name: {0!r}".format(name) + raise error(msg) subpatternappend((GROUPREF, gid)) continue else: @@ -620,7 +621,8 @@ if isname(condname): condgroup = state.groupdict.get(condname) if condgroup is None: - raise error, "unknown group name" + msg = "unknown group name: {0!r}".format(condgroup) + raise error(msg) else: try: condgroup = int(condname) @@ -746,7 +748,8 @@ try: index = pattern.groupindex[name] except KeyError: - raise IndexError, "unknown group name" + msg = "unknown group name: {0!r}".format(name) + raise IndexError(msg) a((MARK, index)) elif c == "0": if s.next in OCTDIGITS: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -31,6 +31,9 @@ - Issue #21672: Fix the behavior of ntpath.join on UNC-style paths. +- Issue #8343: Named group error messages in the re module did not show + the name of the erroneous group. + - Issue #21491: SocketServer: Fix a race condition in child processes reaping. - Issue #21635: The difflib SequenceMatcher.get_matching_blocks() method -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): fix ntpath.join on UNC-style paths by backporting py3k's splitdrive (closes
by benjamin.peterson 23 Jun '14

23 Jun '14

http://hg.python.org/cpython/rev/26ec6248ee8b changeset: 91340:26ec6248ee8b branch: 2.7 parent: 91337:f463387d2434 user: Benjamin Peterson <benjamin(a)python.org> date: Sun Jun 22 19:07:38 2014 -0700 summary: fix ntpath.join on UNC-style paths by backporting py3k's splitdrive (closes #21672) files: Lib/ntpath.py | 47 +++++++++++++++++++++++++--- Lib/test/test_ntpath.py | 32 ++++++++++++++---- Misc/NEWS | 2 + 3 files changed, 68 insertions(+), 13 deletions(-) diff --git a/Lib/ntpath.py b/Lib/ntpath.py --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -82,6 +82,10 @@ if result_path and result_path[-1] not in '\\/': result_path = result_path + '\\' result_path = result_path + p_path + ## add separator between UNC and non-absolute path + if (result_path and result_path[0] not in '\\/' and + result_drive and result_drive[-1:] != ':'): + return result_drive + sep + result_path return result_drive + result_path @@ -89,13 +93,46 @@ # colon) and the path specification. # It is always true that drivespec + pathspec == p def splitdrive(p): - """Split a pathname into drive and path specifiers. Returns a 2-tuple -"(drive,path)"; either part may be empty""" - if p[1:2] == ':': - return p[0:2], p[2:] + """Split a pathname into drive/UNC sharepoint and relative path specifiers. + Returns a 2-tuple (drive_or_unc, path); either part may be empty. + + If you assign + result = splitdrive(p) + It is always true that: + result[0] + result[1] == p + + If the path contained a drive letter, drive_or_unc will contain everything + up to and including the colon. e.g. splitdrive("c:/dir") returns ("c:", "/dir") + + If the path contained a UNC path, the drive_or_unc will contain the host name + and share up to but not including the fourth directory separator character. + e.g. splitdrive("//host/computer/dir") returns ("//host/computer", "/dir") + + Paths cannot contain both a drive letter and a UNC path. + + """ + if len(p) > 1: + normp = p.replace(altsep, sep) + if (normp[0:2] == sep*2) and (normp[2] != sep): + # is a UNC path: + # vvvvvvvvvvvvvvvvvvvv drive letter or UNC path + # \\machine\mountpoint\directory\etc\... + # directory ^^^^^^^^^^^^^^^ + index = normp.find(sep, 2) + if index == -1: + return '', p + index2 = normp.find(sep, index + 1) + # a UNC path can't have two slashes in a row + # (after the initial two) + if index2 == index + 1: + return '', p + if index2 == -1: + index2 = len(p) + return p[:index2], p[index2:] + if normp[1] == ':': + return p[:2], p[2:] return '', p - # Parse UNC paths def splitunc(p): """Split a pathname into UNC mount point and relative path specifiers. diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py --- a/Lib/test/test_ntpath.py +++ b/Lib/test/test_ntpath.py @@ -1,3 +1,4 @@ +# coding: utf-8 import ntpath import os import sys @@ -34,6 +35,21 @@ ('c:', '\\foo\\bar')) tester('ntpath.splitdrive("c:/foo/bar")', ('c:', '/foo/bar')) + tester('ntpath.splitdrive("\\\\conky\\mountpoint\\foo\\bar")', + ('\\\\conky\\mountpoint', '\\foo\\bar')) + tester('ntpath.splitdrive("//conky/mountpoint/foo/bar")', + ('//conky/mountpoint', '/foo/bar')) + tester('ntpath.splitdrive("\\\\\\conky\\mountpoint\\foo\\bar")', + ('', '\\\\\\conky\\mountpoint\\foo\\bar')) + tester('ntpath.splitdrive("///conky/mountpoint/foo/bar")', + ('', '///conky/mountpoint/foo/bar')) + tester('ntpath.splitdrive("\\\\conky\\\\mountpoint\\foo\\bar")', + ('', '\\\\conky\\\\mountpoint\\foo\\bar')) + tester('ntpath.splitdrive("//conky//mountpoint/foo/bar")', + ('', '//conky//mountpoint/foo/bar')) + # Issue #19911: UNC part containing U+0130 + self.assertEqual(ntpath.splitdrive(u'//conky/MOUNTPOİNT/foo/bar'), + (u'//conky/MOUNTPOİNT', '/foo/bar')) def test_splitunc(self): tester('ntpath.splitunc("c:\\foo\\bar")', @@ -62,10 +78,10 @@ tester('ntpath.split("c:\\")', ('c:\\', '')) tester('ntpath.split("\\\\conky\\mountpoint\\")', - ('\\\\conky\\mountpoint', '')) + ('\\\\conky\\mountpoint\\', '')) tester('ntpath.split("c:/")', ('c:/', '')) - tester('ntpath.split("//conky/mountpoint/")', ('//conky/mountpoint', '')) + tester('ntpath.split("//conky/mountpoint/")', ('//conky/mountpoint/', '')) def test_isabs(self): tester('ntpath.isabs("c:\\")', 1) @@ -114,9 +130,9 @@ tester("ntpath.join('c:/', 'x/y')", 'c:/x/y') tester("ntpath.join('c:/a/b', 'x/y')", 'c:/a/b\\x/y') tester("ntpath.join('c:/a/b/', 'x/y')", 'c:/a/b/x/y') - #tester("ntpath.join('//computer/share', 'x/y')", '//computer/share\\x/y') - #tester("ntpath.join('//computer/share/', 'x/y')", '//computer/share/x/y') - #tester("ntpath.join('//computer/share/a/b', 'x/y')", '//computer/share/a/b\\x/y') + tester("ntpath.join('//computer/share', 'x/y')", '//computer/share\\x/y') + tester("ntpath.join('//computer/share/', 'x/y')", '//computer/share/x/y') + tester("ntpath.join('//computer/share/a/b', 'x/y')", '//computer/share/a/b\\x/y') tester("ntpath.join('a/b', '/x/y')", '/x/y') tester("ntpath.join('/a/b', '/x/y')", '/x/y') @@ -124,9 +140,9 @@ tester("ntpath.join('c:a/b', '/x/y')", 'c:/x/y') tester("ntpath.join('c:/', '/x/y')", 'c:/x/y') tester("ntpath.join('c:/a/b', '/x/y')", 'c:/x/y') - #tester("ntpath.join('//computer/share', '/x/y')", '//computer/share/x/y') - #tester("ntpath.join('//computer/share/', '/x/y')", '//computer/share/x/y') - #tester("ntpath.join('//computer/share/a', '/x/y')", '//computer/share/x/y') + tester("ntpath.join('//computer/share', '/x/y')", '//computer/share/x/y') + tester("ntpath.join('//computer/share/', '/x/y')", '//computer/share/x/y') + tester("ntpath.join('//computer/share/a', '/x/y')", '//computer/share/x/y') tester("ntpath.join('c:', 'C:x/y')", 'C:x/y') tester("ntpath.join('c:a/b', 'C:x/y')", 'C:a/b\\x/y') diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -29,6 +29,8 @@ Library ------- +- Issue #21672: Fix the behavior of ntpath.join on UNC-style paths. + - Issue #21491: SocketServer: Fix a race condition in child processes reaping. - Issue #21635: The difflib SequenceMatcher.get_matching_blocks() method -- Repository URL: http://hg.python.org/cpython

1 0