Changeset - 85e51fafd8b3
[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:
0 comments (0 inline, 0 general)
ennstatus/cli/commands/stats.py
Show inline comments
 
@@ -182,10 +182,13 @@ 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'):
 
                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(
 
@@ -198,6 +201,8 @@ def exit_probability(obj, by_server):
 
                    )
 
                )
 
            )
 
            except KeyError:
 
                continue
 
    else:
 
        for server in servers['exit']:
 
            click.echo(
 
@@ -209,6 +214,7 @@ def exit_probability(obj, by_server):
 
                )
 
            )
 
            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' % (
 
@@ -222,3 +228,5 @@ def exit_probability(obj, by_server):
 
                            )
 
                        )
 
                    )
 
                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)