From 52939bcc8f549f6c8fef4bf76e09a20d0bf62e44 Mon Sep 17 00:00:00 2001 From: Chris Jerdonek Date: Thu, 21 Feb 2019 15:58:59 -0800 Subject: Add Distribution._get_version() for DRY --- pkg_resources/__init__.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pkg_resources/__init__.py') 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 -- cgit v1.2.3