[Python-checkins] python/dist/src/Lib urllib2.py,1.30,1.31

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv26841

Modified Files:
	urllib2.py 
Log Message:
Fix HTTPError __init__ for cases where fp is None.

The HTTPError class tries to act as a regular response objects for
HTTP protocol errors that include full responses.  If the failure is
more basic, like no valid response, the __init__ choked when it tried
to initialize its superclasses in addinfourl hierarchy that requires a
valid response.

The solution isn't elegant but seems to be effective.  Do not
initialize the base classes if there isn't a file object containing
the response.  In this case, user code expecting to use the addinfourl
methods will fail; but it was going to fail anyway.

It might be cleaner to factor out HTTPError into two classes, only one
of which inherits from addinfourl.  Not sure that the extra complexity
would lead to any improved functionality, though.

Partial fix for SF bug # 563665.

Bug fix candidate for 2.1 and 2.2.


Index: urllib2.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** urllib2.py	3 Jun 2002 15:58:32 -0000	1.30
--- urllib2.py	3 Jun 2002 16:53:00 -0000	1.31
***************
*** 158,168 ****
  
      def __init__(self, url, code, msg, hdrs, fp):
-         self.__super_init(fp, hdrs, url)
          self.code = code
          self.msg = msg
          self.hdrs = hdrs
          self.fp = fp
-         # XXX
          self.filename = url
  
      def __str__(self):
--- 158,172 ----
  
      def __init__(self, url, code, msg, hdrs, fp):
          self.code = code
          self.msg = msg
          self.hdrs = hdrs
          self.fp = fp
          self.filename = url
+         # The addinfourl classes depend on fp being a valid file
+         # object.  In some cases, the HTTPError may not have a valid
+         # file object.  If this happens, the simplest workaround is to
+         # not initialize the base classes.  
+         if fp is not None:
+             self.__super_init(fp, hdrs, url)
  
      def __str__(self):