fix pep8

5 files changed, 13 insertions, 15 deletions

diff --git a/bin/cloud-init b/bin/cloud-init
index 51253c42..40cdbb06 100755
--- a/bin/cloud-init
+++ b/bin/cloud-init
@@ -628,7 +628,8 @@ def main():
         if args.local:
             rname, rdesc = ("init-local", "searching for local datasources")
         else:
-            rname, rdesc = ("init-network", "searching for network datasources")
+            rname, rdesc = ("init-network",
+                            "searching for network datasources")
     elif name == "modules":
         rname, rdesc = ("modules-%s" % args.mode,
                         "running modules for %s" % args.mode)
diff --git a/cloudinit/reporting/handlers.py b/cloudinit/reporting/handlers.py
index 1d5ca524..be323f53 100644
--- a/cloudinit/reporting/handlers.py
+++ b/cloudinit/reporting/handlers.py
@@ -21,12 +21,5 @@ class LogHandler(ReportingHandler):
         logger.info(event.as_string())
 
 
-class StderrHandler(ReportingHandler):
-    def publish_event(self, event):
-        #sys.stderr.write(event.as_string() + "\n")
-        print(event.as_string())
-
-
 available_handlers = DictRegistry()
 available_handlers.register_item('log', LogHandler)
-available_handlers.register_item('print', StderrHandler)
diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py
index cf50c1fb..838cd198 100644
--- a/cloudinit/sources/__init__.py
+++ b/cloudinit/sources/__init__.py
@@ -257,7 +257,7 @@ def find_source(sys_cfg, distro, paths, ds_deps, cfg_list, pkg_list, reporter):
         myrep = reporting.ReportEventStack(
             name="search-%s" % name.replace("DataSource", ""),
             description="searching for %s data from %s" % (mode, name),
-            message = "no %s data found from %s" % (mode, name),
+            message="no %s data found from %s" % (mode, name),
             parent=reporter)
         try:
             with myrep:
diff --git a/cloudinit/stages.py b/cloudinit/stages.py
index 7b489b9f..d300709d 100644
--- a/cloudinit/stages.py
+++ b/cloudinit/stages.py
@@ -243,7 +243,8 @@ class Init(object):
             return self.datasource
 
         with reporting.ReportEventStack(
-                name="check-cache", description="attempting to read from cache",
+                name="check-cache",
+                description="attempting to read from cache",
                 parent=self.reporter) as myrep:
             ds = self._restore_from_cache()
             if ds:
@@ -708,17 +709,18 @@ class Modules(object):
                 # This name will affect the semaphore name created
                 run_name = "config-%s" % (name)
 
-                desc="running %s with frequency %s" % (run_name, freq)
+                desc = "running %s with frequency %s" % (run_name, freq)
                 myrep = reporting.ReportEventStack(
                     name=run_name, description=desc, parent=self.reporter)
 
                 with myrep:
-                    ran, _r = cc.run(run_name, mod.handle, func_args, freq=freq)
+                    ran, _r = cc.run(run_name, mod.handle, func_args,
+                                     freq=freq)
                     if ran:
                         myrep.message = "%s ran successfully" % run_name
                     else:
                         myrep.message = "%s previously ran" % run_name
-                    
+
             except Exception as e:
                 util.logexc(LOG, "Running module %s (%s) failed", name, mod)
                 failures.append((name, e))
diff --git a/tests/unittests/test_reporting.py b/tests/unittests/test_reporting.py
index 4f4cf3a4..ddfac541 100644
--- a/tests/unittests/test_reporting.py
+++ b/tests/unittests/test_reporting.py
@@ -51,7 +51,8 @@ class TestReportFinishEvent(TestCase):
             self, instantiated_handler_registry):
         event_name, event_description = self._report_finish_event()
         expected_string_representation = ': '.join(
-            ['finish', event_name, reporting.status.SUCCESS, event_description])
+            ['finish', event_name, reporting.status.SUCCESS,
+             event_description])
         self.assertHandlersPassedObjectWithAsString(
             instantiated_handler_registry.registered_items,
             expected_string_representation)
@@ -63,7 +64,8 @@ class TestReportFinishEvent(TestCase):
         event_name, event_description = self._report_finish_event(
             result=reporting.status.SUCCESS)
         expected_string_representation = ': '.join(
-            ['finish', event_name, reporting.status.SUCCESS, event_description])
+            ['finish', event_name, reporting.status.SUCCESS,
+             event_description])
         self.assertHandlersPassedObjectWithAsString(
             instantiated_handler_registry.registered_items,
             expected_string_representation)