diff --git a/jmbase/jmbase/__init__.py b/jmbase/jmbase/__init__.py index c34966bc..ad3931e5 100644 --- a/jmbase/jmbase/__init__.py +++ b/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, diff --git a/jmbase/jmbase/bigstring.py b/jmbase/jmbase/bigstring.py index ecfe9cc2..6847c366 100644 --- a/jmbase/jmbase/bigstring.py +++ b/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 diff --git a/jmbase/jmbase/commands.py b/jmbase/jmbase/commands.py index 21eb24c1..7f00dd63 100644 --- a/jmbase/jmbase/commands.py +++ b/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). diff --git a/jmbase/jmbase/support.py b/jmbase/jmbase/support.py index ecfc0bdd..1206c642 100644 --- a/jmbase/jmbase/support.py +++ b/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 diff --git a/jmbase/setup.py b/jmbase/setup.py index 000a079c..65016424 100644 --- a/jmbase/setup.py +++ b/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) diff --git a/jmbase/test/test_base_support.py b/jmbase/test/test_base_support.py index f086524a..7730dde1 100644 --- a/jmbase/test/test_base_support.py +++ b/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 diff --git a/jmbase/test/test_commands.py b/jmbase/test/test_commands.py index 70dac852..bc43792f 100644 --- a/jmbase/test/test_commands.py +++ b/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) diff --git a/jmbitcoin/jmbitcoin/__init__.py b/jmbitcoin/jmbitcoin/__init__.py index c4a8d32b..7db6dc1c 100644 --- a/jmbitcoin/jmbitcoin/__init__.py +++ b/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 * diff --git a/jmbitcoin/jmbitcoin/bech32.py b/jmbitcoin/jmbitcoin/bech32.py index 36f32023..8d3f9bf7 100644 --- a/jmbitcoin/jmbitcoin/bech32.py +++ b/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" diff --git a/jmbitcoin/jmbitcoin/btscript.py b/jmbitcoin/jmbitcoin/btscript.py index 4ef74be5..c658c4e3 100644 --- a/jmbitcoin/jmbitcoin/btscript.py +++ b/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 diff --git a/jmbitcoin/jmbitcoin/secp256k1_deterministic.py b/jmbitcoin/jmbitcoin/secp256k1_deterministic.py index 1407769c..fea699f6 100644 --- a/jmbitcoin/jmbitcoin/secp256k1_deterministic.py +++ b/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 diff --git a/jmbitcoin/jmbitcoin/secp256k1_main.py b/jmbitcoin/jmbitcoin/secp256k1_main.py index ff839fe5..931b4242 100644 --- a/jmbitcoin/jmbitcoin/secp256k1_main.py +++ b/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 diff --git a/jmbitcoin/jmbitcoin/secp256k1_transaction.py b/jmbitcoin/jmbitcoin/secp256k1_transaction.py index eb5c5f33..5436c743 100644 --- a/jmbitcoin/jmbitcoin/secp256k1_transaction.py +++ b/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 diff --git a/jmbitcoin/test/test_addresses.py b/jmbitcoin/test/test_addresses.py index 810f4646..d7723b1f 100644 --- a/jmbitcoin/test/test_addresses.py +++ b/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 diff --git a/jmbitcoin/test/test_bech32.py b/jmbitcoin/test/test_bech32.py index a0d0d51c..ec5de0d0 100644 --- a/jmbitcoin/test/test_bech32.py +++ b/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 # diff --git a/jmbitcoin/test/test_bip32.py b/jmbitcoin/test/test_bip32.py index d26c07b4..d0eb5b11 100644 --- a/jmbitcoin/test/test_bip32.py +++ b/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 diff --git a/jmbitcoin/test/test_btc_formatting.py b/jmbitcoin/test/test_btc_formatting.py index cc152762..66475d54 100644 --- a/jmbitcoin/test/test_btc_formatting.py +++ b/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 diff --git a/jmbitcoin/test/test_ecc_signing.py b/jmbitcoin/test/test_ecc_signing.py index 0c5b9d8c..570a2926 100644 --- a/jmbitcoin/test/test_ecc_signing.py +++ b/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.''' diff --git a/jmbitcoin/test/test_keys.py b/jmbitcoin/test/test_keys.py index 45146300..06c48fd5 100644 --- a/jmbitcoin/test/test_keys.py +++ b/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 diff --git a/jmbitcoin/test/test_main.py b/jmbitcoin/test/test_main.py index 61a7dda6..5f2bf106 100644 --- a/jmbitcoin/test/test_main.py +++ b/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.''' diff --git a/jmbitcoin/test/test_tx_serialize.py b/jmbitcoin/test/test_tx_serialize.py index e145a879..225ee5d6 100644 --- a/jmbitcoin/test/test_tx_serialize.py +++ b/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 diff --git a/jmclient/jmclient/__init__.py b/jmclient/jmclient/__init__.py index 9397197e..04d5aa4e 100644 --- a/jmclient/jmclient/__init__.py +++ b/jmclient/jmclient/__init__.py @@ -1,6 +1,3 @@ -from __future__ import (absolute_import, division, - print_function, unicode_literals) -from builtins import * import logging diff --git a/jmclient/jmclient/blockchaininterface.py b/jmclient/jmclient/blockchaininterface.py index 4b3b2857..12fda22b 100644 --- a/jmclient/jmclient/blockchaininterface.py +++ b/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 diff --git a/jmclient/jmclient/cli_options.py b/jmclient/jmclient/cli_options.py index c9f9bdae..f64e6acf 100644 --- a/jmclient/jmclient/cli_options.py +++ b/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 diff --git a/jmclient/jmclient/client_protocol.py b/jmclient/jmclient/client_protocol.py index 4aabca8c..8783cfc4 100644 --- a/jmclient/jmclient/client_protocol.py +++ b/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, diff --git a/jmclient/jmclient/commitment_utils.py b/jmclient/jmclient/commitment_utils.py index fb67b724..64a80c4a 100644 --- a/jmclient/jmclient/commitment_utils.py +++ b/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 diff --git a/jmclient/jmclient/configure.py b/jmclient/jmclient/configure.py index cfd9160a..28170b4d 100644 --- a/jmclient/jmclient/configure.py +++ b/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 diff --git a/jmclient/jmclient/cryptoengine.py b/jmclient/jmclient/cryptoengine.py index 3a434f3c..0889d05f 100644 --- a/jmclient/jmclient/cryptoengine.py +++ b/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 diff --git a/jmclient/jmclient/electrum_data.py b/jmclient/jmclient/electrum_data.py index d45d9d06..393f49c0 100644 --- a/jmclient/jmclient/electrum_data.py +++ b/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 diff --git a/jmclient/jmclient/electruminterface.py b/jmclient/jmclient/electruminterface.py index 734ba56c..6327a988 100644 --- a/jmclient/jmclient/electruminterface.py +++ b/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 diff --git a/jmclient/jmclient/jsonrpc.py b/jmclient/jmclient/jsonrpc.py index b9449128..ad8b1d2d 100644 --- a/jmclient/jmclient/jsonrpc.py +++ b/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 # Copyright (C) 2014 by phelix / blockchained.com # diff --git a/jmclient/jmclient/maker.py b/jmclient/jmclient/maker.py index 3dcae547..5a3c6f3f 100644 --- a/jmclient/jmclient/maker.py +++ b/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 diff --git a/jmclient/jmclient/old_mnemonic.py b/jmclient/jmclient/old_mnemonic.py index df8937c2..c4be0534 100644 --- a/jmclient/jmclient/old_mnemonic.py +++ b/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 diff --git a/jmclient/jmclient/output.py b/jmclient/jmclient/output.py index 94ea565b..7242aec8 100644 --- a/jmclient/jmclient/output.py +++ b/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 diff --git a/jmclient/jmclient/podle.py b/jmclient/jmclient/podle.py index fddec115..eff5dcc0 100644 --- a/jmclient/jmclient/podle.py +++ b/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 diff --git a/jmclient/jmclient/schedule.py b/jmclient/jmclient/schedule.py index 31b75438..92890fc0 100644 --- a/jmclient/jmclient/schedule.py +++ b/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 diff --git a/jmclient/jmclient/storage.py b/jmclient/jmclient/storage.py index 48c7d40a..5ff0ce78 100644 --- a/jmclient/jmclient/storage.py +++ b/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 diff --git a/jmclient/jmclient/support.py b/jmclient/jmclient/support.py index 583e8518..bdf601c2 100644 --- a/jmclient/jmclient/support.py +++ b/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 diff --git a/jmclient/jmclient/taker.py b/jmclient/jmclient/taker.py index c8c95fc0..22d1e448 100644 --- a/jmclient/jmclient/taker.py +++ b/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 diff --git a/jmclient/jmclient/taker_utils.py b/jmclient/jmclient/taker_utils.py index 94ffe530..6c0cfd6d 100644 --- a/jmclient/jmclient/taker_utils.py +++ b/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 diff --git a/jmclient/jmclient/wallet.py b/jmclient/jmclient/wallet.py index 04ce77fe..7385aa15 100644 --- a/jmclient/jmclient/wallet.py +++ b/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 diff --git a/jmclient/jmclient/wallet_service.py b/jmclient/jmclient/wallet_service.py index 186b26b7..04dbf48e 100644 --- a/jmclient/jmclient/wallet_service.py +++ b/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 diff --git a/jmclient/jmclient/wallet_utils.py b/jmclient/jmclient/wallet_utils.py index a6af243b..f359864b 100644 --- a/jmclient/jmclient/wallet_utils.py +++ b/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 diff --git a/jmclient/jmclient/yieldgenerator.py b/jmclient/jmclient/yieldgenerator.py index 5e1eac96..92c7cee3 100644 --- a/jmclient/jmclient/yieldgenerator.py +++ b/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 diff --git a/jmclient/setup.py b/jmclient/setup.py index afb4a426..fc28f0de 100644 --- a/jmclient/setup.py +++ b/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) diff --git a/jmclient/test/commontest.py b/jmclient/test/commontest.py index ee5507e6..463c97ba 100644 --- a/jmclient/test/commontest.py +++ b/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 diff --git a/jmclient/test/taker_test_data.py b/jmclient/test/taker_test_data.py index 7a6195df..0ee3c092 100644 --- a/jmclient/test/taker_test_data.py +++ b/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'}, diff --git a/jmclient/test/test_argon2.py b/jmclient/test/test_argon2.py index 8ad11c2e..1f7267b0 100644 --- a/jmclient/test/test_argon2.py +++ b/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 diff --git a/jmclient/test/test_blockchaininterface.py b/jmclient/test/test_blockchaininterface.py index 7cd73e0c..6cc91246 100644 --- a/jmclient/test/test_blockchaininterface.py +++ b/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.""" diff --git a/jmclient/test/test_client_protocol.py b/jmclient/test/test_client_protocol.py index 51768771..0ced7123 100644 --- a/jmclient/test/test_client_protocol.py +++ b/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 diff --git a/jmclient/test/test_coinjoin.py b/jmclient/test/test_coinjoin.py index 4e184300..6428a2b9 100644 --- a/jmclient/test/test_coinjoin.py +++ b/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 diff --git a/jmclient/test/test_commitment_utils.py b/jmclient/test/test_commitment_utils.py index 96ee1fd9..31000ab1 100644 --- a/jmclient/test/test_commitment_utils.py +++ b/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 diff --git a/jmclient/test/test_configure.py b/jmclient/test/test_configure.py index ad5c9aae..cb488d2f 100644 --- a/jmclient/test/test_configure.py +++ b/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 diff --git a/jmclient/test/test_core_nohistory_sync.py b/jmclient/test/test_core_nohistory_sync.py index 51d4f23a..ded8eb1c 100644 --- a/jmclient/test/test_core_nohistory_sync.py +++ b/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.""" diff --git a/jmclient/test/test_maker.py b/jmclient/test/test_maker.py index 77b239d0..1bc53e9a 100644 --- a/jmclient/test/test_maker.py +++ b/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 diff --git a/jmclient/test/test_mnemonic.py b/jmclient/test/test_mnemonic.py index 40772f1a..15a28e23 100644 --- a/jmclient/test/test_mnemonic.py +++ b/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 diff --git a/jmclient/test/test_payjoin.py b/jmclient/test/test_payjoin.py index ec5cd14e..3670100b 100644 --- a/jmclient/test/test_payjoin.py +++ b/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) diff --git a/jmclient/test/test_podle.py b/jmclient/test/test_podle.py index 1d47c6bb..d49fe80c 100644 --- a/jmclient/test/test_podle.py +++ b/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 diff --git a/jmclient/test/test_schedule.py b/jmclient/test/test_schedule.py index 04667b17..fbd8dfa8 100644 --- a/jmclient/test/test_schedule.py +++ b/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 diff --git a/jmclient/test/test_storage.py b/jmclient/test/test_storage.py index 313e2772..11e48948 100644 --- a/jmclient/test/test_storage.py +++ b/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 diff --git a/jmclient/test/test_support.py b/jmclient/test/test_support.py index 2df4d9f9..cbd93b64 100644 --- a/jmclient/test/test_support.py +++ b/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 diff --git a/jmclient/test/test_taker.py b/jmclient/test/test_taker.py index 660424d5..bc00d78b 100644 --- a/jmclient/test/test_taker.py +++ b/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 diff --git a/jmclient/test/test_tx_creation.py b/jmclient/test/test_tx_creation.py index 5f61237a..d50997d1 100644 --- a/jmclient/test/test_tx_creation.py +++ b/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.''' diff --git a/jmclient/test/test_utxomanager.py b/jmclient/test/test_utxomanager.py index bc4a2f3a..2d3023f1 100644 --- a/jmclient/test/test_utxomanager.py +++ b/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 diff --git a/jmclient/test/test_valid_addresses.py b/jmclient/test/test_valid_addresses.py index 8719d21d..a3d8238a 100644 --- a/jmclient/test/test_valid_addresses.py +++ b/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 diff --git a/jmclient/test/test_wallet.py b/jmclient/test/test_wallet.py index f9f255e2..949ca2e5 100644 --- a/jmclient/test/test_wallet.py +++ b/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 diff --git a/jmclient/test/test_wallets.py b/jmclient/test/test_wallets.py index b3083a59..66d60589 100644 --- a/jmclient/test/test_wallets.py +++ b/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 diff --git a/jmclient/test/test_walletservice.py b/jmclient/test/test_walletservice.py index 5ef3ac55..a652a404 100644 --- a/jmclient/test/test_walletservice.py +++ b/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 diff --git a/jmclient/test/test_yieldgenerator.py b/jmclient/test/test_yieldgenerator.py index fda5bc99..2fd25394 100644 --- a/jmclient/test/test_yieldgenerator.py +++ b/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 diff --git a/jmdaemon/jmdaemon/__init__.py b/jmdaemon/jmdaemon/__init__.py index d4b3c3f1..bc7b08b4 100644 --- a/jmdaemon/jmdaemon/__init__.py +++ b/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 * diff --git a/jmdaemon/jmdaemon/daemon_protocol.py b/jmdaemon/jmdaemon/daemon_protocol.py index 93deee13..0e502db2 100644 --- a/jmdaemon/jmdaemon/daemon_protocol.py +++ b/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 diff --git a/jmdaemon/jmdaemon/enc_wrapper.py b/jmdaemon/jmdaemon/enc_wrapper.py index d4244b58..98510a79 100644 --- a/jmdaemon/jmdaemon/enc_wrapper.py +++ b/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 diff --git a/jmdaemon/jmdaemon/irc.py b/jmdaemon/jmdaemon/irc.py index eb80a6ac..9e75037c 100644 --- a/jmdaemon/jmdaemon/irc.py +++ b/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 diff --git a/jmdaemon/jmdaemon/message_channel.py b/jmdaemon/jmdaemon/message_channel.py index 424f0db5..2e826ac9 100644 --- a/jmdaemon/jmdaemon/message_channel.py +++ b/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 diff --git a/jmdaemon/jmdaemon/orderbookwatch.py b/jmdaemon/jmdaemon/orderbookwatch.py index 53e02c6d..566ffb54 100644 --- a/jmdaemon/jmdaemon/orderbookwatch.py +++ b/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 diff --git a/jmdaemon/jmdaemon/protocol.py b/jmdaemon/jmdaemon/protocol.py index 25b5581d..9920e2cf 100644 --- a/jmdaemon/jmdaemon/protocol.py +++ b/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 diff --git a/jmdaemon/jmdaemon/socks.py b/jmdaemon/jmdaemon/socks.py index 9b5d2480..b2f39902 100644 --- a/jmdaemon/jmdaemon/socks.py +++ b/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 diff --git a/jmdaemon/setup.py b/jmdaemon/setup.py index 1a90a031..3116562a 100644 --- a/jmdaemon/setup.py +++ b/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) diff --git a/jmdaemon/test/dummy_mc.py b/jmdaemon/test/dummy_mc.py index 41426249..2beae98b 100644 --- a/jmdaemon/test/dummy_mc.py +++ b/jmdaemon/test/dummy_mc.py @@ -1,6 +1,3 @@ -from __future__ import (absolute_import, division, - print_function, unicode_literals) -from builtins import * import time diff --git a/jmdaemon/test/msgdata.py b/jmdaemon/test/msgdata.py index 7d68aecb..0b3dc67b 100644 --- a/jmdaemon/test/msgdata.py +++ b/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'}, diff --git a/jmdaemon/test/test_daemon_protocol.py b/jmdaemon/test/test_daemon_protocol.py index 1ddd7093..321d548f 100644 --- a/jmdaemon/test/test_daemon_protocol.py +++ b/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.''' diff --git a/jmdaemon/test/test_enc_wrapper.py b/jmdaemon/test/test_enc_wrapper.py index 46d60841..74c3bae7 100644 --- a/jmdaemon/test/test_enc_wrapper.py +++ b/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 diff --git a/jmdaemon/test/test_irc_messaging.py b/jmdaemon/test/test_irc_messaging.py index 5cb28ce5..cca5373c 100644 --- a/jmdaemon/test/test_irc_messaging.py +++ b/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 diff --git a/jmdaemon/test/test_message_channel.py b/jmdaemon/test/test_message_channel.py index e4847f90..617ca9ca 100644 --- a/jmdaemon/test/test_message_channel.py +++ b/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 diff --git a/jmdaemon/test/test_orderbookwatch.py b/jmdaemon/test/test_orderbookwatch.py index 088b5694..7157fabb 100644 --- a/jmdaemon/test/test_orderbookwatch.py +++ b/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 diff --git a/scripts/add-utxo.py b/scripts/add-utxo.py index bb93cf91..76e32656 100644 --- a/scripts/add-utxo.py +++ b/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 diff --git a/scripts/convert_old_wallet.py b/scripts/convert_old_wallet.py index d356807a..c5478eea 100644 --- a/scripts/convert_old_wallet.py +++ b/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 diff --git a/scripts/joinmarket-qt.py b/scripts/joinmarket-qt.py index 3e03dd9a..90e68985 100644 --- a/scripts/joinmarket-qt.py +++ b/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 ''' diff --git a/scripts/joinmarketd.py b/scripts/joinmarketd.py index 8397163b..82964086 100644 --- a/scripts/joinmarketd.py +++ b/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 diff --git a/scripts/obwatch/ob-watcher.py b/scripts/obwatch/ob-watcher.py index 0263140f..4c102b2f 100644 --- a/scripts/obwatch/ob-watcher.py +++ b/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 diff --git a/scripts/qtsupport.py b/scripts/qtsupport.py index e3f5fc36..08e78a97 100644 --- a/scripts/qtsupport.py +++ b/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. diff --git a/scripts/receive-payjoin.py b/scripts/receive-payjoin.py index 115e3217..4123c841 100644 --- a/scripts/receive-payjoin.py +++ b/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 diff --git a/scripts/sendpayment.py b/scripts/sendpayment.py index c941f742..7d7590ef 100644 --- a/scripts/sendpayment.py +++ b/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, diff --git a/scripts/sendtomany.py b/scripts/sendtomany.py index f002f8c5..5a70ed23 100644 --- a/scripts/sendtomany.py +++ b/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 diff --git a/scripts/tumbler.py b/scripts/tumbler.py index dc39b638..0cd882b5 100644 --- a/scripts/tumbler.py +++ b/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 diff --git a/scripts/wallet-tool.py b/scripts/wallet-tool.py index 9cded3ac..7817b2c4 100644 --- a/scripts/wallet-tool.py +++ b/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 diff --git a/scripts/yg-privacyenhanced.py b/scripts/yg-privacyenhanced.py index 03631c98..de57cc2c 100644 --- a/scripts/yg-privacyenhanced.py +++ b/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 diff --git a/scripts/yield-generator-basic.py b/scripts/yield-generator-basic.py index 0b76306b..2094674c 100644 --- a/scripts/yield-generator-basic.py +++ b/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 diff --git a/setupall.py b/setupall.py index 230455df..b52ec1dc 100644 --- a/setupall.py +++ b/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 \n" "Mode is one of:\n" diff --git a/test/common.py b/test/common.py index 6dc8fce9..971eb795 100644 --- a/test/common.py +++ b/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 diff --git a/test/test_segwit.py b/test/test_segwit.py index 7e9e00e9..a222e5f9 100644 --- a/test/test_segwit.py +++ b/test/test_segwit.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 creation of segwit transactions.''' import binascii diff --git a/test/ygrunner.py b/test/ygrunner.py index 7e68327a..c55985fc 100644 --- a/test/ygrunner.py +++ b/test/ygrunner.py @@ -1,7 +1,4 @@ #! /usr/bin/env python -from __future__ import (absolute_import, division, - print_function, unicode_literals) -from builtins import * # noqa: F401 '''Creates wallets and yield generators in regtest. Provides seed for joinmarket-qt test. This should be run via pytest, even though