diff options
| author | Matthew Sherborne <msherborne@gmail.com> | 2013-05-05 10:02:41 +1000 |
|---|---|---|
| committer | Matthew Sherborne <msherborne@gmail.com> | 2013-05-06 10:58:09 +1000 |
| commit | b82ee07c5de59b74a55cf52501c484645ef82768 (patch) | |
| tree | f77a140b13ce578d25a2275ae358461c257e4773 /tools | |
| parent | 9fda1e3d27e9f6c499a43396dfc71a47cb88e047 (diff) | |
| download | nova-b82ee07c5de59b74a55cf52501c484645ef82768.tar.gz nova-b82ee07c5de59b74a55cf52501c484645ef82768.tar.xz nova-b82ee07c5de59b74a55cf52501c484645ef82768.zip | |
Sync oslo-incubator print statement changes
Just changes openstack.common to use the new print statements.
This is in preparation for another sync coming shortly for the
scheduler library.
Change-Id: I17a86ef87f3253d6bb756cbd40a3ff5df9be23ff
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv_common.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index 0401a958f..914fcf17e 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' |