FVDE/ennstatus Changeset - e2671a34fdef · Chaos Computer Club Lëtzebuerg Projects

Changeset - e2671a34fdef

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Dennis Fink - 11 years ago 2014-07-07 14:41:24
dennis.fink@c3l.lu

More pythonic checking if a value is not in a dictionary

1 file changed with 3 insertions and 3 deletions:

ennstatus/api/functions.py

0 comments (0 inline, 0 general)

ennstatus/api/functions.py

➞

Show inline comments

@@ @@ -23,28 +23,28 @@ DATE_FORMAT = '%d-%m-%Y %H:%M:%S' @@
 gi4 = pygeoip.GeoIP('/usr/share/GeoIP/GeoIP.dat', pygeoip.MEMORY_CACHE)
 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']
         raise ValueError(error_message)
     if not server['tor_status'] in ('Online', 'Offline'):
         error_message = ('tor_status has not the right content!'
                          ' is: %s must be one of: Online or Offline\n') \
             % 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:
                 raise ValueError('fingerprint has not the right format!\n')
     else:

0 comments (0 inline, 0 general)