Mercurial > hg
comparison hgdemandimport/demandimportpy2.py @ 43503:313e3a279828
cleanup: remove pointless r-prefixes on double-quoted strings
This is only double-quoted strings. I'll do single-quoted strings as a
second step. These had existed because our source transformer didn't
turn r"" into b"", so we had tagged some strings as r-strings to get
"native" strings on both Pythons. Now that the transformer is gone, we
can dispense with this nonsense.
Methodology:
I ran
hg locate 'set:added() or modified() or clean()' | egrep '.*\.py$' | xargs egrep --color=never -n -- \[\^a-z\]r\"\[\^\"\\\\\]\*\"\[\^\"\]
in an emacs grep-mode buffer, and then used a keyboard macro to
iterate over the results and remove the r prefix as needed.
# skip-blame removing unneeded r prefixes left over from Python 3 migration.
Differential Revision: https://phab.mercurial-scm.org/D7305
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 07 Nov 2019 13:18:19 -0500 |
parents | 2372284d9457 |
children | 9f70512ae2cf |
comparison
equal
deleted
inserted
replaced
43502:c093cc6e6c99 | 43503:313e3a279828 |
---|---|
68 after = [rest] | 68 after = [rest] |
69 else: | 69 else: |
70 head = name | 70 head = name |
71 after = [] | 71 after = [] |
72 object.__setattr__( | 72 object.__setattr__( |
73 self, r"_data", (head, globals, locals, after, level, set()) | 73 self, "_data", (head, globals, locals, after, level, set()) |
74 ) | 74 ) |
75 object.__setattr__(self, r"_module", None) | 75 object.__setattr__(self, "_module", None) |
76 | 76 |
77 def _extend(self, name): | 77 def _extend(self, name): |
78 """add to the list of submodules to load""" | 78 """add to the list of submodules to load""" |
79 self._data[3].append(name) | 79 self._data[3].append(name) |
80 | 80 |
141 for modname in modrefs: | 141 for modname in modrefs: |
142 modref = sys.modules.get(modname, None) | 142 modref = sys.modules.get(modname, None) |
143 if modref and getattr(modref, head, None) is self: | 143 if modref and getattr(modref, head, None) is self: |
144 setattr(modref, head, mod) | 144 setattr(modref, head, mod) |
145 | 145 |
146 object.__setattr__(self, r"_module", mod) | 146 object.__setattr__(self, "_module", mod) |
147 | 147 |
148 def __repr__(self): | 148 def __repr__(self): |
149 if self._module: | 149 if self._module: |
150 return "<proxied module '%s'>" % self._data[0] | 150 return "<proxied module '%s'>" % self._data[0] |
151 return "<unloaded module '%s'>" % self._data[0] | 151 return "<unloaded module '%s'>" % self._data[0] |