mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-01-29 20:42:09 +01:00
Code Issues Projects Releases Wiki Activity

Revert "contrib/ovs/stream.py: TypeError: bad operand type for unary -: 'NoneType'"

Browse Source 
This reverts commit c3a41d06a654ea81cdc79d7bda5106d05f2e1deb.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Isaku Yamahata 2012-11-30 11:44:52 +09:00 committed by FUJITA Tomonori
parent c5c7dc9cfe
commit dae4bc4dc3
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ryu/contrib/ovs/stream.py
View File

@ -152,10 +152,9 @@ class Stream(object):
assert retval != errno.EINPROGRESS
if retval == 0:
self.state = Stream.__S_CONNECTED
else:
elif retval != errno.EAGAIN:
self.state = Stream.__S_DISCONNECTED
self.error = retval
if retval != errno.EAGAIN:
self.state = Stream.__S_DISCONNECTED
def connect(self):
"""Tries to complete the connection on this stream. If the connection
@ -167,11 +166,6 @@ class Stream(object):
last_state = self.state
if self.state == Stream.__S_CONNECTING:
self.__scs_connecting()
if self.state == Stream.__S_CONNECTING:
# try again
assert self.error == errno.EAGAIN
last_state = -1
assert self.state != last_state
elif self.state == Stream.__S_CONNECTED:
return 0
elif self.state == Stream.__S_DISCONNECTED: