From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH 08/11] nmweb: use urllib.quote_plus() as plain quote_plus()
Date: Sun, 4 Feb 2018 23:19:56 -0500 [thread overview]
Message-ID: <20180205041959.22066-9-dkg@fifthhorseman.net> (raw)
In-Reply-To: <20180205041959.22066-1-dkg@fifthhorseman.net>
This will make it easier to import quote_plus from urllib.parse, which
is where it is in python3.
---
contrib/notmuch-web/nmweb.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/notmuch-web/nmweb.py b/contrib/notmuch-web/nmweb.py
index 0217fce0..31351399 100755
--- a/contrib/notmuch-web/nmweb.py
+++ b/contrib/notmuch-web/nmweb.py
@@ -2,7 +2,7 @@
from __future__ import absolute_import
-import urllib
+from urllib import quote_plus
from datetime import datetime
from mailbox import MaildirMessage
import mimetypes
@@ -34,7 +34,7 @@ def urlencode_filter(s):
if type(s) == 'Markup':
s = s.unescape()
s = s.encode('utf8')
- s = urllib.quote_plus(s)
+ s = quote_plus(s)
return Markup(s)
env.filters['url'] = urlencode_filter
@@ -69,7 +69,7 @@ class search:
redir = True
terms += ' %s..%s' % (afters, befores)
if redir:
- raise web.seeother('/search/%s' % urllib.quote_plus(terms))
+ raise web.seeother('/search/%s' % quote_plus(terms))
web.header('Content-type', 'text/html')
web.header('Transfer-Encoding', 'chunked')
db = Database()
@@ -107,7 +107,7 @@ def show_msgs(msgs):
frm = msg.get_header('From')
frm = mailto_addrs(frm)
subj = msg.get_header('Subject')
- lnk = urllib.quote_plus(msg.get_message_id())
+ lnk = quote_plus(msg.get_message_id())
rs = show_msgs(msg.get_replies())
r += '<li><font color=%s>%s—<a href="%s/show/%s">%s</a></font> %s</li>' % (
red, frm, prefix, lnk, subj, rs)
--
2.15.1
next prev parent reply other threads:[~2018-02-05 4:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-05 4:19 clean up for nmweb/btsmail Daniel Kahn Gillmor
2018-02-05 4:19 ` [PATCH 01/11] nmweb: (pylint) use __future__.absolute_import Daniel Kahn Gillmor
2018-02-05 4:19 ` [PATCH 02/11] nmweb: (pylint) use replace() function directly on string object Daniel Kahn Gillmor
2018-02-05 4:19 ` [PATCH 03/11] nmweb: (pylint) use spaces instead of tabs Daniel Kahn Gillmor
2018-02-05 4:19 ` [PATCH 04/11] nmweb: (pylint) normalize whitespace Daniel Kahn Gillmor
2018-03-17 12:37 ` David Bremner
2018-02-05 4:19 ` [PATCH 05/11] nmweb: (pylint) import built-in modules before third-party modules Daniel Kahn Gillmor
2018-02-05 4:19 ` [PATCH 06/11] nmweb: (pylint) put if clause on separate line from predicate Daniel Kahn Gillmor
2018-02-05 4:19 ` [PATCH 07/11] nmweb: shim for launching from gunicorn Daniel Kahn Gillmor
2018-02-05 4:19 ` Daniel Kahn Gillmor [this message]
2018-02-05 4:19 ` [PATCH 09/11] nmweb: explicitly move to python3 Daniel Kahn Gillmor
2018-02-05 4:19 ` [PATCH 10/11] nmweb: hide numeric date fields' Daniel Kahn Gillmor
2018-02-05 4:19 ` [PATCH 11/11] nmweb: handle non-numeric timestamp inputs Daniel Kahn Gillmor
2018-03-17 12:57 ` David Bremner
2018-03-24 23:05 ` clean up for nmweb/btsmail David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180205041959.22066-9-dkg@fifthhorseman.net \
--to=dkg@fifthhorseman.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).