summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorChuck Short <chuck.short@canonical.com>2013-05-01 09:40:43 -0500
committerChuck Short <chuck.short@canonical.com>2013-05-02 08:06:01 -0500
commit2f771aca390639cc49f71c451bd55c1d10db6f58 (patch)
tree5873dda954d351f5522a7451acb1215b7c85ab7c /tools
parent90e83530d4dc49d570fa05ea63a93805717dcfa0 (diff)
downloadoslo-2f771aca390639cc49f71c451bd55c1d10db6f58.tar.gz
oslo-2f771aca390639cc49f71c451bd55c1d10db6f58.tar.xz
oslo-2f771aca390639cc49f71c451bd55c1d10db6f58.zip
Improve python3 compatibility
Change print statements so that it works with python3 as well. Change-Id: Iff16b62e4b875c79862c9af7726ea77627aa7b4f Signed-off-by: Chuck Short <chuck.short@canonical.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv_common.py22
1 files changed, 12 insertions, 10 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py
index 0401a95..914fcf1 100644
--- a/tools/install_venv_common.py
+++ b/tools/install_venv_common.py
@@ -24,6 +24,8 @@ environment, it should be kept strictly compatible with Python 2.6.
Synced in from openstack-common
"""
+from __future__ import print_function
+
import optparse
import os
import subprocess
@@ -42,7 +44,7 @@ class InstallVenv(object):
self.project = project
def die(self, message, *args):
- print >> sys.stderr, message % args
+ print(message % args, file=sys.stderr)
sys.exit(1)
def check_python_version(self):
@@ -89,20 +91,20 @@ class InstallVenv(object):
virtual environment.
"""
if not os.path.isdir(self.venv):
- print 'Creating venv...',
+ print('Creating venv...', end=' ')
if no_site_packages:
self.run_command(['virtualenv', '-q', '--no-site-packages',
self.venv])
else:
self.run_command(['virtualenv', '-q', self.venv])
- print 'done.'
- print 'Installing pip in venv...',
+ print('done.')
+ print('Installing pip in venv...', end=' ')
if not self.run_command(['tools/with_venv.sh', 'easy_install',
'pip>1.0']).strip():
self.die("Failed to install pip.")
- print 'done.'
+ print('done.')
else:
- print "venv already exists..."
+ print("venv already exists...")
pass
def pip_install(self, *args):
@@ -111,7 +113,7 @@ class InstallVenv(object):
redirect_output=False)
def install_dependencies(self):
- print 'Installing dependencies with pip (this can take a while)...'
+ print('Installing dependencies with pip (this can take a while)...')
# First things first, make sure our venv has the latest pip and
# distribute.
@@ -153,12 +155,12 @@ class Distro(InstallVenv):
return
if self.check_cmd('easy_install'):
- print 'Installing virtualenv via easy_install...',
+ print('Installing virtualenv via easy_install...', end=' ')
if self.run_command(['easy_install', 'virtualenv']):
- print 'Succeeded'
+ print('Succeeded')
return
else:
- print 'Failed'
+ print('Failed')
self.die('ERROR: virtualenv not found.\n\n%s development'
' requires virtualenv, please install it using your'