Merge

.hgtags

@@ -72,3 +72,5 @@ dd5bbc116c53d3732d22f983e7ca6d8cfabd3b08 0.7.5
 ee2c967017024197b38e39ced852808265387a4b 0.6.47
 48d3d26cbea68e21c96e51f01092e8fdead5cd60 0.7.6
 5b3c7981a02b4a86af1b10ae16492899b515d485 0.8b4
+cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48
+1506fa538fff01e70424530a32a44e070720cf3c 0.7.7

CHANGES.txt

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

pkg_resources.py

@@ -1029,7 +1029,7 @@ variable to point to an accessible directory.
         return target_path
 
     @staticmethod
-    def warn_unsafe_extraction_path(path):
+    def _warn_unsafe_extraction_path(path):
         """
         If the default extraction path is overridden and set to an insecure
         location, such as /tmp, it opens up an opportunity for an attacker to

tests/test_pkg_resources.py

@@ -64,3 +64,11 @@ class TestZipProvider(object):
         f = open(filename)
         assert f.read() == 'hello, world!'
         manager.cleanup_resources()
+
+class TestResourceManager(object):
+    def test_get_cache_path(self):
+        mgr = pkg_resources.ResourceManager()
+        path = mgr.get_cache_path('foo')
+        type_ = str(type(path))
+        message = "Unexpected type from get_cache_path: " + type_
+        assert isinstance(path, (unicode, str)), message