Changeset 3ae927e in trunk

Timestamp:

2020-09-24T01:18:24Z (5 years ago)

Author:

Chad Whitacre <chad@…>

Branches:

master

Children:

06cd64c8

Parents:

42eaf08

Message:

Respond to review

• Preserve int division
• Dial back the future imports

Location:

src/allmydata/test

Files:

• common.py (modified) (2 diffs)
• common_util.py (modified) (1 diff)

src/allmydata/test/common.py ¶

@@ -1 @@
-from __future__ import absolute_import
-from __future__ import division
 from __future__ import print_function
-from __future__ import unicode_literals
 
 __all__ = [
@@ -962 +959 @@
     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:]

src/allmydata/test/common_util.py ¶

@@ -1 @@
-from __future__ import absolute_import
-from __future__ import division
 from __future__ import print_function
-from __future__ import unicode_literals
 
 import os