diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-07-02 08:30:19 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-07-02 08:30:19 -0400 |
| commit | eec023bf3d453680e4240e6ae712a30ca89f82d1 (patch) | |
| tree | 156798731d9f70fc76ea974fed1801b735dd2944 | |
| parent | 0287b273b81e0ef7cfb6721b87f9d5a5780805a2 (diff) | |
| parent | a556ccfdc2e0b74d65cbb298145ba81ac9934edc (diff) | |
| download | python-setuptools-bitbucket-eec023bf3d453680e4240e6ae712a30ca89f82d1.tar.gz | |
Merge with Distribute 0.6.47
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | pkg_resources.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index e4fcc37e..a2084ddb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -63,6 +63,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 ------ diff --git a/pkg_resources.py b/pkg_resources.py index b4114946..b6aee28d 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -987,7 +987,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) |