diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-01-29 20:26:59 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-01-29 20:26:59 (GMT) |
| commit | 0dcc3cdca5b6f0fcb64cce756e552f43c74785e7 (patch) | |
| tree | 278dfe2d4a0ba830b759a2b039e46b74d598bb1e /Lib/shutil.py | |
| parent | 891f2631f576dfc515627074cccb07e0ffdff156 (diff) | |
| download | cpython-0dcc3cdca5b6f0fcb64cce756e552f43c74785e7.zip cpython-0dcc3cdca5b6f0fcb64cce756e552f43c74785e7.tar.gz cpython-0dcc3cdca5b6f0fcb64cce756e552f43c74785e7.tar.bz2 | |
Merged revisions 69100 via svnmerge from
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").
........
Diffstat (limited to 'Lib/shutil.py')
| -rw-r--r-- | Lib/shutil.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index 9a5f78a..d884d0a 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -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) |