[feat] replace old log handler with new one

Replace logging.getLogger with custom get_logger.
Remove some unneeded dependencies and reorder other.

3 files changed, 6 insertions, 7 deletions

diff --git a/src/leap/bitmask/crypto/certs.py b/src/leap/bitmask/crypto/certs.py
index c3ca4efb..4b669376 100644
--- a/src/leap/bitmask/crypto/certs.py
+++ b/src/leap/bitmask/crypto/certs.py
@@ -17,17 +17,17 @@
 """
 Utilities for dealing with client certs
 """
-import logging
 import os
 
 from leap.bitmask.crypto.srpauth import SRPAuth
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.util.constants import REQUEST_TIMEOUT
 from leap.common.files import check_and_fix_urw_only
 from leap.common.files import mkdir_p
 
 from leap.common import certs as leap_certs
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 def download_client_cert(provider_config, path, session):
diff --git a/src/leap/bitmask/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py
index 1e96030e..452bfa66 100644
--- a/src/leap/bitmask/crypto/srpauth.py
+++ b/src/leap/bitmask/crypto/srpauth.py
@@ -14,9 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 import binascii
-import logging
 import threading
 import sys
 
@@ -33,14 +31,14 @@ from twisted.internet import threads
 from twisted.internet.defer import CancelledError
 
 from leap.bitmask.backend.settings import Settings
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.util import request_helpers as reqhelper
 from leap.bitmask.util.compat import requests_has_max_retries
 from leap.bitmask.util.constants import REQUEST_TIMEOUT
 from leap.common.check import leap_assert
 from leap.common.events import emit, catalog
 
-
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class SRPAuthenticationError(Exception):
diff --git a/src/leap/bitmask/crypto/srpregister.py b/src/leap/bitmask/crypto/srpregister.py
index e3007b6c..baa15244 100644
--- a/src/leap/bitmask/crypto/srpregister.py
+++ b/src/leap/bitmask/crypto/srpregister.py
@@ -26,11 +26,12 @@ from PySide import QtCore
 from urlparse import urlparse
 
 from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.util.constants import SIGNUP_TIMEOUT
 from leap.bitmask.util.request_helpers import get_content
 from leap.common.check import leap_assert, leap_assert_type
 
-logger = logging.getLogger(__name__)
+logger = get_logger()
 
 
 class SRPRegisterImpl: