From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH 02/11] nmweb: (pylint) use replace() function directly on string object
Date: Sun, 4 Feb 2018 23:19:50 -0500 [thread overview]
Message-ID: <20180205041959.22066-3-dkg@fifthhorseman.net> (raw)
In-Reply-To: <20180205041959.22066-1-dkg@fifthhorseman.net>
Use of string.replace() is deprecated, better to invoke replace()
directly on the string object.
---
contrib/notmuch-web/nmweb.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/contrib/notmuch-web/nmweb.py b/contrib/notmuch-web/nmweb.py
index c6d437c5..1f6e0145 100755
--- a/contrib/notmuch-web/nmweb.py
+++ b/contrib/notmuch-web/nmweb.py
@@ -10,7 +10,6 @@ from mailbox import MaildirMessage
import os
import mimetypes
import email
-import string
import re
from jinja2 import Environment, FileSystemLoader # FIXME to PackageLoader
from jinja2 import Markup
@@ -166,8 +165,7 @@ def format_message_walk(msg,mid):
yield '<ul>'
for subpart in part.get_payload():
yield ('<li><a href="#%s">%s</a></li>' %
- (string.replace(subpart.get_content_type(),
- '/', '-'),
+ (subpart.get_content_type().replace('/', '-'),
subpart.get_content_type()))
yield '</ul>'
elif part.get_content_type() == 'message/rfc822':
@@ -191,7 +189,7 @@ def format_message_walk(msg,mid):
yield '<iframe class="embedded-html" src="%s">' % os.path.join(prefix,cachedir,mid,filename)
yield '</div>'
else:
- yield '<div id="%s">' % string.replace(part.get_content_type(),'/','-')
+ yield '<div id="%s">' % (part.get_content_type().replace('/','-'),)
(filename,cid) = link_to_cached_file(part,mid,counter)
counter += 1
yield '<a href="%s">%s (%s)</a>' % (os.path.join(prefix,
@@ -222,7 +220,7 @@ def format_message_walk(msg,mid):
env.globals['format_message'] = format_message
def replace_cids(body,mid):
- return string.replace(body,'cid:',os.path.join(prefix,cachedir,mid)+'/')
+ return body.replace('cid:',os.path.join(prefix,cachedir,mid)+'/')
def find_cids(body):
return re.findall(r'cid:([^ "\'>]*)', body)
--
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 ` Daniel Kahn Gillmor [this message]
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 ` [PATCH 08/11] nmweb: use urllib.quote_plus() as plain quote_plus() Daniel Kahn Gillmor
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-3-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).