[Python-checkins] cpython: Issue #21391: Use os.path.abspath in the shutil module.

berker.peksag python-checkins at python.org
Thu Sep 18 04:10:46 CEST 2014


http://hg.python.org/cpython/rev/ab369d809200
changeset:   92461:ab369d809200
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Thu Sep 18 05:11:15 2014 +0300
summary:
  Issue #21391: Use os.path.abspath in the shutil module.

files:
  Lib/shutil.py |  5 ++---
  Misc/NEWS     |  2 ++
  2 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Lib/shutil.py b/Lib/shutil.py
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -7,7 +7,6 @@
 import os
 import sys
 import stat
-from os.path import abspath
 import fnmatch
 import collections
 import errno
@@ -550,8 +549,8 @@
     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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 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.
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list