aboutsummaryrefslogtreecommitdiffstats
path: root/tests/install_test.py
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2011-06-20 22:55:16 +0100
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2011-06-20 22:55:16 +0100
commit58a658b26d1c95b31d02050dcccd648d2e4ce27b (patch)
treeb9d3e7de6f6d23b91a7afecde3491e99d8cc7069 /tests/install_test.py
parente63f3e7d864b26529d6b197e053b4084be20decf (diff)
downloadexternal_python_setuptools-58a658b26d1c95b31d02050dcccd648d2e4ce27b.tar.gz
external_python_setuptools-58a658b26d1c95b31d02050dcccd648d2e4ce27b.tar.bz2
external_python_setuptools-58a658b26d1c95b31d02050dcccd648d2e4ce27b.zip
Changes to support 2.x and 3.x in the same codebase.
--HG-- branch : distribute extra : rebase_source : 7d3608edee54a43789f0574d702fb839628b5071
Diffstat (limited to 'tests/install_test.py')
-rw-r--r--tests/install_test.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/install_test.py b/tests/install_test.py
index 02deb818..97b79933 100644
--- a/tests/install_test.py
+++ b/tests/install_test.py
@@ -1,19 +1,19 @@
-import urllib2
import sys
import os
+from setuptools.compat import urllib2
if os.path.exists('distribute_setup.py'):
- print 'distribute_setup.py exists in the current dir, aborting'
+ print('distribute_setup.py exists in the current dir, aborting')
sys.exit(2)
-print '**** Starting Test'
-print '\n\n'
+print('**** Starting Test')
+print('\n\n')
is_jython = sys.platform.startswith('java')
if is_jython:
import subprocess
-print 'Downloading bootstrap'
+print('Downloading bootstrap')
file = urllib2.urlopen('http://nightly.ziade.org/distribute_setup.py')
f = open('distribute_setup.py', 'w')
f.write(file.read())
@@ -27,7 +27,7 @@ else:
res = os.spawnv(os.P_WAIT, sys.executable, args)
if res != 0:
- print '**** Test failed, please send me the output at tarek@ziade.org'
+ print('**** Test failed, please send me the output at tarek@ziade.org')
os.remove('distribute_setup.py')
sys.exit(2)
@@ -63,11 +63,11 @@ try:
else:
res = os.spawnv(os.P_WAIT, sys.executable, args)
- print '\n\n'
+ print('\n\n')
if res:
- print '**** Test is OK'
+ print('**** Test is OK')
else:
- print '**** Test failed, please send me the output at tarek@ziade.org'
+ print('**** Test failed, please send me the output at tarek@ziade.org')
finally:
if os.path.exists(script_name):
os.remove(script_name)