[tor-commits] [pytorctl/master] Rename connectionComp and export ns_body_iter.

[mikeperry at torproject.org]

commit 0ec171e6e0286b84802d09d399f7ff620dc37803
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Fri Jun 17 16:29:36 2011 -0700

    Rename connectionComp and export ns_body_iter.
---
 TorCtl.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TorCtl.py b/TorCtl.py
index b1387a0..250dab1 100755
--- a/TorCtl.py
+++ b/TorCtl.py
@@ -35,7 +35,7 @@ __all__ = ["EVENT_TYPE", "connect", "TorCtlError", "TorCtlClosed",
            "NewDescEvent", "CircuitEvent", "StreamEvent", "ORConnEvent",
            "StreamBwEvent", "LogEvent", "AddrMapEvent", "BWEvent",
            "BuildTimeoutSetEvent", "UnknownEvent", "ConsensusTracker",
-           "EventListener", "EVENT_STATE" ]
+           "EventListener", "EVENT_STATE", "ns_body_iter" ]
 
 import os
 import re
@@ -111,7 +111,7 @@ def connect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None):
 
   conn = None
   try:
-    conn, authType, authValue = connectionComp(controlAddr, controlPort)
+    conn, authType, authValue = _make_connection(controlAddr, controlPort)
 
     if authType == AUTH_TYPE.PASSWORD:
       # password authentication, promting for the password if it wasn't provided
@@ -134,7 +134,7 @@ def connect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None):
       print exc
       return None
 
-def connectionComp(controlAddr="127.0.0.1", controlPort=9051):
+def _make_connection(controlAddr="127.0.0.1", controlPort=9051):
   """
   Provides an uninitiated torctl connection components for the control port,
   returning a tuple of the form...