summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <distutils-sig@python.org>2005-03-24 20:29:19 +0000
committerBob Ippolito <distutils-sig@python.org>2005-03-24 20:29:19 +0000
commitd46f322f622281f23c194396f94d2c42e2827b4f (patch)
tree06ee1ab4330fcf6e233e41bdc86b3729b0d52375
parentf58bc069bff975850773108bb7c52848290d64c0 (diff)
downloadpython-setuptools-git-d46f322f622281f23c194396f94d2c42e2827b4f.tar.gz
Specify and implement # comments in get_metadata_lines
A few more PEP 8 formatting fixes for pkg_resources --HG-- branch : setuptools extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4040997
-rw-r--r--pkg_resources.py19
1 files changed, 12 insertions, 7 deletions
diff --git a/pkg_resources.py b/pkg_resources.py
index 15fc862e..08b75362 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -77,7 +77,9 @@ class IResourceProvider:
"""The named metadata resource as a string"""
def get_metadata_lines(name):
- """The named metadata resource as a filtered iterator of stripped lines"""
+ """The named metadata resource as a filtered iterator of
+ stripped (of # comments and whitespace) lines
+ """
# XXX list_resources? glob_resources?
@@ -96,15 +98,18 @@ class ResourceManager:
def resource_filename(self, package_name, resource_name):
"""Return a true filesystem path for specified resource"""
- return get_provider(package_name).get_resource_filename(self, resource_name)
+ return get_provider(package_name).get_resource_filename(self,
+ resource_name)
def resource_stream(self, package_name, resource_name):
"""Return a readable file-like object for specified resource"""
- return get_provider(package_name).get_resource_stream(self, resource_name)
+ return get_provider(package_name).get_resource_stream(self,
+ resource_name)
def resource_string(self, package_name, resource_name):
"""Return specified resource as a string"""
- return get_provider(package_name).get_resource_string(self, resource_name)
+ return get_provider(package_name).get_resource_string(self,
+ resource_name)
def get_cache_path(self, archive_name, names=()):
"""Return absolute location in cache for `archive_name` and `names`
@@ -212,7 +217,7 @@ class DefaultProvider:
def __init__(self, module):
self.module = module
- self.loader = getattr(module, '__loader__',None)
+ self.loader = getattr(module, '__loader__', None)
self.module_path = os.path.dirname(module.__file__)
def get_resource_filename(self, manager, resource_name):
@@ -240,7 +245,7 @@ class DefaultProvider:
def get_metadata_lines(self, name):
for line in self.get_metadata(name).splitlines():
line = line.strip()
- if line:
+ if not line.startswith('#'):
yield line
def _has(self, path):
@@ -329,7 +334,7 @@ class ZipProvider(DefaultProvider):
(t & 0x1F) * 2, 0, 0, -1
)
timestamp = time.mktime(date_time)
- real_path = manager.get_cache_path(self.egg_name, self.prefix+parts)
+ real_path = manager.get_cache_path(self.egg_name, self.prefix + parts)
if os.path.isfile(real_path):
stat = os.stat(real_path)