Bitmessage/PyBitmessage-2024-12-02
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Rewritten the weird imports in debug

Browse Source
This commit is contained in:
Dmitri Bogomolov 2021-07-07 21:49:56 +03:00
parent 822f58ea5d
commit b75585f26c
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/debug.py
View File

@ -35,26 +35,15 @@ Logging is thread-safe so you don't have to worry about locks,
just import and log. just import and log.
""" """
# import ConfigParser
import sys
if sys.version_info[0] == 3:
# python 3
import configparser as ConfigParser
else:
# python 2
import ConfigParser
import logging import logging
import logging.config import logging.config
import os import os
import sys import sys
if sys.version_info[0] == 3: from six.moves import configparser
from . import helper_startup
from . import state import helper_startup
else: import state
import helper_startup
import state
helper_startup.loadConfig() helper_startup.loadConfig()
@ -86,7 +75,7 @@ def configureLogging():
False, False,
'Loaded logger configuration from %s' % logging_config 'Loaded logger configuration from %s' % logging_config
) )
except (OSError, ConfigParser.NoSectionError, KeyError): except (OSError, configparser.NoSectionError, KeyError):
if os.path.isfile(logging_config): if os.path.isfile(logging_config):
fail_msg = \ fail_msg = \
'Failed to load logger configuration from %s, using default' \ 'Failed to load logger configuration from %s, using default' \