Merge

.hgtags

@@ -69,3 +69,5 @@ b57e5ba934767dd498669b17551678081b3047b5 0.6.46
 dd5bbc116c53d3732d22f983e7ca6d8cfabd3b08 0.7.5
 512744f3f306aea0fdde4cfd600af8b2d6e773e7 0.8b2
 8af9839a76407eebf3610fcd3e7973f1625abaa2 0.8b3
+ee2c967017024197b38e39ced852808265387a4b 0.6.47
+48d3d26cbea68e21c96e51f01092e8fdead5cd60 0.7.6

CHANGES.txt

@@ -9,6 +9,12 @@ CHANGES
 * Code base now runs on Python 2.4 - Python 3.3 without Python 2to3
   conversion.
 
+-----
+0.7.6
+-----
+
+* Distribute #375: Repair AttributeError created in last release.
+
 -----
 0.7.5
 -----
@@ -69,6 +75,13 @@ Added several features that were slated for setuptools 0.6c12:
 
 * Issue #3: Fixed NameError in SSL support.
 
+------
+0.6.47
+------
+
+* Correct AttributeError in ``ResourceManager.get_cache_path`` introduced in
+  0.6.46.
+
 ------
 0.6.46
 ------

pkg_resources.py

@@ -1018,7 +1018,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)