Mercurial > hg-stable

changeset 17701:f7b3518c9cb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Bryan O'Sullivan <bryano@fb.com>
date Tue, 02 Oct 2012 14:31:14 -0700
parents 0696b1793f4b (current diff) 5b1b0e4e6902 (diff)
children 57fe5aca86af
files
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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 = ''