cleanup semicolons, whitespace and mutable default arguments

This commit is contained in:
Robin Gloster
2014-08-18 00:52:24 +02:00
parent 08c62a6bf1
commit 7265682a4d
30 changed files with 1074 additions and 1068 deletions

View File

@@ -213,7 +213,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)
@@ -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 = 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.

View File

@@ -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`.
'''