PEP8 cleanup: ensure lines are shorter than 80 characters

This is important for Sugar because the XO has a small screen where long lines
would make the code hard to understand (because you need to constantly scroll horizontally).

Reviewed-by: James Cameron <quozl@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>

12 files changed, 45 insertions, 26 deletions

diff --git a/extensions/cpsection/datetime/view.py b/extensions/cpsection/datetime/view.py
index 72fdad1..ec82060 100644
--- a/extensions/cpsection/datetime/view.py
+++ b/extensions/cpsection/datetime/view.py
@@ -51,7 +51,8 @@ class TimeZone(SectionView):
         self._entry.show()
 
         self._scrolled_window = gtk.ScrolledWindow()
-        self._scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+        self._scrolled_window.set_policy(gtk.POLICY_NEVER,
+                                         gtk.POLICY_AUTOMATIC)
         self._scrolled_window.set_shadow_type(gtk.SHADOW_IN)
 
         self._store = gtk.ListStore(gobject.TYPE_STRING)
diff --git a/extensions/cpsection/frame/view.py b/extensions/cpsection/frame/view.py
index 5c9d473..8b4ab83 100644
--- a/extensions/cpsection/frame/view.py
+++ b/extensions/cpsection/frame/view.py
@@ -149,9 +149,9 @@ class Frame(SectionView):
         self._corner_delay_is_valid = True
         self._edge_delay_is_valid = True
         self.needs_restart = False
-        self._corner_delay_change_handler = self._corner_delay_slider.connect( \
+        self._corner_delay_change_handler = self._corner_delay_slider.connect(
                 'value-changed', self.__corner_delay_changed_cb)
-        self._edge_delay_change_handler = self._edge_delay_slider.connect( \
+        self._edge_delay_change_handler = self._edge_delay_slider.connect(
                 'value-changed', self.__edge_delay_changed_cb)
 
     def undo(self):
diff --git a/extensions/cpsection/keyboard/model.py b/extensions/cpsection/keyboard/model.py
index 82456d3..1f92973 100644
--- a/extensions/cpsection/keyboard/model.py
+++ b/extensions/cpsection/keyboard/model.py
@@ -77,8 +77,8 @@ class KeyboardManager(object):
     def get_options_group(self):
         """Return list of supported options for switching keyboard group"""
         options = []
-        self._configregistry.foreach_option(_GROUP_NAME, self._populate_one, \
-                                                                        options)
+        self._configregistry.foreach_option(_GROUP_NAME, self._populate_one,
+                                            options)
         options.sort()
         return options
 
diff --git a/extensions/cpsection/keyboard/view.py b/extensions/cpsection/keyboard/view.py
index fe3ca15..6dc76ff 100644
--- a/extensions/cpsection/keyboard/view.py
+++ b/extensions/cpsection/keyboard/view.py
@@ -241,7 +241,8 @@ class Keyboard(SectionView):
         return False
 
     def _setup_group_switch_option(self):
-        """Adds the controls for changing the group switch option of keyboard"""
+        """Adds the controls for changing the group switch option of keyboard
+        """
         separator_group_option = gtk.HSeparator()
         self._vbox.pack_start(separator_group_option, expand=False)
         separator_group_option.show_all()
diff --git a/extensions/cpsection/language/view.py b/extensions/cpsection/language/view.py
index 1bd77f8..5355890 100644
--- a/extensions/cpsection/language/view.py
+++ b/extensions/cpsection/language/view.py
@@ -54,9 +54,9 @@ class Language(SectionView):
         self.set_border_width(style.DEFAULT_SPACING * 2)
         self.set_spacing(style.DEFAULT_SPACING)
 
-        explanation = gettext.gettext("Add languages in the order you prefer." \
-                                          " If a translation is not available,"\
-                                          " the next in the list will be used.")
+        explanation = gettext.gettext('Add languages in the order you prefer.'
+                                      ' If a translation is not available,'
+                                      ' the next in the list will be used.')
         self._text = gtk.Label(explanation)
         self._text.set_width_chars(100)
         self._text.set_line_wrap(True)
diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
index 447a51d..1c688c6 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -228,7 +228,8 @@ class Network(SectionView):
         if self._jabber_sid:
             gobject.source_remove(self._jabber_sid)
         self._jabber_sid = gobject.timeout_add(_APPLY_TIMEOUT,
-                                               self.__jabber_timeout_cb, widget)
+                                               self.__jabber_timeout_cb,
+                                               widget)
 
     def __jabber_timeout_cb(self, widget):
         self._jabber_sid = 0
diff --git a/extensions/cpsection/updater/model.py b/extensions/cpsection/updater/model.py
index e0e4f1d..86ede06 100755
--- a/extensions/cpsection/updater/model.py
+++ b/extensions/cpsection/updater/model.py
@@ -198,14 +198,17 @@ class UpdateModel(gobject.GObject):
         logging.debug('UpdateModel._cancel_checking')
         total = len(bundleregistry.get_registry())
         current = total - len(self._bundles_to_check)
-        self.emit('progress', UpdateModel.ACTION_CHECKING, '', current, current)
+        self.emit('progress', UpdateModel.ACTION_CHECKING, '', current,
+                  current)
         self._bundles_to_check = None
         self._cancelling = False
 
     def _cancel_updating(self):
         logging.debug('UpdateModel._cancel_updating')
-        current = self._total_bundles_to_update - len(self._bundles_to_update) - 1
-        self.emit('progress', UpdateModel.ACTION_UPDATING, '', current, current)
+        current = (self._total_bundles_to_update -
+                   len(self._bundles_to_update) - 1)
+        self.emit('progress', UpdateModel.ACTION_UPDATING, '', current,
+                  current)
 
         if self._downloader is not None:
             self._downloader.cancel()
diff --git a/extensions/cpsection/updater/view.py b/extensions/cpsection/updater/view.py
index 588cf23..63fb1e5 100644
--- a/extensions/cpsection/updater/view.py
+++ b/extensions/cpsection/updater/view.py
@@ -161,7 +161,8 @@ class ActivityUpdater(SectionView):
         self._model.check_updates()
 
     def __install_button_clicked_cb(self, button):
-        self._top_label.set_markup('<big>%s</big>' % _('Installing updates...'))
+        text = '<big>%s</big>' % _('Installing updates...')
+        self._top_label.set_markup(text)
         self._model.update(self._update_box.get_bundles_to_update())
 
     def __cancel_button_clicked_cb(self, button):
diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py
index e947ccc..4028878 100644
--- a/extensions/deviceicon/battery.py
+++ b/extensions/deviceicon/battery.py
@@ -93,7 +93,8 @@ class DeviceView(TrayIcon):
         else:
             status = _STATUS_FULLY_CHARGED
 
-        self.icon.props.icon_name = get_icon_state(name, current_level, step=-5)
+        self.icon.props.icon_name = get_icon_state(name, current_level,
+                                                   step=-5)
         self.icon.props.xo_color = xo_color
         self.icon.props.badge_name = badge_name
 
diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
index d5333af..417ac05 100644
--- a/extensions/deviceicon/network.py
+++ b/extensions/deviceicon/network.py
@@ -108,7 +108,8 @@ class WirelessPalette(Palette):
         self._disconnect_item = MenuItem(_('Disconnect...'))
         icon = Icon(icon_size=gtk.ICON_SIZE_MENU, icon_name='media-eject')
         self._disconnect_item.set_image(icon)
-        self._disconnect_item.connect('activate', self.__disconnect_activate_cb)
+        self._disconnect_item.connect('activate',
+                                      self.__disconnect_activate_cb)
         self.menu.append(self._disconnect_item)
 
     def set_connecting(self):
@@ -327,7 +328,8 @@ class GsmPalette(Palette):
 
     def add_alert(self, error, suggestion):
         self._failed_connection = True
-        self._toggle_state_item.get_child().set_label(_('Try connection again'))
+        action = _('Try connection again')
+        self._toggle_state_item.get_child().set_label(action)
 
         title = _('Error: %s') % error
         self.error_title_label.set_markup('<b>%s</b>' % title)
@@ -448,7 +450,8 @@ class WirelessDeviceView(ToolButton):
                 return
             self._active_ap_op = active_ap_op
             active_ap = self._bus.get_object(_NM_SERVICE, active_ap_op)
-            props = dbus.Interface(active_ap, 'org.freedesktop.DBus.Properties')
+            props = dbus.Interface(active_ap,
+                                   'org.freedesktop.DBus.Properties')
 
             props.GetAll(_NM_ACCESSPOINT_IFACE, byte_arrays=True,
                          reply_handler=self.__get_all_ap_props_reply_cb,
@@ -552,7 +555,8 @@ class WirelessDeviceView(ToolButton):
             self._icon.props.pulsing = True
         elif state == network.DEVICE_STATE_ACTIVATED:
             address = self._device_props.Get(_NM_DEVICE_IFACE, 'Ip4Address')
-            self._palette.set_connected_with_frequency(self._frequency, address)
+            self._palette.set_connected_with_frequency(self._frequency,
+                                                       address)
             self._icon.props.pulsing = False
         else:
             self._icon.props.badge_name = None
@@ -683,7 +687,8 @@ class OlpcMeshDeviceView(ToolButton):
     def __deactivate_connection(self, palette, data=None):
         obj = self._bus.get_object(_NM_SERVICE, _NM_PATH)
         netmgr = dbus.Interface(obj, _NM_IFACE)
-        netmgr_props = dbus.Interface(netmgr, 'org.freedesktop.DBus.Properties')
+        netmgr_props = dbus.Interface(netmgr,
+                                      'org.freedesktop.DBus.Properties')
         active_connections_o = netmgr_props.Get(_NM_IFACE,
                                                 'ActiveConnections')
 
@@ -792,7 +797,8 @@ class GsmDeviceView(TrayIcon):
     def __gsm_disconnect_cb(self, palette, data=None):
         obj = self._bus.get_object(_NM_SERVICE, _NM_PATH)
         netmgr = dbus.Interface(obj, _NM_IFACE)
-        netmgr_props = dbus.Interface(netmgr, 'org.freedesktop.DBus.Properties')
+        netmgr_props = dbus.Interface(netmgr,
+                                      'org.freedesktop.DBus.Properties')
         active_connections_o = netmgr_props.Get(_NM_IFACE, 'ActiveConnections')
 
         for conn_o in active_connections_o:
diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py
index cb01629..2eadf1d 100644
--- a/extensions/deviceicon/speaker.py
+++ b/extensions/deviceicon/speaker.py
@@ -71,7 +71,8 @@ class DeviceView(TrayIcon):
             xo_color = XoColor('%s,%s' % (style.COLOR_WHITE.get_svg(),
                                           style.COLOR_WHITE.get_svg()))
 
-        self.icon.props.icon_name = get_icon_state(name, current_level, step=-1)
+        self.icon.props.icon_name = get_icon_state(name, current_level,
+                                                   step=-1)
         self.icon.props.xo_color = xo_color
 
     def __button_release_event_cb(self, widget, event):
diff --git a/extensions/deviceicon/touchpad.py b/extensions/deviceicon/touchpad.py
index d9521c2..b3b34f5 100644
--- a/extensions/deviceicon/touchpad.py
+++ b/extensions/deviceicon/touchpad.py
@@ -33,10 +33,14 @@ from jarabe.frame.frameinvoker import FrameWidgetInvoker
 TOUCHPAD_MODE_CAPACITIVE = 'capacitive'
 TOUCHPAD_MODE_RESISTIVE = 'resistive'
 TOUCHPAD_MODES = [TOUCHPAD_MODE_CAPACITIVE, TOUCHPAD_MODE_RESISTIVE]
-STATUS_TEXT = {TOUCHPAD_MODE_CAPACITIVE: _('finger'),
-               TOUCHPAD_MODE_RESISTIVE: _('stylus')}
-STATUS_ICON = {TOUCHPAD_MODE_CAPACITIVE: 'touchpad-' + TOUCHPAD_MODE_CAPACITIVE,
-               TOUCHPAD_MODE_RESISTIVE: 'touchpad-' + TOUCHPAD_MODE_RESISTIVE}
+STATUS_TEXT = {
+    TOUCHPAD_MODE_CAPACITIVE: _('finger'),
+    TOUCHPAD_MODE_RESISTIVE: _('stylus'),
+}
+STATUS_ICON = {
+    TOUCHPAD_MODE_CAPACITIVE: 'touchpad-' + TOUCHPAD_MODE_CAPACITIVE,
+    TOUCHPAD_MODE_RESISTIVE: 'touchpad-' + TOUCHPAD_MODE_RESISTIVE,
+}
 # NODE_PATH is used to communicate with the touchpad device.
 NODE_PATH = '/sys/devices/platform/i8042/serio1/ptmode'