[gcompris/gcomprixogoo] In python, now import sqlite3 intead of pysqlite2



commit 63d170f0f82cc097b00842ce74c4def1e893495b
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sat Feb 6 10:04:11 2010 +0100

    In python, now import sqlite3 intead of pysqlite2
    
    For backyard compatibility, there is a fallback to sill import pysqlite2.

 src/administration-activity/admin/module_boards.py |   10 +++++++++-
 src/administration-activity/admin/module_groups.py |   10 +++++++++-
 .../admin/module_profiles.py                       |   10 +++++++++-
 .../admin/module_reports.py                        |   10 +++++++++-
 src/administration-activity/admin/module_users.py  |   10 +++++++++-
 5 files changed, 45 insertions(+), 5 deletions(-)
---
diff --git a/src/administration-activity/admin/module_boards.py b/src/administration-activity/admin/module_boards.py
index 4dfe9fe..330aca9 100644
--- a/src/administration-activity/admin/module_boards.py
+++ b/src/administration-activity/admin/module_boards.py
@@ -27,7 +27,15 @@ from gcompris import gcompris_gettext as _
 import sys;
 
 # Database
-from pysqlite2 import dbapi2 as sqlite
+try:
+  from sqlite3 import dbapi2 as sqlite # python 2.5
+except:
+  try:
+    from pysqlite2 import dbapi2 as sqlite
+  except:
+    print 'This program requires pysqlite2\n',\
+        'http://initd.org/tracker/pysqlite/'
+    sys.exit(1)
 
 import module
 import board_list
diff --git a/src/administration-activity/admin/module_groups.py b/src/administration-activity/admin/module_groups.py
index 78b6252..48116e4 100644
--- a/src/administration-activity/admin/module_groups.py
+++ b/src/administration-activity/admin/module_groups.py
@@ -25,7 +25,15 @@ import gtk.gdk
 from gcompris import gcompris_gettext as _
 
 # Database
-from pysqlite2 import dbapi2 as sqlite
+try:
+  from sqlite3 import dbapi2 as sqlite # python 2.5
+except:
+  try:
+    from pysqlite2 import dbapi2 as sqlite
+  except:
+    print 'This program requires pysqlite2\n',\
+        'http://initd.org/tracker/pysqlite/'
+    sys.exit(1)
 
 import module
 import group_list
diff --git a/src/administration-activity/admin/module_profiles.py b/src/administration-activity/admin/module_profiles.py
index 1d5dd8a..ae80d14 100644
--- a/src/administration-activity/admin/module_profiles.py
+++ b/src/administration-activity/admin/module_profiles.py
@@ -29,7 +29,15 @@ import module
 import profile_list
 
 # Database
-from pysqlite2 import dbapi2 as sqlite
+try:
+  from sqlite3 import dbapi2 as sqlite # python 2.5
+except:
+  try:
+    from pysqlite2 import dbapi2 as sqlite
+  except:
+    print 'This program requires pysqlite2\n',\
+        'http://initd.org/tracker/pysqlite/'
+    sys.exit(1)
 
 class Profiles(module.Module):
   """Administrating GCompris Profiles"""
diff --git a/src/administration-activity/admin/module_reports.py b/src/administration-activity/admin/module_reports.py
index 564b8db..3541aae 100644
--- a/src/administration-activity/admin/module_reports.py
+++ b/src/administration-activity/admin/module_reports.py
@@ -26,7 +26,15 @@ import gobject
 from gcompris import gcompris_gettext as _
 
 # Database
-from pysqlite2 import dbapi2 as sqlite
+try:
+  from sqlite3 import dbapi2 as sqlite # python 2.5
+except:
+  try:
+    from pysqlite2 import dbapi2 as sqlite
+  except:
+    print 'This program requires pysqlite2\n',\
+        'http://initd.org/tracker/pysqlite/'
+    sys.exit(1)
 
 import module
 import log_list
diff --git a/src/administration-activity/admin/module_users.py b/src/administration-activity/admin/module_users.py
index cdb9c77..ce6570d 100644
--- a/src/administration-activity/admin/module_users.py
+++ b/src/administration-activity/admin/module_users.py
@@ -26,7 +26,15 @@ import gobject
 from gcompris import gcompris_gettext as _
 
 # Database
-from pysqlite2 import dbapi2 as sqlite
+try:
+  from sqlite3 import dbapi2 as sqlite # python 2.5
+except:
+  try:
+    from pysqlite2 import dbapi2 as sqlite
+  except:
+    print 'This program requires pysqlite2\n',\
+        'http://initd.org/tracker/pysqlite/'
+    sys.exit(1)
 
 import module
 import class_list



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]