Patchwork D7461: py3: wrap a __func__ in sysbytes() before logging as bytes

login
register
mail settings
Submitter phabricator
Date Nov. 21, 2019, 1:41 p.m.
Message ID <ead60641313ffcb9ac48b44afa5121b0@localhost.localdomain>
Download mbox | patch
Permalink /patch/43386/
State Not Applicable
Headers show

Comments

phabricator - Nov. 21, 2019, 1:41 p.m.
Closed by commit rHGaff3f6e407a1: py3: wrap a __func__ in sysbytes() before logging as bytes (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7461?vs=18251&id=18263

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7461/new/

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

AFFECTED FILES
  hgext/remotefilelog/basestore.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, dlax, pulkit
Cc: mercurial-devel

Patch

diff --git a/hgext/remotefilelog/basestore.py b/hgext/remotefilelog/basestore.py
--- a/hgext/remotefilelog/basestore.py
+++ b/hgext/remotefilelog/basestore.py
@@ -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: