github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Do not look for templates_path in default plugins

Browse source 
Closes #697
This commit is contained in:
Simon Willison 2020-03-08 16:09:31 -07:00
commit e1b5339fdf
4 changed files with 53 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

30
datasette/utils/__init__.py
View file

@ -5,7 +5,6 @@ import click
import hashlib
import json
import os
import pkg_resources
import re
import shlex
import tempfile
@ -616,35 +615,6 @@ def module_from_path(path, name):
return mod
def get_plugins(pm):
plugins = []
plugin_to_distinfo = dict(pm.list_plugin_distinfo())
for plugin in pm.get_plugins():
static_path = None
templates_path = None
try:
if pkg_resources.resource_isdir(plugin.__name__, "static"):
static_path = pkg_resources.resource_filename(plugin.__name__, "static")
if pkg_resources.resource_isdir(plugin.__name__, "templates"):
templates_path = pkg_resources.resource_filename(
plugin.__name__, "templates"
)
except (KeyError, ImportError):
# Caused by --plugins_dir= plugins - KeyError/ImportError thrown in Py3.5
pass
plugin_info = {
"name": plugin.__name__,
"static_path": static_path,
"templates_path": templates_path,
}
distinfo = plugin_to_distinfo.get(plugin)
if distinfo:
plugin_info["version"] = distinfo.version
plugin_info["name"] = distinfo.project_name
plugins.append(plugin_info)
return plugins
async def resolve_table_and_format(table_and_format, table_exists, allowed_formats=[]):
if "." in table_and_format:
# Check if a table exists with this exact name