From 1448c4de0cdebfe68f538da2ea28b81a564e86f5 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Mon, 26 Dec 2011 19:12:11 +0100 Subject: Remove trailing whitespace --- src/ppm/accountdb.py | 4 ++-- src/ppm/modemproxy.py | 6 +++--- src/ppm/providerdb.py | 8 ++++---- src/prepaid-manager-applet.py | 37 ++++++++++++++++++------------------- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/ppm/accountdb.py b/src/ppm/accountdb.py index 744cd0b..70c7bb6 100644 --- a/src/ppm/accountdb.py +++ b/src/ppm/accountdb.py @@ -89,7 +89,7 @@ class AccountDB(object): def _bind_account(self, imsi): """Bind a new account object to a gsettings path""" - + path = self._account_path(imsi) account = Account() account.props.identifier = self.imsi_to_identifier(imsi) @@ -136,4 +136,4 @@ class AccountDB(object): account.props.name = provider.name account.props.code = provider.country - + diff --git a/src/ppm/modemproxy.py b/src/ppm/modemproxy.py index fddea25..7ac8fa7 100644 --- a/src/ppm/modemproxy.py +++ b/src/ppm/modemproxy.py @@ -27,7 +27,7 @@ class ModemError(Exception): def is_forbidden(self): return [False, True][self.msg.find("Operation not allowed") != -1] - + def is_disabled(self): return [False, True][self.msg.find("not enabled") != -1] @@ -47,7 +47,7 @@ class ModemManagerProxy(GObject.GObject): MM_DBUS_INTERFACE_MODEM_GSM_CARD='org.freedesktop.ModemManager.Modem.Gsm.Card' MM_DBUS_INTERFACE_MODEM_GSM_USSD='org.freedesktop.ModemManager.Modem.Gsm.Ussd' MM_DBUS_TIMEOUT = 5000 - + __gsignals__ = { # Emitted when a request to MM starts 'request-started': (GObject.SignalFlags.RUN_FIRST, None, @@ -110,7 +110,7 @@ class ModemManagerProxy(GObject.GObject): if self.error_func: me = ModemError("%s failed: %s" % (self.request, err)) self.error_func(me) - + def get_modems(self): modems = [] mm = Gio.DBusProxy.new_sync(self.bus, diff --git a/src/ppm/providerdb.py b/src/ppm/providerdb.py index 8aafa27..db2bdc9 100644 --- a/src/ppm/providerdb.py +++ b/src/ppm/providerdb.py @@ -48,7 +48,7 @@ class ProviderDB(object): else: self._tree = self._load_countries() return self.__countries - + def _load_countries(self): try: for line in file(self.country_codes, 'r'): @@ -95,7 +95,7 @@ class ProviderDB(object): number = t.text text = t.attrib['text'] provider.add_top_up_cmd({'sms': (number, text)}) - + def get_providers(self, mcc, mnc): """ Get possible providers for the current mcc and mnc from the database @@ -119,7 +119,7 @@ class ProviderDB(object): for r in searcher(self.tree): return self._fill_provider_info(r) return None - + def get_country_codes(self): path = "/serviceproviders/country" searcher = etree.ETXPath(path) @@ -133,7 +133,7 @@ class ProviderDB(object): yield (self.countries[code], code) except KeyError: yield (None, code) - + def get_providers_by_code(self, country_code): path = ("/serviceproviders/country[@code='%s']/provider/name" % country_code) diff --git a/src/prepaid-manager-applet.py b/src/prepaid-manager-applet.py index 50b28ab..25ee728 100755 --- a/src/prepaid-manager-applet.py +++ b/src/prepaid-manager-applet.py @@ -1,7 +1,7 @@ #!/usr/bin/python # vim: set fileencoding=utf-8 : # -# (C) 2010 Guido Guenther +# (C) 2010,2011 Guido Guenther # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or @@ -111,7 +111,7 @@ class PPMController(GObject.GObject): self.provider = provider self.emit('provider-changed', provider) - + def _imsi_to_network_id(self, imsi): """Extract mmc and mnc from imsi""" mcc = imsi[0:3] @@ -186,7 +186,7 @@ class PPMController(GObject.GObject): self.mm = ModemManagerProxy() self._connect_mm_signals() - + modems = self.mm.get_modems() if modems: modem = modems[0] # FIXME: handle multiple modems @@ -225,7 +225,7 @@ class PPMController(GObject.GObject): def on_mm_request_finished(self, obj, mm_proxy): logging.debug("Finished modem request") self.view.close_modem_response() - + def on_balance_info_fetched(self, var, user_data): """Callback for succesful MM fetch balance info call""" balance = var.unpack()[0] @@ -269,14 +269,14 @@ class PPMController(GObject.GObject): def on_balance_info_changed(self, obj, balance): """Act on balance-info-changed signal""" logging.debug("Balance info changed") - + timestamp = time.asctime() if self.account: self.account.update_balance(balance, timestamp) self.view.update_account_balance_information(balance, timestamp) - + GObject.type_register(PPMController) @@ -302,10 +302,10 @@ class PPMObject(object): def _add_elements(self, *args): for name in args: self._add_elem(name) - + # View class PPMDialog(GObject.GObject, PPMObject): - + def _init_about_dialog(self): self.about_dialog = Gtk.AboutDialog( authors = ["Guido Günther "], @@ -409,7 +409,7 @@ class PPMDialog(GObject.GObject, PPMObject): def clear_top_up_information(self): self.label_top_up_reply.set_text("") - + def show_provider_balance_info_missing(self, provider): self.provider_info_missing_dialog.balance_info_missing(provider) @@ -539,9 +539,8 @@ class PPMNoModemFoundInfoBar(PPMInfoBar): class PPMProviderAssistant(PPMObject): - PAGE_INTRO, PAGE_COUNTRIES, PAGE_PROVIDERS, PAGE_CONFIRM = range(0, 4) - + def __init__(self, main_dialog): PPMObject.__init__(self, main_dialog, "ppm-provider-assistant") self.assistant = self.builder.get_object("ppm_provider_assistant") @@ -576,7 +575,7 @@ class PPMProviderAssistant(PPMObject): lcode = self._get_current_country_from_locale() if not self.liststore_countries: self.liststore_countries = self.builder.get_object( - "liststore_countries") + "liststore_countries") for (country, code) in self.controller.get_provider_countries(): if country is None: country = code @@ -595,11 +594,11 @@ class PPMProviderAssistant(PPMObject): def _all_pages_func(self, current_page, user_data): return current_page+1 - + def show(self, providers=None): self.possible_providers = providers self.provider = None - + if not self.possible_providers: # No list of possible providers so allow to select the country first self._fill_liststore_countries() @@ -641,7 +640,7 @@ class PPMProviderAssistant(PPMObject): elif self.assistant.get_current_page() == self.PAGE_CONFIRM: self.label_country.set_text(self.country_code) self.label_provider.set_text(self.provider) - + def on_treeview_countries_changed(self, obj): self.assistant.set_page_complete(self.vbox_countries, True) selection = self.treeview_countries.get_selection() @@ -649,7 +648,7 @@ class PPMProviderAssistant(PPMObject): if not iter: return self.country_code = model.get_value(iter, 1) - + def on_treeview_providers_changed(self, obj): self.assistant.set_page_complete(self.vbox_providers, True) selection = self.treeview_providers.get_selection() @@ -670,7 +669,7 @@ class PPMProviderInfoMissingDialog(object): If information about the provider is missing redirect the user to a webpage that explains howto provide that information """ - + wiki_url = ('GNOME Wiki') @@ -707,7 +706,7 @@ class PPMProviderInfoMissingDialog(object): def top_up_info_missing(self, provider): msg = self.messages['top_up_info_missing'] % provider.name self._run(msg) - + def provider_unknown(self, mcc, mnc): msg = self.messages['provider_unknown'] % (mcc, mnc) self._run(msg) @@ -763,7 +762,7 @@ def main(args): controller = PPMController() main_dialog = PPMDialog(controller) controller.schedule_setup() - + Gtk.main() if __name__ == "__main__": -- cgit v1.2.3