use absolute imports everywhere
This commit is contained in:
parent
e8c1e7006c
commit
70936562d0
22 changed files with 44 additions and 46 deletions
|
@ -8,10 +8,11 @@ from rest_framework.decorators import detail_route
|
|||
from rest_framework.response import Response
|
||||
from rest_framework.viewsets import ReadOnlyModelViewSet, ViewSet
|
||||
|
||||
from .cache import AccessCachedViewSetMixin, CachedViewSetMixin
|
||||
from .models import FEATURE_TYPES, Feature, Level, Package, Source
|
||||
from .permissions import filter_source_queryset
|
||||
from .serializers import FeatureSerializer, FeatureTypeSerializer, LevelSerializer, PackageSerializer, SourceSerializer
|
||||
from c3nav.mapdata.cache import AccessCachedViewSetMixin, CachedViewSetMixin
|
||||
from c3nav.mapdata.models import FEATURE_TYPES, Feature, Level, Package, Source
|
||||
from c3nav.mapdata.permissions import filter_source_queryset
|
||||
from c3nav.mapdata.serializers import (FeatureSerializer, FeatureTypeSerializer, LevelSerializer, PackageSerializer,
|
||||
SourceSerializer)
|
||||
|
||||
|
||||
class LevelViewSet(CachedViewSetMixin, ReadOnlyModelViewSet):
|
||||
|
|
|
@ -4,7 +4,7 @@ from django.core.cache import cache
|
|||
from django.template.response import SimpleTemplateResponse
|
||||
from django.utils.cache import patch_vary_headers
|
||||
|
||||
from .permissions import get_unlocked_packages
|
||||
from c3nav.mapdata.permissions import get_unlocked_packages
|
||||
|
||||
|
||||
class CachedViewSetMixin:
|
||||
|
|
|
@ -3,7 +3,7 @@ import json
|
|||
from django.db import models
|
||||
from shapely.geometry import mapping, shape
|
||||
|
||||
from .utils import sort_geojson
|
||||
from c3nav.mapdata.utils import sort_geojson
|
||||
|
||||
|
||||
class GeometryField(models.TextField):
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
from django.core.management.base import BaseCommand, CommandError
|
||||
|
||||
from ...packageio import MapdataWriter
|
||||
from c3nav.mapdata.packageio import MapdataWriter
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
from django.core.management.base import BaseCommand, CommandError
|
||||
from django.db import transaction
|
||||
|
||||
from ...packageio import MapdataReader
|
||||
from c3nav.mapdata.packageio import MapdataReader
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
|
|
|
@ -6,10 +6,9 @@ from django.utils.translation import ugettext_lazy as _
|
|||
from django.utils.translation import get_language
|
||||
from shapely.geometry import mapping, shape
|
||||
|
||||
from c3nav.mapdata.fields import GeometryField, JSONField
|
||||
from c3nav.mapdata.utils import sort_geojson
|
||||
|
||||
from ..fields import GeometryField, JSONField
|
||||
|
||||
|
||||
class FeatureType(namedtuple('FeatureType', ('name', 'title', 'title_plural', 'geomtype', 'color'))):
|
||||
# noinspection PyUnusedLocal
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
from ..models import Feature, Level, Package, Source
|
||||
from c3nav.mapdata.models import Feature, Level, Package, Source
|
||||
|
||||
ordered_models = (Package, Level, Source, Feature)
|
||||
|
|
|
@ -6,8 +6,8 @@ import subprocess
|
|||
from django.conf import settings
|
||||
from django.core.management import CommandError
|
||||
|
||||
from ..models import Level, Package
|
||||
from .const import ordered_models
|
||||
from c3nav.mapdata.models import Level, Package
|
||||
from c3nav.mapdata.packageio.const import ordered_models
|
||||
|
||||
|
||||
class MapdataReader:
|
||||
|
|
|
@ -7,11 +7,10 @@ from datetime import datetime
|
|||
from django.conf import settings
|
||||
from django.utils import timezone
|
||||
|
||||
from c3nav.mapdata.models import Package
|
||||
from c3nav.mapdata.packageio.const import ordered_models
|
||||
from c3nav.mapdata.utils import json_encoder_reindent
|
||||
|
||||
from ..models import Package
|
||||
from .const import ordered_models
|
||||
|
||||
|
||||
class MapdataWriter:
|
||||
def __init__(self):
|
||||
|
|
|
@ -3,7 +3,7 @@ from django.utils.translation import ugettext_lazy as _
|
|||
from rest_framework.exceptions import PermissionDenied
|
||||
from rest_framework.permissions import BasePermission
|
||||
|
||||
from .models import Source
|
||||
from c3nav.mapdata.models import Source
|
||||
|
||||
|
||||
def get_unlocked_packages(request):
|
||||
|
|
|
@ -3,8 +3,8 @@ from rest_framework import serializers
|
|||
from rest_framework.exceptions import ValidationError
|
||||
from shapely.geometry import mapping, shape
|
||||
|
||||
from .models import Feature, Level, Package, Source
|
||||
from .utils import sort_geojson
|
||||
from c3nav.mapdata.models import Feature, Level, Package, Source
|
||||
from c3nav.mapdata.utils import sort_geojson
|
||||
|
||||
|
||||
class GeometryField(serializers.DictField):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue