# HG changeset patch # User Dennis Fink # Date 2014-07-07 14:41:24 # Node ID e2671a34fdef0dd197e56a40a7fe10710c4fdd31 # Parent 4a4e9bdb9f8d1d0ebe72ba492cf7ee8cdca18a89 More pythonic checking if a value is not in a dictionary diff --git a/ennstatus/api/functions.py b/ennstatus/api/functions.py --- a/ennstatus/api/functions.py +++ b/ennstatus/api/functions.py @@ -26,10 +26,10 @@ gi4 = pygeoip.GeoIP('/usr/share/GeoIP/Ge def check_json_format(server): for key in ('server_type', 'server_name', 'tor_status'): - if not key in server: + if key not in server: raise ValueError('%s key not present!\n' % key) - if not server['server_type'] in ('Exit', 'Relay', 'Bridge'): + if server['server_type'] not in ('Exit', 'Relay', 'Bridge'): error_message = ('server_type has not the right content!' ' is: %s must be one of: Exit, Relay or Bridge\n') \ % server['server_type'] @@ -41,7 +41,7 @@ def check_json_format(server): % server['tor_status'] if server['server_type'] in ('Exit', 'Relay'): - if not 'fingerprint' in server: + if 'fingerprint' not in server: raise ValueError('fingerprint key not present!\n') else: if FINGERPRINT_REGEX.match(server['fingerprint']) is None: