diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-02-20 04:09:19 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-02-20 04:09:19 (GMT) |
| commit | 247a9b87bd7ad5836b00e72212f9140f0faa5c9c (patch) | |
| tree | e8d59bc25eeedc430a105954a73ecc5a9d89c924 /Lib/shutil.py | |
| parent | ba01dd93d232d3cb088cd61820e814e8c4c95010 (diff) | |
| download | cpython-247a9b87bd7ad5836b00e72212f9140f0faa5c9c.zip cpython-247a9b87bd7ad5836b00e72212f9140f0faa5c9c.tar.gz cpython-247a9b87bd7ad5836b00e72212f9140f0faa5c9c.tar.bz2 | |
Merged revisions 69415,69591,69593 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69415 | benjamin.peterson | 2009-02-07 13:08:22 -0600 (Sat, 07 Feb 2009) | 1 line
make destinsrc private
........
r69591 | martin.v.loewis | 2009-02-13 14:26:16 -0600 (Fri, 13 Feb 2009) | 1 line
Update Tix build procedure.
........
r69593 | martin.v.loewis | 2009-02-13 14:51:48 -0600 (Fri, 13 Feb 2009) | 1 line
Add optional code signing after merging.
........
Diffstat (limited to 'Lib/shutil.py')
| -rw-r--r-- | Lib/shutil.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index d884d0a..7a84646f 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -256,7 +256,7 @@ def move(src, dst): os.rename(src, real_dst) except OSError: if os.path.isdir(src): - if destinsrc(src, dst): + if _destinsrc(src, dst): raise Error("Cannot move a directory '%s' into itself '%s'." % (src, dst)) copytree(src, real_dst, symlinks=True) rmtree(src) @@ -264,7 +264,7 @@ def move(src, dst): copy2(src, real_dst) os.unlink(src) -def destinsrc(src, dst): +def _destinsrc(src, dst): src = abspath(src) dst = abspath(dst) if not src.endswith(os.path.sep): |