( )⚙ D6453 contrib: fix import-checker to operate on str instead of bytes

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6453

contrib: fix import-checker to operate on str instead of bytes
ClosedPublic

Authored by durin42 on May 29 2019, 10:14 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG04eb3c5607af: contrib: fix import-checker to operate on str instead of bytes
Summary

I believe this is fallout from other Python 3 cleanups, and our code
linting tools are now leaning towards operating on str and not
bytes. I don't feel strongly, so I've just restored this tool to
working on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.May 29 2019, 10:14 AM
pulkit accepted this revision.May 29 2019, 10:16 AM
Closed by commit rHG04eb3c5607af: contrib: fix import-checker to operate on str instead of bytes (authored by durin42). · Explain WhyMay 29 2019, 10:32 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/import-checker.py (20 lines)

Diff 15288

contrib/import-checker.py

... if not isinstance(thing, str): ... if not isinstance(thing, str):
... return thing.decode('ascii') ... return thing.decode('ascii')
... return thing ... return thing
>>> def test(fn, lines): >>> def test(fn, lines):
... for s, m, f, l in embedded(fn, b"example", lines): ... for s, m, f, l in embedded(fn, b"example", lines):
... print("%s %s %d" % (_forcestr(m), _forcestr(f), l)) ... print("%s %s %d" % (_forcestr(m), _forcestr(f), l))
... print(repr(_forcestr(s))) ... print(repr(_forcestr(s)))
>>> lines = [ >>> lines = [
... b'comment', ... 'comment',
... b' >>> from __future__ import print_function', ... ' >>> from __future__ import print_function',
... b" >>> ' multiline", ... " >>> ' multiline",
... b" ... string'", ... " ... string'",
... b' ', ... ' ',
... b'comment', ... 'comment',
... b' $ cat > foo.py <<EOF', ... ' $ cat > foo.py <<EOF',
... b' > from __future__ import print_function', ... ' > from __future__ import print_function',
... b' > EOF', ... ' > EOF',
... ] ... ]
>>> test(b"example.t", lines) >>> test(b"example.t", lines)
example[2] doctest.py 1 example[2] doctest.py 1
"from __future__ import print_function\\n' multiline\\nstring'\\n\\n" "from __future__ import print_function\\n' multiline\\nstring'\\n\\n"
example[8] foo.py 7 example[8] foo.py 7
'from __future__ import print_function\\n' 'from __future__ import print_function\\n'
""" """
errors = [] errors = []
the input file. the input file.
""" """
py = False py = False
if not f.endswith('.t'): if not f.endswith('.t'):
with open(f, 'rb') as src: with open(f, 'rb') as src:
yield src.read(), modname, f, 0 yield src.read(), modname, f, 0
py = True py = True
if py or f.endswith('.t'): if py or f.endswith('.t'):
with open(f, 'rb') as src: with open(f, 'r') as src:
for script, modname, t, line in embedded(f, modname, src): for script, modname, t, line in embedded(f, modname, src):
yield script, modname.encode('utf8'), t, line yield script, modname.encode('utf8'), t, line
def main(argv): def main(argv):
if len(argv) < 2 or (argv[1] == '-' and len(argv) > 2): if len(argv) < 2 or (argv[1] == '-' and len(argv) > 2):
print('Usage: %s {-|file [file] [file] ...}') print('Usage: %s {-|file [file] [file] ...}')
return 1 return 1
if argv[1] == '-': if argv[1] == '-':