summaryrefslogtreecommitdiff
path: root/pkg_resources
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-08-04 13:13:37 -0400
committerJason R. Coombs <jaraco@jaraco.com>2016-08-04 13:13:37 -0400
commitaa835dcab3b98944c928a73eab8b091479514155 (patch)
tree5e4b5a5288f531d72418395cba50be5bbb17f53e /pkg_resources
parenteb4a2e50b292fc9ce1cc2a55bf3a18fc303b4c24 (diff)
downloadpython-setuptools-git-aa835dcab3b98944c928a73eab8b091479514155.tar.gz
Collapse two functions into one.
Diffstat (limited to 'pkg_resources')
-rw-r--r--pkg_resources/__init__.py15
1 files changed, 5 insertions, 10 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 9f0ea6ec..2a053b50 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -1468,16 +1468,11 @@ class NullProvider:
def has_metadata(self, name):
return self.egg_info and self._has(self._fn(self.egg_info, name))
- if sys.version_info <= (3,):
- def get_metadata(self, name):
- if not self.egg_info:
- return ""
- return self._get(self._fn(self.egg_info, name))
- else:
- def get_metadata(self, name):
- if not self.egg_info:
- return ""
- return self._get(self._fn(self.egg_info, name)).decode("utf-8")
+ def get_metadata(self, name):
+ if not self.egg_info:
+ return ""
+ value = self._get(self._fn(self.egg_info, name))
+ return value.decode('utf-8') if six.PY3 else value
def get_metadata_lines(self, name):
return yield_lines(self.get_metadata(name))