From: Brett Cannon <bcannon@gmail.com>
Date: Sat, 16 Aug 2008 21:56:03 +0000 (+0000)
Subject: Silence the DeprecationWarning raised in httplib when mimetools is imported.
X-Git-Tag: v2.6b3~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a4128eae2dd808750b7196151ab3d7a99585353;p=thirdparty%2FPython%2Fcpython.git

Silence the DeprecationWarning raised in httplib when mimetools is imported.
---

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 81020b7810f6..62cd0c74974f 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 53158d17de31..5d1feea77715 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.