diff options
| author | Daniel Schadt <kingdread@gmx.de> | 2026-11-13 08:54:40 +0100 |
|---|---|---|
| committer | Daniel Schadt <kingdread@gmx.de> | 2026-11-13 08:54:40 +0100 |
| commit | f330d591d9b4e02142b9c6707e2e380311b72dbb (patch) | |
| tree | d27b1130f04eaaecc1908da81a1a88edd1212ebf | |
| parent | 0da065154cdaa7af4282c6b5bb400b2fd32fa2c9 (diff) | |
| download | fietsboek-f330d591d9b4e02142b9c6707e2e380311b72dbb.tar.gz fietsboek-f330d591d9b4e02142b9c6707e2e380311b72dbb.tar.bz2 fietsboek-f330d591d9b4e02142b9c6707e2e380311b72dbb.zip | |
fix lints
| -rw-r--r-- | fietsboek/util.py | 8 | ||||
| -rw-r--r-- | fietsboek/views/browse.py | 6 | ||||
| -rw-r--r-- | fietsboek/views/climb.py | 14 |
3 files changed, 17 insertions, 11 deletions
diff --git a/fietsboek/util.py b/fietsboek/util.py index bc7885f..93ad48c 100644 --- a/fietsboek/util.py +++ b/fietsboek/util.py @@ -7,6 +7,7 @@ import re import secrets import unicodedata import urllib.parse +from enum import Enum from pathlib import Path from typing import Optional, TypeVar @@ -24,6 +25,8 @@ from sqlalchemy import select T = TypeVar("T") +E = TypeVar("E", bound=Enum) + ALLOWED_TAGS = ( # Those were the bleach defaults, they worked fine {"a", "abbr", "acronym", "b", "blockquote", "code", "em", "i", "li", "ol", "strong", "ul"} @@ -279,7 +282,7 @@ def retrieve_multiple( return objects -def get_enum(enum: type[T], value: str) -> T: +def get_enum(enum: type[E], value: str) -> E: """Retrieve an enum value by a string name. This is equivalent to ``enum[value]``, but raises an appropriate HTTP exception on errors. @@ -344,7 +347,7 @@ def get_date(request: Request, name: str) -> datetime.date: raise HTTPBadRequest(f"Invalid date in {name!r}") from exc -def qs_replace(url: str, **kwargs: dict[str, str]) -> str: +def qs_replace(url: str, **kwargs: str) -> str: """Construct a new url based on the given one, with the query parameters replaced as given by kwargs. @@ -356,7 +359,6 @@ def qs_replace(url: str, **kwargs: dict[str, str]) -> str: query = urllib.parse.parse_qs(parsed.query) for k, v in kwargs.items(): query[k] = [v] - query.update(kwargs) new_qs = urllib.parse.urlencode(query, doseq=True) return urllib.parse.urlunparse(parsed._replace(query=new_qs)) diff --git a/fietsboek/views/browse.py b/fietsboek/views/browse.py index 1753104..b71fccc 100644 --- a/fietsboek/views/browse.py +++ b/fietsboek/views/browse.py @@ -2,14 +2,13 @@ import datetime import json -import urllib.parse from collections.abc import Callable, Iterable from enum import Enum from io import RawIOBase -from typing import Iterator, TypeVar +from typing import Iterator from zipfile import ZIP_DEFLATED, ZipFile -from pyramid.httpexceptions import HTTPBadRequest, HTTPForbidden, HTTPNotFound +from pyramid.httpexceptions import HTTPForbidden, HTTPNotFound from pyramid.request import Request from pyramid.response import Response from pyramid.view import view_config @@ -21,7 +20,6 @@ from .. import models, util from ..models.track import TrackType, TrackWithMetadata TRACKS_PER_PAGE = 20 -T = TypeVar("T", bound=Enum) AliasedTrack = type[models.Track] diff --git a/fietsboek/views/climb.py b/fietsboek/views/climb.py index e0328a9..bd92f67 100644 --- a/fietsboek/views/climb.py +++ b/fietsboek/views/climb.py @@ -5,14 +5,13 @@ import itertools import logging from enum import Enum -from pyramid.httpexceptions import ( - HTTPNotAcceptable, -) +from pyramid.httpexceptions import HTTPBadRequest, HTTPNotAcceptable from pyramid.request import Request from pyramid.response import Response from pyramid.view import view_config from sqlalchemy import and_, nulls_first, nulls_last, or_, select from sqlalchemy.orm import aliased +from sqlalchemy.sql import Select from .. import models, util @@ -25,6 +24,8 @@ class ResultOrder(Enum): """Enum representing the different ways in which the climbs can be sorted in the result.""" + # pylint: disable=duplicate-code + DATE_ASC = "date-asc" DATE_DESC = "date-desc" LENGTH_ASC = "length-asc" @@ -93,7 +94,7 @@ def _apply_filters(query: Select, request: Request) -> Select: try: categories = [int(c) for c in request.params.getall("category[]")] except ValueError: - raise HTTPBadRequest(f"invalid category") + raise HTTPBadRequest("invalid category") from None if -1 in categories: query = query.where( or_(models.Climb.category.in_(categories), models.Climb.category.is_(None)) @@ -110,6 +111,11 @@ def _apply_filters(query: Select, request: Request) -> Select: request_method="GET", ) def climb_browse(request: Request): + """Endpoint to return the list of climbs. + + :param request: The pyramid request. + :return: The HTTP response. + """ tracks_qry = aliased( models.Track, models.User.visible_tracks_query(request.identity).subquery() ) |
