| pulkit |
| hg-reviewers |
We should be pycompat.unicode everywhere. It turns out we were doing this
everywhere except for one place in templatefilters!
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/__init__.py (5 lines) | |||
| M | mercurial/templatefilters.py (2 lines) |
| 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 = ( | l = ( | ||||
| b'; from mercurial.pycompat import ' | b'; from mercurial.pycompat import ' | ||||
| b'delattr, getattr, hasattr, setattr, ' | b'delattr, getattr, hasattr, setattr\n' | ||||
| b'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 | ||||
| # Emit unmodified token. | # Emit unmodified token. | ||||
| yield t | yield t | ||||
| # Header to add to bytecode files. This MUST be changed when | # Header to add to bytecode files. This MUST be changed when | ||||
| # ``replacetoken`` or any mechanism that changes semantics of module | # ``replacetoken`` or any mechanism that changes semantics of module | ||||
| # loading is changed. Otherwise cached bytecode may get loaded without | # loading is changed. Otherwise cached bytecode may get loaded without | ||||
| # the new transformation mechanisms applied. | # the new transformation mechanisms applied. | ||||
| BYTECODEHEADER = b'HG\x00\x0d' | BYTECODEHEADER = b'HG\x00\x0e' | ||||
| class hgloader(importlib.machinery.SourceFileLoader): | class hgloader(importlib.machinery.SourceFileLoader): | ||||
| """Custom module loader that transforms source code. | """Custom module loader that transforms source code. | ||||
| When the source code is converted to a code object, we transform | When the source code is converted to a code object, we transform | ||||
| certain patterns to be Python 3 compatible. This allows us to write code | certain patterns to be Python 3 compatible. This allows us to write code | ||||
| that is natively Python 2 and compatible with Python 3 without | that is natively Python 2 and compatible with Python 3 without | ||||
| making the code excessively ugly. | making the code excessively ugly. | ||||
| return text or b"(none)" | return text or b"(none)" | ||||
| @templatefilter(b'obfuscate', intype=bytes) | @templatefilter(b'obfuscate', intype=bytes) | ||||
| def obfuscate(text): | def obfuscate(text): | ||||
| """Any text. Returns the input text rendered as a sequence of | """Any text. Returns the input text rendered as a sequence of | ||||
| XML entities. | XML entities. | ||||
| """ | """ | ||||
| text = unicode(text, pycompat.sysstr(encoding.encoding), r'replace') | text = pycompat.unicode(text, pycompat.sysstr(encoding.encoding), r'replace') | ||||
| return b''.join([b'&#%d;' % ord(c) for c in text]) | return b''.join([b'&#%d;' % ord(c) for c in text]) | ||||
| @templatefilter(b'permissions', intype=bytes) | @templatefilter(b'permissions', intype=bytes) | ||||
| def permissions(flags): | def permissions(flags): | ||||
| if b"l" in flags: | if b"l" in flags: | ||||
| return b"lrwxrwxrwx" | return b"lrwxrwxrwx" | ||||
| if b"x" in flags: | if b"x" in flags: | ||||