diff options
| author | Brad Warren <bmw@users.noreply.github.com> | 2020-11-06 02:28:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 02:28:35 +0300 |
| commit | 75365f1d4e92c552f8ec69b97c0534adbd51f1d6 (patch) | |
| tree | b6e19eb17593b594b8e811395d208c09d527aad7 /certbot-compatibility-test | |
| parent | e570e8ad3230ed5ce24191cde9bbbc6d2a54b630 (diff) | |
Remove python_version setting from mypy.ini (#8426)
* Remove python_version from mypy.ini.
* Fix magic_typing
* Ignore msvcrt usage.
* make mypy happier
* clean up changes
* Add type for reporter queue
* More mypy fixes
* Fix pyrfc3339 str.
* Remove unused import.
* Make certbot.util mypy work in both Pythons
* Fix typo
Diffstat (limited to 'certbot-compatibility-test')
| -rw-r--r-- | certbot-compatibility-test/certbot_compatibility_test/configurators/common.py | 3 | ||||
| -rw-r--r-- | certbot-compatibility-test/certbot_compatibility_test/validator.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py b/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py index b592d6288..34aa9133f 100644 --- a/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py +++ b/certbot-compatibility-test/certbot_compatibility_test/configurators/common.py @@ -69,11 +69,10 @@ class Proxy(object): shutil.copy(cert_path, cert) key = os.path.join(cert_and_key_dir, "key") shutil.copy(key_path, key) + chain = None if chain_path: chain = os.path.join(cert_and_key_dir, "chain") shutil.copy(chain_path, chain) - else: - chain = None return cert, key, chain diff --git a/certbot-compatibility-test/certbot_compatibility_test/validator.py b/certbot-compatibility-test/certbot_compatibility_test/validator.py index b527ce16b..bfa03f22d 100644 --- a/certbot-compatibility-test/certbot_compatibility_test/validator.py +++ b/certbot-compatibility-test/certbot_compatibility_test/validator.py @@ -18,7 +18,7 @@ class Validator(object): def certificate(self, cert, name, alt_host=None, port=443): """Verifies the certificate presented at name is cert""" if alt_host is None: - host = socket.gethostbyname(name) + host = socket.gethostbyname(name).encode() elif isinstance(alt_host, six.binary_type): host = alt_host else: |