# HG changeset patch # User Yuya Nishihara # Date 1475994699 -7200 # Node ID 68010ed1636da51fe5cde2e12ef57f7e55bfa701 # Parent 67b0484c9ce4960b67aa634f097c4d833e1d034a py3: include module filename in check-py3-compat.py output This change is intended to reduce noises in the next patch. diff -r 67b0484c9ce4 -r 68010ed1636d contrib/check-py3-compat.py --- a/contrib/check-py3-compat.py Sat Oct 08 19:16:50 2016 +0200 +++ b/contrib/check-py3-compat.py Sun Oct 09 08:31:39 2016 +0200 @@ -58,7 +58,7 @@ name = f.replace('/', '.')[:-3].replace('.pure.', '.') with open(f, 'r') as fh: try: - imp.load_module(name, fh, '', ('py', 'r', imp.PY_SOURCE)) + imp.load_module(name, fh, f, ('py', 'r', imp.PY_SOURCE)) except Exception as e: exc_type, exc_value, tb = sys.exc_info() # We walk the stack and ignore frames from our custom importer, diff -r 67b0484c9ce4 -r 68010ed1636d tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t Sat Oct 08 19:16:50 2016 +0200 +++ b/tests/test-check-py3-compat.t Sun Oct 09 08:31:39 2016 +0200 @@ -16,43 +16,43 @@ $ hg files 'set:(**.py) - grep(pygments)' | sed 's|\\|/|g' \ > | xargs $PYTHON3 contrib/check-py3-compat.py \ > | sed 's/[0-9][0-9]*)$/*)/' - hgext/convert/bzr.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/convcmd.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/cvs.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/darcs.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/filemap.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/git.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/gnuarch.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/hg.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/monotone.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/p4.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/subversion.py: error importing module: Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) - hgext/convert/transport.py: error importing module: No module named 'svn.client' (line *) - hgext/fsmonitor/watchmanclient.py: error importing module: Parent module 'hgext.fsmonitor' not loaded, cannot perform relative import (line *) - hgext/journal.py: error importing module: Parent module 'hgext' not loaded, cannot perform relative import (line *) - hgext/largefiles/basestore.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/largefiles/lfcommands.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/largefiles/localstore.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/largefiles/overrides.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/largefiles/proto.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/largefiles/remotestore.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/largefiles/reposetup.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/largefiles/storefactory.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/largefiles/uisetup.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) - hgext/largefiles/wirestore.py: error importing module: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (line *) + hgext/convert/bzr.py: error importing: Parent module 'hgext.convert' not loaded, cannot perform relative import (error at bzr.py:*) + hgext/convert/convcmd.py: error importing: Parent module 'hgext.convert' not loaded, cannot perform relative import (error at convcmd.py:*) + hgext/convert/cvs.py: error importing: Parent module 'hgext.convert' not loaded, cannot perform relative import (error at cvs.py:*) + hgext/convert/darcs.py: error importing: Parent module 'hgext.convert' not loaded, cannot perform relative import (error at darcs.py:*) + hgext/convert/filemap.py: error importing: Parent module 'hgext.convert' not loaded, cannot perform relative import (error at filemap.py:*) + hgext/convert/git.py: error importing: Parent module 'hgext.convert' not loaded, cannot perform relative import (error at git.py:*) + hgext/convert/gnuarch.py: error importing: Parent module 'hgext.convert' not loaded, cannot perform relative import (error at gnuarch.py:*) + hgext/convert/hg.py: error importing: Parent module 'hgext.convert' not loaded, cannot perform relative import (error at hg.py:*) + hgext/convert/monotone.py: error importing: Parent module 'hgext.convert' not loaded, cannot perform relative import (error at monotone.py:*) + hgext/convert/p4.py: error importing: Parent module 'hgext.convert' not loaded, cannot perform relative import (error at p4.py:*) + hgext/convert/subversion.py: error importing: Parent module 'hgext.convert' not loaded, cannot perform relative import (error at subversion.py:*) + hgext/convert/transport.py: error importing: No module named 'svn.client' (error at transport.py:*) + hgext/fsmonitor/watchmanclient.py: error importing: Parent module 'hgext.fsmonitor' not loaded, cannot perform relative import (error at watchmanclient.py:*) + hgext/journal.py: error importing: Parent module 'hgext' not loaded, cannot perform relative import (error at journal.py:*) + hgext/largefiles/basestore.py: error importing: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (error at basestore.py:*) + hgext/largefiles/lfcommands.py: error importing: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (error at lfcommands.py:*) + hgext/largefiles/localstore.py: error importing: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (error at localstore.py:*) + hgext/largefiles/overrides.py: error importing: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (error at overrides.py:*) + hgext/largefiles/proto.py: error importing: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (error at proto.py:*) + hgext/largefiles/remotestore.py: error importing: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (error at remotestore.py:*) + hgext/largefiles/reposetup.py: error importing: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (error at reposetup.py:*) + hgext/largefiles/storefactory.py: error importing: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (error at storefactory.py:*) + hgext/largefiles/uisetup.py: error importing: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (error at uisetup.py:*) + hgext/largefiles/wirestore.py: error importing: Parent module 'hgext.largefiles' not loaded, cannot perform relative import (error at wirestore.py:*) hgext/mq.py: error importing: startswith first arg must be str or a tuple of str, not bytes (error at extensions.py:*) hgext/rebase.py: error importing: Can't convert 'bytes' object to str implicitly (error at registrar.py:*) - hgext/record.py: error importing module: '^commit|ci' (line *) - hgext/shelve.py: error importing module: Parent module 'hgext' not loaded, cannot perform relative import (line *) + hgext/record.py: error importing: '^commit|ci' (error at record.py:*) + hgext/shelve.py: error importing: Parent module 'hgext' not loaded, cannot perform relative import (error at shelve.py:*) hgext/transplant.py: error importing: Can't convert 'bytes' object to str implicitly (error at registrar.py:*) - mercurial/encoding.py: error importing module: bytes expected, not str (line *) + mercurial/encoding.py: error importing: bytes expected, not str (error at encoding.py:*) mercurial/fileset.py: error importing: Can't convert 'bytes' object to str implicitly (error at registrar.py:*) - mercurial/i18n.py: error importing module: bytes expected, not str (line *) - mercurial/revset.py: error importing module: 'dict' object has no attribute 'iteritems' (line *) - mercurial/scmwindows.py: error importing module: No module named 'winreg' (line *) - mercurial/store.py: error importing module: Can't convert 'bytes' object to str implicitly (line *) - mercurial/win32.py: error importing module: No module named 'msvcrt' (line *) - mercurial/windows.py: error importing module: No module named 'msvcrt' (line *) + mercurial/i18n.py: error importing: bytes expected, not str (error at i18n.py:*) + mercurial/revset.py: error importing: 'dict' object has no attribute 'iteritems' (error at revset.py:*) + mercurial/scmwindows.py: error importing: No module named 'winreg' (error at scmwindows.py:*) + mercurial/store.py: error importing: Can't convert 'bytes' object to str implicitly (error at store.py:*) + mercurial/win32.py: error importing: No module named 'msvcrt' (error at win32.py:*) + mercurial/windows.py: error importing: No module named 'msvcrt' (error at windows.py:*) #endif