0.6a7 bugfix release

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041377

3 files changed, 37 insertions, 4 deletions

diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index f671acc9..3e88096d 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@ from distutils.core import Command as _Command
 from distutils.util import convert_path
 import os.path
 
-__version__ = '0.6a6'
+__version__ = '0.6a7'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 9db49080..d13c46f2 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -1,5 +1,4 @@
-import os.path
-
+import os.path, sys
 from distutils.command.build_py import build_py as _build_py
 from distutils.util import convert_path
 from glob import glob
@@ -36,6 +35,10 @@ class build_py(_build_py):
         # output files are.
         self.byte_compile(_build_py.get_outputs(self, include_bytecode=0))
 
+
+
+
+
     def get_data_files(self):
         """Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
         data = []
@@ -75,6 +78,8 @@ class build_py(_build_py):
                 self.mkpath(os.path.dirname(target))
                 self.copy_file(os.path.join(src_dir, filename), target)
 
+
+
     def get_outputs(self, include_bytecode=1):
         """Return complete list of files copied to the build directory
 
@@ -88,3 +93,31 @@ class build_py(_build_py):
             for package, src_dir, build_dir,filenames in self.data_files
             for filename in filenames
             ]
+
+
+if sys.version>="2.4":
+    # Python 2.4 already has the above code
+    build_py = _build_py
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index c36ad952..16531de3 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -134,7 +134,7 @@ class DistroTests(TestCase):
             "/foo_dir/Foo-1.2.egg",
             metadata=Metadata(('depends.txt', "[bar]\nBaz>=2.0"))
         )
-        ad.add(Foo)
+        ad.add(Foo); ad.add(Distribution.from_filename("Foo-0.9.egg"))
 
         # Request thing(s) that are available -> list to activate
         for i in range(3):