Fix for plugins in Python 3.5 (#222)

ModuleNotFoundError is not a thing in Python 3.5, so catch KeyError/ImportError instead.
pull/232/head
Simon Willison 2018-04-17 20:24:20 -07:00 zatwierdzone przez GitHub
rodzic 1c36d07dd4
commit 4be6deb947
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -1308,8 +1308,8 @@ class Datasette:
modpath = '/-/static-plugins/{}/'.format(plugin_module.__name__) modpath = '/-/static-plugins/{}/'.format(plugin_module.__name__)
dirpath = pkg_resources.resource_filename(plugin_module.__name__, 'static') dirpath = pkg_resources.resource_filename(plugin_module.__name__, 'static')
app.static(modpath, dirpath) app.static(modpath, dirpath)
except ModuleNotFoundError: except (KeyError, ImportError):
# Caused by --plugins_dir= plugins # Caused by --plugins_dir= plugins - KeyError/ImportError thrown in Py3.5
pass pass
app.add_route( app.add_route(
DatabaseView.as_view(self), DatabaseView.as_view(self),