diff --git a/.pylintrc b/.pylintrc index 16f8c3e..ef4dbc4 100644 --- a/.pylintrc +++ b/.pylintrc @@ -10,3 +10,5 @@ enable= too-many-branches, 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/auth.py b/src/wuttaweb/auth.py index 399f479..e18cb78 100644 --- a/src/wuttaweb/auth.py +++ b/src/wuttaweb/auth.py @@ -24,8 +24,6 @@ Auth Utility Logic """ -import re - from pyramid.authentication import SessionAuthenticationHelper from pyramid.request import RequestLocalCache from pyramid.security import remember, forget 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 c89d120..222eb3a 100644 --- a/src/wuttaweb/forms/schema.py +++ b/src/wuttaweb/forms/schema.py @@ -30,7 +30,6 @@ import uuid as _uuid import colander import sqlalchemy as sa -from wuttjamaican.db.model import Person from wuttjamaican.conf import parse_list from wuttaweb.db import Session @@ -384,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) @@ -607,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 082f48a..a09edd0 100644 --- a/src/wuttaweb/forms/widgets.py +++ b/src/wuttaweb/forms/widgets.py @@ -47,7 +47,7 @@ import os import colander import humanize -from deform.widget import ( +from deform.widget import ( # pylint: disable=unused-import Widget, TextInputWidget, TextAreaWidget, @@ -64,8 +64,6 @@ from webhelpers2.html import HTML from wuttjamaican.conf import parse_list -from wuttaweb.db import Session - class ObjectRefWidget(SelectWidget): """ @@ -469,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/grids/base.py b/src/wuttaweb/grids/base.py index 77fa09c..f21aacc 100644 --- a/src/wuttaweb/grids/base.py +++ b/src/wuttaweb/grids/base.py @@ -25,7 +25,6 @@ Base grid classes """ import functools -import json import logging import warnings from collections import namedtuple, OrderedDict @@ -38,9 +37,7 @@ from paginate_sqlalchemy import SqlalchemyOrmPage from pyramid.renderers import render from webhelpers2.html import HTML -from wuttaweb.db import Session from wuttaweb.util import FieldList, get_model_fields, make_json_safe -from wuttjamaican.util import UNSPECIFIED from wuttjamaican.db.util import UUID from wuttaweb.grids.filters import default_sqlalchemy_filters, VerbNotSupported diff --git a/src/wuttaweb/helpers.py b/src/wuttaweb/helpers.py index 80b9d21..3319fa1 100644 --- a/src/wuttaweb/helpers.py +++ b/src/wuttaweb/helpers.py @@ -54,4 +54,8 @@ This module contains the following references: from webhelpers2.html import * from webhelpers2.html.tags import * -from wuttaweb.util import get_liburl, get_csrf_token, render_csrf_token as csrf_token +from wuttaweb.util import ( # pylint: disable=unused-import + get_liburl, + get_csrf_token, + render_csrf_token as csrf_token, +) diff --git a/src/wuttaweb/util.py b/src/wuttaweb/util.py index b544e70..caa41f6 100644 --- a/src/wuttaweb/util.py +++ b/src/wuttaweb/util.py @@ -39,7 +39,6 @@ from pyramid.renderers import get_renderer from webhelpers2.html import HTML, tags from wuttjamaican.util import resource_path -from wuttaweb.db import Session log = logging.getLogger(__name__) @@ -606,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/common.py b/src/wuttaweb/views/common.py index a126182..45d463b 100644 --- a/src/wuttaweb/views/common.py +++ b/src/wuttaweb/views/common.py @@ -27,7 +27,6 @@ Common Views import logging import colander -from pyramid.renderers import render from wuttaweb.views import View from wuttaweb.forms import widgets diff --git a/src/wuttaweb/views/master.py b/src/wuttaweb/views/master.py index bd8ca48..db234de 100644 --- a/src/wuttaweb/views/master.py +++ b/src/wuttaweb/views/master.py @@ -35,7 +35,7 @@ from pyramid.renderers import render_to_response from webhelpers2.html import HTML from wuttaweb.views import View -from wuttaweb.util import get_form_data, get_model_fields, render_csrf_token +from wuttaweb.util import get_form_data, render_csrf_token from wuttaweb.db import Session from wuttaweb.progress import SessionProgress from wuttjamaican.util import get_class_hierarchy 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 06a4bf5..f8463b1 100644 --- a/src/wuttaweb/views/users.py +++ b/src/wuttaweb/views/users.py @@ -24,8 +24,6 @@ Views for users """ -import colander - from wuttjamaican.db.model import User from wuttaweb.views import MasterView from wuttaweb.forms import widgets @@ -177,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 @@ -274,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(