summaryrefslogtreecommitdiff
path: root/pkg_resources
diff options
context:
space:
mode:
authorSteve Kowalik <steven@wedontsleep.org>2015-12-10 11:37:29 +1300
committerSteve Kowalik <steven@wedontsleep.org>2015-12-10 11:37:29 +1300
commit792edda4143317996f83ac5f1ae0db0695173397 (patch)
tree2fb5ddca2484116572fc1142a8fb51e052c1be75 /pkg_resources
parenta718819d2849196e902808301c9a95724510c5c1 (diff)
parent81ca4fea9e4672f39864439f2049108ad731c8fa (diff)
downloadpython-setuptools-git-792edda4143317996f83ac5f1ae0db0695173397.tar.gz
Merge from master.
Diffstat (limited to 'pkg_resources')
-rw-r--r--pkg_resources/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 82a35702..d463945f 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1987,11 +1987,11 @@ class FileMetadata(EmptyProvider):
self.path = path
def has_metadata(self, name):
- return name=='PKG-INFO'
+ return name=='PKG-INFO' and os.path.isfile(self.path)
def get_metadata(self, name):
if name=='PKG-INFO':
- with io.open(self.path, 'rU', encoding='utf-8') as f:
+ with io.open(self.path, encoding='utf-8') as f:
metadata = f.read()
return metadata
raise KeyError("No metadata except PKG-INFO is available")