diff options
| author | PJ Eby <distutils-sig@python.org> | 2008-02-15 23:53:18 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2008-02-15 23:53:18 +0000 |
| commit | 601add2805c394928b7dd9d2156d24508a9bddb6 (patch) | |
| tree | e217b5dba92d6732c4f5b642fbdc62da9cf32183 /pkg_resources.py | |
| parent | ef659874989503df1143f0c4c625f9259fabc1e3 (diff) | |
| download | python-setuptools-git-601add2805c394928b7dd9d2156d24508a9bddb6.tar.gz | |
Fix ``resource_listdir('')`` always returning an empty list for zipped
eggs. Fix missing import in sdist command when encountering
unrecognized SVN entries format. (backports from trunk)
--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4060849
Diffstat (limited to 'pkg_resources.py')
| -rw-r--r-- | pkg_resources.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index 78c96094..c5ebbb3d 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -1188,7 +1188,9 @@ class NullProvider: ) def _fn(self, base, resource_name): - return os.path.join(base, *resource_name.split('/')) + if resource_name: + return os.path.join(base, *resource_name.split('/')) + return base def _get(self, path): if hasattr(self.loader, 'get_data'): @@ -1226,8 +1228,6 @@ class EggProvider(NullProvider): - - class DefaultProvider(EggProvider): """Provides access to package resources in the filesystem""" |