diff options
Diffstat (limited to 'distutils2/_backport/pkgutil.py')
| -rw-r--r-- | distutils2/_backport/pkgutil.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/distutils2/_backport/pkgutil.py b/distutils2/_backport/pkgutil.py index 33c7bd0..441ad6f 100644 --- a/distutils2/_backport/pkgutil.py +++ b/distutils2/_backport/pkgutil.py @@ -16,7 +16,7 @@ except ImportError: from md5 import md5 from distutils2.errors import DistutilsError -from distutils2.metadata import DistributionMetadata +from distutils2.metadata import Metadata from distutils2.version import suggest_normalized_version, VersionPredicate try: import cStringIO as StringIO @@ -726,7 +726,7 @@ class Distribution(object): name = '' """The name of the distribution.""" metadata = None - """A :class:`distutils2.metadata.DistributionMetadata` instance loaded with + """A :class:`distutils2.metadata.Metadata` instance loaded with the distribution's ``METADATA`` file.""" requested = False """A boolean that indicates whether the ``REQUESTED`` metadata file is @@ -738,7 +738,7 @@ class Distribution(object): self.metadata = _cache_path[path].metadata else: metadata_path = os.path.join(path, 'METADATA') - self.metadata = DistributionMetadata(path=metadata_path) + self.metadata = Metadata(path=metadata_path) self.path = path self.name = self.metadata['name'] @@ -868,7 +868,7 @@ class EggInfoDistribution(object): name = '' """The name of the distribution.""" metadata = None - """A :class:`distutils2.metadata.DistributionMetadata` instance loaded with + """A :class:`distutils2.metadata.Metadata` instance loaded with the distribution's ``METADATA`` file.""" _REQUIREMENT = re.compile(\ r'(?P<name>[-A-Za-z0-9_.]+)\s*' \ @@ -903,7 +903,7 @@ class EggInfoDistribution(object): if path.endswith('.egg'): if os.path.isdir(path): meta_path = os.path.join(path, 'EGG-INFO', 'PKG-INFO') - self.metadata = DistributionMetadata(path=meta_path) + self.metadata = Metadata(path=meta_path) try: req_path = os.path.join(path, 'EGG-INFO', 'requires.txt') requires = open(req_path, 'r').read() @@ -913,7 +913,7 @@ class EggInfoDistribution(object): # FIXME handle the case where zipfile is not available zipf = zipimport.zipimporter(path) fileobj = StringIO.StringIO(zipf.get_data('EGG-INFO/PKG-INFO')) - self.metadata = DistributionMetadata(fileobj=fileobj) + self.metadata = Metadata(fileobj=fileobj) try: requires = zipf.get_data('EGG-INFO/requires.txt') except IOError: @@ -927,7 +927,7 @@ class EggInfoDistribution(object): requires = req_f.read() except IOError: requires = None - self.metadata = DistributionMetadata(path=path) + self.metadata = Metadata(path=path) self.name = self.metadata['name'] else: raise ValueError('The path must end with .egg-info or .egg') |