Merge lp:~mvo/software-center/pep8-again into lp:software-center

[Michael Vogt]

I stumbled on non-pep8 software-center today, so I fixed that. So trivial
it does not really need review.

[Gary Lasker (gary-lasker)]

review: Approve

=== modified file 'software-center'
--- software-center	2012-09-06 10:19:43 +0000
+++ software-center	2012-09-14 08:34:33 +0000
@@ -49,42 +49,43 @@
 
 if __name__ == "__main__":
 
-    parser = OptionParser("usage: %prog [options] [package-name | apturl | deb-file]", 
-                          version="%prog "+VERSION)
+    parser = OptionParser("usage: %prog [options] [package-name | apturl | "
+                          "deb-file]", version="%prog " + VERSION)
     parser.add_option("--debug", action="store_true",
                       help="enable debug mode", default=False)
-    parser.add_option("--debug-filter", 
+    parser.add_option("--debug-filter",
                       help="show only specific messages. supported currently: "
                            "'softwarecenter.performance'")
     parser.add_option("--force-rtl", action="store_true",
-                      help="force rtl mode (useful for debugging)", 
+                      help="force rtl mode (useful for debugging)",
                       default=False)
     parser.add_option("--display-navlog", action="store_true",
-                      help="display a navigation history log (useful for debugging)", 
-                      default=False)
+                      help="display a navigation history log (useful for "
+                      "debugging)", default=False)
     # FIXME:  REMOVE THIS option once launchpad integration is enabled
     #         by default
     parser.add_option("--enable-lp", action="store_true",
-                      help="enable launchpad integration (for development use)", 
-                      default=False)
+                      help="enable launchpad integration (for development "
+                      "use)", default=False)
     parser.add_option("--disable-buy", action="store_true",
                       help="disable support to buy software",
                       default=False)
     parser.add_option("--disable-apt-xapian-index", action="store_true",
-                      help="disable support for apt-xapian-index (technical items)",
-                      default=False)
+                      help="disable support for apt-xapian-index (technical "
+                      "items)", default=False)
     parser.add_option("--measure-startup-time", action="store_true",
-                      help="open and wait until the window is visible, then close, only useful for profiling",
-                      default=False)
+                      help="open and wait until the window is visible, "
+                      "then close, only useful for profiling", default=False)
     parser.add_option("--dummy-backend", action="store_true",
-                      help="run with a dummy backend, this will not actually install or remove anything and is useful for testing",
+                      help="run with a dummy backend, this will not actually "
+                      "install or remove anything and is useful for testing",
                       default=False)
     parser.add_option("--packagekit-backend", action="store_true",
-                      help="use PackageKit backend (experimental)", 
+                      help="use PackageKit backend (experimental)",
                       default=False)
     parser.add_option("--profile", action="store_true",
                       help="use cProfile to gather a profile dump for e.g. "
-                           "kcachegrind, runsnake, gprof2dot", 
+                           "kcachegrind, runsnake, gprof2dot",
                       default=False)
 
     (options, args) = parser.parse_args()
@@ -92,17 +93,17 @@
     # statup time measure implies "performance" in debug filters
     if options.measure_startup_time:
         options.debug_filter = "performance,traceback"
-    
+
     if options.debug_filter:
         softwarecenter.log.add_filters_from_string(options.debug_filter)
         # implies general debug
         options.debug = True
-        
+
     if options.debug:
         softwarecenter.log.root.setLevel(level=logging.DEBUG)
     else:
         softwarecenter.log.root.setLevel(level=logging.INFO)
-    
+
     # packagekit
     if options.packagekit_backend:
         softwarecenter.enums.USE_PACKAGEKIT_BACKEND = True
@@ -112,7 +113,7 @@
     if options.dummy_backend:
         import atexit
         from softwarecenter.tests.utils import (
-            start_dummy_backend, 
+            start_dummy_backend,
             stop_dummy_backend)
         start_dummy_backend()
         atexit.register(stop_dummy_backend)
@@ -133,7 +134,7 @@
     with ExecutionTime("create SoftwareCenterApp"):
         app = SoftwareCenterAppGtk3(datadir, xapian_base_path, options, args)
 
-    # DEBUG/PROFILE mode 
+    # DEBUG/PROFILE mode
     if options.measure_startup_time:
         logger = logging.getLogger("softwarecenter.performance")
         with ExecutionTime("show() & gtk events until visible"):
@@ -161,7 +162,7 @@
 
         time_to_ready = time.time() - time_entering_main
         print(time_to_ready)
-        logger.debug("** main window fully ready after: %s seconds" % 
+        logger.debug("** main window fully ready after: %s seconds" %
                      time_to_ready)
         sys.exit(0)
 
@@ -170,7 +171,7 @@
         # use something like "pyprof2calltree" from pypi and kcachegrind:
         #  $ python ./pyprof2calltree.py -i software-center_*.pyprof -k
         # OR
-        #  $ runsnakerun software_center_*.pyprof 
+        #  $ runsnakerun software_center_*.pyprof
         # OR
         #  gprof2dot (http://code.google.com/p/jrfonseca/wiki/Gprof2Dot):
         #  $ gprof2dot.py -f pstats software-center_20120620_114618.pyprof |\
@@ -185,4 +186,3 @@
     # run it normally
     app.run(args)
     Gtk.main()
-

=== modified file 'tests/test_pep8.py'
--- tests/test_pep8.py	2012-08-15 10:00:27 +0000
+++ tests/test_pep8.py	2012-09-14 08:34:33 +0000
@@ -9,10 +9,13 @@
 
     def test_all_code(self):
         res = 0
+        testdir = os.path.dirname(__file__)
         res += subprocess.call(
             ["pep8",
              "--repeat",
-             os.path.dirname(softwarecenter.__file__)
+             os.path.dirname(softwarecenter.__file__),
+             # test the main binary too
+             os.path.join(testdir, "..", "software-center"),
              ])
         self.assertEqual(res, 0)