From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Mon, 27 Jul 2009 23:57:23 +0000 (+0000)
Subject: - re-order sqlite imports to handle multiple installed versions (issue
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e12f197243297c0d8f066dc1c5d89f855aea7d9f;p=roundup.git

- re-order sqlite imports to handle multiple installed versions (issue
  2550570)

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/roundup/trunk@4336 57a73879-2fb5-44c3-a270-3262357dd7e2
---

diff --git a/CHANGES.txt b/CHANGES.txt
index d0b8456..933a3e7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,8 @@ Fixes:
   privilege, e.g., user not existing (issue 2550534)
 - fix construction of individual messages to nosy recipents with
   attachments (issue 2550568)
+- re-order sqlite imports to handle multiple installed versions (issue
+  2550570)
 
 
 2009-03-18 1.4.8 (r4209)
diff --git a/roundup/backends/back_sqlite.py b/roundup/backends/back_sqlite.py
index c044781..59ada1a 100644
--- a/roundup/backends/back_sqlite.py
+++ b/roundup/backends/back_sqlite.py
@@ -14,8 +14,8 @@ from roundup import hyperdb, date, password
 from roundup.backends import rdbms_common
 sqlite_version = None
 try:
-    import sqlite
-    sqlite_version = 1
+    import sqlite3 as sqlite
+    sqlite_version = 3
 except ImportError:
     try:
         from pysqlite2 import dbapi2 as sqlite
@@ -24,8 +24,8 @@ except ImportError:
                 '- %s found'%sqlite.version)
         sqlite_version = 2
     except ImportError:
-        import sqlite3 as sqlite
-        sqlite_version = 3
+        import sqlite
+        sqlite_version = 1
 
 def db_exists(config):
     return os.path.exists(os.path.join(config.DATABASE, 'db'))