Mercurial > public > mercurial-scm > hg-stable
diff hgext/zeroconf/__init__.py @ 43551: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 | 6337b10c46bc |
| children | 9f70512ae2cf |
line wrap: on
line diff
--- a/hgext/zeroconf/__init__.py Thu Nov 07 03:59:22 2019 -0800 +++ b/hgext/zeroconf/__init__.py Thu Nov 07 13:18:19 2019 -0500 @@ -95,7 +95,7 @@ hostname = socket.gethostname().split(r'.')[0] host = hostname + r".local" - name = r"%s-%s" % (hostname, name) + name = "%s-%s" % (hostname, name) # advertise to browsers svc = Zeroconf.ServiceInfo( @@ -180,10 +180,10 @@ server.close() for value in l.found.values(): name = value.name[: value.name.index(b'.')] - url = r"http://%s:%s%s" % ( + url = "http://%s:%s%s" % ( socket.inet_ntoa(value.address), value.port, - value.properties.get(r"path", r"/"), + value.properties.get("path", "/"), ) yield b"zc-" + name, pycompat.bytestr(url)