Skip to content
Snippets Groups Projects
Commit 49ad6bf6 authored by durin42's avatar durin42
Browse files

dispatch: allow testedwith to be bytes or str

parent 81e289ef
No related branches found
No related tags found
No related merge requests found
......@@ -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'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment