summaryrefslogtreecommitdiffstats
path: root/Lib/ssl.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-06-04 09:42:55 (GMT)
committerGeorg Brandl <georg@python.org>2009-06-04 09:42:55 (GMT)
commit706824f19f734e5e567f32d989376547c0ae08da (patch)
tree0cd5ff7ccc373a848f409b572f1bd1ae727fd8fe /Lib/ssl.py
parent3ed0deb9af03c3546ebe583c38ccfd0c5e364196 (diff)
downloadcpython-706824f19f734e5e567f32d989376547c0ae08da.zip
cpython-706824f19f734e5e567f32d989376547c0ae08da.tar.gz
cpython-706824f19f734e5e567f32d989376547c0ae08da.tar.bz2
More codestring -> codebytes.
Diffstat (limited to 'Lib/ssl.py')
-rw-r--r--Lib/ssl.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py
index d3c1d32..6a6a1a3 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -413,7 +413,7 @@ def PEM_cert_to_DER_cert(pem_cert_string):
raise ValueError("Invalid PEM encoding; must end with %s"
% PEM_FOOTER)
d = pem_cert_string.strip()[len(PEM_HEADER):-len(PEM_FOOTER)]
- return base64.decodestring(d.encode('ASCII', 'strict'))
+ return base64.decodebytes(d.encode('ASCII', 'strict'))
def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None):
"""Retrieve the certificate from the server at the specified address,