Commit 2ebac710 authored by Florian Schulze's avatar Florian Schulze

Fixed setup.py use of setuptools vs distutils, so .c and .h files are included in the bdist_egg.

parent ddd75765
...@@ -4,6 +4,9 @@ Whats new in ZODB 3.8.1 ...@@ -4,6 +4,9 @@ Whats new in ZODB 3.8.1
Bugs Fixed: 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 - (beta 7) Fixed a bug, introduced in an earlier beta, that allowed
clients to connect to out of date servers. clients to connect to out of date servers.
......
...@@ -39,7 +39,15 @@ Operating System :: Unix ...@@ -39,7 +39,15 @@ Operating System :: Unix
try: try:
from setuptools import setup 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: 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 from distutils.core import setup
extra = dict( extra = dict(
scripts = ["src/ZODB/scripts/fsdump.py", scripts = ["src/ZODB/scripts/fsdump.py",
...@@ -86,11 +94,7 @@ else: ...@@ -86,11 +94,7 @@ else:
import glob import glob
import os import os
import sys import sys
from distutils.extension import Extension
from distutils import dir_util 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 from distutils.util import convert_path
if sys.version_info < (2, 4, 2): if sys.version_info < (2, 4, 2):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment