commit 72b00c7c4ab7cf82d256ebe3507649249f5d7b4a Author: Damian Johnson <atagar@torproject.org> Date: Tue Apr 12 16:03:46 2011 +0000 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). svn:r24593 --- ChangeLog | 2 +- src/interface/connections/connEntry.py | 15 --------------- src/interface/connections/entries.py | 19 ------------------- 3 files changed, 1 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index bee46bd..7baec68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,7 +47,7 @@ This release chiefly consists of a fully reimplemented connection panel. Besides * 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. diff --git a/src/interface/connections/connEntry.py b/src/interface/connections/connEntry.py index 3f4ec6b..ba171d4 100644 --- a/src/interface/connections/connEntry.py +++ b/src/interface/connections/connEntry.py @@ -332,21 +332,6 @@ class ConnectionLine(entries.ConnectionPanelLine): 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 diff --git a/src/interface/connections/entries.py b/src/interface/connections/entries.py index 7748f05..6b24412 100644 --- a/src/interface/connections/entries.py +++ b/src/interface/connections/entries.py @@ -154,25 +154,6 @@ class ConnectionPanelLine: # 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.