refactor: no import * in tests

tests/test_events.py

@@ -1,5 +1,6 @@
 import time
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 
 
 class TestEvents(SleekTest):

tests/test_jid.py

@@ -1,6 +1,7 @@
 # -*- encoding: utf8 -*-
 from __future__ import unicode_literals
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 from sleekxmpp import JID, InvalidJID
 from sleekxmpp.jid import nodeprep
 

tests/test_stanza_base.py

@@ -1,4 +1,5 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 from sleekxmpp.xmlstream.stanzabase import ET, StanzaBase
 
 

tests/test_stanza_element.py

@@ -1,5 +1,6 @@
-from sleekxmpp.test import *
+import unittest
-from sleekxmpp.xmlstream.stanzabase import ElementBase
+from sleekxmpp.test import SleekTest
+from sleekxmpp.xmlstream.stanzabase import ElementBase, register_stanza_plugin, ET
 from sleekxmpp.thirdparty import OrderedDict
 
 

tests/test_stanza_error.py

@@ -1,4 +1,5 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 
 
 class TestErrorStanzas(SleekTest):

tests/test_stanza_gmail.py

@@ -1,5 +1,8 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp import Iq
+from sleekxmpp.test import SleekTest
 import sleekxmpp.plugins.gmail_notify as gmail
+from sleekxmpp.xmlstream import register_stanza_plugin, ET
 
 
 class TestGmail(SleekTest):

tests/test_stanza_iq.py

@@ -1,4 +1,5 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 from sleekxmpp.xmlstream.stanzabase import ET
 
 

tests/test_stanza_message.py

@@ -1,6 +1,8 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 from sleekxmpp.stanza.message import Message
 from sleekxmpp.stanza.htmlim import HTMLIM
+from sleekxmpp.xmlstream import register_stanza_plugin
 
 
 class TestMessageStanzas(SleekTest):

tests/test_stanza_presence.py

@@ -1,6 +1,6 @@
-from sleekxmpp.test import *
+import unittest
-from sleekxmpp.stanza.presence import Presence
+import sleekxmpp
-
+from sleekxmpp.test import SleekTest
 
 class TestPresenceStanzas(SleekTest):
 

tests/test_stanza_roster.py

@@ -1,5 +1,6 @@
-from sleekxmpp.test import *
+import unittest
-from sleekxmpp.stanza.roster import Roster
+from sleekxmpp.test import SleekTest
+from sleekxmpp.xmlstream import ET
 
 
 class TestRosterStanzas(SleekTest):

tests/test_stanza_xep_0004.py

@@ -1,7 +1,10 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp import Message
+from sleekxmpp.test import SleekTest
 from sleekxmpp.thirdparty import OrderedDict
 
 import sleekxmpp.plugins.xep_0004 as xep_0004
+from sleekxmpp.xmlstream import register_stanza_plugin
 
 
 class TestDataForms(SleekTest):

tests/test_stanza_xep_0030.py

@@ -1,5 +1,8 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp import Iq
+from sleekxmpp.test import SleekTest
 import sleekxmpp.plugins.xep_0030 as xep_0030
+from sleekxmpp.xmlstream import register_stanza_plugin
 
 
 class TestDisco(SleekTest):

tests/test_stanza_xep_0033.py

@@ -1,5 +1,8 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp import Message
+from sleekxmpp.test import SleekTest
 import sleekxmpp.plugins.xep_0033 as xep_0033
+from sleekxmpp.xmlstream import register_stanza_plugin
 
 
 class TestAddresses(SleekTest):

tests/test_stanza_xep_0047.py

@@ -1,5 +1,9 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.exceptions import XMPPError
+from sleekxmpp import Iq
+from sleekxmpp.test import SleekTest
 from sleekxmpp.plugins.xep_0047 import Data
+from sleekxmpp.xmlstream import register_stanza_plugin, ET
 
 
 class TestIBB(SleekTest):

tests/test_stanza_xep_0050.py

@@ -1,6 +1,8 @@
 from sleekxmpp import Iq
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 from sleekxmpp.plugins.xep_0050 import Command
+from sleekxmpp.xmlstream import register_stanza_plugin
 
 
 class TestAdHocCommandStanzas(SleekTest):

tests/test_stanza_xep_0059.py

@@ -1,5 +1,7 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 from sleekxmpp.plugins.xep_0059 import Set
+from sleekxmpp.xmlstream import ET
 
 
 class TestSetStanzas(SleekTest):

tests/test_stanza_xep_0060.py

@@ -1,6 +1,8 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 import sleekxmpp.plugins.xep_0004 as xep_0004
 import sleekxmpp.plugins.xep_0060.stanza as pubsub
+from sleekxmpp.xmlstream.stanzabase import ET
 
 
 class TestPubsubStanzas(SleekTest):

tests/test_stanza_xep_0085.py

@@ -1,5 +1,9 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp import Message
+from sleekxmpp.test import SleekTest
 import sleekxmpp.plugins.xep_0085 as xep_0085
+from sleekxmpp.xmlstream import register_stanza_plugin
+
 
 class TestChatStates(SleekTest):
 

tests/test_stanza_xep_0184.py

@@ -1,5 +1,8 @@
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp import Message
+from sleekxmpp.test import SleekTest
 import sleekxmpp.plugins.xep_0184 as xep_0184
+from sleekxmpp.xmlstream import register_stanza_plugin
 
 
 class TestReciept(SleekTest):

tests/test_stream.py

@@ -1,5 +1,6 @@
 import time
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 
 
 class TestStreamTester(SleekTest):

tests/test_stream_exceptions.py

@@ -1,9 +1,8 @@
-import sys
-import sleekxmpp
 from sleekxmpp.xmlstream.matcher import MatchXPath
 from sleekxmpp.xmlstream.handler import Callback
 from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 
 
 class TestStreamExceptions(SleekTest):

tests/test_stream_filters.py

@@ -1,9 +1,8 @@
 import time
 
 from sleekxmpp import Message
-from sleekxmpp.test import *
+import unittest
-from sleekxmpp.xmlstream.handler import *
+from sleekxmpp.test import SleekTest
-from sleekxmpp.xmlstream.matcher import *
 
 
 class TestFilters(SleekTest):
@@ -84,5 +83,5 @@ class TestFilters(SleekTest):
         """)
 
 
- 
+
 suite = unittest.TestLoader().loadTestsFromTestCase(TestFilters)

tests/test_stream_handlers.py

@@ -1,9 +1,9 @@
 import time
 
-from sleekxmpp import Message
+import unittest
-from sleekxmpp.test import *
+from sleekxmpp.test import SleekTest
-from sleekxmpp.xmlstream.handler import *
+from sleekxmpp.exceptions import IqTimeout
-from sleekxmpp.xmlstream.matcher import *
+from sleekxmpp import Callback, MatchXPath
 
 
 class TestHandlers(SleekTest):

tests/test_stream_presence.py

@@ -1,5 +1,6 @@
 import time
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 
 
 class TestStreamPresence(SleekTest):

tests/test_stream_roster.py

@@ -1,8 +1,9 @@
 # -*- encoding:utf-8 -*-
-
 from __future__ import unicode_literals
 
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.exceptions import IqTimeout
+from sleekxmpp.test import SleekTest
 import time
 import threading
 

tests/test_stream_xep_0030.py

@@ -1,8 +1,8 @@
-import sys
 import time
 import threading
 
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 
 
 class TestStreamDisco(SleekTest):

tests/test_stream_xep_0047.py

@@ -1,7 +1,8 @@
 import threading
 import time
 
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 
 
 class TestInBandByteStreams(SleekTest):

tests/test_stream_xep_0050.py

@@ -1,8 +1,9 @@
 import time
 import logging
-import threading
 
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
+from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin
 
 
 class TestAdHocCommands(SleekTest):
@@ -35,7 +36,7 @@ class TestAdHocCommands(SleekTest):
             logging.debug(initial)
             new_payload = TestPayload()
             if initial:
-                new_payload['bar'] = 'Received: %s' % initial['bar'] 
+                new_payload['bar'] = 'Received: %s' % initial['bar']
             else:
                 new_payload['bar'] = 'Failed'
 

tests/test_stream_xep_0059.py

@@ -1,6 +1,7 @@
 import threading
 
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 from sleekxmpp.xmlstream import register_stanza_plugin
 from sleekxmpp.plugins.xep_0030 import DiscoItems
 from sleekxmpp.plugins.xep_0059 import ResultIterator, Set

tests/test_stream_xep_0060.py

@@ -1,8 +1,7 @@
-import sys
-import time
 import threading
 
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 from sleekxmpp.stanza.atom import AtomEntry
 from sleekxmpp.xmlstream import register_stanza_plugin
 

tests/test_stream_xep_0066.py

@@ -1,7 +1,7 @@
-import time
 import threading
 
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 
 
 class TestOOB(SleekTest):

tests/test_stream_xep_0085.py

@@ -1,7 +1,7 @@
-import threading
 import time
 
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 
 
 class TestStreamChatStates(SleekTest):

tests/test_stream_xep_0092.py

@@ -1,6 +1,7 @@
 import threading
 
-from sleekxmpp.test import *
+import unittest
+from sleekxmpp.test import SleekTest
 
 
 class TestStreamSet(SleekTest):

tests/test_stream_xep_0128.py

@@ -1,9 +1,5 @@
-import sys
+import unittest
-import time
+from sleekxmpp.test import SleekTest
-import threading
-
-from sleekxmpp.test import *
-from sleekxmpp.xmlstream import ElementBase
 
 
 class TestStreamExtendedDisco(SleekTest):

tests/test_stream_xep_0249.py

@@ -1,9 +1,7 @@
-import sys
 import time
-import threading
 
-from sleekxmpp.test import *
+import unittest
-from sleekxmpp.xmlstream import ElementBase
+from sleekxmpp.test import SleekTest
 
 
 class TestStreamDirectInvite(SleekTest):

tests/test_tostring.py

@@ -1,6 +1,6 @@
-from sleekxmpp.test import *
+import unittest
-from sleekxmpp.stanza import Message
+from sleekxmpp.test import SleekTest
-from sleekxmpp.xmlstream.stanzabase import ET, ElementBase
+from sleekxmpp.xmlstream.stanzabase import ET
 from sleekxmpp.xmlstream.tostring import tostring, escape