Merge pull request #46 from mhchia/feature/add-flake8

Add flake8 to tox and CI

Author: mhchia

.flake8

@@ -1,2 +1,2 @@
 [flake8]
-exclude = multiaddr/protocols.csv
+max-line-length = 100

.travis.yml

@@ -2,6 +2,8 @@ sudo: false
 language: python
 matrix:
   include:
+  - python: 3.6
+    env: TOXENV=lint
   - python: 2.7
     env: TOXENV=py27
   - python: 3.4

multiaddr/codecs/__init__.py

@@ -13,6 +13,8 @@ class NoneCodec:
 
 
 CODEC_CACHE = {}
+
+
 def codec_by_name(name):
     if name is None:  # Special “do nothing – expect nothing” pseudo-codec
         return NoneCodec

multiaddr/codecs/p2p.py

@@ -12,7 +12,7 @@
 
 def to_bytes(proto, string):
     # the address is a base58-encoded string
-    if six.PY2 and isinstance(string, unicode):  # pragma: no cover (PY2)
+    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:

multiaddr/exceptions.py

@@ -10,11 +10,11 @@ class ProtocolLookupError(LookupError):
     """
     MultiAddr did not contain a protocol with the requested code
     """
-    
+
     def __init__(self, proto, string):
-        self.proto  = proto
+        self.proto = proto
         self.string = string
-        
+
         super(ProtocolLookupError, self).__init__(
             "MultiAddr {0!r} does not contain protocol {1}".format(string, proto)
         )
@@ -30,8 +30,8 @@ class StringParseError(ParseError):
     """
 
     def __init__(self, message, string, protocol=None, original=None):
-        self.message  = message
-        self.string   = string
+        self.message = message
+        self.string = string
         self.protocol = protocol
         self.original = original
 
@@ -49,8 +49,8 @@ class BinaryParseError(ParseError):
     """
 
     def __init__(self, message, binary, protocol, original=None):
-        self.message  = message
-        self.binary   = binary
+        self.message = message
+        self.binary = binary
         self.protocol = protocol
         self.original = original
 
@@ -69,19 +69,20 @@ class ProtocolExistsError(ProtocolManagerError):
     """
     def __init__(self, proto, kind="name"):
         self.proto = proto
-        self.kind  = kind
+        self.kind = kind
 
         super(ProtocolExistsError, self).__init__(
             "Protocol with {0} {1!r} already exists".format(kind, getattr(proto, kind))
         )
 
+
 class ProtocolNotFoundError(ProtocolManagerError):
     """
     No protocol with the given name or code found
     """
     def __init__(self, value, kind="name"):
         self.value = value
-        self.kind  = kind
+        self.kind = kind
 
         super(ProtocolNotFoundError, self).__init__(
             "No protocol with {0} {1!r} found".format(kind, value)

multiaddr/multiaddr.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 try:
-	import collections.abc
+    import collections.abc
 except ImportError:  # pragma: no cover (PY2)
-	import collections
-	collections.abc = collections
+    import collections
+    collections.abc = collections
 
 import six
 
@@ -17,7 +17,6 @@
 __all__ = ("Multiaddr",)
 
 
-
 class MultiAddrKeys(collections.abc.KeysView, collections.abc.Sequence):
     def __contains__(self, proto):
         proto = protocols.protocol_with_any(proto)
@@ -59,7 +58,15 @@ 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(str(exc), self._mapping.to_bytes(), proto.name, exc), exc)
+                    six.raise_from(
+                        exceptions.BinaryParseError(
+                            str(exc),
+                            self._mapping.to_bytes(),
+                            proto.name,
+                            exc,
+                        ),
+                        exc,
+                    )
             else:
                 # We were given something like '/utp', which doesn't have
                 # an address, so return None
@@ -82,7 +89,6 @@ def __iter__(self):
             yield value
 
 
-
 class Multiaddr(collections.abc.Mapping):
     """Multiaddr is a representation of multiple nested internet addresses.
 
@@ -200,13 +206,13 @@ def decapsulate(self, other):
 
     def value_for_protocol(self, proto):
         """Return the value (if any) following the specified protocol
-        
+
         Returns
         -------
         union[object, NoneType]
             The parsed protocol value for the given protocol code or ``None``
             if the given protocol does not require any value
-        
+
         Raises
         ------
         ~multiaddr.exceptions.BinaryParseError

multiaddr/protocols.py

@@ -67,7 +67,6 @@
 ]
 
 
-
 class Protocol(object):
     __slots__ = [
         "code",   # int
@@ -80,7 +79,7 @@ def __init__(self, code, name, codec):
             raise TypeError("code must be an integer")
         if not isinstance(name, six.string_types):
             raise TypeError("name must be a string")
-        if not isinstance(codec, six.string_types) and not codec is None:
+        if not isinstance(codec, six.string_types) and codec is not None:
             raise TypeError("codec must be a string or None")
 
         self.code = code

multiaddr/transforms.py

@@ -12,7 +12,6 @@
 from .protocols import read_varint_code
 
 
-
 def string_to_bytes(string):
     bs = []
     for proto, codec, value in string_iter(string):
@@ -90,7 +89,14 @@ def bytes_iter(buf):
             proto = protocol_with_code(code)
             codec = codec_by_name(proto.codec)
         except (ImportError, exceptions.ProtocolNotFoundError) as exc:
-            six.raise_from(exceptions.BinaryParseError("Unknown Protocol", buf, proto.name if proto else code), exc)
+            six.raise_from(
+                exceptions.BinaryParseError(
+                    "Unknown Protocol",
+                    buf,
+                    proto.name if proto else code,
+                ),
+                exc,
+            )
         size, num_bytes_read2 = size_for_addr(codec, buf[num_bytes_read:])
         length = size + num_bytes_read2 + num_bytes_read
         yield proto, codec, buf[(length - size):length]

requirements_dev.txt

@@ -3,9 +3,9 @@
 bumpversion==0.5.3
 wheel==0.29.0
 watchdog==0.8.3
-flake8==2.5.4
 tox==3.6.1
 coverage==4.5.2
 Sphinx==1.3.6
+flake8==3.7.7
 pytest
 pytest-cov

tests/test_multiaddr.py

@@ -239,7 +239,7 @@ def test_views():
         "/ip4/127.0.0.1/utp/tcp/5555/udp/1234/utp/"
         "p2p/QmbHVEEepCi7rn7VL7Exxpd2Ci9NNB6ifvqwhsrbRMgQFP")
 
-    for idx, (proto1, proto2, item, value) in enumerate(zip(ma, ma.keys(), ma.items(), ma.values())):
+    for idx, (proto1, proto2, item, value) in enumerate(zip(ma, ma.keys(), ma.items(), ma.values())):  # noqa: E501
         assert (proto1, value) == (proto2, value) == item
         assert proto1 in ma
         assert proto2 in ma.keys()
@@ -253,7 +253,7 @@ def test_views():
     assert len(list(ma.keys())) == len(ma.keys())
     assert len(list(ma.items())) == len(ma.items())
     assert len(list(ma.values())) == len(ma.values())
-    
+
     with pytest.raises(IndexError):
         ma.keys()[len(ma)]
     with pytest.raises(IndexError):
@@ -282,9 +282,6 @@ def test_value_for_protocol_argument_wrong_type():
     with pytest.raises(ProtocolNotFoundError):
         a.value_for_protocol('str123')
 
-
-def test_value_for_protocol_argument_wrong_type():
-    a = Multiaddr("/ip4/127.0.0.1/udp/1234")
     with pytest.raises(TypeError):
         a.value_for_protocol(None)