From ba186b0a9526a9e1b6c720fa00024d2946004712 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 28 Nov 2015 14:08:21 -0500 Subject: Rename method as _version_from_metadata. --- pkg_resources/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 631c8547..7c3e18b4 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -2500,22 +2500,22 @@ class Distribution(object): dist_path = os.path.join(location, basename) basename, ext = os.path.splitext(basename) if ext.lower() in _distributionImpl: - # .dist-info gets much metadata differently + cls = _distributionImpl[ext.lower()] + match = EGG_NAME(basename) if match: project_name, version, py_version, platform = match.group( 'name', 'ver', 'pyver', 'plat' ) - cls = _distributionImpl[ext.lower()] - version = cls._version_from_egg_info(dist_path) or version + version = cls._version_from_metadata(dist_path) or version return cls( location, metadata, project_name=project_name, version=version, py_version=py_version, platform=platform, **kw ) @staticmethod - def _version_from_egg_info(dist_path): + def _version_from_metadata(dist_path): pass @property @@ -2815,7 +2815,7 @@ class Distribution(object): class EggInfoDistribution(Distribution): @staticmethod - def _version_from_egg_info(dist_path): + def _version_from_metadata(dist_path): """ Packages installed by distutils (e.g. numpy or scipy), which uses an old safe_version, and so -- cgit v1.2.1