Make ./pep8.travis.sh run cleanly

98% whitespace.
This commit is contained in:
Sharif Nassar
2015-10-20 22:24:58 -07:00
parent 2cab4e577e
commit 424f4f08b9
6 changed files with 29 additions and 23 deletions
@@ -176,7 +176,8 @@ class NginxConfiguratorTest(util.NginxTest):
['listen', 'somename:8080'],
['include', 'server.conf'],
[['location', '/'],
[['root', 'html'], ['index', 'index.html index.htm']]]]],
[['root', 'html'],
['index', 'index.html index.htm']]]]],
2))
def test_get_all_certs_keys(self):
+5 -3
View File
@@ -308,6 +308,7 @@ def _auth_from_domains(le_client, config, domains, plugins):
return lineage
def set_configurator(previously, now):
"""
Setting configurators multiple ways is okay, as long as they all agree
@@ -319,10 +320,11 @@ def set_configurator(previously, now):
return previously
if previously:
if previously != now:
msg = "Too many flags setting configurators/installers/authenticators %s -> %s"
raise PluginSelectionError, msg % (`previously`, `now`)
msg = "Too many flags setting configurators/installers/authenticators {0} -> {1}"
raise PluginSelectionError(msg.format(repr(previously), repr(now)))
return now
def diagnose_configurator_problem(cfg_type, requested, plugins):
"""
Raise the most helpful error message about a plugin being unavailable
@@ -351,7 +353,7 @@ def diagnose_configurator_problem(cfg_type, requested, plugins):
'"letsencrypt-auto auth" to get a cert you can install manually')
else:
msg = "{0} could not be determined or is not installed".format(cfg_type)
raise PluginSelectionError, msg
raise PluginSelectionError(msg)
def choose_configurator_plugins(args, config, plugins, verb):
+3
View File
@@ -24,6 +24,7 @@ class SubprocessError(Error):
class CertStorageError(Error):
"""Generic `.CertStorage` error."""
# Auth Handler Errors
class AuthorizationError(Error):
"""Authorization error."""
@@ -64,9 +65,11 @@ class DvsniError(DvAuthError):
class PluginError(Error):
"""Let's Encrypt Plugin error."""
class PluginSelectionError(Error):
"""A problem with plugin/configurator selection or setup"""
class NoInstallationError(PluginError):
"""Let's Encrypt No Installation error."""