flake8 and isort

This commit is contained in:
Laura Klünder 2017-05-05 16:37:03 +02:00
parent 89ab60b395
commit dbd589e502
6 changed files with 8 additions and 8 deletions

View file

@ -10,6 +10,7 @@ from c3nav.mapdata.models.base import FEATURE_TYPES
def list_mapitemtypes(request, level): def list_mapitemtypes(request, level):
level = get_object_or_404() level = get_object_or_404()
def get_item_count(mapitemtype): def get_item_count(mapitemtype):
if hasattr(mapitemtype, 'level'): if hasattr(mapitemtype, 'level'):
return filter_queryset_by_access(request, mapitemtype.objects.filter(level__name=level)).count() return filter_queryset_by_access(request, mapitemtype.objects.filter(level__name=level)).count()

View file

@ -1,8 +1,8 @@
import hashlib
import json import json
import mimetypes import mimetypes
import hashlib
from collections import OrderedDict from collections import OrderedDict
from django.http import Http404, HttpResponse, HttpResponseNotModified from django.http import Http404, HttpResponse, HttpResponseNotModified
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from rest_framework.decorators import detail_route, list_route 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.models.geometry import Stair
from c3nav.mapdata.search import get_location from c3nav.mapdata.search import get_location
from c3nav.mapdata.serializers.main import LevelSerializer, SourceSerializer from c3nav.mapdata.serializers.main import LevelSerializer, SourceSerializer
from c3nav.mapdata.utils.cache import (CachedReadOnlyViewSetMixin, cache_mapdata_api_response, get_bssid_areas_cached, from c3nav.mapdata.utils.cache import CachedReadOnlyViewSetMixin, cache_mapdata_api_response, get_bssid_areas_cached
get_levels_cached)
class GeometryTypeViewSet(ViewSet): class GeometryTypeViewSet(ViewSet):

View file

@ -1,5 +1,5 @@
from .level import Level # noqa from .level import Level # noqa
from .source import Source # noqa from .source import Source # noqa
from .geometry import LevelFeature # 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 from .locations import AreaLocation, LocationGroup # noqa

View file

@ -2,9 +2,8 @@ from collections import OrderedDict
from django.db import models from django.db import models
from django.db.models.base import ModelBase from django.db.models.base import ModelBase
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import get_language 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.fields import GeometryField
from c3nav.mapdata.lastupdate import set_last_mapdata_update from c3nav.mapdata.lastupdate import set_last_mapdata_update

View file

@ -1,4 +1,5 @@
from collections import OrderedDict from collections import OrderedDict
from django.db import models from django.db import models
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from shapely.geometry import CAP_STYLE, JOIN_STYLE from shapely.geometry import CAP_STYLE, JOIN_STYLE

View file

@ -120,7 +120,7 @@ class Graph:
point.connect_to(center_point) point.connect_to(center_point)
def connect_elevators(self): def connect_elevators(self):
for elevator in Elevator.objects.all(): for elevator in Elevator.objects.all(): # noqa
elevatorlevels = tuple(elevator.elevatorlevels.all()) elevatorlevels = tuple(elevator.elevatorlevels.all())
for level1, level2 in combinations(elevatorlevels, 2): for level1, level2 in combinations(elevatorlevels, 2):
point1 = self._built_elevatorlevel_points[level1.name] point1 = self._built_elevatorlevel_points[level1.name]