[tor-commits] [torbel/master] Fix bugs in query driver.

[sebastian at torproject.org]

commit 003956b9fd727dd0d05d26997b3672049c969ab3
Author: Harry Bock <hbock at ele.uri.edu>
Date:   Fri Sep 3 18:52:33 2010 -0400

    Fix bugs in query driver.
    
    Used older API revision.
---
 query.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/query.py b/query.py
index c8d52d0..2f223d7 100644
--- a/query.py
+++ b/query.py
@@ -333,14 +333,14 @@ if __name__ == "__main__":
                         print "Invalid port %d. Must be between 1 and 65535." % port
                         sys.exit(1)
 
-            except ValueError, TypeError:
+            except (ValueError, TypeError):
                 print "Invalid target '%s'!" % target
                 usage()
                 sys.exit(1)
 
             target_list.append((ipaddr.IPAddress(ip), portlist))
 
-        exit_list = ExitList(csv_file = "bel_export.csv")
+        exit_list = ExitList("bel_export.csv")
         for ip, portlist in target_list:
             output = open("export-" + str(ip) + ":" + ",".join(map(str, portlist)), "w")
             source_list = exit_list.will_exit_to_ports(ip, portlist)