[CalendarServer-changes] [1343] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 7 14:21:29 PST 2007
Revision: 1343
http://trac.macosforge.org/projects/calendarserver/changeset/1343
Author: wsanchez at apple.com
Date: 2007-03-07 14:21:28 -0800 (Wed, 07 Mar 2007)
Log Message:
-----------
Python 2.5 includes a sqlite3 module; use that if available.
Modified Paths:
--------------
CalendarServer/trunk/run
CalendarServer/trunk/twistedcaldav/db.py
CalendarServer/trunk/twistedcaldav/index.py
CalendarServer/trunk/twistedcaldav/sql.py
Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run 2007-03-07 22:09:46 UTC (rev 1342)
+++ CalendarServer/trunk/run 2007-03-07 22:21:28 UTC (rev 1343)
@@ -534,7 +534,7 @@
# PySQLite
#
-if ! py_have_module pysqlite2; then
+if ! py_have_module sqlite3 && ! py_have_module pysqlite2; then
pysqlite="${top}/pysqlite-2.3.2";
www_get "PySQLite" "${pysqlite}" http://initd.org/pub/software/pysqlite/releases/2.3/2.3.2/pysqlite-2.3.2.tar.gz;
Modified: CalendarServer/trunk/twistedcaldav/db.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/db.py 2007-03-07 22:09:46 UTC (rev 1342)
+++ CalendarServer/trunk/twistedcaldav/db.py 2007-03-07 22:21:28 UTC (rev 1343)
@@ -23,10 +23,15 @@
__all__ = ["AbstractIndex"]
-from pysqlite2 import dbapi2 as sqlite
-from twisted.python import log
import os
+try:
+ import sqlite3 as sqlite
+except ImportError:
+ from pysqlite2 import dbapi2 as sqlite
+
+from twisted.python import log
+
db_basename = ".db.sqlite"
class AbstractIndex(object):
Modified: CalendarServer/trunk/twistedcaldav/index.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/index.py 2007-03-07 22:09:46 UTC (rev 1342)
+++ CalendarServer/trunk/twistedcaldav/index.py 2007-03-07 22:21:28 UTC (rev 1343)
@@ -32,7 +32,10 @@
import os
import datetime
-from pysqlite2 import dbapi2 as sqlite
+try:
+ import sqlite3 as sqlite
+except ImportError:
+ from pysqlite2 import dbapi2 as sqlite
from twisted.python import log
Modified: CalendarServer/trunk/twistedcaldav/sql.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/sql.py 2007-03-07 22:09:46 UTC (rev 1342)
+++ CalendarServer/trunk/twistedcaldav/sql.py 2007-03-07 22:21:28 UTC (rev 1343)
@@ -26,7 +26,10 @@
import os
-from pysqlite2 import dbapi2 as sqlite
+try:
+ import sqlite3 as sqlite
+except ImportError:
+ from pysqlite2 import dbapi2 as sqlite
from twisted.python import log
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070307/4311f170/attachment.html
More information about the calendarserver-changes
mailing list