Mercurial > public > mercurial-scm > hg
comparison mercurial/utils/dateutil.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 | 687b865b95ad |
children | b65bd4b61d78 |
comparison
equal
deleted
inserted
replaced
43505:47fac1692ede | 43506:9f70512ae2cf |
---|---|
221 date = date.strip() | 221 date = date.strip() |
222 | 222 |
223 if date == b'now' or date == _(b'now'): | 223 if date == b'now' or date == _(b'now'): |
224 return makedate() | 224 return makedate() |
225 if date == b'today' or date == _(b'today'): | 225 if date == b'today' or date == _(b'today'): |
226 date = datetime.date.today().strftime(r'%b %d') | 226 date = datetime.date.today().strftime('%b %d') |
227 date = encoding.strtolocal(date) | 227 date = encoding.strtolocal(date) |
228 elif date == b'yesterday' or date == _(b'yesterday'): | 228 elif date == b'yesterday' or date == _(b'yesterday'): |
229 date = (datetime.date.today() - datetime.timedelta(days=1)).strftime( | 229 date = (datetime.date.today() - datetime.timedelta(days=1)).strftime( |
230 r'%b %d' | 230 r'%b %d' |
231 ) | 231 ) |