From 3ae927eab951fbb7f28cc85e8c2247f906a9674c Mon Sep 17 00:00:00 2001 From: Chad Whitacre Date: Wed, 23 Sep 2020 21:18:24 -0400 Subject: [PATCH] Respond to review - Preserve int division - Dial back the __future__ imports --- src/allmydata/test/common.py | 7 ++----- src/allmydata/test/common_util.py | 3 --- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/allmydata/test/common.py b/src/allmydata/test/common.py index 5521a0c4b..6b0059cb4 100644 --- a/src/allmydata/test/common.py +++ b/src/allmydata/test/common.py @@ -1,7 +1,4 @@ -from __future__ import absolute_import -from __future__ import division from __future__ import print_function -from __future__ import unicode_literals __all__ = [ "SyncTestCase", @@ -961,12 +958,12 @@ def _corrupt_offset_of_block_hashes_to_truncate_crypttext_hashes(data, debug=Fal assert sharevernum in (1, 2), "This test is designed to corrupt immutable shares of v1 or v2 in specific ways." if sharevernum == 1: curval = struct.unpack(">L", data[0x0c+0x18:0x0c+0x18+4])[0] - newval = random.randrange(0, max(1, (curval/hashutil.CRYPTO_VAL_SIZE)//2))*hashutil.CRYPTO_VAL_SIZE + newval = random.randrange(0, max(1, (curval//hashutil.CRYPTO_VAL_SIZE)//2))*hashutil.CRYPTO_VAL_SIZE newvalstr = struct.pack(">L", newval) return data[:0x0c+0x18]+newvalstr+data[0x0c+0x18+4:] else: curval = struct.unpack(">Q", data[0x0c+0x2c:0x0c+0x2c+8])[0] - newval = random.randrange(0, max(1, (curval/hashutil.CRYPTO_VAL_SIZE)//2))*hashutil.CRYPTO_VAL_SIZE + newval = random.randrange(0, max(1, (curval//hashutil.CRYPTO_VAL_SIZE)//2))*hashutil.CRYPTO_VAL_SIZE newvalstr = struct.pack(">Q", newval) return data[:0x0c+0x2c]+newvalstr+data[0x0c+0x2c+8:] diff --git a/src/allmydata/test/common_util.py b/src/allmydata/test/common_util.py index b3244eb2f..b363b504d 100644 --- a/src/allmydata/test/common_util.py +++ b/src/allmydata/test/common_util.py @@ -1,7 +1,4 @@ -from __future__ import absolute_import -from __future__ import division from __future__ import print_function -from __future__ import unicode_literals import os from random import randrange