comparison mercurial/dispatch.py @ 31180:27e3b66ec7c5

dispatch: cope with sys.version being unicode on Python 3
author Augie Fackler <raf@durin42.com>
date Fri, 03 Mar 2017 13:29:50 -0500
parents 49ad6bf63107
children 3a03264de3eb
comparison
equal deleted inserted replaced
31179:49ad6bf63107 31180:27e3b66ec7c5
891 bugtracker = ui.config('ui', 'supportcontact', None) 891 bugtracker = ui.config('ui', 'supportcontact', None)
892 if bugtracker is None: 892 if bugtracker is None:
893 bugtracker = _("https://mercurial-scm.org/wiki/BugTracker") 893 bugtracker = _("https://mercurial-scm.org/wiki/BugTracker")
894 warning = (_("** unknown exception encountered, " 894 warning = (_("** unknown exception encountered, "
895 "please report by visiting\n** ") + bugtracker + '\n') 895 "please report by visiting\n** ") + bugtracker + '\n')
896 warning += ((_("** Python %s\n") % sys.version.replace('\n', '')) + 896 if pycompat.ispy3:
897 sysversion = sys.version.encode(u'utf-8')
898 else:
899 sysversion = sys.version
900 sysversion = sysversion.replace('\n', '')
901 warning += ((_("** Python %s\n") % sysversion) +
897 (_("** Mercurial Distributed SCM (version %s)\n") % 902 (_("** Mercurial Distributed SCM (version %s)\n") %
898 util.version()) + 903 util.version()) +
899 (_("** Extensions loaded: %s\n") % 904 (_("** Extensions loaded: %s\n") %
900 ", ".join([x[0] for x in extensions.extensions()]))) 905 ", ".join([x[0] for x in extensions.extensions()])))
901 return warning 906 return warning