summaryrefslogtreecommitdiffstats
path: root/Lib/email/encoders.py
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2011-03-16 21:09:41 (GMT)
committerReid Kleckner <reid@kleckner.net>2011-03-16 21:09:41 (GMT)
commit04055f0cf9fda66fa9e4da4fe60c4f240f54bafe (patch)
tree72deb54786ad491003f861311f7b5fe92d9b4609 /Lib/email/encoders.py
parentda9ac728a84778317e1d529f88e47b6d34a5a6b6 (diff)
parentbb35299fcd62d22a513dd33b8f9656de101575a6 (diff)
downloadcpython-04055f0cf9fda66fa9e4da4fe60c4f240f54bafe.zip
cpython-04055f0cf9fda66fa9e4da4fe60c4f240f54bafe.tar.gz
cpython-04055f0cf9fda66fa9e4da4fe60c4f240f54bafe.tar.bz2
Merged with hg.python.org.
Diffstat (limited to 'Lib/email/encoders.py')
-rw-r--r--Lib/email/encoders.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/email/encoders.py b/Lib/email/encoders.py
index c66f4cc..e5c099f 100644
--- a/Lib/email/encoders.py
+++ b/Lib/email/encoders.py
@@ -12,7 +12,7 @@ __all__ = [
]
-from base64 import b64encode as _bencode
+from base64 import encodebytes as _bencode
from quopri import encodestring as _encodestring