diff --git a/meeting b/meeting index 6142e73..a466721 100755 --- a/meeting +++ b/meeting @@ -1,5 +1,5 @@ #!/usr/bin/python - +from __future__ import print_function # # A simple tool to manage the discuss meetings. # @@ -45,10 +45,10 @@ def list_meetings(): meetings = [ "%s [%s]" % ( entry['displayname'], ", ".join(entry['names']) ) for entry in rcfile.entries.values() if entry['hostname'] == server ] meetings.sort() - print "--- Meetings on %s ---" % server + print("--- Meetings on %s ---" % server) for meeting in meetings: - print "* %s" % meeting - print "" + print("* %s" % meeting) + print("") def get_meeting(name): rcfile = discuss.RCFile() @@ -66,10 +66,10 @@ def list_acl(): acl = meeting.get_acl() acl.sort(key = lambda acl: acl[0]) - print "%s Principal" % acl_flags - print "%s ---------" % ("-" * len(acl_flags)) + print("%s Principal" % acl_flags) + print("%s ---------" % ("-" * len(acl_flags))) for principal, modes in acl: - print "%s %s" % (modes, principal) + print("%s %s" % (modes, principal)) def set_acl(): meeting = get_meeting(args.meeting) @@ -96,7 +96,7 @@ def complete(): meetings = [entry['displayname'] for entry in rcfile.entries.values() if entry['displayname'].startswith(args.prefix)] meetings.sort() - print " ".join( meetings ) + print(" ".join( meetings )) def parse_args(): global args diff --git a/ndsc b/ndsc index 9d056af..0b8209f 100755 --- a/ndsc +++ b/ndsc @@ -98,9 +98,10 @@ def format_transaction_row(trn, width): def truncate_column(text, maxlen): if len(text) <= maxlen: - return pad(text, maxlen) + return str(pad(text, maxlen)) else: - return text[0:maxlen-1] + '…' + # python 2 can't concatenate unicode and str-containing-unicode + return str(text[0:maxlen-1]) + '…' number_column = pad(str(trn.number), number_column_len, True) sender_column = truncate_column(trn.signature, sender_column_len) diff --git a/setup.py b/setup.py index 2058c2e..cb1ec60 100755 --- a/setup.py +++ b/setup.py @@ -1,9 +1,9 @@ #!/usr/bin/python -from distutils.core import setup +from setuptools import setup setup(name='discuss-ng', - version='1.1.1', + version='1.2', description='User interface front-end to the discuss network forum system', author='Victor Vasiliev', scripts=['meeting', 'ndsc']