Upgrade to Python 3.5+ only again as py-ipfs-http-client doesn't support 2.7 anymore

Author: ntninja

.travis.yml

@@ -1,25 +1,18 @@
-sudo: false
 language: python
 matrix:
   include:
   - python: 3.6
     env: TOXENV=lint
-  - python: 2.7
-    env: TOXENV=py27
-  - python: 3.4
-    env: TOXENV=py34
   - python: 3.5
     env: TOXENV=py35
   - python: 3.6
     env: TOXENV=py36
   - python: 3.7
     env: TOXENV=py37
-    dist: xenial
+  - python: 3.8
+    env: TOXENV=py38
   - python: pypy3.5
     env: TOXENV=pypy3
-  allow_failures:
-  - python: 2.7
-    env: TOXENV=py27
 
 install:
 - pip install tox

AUTHORS

@@ -1,3 +1,4 @@
 Steven Buss <[email protected]>
 Fred Thomsen <[email protected]>
 Jesse Weinstein <[email protected]>
+Alexander Schlarb <[email protected]>

LICENSE-MIT

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2014-2015 Steven Buss
+Copyright (c) 2019-2020 Alexander Schlarb
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

multiaddr/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from .multiaddr import Multiaddr  # NOQA
 
 __author__ = 'Steven Buss'

multiaddr/codecs/__init__.py

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-from __future__ import absolute_import
 import importlib
 
 

multiaddr/codecs/_util.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import idna
 
 from . import LENGTH_PREFIXED_VAR_SIZE

multiaddr/codecs/domain.py

@@ -1,35 +1,15 @@
-from __future__ import absolute_import
 import os
 
-import six
-
 from . import LENGTH_PREFIXED_VAR_SIZE
 
 
 SIZE = LENGTH_PREFIXED_VAR_SIZE
 IS_PATH = True
 
 
-if hasattr(os, "fsencode") and hasattr(os, "fsdecode"):
-    fsencode = os.fsencode
-    fsdecode = os.fsdecode
-else:  # pragma: no cover (PY2)
-    import sys
-
-    def fsencode(path):
-        if not isinstance(path, six.binary_type):
-            path = path.encode(sys.getfilesystemencoding())
-        return path
-
-    def fsdecode(path):
-        if not isinstance(path, six.text_type):
-            path = path.decode(sys.getfilesystemencoding())
-        return path
-
-
 def to_bytes(proto, string):
-    return fsencode(string)
+    return os.fsencode(string)
 
 
 def to_string(proto, buf):
-    return fsdecode(buf)
+    return os.fsdecode(buf)

multiaddr/codecs/fspath.py

@@ -1,9 +1,4 @@
-from __future__ import absolute_import
-
 import netaddr
-import six
-
-from ._util import packed_net_bytes_to_int
 
 
 SIZE = 32
@@ -15,5 +10,4 @@ def to_bytes(proto, string):
 
 
 def to_string(proto, buf):
-    ip_addr = netaddr.IPAddress(packed_net_bytes_to_int(buf), version=4)
-    return six.text_type(ip_addr)
+    return str(netaddr.IPAddress(int.from_bytes(buf, byteorder='big'), version=4))

multiaddr/codecs/ip4.py

@@ -1,9 +1,4 @@
-from __future__ import absolute_import
-
 import netaddr
-import six
-
-from ._util import packed_net_bytes_to_int
 
 
 SIZE = 128
@@ -15,5 +10,4 @@ def to_bytes(proto, string):
 
 
 def to_string(proto, buf):
-    ip_addr = netaddr.IPAddress(packed_net_bytes_to_int(buf), version=6)
-    return six.text_type(ip_addr)
+    return str(netaddr.IPAddress(int.from_bytes(buf, byteorder='big'), version=6))

multiaddr/codecs/ip6.py

@@ -1,9 +1,6 @@
-from __future__ import absolute_import
 import base64
 import struct
 
-import six
-
 
 SIZE = 96
 IS_PATH = False
@@ -20,13 +17,13 @@ def to_bytes(proto, string):
     try:
         onion_host_bytes = base64.b32decode(addr[0].upper())
     except Exception as exc:
-        six.raise_from(ValueError("Cannot decode {0!r} as base32: {1}".format(addr[0], exc)), exc)
+        raise ValueError("Cannot decode {0!r} as base32: {1}".format(addr[0], exc)) from exc
 
     # onion port number
     try:
         port = int(addr[1], 10)
     except ValueError as exc:
-        six.raise_from(ValueError("Port number is not a base 10 integer"), exc)
+        raise ValueError("Port number is not a base 10 integer") from exc
     if port not in range(1, 65536):
         raise ValueError("Port number is not in range(1, 65536)")
 
@@ -36,5 +33,5 @@ def to_bytes(proto, string):
 def to_string(proto, buf):
     addr_bytes, port_bytes = (buf[:-2], buf[-2:])
     addr = base64.b32encode(addr_bytes).decode('ascii').lower()
-    port = six.text_type(struct.unpack('>H', port_bytes)[0])
-    return u':'.join([addr, port])
+    port = str(struct.unpack('>H', port_bytes)[0])
+    return ':'.join([addr, port])

multiaddr/codecs/onion.py

@@ -1,9 +1,6 @@
-from __future__ import absolute_import
 import base64
 import struct
 
-import six
-
 
 SIZE = 296
 IS_PATH = False
@@ -20,13 +17,13 @@ def to_bytes(proto, string):
     try:
         onion3_host_bytes = base64.b32decode(addr[0].upper())
     except Exception as exc:
-        six.raise_from(ValueError("Cannot decode {0!r} as base32: {1}".format(addr[0], exc)), exc)
+        raise ValueError("Cannot decode {0!r} as base32: {1}".format(addr[0], exc)) from exc
 
     # onion3 port number
     try:
         port = int(addr[1], 10)
     except ValueError as exc:
-        six.raise_from(ValueError("Port number is not a base 10 integer"), exc)
+        raise ValueError("Port number is not a base 10 integer") from exc
     if port not in range(1, 65536):
         raise ValueError("Port number is not in range(1, 65536)")
 
@@ -36,5 +33,5 @@ def to_bytes(proto, string):
 def to_string(proto, buf):
     addr_bytes, port_bytes = (buf[:-2], buf[-2:])
     addr = base64.b32encode(addr_bytes).decode('ascii').lower()
-    port = six.text_type(struct.unpack('>H', port_bytes)[0])
-    return u':'.join([addr, port])
+    port = str(struct.unpack('>H', port_bytes)[0])
+    return ':'.join([addr, port])

multiaddr/codecs/onion3.py

@@ -1,7 +1,4 @@
-from __future__ import absolute_import
-
 import base58
-import six
 
 from . import LENGTH_PREFIXED_VAR_SIZE
 
@@ -11,9 +8,6 @@
 
 
 def to_bytes(proto, string):
-    # the address is a base58-encoded string
-    if six.PY2 and isinstance(string, unicode):  # pragma: no cover (PY2)  # noqa: F821
-        string = string.encode("ascii")
     mm = base58.b58decode(string)
     if len(mm) < 5:
         raise ValueError("P2P MultiHash too short: len() < 5")

multiaddr/codecs/p2p.py

@@ -1,8 +1,5 @@
-from __future__ import absolute_import
 import struct
 
-import six
-
 
 SIZE = 16
 IS_PATH = False
@@ -12,12 +9,12 @@ def to_bytes(proto, string):
     try:
         return struct.pack('>H', int(string, 10))
     except ValueError as exc:
-        six.raise_from(ValueError("Not a base 10 integer"), exc)
+        raise ValueError("Not a base 10 integer") from exc
     except struct.error as exc:
-        six.raise_from(ValueError("Integer not in range(65536)"), exc)
+        raise ValueError("Integer not in range(65536)") from exc
 
 
 def to_string(proto, buf):
     if len(buf) != 2:
         raise ValueError("Invalid integer length (must be 2 bytes / 16 bits)")
-    return six.text_type(struct.unpack('>H', buf)[0])
+    return str(struct.unpack('>H', buf)[0])

multiaddr/codecs/uint16be.py

@@ -15,7 +15,7 @@ def __init__(self, proto, string):
         self.proto = proto
         self.string = string
 
-        super(ProtocolLookupError, self).__init__(
+        super().__init__(
             "MultiAddr {0!r} does not contain protocol {1}".format(string, proto)
         )
 
@@ -40,7 +40,7 @@ def __init__(self, message, string, protocol=None, original=None):
         else:
             message = "Invalid MultiAddr {0!r}: {1}".format(string, message)
 
-        super(StringParseError, self).__init__(message)
+        super().__init__(message)
 
 
 class BinaryParseError(ParseError):
@@ -56,7 +56,7 @@ def __init__(self, message, binary, protocol, original=None):
 
         message = "Invalid binary MultiAddr protocol {0}: {1}".format(protocol, message)
 
-        super(BinaryParseError, self).__init__(message)
+        super().__init__(message)
 
 
 class ProtocolManagerError(Error):
@@ -71,7 +71,7 @@ def __init__(self, proto, kind="name"):
         self.proto = proto
         self.kind = kind
 
-        super(ProtocolExistsError, self).__init__(
+        super().__init__(
             "Protocol with {0} {1!r} already exists".format(kind, getattr(proto, kind))
         )
 
@@ -84,6 +84,6 @@ def __init__(self, value, kind="name"):
         self.value = value
         self.kind = kind
 
-        super(ProtocolNotFoundError, self).__init__(
+        super().__init__(
             "No protocol with {0} {1!r} found".format(kind, value)
         )

multiaddr/exceptions.py

@@ -1,11 +1,5 @@
-# -*- coding: utf-8 -*-
-try:
-    import collections.abc
-except ImportError:  # pragma: no cover (PY2)
-    import collections
-    collections.abc = collections
-
-import six
+import collections.abc
+
 import varint
 
 from . import exceptions, protocols
@@ -59,15 +53,12 @@ def __iter__(self):
                     # If we have an address, return it
                     yield proto, codec.to_string(proto, part)
                 except Exception as exc:
-                    six.raise_from(
-                        exceptions.BinaryParseError(
+                    raise exceptions.BinaryParseError(
                             str(exc),
                             self._mapping.to_bytes(),
                             proto.name,
                             exc,
-                        ),
-                        exc,
-                    )
+                        ) from exc
             else:
                 # We were given something like '/utp', which doesn't have
                 # an address, so return None
@@ -116,15 +107,9 @@ def __init__(self, addr):
             addr : A string-encoded or a byte-encoded Multiaddr
 
         """
-        # On Python 2 text string will often be binary anyways so detect the
-        # obvious case of a “binary-encoded” multiaddr starting with a slash
-        # and decode it into text
-        if six.PY2 and isinstance(addr, str) and addr.startswith("/"):  # pragma: no cover (PY2)
-            addr = addr.decode("utf-8")
-
-        if isinstance(addr, six.text_type):
+        if isinstance(addr, str):
             self._bytes = string_to_bytes(addr)
-        elif isinstance(addr, six.binary_type):
+        elif isinstance(addr, bytes):
             self._bytes = addr
         elif isinstance(addr, Multiaddr):
             self._bytes = addr.to_bytes()
@@ -155,17 +140,7 @@ def __iter__(self):
         return iter(MultiAddrKeys(self))
 
     def __len__(self):
-        return sum((1 for _ in bytes_iter(self.to_bytes())))
-
-    # On Python 2 __str__ needs to return binary text, so expose the original
-    # function as __unicode__ and transparently encode its returned text based
-    # on the current locale
-    if six.PY2:  # pragma: no cover (PY2)
-        __unicode__ = __str__
-
-        def __str__(self):
-            import locale
-            return self.__unicode__().encode(locale.getpreferredencoding())
+        return sum(1 for _ in bytes_iter(self.to_bytes()))
 
     def __repr__(self):
         return "<Multiaddr %s>" % str(self)