mercurial-scm/hg: comparison contrib/import-checker.py

equal deleted inserted replaced

-:cdf331b54eb8
+:02ee31a50002
 mod = dotted_name_of_path(rel_path)
 yield mod
 stdlib_modules = set(list_stdlib_modules())
-def imported_modules(source, modulename, localmods, ignore_nested=False):
+def imported_modules(source, modulename, f, localmods, ignore_nested=False):
 """Given the source of a file as a string, yield the names
 imported by that file.
 Args:
 source: The python source to examine as a string.
 column zero will be ignored.
 Returns:
 A list of absolute module names imported by the given source.
+>>> f = 'foo/xxx.py'
 >>> modulename = 'foo.xxx'
 >>> localmods = {'foo.__init__': True,
 ...              'foo.foo1': True, 'foo.foo2': True,
 ...              'foo.bar.__init__': True, 'foo.bar.bar1': True,
 ...              'baz.__init__': True, 'baz.baz1': True }
 >>> # standard library (= not locally defined ones)
 >>> sorted(imported_modules(
 ...        'from stdlib1 import foo, bar; import stdlib2',
-...        modulename, localmods))
+...        modulename, f, localmods))
 []
 >>> # relative importing
 >>> sorted(imported_modules(
 ...        'import foo1; from bar import bar1',
-...        modulename, localmods))
+...        modulename, f, localmods))
 ['foo.bar.bar1', 'foo.foo1']
 >>> sorted(imported_modules(
 ...        'from bar.bar1 import name1, name2, name3',
-...        modulename, localmods))
+...        modulename, f, localmods))
 ['foo.bar.bar1']
 >>> # absolute importing
 >>> sorted(imported_modules(
 ...        'from baz import baz1, name1',
-...        modulename, localmods))
+...        modulename, f, localmods))
 ['baz.__init__', 'baz.baz1']
 >>> # mixed importing, even though it shouldn't be recommended
 >>> sorted(imported_modules(
 ...        'import stdlib, foo1, baz',
-...        modulename, localmods))
+...        modulename, f, localmods))
 ['baz.__init__', 'foo.foo1']
 >>> # ignore_nested
 >>> sorted(imported_modules(
 ... '''import foo
 ... def wat():
 ...     import bar
-... ''', modulename, localmods))
+... ''', modulename, f, localmods))
 ['foo.__init__', 'foo.bar.__init__']
 >>> sorted(imported_modules(
 ... '''import foo
 ... def wat():
 ...     import bar
-... ''', modulename, localmods, ignore_nested=True))
+... ''', modulename, f, localmods, ignore_nested=True))
 ['foo.__init__']
 """
 fromlocal = fromlocalfunc(modulename, localmods)
-for node in ast.walk(ast.parse(source)):
+for node in ast.walk(ast.parse(source, f)):
 if ignore_nested and getattr(node, 'col_offset', 0) > 0:
 continue
 if isinstance(node, ast.Import):
 for n in node.names:
 found = fromlocal(n.name)
 localmods[modname] = source_path
 for localmodname, source_path in sorted(localmods.items()):
 for src, modname in sources(source_path, localmodname):
 try:
 used_imports[modname] = sorted(
-imported_modules(src, modname, localmods,
+imported_modules(src, modname, source_path, localmods,
 ignore_nested=True))
 for error, lineno in verify_import_convention(modname, src,
 localmods):
 any_errors = True
 print('%s:%d: %s' % (source_path, lineno, error))

changeset 28921	02ee31a50002
parent 28920	cdf331b54eb8
child 28922	4ec62a084e5c