Merge pull request #313 from mayflower/develop

Proposing #310 again in fixed version

sleekxmpp/thirdparty/socks.py

@@ -219,7 +219,7 @@ class socksocket(socket.socket):
                 # Resolve locally
                 ipaddr = socket.inet_aton(socket.gethostbyname(destaddr))
                 req = req + chr(0x01).encode() + ipaddr
-        req = req + struct.pack(">H", destport)
+        req += struct.pack(">H", destport)
         self.sendall(req)
         # Get the response
         resp = self.__recvall(4)
@@ -288,7 +288,7 @@ class socksocket(socket.socket):
         # The username parameter is considered userid for SOCKS4
         if self.__proxy[4] != None:
             req = req + self.__proxy[4]
-        req = req + chr(0x00).encode()
+        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.

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=None, kwargs=None):
         '''
         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
@@ -65,15 +65,23 @@ class StateMachine(object):
         values for `args` and `kwargs` are provided, they are expanded and passed like so:
         `func( *args, **kwargs )`.
         '''
+        if not args:
+            args = []
+        if not kwargs:
+            kwargs = {}
 
         return self.transition_any((from_state,), to_state, wait=wait,
                                     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=None, kwargs=None):
         '''
         Transition from any of the given `from_states` to the given `to_state`.
         '''
+        if not args:
+            args = []
+        if not kwargs:
+            kwargs = {}
 
         if not isinstance(from_states, (tuple, list, set)):
             raise ValueError("from_states should be a list, tuple, or set")