Show More
@@ -857,6 +857,8 b' def _exceptionwarning(ui):' | |||||
857 | if ui.config('ui', 'supportcontact', None) is None: |
|
857 | if ui.config('ui', 'supportcontact', None) is None: | |
858 | for name, mod in extensions.extensions(): |
|
858 | for name, mod in extensions.extensions(): | |
859 | testedwith = getattr(mod, 'testedwith', '') |
|
859 | testedwith = getattr(mod, 'testedwith', '') | |
|
860 | if pycompat.ispy3 and isinstance(testedwith, str): | |||
|
861 | testedwith = testedwith.encode(u'utf-8') | |||
860 | report = getattr(mod, 'buglink', _('the extension author.')) |
|
862 | report = getattr(mod, 'buglink', _('the extension author.')) | |
861 | if not testedwith.strip(): |
|
863 | if not testedwith.strip(): | |
862 | # We found an untested extension. It's likely the culprit. |
|
864 | # We found an untested extension. It's likely the culprit. | |
@@ -877,7 +879,7 b' def _exceptionwarning(ui):' | |||||
877 | worst = name, nearest, report |
|
879 | worst = name, nearest, report | |
878 | if worst[0] is not None: |
|
880 | if worst[0] is not None: | |
879 | name, testedwith, report = worst |
|
881 | name, testedwith, report = worst | |
880 | if not isinstance(testedwith, str): |
|
882 | if not isinstance(testedwith, (bytes, str)): | |
881 | testedwith = '.'.join([str(c) for c in testedwith]) |
|
883 | testedwith = '.'.join([str(c) for c in testedwith]) | |
882 | warning = (_('** Unknown exception encountered with ' |
|
884 | warning = (_('** Unknown exception encountered with ' | |
883 | 'possibly-broken third-party extension %s\n' |
|
885 | 'possibly-broken third-party extension %s\n' |
General Comments 0
You need to be logged in to leave comments.
Login now