[tor-commits] [arm/master] Dropping unused setOptions() method

atagar at torproject.org atagar at torproject.org
Sun Jun 2 03:14:48 UTC 2013

commit 57754b9927d8c26f371707ad0363881432609a3b
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Jun 1 19:38:35 2013 -0700

    Dropping unused setOptions() method
    Arm's Controller was meant to be a complete wrapper around TorCtl, and as such
    it provided some funtionality that arm itself doesn't use. One instance of this
    is setOptions() which allowed the Controller to set multiple configuration
    options at once. There's no method for doing this in the curses interface so
    dropping the method.
 src/util/torTools.py |   19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/util/torTools.py b/src/util/torTools.py
index adc4d93..7c8eb9c 100644
--- a/src/util/torTools.py
+++ b/src/util/torTools.py
@@ -228,30 +228,13 @@ class Controller:
               list of strings)
-    self.setOptions(((param, value),))
-  def setOptions(self, paramList, isReset = False):
-    """
-    Issues a SETCONF to replace a set of configuration options. This takes a
-    list of parameter/new value tuple pairs. Values can be...
-    - a string to set a single value
-    - a list of strings to set a series of values (for instance the ExitPolicy)
-    - None to set the value to 0 or NULL
-    Arguments:
-      paramList - list of parameter/value tuple pairs
-      isReset   - issues a RESETCONF instead of SETCONF, causing any None
-                  mappings to revert the parameter to its default rather than
-                  set it to 0 or NULL
-    """
       if not self.isAlive():
         raise stem.SocketClosed()
-      self.controller.set_options(paramList, isReset)
+      self.controller.set_conf(param, value)
     except stem.SocketClosed, exc:
       raise exc

More information about the tor-commits mailing list