summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-07-02 08:23:50 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-07-02 08:23:50 -0400
commite9142bcf0f06341e855e37b6744f0626ea1a9d43 (patch)
treee66217088488bb25135895192eb7b227784e8a4e
parent1ce8f258058dd17fe833968a90e75da6935109a6 (diff)
parenta6f5642c86af003b1dce6299c2d9a941b2bd63f2 (diff)
downloadpython-setuptools-git-e9142bcf0f06341e855e37b6744f0626ea1a9d43.tar.gz
Merge fix for AttributeError0.6.47
--HG-- branch : distribute
-rw-r--r--CHANGES.txt7
-rw-r--r--pkg_resources.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 029e4277..3baf6e7a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,13 @@ CHANGES
=======
------
+0.6.47
+------
+
+* Correct AttributeError in ``ResourceManager.get_cache_path`` introduced in
+ 0.6.46.
+
+------
0.6.46
------
diff --git a/pkg_resources.py b/pkg_resources.py
index 8f962ebd..52543a5f 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -989,7 +989,7 @@ variable to point to an accessible directory.
extract, as it tracks the generated names for possible cleanup later.
"""
extract_path = self.extraction_path or get_default_cache()
- self._warn_unsafe_extraction(extract_path)
+ self._warn_unsafe_extraction_path(extract_path)
target_path = os.path.join(extract_path, archive_name+'-tmp', *names)
try:
_bypass_ensure_directory(target_path)