[Python-checkins] distutils2: Branch merge

Sat Oct 2 00:52:19 CEST 2010

tarek.ziade pushed 4ddf7feadf0f to distutils2:
http://hg.python.org/distutils2/rev/4ddf7feadf0f
changeset: 693:4ddf7feadf0f
parent: 665:d8ae6395397e
parent: 692:6f7d4343e99b
user: ?ric Araujo <merwok at netwok.org>
date: Mon Sep 06 06:32:30 2010 +0200
summary: Branch merge
files:

diff --git a/src/DEVNOTES.txt b/src/DEVNOTES.txt
--- a/src/DEVNOTES.txt
+++ b/src/DEVNOTES.txt
@@ -7,8 +7,3 @@
 
 - Always run tests.sh before you push a change. This implies
 that you have all Python versions installed from 2.4 to 2.7.
-
-- With Python 2.4, if you want to run tests with runtests.py, or run
- just one test directly, be sure to run python2.4 setup.py build_ext
- first, else tests won't find _hashlib or _md5. When using tests.sh,
- build_ext is automatically done.
diff --git a/src/runtests-cov.py b/src/runtests-cov.py
--- a/src/runtests-cov.py
+++ b/src/runtests-cov.py
@@ -133,4 +133,10 @@
 except ImportError:
 sys.stderr.write('Error: You have to install unittest2')
 sys.exit(1)
+ if sys.version < '2.5':
+ try:
+ from distutils2._backport import hashlib
+ except ImportError:
+ import subprocess
+ subprocess.call([sys.executable, 'setup.py', 'build_ext'])
 sys.exit(test_main())
diff --git a/src/runtests.py b/src/runtests.py
--- a/src/runtests.py
+++ b/src/runtests.py
@@ -33,4 +33,10 @@
 except ImportError:
 sys.stderr.write('Error: You have to install unittest2')
 sys.exit(1)
+ if sys.version < '2.5':
+ try:
+ from distutils2._backport import hashlib
+ except ImportError:
+ import subprocess
+ subprocess.call([sys.executable, 'setup.py', 'build_ext'])
 sys.exit(test_main())
--
Repository URL: http://hg.python.org/distutils2
