aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-07-14 21:36:52 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2015-07-14 21:36:52 +0200
commitb349344269cecca1473f0f6bc404c6097ad43a23 (patch)
tree1ceeb15e5d20227dc43117db7b407170de9750d5
parentf23c27ed0ff33cadf8d1dd92a131e6371bcbc943 (diff)
downloadipaddress-b349344269cecca1473f0f6bc404c6097ad43a23.tar.gz
PEP8 E501
-rw-r--r--Makefile2
-rw-r--r--test_ipaddress.py24
2 files changed, 17 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 980a83c..6d0dcb3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
default: test
test:
- flake8 ipaddress.py test_ipaddress.py --ignore E501
+ flake8 ipaddress.py test_ipaddress.py
python test_ipaddress.py
pypi:
diff --git a/test_ipaddress.py b/test_ipaddress.py
index d3cee75..c457137 100644
--- a/test_ipaddress.py
+++ b/test_ipaddress.py
@@ -463,13 +463,16 @@ class NetmaskTestMixin_v4(CommonTestMixin_v4):
self.assertEqual(
_compat_str(self.factory('0.0.0.0/%s' % net.netmask)), net_str)
# Zero prefix is treated as decimal.
- self.assertEqual(_compat_str(self.factory('0.0.0.0/0%d' % i)), net_str)
+ self.assertEqual(
+ _compat_str(self.factory('0.0.0.0/0%d' % i)),
+ net_str)
# Generate and re-parse the expanded hostmask. The ambiguous
# cases (/0 and /32) are treated as netmasks.
if i in (32, 0):
net_str = '0.0.0.0/%d' % (32 - i)
self.assertEqual(
- _compat_str(self.factory('0.0.0.0/%s' % net.hostmask)), net_str)
+ _compat_str(self.factory('0.0.0.0/%s' % net.hostmask)),
+ net_str)
def test_netmask_errors(self):
def assertBadNetmask(addr, netmask):
@@ -565,7 +568,9 @@ class NetmaskTestMixin_v6(CommonTestMixin_v6):
def test_valid_netmask(self):
# We only support CIDR for IPv6, because expanded netmasks are not
# standard notation.
- self.assertEqual(_compat_str(self.factory('2001:db8::/32')), '2001:db8::/32')
+ self.assertEqual(
+ _compat_str(self.factory('2001:db8::/32')),
+ '2001:db8::/32')
for i in range(0, 129):
# Generate and re-parse the CIDR format (trivial).
net_str = '::/%d' % i
@@ -953,7 +958,8 @@ class IpaddrUnitTest(unittest.TestCase):
self.assertEqual(list(ipaddress._find_address_range([ip1, ip2, ip3])),
[(ip1, ip3)])
self.assertEqual(128, ipaddress._count_righthand_zero_bits(0, 128))
- self.assertTrue(re.match("IPv4Network\(u?'1.2.3.0/24'\)", repr(self.ipv4_network)))
+ self.assertTrue(
+ re.match("IPv4Network\(u?'1.2.3.0/24'\)", repr(self.ipv4_network)))
def testMissingAddressVersion(self):
class Broken(ipaddress._BaseAddress):
@@ -1098,12 +1104,14 @@ class IpaddrUnitTest(unittest.TestCase):
def testGetSupernet3(self):
self.assertEqual(self.ipv4_network.supernet(3).prefixlen, 21)
- self.assertEqual(_compat_str(self.ipv4_network.supernet(3).network_address),
- '1.2.0.0')
+ self.assertEqual(
+ _compat_str(self.ipv4_network.supernet(3).network_address),
+ '1.2.0.0')
self.assertEqual(self.ipv6_network.supernet(3).prefixlen, 61)
- self.assertEqual(_compat_str(self.ipv6_network.supernet(3).network_address),
- '2001:658:22a:caf8::')
+ self.assertEqual(
+ _compat_str(self.ipv6_network.supernet(3).network_address),
+ '2001:658:22a:caf8::')
def testGetSupernet4(self):
self.assertRaises(ValueError, self.ipv4_network.supernet,