Mercurial > hg
changeset 30166:102e6ef5bb3a
py3: use namedtuple._replace to produce new tokens
| author | Martijn Pieters <mjpieters@fb.com> |
|---|---|
| date | Thu, 13 Oct 2016 09:27:37 +0100 |
| parents | 423377290a3a |
| children | 1e5ff5ae1d2b |
| files | mercurial/__init__.py |
| diffstat | 1 files changed, 5 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/__init__.py Fri Oct 14 17:55:02 2016 +0100 +++ b/mercurial/__init__.py Thu Oct 13 09:27:37 2016 +0100 @@ -233,9 +233,7 @@ """ st = tokens[j] if st.type == token.STRING and st.string.startswith(("'", '"')): - rt = tokenize.TokenInfo(st.type, 'u%s' % st.string, - st.start, st.end, st.line) - tokens[j] = rt + tokens[j] = st._replace(string='u%s' % st.string) for i, t in enumerate(tokens): # Convert most string literals to byte literals. String literals @@ -266,8 +264,7 @@ continue # String literal. Prefix to make a b'' string. - yield tokenize.TokenInfo(t.type, 'b%s' % s, t.start, t.end, - t.line) + yield t._replace(string='b%s' % t.string) continue # Insert compatibility imports at "from __future__ import" line. @@ -287,10 +284,8 @@ for u in tokenize.tokenize(io.BytesIO(l).readline): if u.type in (tokenize.ENCODING, token.ENDMARKER): continue - yield tokenize.TokenInfo(u.type, u.string, - (r, c + u.start[1]), - (r, c + u.end[1]), - '') + yield u._replace( + start=(r, c + u.start[1]), end=(r, c + u.end[1])) continue # This looks like a function call. @@ -322,8 +317,7 @@ # It changes iteritems to items as iteritems is not # present in Python 3 world. elif fn == 'iteritems': - yield tokenize.TokenInfo(t.type, 'items', - t.start, t.end, t.line) + yield t._replace(string='items') continue # Emit unmodified token.