From e38f7ba2933a3df2d79b63e9d0a916d23736f5bf Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Sep 2025 10:32:22 -0500 Subject: [PATCH] fix: fix 'protected-access' for pylint --- .pylintrc | 1 - src/wuttaweb/grids/base.py | 4 ++-- src/wuttaweb/subscribers.py | 10 +++++----- .../templates/themes/butterfly/base.mako | 4 ++-- src/wuttaweb/util.py | 4 ++-- tests/test_subscribers.py | 16 ++++++++-------- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.pylintrc b/.pylintrc index f45d1ec..7b7bdee 100644 --- a/.pylintrc +++ b/.pylintrc @@ -11,7 +11,6 @@ disable=fixme, missing-function-docstring, missing-module-docstring, no-member, - protected-access, redefined-outer-name, simplifiable-if-expression, singleton-comparison, diff --git a/src/wuttaweb/grids/base.py b/src/wuttaweb/grids/base.py index 387840b..6565f9c 100644 --- a/src/wuttaweb/grids/base.py +++ b/src/wuttaweb/grids/base.py @@ -1087,8 +1087,8 @@ class Grid: # pylint: disable=too-many-instance-attributes,too-many-public-meth # TODO: this should be improved; is needed in tailbone for # multi-column sorting with sqlalchemy queries if model_property: - sorter._class = model_class - sorter._column = model_property + sorter._class = model_class # pylint: disable=protected-access + sorter._column = model_property # pylint: disable=protected-access return sorter diff --git a/src/wuttaweb/subscribers.py b/src/wuttaweb/subscribers.py index 25ea614..5fbdb14 100644 --- a/src/wuttaweb/subscribers.py +++ b/src/wuttaweb/subscribers.py @@ -159,20 +159,20 @@ def new_request(event): Register a Vue 3 component, so the base template knows to declare it for use within the app (page). """ - if not hasattr(request, "_wuttaweb_registered_components"): - request._wuttaweb_registered_components = OrderedDict() + if not hasattr(request, "wuttaweb_registered_components"): + request.wuttaweb_registered_components = OrderedDict() - if tagname in request._wuttaweb_registered_components: + if tagname in request.wuttaweb_registered_components: log.warning( "component with tagname '%s' already registered " "with class '%s' but we are replacing that " "with class '%s'", tagname, - request._wuttaweb_registered_components[tagname], + request.wuttaweb_registered_components[tagname], classname, ) - request._wuttaweb_registered_components[tagname] = classname + request.wuttaweb_registered_components[tagname] = classname request.register_component = register_component diff --git a/src/wuttaweb/templates/themes/butterfly/base.mako b/src/wuttaweb/templates/themes/butterfly/base.mako index 76e9b5b..944c541 100644 --- a/src/wuttaweb/templates/themes/butterfly/base.mako +++ b/src/wuttaweb/templates/themes/butterfly/base.mako @@ -58,8 +58,8 @@ const app = createApp() app.component('vue-fontawesome', FontAwesomeIcon) - % if hasattr(request, '_wuttaweb_registered_components'): - % for tagname, classname in request._wuttaweb_registered_components.items(): + % if hasattr(request, 'wuttaweb_registered_components'): + % for tagname, classname in request.wuttaweb_registered_components.items(): app.component('${tagname}', ${classname}) % endfor % endif diff --git a/src/wuttaweb/util.py b/src/wuttaweb/util.py index caa41f6..963c848 100644 --- a/src/wuttaweb/util.py +++ b/src/wuttaweb/util.py @@ -757,14 +757,14 @@ def set_app_theme(request, theme, session=None): # there's only one global template lookup; can get to it via any renderer # but should *not* use /base.mako since that one is about to get volatile - renderer = get_renderer("/menu.mako") + renderer = get_renderer("/page.mako") lookup = renderer.lookup # overwrite first entry in lookup's directory list lookup.directories[0] = theme_path # clear template cache for lookup object, so it will reload each (as needed) - lookup._collection.clear() + lookup._collection.clear() # pylint: disable=protected-access # persist current theme in db settings with app.short_session(session=session) as s: diff --git a/tests/test_subscribers.py b/tests/test_subscribers.py index 9fd7729..501e160 100644 --- a/tests/test_subscribers.py +++ b/tests/test_subscribers.py @@ -76,23 +76,23 @@ class TestNewRequest(TestCase): subscribers.new_request(event) # component tracking dict is missing at first - self.assertFalse(hasattr(self.request, "_wuttaweb_registered_components")) + self.assertFalse(hasattr(self.request, "wuttaweb_registered_components")) # registering a component self.request.register_component("foo-example", "FooExample") - self.assertTrue(hasattr(self.request, "_wuttaweb_registered_components")) - self.assertEqual(len(self.request._wuttaweb_registered_components), 1) - self.assertIn("foo-example", self.request._wuttaweb_registered_components) + self.assertTrue(hasattr(self.request, "wuttaweb_registered_components")) + self.assertEqual(len(self.request.wuttaweb_registered_components), 1) + self.assertIn("foo-example", self.request.wuttaweb_registered_components) self.assertEqual( - self.request._wuttaweb_registered_components["foo-example"], "FooExample" + self.request.wuttaweb_registered_components["foo-example"], "FooExample" ) # re-registering same name self.request.register_component("foo-example", "FooExample") - self.assertEqual(len(self.request._wuttaweb_registered_components), 1) - self.assertIn("foo-example", self.request._wuttaweb_registered_components) + self.assertEqual(len(self.request.wuttaweb_registered_components), 1) + self.assertIn("foo-example", self.request.wuttaweb_registered_components) self.assertEqual( - self.request._wuttaweb_registered_components["foo-example"], "FooExample" + self.request.wuttaweb_registered_components["foo-example"], "FooExample" ) def test_get_referrer(self):