Commit 706824f1 authored by Georg Brandl's avatar Georg Brandl

More codestring -> codebytes.

parent 3ed0deb9
...@@ -391,9 +391,9 @@ def main(): ...@@ -391,9 +391,9 @@ def main():
def test(): def test():
s0 = b"Aladdin:open sesame" s0 = b"Aladdin:open sesame"
print(repr(s0)) print(repr(s0))
s1 = encodestring(s0) s1 = encodebytes(s0)
print(repr(s1)) print(repr(s1))
s2 = decodestring(s1) s2 = decodebytes(s1)
print(repr(s2)) print(repr(s2))
assert s0 == s2 assert s0 == s2
......
...@@ -127,7 +127,7 @@ class upload(PyPIRCCommand): ...@@ -127,7 +127,7 @@ class upload(PyPIRCCommand):
user_pass = (self.username + ":" + self.password).encode('ascii') user_pass = (self.username + ":" + self.password).encode('ascii')
# The exact encoding of the authentication string is debated. # The exact encoding of the authentication string is debated.
# Anyway PyPI only accepts ascii for both username or password. # Anyway PyPI only accepts ascii for both username or password.
auth = "Basic " + base64.encodestring(user_pass).strip().decode('ascii') auth = "Basic " + base64.encodebytes(user_pass).strip().decode('ascii')
# Build up the MIME payload for the POST data # Build up the MIME payload for the POST data
boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254' boundary = '--------------GHSKFJDLGDS7543FJKLFHRE75642756743254'
......
...@@ -944,7 +944,7 @@ class TestMIMEAudio(unittest.TestCase): ...@@ -944,7 +944,7 @@ class TestMIMEAudio(unittest.TestCase):
def test_encoding(self): def test_encoding(self):
payload = self._au.get_payload() payload = self._au.get_payload()
self.assertEqual(base64.decodestring(payload), self._audiodata) self.assertEqual(base64.decodebytes(payload), self._audiodata)
def test_checkSetMinor(self): def test_checkSetMinor(self):
au = MIMEAudio(self._audiodata, 'fish') au = MIMEAudio(self._audiodata, 'fish')
...@@ -984,7 +984,7 @@ class TestMIMEImage(unittest.TestCase): ...@@ -984,7 +984,7 @@ class TestMIMEImage(unittest.TestCase):
def test_encoding(self): def test_encoding(self):
payload = self._im.get_payload() payload = self._im.get_payload()
self.assertEqual(base64.decodestring(payload), self._imgdata) self.assertEqual(base64.decodebytes(payload), self._imgdata)
def test_checkSetMinor(self): def test_checkSetMinor(self):
im = MIMEImage(self._imgdata, 'fish') im = MIMEImage(self._imgdata, 'fish')
......
...@@ -985,7 +985,7 @@ class CGIHTTPRequestHandler(SimpleHTTPRequestHandler): ...@@ -985,7 +985,7 @@ class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
if authorization[0].lower() == "basic": if authorization[0].lower() == "basic":
try: try:
authorization = authorization[1].encode('ascii') authorization = authorization[1].encode('ascii')
authorization = base64.decodestring(authorization).\ authorization = base64.decodebytes(authorization).\
decode('ascii') decode('ascii')
except (binascii.Error, UnicodeError): except (binascii.Error, UnicodeError):
pass pass
......
...@@ -316,7 +316,7 @@ class Plist(_InternalDict): ...@@ -316,7 +316,7 @@ class Plist(_InternalDict):
def _encodeBase64(s, maxlinelength=76): def _encodeBase64(s, maxlinelength=76):
# copied from base64.encodestring(), with added maxlinelength argument # copied from base64.encodebytes(), with added maxlinelength argument
maxbinsize = (maxlinelength//4)*3 maxbinsize = (maxlinelength//4)*3
pieces = [] pieces = []
for i in range(0, len(s), maxbinsize): for i in range(0, len(s), maxbinsize):
...@@ -335,7 +335,7 @@ class Data: ...@@ -335,7 +335,7 @@ class Data:
@classmethod @classmethod
def fromBase64(cls, data): def fromBase64(cls, data):
# base64.decodestring just calls binascii.a2b_base64; # base64.decodebytes just calls binascii.a2b_base64;
# it seems overkill to use both base64 and binascii. # it seems overkill to use both base64 and binascii.
return cls(binascii.a2b_base64(data)) return cls(binascii.a2b_base64(data))
......
...@@ -540,7 +540,7 @@ class SMTP: ...@@ -540,7 +540,7 @@ class SMTP:
""" """
def encode_cram_md5(challenge, user, password): def encode_cram_md5(challenge, user, password):
challenge = base64.decodestring(challenge) challenge = base64.decodebytes(challenge)
response = user + " " + hmac.HMAC(password.encode('ascii'), response = user + " " + hmac.HMAC(password.encode('ascii'),
challenge).hexdigest() challenge).hexdigest()
return encode_base64(response.encode('ascii'), eol='') return encode_base64(response.encode('ascii'), eol='')
......
...@@ -413,7 +413,7 @@ def PEM_cert_to_DER_cert(pem_cert_string): ...@@ -413,7 +413,7 @@ def PEM_cert_to_DER_cert(pem_cert_string):
raise ValueError("Invalid PEM encoding; must end with %s" raise ValueError("Invalid PEM encoding; must end with %s"
% PEM_FOOTER) % PEM_FOOTER)
d = pem_cert_string.strip()[len(PEM_HEADER):-len(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): def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None):
"""Retrieve the certificate from the server at the specified address, """Retrieve the certificate from the server at the specified address,
......
...@@ -65,13 +65,13 @@ class GettextBaseTest(unittest.TestCase): ...@@ -65,13 +65,13 @@ class GettextBaseTest(unittest.TestCase):
if not os.path.isdir(LOCALEDIR): if not os.path.isdir(LOCALEDIR):
os.makedirs(LOCALEDIR) os.makedirs(LOCALEDIR)
fp = open(MOFILE, 'wb') fp = open(MOFILE, 'wb')
fp.write(base64.decodestring(GNU_MO_DATA)) fp.write(base64.decodebytes(GNU_MO_DATA))
fp.close() fp.close()
fp = open(UMOFILE, 'wb') fp = open(UMOFILE, 'wb')
fp.write(base64.decodestring(UMO_DATA)) fp.write(base64.decodebytes(UMO_DATA))
fp.close() fp.close()
fp = open(MMOFILE, 'wb') fp = open(MMOFILE, 'wb')
fp.write(base64.decodestring(MMO_DATA)) fp.write(base64.decodebytes(MMO_DATA))
fp.close() fp.close()
self.env = support.EnvironmentVarGuard() self.env = support.EnvironmentVarGuard()
self.env['LANGUAGE'] = 'xx' self.env['LANGUAGE'] = 'xx'
......
...@@ -1050,7 +1050,7 @@ class HandlerTests(unittest.TestCase): ...@@ -1050,7 +1050,7 @@ class HandlerTests(unittest.TestCase):
self.assertFalse(http_handler.requests[0].has_header(auth_header)) self.assertFalse(http_handler.requests[0].has_header(auth_header))
userpass = bytes('%s:%s' % (user, password), "ascii") userpass = bytes('%s:%s' % (user, password), "ascii")
auth_hdr_value = ('Basic ' + auth_hdr_value = ('Basic ' +
base64.encodestring(userpass).strip().decode()) base64.encodebytes(userpass).strip().decode())
self.assertEqual(http_handler.requests[1].get_header(auth_header), self.assertEqual(http_handler.requests[1].get_header(auth_header),
auth_hdr_value) auth_hdr_value)
......
...@@ -1758,7 +1758,8 @@ class URLopener: ...@@ -1758,7 +1758,8 @@ class URLopener:
msg.append('Content-type: %s' % type) msg.append('Content-type: %s' % type)
if encoding == 'base64': if encoding == 'base64':
import base64 import base64
data = base64.decodestring(data) # XXX is this encoding/decoding ok?
data = base64.decodebytes(data.encode('ascii')).decode('latin1')
else: else:
data = unquote(data) data = unquote(data)
msg.append('Content-Length: %d' % len(data)) msg.append('Content-Length: %d' % len(data))
......
Markdown is supported
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