fix flake8 and isort errors

This commit is contained in:
Laura Klünder 2017-01-13 21:52:44 +01:00
parent a9262ddcee
commit 53a6bdb8cf
7 changed files with 12 additions and 19 deletions

View file

@ -1,6 +1,5 @@
from django.forms import ModelForm, MultipleChoiceField
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy
from c3nav.access.models import AccessToken, AccessUser
from c3nav.mapdata.models import AreaLocation

View file

@ -7,9 +7,7 @@ from collections import OrderedDict
from django.conf import settings
from django.core.files import File
from django.http import Http404, HttpResponse, HttpResponseNotModified
from django.http import HttpResponseBadRequest
from django.views.decorators.csrf import csrf_exempt
from rest_framework.decorators import detail_route, list_route, api_view
from rest_framework.decorators import detail_route, list_route
from rest_framework.response import Response
from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet
@ -19,8 +17,8 @@ from c3nav.mapdata.models import GEOMETRY_MAPITEM_TYPES, AreaLocation, Level, Lo
from c3nav.mapdata.models.geometry import DirectedLineGeometryMapItemWithLevel
from c3nav.mapdata.search import get_location
from c3nav.mapdata.serializers.main import LevelSerializer, PackageSerializer, SourceSerializer
from c3nav.mapdata.utils.cache import (CachedReadOnlyViewSetMixin, cache_mapdata_api_response, get_levels_cached,
get_packages_cached, get_bssid_areas_cached)
from c3nav.mapdata.utils.cache import (CachedReadOnlyViewSetMixin, cache_mapdata_api_response, get_bssid_areas_cached,
get_levels_cached, get_packages_cached)
class GeometryTypeViewSet(ViewSet):
@ -217,6 +215,6 @@ class LocationViewSet(ViewSet):
if area_name is not None:
location = get_location(request, area_name)
if location is not None:
return Response({'location': location.to_location_json()});
return Response({'location': location.to_location_json()})
return Response({'location': None})

View file

@ -1,9 +1,9 @@
from calendar import timegm
from collections import OrderedDict
from django.db.models import Q
from functools import wraps
from django.core.cache import cache
from django.db.models import Q
from django.utils.http import http_date
from rest_framework.response import Response as APIResponse
from rest_framework.views import APIView

View file

@ -7,9 +7,7 @@ from collections import OrderedDict
from django.conf import settings
from django.core.files import File
from django.http import Http404, HttpResponse, HttpResponseNotModified
from django.http import HttpResponseBadRequest
from django.views.decorators.csrf import csrf_exempt
from rest_framework.decorators import detail_route, list_route, api_view
from rest_framework.decorators import detail_route, list_route
from rest_framework.response import Response
from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet
@ -19,8 +17,8 @@ from c3nav.mapdata.models import GEOMETRY_MAPITEM_TYPES, AreaLocation, Level, Lo
from c3nav.mapdata.models.geometry import DirectedLineGeometryMapItemWithLevel
from c3nav.mapdata.search import get_location
from c3nav.mapdata.serializers.main import LevelSerializer, PackageSerializer, SourceSerializer
from c3nav.mapdata.utils.cache import (CachedReadOnlyViewSetMixin, cache_mapdata_api_response, get_levels_cached,
get_packages_cached, get_bssid_areas_cached)
from c3nav.mapdata.utils.cache import (CachedReadOnlyViewSetMixin, cache_mapdata_api_response, get_bssid_areas_cached,
get_levels_cached, get_packages_cached)
class RoutingmetryTypeViewSet(ViewSet):
@ -217,6 +215,6 @@ class LocationViewSet(ViewSet):
if area_name is not None:
location = get_location(request, area_name)
if location is not None:
return Response({'location': location.to_location_json()});
return Response({'location': location.to_location_json()})
return Response({'location': None})

View file

@ -286,7 +286,7 @@ class Graph:
if not len(orig_points_i) or not len(dest_points_i):
raise AlreadyThere()
#if set(orig_points_i) & set(dest_points_i):
# if set(orig_points_i) & set(dest_points_i):
# raise AlreadyThere()
add_orig_point = origin if isinstance(origin, PointLocation) else None

View file

@ -1,6 +1,5 @@
from collections import OrderedDict
import copy
from collections import OrderedDict
import numpy as np
from django.utils.translation import ugettext_lazy as _

View file

@ -2,8 +2,7 @@ from datetime import timedelta
import qrcode
from django.core.files import File
from django.http import Http404, HttpResponse, HttpResponseNotModified
from django.http import JsonResponse
from django.http import Http404, HttpResponse, HttpResponseNotModified, JsonResponse
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse
from django.utils import timezone