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>

4 files changed, 24 insertions, 12 deletions

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'