# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 2006-06-16 13:00:37
# Node ID 5eb02f9ed80449fe0dd72e5e794f6a727b2b8ef7
# Parent  c660691fb45d2cc1a411556e877e796c5a80b84c

Update keepalive.py to current CVS version of urlgrabber.

This fixes a bug where the output of test-bad-pull would differ
between python 2.3 and 2.4.  Also update the expected output of
this test.

diff --git a/mercurial/keepalive.py b/mercurial/keepalive.py
--- a/mercurial/keepalive.py
+++ b/mercurial/keepalive.py
@@ -99,7 +99,7 @@ EXTRA ATTRIBUTES AND METHODS
 
 """
 
-# $Id: keepalive.py,v 1.13 2005/10/22 21:57:28 mstenner Exp $
+# $Id: keepalive.py,v 1.14 2006/04/04 21:00:32 mstenner Exp $
 
 import urllib2
 import httplib
@@ -249,12 +249,14 @@ class HTTPHandler(urllib2.HTTPHandler):
         r._url = req.get_full_url()
         r._connection = h
         r.code = r.status
+        r.headers = r.msg
+        r.msg = r.reason
         
         if r.status == 200 or not HANDLE_ERRORS:
             return r
         else:
-            return self.parent.error('http', req, r, r.status, r.reason, r.msg)
-
+            return self.parent.error('http', req, r,
+                                     r.status, r.msg, r.headers)
 
     def _reuse_connection(self, h, req, host):
         """start the transaction with a re-used connection
@@ -371,7 +373,7 @@ class HTTPResponse(httplib.HTTPResponse)
         self.close()
         
     def info(self):
-        return self.msg
+        return self.headers
 
     def geturl(self):
         return self._url
diff --git a/tests/test-bad-pull.out b/tests/test-bad-pull.out
--- a/tests/test-bad-pull.out
+++ b/tests/test-bad-pull.out
@@ -2,8 +2,4 @@ abort: error: Connection refused
 255
 copy: No such file or directory
 abort: HTTP Error 404
-Date:
-Content-Type: text/html
-Connection: close
-
 0