This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5046

hgdemandimport: adjust imports to reflect vendored module
AbandonedPublic

Authored by indygreg on Oct 13 2018, 3:28 AM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

The "token" module is renamed in our local copy. Import it appropriately.

This angered test-check-module-imports due to attempting relative import of
stdlib module and direct symbol imports. We suppress that check on this file
since it is mostly 3rd party code.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Oct 13 2018, 3:28 AM
baymax requested changes to this revision.Jan 24 2020, 12:32 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:32 PM
indygreg abandoned this revision.Jan 24 2020, 11:51 PM

Revision Contents
Changeset List

Diff 12002

hgdemandimport/py3token.py

# #
# 8. By copying, installing or otherwise using Python, Licensee # 8. By copying, installing or otherwise using Python, Licensee
# agrees to be bound by the terms and conditions of this License # agrees to be bound by the terms and conditions of this License
# Agreement. # Agreement.
# Changes from official Python source code: # Changes from official Python source code:
# #
# * _main() and related functionality removed. # * _main() and related functionality removed.
# * absolute_import added.
"""Token constants (from "token.h").""" """Token constants (from "token.h")."""
from __future__ import absolute_import
__all__ = ['tok_name', 'ISTERMINAL', 'ISNONTERMINAL', 'ISEOF'] __all__ = ['tok_name', 'ISTERMINAL', 'ISNONTERMINAL', 'ISEOF']
# This file is automatically generated; please don't muck it up! # This file is automatically generated; please don't muck it up!
# #
# To update the symbols in this file, 'cd' to the top directory of # To update the symbols in this file, 'cd' to the top directory of
# the python source tree after building the interpreter and run: # the python source tree after building the interpreter and run:
# #
# ./python Lib/token.py # ./python Lib/token.py

hgdemandimport/py3tokenize.py

# Agreement. # Agreement.
# Changes from official Python source code: # Changes from official Python source code:
# #
# * Removed main() and related functionality. # * Removed main() and related functionality.
# * Removed generate_tokens(). # * Removed generate_tokens().
# * Removed open(). # * Removed open().
# * Removed module docstring. # * Removed module docstring.
# * Adjusted for relative imports.
# * absolute_import added.
from __future__ import absolute_import
__author__ = 'Ka-Ping Yee <ping@lfw.org>' __author__ = 'Ka-Ping Yee <ping@lfw.org>'
__credits__ = ('GvR, ESR, Tim Peters, Thomas Wouters, Fred Drake, ' __credits__ = ('GvR, ESR, Tim Peters, Thomas Wouters, Fred Drake, '
'Skip Montanaro, Raymond Hettinger, Trent Nelson, ' 'Skip Montanaro, Raymond Hettinger, Trent Nelson, '
'Michael Foord') 'Michael Foord')
from codecs import lookup, BOM_UTF8 from codecs import lookup, BOM_UTF8
import collections import collections
from itertools import chain from itertools import chain
import itertools as _itertools import itertools as _itertools
import re import re
from token import * from .py3token import *
cookie_re = re.compile(r'^[ \t\f]*#.*?coding[:=][ \t]*([-\w.]+)', re.ASCII) cookie_re = re.compile(r'^[ \t\f]*#.*?coding[:=][ \t]*([-\w.]+)', re.ASCII)
blank_re = re.compile(br'^[ \t\f]*(?:[#\r\n]|$)', re.ASCII) blank_re = re.compile(br'^[ \t\f]*(?:[#\r\n]|$)', re.ASCII)
import token from . import py3token
__all__ = token.__all__ + ["tokenize", "detect_encoding", __all__ = py3token.__all__ + ["tokenize", "detect_encoding",
"untokenize", "TokenInfo"] "untokenize", "TokenInfo"]
del token del py3token
EXACT_TOKEN_TYPES = { EXACT_TOKEN_TYPES = {
'(': LPAR, '(': LPAR,
')': RPAR, ')': RPAR,
'[': LSQB, '[': LSQB,
']': RSQB, ']': RSQB,
':': COLON, ':': COLON,
',': COMMA, ',': COMMA,

tests/test-check-module-imports.t

> -X setup.py \ > -X setup.py \
> -X contrib/debugshell.py \ > -X contrib/debugshell.py \
> -X contrib/hgweb.fcgi \ > -X contrib/hgweb.fcgi \
> -X contrib/packaging/hg-docker \ > -X contrib/packaging/hg-docker \
> -X contrib/python-zstandard/ \ > -X contrib/python-zstandard/ \
> -X contrib/win32/hgwebdir_wsgi.py \ > -X contrib/win32/hgwebdir_wsgi.py \
> -X doc/gendoc.py \ > -X doc/gendoc.py \
> -X doc/hgmanpage.py \ > -X doc/hgmanpage.py \
> -X hgdemandimport/py3tokenize.py \
> -X i18n/posplit \ > -X i18n/posplit \
> -X mercurial/thirdparty \ > -X mercurial/thirdparty \
> -X tests/hypothesishelpers.py \ > -X tests/hypothesishelpers.py \
> -X tests/test-check-interfaces.py \ > -X tests/test-check-interfaces.py \
> -X tests/test-commit-interactive.t \ > -X tests/test-commit-interactive.t \
> -X tests/test-contrib-check-code.t \ > -X tests/test-contrib-check-code.t \
> -X tests/test-demandimport.py \ > -X tests/test-demandimport.py \
> -X tests/test-extension.t \ > -X tests/test-extension.t \