From dbd589e502479da93441cf84bb226b496a790050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Fri, 5 May 2017 16:37:03 +0200 Subject: [PATCH] flake8 and isort --- src/c3nav/editor/views.py | 1 + src/c3nav/mapdata/api.py | 7 +++---- src/c3nav/mapdata/models/__init__.py | 2 +- src/c3nav/mapdata/models/base.py | 3 +-- src/c3nav/mapdata/models/geometry.py | 1 + src/c3nav/routing/graph.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/c3nav/editor/views.py b/src/c3nav/editor/views.py index 740bdd6d..aabaa294 100644 --- a/src/c3nav/editor/views.py +++ b/src/c3nav/editor/views.py @@ -10,6 +10,7 @@ from c3nav.mapdata.models.base import FEATURE_TYPES def list_mapitemtypes(request, level): level = get_object_or_404() + def get_item_count(mapitemtype): if hasattr(mapitemtype, 'level'): return filter_queryset_by_access(request, mapitemtype.objects.filter(level__name=level)).count() diff --git a/src/c3nav/mapdata/api.py b/src/c3nav/mapdata/api.py index 3467255c..9286f1b8 100644 --- a/src/c3nav/mapdata/api.py +++ b/src/c3nav/mapdata/api.py @@ -1,8 +1,8 @@ +import hashlib import json import mimetypes - -import hashlib from collections import OrderedDict + from django.http import Http404, HttpResponse, HttpResponseNotModified from django.shortcuts import get_object_or_404 from rest_framework.decorators import detail_route, list_route @@ -15,8 +15,7 @@ from c3nav.mapdata.models import GEOMETRY_FEATURE_TYPES, AreaLocation, Level, Lo from c3nav.mapdata.models.geometry import Stair from c3nav.mapdata.search import get_location from c3nav.mapdata.serializers.main import LevelSerializer, SourceSerializer -from c3nav.mapdata.utils.cache import (CachedReadOnlyViewSetMixin, cache_mapdata_api_response, get_bssid_areas_cached, - get_levels_cached) +from c3nav.mapdata.utils.cache import CachedReadOnlyViewSetMixin, cache_mapdata_api_response, get_bssid_areas_cached class GeometryTypeViewSet(ViewSet): diff --git a/src/c3nav/mapdata/models/__init__.py b/src/c3nav/mapdata/models/__init__.py index 1b986195..85b8f14d 100644 --- a/src/c3nav/mapdata/models/__init__.py +++ b/src/c3nav/mapdata/models/__init__.py @@ -1,5 +1,5 @@ from .level import Level # noqa from .source import Source # noqa from .geometry import LevelFeature # noqa -from c3nav.mapdata.models.base import GEOMETRY_FEATURE_TYPES +from c3nav.mapdata.models.base import GEOMETRY_FEATURE_TYPES # noqa from .locations import AreaLocation, LocationGroup # noqa diff --git a/src/c3nav/mapdata/models/base.py b/src/c3nav/mapdata/models/base.py index 4850092f..f41b8062 100644 --- a/src/c3nav/mapdata/models/base.py +++ b/src/c3nav/mapdata/models/base.py @@ -2,9 +2,8 @@ from collections import OrderedDict from django.db import models from django.db.models.base import ModelBase -from django.utils.translation import ugettext_lazy as _ from django.utils.translation import get_language -from shapely.geometry import mapping, Point +from shapely.geometry import Point, mapping from c3nav.mapdata.fields import GeometryField from c3nav.mapdata.lastupdate import set_last_mapdata_update diff --git a/src/c3nav/mapdata/models/geometry.py b/src/c3nav/mapdata/models/geometry.py index 3fcaa00b..58932771 100644 --- a/src/c3nav/mapdata/models/geometry.py +++ b/src/c3nav/mapdata/models/geometry.py @@ -1,4 +1,5 @@ from collections import OrderedDict + from django.db import models from django.utils.translation import ugettext_lazy as _ from shapely.geometry import CAP_STYLE, JOIN_STYLE diff --git a/src/c3nav/routing/graph.py b/src/c3nav/routing/graph.py index 50e29d5d..95e6c5b9 100644 --- a/src/c3nav/routing/graph.py +++ b/src/c3nav/routing/graph.py @@ -120,7 +120,7 @@ class Graph: point.connect_to(center_point) def connect_elevators(self): - for elevator in Elevator.objects.all(): + for elevator in Elevator.objects.all(): # noqa elevatorlevels = tuple(elevator.elevatorlevels.all()) for level1, level2 in combinations(elevatorlevels, 2): point1 = self._built_elevatorlevel_points[level1.name]