make destinsrc private
This commit is contained in:
parent
95f8ef2825
commit
096c3ad41d
|
@ -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):
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue