Merge pull request #252 from jpcaruana/develop

refactor : optimize imports + replace mutable argument (a list) in StateMachine constructor

sleekxmpp/__init__.py

@@ -14,6 +14,5 @@ from sleekxmpp.jid import JID, InvalidJID
 from sleekxmpp.xmlstream.handler import *
 from sleekxmpp.xmlstream import XMLStream, RestartStream
 from sleekxmpp.xmlstream.matcher import *
-from sleekxmpp.xmlstream.stanzabase import StanzaBase, ET
 
 from sleekxmpp.version import __version__, __version_info__

sleekxmpp/basexmpp.py

@@ -19,14 +19,13 @@ import logging
 import threading
 
 import sleekxmpp
-from sleekxmpp import plugins, features, roster
+from sleekxmpp import plugins, roster
 from sleekxmpp.api import APIRegistry
 from sleekxmpp.exceptions import IqError, IqTimeout
 
 from sleekxmpp.stanza import Message, Presence, Iq, StreamError
 from sleekxmpp.stanza.roster import Roster
 from sleekxmpp.stanza.nick import Nick
-from sleekxmpp.stanza.htmlim import HTMLIM
 
 from sleekxmpp.xmlstream import XMLStream, JID
 from sleekxmpp.xmlstream import ET, register_stanza_plugin
@@ -34,8 +33,7 @@ from sleekxmpp.xmlstream.matcher import MatchXPath
 from sleekxmpp.xmlstream.handler import Callback
 from sleekxmpp.xmlstream.stanzabase import XML_NS
 
-from sleekxmpp.features import *
+from sleekxmpp.plugins import PluginManager, load_plugin
-from sleekxmpp.plugins import PluginManager, register_plugin, load_plugin
 
 
 log = logging.getLogger(__name__)

sleekxmpp/features/feature_bind/bind.py

@@ -12,7 +12,7 @@ from sleekxmpp.jid import JID
 from sleekxmpp.stanza import Iq, StreamFeatures
 from sleekxmpp.features.feature_bind import stanza
 from sleekxmpp.xmlstream import register_stanza_plugin
-from sleekxmpp.plugins import BasePlugin, register_plugin
+from sleekxmpp.plugins import BasePlugin
 
 
 log = logging.getLogger(__name__)

sleekxmpp/features/feature_mechanisms/mechanisms.py

@@ -6,7 +6,6 @@
     See the file LICENSE for copying permission.
 """
 
-import sys
 import ssl
 import logging
 

sleekxmpp/features/feature_preapproval/preapproval.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from sleekxmpp.stanza import Iq, StreamFeatures
+from sleekxmpp.stanza import StreamFeatures
 from sleekxmpp.features.feature_preapproval import stanza
 from sleekxmpp.xmlstream import register_stanza_plugin
 from sleekxmpp.plugins.base import BasePlugin

sleekxmpp/features/feature_rosterver/rosterver.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from sleekxmpp.stanza import Iq, StreamFeatures
+from sleekxmpp.stanza import StreamFeatures
 from sleekxmpp.features.feature_rosterver import stanza
 from sleekxmpp.xmlstream import register_stanza_plugin
 from sleekxmpp.plugins.base import BasePlugin

sleekxmpp/plugins/xep_0082.py

@@ -6,7 +6,6 @@
     See the file LICENSE for copying permission.
 """
 
-import logging
 import datetime as dt
 
 from sleekxmpp.plugins import BasePlugin, register_plugin

sleekxmpp/roster/__init__.py

@@ -6,7 +6,6 @@
     See the file LICENSE for copying permission.
 """
 
-from sleekxmpp.xmlstream import JID
 from sleekxmpp.roster.item import RosterItem
 from sleekxmpp.roster.single import RosterNode
 from sleekxmpp.roster.multi import Roster

sleekxmpp/test/sleektest.py

@@ -9,14 +9,12 @@
 import unittest
 from xml.parsers.expat import ExpatError
 
-import sleekxmpp
 from sleekxmpp import ClientXMPP, ComponentXMPP
 from sleekxmpp.util import Queue
 from sleekxmpp.stanza import Message, Iq, Presence
 from sleekxmpp.test import TestSocket, TestLiveSocket
-from sleekxmpp.exceptions import XMPPError, IqTimeout, IqError
+from sleekxmpp.xmlstream import ET
-from sleekxmpp.xmlstream import ET, register_stanza_plugin
+from sleekxmpp.xmlstream import ElementBase
-from sleekxmpp.xmlstream import ElementBase, StanzaBase
 from sleekxmpp.xmlstream.tostring import tostring
 from sleekxmpp.xmlstream.matcher import StanzaPath, MatcherId
 from sleekxmpp.xmlstream.matcher import MatchXMLMask, MatchXPath

sleekxmpp/thirdparty/socks.py

@@ -13,7 +13,7 @@ are permitted provided that the following conditions are met:
 3. Neither the name of Dan Haim nor the names of his contributors may be used
    to endorse or promote products derived from this software without specific
    prior written permission.
-   
+
 THIS SOFTWARE IS PROVIDED BY DAN HAIM "AS IS" AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
@@ -28,9 +28,6 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMANGE.
 This module provides a standard socket-like interface for Python
 for tunneling connections through SOCKS proxies.
 
-"""
-
-"""
 
 Minor modifications made by Christopher Gilbert (http://motomastyle.com/)
 for use in PyLoris (http://pyloris.sourceforge.net/)
@@ -42,7 +39,6 @@ mainly to merge bug fixes found in Sourceforge
 
 import socket
 import struct
-import sys
 
 PROXY_TYPE_SOCKS4 = 1
 PROXY_TYPE_SOCKS5 = 2

sleekxmpp/thirdparty/statemachine.py

@@ -15,7 +15,8 @@ log = logging.getLogger(__name__)
 
 class StateMachine(object):
 
-    def __init__(self, states=[]):
+    def __init__(self, states=None):
+        if not states: states = []
         self.lock = threading.Condition()
         self.__states = []
         self.addStates(states)

sleekxmpp/util/stringprep_profiles.py

@@ -16,7 +16,6 @@
 
 from __future__ import unicode_literals
 
-import sys
 import stringprep
 from unicodedata import ucd_3_2_0 as unicodedata
 

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