# HG changeset patch # User Augie Fackler # Date 1488565765 18000 # Node ID 49ad6bf6310794f755fed13a4360b0e9464006e3 # Parent 81e289ef937653c92bb2b9098582dbdacb553777 dispatch: allow testedwith to be bytes or str diff -r 81e289ef9376 -r 49ad6bf63107 mercurial/dispatch.py --- a/mercurial/dispatch.py Fri Mar 03 14:09:14 2017 -0500 +++ b/mercurial/dispatch.py Fri Mar 03 13:29:25 2017 -0500 @@ -857,6 +857,8 @@ if ui.config('ui', 'supportcontact', None) is None: for name, mod in extensions.extensions(): testedwith = getattr(mod, 'testedwith', '') + if pycompat.ispy3 and isinstance(testedwith, str): + testedwith = testedwith.encode(u'utf-8') report = getattr(mod, 'buglink', _('the extension author.')) if not testedwith.strip(): # We found an untested extension. It's likely the culprit. @@ -877,7 +879,7 @@ worst = name, nearest, report if worst[0] is not None: name, testedwith, report = worst - if not isinstance(testedwith, str): + if not isinstance(testedwith, (bytes, str)): testedwith = '.'.join([str(c) for c in testedwith]) warning = (_('** Unknown exception encountered with ' 'possibly-broken third-party extension %s\n'