diff --git a/datasette/views/base.py b/datasette/views/base.py index 7772f42d..6d6bf0ac 100644 --- a/datasette/views/base.py +++ b/datasette/views/base.py @@ -42,7 +42,7 @@ class DatasetteError(Exception): class RenderMixin(HTTPMethodView): def render(self, templates, **context): - template = self.jinja_env.select_template(templates) + template = self.ds.jinja_env.select_template(templates) select_templates = [ "{}{}".format("*" if template_name == template.name else "", template_name) for template_name in templates @@ -66,11 +66,6 @@ class BaseView(RenderMixin): def __init__(self, datasette): self.ds = datasette - self.files = datasette.files - self.jinja_env = datasette.jinja_env - self.executor = datasette.executor - self.page_size = datasette.page_size - self.max_returned_rows = datasette.max_returned_rows def table_metadata(self, database, table): "Fetch table-specific metadata." diff --git a/datasette/views/index.py b/datasette/views/index.py index 66776e1c..b529d03b 100644 --- a/datasette/views/index.py +++ b/datasette/views/index.py @@ -12,9 +12,6 @@ class IndexView(RenderMixin): def __init__(self, datasette): self.ds = datasette - self.files = datasette.files - self.jinja_env = datasette.jinja_env - self.executor = datasette.executor async def get(self, request, as_format): databases = [] diff --git a/datasette/views/special.py b/datasette/views/special.py index 7fde5ee9..8f00cbec 100644 --- a/datasette/views/special.py +++ b/datasette/views/special.py @@ -6,7 +6,6 @@ from .base import RenderMixin class JsonDataView(RenderMixin): def __init__(self, datasette, filename, data_callback): self.ds = datasette - self.jinja_env = datasette.jinja_env self.filename = filename self.data_callback = data_callback diff --git a/datasette/views/table.py b/datasette/views/table.py index 07ff6bb7..cecdbb4a 100644 --- a/datasette/views/table.py +++ b/datasette/views/table.py @@ -466,7 +466,7 @@ class TableView(RowTableShared): page_size = _size or request.raw_args.get("_size") if page_size: if page_size == "max": - page_size = self.max_returned_rows + page_size = self.ds.max_returned_rows try: page_size = int(page_size) if page_size < 0: @@ -475,14 +475,14 @@ class TableView(RowTableShared): except ValueError: raise DatasetteError("_size must be a positive integer", status=400) - if page_size > self.max_returned_rows: + if page_size > self.ds.max_returned_rows: raise DatasetteError( - "_size must be <= {}".format(self.max_returned_rows), status=400 + "_size must be <= {}".format(self.ds.max_returned_rows), status=400 ) extra_args["page_size"] = page_size else: - page_size = self.page_size + page_size = self.ds.page_size sql = "select {select} from {table_name} {where}{order_by}limit {limit}{offset}".format( select=select,