Fix flake8 warnings

* Ignore E402 (not happy about my py2/3 compat layer)
* Fix comments

Author: bd808

iptools/__init__.py

@@ -64,7 +64,7 @@ def _address2long(address):
     if parsed is None:
         parsed = ipv6.ip2long(address)
     return parsed
-#end _addess2long
+# end _addess2long
 
 
 class IpRange (Sequence):
@@ -164,7 +164,7 @@ def __init__(self, start, end=None):
         self._ipver = ipv4
         if self.endIp > ipv4.MAX_IP:
             self._ipver = ipv6
-    #end __init__
+    # end __init__
 
     def __repr__(self):
         """
@@ -178,7 +178,7 @@ def __repr__(self):
         return "IpRange(%r, %r)" % (
             self._ipver.long2ip(self.startIp),
             self._ipver.long2ip(self.endIp))
-    #end __repr__
+    # end __repr__
 
     def __str__(self):
         """
@@ -192,7 +192,7 @@ def __str__(self):
         return (
             self._ipver.long2ip(self.startIp),
             self._ipver.long2ip(self.endIp)).__repr__()
-    #end __str__
+    # end __str__
 
     def __eq__(self, other):
         """
@@ -206,7 +206,7 @@ def __eq__(self, other):
         return isinstance(other, IpRange) and \
             self.startIp == other.startIp and \
             self.endIp == other.endIp
-    #end __eq__
+    # end __eq__
 
     def __len__(self):
         """
@@ -223,7 +223,7 @@ def __len__(self):
         True
         """
         return self._len
-    #end __len__
+    # end __len__
 
     def __hash__(self):
         """
@@ -238,7 +238,7 @@ def __hash__(self):
         False
         """
         return hash((self.startIp, self.endIp))
-    #end __hash__
+    # end __hash__
 
     def _cast(self, item):
         if isinstance(item, basestring):
@@ -252,10 +252,10 @@ def _cast(self, item):
             # downcast to ipv4 iff address is in the IPv4 mapped block
             if item in IpRange(ipv6.IPV4_MAPPED):
                 item = item & ipv4.MAX_IP
-        #end if
+        # end if
 
         return item
-    #end _cast
+    # end _cast
 
     def index(self, item):
         """
@@ -282,11 +282,11 @@ def index(self, item):
         if offset >= 0 and offset < self._len:
             return offset
         raise ValueError('%s is not in range' % self._ipver.long2ip(item))
-    #end index
+    # end index
 
     def count(self, item):
         return int(item in self)
-    #end count
+    # end count
 
     def __contains__(self, item):
         """
@@ -313,7 +313,7 @@ def __contains__(self, item):
         """
         item = self._cast(item)
         return self.startIp <= item <= self.endIp
-    #end __contains__
+    # end __contains__
 
     def __getitem__(self, index):
         """
@@ -348,7 +348,7 @@ def __getitem__(self, index):
         """
         if isinstance(index, slice):
             if index.step not in (None, 1):
-                #TODO: return an IpRangeList
+                # TODO: return an IpRangeList
                 raise ValueError('slice step not supported')
             start = index.start or 0
             if start < 0:
@@ -371,7 +371,7 @@ def __getitem__(self, index):
             if index < 0 or index >= self._len:
                 raise IndexError('index out of range')
             return self._ipver.long2ip(self.startIp + index)
-    #end __getitem__
+    # end __getitem__
 
     def __iter__(self):
         """
@@ -392,8 +392,8 @@ def __iter__(self):
         while i <= self.endIp:
             yield self._ipver.long2ip(i)
             i += 1
-    #end __iter__
-#end class IpRange
+    # end __iter__
+# end class IpRange
 
 
 class IpRangeList (object):
@@ -410,7 +410,7 @@ class IpRangeList (object):
     """
     def __init__(self, *args):
         self.ips = tuple(map(IpRange, args))
-    #end __init__
+    # end __init__
 
     def __repr__(self):
         """
@@ -429,7 +429,7 @@ def __repr__(self):
         IpRange('192.168.0.0', '192.168.255.255'))"
         """
         return "IpRangeList%r" % (self.ips,)
-    #end __repr__
+    # end __repr__
 
     def __str__(self):
         """
@@ -440,7 +440,7 @@ def __str__(self):
         ('192.168.0.0', '192.168.255.255'))"
         """
         return "(%s)" % ", ".join(str(i) for i in self.ips)
-    #end __str__
+    # end __str__
 
     def __contains__(self, item):
         """
@@ -469,7 +469,7 @@ def __contains__(self, item):
             if item in r:
                 return True
         return False
-    #end __contains__
+    # end __contains__
 
     def __iter__(self):
         """
@@ -497,7 +497,7 @@ def __iter__(self):
         for r in self.ips:
             for ip in r:
                 yield ip
-    #end __iter__
+    # end __iter__
 
     def __len__(self):
         """
@@ -516,7 +516,7 @@ def __len__(self):
         True
         """
         return sum(r.__len__() for r in self.ips)
-    #end __len__
-#end class IpRangeList
+    # end __len__
+# end class IpRangeList
 
 # vim: set sw=4 ts=4 sts=4 et :

iptools/ipv4.py

@@ -93,7 +93,7 @@ def bin(x):
         except NameError:
             out.reverse()
             return '0b' + ''.join(out)
-    #end bin
+    # end bin
 # end compatibility "fixes'
 
 
@@ -223,7 +223,7 @@ def validate_ip(s):
                 return False
         return True
     return False
-#end validate_ip
+# end validate_ip
 
 
 def validate_cidr(s):
@@ -266,7 +266,7 @@ def validate_cidr(s):
             return False
         return True
     return False
-#end validate_cidr
+# end validate_cidr
 
 
 def validate_netmask(s):
@@ -305,7 +305,7 @@ def validate_netmask(s):
         return True
     else:
         return False
-#end validate_netmask
+# end validate_netmask
 
 
 def validate_subnet(s):
@@ -348,7 +348,7 @@ def validate_subnet(s):
         else:
             return False
     raise TypeError("expected string or unicode")
-#end validate_subnet
+# end validate_subnet
 
 
 def ip2long(ip):
@@ -385,7 +385,7 @@ def ip2long(ip):
     for q in quads:
         lngip = (lngip << 8) | int(q)
     return lngip
-#end ip2long
+# end ip2long
 
 
 def ip2network(ip):
@@ -406,7 +406,7 @@ def ip2network(ip):
     for i in range(4):
         netw = (netw << 8) | int(len(quads) > i and quads[i] or 0)
     return netw
-#end ip2network
+# end ip2network
 
 
 def long2ip(l):
@@ -448,7 +448,7 @@ def long2ip(l):
             "expected int between %d and %d inclusive" % (MIN_IP, MAX_IP))
     return '%d.%d.%d.%d' % (
         l >> 24 & 255, l >> 16 & 255, l >> 8 & 255, l & 255)
-#end long2ip
+# end long2ip
 
 
 def ip2hex(addr):
@@ -478,7 +478,7 @@ def ip2hex(addr):
     if netip is None:
         return None
     return "%08x" % netip
-#end ip2hex
+# end ip2hex
 
 
 def hex2ip(hex_str):
@@ -506,7 +506,7 @@ def hex2ip(hex_str):
     except ValueError:
         return None
     return long2ip(netip)
-#end hex2ip
+# end hex2ip
 
 
 def cidr2block(cidr):
@@ -543,7 +543,7 @@ def cidr2block(cidr):
     network = ip2network(ip)
 
     return _block_from_ip_and_prefix(network, prefix)
-#end cidr2block
+# end cidr2block
 
 
 def netmask2prefix(mask):
@@ -571,7 +571,7 @@ def netmask2prefix(mask):
     if validate_netmask(mask):
         return bin(ip2network(mask)).count('1')
     return 0
-#end netmask2prefix
+# end netmask2prefix
 
 
 def subnet2block(subnet):
@@ -609,7 +609,7 @@ def subnet2block(subnet):
     network = ip2network(ip)
 
     return _block_from_ip_and_prefix(network, prefix)
-#end subnet2block
+# end subnet2block
 
 
 def _block_from_ip_and_prefix(ip, prefix):
@@ -630,6 +630,6 @@ def _block_from_ip_and_prefix(ip, prefix):
     mask = (1 << shift) - 1
     block_end = block_start | mask
     return (long2ip(block_start), long2ip(block_end))
-#end _block_from_ip_and_prefix
+# end _block_from_ip_and_prefix
 
 # vim: set sw=4 ts=4 sts=4 et :

iptools/ipv6.py

@@ -190,7 +190,7 @@ def validate_ip(s):
                 return False
         return True
     return False
-#end validate_ip
+# end validate_ip
 
 
 def ip2long(ip):
@@ -247,15 +247,15 @@ def ip2long(ip):
             hextets.append('0')
         for h in h2:
             hextets.append(h)
-    #end if
+    # end if
 
     lngip = 0
     for h in hextets:
         if '' == h:
             h = '0'
         lngip = (lngip << 16) | int(h, 16)
     return lngip
-#end ip2long
+# end ip2long
 
 
 def long2ip(l):
@@ -311,18 +311,18 @@ def long2ip(l):
                 dc_len, dc_start = (run_len, run_start)
         else:
             run_len, run_start = (0, -1)
-    #end for
+    # end for
     if dc_len > 1:
         dc_end = dc_start + dc_len
         if dc_end == len(hextets):
             hextets += ['']
         hextets[dc_start:dc_end] = ['']
         if dc_start == 0:
             hextets = [''] + hextets
-    #end if
+    # end if
 
     return ':'.join(hextets)
-#end long2ip
+# end long2ip
 
 
 def validate_cidr(s):
@@ -365,7 +365,7 @@ def validate_cidr(s):
             return False
         return True
     return False
-#end validate_cidr
+# end validate_cidr
 
 
 def cidr2block(cidr):
@@ -399,6 +399,6 @@ def cidr2block(cidr):
     mask = (1 << shift) - 1
     block_end = block_start | mask
     return (long2ip(block_start), long2ip(block_end))
-#end cidr2block
+# end cidr2block
 
 # vim: set sw=4 ts=4 sts=4 et :

setup.cfg

@@ -7,12 +7,12 @@ cover-html=1
 cover-html-dir=docs/_build/cover
 
 [flake8]
-ignore=F821
+ignore=F821,E402
 count=1
 show-pep8=1
 show-source=1
 statistics=1
-exclude=build,dist,doc,*.egg,*.egg-info
+exclude=build,dist,docs,*.egg,*.egg-info
 
 [wheel]
 universal = 1