use absolute imports everywhere

src/c3nav/api/__init__.py

@@ -1,5 +1,5 @@
 from rest_framework.renderers import JSONRenderer
-from ..mapdata.utils import json_encoder_reindent
+from c3nav.mapdata.utils import json_encoder_reindent
 from functools import wraps
 
 orig_render = JSONRenderer.render

src/c3nav/api/urls.py

@@ -1,16 +1,16 @@
 from django.conf.urls import include, url
 from rest_framework.routers import DefaultRouter
 
-from ..editor import api as editor_api
+from c3nav.editor.api import HosterViewSet
-from ..mapdata import api as mapdata_api
+from c3nav.mapdata.api import FeatureTypeViewSet, FeatureViewSet, LevelViewSet, PackageViewSet, SourceViewSet
 
 router = DefaultRouter()
-router.register(r'levels', mapdata_api.LevelViewSet)
+router.register(r'levels', LevelViewSet)
-router.register(r'packages', mapdata_api.PackageViewSet)
+router.register(r'packages', PackageViewSet)
-router.register(r'sources', mapdata_api.SourceViewSet)
+router.register(r'sources', SourceViewSet)
-router.register(r'featuretypes', mapdata_api.FeatureTypeViewSet, base_name='featuretype')
+router.register(r'featuretypes', FeatureTypeViewSet, base_name='featuretype')
-router.register(r'features', mapdata_api.FeatureViewSet)
+router.register(r'features', FeatureViewSet)
-router.register(r'hosters', editor_api.HosterViewSet, base_name='hoster')
+router.register(r'hosters', HosterViewSet, base_name='hoster')
 
 
 urlpatterns = [

src/c3nav/control/urls.py

@@ -1,7 +1,7 @@
 from django.conf.urls import url
 
-from . import views
+from c3nav.control.views import dashboard
 
 urlpatterns = [
-    url(r'^$', views.dashboard, name='control.dashboard'),
+    url(r'^$', dashboard, name='control.dashboard'),
 ]

src/c3nav/editor/api.py

@@ -2,8 +2,8 @@ from django.http import Http404
 from rest_framework.response import Response
 from rest_framework.viewsets import ViewSet
 
-from .hosters import hosters
+from c3nav.editor.hosters import hosters
-from .serializers import HosterSerializer
+from c3nav.editor.serializers import HosterSerializer
 
 
 class HosterViewSet(ViewSet):

src/c3nav/editor/apps.py

@@ -5,5 +5,5 @@ class EditorConfig(AppConfig):
     name = 'c3nav.editor'
 
     def ready(self):
-        from .hosters import init_hosters
+        from c3nav.editor.hosters import init_hosters
         init_hosters()

src/c3nav/editor/forms.py

@@ -6,9 +6,8 @@ from django.forms.models import ModelChoiceField
 from django.forms.widgets import HiddenInput
 from django.utils.translation import ugettext_lazy as _
 
-from c3nav.mapdata.models.package import Package
+from c3nav.mapdata.models import Feature, Package
 from c3nav.mapdata.permissions import get_unlocked_packages
-from ..mapdata.models import Feature
 
 
 class FeatureForm(ModelForm):

src/c3nav/editor/hosters/__init__.py

@@ -1,6 +1,6 @@
 from django.conf import settings
-from .github import GithubHoster  # noqa
+from c3nav.editor.hosters.github import GithubHoster  # noqa
-from .gitlab import GitlabHoster  # noqa
+from c3nav.editor.hosters.gitlab import GitlabHoster  # noqa
 
 from collections import OrderedDict
 

src/c3nav/editor/hosters/base.py

@@ -1,4 +1,4 @@
-from ...mapdata.models import Package
+from c3nav.mapdata.models import Package
 
 
 class Hoster:

src/c3nav/editor/hosters/github.py

@@ -1,4 +1,4 @@
-from .base import Hoster
+from c3nav.editor.hosters.base import Hoster
 
 
 class GithubHoster(Hoster):

src/c3nav/editor/hosters/gitlab.py

@@ -1,4 +1,4 @@
-from .base import Hoster
+from c3nav.editor.hosters.base import Hoster
 
 
 class GitlabHoster(Hoster):

src/c3nav/mapdata/api.py

@@ -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 c3nav.mapdata.cache import AccessCachedViewSetMixin, CachedViewSetMixin
-from .models import FEATURE_TYPES, Feature, Level, Package, Source
+from c3nav.mapdata.models import FEATURE_TYPES, Feature, Level, Package, Source
-from .permissions import filter_source_queryset
+from c3nav.mapdata.permissions import filter_source_queryset
-from .serializers import FeatureSerializer, FeatureTypeSerializer, LevelSerializer, PackageSerializer, SourceSerializer
+from c3nav.mapdata.serializers import (FeatureSerializer, FeatureTypeSerializer, LevelSerializer, PackageSerializer,
+                                       SourceSerializer)
 
 
 class LevelViewSet(CachedViewSetMixin, ReadOnlyModelViewSet):

src/c3nav/mapdata/cache.py

@@ -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:

src/c3nav/mapdata/fields.py

@@ -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):

src/c3nav/mapdata/management/commands/dumpmap.py

@@ -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):

src/c3nav/mapdata/management/commands/loadmap.py

@@ -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):

src/c3nav/mapdata/models/feature.py

@@ -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

src/c3nav/mapdata/packageio/const.py

@@ -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)

src/c3nav/mapdata/packageio/read.py

@@ -6,8 +6,8 @@ import subprocess
 from django.conf import settings
 from django.core.management import CommandError
 
-from ..models import Level, Package
+from c3nav.mapdata.models import Level, Package
-from .const import ordered_models
+from c3nav.mapdata.packageio.const import ordered_models
 
 
 class MapdataReader:

src/c3nav/mapdata/packageio/write.py

@@ -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):

src/c3nav/mapdata/permissions.py

@@ -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):

src/c3nav/mapdata/serializers.py

@@ -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 c3nav.mapdata.models import Feature, Level, Package, Source
-from .utils import sort_geojson
+from c3nav.mapdata.utils import sort_geojson
 
 
 class GeometryField(serializers.DictField):

src/c3nav/urls.py

@@ -1,13 +1,13 @@
 from django.conf.urls import include, url
 from django.contrib import admin
 
-from .api import urls as api_urls
+import c3nav.api.urls
-from .control import urls as control_urls
+import c3nav.control.urls
-from .editor import urls as editor_urls
+import c3nav.editor.urls
 
 urlpatterns = [
-    url(r'^control/', include(control_urls)),
+    url(r'^control/', include(c3nav.control.urls)),
-    url(r'^editor/', include(editor_urls)),
+    url(r'^editor/', include(c3nav.editor.urls)),
-    url(r'^api/', include(api_urls)),
+    url(r'^api/', include(c3nav.api.urls)),
     url(r'^admin/', admin.site.urls),
 ]