pep8 cleanup: fix number of blank lines

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

32 files changed, 125 insertions, 22 deletions

diff --git a/extensions/cpsection/aboutcomputer/__init__.py b/extensions/cpsection/aboutcomputer/__init__.py
index ceb515a..faf814d 100644
--- a/extensions/cpsection/aboutcomputer/__init__.py
+++ b/extensions/cpsection/aboutcomputer/__init__.py
@@ -19,4 +19,3 @@ from gettext import gettext as _
 CLASS = 'AboutComputer'
 ICON = 'module-about_my_computer'
 TITLE = _('About my Computer')
-
diff --git a/extensions/cpsection/aboutcomputer/model.py b/extensions/cpsection/aboutcomputer/model.py
index 77d3b86..b700a6b 100644
--- a/extensions/cpsection/aboutcomputer/model.py
+++ b/extensions/cpsection/aboutcomputer/model.py
@@ -24,29 +24,35 @@ import errno
 
 from jarabe import config
 
+
 _logger = logging.getLogger('ControlPanel - AboutComputer')
 _not_available = _('Not available')
 
+
 def get_aboutcomputer():
     msg = 'Serial Number: %s \nBuild Number: %s \nFirmware Number: %s \n' \
             % (get_serial_number(), get_build_number(), get_firmware_number())
     return msg
 
+
 def print_aboutcomputer():
     print get_aboutcomputer()
 
+
 def get_serial_number():
     serial_no = _read_file('/ofw/serial-number')
     if serial_no is None:
         serial_no = _not_available
     return serial_no
 
+
 def print_serial_number():
     serial_no = get_serial_number()
     if serial_no is None:
         serial_no = _not_available
     print serial_no
 
+
 def get_build_number():
     build_no = _read_file('/boot/olpc_build')
 
@@ -68,9 +74,11 @@ def get_build_number():
 
     return build_no
 
+
 def print_build_number():
     print get_build_number()
 
+
 def get_firmware_number():
     firmware_no = _read_file('/ofw/openprom/model')
     if firmware_no is None:
@@ -81,9 +89,11 @@ def get_firmware_number():
             firmware_no = firmware_no[1]
     return firmware_no
 
+
 def print_firmware_number():
     print get_firmware_number()
 
+
 def get_wireless_firmware():
     try:
         info = subprocess.Popen(["/usr/sbin/ethtool", "-i", "eth0"],
@@ -97,9 +107,11 @@ def get_wireless_firmware():
         wireless_firmware = _not_available
     return wireless_firmware
 
+
 def print_wireless_firmware():
     print get_wireless_firmware()
 
+
 def _read_file(path):
     if os.access(path, os.R_OK) == 0:
         return None
@@ -114,6 +126,7 @@ def _read_file(path):
         _logger.debug('No information in file or directory: %s', path)
         return None
 
+
 def get_license():
     license_file = os.path.join(config.data_path, 'GPLv2')
     lang = os.environ['LANG']
diff --git a/extensions/cpsection/aboutcomputer/view.py b/extensions/cpsection/aboutcomputer/view.py
index 39bacfb..68545fd 100644
--- a/extensions/cpsection/aboutcomputer/view.py
+++ b/extensions/cpsection/aboutcomputer/view.py
@@ -26,6 +26,7 @@ from sugar.graphics import style
 from jarabe import config
 from jarabe.controlpanel.sectionview import SectionView
 
+
 class AboutComputer(SectionView):
     def __init__(self, model, alerts=None):
         SectionView.__init__(self)
diff --git a/extensions/cpsection/aboutme/__init__.py b/extensions/cpsection/aboutme/__init__.py
index 98843e1..7ded428 100644
--- a/extensions/cpsection/aboutme/__init__.py
+++ b/extensions/cpsection/aboutme/__init__.py
@@ -24,5 +24,3 @@ ICON = 'module-about_me'
 TITLE = _('About Me')
 client = gconf.client_get_default()
 COLOR = XoColor(client.get_string('/desktop/sugar/user/color'))
-
-
diff --git a/extensions/cpsection/aboutme/model.py b/extensions/cpsection/aboutme/model.py
index 078fff4..fd7261c 100644
--- a/extensions/cpsection/aboutme/model.py
+++ b/extensions/cpsection/aboutme/model.py
@@ -18,6 +18,7 @@
 from gettext import gettext as _
 import gconf
 
+
 _COLORS = {'red': {'dark':'#b20008', 'medium':'#e6000a', 'light':'#ffadce'},
            'orange': {'dark':'#9a5200', 'medium':'#c97e00', 'light':'#ffc169'},
            'yellow': {'dark':'#807500', 'medium':'#be9e00', 'light':'#fffa00'},
@@ -28,13 +29,16 @@ _COLORS = {'red': {'dark':'#b20008', 'medium':'#e6000a', 'light':'#ffadce'},
 
 _MODIFIERS = ('dark', 'medium', 'light')
 
+
 def get_nick():
     client = gconf.client_get_default()
     return client.get_string("/desktop/sugar/user/nick")
 
+
 def print_nick():
     print get_nick()
 
+
 def set_nick(nick):
     """Set the nickname.
     nick : e.g. 'walter'
@@ -47,10 +51,12 @@ def set_nick(nick):
     client.set_string("/desktop/sugar/user/nick", nick)
     return 1
 
+
 def get_color():
     client = gconf.client_get_default()
     return client.get_string("/desktop/sugar/user/color")
 
+
 def print_color():
     color_string = get_color()
     tmp = color_string.split(',')
@@ -74,6 +80,7 @@ def print_color():
     else:
         print _('fill:     %s') % (tmp[1])
 
+
 def set_color(stroke, fill, stroke_modifier='medium', fill_modifier='medium'):
     """Set the system color by setting a fill and stroke color.
     fill : [red, orange, yellow, blue, green, purple]
@@ -102,10 +109,12 @@ def set_color(stroke, fill, stroke_modifier='medium', fill_modifier='medium'):
     client.set_string("/desktop/sugar/user/color", color)
     return 1
 
+
 def get_color_xo():
     client = gconf.client_get_default()
     return client.get_string("/desktop/sugar/user/color")
 
+
 def set_color_xo(color):
     """Set a color with an XoColor
     This method is used by the graphical user interface
diff --git a/extensions/cpsection/datetime/model.py b/extensions/cpsection/datetime/model.py
index a928b41..39d5e5e 100644
--- a/extensions/cpsection/datetime/model.py
+++ b/extensions/cpsection/datetime/model.py
@@ -26,6 +26,7 @@ import gconf
 
 _zone_tab = '/usr/share/zoneinfo/zone.tab'
 
+
 def _initialize():
     '''Initialize the docstring of the set function'''
     if set_timezone.__doc__ is None:
@@ -36,6 +37,7 @@ def _initialize():
     for timezone in timezones:
         set_timezone.__doc__ += timezone + '\n'
 
+
 def read_all_timezones(fn=_zone_tab):
     fd = open (fn, 'r')
     lines = fd.readlines()
@@ -67,13 +69,16 @@ def read_all_timezones(fn=_zone_tab):
         timezones.append(tz)
     return timezones
 
+
 def get_timezone():
     client = gconf.client_get_default()
     return client.get_string('/desktop/sugar/date/timezone')
 
+
 def print_timezone():
     print get_timezone()
 
+
 def set_timezone(timezone):
     """Set the system timezone
     timezone : e.g. 'America/Los_Angeles'
@@ -89,4 +94,3 @@ def set_timezone(timezone):
 
 # inilialize the docstrings for the timezone
 _initialize()
-
diff --git a/extensions/cpsection/datetime/view.py b/extensions/cpsection/datetime/view.py
index a2c4c78..72fdad1 100644
--- a/extensions/cpsection/datetime/view.py
+++ b/extensions/cpsection/datetime/view.py
@@ -24,6 +24,7 @@ from sugar.graphics import iconentry
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
 
+
 class TimeZone(SectionView):
     def __init__(self, model, alerts):
         SectionView.__init__(self)
diff --git a/extensions/cpsection/frame/model.py b/extensions/cpsection/frame/model.py
index 765d183..de2da5e 100644
--- a/extensions/cpsection/frame/model.py
+++ b/extensions/cpsection/frame/model.py
@@ -18,14 +18,17 @@
 from gettext import gettext as _
 import gconf
 
+
 def get_corner_delay():
     client = gconf.client_get_default()
     corner_delay = client.get_int('/desktop/sugar/frame/corner_delay')
     return corner_delay
 
+
 def print_corner_delay():
     print get_corner_delay()
 
+
 def set_corner_delay(delay):
     """Set a delay for the activation of the frame using hot corners.
     instantaneous: 0 (0 milliseconds)
@@ -40,14 +43,17 @@ def set_corner_delay(delay):
     client.set_int('/desktop/sugar/frame/corner_delay', int(delay))
     return 0
 
+
 def get_edge_delay():
     client = gconf.client_get_default()
     edge_delay = client.get_int('/desktop/sugar/frame/edge_delay')
     return edge_delay
 
+
 def print_edge_delay():
     print get_edge_delay()
 
+
 def set_edge_delay(delay):
     """Set a delay for the activation of the frame using warm edges.
     instantaneous: 0 (0 milliseconds)
diff --git a/extensions/cpsection/frame/view.py b/extensions/cpsection/frame/view.py
index d9e1a6a..fb2b6b7 100644
--- a/extensions/cpsection/frame/view.py
+++ b/extensions/cpsection/frame/view.py
@@ -23,11 +23,13 @@ from sugar.graphics import style
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
 
+
 _never =  _('never')
 _instantaneous = _('instantaneous')
 _seconds_label = _('%s seconds')
 _MAX_DELAY = 1000
 
+
 class Frame(SectionView):
     def __init__(self, model, alerts):
         SectionView.__init__(self)
diff --git a/extensions/cpsection/keyboard/__init__.py b/extensions/cpsection/keyboard/__init__.py
index 568e7a5..065086c 100644
--- a/extensions/cpsection/keyboard/__init__.py
+++ b/extensions/cpsection/keyboard/__init__.py
@@ -19,4 +19,3 @@ from gettext import gettext as _
 CLASS = 'Keyboard'
 ICON = 'module-keyboard'
 TITLE = _('Keyboard')
-
diff --git a/extensions/cpsection/keyboard/model.py b/extensions/cpsection/keyboard/model.py
index 4c44740..b7186e2 100644
--- a/extensions/cpsection/keyboard/model.py
+++ b/extensions/cpsection/keyboard/model.py
@@ -26,6 +26,7 @@ _LAYOUTS_KEY = '/desktop/sugar/peripherals/keyboard/layouts'
 _OPTIONS_KEY = '/desktop/sugar/peripherals/keyboard/options'
 _MODEL_KEY = '/desktop/sugar/peripherals/keyboard/model'
 
+
 class KeyboardManager(object):
     def __init__(self, display):
         self._engine = xklavier.Engine(display)
@@ -166,4 +167,3 @@ class KeyboardManager(object):
         self._configrec.set_layouts(layouts_list)
         self._configrec.set_variants(variants_list)
         self._configrec.activate(self._engine)
-
diff --git a/extensions/cpsection/keyboard/view.py b/extensions/cpsection/keyboard/view.py
index bcc98d8..51062fd 100644
--- a/extensions/cpsection/keyboard/view.py
+++ b/extensions/cpsection/keyboard/view.py
@@ -26,6 +26,7 @@ from sugar.graphics.icon import Icon
 
 from jarabe.controlpanel.sectionview import SectionView
 
+
 CLASS = 'Language'
 ICON = 'module-keyboard'
 TITLE = _('Keyboard')
@@ -37,6 +38,7 @@ _APPLY_TIMEOUT = 500
 #      once python-xklavier has been packaged for all major distributions
 #      For more information, see: http://dev.sugarlabs.org/ticket/407
 
+
 class LayoutCombo(gtk.HBox):
 
     """
@@ -306,7 +308,6 @@ class Keyboard(SectionView):
         except Exception:
             logging.exception('Could not set new keyboard group switch option')
 
-
         return False
 
     def _setup_layouts(self):
@@ -417,10 +418,8 @@ class Keyboard(SectionView):
 
         return False
 
-
     def undo(self):
         """Reverts back to the original keyboard configuration"""
         self._keyboard_manager.set_model(self._kmodel)
         self._keyboard_manager.set_layouts(self._klayouts)
         self._keyboard_manager.set_option_group(self._group_switch_option)
-
diff --git a/extensions/cpsection/language/__init__.py b/extensions/cpsection/language/__init__.py
index a8f9f08..c93b7d1 100644
--- a/extensions/cpsection/language/__init__.py
+++ b/extensions/cpsection/language/__init__.py
@@ -19,4 +19,3 @@ from gettext import gettext as _
 CLASS = 'Language'
 ICON = 'module-language'
 TITLE = _('Language')
-
diff --git a/extensions/cpsection/language/model.py b/extensions/cpsection/language/model.py
index bd61ed1..c6f4847 100644
--- a/extensions/cpsection/language/model.py
+++ b/extensions/cpsection/language/model.py
@@ -25,9 +25,11 @@ import locale
 from gettext import gettext as _
 import subprocess
 
+
 _default_lang = '%s.%s' % locale.getdefaultlocale()
 _standard_msg = _("Could not access ~/.i18n. Create standard settings.")
 
+
 def read_all_languages():
     fdp = subprocess.Popen(['locale', '-av'], stdout=subprocess.PIPE)
     lines = fdp.stdout.read().split('\n')
@@ -52,6 +54,7 @@ def read_all_languages():
     locales.sort()
     return locales
 
+
 def _initialize():
     if set_languages.__doc__ is None:
         # when running under 'python -OO', all __doc__ fields are None,
@@ -63,6 +66,7 @@ def _initialize():
         set_languages.__doc__ += '%s \n' % (lang[0].replace(' ', '_') + '/' +
                                            lang[1].replace(' ', '_'))
 
+
 def _write_i18n(langs):
     colon = ':'
     langstr = colon.join(langs)
@@ -79,6 +83,7 @@ def _write_i18n(langs):
         fd.write('LANGUAGE="%s"\n' % langstr)
         fd.close()
 
+
 def get_languages():
     path = os.path.join(os.environ.get("HOME"), '.i18n')
     if not os.access(path, os.R_OK):
@@ -109,6 +114,7 @@ def get_languages():
     else:
         return langlist
 
+
 def print_languages():
     codes = get_languages()
 
@@ -124,6 +130,7 @@ def print_languages():
         if not found_lang:
             print (_("Language for code=%s could not be determined.") % code)
 
+
 def set_languages(languages):
     """Set the system language.
     languages :
@@ -146,6 +153,6 @@ def set_languages(languages):
     else:
         _write_i18n(languages)
 
+
 # inilialize the docstrings for the language
 _initialize()
-
diff --git a/extensions/cpsection/language/view.py b/extensions/cpsection/language/view.py
index 4ce7196..3a1f1a5 100644
--- a/extensions/cpsection/language/view.py
+++ b/extensions/cpsection/language/view.py
@@ -32,6 +32,7 @@ CLASS = 'Language'
 ICON = 'module-language'
 TITLE = gettext.gettext('Language')
 
+
 class Language(SectionView):
     def __init__(self, model, alerts):
         SectionView.__init__(self)
@@ -99,7 +100,6 @@ class Language(SectionView):
         self._attach_to_table(label, 0, 1, padding=1)
         label.show()
 
-
         store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
         for language, country, code in self._available_locales:
             description = '%s (%s)' % (_translate_language(language), \
@@ -271,7 +271,6 @@ class Language(SectionView):
         else:
             remove_button.props.visible = True
 
-
     def __lang_timeout_cb(self, codes):
         self._lang_sid = 0
         self._model.set_languages(codes)
diff --git a/extensions/cpsection/modemconfiguration/__init__.py b/extensions/cpsection/modemconfiguration/__init__.py
index 8a219dc..61f5904 100644
--- a/extensions/cpsection/modemconfiguration/__init__.py
+++ b/extensions/cpsection/modemconfiguration/__init__.py
@@ -19,4 +19,3 @@ from gettext import gettext as _
 CLASS = 'ModemConfiguration'
 ICON = 'module-modemconfiguration'
 TITLE = _('Modem Configuration')
-
diff --git a/extensions/cpsection/modemconfiguration/model.py b/extensions/cpsection/modemconfiguration/model.py
index 2545ce1..1e83c44 100755
--- a/extensions/cpsection/modemconfiguration/model.py
+++ b/extensions/cpsection/modemconfiguration/model.py
@@ -20,51 +20,62 @@ from jarabe.model.network import GSM_USERNAME_PATH, GSM_PASSWORD_PATH, \
                                  GSM_NUMBER_PATH, GSM_APN_PATH, GSM_PIN_PATH, \
                                  GSM_PUK_PATH
 
+
 def get_username():
     client = gconf.client_get_default()
     return client.get_string(GSM_USERNAME_PATH) or ''
 
+
 def get_password():
     client = gconf.client_get_default()
     return client.get_string(GSM_PASSWORD_PATH) or ''
 
+
 def get_number():
     client = gconf.client_get_default()
     return client.get_string(GSM_NUMBER_PATH) or ''
 
+
 def get_apn():
     client = gconf.client_get_default()
     return client.get_string(GSM_APN_PATH) or ''
 
+
 def get_pin():
     client = gconf.client_get_default()
     return client.get_string(GSM_PIN_PATH) or ''
 
+
 def get_puk():
     client = gconf.client_get_default()
     return client.get_string(GSM_PUK_PATH) or ''
 
+
 def set_username(username):
     client = gconf.client_get_default()
     client.set_string(GSM_USERNAME_PATH, username)
 
+
 def set_password(password):
     client = gconf.client_get_default()
     client.set_string(GSM_PASSWORD_PATH, password)
 
+
 def set_number(number):
     client = gconf.client_get_default()
     client.set_string(GSM_NUMBER_PATH, number)
 
+
 def set_apn(apn):
     client = gconf.client_get_default()
     client.set_string(GSM_APN_PATH, apn)
 
+
 def set_pin(pin):
     client = gconf.client_get_default()
     client.set_string(GSM_PIN_PATH, pin)
 
+
 def set_puk(puk):
     client = gconf.client_get_default()
     client.set_string(GSM_PUK_PATH, puk)
-
diff --git a/extensions/cpsection/modemconfiguration/view.py b/extensions/cpsection/modemconfiguration/view.py
index af8f332..11396d7 100644
--- a/extensions/cpsection/modemconfiguration/view.py
+++ b/extensions/cpsection/modemconfiguration/view.py
@@ -25,8 +25,10 @@ from sugar.graphics import style
 
 from jarabe.controlpanel.sectionview import SectionView
 
+
 APPLY_TIMEOUT = 1000
 
+
 class EntryWithLabel(gtk.HBox):
     __gtype_name__ = "SugarEntryWithLabel"
 
@@ -86,6 +88,7 @@ class EntryWithLabel(gtk.HBox):
         return self._is_valid
     is_valid = gobject.property(type=bool, getter=_get_is_valid, default=True)
 
+
 class UsernameEntry(EntryWithLabel):
     def __init__(self, model):
         EntryWithLabel.__init__(self, _('Username:'))
@@ -97,6 +100,7 @@ class UsernameEntry(EntryWithLabel):
     def set_value(self, username):
         self._model.set_username(username)
 
+
 class PasswordEntry(EntryWithLabel):
     def __init__(self, model):
         EntryWithLabel.__init__(self, _('Password:'))
@@ -108,6 +112,7 @@ class PasswordEntry(EntryWithLabel):
     def set_value(self, password):
         self._model.set_password(password)
 
+
 class NumberEntry(EntryWithLabel):
     def __init__(self, model):
         EntryWithLabel.__init__(self, _('Number:'))
@@ -119,6 +124,7 @@ class NumberEntry(EntryWithLabel):
     def set_value(self, number):
         self._model.set_number(number)
 
+
 class ApnEntry(EntryWithLabel):
     def __init__(self, model):
         EntryWithLabel.__init__(self, _('Access Point Name (APN):'))
@@ -130,6 +136,7 @@ class ApnEntry(EntryWithLabel):
     def set_value(self, apn):
         self._model.set_apn(apn)
 
+
 class PinEntry(EntryWithLabel):
     def __init__(self, model):
         EntryWithLabel.__init__(self, _('Personal Identity Number (PIN):'))
@@ -141,6 +148,7 @@ class PinEntry(EntryWithLabel):
     def set_value(self, pin):
         self._model.set_pin(pin)
 
+
 class PukEntry(EntryWithLabel):
     def __init__(self, model):
         EntryWithLabel.__init__(self, _('Personal Unblocking Key (PUK):'))
@@ -247,4 +255,3 @@ class ModemConfiguration(SectionView):
         if entry.is_valid:
             self.needs_restart = True
         self._validate()
-
diff --git a/extensions/cpsection/network/__init__.py b/extensions/cpsection/network/__init__.py
index 8fea274..86546f7 100644
--- a/extensions/cpsection/network/__init__.py
+++ b/extensions/cpsection/network/__init__.py
@@ -20,6 +20,3 @@ CLASS = 'Network'
 ICON = 'module-network'
 TITLE = _('Network')
 KEYWORDS = ['network', 'jabber', 'radio', 'server']
-
-
-
diff --git a/extensions/cpsection/network/model.py b/extensions/cpsection/network/model.py
index aad0607..c1e7229 100644
--- a/extensions/cpsection/network/model.py
+++ b/extensions/cpsection/network/model.py
@@ -25,19 +25,24 @@ _NM_IFACE = 'org.freedesktop.NetworkManager'
 
 KEYWORDS = ['network', 'jabber', 'radio', 'server']
 
+
 class ReadError(Exception):
     def __init__(self, value):
         self.value = value
+
     def __str__(self):
         return repr(self.value)
 
+
 def get_jabber():
     client = gconf.client_get_default()
     return client.get_string('/desktop/sugar/collaboration/jabber_server')
 
+
 def print_jabber():
     print get_jabber()
 
+
 def set_jabber(server):
     """Set the jabber server
     server : e.g. 'olpc.collabora.co.uk'
@@ -47,6 +52,7 @@ def set_jabber(server):
 
     return 0
 
+
 def get_radio():
     try:
         bus = dbus.SystemBus()
@@ -61,9 +67,11 @@ def get_radio():
     else:
         raise ReadError(_('State is unknown.'))
 
+
 def print_radio():
     print ('off', 'on')[get_radio()]
 
+
 def set_radio(state):
     """Turn Radio 'on' or 'off'
     state : 'on/off'
@@ -89,6 +97,7 @@ def set_radio(state):
 
     return 0
 
+
 def clear_registration():
     """Clear the registration with the schoolserver
     """
@@ -96,19 +105,23 @@ def clear_registration():
     client.set_string('/desktop/sugar/backup_url', '')
     return 1
 
+
 def clear_networks():
     """Clear saved passwords and network configurations.
     """
     pass
 
+
 def get_publish_information():
     client = gconf.client_get_default()
     publish = client.get_bool('/desktop/sugar/collaboration/publish_gadget')
     return publish
 
+
 def print_publish_information():
     print get_publish_information()
 
+
 def set_publish_information(value):
     """ If set to true, Sugar will make you searchable for
     the other users of the Jabber server.
diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
index a331bbd..447a51d 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -23,12 +23,14 @@ from sugar.graphics import style
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
 
+
 CLASS = 'Network'
 ICON = 'module-network'
 TITLE = _('Network')
 
 _APPLY_TIMEOUT = 3000
 
+
 class Network(SectionView):
     def __init__(self, model, alerts):
         SectionView.__init__(self)
diff --git a/extensions/cpsection/power/__init__.py b/extensions/cpsection/power/__init__.py
index 8b2e85f..35f7efd 100644
--- a/extensions/cpsection/power/__init__.py
+++ b/extensions/cpsection/power/__init__.py
@@ -20,4 +20,3 @@ CLASS = 'Power'
 ICON = 'module-power'
 TITLE = _('Power')
 KEYWORDS = ['automatic', 'extreme', 'power', 'suspend', 'battery']
-
diff --git a/extensions/cpsection/power/model.py b/extensions/cpsection/power/model.py
index 6c03ca8..ffbb5a2 100644
--- a/extensions/cpsection/power/model.py
+++ b/extensions/cpsection/power/model.py
@@ -35,14 +35,17 @@ _logger = logging.getLogger('ControlPanel - Power')
 class ReadError(Exception):
     def __init__(self, value):
         self.value = value
+
     def __str__(self):
         return repr(self.value)
 
+
 def using_powerd():
     # directory exists if powerd running, and it's recent
     # enough to be controllable.
     return os.access(POWERD_FLAG_DIR, os.W_OK)
 
+
 def get_automatic_pm():
     if using_powerd():
         return not os.access(POWERD_INHIBIT_FLAG, os.R_OK)
@@ -51,9 +54,11 @@ def get_automatic_pm():
     client = gconf.client_get_default()
     return client.get_bool('/desktop/sugar/power/automatic')
 
+
 def print_automatic_pm():
     print ('off', 'on')[get_automatic_pm()]
 
+
 def set_automatic_pm(enabled):
     """Automatic suspends on/off."""
 
@@ -88,13 +93,16 @@ def set_automatic_pm(enabled):
     client.set_bool('/desktop/sugar/power/automatic', enabled)
     return
 
+
 def get_extreme_pm():
     client = gconf.client_get_default()
     return client.get_bool('/desktop/sugar/power/extreme')
 
+
 def print_extreme_pm():
     print ('off', 'on')[get_extreme_pm()]
 
+
 def set_extreme_pm(enabled):
     """Extreme power management on/off."""
 
diff --git a/extensions/cpsection/power/view.py b/extensions/cpsection/power/view.py
index 8f1ed56..fd89efa 100644
--- a/extensions/cpsection/power/view.py
+++ b/extensions/cpsection/power/view.py
@@ -22,6 +22,7 @@ from sugar.graphics import style
 from jarabe.controlpanel.sectionview import SectionView
 from jarabe.controlpanel.inlinealert import InlineAlert
 
+
 class Power(SectionView):
     def __init__(self, model, alerts):
         SectionView.__init__(self)
diff --git a/extensions/cpsection/updater/model.py b/extensions/cpsection/updater/model.py
index d678b1f..e3996e8 100755
--- a/extensions/cpsection/updater/model.py
+++ b/extensions/cpsection/updater/model.py
@@ -218,6 +218,7 @@ class UpdateModel(gobject.GObject):
         self._bundles_to_update = None
         self._cancelling = False
 
+
 class BundleUpdate(object):
 
     def __init__(self, bundle, version, link, size):
diff --git a/extensions/cpsection/updater/view.py b/extensions/cpsection/updater/view.py
index ad3f5f2..588cf23 100644
--- a/extensions/cpsection/updater/view.py
+++ b/extensions/cpsection/updater/view.py
@@ -179,6 +179,7 @@ class ActivityUpdater(SectionView):
     def undo(self):
         self._model.cancel()
 
+
 class ProgressPane(gtk.VBox):
     '''Container which replaces the `ActivityPane` during refresh or
     install.'''
diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py
index 8b1bac8..c1c920b 100644
--- a/extensions/deviceicon/battery.py
+++ b/extensions/deviceicon/battery.py
@@ -30,6 +30,7 @@ from sugar.graphics.xocolor import XoColor
 
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 
+
 _ICON_NAME = 'battery'
 
 _STATUS_CHARGING = 0
@@ -42,6 +43,7 @@ _CHARGING_PROP = 'battery.rechargeable.is_charging'
 _DISCHARGING_PROP = 'battery.rechargeable.is_discharging'
 _PRESENT_PROP = 'battery.present'
 
+
 class DeviceView(TrayIcon):
 
     FRAME_POSITION_RELATIVE = 102
@@ -101,6 +103,7 @@ class DeviceView(TrayIcon):
     def _battery_status_changed_cb(self, pspec, param):
         self._update_info()
 
+
 class BatteryPalette(Palette):
 
     def __init__(self, primary_text):
@@ -155,6 +158,7 @@ class BatteryPalette(Palette):
         self.props.secondary_text = secondary_text
         self._status_label.set_text(status_text)
 
+
 class DeviceModel(gobject.GObject):
     __gproperties__ = {
         'level'       : (int, None, None, 0, 100, 0,
@@ -241,6 +245,7 @@ class DeviceModel(gobject.GObject):
                 self._present = self._get_present()
                 self.notify('present')
 
+
 def setup(tray):
     bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
     proxy = bus.get_object('org.freedesktop.Hal',
diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
index 447cad5..55e334f 100644
--- a/extensions/deviceicon/network.py
+++ b/extensions/deviceicon/network.py
@@ -49,6 +49,7 @@ from jarabe.model.network import IP4Config
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 from jarabe.view.pulsingicon import PulsingIcon
 
+
 IP_ADDRESS_TEXT_TEMPLATE = _("IP address: %s")
 
 _NM_SERVICE = 'org.freedesktop.NetworkManager'
@@ -199,6 +200,7 @@ class WiredPalette(Palette):
             ip_address_text = ""
         self._ip_address_label.set_text(ip_address_text)
 
+
 class GsmPalette(Palette):
     __gtype_name__ = 'SugarGsmPalette'
 
@@ -749,6 +751,7 @@ class GsmDeviceView(TrayIcon):
                                       signal_name='PppStats',
                                       path=self._device.object_path,
                                       dbus_interface=_NM_SERIAL_IFACE)
+
     def create_palette(self):
         palette = GsmPalette()
 
@@ -1001,6 +1004,7 @@ class WiredDeviceObserver(object):
                 del self._device_view
                 self._device_view = None
 
+
 class GsmDeviceObserver(object):
     def __init__(self, device, tray):
         self._device = device
@@ -1015,6 +1019,7 @@ class GsmDeviceObserver(object):
         self._tray.remove_device(self._device_view)
         self._device_view = None
 
+
 class NetworkManagerObserver(object):
     def __init__(self, tray):
         self._bus = dbus.SystemBus()
@@ -1073,5 +1078,6 @@ class NetworkManagerObserver(object):
             device.disconnect()
             del self._devices[device_op]
 
+
 def setup(tray):
     device_observer = NetworkManagerObserver(tray)
diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py
index cf06e01..ae84036 100644
--- a/extensions/deviceicon/speaker.py
+++ b/extensions/deviceicon/speaker.py
@@ -32,6 +32,7 @@ from jarabe.model import sound
 
 _ICON_NAME = 'speaker'
 
+
 class DeviceView(TrayIcon):
 
     FRAME_POSITION_RELATIVE = 103
@@ -86,6 +87,7 @@ class DeviceView(TrayIcon):
     def __speaker_status_changed_cb(self, pspec_, param_):
         self._update_info()
 
+
 class SpeakerPalette(Palette):
 
     def __init__(self, primary_text, model):
@@ -167,6 +169,7 @@ class SpeakerPalette(Palette):
         self._update_level()
         self._update_muted()
 
+
 class DeviceModel(gobject.GObject):
     __gproperties__ = {
         'level'   : (int, None, None, 0, 100, 0, gobject.PARAM_READWRITE),
@@ -212,5 +215,6 @@ class DeviceModel(gobject.GObject):
         elif pspec.name == "muted":
             self._set_muted(value)
 
+
 def setup(tray):
     tray.add_device(DeviceView())
diff --git a/extensions/deviceicon/volume.py b/extensions/deviceicon/volume.py
index e7f62a2..ea2377d 100644
--- a/extensions/deviceicon/volume.py
+++ b/extensions/deviceicon/volume.py
@@ -28,8 +28,10 @@ from jarabe.journal import journalactivity
 from jarabe.view.palettes import VolumePalette
 from jarabe.frame.frameinvoker import FrameWidgetInvoker
 
+
 _icons = {}
 
+
 class DeviceView(TrayIcon):
 
     FRAME_POSITION_RELATIVE = 500
@@ -70,9 +72,11 @@ class DeviceView(TrayIcon):
         journal.reveal()
         return True
 
+
 def setup(tray):
     gobject.idle_add(_setup_volumes, tray)
 
+
 def _setup_volumes(tray):
     volume_monitor = gio.volume_monitor_get()
 
@@ -86,9 +90,11 @@ def _setup_volumes(tray):
     volume_monitor.connect('mount-added', _mount_added_cb, tray)
     volume_monitor.connect('mount-removed', _mount_removed_cb, tray)
 
+
 def _volume_added_cb(volume_monitor, volume, tray):
     _mount(volume, tray)
 
+
 def _mount(volume, tray):
     # Follow Nautilus behaviour here
     # since it has the same issue with removable device
@@ -102,20 +108,23 @@ def _mount(volume, tray):
         #TODO: pass None as mount_operation, or better, SugarMountOperation
         volume.mount(gtk.MountOperation(tray.get_toplevel()), _mount_cb)
 
+
 def _mount_cb(volume, result):
     logging.debug('_mount_cb %r %r', volume, result)
     volume.mount_finish(result)
 
+
 def _mount_added_cb(volume_monitor, mount, tray):
     _add_device(mount, tray)
 
+
 def _mount_removed_cb(volume_monitor, mount, tray):
     icon = _icons[mount]
     tray.remove_device(icon)
     del _icons[mount]
 
+
 def _add_device(mount, tray):
     icon = DeviceView(mount)
     _icons[mount] = icon
     tray.add_device(icon)
-
diff --git a/extensions/globalkey/screenshot.py b/extensions/globalkey/screenshot.py
index 8b4d4c2..b62806f 100644
--- a/extensions/globalkey/screenshot.py
+++ b/extensions/globalkey/screenshot.py
@@ -31,6 +31,7 @@ from jarabe.model import shell
 
 BOUND_KEYS = ['<alt>1', 'Print']
 
+
 def handle_key_press(key):
     tmp_dir = os.path.join(env.get_profile_path(), 'data')
     fd, file_path = tempfile.mkstemp(dir=tmp_dir)
@@ -87,14 +88,15 @@ def handle_key_press(key):
         jobject.destroy()
         del jobject
 
+
 def _get_preview_data(screenshot):
     preview = screenshot.scale_simple(style.zoom(300), style.zoom(225),
                                       gtk.gdk.INTERP_BILINEAR)
     preview_data = []
+
     def save_func(buf, data):
         data.append(buf)
 
     preview.save_to_callback(save_func, 'png', user_data=preview_data)
 
     return dbus.ByteArray(''.join(preview_data))
-
diff --git a/extensions/globalkey/viewsource.py b/extensions/globalkey/viewsource.py
index df3cd9e..96e7c6b 100644
--- a/extensions/globalkey/viewsource.py
+++ b/extensions/globalkey/viewsource.py
@@ -18,8 +18,10 @@
 from jarabe.view.viewsource import setup_view_source
 from jarabe.model import shell
 
+
 BOUND_KEYS = ['0xEC', '<alt><shift>v']
 
+
 def handle_key_press(key):
     shell_model = shell.get_model()
     activity = shell_model.get_active_activity()