[SQL-CVS] r4340 - in SQLObject/trunk: . scripts sqlobject

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

Author: phd
Date: Thu Mar  3 10:02:59 2011
New Revision: 4340

Log:
connectionForURI(uri, oldUri=True).
Renamed scripts/sqlobject-convertURI to scripts/sqlobject-convertOldURI.

Added:
   SQLObject/trunk/scripts/sqlobject-convertOldURI
      - copied, changed from r4339, SQLObject/trunk/scripts/sqlobject-convertURI
Deleted:
   SQLObject/trunk/scripts/sqlobject-convertURI
Modified:
   SQLObject/trunk/setup.py
   SQLObject/trunk/sqlobject/dbconnection.py

Copied and modified: SQLObject/trunk/scripts/sqlobject-convertOldURI (from r4339, SQLObject/trunk/scripts/sqlobject-convertURI)
==============================================================================
--- SQLObject/trunk/scripts/sqlobject-convertURI	Tue Mar  1 10:31:01 2011	(r4339, copy source)
+++ SQLObject/trunk/scripts/sqlobject-convertOldURI	Thu Mar  3 10:02:59 2011	(r4340)
@@ -13,9 +13,7 @@
 except (ImportError, pkg_resources.DistributionNotFound):
     pass
 
-from sqlobject.dbconnection import dbConnectionForScheme
+from sqlobject import connectionForURI
 
-scheme = uri.split(':')[0]
-connCls = dbConnectionForScheme(scheme)
-conn = connCls.connectionFromOldURI(uri)
+conn = connectionForURI(uri, oldUri=True)
 print conn.uri()

Modified: SQLObject/trunk/setup.py
==============================================================================
--- SQLObject/trunk/setup.py	Tue Mar  1 10:31:01 2011	(r4339)
+++ SQLObject/trunk/setup.py	Thu Mar  3 10:02:59 2011	(r4340)
@@ -52,7 +52,7 @@
       download_url="http://cheeseshop.python.org/pypi/SQLObject/1.0",
       license="LGPL",
       packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
-      scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertURI"],
+      scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
       install_requires=["FormEncode>=1.1.1"],
       extras_require={
         'mysql': ['MySQLdb'],

Modified: SQLObject/trunk/sqlobject/dbconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/dbconnection.py	Tue Mar  1 10:31:01 2011	(r4339)
+++ SQLObject/trunk/sqlobject/dbconnection.py	Thu Mar  3 10:02:59 2011	(r4340)
@@ -991,7 +991,7 @@
             assert inst.name.find(':') == -1, "You cannot include ':' in your class names (%r)" % cls.name
             self.instanceNames[inst.name] = inst
 
-    def connectionForURI(self, uri, **args):
+    def connectionForURI(self, uri, oldUri=False, **args):
         if args:
             if '?' not in uri:
                 uri += '?' + urllib.urlencode(args)
@@ -1002,7 +1002,10 @@
         if uri.find(':') != -1:
             scheme, rest = uri.split(':', 1)
             connCls = self.dbConnectionForScheme(scheme)
-            conn = connCls.connectionFromURI(uri)
+            if oldUri:
+                conn = connCls.connectionFromOldURI(uri)
+            else:
+                conn = connCls.connectionFromURI(uri)
         else:
             # We just have a name, not a URI
             assert self.instanceNames.has_key(uri), \