changeset 36291:af0a19d8812b

py3: get bytes-repr of network errors portably

This resolves a lot of weird issues in Python 3 around error strings.

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

--- a/mercurial/hgweb/hgweb_mod.py	Sat Feb 17 01:09:56 2018 -0500
+++ b/mercurial/hgweb/hgweb_mod.py	Sat Feb 17 01:11:48 2018 -0500
@@ -443,20 +443,20 @@
 
         except (error.LookupError, error.RepoLookupError) as err:
             req.respond(HTTP_NOT_FOUND, ctype)
-            msg = str(err)
+            msg = pycompat.bytestr(err)
             if (util.safehasattr(err, 'name') and
                 not isinstance(err,  error.ManifestLookupError)):
                 msg = 'revision not found: %s' % err.name
             return tmpl('error', error=msg)
         except (error.RepoError, error.RevlogError) as inst:
             req.respond(HTTP_SERVER_ERROR, ctype)
-            return tmpl('error', error=str(inst))
+            return tmpl('error', error=pycompat.bytestr(inst))
         except ErrorResponse as inst:
             req.respond(inst, ctype)
             if inst.code == HTTP_NOT_MODIFIED:
                 # Not allowed to return a body on a 304
                 return ['']
-            return tmpl('error', error=str(inst))
+            return tmpl('error', error=pycompat.bytestr(inst))
 
     def check_perm(self, rctx, req, op):
         for permhook in permhooks:

--- a/mercurial/hgweb/request.py	Sat Feb 17 01:09:56 2018 -0500
+++ b/mercurial/hgweb/request.py	Sat Feb 17 01:11:48 2018 -0500
@@ -121,7 +121,8 @@
             elif isinstance(status, int):
                 status = statusmessage(status)
 
-            self.server_write = self._start_response(status, self.headers)
+            self.server_write = self._start_response(
+                pycompat.sysstr(status), self.headers)
             self._start_response = None
             self.headers = []
         if body is not None:

--- a/mercurial/hgweb/webutil.py	Sat Feb 17 01:09:56 2018 -0500
+++ b/mercurial/hgweb/webutil.py	Sat Feb 17 01:11:48 2018 -0500
@@ -347,7 +347,7 @@
     try:
         return util.processlinerange(fromline, toline)
     except error.ParseError as exc:
-        raise ErrorResponse(HTTP_BAD_REQUEST, str(exc))
+        raise ErrorResponse(HTTP_BAD_REQUEST, pycompat.bytestr(exc))
 
 def formatlinerange(fromline, toline):
     return '%d:%d' % (fromline + 1, toline)

--- a/mercurial/wireproto.py	Sat Feb 17 01:09:56 2018 -0500
+++ b/mercurial/wireproto.py	Sat Feb 17 01:11:48 2018 -0500
@@ -879,11 +879,11 @@
         # cleanly forward Abort error to the client
         if not exchange.bundle2requested(opts.get('bundlecaps')):
             if proto.name == 'http-v1':
-                return ooberror(str(exc) + '\n')
+                return ooberror(pycompat.bytestr(exc) + '\n')
             raise # cannot do better for bundle1 + ssh
         # bundle2 request expect a bundle2 reply
         bundler = bundle2.bundle20(repo.ui)
-        manargs = [('message', str(exc))]
+        manargs = [('message', pycompat.bytestr(exc))]
         advargs = []
         if exc.hint is not None:
             advargs.append(('hint', exc.hint))

--- a/mercurial/wireprotoserver.py	Sat Feb 17 01:09:56 2018 -0500
+++ b/mercurial/wireprotoserver.py	Sat Feb 17 01:11:48 2018 -0500
@@ -339,7 +339,7 @@
 
     # TODO This response body assumes the failed command was
     # "unbundle." That assumption is not always valid.
-    req.respond(e, HGTYPE, body='0\n%s\n' % e)
+    req.respond(e, HGTYPE, body='0\n%s\n' % pycompat.bytestr(e))
 
     return ''