[tor-commits] [stem/master] Drop workaround for 'GETINFO onions/current' behavior change

atagar at torproject.org atagar at torproject.org
Mon Feb 10 03:14:50 UTC 2020


commit 74615ebfa801f28d3e85ff1e7c52f38b4953297c
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Feb 8 13:17:42 2020 -0800

    Drop workaround for 'GETINFO onions/current' behavior change
    
    Back in 2017 we changed this GETINFO option's behavior to return an empty list
    rather than error when no results are available. THis is long enough that we
    can drop this normalization.
    
      https://trac.torproject.org/projects/tor/ticket/21329
---
 stem/control.py | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/stem/control.py b/stem/control.py
index ff984b57..4016e762 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -2788,16 +2788,7 @@ class Controller(BaseController):
     result = []
 
     if our_services:
-      try:
-        result += self.get_info('onions/current').split('\n')
-      except (stem.ProtocolError, stem.OperationFailed) as exc:
-        # TODO: Tor's behavior around this was changed in Feb 2017, we should
-        # drop it when all versions that did this are deprecated...
-        #
-        #   https://trac.torproject.org/projects/tor/ticket/21329
-
-        if 'No onion services of the specified type.' not in str(exc):
-          raise
+      result += self.get_info('onions/current').split('\n')
 
     if detached:
       try:





More information about the tor-commits mailing list