Cleanup to trim long lines

5 files changed, 56 insertions, 22 deletions

diff --git a/GstInspector/Data.py b/GstInspector/Data.py
index 7a679d3..5e29e19 100644
--- a/GstInspector/Data.py
+++ b/GstInspector/Data.py
@@ -119,8 +119,8 @@ class FactoryHelper (object):
             self.__element_instance = self.factory.create ("dummy")
 
             if self.__element_instance is None:
-                raise gst.ElementNotFoundError ("Failed to create element from %s factory" \
-                                                % (factory_name,))
+                msg = "Failed to create element from %s factory" % (factory_name,)
+                raise gst.ElementNotFoundError (msg)
 
         return self.__element_instance
 
@@ -650,7 +650,8 @@ class StructureData (AccessibleDataObject):
     def __init__ (self, structure):
 
         self.name = pool (structure.get_name ())
-        self.fields = pool (tuple (((pool (name), pool (gst_value_serialize (structure[name])),)
+        self.fields = pool (tuple (((pool (name),
+                                     pool (gst_value_serialize (structure[name])),)
                                     for name in structure.keys ())))
 
     def __repr__ (self):
@@ -858,7 +859,8 @@ class RankData (DataObject):
         except KeyError:
             # Not a named rank.
             ranks = _named_ranks.keys ()
-            nearest_rank = list (sorted (((abs (self._rank - rank), rank,) for rank in ranks)))[0][1]
+            delta = ((abs (self._rank - rank), rank,) for rank in ranks)
+            nearest_rank = list (sorted (delta))[0][1]
             nearest_name = _named_ranks[nearest_rank]
             if nearest_rank > self._rank:
                 sign = "-"
diff --git a/GstInspector/GUI/app.py b/GstInspector/GUI/app.py
index 262dd6e..d03d2d7 100644
--- a/GstInspector/GUI/app.py
+++ b/GstInspector/GUI/app.py
@@ -111,8 +111,14 @@ class InspectorApp (Data.Consumer):
         self.data_producer.consumers.append (window)
         self.windows.append (window)
         self.logger.debug ("window list is now %r", self.windows)
-        window.actions.new_window.connect ("activate", self.handle_new_window_action_activate)
-        window.actions.reload_data.connect ("activate", self.handle_reload_data_action_activate)
+
+        action = window.actions.new_window
+        handler = self.handle_new_window_action_activate
+        action.connect ("activate", handler)
+
+        action = window.actions.reload_data
+        handler = self.handle_reload_data_action_activate
+        action.connect ("activate", handler)
 
     def close_window (self, window):
 
diff --git a/GstInspector/GUI/pages.py b/GstInspector/GUI/pages.py
index e6062fd..b6ce8f9 100644
--- a/GstInspector/GUI/pages.py
+++ b/GstInspector/GUI/pages.py
@@ -26,8 +26,14 @@ import pango
 import gobject
 import gtk
 
-from GstInspector.GUI.models import NameValueModel, PadsModel, PropertiesModel, SignalsModel
-from GstInspector.GUI.utils import Manager, iter_container, size_group_for_tables, widget_add_popup_menu
+from GstInspector.GUI.models import (NameValueModel,
+                                     PadsModel,
+                                     PropertiesModel,
+                                     SignalsModel)
+from GstInspector.GUI.utils import (Manager,
+                                    iter_container,
+                                    size_group_for_tables,
+                                    widget_add_popup_menu)
 
 # Pre 2.10 GTK+ compatibility.
 _gtk_has_link_buttons = hasattr (gtk, "LinkButton")
@@ -806,8 +812,9 @@ class PageManager (Manager):
         Manager.__init__ (self, *a, **kw)
 
         self.action_group = gtk.ActionGroup ("NameValueActions")
-        self.action_group.add_actions ([("expand-all", gtk.STOCK_ZOOM_IN, _("_Expand all")),
-                                        ("collapse-all", gtk.STOCK_ZOOM_OUT, _("_Collapse all"))])
+        expand_all = ("expand-all", gtk.STOCK_ZOOM_IN, _("_Expand all"),)
+        collapse_all = ("collapse-all", gtk.STOCK_ZOOM_OUT, _("_Collapse all"),)
+        self.action_group.add_actions ([expand_all, collapse_all])
 
     def attach (self, inspector_window):
 
@@ -833,8 +840,13 @@ class PageManager (Manager):
         self.element = None
         self.update_source = None
 
-        actions.expand_all.connect ("activate", self.handle_expand_all_action_activate)
-        actions.collapse_all.connect ("activate", self.handle_collapse_all_action_activate)
+        action = actions.expand_all
+        handler = self.handle_expand_all_action_activate
+        action.connect ("activate", handler)
+
+        action = actions.collapse_all
+        handler = self.handle_collapse_all_action_activate
+        action.connect ("activate", handler)
 
     def detach (self):
 
diff --git a/GstInspector/GUI/window.py b/GstInspector/GUI/window.py
index 79b931a..04ae74a 100644
--- a/GstInspector/GUI/window.py
+++ b/GstInspector/GUI/window.py
@@ -312,8 +312,9 @@ class InspectorWindow (Data.Consumer):
         # action's state is common between all windows at any time (at least
         # sharing the menu actions works).
         app_group = gtk.ActionGroup ("AppActions")
-        app_group.add_actions ([("new-window", gtk.STOCK_NEW, _("_New Window")),
-                                ("reload-data", gtk.STOCK_REFRESH, _("_Refresh Data"), "<Ctrl>R")])
+        new_window = ("new-window", gtk.STOCK_NEW,_("_New Window"),)
+        reload_data = ("reload-data", gtk.STOCK_REFRESH, _("_Refresh Data"), "<Ctrl>R",)
+        app_group.add_actions ([new_window, reload_data])
 
         group = gtk.ActionGroup ("WindowActions")
         group.add_actions ([("show-about", gtk.STOCK_ABOUT),
@@ -347,8 +348,11 @@ class InspectorWindow (Data.Consumer):
         # We need to keep a reference to the context menubar around, otherwise
         # the child menus will have invalid windows:
         self.context_menubar = ui.get_widget ("/ui/context")
-        self.name_value_popup = ui.get_widget ("/ui/context/NameValueContextMenu").get_submenu ()
-        self.columns_popup = ui.get_widget ("/ui/menubar/ViewMenu/ViewColumnsMenu").get_submenu ()
+
+        menu = ui.get_widget ("/ui/context/NameValueContextMenu")
+        self.name_value_popup = menu.get_submenu ()
+        menu = ui.get_widget ("/ui/menubar/ViewMenu/ViewColumnsMenu")
+        self.columns_popup = menu.get_submenu ()
 
         model = self.app.element_model
         self.element_model = model
@@ -384,9 +388,17 @@ class InspectorWindow (Data.Consumer):
 
         self.window_state.attach (self)
 
-        self.actions.close_window.connect ("activate", self.handle_close_window_action_activate)
-        self.actions.show_filter.connect ("toggled", self.handle_show_filter_action_toggled)
-        self.actions.show_about.connect ("activate", self.handle_show_about_action_activate)
+        action = self.actions.close_window
+        handler = self.handle_close_window_action_activate
+        action.connect ("activate", handler)
+
+        action = self.actions.show_filter
+        handler = self.handle_show_filter_action_toggled
+        action.connect ("toggled", handler)
+
+        action = self.actions.show_about
+        handler = self.handle_show_about_action_activate
+        action.connect ("activate", handler)
 
         window = self.gtk_window
         window.connect ("delete-event", self.handle_window_delete_event)
@@ -396,7 +408,8 @@ class InspectorWindow (Data.Consumer):
         view = self.element_view
         view.drag_dest_unset ()
         view.unset_rows_drag_source ()
-        view.get_selection ().connect ("changed", self.handle_element_view_selection_changed)
+        view_selection = view.get_selection ()
+        view_selection.connect ("changed", self.handle_element_view_selection_changed)
         widget_add_popup_menu (view, self.columns_popup)
 
         self.page_manager.attach (self)
diff --git a/GstInspector/main.py b/GstInspector/main.py
index cac4f19..4dd80ff 100644
--- a/GstInspector/main.py
+++ b/GstInspector/main.py
@@ -510,9 +510,10 @@ def _init_options ():
 
 def _init_logging (level = None):
 
+    format = "%(asctime)s.%(msecs)03d %(levelname)8s %(name)20s: %(message)s"
     logging.basicConfig (level = level,
-                         format = '%(asctime)s.%(msecs)03d %(levelname)8s %(name)20s: %(message)s',
-                         datefmt = '%H:%M:%S')
+                         format = format,
+                         datefmt = "%H:%M:%S")
 
     logger = logging.getLogger ("main")
     logger.debug ("logging at level %s", logging.getLevelName (level))