Patchwork D3347: httppeer: work around API differences on urllib Request objects

login
register
mail settings
Submitter phabricator
Date April 16, 2018, 11:21 p.m.
Message ID <93b9d4f5a907d63d77ecaa1b271e2819@localhost.localdomain>
Download mbox | patch
Permalink /patch/31132/
State Not Applicable
Headers show

Comments

phabricator - April 16, 2018, 11:21 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa1f785148097: httppeer: work around API differences on urllib Request objects (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3347?vs=8224&id=8341

REVISION DETAIL
  https://phab.mercurial-scm.org/D3347

AFFECTED FILES
  mercurial/httppeer.py

CHANGE DETAILS




To: durin42, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py
--- a/mercurial/httppeer.py
+++ b/mercurial/httppeer.py
@@ -264,6 +264,14 @@ 
 
     return req, cu, qs
 
+def _reqdata(req):
+    """Get request data, if any. If no data, returns None."""
+    if pycompat.ispy3:
+        return req.data
+    if not req.has_data():
+        return None
+    return req.get_data()
+
 def sendrequest(ui, opener, req):
     """Send a prepared HTTP request.
 
@@ -290,9 +298,8 @@ 
         if hgargssize is not None:
             dbg(line % '  %d bytes of commands arguments in headers'
                 % hgargssize)
-
-        if req.has_data():
-            data = req.get_data()
+        data = _reqdata(req)
+        if data is not None:
             length = getattr(data, 'length', None)
             if length is None:
                 length = len(data)