Don't import debug in bitmessageqt
This commit is contained in:
parent
b6c979091f
commit
0dceb7e15c
|
@ -3,6 +3,7 @@ PyQt based UI for bitmessage, the main module
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import hashlib
|
import hashlib
|
||||||
|
import logging
|
||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
import string
|
import string
|
||||||
|
@ -19,7 +20,6 @@ from PyQt4.QtNetwork import QLocalSocket, QLocalServer
|
||||||
|
|
||||||
import shared
|
import shared
|
||||||
import state
|
import state
|
||||||
from debug import logger
|
|
||||||
from tr import _translate
|
from tr import _translate
|
||||||
from addresses import decodeAddress, addBMIfNotPresent
|
from addresses import decodeAddress, addBMIfNotPresent
|
||||||
from bmconfigparser import BMConfigParser
|
from bmconfigparser import BMConfigParser
|
||||||
|
@ -58,6 +58,8 @@ try:
|
||||||
except ImportError:
|
except ImportError:
|
||||||
get_plugins = False
|
get_plugins = False
|
||||||
|
|
||||||
|
logger = logging.getLogger('default')
|
||||||
|
|
||||||
|
|
||||||
# TODO: rewrite
|
# TODO: rewrite
|
||||||
def powQueueSize():
|
def powQueueSize():
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import logging
|
||||||
import locale
|
import locale
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
@ -8,7 +9,6 @@ import paths
|
||||||
import settingsmixin
|
import settingsmixin
|
||||||
import widgets
|
import widgets
|
||||||
from bmconfigparser import BMConfigParser
|
from bmconfigparser import BMConfigParser
|
||||||
from debug import logger
|
|
||||||
from foldertree import AddressBookCompleter
|
from foldertree import AddressBookCompleter
|
||||||
from tr import _translate
|
from tr import _translate
|
||||||
|
|
||||||
|
@ -20,6 +20,8 @@ class Window(settingsmixin.SMainWindow):
|
||||||
super(Window, self).__init__(parent)
|
super(Window, self).__init__(parent)
|
||||||
widgets.load('main.ui', self)
|
widgets.load('main.ui', self)
|
||||||
|
|
||||||
|
self.logger = logging.getLogger('default')
|
||||||
|
|
||||||
self.qmytranslator = self.qsystranslator = None
|
self.qmytranslator = self.qsystranslator = None
|
||||||
self.blackwhitelist.rerenderBlackWhiteList()
|
self.blackwhitelist.rerenderBlackWhiteList()
|
||||||
|
|
||||||
|
@ -143,7 +145,7 @@ class Window(settingsmixin.SMainWindow):
|
||||||
l10n.encoding = locale.nl_langinfo(locale.CODESET)
|
l10n.encoding = locale.nl_langinfo(locale.CODESET)
|
||||||
else:
|
else:
|
||||||
l10n.encoding = locale.getlocale()[1]
|
l10n.encoding = locale.getlocale()[1]
|
||||||
logger.info("Successfully set locale to %s", lang)
|
self.logger.info("Successfully set locale to %s", lang)
|
||||||
break
|
break
|
||||||
except:
|
except:
|
||||||
logger.error("Failed to set locale to %s", lang, exc_info=True)
|
self.logger.error("Failed to set locale to %s", lang, exc_info=True)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user