[SQL-CVS] r647 - in trunk/SQLObject/sqlobject: . tests

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

Author: phd
Date: 2005-02-24 22:56:21 +0000 (Thu, 24 Feb 2005)
New Revision: 647

Modified:
   trunk/SQLObject/sqlobject/dbconnection.py
   trunk/SQLObject/sqlobject/tests/test_parse.py
Log:
_parseURI() now translate paths from C|/path to C:/path on w32 platforms.


Modified: trunk/SQLObject/sqlobject/dbconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/dbconnection.py	2005-02-24 14:05:57 UTC (rev 646)
+++ trunk/SQLObject/sqlobject/dbconnection.py	2005-02-24 22:56:21 UTC (rev 647)
@@ -105,6 +105,9 @@
         else:
             port = None
         path = '/' + rest
+        if os.name == 'nt':
+            if (len(rest) > 1) and (rest[1] == '|'):
+                path = "%s:%s" % (rest[0], rest[2:])
         args = {}
         if path.find('?') != -1:
             path, arglist = path.split('?', 1)

Modified: trunk/SQLObject/sqlobject/tests/test_parse.py
===================================================================
--- trunk/SQLObject/sqlobject/tests/test_parse.py	2005-02-24 14:05:57 UTC (rev 646)
+++ trunk/SQLObject/sqlobject/tests/test_parse.py	2005-02-24 22:56:21 UTC (rev 647)
@@ -1,3 +1,4 @@
+import os
 from sqlobject.dbconnection import DBConnection
 
 ########################################
@@ -54,3 +55,12 @@
     assert port is None
     assert path == "/:memory:"
     assert args == {}
+
+    if os.name == 'nt':
+        user, password, host, port, path, args = _parseURI("sqlite:/C|/full/path/to/database")
+        assert user is None
+        assert password is None
+        assert host is None
+        assert port is None
+        assert path == "C:/full/path/to/database"
+        assert args == {}