Silence the DeprecationWarning raised in httplib when mimetools is imported.

2 files changed, 6 insertions, 2 deletions

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 81020b7..62cd0c7 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -66,10 +66,14 @@ Req-started-unread-response    _CS_REQ_STARTED    <response_class>
 Req-sent-unread-response       _CS_REQ_SENT       <response_class>
 """
 
-import mimetools
 import socket
 from urlparse import urlsplit
 import warnings
+from test.test_support import catch_warning
+with catch_warning(record=False):
+    warnings.filterwarnings("ignore", ".*mimetools has been removed",
+                            DeprecationWarning)
+    import mimetools
 
 try:
     from cStringIO import StringIO
diff --git a/Misc/NEWS b/Misc/NEWS
index 53158d1..5d1feea 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -49,7 +49,7 @@ Library
 -------
 
 - Silence the DeprecationWarning raised when importing mimetools in
-  BaseHTTPServer.
+  BaseHTTPServer, httplib.
 
 - Issue #2776: fixed small issue when handling an URL with double slash
   after a 302 response in the case of not going through a proxy.