Mark all segments of Python 2-only code as *pragma: no cover*

This way such code is not considered by the coverage analyser, causing testing failures for Python 2
to not look like they decrease coverage and giving the actually relevant coverage figure when running
`tox -e py3` rather than marking the Python 2 lines as untested in this case.

Author: ntninja

multiaddr/codecs/_util.py

@@ -2,7 +2,7 @@
     def packed_net_bytes_to_int(b):
         """Convert the given big-endian byte-string to an int."""
         return int.from_bytes(b, byteorder='big')
-else:  # PY2
+else:  # pragma: no cover (PY2)
     def packed_net_bytes_to_int(b):
         """Convert the given big-endian byte-string to an int."""
         return int(b.encode('hex'), 16)

multiaddr/codecs/fspath.py

@@ -13,16 +13,16 @@
 if hasattr(os, "fsencode") and hasattr(os, "fsdecode"):
     fsencode = os.fsencode
     fsdecode = os.fsdecode
-else:  # PY2
+else:  # pragma: no cover (PY2)
     import sys
 
     def fsencode(path):
-        if not isinstance(path, six.binary_type):  # pragma: no cover
+        if not isinstance(path, six.binary_type):
             path = path.encode(sys.getfilesystemencoding())
         return path
 
     def fsdecode(path):
-        if not isinstance(path, six.text_type):  # pragma: no cover
+        if not isinstance(path, six.text_type):
             path = path.decode(sys.getfilesystemencoding())
         return path
 

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):
+    if six.PY2 and isinstance(string, unicode):  # pragma: no cover (PY2)
         string = string.encode("ascii")
     mm = base58.b58decode(string)
     if len(mm) < 5:

multiaddr/multiaddr.py

@@ -39,7 +39,7 @@ def __init__(self, addr):
         # 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("/"):
+        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):
@@ -66,7 +66,7 @@ def __str__(self):
     # 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:
+    if six.PY2:  # pragma: no cover (PY2)
         __unicode__ = __str__
 
         def __str__(self):

multiaddr/protocols.py

@@ -123,7 +123,7 @@ def _uvarint(buf):
     for i, b_str in enumerate(buf):
         if six.PY3:
             b = b_str
-        else:
+        else:  # pragma: no cover (PY2)
             b = int(binascii.b2a_hex(b_str), 16)
         if b < 0x80:
             if i > 9 or (i == 9 and b > 1):

multiaddr/transforms.py

@@ -78,7 +78,7 @@ def string_iter(string):
                 value = "/" + "/".join(sp)
                 if not six.PY2:
                     sp.clear()
-                else:
+                else:  # pragma: no cover (PY2)
                     sp = []
             else:
                 value = sp.pop(0)