[Python-checkins] distutils2: Fix merge after running tests

[tarek.ziade]

tarek.ziade pushed 70cc02f1c720 to distutils2:

http://hg.python.org/distutils2/rev/70cc02f1c720
changeset:   436:70cc02f1c720
user:        ?ric Araujo <merwok at netwok.org>
date:        Tue Aug 03 22:50:41 2010 +0200
summary:     Fix merge after running tests
files:       src/distutils2/command/install_distinfo.py, src/distutils2/tests/test_install_distinfo.py, src/tests.sh

diff --git a/src/distutils2/command/install_distinfo.py b/src/distutils2/command/install_distinfo.py
--- a/src/distutils2/command/install_distinfo.py
+++ b/src/distutils2/command/install_distinfo.py
@@ -10,15 +10,16 @@
 automatically by the ``install`` command.
 """
 
+import os
+import csv
+import re
 from distutils2.command.cmd import Command
 from distutils2 import log
 from distutils2._backport.shutil import rmtree
-
-
-import csv
-import hashlib
-import os
-import re
+try:
+    import hashlib
+except ImportError:
+    from distutils2._backport import hashlib
 
 
 class install_distinfo(Command):
diff --git a/src/distutils2/tests/test_install_distinfo.py b/src/distutils2/tests/test_install_distinfo.py
--- a/src/distutils2/tests/test_install_distinfo.py
+++ b/src/distutils2/tests/test_install_distinfo.py
@@ -4,13 +4,17 @@
 import sys
 import csv
 
-from distutils2._backport import hashlib
 from distutils2.command.install_distinfo import install_distinfo
 from distutils2.core import Command
 from distutils2.metadata import DistributionMetadata
 from distutils2.tests import support
 from distutils2.tests.support import unittest
 
+try:
+    import hashlib
+except ImportError:
+    from distutils2._backport import hashlib
+
 
 class DummyInstallCmd(Command):
 
@@ -143,9 +147,9 @@
         dirs = []
         for dir in os.listdir(fake_dists):
                 full_path = os.path.join(fake_dists, dir)
-                if not dir.endswith(('.egg', '.egg-info', '.dist-info')) \
-                   and os.path.isdir(full_path):
-                        dirs.append(full_path)
+                if (not dir.endswith('.egg') or dir.endswith('.egg-info') or
+                    dir.endswith('.dist-info')) and os.path.isdir(full_path):
+                    dirs.append(full_path)
 
         for dir in dirs:
             for (path, subdirs, files) in os.walk(dir):
diff --git a/src/tests.sh b/src/tests.sh
--- a/src/tests.sh
+++ b/src/tests.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 echo -n "Running tests for Python 2.4... "
 rm -f distutils2/_backport/_hashlib.so
-python2.4 setup.py build_ext -q 2> /dev/null > /dev/null
+python2.4 setup.py build_ext -f -q 2> /dev/null > /dev/null
 python2.4 -Wd runtests.py -q 2> /dev/null
 if [ $? -ne 0 ];then
     echo "Failed"

--
Repository URL: http://hg.python.org/distutils2