diff options
| -rw-r--r-- | contrib/scripts/gdb-iterate-dll.py | 1 | ||||
| -rwxr-xr-x | contrib/scripts/gnunet-chk.py.in | 8 | ||||
| -rw-r--r-- | contrib/scripts/gnunet_pyexpect.py.in | 1 | ||||
| -rw-r--r-- | contrib/scripts/terminate.py.in | 1 | ||||
| -rw-r--r-- | src/consensus/consensus-simulation.py.in | 8 | ||||
| -rw-r--r-- | src/integration-tests/gnunet_pyexpect.py.in | 1 | ||||
| -rw-r--r-- | src/integration-tests/gnunet_testing.py.in | 2 | ||||
| -rw-r--r-- | src/revocation/test_local_revocation.py.in | 1 |
8 files changed, 4 insertions, 19 deletions
diff --git a/contrib/scripts/gdb-iterate-dll.py b/contrib/scripts/gdb-iterate-dll.py index 9e6478e9f..79d46aa96 100644 --- a/contrib/scripts/gdb-iterate-dll.py +++ b/contrib/scripts/gdb-iterate-dll.py @@ -1,4 +1,3 @@ -from builtins import str from gdb import * diff --git a/contrib/scripts/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in index ab0bc635f..0fb591627 100755 --- a/contrib/scripts/gnunet-chk.py.in +++ b/contrib/scripts/gnunet-chk.py.in @@ -21,10 +21,6 @@ # Brief: Computes GNUNET style Content Hash Key for a given file # Author: Sree Harsha Totakura -from builtins import str -from builtins import range -from past.utils import old_div -from builtins import object from hashlib import sha512 import logging import os @@ -252,7 +248,7 @@ def compute_chk_offset_(depth, end_offset): bds = compute_tree_size_(depth) if (depth > 0): end_offset -= 1 - ret = old_div(end_offset, bds) + ret = end_offset // bds return ret % CHK_PER_INODE @@ -276,7 +272,7 @@ def compute_iblock_size_(depth, offset): ret = CHK_PER_INODE else: bds /= CHK_PER_INODE - ret = old_div(mod, bds) + ret = mod // bds if (mod % bds) is not 0: ret += 1 return ret diff --git a/contrib/scripts/gnunet_pyexpect.py.in b/contrib/scripts/gnunet_pyexpect.py.in index 9611fc0ae..188436f51 100644 --- a/contrib/scripts/gnunet_pyexpect.py.in +++ b/contrib/scripts/gnunet_pyexpect.py.in @@ -19,7 +19,6 @@ # # Testcase for gnunet-peerinfo -from builtins import object import os import re import subprocess diff --git a/contrib/scripts/terminate.py.in b/contrib/scripts/terminate.py.in index 9ed356502..161b4db61 100644 --- a/contrib/scripts/terminate.py.in +++ b/contrib/scripts/terminate.py.in @@ -21,7 +21,6 @@ # For other platforms it's equivalent to Popen.kill () # Requires pywin32 on W32. -from builtins import object import sys import subprocess import os diff --git a/src/consensus/consensus-simulation.py.in b/src/consensus/consensus-simulation.py.in index 23639b195..39daf81c6 100644 --- a/src/consensus/consensus-simulation.py.in +++ b/src/consensus/consensus-simulation.py.in @@ -17,13 +17,9 @@ # # SPDX-License-Identifier: AGPL3.0-or-later -from builtins import str -from builtins import range -from past.utils import old_div import argparse import random from math import ceil, log, floor -from past.builtins import xrange def bsc(n): @@ -40,7 +36,7 @@ def bsc(n): def simulate(k, n, verbose): assert k < n - largest_arc = old_div(int(2**ceil(log(n, 2))), 2) + largest_arc = int(2**ceil(log(n, 2))) // 2 num_ghosts = (2 * largest_arc) - n if verbose: print("we have", num_ghosts, "ghost peers") @@ -106,4 +102,4 @@ if __name__ == "__main__": sum = 0.0 for n in range(0, args.r): sum += simulate(args.k, args.n, args.verbose) - print(old_div(sum, args.r)) + print(sum // args.r) diff --git a/src/integration-tests/gnunet_pyexpect.py.in b/src/integration-tests/gnunet_pyexpect.py.in index 000b8f99a..d757634a5 100644 --- a/src/integration-tests/gnunet_pyexpect.py.in +++ b/src/integration-tests/gnunet_pyexpect.py.in @@ -19,7 +19,6 @@ # # Testcase for gnunet-peerinfo -from builtins import object import os import re import subprocess diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index 667c3fff5..c3596d232 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in @@ -19,8 +19,6 @@ # # Functions for integration testing -from builtins import object -from builtins import str import os import subprocess import sys diff --git a/src/revocation/test_local_revocation.py.in b/src/revocation/test_local_revocation.py.in index 979a55d83..4cc6119ca 100644 --- a/src/revocation/test_local_revocation.py.in +++ b/src/revocation/test_local_revocation.py.in @@ -19,7 +19,6 @@ # # Testcase for ego revocation -from builtins import str import sys import os import subprocess |