aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-03-19 11:11:34 -0700
committerJason R. Coombs <jaraco@jaraco.com>2013-03-19 11:11:34 -0700
commit7a12d0b7937c832c0ce5b306105ceb5c5b08bd63 (patch)
tree951679304b07854f7c0e2a3a53a76ffb0ce9dc15
parent6482552f94c24cdc52c9badf6923640a4e9efa4f (diff)
downloadexternal_python_setuptools-7a12d0b7937c832c0ce5b306105ceb5c5b08bd63.tar.gz
external_python_setuptools-7a12d0b7937c832c0ce5b306105ceb5c5b08bd63.tar.bz2
external_python_setuptools-7a12d0b7937c832c0ce5b306105ceb5c5b08bd63.zip
Updated a couple more references from Distribute to Setuptools
--HG-- branch : Setuptools-Distribute merge extra : rebase_source : ad9f8f344d7e705ddc354757fbe741b34b576b1b
-rw-r--r--setuptools/tests/test_resources.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index f10fc999..9c2ed9c9 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -559,7 +559,7 @@ class NamespaceTests(TestCase):
def setUp(self):
self._ns_pkgs = pkg_resources._namespace_packages.copy()
- self._tmpdir = tempfile.mkdtemp(prefix="tests-distribute-")
+ self._tmpdir = tempfile.mkdtemp(prefix="tests-setuptools-")
os.makedirs(os.path.join(self._tmpdir, "site-pkgs"))
self._prev_sys_path = sys.path[:]
sys.path.append(os.path.join(self._tmpdir, "site-pkgs"))
@@ -603,7 +603,7 @@ class NamespaceTests(TestCase):
try:
import pkg1.pkg2
except ImportError, e:
- self.fail("Distribute tried to import the parent namespace package")
+ self.fail("Setuptools tried to import the parent namespace package")
# check the _namespace_packages dict
self._assertIn("pkg1.pkg2", pkg_resources._namespace_packages.keys())
self.assertEqual(pkg_resources._namespace_packages["pkg1"], ["pkg1.pkg2"])