Merge pull request #9529

484ece1 tests: remove python2 compatibility (tobtoht)

tests/block_weight/block_weight.py

@@ -1,9 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Simulate a maximal block attack on the Monero network
 # This uses the scheme proposed by ArticMine
 # Written by Sarang Nother
 # Copyright (c) 2019-2024, The Monero Project
-from __future__ import print_function
 import sys
 import math
 

tests/block_weight/compare.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-from __future__ import print_function
 import sys
 import subprocess
 

tests/difficulty/gen_wide_data.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-from __future__ import print_function
 import random
 
 DIFFICULTY_TARGET = 120

tests/difficulty/generate-data

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 # Copyright (c) 2014-2024, The Monero Project
 # 

tests/difficulty/wide_difficulty.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-from __future__ import print_function
 import sys
 import subprocess
 

tests/functional_tests/address_book.py

@@ -32,7 +32,6 @@
 """Test wallet address book RPC
 """
 
-from __future__ import print_function
 from framework.wallet import Wallet
 
 class AddressBookTest():

tests/functional_tests/bans.py

@@ -28,7 +28,6 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import time
 
 """Test peer baning RPC calls

tests/functional_tests/blockchain.py

@@ -29,7 +29,6 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import time
 
 """Test daemon blockchain RPC calls

tests/functional_tests/check_missing_rpc_methods.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-from __future__ import print_function
 import sys
 import re
 

tests/functional_tests/cold_signing.py

@@ -31,7 +31,6 @@
 """Test cold tx signing
 """
 
-from __future__ import print_function
 from framework.daemon import Daemon
 from framework.wallet import Wallet
 import random

tests/functional_tests/daemon_info.py

@@ -37,7 +37,6 @@
 
 """
 
-from __future__ import print_function
 import os
 from framework.daemon import Daemon
 

tests/functional_tests/functional_tests_rpc.py

@@ -1,6 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-from __future__ import print_function
 import sys
 import time
 import subprocess

tests/functional_tests/get_output_distribution.py

@@ -31,7 +31,6 @@
 """Test get_output_distribution RPC
 """
 
-from __future__ import print_function
 from framework.daemon import Daemon
 from framework.wallet import Wallet
 

tests/functional_tests/integrated_address.py

@@ -36,7 +36,6 @@
 
 """
 
-from __future__ import print_function
 from framework.wallet import Wallet
 
 class IntegratedAddressTest():

tests/functional_tests/k_anonymity.py

@@ -28,7 +28,6 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import math
 import random
 

tests/functional_tests/mining.py

@@ -29,7 +29,6 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import time
 import os
 import math

tests/functional_tests/multisig.py

@@ -28,7 +28,6 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import random
 
 """Test multisig transfers

tests/functional_tests/p2p.py

@@ -29,7 +29,6 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import time
 
 """Test daemon P2P

tests/functional_tests/proofs.py

@@ -28,8 +28,6 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 """Test misc proofs (tx key, send, receive, reserve)
 """
 

tests/functional_tests/rpc_payment.py

@@ -28,7 +28,6 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import subprocess
 import os
 import time

tests/functional_tests/sign_message.py

@@ -28,8 +28,6 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 """Test message signing/verification RPC calls
 
 Test the following RPCs:

tests/functional_tests/speed.py

@@ -41,7 +41,6 @@
 
 import time
 from time import sleep
-from __future__ import print_function
 
 from framework.daemon import Daemon
 from framework.wallet import Wallet

tests/functional_tests/transfer.py

@@ -28,7 +28,6 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
 import json
 import util_resources
 import pprint

tests/functional_tests/txpool.py

@@ -28,8 +28,6 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 """Test txpool
 """
 

tests/functional_tests/uri.py

@@ -32,7 +32,6 @@
 """Test URI RPC
 """
 
-from __future__ import print_function
 try:
   from urllib import quote as urllib_quote
 except:

tests/functional_tests/util_resources.py

@@ -34,7 +34,6 @@
     by running numerical calculations
 """
 
-from __future__ import print_function
 import subprocess
 import psutil
 import os

tests/functional_tests/validate_address.py

@@ -31,7 +31,6 @@
 """Test address validation RPC calls
 """
 
-from __future__ import print_function
 from framework.wallet import Wallet
 
 class AddressValidationTest():

tests/functional_tests/wallet.py

@@ -32,7 +32,6 @@
 """Test basic wallet functionality
 """
 
-from __future__ import print_function
 import sys
 import util_resources