From c1d9a011cf63d6a1ffe8ea090c60384f0c92a87b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sun, 24 Dec 2023 16:07:07 +0100 Subject: [PATCH] make linter happy --- src/c3nav/api/api.py | 1 - src/c3nav/editor/views/changes.py | 3 +-- src/c3nav/mapdata/models/access.py | 3 +-- src/c3nav/mapdata/models/geometry/base.py | 2 +- src/c3nav/mapdata/schemas/model_base.py | 1 - src/c3nav/mapdata/schemas/models.py | 1 - src/c3nav/routing/api/routing.py | 1 + src/c3nav/site/views.py | 2 -- 8 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/c3nav/api/api.py b/src/c3nav/api/api.py index ab1f68f5..74c9855f 100644 --- a/src/c3nav/api/api.py +++ b/src/c3nav/api/api.py @@ -1,4 +1,3 @@ -from django.conf import settings from ninja import Field as APIField from ninja import Router as APIRouter diff --git a/src/c3nav/editor/views/changes.py b/src/c3nav/editor/views/changes.py index 32f63ef6..72cf0f18 100644 --- a/src/c3nav/editor/views/changes.py +++ b/src/c3nav/editor/views/changes.py @@ -232,8 +232,7 @@ def changeset_detail(request, pk): else: obj_desc = format_lazy(_('{model} #{id} (deleted outside this changeset)'), - model=obj.__class__._meta.verbose_name, id=pk) - + model=obj.__class__._meta.verbose_name, id=pk) edit_url = None if obj_still_exists and can_edit and not isinstance(obj, LocationRedirect): diff --git a/src/c3nav/mapdata/models/access.py b/src/c3nav/mapdata/models/access.py index 5d0e1c8b..96dc3b50 100644 --- a/src/c3nav/mapdata/models/access.py +++ b/src/c3nav/mapdata/models/access.py @@ -61,7 +61,6 @@ class AccessRestriction(TitledMixin, models.Model): return access_restriction_ids - class AccessRestrictionGroup(TitledMixin, models.Model): """ An access restriction group @@ -204,7 +203,7 @@ class AccessPermission(models.Model): ) @staticmethod - def build_access_permission_key(*, session_token: str|None = None, user_id: int|None = None): + def build_access_permission_key(*, session_token: str | None = None, user_id: int | None = None): if session_token: if user_id: raise ValueError diff --git a/src/c3nav/mapdata/models/geometry/base.py b/src/c3nav/mapdata/models/geometry/base.py index a4895490..0e9c00f6 100644 --- a/src/c3nav/mapdata/models/geometry/base.py +++ b/src/c3nav/mapdata/models/geometry/base.py @@ -4,7 +4,7 @@ from contextlib import contextmanager from django.db import models from django.utils.functional import cached_property from django.utils.translation import gettext_lazy as _ -from shapely.geometry import Point, box +from shapely.geometry import Point from shapely.geometry.base import BaseGeometry from shapely.ops import unary_union diff --git a/src/c3nav/mapdata/schemas/model_base.py b/src/c3nav/mapdata/schemas/model_base.py index b05ab5fa..f54cc3b6 100644 --- a/src/c3nav/mapdata/schemas/model_base.py +++ b/src/c3nav/mapdata/schemas/model_base.py @@ -1,7 +1,6 @@ import re from typing import Annotated, Optional, Union -from ninja import Schema from pydantic import Field as APIField from pydantic import PositiveInt diff --git a/src/c3nav/mapdata/schemas/models.py b/src/c3nav/mapdata/schemas/models.py index 66d0ed4b..70b97e2c 100644 --- a/src/c3nav/mapdata/schemas/models.py +++ b/src/c3nav/mapdata/schemas/models.py @@ -1,6 +1,5 @@ from typing import Annotated, ClassVar, Literal, Optional, Union -from ninja import Schema from pydantic import Discriminator from pydantic import Field as APIField from pydantic import NonNegativeFloat, PositiveFloat, PositiveInt diff --git a/src/c3nav/routing/api/routing.py b/src/c3nav/routing/api/routing.py index ec72ef7b..303c8b91 100644 --- a/src/c3nav/routing/api/routing.py +++ b/src/c3nav/routing/api/routing.py @@ -46,6 +46,7 @@ class RestrictedAreas(StrEnum): PREFER = "prefer" AVOID = "avoid" + class LevelWayTypeChoice(StrEnum): """ route preferences for way types that are level """ ALLOW = "allow" diff --git a/src/c3nav/site/views.py b/src/c3nav/site/views.py index cd95c66a..3231a033 100644 --- a/src/c3nav/site/views.py +++ b/src/c3nav/site/views.py @@ -8,7 +8,6 @@ from django.contrib import messages from django.contrib.auth import login, logout from django.contrib.auth.decorators import login_required from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm, UserCreationForm -from django.contrib.auth.views import redirect_to_login from django.core.cache import cache from django.core.exceptions import ObjectDoesNotExist, SuspiciousOperation from django.core.paginator import Paginator @@ -28,7 +27,6 @@ from django.views.decorators.http import etag from c3nav import __version__ as c3nav_version from c3nav.api.models import Secret -from c3nav.control.forms import AccessPermissionForm, SignedPermissionDataError from c3nav.mapdata.grid import grid from c3nav.mapdata.models import Location, Source from c3nav.mapdata.models.access import AccessPermissionToken, AccessPermission