Support the sqlite3 module that comes with Python 2.5

[Christopher Lenz]

Now that Python 2.5 has been released, we should support the sqlite3 module that comes bundled.

The package name has been changed from pysqlite2.dbapi2 to sqlite3, so an adjustment of Trac's sqlite_backend is required. One open question is whether pysqlite2.dbapi2 should take precedence over sqlite3 or the other way around.

I'll attach a patch that adds support for sqlite3, and prefers it to the standalone PySQLite driver.

[Christopher Lenz]

First attempt

[Christopher Lenz]

Can someone review this patch before we check it in?

[Christian Boos]

I think that pysqlite2 should take precedence over sqlite3 if it corresponds to a more recent version.

[Christian Boos]

Slightly modified patch: sqlite3 is still the preferred package, but if a more recent pysqlite2 is installed, prefer the latter one.

[Christian Boos]

Updated the patch. A typical scenario for this is that you have the need for a bug fix, then it's probably much easier to install the new pysqlite package from initd.org than to upgrade the bundled sqlite3 package. Or, you need to recompile pysqlite so that it uses a specific sqlite version (in that case, you'd also have to bump the PYSQLITE_VERSION in src/module.h to something higher than 2.3.2, which is sqlite3's version for the Python 2.5 release).

Besides this, I've successfully tested both sqlite3.diff and sqlite3.2.diff on the Genshi branch, using Python 2.5 freshly installed from the python-2.5.msi

Side-note: if we're to support python 2.5 for 0.10, we probably need to backport r3751 (or a better fix) on trunk.

[Christopher Lenz]

I agree it should default to pysqlite2.dbapi2. Don't see the point of the version comparison though, I'd rather keep the logic simple and always use PySQLite2 in preference to the bundled sqlite3 module.

Also agree about backporting r3751. Python 2.5 compatibility should definitely be a goal with 0.10.x.

[Christian Boos]

Ok, so attachment:sqlite3.3.diff​ should do the trick.

[Matthew Good]

Replying to cboos:

Ok, so attachment:sqlite3.3.diff​ should do the trick.

No, you reattached the second version of the patch.

[Christian Boos]

Always prefer pysqlite2 over sqlite3 — take 2

[Christian Boos]

Oops — fixed. As you can see, that's actually the same thing as cmlenz' first attempt, only the order of sqlite3 and pysqlite2 imports has been permuted.

[Christopher Lenz]

Checked in the patch in [3754].

Sooo close to matching the ticket number to the changeset number here :-P