Use new email module names (#1637162, #1637159, #1637157).
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index a7305ce..a5c82a8 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -43,10 +43,10 @@
import socket
import re
-import email.Utils
+import email.utils
import base64
import hmac
-from email.base64MIME import encode as encode_base64
+from email.base64mime import encode as encode_base64
from sys import stderr
__all__ = ["SMTPException","SMTPServerDisconnected","SMTPResponseException",
@@ -172,7 +172,7 @@
"""
m = (None, None)
try:
- m = email.Utils.parseaddr(addr)[1]
+ m = email.utils.parseaddr(addr)[1]
except AttributeError:
pass
if m == (None, None): # Indicates parse failure or AttributeError