[SQL-CVS] r947 - trunk/SQLObject

[<sub...@co...>]

Author: ianb
Date: 2005-08-27 09:22:54 +0000 (Sat, 27 Aug 2005)
New Revision: 947

Modified:
   trunk/SQLObject/
   trunk/SQLObject/setup.py
Log:
use distutils for python2.2 with setup.py



Property changes on: trunk/SQLObject
___________________________________________________________________
Name: svn:ignore
   - MANIFEST
data
build
dist
*.pyc
*.pyo
*.tmp

   + MANIFEST
data
build
dist
*.pyc
*.pyo
*.tmp
SQLObject.egg-info


Modified: trunk/SQLObject/setup.py
===================================================================
--- trunk/SQLObject/setup.py	2005-08-27 09:20:16 UTC (rev 946)
+++ trunk/SQLObject/setup.py	2005-08-27 09:22:54 UTC (rev 947)
@@ -1,6 +1,11 @@
-from ez_setup import use_setuptools
-use_setuptools()
-from setuptools import setup, find_packages
+# ez_setup doesn't work with Python 2.2, so we use distutils
+# in that case:
+try:
+    from ez_setup import use_setuptools
+    use_setuptools()
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 
 subpackages = ['firebird', 'inheritance', 'mysql', 'postgres',
                'sqlite', 'sybase', 'maxdb', 'util', 'manager']
@@ -13,7 +18,7 @@
     DistributionMetadata.download_url = None
 
 setup(name="SQLObject",
-      version="0.7",
+      version="0.7b1",
       description="Object-Relational Manager, aka database wrapper",
       long_description="""\
 Classes created using SQLObject wrap database rows, presenting a