diff mercurial/error.py @ 45903:64faa55716f4

tests: make test-worker.t pass on py2 I broke the py2 version in https://phab.mercurial-scm.org/D9287 because the `WorkerError.__bytes__()` (or `.__str__()`?) output was different in py2 compared to py3. Part of the problem was that I didn't propagate the status code that was passed in to the superclass so it could get printed. This patch fixes that. I don't know how it worked on py3 before this patch... I also added the usual `__bytes__ = _tobytes` override for good measure. It doesn't seem to be needed for tests to pass, though. Differential Revision: https://phab.mercurial-scm.org/D9377
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 11:56:10 -0800
parents 9dc1351d0b5f
children 8f50dc096cf4
line wrap: on
line diff
--- a/mercurial/error.py	Mon Nov 23 11:30:43 2020 -0800
+++ b/mercurial/error.py	Mon Nov 23 11:56:10 2020 -0800
@@ -137,6 +137,10 @@
 
     def __init__(self, status_code):
         self.status_code = status_code
+        # Pass status code to superclass just so it becomes part of __bytes__
+        super(WorkerError, self).__init__(status_code)
+
+    __bytes__ = _tobytes
 
 
 class InterventionRequired(Hint, Exception):