Author: phd
Date: 2006-08-29 08:26:02 -0600 (Tue, 29 Aug 2006)
New Revision: 1889
Modified:
home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py
home/phd/SQLObject/paramstyles/sqlobject/tests/test_parse.py
Log:
Merged patches from the revisions 1886:1888 from the trunk
Modified: home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py 2006-08-29 14:20:29 UTC (rev 1888)
+++ home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py 2006-08-29 14:26:02 UTC (rev 1889)
@@ -96,7 +96,7 @@
else:
host, rest = rest.split('/', 1)
if host and host.find('@') != -1:
- user, host = host.split('@', 1)
+ user, host = host.rsplit('@', 1)
if user.find(':') != -1:
user, password = user.split(':', 1)
else:
Modified: home/phd/SQLObject/paramstyles/sqlobject/tests/test_parse.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/tests/test_parse.py 2006-08-29 14:20:29 UTC (rev 1888)
+++ home/phd/SQLObject/paramstyles/sqlobject/tests/test_parse.py 2006-08-29 14:26:02 UTC (rev 1889)
@@ -48,6 +48,14 @@
assert path == "/full/path/to/socket/database"
assert args == {}
+ user, password, host, port, path, args = _parseURI("postgres://user:at@...>")
+ assert user == "user"
+ assert password == "at@..."
+ assert host == "host"
+ assert port is None
+ assert path == "/database"
+ assert args == {}
+
user, password, host, port, path, args = _parseURI("sqlite:///full/path/to/database")
assert user is None
assert password is None
|