upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-05 06:42:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

s/six\.binary_type/bytes/g

Browse source
This commit is contained in:
Brad Warren 2021-02-08 12:12:21 -08:00
parent cc2e7e745b
commit 25f497aba7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
certbot-compatibility-test/certbot_compatibility_test/validator.py
View file

@ -18,11 +18,11 @@ class Validator(object):
"""Verifies the certificate presented at name is cert"""
if alt_host is None:
host = socket.gethostbyname(name).encode()
elif isinstance(alt_host, six.binary_type):
elif isinstance(alt_host, bytes):
host = alt_host
else:
host = alt_host.encode()
name = name if isinstance(name, six.binary_type) else name.encode()
name = name if isinstance(name, bytes) else name.encode()
try:
presented_cert = crypto_util.probe_sni(name, host, port)

2
certbot/certbot/util.py
View file

@ -517,7 +517,7 @@ def enforce_domain_sanity(domain):
"""
# Unicode
try:
if isinstance(domain, six.binary_type):
if isinstance(domain, bytes):
domain = domain.decode('utf-8')
domain.encode('ascii')
except UnicodeError: