From: W. Trevor King Date: Mon, 10 Feb 2014 18:40:22 +0000 (-0800) Subject: nmbug-status: Convert to Python-3-compatible print functions X-Git-Tag: 0.18_rc0~163 X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=a8b81adc8eab68cf13f99a8c4d6dd75d6e732a81;hp=9c1bc977d79808fca5b4fd0c584570bd4da90bef;p=notmuch nmbug-status: Convert to Python-3-compatible print functions We shouldn't require folks to install Python 2 to run nmbug-status. --- diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status index 934c895f..b1feee9f 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 '

%s

' % (title, title) - print comment - print 'The view is generated from the following query:' - print '
' - print query_string - print '
' - print '\n' + print('

%s

' % (title, title)) + print(comment) + print('The view is generated from the following query:') + print('
') + print(query_string) + print('
') + print('
\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\n') - print '

' + print('') 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 ''' + print(''' Notmuch Patches -''' - print '

Notmuch Patches

' - print 'Generated: %s
' % datetime.datetime.utcnow().date() - print 'For more infomation see nmbug' +''') + print('

Notmuch Patches

') + print('Generated: %s
' % datetime.datetime.utcnow().date()) + print('For more infomation see nmbug') - print '

Views

' - print '') for view in config['views']: print_view(**view) if output_format == 'html': - print '\n' + print('\n')