]> granicus.if.org Git - python/commitdiff
Issue #19456: ntpath.join() now joins relative paths correctly when a drive
authorSerhiy Storchaka <storchaka@gmail.com>
Mon, 27 Jan 2014 21:16:28 +0000 (23:16 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Mon, 27 Jan 2014 21:16:28 +0000 (23:16 +0200)
is present.

1  2 
Lib/ntpath.py
Lib/test/test_ntpath.py
Misc/NEWS

diff --cc Lib/ntpath.py
Simple merge
Simple merge
diff --cc Misc/NEWS
index fdcf37d48073ddd3ca263f35bf124d8a69399baa,c52ca189eae6da0124ca47f294c200a8f0325ba8..6d528be9e7412cf67f97e774d808b62c508b9d5b
+++ b/Misc/NEWS
@@@ -48,11 -32,31 +48,14 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #19077: tempfile.TemporaryDirectory cleanup is now most likely
 -  successful when called during nulling out of modules during shutdown.
 -  Misleading exception no longer raised when resource warning is emitted
 -  during shutdown.
+ - 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.
 +
 +- Issue #20394: Silence Coverity warning in audioop module.
  
  - Issue #20367: Fix behavior of concurrent.futures.as_completed() for
    duplicate arguments.  Patch by Glenn Langford.