# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1574364508 18000
# Node ID eab0b7383cd3ba388cdbd9dd8a617f0c288e8731
# Parent  aff3f6e407a118393caaf892d1027e5cb753c956
patch: fix a str + bytes issue in an exception handler

Flagged by pytype.

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

diff -r aff3f6e407a1 -r eab0b7383cd3 mercurial/patch.py
--- a/mercurial/patch.py	Wed Nov 20 08:11:21 2019 -0800
+++ b/mercurial/patch.py	Thu Nov 21 14:28:28 2019 -0500
@@ -2290,7 +2290,7 @@
             try:
                 current_file = patcher(ui, gp, backend, store, eolmode=eolmode)
             except PatchError as inst:
-                ui.warn(str(inst) + b'\n')
+                ui.warn(stringutil.forcebytestr(inst) + b'\n')
                 current_file = None
                 rejects += 1
                 continue