check: check modules in hgdemandimport

A few places only check modules in mercurial and hgext. Add
hgdemandimport to the list in those places.

contrib/check-py3-compat.py

@@ -1,95 +1,96 b''
 #!/usr/bin/env python
 #
 # check-py3-compat - check Python 3 compatibility of Mercurial files
 #
 # Copyright 2015 Gregory Szorc <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from __future__ import absolute_import, print_function
 
 import ast
 import importlib
 import os
 import sys
 import traceback
 
 def check_compat_py2(f):
     """Check Python 3 compatibility for a file with Python 2"""
     with open(f, 'rb') as fh:
         content = fh.read()
     root = ast.parse(content)
 
     # Ignore empty files.
     if not root.body:
         return
 
     futures = set()
     haveprint = False
     for node in ast.walk(root):
         if isinstance(node, ast.ImportFrom):
             if node.module == '__future__':
                 futures |= set(n.name for n in node.names)
         elif isinstance(node, ast.Print):
             haveprint = True
 
     if 'absolute_import' not in futures:
         print('%s not using absolute_import' % f)
     if haveprint and 'print_function' not in futures:
         print('%s requires print_function' % f)
 
 def check_compat_py3(f):
     """Check Python 3 compatibility of a file with Python 3."""
     with open(f, 'rb') as fh:
         content = fh.read()
 
     try:
         ast.parse(content)
     except SyntaxError as e:
         print('%s: invalid syntax: %s' % (f, e))
         return
 
     # Try to import the module.
-    # For now we only support mercurial.* and hgext.* modules because figuring
-    # out module paths for things not in a package can be confusing.
-    if f.startswith(('hgext/', 'mercurial/')) and not f.endswith('__init__.py'):
+    # For now we only support modules in packages because figuring out module
+    # paths for things not in a package can be confusing.
+    if (f.startswith(('hgdemandimport/', 'hgext/', 'mercurial/'))
+        and not f.endswith('__init__.py')):
         assert f.endswith('.py')
         name = f.replace('/', '.')[:-3]
         try:
             importlib.import_module(name)
         except Exception as e:
             exc_type, exc_value, tb = sys.exc_info()
             # We walk the stack and ignore frames from our custom importer,
             # import mechanisms, and stdlib modules. This kinda/sorta
             # emulates CPython behavior in import.c while also attempting
             # to pin blame on a Mercurial file.
             for frame in reversed(traceback.extract_tb(tb)):
                 if frame.name == '_call_with_frames_removed':
                     continue
                 if 'importlib' in frame.filename:
                     continue
                 if 'mercurial/__init__.py' in frame.filename:
                     continue
                 if frame.filename.startswith(sys.prefix):
                     continue
                 break
 
             if frame.filename:
                 filename = os.path.basename(frame.filename)
                 print('%s: error importing: <%s> %s (error at %s:%d)' % (
                       f, type(e).__name__, e, filename, frame.lineno))
             else:
                 print('%s: error importing module: <%s> %s (line %d)' % (
                       f, type(e).__name__, e, frame.lineno))
 
 if __name__ == '__main__':
     if sys.version_info[0] == 2:
         fn = check_compat_py2
     else:
         fn = check_compat_py3
 
     for f in sys.argv[1:]:
         fn(f)
 
     sys.exit(0)

tests/test-check-help.t

@@ -1,28 +1,28 b''
 #require test-repo
 
   $ . "$TESTDIR/helpers-testrepo.sh"
 
   $ cat <<'EOF' > scanhelptopics.py
   > from __future__ import absolute_import, print_function
   > import re
   > import sys
   > if sys.platform == "win32":
   >     import os, msvcrt
   >     msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
   > topics = set()
   > topicre = re.compile(r':hg:`help ([a-z0-9\-.]+)`')
   > for fname in sys.argv:
   >     with open(fname) as f:
   >         topics.update(m.group(1) for m in topicre.finditer(f.read()))
   > for s in sorted(topics):
   >     print(s)
   > EOF
 
   $ cd "$TESTDIR"/..
 
 Check if ":hg:`help TOPIC`" is valid:
 (use "xargs -n1 -t" to see which help commands are executed)
 
-  $ hg files 'glob:{hgext,mercurial}/**/*.py' | sed 's|\\|/|g' \
+  $ hg files 'glob:{hgdemandimport,hgext,mercurial}/**/*.py' | sed 's|\\|/|g' \
   > | xargs python "$TESTTMP/scanhelptopics.py" \
   > | xargs -n1 hg help > /dev/null

tests/test-check-pylint.t

@@ -1,19 +1,19 b''
 #require test-repo pylint hg10
 
 Run pylint for known rules we care about.
 -----------------------------------------
 
 There should be no recorded failures; fix the codebase before introducing a
 new check.
 
 Current checks:
 - W0102: no mutable default argument
 
   $ touch $TESTTMP/fakerc
   $ pylint --rcfile=$TESTTMP/fakerc --disable=all \
   >   --enable=W0102 --reports=no \
-  >   mercurial hgext hgext3rd
+  >   mercurial hgdemandimport hgext hgext3rd
    (?)
   ------------------------------------ (?)
   Your code has been rated at 10.00/10 (?)
    (?)