# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 2012-10-02 21:31:14
# Node ID f7b3518c9cb4d62ecb1f9793ff7fe4b7877544b1
# Parent  0696b1793f4bfdb5c52a9cadd0171fe8ca66e366
# Parent  5b1b0e4e6902983debf3db8352f0715d75ca85fc

Merge

diff --git a/mercurial/keepalive.py b/mercurial/keepalive.py
--- a/mercurial/keepalive.py
+++ b/mercurial/keepalive.py
@@ -377,10 +377,7 @@ class HTTPResponse(httplib.HTTPResponse)
 
 
     def __init__(self, sock, debuglevel=0, strict=0, method=None):
-        if method: # the httplib in python 2.3 uses the method arg
-            httplib.HTTPResponse.__init__(self, sock, debuglevel, method)
-        else: # 2.2 doesn't
-            httplib.HTTPResponse.__init__(self, sock, debuglevel)
+        httplib.HTTPResponse.__init__(self, sock, debuglevel, method)
         self.fileno = sock.fileno
         self.code = None
         self._rbuf = ''