httppeer: extract code for performing an HTTP request

This is generic and doesn't need to live as a method of httppeer.

Differential Revision: https://phab.mercurial-scm.org/D3233

mercurial/httppeer.py

@@ -138,24 +138,14 b' class _multifile(object):'
             f.seek(0)
         self._index = 0
 
-class httppeer(wireproto.wirepeer):
-    def __init__(self, ui, path, url, opener, requestbuilder):
-        self.ui = ui
-        self._path = path
-        self._url = url
-        self._caps = None
-        self._urlopener = opener
-        self._requestbuilder = requestbuilder
+def sendrequest(ui, opener, req):
+    """Send a prepared HTTP request.
 
-    def __del__(self):
-        for h in self._urlopener.handlers:
-            h.close()
-            getattr(h, "close_all", lambda: None)()
-
-    def _openurl(self, req):
-        if (self.ui.debugflag
-            and self.ui.configbool('devel', 'debug.peer-request')):
-            dbg = self.ui.debug
+    Returns the response object.
+    """
+    if (ui.debugflag
+        and ui.configbool('devel', 'debug.peer-request')):
+        dbg = ui.debug
             line = 'devel-peer-request: %s\n'
             dbg(line % '%s %s' % (req.get_method(), req.get_full_url()))
             hgargssize = None
@@ -181,11 +171,26 b' class httppeer(wireproto.wirepeer):'
 
             start = util.timer()
 
-        ret = self._urlopener.open(req)
-        if self.ui.configbool('devel', 'debug.peer-request'):
+    res = opener.open(req)
+    if ui.configbool('devel', 'debug.peer-request'):
             dbg(line % '  finished in %.4f seconds (%s)'
-                % (util.timer() - start, ret.code))
-        return ret
+            % (util.timer() - start, res.code))
+
+    return res
+
+class httppeer(wireproto.wirepeer):
+    def __init__(self, ui, path, url, opener, requestbuilder):
+        self.ui = ui
+        self._path = path
+        self._url = url
+        self._caps = None
+        self._urlopener = opener
+        self._requestbuilder = requestbuilder
+
+    def __del__(self):
+        for h in self._urlopener.handlers:
+            h.close()
+            getattr(h, "close_all", lambda: None)()
 
     # Begin of ipeerconnection interface.
 
@@ -322,7 +327,7 b' class httppeer(wireproto.wirepeer):'
             self.ui.debug("sending %d bytes\n" % size)
             req.add_unredirected_header(r'Content-Length', r'%d' % size)
         try:
-            resp = self._openurl(req)
+            resp = sendrequest(self.ui, self._urlopener, req)
         except urlerr.httperror as inst:
             if inst.code == 401:
                 raise error.Abort(_('authorization failed'))