Remove Python 2 compatibility imports and disable Python 2 installation in setuptools.

jmbase/jmbase/__init__.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 
 from .support import (get_log, chunks, debug_silence, jmprint,
                       joinmarket_alert, core_alert, get_password,

jmbase/jmbase/bigstring.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 import itertools
 from twisted.protocols import amp
 

jmbase/jmbase/commands.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 """
 Commands defining client-server (daemon)
 messaging protocol (*not* Joinmarket p2p protocol).

jmbase/jmbase/support.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 import logging
 from getpass import getpass

jmbase/setup.py

@@ -11,4 +11,5 @@ setup(name='joinmarketbase',
       packages=['jmbase'],
       install_requires=['future', 'twisted==19.7.0', 'service-identity',
                         'chromalog==1.0.5'],
+      python_requires='>=3.3',
       zip_safe=False)

jmbase/test/test_base_support.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 def test_color_coded_logging():
     # TODO

jmbase/test/test_commands.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 from twisted.internet import protocol, reactor, task
 from twisted.internet.error import (ConnectionLost, ConnectionAborted,
                                     ConnectionClosed, ConnectionDone)

jmbitcoin/jmbitcoin/__init__.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 import coincurve as secp256k1
 from jmbitcoin.secp256k1_main import *
 from jmbitcoin.secp256k1_transaction import *

jmbitcoin/jmbitcoin/bech32.py

@@ -19,9 +19,6 @@
 # THE SOFTWARE.
 
 """Reference implementation for Bech32 and segwit addresses."""
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
 

jmbitcoin/jmbitcoin/btscript.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 #OP codes; disabled commented.
 
 # push value

jmbitcoin/jmbitcoin/secp256k1_deterministic.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 from jmbitcoin.secp256k1_main import *
 import hmac
 import hashlib

jmbitcoin/jmbitcoin/secp256k1_main.py

@@ -1,7 +1,4 @@
 #!/usr/bin/python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import native_bytes, bytes_to_native_str
 import binascii
 import hashlib

jmbitcoin/jmbitcoin/secp256k1_transaction.py

@@ -1,7 +1,4 @@
 #!/usr/bin/python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 from past.builtins import basestring
 from io import BytesIO
 import binascii

jmbitcoin/test/test_addresses.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 import jmbitcoin as btc
 import json
 import pytest

jmbitcoin/test/test_bech32.py

@@ -1,7 +1,4 @@
 #!/usr/bin/python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 # Copyright (c) 2017 Pieter Wuille
 #

jmbitcoin/test/test_bip32.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 import pytest
 import jmbitcoin as btc
 import binascii

jmbitcoin/test/test_btc_formatting.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Test bitcoin module data handling'''
 
 import jmbitcoin as btc

jmbitcoin/test/test_ecc_signing.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Test ECDSA signing and other key operations, including legacy message
 signature conversion.'''
 

jmbitcoin/test/test_keys.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Public and private key validity and formatting tests.'''
 
 import jmbitcoin as btc

jmbitcoin/test/test_main.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Testing mostly exceptional cases in secp256k1_main.
    Some of these may represent code that should be removed, TODO.'''
 

jmbitcoin/test/test_tx_serialize.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 import jmbitcoin as btc
 import pytest
 import json

jmclient/jmclient/__init__.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 
 import logging
 

jmclient/jmclient/blockchaininterface.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 import abc
 import random

jmclient/jmclient/cli_options.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 import random
 from optparse import OptionParser, OptionValueError
 from configparser import NoOptionError

jmclient/jmclient/client_protocol.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import iteritems
 from twisted.internet import protocol, reactor, task
 from twisted.internet.error import (ConnectionLost, ConnectionAborted,

jmclient/jmclient/commitment_utils.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 import sys
 import jmbitcoin as btc

jmclient/jmclient/configure.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 import io
 import logging

jmclient/jmclient/cryptoengine.py

@@ -1,9 +1,6 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 
-from binascii import unhexlify
+from binascii import hexlify, unhexlify
 from collections import OrderedDict
 import struct
 

jmclient/jmclient/electrum_data.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 # Default server list from electrum client
 # https://github.com/spesmilo/electrum, file https://github.com/spesmilo/electrum/blob/7dbd612d5dad13cd6f1c0df32534a578bad331ad/lib/servers.json
 

jmclient/jmclient/electruminterface.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import iteritems
 import jmbitcoin as btc
 import json

jmclient/jmclient/jsonrpc.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 # Copyright (C) 2013,2015 by Daniel Kraft <d@domob.eu>
 # Copyright (C) 2014 by phelix / blockchained.com
 #

jmclient/jmclient/maker.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import iteritems
 import base64
 import pprint

jmclient/jmclient/old_mnemonic.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 #
 # Electrum - lightweight Bitcoin client
 # Copyright (C) 2011 thomasv@gitorious

jmclient/jmclient/output.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from binascii import hexlify
 
 

jmclient/jmclient/podle.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 #Proof Of Discrete Logarithm Equivalence
 #For algorithm steps, see https://gist.github.com/AdamISZ/9cbba5e9408d23813ca8
 import os

jmclient/jmclient/schedule.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 import copy
 import random
 import sys

jmclient/jmclient/storage.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import native
 
 import os

jmclient/jmclient/support.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from functools import reduce
 import random
 from jmbase.support import get_log

jmclient/jmclient/taker.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import iteritems
 
 import base64

jmclient/jmclient/taker_utils.py

@@ -1,14 +1,13 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import iteritems
 import logging
 import pprint
 import os
+import sys
 import time
 import numbers
 from jmbase import get_log, jmprint
 from .configure import jm_single, validate_address
+from .jsonrpc import JsonRpcError
 from .schedule import human_readable_schedule_entry, tweak_tumble_schedule,\
     schedule_to_text
 from .wallet import BaseWallet, estimate_tx_fee, compute_tx_locktime

jmclient/jmclient/wallet.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 from configparser import NoOptionError
 import warnings

jmclient/jmclient/wallet_service.py

@@ -1,6 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
 
 import collections
 import time

jmclient/jmclient/wallet_utils.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import iteritems
 import json
 import os

jmclient/jmclient/yieldgenerator.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import iteritems
 
 import datetime

jmclient/setup.py

@@ -12,4 +12,5 @@ setup(name='joinmarketclient',
       install_requires=['future', 'configparser;python_version<"3.2"',
                         'joinmarketbase==0.6.1', 'mnemonic', 'argon2_cffi',
                         'bencoder.pyx>=2.0.0', 'pyaes'],
+      python_requires='>=3.3',
       zip_safe=False)

jmclient/test/commontest.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Some helper functions for testing'''
 
 import os

jmclient/test/taker_test_data.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 #orderbook
 t_orderbook = [{u'counterparty': u'J6FA1Gj7Ln4vSGne', u'ordertype': u'swreloffer', u'oid': 0,
   u'minsize': 7500000, u'txfee': 1000, u'maxsize': 599972700, u'cjfee': u'0.0002'},

jmclient/test/test_argon2.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 from jmclient import Argon2Hash, get_random_bytes
 

jmclient/test/test_blockchaininterface.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 """Blockchaininterface functionality tests."""
 

jmclient/test/test_client_protocol.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 '''test client-protocol interfacae.'''
 
 from jmbase import get_log

jmclient/test/test_coinjoin.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 """
 Test doing full coinjoins, bypassing IRC

jmclient/test/test_commitment_utils.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from commontest import DummyBlockchainInterface
 import pytest
 

jmclient/test/test_configure.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''test configure module.'''
 
 import pytest

jmclient/test/test_core_nohistory_sync.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Wallet functionality tests.'''
 
 """BitcoinCoreNoHistoryInterface functionality tests."""

jmclient/test/test_maker.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
-
 import jmbitcoin as btc
 from jmclient import Maker, get_p2sh_vbyte, get_p2pk_vbyte, \
     load_test_config, jm_single, WalletService

jmclient/test/test_mnemonic.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from jmclient import old_mnemonic
 
 import pytest

jmclient/test/test_payjoin.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 """
 Test doing payjoin joins (with message channel layer mocked)

jmclient/test/test_podle.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Tests of Proof of discrete log equivalence commitments.'''
 import os
 import jmbitcoin as bitcoin

jmclient/test/test_schedule.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''test schedule module.'''
 
 import pytest

jmclient/test/test_storage.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 from jmclient import storage
 import pytest

jmclient/test/test_support.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''support functions for jmclient tests.'''
 
 import pytest

jmclient/test/test_taker.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import iteritems
 from commontest import DummyBlockchainInterface
 import jmbitcoin as bitcoin

jmclient/test/test_tx_creation.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Test of unusual transaction types creation and push to
 network to check validity.'''
 

jmclient/test/test_utxomanager.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 from jmclient.wallet import UTXOManager
 from test_storage import MockStorage

jmclient/test/test_valid_addresses.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from jmclient.configure import validate_address, load_test_config
 from jmclient import jm_single
 import json

jmclient/test/test_wallet.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Wallet functionality tests.'''
 
 import os

jmclient/test/test_wallets.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Wallet functionality tests.'''
 
 import os

jmclient/test/test_walletservice.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Tests of functionality at walletservice layer.'''
 
 import os

jmclient/test/test_yieldgenerator.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 import unittest
 

jmdaemon/jmdaemon/__init__.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 
 import logging
 from .protocol import *

jmdaemon/jmdaemon/daemon_protocol.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 from future.utils import iteritems
 
 from .message_channel import MessageChannelCollection

jmdaemon/jmdaemon/enc_wrapper.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 # A wrapper for public key
 # authenticated encryption

jmdaemon/jmdaemon/irc.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 
 #TODO: SSL support (can it be done without back-end openssl?)
 from twisted.internet import reactor, protocol

jmdaemon/jmdaemon/message_channel.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import iteritems
 import abc
 import base64

jmdaemon/jmdaemon/orderbookwatch.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 import sqlite3
 import sys

jmdaemon/jmdaemon/protocol.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 #Protocol version
 JM_VERSION = 5
 

jmdaemon/jmdaemon/socks.py

@@ -29,9 +29,6 @@ This module provides a standard socket-like interface for Python
 for tunneling connections through SOCKS proxies.
 
 """
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 import socket
 import struct
 import random

jmdaemon/setup.py

@@ -10,4 +10,5 @@ setup(name='joinmarketdaemon',
       license='GPL',
       packages=['jmdaemon'],
       install_requires=['future', 'txtorcon', 'pyopenssl', 'libnacl', 'joinmarketbase==0.6.1'],
+      python_requires='>=3.3',
       zip_safe=False)

jmdaemon/test/dummy_mc.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 
 import time
 

jmdaemon/test/msgdata.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 #orderbook
 t_orderbook = [{u'counterparty': u'J5FA1Gj7Ln4vSGne', u'ordertype': u'reloffer', u'oid': 0,
   u'minsize': 7500000, u'txfee': 1000, u'maxsize': 599972700, u'cjfee': u'0.0002'},

jmdaemon/test/test_daemon_protocol.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 from future.utils import iteritems
 '''test daemon-protocol interfacae.'''
 

jmdaemon/test/test_enc_wrapper.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 import base64
 import string
 import random

jmdaemon/test/test_irc_messaging.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Tests of joinmarket bots end-to-end (including IRC and bitcoin) '''
 
 import time

jmdaemon/test/test_message_channel.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 '''test messagechannel management code.'''
 
 import pytest

jmdaemon/test/test_orderbookwatch.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 import pytest
 

scripts/add-utxo.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import iteritems
 """A very simple command line tool to import utxos to be used
 as commitments into joinmarket's commitments.json file, allowing

scripts/convert_old_wallet.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 import argparse
 import json
 import os.path

scripts/joinmarket-qt.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 from future.utils import iteritems
 
 '''

scripts/joinmarketd.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 import sys
 from twisted.internet import reactor
 from twisted.python.log import startLogging

scripts/obwatch/ob-watcher.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 from future.utils import iteritems
 from past.builtins import cmp
 from functools import cmp_to_key

scripts/qtsupport.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import *
 
 '''
 Qt files for the wizard for initiating a tumbler run.

scripts/receive-payjoin.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 from optparse import OptionParser
 

scripts/sendpayment.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 """
 A sample implementation of a single coinjoin script,

scripts/sendtomany.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 """A simple command line tool to create a bunch
 of utxos from one (thus giving more potential commitments
 for a Joinmarket user, although of course it may be useful

scripts/tumbler.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 import sys
 from twisted.internet import reactor

scripts/wallet-tool.py

@@ -1,6 +1,3 @@
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 from jmbase import jmprint
 from jmclient import wallet_tool_main

scripts/yg-privacyenhanced.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 from future.utils import iteritems
 
 import random

scripts/yield-generator-basic.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 
 from jmbase import jmprint
 from jmclient import YieldGeneratorBasic, ygmain

setupall.py

@@ -17,6 +17,9 @@ to libsodium.
 All modes require and install twisted.
 """
 
+if sys.version_info < (3, 3):
+    raise RuntimeError("This package requres Python 3.3+")
+
 def help():
     print("Usage: python setupall.py <mode>\n"
           "Mode is one of:\n"

test/common.py

@@ -1,7 +1,4 @@
 #! /usr/bin/env python
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from builtins import * # noqa: F401
 '''Some helper functions for testing'''
 
 import sys