Do not use base except: clauses

https://docs.python.org/2/howto/doanddont.html#except

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

3 files changed, 8 insertions, 9 deletions

diff --git a/tests/echo.py b/tests/echo.py
index 4e0f045..780891c 100755
--- a/tests/echo.py
+++ b/tests/echo.py
@@ -63,9 +63,9 @@ if __name__ == '__main__':
     (opts, args) = parser.parse_args()
 
     try:
-        if len(args) != 1: raise
+        if len(args) != 1: raise ValueError
         opts.listen_port = int(args[0])
-    except:
+    except ValueError:
         parser.error("Invalid arguments")
 
     logging.basicConfig(level=logging.INFO)
diff --git a/tests/echo_client.py b/tests/echo_client.py
index 6d745ec..4f238f6 100755
--- a/tests/echo_client.py
+++ b/tests/echo_client.py
@@ -12,10 +12,9 @@ from websockify.websocket import WebSocket, \
 parser = optparse.OptionParser(usage="%prog URL")
 (opts, args) = parser.parse_args()
 
-try:
-    if len(args) != 1: raise
+if len(args) == 1:
     URL = args[0]
-except:
+else:
     parser.error("Invalid arguments")
 
 sock = WebSocket()
diff --git a/tests/load.py b/tests/load.py
index bf2c9ae..710b593 100755
--- a/tests/load.py
+++ b/tests/load.py
@@ -105,7 +105,7 @@ class WebSocketLoad(WebSockifyRequestHandler):
                 cnt    = int(cnt)
                 length = int(length)
                 chksum = int(chksum)
-            except:
+            except ValueError:
                 print "\n<BOF>" + repr(data) + "<EOF>"
                 err += "Invalid data format\n"
                 continue
@@ -148,16 +148,16 @@ if __name__ == '__main__':
     (opts, args) = parser.parse_args()
 
     try:
-        if len(args) != 1: raise
+        if len(args) != 1: raise ValueError
         opts.listen_port = int(args[0])
 
-        if len(args) not in [1,2]: raise
+        if len(args) not in [1,2]: raise ValueError
         opts.listen_port = int(args[0])
         if len(args) == 2:
             opts.delay = int(args[1])
         else:
             opts.delay = 10
-    except:
+    except ValueError:
         parser.error("Invalid arguments")
 
     logging.basicConfig(level=logging.INFO)