mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Packaging: always use repr to display project names. 

This helps debugging in case of trailing blanks and such things.
This commit is contained in:
Éric Araujo 2011-06-08 04:40:13 +02:00
parent ea888e038b
commit 46bdcf7d4b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/packaging/depgraph.py
View File

@ -72,7 +72,7 @@ def add_missing(self, distribution, requirement):
self.missing[distribution].append(requirement) self.missing[distribution].append(requirement)
def _repr_dist(self, dist): def _repr_dist(self, dist):
return '%s %s' % (dist.name, dist.metadata['Version']) return '%r %s' % (dist.name, dist.metadata['Version'])
def repr_node(self, dist, level=1): def repr_node(self, dist, level=1):
"""Prints only a subgraph""" """Prints only a subgraph"""
@ -154,8 +154,8 @@ def generate_graph(dists):
if len(comps) == 2: if len(comps) == 2:
version = comps[1] version = comps[1]
if len(version) < 3 or version[0] != '(' or version[-1] != ')': if len(version) < 3 or version[0] != '(' or version[-1] != ')':
raise PackagingError('Distribution %s has ill formed' \ raise PackagingError('distribution %r has ill-formed'
'provides field: %s' % (dist.name, p)) 'provides field: %r' % (dist.name, p))
version = version[1:-1] # trim off parenthesis version = version[1:-1] # trim off parenthesis
if not name in provided: if not name in provided:
provided[name] = [] provided[name] = []
@ -204,8 +204,9 @@ def dependent_dists(dists, dist):
:param dists: a list of distributions :param dists: a list of distributions
:param dist: a distribution, member of *dists* for which we are interested :param dist: a distribution, member of *dists* for which we are interested
""" """
if not dist in dists: if dist not in dists:
raise ValueError('The given distribution is not a member of the list') raise ValueError('given distribution %r is not a member of the list' %
dist.name)
graph = generate_graph(dists) graph = generate_graph(dists)
dep = [dist] # dependent distributions dep = [dist] # dependent distributions
@ -243,7 +244,7 @@ def main():
for dist, reqs in graph.missing.items(): for dist, reqs in graph.missing.items():
if len(reqs) > 0: if len(reqs) > 0:
print("Warning: Missing dependencies for %s:" % dist.name, print("Warning: Missing dependencies for %r:" % dist.name,
", ".join(reqs)) ", ".join(reqs))
# XXX replace with argparse # XXX replace with argparse
if len(sys.argv) == 1: if len(sys.argv) == 1:
@ -261,7 +262,7 @@ def main():
tempout.seek(0) tempout.seek(0)
tempout = tempout.read() tempout = tempout.read()
print(tempout) print(tempout)
print('Dot file written at "%s"' % filename) print('Dot file written at %r' % filename)
sys.exit(0) sys.exit(0)
else: else:
print('Supported option: -d [filename]') print('Supported option: -d [filename]')