[tor-commits] r24593: {arm} Dropping the descriptor popup stubs from the new interface. (in arm/trunk: . src/interface/connections)

[Damian Johnson]

Author: atagar
Date: 2011-04-12 16:03:46 +0000 (Tue, 12 Apr 2011)
New Revision: 24593

Modified:
   arm/trunk/ChangeLog
   arm/trunk/src/interface/connections/connEntry.py
   arm/trunk/src/interface/connections/entries.py
Log:
Dropping the descriptor popup stubs from the new interface. This was feature creep and its capabilities will be almost entirely redundant with raw control port access (which is coming in a couple releases).



Modified: arm/trunk/ChangeLog
===================================================================
--- arm/trunk/ChangeLog	2011-04-12 15:57:47 UTC (rev 24592)
+++ arm/trunk/ChangeLog	2011-04-12 16:03:46 UTC (rev 24593)
@@ -47,7 +47,7 @@
     * fix: the 'startup.dataDirectory' config option was being ignored
     * fix: recognizing the proper private ip ranges of the 172.* block
     * fix: missing 'is default' option from config sort ordering
-    * fix (4/4/11): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard)
+    * fix (4/4/11, r24562): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard)
 
 1/7/11 - version 1.4.1 (r24054)
 Platform specific enhancements including BSD compatibility and vastly improved performance on Linux.

Modified: arm/trunk/src/interface/connections/connEntry.py
===================================================================
--- arm/trunk/src/interface/connections/connEntry.py	2011-04-12 15:57:47 UTC (rev 24592)
+++ arm/trunk/src/interface/connections/connEntry.py	2011-04-12 16:03:46 UTC (rev 24593)
@@ -332,21 +332,6 @@
     detailFormat = curses.A_BOLD | uiTools.getColor(CATEGORY_COLOR[self.getType()])
     return [uiTools.DrawEntry(line, detailFormat) for line in self._getDetailContent(width)]
   
-  def _getDescriptors(self, width):
-    """
-    Provides raw descriptor information for the relay.
-    
-    Arguments:
-      width - available space to display in
-    """
-    
-    # TODO: Porting and refactoring the descriptorPopup.py functionality is
-    # gonna take quite a bit of work. This is a very rarely used feature and
-    # not worth delaying the 1.4.2 release any further, so this will be a part
-    # of 1.4.3.
-    
-    return []
-  
   def resetDisplay(self):
     entries.ConnectionPanelLine.resetDisplay(self)
     self.cachedType = None

Modified: arm/trunk/src/interface/connections/entries.py
===================================================================
--- arm/trunk/src/interface/connections/entries.py	2011-04-12 15:57:47 UTC (rev 24592)
+++ arm/trunk/src/interface/connections/entries.py	2011-04-12 16:03:46 UTC (rev 24593)
@@ -154,25 +154,6 @@
     # implementation of getDetails
     return []
   
-  def getDescriptor(self, width):
-    """
-    Provides a list of DrawEntry instances with descriptor information for
-    this connection.
-    
-    Arguments:
-      width - available space to display in
-    """
-    
-    if self._descriptorCacheArgs != width:
-      self._descriptorCache = self._getDescriptor(width)
-      self._descriptorCacheArgs = width
-    
-    return self._descriptorCache
-  
-  def _getDescriptor(self, width):
-    # implementation of getDescriptor
-    return []
-  
   def resetDisplay(self):
     """
     Flushes cached display results.