X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=devel%2Fnmbug%2Fnmbug-status;h=ef7169a6f4cb642f54155b9d0682794606df6cf9;hb=320d4a856eca6f7d4363b3465e7032e658913ece;hp=1c390e6d391de3a71c510a759d9e11e8e90be9dc;hpb=aaa7f0d92ee9c876c38da43be5c49e8d5c73a99b;p=notmuch diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status index 1c390e6d..ef7169a6 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 @@ -27,7 +26,7 @@ import subprocess import xml.sax.saxutils -_ENCODING = locale.getpreferredencoding() or sys.getdefaultencoding() +_ENCODING = 'UTF-8' _PAGES = {} @@ -90,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) @@ -205,19 +204,22 @@ class HtmlPage (Page): return stream.write('\n') for thread in threads: + stream.write(' \n') for message_display_data in thread: stream.write(( - '\n' - ' \n' - ' \n' - '\n' - '\n' - ' \n' - ' \n' - '\n' + ' \n' + ' \n' + ' \n' + ' \n' + ' \n' + ' \n' + ' \n' + ' \n' ).format(**message_display_data)) + stream.write(' \n') if thread != threads[-1]: - stream.write('\n') + stream.write( + ' \n') stream.write('
{date}{message-id-term}
{from}{subject}
{date}{message-id-term}
{from}{subject}


\n') def _message_display_data(self, *args, **kwargs): @@ -246,8 +248,41 @@ _PAGES['html'] = HtmlPage( header=''' - -Notmuch Patches + + Notmuch Patches +

Notmuch Patches

@@ -256,7 +291,10 @@ Generated: {date}
For more infomation see nmbug

Views

-'''.format(date=datetime.datetime.utcnow().date()), +'''.format(date=datetime.datetime.utcnow().date(), + encoding=_ENCODING, + inter_message_padding='0.25em', + border_radius='0.5em'), footer='\n\n', )