Mercurial > public > mercurial-scm > hg
comparison mercurial/config.py @ 43506:9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
This is the promised second step on single-quoted strings. 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 -- \[\^b\]\[\^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/D7306
author | Augie Fackler <augie@google.com> |
---|---|
date | Fri, 08 Nov 2019 11:19:20 -0800 |
parents | 6ada8a274b9c |
children | f7f142d74df3 |
comparison
equal
deleted
inserted
replaced
43505:47fac1692ede | 43506:9f70512ae2cf |
---|---|
210 raise error.ParseError(l.rstrip(), (b"%s:%d" % (src, line))) | 210 raise error.ParseError(l.rstrip(), (b"%s:%d" % (src, line))) |
211 | 211 |
212 def read(self, path, fp=None, sections=None, remap=None): | 212 def read(self, path, fp=None, sections=None, remap=None): |
213 if not fp: | 213 if not fp: |
214 fp = util.posixfile(path, b'rb') | 214 fp = util.posixfile(path, b'rb') |
215 assert getattr(fp, 'mode', r'rb') == r'rb', ( | 215 assert getattr(fp, 'mode', 'rb') == 'rb', ( |
216 b'config files must be opened in binary mode, got fp=%r mode=%r' | 216 b'config files must be opened in binary mode, got fp=%r mode=%r' |
217 % (fp, fp.mode,) | 217 % (fp, fp.mode,) |
218 ) | 218 ) |
219 self.parse( | 219 self.parse( |
220 path, fp.read(), sections=sections, remap=remap, include=self.read | 220 path, fp.read(), sections=sections, remap=remap, include=self.read |