Suppress new deprecation warnings when running the
test suite.
For urllib2, move the import of gopherlib into the
only function that uses it: users (including the
test suite) certainly shouldn't see a deprecation
warning just because they import urllib2! If they
actually use gopher_open(), fine, _then_ they should
see a deprecation warning.
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 683867a..7bf5314 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -9,6 +9,10 @@
r'pre$')
warnings.filterwarnings("ignore", ".* regsub .*", DeprecationWarning,
r'^regsub$')
+warnings.filterwarnings("ignore",
+ "the gopherlib module is deprecated",
+ DeprecationWarning,
+ "<string>")
class AllTest(unittest.TestCase):
diff --git a/Lib/test/test_imageop.py b/Lib/test/test_imageop.py
index 7b32bbc..b01e83f 100755
--- a/Lib/test/test_imageop.py
+++ b/Lib/test/test_imageop.py
@@ -9,6 +9,12 @@
import imageop, uu, os
+import warnings
+warnings.filterwarnings("ignore",
+ "the rgbimg module is deprecated",
+ DeprecationWarning,
+ ".*test_imageop")
+
def main(use_rgbimg=1):
# Create binary test files
diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py
index 394d966..fd10b68 100644
--- a/Lib/test/test_sundry.py
+++ b/Lib/test/test_sundry.py
@@ -4,6 +4,11 @@
warnings.filterwarnings('ignore', r".*posixfile module",
DeprecationWarning, 'posixfile$')
+warnings.filterwarnings("ignore",
+ "the gopherlib module is deprecated",
+ DeprecationWarning,
+ ".*test_sundry")
+
from test.test_support import verbose
import BaseHTTPServer
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 19bf082..4c83bfc 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -89,7 +89,6 @@
import base64
import ftplib
-import gopherlib
import httplib
import inspect
import md5
@@ -1259,6 +1258,7 @@
class GopherHandler(BaseHandler):
def gopher_open(self, req):
+ import gopherlib # this raises DeprecationWarning in 2.5
host = req.get_host()
if not host:
raise GopherError('no host given')