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

[Florian Schulze]

Log message for revision 90444:
  Fixed setup.py use of setuptools vs distutils, so .c and .h files are included in the bdist_egg.

Changed:
  U   ZODB/branches/3.8/NEWS.txt
  U   ZODB/branches/3.8/setup.py

-=-
Modified: ZODB/branches/3.8/NEWS.txt
===================================================================
--- ZODB/branches/3.8/NEWS.txt	2008-08-27 12:47:43 UTC (rev 90443)
+++ ZODB/branches/3.8/NEWS.txt	2008-08-27 12:49:12 UTC (rev 90444)
@@ -4,6 +4,9 @@
 
 Bugs Fixed:
 
+- (unreleased) Fixed setup.py use of setuptools vs distutils, so .c and .h
+  files are included in the bdist_egg.
+
 - (beta 7) Fixed a bug, introduced in an earlier beta, that allowed
   clients to connect to out of date servers.
 

Modified: ZODB/branches/3.8/setup.py
===================================================================
--- ZODB/branches/3.8/setup.py	2008-08-27 12:47:43 UTC (rev 90443)
+++ ZODB/branches/3.8/setup.py	2008-08-27 12:49:12 UTC (rev 90444)
@@ -39,7 +39,15 @@
 
 try:
     from setuptools import setup
+    from setuptools.extension import Extension
+    from setuptools.dist import Distribution
+    from setuptools.command.install_lib import install_lib
+    from setuptools.command.build_py import build_py
 except ImportError:
+    from distutils.extension import Extension
+    from distutils.dist import Distribution
+    from distutils.command.install_lib import install_lib
+    from distutils.command.build_py import build_py
     from distutils.core import setup
     extra = dict(
         scripts = ["src/ZODB/scripts/fsdump.py",
@@ -86,11 +94,7 @@
 import glob
 import os
 import sys
-from distutils.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 distutils.util import convert_path
 
 if sys.version_info < (2, 4, 2):