From: Berker Peksag <berker.peksag@gmail.com>
Date: Thu, 18 Sep 2014 02:11:15 +0000 (+0300)
Subject: Issue #21391: Use os.path.abspath in the shutil module.
X-Git-Tag: v3.5.0a1~904
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3715da5c97d98f553f1e0422eda7d129806dbda2;p=thirdparty%2FPython%2Fcpython.git

Issue #21391: Use os.path.abspath in the shutil module.
---

diff --git a/Lib/shutil.py b/Lib/shutil.py
index 344d9d3b8cd7..c2c66de51314 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -7,7 +7,6 @@ XXX The functions here don't copy the resource fork or other metadata on Mac.
 import os
 import sys
 import stat
-from os.path import abspath
 import fnmatch
 import collections
 import errno
@@ -550,8 +549,8 @@ def move(src, dst, copy_function=copy2):
     return real_dst
 
 def _destinsrc(src, dst):
-    src = abspath(src)
-    dst = abspath(dst)
+    src = os.path.abspath(src)
+    dst = os.path.abspath(dst)
     if not src.endswith(os.path.sep):
         src += os.path.sep
     if not dst.endswith(os.path.sep):
diff --git a/Misc/NEWS b/Misc/NEWS
index 6adc7fabe408..8ca38329fe94 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@ Release date: TBA
 Core and Builtins
 -----------------
 
+- Issue #21391: Use os.path.abspath in the shutil module.
+
 - Issue #11471: avoid generating a JUMP_FORWARD instruction at the end of
   an if-block if there is no else-clause.  Original patch by Eugene Toder.