diff -ur SQLObject-0.7rc1.orig/scripts/sqlobject-admin SQLObject-0.7rc1/scripts/sqlobject-admin --- SQLObject-0.7rc1.orig/scripts/sqlobject-admin 2005-11-06 17:16:23 +0300 +++ SQLObject-0.7rc1/scripts/sqlobject-admin 2005-11-09 00:55:36 +0300 @@ -2,12 +2,12 @@ import sys import os -try: - import pkg_resources - pkg_resources.require('SQLObject>0.6.1') -except (ImportError, pkg_resources.DistributionNotFound): +#try: +# import pkg_resources +# pkg_resources.require('SQLObject>0.6.1') +#except (ImportError, pkg_resources.DistributionNotFound): # Oh well, we tried... - pass +# pass try: import sqlobject.manager diff -ur SQLObject-0.7rc1.orig/setup.py SQLObject-0.7rc1/setup.py --- SQLObject-0.7rc1.orig/setup.py 2005-11-06 17:16:36 +0300 +++ SQLObject-0.7rc1/setup.py 2005-11-06 17:16:08 +0300 @@ -1,11 +1,11 @@ # 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 +#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']