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/test/test_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/test/test_shutil.py')
| -rw-r--r-- | Lib/test/test_shutil.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index c7dd1b3..86c7b64 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) |