fix logging import plus a minor tidy up of utility func

jasonrbriggs · Sep 25, 2022 · 4348785 · 4348785
1 parent 0c9d45c
commit 4348785
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/stomp/adapter/ws.py b/stomp/adapter/ws.py
@@ -1,5 +1,4 @@
 import errno
-import logging
 import math
 import random
 import sys
@@ -34,6 +33,7 @@ class SSLError(object):
 from stomp.connect import BaseConnection, StompConnection12
 from stomp.protocol import Protocol12
 from stomp.exception import *
+from stomp import logging
 
 
 class WSTransport(BaseTransport):

diff --git a/stomp/utils.py b/stomp/utils.py
@@ -141,8 +141,7 @@ def is_localhost(host_and_port):
     (host, _) = host_and_port
     if host in LOCALHOST_NAMES:
         return 1
-    else:
-        return 2
+    return 2
 
 
 _HEADER_ESCAPES = {

diff --git a/tests/test_ipv6.py b/tests/test_ipv6.py
@@ -1,8 +1,8 @@
 import stomp
 from stomp.listener import TestListener
+from stomp import logging
 from .testutils import *
 
-import logging
 
 
 @pytest.fixture()

diff --git a/tests/test_misc.py b/tests/test_misc.py
@@ -1,12 +1,12 @@
 import importlib
-import logging
 import platform
 import traceback
 import xml.dom.minidom
 
 import stomp
 from stomp.exception import *
 from stomp.listener import *
+from stomp import logging
 from .testutils import *
 
 

diff --git a/tests/test_override_threading.py b/tests/test_override_threading.py
@@ -1,9 +1,9 @@
-import logging
 from concurrent.futures import ThreadPoolExecutor
 
 import stomp
 from stomp.listener import TestListener
 from .testutils import *
+from stomp import logging
 
 
 executor = ThreadPoolExecutor()