[or-cvs] minor cleanups

[Nick Mathewson]

Update of /home/or/cvsroot/control/python
In directory moria:/tmp/cvs-serv30221

Modified Files:
	TorCtl.py TorExample.py 
Log Message:
minor cleanups

Index: TorCtl.py
===================================================================
RCS file: /home/or/cvsroot/control/python/TorCtl.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TorCtl.py	4 Jun 2005 02:42:56 -0000	1.1
+++ TorCtl.py	15 Jun 2005 15:18:22 -0000	1.2
@@ -18,7 +18,7 @@
 
 __all__ = [
     "MSG_TYPE", "EVENT_TYPE", "CIRC_STATUS", "STREAM_STATUS",
-    "OR_CONN_STATUS", "SIGNAL", "ERR_STATUS",
+    "OR_CONN_STATUS", "SIGNAL", "ERR_CODES",
     "TorCtlError", "ProtocolError", "ErrorReply", "Connection", "EventHandler",
     "DebugEventHandler", "parseHostAndPort"
     ]

Index: TorExample.py
===================================================================
RCS file: /home/or/cvsroot/control/python/TorExample.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TorExample.py	4 Jun 2005 02:42:56 -0000	1.1
+++ TorExample.py	15 Jun 2005 15:18:22 -0000	1.2
@@ -57,7 +57,7 @@
 
 def run_get_info():
     conn = getConnection()
-    opts = conn.get_option(sys.argv[1:])
+    opts = conn.get_info(sys.argv[1:])
     for k in sys.argv[1:]:
         print "KEY:",k
         print "VALUE:",opts.get(k)
@@ -65,7 +65,7 @@
 def run_listen():
     m = { "circ": "CIRCSTATUS",
           "stream": "STREAMSTATUS",
-          "orconn", "ORCONNSTATUS",
+          "orconn": "ORCONNSTATUS",
           "bw": "BANDWIDTH",
           "newdesc": "NEWDESC",
           "info": "INFO_MSG",
@@ -106,3 +106,7 @@
     conn = getConnection()
     conn.close()
     #XXXX
+
+if __name__ == '__main__':
+    run()
+