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

@@ @@ -75,49 +75,49 @@ class ServerDecoder(json.JSONDecoder): @@
                 current_app.logger.debug('{}: {}'.format(
                     key, default_obj[key]
+                )
+                )
                 default_obj[key] = ipaddress.ip_address(default_obj[key])
         current_app.logger.debug('Loading last_updated')
         default_obj['last_updated'] = datetime.fromtimestamp(
             strict_rfc3339.rfc3339_to_timestamp(default_obj['last_updated'])
+        )
         return default_obj
 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']
             default_weights = {
                 '1_week': None,
                 '1_month': None,
                 '3_months': None,
                 '1_year': None,
                 '5_years': None
+            }
             self.mean_consensus_weight = kwargs.get(
                 'mean_consensus_weight',
                 default_weights
+            )

ennstatus/api/schema/server.json

➞

Show inline comments

@@ @@ -70,49 +70,49 @@ @@
                 "Slovakia", "Slovenia", "Solomon Islands", "Somalia",
                 "South Africa", "South Georgia and the South Sandwich Islands",
                 "South Sudan", "Spain", "Sri Lanka", "Sudan", "Suriname",
                 "Svalbard and Jan Mayen", "Swaziland", "Sweden", "Switzerland",
                 "Syrian Arab Republic", "Taiwan", "Tajikistan",
                 "Tanzania, United Republic of", "Thailand", "Timor-Leste",
                 "Togo", "Tokelau", "Tonga", "Trinidad and Tobago", "Tunisia",
                 "Turkey", "Turkmenistan", "Turks and Caicos Islands", "Tuvalu",
                 "Uganda", "Ukraine", "United Arab Emirates", "United Kingdom",
                 "United States", "United States Minor Outlying Islands",
                 "Uruguay", "Uzbekistan", "Vanuatu", "Venezuela", "Vietnam",
                 "Virgin Islands, British", "Virgin Islands, U.S.",
                 "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",
         "status",
         "last_updated",
         "country",
         "fingerprint",
         "type"
     ],
     "definitions": {
         "weights": {
             "type": "object",
             "properties": {
                 "1_week": {
                     "$ref": "#/definitions/weights_data"

setup.py

➞

Show inline comments

 from setuptools import setup, find_packages
 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',
+          ]
       },
       classifiers=['Development Status :: 5 - Production/Stable',
                    'Environment :: Web Environment',
                    'Operating System :: POSIX',
                    'Programming Language :: Python',
                    'Programming Language :: Python :: 3',
                    'Programming Language :: Python :: 3.3',
                    'Topic :: Internet',
                    'Topic :: Internet :: WWW/HTTP',
                    'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
                    'Topic :: Internet :: WWW/HTTP :: WSGI',

0 comments (0 inline, 0 general)