Skip to content

Commit

Permalink
more pep8 stuff.
Browse files Browse the repository at this point in the history
  • Loading branch information
gutomaia committed Jul 27, 2011
1 parent cfc1d69 commit a1aa1fb
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 20 deletions.
4 changes: 2 additions & 2 deletions MockClient.py
Expand Up @@ -23,13 +23,13 @@ def onConnected(self):
self.connected = True self.connected = True


def onAddContact(self, contact): def onAddContact(self, contact):
self.contact = contact; self.contact = contact


def onRemoveContact(self, contact): def onRemoveContact(self, contact):
pass pass


def onAddGroup(self, group): def onAddGroup(self, group):
self.group = group; self.group = group


def onRemoveGroup(self, group): def onRemoveGroup(self, group):
pass pass
4 changes: 3 additions & 1 deletion Msnp8.py
Expand Up @@ -10,7 +10,9 @@
import Msnp import Msnp
import Notification import Notification



class Msnp8(Notification.Notification): class Msnp8(Notification.Notification):

def __init__(self): def __init__(self):
Notification.Notification.__init__(self) Notification.Notification.__init__(self)
#super(Msnp8,self).connect() #super(Msnp8,self).connect()
Expand Down Expand Up @@ -81,7 +83,7 @@ def execute(self, command):
elif cmd == "CHG": elif cmd == "CHG":
self.onConnected() self.onConnected()
elif cmd == "CHL": elif cmd == "CHL":
params = command.strip().split(' '); params = command.strip().split(' ')
self.send(self.qry(params[2])) self.send(self.qry(params[2]))
# elif cmd == "QRY": # elif cmd == "QRY":
elif cmd == "207": elif cmd == "207":
Expand Down
4 changes: 2 additions & 2 deletions Notification.py
Expand Up @@ -47,13 +47,13 @@ def login(self, username, password):
def logout(self): def logout(self):
self.send(self.out()) self.send(self.out())
self.disconnect() self.disconnect()

# public final function addConnectionListener($connectionListener){ # public final function addConnectionListener($connectionListener){
# $this->_connectionListener = $connectionListener; # $this->_connectionListener = $connectionListener;


# public final function # public final function
def addContactListener(self, contactListener): def addContactListener(self, contactListener):
self._contactListener = contactListener; self._contactListener = contactListener
# $this->_contactListener = $contactListener; # $this->_contactListener = $contactListener;


# public final function addPresenceListener($presenceListener){ # public final function addPresenceListener($presenceListener){
Expand Down
2 changes: 1 addition & 1 deletion SocketConnection.py
Expand Up @@ -27,7 +27,7 @@ def connect(self, host, port):
print host, port print host, port
if self.getSocket() != None: if self.getSocket() != None:
self._socket.close() self._socket.close()
self._socket = None; self._socket = None
self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
result = self._socket.connect((host,port)) result = self._socket.connect((host,port))
#if ($this->getSocket()) { #if ($this->getSocket()) {
Expand Down
19 changes: 7 additions & 12 deletions Tweener.py
Expand Up @@ -16,21 +16,19 @@ class Tweener:
def __init__(self): def __init__(self):
self.EL = "\r\n" self.EL = "\r\n"
self.passportProps = None self.passportProps = None



def extractHttpResponseHeader(self, httpResponse): def extractHttpResponseHeader(self, httpResponse):
props = {} props = {}
cutter = httpResponse.find("\r\n\r\n") cutter = httpResponse.find("\r\n\r\n")
header = httpResponse[0:cutter] header = httpResponse[0:cutter]
parameter_values = header.split(self.EL) parameter_values = header.split(self.EL)
for i in range(1, len(parameter_values)): for i in range(1, len(parameter_values)):
cutter = parameter_values[i].find(':') cutter = parameter_values[i].find(':')
key = parameter_values[i][0:cutter] key = parameter_values[i][0:cutter]
value = parameter_values[i][cutter+2:] value = parameter_values[i][cutter+2:]
props[key] = value props[key] = value
return props return props



def extractVarParams(self, params): def extractVarParams(self, params):
props = {} props = {}
parameter_values = params.split(',') parameter_values = params.split(',')
Expand Down Expand Up @@ -71,7 +69,6 @@ def connectToTheNexus(self):
# $passportURLS = $responseHeader['PassportURLs']; # $passportURLS = $responseHeader['PassportURLs'];
# $this->passportProps = $this->extractVarParams($passportURLS); # $this->passportProps = $this->extractVarParams($passportURLS);
# } # }
pass


def buildHttpRequestHeader(self, url, params = None): def buildHttpRequestHeader(self, url, params = None):
requestHeader = '' requestHeader = ''
Expand All @@ -89,10 +86,10 @@ def buildParamVars(self, params):
paramVars = ''; paramVars = '';
for key, value in params.iteritems(): for key, value in params.iteritems():
if key == 'lc': if key == 'lc':
paramVars+=value paramVars +=value
else: else:
paramVars+=key+'='+value paramVars +=key+'='+value
paramVars+=',' paramVars +=','
return paramVars return paramVars


# function buildParamVars($params){ # function buildParamVars($params){
Expand All @@ -115,8 +112,6 @@ def encode(self, var):
# return str_replace("@", "%40", $var); # return str_replace("@", "%40", $var);
# } # }




def request(self, url, port, httpRequest): def request(self, url, port, httpRequest):
host = url[:url.find('/')] host = url[:url.find('/')]
request = url[url.find('/'):] request = url[url.find('/'):]
Expand Down
4 changes: 2 additions & 2 deletions TweenerTest.py
Expand Up @@ -19,7 +19,7 @@ def setUp(self):
def tearDown(self): def tearDown(self):
self._twn = None self._twn = None


def testExtractHttpResponseHeader(self): def test_extract_http_response_header(self):
self.assertTrue(True) self.assertTrue(True)
header = 'HTTP/1.1 200 OK' + self.EL header = 'HTTP/1.1 200 OK' + self.EL
header += 'Date: Sun, 11 Jul 2010 18:46:58 GMT' + self.EL header += 'Date: Sun, 11 Jul 2010 18:46:58 GMT' + self.EL
Expand Down Expand Up @@ -76,7 +76,7 @@ def testBuildHttpRequestHeader(self):
'Authorization':'Passport1.4 OrgVerb=GET,OrgURL=http%3A%2F%2Fmessenger%2Emsn%2Ecom,sign-in=dvader%40empire.com,pwd=ih8jedis,ct=1278901179,rver=5.5.4182.0,wp=FS_40SEC_0_COMPACT,lc=1033,id=507,ru=http:%2F%2Fmessenger.msn.com,tw=0,kpp=1,kv=4,ver=2.1.6000.1,rn=1lgjBfIL,tpf=b0735e3a873dfb5e75054465196398e0', 'Authorization':'Passport1.4 OrgVerb=GET,OrgURL=http%3A%2F%2Fmessenger%2Emsn%2Ecom,sign-in=dvader%40empire.com,pwd=ih8jedis,ct=1278901179,rver=5.5.4182.0,wp=FS_40SEC_0_COMPACT,lc=1033,id=507,ru=http:%2F%2Fmessenger.msn.com,tw=0,kpp=1,kv=4,ver=2.1.6000.1,rn=1lgjBfIL,tpf=b0735e3a873dfb5e75054465196398e0',
'Host':'login.live.com' 'Host':'login.live.com'
} }
requestHeader = self._twn.buildHttpRequestHeader('login.live.com/login2.srf', requestParams); requestHeader = self._twn.buildHttpRequestHeader('login.live.com/login2.srf', requestParams)
#self.assertEquals(expected, requestHeader) #self.assertEquals(expected, requestHeader)


def testEncode(self): def testEncode(self):
Expand Down

0 comments on commit a1aa1fb

Please sign in to comment.