.pylintrc

@@ -3,10 +3,5 @@
 [MESSAGES CONTROL]
 disable=all
 enable=
-        empty-docstring,
         inconsistent-return-statements,
-        no-else-return,
-        redefined-argument-from-local,
-        too-many-branches,
         too-many-instance-attributes,
-        too-many-return-statements,

src/wuttaweb/conf.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  wuttaweb -- Web App for Wutta Framework
-#  Copyright © 2024-2025 Lance Edgar
+#  Copyright © 2024 Lance Edgar
 #
 #  This file is part of Wutta Framework.
 #
@@ -38,7 +38,7 @@ class WuttaWebConfigExtension(WuttaConfigExtension):
 
     key = "wuttaweb"
 
-    def configure(self, config):  # pylint: disable=empty-docstring
+    def configure(self, config):
         """ """
         config.setdefault(
             "wutta_continuum.wutta_plugin_spec",

src/wuttaweb/db/continuum.py

@@ -43,14 +43,14 @@ else:
         # TODO: should find a better way, threadlocals are bad?
         # https://docs.pylonsproject.org/projects/pyramid/en/latest/api/threadlocal.html#pyramid.threadlocal.get_current_request
 
-        def get_remote_addr(self, uow, session):  # pylint: disable=empty-docstring
+        def get_remote_addr(self, uow, session):
             """ """
             request = get_current_request()
             if request:
                 return request.client_addr
             return None
 
-        def get_user_id(self, uow, session):  # pylint: disable=empty-docstring
+        def get_user_id(self, uow, session):
             """ """
             request = get_current_request()
             if request and request.user:

src/wuttaweb/emails.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  wuttaweb -- Web App for Wutta Framework
-#  Copyright © 2024-2025 Lance Edgar
+#  Copyright © 2024 Lance Edgar
 #
 #  This file is part of Wutta Framework.
 #
@@ -34,7 +34,7 @@ class feedback(EmailSetting):
 
     default_subject = "User Feedback"
 
-    def sample_data(self):  # pylint: disable=empty-docstring
+    def sample_data(self):
         """ """
         model = self.app.model
         person = model.Person(full_name="Barney Rubble")

src/wuttaweb/forms/base.py

@@ -592,7 +592,7 @@ class Form:  # pylint: disable=too-many-instance-attributes
         self.set_widget(key, widget)
         self.add_grid_vue_context(grid)
 
-    def add_grid_vue_context(self, grid):  # pylint: disable=empty-docstring
+    def add_grid_vue_context(self, grid):
         """ """
         if not grid.key:
             raise ValueError("grid must have a key!")
@@ -777,7 +777,7 @@ class Form:  # pylint: disable=too-many-instance-attributes
             self.config, model_class=model_class or self.model_class
         )
 
-    def get_schema(self):  # pylint: disable=too-many-branches
+    def get_schema(self):
         """
         Return the :class:`colander:colander.Schema` object for the
         form, generating it automatically if necessary.
@@ -1146,7 +1146,7 @@ class Form:  # pylint: disable=too-many-instance-attributes
 
     # TODO: for tailbone compat, should document?
     # (ideally should remove this and find a better way)
-    def get_vue_field_value(self, key):  # pylint: disable=empty-docstring
+    def get_vue_field_value(self, key):
         """ """
         if key not in self.fields:
             return None

src/wuttaweb/forms/schema.py

@@ -49,7 +49,7 @@ class WuttaDateTime(colander.DateTime):
     the Buefy datepicker + timepicker widgets.
     """
 
-    def deserialize(  # pylint: disable=inconsistent-return-statements,empty-docstring
+    def deserialize(  # pylint: disable=inconsistent-return-statements
         self, node, cstruct
     ):
         """ """
@@ -147,7 +147,7 @@ class WuttaEnum(colander.Enum):
         self.config = self.request.wutta_config
         self.app = self.config.get_app()
 
-    def widget_maker(self, **kwargs):  # pylint: disable=empty-docstring
+    def widget_maker(self, **kwargs):
         """ """
 
         if "values" not in kwargs:
@@ -181,7 +181,7 @@ class WuttaDictEnum(colander.String):
         self.app = self.config.get_app()
         self.enum_dct = enum_dct
 
-    def widget_maker(self, **kwargs):  # pylint: disable=empty-docstring
+    def widget_maker(self, **kwargs):
         """ """
         if "values" not in kwargs:
             kwargs["values"] = [(k, v) for k, v in self.enum_dct.items()]
@@ -210,7 +210,7 @@ class WuttaMoney(colander.Money):
         self.config = self.request.wutta_config
         self.app = self.config.get_app()
 
-    def widget_maker(self, **kwargs):  # pylint: disable=empty-docstring
+    def widget_maker(self, **kwargs):
         """ """
         if self.scale:
             kwargs.setdefault("scale", self.scale)
@@ -234,7 +234,7 @@ class WuttaQuantity(colander.Decimal):
         self.config = self.request.wutta_config
         self.app = self.config.get_app()
 
-    def serialize(self, node, appstruct):  # pylint: disable=empty-docstring
+    def serialize(self, node, appstruct):
         """ """
         if appstruct in (colander.null, None):
             return colander.null
@@ -324,7 +324,7 @@ class ObjectRef(colander.SchemaType):
         class_name = self.__class__.__name__
         raise NotImplementedError(f"you must define {class_name}.model_class")
 
-    def serialize(self, node, appstruct):  # pylint: disable=empty-docstring
+    def serialize(self, node, appstruct):
         """ """
         # nb. normalize to empty option if no object ref, so that
         # works as expected
@@ -353,7 +353,7 @@ class ObjectRef(colander.SchemaType):
         """
         return obj.uuid.hex
 
-    def deserialize(self, node, cstruct):  # pylint: disable=empty-docstring
+    def deserialize(self, node, cstruct):
         """ """
         if not cstruct:
             return colander.null
@@ -361,7 +361,7 @@ class ObjectRef(colander.SchemaType):
         # nb. use shortcut to fetch model instance from DB
         return self.objectify(cstruct)
 
-    def dictify(self, obj):  # pylint: disable=empty-docstring
+    def dictify(self, obj):
         """ """
 
         # TODO: would we ever need to do something else?
@@ -466,16 +466,16 @@ class PersonRef(ObjectRef):
     """
 
     @property
-    def model_class(self):  # pylint: disable=empty-docstring
+    def model_class(self):
         """ """
         model = self.app.model
         return model.Person
 
-    def sort_query(self, query):  # pylint: disable=empty-docstring
+    def sort_query(self, query):
         """ """
         return query.order_by(self.model_class.full_name)
 
-    def get_object_url(self, person):  # pylint: disable=empty-docstring
+    def get_object_url(self, person):
         """ """
         return self.request.route_url("people.view", uuid=person.uuid)
 
@@ -490,16 +490,16 @@ class RoleRef(ObjectRef):
     """
 
     @property
-    def model_class(self):  # pylint: disable=empty-docstring
+    def model_class(self):
         """ """
         model = self.app.model
         return model.Role
 
-    def sort_query(self, query):  # pylint: disable=empty-docstring
+    def sort_query(self, query):
         """ """
         return query.order_by(self.model_class.name)
 
-    def get_object_url(self, role):  # pylint: disable=empty-docstring
+    def get_object_url(self, role):
         """ """
         return self.request.route_url("roles.view", uuid=role.uuid)
 
@@ -514,16 +514,16 @@ class UserRef(ObjectRef):
     """
 
     @property
-    def model_class(self):  # pylint: disable=empty-docstring
+    def model_class(self):
         """ """
         model = self.app.model
         return model.User
 
-    def sort_query(self, query):  # pylint: disable=empty-docstring
+    def sort_query(self, query):
         """ """
         return query.order_by(self.model_class.username)
 
-    def get_object_url(self, user):  # pylint: disable=empty-docstring
+    def get_object_url(self, user):
         """ """
         return self.request.route_url("users.view", uuid=user.uuid)
 
@@ -641,7 +641,7 @@ class FileDownload(colander.String):
         self.config = self.request.wutta_config
         self.app = self.config.get_app()
 
-    def widget_maker(self, **kwargs):  # pylint: disable=empty-docstring
+    def widget_maker(self, **kwargs):
         """ """
         kwargs.setdefault("url", self.url)
         return widgets.FileDownloadWidget(self.request, **kwargs)
@@ -653,14 +653,13 @@ class EmailRecipients(colander.String):
     (``To``, ``Cc``, ``Bcc``).
     """
 
-    def serialize(self, node, appstruct):  # pylint: disable=empty-docstring
+    def serialize(self, node, appstruct):
-        """ """
         if appstruct is colander.null:
             return colander.null
 
         return "\n".join(parse_list(appstruct))
 
-    def deserialize(self, node, cstruct):  # pylint: disable=empty-docstring
+    def deserialize(self, node, cstruct):
         """ """
         if cstruct is colander.null:
             return colander.null

src/wuttaweb/forms/widgets.py

@@ -110,9 +110,7 @@ class ObjectRefWidget(SelectWidget):
         self.request = request
         self.url = url
 
-    def get_template_values(  # pylint: disable=empty-docstring
+    def get_template_values(self, field, cstruct, kw):
-        self, field, cstruct, kw
-    ):
         """ """
         values = super().get_template_values(field, cstruct, kw)
 
@@ -213,7 +211,7 @@ class WuttaDateWidget(DateInputWidget):
         self.config = self.request.wutta_config
         self.app = self.config.get_app()
 
-    def serialize(self, field, cstruct, **kw):  # pylint: disable=empty-docstring
+    def serialize(self, field, cstruct, **kw):
         """ """
         readonly = kw.get("readonly", self.readonly)
         if readonly and cstruct:
@@ -250,7 +248,7 @@ class WuttaDateTimeWidget(DateTimeInputWidget):
         self.config = self.request.wutta_config
         self.app = self.config.get_app()
 
-    def serialize(self, field, cstruct, **kw):  # pylint: disable=empty-docstring
+    def serialize(self, field, cstruct, **kw):
         """ """
         readonly = kw.get("readonly", self.readonly)
         if readonly and cstruct:
@@ -288,7 +286,7 @@ class WuttaMoneyInputWidget(MoneyInputWidget):
         self.config = self.request.wutta_config
         self.app = self.config.get_app()
 
-    def serialize(self, field, cstruct, **kw):  # pylint: disable=empty-docstring
+    def serialize(self, field, cstruct, **kw):
         """ """
         readonly = kw.get("readonly", self.readonly)
         if readonly:
@@ -329,7 +327,7 @@ class FileDownloadWidget(Widget):
         self.config = self.request.wutta_config
         self.app = self.config.get_app()
 
-    def serialize(self, field, cstruct, **kw):  # pylint: disable=empty-docstring
+    def serialize(self, field, cstruct, **kw):
         """ """
         # nb. readonly is the only way this rolls
         kw["readonly"] = True
@@ -350,7 +348,7 @@ class FileDownloadWidget(Widget):
         values = self.get_template_values(field, cstruct, kw)
         return field.renderer(template, **values)
 
-    def readable_size(self, path):  # pylint: disable=empty-docstring
+    def readable_size(self, path):
         """ """
         try:
             size = os.path.getsize(path)
@@ -409,7 +407,7 @@ class RoleRefsWidget(WuttaCheckboxChoiceWidget):
 
     readonly_template = "readonly/rolerefs"
 
-    def serialize(self, field, cstruct, **kw):  # pylint: disable=empty-docstring
+    def serialize(self, field, cstruct, **kw):
         """ """
         model = self.app.model
 
@@ -463,7 +461,7 @@ class PermissionsWidget(WuttaCheckboxChoiceWidget):
     template = "permissions"
     readonly_template = "readonly/permissions"
 
-    def serialize(self, field, cstruct, **kw):  # pylint: disable=empty-docstring
+    def serialize(self, field, cstruct, **kw):
         """ """
         kw.setdefault("permissions", self.permissions)
 
@@ -495,7 +493,7 @@ class EmailRecipientsWidget(TextAreaWidget):
 
     readonly_template = "readonly/email_recips"
 
-    def serialize(self, field, cstruct, **kw):  # pylint: disable=empty-docstring
+    def serialize(self, field, cstruct, **kw):
         """ """
         readonly = kw.get("readonly", self.readonly)
         if readonly:
@@ -503,7 +501,7 @@ class EmailRecipientsWidget(TextAreaWidget):
 
         return super().serialize(field, cstruct, **kw)
 
-    def deserialize(self, field, pstruct):  # pylint: disable=empty-docstring
+    def deserialize(self, field, pstruct):
         """ """
         if pstruct is colander.null:
             return colander.null
@@ -522,7 +520,7 @@ class BatchIdWidget(Widget):
     zero-padded 8-char string
     """
 
-    def serialize(self, field, cstruct, **kw):  # pylint: disable=empty-docstring
+    def serialize(self, field, cstruct, **kw):
         """ """
         if cstruct is colander.null:
             return colander.null

src/wuttaweb/grids/base.py

@@ -426,8 +426,8 @@ class Grid:  # pylint: disable=too-many-instance-attributes
         self.set_columns(columns or self.get_columns())
         self.renderers = {}
         if renderers:
-            for k, val in renderers.items():
+            for key, val in renderers.items():
-                self.set_renderer(k, val)
+                self.set_renderer(key, val)
         self.set_default_renderers()
         self.set_tools(tools)
 
@@ -470,8 +470,8 @@ class Grid:  # pylint: disable=too-many-instance-attributes
 
         # enums
         self.enums = {}
-        for k in enums:
+        for key in enums:
-            self.set_enum(k, enums[k])
+            self.set_enum(key, enums[key])
 
     def get_columns(self):
         """
@@ -1462,7 +1462,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes
     # configuration methods
     ##############################
 
-    def load_settings(self, persist=True):  # pylint: disable=too-many-branches
+    def load_settings(self, persist=True):
         """
         Load all effective settings for the grid.
 
@@ -1594,7 +1594,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes
             self.pagesize = settings["pagesize"]
             self.page = settings["page"]
 
-    def request_has_settings(self, typ):  # pylint: disable=empty-docstring
+    def request_has_settings(self, typ):
         """ """
 
         if typ == "filter" and self.filterable:
@@ -1615,7 +1615,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes
 
         return False
 
-    def get_setting(  # pylint: disable=empty-docstring
+    def get_setting(
         self, settings, key, src="session", default=None, normalize=lambda v: v
     ):
         """ """
@@ -1641,9 +1641,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes
         # okay then, default it is
         return default
 
-    def update_filter_settings(  # pylint: disable=empty-docstring
+    def update_filter_settings(self, settings, src=None):
-        self, settings, src=None
-    ):
         """ """
         if not self.filterable:
             return
@@ -1676,9 +1674,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes
                     settings, f"{prefix}.value", src="session", default=""
                 )
 
-    def update_sort_settings(  # pylint: disable=empty-docstring
+    def update_sort_settings(self, settings, src=None):
-        self, settings, src=None
-    ):
         """ """
         if not (self.sortable and self.sort_on_backend):
             return
@@ -1708,7 +1704,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes
                     skey = f"sorters.{i}.{key}"
                     settings[skey] = self.get_setting(settings, skey, src="session")
 
-    def update_page_settings(self, settings):  # pylint: disable=empty-docstring
+    def update_page_settings(self, settings):
         """ """
         if not (self.paginated and self.paginate_on_backend):
             return
@@ -1735,7 +1731,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes
             if page is not None:
                 settings["page"] = int(page)
 
-    def persist_settings(self, settings, dest=None):  # pylint: disable=empty-docstring
+    def persist_settings(self, settings, dest=None):
         """ """
         if dest not in ("session",):
             raise ValueError(f"invalid dest identifier: {dest}")
@@ -2320,7 +2316,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes
             )
         return filters
 
-    def object_to_dict(self, obj):  # pylint: disable=empty-docstring
+    def object_to_dict(self, obj):
         """ """
         try:
             dct = dict(obj)
@@ -2396,7 +2392,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes
             "row_classes": row_classes,
         }
 
-    def get_vue_data(self):  # pylint: disable=empty-docstring
+    def get_vue_data(self):
         """ """
         warnings.warn(
             "grid.get_vue_data() is deprecated; "

src/wuttaweb/grids/filters.py

@@ -42,7 +42,7 @@ from wuttjamaican.util import UNSPECIFIED
 log = logging.getLogger(__name__)
 
 
-class VerbNotSupported(Exception):  # pylint: disable=empty-docstring
+class VerbNotSupported(Exception):
     """ """
 
     def __init__(self, verb):
@@ -510,7 +510,7 @@ class StringAlchemyFilter(AlchemyFilter):
 
     default_verbs = ["contains", "does_not_contain", "equal", "not_equal"]
 
-    def coerce_value(self, value):  # pylint: disable=empty-docstring
+    def coerce_value(self, value):
         """ """
         if value is not None:
             value = str(value)
@@ -577,7 +577,7 @@ class IntegerAlchemyFilter(NumericAlchemyFilter):
     Subclass of :class:`NumericAlchemyFilter`.
     """
 
-    def coerce_value(self, value):  # pylint: disable=empty-docstring
+    def coerce_value(self, value):
         """ """
         if value:
             try:
@@ -596,7 +596,7 @@ class BooleanAlchemyFilter(AlchemyFilter):
 
     default_verbs = ["is_true", "is_false"]
 
-    def get_verbs(self):  # pylint: disable=empty-docstring
+    def get_verbs(self):
         """ """
 
         # get basic verbs from caller, or default list
@@ -617,7 +617,7 @@ class BooleanAlchemyFilter(AlchemyFilter):
 
         return verbs
 
-    def coerce_value(self, value):  # pylint: disable=empty-docstring
+    def coerce_value(self, value):
         """ """
         if value is not None:
             return bool(value)
@@ -676,7 +676,7 @@ class DateAlchemyFilter(AlchemyFilter):
         # 'between':              "between",
     }
 
-    def coerce_value(self, value):  # pylint: disable=empty-docstring
+    def coerce_value(self, value):
         """ """
         if value:
             if isinstance(value, datetime.date):

src/wuttaweb/menus.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  wuttaweb -- Web App for Wutta Framework
-#  Copyright © 2024-2025 Lance Edgar
+#  Copyright © 2024 Lance Edgar
 #
 #  This file is part of Wutta Framework.
 #
@@ -213,7 +213,7 @@ class MenuHandler(GenericHandler):
     # default internal logic
     ##############################
 
-    def do_make_menus(self, request, **kwargs):  # pylint: disable=too-many-branches
+    def do_make_menus(self, request, **kwargs):
         """
         This method is responsible for constructing the final menu
         set.  It first calls :meth:`make_menus()` to get the basic

src/wuttaweb/progress.py

@@ -113,14 +113,14 @@ class SessionProgress(ProgressBase):  # pylint: disable=too-many-instance-attrib
         self.session.save()
         return self
 
-    def clear(self):  # pylint: disable=empty-docstring
+    def clear(self):
         """ """
         self.session.clear()
         self.session["complete"] = False
         self.session["error"] = False
         self.session.save()
 
-    def update(self, value):  # pylint: disable=empty-docstring
+    def update(self, value):
         """ """
         self.session.load()
         self.session["value"] = value

src/wuttaweb/util.py

@@ -141,7 +141,7 @@ def get_form_data(request):
     return request.POST
 
 
-def get_libver(  # pylint: disable=too-many-return-statements,too-many-branches
+def get_libver(
     request,
     key,
     configured_only=False,
@@ -281,7 +281,7 @@ def get_libver(  # pylint: disable=too-many-return-statements,too-many-branches
     return None
 
 
-def get_liburl(  # pylint: disable=too-many-return-statements,too-many-branches
+def get_liburl(
     request,
     key,
     configured_only=False,
@@ -401,57 +401,57 @@ def get_liburl(  # pylint: disable=too-many-return-statements,too-many-branches
             return liburl + static.buefy_js.relpath
         return f"https://unpkg.com/buefy@{version}/dist/buefy.min.js"
 
-    if key == "buefy.css":
+    elif key == "buefy.css":
         if static and hasattr(static, "buefy_css"):
             return liburl + static.buefy_css.relpath
         return f"https://unpkg.com/buefy@{version}/dist/buefy.min.css"
 
-    if key == "vue":
+    elif key == "vue":
         if static and hasattr(static, "vue_js"):
             return liburl + static.vue_js.relpath
         return f"https://unpkg.com/vue@{version}/dist/vue.min.js"
 
-    if key == "vue_resource":
+    elif key == "vue_resource":
         if static and hasattr(static, "vue_resource_js"):
             return liburl + static.vue_resource_js.relpath
         return f"https://cdn.jsdelivr.net/npm/vue-resource@{version}"
 
-    if key == "fontawesome":
+    elif key == "fontawesome":
         if static and hasattr(static, "fontawesome_js"):
             return liburl + static.fontawesome_js.relpath
         return f"https://use.fontawesome.com/releases/v{version}/js/all.js"
 
-    if key == "bb_vue":
+    elif key == "bb_vue":
         if static and hasattr(static, "bb_vue_js"):
             return liburl + static.bb_vue_js.relpath
         return f"https://unpkg.com/vue@{version}/dist/vue.esm-browser.prod.js"
 
-    if key == "bb_oruga":
+    elif key == "bb_oruga":
         if static and hasattr(static, "bb_oruga_js"):
             return liburl + static.bb_oruga_js.relpath
         return f"https://unpkg.com/@oruga-ui/oruga-next@{version}/dist/oruga.mjs"
 
-    if key == "bb_oruga_bulma":
+    elif key == "bb_oruga_bulma":
         if static and hasattr(static, "bb_oruga_bulma_js"):
             return liburl + static.bb_oruga_bulma_js.relpath
         return f"https://unpkg.com/@oruga-ui/theme-bulma@{version}/dist/bulma.js"
 
-    if key == "bb_oruga_bulma_css":
+    elif key == "bb_oruga_bulma_css":
         if static and hasattr(static, "bb_oruga_bulma_css"):
             return liburl + static.bb_oruga_bulma_css.relpath
         return f"https://unpkg.com/@oruga-ui/theme-bulma@{version}/dist/bulma.css"
 
-    if key == "bb_fontawesome_svg_core":
+    elif key == "bb_fontawesome_svg_core":
         if static and hasattr(static, "bb_fontawesome_svg_core_js"):
             return liburl + static.bb_fontawesome_svg_core_js.relpath
         return f"https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-svg-core@{version}/+esm"
 
-    if key == "bb_free_solid_svg_icons":
+    elif key == "bb_free_solid_svg_icons":
         if static and hasattr(static, "bb_free_solid_svg_icons_js"):
             return liburl + static.bb_free_solid_svg_icons_js.relpath
         return f"https://cdn.jsdelivr.net/npm/@fortawesome/free-solid-svg-icons@{version}/+esm"
 
-    if key == "bb_vue_fontawesome":
+    elif key == "bb_vue_fontawesome":
         if static and hasattr(static, "bb_vue_fontawesome_js"):
             return liburl + static.bb_vue_fontawesome_js.relpath
         return (
@@ -546,7 +546,7 @@ def get_model_fields(config, model_class, include_fk=False):
     return fields
 
 
-def prop_is_fk(mapper, prop):  # pylint: disable=empty-docstring
+def prop_is_fk(mapper, prop):
     """ """
     if not isinstance(prop, orm.ColumnProperty):
         return False
@@ -581,18 +581,18 @@ def make_json_safe(value, key=None, warn=True):
     if value is colander.null:
         return None
 
-    if isinstance(value, dict):
+    elif isinstance(value, dict):
         # recursively convert dict
         parent = dict(value)
-        for k, v in parent.items():
+        for key, value in parent.items():
-            parent[k] = make_json_safe(v, key=k, warn=warn)
+            parent[key] = make_json_safe(value, key=key, warn=warn)
         value = parent
 
     elif isinstance(value, list):
         # recursively convert list
         parent = list(value)
-        for i, v in enumerate(parent):
+        for i, value in enumerate(parent):
-            parent[i] = make_json_safe(v, key=key, warn=warn)
+            parent[i] = make_json_safe(value, key=key, warn=warn)
         value = parent
 
     elif isinstance(value, _uuid.UUID):

src/wuttaweb/views/auth.py

@@ -86,6 +86,7 @@ class AuthView(View):
                 headers = login_user(self.request, user)
                 return self.redirect(referrer, headers=headers)
 
+            else:
                 self.request.session.flash("Invalid user credentials", "error")
 
         return {
@@ -190,7 +191,7 @@ class AuthView(View):
 
         return {"index_title": str(self.request.user), "form": form}
 
-    def change_password_make_schema(self):  # pylint: disable=empty-docstring
+    def change_password_make_schema(self):
         """ """
         schema = colander.Schema()
 

src/wuttaweb/views/batch.py

@@ -121,7 +121,7 @@ class BatchMasterView(MasterView):
 
         return super().render_to_response(template, context)
 
-    def configure_grid(self, g):  # pylint: disable=empty-docstring
+    def configure_grid(self, g):
         """ """
         super().configure_grid(g)
         model = self.app.model
@@ -144,20 +144,20 @@ class BatchMasterView(MasterView):
         # description
         g.set_link("description")
 
-    def render_batch_id(self, batch, key, value):  # pylint: disable=empty-docstring
+    def render_batch_id(self, batch, key, value):
         """ """
         if value:
             batch_id = int(value)
             return f"{batch_id:08d}"
         return None
 
-    def get_instance_title(self, batch):  # pylint: disable=empty-docstring
+    def get_instance_title(self, batch):
         """ """
         if batch.description:
             return f"{batch.id_str} {batch.description}"
         return batch.id_str
 
-    def configure_form(self, f):  # pylint: disable=too-many-branches,empty-docstring
+    def configure_form(self, f):
         """ """
         super().configure_form(f)
         batch = f.model_instance
@@ -378,7 +378,7 @@ class BatchMasterView(MasterView):
     ##############################
 
     @classmethod
-    def get_row_model_class(cls):  # pylint: disable=empty-docstring
+    def get_row_model_class(cls):
         """ """
         if hasattr(cls, "row_model_class"):
             return cls.row_model_class
@@ -396,7 +396,7 @@ class BatchMasterView(MasterView):
         query = self.Session.query(BatchRow).filter(BatchRow.batch == batch)
         return query
 
-    def configure_row_grid(self, g):  # pylint: disable=empty-docstring
+    def configure_row_grid(self, g):
         """ """
         super().configure_row_grid(g)
 
@@ -404,7 +404,7 @@ class BatchMasterView(MasterView):
 
         g.set_renderer("status_code", self.render_row_status)
 
-    def render_row_status(self, row, key, value):  # pylint: disable=empty-docstring
+    def render_row_status(self, row, key, value):
         """ """
         return row.STATUS.get(value, value)
 
@@ -413,7 +413,7 @@ class BatchMasterView(MasterView):
     ##############################
 
     @classmethod
-    def defaults(cls, config):  # pylint: disable=empty-docstring
+    def defaults(cls, config):
         """ """
         cls._defaults(config)
         cls._batch_defaults(config)

src/wuttaweb/views/common.py

@@ -85,7 +85,7 @@ class CommonView(View):
         """
         return {"index_title": self.app.get_title()}
 
-    def feedback(self):  # pylint: disable=empty-docstring
+    def feedback(self):
         """ """
         model = self.app.model
         session = Session()
@@ -116,7 +116,7 @@ class CommonView(View):
 
         return {"ok": True}
 
-    def feedback_make_schema(self):  # pylint: disable=empty-docstring
+    def feedback_make_schema(self):
         """ """
         schema = colander.Schema()
 
@@ -132,7 +132,7 @@ class CommonView(View):
 
         return schema
 
-    def feedback_send(self, context):  # pylint: disable=empty-docstring
+    def feedback_send(self, context):
         """ """
         self.app.send_email("feedback", context)
 

src/wuttaweb/views/email.py

@@ -89,7 +89,7 @@ class EmailSettingView(MasterView):
             data.append(self.normalize_setting(setting))
         return data
 
-    def normalize_setting(self, setting):  # pylint: disable=empty-docstring
+    def normalize_setting(self, setting):
         """ """
         key = setting.__name__
         return {
@@ -107,7 +107,7 @@ class EmailSettingView(MasterView):
             "enabled": self.email_handler.is_enabled(key),
         }
 
-    def configure_grid(self, g):  # pylint: disable=empty-docstring
+    def configure_grid(self, g):
         """ """
         super().configure_grid(g)
 
@@ -122,7 +122,7 @@ class EmailSettingView(MasterView):
         # to
         g.set_renderer("to", self.render_to_short)
 
-    def render_to_short(self, setting, field, value):  # pylint: disable=empty-docstring
+    def render_to_short(self, setting, field, value):
         """ """
         recips = value
         if not recips:
@@ -134,7 +134,7 @@ class EmailSettingView(MasterView):
         recips = ", ".join(recips[:2])
         return f"{recips}, ..."
 
-    def get_instance(self):  # pylint: disable=empty-docstring
+    def get_instance(self):
         """ """
         key = self.request.matchdict["key"]
         setting = self.email_handler.get_email_setting(key, instance=False)
@@ -143,11 +143,11 @@ class EmailSettingView(MasterView):
 
         raise self.notfound()
 
-    def get_instance_title(self, setting):  # pylint: disable=empty-docstring
+    def get_instance_title(self, setting):
         """ """
         return setting["subject"]
 
-    def configure_form(self, f):  # pylint: disable=empty-docstring
+    def configure_form(self, f):
         """ """
         super().configure_form(f)
 
@@ -173,7 +173,7 @@ class EmailSettingView(MasterView):
         # enabled
         f.set_node("enabled", colander.Boolean())
 
-    def persist(self, setting):  # pylint: disable=too-many-branches,empty-docstring
+    def persist(self, setting):
         """ """
         session = self.Session()
         key = self.request.matchdict["key"]
@@ -233,7 +233,7 @@ class EmailSettingView(MasterView):
         # enabled
         save("enabled", "true" if setting["enabled"] else "false")
 
-    def render_to_response(self, template, context):  # pylint: disable=empty-docstring
+    def render_to_response(self, template, context):
         """ """
         if self.viewing:
             setting = context["instance"]
@@ -270,7 +270,7 @@ class EmailSettingView(MasterView):
         return self.request.response
 
     @classmethod
-    def defaults(cls, config):  # pylint: disable=empty-docstring
+    def defaults(cls, config):
         """ """
         cls._email_defaults(config)
         cls._defaults(config)

src/wuttaweb/views/master.py

@@ -483,7 +483,7 @@ class MasterView(View):
                     context["pager_stats"] = grid.get_vue_pager_stats()
                 return self.json_response(context)
 
-            # full, not partial
+            else:  # full, not partial
 
                 # nb. when user asks to reset view, it is via the query
                 # string.  if so we then redirect to discard that.
@@ -801,6 +801,8 @@ class MasterView(View):
             self.delete_bulk_action(data)
             return self.redirect(self.get_index_url())
 
+        else:
+
             # start thread for delete; show progress page
             route_prefix = self.get_route_prefix()
             key = f"{route_prefix}.delete_bulk"
@@ -813,9 +815,7 @@ class MasterView(View):
             thread.start()
             return self.render_progress(progress)
 
-    def delete_bulk_thread(  # pylint: disable=empty-docstring
+    def delete_bulk_thread(self, query, success_url=None, progress=None):
-        self, query, success_url=None, progress=None
-    ):
         """ """
         model_title_plural = self.get_model_title_plural()
 
@@ -867,7 +867,7 @@ class MasterView(View):
             delete, data, progress, message=f"Deleting {model_title_plural}"
         )
 
-    def delete_bulk_make_button(self):  # pylint: disable=empty-docstring
+    def delete_bulk_make_button(self):
         """ """
         route_prefix = self.get_route_prefix()
 
@@ -1111,9 +1111,7 @@ class MasterView(View):
         :param progress: Optional progress indicator factory.
         """
 
-    def execute_thread(  # pylint: disable=empty-docstring
+    def execute_thread(self, key, user_uuid, progress=None):
-        self, key, user_uuid, progress=None
-    ):
         """ """
         model = self.app.model
         model_title = self.get_model_title()

src/wuttaweb/views/people.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  wuttaweb -- Web App for Wutta Framework
-#  Copyright © 2024-2025 Lance Edgar
+#  Copyright © 2024 Lance Edgar
 #
 #  This file is part of Wutta Framework.
 #
@@ -70,7 +70,7 @@ class PersonView(MasterView):
         "users",
     ]
 
-    def configure_grid(self, g):  # pylint: disable=empty-docstring
+    def configure_grid(self, g):
         """ """
         super().configure_grid(g)
 
@@ -83,7 +83,7 @@ class PersonView(MasterView):
         # last_name
         g.set_link("last_name")
 
-    def configure_form(self, f):  # pylint: disable=empty-docstring
+    def configure_form(self, f):
         """ """
         super().configure_form(f)
         person = f.model_instance
@@ -129,7 +129,7 @@ class PersonView(MasterView):
 
         return grid
 
-    def objectify(self, form):  # pylint: disable=empty-docstring
+    def objectify(self, form):
         """ """
         person = super().objectify(form)
 
@@ -138,7 +138,7 @@ class PersonView(MasterView):
 
         return person
 
-    def autocomplete_query(self, term):  # pylint: disable=empty-docstring
+    def autocomplete_query(self, term):
         """ """
         model = self.app.model
         session = self.Session()
@@ -147,7 +147,7 @@ class PersonView(MasterView):
         query = query.filter(sa.and_(*criteria)).order_by(model.Person.full_name)
         return query
 
-    def view_profile(self, session=None):  # pylint: disable=empty-docstring
+    def view_profile(self, session=None):
         """ """
         person = self.get_instance(session=session)
         context = {
@@ -156,13 +156,13 @@ class PersonView(MasterView):
         }
         return self.render_to_response("view_profile", context)
 
-    def make_user(self):  # pylint: disable=empty-docstring
+    def make_user(self):
         """ """
         self.request.session.flash("TODO: this feature is not yet supported", "error")
         return self.redirect(self.request.get_referrer())
 
     @classmethod
-    def defaults(cls, config):  # pylint: disable=empty-docstring
+    def defaults(cls, config):
         """ """
 
         # nb. Person may come from custom model

src/wuttaweb/views/reports.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  wuttaweb -- Web App for Wutta Framework
-#  Copyright © 2024-2025 Lance Edgar
+#  Copyright © 2024 Lance Edgar
 #
 #  This file is part of Wutta Framework.
 #
@@ -72,16 +72,14 @@ class ReportView(MasterView):
         super().__init__(request, context=context)
         self.report_handler = self.app.get_report_handler()
 
-    def get_grid_data(  # pylint: disable=empty-docstring
+    def get_grid_data(self, columns=None, session=None):
-        self, columns=None, session=None
-    ):
         """ """
         data = []
         for report in self.report_handler.get_reports().values():
             data.append(self.normalize_report(report))
         return data
 
-    def normalize_report(self, report):  # pylint: disable=empty-docstring
+    def normalize_report(self, report):
         """ """
         return {
             "report_key": report.report_key,
@@ -89,7 +87,7 @@ class ReportView(MasterView):
             "help_text": report.__doc__,
         }
 
-    def configure_grid(self, g):  # pylint: disable=empty-docstring
+    def configure_grid(self, g):
         """ """
         super().configure_grid(g)
 
@@ -103,7 +101,7 @@ class ReportView(MasterView):
         # help_text
         g.set_searchable("help_text")
 
-    def get_instance(self):  # pylint: disable=empty-docstring
+    def get_instance(self):
         """ """
         key = self.request.matchdict["report_key"]
         report = self.report_handler.get_report(key)
@@ -112,7 +110,7 @@ class ReportView(MasterView):
 
         raise self.notfound()
 
-    def get_instance_title(self, report):  # pylint: disable=empty-docstring
+    def get_instance_title(self, report):
         """ """
         return report["report_title"]
 
@@ -151,7 +149,7 @@ class ReportView(MasterView):
 
         return self.render_to_response("view", context)
 
-    def configure_form(self, f):  # pylint: disable=empty-docstring
+    def configure_form(self, f):
         """ """
         super().configure_form(f)
         key = self.request.matchdict["report_key"]
@@ -212,7 +210,7 @@ class ReportView(MasterView):
         context["report_generated"] = datetime.datetime.now()
         return context
 
-    def normalize_columns(self, columns):  # pylint: disable=empty-docstring
+    def normalize_columns(self, columns):
         """ """
         normal = []
         for column in columns:
@@ -222,7 +220,7 @@ class ReportView(MasterView):
             normal.append(column)
         return normal
 
-    def get_download_data(self):  # pylint: disable=empty-docstring
+    def get_download_data(self):
         """ """
         key = self.request.matchdict["report_key"]
         report = self.report_handler.get_report(key)
@@ -231,14 +229,14 @@ class ReportView(MasterView):
         data = self.report_handler.make_report_data(report, params)
         return params, columns, data
 
-    def get_download_path(self, data, ext):  # pylint: disable=empty-docstring
+    def get_download_path(self, data, ext):
         """ """
         tempdir = tempfile.mkdtemp()
         filename = f"{data['output_title']}.{ext}"
         return os.path.join(tempdir, filename)
 
     @classmethod
-    def defaults(cls, config):  # pylint: disable=empty-docstring
+    def defaults(cls, config):
         """ """
         cls._defaults(config)
         cls._report_defaults(config)

src/wuttaweb/views/roles.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  wuttaweb -- Web App for Wutta Framework
-#  Copyright © 2024-2025 Lance Edgar
+#  Copyright © 2024 Lance Edgar
 #
 #  This file is part of Wutta Framework.
 #
@@ -59,13 +59,13 @@ class RoleView(MasterView):
     sort_defaults = "name"
 
     # TODO: master should handle this, possibly via configure_form()
-    def get_query(self, session=None):  # pylint: disable=empty-docstring
+    def get_query(self, session=None):
         """ """
         model = self.app.model
         query = super().get_query(session=session)
         return query.order_by(model.Role.name)
 
-    def configure_grid(self, g):  # pylint: disable=empty-docstring
+    def configure_grid(self, g):
         """ """
         super().configure_grid(g)
 
@@ -75,7 +75,7 @@ class RoleView(MasterView):
         # notes
         g.set_renderer("notes", self.grid_render_notes)
 
-    def is_editable(self, role):  # pylint: disable=empty-docstring
+    def is_editable(self, role):
         """ """
         session = self.app.get_session(role)
         auth = self.app.get_auth_handler()
@@ -93,7 +93,7 @@ class RoleView(MasterView):
 
         return True
 
-    def is_deletable(self, role):  # pylint: disable=empty-docstring
+    def is_deletable(self, role):
         """ """
         session = self.app.get_session(role)
         auth = self.app.get_auth_handler()
@@ -108,7 +108,7 @@ class RoleView(MasterView):
 
         return True
 
-    def configure_form(self, f):  # pylint: disable=empty-docstring
+    def configure_form(self, f):
         """ """
         super().configure_form(f)
         role = f.model_instance
@@ -171,7 +171,7 @@ class RoleView(MasterView):
 
         return grid
 
-    def unique_name(self, node, value):  # pylint: disable=empty-docstring
+    def unique_name(self, node, value):
         """ """
         model = self.app.model
         session = Session()
@@ -266,7 +266,7 @@ class RoleView(MasterView):
 
         return available
 
-    def objectify(self, form):  # pylint: disable=empty-docstring
+    def objectify(self, form):
         """ """
         # normal logic first
         role = super().objectify(form)
@@ -276,7 +276,7 @@ class RoleView(MasterView):
 
         return role
 
-    def update_permissions(self, role, form):  # pylint: disable=empty-docstring
+    def update_permissions(self, role, form):
         """ """
         if "permissions" not in form.validated:
             return
@@ -293,7 +293,7 @@ class RoleView(MasterView):
                     auth.revoke_permission(role, pkey)
 
     @classmethod
-    def defaults(cls, config):  # pylint: disable=empty-docstring
+    def defaults(cls, config):
         """ """
         cls._defaults(config)
         cls._role_defaults(config)
@@ -340,7 +340,7 @@ class PermissionView(MasterView):
         "permission",
     ]
 
-    def get_query(self, **kwargs):  # pylint: disable=empty-docstring
+    def get_query(self, **kwargs):
         """ """
         query = super().get_query(**kwargs)
         model = self.app.model
@@ -350,7 +350,7 @@ class PermissionView(MasterView):
 
         return query
 
-    def configure_grid(self, g):  # pylint: disable=empty-docstring
+    def configure_grid(self, g):
         """ """
         super().configure_grid(g)
         model = self.app.model
@@ -363,7 +363,7 @@ class PermissionView(MasterView):
         # permission
         g.set_link("permission")
 
-    def configure_form(self, f):  # pylint: disable=empty-docstring
+    def configure_form(self, f):
         """ """
         super().configure_form(f)
 

src/wuttaweb/views/settings.py

@@ -71,9 +71,7 @@ class AppInfoView(MasterView):
     # TODO: for tailbone backward compat with get_liburl() etc.
     weblib_config_prefix = None
 
-    def get_grid_data(  # pylint: disable=empty-docstring
+    def get_grid_data(self, columns=None, session=None):
-        self, columns=None, session=None
-    ):
         """ """
 
         # nb. init with empty data, only load it upon user request
@@ -93,7 +91,7 @@ class AppInfoView(MasterView):
 
         return data
 
-    def configure_grid(self, g):  # pylint: disable=empty-docstring
+    def configure_grid(self, g):
         """ """
         super().configure_grid(g)
 
@@ -105,7 +103,7 @@ class AppInfoView(MasterView):
         # editable_project_location
         g.set_searchable("editable_project_location")
 
-    def get_weblibs(self):  # pylint: disable=empty-docstring
+    def get_weblibs(self):
         """ """
         return OrderedDict(
             [
@@ -124,7 +122,7 @@ class AppInfoView(MasterView):
             ]
         )
 
-    def configure_get_simple_settings(self):  # pylint: disable=empty-docstring
+    def configure_get_simple_settings(self):
         """ """
         simple_settings = [
             # basics
@@ -173,7 +171,7 @@ class AppInfoView(MasterView):
 
         return simple_settings
 
-    def configure_get_context(self, **kwargs):  # pylint: disable=empty-docstring
+    def configure_get_context(self, **kwargs):
         """ """
         context = super().configure_get_context(**kwargs)
 
@@ -242,14 +240,14 @@ class SettingView(MasterView):
     sort_defaults = "name"
 
     # TODO: master should handle this (per model key)
-    def configure_grid(self, g):  # pylint: disable=empty-docstring
+    def configure_grid(self, g):
         """ """
         super().configure_grid(g)
 
         # name
         g.set_link("name")
 
-    def configure_form(self, f):  # pylint: disable=empty-docstring
+    def configure_form(self, f):
         """ """
         super().configure_form(f)
 
@@ -260,7 +258,7 @@ class SettingView(MasterView):
         # TODO: master should handle this (per column nullable)
         f.set_required("value", False)
 
-    def unique_name(self, node, value):  # pylint: disable=empty-docstring
+    def unique_name(self, node, value):
         """ """
         model = self.app.model
         session = self.Session()

src/wuttaweb/views/upgrades.py

@@ -72,7 +72,7 @@ class UpgradeView(MasterView):
 
     sort_defaults = ("created", "desc")
 
-    def configure_grid(self, g):  # pylint: disable=empty-docstring
+    def configure_grid(self, g):
         """ """
         super().configure_grid(g)
         model = self.app.model
@@ -110,7 +110,7 @@ class UpgradeView(MasterView):
         )
         g.set_filter("executed_by", Executor.username, label="Executed By Username")
 
-    def grid_row_class(self, upgrade, data, i):  # pylint: disable=empty-docstring
+    def grid_row_class(self, upgrade, data, i):
         """ """
         enum = self.app.enum
         if upgrade.status == enum.UpgradeStatus.EXECUTING:
@@ -119,7 +119,7 @@ class UpgradeView(MasterView):
             return "has-background-warning"
         return None
 
-    def configure_form(self, f):  # pylint: disable=empty-docstring
+    def configure_form(self, f):
         """ """
         super().configure_form(f)
         enum = self.app.enum
@@ -213,7 +213,7 @@ class UpgradeView(MasterView):
 
         super().delete_instance(upgrade)
 
-    def objectify(self, form):  # pylint: disable=empty-docstring
+    def objectify(self, form):
         """ """
         upgrade = super().objectify(form)
         enum = self.app.enum
@@ -225,15 +225,13 @@ class UpgradeView(MasterView):
 
         return upgrade
 
-    def download_path(self, upgrade, filename):  # pylint: disable=empty-docstring
+    def download_path(self, upgrade, filename):
         """ """
         if filename:
             return self.get_upgrade_filepath(upgrade, filename)
         return None
 
-    def get_upgrade_filepath(  # pylint: disable=empty-docstring
+    def get_upgrade_filepath(self, upgrade, filename=None, create=True):
-        self, upgrade, filename=None, create=True
-    ):
         """ """
         uuid = str(upgrade.uuid)
         path = self.app.get_appdir(
@@ -289,7 +287,7 @@ class UpgradeView(MasterView):
         else:
             upgrade.status = enum.UpgradeStatus.FAILURE
 
-    def execute_progress(self):  # pylint: disable=empty-docstring
+    def execute_progress(self):
         """ """
         route_prefix = self.get_route_prefix()
         upgrade = self.get_instance()
@@ -331,7 +329,7 @@ class UpgradeView(MasterView):
 
         return data
 
-    def configure_get_simple_settings(self):  # pylint: disable=empty-docstring
+    def configure_get_simple_settings(self):
         """ """
 
         script = self.config.get(f"{self.app.appname}.upgrades.command")
@@ -344,7 +342,7 @@ class UpgradeView(MasterView):
         ]
 
     @classmethod
-    def defaults(cls, config):  # pylint: disable=empty-docstring
+    def defaults(cls, config):
         """ """
 
         # nb. Upgrade may come from custom model

src/wuttaweb/views/users.py

@@ -74,7 +74,7 @@ class UserView(MasterView):
         "api_tokens",
     ]
 
-    def get_query(self, session=None):  # pylint: disable=empty-docstring
+    def get_query(self, session=None):
         """ """
         query = super().get_query(session=session)
 
@@ -84,7 +84,7 @@ class UserView(MasterView):
 
         return query
 
-    def configure_grid(self, g):  # pylint: disable=empty-docstring
+    def configure_grid(self, g):
         """ """
         super().configure_grid(g)
         model = self.app.model
@@ -100,13 +100,13 @@ class UserView(MasterView):
         g.set_sorter("person", model.Person.full_name)
         g.set_filter("person", model.Person.full_name, label="Person Full Name")
 
-    def grid_row_class(self, user, data, i):  # pylint: disable=empty-docstring
+    def grid_row_class(self, user, data, i):
         """ """
         if not user.active:
             return "has-background-warning"
         return None
 
-    def is_editable(self, user):  # pylint: disable=empty-docstring
+    def is_editable(self, user):
         """ """
 
         # only root can edit certain users
@@ -115,7 +115,7 @@ class UserView(MasterView):
 
         return True
 
-    def configure_form(self, f):  # pylint: disable=empty-docstring
+    def configure_form(self, f):
         """ """
         super().configure_form(f)
         user = f.model_instance
@@ -161,7 +161,7 @@ class UserView(MasterView):
         else:
             f.remove("api_tokens")
 
-    def unique_username(self, node, value):  # pylint: disable=empty-docstring
+    def unique_username(self, node, value):
         """ """
         model = self.app.model
         session = self.Session()
@@ -175,7 +175,7 @@ class UserView(MasterView):
         if query.count():
             node.raise_invalid("Username must be unique")
 
-    def objectify(self, form):  # pylint: disable=empty-docstring
+    def objectify(self, form):
         """ """
         model = self.app.model
         auth = self.app.get_auth_handler()
@@ -221,7 +221,7 @@ class UserView(MasterView):
 
         return user
 
-    def update_roles(self, user, form):  # pylint: disable=empty-docstring
+    def update_roles(self, user, form):
         """ """
         # TODO
         # if not self.has_perm('edit_roles'):
@@ -311,7 +311,7 @@ class UserView(MasterView):
 
         return grid
 
-    def normalize_api_token(self, token):  # pylint: disable=empty-docstring
+    def normalize_api_token(self, token):
         """ """
         return {
             "uuid": token.uuid.hex,
@@ -366,7 +366,7 @@ class UserView(MasterView):
         return {}
 
     @classmethod
-    def defaults(cls, config):  # pylint: disable=empty-docstring
+    def defaults(cls, config):
         """ """
 
         # nb. User may come from custom model

tests/views/test_upgrades.py

@@ -121,7 +121,7 @@ class TestUpgradeView(WebTestCase):
         model = self.app.model
         enum = self.app.enum
 
-        appdir = self.mkdtemp()
+        appdir = self.mkdir("app")
         self.config.setdefault("wutta.appdir", appdir)
         self.assertEqual(self.app.get_appdir(), appdir)
 
@@ -150,7 +150,7 @@ class TestUpgradeView(WebTestCase):
         model = self.app.model
         enum = self.app.enum
 
-        appdir = self.mkdtemp()
+        appdir = self.mkdir("app")
         self.config.setdefault("wutta.appdir", appdir)
         self.assertEqual(self.app.get_appdir(), appdir)
 
@@ -181,7 +181,7 @@ class TestUpgradeView(WebTestCase):
         model = self.app.model
         enum = self.app.enum
 
-        appdir = self.mkdtemp()
+        appdir = self.mkdir("app")
         self.config.setdefault("wutta.appdir", appdir)
         self.assertEqual(self.app.get_appdir(), appdir)
 
@@ -219,7 +219,7 @@ class TestUpgradeView(WebTestCase):
         model = self.app.model
         enum = self.app.enum
 
-        appdir = self.mkdtemp()
+        appdir = self.mkdir("app")
         self.config.setdefault("wutta.appdir", appdir)
         self.assertEqual(self.app.get_appdir(), appdir)