diff --git a/gramps/grampsapp.py b/gramps/grampsapp.py index 7d35c0a79..c4611e366 100644 --- a/gramps/grampsapp.py +++ b/gramps/grampsapp.py @@ -290,10 +290,12 @@ def show_settings(): try: import sqlite3 - sqlite3_version_str = sqlite3.version + sqlite3_py_version_str = sqlite3.version + sqlite3_version_str = sqlite3.sqlite_version sqlite3_location_str = sqlite3.__file__ except: sqlite3_version_str = 'not found' + sqlite3_py_version_str = 'not found' sqlite3_location_str = 'not found' try: @@ -389,6 +391,7 @@ def show_settings(): print(' location : %s' % bsddb_location_str) print(' sqlite3 :') print(' version : %s' % sqlite3_version_str) + print(' py version : %s' % sqlite3_py_version_str) print(' location : %s' % sqlite3_location_str) print('') diff --git a/gramps/gui/aboutdialog.py b/gramps/gui/aboutdialog.py index e54fe0399..4ecf227e6 100644 --- a/gramps/gui/aboutdialog.py +++ b/gramps/gui/aboutdialog.py @@ -74,8 +74,10 @@ except: try: import sqlite3 - sqlite3_version_str = sqlite3.version + sqlite3_py_version_str = sqlite3.version + sqlite3_version_str = sqlite3.sqlite_version except: + sqlite3_py_version_str = 'not found' sqlite3_version_str = 'not found' #------------------------------------------------------------------------- @@ -137,7 +139,7 @@ class GrampsAboutDialog(Gtk.AboutDialog): "GRAMPS: %s \n" + "Python: %s \n" + "BSDDB: %s \n" + - "sqlite: %s \n" + + "sqlite: %s (%s)\n" + "LANG: %s\n" + "OS: %s\n" + "Distribution: %s") @@ -145,6 +147,7 @@ class GrampsAboutDialog(Gtk.AboutDialog): ellipses(str(sys.version).replace('\n','')), BSDDB_STR, sqlite3_version_str, + sqlite3_py_version_str, ellipses(get_env_var('LANG','')), ellipses(operatingsystem), ellipses(distribution))) diff --git a/gramps/plugins/database/dbapi_support/sqlite.py b/gramps/plugins/database/dbapi_support/sqlite.py index c2eae3970..117c40eb0 100644 --- a/gramps/plugins/database/dbapi_support/sqlite.py +++ b/gramps/plugins/database/dbapi_support/sqlite.py @@ -16,7 +16,8 @@ class Sqlite(object): "DB-API version": "2.0", "Database SQL type": cls.__name__, "Database SQL module": "sqlite3", - "Database SQL module version": sqlite3.version, + "Database SQL Python module version": sqlite3.version, + "Database SQL module version": sqlite3.sqlite_version, "Database SQL module location": sqlite3.__file__, } return summary