Fixed line count in 'pip show' tests. Renamed 'pip.util.recursive_dependencies()' to 'pip.util.get_recursive_dependencies()'. This function now takes a list of positional arguments (was a list as first positional argument).

Author: benoitbryon

pip/commands/freeze.py

@@ -6,7 +6,7 @@
 from pip.req import InstallRequirement
 from pip.log import logger
 from pip.basecommand import Command
-from pip.util import get_installed_distributions, recursive_dependencies
+from pip.util import get_installed_distributions, get_recursive_dependencies
 
 
 # packages to exclude from freeze output
@@ -77,7 +77,7 @@ def run(self, options, args):
         only_dists = []
         if args:
             only_dists = args
-            only_dists.extend(recursive_dependencies(only_dists))
+            only_dists.extend(get_recursive_dependencies(*only_dists))
             only_dists = [name.lower() for name in only_dists]
 
         for dist in get_installed_distributions(local_only=local_only,

pip/commands/show.py

@@ -2,7 +2,7 @@
 
 from pip.basecommand import Command
 from pip.log import logger
-from pip.util import recursive_dependencies
+from pip.util import get_recursive_dependencies
 from pip._vendor import pkg_resources
 
 
@@ -80,7 +80,7 @@ def print_results(distributions, list_all_files):
         logger.notify("Location: %s" % dist['location'])
         logger.notify("Requires: %s" % ', '.join(dist['requires']))
         logger.notify("Requires recursive: %s" % ', '.join(
-            recursive_dependencies([dist['name']])))
+            get_recursive_dependencies(dist['name'])))
         if list_all_files:
             logger.notify("Files:")
             if dist['files'] is not None:

pip/util.py

@@ -400,20 +400,22 @@ def get_installed_distributions(local_only=True,
             ]
 
 
-def recursive_dependencies(query):
-    """Return list of dependencies of dists in ``query``, recursively."""
+def get_recursive_dependencies(*names):
+    """Return set of dependencies of dists in ``names``, recursively."""
     dependencies = set()
     installed = dict(
         [(p.project_name.lower(), p) for p in pkg_resources.working_set])
-    query_names = [name.lower() for name in query]
+    query_names = [name.lower() for name in names]
     for pkg in query_names:
         try:
             dist = installed[pkg]
-            for dep in dist.requires():
-                dependencies.add(dep.project_name)
-                dependencies.update(recursive_dependencies([dep.project_name]))
         except KeyError:
             pass  # pkg is not installed.
+        else:
+            for dep in dist.requires():
+                name = dep.project_name
+                dependencies.add(name)
+                dependencies.update(get_recursive_dependencies(name))
     return dependencies
 
 

tests/functional/test_show.py

@@ -9,7 +9,7 @@ def test_show(script):
     """
     result = script.pip('show', 'pip')
     lines = result.stdout.split('\n')
-    assert len(lines) == 6
+    assert len(lines) == 7
     assert lines[0] == '---', lines[0]
     assert lines[1] == 'Name: pip', lines[1]
     assert lines[2] == 'Version: %s' % __version__, lines[2]
@@ -27,7 +27,7 @@ def test_show_with_files_not_found(script, data):
     script.pip('install', '-e', editable)
     result = script.pip('show', '-f', 'SetupPyUTF8')
     lines = result.stdout.split('\n')
-    assert len(lines) == 8
+    assert len(lines) == 9
     assert lines[0] == '---', lines[0]
     assert lines[1] == 'Name: SetupPyUTF8', lines[1]
     assert lines[2] == 'Version: 0.0.0', lines[2]