py3: wrap a __func__ in sysbytes() before logging as bytes stable
authorMartin von Zweigbergk <martinvonz@google.com>
Wed, 20 Nov 2019 08:11:21 -0800
branchstable
changeset 43722 aff3f6e407a1
parent 43721 bfbbf48d51e8
child 43723 eab0b7383cd3
py3: wrap a __func__ in sysbytes() before logging as bytes Differential Revision: https://phab.mercurial-scm.org/D7461
hgext/remotefilelog/basestore.py
--- a/hgext/remotefilelog/basestore.py	Wed Nov 20 19:16:11 2019 -0800
+++ b/hgext/remotefilelog/basestore.py	Wed Nov 20 08:11:21 2019 -0800
@@ -441,7 +441,10 @@
             i = 0
             while i < self.numattempts:
                 if i > 0:
-                    retrylog(b're-attempting (n=%d) %s\n' % (i, funcname))
+                    retrylog(
+                        b're-attempting (n=%d) %s\n'
+                        % (i, pycompat.sysbytes(funcname))
+                    )
                     self.markforrefresh()
                 i += 1
                 try: