[wwwsearch-commits] r43936 - wwwsearch/mechanize/trunk/mechanize

[jjlee at codespeak.net]

Author: jjlee
Date: Thu May 31 02:12:29 2007
New Revision: 43936

Modified:
   wwwsearch/mechanize/trunk/mechanize/__init__.py
   wwwsearch/mechanize/trunk/mechanize/_urllib2.py
   wwwsearch/mechanize/trunk/mechanize/_useragent.py
Log:
Remove gopher support, since Python 2.6 no longer supports it (titus at caltech.edu)

Modified: wwwsearch/mechanize/trunk/mechanize/__init__.py
==============================================================================
--- wwwsearch/mechanize/trunk/mechanize/__init__.py	(original)
+++ wwwsearch/mechanize/trunk/mechanize/__init__.py	Thu May 31 02:12:29 2007
@@ -17,8 +17,6 @@
     'FileHandler',
     'FormNotFoundError',
     'FormsFactory',
-    'GopherError',
-    'GopherHandler',
     'HTTPBasicAuthHandler',
     'HTTPCookieProcessor',
     'HTTPDefaultErrorHandler',

Modified: wwwsearch/mechanize/trunk/mechanize/_urllib2.py
==============================================================================
--- wwwsearch/mechanize/trunk/mechanize/_urllib2.py	(original)
+++ wwwsearch/mechanize/trunk/mechanize/_urllib2.py	Thu May 31 02:12:29 2007
@@ -2,8 +2,7 @@
 # ...from urllib2...
 from urllib2 import \
      URLError, \
-     HTTPError, \
-     GopherError
+     HTTPError
 # ...and from mechanize
 from _opener import OpenerDirector, \
      SeekableResponseOpener, \
@@ -32,8 +31,7 @@
      UnknownHandler, \
      FTPHandler, \
      CacheFTPHandler, \
-     FileHandler, \
-     GopherHandler
+     FileHandler
 # ...and from mechanize
 from _http import \
      HTTPHandler, \

Modified: wwwsearch/mechanize/trunk/mechanize/_useragent.py
==============================================================================
--- wwwsearch/mechanize/trunk/mechanize/_useragent.py	(original)
+++ wwwsearch/mechanize/trunk/mechanize/_useragent.py	Thu May 31 02:12:29 2007
@@ -50,7 +50,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,
@@ -77,7 +76,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",
                       ]