[SQL-CVS] r1190 - SQLObject/trunk/sqlobject

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

Author: phd
Date: 2005-11-02 20:07:16 +0000 (Wed, 02 Nov 2005)
New Revision: 1190

Modified:
   SQLObject/trunk/sqlobject/conftest.py
Log:
Do not import pkg_resources under Python 2.2.


Modified: SQLObject/trunk/sqlobject/conftest.py
===================================================================
--- SQLObject/trunk/sqlobject/conftest.py	2005-11-02 18:24:51 UTC (rev 1189)
+++ SQLObject/trunk/sqlobject/conftest.py	2005-11-02 20:07:16 UTC (rev 1190)
@@ -10,9 +10,14 @@
 import py
 import os
 import sqlobject
-import pkg_resources
-pkg_resources.require('SQLObject')
 
+try:
+    import pkg_resources
+except ImportError: # Python 2.2
+    pass
+else:
+    pkg_resources.require('SQLObject')
+
 connectionShortcuts = {
     'mysql': 'mysql://test@localhost/test',
     'dbm': 'dbm:///data',