[tor-commits] [arm/release] fix: using renamed functions/args in torctl

[atagar at torproject.org]

commit 00ba915dc6f24476c19b4fb67d260a64063c19ff
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Jun 18 16:01:30 2011 -0700

    fix: using renamed functions/args in torctl
    
    The torctl patches had some functions and arguments renamed while being merged
    so using those.
---
 src/cli/headerPanel.py |    2 +-
 src/starter.py         |    2 +-
 src/util/torTools.py   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py
index 145e75b..7e0f639 100644
--- a/src/cli/headerPanel.py
+++ b/src/cli/headerPanel.py
@@ -133,7 +133,7 @@ class HeaderPanel(panel.Panel, threading.Thread):
     elif key in (ord('r'), ord('R')) and not self._isTorConnected:
       try:
         ctlAddr, ctlPort = self._config["startup.interface.ipAddress"], self._config["startup.interface.port"]
-        tmpConn, authType, authValue = TorCtl.TorCtl.connectionComp(ctlAddr, ctlPort)
+        tmpConn, authType, authValue = TorCtl.TorCtl.preauth_connect(ctlAddr, ctlPort)
         
         if authType == TorCtl.TorCtl.AUTH_TYPE.PASSWORD:
           authValue = cli.popups.inputPrompt("Controller Password: ")
diff --git a/src/starter.py b/src/starter.py
index 94bb30b..e060274 100644
--- a/src/starter.py
+++ b/src/starter.py
@@ -358,7 +358,7 @@ if __name__ == '__main__':
     # making this a much bigger hack).
     
     try:
-      tmpConn, authType, cookiePath = TorCtl.TorCtl.connectionComp(controlAddr, controlPort)
+      tmpConn, authType, cookiePath = TorCtl.TorCtl.preauth_connect(controlAddr, controlPort)
       
       if authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE:
         torPid = util.torTools.getPid(controlPort)
diff --git a/src/util/torTools.py b/src/util/torTools.py
index 17c54f0..7ea140b 100644
--- a/src/util/torTools.py
+++ b/src/util/torTools.py
@@ -1629,7 +1629,7 @@ class Controller(TorCtl.PostEventListener):
     if self.isAlive():
       # fetch the current network status if not provided
       if not nsList:
-        try: nsList = self.conn.get_network_status(getIterator=True)
+        try: nsList = self.conn.get_network_status(get_iterator=True)
         except (socket.error, TorCtl.TorCtlClosed, TorCtl.ErrorReply): nsList = []
       
       # construct mappings of ips to relay data