diff options
| author | Ned Deily <nad@acm.org> | 2011-10-07 19:02:29 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-10-07 19:02:29 (GMT) |
| commit | 532c363ac775c5499f9f00a06c84c7b1a5c4f337 (patch) | |
| tree | b7e50a9fecd130de390cd2e87110f0b3fa8c92e4 /Lib | |
| parent | 2da16e61f565f0c9ec3fe06ad7a1ec779694fb96 (diff) | |
| parent | 7010a07bd0dab29e5e360f2bbd862ed23ba3f288 (diff) | |
| download | cpython-532c363ac775c5499f9f00a06c84c7b1a5c4f337.zip cpython-532c363ac775c5499f9f00a06c84c7b1a5c4f337.tar.gz cpython-532c363ac775c5499f9f00a06c84c7b1a5c4f337.tar.bz2 | |
Merge with 3.2
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_pkgutil.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py index f755e67..f4e0323 100644 --- a/Lib/test/test_pkgutil.py +++ b/Lib/test/test_pkgutil.py @@ -15,11 +15,11 @@ class PkgutilTests(unittest.TestCase): def setUp(self): self.dirname = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, self.dirname) sys.path.insert(0, self.dirname) def tearDown(self): del sys.path[0] - shutil.rmtree(self.dirname) def test_getdata_filesys(self): pkg = 'test_getdata_filesys' @@ -91,9 +91,9 @@ class PkgutilTests(unittest.TestCase): # this does not appear to create an unreadable dir on Windows # but the test should not fail anyway os.mkdir(d, 0) + self.addCleanup(os.rmdir, d) for t in pkgutil.walk_packages(path=[self.dirname]): self.fail("unexpected package found") - os.rmdir(d) class PkgutilPEP302Tests(unittest.TestCase): |