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

Changeset - 4e684d8a45c1

Parent rev.

Child rev.

[Not reviewed]

Merge dev

0 3 0

Dennis Fink - 9 years ago 2015-10-20 01:40:53
dennis.fink@c3l.lu

Merged hotfix-api-bandwidth

3 files changed with 3 insertions and 3 deletions:

ennstatus/api/model.py

ennstatus/api/schema/server.json

setup.py

0 comments (0 inline, 0 general)

ennstatus/api/model.py

➞

Show inline comments

@@ @@ -87,25 +87,25 @@ class ServerDecoder(json.JSONDecoder): @@
 class Server:
     def __init__(self, *args, **kwargs):
         self.name = kwargs['name']
         self.type = kwargs['type']
         self.status = kwargs.get('status')
         self.fingerprint = kwargs['fingerprint']
         self.last_updated = kwargs['last_updated']
         self.country = kwargs['country']
-        self.bandwith = kwargs.get('bandwith')
+        self.bandwidth = kwargs.get('bandwidth')
         if self.type == 'bridge':
             self.obfs = kwargs.get('obfs')
             self.fteproxy = kwargs.get('fteproxy')
             self.flashproxy = kwargs.get('flashproxy')
             self.meek = kwargs.get('meek')
         else:
             self.ip = kwargs['ip']
             if 'ip6' in kwargs:
                 self.ip6 = kwargs['ip6']

ennstatus/api/schema/server.json

➞

Show inline comments

@@ @@ -82,25 +82,25 @@ @@
                 "Wallis and Futuna", "Western Sahara", "Yemen", "Zambia",
                 "Zimbabwe"
+            ]
         },
         "fingerprint": {
             "type": "string",
             "pattern": "^[a-zA-Z0-9]{40}$"
         },
         "last_updated": {
             "type": "string",
             "format": "date-time"
         },
-        "bandwith": {
+        "bandwidth": {
             "type": [
                 "string",
                 "null"
             ],
             "default": null
         },
         "type": {
             "type": "string"
+        }
     },
     "required": [
         "name",

setup.py

➞

Show inline comments

@@ @@ -2,25 +2,25 @@ from setuptools import setup, find_packa @@
 def _get_requirements():
     with open('requirements.in', encoding='utf-8') as f:
         lines = f.readlines()
     lines = [line[:-1] for line in lines if not line.startswith('#')]
     return lines
 setup(name='Ennstatus',
-      version='5.0.1-dev',
+      version='5.0.2-dev',
       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+',
       packages=find_packages(),
       install_requires=_get_requirements(),
       include_package_data=True,
       entry_points={
           'console_scripts': [
               'ennstatuscli = ennstatus.cli:cli',

0 comments (0 inline, 0 general)