Optional uvicorn import for Pyodide, refs #1733

simonw · May 2, 2022 · fb26057 · fb26057
1 parent 7d3cec7
commit fb26057
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/datasette/app.py b/datasette/app.py
@@ -804,13 +804,23 @@ def _versions(self):
         datasette_version = {"version": __version__}
         if self.version_note:
             datasette_version["note"] = self.version_note
+
+        try:
+            # Optional import to avoid breaking Pyodide
+            # https://github.com/simonw/datasette/issues/1733#issuecomment-1115268245
+            import uvicorn
+
+            uvicorn_version = uvicorn.__version__
+        except ImportError:
+            uvicorn_version = None
         info = {
             "python": {
                 "version": ".".join(map(str, sys.version_info[:3])),
                 "full": sys.version,
             },
             "datasette": datasette_version,
             "asgi": "3.0",
+            "uvicorn": uvicorn_version,
             "sqlite": {
                 "version": sqlite_version,
                 "fts_versions": fts_versions,