diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-08-15 09:50:33 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-08-15 09:50:33 -0400 |
| commit | 4595b30027cfc97d04ab79ab2601c8ef660f3f5d (patch) | |
| tree | f6458830e00930f6318564e227065386755e6e81 | |
| parent | 4fe251f50d55a25e7a1136784ced13723e114094 (diff) | |
| download | python-setuptools-bitbucket-5.7.tar.gz | |
Use MemoizedZipManifests for all operations. Fixes #240.5.7
| -rw-r--r-- | CHANGES.txt | 11 | ||||
| -rw-r--r-- | pkg_resources.py | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 3674383c..83b05bbe 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,17 @@ CHANGES ======= --- +5.7 +--- + +* Issue #240: Based on real-world performance measures against 5.4, zip + manifests are now cached in all circumstances. The + ``PKG_RESOURCES_CACHE_ZIP_MANIFESTS`` environment variable is no longer + relevant. The observed "memory increase" referenced in the 5.4 release + notes and detailed in Issue #154 was likely not an increase over the status + quo, but rather only an increase over not storing the zip info at all. + +--- 5.6 --- diff --git a/pkg_resources.py b/pkg_resources.py index 11debf65..ee2c553b 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -1605,11 +1605,7 @@ class ZipProvider(EggProvider): """Resource support for zips and eggs""" eagers = None - _zip_manifests = ( - MemoizedZipManifests() - if os.environ.get('PKG_RESOURCES_CACHE_ZIP_MANIFESTS') else - ZipManifests() - ) + _zip_manifests = MemoizedZipManifests() def __init__(self, module): EggProvider.__init__(self, module) |