# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1349213474 25200
# Node ID f7b3518c9cb4d62ecb1f9793ff7fe4b7877544b1
# Parent  0696b1793f4bfdb5c52a9cadd0171fe8ca66e366# Parent  5b1b0e4e6902983debf3db8352f0715d75ca85fc
Merge

diff -r 0696b1793f4b -r f7b3518c9cb4 mercurial/keepalive.py
--- a/mercurial/keepalive.py	Sun Sep 30 15:31:27 2012 +0200
+++ b/mercurial/keepalive.py	Tue Oct 02 14:31:14 2012 -0700
@@ -377,10 +377,7 @@
 
 
     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 = ''