diff options
author | Robin Gloster <robin@loc-com.de> | 2014-08-18 15:15:14 +0200 |
---|---|---|
committer | Robin Gloster <robin@loc-com.de> | 2014-08-18 15:15:14 +0200 |
commit | 3dd379cdf12d885e26f8ec26c54879a95d5f0b84 (patch) | |
tree | 5dc018384ad03253608ff79c9fdbb577b84d2d2f /sleekxmpp/thirdparty | |
parent | 7265682a4d57d88956cb54f98f7a470465bbf417 (diff) | |
download | slixmpp-3dd379cdf12d885e26f8ec26c54879a95d5f0b84.tar.gz slixmpp-3dd379cdf12d885e26f8ec26c54879a95d5f0b84.tar.bz2 slixmpp-3dd379cdf12d885e26f8ec26c54879a95d5f0b84.tar.xz slixmpp-3dd379cdf12d885e26f8ec26c54879a95d5f0b84.zip |
Revert "cleanup semicolons, whitespace and mutable default arguments"
This reverts commit 7265682a4d57d88956cb54f98f7a470465bbf417.
Diffstat (limited to 'sleekxmpp/thirdparty')
-rw-r--r-- | sleekxmpp/thirdparty/socks.py | 4 | ||||
-rw-r--r-- | sleekxmpp/thirdparty/statemachine.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sleekxmpp/thirdparty/socks.py b/sleekxmpp/thirdparty/socks.py index 0c1f6eba..9239a7b9 100644 --- a/sleekxmpp/thirdparty/socks.py +++ b/sleekxmpp/thirdparty/socks.py @@ -213,7 +213,7 @@ class socksocket(socket.socket): # Resolve locally ipaddr = socket.inet_aton(socket.gethostbyname(destaddr)) req = req + chr(0x01).encode() + ipaddr - req += struct.pack(">H", destport) + req = req + struct.pack(">H", destport) self.sendall(req) # Get the response resp = self.__recvall(4) @@ -282,7 +282,7 @@ class socksocket(socket.socket): # The username parameter is considered userid for SOCKS4 if self.__proxy[4] != None: req = req + self.__proxy[4] - req += chr(0x00).encode() + req = req + chr(0x00).encode() # DNS name if remote resolving is required # NOTE: This is actually an extension to the SOCKS4 protocol # called SOCKS4A and may not be supported in all cases. diff --git a/sleekxmpp/thirdparty/statemachine.py b/sleekxmpp/thirdparty/statemachine.py index 9f6906bf..113320fa 100644 --- a/sleekxmpp/thirdparty/statemachine.py +++ b/sleekxmpp/thirdparty/statemachine.py @@ -34,7 +34,7 @@ class StateMachine(object): self.lock.release() - def transition(self, from_state, to_state, wait=0.0, func=None, *args, **kwargs): + def transition(self, from_state, to_state, wait=0.0, func=None, args=[], kwargs={}): ''' Transition from the given `from_state` to the given `to_state`. This method will return `True` if the state machine is now in `to_state`. It @@ -70,7 +70,7 @@ class StateMachine(object): func=func, args=args, kwargs=kwargs) - def transition_any(self, from_states, to_state, wait=0.0, func=None, *args, **kwargs): + def transition_any(self, from_states, to_state, wait=0.0, func=None, args=[], kwargs={}): ''' Transition from any of the given `from_states` to the given `to_state`. ''' |