zfec: make it Python 2.4-compatible (but also it requires setuptools again)

src/zfec/setup.py

@@ -26,7 +26,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from distutils.core import Extension, setup
+from setuptools import Extension, find_packages, setup
 
 DEBUGMODE=False
 # DEBUGMODE=True
@@ -66,9 +66,9 @@ setup(name='zfec',
       url='http://allmydata.org/source/zfec',
       license='GNU GPL',
       platform='Any',
-      packages=['zfec', 'zfec.cmdline', 'zfec.util', 'zfec.test'],
+      packages=find_packages(),
       classifiers=trove_classifiers,
-      entry_points = { 'console_scripts': [ 'zfec = zfec.cmdline.zfec:main', 'zunfec = zfec.cmdline.zunfec:main' ] },
+      entry_points = { 'console_scripts': [ 'zfec = zfec.cmdline_zfec:main', 'zunfec = zfec.cmdline_zunfec:main' ] },
       ext_modules=[Extension('_fec', ['zfec/fec.c', 'zfec/_fecmodule.c',], extra_link_args=extra_link_args, extra_compile_args=extra_compile_args, undef_macros=undef_macros),],
       test_suite="zfec.test.test_zfec",
       )

src/zfec/zfec/__init__.py

@@ -17,5 +17,5 @@ __version__ = Version("1.0.0a5-1-STABLE")
 __sources__ = ["http://allmydata.com/source/zfec",]
 
 from _fec import Encoder, Decoder, Error
-import filefec
+import filefec, cmdline_zfec, cmdline_zunfec
 

src/zfec/zfec/cmdline_zfec.py

@@ -7,11 +7,11 @@
 
 import sys
 
-from ..util import argparse
+from util import argparse
-from .. import filefec
+import filefec
 
-from ..zfec import __version__ as libversion
+from zfec import __version__ as libversion
-from ..util.version import Version
+from util.version import Version
 __version__ = Version("1.0.0a1-0-STABLE")
 
 def main():

src/zfec/zfec/cmdline_zunfec.py

@@ -7,11 +7,11 @@
 
 import os, sys
 
-from ..util import argparse
+from util import argparse
-from .. import filefec
+import filefec
 
-from ..zfec import __version__ as libversion
+from zfec import __version__ as libversion
-from ..util.version import Version
+from util.version import Version
 __version__ = Version("1.0.0a1-0-STABLE")
 
 def main():