Merge lp:~james-page/charm-helpers/cleanup_flake8 into lp:charm-helpers

[James Page]

Tidy flake8 warnings from core packages and associated tests.

These where annoying me on every review I did so I fixed them up.

=== modified file 'charmhelpers/core/hookenv.py'
--- charmhelpers/core/hookenv.py	2013-07-05 18:22:23 +0000
+++ charmhelpers/core/hookenv.py	2013-07-11 08:33:31 +0000
@@ -335,5 +335,6 @@
             return decorated
         return wrapper
 
+
 def charm_dir():
     return os.environ.get('CHARM_DIR')
 
=== modified file 'tests/core/test_hookenv.py'
--- tests/core/test_hookenv.py	2013-07-05 18:43:41 +0000
+++ tests/core/test_hookenv.py	2013-07-11 08:33:31 +0000
@@ -445,7 +445,7 @@
     def test_gets_relations(self, relation_get, related_units,
                             relation_ids, relation_types, local_unit):
         local_unit.return_value = 'u0'
-        relation_types.return_value = ['t1','t2']
+        relation_types.return_value = ['t1', 't2']
         relation_ids.return_value = ['i1']
         related_units.return_value = ['u1', 'u2']
         relation_get.return_value = {'key': 'val'}
@@ -507,8 +507,8 @@
     @patch('charmhelpers.core.hookenv.relation_get')
     @patch('charmhelpers.core.hookenv.os')
     def test_gets_execution_environment_no_relation(
-        self, os_, relations_get, relations, relation_id,
-        local_unit, relation_type, config):
+            self, os_, relations_get, relations, relation_id,
+            local_unit, relation_type, config):
         config.return_value = 'some-config'
         relation_type.return_value = 'some-type'
         local_unit.return_value = 'some-unit'
@@ -526,7 +526,6 @@
             'env': 'some-environment',
         })
 
-
     @patch('charmhelpers.core.hookenv.os')
     def test_gets_the_relation_id(self, os_):
         os_.environ = {
@@ -618,7 +617,7 @@
     def test_sets_relation_with_relation_id(self, check_call_):
         hookenv.relation_set(relation_id="foo", bar="baz")
         check_call_.assert_called_with(['relation-set', '-r', 'foo',
-                                         'bar=baz'])
+                                        'bar=baz'])
 
     @patch('subprocess.check_call')
     def test_sets_relation_with_missing_value(self, check_call_):
@@ -639,10 +638,11 @@
         hookenv.open_port(443, "TCP")
         hookenv.open_port(80)
         hookenv.open_port(100, "UDP")
-        calls = [call(['open-port', '443/TCP']),
-                 call(['open-port', '80/TCP']),
-                 call(['open-port', '100/UDP']),
-                ]
+        calls = [
+            call(['open-port', '443/TCP']),
+            call(['open-port', '80/TCP']),
+            call(['open-port', '100/UDP']),
+        ]
         check_call_.assert_has_calls(calls)
 
     @patch('subprocess.check_call')
@@ -650,10 +650,11 @@
         hookenv.close_port(443, "TCP")
         hookenv.close_port(80)
         hookenv.close_port(100, "UDP")
-        calls = [call(['close-port', '443/TCP']),
-                 call(['close-port', '80/TCP']),
-                 call(['close-port', '100/UDP']),
-                ]
+        calls = [
+            call(['close-port', '443/TCP']),
+            call(['close-port', '80/TCP']),
+            call(['close-port', '100/UDP']),
+        ]
         check_call_.assert_has_calls(calls)
 
     @patch('subprocess.check_output')
 
=== modified file 'tests/payload/test_execd.py'
--- tests/payload/test_execd.py	2013-06-11 14:15:03 +0000
+++ tests/payload/test_execd.py	2013-07-11 08:33:31 +0000
@@ -18,7 +18,7 @@
         self.test_charm_dir = charm_dir
 
         env_patcher = patch.dict('os.environ',
-                                {'CHARM_DIR': self.test_charm_dir})
+                                 {'CHARM_DIR': self.test_charm_dir})
         env_patcher.start()
         self.addCleanup(env_patcher.stop)
 
@@ -31,11 +31,11 @@
     def make_preinstall_executable(self, module_dir, execd_dir='exec.d',
                                    error_on_preinstall=False):
         """Add a charm-pre-install to module dir.
-        
+
         When executed, the charm-pre-install will create a second
         file in the same directory, charm-pre-install-success.
         """
-        module_path = os.path.join(self.test_charm_dir, execd_dir, module_dir) 
+        module_path = os.path.join(self.test_charm_dir, execd_dir, module_dir)
         os.makedirs(module_path)
 
         charm_pre_install_path = os.path.join(module_path,
@@ -44,7 +44,7 @@
                                                 'charm-pre-install-success')
         with open(charm_pre_install_path, 'w+') as f:
             f.write("#!/bin/bash\n"
-                     "/usr/bin/touch {}".format(pre_install_success_path))
+                    "/usr/bin/touch {}".format(pre_install_success_path))
         perms = stat.S_IXUSR
         # If the charm-pre-install should run without errors,
         # ensure it is executable.
@@ -113,7 +113,6 @@
                                  'charm-pre-install') for mod in modules]
         self.assertItemsEqual(submodules, expected)
 
-
     def test_execd_run(self):
         modules = ['basenode', 'mod2', 'c']
         for module in modules:
@@ -138,10 +137,9 @@
                             self.test_charm_dir))
         log_.assert_called_with(expected_log)
 
-
     @patch('charmhelpers.core.hookenv.log')
     @patch('sys.exit')
-    def test_execd_run_dies_with_return_code(self, exit_, log_):
+    def test_execd_run_dies_with_return_code(self, exit_, log):
         self.make_preinstall_executable(module_dir='basenode',
                                         error_on_preinstall=True)