From fd1ba90c16c810381d3dd9a49322c7c6280d86fa Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sat, 26 May 2018 14:42:36 +0100 Subject: [PATCH 1/1] peerdb/tripe-newpeers.in: Abolish `ConfigSection.has_option'. Instead, the caller just catches `MissingKeyException'. --- peerdb/tripe-newpeers.in | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/peerdb/tripe-newpeers.in b/peerdb/tripe-newpeers.in index ed87189f..304d34ac 100644 --- a/peerdb/tripe-newpeers.in +++ b/peerdb/tripe-newpeers.in @@ -199,14 +199,6 @@ class ConfigSection (object): string) return string - def has_option(me, key): - """ - Decide whether this section has a configuration key KEY. - - This version of the method properly handles the @inherit key. - """ - return key == 'name' or me._get(key)[0] is not None - def _get(me, key, map = None, path = None): """ Low-level option-fetching method. @@ -525,11 +517,13 @@ def output(conf, cdb): label = sec.name else: label = 'P%s' % sec.name - if sec.has_option('auto') and \ - sec.get('auto') in ('y', 'yes', 't', 'true', '1', 'on'): - auto.append(sec.name) - if sec.has_option('user'): - cdb.add('U%s' % sec.get('user')) + try: a = sec.get('auto') + except MissingKeyException: pass + else: + if a in ('y', 'yes', 't', 'true', '1', 'on'): auto.append(sec.name) + try: u = sec.get('user') + except MissingKeyException: pass + else: cdb.add('U%s' % u) url = M.URLEncode(laxp = True, semip = True) for key, value in sorted(sec.items(), key = lambda (k, v): k): if not key.startswith('@'): -- 2.11.0