X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=devel%2Fnmbug%2Fnmbug-status;h=cb3901f75fa8926ea6fb10cef5627460243a134d;hb=81a1aae2dc3b48c4e0dcc524455f32ca91087033;hp=6a156af28250e5309a968d1791be38da29c2e00a;hpb=aa32d2579b0aa4c8c8a31a1d6060445b254b2be2;p=notmuch diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status index 6a156af2..cb3901f7 100755 --- a/devel/nmbug/nmbug-status +++ b/devel/nmbug/nmbug-status @@ -13,7 +13,6 @@ import codecs import collections import datetime import email.utils -import locale try: # Python 3 from urllib.parse import quote except ImportError: # Python 2 @@ -24,9 +23,10 @@ import os import re import sys import subprocess +import xml.sax.saxutils -_ENCODING = locale.getpreferredencoding() or sys.getdefaultencoding() +_ENCODING = 'UTF-8' _PAGES = {} @@ -41,7 +41,7 @@ if not hasattr(collections, 'OrderedDict'): # Python 2.6 or earlier super(_OrderedDict, self).__setitem__(key, value) self._keys.append(key) - def __values__(self): + def values(self): for key in self._keys: yield self[key] @@ -89,7 +89,7 @@ class Page (object): byte_stream = sys.stdout.buffer except AttributeError: # Python 2 byte_stream = sys.stdout - stream = codecs.getwriter(encoding='UTF-8')(stream=byte_stream) + stream = codecs.getwriter(encoding=_ENCODING)(stream=byte_stream) self._write_header(views=views, stream=stream) for view in views: self._write_view(database=database, view=view, stream=stream) @@ -204,19 +204,22 @@ class HtmlPage (Page): return stream.write('
{date} | \n' - '{message-id-term} | \n'
- '
{from} | \n' - '{subject} | \n' - '
Generated: {date}
-For more infomation see nmbug
+{blurb}