unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: "W. Trevor King" <wking@tremily.us>
To: notmuch@notmuchmail.org
Subject: [PATCH 01/17] nmbug-status: Convert to Python-3-compatible print functions
Date: Mon,  3 Feb 2014 02:59:19 -0800	[thread overview]
Message-ID: <273f26f98609938ace1190cfc6b5321b643b598f.1391424512.git.wking@tremily.us> (raw)
In-Reply-To: <cover.1391424512.git.wking@tremily.us>
In-Reply-To: <cover.1391424512.git.wking@tremily.us>

We shouldn't require folks to install Python 2 to run nmbug-status.
---
 devel/nmbug/nmbug-status | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status
index 934c895..b1feee9 100755
--- a/devel/nmbug/nmbug-status
+++ b/devel/nmbug/nmbug-status
@@ -6,6 +6,8 @@
 #       - python 2.6 for json
 #       - argparse; either python 2.7, or install separately
 
+from __future__ import print_function
+
 import datetime
 import rfc822
 import urllib
@@ -49,12 +51,12 @@ config = json.load(fp)
 
 if args.list_views:
     for view in config['views']:
-        print view['title']
+        print(view['title'])
     sys.exit(0)
 elif args.get_query != None:
     for view in config['views']:
         if args.get_query == view['title']:
-            print ' and '.join(view['query'])
+            print(' and '.join(view['query']))
     sys.exit(0)
 else:
     # only import notmuch if needed
@@ -75,7 +77,7 @@ class Thread:
 
 def output_with_separator(threadlist, sep):
     outputs = (thread.join_utf8_with_newlines() for thread in threadlist)
-    print sep.join(outputs)
+    print(sep.join(outputs))
 
 headers = ['date', 'from', 'subject']
 
@@ -93,13 +95,13 @@ def print_view(title, query, comment):
     lines = None
 
     if output_format == 'html':
-        print '<h3><a name="%s" />%s</h3>' % (title, title)
-        print comment
-        print 'The view is generated from the following query:'
-        print '<blockquote>'
-        print query_string
-        print '</blockquote>'
-        print '<table>\n'
+        print('<h3><a name="%s" />%s</h3>' % (title, title))
+        print(comment)
+        print('The view is generated from the following query:')
+        print('<blockquote>')
+        print(query_string)
+        print('</blockquote>')
+        print('<table>\n')
 
     for m in q_new.search_messages():
 
@@ -156,7 +158,7 @@ def print_view(title, query, comment):
     if output_format == 'html':
         output_with_separator(threadlist,
                               '\n<tr><td colspan="2"><br /></td></tr>\n')
-        print '</table>'
+        print('</table>')
     else:
         output_with_separator(threadlist, '\n\n')
 
@@ -165,26 +167,26 @@ def print_view(title, query, comment):
 db = notmuch.Database(mode=notmuch.Database.MODE.READ_WRITE)
 
 if output_format == 'html':
-    print '''<?xml version="1.0" encoding="utf-8" ?>
+    print('''<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>Notmuch Patches</title>
 </head>
-<body>'''
-    print '<h2>Notmuch Patches</h2>'
-    print 'Generated: %s<br />' % datetime.datetime.utcnow().date()
-    print 'For more infomation see <a href="http://notmuchmail.org/nmbug">nmbug</a>'
+<body>''')
+    print('<h2>Notmuch Patches</h2>')
+    print('Generated: %s<br />' % datetime.datetime.utcnow().date())
+    print('For more infomation see <a href="http://notmuchmail.org/nmbug">nmbug</a>')
 
-    print '<h3>Views</h3>'
-    print '<ul>'
+    print('<h3>Views</h3>')
+    print('<ul>')
     for view in config['views']:
-        print '<li><a href="#%(title)s">%(title)s</a></li>' % view
-    print '</ul>'
+        print('<li><a href="#%(title)s">%(title)s</a></li>' % view)
+    print('</ul>')
 
 for view in config['views']:
     print_view(**view)
 
 if output_format == 'html':
-    print '</body>\n</html>'
+    print('</body>\n</html>')
-- 
1.8.5.2.8.g0f6c0d1

  reply	other threads:[~2014-02-03 11:02 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-03 10:59 [PATCH 00/17] nmbug-status: Python-3-compabitility and general refactoring W. Trevor King
2014-02-03 10:59 ` W. Trevor King [this message]
2014-02-03 10:59 ` [PATCH 02/17] nmbug-status: Use email.utils instead of rfc822 W. Trevor King
2014-02-03 10:59 ` [PATCH 03/17] nmbug-status: Decode Popen output using the user's locale W. Trevor King
2014-02-03 10:59 ` [PATCH 04/17] nmbug-status: Factor config-loading out into read_config W. Trevor King
2014-02-03 10:59 ` [PATCH 05/17] nmbug-status: Add metavars for --config and --get-query W. Trevor King
2014-02-03 10:59 ` [PATCH 06/17] nmbug-status: Consolidate functions and main code W. Trevor King
2014-02-03 10:59 ` [PATCH 07/17] nmbug-status: Don't require write access W. Trevor King
2014-02-03 10:59 ` [PATCH 08/17] nmbug-status: Consolidate HTML header printing W. Trevor King
2014-02-03 10:59 ` [PATCH 09/17] nmbug-status: Add a Python-3-compatible urllib.parse.quote import W. Trevor King
2014-02-03 10:59 ` [PATCH 10/17] nmbug-status: Add Page and HtmlPage for modular rendering W. Trevor King
2014-02-03 10:59 ` [PATCH 11/17] nmbug-status: Normalize table HTML indentation W. Trevor King
2014-02-03 10:59 ` [PATCH 12/17] nmbug-status: Convert from XHTML 1.0 to HTML 5 W. Trevor King
2014-02-03 10:59 ` [PATCH 13/17] nmbug-status: Encode output using the user's locale W. Trevor King
2014-02-03 10:59 ` [PATCH 14/17] nmbug-status: Anchor with h3 ids instead of a names W. Trevor King
2014-02-03 10:59 ` [PATCH 15/17] nmbug-status: Quote the title when using it as an id W. Trevor King
2014-02-08 23:18   ` W. Trevor King
2014-02-09  9:34     ` Tomi Ollila
2014-02-03 10:59 ` [PATCH 16/17] nmbug-status: Use <code> and <p> markup where appropriate W. Trevor King
2014-02-03 10:59 ` [PATCH 17/17] nmbug-status: Color threads in HTML output W. Trevor King
2014-02-03 21:10 ` [PATCH 00/17] nmbug-status: Python-3-compabitility and general refactoring Tomi Ollila
2014-02-04  0:53   ` W. Trevor King
2014-02-04 10:30     ` Tomi Ollila
2014-02-04 13:07       ` David Bremner
2014-02-04 15:50         ` W. Trevor King
2014-02-04 17:39           ` W. Trevor King
2014-02-04 16:11       ` W. Trevor King
2014-02-04 18:40         ` Tomi Ollila
2014-02-04 19:14           ` W. Trevor King
2014-02-04 20:06             ` Tomi Ollila
2014-02-05 15:00               ` Tomi Ollila
2014-02-05 15:24                 ` Tomi Ollila
2014-02-05 15:31                   ` W. Trevor King
2014-02-07 22:15                     ` W. Trevor King
2014-02-05 15:27                 ` W. Trevor King
2014-02-05 22:54                   ` Tomi Ollila
2014-02-06 18:14                     ` W. Trevor King
2014-02-08 16:11                       ` David Bremner
     [not found]                       ` <87ob2hogkr.fsf@zancas.localnet>
2014-02-08 17:16                         ` W. Trevor King
2014-02-08 18:29                           ` Tomi Ollila
2014-02-08 19:09                             ` W. Trevor King
2014-02-08 19:37                               ` Tomi Ollila
2014-02-08 22:19                                 ` W. Trevor King
2014-02-04 17:48       ` W. Trevor King
2014-02-04 18:34         ` Tomi Ollila

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=273f26f98609938ace1190cfc6b5321b643b598f.1391424512.git.wking@tremily.us \
    --to=wking@tremily.us \
    --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).