93/05f43865d9fc9ae4f44391165151e94b6fb86b

   1 Return-Path: <wking@tremily.us>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 18F5D429E58\r
   6         for <notmuch@notmuchmail.org>; Mon,  3 Feb 2014 03:03:04 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
   9 X-Spam-Flag: NO\r
  10 X-Spam-Score: 0\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
  13         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]\r
  14         autolearn=disabled\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id 7TqG90BmMC7x for <notmuch@notmuchmail.org>;\r
  18         Mon,  3 Feb 2014 03:02:56 -0800 (PST)\r
  19 Received: from qmta01.westchester.pa.mail.comcast.net\r
  20         (qmta01.westchester.pa.mail.comcast.net [76.96.62.16])\r
  21         by olra.theworths.org (Postfix) with ESMTP id 61003429E32\r
  22         for <notmuch@notmuchmail.org>; Mon,  3 Feb 2014 03:02:42 -0800 (PST)\r
  23 Received: from omta07.westchester.pa.mail.comcast.net ([76.96.62.59])\r
  24         by qmta01.westchester.pa.mail.comcast.net with comcast\r
  25         id Mn2i1n0011GhbT851n2i2b; Mon, 03 Feb 2014 11:02:42 +0000\r
  26 Received: from odin.tremily.us ([24.18.63.50])\r
  27         by omta07.westchester.pa.mail.comcast.net with comcast\r
  28         id Mn0h1n00U152l3L3Tn0iPX; Mon, 03 Feb 2014 11:00:42 +0000\r
  29 Received: from mjolnir.tremily.us (unknown [192.168.0.140])\r
  30         by odin.tremily.us (Postfix) with ESMTPS id 9644EFB4D52;\r
  31         Mon,  3 Feb 2014 03:00:41 -0800 (PST)\r
  32 Received: (nullmailer pid 696 invoked by uid 1000);\r
  33         Mon, 03 Feb 2014 10:59:41 -0000\r
  34 From: "W. Trevor King" <wking@tremily.us>\r
  35 To: notmuch@notmuchmail.org\r
  36 Subject: [PATCH 09/17] nmbug-status: Add a Python-3-compatible\r
  37         urllib.parse.quote import\r
  38 Date: Mon,  3 Feb 2014 02:59:27 -0800\r
  39 Message-Id:\r
  40  <80d27fa376ab1c214396c24fb0268a96293a4d87.1391424512.git.wking@tremily.us>\r
  41 X-Mailer: git-send-email 1.8.5.2.8.g0f6c0d1\r
  42 In-Reply-To: <cover.1391424512.git.wking@tremily.us>\r
  43 References: <cover.1391424512.git.wking@tremily.us>\r
  44 In-Reply-To: <cover.1391424512.git.wking@tremily.us>\r
  45 References: <cover.1391424512.git.wking@tremily.us>\r
  46 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
  47         s=q20121106; t=1391425362;\r
  48         bh=+RYjUyYKWkd/LXfnYi2JOZZTp5ecx1cOBgcyXSpm2TU=;\r
  49         h=Received:Received:Received:Received:From:To:Subject:Date:\r
  50         Message-Id;\r
  51         b=lcImJa3feHFABBSQR3ZKZ4rtsaLJuhhawDydqkzngVV/7snhQytItWPIWRh6LFL+h\r
  52         QwdYrwyILkAqtbW3VvNxMxmB+p6wTrV1FKSAE28RxRlAocCIR+ELqFndYH4t9HEzDG\r
  53         /yHtCBHM+HvPOKMRprfl1nqYQlND4R31EM66UQeDt3e/a6yVkL9M6JTKdQBXtfUMHz\r
  54         IDuZ/JOS3Qvy68yW2UGvB4N90chBX7iZBaq/avxWyeuQRStUgkAeyrNsiMuYQsJRIF\r
  55         ugAegFt5EvtAilsAQrY8qwvPSYvRAh4hndQqg429QhWrU/VbpeldJWtib/XGdraTra\r
  56         HxCPaWr5NEdnQ==\r
  57 X-BeenThere: notmuch@notmuchmail.org\r
  58 X-Mailman-Version: 2.1.13\r
  59 Precedence: list\r
  60 List-Id: "Use and development of the notmuch mail system."\r
  61         <notmuch.notmuchmail.org>\r
  62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  65 List-Post: <mailto:notmuch@notmuchmail.org>\r
  66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  69 X-List-Received-Date: Mon, 03 Feb 2014 11:03:04 -0000\r
  70 \r
  71 Python 2's urllib.quote [1] has moved to urllib.parse.quote in Python\r
  72 3 [2].\r
  73 \r
  74 [1]: http://docs.python.org/2/library/urllib.html#urllib.quote\r
  75 [2]: http://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote\r
  76 ---\r
  77  devel/nmbug/nmbug-status | 9 ++++++---\r
  78  1 file changed, 6 insertions(+), 3 deletions(-)\r
  79 \r
  80 diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status\r
  81 index 3aa83b6..22b6b10 100755\r
  82 --- a/devel/nmbug/nmbug-status\r
  83 +++ b/devel/nmbug/nmbug-status\r
  84 @@ -12,7 +12,10 @@ import codecs\r
  85  import datetime\r
  86  import email.utils\r
  87  import locale\r
  88 -import urllib\r
  89 +try:  # Python 3\r
  90 +    from urllib.parse import quote\r
  91 +except ImportError:  # Python 2\r
  92 +    from urllib import quote\r
  93  import json\r
  94  import argparse\r
  95  import os\r
  96 @@ -124,8 +127,8 @@ def print_view(database, title, query, comment,\r
  97  \r
  98          if output_format == 'html':\r
  99  \r
 100 -            out['subject'] = '<a href="http://mid.gmane.org/%s">%s</a>' \\r
 101 -                % (urllib.quote(mid), out['subject'])\r
 102 +            out['subject'] = '<a href="http://mid.gmane.org/%s">%s</a>' % (\r
 103 +                quote(mid), out['subject'])\r
 104  \r
 105              lines.append(' <tr><td>%s' % out['date'])\r
 106              lines.append('</td><td>%s' % out['id'])\r
 107 -- \r
 108 1.8.5.2.8.g0f6c0d1\r
 109 \r