From b69eb1210b6875c1533d7faafed317d40ea1a200 Mon Sep 17 00:00:00 2001
From: Mark Skipper <marks@aptivate.org>
Date: Wed, 1 Jul 2015 21:35:17 +0100
Subject: [PATCH] Move serializers back into rest_api
---
django/website/{data_layer => rest_api}/serializers.py | 3 ++-
django/website/rest_api/views.py | 2 +-
django/website/transport/tests/message_tests.py | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
rename django/website/{data_layer => rest_api}/serializers.py (83%)
diff --git a/django/website/data_layer/serializers.py b/django/website/rest_api/serializers.py
similarity index 83%
rename from django/website/data_layer/serializers.py
rename to django/website/rest_api/serializers.py
index aac5d34c..cdd7c6a7 100644
--- a/django/website/data_layer/serializers.py
+++ b/django/website/rest_api/serializers.py
@@ -1,7 +1,8 @@
from __future__ import unicode_literals, absolute_import
from rest_framework import serializers
-from .models import Item
+from data_layer.models import Item
+
class ItemSerializer(serializers.ModelSerializer):
class Meta:
diff --git a/django/website/rest_api/views.py b/django/website/rest_api/views.py
index 65a1c3af..3f732f19 100644
--- a/django/website/rest_api/views.py
+++ b/django/website/rest_api/views.py
@@ -1,6 +1,6 @@
from rest_framework import generics
from data_layer.models import Item
-from data_layer.serializers import ItemSerializer
+from .serializers import ItemSerializer
class ItemList(generics.ListAPIView):
diff --git a/django/website/transport/tests/message_tests.py b/django/website/transport/tests/message_tests.py
index dd889058..85028e3a 100644
--- a/django/website/transport/tests/message_tests.py
+++ b/django/website/transport/tests/message_tests.py
@@ -1,7 +1,7 @@
from __future__ import unicode_literals, absolute_import
import pytest
-from data_layer.serializers import ItemSerializer
+from rest_api.serializers import ItemSerializer
from data_layer.tests.factories import ItemFactory
from transport import data_layer_transport as dl
--
GitLab