From 625a22c83ba048874e2a13e597ae0f234f28a1f3 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Sep 2025 14:13:02 -0500 Subject: [PATCH] fix: fix 'unnecessary-lambda-assignment' for pylint --- .pylintrc | 1 - src/sideshow/web/views/customers.py | 36 ++++++++++++++++------------- src/sideshow/web/views/products.py | 36 ++++++++++++++++------------- tests/web/views/test_customers.py | 20 ++++++++++++++++ tests/web/views/test_products.py | 20 ++++++++++++++++ 5 files changed, 80 insertions(+), 33 deletions(-) diff --git a/.pylintrc b/.pylintrc index 79bcb87..a0f7d85 100644 --- a/.pylintrc +++ b/.pylintrc @@ -29,4 +29,3 @@ disable=fixme, too-many-locals, too-many-positional-arguments, too-many-public-methods, - unnecessary-lambda-assignment, diff --git a/src/sideshow/web/views/customers.py b/src/sideshow/web/views/customers.py index eeaf766..4076ab5 100644 --- a/src/sideshow/web/views/customers.py +++ b/src/sideshow/web/views/customers.py @@ -138,10 +138,11 @@ class LocalCustomerView(MasterView): grid.set_renderer("total_price", grid.render_currency) if self.request.has_perm("orders.view"): - url = lambda order, i: self.request.route_url( - "orders.view", uuid=order.uuid - ) - grid.add_action("view", icon="eye", url=url) + + def view_url(order, i): # pylint: disable=unused-argument + return self.request.route_url("orders.view", uuid=order.uuid) + + grid.add_action("view", icon="eye", url=view_url) grid.set_link("order_id") return grid @@ -174,10 +175,11 @@ class LocalCustomerView(MasterView): ) if self.request.has_perm("neworder_batches.view"): - url = lambda batch, i: self.request.route_url( - "neworder_batches.view", uuid=batch.uuid - ) - grid.add_action("view", icon="eye", url=url) + + def view_url(batch, i): # pylint: disable=unused-argument + return self.request.route_url("neworder_batches.view", uuid=batch.uuid) + + grid.add_action("view", icon="eye", url=view_url) grid.set_link("id") return grid @@ -328,10 +330,11 @@ class PendingCustomerView(MasterView): grid.set_renderer("total_price", grid.render_currency) if self.request.has_perm("orders.view"): - url = lambda order, i: self.request.route_url( - "orders.view", uuid=order.uuid - ) - grid.add_action("view", icon="eye", url=url) + + def view_url(order, i): # pylint: disable=unused-argument + return self.request.route_url("orders.view", uuid=order.uuid) + + grid.add_action("view", icon="eye", url=view_url) grid.set_link("order_id") return grid @@ -364,10 +367,11 @@ class PendingCustomerView(MasterView): ) if self.request.has_perm("neworder_batches.view"): - url = lambda batch, i: self.request.route_url( - "neworder_batches.view", uuid=batch.uuid - ) - grid.add_action("view", icon="eye", url=url) + + def view_url(batch, i): # pylint: disable=unused-argument + return self.request.route_url("neworder_batches.view", uuid=batch.uuid) + + grid.add_action("view", icon="eye", url=view_url) grid.set_link("id") return grid diff --git a/src/sideshow/web/views/products.py b/src/sideshow/web/views/products.py index 1d1ee76..9127d89 100644 --- a/src/sideshow/web/views/products.py +++ b/src/sideshow/web/views/products.py @@ -176,10 +176,11 @@ class LocalProductView(MasterView): ) if self.request.has_perm("orders.view"): - url = lambda order, i: self.request.route_url( - "orders.view", uuid=order.uuid - ) - grid.add_action("view", icon="eye", url=url) + + def view_url(order, i): # pylint: disable=unused-argument + return self.request.route_url("orders.view", uuid=order.uuid) + + grid.add_action("view", icon="eye", url=view_url) grid.set_link("order_id") return grid @@ -215,10 +216,11 @@ class LocalProductView(MasterView): ) if self.request.has_perm("neworder_batches.view"): - url = lambda batch, i: self.request.route_url( - "neworder_batches.view", uuid=batch.uuid - ) - grid.add_action("view", icon="eye", url=url) + + def view_url(batch, i): # pylint: disable=unused-argument + return self.request.route_url("neworder_batches.view", uuid=batch.uuid) + + grid.add_action("view", icon="eye", url=view_url) grid.set_link("id") return grid @@ -389,10 +391,11 @@ class PendingProductView(MasterView): ) if self.request.has_perm("orders.view"): - url = lambda order, i: self.request.route_url( - "orders.view", uuid=order.uuid - ) - grid.add_action("view", icon="eye", url=url) + + def view_url(order, i): # pylint: disable=unused-argument + return self.request.route_url("orders.view", uuid=order.uuid) + + grid.add_action("view", icon="eye", url=view_url) grid.set_link("order_id") return grid @@ -428,10 +431,11 @@ class PendingProductView(MasterView): ) if self.request.has_perm("neworder_batches.view"): - url = lambda batch, i: self.request.route_url( - "neworder_batches.view", uuid=batch.uuid - ) - grid.add_action("view", icon="eye", url=url) + + def view_url(batch, i): # pylint: disable=unused-argument + return self.request.route_url("neworder_batches.view", uuid=batch.uuid) + + grid.add_action("view", icon="eye", url=view_url) grid.set_link("id") return grid diff --git a/tests/web/views/test_customers.py b/tests/web/views/test_customers.py index e5bd05d..a2096d2 100644 --- a/tests/web/views/test_customers.py +++ b/tests/web/views/test_customers.py @@ -58,6 +58,7 @@ class TestLocalCustomerView(WebTestCase): self.assertIn("new_order_batches", form) def test_make_orders_grid(self): + self.pyramid_config.add_route("orders.view", "/orders/{uuid}/view") model = self.app.model view = self.make_view() @@ -79,7 +80,13 @@ class TestLocalCustomerView(WebTestCase): self.assertEqual(len(grid.actions), 1) self.assertEqual(grid.actions[0].key, "view") + # render grid for coverage generating url + grid.render_vue_template() + def test_make_new_order_batches_grid(self): + self.pyramid_config.add_route( + "neworder_batches.view", "/batch/neworder/{uuid}/view" + ) model = self.app.model handler = NewOrderBatchHandler(self.config) view = self.make_view() @@ -104,6 +111,9 @@ class TestLocalCustomerView(WebTestCase): self.assertEqual(len(grid.actions), 1) self.assertEqual(grid.actions[0].key, "view") + # render grid for coverage generating url + grid.render_vue_template() + def test_objectify(self): model = self.app.model view = self.make_view() @@ -178,6 +188,7 @@ class TestPendingCustomerView(WebTestCase): self.assertIn("new_order_batches", form) def test_make_orders_grid(self): + self.pyramid_config.add_route("orders.view", "/orders/{uuid}/view") model = self.app.model enum = self.app.enum view = self.make_view() @@ -202,7 +213,13 @@ class TestPendingCustomerView(WebTestCase): self.assertEqual(len(grid.actions), 1) self.assertEqual(grid.actions[0].key, "view") + # render grid for coverage generating url + grid.render_vue_template() + def test_make_new_order_batches_grid(self): + self.pyramid_config.add_route( + "neworder_batches.view", "/batch/neworder/{uuid}/view" + ) model = self.app.model enum = self.app.enum handler = NewOrderBatchHandler(self.config) @@ -230,6 +247,9 @@ class TestPendingCustomerView(WebTestCase): self.assertEqual(len(grid.actions), 1) self.assertEqual(grid.actions[0].key, "view") + # render grid for coverage generating url + grid.render_vue_template() + def test_objectify(self): model = self.app.model enum = self.app.enum diff --git a/tests/web/views/test_products.py b/tests/web/views/test_products.py index da467ec..de17a8b 100644 --- a/tests/web/views/test_products.py +++ b/tests/web/views/test_products.py @@ -60,6 +60,7 @@ class TestLocalProductView(WebTestCase): self.assertIn("local_products.view.orders", form.grid_vue_context) def test_make_orders_grid(self): + self.pyramid_config.add_route("orders.view", "/orders/{uuid}/view") model = self.app.model enum = self.app.enum view = self.make_view() @@ -89,7 +90,13 @@ class TestLocalProductView(WebTestCase): self.assertEqual(len(grid.actions), 1) self.assertEqual(grid.actions[0].key, "view") + # render grid for coverage generating url + grid.render_vue_template() + def test_make_new_order_batches_grid(self): + self.pyramid_config.add_route( + "neworder_batches.view", "/batch/neworder/{uuid}/view" + ) model = self.app.model enum = self.app.enum handler = NewOrderBatchHandler(self.config) @@ -117,6 +124,9 @@ class TestLocalProductView(WebTestCase): self.assertEqual(len(grid.actions), 1) self.assertEqual(grid.actions[0].key, "view") + # render grid for coverage generating url + grid.render_vue_template() + class TestPendingProductView(WebTestCase): @@ -178,6 +188,7 @@ class TestPendingProductView(WebTestCase): self.assertIn("created_by", form) def test_make_orders_grid(self): + self.pyramid_config.add_route("orders.view", "/orders/{uuid}/view") model = self.app.model enum = self.app.enum view = self.make_view() @@ -209,7 +220,13 @@ class TestPendingProductView(WebTestCase): self.assertEqual(len(grid.actions), 1) self.assertEqual(grid.actions[0].key, "view") + # render grid for coverage generating url + grid.render_vue_template() + def test_make_new_order_batches_grid(self): + self.pyramid_config.add_route( + "neworder_batches.view", "/batch/neworder/{uuid}/view" + ) model = self.app.model enum = self.app.enum handler = NewOrderBatchHandler(self.config) @@ -239,6 +256,9 @@ class TestPendingProductView(WebTestCase): self.assertEqual(len(grid.actions), 1) self.assertEqual(grid.actions[0].key, "view") + # render grid for coverage generating url + grid.render_vue_template() + def test_get_template_context(self): enum = self.app.enum model = self.app.model