[tor-commits] [arm/master] Minor fixes spotted while prepping for release

[atagar at torproject.org]

commit d84dc4dba0c3143337ba6ebbf50f75df33ae6e15
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Sep 24 17:53:25 2011 -0700

    Minor fixes spotted while prepping for release
---
 README                      |    1 +
 src/cli/interpretorPanel.py |    2 +-
 src/util/__init__.py        |    2 +-
 src/util/torTools.py        |    1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index cbaf2f7..87a6141 100644
--- a/README
+++ b/README
@@ -208,6 +208,7 @@ Layout:
       sysTools.py    - helper for system calls, providing client side caching
       textInput.py   - expands the capabilities of text input fields
       torConfig.py   - functions for working with the torrc and config options
+      torInterpretor.py - provides a shell around raw control port access
       torTools.py    - TorCtl wrapper, providing caching and derived information
       uiTools.py     - helper functions for presenting the user interface
 
diff --git a/src/cli/interpretorPanel.py b/src/cli/interpretorPanel.py
index 283c371..37b9e58 100644
--- a/src/cli/interpretorPanel.py
+++ b/src/cli/interpretorPanel.py
@@ -77,7 +77,7 @@ class InterpretorPanel(panel.Panel):
         isDone = True
       else:
         try:
-          inputEntry, outputEntry = self.interpretor.handleQuery(input)
+          self.interpretor.handleQuery(input)
         except torInterpretor.InterpretorClosed:
           # Makes our control connection check if its been closed or not
           torTools.getConn().isAlive()
diff --git a/src/util/__init__.py b/src/util/__init__.py
index 973527e..2b8f928 100644
--- a/src/util/__init__.py
+++ b/src/util/__init__.py
@@ -4,5 +4,5 @@ application's status, making cross platform system calls, parsing tor data,
 and safely working with curses (hiding some of the gory details).
 """
 
-__all__ = ["conf", "connections", "enum", "gtkTools", "hostnames", "log", "panel", "procTools", "procName", "sysTools", "textInput", "torConfig", "torTools", "uiTools"]
+__all__ = ["conf", "connections", "enum", "gtkTools", "hostnames", "log", "panel", "procTools", "procName", "sysTools", "textInput", "torConfig", "torInterpretor", "torTools", "uiTools"]
 
diff --git a/src/util/torTools.py b/src/util/torTools.py
index 9f06a61..8e2d6d5 100644
--- a/src/util/torTools.py
+++ b/src/util/torTools.py
@@ -123,7 +123,6 @@ def connect_socket(socketPath="/var/run/tor/control", ConnClass=TorCtl.Connectio
     ConnClass  - connection type to instantiate
   """
 
-  import socket
   try:
     s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
     s.connect(socketPath)