sqlobject-cvs

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

Author: ianb
Date: 2006-06-13 15:27:16 -0600 (Tue, 13 Jun 2006)
New Revision: 1806

Modified:
   SQLObject/trunk/sqlobject/dbconnection.py
Log:
merged r1804:1805 to trunk

Modified: SQLObject/trunk/sqlobject/dbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/dbconnection.py	2006-06-13 21:25:24 UTC (rev 1805)
+++ SQLObject/trunk/sqlobject/dbconnection.py	2006-06-13 21:27:16 UTC (rev 1806)
@@ -56,14 +56,15 @@
         auth = getattr(self, 'user', None) or ''
         if auth:
             if self.password:
-                auth = auth + '@' + self.password
-            auth = auth + ':'
+                auth = auth + ':' + self.password
+            auth = auth + '@'
         else:
             assert not getattr(self, 'password', None), (
                 'URIs cannot express passwords without usernames')
         uri = '%s://%s' % (self.dbName, auth)
         if self.host:
-            uri += self.host + '/'
+            uri += self.host
+        uri += '/'
         db = self.db
         if db.startswith('/'):
             db = path[1:]