diff --git a/.pylintrc b/.pylintrc index 911c71b..ef4dbc4 100644 --- a/.pylintrc +++ b/.pylintrc @@ -11,3 +11,4 @@ enable= too-many-instance-attributes, too-many-return-statements, unused-import, + unused-variable, diff --git a/src/wuttaweb/app.py b/src/wuttaweb/app.py index 1c96d40..f7f768e 100644 --- a/src/wuttaweb/app.py +++ b/src/wuttaweb/app.py @@ -182,7 +182,7 @@ def main(global_config, **settings): ``poser.web.app:main``), similar to this one but with additional views and other config. """ - wutta_config = make_wutta_config(settings) + wutta_config = make_wutta_config(settings) # pylint: disable=unused-variable pyramid_config = make_pyramid_config(settings) pyramid_config.include("wuttaweb.static") diff --git a/src/wuttaweb/forms/base.py b/src/wuttaweb/forms/base.py index 8aa3162..3a8af71 100644 --- a/src/wuttaweb/forms/base.py +++ b/src/wuttaweb/forms/base.py @@ -870,7 +870,6 @@ class Form: # pylint: disable=too-many-instance-attributes generating it automatically if necessary. """ if not hasattr(self, "deform_form"): - model = self.app.model schema = self.get_schema() kwargs = {} diff --git a/src/wuttaweb/forms/schema.py b/src/wuttaweb/forms/schema.py index d11cb32..222eb3a 100644 --- a/src/wuttaweb/forms/schema.py +++ b/src/wuttaweb/forms/schema.py @@ -383,7 +383,6 @@ class ObjectRef(colander.SchemaType): return value # fetch object from DB - model = self.app.model obj = None if isinstance(value, _uuid.UUID): obj = self.session.get(self.model_class, value) @@ -606,7 +605,7 @@ class Permissions(WuttaSet): if "values" not in kwargs: values = [] - for gkey, group in self.permissions.items(): + for group in self.permissions.values(): for pkey, perm in group["perms"].items(): values.append((pkey, perm["label"])) kwargs["values"] = values diff --git a/src/wuttaweb/forms/widgets.py b/src/wuttaweb/forms/widgets.py index 04ebbab..a09edd0 100644 --- a/src/wuttaweb/forms/widgets.py +++ b/src/wuttaweb/forms/widgets.py @@ -467,7 +467,7 @@ class PermissionsWidget(WuttaCheckboxChoiceWidget): if "values" not in kw: values = [] - for gkey, group in self.permissions.items(): + for group in self.permissions.values(): for pkey, perm in group["perms"].items(): values.append((pkey, perm["label"])) kw["values"] = values diff --git a/src/wuttaweb/util.py b/src/wuttaweb/util.py index 0f9fd9b..caa41f6 100644 --- a/src/wuttaweb/util.py +++ b/src/wuttaweb/util.py @@ -605,7 +605,7 @@ def make_json_safe(value, key=None, warn=True): # ensure JSON-compatibility, warn if problems try: json.dumps(value) - except TypeError as error: + except TypeError: if warn: prefix = "value" if key: diff --git a/src/wuttaweb/views/roles.py b/src/wuttaweb/views/roles.py index b335c96..0dc59c8 100644 --- a/src/wuttaweb/views/roles.py +++ b/src/wuttaweb/views/roles.py @@ -285,8 +285,8 @@ class RoleView(MasterView): available = self.wutta_permissions permissions = form.validated["permissions"] - for gkey, group in available.items(): - for pkey, perm in group["perms"].items(): + for group in available.values(): + for pkey in group["perms"]: if pkey in permissions: auth.grant_permission(role, pkey) else: diff --git a/src/wuttaweb/views/settings.py b/src/wuttaweb/views/settings.py index 48de964..0c6b9bb 100644 --- a/src/wuttaweb/views/settings.py +++ b/src/wuttaweb/views/settings.py @@ -156,7 +156,7 @@ class AppInfoView(MasterView): return self.config.get(f"wuttaweb.{key}") weblibs = self.get_weblibs() - for key, title in weblibs.items(): + for key in weblibs: simple_settings.append( { diff --git a/src/wuttaweb/views/users.py b/src/wuttaweb/views/users.py index 461860d..f8463b1 100644 --- a/src/wuttaweb/views/users.py +++ b/src/wuttaweb/views/users.py @@ -175,7 +175,6 @@ class UserView(MasterView): def objectify(self, form): # pylint: disable=empty-docstring """ """ - model = self.app.model auth = self.app.get_auth_handler() data = form.validated @@ -272,7 +271,6 @@ class UserView(MasterView): :rtype: :class:`~wuttaweb.grids.base.Grid` """ - model = self.app.model route_prefix = self.get_route_prefix() grid = self.make_grid(