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

Changeset - 5a9d06b7e07d

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Dennis Fink - 11 years ago 2014-07-16 20:14:38
dennis.fink@c3l.lu

Fix bridge checking and version bump

2 files changed with 3 insertions and 4 deletions:

ennstatus/api/functions.py

setup.py

0 comments (0 inline, 0 general)

ennstatus/api/functions.py

➞

Show inline comments

@@ @@ -26,14 +26,13 @@ def check_bridge(key, server): @@
     if key not in server:
         raise ValueError('%s key not present!\n' % key)
     else:
         if not isinstance(server[key], bool):
             error_message = ('%s has not the right type!'
                              ' Needs to be a boolean!\n') \
                 % key
                              ' Needs to be a boolean!\n') % key
             raise ValueError(error_message)
 def check_json_format(server):
     for key in ('server_type', 'server_name', 'tor_status', 'fingerprint'):
@@ @@ -51,13 +50,13 @@ def check_json_format(server): @@
                          ' is: %s must be one of: Online or Offline\n') \
             % server['tor_status']
     if FINGERPRINT_REGEX.match(server['fingerprint']) is None:
         raise ValueError('fingerprint has not the right format!\n')
-    if server['server_type'] == 'bridge':
+    if server['server_type'] == 'Bridge':
         for key in ('obfs', 'fteproxy', 'flashproxy', 'meek'):
             check_bridge(key, server)
     if 'ip' in server:
         if IP_REGEX.match(server['ip']) is None:
             raise ValueError('ip is not the right format!\n')

setup.py

➞

Show inline comments

@@ @@ -8,13 +8,13 @@ def _get_requirements(): @@
     lines = [line[:-1] for line in lines if not line.startswith('#')]
     return lines
 setup(name='Ennstatus',
-      version='4.2.0',
+      version='4.2.1',
       description=('Ennstatus provides the user with vital information about '
                    'the status of the organizations Tor servers.'),
       author='Frënn vun der Ënn',
       author_email='info@enn.lu',
       url='https://bitbucket.org/fvde/ennstatus',
       license='GPLv3+',

0 comments (0 inline, 0 general)