[or-cvs] r14628: Backport __all__ and AUTHENTICATE fixes. (torflow/trunk/TorCtl)

[mikeperry at seul.org]

Author: mikeperry
Date: 2008-05-16 00:57:11 -0400 (Fri, 16 May 2008)
New Revision: 14628

Modified:
   torflow/trunk/TorCtl/TorCtl.py
Log:

Backport __all__ and AUTHENTICATE fixes.



Modified: torflow/trunk/TorCtl/TorCtl.py
===================================================================
--- torflow/trunk/TorCtl/TorCtl.py	2008-05-16 04:37:47 UTC (rev 14627)
+++ torflow/trunk/TorCtl/TorCtl.py	2008-05-16 04:57:11 UTC (rev 14628)
@@ -21,9 +21,7 @@
 
 """
 
-__all__ = ["EVENTTYPE", "CIRC", "STREAM", "ORCONN", "STREAM_BW", "BW",
-           "NS", "NEWDESC", "ADDRMAP", "DEBUG", "INFO", "NOTICE", "WARN",
-           "ERR", "TorCtlError", "TorCtlClosed", "ProtocolError",
+__all__ = ["EVENT_TYPE", "TorCtlError", "TorCtlClosed", "ProtocolError",
            "ErrorReply", "NetworkStatus", "ExitPolicyLine", "Router",
            "RouterVersion", "Connection", "parse_ns_body",
            "EventHandler", "DebugEventHandler", "NetworkStatusEvent",
@@ -570,8 +568,8 @@
     """Send an authenticating secret to Tor.  You'll need to call this
        method before Tor can start.
     """
-    hexstr = binascii.b2a_hex(secret)
-    self.sendAndRecv("AUTHENTICATE %s\r\n"%hexstr)
+    #hexstr = binascii.b2a_hex(secret)
+    self.sendAndRecv("AUTHENTICATE \"%s\"\r\n"%secret)
 
   def get_option(self, name):
     """Get the value of the configuration option named 'name'.  To