Show pysqlite3 version on /-/versions, if installed - #1125

This commit is contained in:
Simon Willison 2020-12-03 14:08:50 -08:00
commit 00185af74a
2 changed files with 15 additions and 2 deletions

View file

@ -9,6 +9,7 @@ import inspect
from itsdangerous import BadSignature
import json
import os
import pkg_resources
import re
import secrets
import sys
@ -57,7 +58,6 @@ from .utils import (
module_from_path,
parse_metadata,
resolve_env_secrets,
sqlite3,
to_css_class,
HASH_LENGTH,
)
@ -74,6 +74,10 @@ from .utils.asgi import (
asgi_send_json,
asgi_send_redirect,
)
from .utils.sqlite import (
sqlite3,
using_pysqlite3,
)
from .tracer import AsgiTracer
from .plugins import pm, DEFAULT_PLUGINS, get_plugins
from .version import __version__
@ -619,7 +623,7 @@ class Datasette:
datasette_version = {"version": __version__}
if self.version_note:
datasette_version["note"] = self.version_note
return {
info = {
"python": {
"version": ".".join(map(str, sys.version_info[:3])),
"full": sys.version,
@ -636,6 +640,12 @@ class Datasette:
],
},
}
if using_pysqlite3:
try:
info["pysqlite3"] = pkg_resources.get_distribution("pysqlite3").version
except pkg_resources.DistributionNotFound:
pass
return info
def _plugins(self, request=None, all=False):
ps = list(get_plugins())

View file

@ -1,5 +1,8 @@
using_pysqlite3 = False
try:
import pysqlite3 as sqlite3
using_pysqlite3 = True
except ImportError:
import sqlite3