From 6c66c8d57be3281c16c718372aca0f54bda43502 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 1 Sep 2025 10:37:56 -0500 Subject: [PATCH] fix: fix 'redefined-outer-name' for pylint --- .pylintrc | 1 - src/wuttaweb/app.py | 6 +++--- src/wuttaweb/views/auth.py | 4 +++- src/wuttaweb/views/common.py | 2 +- src/wuttaweb/views/email.py | 2 +- src/wuttaweb/views/people.py | 2 +- src/wuttaweb/views/progress.py | 4 +++- src/wuttaweb/views/reports.py | 2 +- src/wuttaweb/views/roles.py | 6 ++++-- src/wuttaweb/views/settings.py | 4 ++-- src/wuttaweb/views/upgrades.py | 2 +- src/wuttaweb/views/users.py | 4 +++- 12 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.pylintrc b/.pylintrc index 7b7bdee..4ae2600 100644 --- a/.pylintrc +++ b/.pylintrc @@ -11,7 +11,6 @@ disable=fixme, missing-function-docstring, missing-module-docstring, no-member, - redefined-outer-name, simplifiable-if-expression, singleton-comparison, super-init-not-called, diff --git a/src/wuttaweb/app.py b/src/wuttaweb/app.py index 1593095..38749e0 100644 --- a/src/wuttaweb/app.py +++ b/src/wuttaweb/app.py @@ -239,14 +239,14 @@ def make_wsgi_app(main_app=None, config=None): # determine the app factory if isinstance(main_app, str): - make_wsgi_app = app.load_object(main_app) + factory = app.load_object(main_app) elif callable(main_app): - make_wsgi_app = main_app + factory = main_app else: raise ValueError("main_app must be spec or callable") # construct a pyramid app "per usual" - return make_wsgi_app({}, **settings) + return factory({}, **settings) def make_asgi_app(main_app=None, config=None): diff --git a/src/wuttaweb/views/auth.py b/src/wuttaweb/views/auth.py index c2a52cb..cb82de5 100644 --- a/src/wuttaweb/views/auth.py +++ b/src/wuttaweb/views/auth.py @@ -314,7 +314,9 @@ class AuthView(View): def defaults(config, **kwargs): base = globals() - AuthView = kwargs.get("AuthView", base["AuthView"]) # pylint: disable=invalid-name + AuthView = kwargs.get( # pylint: disable=invalid-name,redefined-outer-name + "AuthView", base["AuthView"] + ) AuthView.defaults(config) diff --git a/src/wuttaweb/views/common.py b/src/wuttaweb/views/common.py index 71ef57e..5359184 100644 --- a/src/wuttaweb/views/common.py +++ b/src/wuttaweb/views/common.py @@ -345,7 +345,7 @@ class CommonView(View): def defaults(config, **kwargs): base = globals() - CommonView = kwargs.get( # pylint: disable=invalid-name + CommonView = kwargs.get( # pylint: disable=invalid-name,redefined-outer-name "CommonView", base["CommonView"] ) CommonView.defaults(config) diff --git a/src/wuttaweb/views/email.py b/src/wuttaweb/views/email.py index 055084f..4e56b0e 100644 --- a/src/wuttaweb/views/email.py +++ b/src/wuttaweb/views/email.py @@ -303,7 +303,7 @@ class EmailSettingView(MasterView): # pylint: disable=abstract-method def defaults(config, **kwargs): base = globals() - EmailSettingView = kwargs.get( # pylint: disable=invalid-name + EmailSettingView = kwargs.get( # pylint: disable=invalid-name,redefined-outer-name "EmailSettingView", base["EmailSettingView"] ) EmailSettingView.defaults(config) diff --git a/src/wuttaweb/views/people.py b/src/wuttaweb/views/people.py index 9038b50..1f329ea 100644 --- a/src/wuttaweb/views/people.py +++ b/src/wuttaweb/views/people.py @@ -216,7 +216,7 @@ class PersonView(MasterView): # pylint: disable=abstract-method def defaults(config, **kwargs): base = globals() - PersonView = kwargs.get( # pylint: disable=invalid-name + PersonView = kwargs.get( # pylint: disable=invalid-name,redefined-outer-name "PersonView", base["PersonView"] ) PersonView.defaults(config) diff --git a/src/wuttaweb/views/progress.py b/src/wuttaweb/views/progress.py index 06aa456..889a9d5 100644 --- a/src/wuttaweb/views/progress.py +++ b/src/wuttaweb/views/progress.py @@ -66,7 +66,9 @@ def progress(request): def defaults(config, **kwargs): base = globals() - progress = kwargs.get("progress", base["progress"]) + progress = kwargs.get( # pylint: disable=redefined-outer-name + "progress", base["progress"] + ) config.add_route("progress", "/progress/{key}") config.add_view(progress, route_name="progress", renderer="json") diff --git a/src/wuttaweb/views/reports.py b/src/wuttaweb/views/reports.py index 906f5dd..ffc4952 100644 --- a/src/wuttaweb/views/reports.py +++ b/src/wuttaweb/views/reports.py @@ -264,7 +264,7 @@ class ReportView(MasterView): # pylint: disable=abstract-method def defaults(config, **kwargs): base = globals() - ReportView = kwargs.get( # pylint: disable=invalid-name + ReportView = kwargs.get( # pylint: disable=invalid-name,redefined-outer-name "ReportView", base["ReportView"] ) ReportView.defaults(config) diff --git a/src/wuttaweb/views/roles.py b/src/wuttaweb/views/roles.py index c03e1c4..3c30d7f 100644 --- a/src/wuttaweb/views/roles.py +++ b/src/wuttaweb/views/roles.py @@ -380,10 +380,12 @@ class PermissionView(MasterView): # pylint: disable=abstract-method def defaults(config, **kwargs): base = globals() - RoleView = kwargs.get("RoleView", base["RoleView"]) # pylint: disable=invalid-name + RoleView = kwargs.get( # pylint: disable=invalid-name,redefined-outer-name + "RoleView", base["RoleView"] + ) RoleView.defaults(config) - PermissionView = kwargs.get( # pylint: disable=invalid-name + PermissionView = kwargs.get( # pylint: disable=invalid-name,redefined-outer-name "PermissionView", base["PermissionView"] ) PermissionView.defaults(config) diff --git a/src/wuttaweb/views/settings.py b/src/wuttaweb/views/settings.py index f646865..792935d 100644 --- a/src/wuttaweb/views/settings.py +++ b/src/wuttaweb/views/settings.py @@ -278,12 +278,12 @@ class SettingView(MasterView): # pylint: disable=abstract-method def defaults(config, **kwargs): base = globals() - AppInfoView = kwargs.get( # pylint: disable=invalid-name + AppInfoView = kwargs.get( # pylint: disable=invalid-name,redefined-outer-name "AppInfoView", base["AppInfoView"] ) AppInfoView.defaults(config) - SettingView = kwargs.get( # pylint: disable=invalid-name + SettingView = kwargs.get( # pylint: disable=invalid-name,redefined-outer-name "SettingView", base["SettingView"] ) SettingView.defaults(config) diff --git a/src/wuttaweb/views/upgrades.py b/src/wuttaweb/views/upgrades.py index 99d1148..052e6c4 100644 --- a/src/wuttaweb/views/upgrades.py +++ b/src/wuttaweb/views/upgrades.py @@ -380,7 +380,7 @@ class UpgradeView(MasterView): # pylint: disable=abstract-method def defaults(config, **kwargs): base = globals() - UpgradeView = kwargs.get( # pylint: disable=invalid-name + UpgradeView = kwargs.get( # pylint: disable=invalid-name,redefined-outer-name "UpgradeView", base["UpgradeView"] ) UpgradeView.defaults(config) diff --git a/src/wuttaweb/views/users.py b/src/wuttaweb/views/users.py index eb5c858..9982b3e 100644 --- a/src/wuttaweb/views/users.py +++ b/src/wuttaweb/views/users.py @@ -420,7 +420,9 @@ class UserView(MasterView): # pylint: disable=abstract-method def defaults(config, **kwargs): base = globals() - UserView = kwargs.get("UserView", base["UserView"]) # pylint: disable=invalid-name + UserView = kwargs.get( # pylint: disable=invalid-name,redefined-outer-name + "UserView", base["UserView"] + ) UserView.defaults(config)