Fix lint

charm-helpers-hooks.yaml

@@ -1,5 +1,4 @@
-#branch: lp:charm-helpers
-branch: lp:~gnuoy/charm-helpers/neutron-shuffle
+branch: lp:charm-helpers
 destination: hooks/charmhelpers
 include:
     - core

hooks/quantum_contexts.py

@@ -4,9 +4,6 @@ import uuid
 import socket
 from charmhelpers.core.hookenv import (
     config,
-    relation_ids,
-    related_units,
-    relation_get,
     unit_get,
     cached
 )
@@ -15,8 +12,6 @@ from charmhelpers.fetch import (
 )
 from charmhelpers.contrib.openstack.context import (
     OSContextGenerator,
-    context_complete,
-    NeutronPortContext,
     NeutronAPIContext,
 )
 from charmhelpers.contrib.openstack.utils import (
@@ -29,14 +24,8 @@ from charmhelpers.contrib.network.ip import (
     get_address_in_network,
 )
 from charmhelpers.contrib.openstack.neutron import (
-    parse_data_port_mappings,
     parse_vlan_range_mappings,
 )
-from charmhelpers.core.host import (
-    get_nic_hwaddr,
-)
-from charmhelpers.core.strutils import bool_from_string
-import copy
 
 DB_USER = "quantum"
 QUANTUM_DB = "quantum"

unit_tests/test_quantum_contexts.py

@@ -267,7 +267,7 @@ class TestQuantumGatewayContext(CharmTestCase):
         super(TestQuantumGatewayContext, self).setUp(quantum_contexts,
                                                      TO_PATCH)
         self.config.side_effect = self.test_config.get
-        self.maxDiff = None 
+        self.maxDiff = None
 
     @patch.object(quantum_contexts, 'get_shared_secret')
     @patch.object(quantum_contexts, 'get_host_ip')