[SQL-CVS] r2213 - home/phd/SQLObject/paramstyles/sqlobject/firebird

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

Author: phd
Date: 2007-01-16 07:20:47 -0700 (Tue, 16 Jan 2007)
New Revision: 2213

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py
Log:
Merged patches from the revisions 2208:2212 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py	2007-01-16 14:19:08 UTC (rev 2212)
+++ home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py	2007-01-16 14:20:47 UTC (rev 2213)
@@ -39,8 +39,8 @@
             password = 'masterkey'
         if not auth:
             auth='sysdba'
-        if os.name == 'nt' and path[0] == '/':
-            # strip the leading slash off of db name/alias
+        # check for alias using
+        if (path[0] == '/') and path[-3:].lower() not in ('fdb', 'gdb'):
             path = path[1:]
         path = path.replace('/', os.sep)
         return cls(host, db=path, user=auth, password=password, **args)