mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-04 08:15:25 +00:00
Code Issues Releases Wiki Activity

python: Don't compare None and int.

Browse Source 
Comparing None to an integer worked in Python 2, but fails in Python 3.

Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Russell Bryant
2015-12-17 09:56:44 -05:00
parent da2d45c6c6
commit c03afda69a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/ovs/reconnect.py
View File

@@ -518,7 +518,7 @@ class Reconnect(object):
"""Causes the next call to poller.block() to wake up when self.run() """Causes the next call to poller.block() to wake up when self.run()
should be called.""" should be called."""
timeout = self.timeout(now) timeout = self.timeout(now)
if timeout >= 0: if timeout is not None and timeout >= 0:
poller.timer_wait(timeout) poller.timer_wait(timeout)
def timeout(self, now): def timeout(self, now):

2
tests/test-reconnect.py
View File

@@ -93,7 +93,7 @@ def do_advance(arg):
def do_timeout(_): def do_timeout(_):
global now global now
timeout = r.timeout(now) timeout = r.timeout(now)
if timeout >= 0: if timeout is not None and timeout >= 0:
print(" advance %d ms" % timeout) print(" advance %d ms" % timeout)
now += timeout now += timeout
else: else: