Mailman 3 January 2014 - Python-checkins

cpython (2.7): Remove inaccurate comment and a the related recently added
by gregory.p.smith 27 Jan '14

27 Jan '14

http://hg.python.org/cpython/rev/f9c54ada1b32 changeset: 88790:f9c54ada1b32 branch: 2.7 user: Gregory P. Smith <greg(a)krypto.org> date: Mon Jan 27 22:43:25 2014 -0800 summary: Remove inaccurate comment and a the related recently added Py_VerboseFlag print that can never be triggered. prefix[0] is always equal to 0 at this point in the code. files: Modules/zipimport.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/Modules/zipimport.c b/Modules/zipimport.c --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -134,13 +134,6 @@ } if (path != NULL) { PyObject *files; - if (Py_VerboseFlag && prefix && prefix[0] != '\0') - PySys_WriteStderr("# zipimport: prefix=%s constructing a " - "zipimporter for %s\n", prefix, path); - /* NOTE(gps): test_zipimport.py never exercises a case where - * prefix is non-empty. When would that ever be possible? - * Are we missing coverage or is prefix simply never needed? - */ files = PyDict_GetItemString(zip_directory_cache, path); if (files == NULL) { PyObject *zip_stat = NULL; -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Refactor the new test for issue19081 to exec import statements into a
by gregory.p.smith 27 Jan '14

27 Jan '14

http://hg.python.org/cpython/rev/d140e3f41796 changeset: 88789:d140e3f41796 branch: 2.7 parent: 88779:6b314f5c9404 user: Gregory P. Smith <greg(a)krypto.org> date: Mon Jan 27 22:06:51 2014 -0800 summary: Refactor the new test for issue19081 to exec import statements into a test_ns dict instead of the actual globals() and locals(). Suggested after review by Thomas Wouters. files: Lib/test/test_zipimport.py | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py --- a/Lib/test/test_zipimport.py +++ b/Lib/test/test_zipimport.py @@ -469,7 +469,7 @@ with self.assertRaises(ImportError): from ziptest_a import test_value with self.assertRaises(ImportError): - exec("from {} import {}".format(TESTPACK, TESTMOD)) + exec("from {} import {}".format(TESTPACK, TESTMOD), {}) # Alters all of the offsets within the file self.restoreZipFileWithDifferentHeaderOffsets() @@ -479,10 +479,12 @@ # new file's end of file central index and be able to import again. # Importing a submodule triggers a different import code path. - exec("import " + self.testpack_testmod) - self.assertEqual(getattr(locals()[TESTPACK], TESTMOD).test_value, 38) - exec("from {} import {}".format(TESTPACK, TESTMOD)) - self.assertEqual(locals()[TESTMOD].test_value, 38) + test_ns = {} + exec("import " + self.testpack_testmod, test_ns) + self.assertEqual(getattr(test_ns[TESTPACK], TESTMOD).test_value, 38) + test_ns = {} + exec("from {} import {}".format(TESTPACK, TESTMOD), test_ns) + self.assertEqual(test_ns[TESTMOD].test_value, 38) ziptest_a = __import__("ziptest_a", globals(), locals(), ["test_value"]) self.assertEqual(ziptest_a.test_value, 23) @@ -498,8 +500,9 @@ testmod = __import__(TESTMOD, globals(), locals(), ["test_value"]) self.assertEqual(testmod.test_value, 38) del sys.modules[TESTMOD] - exec("from {} import test_value".format(TESTMOD)) - self.assertEqual(test_value, 38) + test_ns = {} + exec("from {} import test_value".format(TESTMOD), test_ns) + self.assertEqual(test_ns["test_value"], 38) del sys.modules[TESTMOD] # Confirm that imports from the top level of the zip file @@ -516,7 +519,7 @@ with self.assertRaises(ImportError): testmod = __import__(TESTMOD, globals(), locals(), ["test_value"]) with self.assertRaises(ImportError): - exec("from {} import test_value".format(TESTMOD)) + exec("from {} import test_value".format(TESTMOD), {}) with self.assertRaises(ImportError): import ziptest_a @@ -525,8 +528,9 @@ testmod = __import__(TESTMOD, globals(), locals(), ["test_value"]) self.assertEqual(testmod.test_value, 38) del sys.modules[TESTMOD] - exec("from {} import test_value".format(TESTMOD)) - self.assertEqual(test_value, 38) + test_ns = {} + exec("from {} import test_value".format(TESTMOD), test_ns) + self.assertEqual(test_ns['test_value'], 38) ziptest_a = __import__("ziptest_a", globals(), locals(), ["test_value"]) self.assertEqual(ziptest_a.test_value, 23) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix doc reference to OS X 10.9 Mavericks.
by ned.deily 27 Jan '14

27 Jan '14

http://hg.python.org/cpython/rev/6b37e6aff9ef changeset: 88788:6b37e6aff9ef user: Ned Deily <nad(a)acm.org> date: Mon Jan 27 19:03:07 2014 -0700 summary: Fix doc reference to OS X 10.9 Mavericks. files: Doc/library/asyncio-eventloop.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -294,7 +294,7 @@ .. note:: - On Mac OS X older than Maverick (10.9), :class:`selectors.KqueueSelector` + On Mac OS X older than 10.9 (Mavericks), :class:`selectors.KqueueSelector` does not support character devices like PTY, whereas it is used by the default event loop. The :class:`SelectorEventLoop` can be used with :class:`SelectSelector` to handle character devices. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: asyncio doc: list Windows and Mac OS X limitations and explain how to work
by victor.stinner 27 Jan '14

27 Jan '14

http://hg.python.org/cpython/rev/403565c0e5de changeset: 88787:403565c0e5de user: Victor Stinner <victor.stinner(a)gmail.com> date: Tue Jan 28 02:24:22 2014 +0100 summary: asyncio doc: list Windows and Mac OS X limitations and explain how to work around them files: Doc/library/asyncio-eventloop.rst | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -286,6 +286,19 @@ Run subprocesses asynchronously using the :mod:`subprocess` module. +.. note:: + + On Windows, the default event loop uses + :class:`selectors.SelectSelector` which only supports sockets. The + :class:`ProactorEventLoop` should be used instead. + +.. note:: + + On Mac OS X older than Maverick (10.9), :class:`selectors.KqueueSelector` + does not support character devices like PTY, whereas it is used by the + default event loop. The :class:`SelectorEventLoop` can be used with + :class:`SelectSelector` to handle character devices. + .. method:: BaseEventLoop.subprocess_exec(protocol_factory, \*args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=False, shell=False, bufsize=0, \*\*kwargs) XXX @@ -294,8 +307,6 @@ See the constructor of the :class:`subprocess.Popen` class for parameters. - Availability: Unix. - .. method:: BaseEventLoop.subprocess_shell(protocol_factory, cmd, \*, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=False, shell=True, bufsize=0, \*\*kwargs) XXX @@ -304,8 +315,6 @@ See the constructor of the :class:`subprocess.Popen` class for parameters. - Availability: Unix. - .. method:: BaseEventLoop.connect_read_pipe(protocol_factory, pipe) Register read pipe in eventloop. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: NEWS: Add few missing news items
by yury.selivanov 27 Jan '14

27 Jan '14

http://hg.python.org/cpython/rev/6f8d79ceb758 changeset: 88786:6f8d79ceb758 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Mon Jan 27 19:40:07 2014 -0500 summary: NEWS: Add few missing news items files: Misc/NEWS | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,16 @@ - Issue #20308: inspect.signature now works on classes without user-defined __init__ or __new__ methods. +- Issue #20372: inspect.getfile (and a bunch of other inspect functions that + use it) doesn't crash with unexpected AttributeError on classes defined in C + without __module__. + +- Issue #20356: inspect.signature formatting uses '/' to separate + positional-only parameters from others. + +- Issue #20223: inspect.signature now supports methods defined with + functools.partialmethods. + What's New in Python 3.4.0 Beta 3? ================================== -- Repository URL: http://hg.python.org/cpython

1 0

cpython: inspect.signature: Support classes without user-defined __init__/__new__ #20308
by yury.selivanov 27 Jan '14

27 Jan '14

http://hg.python.org/cpython/rev/b9ca2019bcb9 changeset: 88785:b9ca2019bcb9 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Mon Jan 27 19:29:45 2014 -0500 summary: inspect.signature: Support classes without user-defined __init__/__new__ #20308 files: Lib/inspect.py | 11 +++++++++++ Lib/test/test_inspect.py | 14 ++++++++++++++ Misc/NEWS | 3 +++ 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -1561,6 +1561,17 @@ init = _get_user_defined_method(obj, '__init__') if init is not None: sig = signature(init) + + if sig is None: + if type in obj.__mro__: + # 'obj' is a metaclass without user-defined __init__ + # or __new__. Return a signature of 'type' builtin. + return signature(type) + else: + # We have a class (not metaclass), but no user-defined + # __init__ or __new__ for it + return signature(object) + elif not isinstance(obj, _NonUserDefinedCallables): # An object with __call__ # We also check that the 'obj' is not an instance of 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 @@ -2045,6 +2045,20 @@ ('bar', 2, ..., "keyword_only")), ...)) + # Test classes without user-defined __init__ or __new__ + class C: pass + self.assertEqual(str(inspect.signature(C)), '()') + class D(C): pass + self.assertEqual(str(inspect.signature(D)), '()') + + # Test meta-classes without user-defined __init__ or __new__ + class C(type): pass + self.assertEqual(str(inspect.signature(C)), + '(object_or_name, bases, dict)') + class D(C): pass + self.assertEqual(str(inspect.signature(D)), + '(object_or_name, bases, dict)') + def test_signature_on_callable_objects(self): class Foo: def __call__(self, a): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,9 @@ Library ------- +- Issue #20308: inspect.signature now works on classes without user-defined + __init__ or __new__ methods. + What's New in Python 3.4.0 Beta 3? ================================== -- Repository URL: http://hg.python.org/cpython

1 0

cpython: asyncio: remove temporary aliases
by victor.stinner 27 Jan '14

27 Jan '14

http://hg.python.org/cpython/rev/a0ecf4155087 changeset: 88784:a0ecf4155087 user: Victor Stinner <victor.stinner(a)gmail.com> date: Tue Jan 28 00:09:24 2014 +0100 summary: asyncio: remove temporary aliases files: Lib/asyncio/queues.py | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py --- a/Lib/asyncio/queues.py +++ b/Lib/asyncio/queues.py @@ -22,12 +22,6 @@ pass -# Un-exported aliases for temporary backward compatibility. -# Will disappear soon. -Full = QueueFull -Empty = QueueEmpty - - class Queue: """A queue, useful for coordinating producer and consumer coroutines. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: inspect.signature: Add support for 'functools.partialmethod' #20223
by yury.selivanov 27 Jan '14

27 Jan '14

http://hg.python.org/cpython/rev/baedc256999a changeset: 88783:baedc256999a user: Yury Selivanov <yselivanov(a)sprymix.com> date: Mon Jan 27 17:28:37 2014 -0500 summary: inspect.signature: Add support for 'functools.partialmethod' #20223 files: Lib/functools.py | 1 + Lib/inspect.py | 107 ++++++++++++++++---------- Lib/test/test_inspect.py | 27 ++++++ 3 files changed, 95 insertions(+), 40 deletions(-) diff --git a/Lib/functools.py b/Lib/functools.py --- a/Lib/functools.py +++ b/Lib/functools.py @@ -290,6 +290,7 @@ call_args = (cls_or_self,) + self.args + tuple(rest) return self.func(*call_args, **call_keywords) _method.__isabstractmethod__ = self.__isabstractmethod__ + _method._partialmethod = self return _method def __get__(self, obj, cls): diff --git a/Lib/inspect.py b/Lib/inspect.py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -1440,6 +1440,51 @@ return meth +def _get_partial_signature(wrapped_sig, partial, extra_args=()): + new_params = OrderedDict(wrapped_sig.parameters.items()) + + partial_args = partial.args or () + partial_keywords = partial.keywords or {} + + if extra_args: + partial_args = extra_args + partial_args + + try: + ba = wrapped_sig.bind_partial(*partial_args, **partial_keywords) + except TypeError as ex: + msg = 'partial object {!r} has incorrect arguments'.format(partial) + raise ValueError(msg) from ex + + for arg_name, arg_value in ba.arguments.items(): + param = new_params[arg_name] + if arg_name in partial_keywords: + # We set a new default value, because the following code + # is correct: + # + # >>> def foo(a): print(a) + # >>> print(partial(partial(foo, a=10), a=20)()) + # 20 + # >>> print(partial(partial(foo, a=10), a=20)(a=30)) + # 30 + # + # So, with 'partial' objects, passing a keyword argument is + # like setting a new default value for the corresponding + # parameter + # + # We also mark this parameter with '_partial_kwarg' + # flag. Later, in '_bind', the 'default' value of this + # parameter will be added to 'kwargs', to simulate + # the 'functools.partial' real call. + new_params[arg_name] = param.replace(default=arg_value, + _partial_kwarg=True) + + elif (param.kind not in (_VAR_KEYWORD, _VAR_POSITIONAL) and + not param._partial_kwarg): + new_params.pop(arg_name) + + return wrapped_sig.replace(parameters=new_params.values()) + + def signature(obj): '''Get a signature object for the passed callable.''' @@ -1470,50 +1515,32 @@ if sig is not None: return sig + try: + partialmethod = obj._partialmethod + except AttributeError: + pass + else: + # Unbound partialmethod (see functools.partialmethod) + # This means, that we need to calculate the signature + # as if it's a regular partial object, but taking into + # account that the first positional argument + # (usually `self`, or `cls`) will not be passed + # automatically (as for boundmethods) + + wrapped_sig = signature(partialmethod.func) + sig = _get_partial_signature(wrapped_sig, partialmethod, (None,)) + + first_wrapped_param = tuple(wrapped_sig.parameters.values())[0] + new_params = (first_wrapped_param,) + tuple(sig.parameters.values()) + + return sig.replace(parameters=new_params) + if isinstance(obj, types.FunctionType): return Signature.from_function(obj) if isinstance(obj, functools.partial): - sig = signature(obj.func) - - new_params = OrderedDict(sig.parameters.items()) - - partial_args = obj.args or () - partial_keywords = obj.keywords or {} - try: - ba = sig.bind_partial(*partial_args, **partial_keywords) - except TypeError as ex: - msg = 'partial object {!r} has incorrect arguments'.format(obj) - raise ValueError(msg) from ex - - for arg_name, arg_value in ba.arguments.items(): - param = new_params[arg_name] - if arg_name in partial_keywords: - # We set a new default value, because the following code - # is correct: - # - # >>> def foo(a): print(a) - # >>> print(partial(partial(foo, a=10), a=20)()) - # 20 - # >>> print(partial(partial(foo, a=10), a=20)(a=30)) - # 30 - # - # So, with 'partial' objects, passing a keyword argument is - # like setting a new default value for the corresponding - # parameter - # - # We also mark this parameter with '_partial_kwarg' - # flag. Later, in '_bind', the 'default' value of this - # parameter will be added to 'kwargs', to simulate - # the 'functools.partial' real call. - new_params[arg_name] = param.replace(default=arg_value, - _partial_kwarg=True) - - elif (param.kind not in (_VAR_KEYWORD, _VAR_POSITIONAL) and - not param._partial_kwarg): - new_params.pop(arg_name) - - return sig.replace(parameters=new_params.values()) + wrapped_sig = signature(obj.func) + return _get_partial_signature(wrapped_sig, obj) sig = None if isinstance(obj, type): 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 @@ -1877,6 +1877,33 @@ ba = inspect.signature(_foo).bind(12, 14) self.assertEqual(_foo(*ba.args, **ba.kwargs), (12, 14, 13)) + def test_signature_on_partialmethod(self): + from functools import partialmethod + + class Spam: + def test(): + pass + ham = partialmethod(test) + + with self.assertRaisesRegex(ValueError, "has incorrect arguments"): + inspect.signature(Spam.ham) + + class Spam: + def test(it, a, *, c) -> 'spam': + pass + ham = partialmethod(test, c=1) + + self.assertEqual(self.signature(Spam.ham), + ((('it', ..., ..., 'positional_or_keyword'), + ('a', ..., ..., 'positional_or_keyword'), + ('c', 1, ..., 'keyword_only')), + 'spam')) + + self.assertEqual(self.signature(Spam().ham), + ((('a', ..., ..., 'positional_or_keyword'), + ('c', 1, ..., 'keyword_only')), + 'spam')) + def test_signature_on_decorated(self): import functools -- Repository URL: http://hg.python.org/cpython

1 0

cpython: asyncio doc: subprocess_exec/subprocess_shell are not available on Windows
by victor.stinner 27 Jan '14

27 Jan '14

http://hg.python.org/cpython/rev/868da4813af2 changeset: 88782:868da4813af2 user: Victor Stinner <victor.stinner(a)gmail.com> date: Mon Jan 27 23:01:41 2014 +0100 summary: asyncio doc: subprocess_exec/subprocess_shell are not available on Windows files: Doc/library/asyncio-eventloop.rst | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -294,6 +294,8 @@ See the constructor of the :class:`subprocess.Popen` class for parameters. + Availability: Unix. + .. method:: BaseEventLoop.subprocess_shell(protocol_factory, cmd, \*, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=False, shell=True, bufsize=0, \*\*kwargs) XXX @@ -302,6 +304,8 @@ See the constructor of the :class:`subprocess.Popen` class for parameters. + Availability: Unix. + .. method:: BaseEventLoop.connect_read_pipe(protocol_factory, pipe) Register read pipe in eventloop. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #19456: ntpath.join() now joins relative paths correctly when a drive
by serhiy.storchaka 27 Jan '14

27 Jan '14

http://hg.python.org/cpython/rev/7ce464ba615a changeset: 88781:7ce464ba615a parent: 88778:ffe1d684b41e parent: 88780:f4377699fd47 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Mon Jan 27 23:16:28 2014 +0200 summary: Issue #19456: ntpath.join() now joins relative paths correctly when a drive is present. files: Lib/ntpath.py | 106 +++++++-------------------- Lib/test/test_ntpath.py | 63 ++++++++------- Misc/NEWS | 3 + 3 files changed, 66 insertions(+), 106 deletions(-) diff --git a/Lib/ntpath.py b/Lib/ntpath.py --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -101,82 +101,36 @@ # Join two (or more) paths. - -def join(a, *p): - """Join two or more pathname components, inserting "\\" as needed. - If any component is an absolute path, all previous path components - will be discarded.""" - sep = _get_sep(a) - seps = _get_bothseps(a) - colon = _get_colon(a) - path = a - for b in p: - b_wins = 0 # set to 1 iff b makes path irrelevant - if not path: - b_wins = 1 - - elif isabs(b): - # This probably wipes out path so far. However, it's more - # complicated if path begins with a drive letter. You get a+b - # (minus redundant slashes) in these four cases: - # 1. join('c:', '/a') == 'c:/a' - # 2. join('//computer/share', '/a') == '//computer/share/a' - # 3. join('c:/', '/a') == 'c:/a' - # 4. join('//computer/share/', '/a') == '//computer/share/a' - # But b wins in all of these cases: - # 5. join('c:/a', '/b') == '/b' - # 6. join('//computer/share/a', '/b') == '/b' - # 7. join('c:', 'd:/') == 'd:/' - # 8. join('c:', '//computer/share/') == '//computer/share/' - # 9. join('//computer/share', 'd:/') == 'd:/' - # 10. join('//computer/share', '//computer/share/') == '//computer/share/' - # 11. join('c:/', 'd:/') == 'd:/' - # 12. join('c:/', '//computer/share/') == '//computer/share/' - # 13. join('//computer/share/', 'd:/') == 'd:/' - # 14. join('//computer/share/', '//computer/share/') == '//computer/share/' - b_prefix, b_rest = splitdrive(b) - - # if b has a prefix, it always wins. - if b_prefix: - b_wins = 1 - else: - # b doesn't have a prefix. - # but isabs(b) returned true. - # and therefore b_rest[0] must be a slash. - # (but let's check that.) - assert(b_rest and b_rest[0] in seps) - - # so, b still wins if path has a rest that's more than a sep. - # you get a+b if path_rest is empty or only has a sep. - # (see cases 1-4 for times when b loses.) - path_rest = splitdrive(path)[1] - b_wins = path_rest and path_rest not in seps - - if b_wins: - path = b - else: - # Join, and ensure there's a separator. - assert len(path) > 0 - if path[-1:] in seps: - if b and b[:1] in seps: - path += b[1:] - else: - path += b - elif path[-1:] == colon: - path += b - elif b: - if b[:1] in seps: - path += b - else: - path += sep + b - else: - # path is not empty and does not end with a backslash, - # but b is empty; since, e.g., split('a/') produces - # ('a', ''), it's best if join() adds a backslash in - # this case. - path += sep - - return path +def join(path, *paths): + sep = _get_sep(path) + seps = _get_bothseps(path) + colon = _get_colon(path) + result_drive, result_path = splitdrive(path) + for p in paths: + p_drive, p_path = splitdrive(p) + if p_path and p_path[0] in seps: + # Second path is absolute + if p_drive or not result_drive: + result_drive = p_drive + result_path = p_path + continue + elif p_drive and p_drive != result_drive: + if p_drive.lower() != result_drive.lower(): + # Different drives => ignore the first path entirely + result_drive = p_drive + result_path = p_path + continue + # Same drive in different case + result_drive = p_drive + # Second path is relative to the first + if result_path and result_path[-1] not in seps: + result_path = result_path + sep + result_path = result_path + p_path + ## add separator between UNC and non-absolute path + if (result_path and result_path[0] not in seps and + result_drive and result_drive[-1:] != colon): + return result_drive + sep + result_path + return result_drive + result_path # Split a path in a drive specification (a drive letter followed by a 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 @@ -126,10 +126,7 @@ tester('ntpath.join("/a")', '/a') tester('ntpath.join("\\a")', '\\a') tester('ntpath.join("a:")', 'a:') - tester('ntpath.join("a:", "b")', 'a:b') - tester('ntpath.join("a:", "/b")', 'a:/b') tester('ntpath.join("a:", "\\b")', 'a:\\b') - tester('ntpath.join("a", "/b")', '/b') tester('ntpath.join("a", "\\b")', '\\b') tester('ntpath.join("a", "b", "c")', 'a\\b\\c') tester('ntpath.join("a\\", "b", "c")', 'a\\b\\c') @@ -137,42 +134,48 @@ tester('ntpath.join("a", "b", "\\c")', '\\c') tester('ntpath.join("d:\\", "\\pleep")', 'd:\\pleep') tester('ntpath.join("d:\\", "a", "b")', 'd:\\a\\b') - tester("ntpath.join('c:', '/a')", 'c:/a') - tester("ntpath.join('c:/', '/a')", 'c:/a') - tester("ntpath.join('c:/a', '/b')", '/b') - tester("ntpath.join('c:', 'd:/')", 'd:/') - tester("ntpath.join('c:/', 'd:/')", 'd:/') - tester("ntpath.join('c:/', 'd:/a/b')", 'd:/a/b') - tester("ntpath.join('')", '') - tester("ntpath.join('', '', '', '', '')", '') - tester("ntpath.join('a')", 'a') tester("ntpath.join('', 'a')", 'a') tester("ntpath.join('', '', '', '', 'a')", 'a') tester("ntpath.join('a', '')", 'a\\') tester("ntpath.join('a', '', '', '', '')", 'a\\') tester("ntpath.join('a\\', '')", 'a\\') tester("ntpath.join('a\\', '', '', '', '')", 'a\\') + tester("ntpath.join('a/', '')", 'a/') - # from comment in ntpath.join - tester("ntpath.join('c:', '/a')", 'c:/a') - tester("ntpath.join('//computer/share', '/a')", '//computer/share/a') - tester("ntpath.join('c:/', '/a')", 'c:/a') - tester("ntpath.join('//computer/share/', '/a')", '//computer/share/a') - tester("ntpath.join('c:/a', '/b')", '/b') - tester("ntpath.join('//computer/share/a', '/b')", '/b') - tester("ntpath.join('c:', 'd:/')", 'd:/') - tester("ntpath.join('c:', '//computer/share/')", '//computer/share/') - tester("ntpath.join('//computer/share', 'd:/')", 'd:/') - tester("ntpath.join('//computer/share', '//computer/share/')", '//computer/share/') - tester("ntpath.join('c:/', 'd:/')", 'd:/') - tester("ntpath.join('c:/', '//computer/share/')", '//computer/share/') - tester("ntpath.join('//computer/share/', 'd:/')", 'd:/') - tester("ntpath.join('//computer/share/', '//computer/share/')", '//computer/share/') + tester("ntpath.join('a/b', 'x/y')", 'a/b\\x/y') + tester("ntpath.join('/a/b', 'x/y')", '/a/b\\x/y') + tester("ntpath.join('/a/b/', 'x/y')", '/a/b/x/y') + 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('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('c:', '//computer/share/')", '//computer/share/') - tester("ntpath.join('c:/', '//computer/share/')", '//computer/share/') - tester("ntpath.join('c:/', '//computer/share/a/b')", '//computer/share/a/b') + tester("ntpath.join('a/b', '/x/y')", '/x/y') + tester("ntpath.join('/a/b', '/x/y')", '/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('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('c:', 'C:x/y')", 'C:x/y') + tester("ntpath.join('c:a/b', 'C:x/y')", 'C:a/b\\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') + + for x in ('', 'a/b', '/a/b', 'c:', 'c:a/b', 'c:/', 'c:/a/b', + '//computer/share', '//computer/share/', '//computer/share/a/b'): + for y in ('d:', 'd:x/y', 'd:/', 'd:/x/y', + '//machine/common', '//machine/common/', '//machine/common/x/y'): + tester("ntpath.join(%r, %r)" % (x, y), y) tester("ntpath.join('\\\\computer\\share\\', 'a', 'b')", '\\\\computer\\share\\a\\b') tester("ntpath.join('\\\\computer\\share', 'a', 'b')", '\\\\computer\\share\\a\\b') diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -48,6 +48,9 @@ Library ------- +- Issue #19456: ntpath.join() now joins relative paths correctly when a drive + is present. + - Issue #19077: tempfile.TemporaryDirectory cleanup no longer fails when called during shutdown. Emitting resource warning in __del__ no longer fails. Original patch by Antoine Pitrou. -- Repository URL: http://hg.python.org/cpython

1 0