diff --git a/.pylintrc b/.pylintrc index 2de412d..2186f77 100644 --- a/.pylintrc +++ b/.pylintrc @@ -20,7 +20,6 @@ disable=fixme, duplicate-code, implicit-str-concat, import-outside-toplevel, - invalid-name, isinstance-second-argument-not-valid-type, keyword-arg-before-vararg, missing-function-docstring, diff --git a/src/wuttaweb/emails.py b/src/wuttaweb/emails.py index 43bc956..eb34bb3 100644 --- a/src/wuttaweb/emails.py +++ b/src/wuttaweb/emails.py @@ -27,7 +27,7 @@ from wuttjamaican.email import EmailSetting -class feedback(EmailSetting): +class feedback(EmailSetting): # pylint: disable=invalid-name """ Sent when user submits feedback via the web app. """ diff --git a/src/wuttaweb/handler.py b/src/wuttaweb/handler.py index 04deab2..e3520b5 100644 --- a/src/wuttaweb/handler.py +++ b/src/wuttaweb/handler.py @@ -187,8 +187,8 @@ class WebHandler(GenericHandler): # registered via entry points registered = [] - for Handler in load_entry_points(f"{self.appname}.web.menus").values(): - spec = Handler.get_spec() + for handler in load_entry_points(f"{self.appname}.web.menus").values(): + spec = handler.get_spec() if spec not in handlers: registered.append(spec) if registered: diff --git a/src/wuttaweb/views/auth.py b/src/wuttaweb/views/auth.py index f3b162e..c2a52cb 100644 --- a/src/wuttaweb/views/auth.py +++ b/src/wuttaweb/views/auth.py @@ -314,7 +314,7 @@ class AuthView(View): def defaults(config, **kwargs): base = globals() - AuthView = kwargs.get("AuthView", base["AuthView"]) + AuthView = kwargs.get("AuthView", base["AuthView"]) # pylint: disable=invalid-name AuthView.defaults(config) diff --git a/src/wuttaweb/views/batch.py b/src/wuttaweb/views/batch.py index a94e10f..2064859 100644 --- a/src/wuttaweb/views/batch.py +++ b/src/wuttaweb/views/batch.py @@ -127,7 +127,7 @@ class BatchMasterView(MasterView): model = self.app.model # created_by - CreatedBy = orm.aliased(model.User) + CreatedBy = orm.aliased(model.User) # pylint: disable=invalid-name g.set_joiner( "created_by", lambda q: q.join( @@ -383,8 +383,8 @@ class BatchMasterView(MasterView): if hasattr(cls, "row_model_class"): return cls.row_model_class - Batch = cls.get_model_class() - return Batch.__row_class__ + model_class = cls.get_model_class() + return model_class.__row_class__ def get_row_grid_data(self, batch): """ @@ -392,8 +392,10 @@ class BatchMasterView(MasterView): :attr:`~wuttjamaican:wuttjamaican.db.model.batch.BatchMixin.rows` data. """ - BatchRow = self.get_row_model_class() - query = self.Session.query(BatchRow).filter(BatchRow.batch == batch) + row_model_class = self.get_row_model_class() + query = self.Session.query(row_model_class).filter( + row_model_class.batch == batch + ) return query def configure_row_grid(self, g): # pylint: disable=empty-docstring diff --git a/src/wuttaweb/views/common.py b/src/wuttaweb/views/common.py index 45d463b..3980246 100644 --- a/src/wuttaweb/views/common.py +++ b/src/wuttaweb/views/common.py @@ -345,7 +345,9 @@ class CommonView(View): def defaults(config, **kwargs): base = globals() - CommonView = kwargs.get("CommonView", base["CommonView"]) + CommonView = kwargs.get( # pylint: disable=invalid-name + "CommonView", base["CommonView"] + ) CommonView.defaults(config) diff --git a/src/wuttaweb/views/email.py b/src/wuttaweb/views/email.py index 91ea49a..34e6a29 100644 --- a/src/wuttaweb/views/email.py +++ b/src/wuttaweb/views/email.py @@ -301,7 +301,9 @@ class EmailSettingView(MasterView): def defaults(config, **kwargs): base = globals() - EmailSettingView = kwargs.get("EmailSettingView", base["EmailSettingView"]) + EmailSettingView = kwargs.get( # pylint: disable=invalid-name + "EmailSettingView", base["EmailSettingView"] + ) EmailSettingView.defaults(config) diff --git a/src/wuttaweb/views/people.py b/src/wuttaweb/views/people.py index 74f58f9..f9de00e 100644 --- a/src/wuttaweb/views/people.py +++ b/src/wuttaweb/views/people.py @@ -210,7 +210,9 @@ class PersonView(MasterView): def defaults(config, **kwargs): base = globals() - PersonView = kwargs.get("PersonView", base["PersonView"]) + PersonView = kwargs.get( # pylint: disable=invalid-name + "PersonView", base["PersonView"] + ) PersonView.defaults(config) diff --git a/src/wuttaweb/views/reports.py b/src/wuttaweb/views/reports.py index aafde7e..a79b262 100644 --- a/src/wuttaweb/views/reports.py +++ b/src/wuttaweb/views/reports.py @@ -264,7 +264,9 @@ class ReportView(MasterView): def defaults(config, **kwargs): base = globals() - ReportView = kwargs.get("ReportView", base["ReportView"]) + ReportView = kwargs.get( # pylint: disable=invalid-name + "ReportView", base["ReportView"] + ) ReportView.defaults(config) diff --git a/src/wuttaweb/views/roles.py b/src/wuttaweb/views/roles.py index 0dc59c8..2d19ef1 100644 --- a/src/wuttaweb/views/roles.py +++ b/src/wuttaweb/views/roles.py @@ -374,10 +374,12 @@ class PermissionView(MasterView): def defaults(config, **kwargs): base = globals() - RoleView = kwargs.get("RoleView", base["RoleView"]) + RoleView = kwargs.get("RoleView", base["RoleView"]) # pylint: disable=invalid-name RoleView.defaults(config) - PermissionView = kwargs.get("PermissionView", base["PermissionView"]) + PermissionView = kwargs.get( # pylint: disable=invalid-name + "PermissionView", base["PermissionView"] + ) PermissionView.defaults(config) diff --git a/src/wuttaweb/views/settings.py b/src/wuttaweb/views/settings.py index 0c6b9bb..7cfd576 100644 --- a/src/wuttaweb/views/settings.py +++ b/src/wuttaweb/views/settings.py @@ -278,10 +278,14 @@ class SettingView(MasterView): def defaults(config, **kwargs): base = globals() - AppInfoView = kwargs.get("AppInfoView", base["AppInfoView"]) + AppInfoView = kwargs.get( # pylint: disable=invalid-name + "AppInfoView", base["AppInfoView"] + ) AppInfoView.defaults(config) - SettingView = kwargs.get("SettingView", base["SettingView"]) + SettingView = kwargs.get( # pylint: disable=invalid-name + "SettingView", base["SettingView"] + ) SettingView.defaults(config) diff --git a/src/wuttaweb/views/upgrades.py b/src/wuttaweb/views/upgrades.py index e86d617..a3bc205 100644 --- a/src/wuttaweb/views/upgrades.py +++ b/src/wuttaweb/views/upgrades.py @@ -86,7 +86,7 @@ class UpgradeView(MasterView): # created_by g.set_link("created_by") - Creator = orm.aliased(model.User) + Creator = orm.aliased(model.User) # pylint: disable=invalid-name g.set_joiner( "created_by", lambda q: q.join(Creator, Creator.uuid == model.Upgrade.created_by_uuid), @@ -101,7 +101,7 @@ class UpgradeView(MasterView): # executed_by g.set_link("executed_by") - Executor = orm.aliased(model.User) + Executor = orm.aliased(model.User) # pylint: disable=invalid-name g.set_joiner( "executed_by", lambda q: q.outerjoin( @@ -378,7 +378,9 @@ class UpgradeView(MasterView): def defaults(config, **kwargs): base = globals() - UpgradeView = kwargs.get("UpgradeView", base["UpgradeView"]) + UpgradeView = kwargs.get( # pylint: disable=invalid-name + "UpgradeView", base["UpgradeView"] + ) UpgradeView.defaults(config) diff --git a/src/wuttaweb/views/users.py b/src/wuttaweb/views/users.py index f8463b1..cd09c66 100644 --- a/src/wuttaweb/views/users.py +++ b/src/wuttaweb/views/users.py @@ -418,7 +418,7 @@ class UserView(MasterView): def defaults(config, **kwargs): base = globals() - UserView = kwargs.get("UserView", base["UserView"]) + UserView = kwargs.get("UserView", base["UserView"]) # pylint: disable=invalid-name UserView.defaults(config)