This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4034

py3: stop rewriting xrange() to pycompat.xrange()
ClosedPublic

Authored by indygreg on Aug 1 2018, 4:10 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGfb9121ea38c4: py3: stop rewriting xrange() to pycompat.xrange()
rHG6558f24f2202: py3: stop rewriting xrange() to pycompat.xrange()
Summary

We now require the use of pycompat.xrange() in source.

One less feature in the module importer gets us one step closer
to Python 3 native source code.

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

indygreg created this revision.Aug 1 2018, 4:10 PM
durin42 accepted this revision.Aug 1 2018, 4:18 PM
This revision is now accepted and ready to land.Aug 1 2018, 4:18 PM
Closed by commit rHG6558f24f2202: py3: stop rewriting xrange() to pycompat.xrange() (authored by indygreg). · Explain WhyAug 1 2018, 4:19 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Aug 2 2018, 8:57 AM

Need to bump BYTECODEHEADER. Fixed in flight.

Revision Contents
Changeset List

PathPackages
Mmercurial/__init__.py (2 lines)

Diff 9740

mercurial/__init__.py

futureimpline = True futureimpline = True
if t.type == token.NEWLINE and futureimpline: if t.type == token.NEWLINE and futureimpline:
futureimpline = False futureimpline = False
if fullname == 'mercurial.pycompat': if fullname == 'mercurial.pycompat':
yield t yield t
continue continue
r, c = t.start r, c = t.start
l = (b'; from mercurial.pycompat import ' l = (b'; from mercurial.pycompat import '
b'delattr, getattr, hasattr, setattr, xrange, ' b'delattr, getattr, hasattr, setattr, '
b'open, unicode\n') b'open, unicode\n')
for u in tokenize.tokenize(io.BytesIO(l).readline): for u in tokenize.tokenize(io.BytesIO(l).readline):
if u.type in (tokenize.ENCODING, token.ENDMARKER): if u.type in (tokenize.ENCODING, token.ENDMARKER):
continue continue
yield u._replace( yield u._replace(
start=(r, c + u.start[1]), end=(r, c + u.end[1])) start=(r, c + u.start[1]), end=(r, c + u.end[1]))
continue continue