diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-09-18 18:11:48 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-09-18 18:11:48 (GMT) |
| commit | 229011d949f40c898ca4e146f3120af326a3f40d (patch) | |
| tree | a804e7c1bd83270b459a55d9cc104fcb805bbefd /Lib/packaging/tests/test_util.py | |
| parent | 41479450ece3bb5c01a49b5efd5d17021ca401ec (diff) | |
| download | cpython-229011d949f40c898ca4e146f3120af326a3f40d.zip cpython-229011d949f40c898ca4e146f3120af326a3f40d.tar.gz cpython-229011d949f40c898ca4e146f3120af326a3f40d.tar.bz2 | |
Make a number of small changes to ease the backport to distutils2
Diffstat (limited to 'Lib/packaging/tests/test_util.py')
| -rw-r--r-- | Lib/packaging/tests/test_util.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/packaging/tests/test_util.py b/Lib/packaging/tests/test_util.py index c3d91aa..dcd210f 100644 --- a/Lib/packaging/tests/test_util.py +++ b/Lib/packaging/tests/test_util.py @@ -15,7 +15,7 @@ from packaging.errors import ( from packaging import util from packaging.dist import Distribution from packaging.util import ( - convert_path, change_root, split_quoted, strtobool, + convert_path, change_root, split_quoted, strtobool, run_2to3, get_compiler_versions, _MAC_OS_X_LD_VERSION, byte_compile, find_packages, spawn, get_pypirc_path, generate_pypirc, read_pypirc, resolve_name, iglob, RICH_GLOB, egginfo_to_distinfo, is_setuptools, is_distutils, is_packaging, @@ -374,7 +374,7 @@ class UtilTestCase(support.EnvironRestorer, res = find_packages([root], ['pkg1.pkg2']) self.assertEqual(set(res), set(['pkg1', 'pkg5', 'pkg1.pkg3', - 'pkg1.pkg3.pkg6'])) + 'pkg1.pkg3.pkg6'])) def test_resolve_name(self): self.assertIs(str, resolve_name('builtins.str')) @@ -416,7 +416,6 @@ class UtilTestCase(support.EnvironRestorer, file_handle.write(content) file_handle.flush() file_handle.seek(0) - from packaging.util import run_2to3 run_2to3([file_name]) new_content = "".join(file_handle.read()) file_handle.close() @@ -432,7 +431,6 @@ class UtilTestCase(support.EnvironRestorer, file_handle.write(content) file_handle.flush() file_handle.seek(0) - from packaging.util import run_2to3 run_2to3([file_name], doctests_only=True) new_content = "".join(file_handle.readlines()) file_handle.close() |