diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-02-07 19:08:22 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-02-07 19:08:22 (GMT) |
| commit | 096c3ad41de5b2aa2d7c822c4f5f8b90f49e5103 (patch) | |
| tree | df4b7cca480a4d33f0fffad9278c48d6dbde0965 /Lib | |
| parent | 95f8ef282578cd6aa87458425a777fc1cbdbf997 (diff) | |
| download | cpython-096c3ad41de5b2aa2d7c822c4f5f8b90f49e5103.zip cpython-096c3ad41de5b2aa2d7c822c4f5f8b90f49e5103.tar.gz cpython-096c3ad41de5b2aa2d7c822c4f5f8b90f49e5103.tar.bz2 | |
make destinsrc private
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/shutil.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_shutil.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index cfb6646..af96546 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): diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 6f65bdf..ac37a53 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -346,8 +346,8 @@ class TestMove(unittest.TestCase): for src, dst in [('srcdir', 'srcdir/dest')]: src = os.path.join(TESTFN, src) dst = os.path.join(TESTFN, dst) - self.assert_(shutil.destinsrc(src, dst), - msg='destinsrc() wrongly concluded that ' + self.assert_(shutil._destinsrc(src, dst), + msg='_destinsrc() wrongly concluded that ' 'dst (%s) is not in src (%s)' % (dst, src)) finally: shutil.rmtree(TESTFN, ignore_errors=True) @@ -358,8 +358,8 @@ class TestMove(unittest.TestCase): for src, dst in [('srcdir', 'src/dest'), ('srcdir', 'srcdir.new')]: src = os.path.join(TESTFN, src) dst = os.path.join(TESTFN, dst) - self.failIf(shutil.destinsrc(src, dst), - msg='destinsrc() wrongly concluded that ' + self.failIf(shutil._destinsrc(src, dst), + msg='_destinsrc() wrongly concluded that ' 'dst (%s) is in src (%s)' % (dst, src)) finally: shutil.rmtree(TESTFN, ignore_errors=True) |