diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-07-29 02:24:33 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-07-29 02:24:33 -0700 |
| commit | d439c4f21515813b69f8e39d430cee8ca9a3c946 (patch) | |
| tree | e8a4970b42759c9fcebe01a18a56bddaf0d88214 /sleekxmpp/thirdparty | |
| parent | 85bc6f530178f3b049ea2ae064f168b77aeee332 (diff) | |
| parent | a9f2e1482ca65a919a7a9f0c44af7f9f51907887 (diff) | |
| download | slixmpp-d439c4f21515813b69f8e39d430cee8ca9a3c946.tar.gz slixmpp-d439c4f21515813b69f8e39d430cee8ca9a3c946.tar.bz2 slixmpp-d439c4f21515813b69f8e39d430cee8ca9a3c946.tar.xz slixmpp-d439c4f21515813b69f8e39d430cee8ca9a3c946.zip | |
Merge pull request #252 from jpcaruana/develop
refactor : optimize imports + replace mutable argument (a list) in StateMachine constructor
Diffstat (limited to 'sleekxmpp/thirdparty')
| -rw-r--r-- | sleekxmpp/thirdparty/socks.py | 6 | ||||
| -rw-r--r-- | sleekxmpp/thirdparty/statemachine.py | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sleekxmpp/thirdparty/socks.py b/sleekxmpp/thirdparty/socks.py index a6c0d70e..9239a7b9 100644 --- a/sleekxmpp/thirdparty/socks.py +++ b/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 diff --git a/sleekxmpp/thirdparty/statemachine.py b/sleekxmpp/thirdparty/statemachine.py index 4b5ecd6b..113320fa 100644 --- a/sleekxmpp/thirdparty/statemachine.py +++ b/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) |