mercurial-scm/hg: comparison contrib/byteify-strings.py

equal deleted inserted replaced

-:57875cf423c9
+:2372284d9457
 import sys
 import tempfile
 import token
 import tokenize
 def adjusttokenpos(t, ofs):
 """Adjust start/end column of the given token"""
-return t._replace(start=(t.start[0], t.start[1] + ofs),
+return t._replace(
-end=(t.end[0], t.end[1] + ofs))
+start=(t.start[0], t.start[1] + ofs), end=(t.end[0], t.end[1] + ofs)
+)
 def replacetokens(tokens, opts):
 """Transform a stream of tokens from raw to Python 3.
 Returns a generator of possibly rewritten tokens.
 """
 k = j
 currtoken = tokens[k]
 while currtoken.type in (token.STRING, token.NEWLINE, tokenize.NL):
 k += 1
-if (
+if currtoken.type == token.STRING and currtoken.string.startswith(
-currtoken.type == token.STRING
+("'", '"')
-and currtoken.string.startswith(("'", '"'))
 ):
 sysstrtokens.add(currtoken)
 try:
 currtoken = tokens[k]
 except IndexError:
 coldelta = 0  # column increment for new opening parens
 coloffset = -1  # column offset for the current line (-1: TBD)
 parens = [(0, 0, 0, -1)]  # stack of (line, end-column, column-offset, type)
 ignorenextline = False  # don't transform the next line
-insideignoreblock = False # don't transform until turned off
+insideignoreblock = False  # don't transform until turned off
 for i, t in enumerate(tokens):
 # Compute the column offset for the current line, such that
 # the current line will be aligned to the last opening paren
 # as before.
 if coloffset < 0:
 lastparen = parens[-1]
 if t.start[1] == lastparen[1]:
 coloffset = lastparen[2]
-elif (
+elif t.start[1] + 1 == lastparen[1] and lastparen[3] not in (
-t.start[1] + 1 == lastparen[1]
+token.NEWLINE,
-and lastparen[3] not in (token.NEWLINE, tokenize.NL)
+tokenize.NL,
 ):
 # fix misaligned indent of s/util.Abort/error.Abort/
 coloffset = lastparen[2] + (lastparen[1] - t.start[1])
 else:
 coloffset = 0
 if s[0] not in ("'", '"'):
 yield adjusttokenpos(t, coloffset)
 continue
 # String literal. Prefix to make a b'' string.
-yield adjusttokenpos(t._replace(string='b%s' % t.string),
+yield adjusttokenpos(t._replace(string='b%s' % t.string), coloffset)
-coloffset)
 coldelta += 1
 continue
 # This looks like a function call.
 if t.type == token.NAME and _isop(i + 1, '('):
 fn = t.string
 # *attr() builtins don't accept byte strings to 2nd argument.
 if fn in (
-'getattr', 'setattr', 'hasattr', 'safehasattr', 'wrapfunction',
+'getattr',
-'wrapclass', 'addattr'
+'setattr',
+'hasattr',
+'safehasattr',
+'wrapfunction',
+'wrapclass',
+'addattr',
 ) and (opts['allow-attr-methods'] or not _isop(i - 1, '.')):
 arg1idx = _findargnofcall(1)
 if arg1idx is not None:
 _ensuresysstr(arg1idx)
 _ensuresysstr(i + 2)
 if _ismethodcall(i, 'get', 'pop', 'setdefault', 'popitem'):
 _ensuresysstr(i + 4)
 # Looks like "if __name__ == '__main__'".
-if (t.type == token.NAME and t.string == '__name__'
+if (
-and _isop(i + 1, '==')):
+t.type == token.NAME
+and t.string == '__name__'
+and _isop(i + 1, '==')
+):
 _ensuresysstr(i + 2)
 # Emit unmodified token.
 yield adjusttokenpos(t, coloffset)
 def process(fin, fout, opts):
 tokens = tokenize.tokenize(fin.readline)
 tokens = replacetokens(list(tokens), opts)
 fout.write(tokenize.untokenize(tokens))
 def tryunlink(fname):
 try:
 os.unlink(fname)
 except OSError as err:
 if err.errno != errno.ENOENT:
 raise
 @contextlib.contextmanager
 def editinplace(fname):
 n = os.path.basename(fname)
 d = os.path.dirname(fname)
-fp = tempfile.NamedTemporaryFile(prefix='.%s-' % n, suffix='~', dir=d,
+fp = tempfile.NamedTemporaryFile(
-delete=False)
+prefix='.%s-' % n, suffix='~', dir=d, delete=False
+)
 try:
 yield fp
 fp.close()
 if os.name == 'nt':
 tryunlink(fname)
 os.rename(fp.name, fname)
 finally:
 fp.close()
 tryunlink(fp.name)
 def main():
 ap = argparse.ArgumentParser()
-ap.add_argument('--version', action='version',
+ap.add_argument(
-version='Byteify strings 1.0')
+'--version', action='version', version='Byteify strings 1.0'
-ap.add_argument('-i', '--inplace', action='store_true', default=False,
+)
-help='edit files in place')
+ap.add_argument(
-ap.add_argument('--dictiter', action='store_true', default=False,
+'-i',
-help='rewrite iteritems() and itervalues()'),
+'--inplace',
-ap.add_argument('--allow-attr-methods', action='store_true',
+action='store_true',
 default=False,
-help='also handle attr*() when they are methods'),
+help='edit files in place',
-ap.add_argument('--treat-as-kwargs', nargs="+", default=[],
+)
-help="ignore kwargs-like objects"),
+ap.add_argument(
+'--dictiter',
+action='store_true',
+default=False,
+help='rewrite iteritems() and itervalues()',
+),
+ap.add_argument(
+'--allow-attr-methods',
+action='store_true',
+default=False,
+help='also handle attr*() when they are methods',
+),
+ap.add_argument(
+'--treat-as-kwargs',
+nargs="+",
+default=[],
+help="ignore kwargs-like objects",
+),
 ap.add_argument('files', metavar='FILE', nargs='+', help='source file')
 args = ap.parse_args()
 opts = {
 'dictiter': args.dictiter,
 'treat-as-kwargs': set(args.treat_as_kwargs),
 else:
 with open(fname, 'rb') as fin:
 fout = sys.stdout.buffer
 process(fin, fout, opts)
 if __name__ == '__main__':
 if sys.version_info.major < 3:
 print('This script must be run under Python 3.')
 sys.exit(3)
 main()

changeset 43076	2372284d9457
parent 42701	11498aa91c03
child 43379	bb509f39d387