diff options
author | Willy Sudiarto Raharjo <willysr@gmail.com> | 2012-09-15 11:07:50 -0500 |
---|---|---|
committer | dsomero <xgizzmo@slackbuilds.org> | 2012-09-16 19:45:34 -0400 |
commit | 1fb3922c8c7c3583c0784f4e1e9e50eef7a6eed2 (patch) | |
tree | 9d6e080fdfea33be75f73ec7b8ce2432c287d312 /academic/gcompris/python-sqlite3.patch | |
parent | 17dfd1c8c1852835645169ca8f66f74d5fa1d74f (diff) | |
download | slackbuilds-1fb3922c8c7c3583c0784f4e1e9e50eef7a6eed2.tar.gz |
academic/gcompris: Updated for version 12.05.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'academic/gcompris/python-sqlite3.patch')
-rw-r--r-- | academic/gcompris/python-sqlite3.patch | 302 |
1 files changed, 0 insertions, 302 deletions
diff --git a/academic/gcompris/python-sqlite3.patch b/academic/gcompris/python-sqlite3.patch deleted file mode 100644 index 4d727cc088..0000000000 --- a/academic/gcompris/python-sqlite3.patch +++ /dev/null @@ -1,302 +0,0 @@ ---- configure 2009-03-29 06:39:51.000000000 -0400 -+++ configure 2009-04-19 17:38:50.000000000 -0400 -@@ -19578,7 +19578,7 @@ - prog=" - import sys - try: -- import pysqlite2 -+ import sqlite3 as sqlite - except ImportError: - sys.exit(1) - except: ---- src/boards/python/admin/module_users.py -+++ src/boards/python/admin/module_users.py -@@ -26,7 +26,13 @@ - from gcompris import gcompris_gettext as _ - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - import module - import class_list ---- src/boards/python/admin/class_edit.py -+++ src/boards/python/admin/class_edit.py -@@ -23,7 +23,13 @@ - from gcompris import gcompris_gettext as _ - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - import user_list - ---- src/boards/python/admin/class_list.py -+++ src/boards/python/admin/class_list.py -@@ -26,7 +26,13 @@ - from gcompris import gcompris_gettext as _ - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - import constants - ---- src/boards/python/admin/module_boards.py -+++ src/boards/python/admin/module_boards.py -@@ -27,7 +27,13 @@ - import sys; - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - import module - import board_list ---- src/boards/python/admin/user_edit.py -+++ src/boards/python/admin/user_edit.py -@@ -23,7 +23,13 @@ - from gcompris import gcompris_gettext as _ - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - import user_list - ---- src/boards/python/admin/group_list.py -+++ src/boards/python/admin/group_list.py -@@ -26,7 +26,13 @@ - from gcompris import gcompris_gettext as _ - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - import group_user_list - import group_edit ---- src/boards/python/admin/profile_list.py -+++ src/boards/python/admin/profile_list.py -@@ -26,7 +26,13 @@ - from gcompris import gcompris_gettext as _ - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - import profile_group_list - import profile_edit ---- src/boards/python/admin/log_list.py -+++ src/boards/python/admin/log_list.py -@@ -27,7 +27,13 @@ - from gcompris import gcompris_gettext as _ - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - import constants - ---- src/boards/python/admin/profile_group_list.py -+++ src/boards/python/admin/profile_group_list.py -@@ -28,7 +28,13 @@ - import constants - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - #import group_edit - ---- src/boards/python/admin/profile_edit.py -+++ src/boards/python/admin/profile_edit.py -@@ -27,7 +27,13 @@ - import constants - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - # Group Management - ( ---- src/boards/python/admin/group_edit.py -+++ src/boards/python/admin/group_edit.py -@@ -27,7 +27,13 @@ - import constants - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - # User List Management - ( ---- src/boards/python/admin/module_groups.py -+++ src/boards/python/admin/module_groups.py -@@ -25,7 +25,13 @@ - from gcompris import gcompris_gettext as _ - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - import module - import group_list ---- src/boards/python/admin/module_reports.py -+++ src/boards/python/admin/module_reports.py -@@ -26,8 +26,14 @@ - from gcompris import gcompris_gettext as _ - - # Database --from pysqlite2 import dbapi2 as sqlite -- -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" -+ - import module - import log_list - ---- src/boards/python/admin/module_profiles.py -+++ src/boards/python/admin/module_profiles.py -@@ -28,7 +28,13 @@ - import profile_list - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - class Profiles(module.Module): - """Administrating GCompris Profiles""" ---- src/boards/python/admin/group_user_list.py -+++ src/boards/python/admin/group_user_list.py -@@ -28,7 +28,13 @@ - import constants - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - #import group_edit - ---- src/boards/python/admin/board_list.py -+++ src/boards/python/admin/board_list.py -@@ -27,7 +27,13 @@ - from gcompris import gcompris_gettext as _ - - # Database --#from pysqlite2 import dbapi2 as sqlite -+#try: -+# import sqlite3 as sqlite -+#except ImportError: -+# try: -+# from pysqlite2 import dbapi2 as sqlite -+# except ImportError: -+# raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - # Board Management - ( ---- src/boards/python/admin/user_list.py -+++ src/boards/python/admin/user_list.py -@@ -25,7 +25,13 @@ - from gcompris import gcompris_gettext as _ - - # Database --from pysqlite2 import dbapi2 as sqlite -+try: -+ import sqlite3 as sqlite -+except ImportError: -+ try: -+ from pysqlite2 import dbapi2 as sqlite -+ except ImportError: -+ raise ImportError, "no module named sqlite3 or pysqlite2.dbapi2" - - import constants - import user_edit |