aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-09-27 14:17:34 -0500
committerJason R. Coombs <jaraco@jaraco.com>2016-09-27 14:17:34 -0500
commit35ea365b50bd1a64375fdbcce187affab22af3b7 (patch)
tree9658c09b13831ac89f5e21f0609655025e938a5d
parentf10da56e220c2f06126f2aa60ccfbfdddbfa6075 (diff)
downloadexternal_python_setuptools-35ea365b50bd1a64375fdbcce187affab22af3b7.tar.gz
external_python_setuptools-35ea365b50bd1a64375fdbcce187affab22af3b7.tar.bz2
external_python_setuptools-35ea365b50bd1a64375fdbcce187affab22af3b7.zip
Put main logic in the top-level body of the function.
-rw-r--r--pkg_resources/__init__.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index af986ac3..37bf1482 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1859,12 +1859,13 @@ class FileMetadata(EmptyProvider):
return name == 'PKG-INFO' and os.path.isfile(self.path)
def get_metadata(self, name):
- if name == 'PKG-INFO':
- with io.open(self.path, encoding='utf-8', errors="replace") as f:
- metadata = f.read()
- self._warn_on_replacement(metadata)
- return metadata
- raise KeyError("No metadata except PKG-INFO is available")
+ if name != 'PKG-INFO':
+ raise KeyError("No metadata except PKG-INFO is available")
+
+ with io.open(self.path, encoding='utf-8', errors="replace") as f:
+ metadata = f.read()
+ self._warn_on_replacement(metadata)
+ return metadata
def _warn_on_replacement(self, metadata):
# Python 2.6 and 3.2 compat for: replacement_char = '�'