[SQL-CVS] r1503 - in home/phd/SQLObject/paramstyles: . sqlobject sqlobject/tests

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

Author: phd
Date: 2006-01-13 02:19:24 -0700 (Fri, 13 Jan 2006)
New Revision: 1503

Added:
   home/phd/SQLObject/paramstyles/sqlobject/tests/test_paste.py
   home/phd/SQLObject/paramstyles/sqlobject/wsgi_middleware.py
Modified:
   home/phd/SQLObject/paramstyles/setup.py
   home/phd/SQLObject/paramstyles/sqlobject/tests/dbtest.py
Log:
Merged patches from the revisions 1500:1502 from the trunk

Modified: home/phd/SQLObject/paramstyles/setup.py
===================================================================
--- home/phd/SQLObject/paramstyles/setup.py	2006-01-13 09:18:48 UTC (rev 1502)
+++ home/phd/SQLObject/paramstyles/setup.py	2006-01-13 09:19:24 UTC (rev 1503)
@@ -4,8 +4,10 @@
     from ez_setup import use_setuptools
     use_setuptools()
     from setuptools import setup
+    is_setuptools = True
 except ImportError:
     from distutils.core import setup
+    is_setuptools = False
 
 subpackages = ['firebird', 'include', 'include.pydispatch', 'inheritance',
                'manager', 'maxdb', 'mssql', 'mysql', 'postgres', 'sqlite',
@@ -18,6 +20,13 @@
     DistributionMetadata.classifiers = None
     DistributionMetadata.download_url = None
 
+kw = {}
+if is_setuptools:
+    kw['entry_points'] = """
+    [paste.filter_app_factory]
+    main = sqlobject.wsgi_middleware:make_middleware
+    """
+
 setup(name="SQLObject",
       version="0.8",
       description="Object-Relational Manager, aka database wrapper",
@@ -58,6 +67,7 @@
         'sqlite': ['pysqlite'],
         # Others?
         },
+      **kw
       )
 
 # Send announce to:

Modified: home/phd/SQLObject/paramstyles/sqlobject/tests/dbtest.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/tests/dbtest.py	2006-01-13 09:18:48 UTC (rev 1502)
+++ home/phd/SQLObject/paramstyles/sqlobject/tests/dbtest.py	2006-01-13 09:19:24 UTC (rev 1503)
@@ -84,9 +84,7 @@
     'sqlite:///' + installedDBFilename)
 
 def getConnection(**kw):
-    name = conftest.option.Database
-    if conftest.connectionShortcuts.has_key(name):
-        name = conftest.connectionShortcuts[name]
+    name = getConnectionURI()
     conn = sqlobject.connectionForURI(name, **kw)
     if conftest.option.show_sql:
         conn.debug = True
@@ -94,6 +92,12 @@
         conn.debugOutput = True
     return conn
 
+def getConnectionURI():
+    name = conftest.option.Database
+    if conftest.connectionShortcuts.has_key(name):
+        name = conftest.connectionShortcuts[name]
+    return name
+
 try:
     connection = getConnection()
 except Exception, e:
@@ -291,6 +295,6 @@
     sqlobject.main.warnings_level = None
     sqlobject.main.exception_level = 0
 
-__all__ = ['getConnection', 'setupClass', 'Dummy', 'raises',
+__all__ = ['getConnection', 'getConnectionURI', 'setupClass', 'Dummy', 'raises',
            'd', 'inserts', 'supports', 'deprecated_module',
            'setup_module', 'teardown_module']

Copied: home/phd/SQLObject/paramstyles/sqlobject/tests/test_paste.py (from rev 1501, SQLObject/trunk/sqlobject/tests/test_paste.py)


Property changes on: home/phd/SQLObject/paramstyles/sqlobject/tests/test_paste.py
___________________________________________________________________
Name: svn:eol-style
   + native

Copied: home/phd/SQLObject/paramstyles/sqlobject/wsgi_middleware.py (from rev 1501, SQLObject/trunk/sqlobject/wsgi_middleware.py)


Property changes on: home/phd/SQLObject/paramstyles/sqlobject/wsgi_middleware.py
___________________________________________________________________
Name: svn:eol-style
   + native