Patchwork D1478: py3: cast error message to localstr in blackbox.py

login
register
mail settings
Submitter phabricator
Date Jan. 14, 2018, 8:13 p.m.
Message ID <b96b06dbcdcf5c9093244aee32c68a5a@localhost.localdomain>
Download mbox | patch
Permalink /patch/26746/
State Not Applicable
Headers show

Comments

phabricator - Jan. 14, 2018, 8:13 p.m.
indygreg updated this revision to Diff 4823.
indygreg edited the summary of this revision.
indygreg retitled this revision from "py3: cast error message to bytes in blackbox.py" to "py3: cast error message to localstr in blackbox.py".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1478?vs=3718&id=4823

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

AFFECTED FILES
  hgext/blackbox.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/blackbox.py b/hgext/blackbox.py
--- a/hgext/blackbox.py
+++ b/hgext/blackbox.py
@@ -44,6 +44,7 @@ 
 from mercurial.node import hex
 
 from mercurial import (
+    encoding,
     registrar,
     ui as uimod,
     util,
@@ -182,7 +183,7 @@ 
                     fp.write(fmt % args)
             except (IOError, OSError) as err:
                 self.debug('warning: cannot write to blackbox.log: %s\n' %
-                           err.strerror)
+                           encoding.strtolocal(err.strerror))
                 # do not restore _bbinlog intentionally to avoid failed
                 # logging again
             else: