From dae4bc4dc3293c7969f0a9e1084371a39dcb23da Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Fri, 30 Nov 2012 11:44:52 +0900 Subject: Revert "contrib/ovs/stream.py: TypeError: bad operand type for unary -: 'NoneType'" This reverts commit c3a41d06a654ea81cdc79d7bda5106d05f2e1deb. Signed-off-by: FUJITA Tomonori --- ryu/contrib/ovs/stream.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ryu/contrib/ovs/stream.py b/ryu/contrib/ovs/stream.py index b4f5ba6f..c4d243d0 100644 --- a/ryu/contrib/ovs/stream.py +++ b/ryu/contrib/ovs/stream.py @@ -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: -- cgit v1.2.3