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))