aboutsummaryrefslogtreecommitdiff
path: root/rtr-origin/rtr-origin.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2009-04-29 04:07:41 +0000
committerRob Austein <sra@hactrn.net>2009-04-29 04:07:41 +0000
commit55769ccf0d1230698646ab5afa331e7617505f4f (patch)
tree126f9e21c2e4dd8dfbdc6c266f18d5c4d6004fa3 /rtr-origin/rtr-origin.py
parent4762069728c3874b8a240c5c99c87f935051fd5a (diff)
More lint
svn path=/rpkid/Makefile; revision=2373
Diffstat (limited to 'rtr-origin/rtr-origin.py')
-rw-r--r--rtr-origin/rtr-origin.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/rtr-origin/rtr-origin.py b/rtr-origin/rtr-origin.py
index bab00a20..61c161de 100644
--- a/rtr-origin/rtr-origin.py
+++ b/rtr-origin/rtr-origin.py
@@ -237,7 +237,8 @@ class reset_query(pdu_empty):
self.send_nodata(server)
else:
try:
- self.send_file(server, "%s.ax" % server.current_serial)
+ fn = "%s.ax" % server.current_serial
+ self.send_file(server, fn)
except IOError:
server.push_pdu(error_report(errno = error_report.codes["Internal Error"], errpdu = self, errmsg = "Couldn't open %s" % fn))
@@ -369,7 +370,7 @@ class error_report(pdu):
1 : "Internal Error",
2 : "No Data Available" }
- codes = dict((v,k) for k,v in msgs.items())
+ codes = dict((v, k) for k, v in msgs.items())
def __init__(self, errno = None, errpdu = None, errmsg = None):
assert errno is None or errno in self.msgs
@@ -844,7 +845,6 @@ def client_main(argv):
if argv:
raise RuntimeError, "Unexpected arguments: %s" % argv
client = None
- timer = None
try:
client = client_channel("ssh", "-p", "2222", "-s", "localhost", "rpki-rtr")
client.push_pdu(reset_query())
@@ -872,8 +872,8 @@ main_dispatch = {
"server" : server_main,
"show" : show_main }
-opts,argv = getopt.getopt(sys.argv[1:], "c:h?", ["config=", "help"] + main_dispatch.keys())
-for o,a in opts:
+opts, argv = getopt.getopt(sys.argv[1:], "c:h?", ["config=", "help"] + main_dispatch.keys())
+for o, a in opts:
if o in ("-h", "--help", "-?"):
print __doc__
sys.exit(0)