[tor-commits] [arm/master] fix: Minor refactoring for moved/removed resources

[atagar at torproject.org]

commit 30f9ad4e138848cc012f45842a972d2065612eb7
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed Apr 27 08:32:40 2011 -0700

    fix: Minor refactoring for moved/removed resources
    
    Missed a couple spots where the connPanel and /src/interface were referenced.
---
 README              |   17 ++++++++---------
 src/cli/__init__.py |    2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 7beb7e3..50657a1 100644
--- a/README
+++ b/README
@@ -139,14 +139,7 @@ Layout:
     torConfigDesc.txt - fallback descriptions of Tor's configuration options
     uninstall         - removal script
     
-    interface/
-      connections/
-        __init__.py
-        connPanel.py      - (page 2) lists the active tor connections
-        circEntry.py      - circuit entries in the connection panel
-        connEntry.py      - individual connections to or from the system
-        entries.py        - common parent for connPanel display entries
-      
+    cli/
       graphing/
         __init__.py
         graphPanel.py     - (page 1) presents graphs for data instances
@@ -154,13 +147,19 @@ Layout:
         psStats.py        - tracks system information (such as cpu/memory usage)
         connStats.py      - tracks number of tor connections
       
+      connections/
+        __init__.py
+        connPanel.py      - (page 2) lists the active tor connections
+        circEntry.py      - circuit entries in the connection panel
+        connEntry.py      - individual connections to or from the system
+        entries.py        - common parent for connPanel display entries
+      
       __init__.py
       controller.py          - main display loop, handling input and layout
       headerPanel.py         - top of all pages, providing general information
       descriptorPopup.py     - (popup) displays connection descriptor data
       
       logPanel.py            - (page 1) displays tor, arm, and torctl events
-      connPanel.py           - (page 2) deprecated counterpart for connections/*
       configPanel.py         - (page 3) editor panel for the tor configuration
       torrcPanel.py          - (page 4) displays torrc and validation
     
diff --git a/src/cli/__init__.py b/src/cli/__init__.py
index 0f11fc1..171af09 100644
--- a/src/cli/__init__.py
+++ b/src/cli/__init__.py
@@ -2,5 +2,5 @@
 Panels, popups, and handlers comprising the arm user interface.
 """
 
-__all__ = ["configPanel", "connPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "torrcPanel"]
+__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "torrcPanel"]