October 2017 - tor-commits - lists.torproject.org

[nyx/master] Cpu usage pegged when paused
by atagar＠torproject.org 17 Oct '17

17 Oct '17

commit 523a1f5e06bea0e18da24b055899df8a538a05ce Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 15 08:58:54 2017 -0700 Cpu usage pegged when paused When paused daemon updates turned into a busy loop, pegging the cpu. Actually, I'm unsure why we're checking the paused status at all since daemons still run in the background. --- nyx/panel/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 3e1aa61..ed32887 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -203,7 +203,7 @@ class DaemonPanel(Panel, threading.Thread): last_ran = None while not self._halt: - if nyx_interface().is_paused() or (last_ran and time.time() - last_ran < self._update_rate): + if last_ran and time.time() - last_ran < self._update_rate: sleep_until = last_ran + self._update_rate + 0.1 while not self._halt and time.time() < sleep_until:

1 0

[nyx/master] Don't resolve tor's cwd for relative paths
by atagar＠torproject.org 17 Oct '17

17 Oct '17

commit b8ce3ce084f991dac2e7de6fb5b40fb3824b5fa0 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 11 11:40:12 2017 -0700 Don't resolve tor's cwd for relative paths Tor's DisableDebuggerAttachment feature breaks all methods we attempt to get tor's cwd (/proc, pwdx, and lsof). However, this is fine since we only need the cwd to expand relative paths which doesn't come up much (iirc tor makes more effort nowadays to give only absolute paths). Skipping cwd resolution if a path's relative so we avoid the doomed system calls. --- nyx/__init__.py | 2 +- nyx/tracker.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 89a24c7..d9a9b52 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -343,7 +343,7 @@ def expand_path(path): return None try: - tor_cwd = stem.util.system.cwd(tor_controller().get_pid(None)) + tor_cwd = stem.util.system.cwd(tor_controller().get_pid(None)) if not os.path.isabs(path) else None return chroot() + stem.util.system.expand_path(path, tor_cwd) except IOError as exc: stem.util.log.info('Unable to expand a relative path (%s): %s' % (path, exc)) diff --git a/nyx/tracker.py b/nyx/tracker.py index c41fdad..6d6ab64 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -817,6 +817,7 @@ class ConsensusTracker(object): if cache_age < 3600: stem.util.log.info('Cache is only %s old, no need to refresh it.' % str_tools.time_label(cache_age, is_long = True)) else: + stem.util.log.info('Cache is %s old, refreshing relay information.' % str_tools.time_label(cache_age, is_long = True)) start_time = time.time() ns_response = controller.get_info('ns/all', None)

1 0

[nyx/master] Interpreter scrolling off by one
by atagar＠torproject.org 17 Oct '17

17 Oct '17

commit 85591ab9591a92c1e7b06ce4bdf059fe7912cbdc Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 11 19:06:17 2017 +0200 Interpreter scrolling off by one When the interpreter panel has content the scollbar doesn't report itself as being at the bottom. --- nyx/panel/interpreter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 64a9556..63cceba 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -128,7 +128,7 @@ class InterpreterPanel(nyx.panel.Panel): if len(self._lines) > subwindow.height - 2: self._x_offset = 2 - subwindow.scrollbar(1, scroll, len(self._lines)) + subwindow.scrollbar(1, scroll, len(self._lines) + 1) for i, line in enumerate(self._lines + [prompt]): x, y = self._x_offset, i + 1 - scroll

1 0

[nyx/master] Fetch address at a fixed rate
by atagar＠torproject.org 17 Oct '17

17 Oct '17

commit 41079dcefbf4dec47967dcbcc0ab5bf135dc16ce Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 11 11:07:05 2017 -0700 Fetch address at a fixed rate Stem transparently caches immutable information but our address is a rather strange critter. It can change but hardly ever does, and is used quite a bit. Nyx forced Stem to treat this as being cachable but when our address is unavailable this still accounted for numerous requests. Instead fetching the our address at a fixed rate of once a minute. This provides two benefits... * Avoid pointless requests while there's no network available. * This way we'll evenually update our address if it changes while running. --- nyx/__init__.py | 24 +++++++++++++++++++++--- nyx/panel/connection.py | 5 ++--- nyx/panel/header.py | 4 ++-- nyx/tracker.py | 7 +++---- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index c326cd3..89a24c7 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -9,6 +9,7 @@ Tor curses monitoring application. nyx_interface - nyx interface singleton tor_controller - tor connection singleton cache - provides our application cache + our_address - provides our ip address show_message - shows a message to the user input_prompt - prompts the user for text input @@ -104,9 +105,9 @@ CACHE = None CHROOT = None BASE_DIR = os.path.sep.join(__file__.split(os.path.sep)[:-1]) -# technically can change but we use this query a *lot* so needs to be cached - -stem.control.CACHEABLE_GETINFO_PARAMS = list(stem.control.CACHEABLE_GETINFO_PARAMS) + ['address'] +CACHED_ADDRESS = None +ADDRESS_FETCHED = None +ADDRESS_FETCH_RATE = 60 # disable trace level messages about cache hits @@ -250,6 +251,23 @@ def cache(): return CACHE +def our_address(default = None): + """ + Provides our ip address. + + :param str default: response if address is unavailable + + :returns: **str** with our address + """ + + global CACHED_ADDRESS, ADDRESS_FETCHED + + if ADDRESS_FETCHED is None or (time.time() - ADDRESS_FETCHED) > ADDRESS_FETCH_RATE: + CACHED_ADDRESS = tor_controller().get_info('address', None) + ADDRESS_FETCHED = time.time() + + return CACHED_ADDRESS if CACHED_ADDRESS is not None else default + def show_message(message = None, *attr, **kwargs): """ Shows a message in our header. diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index c172908..8e5873d 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -16,7 +16,7 @@ import nyx.panel import nyx.popups import nyx.tracker -from nyx import PAUSE_TIME, nyx_interface, tor_controller +from nyx import PAUSE_TIME, nyx_interface, tor_controller, our_address from nyx.curses import WHITE, NORMAL, BOLD, HIGHLIGHT from nyx.menu import MenuItem, Submenu, RadioMenuItem, RadioGroup @@ -571,8 +571,7 @@ def _draw_line(subwindow, x, y, line, is_selected, width, current_time): def _draw_address_column(subwindow, x, y, line, attr): - src = tor_controller().get_info('address', line.connection.local_address) - src += ':%s' % line.connection.local_port if line.line_type == LineType.CONNECTION else '' + src = '%s:%s' % (our_address(line.connection.local_address), line.connection.local_port if line.line_type == LineType.CONNECTION else '') if line.line_type == LineType.CIRCUIT_HEADER and line.circuit.status != 'BUILT': dst = 'Building...' diff --git a/nyx/panel/header.py b/nyx/panel/header.py index b1cbfbf..3751d56 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -23,7 +23,7 @@ import nyx.popups import nyx.tracker from stem.util import conf, log -from nyx import nyx_interface, tor_controller +from nyx import nyx_interface, tor_controller, our_address from nyx.curses import RED, GREEN, YELLOW, CYAN, WHITE, BOLD, HIGHLIGHT @@ -268,7 +268,7 @@ class Sampling(object): 'version': str(controller.get_version('Unknown')).split()[0], 'version_status': controller.get_info('status/version/current', 'Unknown'), - 'address': or_listeners[0][0] if (or_listeners and or_listeners[0][0] != '0.0.0.0') else controller.get_info('address', 'Unknown'), + 'address': or_listeners[0][0] if (or_listeners and or_listeners[0][0] != '0.0.0.0') else our_address('Unknown'), 'or_port': or_listeners[0][1] if or_listeners else '', 'dir_port': controller.get_conf('DirPort', '0'), 'control_port': str(control_listeners[0][1]) if control_listeners else None, diff --git a/nyx/tracker.py b/nyx/tracker.py index b2190fe..c41fdad 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -60,7 +60,7 @@ import stem.control import stem.descriptor.router_status_entry import stem.util.log -from nyx import PAUSE_TIME, tor_controller +from nyx import PAUSE_TIME, tor_controller, our_address from stem.util import conf, connection, enum, proc, str_tools, system CONFIG = conf.config_dict('nyx', { @@ -902,7 +902,7 @@ class ConsensusTracker(object): controller = tor_controller() - if address == controller.get_info('address', None): + if our_address() == address: fingerprint = controller.get_info('fingerprint', None) ports = controller.get_ports(stem.control.Listener.OR, None) @@ -923,10 +923,9 @@ class ConsensusTracker(object): controller = tor_controller() if fingerprint == controller.get_info('fingerprint', None): - my_address = controller.get_info('address', None) my_or_ports = controller.get_ports(stem.control.Listener.OR, []) - if my_address and len(my_or_ports) == 1: + if our_address() and len(my_or_ports) == 1: return (my_address, my_or_ports[0]) return nyx.cache().relay_address(fingerprint, default)

1 0

[nyx/master] Fix graph panel deadlock
by atagar＠torproject.org 17 Oct '17

17 Oct '17

commit 9978fd0f37ebb8a295d57f60cb54f16f40955c6e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 15 08:20:54 2017 -0700 Fix graph panel deadlock Replacing stat cloning with a simple lock bought us some performance improvement but it also introduced a deadlocking issue. If redraw is called while we're updating a stat the interface freezes. This can be easily sidestepped by only locking for the stat update and not including the redraw call. --- nyx/panel/graph.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index f62ce55..07fc93b 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -601,12 +601,12 @@ class GraphPanel(nyx.panel.Panel): for stat in self._stats.values(): stat.bandwidth_event(event) - if self._displayed_stat: - param = self._stats[self._displayed_stat] - update_rate = INTERVAL_SECONDS[self._update_interval] + if self._displayed_stat: + param = self._stats[self._displayed_stat] + update_rate = INTERVAL_SECONDS[self._update_interval] - if param.primary.tick % update_rate == 0: - self.redraw() + if param.primary.tick % update_rate == 0: + self.redraw() def _draw_subgraph(subwindow, data, x, width, height, bounds_type, interval, color, fill_char = ' '):

1 0

[stem/master] Skip proc connections with a blank address or port
by atagar＠torproject.org 17 Oct '17

17 Oct '17

commit 5942687b190e01331c8cd28a3100672f6ce7da1e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 15 09:20:24 2017 -0700 Skip proc connections with a blank address or port Can't think of any reason we'd want connections with an undefined address or port, so skipping those entries. This doesn't come up in practice but when I hack my proc contents a bit I get... File "/usr/lib/python2.7/stem/util/lru_cache.py", line 135, in wrapper result = user_function(*args, **kwds) File "/usr/lib/python2.7/stem/exit_policy.py", line 289, in can_exit_to if rule.is_match(address, port, strict): File "/usr/lib/python2.7/stem/exit_policy.py", line 759, in is_match raise ValueError("'%s' isn't a valid port" % port) ValueError: '0' isn't a valid port --- stem/util/proc.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stem/util/proc.py b/stem/util/proc.py index 70096a33..87b53a26 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -439,8 +439,10 @@ def connections(pid = None, user = None): r_addr = _unpack_addr(line[raddr_start:raddr_end]) r_port = int(line[rport_start:rport_end], 16) - if is_udp and (r_addr == '0.0.0.0' or r_addr == '0000:0000:0000:0000:0000:0000') and r_port == 0: - continue # skip udp connections with a blank destination + if r_addr == '0.0.0.0' or r_addr == '0000:0000:0000:0000:0000:0000': + continue # no address + elif l_port == 0 or r_port == 0: + continue # no port conn.append(stem.util.connection.Connection(l_addr, l_port, r_addr, r_port, protocol, is_ipv6)) except IOError as exc:

1 0

[stem/master] Integ failure for HiddenServiceNonAnonymousMode with older tor versions
by atagar＠torproject.org 17 Oct '17

17 Oct '17

commit a3aceae0e638429119130366be5773f85f8d7522 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Oct 11 19:31:56 2017 +0200 Integ failure for HiddenServiceNonAnonymousMode with older tor versions Tor's HiddenServiceNonAnonymousMode option is rather new. Nice that we have an integ test for it, but we should account for versions without it too... ====================================================================== FAIL: test_unanonymous_hidden_service_config_must_match ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 150, in <lambda> self.method = lambda test: self.result(test) # method that can be mixed into TestCases File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 212, in result test.fail(self._result.msg) AssertionError: Expected 'Process terminated: HiddenServiceNonAnonymousMode does not provide any server anonymity. It must be used with HiddenServiceSingleHopMode set to 1.' but was 'Process terminated: Unknown option 'HiddenServiceNonAnonymousMode'. Failing.' --- test/integ/process.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index 59299f81..72cba38b 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -364,7 +364,10 @@ class TestProcess(unittest.TestCase): raise AssertionError("Tor shouldn't start with 'HiddenServiceNonAnonymousMode' set but not 'HiddenServiceSingleHopMode'") except OSError as exc: - assert_equal('Process terminated: HiddenServiceNonAnonymousMode does not provide any server anonymity. It must be used with HiddenServiceSingleHopMode set to 1.', str(exc)) + if test.tor_version() >= stem.version.Requirement.ADD_ONION_NON_ANONYMOUS: + assert_equal('Process terminated: HiddenServiceNonAnonymousMode does not provide any server anonymity. It must be used with HiddenServiceSingleHopMode set to 1.', str(exc)) + else: + assert_equal("Process terminated: Unknown option 'HiddenServiceNonAnonymousMode'. Failing.", str(exc)) try: stem.process.launch_tor_with_config( @@ -374,7 +377,10 @@ class TestProcess(unittest.TestCase): raise AssertionError("Tor shouldn't start with 'HiddenServiceSingleHopMode' set but not 'HiddenServiceNonAnonymousMode'") except OSError as exc: - assert_equal('Process terminated: HiddenServiceSingleHopMode does not provide any server anonymity. It must be used with HiddenServiceNonAnonymousMode set to 1.', str(exc)) + if test.tor_version() >= stem.version.Requirement.ADD_ONION_NON_ANONYMOUS: + assert_equal('Process terminated: HiddenServiceSingleHopMode does not provide any server anonymity. It must be used with HiddenServiceNonAnonymousMode set to 1.', str(exc)) + else: + assert_equal("Process terminated: Unknown option 'HiddenServiceSingleHopMode'. Failing.", str(exc)) @asynchronous def test_can_run_multithreaded(tor_cmd):

1 0

[stem/master] Regression for python3 with stem.util.proc
by atagar＠torproject.org 17 Oct '17

17 Oct '17

commit 820f3e9b33a8604c595f5dc1bf65cfb196c4b28d Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 17 03:50:22 2017 -0700 Regression for python3 with stem.util.proc Fixing bytes normalization issues that broke our stem.util.proc unit tests for python3. --- stem/util/proc.py | 30 +++++++++++++++--------------- test/unit/util/proc.py | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/stem/util/proc.py b/stem/util/proc.py index 87b53a26..3afdf162 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -372,22 +372,22 @@ def connections(pid = None, user = None): raise IOError("This requires python's pwd module, which is unavailable on Windows.") inodes = _inodes_for_sockets(pid) if pid else set() - process_uid = str(pwd.getpwnam(user).pw_uid) if user else None + process_uid = stem.util.str_tools._to_bytes(str(pwd.getpwnam(user).pw_uid)) if user else None for proc_file_path in ('/proc/net/tcp', '/proc/net/tcp6', '/proc/net/udp', '/proc/net/udp6'): if proc_file_path.endswith('6') and not os.path.exists(proc_file_path): continue # ipv6 proc contents are optional protocol = proc_file_path[10:].rstrip('6') # 'tcp' or 'udp' - is_tcp, is_udp, is_ipv6 = protocol == 'tcp', protocol == 'udp', proc_file_path.endswith('6') + is_tcp, is_ipv6 = protocol == 'tcp', proc_file_path.endswith('6') title = '' try: with open(proc_file_path, 'rb') as proc_file: title = proc_file.readline() - if 'local_address' in title: - laddr_start = title.index('local_address') + if b'local_address' in title: + laddr_start = title.index(b'local_address') laddr_end = laddr_start + (8 if not is_ipv6 else 32) lport_start = laddr_end + 1 @@ -395,8 +395,8 @@ def connections(pid = None, user = None): else: raise IOError("title line missing 'local_address', %s" % title) - if 'rem_address' in title or 'remote_address' in title: - raddr_start = title.index('rem_address') if 'rem_address' in title else title.index('remote_address') + if b'rem_address' in title or b'remote_address' in title: + raddr_start = title.index(b'rem_address') if b'rem_address' in title else title.index(b'remote_address') raddr_end = raddr_start + (8 if not is_ipv6 else 32) rport_start = raddr_end + 1 @@ -404,29 +404,29 @@ def connections(pid = None, user = None): else: raise IOError("title line missing 'remote_address', %s" % title) - if 'st' in title: - status_start = title.index('st') + if b'st' in title: + status_start = title.index(b'st') status_end = status_start + 2 else: raise IOError("title line missing 'st', %s" % title) - if 'retrnsmt' in title and 'uid' in title: + if b'retrnsmt' in title and b'uid' in title: # unlike the above fields uid is right aligned - uid_start = title.index('retrnsmt') + 9 - uid_end = title.index('uid') + 3 - elif 'retrnsmt' not in title: + uid_start = title.index(b'retrnsmt') + 9 + uid_end = title.index(b'uid') + 3 + elif b'retrnsmt' not in title: raise IOError("title line missing 'retrnsmt', %s" % title) else: raise IOError("title line missing 'uid', %s" % title) - if 'timeout' in title: + if b'timeout' in title: # inodes can lack a header, and are a dynamic size - inode_start = title.index('timeout') + 8 + inode_start = title.index(b'timeout') + 8 else: raise IOError("title line missing 'timeout', %s" % title) for line in proc_file: - if inodes and line[inode_start:].split(' ', 1)[0] not in inodes: + if inodes and line[inode_start:].split(b' ', 1)[0] not in inodes: continue elif process_uid and line[uid_start:uid_end].strip() != process_uid: continue diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index 4d9c8ffa..4c24b279 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -16,7 +16,7 @@ try: except ImportError: from mock import Mock, patch -TITLE_LINE = 'sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout' +TITLE_LINE = b'sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout' TCP6_CONTENT = b"""\ sl local_address remote_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode

1 0

[stem/master] Python3 errors due to list modificaion during iteration
by atagar＠torproject.org 17 Oct '17

17 Oct '17

commit 49c084d8388551804a84fb638db8db28acd0a0ef Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 17 03:55:01 2017 -0700 Python3 errors due to list modificaion during iteration When iterating over keys python 2.x makes a shallow clone of lists whereas python 3.x doesn't. Good for performance, but means we need to be careful about modifying a list during iteration. Caught thanks to our integ tests... ====================================================================== ERROR: test_without_ephemeral_hidden_services ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/require.py", line 58, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/require.py", line 58, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/integ/control/controller.py", line 560, in test_without_ephemeral_hidden_services self.assertEqual([], controller.list_ephemeral_hidden_services()) File "/home/atagar/Desktop/stem/stem/control.py", line 475, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/stem/control.py", line 2774, in list_ephemeral_hidden_services result += self.get_info('onions/current').split('\n') File "/home/atagar/Desktop/stem/stem/control.py", line 475, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/stem/control.py", line 1191, in get_info self._set_cache(to_cache, 'getinfo') File "/home/atagar/Desktop/stem/stem/control.py", line 3112, in _set_cache for cache_key in self._request_cache.keys(): RuntimeError: dictionary changed size during iteration --- stem/control.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index ce339da9..ac18c3bc 100644 --- a/stem/control.py +++ b/stem/control.py @@ -3109,7 +3109,7 @@ class Controller(BaseController): # if no params are provided then clear the namespace if not params and namespace: - for cache_key in self._request_cache.keys(): + for cache_key in list(self._request_cache.keys()): if cache_key.startswith('%s.' % namespace): del self._request_cache[cache_key] @@ -3122,7 +3122,7 @@ class Controller(BaseController): cache_key = key if value is None: - if cache_key in self._request_cache: + if cache_key in list(self._request_cache.keys()): del self._request_cache[cache_key] else: self._request_cache[cache_key] = value

1 0

[stem/master] Minor simplification for cache fetches
by atagar＠torproject.org 17 Oct '17

17 Oct '17

commit e134dc59de93de3aef2ae1ec6e9b7a2f194c8eff Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 17 11:48:58 2017 -0700 Minor simplification for cache fetches Good spot for map to simplify this a tad. --- stem/control.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/stem/control.py b/stem/control.py index ac18c3bc..b6d49d22 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1147,8 +1147,7 @@ class Controller(BaseController): # check for cached results - from_cache = [param.lower() for param in params] - cached_results = self._get_cache_map(from_cache, 'getinfo') + cached_results = self._get_cache_map(map(str.lower, params), 'getinfo') for key in cached_results: user_expected_key = _case_insensitive_lookup(params, key) @@ -2163,13 +2162,10 @@ class Controller(BaseController): if params == []: return {} - # translate context sensitive options - lookup_params = set([MAPPED_CONFIG_KEYS.get(entry, entry) for entry in params]) - - # check for cached results + # check for cached results, translating context sensitive options - from_cache = [param.lower() for param in lookup_params] - cached_results = self._get_cache_map(from_cache, 'getconf') + lookup_params = set([MAPPED_CONFIG_KEYS.get(entry, entry) for entry in params]) + cached_results = self._get_cache_map(map(str.lower, lookup_params), 'getconf') for key in cached_results: user_expected_key = _case_insensitive_lookup(lookup_params, key)

1 0