Drop support for python 2.x

Author: emesik

monero/address.py

@@ -1,8 +1,6 @@
 from binascii import hexlify, unhexlify
 import re
-import six
 import struct
-import warnings
 
 from . import base58
 from . import const
@@ -66,10 +64,8 @@ def __repr__(self):
         return base58.encode(hexlify(self._decoded))
 
     def __eq__(self, other):
-        if isinstance(other, BaseAddress):
+        if isinstance(other, (BaseAddress, str)):
             return str(self) == str(other)
-        elif isinstance(other, six.text_type) or isinstance(other, six.string_types):
-            return str(self) == six.ensure_str(other)
         return super(BaseAddress, self).__eq__(other)
 
     def __hash__(self):

monero/backends/jsonrpc/daemon.py

@@ -1,12 +1,10 @@
-from __future__ import unicode_literals
 import binascii
 from datetime import datetime
 from decimal import Decimal
 import ipaddress
 import json
 import logging
 import requests
-import six
 
 from ... import address
 from ... import exceptions
@@ -134,7 +132,7 @@ def send_transaction(self, blob, relay=True):
         res = self.raw_request(
             "/sendrawtransaction",
             {
-                "tx_as_hex": six.ensure_text(binascii.hexlify(blob)),
+                "tx_as_hex": binascii.hexlify(blob).decode(),
                 "do_not_relay": not relay,
             },
         )
@@ -388,14 +386,11 @@ def submit_block(self, blobs):
         }
         """
 
-        if isinstance(blobs, (six.binary_type,) + six.string_types):
+        if isinstance(blobs, (bytes, str)):
             blobs = [blobs]
 
         blobs = [
-            binascii.hexlify(b).decode()
-            if isinstance(b, six.binary_type)
-            else six.ensure_text(b)
-            for b in blobs
+            binascii.hexlify(b).decode() if isinstance(b, bytes) else b for b in blobs
         ]
 
         return self.raw_jsonrpc_request("submit_block", params=blobs)
@@ -707,9 +702,7 @@ def set_bans(self, ip, ban, seconds=None):
         }
         """
 
-        if isinstance(
-            ip, six.string_types + six.integer_types
-        ):  # If single element paramters
+        if isinstance(ip, (str, int)):  # If single element paramters
             user_bans = [{"ip": ip, "ban": ban, "seconds": seconds}]
         else:  # If params are iterables, contrust the list of ban entries
             if not (len(ip) == len(ban) == len(seconds)):
@@ -736,7 +729,7 @@ def set_bans(self, ip, ban, seconds=None):
                 raise ValueError('"seconds" can not be less than zero')
 
             ban = {}
-            if isinstance(curr_ip, six.integer_types):
+            if isinstance(curr_ip, int):
                 ban["ip"] = curr_ip
             else:
                 ban["host"] = curr_ip
@@ -823,7 +816,7 @@ def get_output_histogram(
         """
 
         # Coerce amounts paramter
-        if isinstance(amounts, (Decimal,) + six.integer_types):
+        if isinstance(amounts, (Decimal, int)):
             amounts = [to_atomic(amounts) if isinstance(amounts, Decimal) else amounts]
         elif amounts is None:
             raise ValueError("amounts is None")
@@ -893,7 +886,7 @@ def get_fee_estimate(self, grace_blocks=None):
         }
         """
 
-        if not isinstance(grace_blocks, (type(None),) + six.integer_types):
+        if not isinstance(grace_blocks, (type(None), int)):
             raise TypeError("grace_blocks is not an int")
         elif grace_blocks is not None and grace_blocks < 0:
             raise ValueError("grace_blocks < 0")
@@ -1106,9 +1099,6 @@ def send_raw_transaction(self, tx_as_hex, do_not_relay=False):
         "untrusted": bool; True for bootstrap mode, False for full sync mode.
         }
         """
-
-        tx_as_hex = six.ensure_text(tx_as_hex)
-
         return self.raw_request(
             "/send_raw_transaction",
             data={"tx_as_hex": tx_as_hex, "do_not_relay": do_not_relay},
@@ -1287,7 +1277,7 @@ def set_log_categories(self, categories=None):
 
         if not categories:
             return self.raw_request("/set_log_categories")
-        elif isinstance(categories, six.string_types):
+        elif isinstance(categories, str):
             categories = categories.split(",")
 
         # Validate categories
@@ -1489,12 +1479,10 @@ def get_outs(self, amount, index, get_txid=True):
         }
         """
 
-        if isinstance(index, six.integer_types):  # single element
+        if isinstance(index, int):  # single element
             outputs = [
                 {
-                    "amount": amount
-                    if isinstance(amount, six.integer_types)
-                    else to_atomic(amount),
+                    "amount": amount,
                     "index": index,
                 }
             ]
@@ -1506,9 +1494,7 @@ def get_outs(self, amount, index, get_txid=True):
             for a, i in zip(amount, index):
                 outputs.append(
                     {
-                        "amount": a
-                        if isinstance(a, six.integer_types)
-                        else to_atomic(a),
+                        "amount": a if isinstance(a, int) else to_atomic(a),
                         "index": i,
                     }
                 )
@@ -1537,10 +1523,6 @@ def update(self, command, path=None):
         "status": str; General RPC error code. "OK" means everything looks good.
         }
         """
-
-        command = six.ensure_text(command)
-        path = six.ensure_text(path) if path is not None else None
-
         if command not in ("check", "download"):
             raise ValueError('unrecognized command: "{}"'.format(command))
 
@@ -1620,10 +1602,12 @@ def _validate_hashlist(self, hashes):
         if not hashes:
             return []
         else:
-            if isinstance(hashes, six.string_types):
+            if isinstance(hashes, str):
                 hashes = [hashes]
             else:
-                coerce_compatible_str = lambda s: six.ensure_text(str(s))
+                coerce_compatible_str = (
+                    lambda s: s.decode() if isinstance(s, bytes) else s
+                )
                 hashes = list(map(coerce_compatible_str, hashes))
 
             not_valid = lambda h: not self._is_valid_256_hex(h)

monero/backends/jsonrpc/wallet.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import binascii
 from datetime import datetime
 import json

monero/block.py

@@ -1,5 +1,4 @@
 import operator
-import six
 from .transaction import Transaction
 
 
@@ -43,12 +42,12 @@ def __init__(self, **kwargs):
     def __eq__(self, other):
         if isinstance(other, Block):
             return self.hash == other.hash
-        elif isinstance(other, six.string_types):
-            return six.ensure_text(self.hash) == six.ensure_text(other)
+        elif isinstance(other, str):
+            return self.hash == other
         return super(Block, self).__eq__(other)
 
     def __contains__(self, tx):
-        if isinstance(tx, six.string_types):
+        if isinstance(tx, str):
             txid = tx
         elif isinstance(tx, Transaction):
             txid = tx.hash

monero/daemon.py

@@ -1,5 +1,3 @@
-import six
-
 from .backends.jsonrpc import JSONRPCDaemon
 
 
@@ -85,6 +83,6 @@ def transactions(self, hashes):
 
         :param hashes: str or list of str
         """
-        if isinstance(hashes, six.string_types):
+        if isinstance(hashes, str):
             hashes = [hashes]
         return self._backend.transactions(hashes)

monero/numbers.py

@@ -1,13 +1,12 @@
 from decimal import Decimal
-import six
 
 PICONERO = Decimal("0.000000000001")
 EMPTY_KEY = "0" * 64
 
 
 def to_atomic(amount):
     """Convert Monero decimal to atomic integer of piconero."""
-    if not isinstance(amount, (Decimal, float) + six.integer_types):
+    if not isinstance(amount, (Decimal, int, float)):
         raise ValueError(
             "Amount '{}' doesn't have numeric type. Only Decimal, int, long and "
             "float (not recommended) are accepted as amounts.".format(amount)
@@ -41,11 +40,9 @@ class PaymentID(object):
     def __init__(self, payment_id):
         if isinstance(payment_id, PaymentID):
             payment_id = int(payment_id)
-        if isinstance(payment_id, six.text_type) or isinstance(
-            payment_id, six.string_types
-        ):
+        if isinstance(payment_id, str):
             payment_id = int(payment_id, 16)
-        elif not isinstance(payment_id, six.integer_types):
+        elif not isinstance(payment_id, int):
             raise TypeError(
                 "payment_id must be either int or hexadecimal str or bytes, "
                 "is {0}".format(type(payment_id))
@@ -72,8 +69,8 @@ def __int__(self):
     def __eq__(self, other):
         if isinstance(other, PaymentID):
             return int(self) == int(other)
-        elif isinstance(other, six.integer_types):
+        elif isinstance(other, int):
             return int(self) == other
-        elif isinstance(other, six.text_type) or isinstance(other, six.string_types):
-            return str(self) == six.ensure_str(other)
+        elif isinstance(other, str):
+            return str(self) == other
         return super(PaymentID, self).__eq__(other)

monero/transaction/__init__.py

@@ -2,7 +2,6 @@
 import itertools
 import operator
 import re
-import six
 import struct
 import varint
 import warnings
@@ -461,9 +460,7 @@ def __init__(self, **filterparams):
         if _local_address is None:
             self.local_addresses = []
         else:
-            if isinstance(_local_address, six.string_types) or isinstance(
-                _local_address, six.text_type
-            ):
+            if isinstance(_local_address, str):
                 local_addresses = [_local_address]
             else:
                 try:
@@ -475,9 +472,7 @@ def __init__(self, **filterparams):
         if _tx_id is None:
             self.tx_ids = []
         else:
-            if isinstance(_tx_id, six.string_types) or isinstance(
-                _tx_id, six.text_type
-            ):
+            if isinstance(_tx_id, str):
                 tx_ids = [_tx_id]
             else:
                 try:
@@ -489,9 +484,7 @@ def __init__(self, **filterparams):
         if _payment_id is None:
             self.payment_ids = []
         else:
-            if isinstance(_payment_id, six.string_types) or isinstance(
-                _payment_id, six.text_type
-            ):
+            if isinstance(_payment_id, str):
                 payment_ids = [_payment_id]
             else:
                 try:

monero/transaction/extra.py

@@ -1,5 +1,4 @@
 import binascii
-import six
 import varint
 
 

monero/wordlists/wordlist.py

@@ -4,8 +4,6 @@
 import logging
 from binascii import crc32
 
-from six import with_metaclass
-
 
 WORDLISTS = {}
 _log = logging.getLogger(__name__)
@@ -40,7 +38,7 @@ def __new__(cls, name, bases, attrs):
         return new_cls
 
 
-class Wordlist(with_metaclass(WordlistType)):
+class Wordlist(metaclass=WordlistType):
     n = 1626
 
     @classmethod

requirements.txt

@@ -2,6 +2,5 @@ pycryptodomex~=3.14
 pynacl~=1.4
 pysocks~=1.7
 requests
-six>=1.12.0
 ipaddress
 varint

setup.py

@@ -1,9 +1,6 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 import codecs
 import os
 import re
-import sys
 from distutils.core import setup
 
 from setuptools import find_packages
@@ -33,11 +30,7 @@ def find_version(*parts):
     url="https://github.com/monero-ecosystem/monero-python/",
     long_description=open("README.rst", "rb").read().decode("utf-8"),
     install_requires=open("requirements.txt", "r").read().splitlines(),
-    tests_require=open(
-        "test_requirements_py{:d}.txt".format(sys.version_info.major), "r"
-    )
-    .read()
-    .splitlines(),
+    tests_require=open("test_requirements.txt", "r").read().splitlines(),
     packages=find_packages(".", exclude=["tests"]),
     include_package_data=True,
     author="Michał Sałaban",
@@ -49,7 +42,6 @@ def find_version(*parts):
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",

test_requirements_py3.txt renamed to test_requirements.txt

@@ -1,5 +1,4 @@
 from datetime import datetime
-import six
 import unittest
 
 from monero.block import Block

test_requirements_py2.txt

@@ -3,7 +3,6 @@
 import logging
 import os
 import responses
-import six
 
 from monero.const import NET_STAGE
 from monero.daemon import Daemon
@@ -867,7 +866,7 @@ def test_set_bans_single(self):
             status=200,
         )
 
-        resp = self.backend.set_bans(six.ensure_text("188.165.17.204"), True, 3600)
+        resp = self.backend.set_bans("188.165.17.204", True, 3600)
 
         self.assertEqual(resp["status"], "OK")
 
@@ -881,9 +880,9 @@ def test_set_bans_multiple(self):
         )
 
         ips = [
-            six.ensure_text("188.165.17.204"),
+            "188.165.17.204",
             1466097787,
-            six.ensure_text("87.98.224.124"),
+            "87.98.224.124",
         ]
         bans = [True, True, False]
         seconds = [3600, 500, 7200]