diff --git a/contrib/plugin.video.videoobmc/resources/lib/base/weboobmc2.py b/contrib/plugin.video.videoobmc/resources/lib/base/weboobmc2.py index 4ec65fb1cb69b20701bb3dbcc7acd766630bdc3d..16cc498366ae2c8c9b674045f82b37c2eda2bdf4 100644 --- a/contrib/plugin.video.videoobmc/resources/lib/base/weboobmc2.py +++ b/contrib/plugin.video.videoobmc/resources/lib/base/weboobmc2.py @@ -1,15 +1,15 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from weboob.tools.application.base import BaseApplication +from weboob.tools.application.base import Application import os import re import subprocess -class Weboobmc(BaseApplication): +class Weboobmc(Application): def __init__(self, count=10): - BaseApplication.__init__(self) + Application.__init__(self) self.count = int(count) self._is_default_count = False diff --git a/contrib/videoob_web/videoob_web/videoob_web.py b/contrib/videoob_web/videoob_web/videoob_web.py index 6510a4b15dfa8774015daa30da3ac61fd9d518c6..f0f56fec2f64d6eeb2025db5186d0cdbb72ae918 100644 --- a/contrib/videoob_web/videoob_web/videoob_web.py +++ b/contrib/videoob_web/videoob_web/videoob_web.py @@ -29,7 +29,7 @@ from wsgiref.simple_server import make_server from weboob.capabilities.video import CapVideo -from weboob.tools.application.base import BaseApplication +from weboob.tools.application.base import Application __all__ = ['VideoobWeb'] @@ -39,7 +39,7 @@ output_encoding='utf-8', encoding_errors='replace') -class VideoobWeb(BaseApplication): +class VideoobWeb(Application): APPNAME = 'videoob-webserver' VERSION = '0.j' COPYRIGHT = 'Copyright(C) 2010-2011 Christophe Benz' diff --git a/tools/make_man.py b/tools/make_man.py index 7c1ccc2065ff5de63f59acb721ec81f9ef4fb71a..2c37f7f3e86f0479caaef8e3a2814d065780db35 100755 --- a/tools/make_man.py +++ b/tools/make_man.py @@ -27,7 +27,7 @@ import re import time -from weboob.tools.application.base import BaseApplication +from weboob.tools.application.base import Application BASE_PATH = os.path.join(os.path.dirname(__file__), os.pardir) DEST_DIR = 'man' @@ -126,7 +126,7 @@ def main(): print "Loaded %s" % fname # Find the applications we can handle for klass in script.__dict__.itervalues(): - if inspect.isclass(klass) and issubclass(klass, BaseApplication): + if inspect.isclass(klass) and issubclass(klass, Application): analyze_application(klass, fname) finally: # Cleanup compiled files if needed diff --git a/weboob/applications/boobathon/boobathon.py b/weboob/applications/boobathon/boobathon.py index b5f3209f1435168e79b12b9fabfd0cccf1fce1c7..0df5e1267d08c64bdcbdfa349e2ae61f73bf90d2 100644 --- a/weboob/applications/boobathon/boobathon.py +++ b/weboob/applications/boobathon/boobathon.py @@ -769,7 +769,7 @@ def do_cancel(self, line): def load_default_backends(self): """ - Overload a BaseApplication method. + Overload a Application method. """ for instance_name, backend_name, params in self.weboob.backends_config.iter_backends(): if backend_name != 'redmine': diff --git a/weboob/applications/masstransit/masstransit.py b/weboob/applications/masstransit/masstransit.py index 3812436d3db02735abb9e00dc747b2e00037e00d..fa4f5bf5898a142edd4e7adca5313ca3bcb881ff 100644 --- a/weboob/applications/masstransit/masstransit.py +++ b/weboob/applications/masstransit/masstransit.py @@ -19,7 +19,7 @@ from weboob.capabilities.travel import CapTravel -from weboob.tools.application.base import BaseApplication +from weboob.tools.application.base import Application from logging import warning import gtk @@ -275,7 +275,7 @@ def refresh(self): hildon.hildon_gtk_window_set_progress_indicator(self.main_window, 0) -class Masstransit(BaseApplication): +class Masstransit(Application): "Application Class" APPNAME = 'masstransit' VERSION = '1.0' diff --git a/weboob/applications/weboobdebug/weboobdebug.py b/weboob/applications/weboobdebug/weboobdebug.py index d7b3c320099eb6ade8351c51ba520cb55391de26..53b3a45690c794d46e21628142ca4703f32e13e5 100644 --- a/weboob/applications/weboobdebug/weboobdebug.py +++ b/weboob/applications/weboobdebug/weboobdebug.py @@ -20,10 +20,10 @@ from optparse import OptionGroup -from weboob.tools.application.base import BaseApplication +from weboob.tools.application.base import Application -class WeboobDebug(BaseApplication): +class WeboobDebug(Application): APPNAME = 'weboobdebug' VERSION = '1.0' COPYRIGHT = 'Copyright(C) 2010-2011 Christophe Benz' diff --git a/weboob/tools/application/base.py b/weboob/tools/application/base.py index 233a68998610051b341abccafdda8414778b18e8..11344749081d8c441dbf71f35c6f7b72450096e3 100644 --- a/weboob/tools/application/base.py +++ b/weboob/tools/application/base.py @@ -37,7 +37,7 @@ from weboob.tools.misc import to_unicode from .results import ResultsConditionError -__all__ = ['BaseApplication'] +__all__ = ['Application'] class MoreResultsAvailable(Exception): @@ -72,7 +72,7 @@ def save(self): return self.storage.save('applications', self.name) -class BaseApplication(object): +class Application(object): """ Base application. @@ -136,7 +136,7 @@ def handle_application_options(self): """ pass - # ------ BaseApplication methods ------------------------------- + # ------ Application methods ------------------------------- def __init__(self, option_parser=None): self.encoding = self.guess_encoding() diff --git a/weboob/tools/application/console.py b/weboob/tools/application/console.py index 4dd11ba919df735444db640ee0381bda0eb3048c..8224b95df276dc5768386e81103710297aee1cf7 100644 --- a/weboob/tools/application/console.py +++ b/weboob/tools/application/console.py @@ -37,7 +37,7 @@ from weboob.tools.misc import to_unicode from weboob.tools.ordereddict import OrderedDict -from .base import BaseApplication, MoreResultsAvailable +from .base import Application, MoreResultsAvailable __all__ = ['ConsoleApplication', 'BackendNotGiven'] @@ -55,7 +55,7 @@ class BackendNotFound(Exception): pass -class ConsoleApplication(BaseApplication): +class ConsoleApplication(Application): """ Base application class for CLI applications. """ @@ -74,7 +74,7 @@ class ConsoleApplication(BaseApplication): NC = '' # no color def __init__(self, option_parser=None): - BaseApplication.__init__(self, option_parser) + Application.__init__(self, option_parser) self.weboob.callbacks['login'] = self.login_cb self.enabled_backends = set() diff --git a/weboob/tools/application/qt/qt.py b/weboob/tools/application/qt/qt.py index ef8fe0538ec61cac81f9c9efd2baa3c600503bb0..521e48697250cdf3db7f1ae1ff898701c390d60b 100644 --- a/weboob/tools/application/qt/qt.py +++ b/weboob/tools/application/qt/qt.py @@ -39,7 +39,7 @@ from weboob.tools.misc import to_unicode from weboob.capabilities import UserError -from ..base import BaseApplication, MoreResultsAvailable +from ..base import Application, MoreResultsAvailable __all__ = ['QtApplication', 'QtMainWindow', 'QtDo', 'HTMLDelegate'] @@ -140,12 +140,12 @@ def add_request(self, request): return request.answer -class QtApplication(QApplication, BaseApplication): +class QtApplication(QApplication, Application): def __init__(self): QApplication.__init__(self, sys.argv) self.setApplicationName(self.APPNAME) - BaseApplication.__init__(self) + Application.__init__(self) self.cbmanager = QCallbacksManager(self.weboob, self) def create_weboob(self): @@ -154,7 +154,7 @@ def create_weboob(self): def load_backends(self, *args, **kwargs): while True: try: - return BaseApplication.load_backends(self, *args, **kwargs) + return Application.load_backends(self, *args, **kwargs) except VersionsMismatchError as e: msg = 'Versions of modules mismatch with version of weboob.' except ConfigError as e: