[CalendarServer-changes] [4739] CalendarServer/trunk/twistedcaldav/sql.py
source_changes at macosforge.org
source_changes at macosforge.org
Wed Nov 11 10:10:42 PST 2009
Revision: 4739
http://trac.macosforge.org/projects/calendarserver/changeset/4739
Author: wsanchez at apple.com
Date: 2009-11-11 10:10:42 -0800 (Wed, 11 Nov 2009)
Log Message:
-----------
Export sqlite2.DatabaseError as DatabaseError
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/sql.py
Modified: CalendarServer/trunk/twistedcaldav/sql.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/sql.py 2009-11-11 16:30:03 UTC (rev 4738)
+++ CalendarServer/trunk/twistedcaldav/sql.py 2009-11-11 18:10:42 UTC (rev 4739)
@@ -18,9 +18,10 @@
Generic SQL database access object.
"""
-__all__ = [
+__all__ = [
+ "db_prefix",
+ "DatabaseError",
"AbstractSQLDatabase",
- "db_prefix"
]
import os
@@ -36,7 +37,11 @@
db_prefix = ".db."
-class AbstractSQLDatabase(object):
+
+DatabaseError = sqlite.DatabaseError
+
+
+class AbstractSQLDatabase (object):
"""
A generic SQL database.
"""
@@ -83,9 +88,8 @@
self._db_connection = sqlite.connect(db_filename, isolation_level=None)
else:
self._db_connection = sqlite.connect(db_filename)
- except:
- log.err("Unable to open database: %s" % (self,))
- raise
+ except DatabaseError:
+ raise DatabaseError("Unable to open database %s" % (self.dbpath,))
#
# Set up the schema
@@ -304,7 +308,7 @@
try:
q.execute(sql, query_params)
return q.fetchall()
- except:
+ except DatabaseError:
log.err("Exception while executing SQL on DB %s: %r %r" % (self, sql, query_params))
raise
finally:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091111/2f56e7b7/attachment-0001.html>
More information about the calendarserver-changes
mailing list