[Patch #988602] Move the urllib2 tests into the test framework

Lib/urllib2.py

@@ -1274,80 +1274,3 @@ class OpenerFactory:
             if inspect.isclass(ph):
                 ph = ph()
             opener.add_handler(ph)
-
-if __name__ == "__main__":
-    # XXX some of the test code depends on machine configurations that
-    # are internal to CNRI.   Need to set up a public server with the
-    # right authentication configuration for test purposes.
-    if socket.gethostname() == 'bitdiddle':
-        localhost = 'bitdiddle.cnri.reston.va.us'
-    elif socket.gethostname() == 'bitdiddle.concentric.net':
-        localhost = 'localhost'
-    else:
-        localhost = None
-    urls = [
-        # Thanks to Fred for finding these!
-        'gopher://gopher.lib.ncsu.edu/11/library/stacks/Alex',
-        'gopher://gopher.vt.edu:10010/10/33',
-
-        'file:/etc/passwd',
-        'file://nonsensename/etc/passwd',
-        'ftp://www.python.org/pub/python/misc/sousa.au',
-        'ftp://www.python.org/pub/tmp/blat',
-        'http://www.espn.com/', # redirect
-        'http://www.python.org/Spanish/Inquistion/',
-        ('http://www.python.org/cgi-bin/faqw.py',
-         'query=pythonistas&querytype=simple&casefold=yes&req=search'),
-        'http://www.python.org/',
-        'ftp://gatekeeper.research.compaq.com/pub/DEC/SRC/research-reports/00README-Legal-Rules-Regs',
-            ]
-
-##    if localhost is not None:
-##        urls = urls + [
-##            'file://%s/etc/passwd' % localhost,
-##            'http://%s/simple/' % localhost,
-##            'http://%s/digest/' % localhost,
-##            'http://%s/not/found.h' % localhost,
-##            ]
-
-##        bauth = HTTPBasicAuthHandler()
-##        bauth.add_password('basic_test_realm', localhost, 'jhylton',
-##                           'password')
-##        dauth = HTTPDigestAuthHandler()
-##        dauth.add_password('digest_test_realm', localhost, 'jhylton',
-##                           'password')
-
-
-    cfh = CacheFTPHandler()
-    cfh.setTimeout(1)
-
-##    # XXX try out some custom proxy objects too!
-##    def at_cnri(req):
-##        host = req.get_host()
-##        print host
-##        if host[-18:] == '.cnri.reston.va.us':
-##            return 1
-##    p = CustomProxy('http', at_cnri, 'proxy.cnri.reston.va.us')
-##    ph = CustomProxyHandler(p)
-
-##    install_opener(build_opener(dauth, bauth, cfh, GopherHandler, ph))
-    install_opener(build_opener(cfh, GopherHandler))
-
-    for url in urls:
-        if isinstance(url, tuple):
-            url, req = url
-        else:
-            req = None
-        print url
-        try:
-            f = urlopen(url, req)
-        except IOError, err:
-            print "IOError:", err
-        except socket.error, err:
-            print "socket.error:", err
-        else:
-            buf = f.read()
-            f.close()
-            print "read %d bytes" % len(buf)
-        print
-        time.sleep(0.1)