fix linter warnings

This commit is contained in:
Laura Klünder 2022-04-03 16:42:17 +02:00
parent 03437a3a40
commit 4e15cc1b74
10 changed files with 12 additions and 12 deletions

View file

@ -1,3 +1,4 @@
[settings] [settings]
line_length=120 line_length=120
skip=migrations,celery.py,__init__.py skip=migrations,celery.py,__init__.py
no_inline_sort=true

View file

@ -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] # graphedges = [edge for edge in graphedges if edge.from_node.space_id != edge.to_node.space_id]
results = chain( 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(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.altitudemarkers.all() for space in level.spaces.all()),
*(space.wifi_measurements.all() for space in level.spaces.all()) *(space.wifi_measurements.all() for space in level.spaces.all())
# graphedges, # graphedges,

View file

@ -5,7 +5,7 @@ from functools import reduce, wraps
from itertools import chain from itertools import chain
from django.core.cache import cache 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 import models
from django.db.models import Manager, ManyToManyRel, Prefetch, Q from django.db.models import Manager, ManyToManyRel, Prefetch, Q
from django.db.models.fields.related_descriptors import ReverseOneToOneDescriptor from django.db.models.fields.related_descriptors import ReverseOneToOneDescriptor

View file

@ -15,7 +15,8 @@ from django.utils import timezone
from django.utils.crypto import get_random_string from django.utils.crypto import get_random_string
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.text import format_lazy 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.fields import I18nField
from c3nav.mapdata.grid import grid from c3nav.mapdata.grid import grid

View file

@ -65,7 +65,7 @@ class Report(models.Model):
@property @property
def form_cls(self): 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 return ReportMissingLocationForm if self.category == 'missing-location' else ReportIssueForm
@cached_property @cached_property

View file

@ -70,8 +70,6 @@ class OpenSCADEngine(Base3DEngine):
else: else:
self.root = OpenScadBlock('scale([%(scale)f, %(scale)f, %(scale)f])' % { self.root = OpenScadBlock('scale([%(scale)f, %(scale)f, %(scale)f])' % {
'scale': self.scale, '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): def custom_render(self, level_render_data, access_permissions, full_levels):

View file

@ -1,7 +1,7 @@
from django.urls import path, register_converter from django.urls import path, register_converter
from c3nav.mapdata.converters import SignedIntConverter, AccessPermissionsConverter, HistoryModeConverter, \ from c3nav.mapdata.converters import (AccessPermissionsConverter, ArchiveFileExtConverter, HistoryFileExtConverter,
HistoryFileExtConverter, ArchiveFileExtConverter HistoryModeConverter, SignedIntConverter)
from c3nav.mapdata.views import get_cache_package, map_history, tile from c3nav.mapdata.views import get_cache_package, map_history, tile
register_converter(SignedIntConverter, 'sint') register_converter(SignedIntConverter, 'sint')

View file

@ -379,7 +379,7 @@ class Router:
pois=self.pois, point=location, restrictions=restrictions pois=self.pois, point=location, restrictions=restrictions
) )
nearby = tuple(sorted( 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) key=operator.itemgetter(1)
)) ))
# show all location within 5 meters, but at least 20 # show all location within 5 meters, but at least 20

View file

@ -1,6 +1,6 @@
from django.urls import path, register_converter 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, 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, login_view, logout_view, map_index, position_create, position_detail, position_list,
position_set, qr_code, register_view, report_create, report_detail, report_list) position_set, qr_code, register_view, report_create, report_detail, report_list)

View file

@ -1,8 +1,8 @@
from contextlib import suppress from contextlib import suppress
from django.conf import settings from django.conf import settings
from django.urls import include, path
from django.contrib import admin from django.contrib import admin
from django.urls import include, path
import c3nav.api.urls import c3nav.api.urls
import c3nav.control.urls import c3nav.control.urls