Re-add Python 2.7 support and enable testing on PyPy3.5

This partially reverts commit 164dcc3.

Author: ntninja

.travis.yml

@@ -1,6 +1,9 @@
+sudo: false
 language: python
 matrix:
   include:
+  - python: 2.7
+    env: TOXENV=py27
   - python: 3.4
     env: TOXENV=py34
   - python: 3.5
@@ -10,6 +13,11 @@ matrix:
   - python: 3.7
     env: TOXENV=py37
     dist: xenial
+  - python: pypy3.5
+    env: TOXENV=pypy3
+  allow_failures:
+  - python: 2.7
+    env: TOXENV=py27
 
 install:
 - pip install tox

CONTRIBUTING.rst

@@ -101,7 +101,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 3.4+ and PyPy. Check
+3. The pull request should work for Python 2.7, 3.4+ and PyPy3. Check
    https://travis-ci.org/multiformats/py-multiaddr/pull_requests
    and make sure that the tests pass for all supported Python versions.
 

Makefile

@@ -52,7 +52,7 @@ lint:
 	flake8 multiaddr/* tests/*
 
 test:
-	TOXENV=py37 tox
+	TOXENV=py27 tox
 
 test-all:
 	tox

docs/conf.py

@@ -55,8 +55,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = 'Multiaddr'
-copyright = '2016, Steven Buss'
+project = u'Multiaddr'
+copyright = u'2016, Steven Buss'
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout
@@ -209,8 +209,8 @@
 # [howto/manual]).
 latex_documents = [
     ('index', 'multiaddr.tex',
-     'Multiaddr Documentation',
-     'Steven Buss', 'manual'),
+     u'Multiaddr Documentation',
+     u'Steven Buss', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at
@@ -240,8 +240,8 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'multiaddr',
-     'Multiaddr Documentation',
-     ['Steven Buss'], 1)
+     u'Multiaddr Documentation',
+     [u'Steven Buss'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -255,8 +255,8 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'multiaddr',
-     'Multiaddr Documentation',
-     'Steven Buss',
+     u'Multiaddr Documentation',
+     u'Steven Buss',
      'multiaddr',
      'One line description of project.',
      'Miscellaneous'),

multiaddr/multiaddr.py

@@ -13,7 +13,7 @@ class ProtocolNotFoundException(Exception):
     pass
 
 
-class Multiaddr:
+class Multiaddr(object):
     """Multiaddr is a representation of multiple nested internet addresses.
 
     Multiaddr is a cross-protocol, cross-platform format for representing

multiaddr/protocols.py

@@ -67,7 +67,7 @@
 LENGTH_PREFIXED_VAR_SIZE = -1
 
 
-class Protocol:
+class Protocol(object):
     __slots__ = [
         "code",   # int
         "size",   # int (-1 indicates a length-prefixed variable size)
@@ -77,13 +77,13 @@ class Protocol:
     ]
 
     def __init__(self, code, size, name, vcode, path=False):
-        if not isinstance(code, int):
+        if not isinstance(code, six.integer_types):
             raise ValueError("code must be an integer")
-        if not isinstance(size, int):
+        if not isinstance(size, six.integer_types):
             raise ValueError("size must be an integer")
-        if not isinstance(name, str):
+        if not isinstance(name, six.string_types):
             raise ValueError("name must be a string")
-        if not isinstance(vcode, bytes):
+        if not isinstance(vcode, six.binary_type):
             raise ValueError("vcode must be binary")
         if not isinstance(path, bool):
             raise ValueError("path must be a boolean")
@@ -179,8 +179,8 @@ def read_varint_code(buf):
     Protocol(P_UNIX, LENGTH_PREFIXED_VAR_SIZE, 'unix', code_to_varint(P_UNIX), path=True),
 ]
 
-_names_to_protocols = {proto.name: proto for proto in PROTOCOLS}
-_codes_to_protocols = {proto.code: proto for proto in PROTOCOLS}
+_names_to_protocols = dict((proto.name, proto) for proto in PROTOCOLS)
+_codes_to_protocols = dict((proto.code, proto) for proto in PROTOCOLS)
 
 
 def add_protocol(proto):

setup.py

@@ -36,18 +36,20 @@
     license='MIT License',
     zip_safe=False,
     keywords='multiaddr',
-    python_requires='>=3.4',
+    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3 :: Only',
     ],
     setup_requires=[
         'pytest-runner',

tests/test_protocols.py

@@ -53,7 +53,7 @@ def test_invalid_name(valid_params, invalid_name):
         protocols.Protocol(**valid_params)
 
 
-@pytest.mark.parametrize("invalid_vcode", [3, 'a3'])
+@pytest.mark.parametrize("invalid_vcode", [3, u'a3'])
 def test_invalid_vcode(valid_params, invalid_vcode):
     valid_params['vcode'] = invalid_vcode
     with pytest.raises(ValueError):
@@ -67,7 +67,7 @@ def test_invalid_path(valid_params, invalid_path):
         protocols.Protocol(**valid_params)
 
 
-@pytest.mark.parametrize("name", ["foo-str", "foo-u"])
+@pytest.mark.parametrize("name", ["foo-str", u"foo-u"])
 def test_valid_names(valid_params, name):
     valid_params['name'] = name
     test_valid(valid_params)

tox.ini

@@ -1,10 +1,10 @@
 [tox]
-envlist = py34, py35, py36, py37
+envlist = py27, py34, py35, py36, py37, pypy3
 
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/multiaddr
-commands = pytest --cov=./
+commands = py.test --cov=./
 
 ; If you want to make tox run the tests with the same versions, create a
 ; requirements.txt with the pinned versions and uncomment the following lines: