mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 69100 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69100 | antoine.pitrou | 2009-01-29 21:19:34 +0100 (jeu., 29 janv. 2009) | 5 lines

  Issue #2047: shutil.move() could believe that its destination path was
  inside its source path if it began with the same letters (e.g. "src" vs.
  "src.new").
........
This commit is contained in:
Antoine Pitrou 2009-01-29 20:26:59 +00:00
parent 891f2631f5
commit 0dcc3cdca5
3 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/shutil.py
View file

@ -265,4 +265,10 @@ def move(src, dst):
os.unlink(src)
def destinsrc(src, dst):
return abspath(dst).startswith(abspath(src))
src = abspath(src)
dst = abspath(dst)
if not src.endswith(os.path.sep):
src += os.path.sep
if not dst.endswith(os.path.sep):
dst += os.path.sep
return dst.startswith(src)