This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6511

py3: hack around inconsistency of type of name passed to DNSQuestion
ClosedPublic

Authored by pulkit on Jun 11 2019, 2:00 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8306b6c29add: py3: hack around inconsistency of type of name passed to DNSQuestion
Summary

I don't like this patch but this is the easiest way I could fix it. There are
some callers which pass name which is bytes, some pass name which is str. I just
encode() that if that's str.

This does makes test-paths.t pass, but I am not confident whether the whole of
zeroconf will work on py3 or not.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Jun 11 2019, 2:00 PM
pulkit added a comment.Jun 29 2019, 11:54 AM

Review ping for this stack.

pulkit updated this revision to Diff 15711.Jun 29 2019, 7:15 PM
pulkit added a commit: rHG8306b6c29add: py3: hack around inconsistency of type of name passed to DNSQuestion.Jun 30 2019, 6:57 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8306b6c29add: py3: hack around inconsistency of type of name passed to DNSQuestion (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 15446

contrib/python3-whitelist

test-patch.t test-patch.t
test-patchbomb-bookmark.t test-patchbomb-bookmark.t
test-patchbomb-tls.t test-patchbomb-tls.t
test-patchbomb.t test-patchbomb.t
test-pathconflicts-basic.t test-pathconflicts-basic.t
test-pathconflicts-merge.t test-pathconflicts-merge.t
test-pathconflicts-update.t test-pathconflicts-update.t
test-pathencode.py test-pathencode.py
test-paths.t
test-pending.t test-pending.t
test-permissions.t test-permissions.t
test-phabricator.t test-phabricator.t
test-phase-archived.t test-phase-archived.t
test-phases-exchange.t test-phases-exchange.t
test-phases.t test-phases.t
test-profile.t test-profile.t
test-progress.t test-progress.t

hgext/zeroconf/Zeroconf.py

import itertools import itertools
import select import select
import socket import socket
import struct import struct
import threading import threading
import time import time
import traceback import traceback
from mercurial import pycompat
__all__ = ["Zeroconf", "ServiceInfo", "ServiceBrowser"] __all__ = ["Zeroconf", "ServiceInfo", "ServiceBrowser"]
# hook for threads # hook for threads
globals()['_GLOBAL_DONE'] = 0 globals()['_GLOBAL_DONE'] = 0
# Some timing constants # Some timing constants
else: else:
result += "]" result += "]"
return result return result
class DNSQuestion(DNSEntry): class DNSQuestion(DNSEntry):
"""A DNS question entry""" """A DNS question entry"""
def __init__(self, name, type, clazz): def __init__(self, name, type, clazz):
if pycompat.ispy3 and isinstance(name, str):
name = name.encode('ascii')
if not name.endswith(".local."): if not name.endswith(".local."):
raise NonLocalNameException(name) raise NonLocalNameException(name)
DNSEntry.__init__(self, name, type, clazz) DNSEntry.__init__(self, name, type, clazz)
def answeredBy(self, rec): def answeredBy(self, rec):
"""Returns true if the question is answered by the record""" """Returns true if the question is answered by the record"""
return (self.clazz == rec.clazz and return (self.clazz == rec.clazz and
(self.type == rec.type or self.type == _TYPE_ANY) and (self.type == rec.type or self.type == _TYPE_ANY) and