Mercurial > hg
changeset 43078:88eba7103660
mangler: stop rewriting string constants to be bytes literals
We've rewritten everything, so we no longer require this step.
Differential Revision: https://phab.mercurial-scm.org/D6973
author | Augie Fackler <augie@google.com> |
---|---|
date | Sat, 04 May 2019 11:25:40 -0400 |
parents | 687b865b95ad |
children | 5209fc94b982 |
files | mercurial/__init__.py |
diffstat | 1 files changed, 0 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/__init__.py Sun Oct 06 09:48:39 2019 -0400 +++ b/mercurial/__init__.py Sat May 04 11:25:40 2019 -0400 @@ -153,37 +153,6 @@ tokens[j] = st._replace(string='u%s' % st.string) for i, t in enumerate(tokens): - # Convert most string literals to byte literals. String literals - # in Python 2 are bytes. String literals in Python 3 are unicode. - # Most strings in Mercurial are bytes and unicode strings are rare. - # Rather than rewrite all string literals to use ``b''`` to indicate - # byte strings, we apply this token transformer to insert the ``b`` - # prefix nearly everywhere. - if t.type == token.STRING: - s = t.string - - # Preserve docstrings as string literals. This is inconsistent - # with regular unprefixed strings. However, the - # "from __future__" parsing (which allows a module docstring to - # exist before it) doesn't properly handle the docstring if it - # is b''' prefixed, leading to a SyntaxError. We leave all - # docstrings as unprefixed to avoid this. This means Mercurial - # components touching docstrings need to handle unicode, - # unfortunately. - if s[0:3] in ("'''", '"""'): - yield t - continue - - # If the first character isn't a quote, it is likely a string - # prefixing character (such as 'b', 'u', or 'r'. Ignore. - if s[0] not in ("'", '"'): - yield t - continue - - # String literal. Prefix to make a b'' string. - yield t._replace(string='b%s' % t.string) - continue - # Insert compatibility imports at "from __future__ import" line. # No '\n' should be added to preserve line numbers. if (