This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6510

py3: add r'' prefixes and do ('%d' % int) instead of str(int)
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG683aeef12830: py3: add r'' prefixes and do ('%d' % int) instead of str(int)
Summary

This addresses more failures related to zeroconf on py3.

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

pulkit created this revision.Jun 11 2019, 2:00 PM
pulkit added a commit: rHG683aeef12830: py3: add r'' prefixes and do ('%d' % int) instead of str(int).Jun 30 2019, 6:57 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG683aeef12830: py3: add r'' prefixes and do ('%d' % int) instead of str(int) (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/zeroconf/Zeroconf.py (6 lines)

Diff 15724

hgext/zeroconf/Zeroconf.py

def readCharacterString(self): def readCharacterString(self):
"""Reads a character string from the packet""" """Reads a character string from the packet"""
length = ord(self.data[self.offset]) length = ord(self.data[self.offset])
self.offset += 1 self.offset += 1
return self.readString(length) return self.readString(length)
def readString(self, len): def readString(self, len):
"""Reads a string of a given length from the packet""" """Reads a string of a given length from the packet"""
format = '!' + str(len) + 's' format = '!%ds' % len
length = struct.calcsize(format) length = struct.calcsize(format)
info = struct.unpack(format, info = struct.unpack(format,
self.data[self.offset:self.offset + length]) self.data[self.offset:self.offset + length])
self.offset += length self.offset += length
return info[0] return info[0]
def readUnsignedShort(self): def readUnsignedShort(self):
"""Reads an unsigned short from the packet""" """Reads an unsigned short from the packet"""
return (self.flags & _FLAGS_QR_MASK) == _FLAGS_QR_RESPONSE return (self.flags & _FLAGS_QR_MASK) == _FLAGS_QR_RESPONSE
def readUTF(self, offset, len): def readUTF(self, offset, len):
"""Reads a UTF-8 string of a given length from the packet""" """Reads a UTF-8 string of a given length from the packet"""
return self.data[offset:offset + len].decode('utf-8') return self.data[offset:offset + len].decode('utf-8')
def readName(self): def readName(self):
"""Reads a domain name from the packet""" """Reads a domain name from the packet"""
result = '' result = r''
off = self.offset off = self.offset
next = -1 next = -1
first = off first = off
while True: while True:
len = ord(self.data[off:off + 1]) len = ord(self.data[off:off + 1])
off += 1 off += 1
if len == 0: if len == 0:
break break
t = len & 0xC0 t = len & 0xC0
if t == 0x00: if t == 0x00:
result = ''.join((result, self.readUTF(off, len) + '.')) result = r''.join((result, self.readUTF(off, len) + r'.'))
off += len off += len
elif t == 0xC0: elif t == 0xC0:
if next < 0: if next < 0:
next = off + 1 next = off + 1
off = ((len & 0x3F) << 8) | ord(self.data[off:off + 1]) off = ((len & 0x3F) << 8) | ord(self.data[off:off + 1])
if off >= first: if off >= first:
raise BadDomainNameCircular(off) raise BadDomainNameCircular(off)
first = off first = off