From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Tue, 17 Apr 2012 11:18:50 +0000 (+0200)
Subject: fix changes api
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/153a6a7be8dee6ae0cb25caa6ac154046be67a40?ds=sidebyside

fix changes api
---

diff --git a/apps/api/handlers.py b/apps/api/handlers.py
index 91a3f4bb9..437b3be4c 100644
--- a/apps/api/handlers.py
+++ b/apps/api/handlers.py
@@ -106,7 +106,7 @@ class BookDetails(object):
 
     @classmethod
     def author(cls, book):
-        return ",".join(t[0] for t in book.related_info()['tags']['author'])
+        return ",".join(t[0] for t in book.related_info()['tags'].get('author', []))
 
     @classmethod
     def href(cls, book):
@@ -410,7 +410,7 @@ class CatalogueHandler(BaseHandler):
     def book_dict(book, fields=None):
         all_fields = ['url', 'title', 'description',
                       'gazeta_link', 'wiki_link',
-                      ] + Book.formats + BookMedia.formats + [
+                      ] + Book.formats + BookMedia.formats.keys() + [
                       'parent', 'parent_number',
                       'tags',
                       'license', 'license_description', 'source_name',
diff --git a/apps/api/tests.py b/apps/api/tests.py
index 5a981a26a..fe8e70f62 100644
--- a/apps/api/tests.py
+++ b/apps/api/tests.py
@@ -1,31 +1,26 @@
 # -*- coding: utf-8 -*-
 
-from datetime import datetime
+from os import path
 
+from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import TestCase
+from django.test.utils import override_settings
 from django.utils import simplejson as json
-from django.conf import settings
 
-from api.helpers import timestamp
 from catalogue.models import Book, Tag
-from picture.tests.utils import RequestFactory
 from picture.forms import PictureImportForm
-from picture.models import Picture, picture_storage
+from picture.models import Picture
 import picture.tests
-from django.core.files.uploadedfile import SimpleUploadedFile
-
- 
-from os import path
 
 
+@override_settings(
+    API_WAIT=-1, 
+    CACHES = {'api': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
+              'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'},
+              'permanent': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}}
+)
 class ApiTest(TestCase):
-
-    def setUp(self):
-        self.old_api_wait = settings.API_WAIT
-        settings.API_WAIT = -1
-
-    def tearDown(self):
-        settings.API_WAIT = self.old_api_wait
+    pass
 
 
 class ChangesTest(ApiTest):