Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sqlite: add version number

Browse Source
This commit is contained in:
Doug Blank 2016-05-07 06:43:33 -04:00
parent d9154a75e1
commit f00a355110
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps/grampsapp.py
View File

@ -290,10 +290,12 @@ def show_settings():
try: try:
import sqlite3 import sqlite3
sqlite3_version_str = sqlite3.version sqlite3_py_version_str = sqlite3.version
sqlite3_version_str = sqlite3.sqlite_version
sqlite3_location_str = sqlite3.__file__ sqlite3_location_str = sqlite3.__file__
except: except:
sqlite3_version_str = 'not found' sqlite3_version_str = 'not found'
sqlite3_py_version_str = 'not found'
sqlite3_location_str = 'not found' sqlite3_location_str = 'not found'
try: try:
@ -389,6 +391,7 @@ def show_settings():
print(' location : %s' % bsddb_location_str) print(' location : %s' % bsddb_location_str)
print(' sqlite3 :') print(' sqlite3 :')
print(' version : %s' % sqlite3_version_str) print(' version : %s' % sqlite3_version_str)
print(' py version : %s' % sqlite3_py_version_str)
print(' location : %s' % sqlite3_location_str) print(' location : %s' % sqlite3_location_str)
print('') print('')

7
gramps/gui/aboutdialog.py
View File

@ -74,8 +74,10 @@ except:
try: try:
import sqlite3 import sqlite3
sqlite3_version_str = sqlite3.version sqlite3_py_version_str = sqlite3.version
sqlite3_version_str = sqlite3.sqlite_version
except: except:
sqlite3_py_version_str = 'not found'
sqlite3_version_str = 'not found' sqlite3_version_str = 'not found'
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -137,7 +139,7 @@ class GrampsAboutDialog(Gtk.AboutDialog):
"GRAMPS: %s \n" + "GRAMPS: %s \n" +
"Python: %s \n" + "Python: %s \n" +
"BSDDB: %s \n" + "BSDDB: %s \n" +
"sqlite: %s \n" + "sqlite: %s (%s)\n" +
"LANG: %s\n" + "LANG: %s\n" +
"OS: %s\n" + "OS: %s\n" +
"Distribution: %s") "Distribution: %s")
@ -145,6 +147,7 @@ class GrampsAboutDialog(Gtk.AboutDialog):
ellipses(str(sys.version).replace('\n','')), ellipses(str(sys.version).replace('\n','')),
BSDDB_STR, BSDDB_STR,
sqlite3_version_str, sqlite3_version_str,
sqlite3_py_version_str,
ellipses(get_env_var('LANG','')), ellipses(get_env_var('LANG','')),
ellipses(operatingsystem), ellipses(operatingsystem),
ellipses(distribution))) ellipses(distribution)))

3
gramps/plugins/database/dbapi_support/sqlite.py
View File

@ -16,7 +16,8 @@ class Sqlite(object):
"DB-API version": "2.0", "DB-API version": "2.0",
"Database SQL type": cls.__name__, "Database SQL type": cls.__name__,
"Database SQL module": "sqlite3", "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__, "Database SQL module location": sqlite3.__file__,
} }
return summary return summary