From a6b5a69612f4dd744be20c326152a9d892150f98 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Thu, 3 Jan 2013 17:14:02 +0100 Subject: seperate api into several components --- pyload.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'pyload.py') diff --git a/pyload.py b/pyload.py index 578106940..389e1648c 100755 --- a/pyload.py +++ b/pyload.py @@ -375,12 +375,13 @@ class Core(object): __builtin__.pyreq = self.requestFactory # deferred import, could improve start-up time - from module import Api + from module.Api import Api from module.AddonManager import AddonManager from module.interaction.InteractionManager import InteractionManager from module.threads.ThreadManager import ThreadManager - self.api = Api.Api(self) + Api.initComponents() + self.api = Api(self) self.scheduler = Scheduler(self) @@ -497,7 +498,19 @@ class Core(object): def init_logger(self, level): console = logging.StreamHandler(sys.stdout) - frm = logging.Formatter("%(asctime)s %(levelname)-8s %(message)s", "%d.%m.%Y %H:%M:%S") + + # change current locale to default if it is not set + current_locale = locale.getlocale() + if current_locale == (None, None): + current_locale = locale.setlocale(locale.LC_ALL, '') + + # We use timeformat provided by locale when available + if current_locale != (None, None): + tfrm = locale.nl_langinfo(locale.D_FMT) + " " + locale.nl_langinfo(locale.T_FMT) + else: # normally this case should not be entered + tfrm = "%d.%m.%Y %H:%M:%S" + + frm = logging.Formatter("%(asctime)s %(levelname)-8s %(message)s", tfrm) console.setFormatter(frm) self.log = logging.getLogger("log") # setable in config -- cgit v1.2.3