[PATCH 13/17] nmbug-status: Encode output using the user's locale

diff --git a/ec/535d112978e971eaee92d181379cfba6f2c8c5 b/ec/535d112978e971eaee92d181379cfba6f2c8c5
new file mode 100644 (file)
index 0000000..7479dd8
--- /dev/null
+++ b/ec/535d112978e971eaee92d181379cfba6f2c8c5
@@ -0,0 +1,112 @@
+Return-Path: <wking@tremily.us>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id DC815429E32\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Feb 2014 03:03:04 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id TyR3dIbCYqve for <notmuch@notmuchmail.org>;\r
+       Mon,  3 Feb 2014 03:02:58 -0800 (PST)\r
+Received: from qmta12.westchester.pa.mail.comcast.net\r
+       (qmta12.westchester.pa.mail.comcast.net [76.96.59.227])\r
+       by olra.theworths.org (Postfix) with ESMTP id 64646429E48\r
+       for <notmuch@notmuchmail.org>; Mon,  3 Feb 2014 03:02:44 -0800 (PST)\r
+Received: from omta20.westchester.pa.mail.comcast.net ([76.96.62.71])\r
+       by qmta12.westchester.pa.mail.comcast.net with comcast\r
+       id Mn2k1n0011YDfWL5Cn2kuP; Mon, 03 Feb 2014 11:02:44 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by omta20.westchester.pa.mail.comcast.net with comcast\r
+       id Mn0j1n00j152l3L3gn0kHT; Mon, 03 Feb 2014 11:00:44 +0000\r
+Received: from mjolnir.tremily.us (unknown [192.168.0.140])\r
+       by odin.tremily.us (Postfix) with ESMTPS id 974FDFB4D5B;\r
+       Mon,  3 Feb 2014 03:00:43 -0800 (PST)\r
+Received: (nullmailer pid 708 invoked by uid 1000);\r
+       Mon, 03 Feb 2014 10:59:42 -0000\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 13/17] nmbug-status: Encode output using the user's locale\r
+Date: Mon,  3 Feb 2014 02:59:31 -0800\r
+Message-Id:\r
+ <d4acc1cd540f12eea0a77bb71ffca78cf140b1d5.1391424512.git.wking@tremily.us>\r
+X-Mailer: git-send-email 1.8.5.2.8.g0f6c0d1\r
+In-Reply-To: <cover.1391424512.git.wking@tremily.us>\r
+References: <cover.1391424512.git.wking@tremily.us>\r
+In-Reply-To: <cover.1391424512.git.wking@tremily.us>\r
+References: <cover.1391424512.git.wking@tremily.us>\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20121106; t=1391425364;\r
+       bh=7eoMlZwcCw4w7we9Iv9sn04rDARubSza7iwz/XbP94Y=;\r
+       h=Received:Received:Received:Received:From:To:Subject:Date:\r
+       Message-Id;\r
+       b=XoC5q0jj/RIXYYqSJuuxT6w5+k3KfeA2Sk0fvd2U3fdtHhLu2zaON9j8mlJV/Jv4l\r
+       GQvIw1kEU/0FmUD4keCQJgmyNBiB9hCCmeuxSodd4AxVa/sOQMp1B9/GCgIeX7gU0+\r
+       e2h7HR3cMnH4QAdyF22SarcnHpP+Fy7me9lpshl6xpMliG8Y+w8NzNbuPd24lsu+/Y\r
+       n91KJtw4DKlLj6bjUa+5/jOoZQdm5Sqsojzq08PieMZwz/1u9UQJHsf53x3ZmnwEdD\r
+       WBXfWKinj1ya0uF53+MBCfp77fx1SicJvcc668YriMfaytwRs/JwhbmoSb0E6KH4HR\r
+       kxFDkodPBYW+g==\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 03 Feb 2014 11:03:05 -0000\r
+\r
+Instead of always writing UTF-8, allow the user to configure the\r
+output encoding using their locale.  This is useful for previewing\r
+output in the terminal, for poor souls that don't use UTF-8 locales\r
+;).\r
+---\r
+ devel/nmbug/nmbug-status | 7 ++++---\r
+ 1 file changed, 4 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status\r
+index b67b86b..e86ea2a 100755\r
+--- a/devel/nmbug/nmbug-status\r
++++ b/devel/nmbug/nmbug-status\r
+@@ -70,7 +70,7 @@ class Page (object):\r
+                 byte_stream = sys.stdout.buffer\r
+             except AttributeError:  # Python 2\r
+                 byte_stream = sys.stdout\r
+-            stream = codecs.getwriter(encoding='UTF-8')(stream=byte_stream)\r
++            stream = codecs.getwriter(encoding=_ENCODING)(stream=byte_stream)\r
+         self._write_header(views=views, stream=stream)\r
+         for view in views:\r
+             self._write_view(database=database, view=view, stream=stream)\r
+@@ -212,7 +212,7 @@ _PAGES['html'] = HtmlPage(\r
+     header='''<!DOCTYPE html>\r
+ <html lang="en">\r
+ <head>\r
+-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\r
++<meta http-equiv="Content-Type" content="text/html; charset={encoding}" />\r
+ <title>Notmuch Patches</title>\r
+ </head>\r
+ <body>\r
+@@ -220,7 +220,8 @@ _PAGES['html'] = HtmlPage(\r
+ Generated: {date}<br />\r
+ For more infomation see <a href="http://notmuchmail.org/nmbug">nmbug</a>\r
+ <h3>Views</h3>\r
+-'''.format(date=datetime.datetime.utcnow().date()),\r
++'''.format(date=datetime.datetime.utcnow().date(),\r
++           encoding=_ENCODING),\r
+     footer='</body>\n</html>\n',\r
+     )\r
+ \r
+-- \r
+1.8.5.2.8.g0f6c0d1\r
+\r