From 67450f43b300c53e3dec9b7b4f7b6d9638f1b117 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Mon, 26 Nov 2012 17:27:46 +0000 Subject: [PATCH] Fix print statements for Python2.5 --- deluge/main.py | 2 +- deluge/ui/console/main.py | 2 +- setup.py | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deluge/main.py b/deluge/main.py index 224d824a2..d7f3df257 100644 --- a/deluge/main.py +++ b/deluge/main.py @@ -175,7 +175,7 @@ this should be an IP address", metavar="IFACE", if options.config: if not deluge.configmanager.set_config_dir(options.config): - print("There was an error setting the config dir! Exiting..") + print "There was an error setting the config dir! Exiting.." sys.exit(1) # Sets the options.logfile to point to the default location diff --git a/deluge/ui/console/main.py b/deluge/ui/console/main.py index 113fd95d5..d700b832a 100644 --- a/deluge/ui/console/main.py +++ b/deluge/ui/console/main.py @@ -288,7 +288,7 @@ Please use commands from the command line, eg:\n if self.interactive: self.screen.add_line(line, not self.batch_write) else: - print(colors.strip_colors(line.encode("utf-8"))) + print colors.strip_colors(line.encode("utf-8")) def do_command(self, cmd): """ diff --git a/setup.py b/setup.py index cef21f951..801882dfd 100755 --- a/setup.py +++ b/setup.py @@ -262,11 +262,11 @@ class build_trans(cmd.Command): INTLTOOL_MERGE='intltool-merge' INTLTOOL_MERGE_OPTS='--utf8 --quiet --desktop-style' desktop_in='deluge/data/share/applications/deluge.desktop.in' - print('Creating desktop file: %s' % desktop_data) + print 'Creating desktop file: %s' % desktop_data os.system('C_ALL=C ' + '%s '*5 % (INTLTOOL_MERGE, INTLTOOL_MERGE_OPTS, \ po_dir, desktop_in, desktop_data)) - print('Compiling po files from %s...' % po_dir), + print 'Compiling po files from %s...' % po_dir, for path, names, filenames in os.walk(po_dir): for f in filenames: uptoDate = False @@ -426,7 +426,7 @@ class clean_plugins(cmd.Command): self.set_undefined_options('clean', ('all', 'all')) def run(self): - print("Cleaning the plugin's folders..") + print "Cleaning the plugin's folders.." PLUGIN_PATH = "deluge/plugins/*" @@ -439,7 +439,7 @@ class clean_plugins(cmd.Command): # Delete the .eggs if path[-4:] == ".egg": - print("Deleting %s" % path) + print "Deleting %s" % path os.remove(path) EGG_INFO_DIR_PATH = "deluge/plugins/*/*.egg-info" @@ -447,7 +447,7 @@ class clean_plugins(cmd.Command): for path in glob.glob(EGG_INFO_DIR_PATH): # Delete the .egg-info's directories if path[-9:] == ".egg-info": - print("Deleting %s" % path) + print "Deleting %s" % path for fpath in os.listdir(path): os.remove(os.path.join(path, fpath)) os.removedirs(path) @@ -455,7 +455,7 @@ class clean_plugins(cmd.Command): ROOT_EGG_INFO_DIR_PATH = "deluge*.egg-info" for path in glob.glob(ROOT_EGG_INFO_DIR_PATH): - print("Deleting %s" % path) + print "Deleting %s" % path for fpath in os.listdir(path): os.remove(os.path.join(path, fpath)) os.removedirs(path) @@ -470,7 +470,7 @@ class clean(_clean): _clean.run(self) if os.path.exists(desktop_data): - print("Deleting %s" % desktop_data) + print "Deleting %s" % desktop_data os.remove(desktop_data) cmdclass = {