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 33 insertions and 25 deletions:

ennstatus/cli/commands/stats.py

setup.py

0 comments (0 inline, 0 general)

ennstatus/cli/commands/stats.py

➞

Show inline comments

@@ @@ -182,22 +182,27 @@ def exit_probability(obj, by_server): @@
         exit_probability = defaultdict(int)
         for server in servers['exit']:
             for subkey in ('1_week', '1_month', '3_months', '1_year', '5_years'):
                 if server.mean_exit_probability[subkey] is not None:
                     exit_probability[subkey] += server.mean_exit_probability[subkey]
                 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'):
             click.echo(
                 'Mean exit probability over %s: %s' % (
                     click.style(
                         subkey,
                         fg='blue'
                     ),
                     click.style(
                         str(round(exit_probability[subkey], 2)) + '%',
                         fg='red'
             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(
@@ @@ -209,16 +214,19 @@ def exit_probability(obj, by_server): @@
+                )
+            )
             for subkey in ('1_week', '1_month', '3_months', '1_year', '5_years'):
                 if server.mean_exit_probability[subkey] is not None:
                     click.echo(
                         'Mean exit probabilty over %s: %s' % (
                             click.style(
                                 subkey,
                                 fg='blue'
                             ),
                             click.style(
                                 str(round(server.mean_exit_probability[subkey], 2)) + "%",
                                 fg='red'
                 try:
                     if server.mean_exit_probability[subkey] is not None:
                         click.echo(
                             'Mean exit probabilty over %s: %s' % (
                                 click.style(
                                     subkey,
                                     fg='blue'
                                 ),
                                 click.style(
                                     str(round(server.mean_exit_probability[subkey], 2)) + "%",
                                     fg='red'
+                                )
+                            )
+                        )
+                    )
                 except KeyError:
                     continue

setup.py

➞

Show inline comments

@@ @@ -11,7 +11,7 @@ def _get_requirements(): @@
 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',

0 comments (0 inline, 0 general)