[Thuban-commits] r2684: sqlite version

[Frank Koormann]

Am Donnerstag 29 Juni 2006 13:57 schrieb Didrik Pinte:
>
> Revision 2685 must be ok with the 1.1.x and the 2.x versions.
>

No. You proposed to change the determination of sqlite-version but accidently 
you changed the determination of pysqlite. I think the entire block should 
look like 

--------
# PySQLite
try:
    from pysqlite2 import dbapi2 as sqlite
except ImportError:
    import sqlite
versions['pysqlite'] = sqlite.version
versions['pysqlite-tuple'] = make_tuple(sqlite.version)

# SQLite
try:
    from pysqlite2._sqlite import sqlite_version
    versions['sqlite'] = sqlite_version
    versions['sqlite-tuple'] = make_tuple(sqlite_version)
except ImportError:
    from _sqlite import sqlite_version
    versions['sqlite'] = sqlite_version()
    versions['sqlite-tuple'] = make_tuple(sqlite_version())
--------

This works for me on a Debian Sarge (pysqlite 1.0.1, sqlite 2.8.16), but 
others with pysqlite2 / sqlite 3x should confirm.

Cheers,

	Frank
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.intevation.de/pipermail/thuban-devel/attachments/20060629/d0224139/attachment.bin