Flake8 fixes.

Author: davejohncole

keamodule/tests/test_callout_handle.py

@@ -25,7 +25,7 @@ def test_ok(self):
         m = kea.CalloutManager()
         h = kea.CalloutHandle(m)
         self.assertEqual(2, m.use_count)
-        h = None
+        del h
         self.assertEqual(1, m.use_count)
 
 
@@ -34,11 +34,11 @@ class TestCalloutHandle_setArgument(utils.BaseTestCase):
     def test_lease4(self):
         m = kea.CalloutManager()
         h = kea.CalloutHandle(m)
-        l = kea.Lease4()
-        l.addr = '1.2.3.4'
-        self.assertEqual(1, l.use_count)
-        self.assertIsNone(h.setArgument('lease4', l))
-        self.assertEqual(2, l.use_count)
+        x = kea.Lease4()
+        x.addr = '1.2.3.4'
+        self.assertEqual(1, x.use_count)
+        self.assertIsNone(h.setArgument('lease4', x))
+        self.assertEqual(2, x.use_count)
         self.assertEqual('1.2.3.4', h.getArgument('lease4').addr)
 
 
@@ -53,7 +53,7 @@ def test_ok(self):
 
 
 class TestCalloutHandle_getContext(utils.BaseTestCase):
-    
+
     def test_ok(self):
         m = kea.CalloutManager()
         h = kea.CalloutHandle(m)
@@ -67,11 +67,12 @@ def test_notset(self):
         h = kea.CalloutHandle(m)
         with self.assertRaises(TypeError) as cm:
             h.getContext('foo')
-        self.assertEqual(("unable to find callout context associated with the current library index (-1)",), cm.exception.args)
+        self.assertEqual(("unable to find callout context associated with the current"
+                          " library index (-1)",), cm.exception.args)
 
 
 class TestCalloutHandle_deleteContext(utils.BaseTestCase):
-    
+
     def test_ok(self):
         m = kea.CalloutManager()
         h = kea.CalloutHandle(m)
@@ -83,15 +84,15 @@ def test_ok(self):
 
 
 class TestCalloutHandle_getStatus(utils.BaseTestCase):
-    
+
     def test_ok(self):
         m = kea.CalloutManager()
         h = kea.CalloutHandle(m)
         self.assertEqual(kea.NEXT_STEP_CONTINUE, h.getStatus())
 
 
 class TestCalloutHandle_setStatus(utils.BaseTestCase):
-    
+
     def test_ok(self):
         m = kea.CalloutManager()
         h = kea.CalloutHandle(m)

keamodule/tests/test_callout_manager.py

@@ -1,5 +1,3 @@
-import unittest
-
 import kea
 import utils
 

keamodule/tests/test_option.py

@@ -1,4 +1,3 @@
-import unittest
 import codecs
 
 import kea
@@ -135,7 +134,9 @@ def test_uint8(self):
         self.assertEqual('type=042, len=001: 05', o.toText())
 
     def test_nested(self):
-        o = kea.Option(42).addOption(kea.Option(4).setUint16(5)).addOption(kea.Option(6).setString('hello'))
+        o = kea.Option(42).addOption(kea.Option(4)
+                                     .setUint16(5)).addOption(kea.Option(6)
+                                                              .setString('hello'))
         self.assertEqual("""\
 type=042, len=011: ,
 options:

keamodule/tests/test_pkt4.py

@@ -1,4 +1,3 @@
-import unittest
 import textwrap
 from ipaddress import IPv4Network
 
@@ -139,18 +138,6 @@ def test_bytes_option_ok(self):
         self.assertIs(p, p.addOption(o))
         self.assertEqual(2, o.use_count)
 
-
-class TestPkt4_getOption(utils.BaseTestCase):
-
-    def test_ok(self):
-        p = kea.Pkt4(kea.DHCPREQUEST, 42)
-        o = p.getOption(kea.DHO_DHCP_MESSAGE_TYPE)
-        self.assertIsInstance(o, kea.Option)
-        self.assertEqual(bytes([kea.DHCPREQUEST]), o.getBytes())
-
-
-class TestPkt4_addOption(utils.BaseTestCase):
-
     def test_ok(self):
         p = kea.Pkt4(kea.DHCPREQUEST, 42)
         o = kea.Option(kea.DHO_DHCP_AGENT_OPTIONS)
@@ -161,14 +148,23 @@ def test_ok(self):
         self.assertEqual(kea.DHO_DHCP_AGENT_OPTIONS, n.getType())
 
 
+class TestPkt4_getOption(utils.BaseTestCase):
+
+    def test_ok(self):
+        p = kea.Pkt4(kea.DHCPREQUEST, 42)
+        o = p.getOption(kea.DHO_DHCP_MESSAGE_TYPE)
+        self.assertIsInstance(o, kea.Option)
+        self.assertEqual(bytes([kea.DHCPREQUEST]), o.getBytes())
+
+
 class TestPkt4_toText(utils.BaseTestCase):
 
     def test_empty(self):
         p = kea.Pkt4(kea.DHCPREQUEST, 42)
         self.assertEqual(textwrap.dedent("""\
             local_address=0.0.0.0:67, remote_address=0.0.0.0:68, msg_type=DHCPREQUEST (3), transid=0x2a,
             options:
-              type=053, len=001: 3 (uint8)"""), p.toText())
+              type=053, len=001: 3 (uint8)"""), p.toText())  # noqa: E501
 
     def test_filled(self):
         p = kea.Pkt4(kea.DHCPREQUEST, 42)                                               # 53
@@ -190,4 +186,4 @@ def test_filled(self):
               type=051, len=004: 00:00:1c:20
               type=053, len=001: 3 (uint8)
               type=058, len=004: 00:00:07:08
-              type=059, len=004: 00:00:0e:10"""), p.toText())
+              type=059, len=004: 00:00:0e:10"""), p.toText())  # noqa: E501