[Zope3-checkins] SVN: Zope3/trunk/src/mechanize/_u - Remove any trace of gopher here, it's gone in Python 2.6. Newer versions of mechanize already removed this, but one step at a time.

[Sidnei da Silva]

Log message for revision 92175:
   - Remove any trace of gopher here, it's gone in Python 2.6. Newer versions of mechanize already removed this, but one step at a time.

Changed:
  U   Zope3/trunk/src/mechanize/_urllib2.py
  U   Zope3/trunk/src/mechanize/_useragent.py

-=-
Modified: Zope3/trunk/src/mechanize/_urllib2.py
===================================================================
--- Zope3/trunk/src/mechanize/_urllib2.py	2008-10-13 20:39:01 UTC (rev 92174)
+++ Zope3/trunk/src/mechanize/_urllib2.py	2008-10-13 21:07:59 UTC (rev 92175)
@@ -3,7 +3,6 @@
 from urllib2 import \
      URLError, \
      HTTPError, \
-     GopherError, \
      HTTPPasswordMgr, \
      HTTPPasswordMgrWithDefaultRealm, \
      AbstractBasicAuthHandler, \
@@ -32,7 +31,6 @@
      FTPHandler, \
      CacheFTPHandler, \
      FileHandler, \
-     GopherHandler
 # ...and from mechanize
 from _urllib2_support import \
      HTTPHandler, \

Modified: Zope3/trunk/src/mechanize/_useragent.py
===================================================================
--- Zope3/trunk/src/mechanize/_useragent.py	2008-10-13 20:39:01 UTC (rev 92174)
+++ Zope3/trunk/src/mechanize/_useragent.py	2008-10-13 21:07:59 UTC (rev 92175)
@@ -59,7 +59,6 @@
         # CacheFTPHandler is buggy, at least in 2.3, so we don't use it
         "ftp": _urllib2.FTPHandler,
         "file": _urllib2.FileHandler,
-        "gopher": _urllib2.GopherHandler,
 
         # other handlers
         "_unknown": _urllib2.UnknownHandler,
@@ -88,7 +87,7 @@
         "_debug_response_body": _urllib2.HTTPResponseDebugProcessor,
         }
 
-    default_schemes = ["http", "ftp", "file", "gopher"]
+    default_schemes = ["http", "ftp", "file"]
     default_others = ["_unknown", "_http_error", "_http_request_upgrade",
                       "_http_default_error",
                       ]