[PATCH v2 09/20] nmbug-status: Add a Python-3-compatible urllib.parse.quote import

diff --git a/62/59930e86d0306e3f47299d4988350892e91b41 b/62/59930e86d0306e3f47299d4988350892e91b41
new file mode 100644 (file)
index 0000000..f0136f4
--- /dev/null
+++ b/62/59930e86d0306e3f47299d4988350892e91b41
@@ -0,0 +1,110 @@
+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 1A5F4431FBD\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Feb 2014 10:44:51 -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 Qx42ZzkYSMSg for <notmuch@notmuchmail.org>;\r
+       Mon, 10 Feb 2014 10:44:45 -0800 (PST)\r
+Received: from qmta13.westchester.pa.mail.comcast.net\r
+       (qmta13.westchester.pa.mail.comcast.net [76.96.59.243])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4FA49431FDF\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Feb 2014 10:43:57 -0800 (PST)\r
+Received: from omta11.westchester.pa.mail.comcast.net ([76.96.62.36])\r
+       by qmta13.westchester.pa.mail.comcast.net with comcast\r
+       id Qcvh1n0010mv7h05Dijx9h; Mon, 10 Feb 2014 18:43:57 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by omta11.westchester.pa.mail.comcast.net with comcast\r
+       id Qihw1n00B152l3L3XihwvR; Mon, 10 Feb 2014 18:41:57 +0000\r
+Received: from mjolnir.tremily.us (unknown [192.168.0.140])\r
+       by odin.tremily.us (Postfix) with ESMTPS id EE86110167B3;\r
+       Mon, 10 Feb 2014 10:41:55 -0800 (PST)\r
+Received: (nullmailer pid 1263 invoked by uid 1000);\r
+       Mon, 10 Feb 2014 18:40:45 -0000\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 09/20] nmbug-status: Add a Python-3-compatible\r
+       urllib.parse.quote import\r
+Date: Mon, 10 Feb 2014 10:40:30 -0800\r
+Message-Id:\r
+ <80d27fa376ab1c214396c24fb0268a96293a4d87.1392056624.git.wking@tremily.us>\r
+X-Mailer: git-send-email 1.8.5.2.8.g0f6c0d1\r
+In-Reply-To: <cover.1392056624.git.wking@tremily.us>\r
+References: <cover.1392056624.git.wking@tremily.us>\r
+In-Reply-To: <cover.1392056624.git.wking@tremily.us>\r
+References: <cover.1392056624.git.wking@tremily.us>\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20121106; t=1392057837;\r
+       bh=+RYjUyYKWkd/LXfnYi2JOZZTp5ecx1cOBgcyXSpm2TU=;\r
+       h=Received:Received:Received:Received:From:To:Subject:Date:\r
+       Message-Id;\r
+       b=ES/ddDd5OLdo3lLUMCYGisRcMX1gPnQQpQP9vZrkzL7mOpqG1qQZXNYXuCCXIM16U\r
+       ximhdPlnokuZMY+Sf80JYlDrnKRB1laZvEDrSLRkwjKxIdxqe7vxgkIbCRbACJo7Qs\r
+       pGSolxPtRcDmE3GaH76U3ujF4z2ijJcIo2/KNAICW8dLJBZuk4rD8TBsjeveVnCfYr\r
+       luByPyxf2qVyL3DqyvUHZdAkR1VKutHkHL9279IUaNRFRczv9QsscfnuKhZqtYontv\r
+       RdRLmgwAMi2tcCyQXXN3cAfVxuGbWUBG21bv6ZAHjPSrMJKws+9/VFOIswZRTn3kB+\r
+       5/5Nl4KNK5ogA==\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\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, 10 Feb 2014 18:44:51 -0000\r
+\r
+Python 2's urllib.quote [1] has moved to urllib.parse.quote in Python\r
+3 [2].\r
+\r
+[1]: http://docs.python.org/2/library/urllib.html#urllib.quote\r
+[2]: http://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote\r
+---\r
+ devel/nmbug/nmbug-status | 9 ++++++---\r
+ 1 file changed, 6 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status\r
+index 3aa83b6..22b6b10 100755\r
+--- a/devel/nmbug/nmbug-status\r
++++ b/devel/nmbug/nmbug-status\r
+@@ -12,7 +12,10 @@ import codecs\r
+ import datetime\r
+ import email.utils\r
+ import locale\r
+-import urllib\r
++try:  # Python 3\r
++    from urllib.parse import quote\r
++except ImportError:  # Python 2\r
++    from urllib import quote\r
+ import json\r
+ import argparse\r
+ import os\r
+@@ -124,8 +127,8 @@ def print_view(database, title, query, comment,\r
+ \r
+         if output_format == 'html':\r
+ \r
+-            out['subject'] = '<a href="http://mid.gmane.org/%s">%s</a>' \\r
+-                % (urllib.quote(mid), out['subject'])\r
++            out['subject'] = '<a href="http://mid.gmane.org/%s">%s</a>' % (\r
++                quote(mid), out['subject'])\r
+ \r
+             lines.append(' <tr><td>%s' % out['date'])\r
+             lines.append('</td><td>%s' % out['id'])\r
+-- \r
+1.8.5.2.8.g0f6c0d1\r
+\r