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

Changeset - 85e51fafd8b3

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 2 0

Dennis Fink - 9 years ago 2016-05-16 14:33:54
dennis.fink@c3l.lu

Merged hotfix-ennstatuscli-key-error

2 files changed with 10 insertions and 2 deletions:

ennstatus/cli/commands/stats.py

setup.py

0 comments (0 inline, 0 general)

ennstatus/cli/commands/stats.py

➞

Show inline comments

@@ @@ -179,39 +179,45 @@ def exit_probability(obj, by_server): @@
         servers = split_all_servers_to_types()
     if not by_server:
         exit_probability = defaultdict(int)
         for server in servers['exit']:
             for subkey in ('1_week', '1_month', '3_months', '1_year', '5_years'):
                 try:
                 if server.mean_exit_probability[subkey] is not None:
                     exit_probability[subkey] += server.mean_exit_probability[subkey]
                 except KeyError:
                     continue
         for subkey in ('1_week', '1_month', '3_months', '1_year', '5_years'):
             try:
             click.echo(
                 'Mean exit probability over %s: %s' % (
                     click.style(
                         subkey,
                         fg='blue'
                     ),
                     click.style(
                         str(round(exit_probability[subkey], 2)) + '%',
                         fg='red'
+                    )
+                )
+            )
             except KeyError:
                 continue
     else:
         for server in servers['exit']:
             click.echo(
                 click.style(
                     server.name.capitalize(),
                     fg='red',
                     bold=True,
                     underline=True
+                )
+            )
             for subkey in ('1_week', '1_month', '3_months', '1_year', '5_years'):
                 try:
                 if server.mean_exit_probability[subkey] is not None:
                     click.echo(
                         'Mean exit probabilty over %s: %s' % (
                             click.style(
                                 subkey,
                                 fg='blue'
@@ @@ -219,6 +225,8 @@ def exit_probability(obj, by_server): @@
                             click.style(
                                 str(round(server.mean_exit_probability[subkey], 2)) + "%",
                                 fg='red'
+                            )
+                        )
+                    )
                 except KeyError:
                     continue

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='5.4.5',
+      version='5.4.6',
       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)