From: Georg Brandl <georg@python.org>
Date: Mon, 6 Dec 2010 22:25:25 +0000 (+0000)
Subject: Don't use deprecated aliases.
X-Git-Tag: v3.2b2~198
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c23ea2e88777798fcf1ca6d20c6cbbd8c1cacec;p=python

Don't use deprecated aliases.
---

diff --git a/Lib/encodings/base64_codec.py b/Lib/encodings/base64_codec.py
index e8b19ee237..321a961782 100644
--- a/Lib/encodings/base64_codec.py
+++ b/Lib/encodings/base64_codec.py
@@ -13,11 +13,11 @@ import base64
 
 def base64_encode(input, errors='strict'):
     assert errors == 'strict'
-    return (base64.encodestring(input), len(input))
+    return (base64.encodebytes(input), len(input))
 
 def base64_decode(input, errors='strict'):
     assert errors == 'strict'
-    return (base64.decodestring(input), len(input))
+    return (base64.decodebytes(input), len(input))
 
 class Codec(codecs.Codec):
     def encode(self, input, errors='strict'):
@@ -28,12 +28,12 @@ class Codec(codecs.Codec):
 class IncrementalEncoder(codecs.IncrementalEncoder):
     def encode(self, input, final=False):
         assert self.errors == 'strict'
-        return base64.encodestring(input)
+        return base64.encodebytes(input)
 
 class IncrementalDecoder(codecs.IncrementalDecoder):
     def decode(self, input, final=False):
         assert self.errors == 'strict'
-        return base64.decodestring(input)
+        return base64.decodebytes(input)
 
 class StreamWriter(Codec, codecs.StreamWriter):
     charbuffertype = bytes