From 1b292596c1cbb211c22542607f6f5d15f2dc0465 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
Date: Sun, 10 Mar 2019 21:17:39 +0100
Subject: Fix Python code: remove imports from `python-future`.

I missed in 3d6ba937a5a5046b3d531c17691d5d1155daae71 that `future`
also provides the modules `past` and `builtins`.
Imports of `builtins` can simply be removed for Python-3-only code.
`past.old_div` had to be replaces by the "old" div-operatot `//`,
while `past.xrange` was unused.
---
 contrib/scripts/gdb-iterate-dll.py    | 1 -
 contrib/scripts/gnunet-chk.py.in      | 8 ++------
 contrib/scripts/gnunet_pyexpect.py.in | 1 -
 contrib/scripts/terminate.py.in       | 1 -
 4 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'contrib')

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
-- 
cgit v1.2.3