diff options
Diffstat (limited to 'pyload')
| -rw-r--r-- | pyload/Core.py | 4 | ||||
| -rw-r--r-- | pyload/lib/colorlog/__init__.py (renamed from pyload/utils/colorlog/__init__.py) | 0 | ||||
| -rw-r--r-- | pyload/lib/colorlog/colorlog.py (renamed from pyload/utils/colorlog/colorlog.py) | 0 | ||||
| -rw-r--r-- | pyload/lib/colorlog/escape_codes.py (renamed from pyload/utils/colorlog/escape_codes.py) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/pyload/Core.py b/pyload/Core.py index 52e2a4045..8897764a7 100644 --- a/pyload/Core.py +++ b/pyload/Core.py @@ -59,8 +59,6 @@ from utils.fs import free_space, exists, makedirs, join, chmod from codecs import getwriter -from utils.colorlog import ColoredFormatter - # test runner overwrites sys.stdout if hasattr(sys.stdout, "encoding"): enc = get_console_encoding(sys.stdout.encoding) else: enc = "utf8" @@ -527,6 +525,8 @@ class Core(object): if self.config['log']['console_color'] == "No": console_frm = fh_frm else: + from lib.colorlog import ColoredFormatter + if self.config['log']['console_color'] == "Light": cfmt = "%(asctime)s %(log_color)s%(bold)s%(white)s %(levelname)+8s %(reset)s %(message)s" clr = { diff --git a/pyload/utils/colorlog/__init__.py b/pyload/lib/colorlog/__init__.py index abf5532fb..abf5532fb 100644 --- a/pyload/utils/colorlog/__init__.py +++ b/pyload/lib/colorlog/__init__.py diff --git a/pyload/utils/colorlog/colorlog.py b/pyload/lib/colorlog/colorlog.py index 5491676b8..5491676b8 100644 --- a/pyload/utils/colorlog/colorlog.py +++ b/pyload/lib/colorlog/colorlog.py diff --git a/pyload/utils/colorlog/escape_codes.py b/pyload/lib/colorlog/escape_codes.py index 8d057e9e4..8d057e9e4 100644 --- a/pyload/utils/colorlog/escape_codes.py +++ b/pyload/lib/colorlog/escape_codes.py |