[Sugar-devel] [PATCH sugar v2 01/21] fix EOL spaces
Simon Schampijer
simon at schampijer.de
Wed Nov 24 12:42:55 EST 2010
Reviewed-by: Simon Schampijer<simon at schampijer.de>
On 11/19/2010 10:13 PM, Sascha Silbe wrote:
> Reviewed-by: James Cameron<quozl at laptop.org>
> CC: Aleksey Lim<alsroot at member.fsf.org>
> Signed-off-by: Sascha Silbe<sascha-pgp at silbe.org>
>
> diff --git a/extensions/cpsection/aboutcomputer/model.py b/extensions/cpsection/aboutcomputer/model.py
> index 898d79c..77d3b86 100644
> --- a/extensions/cpsection/aboutcomputer/model.py
> +++ b/extensions/cpsection/aboutcomputer/model.py
> @@ -40,7 +40,7 @@ def get_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:
> @@ -71,7 +71,7 @@ def get_build_number():
> def print_build_number():
> print get_build_number()
>
> -def get_firmware_number():
> +def get_firmware_number():
> firmware_no = _read_file('/ofw/openprom/model')
> if firmware_no is None:
> firmware_no = _not_available
> @@ -79,9 +79,9 @@ def get_firmware_number():
> firmware_no = re.split(" +", firmware_no)
> if len(firmware_no) == 3:
> firmware_no = firmware_no[1]
> - return firmware_no
> + return firmware_no
>
> -def print_firmware_number():
> +def print_firmware_number():
> print get_firmware_number()
>
> def get_wireless_firmware():
> diff --git a/extensions/cpsection/aboutcomputer/view.py b/extensions/cpsection/aboutcomputer/view.py
> index b6ff43f..39bacfb 100644
> --- a/extensions/cpsection/aboutcomputer/view.py
> +++ b/extensions/cpsection/aboutcomputer/view.py
> @@ -68,7 +68,7 @@ class AboutComputer(SectionView):
> box_identity = gtk.HBox(spacing=style.DEFAULT_SPACING)
> label_serial = gtk.Label(_('Serial Number:'))
> label_serial.set_alignment(1, 0)
> - label_serial.modify_fg(gtk.STATE_NORMAL,
> + label_serial.modify_fg(gtk.STATE_NORMAL,
> style.COLOR_SELECTION_GREY.get_gdk_color())
> box_identity.pack_start(label_serial, expand=False)
> self._group.add_widget(label_serial)
> @@ -83,7 +83,7 @@ class AboutComputer(SectionView):
> self._vbox.pack_start(vbox_identity, expand=False)
> vbox_identity.show()
>
> - def _setup_software(self):
> + def _setup_software(self):
> separator_software = gtk.HSeparator()
> self._vbox.pack_start(separator_software, expand=False)
> separator_software.show()
> @@ -99,7 +99,7 @@ class AboutComputer(SectionView):
> box_build = gtk.HBox(spacing=style.DEFAULT_SPACING)
> label_build = gtk.Label(_('Build:'))
> label_build.set_alignment(1, 0)
> - label_build.modify_fg(gtk.STATE_NORMAL,
> + label_build.modify_fg(gtk.STATE_NORMAL,
> style.COLOR_SELECTION_GREY.get_gdk_color())
> box_build.pack_start(label_build, expand=False)
> self._group.add_widget(label_build)
> @@ -130,7 +130,7 @@ class AboutComputer(SectionView):
> box_firmware = gtk.HBox(spacing=style.DEFAULT_SPACING)
> label_firmware = gtk.Label(_('Firmware:'))
> label_firmware.set_alignment(1, 0)
> - label_firmware.modify_fg(gtk.STATE_NORMAL,
> + label_firmware.modify_fg(gtk.STATE_NORMAL,
> style.COLOR_SELECTION_GREY.get_gdk_color())
> box_firmware.pack_start(label_firmware, expand=False)
> self._group.add_widget(label_firmware)
> diff --git a/extensions/cpsection/aboutme/model.py b/extensions/cpsection/aboutme/model.py
> index 8500799..078fff4 100644
> --- a/extensions/cpsection/aboutme/model.py
> +++ b/extensions/cpsection/aboutme/model.py
> @@ -27,14 +27,14 @@ _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'
> @@ -64,16 +64,16 @@ def print_color():
> if _COLORS[color][hue] == tmp[1]:
> fill_tuple = (color, hue)
>
> - if stroke_tuple is not None:
> - print _('stroke: color=%s hue=%s') % (stroke_tuple[0],
> + if stroke_tuple is not None:
> + print _('stroke: color=%s hue=%s') % (stroke_tuple[0],
> stroke_tuple[1])
> else:
> - print _('stroke: %s') % (tmp[0])
> - if fill_tuple is not None:
> + print _('stroke: %s') % (tmp[0])
> + if fill_tuple is not None:
> print _('fill: color=%s hue=%s') % (fill_tuple[0], fill_tuple[1])
> 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]
> @@ -81,20 +81,20 @@ def set_color(stroke, fill, stroke_modifier='medium', fill_modifier='medium'):
> hue stroke : [dark, medium, light] (optional)
> hue fill : [dark, medium, light] (optional)
> """
> -
> +
> if stroke_modifier not in _MODIFIERS or fill_modifier not in _MODIFIERS:
> print (_("Error in specified color modifiers."))
> return
> if stroke not in _COLORS or fill not in _COLORS:
> print (_("Error in specified colors."))
> return
> -
> +
> if stroke_modifier == fill_modifier:
> if fill_modifier == 'medium':
> fill_modifier = 'light'
> else:
> fill_modifier = 'medium'
> -
> +
> color = _COLORS[stroke][stroke_modifier] + ',' \
> + _COLORS[fill][fill_modifier]
>
> @@ -107,7 +107,7 @@ def get_color_xo():
> return client.get_string("/desktop/sugar/user/color")
>
> def set_color_xo(color):
> - """Set a color with an XoColor
> + """Set a color with an XoColor
> This method is used by the graphical user interface
> """
> client = gconf.client_get_default()
> diff --git a/extensions/cpsection/datetime/model.py b/extensions/cpsection/datetime/model.py
> index 76064e4..a928b41 100644
> --- a/extensions/cpsection/datetime/model.py
> +++ b/extensions/cpsection/datetime/model.py
> @@ -32,10 +32,10 @@ def _initialize():
> # when running under 'python -OO', all __doc__ fields are None,
> # so += would fail -- and this function would be unnecessary anyway.
> return
> - timezones = read_all_timezones()
> + timezones = read_all_timezones()
> for timezone in timezones:
> - set_timezone.__doc__ += timezone + '\n'
> -
> + set_timezone.__doc__ += timezone + '\n'
> +
> def read_all_timezones(fn=_zone_tab):
> fd = open (fn, 'r')
> lines = fd.readlines()
> @@ -48,7 +48,7 @@ def read_all_timezones(fn=_zone_tab):
> if len(line)> 1:
> timezones.append(line[2])
> timezones.sort()
> -
> +
> for offset in xrange(-12, 13):
> if offset< 0:
> tz = 'GMT%d' % offset
> @@ -56,7 +56,7 @@ def read_all_timezones(fn=_zone_tab):
> tz = 'GMT+%d' % offset
> else:
> tz = 'GMT'
> - timezones.append(tz)
> + timezones.append(tz)
> for offset in xrange(-12, 13):
> if offset< 0:
> tz = 'UTC%d' % offset
> @@ -64,7 +64,7 @@ def read_all_timezones(fn=_zone_tab):
> tz = 'UTC+%d' % offset
> else:
> tz = 'UTC'
> - timezones.append(tz)
> + timezones.append(tz)
> return timezones
>
> def get_timezone():
> @@ -87,6 +87,6 @@ def set_timezone(timezone):
> raise ValueError(_("Error timezone does not exist."))
> return 1
>
> -# inilialize the docstrings for the timezone
> +# inilialize the docstrings for the timezone
> _initialize()
>
> diff --git a/extensions/cpsection/datetime/view.py b/extensions/cpsection/datetime/view.py
> index 58719b4..a2c4c78 100644
> --- a/extensions/cpsection/datetime/view.py
> +++ b/extensions/cpsection/datetime/view.py
> @@ -30,7 +30,7 @@ class TimeZone(SectionView):
>
> self._model = model
> self.restart_alerts = alerts
> - self._zone_sid = 0
> + self._zone_sid = 0
> self._cursor_change_handler = None
>
> self.set_border_width(style.DEFAULT_SPACING * 2)
> @@ -42,18 +42,18 @@ class TimeZone(SectionView):
> self._entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY,
> 'system-search')
> self._entry.add_clear_button()
> - self._entry.modify_bg(gtk.STATE_INSENSITIVE,
> + self._entry.modify_bg(gtk.STATE_INSENSITIVE,
> style.COLOR_WHITE.get_gdk_color())
> - self._entry.modify_base(gtk.STATE_INSENSITIVE,
> - style.COLOR_WHITE.get_gdk_color())
> + self._entry.modify_base(gtk.STATE_INSENSITIVE,
> + style.COLOR_WHITE.get_gdk_color())
> self.pack_start(self._entry, False)
> - self._entry.show()
> + self._entry.show()
>
> self._scrolled_window = gtk.ScrolledWindow()
> 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)
> + self._store = gtk.ListStore(gobject.TYPE_STRING)
> zones = model.read_all_timezones()
> for zone in zones:
> self._store.append([zone])
> @@ -91,16 +91,16 @@ class TimeZone(SectionView):
> zone = self._model.get_timezone()
> for row in self._store:
> if zone == row[0]:
> - self._treeview.set_cursor(row.path, self._timezone_column,
> + self._treeview.set_cursor(row.path, self._timezone_column,
> False)
> - self._treeview.scroll_to_cell(row.path, self._timezone_column,
> - True, 0.5, 0.5)
> + self._treeview.scroll_to_cell(row.path, self._timezone_column,
> + True, 0.5, 0.5)
> break
> -
> - self.needs_restart = False
> +
> + self.needs_restart = False
> self._cursor_change_handler = self._treeview.connect( \
> "cursor-changed", self.__zone_changed_cd)
> -
> +
> def undo(self):
> self._treeview.disconnect(self._cursor_change_handler)
> self._model.undo()
> @@ -121,18 +121,18 @@ class TimeZone(SectionView):
> return False
> if self._model.get_timezone() == self._store.get_value(row, 0):
> return False
> -
> +
> if self._zone_sid:
> gobject.source_remove(self._zone_sid)
> - self._zone_sid = gobject.timeout_add(self._APPLY_TIMEOUT,
> + self._zone_sid = gobject.timeout_add(self._APPLY_TIMEOUT,
> self.__zone_timeout_cb, row)
> return True
>
> - def __zone_timeout_cb(self, row):
> - self._zone_sid = 0
> + def __zone_timeout_cb(self, row):
> + self._zone_sid = 0
> self._model.set_timezone(self._store.get_value(row, 0))
> self.restart_alerts.append('zone')
> - self.needs_restart = True
> + self.needs_restart = True
> self._zone_alert.props.msg = self.restart_msg
> self._zone_alert.show()
> return False
> diff --git a/extensions/cpsection/frame/model.py b/extensions/cpsection/frame/model.py
> index 9eea9ad..765d183 100644
> --- a/extensions/cpsection/frame/model.py
> +++ b/extensions/cpsection/frame/model.py
> @@ -17,7 +17,7 @@
>
> 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')
> @@ -25,21 +25,21 @@ def get_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)
> - delay: 100 (100 milliseconds)
> + delay: 100 (100 milliseconds)
> never: 1000 (disable activation)
> """
> try:
> int(delay)
> - except ValueError:
> + except ValueError:
> raise ValueError(_("Value must be an integer."))
> client = gconf.client_get_default()
> 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')
> @@ -47,16 +47,16 @@ def get_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.
> + """Set a delay for the activation of the frame using warm edges.
> instantaneous: 0 (0 milliseconds)
> - delay: 100 (100 milliseconds)
> + delay: 100 (100 milliseconds)
> never: 1000 (disable activation)
> """
> try:
> int(delay)
> - except ValueError:
> + except ValueError:
> raise ValueError(_("Value must be an integer."))
> client = gconf.client_get_default()
> client.set_int('/desktop/sugar/frame/edge_delay', int(delay))
> diff --git a/extensions/cpsection/frame/view.py b/extensions/cpsection/frame/view.py
> index cbe43bb..d9e1a6a 100644
> --- a/extensions/cpsection/frame/view.py
> +++ b/extensions/cpsection/frame/view.py
> @@ -43,7 +43,7 @@ class Frame(SectionView):
>
> self.set_border_width(style.DEFAULT_SPACING * 2)
> self.set_spacing(style.DEFAULT_SPACING)
> - self._group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
> + self._group = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
>
> separator = gtk.HSeparator()
> self.pack_start(separator, expand=False)
> @@ -67,25 +67,25 @@ class Frame(SectionView):
> self._setup_edge()
>
> self.pack_start(self._box_sliders, expand=False)
> - self._box_sliders.show()
> + self._box_sliders.show()
>
> self.setup()
>
> - def _setup_corner(self):
> + def _setup_corner(self):
> box_delay = gtk.HBox(spacing=style.DEFAULT_SPACING)
> label_delay = gtk.Label(_('Corner'))
> label_delay.set_alignment(1, 0.75)
> - label_delay.modify_fg(gtk.STATE_NORMAL,
> + label_delay.modify_fg(gtk.STATE_NORMAL,
> style.COLOR_SELECTION_GREY.get_gdk_color())
> box_delay.pack_start(label_delay, expand=False)
> self._group.add_widget(label_delay)
> - label_delay.show()
> -
> - adj = gtk.Adjustment(value=100, lower=0, upper=_MAX_DELAY,
> + label_delay.show()
> +
> + adj = gtk.Adjustment(value=100, lower=0, upper=_MAX_DELAY,
> step_incr=100, page_incr=100, page_size=0)
> self._corner_delay_slider = gtk.HScale(adj)
> self._corner_delay_slider.set_digits(0)
> - self._corner_delay_slider.connect('format-value',
> + self._corner_delay_slider.connect('format-value',
> self.__corner_delay_format_cb)
> box_delay.pack_start(self._corner_delay_slider)
> self._corner_delay_slider.show()
> @@ -105,22 +105,22 @@ class Frame(SectionView):
> if 'corner_delay' in self.restart_alerts:
> self._corner_delay_alert.props.msg = self.restart_msg
> self._corner_delay_alert.show()
> -
> - def _setup_edge(self):
> +
> + def _setup_edge(self):
> box_delay = gtk.HBox(spacing=style.DEFAULT_SPACING)
> label_delay = gtk.Label(_('Edge'))
> label_delay.set_alignment(1, 0.75)
> - label_delay.modify_fg(gtk.STATE_NORMAL,
> + label_delay.modify_fg(gtk.STATE_NORMAL,
> style.COLOR_SELECTION_GREY.get_gdk_color())
> box_delay.pack_start(label_delay, expand=False)
> self._group.add_widget(label_delay)
> - label_delay.show()
> -
> - adj = gtk.Adjustment(value=100, lower=0, upper=_MAX_DELAY,
> + label_delay.show()
> +
> + adj = gtk.Adjustment(value=100, lower=0, upper=_MAX_DELAY,
> step_incr=100, page_incr=100, page_size=0)
> self._edge_delay_slider = gtk.HScale(adj)
> self._edge_delay_slider.set_digits(0)
> - self._edge_delay_slider.connect('format-value',
> + self._edge_delay_slider.connect('format-value',
> self.__edge_delay_format_cb)
> box_delay.pack_start(self._edge_delay_slider)
> self._edge_delay_slider.show()
> @@ -140,7 +140,7 @@ class Frame(SectionView):
> if 'edge_delay' in self.restart_alerts:
> self._edge_delay_alert.props.msg = self.restart_msg
> self._edge_delay_alert.show()
> -
> +
> def setup(self):
> self._corner_delay_slider.set_value(self._model.get_corner_delay())
> self._edge_delay_slider.set_value(self._model.get_edge_delay())
> @@ -151,13 +151,13 @@ class Frame(SectionView):
> 'value-changed', self.__corner_delay_changed_cb)
> self._edge_delay_change_handler = self._edge_delay_slider.connect( \
> 'value-changed', self.__edge_delay_changed_cb)
> -
> - def undo(self):
> +
> + def undo(self):
> self._corner_delay_slider.disconnect(self._corner_delay_change_handler)
> self._edge_delay_slider.disconnect(self._edge_delay_change_handler)
> self._model.undo()
> - self._corner_delay_alert.hide()
> - self._edge_delay_alert.hide()
> + self._corner_delay_alert.hide()
> + self._edge_delay_alert.hide()
>
> def _validate(self):
> if self._edge_delay_is_valid and self._corner_delay_is_valid:
> @@ -165,15 +165,15 @@ class Frame(SectionView):
> else:
> self.props.is_valid = False
>
> - def __corner_delay_changed_cb(self, scale, data=None):
> + def __corner_delay_changed_cb(self, scale, data=None):
> if self._corner_delay_sid:
> gobject.source_remove(self._corner_delay_sid)
> self._corner_delay_sid = gobject.timeout_add( \
> self._APPLY_TIMEOUT, self.__corner_delay_timeout_cb, scale)
> -
> - def __corner_delay_timeout_cb(self, scale):
> +
> + def __corner_delay_timeout_cb(self, scale):
> self._corner_delay_sid = 0
> - if scale.get_value() == self._model.get_corner_delay():
> + if scale.get_value() == self._model.get_corner_delay():
> return
> try:
> self._model.set_corner_delay(scale.get_value())
> @@ -182,12 +182,12 @@ class Frame(SectionView):
> self._corner_delay_is_valid = False
> else:
> self._corner_delay_alert.props.msg = self.restart_msg
> - self._corner_delay_is_valid = True
> + self._corner_delay_is_valid = True
> self.needs_restart = True
> self.restart_alerts.append('corner_delay')
> -
> +
> self._validate()
> - self._corner_delay_alert.show()
> + self._corner_delay_alert.show()
> return False
>
> def __corner_delay_format_cb(self, scale, value):
> @@ -198,15 +198,15 @@ class Frame(SectionView):
> else:
> return _seconds_label % (value / _MAX_DELAY)
>
> - def __edge_delay_changed_cb(self, scale, data=None):
> + def __edge_delay_changed_cb(self, scale, data=None):
> if self._edge_delay_sid:
> gobject.source_remove(self._edge_delay_sid)
> self._edge_delay_sid = gobject.timeout_add( \
> self._APPLY_TIMEOUT, self.__edge_delay_timeout_cb, scale)
> -
> - def __edge_delay_timeout_cb(self, scale):
> +
> + def __edge_delay_timeout_cb(self, scale):
> self._edge_delay_sid = 0
> - if scale.get_value() == self._model.get_edge_delay():
> + if scale.get_value() == self._model.get_edge_delay():
> return
> try:
> self._model.set_edge_delay(scale.get_value())
> @@ -215,12 +215,12 @@ class Frame(SectionView):
> self._edge_delay_is_valid = False
> else:
> self._edge_delay_alert.props.msg = self.restart_msg
> - self._edge_delay_is_valid = True
> + self._edge_delay_is_valid = True
> self.needs_restart = True
> self.restart_alerts.append('edge_delay')
> -
> +
> self._validate()
> - self._edge_delay_alert.show()
> + self._edge_delay_alert.show()
> return False
>
> def __edge_delay_format_cb(self, scale, value):
> diff --git a/extensions/cpsection/keyboard/model.py b/extensions/cpsection/keyboard/model.py
> index 089c2ea..4c44740 100644
> --- a/extensions/cpsection/keyboard/model.py
> +++ b/extensions/cpsection/keyboard/model.py
> @@ -33,7 +33,7 @@ class KeyboardManager(object):
> self._configregistry.load(False)
> self._configrec = xklavier.ConfigRec()
> self._configrec.get_from_server(self._engine)
> -
> +
> self._gconf_client = gconf.client_get_default()
>
> def _populate_one(self, config_registry, item, store):
> @@ -48,7 +48,7 @@ class KeyboardManager(object):
> else:
> description = 'Default layout, %s' % item.get_description()
> variant = ''
> -
> +
> store.append([description, ('%s(%s)' % (layout, variant))])
>
> def get_models(self):
> @@ -96,7 +96,7 @@ class KeyboardManager(object):
> layouts = self._gconf_client.get_list(_LAYOUTS_KEY, gconf.VALUE_STRING)
> if layouts:
> return layouts
> -
> +
> layouts = self._configrec.get_layouts()
> variants = self._configrec.get_variants()
>
> @@ -126,7 +126,7 @@ class KeyboardManager(object):
> return option
>
> return None
> -
> +
> def get_max_layouts(self):
> """Return the maximum number of layouts supported simultaneously"""
> return self._engine.get_max_num_groups()
> @@ -162,8 +162,8 @@ class KeyboardManager(object):
> for layout in layouts:
> layouts_list.append(layout.split('(')[0])
> variants_list.append(layout.split('(')[1][:-1])
> -
> +
> self._configrec.set_layouts(layouts_list)
> self._configrec.set_variants(variants_list)
> - self._configrec.activate(self._engine)
> -
> + self._configrec.activate(self._engine)
> +
> diff --git a/extensions/cpsection/keyboard/view.py b/extensions/cpsection/keyboard/view.py
> index dd62a85..bcc98d8 100644
> --- a/extensions/cpsection/keyboard/view.py
> +++ b/extensions/cpsection/keyboard/view.py
> @@ -129,7 +129,7 @@ class LayoutCombo(gtk.HBox):
> model = combobox.get_model()
> lang = model.get(it, 0)[0]
> self._set_kvariant_store(lang)
> -
> +
> def _kvariant_combo_changed_cb(self, combobox):
> it = combobox.get_active_iter()
> model = combobox.get_model()
> @@ -145,16 +145,16 @@ class Keyboard(SectionView):
>
> self._kmodel = None
> self._selected_kmodel = None
> -
> +
> self._klayouts = []
> self._selected_klayouts = []
> -
> +
> self._group_switch_option = None
> self._selected_group_switch_option = None
>
> self.set_border_width(style.DEFAULT_SPACING * 2)
> self.set_spacing(style.DEFAULT_SPACING)
> -
> +
> self._layout_table = gtk.Table(rows = 4, columns = 2, \
> homogeneous = False)
>
> @@ -169,7 +169,7 @@ class Keyboard(SectionView):
>
> self._vbox = gtk.VBox()
> scrollwindow.add_with_viewport(self._vbox)
> -
> +
> self.__kmodel_sid = None
> self.__layout_sid = None
> self.__group_switch_sid = None
> @@ -177,7 +177,7 @@ class Keyboard(SectionView):
> self._setup_kmodel()
> self._setup_layouts()
> self._setup_group_switch_option()
> -
> +
> self._vbox.show()
>
> def _setup_kmodel(self):
> @@ -223,7 +223,7 @@ class Keyboard(SectionView):
> def __kmodel_changed_cb(self, combobox):
> if self.__kmodel_sid is not None:
> gobject.source_remove(self.__kmodel_sid)
> - self.__kmodel_sid = gobject.timeout_add(_APPLY_TIMEOUT,
> + self.__kmodel_sid = gobject.timeout_add(_APPLY_TIMEOUT,
> self.__kmodel_timeout_cb, combobox)
>
> def __kmodel_timeout_cb(self, combobox):
> @@ -290,7 +290,7 @@ class Keyboard(SectionView):
> def __group_switch_changed_cb(self, combobox):
> if self.__group_switch_sid is not None:
> gobject.source_remove(self.__group_switch_sid)
> - self.__group_switch_sid = gobject.timeout_add(_APPLY_TIMEOUT,
> + self.__group_switch_sid = gobject.timeout_add(_APPLY_TIMEOUT,
> self.__group_switch_timeout_cb, combobox)
>
> def __group_switch_timeout_cb(self, combobox):
> @@ -335,7 +335,7 @@ class Keyboard(SectionView):
> if i< len(self._klayouts):
> layout_combo.show_all()
> layout_combo.select_layout(self._klayouts[i])
> -
> +
> self._vbox.pack_start(self._layout_table, expand=False)
> self._layout_table.set_size_request(self._vbox.size_request()[0], -1)
> self._layout_table.show()
> @@ -387,7 +387,7 @@ class Keyboard(SectionView):
> def __add_button_clicked_cb(self, button):
> self._layout_combo_list[len(self._selected_klayouts)].show_all()
> self._update_klayouts()
> -
> +
> def __remove_button_clicked_cb(self, button):
> self._layout_combo_list[len(self._selected_klayouts) - 1].hide()
> self._update_klayouts()
> @@ -403,7 +403,7 @@ class Keyboard(SectionView):
>
> if self.__layout_sid is not None:
> gobject.source_remove(self.__layout_sid)
> - self.__layout_sid = gobject.timeout_add(_APPLY_TIMEOUT,
> + self.__layout_sid = gobject.timeout_add(_APPLY_TIMEOUT,
> self.__layout_timeout_cb)
>
> def __layout_timeout_cb(self):
> diff --git a/extensions/cpsection/language/model.py b/extensions/cpsection/language/model.py
> index 4f3686f..bd61ed1 100644
> --- a/extensions/cpsection/language/model.py
> +++ b/extensions/cpsection/language/model.py
> @@ -43,7 +43,7 @@ def read_all_languages():
> if locale.endswith('utf8') and len(lang):
> locales.append((lang, territory, locale))
>
> - #FIXME: This is a temporary workaround for locales that are essential to
> + #FIXME: This is a temporary workaround for locales that are essential to
> # OLPC, but are not in Glibc yet.
> locales.append(('Kreyol', 'Haiti', 'ht_HT.utf8'))
> locales.append(('Dari', 'Afghanistan', 'fa_AF.utf8'))
> @@ -52,7 +52,7 @@ def read_all_languages():
> locales.sort()
> return locales
>
> -def _initialize():
> +def _initialize():
> if set_languages.__doc__ is None:
> # when running under 'python -OO', all __doc__ fields are None,
> # so += would fail -- and this function would be unnecessary anyway.
> @@ -60,9 +60,9 @@ def _initialize():
> languages = read_all_languages()
> set_languages.__doc__ += '\n'
> for lang in languages:
> - set_languages.__doc__ += '%s \n' % (lang[0].replace(' ', '_') + '/' +
> + set_languages.__doc__ += '%s \n' % (lang[0].replace(' ', '_') + '/' +
> lang[1].replace(' ', '_'))
> -
> +
> def _write_i18n(langs):
> colon = ':'
> langstr = colon.join(langs)
> @@ -82,13 +82,13 @@ def _write_i18n(langs):
> def get_languages():
> path = os.path.join(os.environ.get("HOME"), '.i18n')
> if not os.access(path, os.R_OK):
> - print _standard_msg
> + print _standard_msg
> fd = open(path, 'w')
> fd.write('LANG="%s"\n' % _default_lang)
> fd.write('LANGUAGE="%s"\n' % _default_lang)
> fd.close()
> return [_default_lang]
> -
> +
> fd = open(path, "r")
> lines = fd.readlines()
> fd.close()
> @@ -123,10 +123,10 @@ def print_languages():
> break
> if not found_lang:
> print (_("Language for code=%s could not be determined.") % code)
> -
> +
> def set_languages(languages):
> """Set the system language.
> - languages :
> + languages :
> """
> if isinstance(languages, str):
> # This came from the commandline
> @@ -134,7 +134,7 @@ def set_languages(languages):
> if languages.endswith('utf8'):
> _write_i18n(languages)
> return 1
> - else:
> + else:
> langs = read_all_languages()
> for lang, territory, locale in langs:
> code = lang.replace(' ', '_') + '/' \
> diff --git a/extensions/cpsection/language/view.py b/extensions/cpsection/language/view.py
> index d1a49cf..4ce7196 100644
> --- a/extensions/cpsection/language/view.py
> +++ b/extensions/cpsection/language/view.py
> @@ -25,7 +25,7 @@ from sugar.graphics.icon import Icon
> from jarabe.controlpanel.sectionview import SectionView
> from jarabe.controlpanel.inlinealert import InlineAlert
>
> -_translate_language = lambda msg: gettext.dgettext('iso_639', msg)
> +_translate_language = lambda msg: gettext.dgettext('iso_639', msg)
> _translate_country = lambda msg: gettext.dgettext('iso_3166', msg)
>
> CLASS = 'Language'
> @@ -69,14 +69,14 @@ class Language(SectionView):
> self.pack_start(scrolled, expand=True)
>
> self._table = gtk.Table(rows=1, columns=3, homogeneous=False)
> - self._table.set_border_width(style.DEFAULT_SPACING * 2)
> + self._table.set_border_width(style.DEFAULT_SPACING * 2)
> self._table.show()
> scrolled.add_with_viewport(self._table)
>
> self._lang_alert_box = gtk.HBox(spacing=style.DEFAULT_SPACING)
> self.pack_start(self._lang_alert_box, False)
>
> - self._lang_alert = InlineAlert()
> + self._lang_alert = InlineAlert()
> self._lang_alert_box.pack_start(self._lang_alert)
> if 'lang' in self.restart_alerts:
> self._lang_alert.props.msg = self.restart_msg
> @@ -89,7 +89,7 @@ class Language(SectionView):
> '''Adds a row to the table'''
>
> self._selected_lang_count += 1
> -
> +
> self._table.resize(self._selected_lang_count, 3)
>
> label = gtk.Label(str=str(self._selected_lang_count))
> @@ -98,8 +98,8 @@ class Language(SectionView):
> self._labels.append(label)
> 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), \
> @@ -115,7 +115,7 @@ class Language(SectionView):
> for row in store:
> lang = locale_code.split('.')[0]
> lang_column = row[0].split('.')[0]
> - if lang in lang_column:
> + if lang in lang_column:
> combobox.set_active_iter(row.iter)
> break
> else:
> @@ -132,7 +132,7 @@ class Language(SectionView):
> self._attach_to_table(add_remove_box, 2, 3)
>
> add_remove_box.show_all()
> -
> +
> if self._selected_lang_count> 1:
> previous_add_removes = self._add_remove_boxes[-2]
> previous_add_removes.hide_all()
> @@ -154,7 +154,7 @@ class Language(SectionView):
> self._selected_lang_count -= 1
>
> label, add_remove_box, combobox, store_ = self._get_last_row()
> -
> +
> label.destroy()
> add_remove_box.destroy()
> combobox.destroy()
> @@ -218,7 +218,7 @@ class Language(SectionView):
> last_lang = selected_langs[-1]
>
> self._determine_add_remove_visibility(last_lang = last_lang)
> -
> +
> self._changed = (selected_langs != self._selected_locales)
>
> if self._changed == False:
> @@ -245,7 +245,7 @@ class Language(SectionView):
> model = combobox.get_model()
> lang_code = model.get(it, 0)[0]
> new_codes.append(lang_code)
> -
> +
> return new_codes
>
> def _determine_add_remove_visibility(self, last_lang = None):
> @@ -256,11 +256,11 @@ class Language(SectionView):
> if last_lang is None:
> selected_langs = self._get_selected_langs()
> last_lang = selected_langs[-1]
> -
> +
> add_remove_box = self._add_remove_boxes[-1]
> buttons = add_remove_box.get_children()
> add_button, remove_button = buttons
> -
> +
> if last_lang.startswith('en_US'):
> add_button.props.visible = False
> else:
> diff --git a/extensions/cpsection/modemconfiguration/view.py b/extensions/cpsection/modemconfiguration/view.py
> index b236f3f..af8f332 100644
> --- a/extensions/cpsection/modemconfiguration/view.py
> +++ b/extensions/cpsection/modemconfiguration/view.py
> @@ -53,7 +53,7 @@ class EntryWithLabel(gtk.HBox):
> def __entry_changed_cb(self, widget, data=None):
> if self._timeout_sid:
> gobject.source_remove(self._timeout_sid)
> - self._timeout_sid = gobject.timeout_add(APPLY_TIMEOUT,
> + self._timeout_sid = gobject.timeout_add(APPLY_TIMEOUT,
> self.__timeout_cb)
>
> def __timeout_cb(self):
> @@ -63,7 +63,7 @@ class EntryWithLabel(gtk.HBox):
> return False
>
> try:
> - self.set_value(self._entry.get_text())
> + self.set_value(self._entry.get_text())
> except ValueError:
> self._is_valid = False
> else:
> @@ -74,13 +74,13 @@ class EntryWithLabel(gtk.HBox):
> return False
>
> def set_text_from_model(self):
> - self._entry.set_text(self.get_value())
> + self._entry.set_text(self.get_value())
>
> def get_value(self):
> raise NotImplementedError
>
> def set_value(self):
> - raise NotImplementedError
> + raise NotImplementedError
>
> def _get_is_valid(self):
> return self._is_valid
> @@ -209,12 +209,12 @@ class ModemConfiguration(SectionView):
> self._group.add_widget(self._pin_entry.label)
> self.pack_start(self._pin_entry, expand=False)
> self._pin_entry.show()
> -
> +
> self._puk_entry = PukEntry(model)
> self._puk_entry.connect('notify::is-valid',
> self.__notify_is_valid_cb)
> self._group.add_widget(self._puk_entry.label)
> - self.pack_start(self._puk_entry, expand=False)
> + self.pack_start(self._puk_entry, expand=False)
> self._puk_entry.show()
>
> self.setup()
> diff --git a/extensions/cpsection/network/model.py b/extensions/cpsection/network/model.py
> index 2713f23..aad0607 100644
> --- a/extensions/cpsection/network/model.py
> +++ b/extensions/cpsection/network/model.py
> @@ -63,11 +63,11 @@ def get_radio():
>
> def print_radio():
> print ('off', 'on')[get_radio()]
> -
> +
> def set_radio(state):
> """Turn Radio 'on' or 'off'
> state : 'on/off'
> - """
> + """
> if state == 'on' or state == 1:
> try:
> bus = dbus.SystemBus()
> @@ -105,12 +105,12 @@ 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
> + """ If set to true, Sugar will make you searchable for
> the other users of the Jabber server.
> value: 0/1
> """
> diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
> index 588daeb..a331bbd 100644
> --- a/extensions/cpsection/network/view.py
> +++ b/extensions/cpsection/network/view.py
> @@ -33,8 +33,8 @@ class Network(SectionView):
> def __init__(self, model, alerts):
> SectionView.__init__(self)
>
> - self._model = model
> - self.restart_alerts = alerts
> + self._model = model
> + self.restart_alerts = alerts
> self._jabber_sid = 0
> self._jabber_valid = True
> self._radio_valid = True
> @@ -64,7 +64,7 @@ class Network(SectionView):
> box_wireless.set_border_width(style.DEFAULT_SPACING * 2)
> box_wireless.set_spacing(style.DEFAULT_SPACING)
>
> - radio_info = gtk.Label(_("Turn off the wireless radio to save "
> + radio_info = gtk.Label(_("Turn off the wireless radio to save "
> "battery life"))
> radio_info.set_alignment(0, 0)
> radio_info.set_line_wrap(True)
> @@ -93,7 +93,7 @@ class Network(SectionView):
> self._radio_alert.props.msg = self.restart_msg
> self._radio_alert.show()
>
> - history_info = gtk.Label(_("Discard network history if you "
> + history_info = gtk.Label(_("Discard network history if you "
> "have trouble connecting to the network"))
> history_info.set_alignment(0, 0)
> history_info.set_line_wrap(True)
> @@ -135,24 +135,24 @@ class Network(SectionView):
> box_server = gtk.HBox(spacing=style.DEFAULT_SPACING)
> label_server = gtk.Label(_('Server:'))
> label_server.set_alignment(1, 0.5)
> - label_server.modify_fg(gtk.STATE_NORMAL,
> + label_server.modify_fg(gtk.STATE_NORMAL,
> style.COLOR_SELECTION_GREY.get_gdk_color())
> box_server.pack_start(label_server, expand=False)
> group.add_widget(label_server)
> - label_server.show()
> + label_server.show()
> self._entry = gtk.Entry()
> self._entry.set_alignment(0)
> - self._entry.modify_bg(gtk.STATE_INSENSITIVE,
> + self._entry.modify_bg(gtk.STATE_INSENSITIVE,
> style.COLOR_WHITE.get_gdk_color())
> - self._entry.modify_base(gtk.STATE_INSENSITIVE,
> - style.COLOR_WHITE.get_gdk_color())
> + self._entry.modify_base(gtk.STATE_INSENSITIVE,
> + style.COLOR_WHITE.get_gdk_color())
> self._entry.set_size_request(int(gtk.gdk.screen_width() / 3), -1)
> box_server.pack_start(self._entry, expand=False)
> - self._entry.show()
> + self._entry.show()
> box_mesh.pack_start(box_server, expand=False)
> box_server.show()
> -
> - self._jabber_alert = InlineAlert()
> +
> + self._jabber_alert = InlineAlert()
> label_jabber_error = gtk.Label()
> group.add_widget(label_jabber_error)
> self._jabber_alert_box.pack_start(label_jabber_error, expand=False)
> @@ -176,13 +176,13 @@ class Network(SectionView):
> self.setup()
>
> def setup(self):
> - self._entry.set_text(self._model.get_jabber())
> - try:
> - radio_state = self._model.get_radio()
> + self._entry.set_text(self._model.get_jabber())
> + try:
> + radio_state = self._model.get_radio()
> except self._model.ReadError, detail:
> - self._radio_alert.props.msg = detail
> + self._radio_alert.props.msg = detail
> self._radio_alert.show()
> - else:
> + else:
> self._button.set_active(radio_state)
>
> self._jabber_valid = True
> @@ -195,13 +195,13 @@ class Network(SectionView):
> self._network_configuration_reset_handler = \
> self._clear_history_button.connect( \
> 'clicked', self.__network_configuration_reset_cb)
> -
> +
> def undo(self):
> self._button.disconnect(self._radio_change_handler)
> self._entry.disconnect(self._jabber_change_handler)
> self._model.undo()
> self._jabber_alert.hide()
> - self._radio_alert.hide()
> + self._radio_alert.hide()
>
> def _validate(self):
> if self._jabber_valid and self._radio_valid:
> @@ -209,7 +209,7 @@ class Network(SectionView):
> else:
> self.props.is_valid = False
>
> - def __radio_toggled_cb(self, widget, data=None):
> + def __radio_toggled_cb(self, widget, data=None):
> radio_state = widget.get_active()
> try:
> self._model.set_radio(radio_state)
> @@ -217,18 +217,18 @@ class Network(SectionView):
> self._radio_alert.props.msg = detail
> self._radio_valid = False
> else:
> - self._radio_valid = True
> + self._radio_valid = True
>
> self._validate()
> return False
>
> - def __jabber_changed_cb(self, widget, data=None):
> + def __jabber_changed_cb(self, widget, data=None):
> if self._jabber_sid:
> gobject.source_remove(self._jabber_sid)
> - self._jabber_sid = gobject.timeout_add(_APPLY_TIMEOUT,
> + self._jabber_sid = gobject.timeout_add(_APPLY_TIMEOUT,
> self.__jabber_timeout_cb, widget)
> -
> - def __jabber_timeout_cb(self, widget):
> +
> + def __jabber_timeout_cb(self, widget):
> self._jabber_sid = 0
> if widget.get_text() == self._model.get_jabber:
> return
> @@ -240,7 +240,7 @@ class Network(SectionView):
> self._jabber_alert.show()
> self.restart_alerts.append('jabber')
> else:
> - self._jabber_valid = True
> + self._jabber_valid = True
> self._jabber_alert.hide()
>
> self._validate()
> diff --git a/extensions/cpsection/power/model.py b/extensions/cpsection/power/model.py
> index 48d05de..6c03ca8 100644
> --- a/extensions/cpsection/power/model.py
> +++ b/extensions/cpsection/power/model.py
> @@ -74,7 +74,7 @@ def set_automatic_pm(enabled):
> bus = dbus.SystemBus()
> proxy = bus.get_object(OHM_SERVICE_NAME, OHM_SERVICE_PATH)
> keystore = dbus.Interface(proxy, OHM_SERVICE_IFACE)
> -
> +
> if enabled == 'on' or enabled == 1:
> keystore.SetKey("suspend.automatic_pm", 1)
> enabled = True
> @@ -97,11 +97,11 @@ def print_extreme_pm():
>
> def set_extreme_pm(enabled):
> """Extreme power management on/off."""
> -
> +
> bus = dbus.SystemBus()
> proxy = bus.get_object(OHM_SERVICE_NAME, OHM_SERVICE_PATH)
> keystore = dbus.Interface(proxy, OHM_SERVICE_IFACE)
> -
> +
> if enabled == 'on' or enabled == 1:
> keystore.SetKey("suspend.extreme_pm", 1)
> enabled = True
> diff --git a/extensions/cpsection/updater/backends/aslo.py b/extensions/cpsection/updater/backends/aslo.py
> index 5f257f9..cf2994f 100644
> --- a/extensions/cpsection/updater/backends/aslo.py
> +++ b/extensions/cpsection/updater/backends/aslo.py
> @@ -150,7 +150,7 @@ def fetch_update_info(bundle, completion_cb):
>
> completion_cb receives bundle, version, link, size and possibly an error
> message:
> -
> +
> def completion_cb(bundle, version, link, size, error_message):
> '''
> global _fetcher
> diff --git a/extensions/cpsection/updater/model.py b/extensions/cpsection/updater/model.py
> index 9845371..4cb90ed 100755
> --- a/extensions/cpsection/updater/model.py
> +++ b/extensions/cpsection/updater/model.py
> @@ -262,7 +262,7 @@ class _Downloader(gobject.GObject):
> except:
> self.emit('error', traceback.format_exc())
> return
> -
> +
> temp_file_path = self._get_temp_file_path(self.bundle_update.link)
> self._output_file = gio.File(temp_file_path)
> self._output_stream = self._output_file.create()
> diff --git a/extensions/cpsection/updater/view.py b/extensions/cpsection/updater/view.py
> index 2164c0b..31a5737 100644
> --- a/extensions/cpsection/updater/view.py
> +++ b/extensions/cpsection/updater/view.py
> @@ -145,7 +145,7 @@ class ActivityUpdater(SectionView):
> top_message = gobject.markup_escape_text(top_message)
>
> self._top_label.set_markup('<big>%s</big>' % top_message)
> -
> +
> if not available_updates:
> self._clear_center()
> else:
> @@ -176,7 +176,7 @@ class ActivityUpdater(SectionView):
> self._top_label.set_markup('<big>%s</big>' % top_message)
> self._clear_center()
>
> - def undo(self):
> + def undo(self):
> self._model.cancel()
>
> class ProgressPane(gtk.VBox):
> diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py
> index edfcce4..8b1bac8 100644
> --- a/extensions/deviceicon/battery.py
> +++ b/extensions/deviceicon/battery.py
> @@ -47,7 +47,7 @@ class DeviceView(TrayIcon):
> FRAME_POSITION_RELATIVE = 102
>
> def __init__(self, udi):
> - client = gconf.client_get_default()
> + client = gconf.client_get_default()
> self._color = XoColor(client.get_string('/desktop/sugar/user/color'))
>
> TrayIcon.__init__(self, icon_name=_ICON_NAME, xo_color=self._color)
> @@ -105,7 +105,7 @@ class BatteryPalette(Palette):
>
> def __init__(self, primary_text):
> Palette.__init__(self, primary_text)
> -
> +
> self._level = 0
> self._progress_bar = gtk.ProgressBar()
> self._progress_bar.set_size_request(
> @@ -169,7 +169,7 @@ class DeviceModel(gobject.GObject):
>
> def __init__(self, udi):
> gobject.GObject.__init__(self)
> -
> +
> bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
> proxy = bus.get_object('org.freedesktop.Hal', udi,
> follow_name_owner_changes=True)
> @@ -215,7 +215,7 @@ class DeviceModel(gobject.GObject):
>
> def do_get_property(self, pspec):
> if pspec.name == 'level':
> - return self._level
> + return self._level
> if pspec.name == 'charging':
> return self._charging
> if pspec.name == 'discharging':
> diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
> index 0789f9c..447cad5 100644
> --- a/extensions/deviceicon/network.py
> +++ b/extensions/deviceicon/network.py
> @@ -302,7 +302,7 @@ class GsmPalette(Palette):
> icon = Icon(icon_name='media-eject', \
> icon_size=gtk.ICON_SIZE_MENU)
> self._toggle_state_item.set_image(icon)
> -
> +
> elif self._current_state == _GSM_STATE_FAILED:
> message_error = self._get_error_by_nm_reason(reason)
> self.add_alert(message_error[0], message_error[1])
> @@ -406,9 +406,9 @@ class WirelessDeviceView(ToolButton):
> self.set_palette(self._palette)
> self._palette.set_group_id('frame')
>
> - self._device_props = dbus.Interface(self._device,
> + self._device_props = dbus.Interface(self._device,
> 'org.freedesktop.DBus.Properties')
> - self._device_props.GetAll(_NM_DEVICE_IFACE, byte_arrays=True,
> + self._device_props.GetAll(_NM_DEVICE_IFACE, byte_arrays=True,
> reply_handler=self.__get_device_props_reply_cb,
> error_handler=self.__get_device_props_error_cb)
>
> @@ -497,7 +497,7 @@ class WirelessDeviceView(ToolButton):
> digest = hash(sha_hash.digest())
> index = digest % len(xocolor.colors)
>
> - self._color = xocolor.XoColor('%s,%s' %
> + self._color = xocolor.XoColor('%s,%s' %
> (xocolor.colors[index][0],
> xocolor.colors[index][1]))
> self._update()
> diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py
> index 3a54464..cf06e01 100644
> --- a/extensions/deviceicon/speaker.py
> +++ b/extensions/deviceicon/speaker.py
> @@ -37,7 +37,7 @@ class DeviceView(TrayIcon):
> FRAME_POSITION_RELATIVE = 103
>
> def __init__(self):
> - client = gconf.client_get_default()
> + client = gconf.client_get_default()
> self._color = XoColor(client.get_string('/desktop/sugar/user/color'))
>
> TrayIcon.__init__(self, icon_name=_ICON_NAME, xo_color=self._color)
> diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
> index ac847e2..ada55e0 100644
> --- a/src/jarabe/desktop/favoritesview.py
> +++ b/src/jarabe/desktop/favoritesview.py
> @@ -386,7 +386,7 @@ class ActivityIcon(CanvasIcon):
> break
>
> def _get_last_activity_async(self, bundle_id, properties):
> - query = {'activity': bundle_id}
> + query = {'activity': bundle_id}
> datastore.find(query, sorting=['+timestamp'],
> limit=self._MAX_RESUME_ENTRIES,
> properties=properties,
> diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py
> index cbf105d..c6bd0fb 100644
> --- a/src/jarabe/journal/journaltoolbox.py
> +++ b/src/jarabe/journal/journaltoolbox.py
> @@ -451,7 +451,7 @@ class EntryToolbar(gtk.Toolbar):
> model.copy(self._metadata, mount_point)
> except IOError, e:
> logging.exception('Error while copying the entry. %s', e.strerror)
> - self.emit('volume-error',
> + self.emit('volume-error',
> _('Error while copying the entry. %s') % e.strerror,
> _('Error'))
>
> diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py
> index 79e4360..d76e408 100644
> --- a/src/jarabe/model/network.py
> +++ b/src/jarabe/model/network.py
> @@ -471,14 +471,14 @@ class SecretsGsm(object):
> self.password = None
> self.pin = None
> self.puk = None
> -
> +
> def get_dict(self):
> secrets = {}
> if self.password is not None:
> secrets['password'] = self.password
> if self.pin is not None:
> secrets['pin'] = self.pin
> - if self.puk is not None:
> + if self.puk is not None:
> secrets['puk'] = self.puk
> return {'gsm': secrets}
>
> @@ -870,10 +870,10 @@ def load_gsm_connection():
>
> if username and number and apn:
> settings = SettingsGsm()
> - settings.gsm.username = username
> + settings.gsm.username = username
> settings.gsm.number = number
> settings.gsm.apn = apn
> -
> +
> secrets = SecretsGsm()
> secrets.pin = pin
> secrets.puk = puk
> diff --git a/src/jarabe/model/olpcmesh.py b/src/jarabe/model/olpcmesh.py
> index 60f6be4..7873692 100644
> --- a/src/jarabe/model/olpcmesh.py
> +++ b/src/jarabe/model/olpcmesh.py
> @@ -119,7 +119,7 @@ class OlpcMeshManager(object):
> def __eth_device_state_changed_cb(self, new_state, old_state, reason):
> """If a connection is activated on the eth device, stop trying our
> automatic connections.
> -
> +
> """
> self._eth_device_state = new_state
> self._maybe_schedule_idle_check()
> diff --git a/src/jarabe/util/emulator.py b/src/jarabe/util/emulator.py
> index 6a43044..9ab1979 100644
> --- a/src/jarabe/util/emulator.py
> +++ b/src/jarabe/util/emulator.py
> @@ -36,7 +36,7 @@ default_dimensions = (800, 600)
> def _run_xephyr(display, dpi, dimensions, fullscreen):
> cmd = [ 'Xephyr' ]
> cmd.append(':%d' % display)
> - cmd.append('-ac')
> + cmd.append('-ac')
> cmd += ['-title', _('Sugar in a window')]
>
> screen_size = (gtk.gdk.screen_width(), gtk.gdk.screen_height())
More information about the Sugar-devel
mailing list