diff options
| author | Chris Jerdonek <chris.jerdonek@gmail.com> | 2019-02-21 15:58:59 -0800 |
|---|---|---|
| committer | Paul Ganssle <paul@ganssle.io> | 2019-04-03 10:37:22 -0400 |
| commit | 52939bcc8f549f6c8fef4bf76e09a20d0bf62e44 (patch) | |
| tree | 29e888ae5e8beedf81c57f4dd5ece3ecb81e8fcb | |
| parent | 4876dbb7f09b02eb0d513837d7c27d08b095cdce (diff) | |
| download | python-setuptools-git-52939bcc8f549f6c8fef4bf76e09a20d0bf62e44.tar.gz | |
Add Distribution._get_version() for DRY
| -rw-r--r-- | pkg_resources/__init__.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 5d66f6e0..e8921f95 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -2661,7 +2661,7 @@ class Distribution: try: return self._version except AttributeError: - version = _version_from_file(self._get_metadata(self.PKG_INFO)) + version = self._get_version() if version is None: tmpl = "Missing 'Version:' header and/or %s file" raise ValueError(tmpl % self.PKG_INFO, self) @@ -2727,6 +2727,12 @@ class Distribution: for line in self.get_metadata_lines(name): yield line + def _get_version(self): + lines = self._get_metadata(self.PKG_INFO) + version = _version_from_file(lines) + + return version + def activate(self, path=None, replace=False): """Ensure distribution is importable on `path` (default=sys.path)""" if path is None: @@ -2945,7 +2951,7 @@ class EggInfoDistribution(Distribution): take an extra step and try to get the version number from the metadata file itself instead of the filename. """ - md_version = _version_from_file(self._get_metadata(self.PKG_INFO)) + md_version = self._get_version() if md_version: self._version = md_version return self |
