diff options
| author | René Moser <mail@renemoser.net> | 2016-06-02 09:31:08 +0200 |
|---|---|---|
| committer | René Moser <mail@renemoser.net> | 2016-06-02 09:31:08 +0200 |
| commit | 4874ceefa59ac85a57943ac59c90c3b23d7550f3 (patch) | |
| tree | 4a1c62d9e64badb0e3d0f11213c7b4e5bd3c5b37 | |
| parent | bb6504c8d351ea188712c6c4976fe521ec3f189c (diff) | |
| download | ansible-modules-extras-4874ceefa59ac85a57943ac59c90c3b23d7550f3.tar.gz | |
letsencrypt: fix tests failures (#2360)
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | web_infrastructure/letsencrypt.py | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 9b54c2dd..f9e21227 100644 --- a/.travis.yml +++ b/.travis.yml @@ -140,7 +140,7 @@ install: - pip install git+https://github.com/ansible/ansible.git@devel#egg=ansible - pip install git+https://github.com/sivel/ansible-testing.git#egg=ansible_testing script: - - python2.4 -m compileall -fq -x 'cloud/|monitoring/zabbix.*\.py|/dnf\.py|/layman\.py|/maven_artifact\.py|clustering/(consul.*|znode)\.py|notification/pushbullet\.py|database/influxdb/influxdb.*\.py|database/mssql/mssql_db\.py' . + - python2.4 -m compileall -fq -x 'cloud/|monitoring/zabbix.*\.py|/dnf\.py|/layman\.py|/maven_artifact\.py|clustering/(consul.*|znode)\.py|notification/pushbullet\.py|database/influxdb/influxdb.*\.py|database/mssql/mssql_db\.py|/letsencrypt\.py' . - python2.6 -m compileall -fq . - python2.7 -m compileall -fq . - python3.4 -m compileall -fq . -x $(echo "$PY3_EXCLUDE_LIST"| tr ' ' '|') diff --git a/web_infrastructure/letsencrypt.py b/web_infrastructure/letsencrypt.py index 35d521a8..81cbb28e 100644 --- a/web_infrastructure/letsencrypt.py +++ b/web_infrastructure/letsencrypt.py @@ -47,6 +47,8 @@ description: - "Although the defaults are choosen so that the module can be used with the Let's Encrypt CA, the module can be used with any service using the ACME protocol." +requirements: + - "python >= 2.6" options: account_key: description: @@ -214,7 +216,7 @@ def write_file(module, dest, content): f = open(tmpsrc, 'wb') try: f.write(content) - except Exception, err: + except Exception as err: os.remove(tmpsrc) module.fail_json(msg="failed to create temporary content file: %s" % str(err)) f.close() @@ -246,7 +248,7 @@ def write_file(module, dest, content): try: shutil.copyfile(tmpsrc, dest) changed = True - except Exception, err: + except Exception as err: os.remove(tmpsrc) module.fail_json(msg="failed to copy %s to %s: %s" % (tmpsrc, dest, str(err))) os.remove(tmpsrc) @@ -350,7 +352,7 @@ class ACMEAccount(object): try: payload64 = nopad_b64(self.module.jsonify(payload).encode('utf8')) protected64 = nopad_b64(self.module.jsonify(protected).encode('utf8')) - except Exception, e: + except Exception as e: self.module.fail_json(msg="Failed to encode payload / headers as JSON: {0}".format(e)) openssl_sign_cmd = [self._openssl_bin, "dgst", "-sha256", "-sign", self.key] |