[Zodb-checkins] SVN: ZODB/trunk/ Fixed setup.py use of setuptools vs distutils, so .c and .h files are included in the bdist_egg. Merged from r90444 in the 3.8 branch.

[Florian Schulze]

Log message for revision 90468:
  Fixed setup.py use of setuptools vs distutils, so .c and .h files are included in the bdist_egg. Merged from r90444 in the 3.8 branch.

Changed:
  U   ZODB/trunk/HISTORY.txt
  U   ZODB/trunk/setup.py

-=-
Modified: ZODB/trunk/HISTORY.txt
===================================================================
--- ZODB/trunk/HISTORY.txt	2008-08-27 14:52:27 UTC (rev 90467)
+++ ZODB/trunk/HISTORY.txt	2008-08-27 14:59:55 UTC (rev 90468)
@@ -4,6 +4,9 @@
 General
 -------
 
+- (unreleased) Fixed setup.py use of setuptools vs distutils, so .c and .h
+  files are included in the bdist_egg.
+
 - The ZODB Storage APIs have been documented and cleaned up.
 
 - ZODB versions are now officially deprecated and support for them

Modified: ZODB/trunk/setup.py
===================================================================
--- ZODB/trunk/setup.py	2008-08-27 14:52:27 UTC (rev 90467)
+++ ZODB/trunk/setup.py	2008-08-27 14:59:55 UTC (rev 90468)
@@ -59,11 +59,11 @@
 import glob
 import os
 import sys
-from distutils.extension import Extension
+from setuptools.extension import Extension
 from distutils import dir_util
-from distutils.dist import Distribution
-from distutils.command.install_lib import install_lib
-from distutils.command.build_py import build_py
+from setuptools.dist import Distribution
+from setuptools.command.install_lib import install_lib
+from setuptools.command.build_py import build_py
 from distutils.util import convert_path
 
 if sys.version_info < (2, 4, 2):