Cleanup for class meta failing with Table(query=Query(...)) provided

Author: Johan Lübcke

iommi/declarative/util.py

@@ -44,21 +44,16 @@ def inject_args(args, kwargs, extra_args, pos_arg_names, merge_namespaces):
     else:
         new_args = args
 
-    for k, v in kwargs.items():
-        new_value = new_kwargs.get(k, None)
-        if merge_namespaces and isinstance(new_value, Namespace):
-            if v is not None:
-                new_kwargs[k] = Namespace(new_value, v)
-            else:
-                new_kwargs[k] = None
-        else:
-            new_kwargs[k] = v
+    if merge_namespaces:
+        new_kwargs = Namespace(new_kwargs, kwargs)
+    else:
+        new_kwargs.update(kwargs)
 
     return new_args, new_kwargs
 
 
 def strip_prefix(s, *, prefix, strict=False):
     if s.startswith(prefix):
-        return s[len(prefix):]
+        return s[len(prefix) :]
     assert strict is False, f"String '{s}' does not start with prefix '{prefix}'"
     return s

iommi/table.py

@@ -4,10 +4,8 @@
     datetime,
     time,
 )
-from enum import (
-    Enum,
-    auto,
-)
+from enum import auto, \
+    Enum
 from functools import total_ordering
 from io import StringIO
 from itertools import groupby
@@ -44,13 +42,13 @@
 )
 
 from iommi._web_compat import (
+    format_html,
     HttpResponse,
     HttpResponseRedirect,
-    Template,
-    format_html,
     mark_safe,
     render_template,
     smart_str,
+    Template
 )
 from iommi.action import (
     Action,
@@ -63,25 +61,23 @@
     render_attrs,
 )
 from iommi.base import (
-    MISSING,
-    NOT_BOUND_MESSAGE,
     build_as_view_wrapper,
     capitalize,
     get_display_name,
     items,
     keys,
+    MISSING,
     model_and_rows,
-    values,
+    NOT_BOUND_MESSAGE,
+    values
 )
 from iommi.declarative import declarative
 from iommi.declarative.dispatch import dispatch
-from iommi.declarative.namespace import (
-    EMPTY,
-    Namespace,
-    flatten,
-    getattr_path,
-    setdefaults_path,
-)
+from iommi.declarative.namespace import EMPTY, \
+    flatten, \
+    getattr_path, \
+    Namespace, \
+    setdefaults_path
 from iommi.declarative.with_meta import with_meta
 from iommi.endpoint import (
     DISPATCH_PREFIX,
@@ -96,20 +92,18 @@
     Field,
     Form,
 )
-from iommi.fragment import (
-    Fragment,
-    Header,
-    Tag,
-    TransientFragment,
-    build_and_bind_h_tag,
-    html,
-)
+from iommi.fragment import build_and_bind_h_tag, \
+    Fragment, \
+    Header, \
+    html, \
+    Tag, \
+    TransientFragment
 from iommi.from_model import (
     AutoConfig,
-    NoRegisteredSearchFieldException,
     create_members_from_model,
     get_search_fields,
     member_from_model,
+    NoRegisteredSearchFieldException
 )
 from iommi.member import (
     bind_member,
@@ -126,14 +120,14 @@
     Query,
 )
 from iommi.refinable import (
+    evaluated_refinable,
     EvaluatedRefinable,
     Prio,
     Refinable,
+    refinable,
     RefinableMembers,
     RefinableObject,
-    SpecialEvaluatedRefinable,
-    evaluated_refinable,
-    refinable,
+    SpecialEvaluatedRefinable
 )
 from iommi.shortcut import (
     Shortcut,
@@ -143,14 +137,11 @@
     LAST,
     sort_after,
 )
-from iommi.struct import (
-    Struct,
-    merged,
-)
+from iommi.struct import merged, \
+    Struct
 from iommi.traversable import (
     Traversable,
 )
-
 from ._db_compat import base_defaults_factory
 
 LAST = LAST
@@ -1636,6 +1627,13 @@ class TableAutoConfig(AutoConfig):
 
     rows = Refinable()
 
+def endpoint__tbody(table, **_):
+    return {
+        'html': table.container.__html__(
+            render=lambda fragment, context: fragment.render_text_or_children(context=context)
+        )
+    }
+
 
 def endpoint__csv(table, **_):
     from datetime import timezone
@@ -1780,8 +1778,6 @@ class Meta:
     columns: Dict[str, Column] = RefinableMembers()
 
     class Meta:
-        query__advanced__assets__query_form_toggle_script__template = "iommi/query/form_toggle_script.html"
-        assets__table_js_select_all__template = "iommi/table/js_select_all.html"
         member_class = Column
         form_class = Form
         query_class = Query
@@ -1790,24 +1786,6 @@ class Meta:
         cells_class = Cells
         row_group_class = RowGroup
 
-        @staticmethod
-        def endpoints__tbody__func(table, **_):
-            return {
-                'html': table.container.__html__(
-                    render=lambda fragment, context: fragment.render_text_or_children(context=context)
-                )
-            }
-
-        endpoints__csv__func = endpoint__csv
-
-        container__attrs = Namespace(
-            {
-                'data-endpoint': lambda table, **_: DISPATCH_PREFIX + table.endpoints.tbody.iommi_path,
-                'data-iommi-id': lambda table, **_: table.iommi_path,
-            }
-        )
-
-        query__form__attrs = {'data-iommi-id-of-table': lambda table, **_: table.iommi_path}
         columns = EMPTY
         parts = EMPTY
         row__attrs__class = EMPTY
@@ -1875,6 +1853,17 @@ def post_bulk_edit(table, queryset, updates, **_):
         # style
         query__form__actions__submit__call_target=Action.button,
         title=MISSING,
+        endpoints__tbody__func=endpoint__tbody,
+        endpoints__csv__func=endpoint__csv,
+        query__advanced__assets__query_form_toggle_script__template = "iommi/query/form_toggle_script.html",
+        query__form__attrs = {
+            'data-iommi-id-of-table': lambda table, **_: table.iommi_path,
+        },
+        assets__table_js_select_all__template = "iommi/table/js_select_all.html",
+        container__attrs ={
+            'data-endpoint': lambda table, **_: DISPATCH_PREFIX + table.endpoints.tbody.iommi_path,
+            'data-iommi-id': lambda table, **_: table.iommi_path,
+        },
     )
     def __init__(
         self,

iommi/table__tests.py

@@ -4561,3 +4561,20 @@ class TestTable(NoSortTable):
     t = t.bind(request=req('get'))
     verify_table_html(table=t, expected_html=expected_html)
     verify_table_html(table=t, expected_html=expected_html)
+
+
+def test_table_explicit_query():
+    Table(
+        rows=[],
+        query=Query(
+            filter=lambda rows, **_: rows,
+        ),
+    ).bind(request=req('get'))
+
+
+def test_table_list_custom_query():
+    Table(
+        rows=[],
+        query__filter=lambda rows, **_: rows,
+        query__filters__foo=Filter(),
+    ).bind(request=req('get'))