[wwwsearch-commits] r27812 - in wwwsearch/mechanize/trunk: . mechanize

[jjlee at codespeak.net]

Author: jjlee
Date: Mon May 29 00:00:57 2006
New Revision: 27812

Modified:
   wwwsearch/mechanize/trunk/README.html.in
   wwwsearch/mechanize/trunk/mechanize/_request.py
Log:
Finish syncing up against 2.5 changes and seeing what I can get rid of now depend on 2.3 instead of 2.0

Modified: wwwsearch/mechanize/trunk/README.html.in
==============================================================================
--- wwwsearch/mechanize/trunk/README.html.in	(original)
+++ wwwsearch/mechanize/trunk/README.html.in	Mon May 29 00:00:57 2006
@@ -283,8 +283,6 @@
 <em>This is <strong>very</strong> roughly in order of priority</em>
 
 <ul>
-  <li>Can maybe switch back to using some stuff direct from urllib2
-    now using 2.3 -- e.g. maybe HTTPRedirectHandler?
   <li>Test <code>.any_response()</code> two handlers case: ordering.
   <li>Test referer bugs (frags and don't add in redirect unless orig
     req had Referer)

Modified: wwwsearch/mechanize/trunk/mechanize/_request.py
==============================================================================
--- wwwsearch/mechanize/trunk/mechanize/_request.py	(original)
+++ wwwsearch/mechanize/trunk/mechanize/_request.py	Mon May 29 00:00:57 2006
@@ -15,7 +15,7 @@
 
 class Request(urllib2.Request):
     def __init__(self, url, data=None, headers={},
-             origin_req_host=None, unverifiable=False):
+                 origin_req_host=None, unverifiable=False):
         urllib2.Request.__init__(self, url, data, headers)
         self.unredirected_hdrs = {}
 
@@ -43,10 +43,8 @@
 
     def has_header(self, header_name):
         """True iff request has named header (regular or unredirected)."""
-        if (self.headers.has_key(header_name) or
-            self.unredirected_hdrs.has_key(header_name)):
-            return True
-        return False
+        return (header_name in self.headers or
+                header_name in self.unredirected_hdrs)
 
     def get_header(self, header_name, default=None):
         return self.headers.get(