diff --git a/astara/cli/browse.py b/astara/cli/browse.py index 553639c8..6a6941eb 100644 --- a/astara/cli/browse.py +++ b/astara/cli/browse.py @@ -17,6 +17,8 @@ """Interactive CLI for rebuilding routers """ + +from __future__ import print_function import logging import os import Queue @@ -204,7 +206,7 @@ def populate_routers(db, conf, workers): try: client.fetch() except (KeyboardInterrupt, SystemExit): - print "Killing background worker..." + print("Killing background worker...") break @@ -334,7 +336,7 @@ class BrowseRouters(message.MessageSending): ] if i + offset == self.position: args = map(self.term.reverse, args[:-3]) + args[-3:] - print self.term.move(i, 0) + ' '.join(args) + print(self.term.move(i, 0) + ' '.join(args)) def make_message(self, router): return { @@ -368,8 +370,8 @@ class BrowseRouters(message.MessageSending): def _exit(self): if self.interactive: - print 'Deleting %s...' % self.fh.name + print('Deleting %s...' % self.fh.name) self.fh.close() os.remove(self.fh.name) if self.interactive: - print 'Exiting...' + print('Exiting...') diff --git a/astara/debug.py b/astara/debug.py index 6be4ebe0..805f5fbe 100644 --- a/astara/debug.py +++ b/astara/debug.py @@ -15,6 +15,8 @@ # under the License. +from __future__ import print_function + import os import sys @@ -41,11 +43,11 @@ class Fake(object): def delete_callback(self): - print 'DELETE' + print('DELETE') def bandwidth_callback(self, *args, **kwargs): - print 'BANDWIDTH:', args, kwargs + print('BANDWIDTH:', args, kwargs) def debug_one_router(args=sys.argv[1:]):