From 4e15cc1b74bba2b203519451b72f6fcbeb00ac7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sun, 3 Apr 2022 16:42:17 +0200 Subject: [PATCH] fix linter warnings --- src/.isort.cfg | 1 + src/c3nav/editor/api.py | 4 ++-- src/c3nav/editor/wrappers.py | 2 +- src/c3nav/mapdata/models/locations.py | 3 ++- src/c3nav/mapdata/models/report.py | 2 +- src/c3nav/mapdata/render/engines/openscad.py | 2 -- src/c3nav/mapdata/urls.py | 4 ++-- src/c3nav/routing/router.py | 2 +- src/c3nav/site/urls.py | 2 +- src/c3nav/urls.py | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/.isort.cfg b/src/.isort.cfg index a41daf53..46486708 100644 --- a/src/.isort.cfg +++ b/src/.isort.cfg @@ -1,3 +1,4 @@ [settings] line_length=120 skip=migrations,celery.py,__init__.py +no_inline_sort=true diff --git a/src/c3nav/editor/api.py b/src/c3nav/editor/api.py index 7cd2b8ef..834d4801 100644 --- a/src/c3nav/editor/api.py +++ b/src/c3nav/editor/api.py @@ -200,9 +200,9 @@ class EditorViewSet(EditorViewSetMixin, ViewSet): # graphedges = [edge for edge in graphedges if edge.from_node.space_id != edge.to_node.space_id] results = chain( - *(self._get_level_geometries(l) for l in levels_under), + *(self._get_level_geometries(level) for level in levels_under), self._get_level_geometries(level), - *(self._get_level_geometries(l) for l in levels_on_top), + *(self._get_level_geometries(level) for level in levels_on_top), *(space.altitudemarkers.all() for space in level.spaces.all()), *(space.wifi_measurements.all() for space in level.spaces.all()) # graphedges, diff --git a/src/c3nav/editor/wrappers.py b/src/c3nav/editor/wrappers.py index adb03758..f9bc175d 100644 --- a/src/c3nav/editor/wrappers.py +++ b/src/c3nav/editor/wrappers.py @@ -5,7 +5,7 @@ from functools import reduce, wraps from itertools import chain from django.core.cache import cache -from django.core.exceptions import ObjectDoesNotExist, FieldDoesNotExist +from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist from django.db import models from django.db.models import Manager, ManyToManyRel, Prefetch, Q from django.db.models.fields.related_descriptors import ReverseOneToOneDescriptor diff --git a/src/c3nav/mapdata/models/locations.py b/src/c3nav/mapdata/models/locations.py index 31188b7f..a2dfc0d1 100644 --- a/src/c3nav/mapdata/models/locations.py +++ b/src/c3nav/mapdata/models/locations.py @@ -15,7 +15,8 @@ from django.utils import timezone from django.utils.crypto import get_random_string from django.utils.functional import cached_property from django.utils.text import format_lazy -from django.utils.translation import gettext_lazy as _, ngettext_lazy +from django.utils.translation import gettext_lazy as _ +from django.utils.translation import ngettext_lazy from c3nav.mapdata.fields import I18nField from c3nav.mapdata.grid import grid diff --git a/src/c3nav/mapdata/models/report.py b/src/c3nav/mapdata/models/report.py index c7ac8d77..04226d14 100644 --- a/src/c3nav/mapdata/models/report.py +++ b/src/c3nav/mapdata/models/report.py @@ -65,7 +65,7 @@ class Report(models.Model): @property def form_cls(self): - from c3nav.site.forms import ReportMissingLocationForm, ReportIssueForm + from c3nav.site.forms import ReportIssueForm, ReportMissingLocationForm return ReportMissingLocationForm if self.category == 'missing-location' else ReportIssueForm @cached_property diff --git a/src/c3nav/mapdata/render/engines/openscad.py b/src/c3nav/mapdata/render/engines/openscad.py index 060c4284..58ebb59e 100644 --- a/src/c3nav/mapdata/render/engines/openscad.py +++ b/src/c3nav/mapdata/render/engines/openscad.py @@ -70,8 +70,6 @@ class OpenSCADEngine(Base3DEngine): else: self.root = OpenScadBlock('scale([%(scale)f, %(scale)f, %(scale)f])' % { 'scale': self.scale, - 'x': -(self.minx + self.maxx) / 2, - 'y': -(self.miny + self.maxy) / 2, }) def custom_render(self, level_render_data, access_permissions, full_levels): diff --git a/src/c3nav/mapdata/urls.py b/src/c3nav/mapdata/urls.py index 3fed7325..3cedc585 100644 --- a/src/c3nav/mapdata/urls.py +++ b/src/c3nav/mapdata/urls.py @@ -1,7 +1,7 @@ from django.urls import path, register_converter -from c3nav.mapdata.converters import SignedIntConverter, AccessPermissionsConverter, HistoryModeConverter, \ - HistoryFileExtConverter, ArchiveFileExtConverter +from c3nav.mapdata.converters import (AccessPermissionsConverter, ArchiveFileExtConverter, HistoryFileExtConverter, + HistoryModeConverter, SignedIntConverter) from c3nav.mapdata.views import get_cache_package, map_history, tile register_converter(SignedIntConverter, 'sint') diff --git a/src/c3nav/routing/router.py b/src/c3nav/routing/router.py index d7730341..234c2773 100644 --- a/src/c3nav/routing/router.py +++ b/src/c3nav/routing/router.py @@ -379,7 +379,7 @@ class Router: pois=self.pois, point=location, restrictions=restrictions ) nearby = tuple(sorted( - tuple(l for l in nearby_areas+nearby_pois if l[0].can_search), + tuple(location for location in nearby_areas+nearby_pois if location[0].can_search), key=operator.itemgetter(1) )) # show all location within 5 meters, but at least 20 diff --git a/src/c3nav/site/urls.py b/src/c3nav/site/urls.py index e7c1caf8..290dea36 100644 --- a/src/c3nav/site/urls.py +++ b/src/c3nav/site/urls.py @@ -1,6 +1,6 @@ from django.urls import path, register_converter -from c3nav.site.converters import LocationConverter, CoordinatesConverter, AtPositionConverter, IsEmbedConverter +from c3nav.site.converters import AtPositionConverter, CoordinatesConverter, IsEmbedConverter, LocationConverter from c3nav.site.views import (about_view, access_redeem_view, account_view, change_password_view, choose_language, login_view, logout_view, map_index, position_create, position_detail, position_list, position_set, qr_code, register_view, report_create, report_detail, report_list) diff --git a/src/c3nav/urls.py b/src/c3nav/urls.py index 7cfa0274..e3a75349 100644 --- a/src/c3nav/urls.py +++ b/src/c3nav/urls.py @@ -1,8 +1,8 @@ from contextlib import suppress from django.conf import settings -from django.urls import include, path from django.contrib import admin +from django.urls import include, path import c3nav.api.urls import c3nav.control.urls