pulkit updated this revision to Diff 15711. REPOSITORY rHG Mercurial
CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6511?vs=15446&id=15711 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6511/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6511 AFFECTED FILES contrib/python3-whitelist hgext/zeroconf/Zeroconf.py CHANGE DETAILS diff --git a/hgext/zeroconf/Zeroconf.py b/hgext/zeroconf/Zeroconf.py --- a/hgext/zeroconf/Zeroconf.py +++ b/hgext/zeroconf/Zeroconf.py @@ -89,6 +89,8 @@ import time import traceback +from mercurial import pycompat + __all__ = ["Zeroconf", "ServiceInfo", "ServiceBrowser"] # hook for threads @@ -270,6 +272,8 @@ """A DNS question entry""" def __init__(self, name, type, clazz): + if pycompat.ispy3 and isinstance(name, str): + name = name.encode('ascii') if not name.endswith(".local."): raise NonLocalNameException(name) DNSEntry.__init__(self, name, type, clazz) diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist --- a/contrib/python3-whitelist +++ b/contrib/python3-whitelist @@ -518,6 +518,7 @@ test-pathconflicts-merge.t test-pathconflicts-update.t test-pathencode.py +test-paths.t test-pending.t test-permissions.t test-phabricator.t To: pulkit, #hg-reviewers Cc: mjpieters, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel