Switch from pkg_resources to importlib.metadata in app.py, refs #2057

This commit is contained in:
Simon Willison 2023-09-16 09:35:18 -07:00
commit 852f501485
2 changed files with 25 additions and 3 deletions

View file

@ -8,11 +8,11 @@ import functools
import glob
import hashlib
import httpx
import importlib.metadata
import inspect
from itsdangerous import BadSignature
import json
import os
import pkg_resources
import re
import secrets
import sys
@ -1118,9 +1118,9 @@ class Datasette:
if using_pysqlite3:
for package in ("pysqlite3", "pysqlite3-binary"):
try:
info["pysqlite3"] = pkg_resources.get_distribution(package).version
info["pysqlite3"] = importlib.metadata.version(package)
break
except pkg_resources.DistributionNotFound:
except importlib.metadata.PackageNotFoundError:
pass
return info