This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5805

zeroconf: port to Python 3
ClosedPublic

Authored by indygreg on Feb 2 2019, 3:08 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGfa2071753dc2: zeroconf: port to Python 3
Summary

Since we're using the source transformer on Python 3, calls into
Zeroconf and return values from it are generally bytes.

But various socket functions require str on Python 3.

This commit contains enough changes to coerce test-paths.t into
passing on Python 3. I suspect there are still a handful of bugs
on Python 3. But the tests do pass.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Feb 2 2019, 3:08 PM
yuja added a subscriber: yuja.Feb 2 2019, 9:36 PM
    1. advertise to browsers svc = Zeroconf.ServiceInfo('_http._tcp.local.',
  • name + '._http._tcp.local.',

+ pycompat.bytestr(name + r'._http._tcp.local.'),

server = host,
port = port,
  • properties = {'description': desc,
  • 'path': "/" + path},

+ properties = {
+ 'description': pycompat.bytestr(desc),
+ 'path': pycompat.bytestr(r"/" + path)},

                           address = localip, weight = 0, priority = 0)
server.registerService(svc)
# advertise to Mercurial clients
svc = Zeroconf.ServiceInfo('_hg._tcp.local.',
  • name + '._hg._tcp.local.',

+ pycompat.bytestr(name + r'._hg._tcp.local.'),

server = host,
port = port,
  • properties = {'description': desc,
  • 'path': "/" + path},

+ properties = {
+ 'description': pycompat.bytestr(desc),
+ 'path': pycompat.bytestr(r"/" + path)},

address = localip, weight = 0, priority = 0)

I think path and desc are bytes since they come from ui.config().

pulkit updated this revision to Diff 15444.Jun 11 2019, 1:03 PM
pulkit added a subscriber: pulkit.Jun 11 2019, 1:04 PM

This patch is important for making test-paths.t pass on Python 3. Since Greg is quite busy now a days, I incorporated Yuya's feedback and updated it. The test still not pass though.

indygreg added a commit: rHGfa2071753dc2: zeroconf: port to Python 3.Jun 30 2019, 6:57 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGfa2071753dc2: zeroconf: port to Python 3 (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/zeroconf/__init__.py (35 lines)

Diff 15723

hgext/zeroconf/__init__.py

import time import time
from . import Zeroconf from . import Zeroconf
from mercurial import ( from mercurial import (
dispatch, dispatch,
encoding, encoding,
extensions, extensions,
hg, hg,
pycompat,
ui as uimod, ui as uimod,
) )
from mercurial.hgweb import ( from mercurial.hgweb import (
server as servermod server as servermod
) )
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
testedwith = 'ships-with-hg-core' testedwith = 'ships-with-hg-core'
# publish # publish
server = None server = None
localip = None localip = None
def getip(): def getip():
# finds external-facing interface without sending any packets (Linux) # finds external-facing interface without sending any packets (Linux)
try: try:
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
s.connect(('1.0.0.1', 0)) s.connect((r'1.0.0.1', 0))
ip = s.getsockname()[0] ip = s.getsockname()[0]
return ip return ip
except socket.error: except socket.error:
pass pass
# Generic method, sometimes gives useless results # Generic method, sometimes gives useless results
try: try:
dumbip = socket.gethostbyaddr(socket.gethostname())[2][0] dumbip = socket.gethostbyaddr(socket.gethostname())[2][0]
if ':' in dumbip: if r':' in dumbip:
dumbip = '127.0.0.1' dumbip = r'127.0.0.1'
if not dumbip.startswith('127.'): if not dumbip.startswith(r'127.'):
return dumbip return dumbip
except (socket.gaierror, socket.herror): except (socket.gaierror, socket.herror):
dumbip = '127.0.0.1' dumbip = r'127.0.0.1'
# works elsewhere, but actually sends a packet # works elsewhere, but actually sends a packet
try: try:
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
s.connect(('1.0.0.1', 1)) s.connect((r'1.0.0.1', 1))
ip = s.getsockname()[0] ip = s.getsockname()[0]
return ip return ip
except socket.error: except socket.error:
pass pass
return dumbip return dumbip
def publish(name, desc, path, port): def publish(name, desc, path, port):
global server, localip global server, localip
if not server: if not server:
ip = getip() ip = getip()
if ip.startswith('127.'): if ip.startswith(r'127.'):
# if we have no internet connection, this can happen. # if we have no internet connection, this can happen.
return return
localip = socket.inet_aton(ip) localip = socket.inet_aton(ip)
server = Zeroconf.Zeroconf(ip) server = Zeroconf.Zeroconf(ip)
hostname = socket.gethostname().split('.')[0] hostname = socket.gethostname().split(r'.')[0]
host = hostname + ".local" host = hostname + r".local"
name = "%s-%s" % (hostname, name) name = r"%s-%s" % (hostname, name)
# advertise to browsers # advertise to browsers
svc = Zeroconf.ServiceInfo('_http._tcp.local.', svc = Zeroconf.ServiceInfo('_http._tcp.local.',
name + '._http._tcp.local.', pycompat.bytestr(name + r'._http._tcp.local.'),
server = host, server = host,
port = port, port = port,
properties = {'description': desc, properties = {'description': desc,
'path': "/" + path}, 'path': "/" + path},
address = localip, weight = 0, priority = 0) address = localip, weight = 0, priority = 0)
server.registerService(svc) server.registerService(svc)
# advertise to Mercurial clients # advertise to Mercurial clients
svc = Zeroconf.ServiceInfo('_hg._tcp.local.', svc = Zeroconf.ServiceInfo('_hg._tcp.local.',
name + '._hg._tcp.local.', pycompat.bytestr(name + r'._hg._tcp.local.'),
server = host, server = host,
port = port, port = port,
properties = {'description': desc, properties = {'description': desc,
'path': "/" + path}, 'path': "/" + path},
address = localip, weight = 0, priority = 0) address = localip, weight = 0, priority = 0)
server.registerService(svc) server.registerService(svc)
def zc_create_server(create_server, ui, app): def zc_create_server(create_server, ui, app):
def removeService(self, server, type, name): def removeService(self, server, type, name):
if repr(name) in self.found: if repr(name) in self.found:
del self.found[repr(name)] del self.found[repr(name)]
def addService(self, server, type, name): def addService(self, server, type, name):
self.found[repr(name)] = server.getServiceInfo(type, name) self.found[repr(name)] = server.getServiceInfo(type, name)
def getzcpaths(): def getzcpaths():
ip = getip() ip = getip()
if ip.startswith('127.'): if ip.startswith(r'127.'):
return return
server = Zeroconf.Zeroconf(ip) server = Zeroconf.Zeroconf(ip)
l = listener() l = listener()
Zeroconf.ServiceBrowser(server, "_hg._tcp.local.", l) Zeroconf.ServiceBrowser(server, "_hg._tcp.local.", l)
time.sleep(1) time.sleep(1)
server.close() server.close()
for value in l.found.values(): for value in l.found.values():
name = value.name[:value.name.index('.')] name = value.name[:value.name.index(b'.')]
url = "http://%s:%s%s" % (socket.inet_ntoa(value.address), value.port, url = r"http://%s:%s%s" % (socket.inet_ntoa(value.address), value.port,
value.properties.get("path", "/")) value.properties.get(r"path", r"/"))
yield "zc-" + name, url yield b"zc-" + name, pycompat.bytestr(url)
def config(orig, self, section, key, *args, **kwargs): def config(orig, self, section, key, *args, **kwargs):
if section == "paths" and key.startswith("zc-"): if section == "paths" and key.startswith("zc-"):
for name, path in getzcpaths(): for name, path in getzcpaths():
if name == key: if name == key:
return path return path
return orig(self, section, key, *args, **kwargs) return orig(self, section, key, *args, **kwargs)