Merge lp:~mterry/python-distutils-extra/746565 into lp:python-distutils-extra

[Michael Terry]

[Martin Pitt (pitti)]

Thanks for this!

Do you have an example where the current code goes wrong? I'd like to add a test case for it.

review: Needs Information

[Michael Terry (mterry)]

Sure. Have the following code layout:

mymodule/
  __init__.py
  foo.py
  bar.py

In foo.py, have:

"""
from mymodule.bar import a
from bar import b
from . bar import c
"""

The first import was always correctly ignored (it detected mymodule as a provided module).

The second import is an implicit relative import that the current code will still have problems with, as my change does not affect that.

My change does fix the third import.

[Martin Pitt (pitti)]

Ah, thanks! I merged this together with a test case update which reproduces this.

I'll also try to fix the second case.

review: Approve

=== modified file 'DistUtilsExtra/auto.py'
--- DistUtilsExtra/auto.py	2011-03-15 20:58:51 +0000
+++ DistUtilsExtra/auto.py	2011-03-31 16:52:55 +0000
@@ -345,7 +345,7 @@
                     if __external_mod(alias.name, attrs):
                         imports.add(alias.name)
             if isinstance(node, ast.ImportFrom):
-                if __external_mod(node.module, attrs):
+                if node.level == 0 and __external_mod(node.module, attrs):
                     imports.add(node.module)
     except SyntaxError, e:
         sys.stderr.write('WARNING: syntax errors in %s: %s\n' % (file, str(e)))