aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.hgtags2
-rw-r--r--CHANGES.txt14
-rw-r--r--pkg_resources.py2
-rw-r--r--tests/test_pkg_resources.py8
4 files changed, 25 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index a9c0a4cc..426fff2e 100644
--- a/.hgtags
+++ b/.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
diff --git a/CHANGES.txt b/CHANGES.txt
index 894c27c5..35a0b7ce 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,13 @@ CHANGES
conversion.
-----
+0.7.7
+-----
+
+* Distribute #375: Repair AttributeError created in last release (redo).
+* Issue #30: Added test for get_cache_path.
+
+-----
0.7.6
-----
@@ -76,6 +83,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
------
diff --git a/pkg_resources.py b/pkg_resources.py
index c3abc1d7..ec1ba1fb 100644
--- a/pkg_resources.py
+++ b/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
diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index b05ea44b..398f1acc 100644
--- a/tests/test_pkg_resources.py
+++ b/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