python: Style cleanup.

This patch does minor style cleanups to the code in the python and
tests directory.  There's other code floating around that could use
similar treatment, but updating it is not convenient at the moment.

1 files changed, 38 insertions, 18 deletions

diff --git a/tests/test-reconnect.py b/tests/test-reconnect.py
index af52c8acb..90d337af3 100644
--- a/tests/test-reconnect.py
+++ b/tests/test-reconnect.py
@@ -1,11 +1,11 @@
 # Copyright (c) 2009, 2010 Nicira Networks.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,15 +18,22 @@ import sys
 
 import ovs.reconnect
 
-def do_enable(arg):
+now = 0
+r = None
+
+
+def do_enable(_):
     r.enable(now)
 
-def do_disable(arg):
+
+def do_disable(_):
     r.disable(now)
 
-def do_force_reconnect(arg):
+
+def do_force_reconnect(_):
     r.force_reconnect(now)
 
+
 def error_from_string(s):
     if not s:
         return 0
@@ -38,21 +45,27 @@ def error_from_string(s):
         sys.stderr.write("unknown error '%s'\n" % s)
         sys.exit(1)
 
+
 def do_disconnected(arg):
     r.disconnected(now, error_from_string(arg))
-    
-def do_connecting(arg):
+
+
+def do_connecting(_):
     r.connecting(now)
 
+
 def do_connect_failed(arg):
     r.connect_failed(now, error_from_string(arg))
 
-def do_connected(arg):
+
+def do_connected(_):
     r.connected(now)
 
-def do_received(arg):
+
+def do_received(_):
     r.received(now)
 
+
 def do_run(arg):
     global now
     if arg is not None:
@@ -70,11 +83,13 @@ def do_run(arg):
     else:
         assert False
 
+
 def do_advance(arg):
     global now
     now += int(arg)
 
-def do_timeout(arg):
+
+def do_timeout(_):
     global now
     timeout = r.timeout(now)
     if timeout >= 0:
@@ -83,9 +98,11 @@ def do_timeout(arg):
     else:
         print "  no timeout"
 
+
 def do_set_max_tries(arg):
     r.set_max_tries(int(arg))
 
+
 def diff_stats(old, new, delta):
     if (old.state != new.state or
         old.state_elapsed != new.state_elapsed or
@@ -116,9 +133,9 @@ def diff_stats(old, new, delta):
     if (old.last_connected != new.last_connected or
         (new.msec_since_connect != None and
          old.msec_since_connect != new.msec_since_connect - delta) or
-        (old.total_connected_duration != new.total_connected_duration - delta and
-         not (old.total_connected_duration == 0 and
-              new.total_connected_duration == 0))):
+        (old.total_connected_duration != new.total_connected_duration - delta
+            and not (old.total_connected_duration == 0 and
+                new.total_connected_duration == 0))):
         print("  last connected %d ms ago, connected %d ms total"
               % (new.msec_since_connect, new.total_connected_duration))
 
@@ -128,15 +145,19 @@ def diff_stats(old, new, delta):
         print("  disconnected at %d ms (%d ms ago)"
               % (new.last_disconnected, new.msec_since_disconnect))
 
-def do_set_passive(arg):
+
+def do_set_passive(_):
     r.set_passive(True, now)
 
-def do_listening(arg):
+
+def do_listening(_):
     r.listening(now)
 
+
 def do_listen_error(arg):
     r.listen_error(now, int(arg))
 
+
 def main():
     commands = {
         "enable": do_enable,
@@ -201,7 +222,6 @@ def main():
 
         old_time = now
 
+
 if __name__ == '__main__':
     main()
-
-