Rename BaseApplication to Application

weboob/tools/application/base.py

@@ -37,7 +37,7 @@ from weboob.tools.log import createColoredFormatter, getLogger, settings as log_
 from weboob.tools.misc import to_unicode
 from .results import ResultsConditionError
 
-__all__ = ['BaseApplication']
+__all__ = ['Application']
 
 
 class MoreResultsAvailable(Exception):
@@ -72,7 +72,7 @@ class ApplicationStorage(object):
             return self.storage.save('applications', self.name)
 
 
-class BaseApplication(object):
+class Application(object):
     """
     Base application.
 
@@ -136,7 +136,7 @@ class BaseApplication(object):
         """
         pass
 
-    # ------ BaseApplication methods -------------------------------
+    # ------ Application methods -------------------------------
 
     def __init__(self, option_parser=None):
         self.encoding = self.guess_encoding()

weboob/tools/application/console.py

@@ -37,7 +37,7 @@ from weboob.tools.value import Value, ValueBool, ValueFloat, ValueInt, ValueBack
 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()
 

weboob/tools/application/qt/qt.py

@@ -39,7 +39,7 @@ from weboob.tools.value import ValueInt, ValueBool, ValueBackendPassword
 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 @@ class QCallbacksManager(QObject):
         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 @@ class QtApplication(QApplication, BaseApplication):
     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: