Commit 4a51180f authored by Maarten de Waard's avatar Maarten de Waard 🤘🏻
Browse files

stage1

parent 52ee2c75
......@@ -523,7 +523,7 @@ class HAProxyInstaller(common.Plugin):
contents = pem.read()
if self._cert_key_check(contents, filepath):
yield (filepath, filepath, self.conf("haproxy-config"))
except IOError, err:
except IOError as err:
logger.error(
"Can't access \"%s\", reason:\n %s",
filepath,
......@@ -544,7 +544,7 @@ class HAProxyInstaller(common.Plugin):
except TypeError:
logger.warn("Could not read certificate, wrong type (not PEM)")
# Documentation says it raises "Error"
except Exception, err: # pylint: disable=broad-except
except Exception as err: # pylint: disable=broad-except
logger.error("Unexpected error! %s", err)
if issuer == self.conf('haproxy-ca-common-name') and key.check():
......
"""Certbot HAProxy Tests"""
from __future__ import print_function
import unittest
......@@ -6,7 +7,7 @@ def load_tests(loader, tests, pattern=None):
"""Find all python files in the tests folder"""
if pattern is None:
pattern = 'test_*.py'
print "loader: ", loader
print("loader: ", loader)
suite = loader.discover('certbot_haproxy/tests', pattern=pattern)
suite.addTests(tests)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment