diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-02-03 10:06:00 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-02-03 10:06:00 -0500 |
| commit | 397879392e928a873953bddd978dd87292211e62 (patch) | |
| tree | dd556c13b7864f7b6dfb2944df2ea96878d1b921 /pkg_resources | |
| parent | e3d7334022838f8153a06b0105c6b8f4a32762a2 (diff) | |
| download | python-setuptools-git-397879392e928a873953bddd978dd87292211e62.tar.gz | |
Use py.path objects for cleaner setup
Diffstat (limited to 'pkg_resources')
| -rw-r--r-- | pkg_resources/tests/test_resources.py | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py index 49acd036..00f0307d 100644 --- a/pkg_resources/tests/test_resources.py +++ b/pkg_resources/tests/test_resources.py @@ -653,21 +653,17 @@ class TestNamespaces: Check both are in the _namespace_packages dict and that their __path__ is correct """ - real_tmpdir = str(symlinked_tmpdir.realpath()) - tmpdir = str(symlinked_tmpdir) - sys.path.append(os.path.join(tmpdir, "site-pkgs2")) - os.makedirs(os.path.join(tmpdir, "site-pkgs", "pkg1", "pkg2")) - os.makedirs(os.path.join(tmpdir, "site-pkgs2", "pkg1", "pkg2")) + real_tmpdir = symlinked_tmpdir.realpath() + tmpdir = symlinked_tmpdir + sys.path.append(str(tmpdir / 'site-pkgs2')) + site_dirs = tmpdir / 'site-pkgs', tmpdir / 'site-pkgs2' ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n" - for site in ["site-pkgs", "site-pkgs2"]: - pkg1_init = open(os.path.join(tmpdir, site, - "pkg1", "__init__.py"), "w") - pkg1_init.write(ns_str) - pkg1_init.close() - pkg2_init = open(os.path.join(tmpdir, site, - "pkg1", "pkg2", "__init__.py"), "w") - pkg2_init.write(ns_str) - pkg2_init.close() + for site in site_dirs: + pkg1 = site / 'pkg1' + pkg2 = pkg1 / 'pkg2' + pkg2.ensure_dir() + (pkg1 / '__init__.py').write_text(ns_str, encoding='utf-8') + (pkg2 / '__init__.py').write_text(ns_str, encoding='utf-8') import pkg1 assert "pkg1" in pkg_resources._namespace_packages # attempt to import pkg2 from site-pkgs2 @@ -677,8 +673,8 @@ class TestNamespaces: assert pkg_resources._namespace_packages["pkg1"] == ["pkg1.pkg2"] # check the __path__ attribute contains both paths expected = [ - os.path.join(real_tmpdir, "site-pkgs", "pkg1", "pkg2"), - os.path.join(real_tmpdir, "site-pkgs2", "pkg1", "pkg2"), + str(real_tmpdir / "site-pkgs" / "pkg1" / "pkg2"), + str(real_tmpdir / "site-pkgs2" / "pkg1" / "pkg2"), ] assert pkg1.pkg2.__path__ == expected |