diff options
| author | Kelsey Hightower <kelsey.hightower@gmail.com> | 2011-02-28 21:42:32 -0500 |
|---|---|---|
| committer | Kelsey Hightower <kelsey.hightower@gmail.com> | 2011-02-28 21:42:32 -0500 |
| commit | 829926221be3f5193993febd18a221f377166658 (patch) | |
| tree | 167fec12f352447f8bfa99a5d75566fa7940b608 /distutils2 | |
| parent | 9dc8c0a70f33187d44d346be39443923cee95a1f (diff) | |
| download | disutils2-829926221be3f5193993febd18a221f377166658.tar.gz | |
pep8/pyflakes fixes for distutils2.depgraph
Diffstat (limited to 'distutils2')
| -rw-r--r-- | distutils2/depgraph.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/distutils2/depgraph.py b/distutils2/depgraph.py index 1121b4c..6d2295c 100644 --- a/distutils2/depgraph.py +++ b/distutils2/depgraph.py @@ -78,7 +78,7 @@ class DependencyGraph(object): if label is not None: dist = '%s [%s]' % (dist, label) output.append(' ' * level + '%s' % dist) - suboutput = self.repr_node(other, level+1) + suboutput = self.repr_node(other, level + 1) subs = suboutput.split('\n') output.extend(subs[1:]) return '\n'.join(output) @@ -133,16 +133,16 @@ def generate_graph(dists): :rtype: an :class:`DependencyGraph` instance """ graph = DependencyGraph() - provided = {} # maps names to lists of (version, dist) tuples - dists = list(dists) # maybe use generator_tools in future + provided = {} # maps names to lists of (version, dist) tuples + dists = list(dists) # maybe use generator_tools in future # first, build the graph and find out the provides for dist in dists: graph.add_distribution(dist) - provides = (dist.metadata['Provides-Dist'] + dist.metadata['Provides'] + + provides = (dist.metadata['Provides-Dist'] + + dist.metadata['Provides'] + ['%s (%s)' % (dist.name, dist.metadata['Version'])]) - for p in provides: comps = p.strip().rsplit(" ", 1) name = comps[0] @@ -152,7 +152,7 @@ def generate_graph(dists): if len(version) < 3 or version[0] != '(' or version[-1] != ')': raise DistutilsError('Distribution %s has ill formed' \ 'provides field: %s' % (dist.name, p)) - version = version[1:-1] # trim off parenthesis + version = version[1:-1] # trim off parenthesis if not name in provided: provided[name] = [] provided[name].append((version, dist)) @@ -179,7 +179,7 @@ def generate_graph(dists): match = predicate.match(version) except IrrationalVersionError: # XXX small compat-mode - if version.split(' ' ) == 1: + if version.split(' ') == 1: match = True else: match = False @@ -204,8 +204,8 @@ def dependent_dists(dists, dist): raise ValueError('The given distribution is not a member of the list') graph = generate_graph(dists) - dep = [dist] # dependent distributions - fringe = graph.reverse_list[dist] # list of nodes we should inspect + dep = [dist] # dependent distributions + fringe = graph.reverse_list[dist] # list of nodes we should inspect while not len(fringe) == 0: node = fringe.pop() @@ -214,9 +214,10 @@ def dependent_dists(dists, dist): if not prev in dep: fringe.append(prev) - dep.pop(0) # remove dist from dep, was there to prevent infinite loops + dep.pop(0) # remove dist from dep, was there to prevent infinite loops return dep + def main(): from distutils2._backport.pkgutil import get_distributions tempout = StringIO() |
