diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-07-02 11:46:54 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-07-02 11:46:54 -0400 |
| commit | 9ce1d1b4b6a55f69b4445e86df9f4040af862e0a (patch) | |
| tree | a41b1360aaa86540633bc7cee37562afaaf3e063 | |
| parent | b69b0368a7201f5b21e8d4fd0fb1379db87090c8 (diff) | |
| parent | 132ef1524599896fd97bc1477d86a339bcf51415 (diff) | |
| download | python-setuptools-git-9ce1d1b4b6a55f69b4445e86df9f4040af862e0a.tar.gz | |
Merge with Distribute 0.6.48
--HG--
rename : distribute_setup.py => ez_setup.py
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | pkg_resources.py | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -68,3 +68,4 @@ b57e5ba934767dd498669b17551678081b3047b5 0.6.46 dd5bbc116c53d3732d22f983e7ca6d8cfabd3b08 0.7.5 ee2c967017024197b38e39ced852808265387a4b 0.6.47 48d3d26cbea68e21c96e51f01092e8fdead5cd60 0.7.6 +cae9127e0534fc46d7ddbc11f68dc88fd9311459 0.6.48 diff --git a/CHANGES.txt b/CHANGES.txt index 587e336c..31d6bc89 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -69,6 +69,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 b6aee28d..eb351103 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -998,7 +998,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 |