hamster-applet r593 - in trunk: . hamster

[tbaugis svn gnome org]

Author: tbaugis
Date: Thu Oct 23 21:55:04 2008
New Revision: 593
URL: http://svn.gnome.org/viewvc/hamster-applet?rev=593&view=rev

Log:
do not require pysqlite in python 2.5
patch by Nirbheek Chauhan
fixes bug 554249


Modified:
   trunk/configure.ac
   trunk/hamster/db.py

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Oct 23 21:55:04 2008
@@ -100,20 +100,38 @@
 AC_MSG_RESULT($PYGTK_DEFSDIR)
 
 
-AC_MSG_CHECKING([for pysqlite2 module])
-if AC_RUN_LOG([DISPLAY= $PYTHON -c '
+if test "x$PYTHON_VERSION" = "x2.5"; then
+    AC_MSG_CHECKING([for python sqlite module])
+    if AC_RUN_LOG([DISPLAY= $PYTHON -c '
+try:
+    import sqlite3
+except ImportError, e:
+    if str(e).find("sqlite3") >= 0:
+        raise
+except:
+    pass
+    ']); then
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Python 2.5: inbuilt sqlite is required to build hamster])
+    fi
+else
+    AC_MSG_CHECKING([for pysqlite2 module])
+    if AC_RUN_LOG([DISPLAY= $PYTHON -c '
 try:
     import pysqlite2
 except ImportError, e:
     if str(e).find("pysqlite2") >= 0:
-          raise
+        raise
 except:
     pass
-']); then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([pysqlite2 Python module required to build hamster])
+    ']); then
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Python 2.4: pysqlite2 module required to build hamster])
+    fi
 fi
 
 

Modified: trunk/hamster/db.py
==============================================================================
--- trunk/hamster/db.py	(original)
+++ trunk/hamster/db.py	Thu Oct 23 21:55:04 2008
@@ -21,7 +21,14 @@
 
 """separate file for database operations"""
 
-from pysqlite2 import dbapi2 as sqlite
+try:
+    import sqlite3 as sqlite
+except ImportError:
+    try:
+        from pysqlite2 import dbapi2 as sqlite
+    except ImportError:
+        print "Error: Neither sqlite3 nor pysqlite2 found"
+        raise
 import os, time
 import datetime
 import hamster