diff hgext/githelp.py @ 43793:29adf0a087a1

merge with stable
author Augie Fackler <augie@google.com>
date Thu, 05 Dec 2019 11:15:19 -0500
parents 9f70512ae2cf 24d0189238f1
children ca5bd34c597b
line wrap: on
line diff
--- a/hgext/githelp.py	Tue Dec 03 17:17:57 2019 -0800
+++ b/hgext/githelp.py	Thu Dec 05 11:15:19 2019 -0500
@@ -115,7 +115,7 @@
     args = list([convert(x) for x in args])
     opts = dict(
         [
-            (k, convert(v)) if isinstance(v, str) else (k, v)
+            (k, convert(v)) if isinstance(v, bytes) else (k, v)
             for k, v in pycompat.iteritems(opts)
         ]
     )