# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1520091067 -19800
# Node ID 9e2866065982690cab56f4f20e23007c1df53cac
# Parent  8395fddde46c01bdc04d8482928f0ba6bb2da28f
py3: use util.forcevytestr to convert error to bytes

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

diff -r 8395fddde46c -r 9e2866065982 hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Sat Mar 03 09:50:07 2018 -0500
+++ b/hgext/convert/subversion.py	Sat Mar 03 21:01:07 2018 +0530
@@ -147,7 +147,7 @@
         # Caller may interrupt the iteration
         pickle.dump(None, fp, protocol)
     except Exception as inst:
-        pickle.dump(str(inst), fp, protocol)
+        pickle.dump(util.forcebytestr(inst), fp, protocol)
     else:
         pickle.dump(None, fp, protocol)
     fp.flush()
diff -r 8395fddde46c -r 9e2866065982 hgext/mq.py
--- a/hgext/mq.py	Sat Mar 03 09:50:07 2018 -0500
+++ b/hgext/mq.py	Sat Mar 03 21:01:07 2018 +0530
@@ -723,7 +723,8 @@
         try:
             os.unlink(undo)
         except OSError as inst:
-            self.ui.warn(_('error removing undo: %s\n') % str(inst))
+            self.ui.warn(_('error removing undo: %s\n') %
+                         util.forcebytestr(inst))
 
     def backup(self, repo, files, copy=False):
         # backup local changes in --force case
diff -r 8395fddde46c -r 9e2866065982 hgext/narrow/narrowbundle2.py
--- a/hgext/narrow/narrowbundle2.py	Sat Mar 03 09:50:07 2018 -0500
+++ b/hgext/narrow/narrowbundle2.py	Sat Mar 03 21:01:07 2018 +0530
@@ -449,7 +449,7 @@
         except OSError as e:
             if e.errno != errno.ENOENT:
                 ui.warn(_('error removing %s: %s\n') %
-                        (undovfs.join(undofile), str(e)))
+                        (undovfs.join(undofile), util.forcebytestr(e)))
 
     # Remove partial backup only if there were no exceptions
     vfs.unlink(chgrpfile)
diff -r 8395fddde46c -r 9e2866065982 hgext/relink.py
--- a/hgext/relink.py	Sat Mar 03 09:50:07 2018 -0500
+++ b/hgext/relink.py	Sat Mar 03 21:01:07 2018 +0530
@@ -187,7 +187,7 @@
             relinked += 1
             savedbytes += sz
         except OSError as inst:
-            ui.warn('%s: %s\n' % (tgt, str(inst)))
+            ui.warn('%s: %s\n' % (tgt, util.forcebytestr(inst)))
 
     ui.progress(_('relinking'), None)