D5758: tests: various Python 3 ports for test-remotefilelog-datapack.py
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Wed Jan 30 21:37:42 UTC 2019
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Use bytes I/O. Use byteschr(). Convert temporary path to bytes.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5758
AFFECTED FILES
tests/test-remotefilelog-datapack.py
CHANGE DETAILS
diff --git a/tests/test-remotefilelog-datapack.py b/tests/test-remotefilelog-datapack.py
--- a/tests/test-remotefilelog-datapack.py
+++ b/tests/test-remotefilelog-datapack.py
@@ -40,15 +40,16 @@
shutil.rmtree(d)
def makeTempDir(self):
- tempdir = tempfile.mkdtemp()
+ tempdir = pycompat.bytestr(tempfile.mkdtemp())
self.tempdirs.append(tempdir)
return tempdir
def getHash(self, content):
return hashlib.sha1(content).digest()
def getFakeHash(self):
- return ''.join(chr(random.randint(0, 255)) for _ in range(20))
+ return b''.join(pycompat.bytechr(random.randint(0, 255))
+ for _ in range(20))
def createPack(self, revisions=None, packdir=None):
if revisions is None:
@@ -220,11 +221,11 @@
def testBadVersionThrows(self):
pack = self.createPack()
path = pack.path + b'.datapack'
- with open(path) as f:
+ with open(path, 'rb') as f:
raw = f.read()
raw = struct.pack('!B', 255) + raw[1:]
os.chmod(path, os.stat(path).st_mode | stat.S_IWRITE)
- with open(path, 'w+') as f:
+ with open(path, 'wb+') as f:
f.write(raw)
try:
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list