chibisov · auvipy · Dec 1, 2015 · Aug 16, 2015 · Dec 1, 2015 · Dec 1, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -1,36 +1,22 @@
 language: python
 
 python:
+  - "3.5"
+  - "3.4"
   - "2.7"
 
+matrix:
+  exclude:
+    - env: TOX_ENV=django.1.7
+      python: "3.5"
+
 install:
   - pip install tox
 
 env:
-  - TOX_ENV=py27-drf2.3.5
-  - TOX_ENV=py27-drf2.3.6
-  - TOX_ENV=py27-drf2.3.7
-  - TOX_ENV=py27-drf2.3.8
-  - TOX_ENV=py27-drf2.3.9
-  - TOX_ENV=py27-drf2.3.10
-  - TOX_ENV=py27-drf2.3.11
-  - TOX_ENV=py27-drf2.3.12
-  - TOX_ENV=py27-drf2.3.13
-  - TOX_ENV=py27-drf2.3.14
-  - TOX_ENV=py27-drf2.4.0
-  - TOX_ENV=py27-drf2.4.1
-  - TOX_ENV=py27-drf2.4.2
-  - TOX_ENV=py27-drf2.4.3
-  - TOX_ENV=py27-drf2.4.4
-  - TOX_ENV=py27-drf3.0
-  - TOX_ENV=py27-drf3.0.1
-  - TOX_ENV=py27-drf3.0.2
-  - TOX_ENV=py27-drf3.0.3
-  - TOX_ENV=py27-drf3.0.4
-  - TOX_ENV=py3
-  - TOX_ENV=django1.5
-  - TOX_ENV=django1.6
-  - TOX_ENV=django1.7
+  - TOX_ENV=latest,
+  - TOX_ENV=django.1.8.lts,
+  - TOX_ENV=django.1.7
 
 script:
   - tox -e $TOX_ENV -- tests_app
diff --git a/docs/index.html b/docs/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-Backdoc is a tool for backbone-like documentation generation. 
+Backdoc is a tool for backbone-like documentation generation.
 Backdoc main goal is to help to generate one page documentation from one markdown source file.
 
 https://github.com/chibisov/backdoc
@@ -103,7 +103,7 @@
         }
 
         .sidebar ul ul li:before {
-            content: "- "; 
+            content: "- ";
         }
         .sidebar ul ul li {
             margin-bottom: 3px;
@@ -155,7 +155,7 @@
             font-size: 13px;
             line-height: 18px;
             padding-left: 15px;
-        }        
+        }
 
         pre {
             font-size: 12px;
@@ -218,7 +218,7 @@
                 padding-left: 10px;
                 padding-right: 10px;
             }
-            .main_container > ul, 
+            .main_container > ul,
             .main_container > ol {
                 padding-left: 27px;
             }
@@ -235,7 +235,7 @@
             .force_show_sidebar .toggle_sidebar_button {
                 right: 0;
             }
-            .force_show_sidebar .toggle_sidebar_button .line:first-child, 
+            .force_show_sidebar .toggle_sidebar_button .line:first-child,
             .force_show_sidebar .toggle_sidebar_button .line:last-child {
                 visibility: hidden;
             }
@@ -1617,7 +1617,7 @@ <h4 id="how-key-constructor-works">How key constructor works</h4>
 <pre><code>'{"unique_method_id": "your_app.views.SometView.get", "language": "en", "format": "json"}'
 </code></pre>
 
-<p>And finally compresses json with <strong>sha256</strong> and returns hash value:</p>
+<p>And finally compresses json with <strong>md5</strong> and returns hash value:</p>
 
 <pre><code>'b04f8f03c89df824e0ecd25230a90f0e0ebe184cf8c0114342e9471dd2275baa'
 </code></pre>

diff --git a/docs/index.md b/docs/index.md
@@ -1118,7 +1118,7 @@ Then constructor dumps resulting dict to json:
 
     '{"unique_method_id": "your_app.views.SometView.get", "language": "en", "format": "json"}'
 
-And finally compresses json with **sha256** and returns hash value:
+And finally compresses json with **md5** and returns hash value:
 
     'b04f8f03c89df824e0ecd25230a90f0e0ebe184cf8c0114342e9471dd2275baa'
 

diff --git a/rest_framework_extensions/bulk_operations/mixins.py b/rest_framework_extensions/bulk_operations/mixins.py
@@ -68,7 +68,7 @@ def partial_update_bulk(self, request, *args, **kwargs):
         is_valid, errors = self.is_valid_bulk_operation()
         if is_valid:
             queryset = self.filter_queryset(self.get_queryset())
-            update_bulk_dict = self.get_update_bulk_dict(serializer=self.get_serializer_class()(), data=request.DATA)
+            update_bulk_dict = self.get_update_bulk_dict(serializer=self.get_serializer_class()(), data=request.data)
             self.pre_save_bulk(queryset, update_bulk_dict)  # todo: test and document me
             try:
                 queryset.update(**update_bulk_dict)

diff --git a/rest_framework_extensions/key_constructor/constructors.py b/rest_framework_extensions/key_constructor/constructors.py
@@ -75,10 +75,10 @@ def _get_key(self, view_instance, view_method, request, args, kwargs):
         )
 
     def prepare_key(self, key_dict):
-        return hashlib.sha256(json.dumps(key_dict, sort_keys=True).encode('utf-8')).hexdigest()
+        return hashlib.md5(json.dumps(key_dict, sort_keys=True).encode('utf-8')).hexdigest()
 
     def get_data_from_bits(self, **kwargs):
-        result_dict = {}    
+        result_dict = {}
         for bit_name, bit_instance in self.bits.items():
             if bit_name in self.params:
                 params = self.params[bit_name]
@@ -103,4 +103,4 @@ class DefaultObjectKeyConstructor(DefaultKeyConstructor):
 
 class DefaultListKeyConstructor(DefaultKeyConstructor):
     list_sql_query = bits.ListSqlQueryKeyBit()
-    pagination = bits.PaginationKeyBit()
+    pagination = bits.PaginationKeyBit()
diff --git a/rest_framework_extensions/mixins.py b/rest_framework_extensions/mixins.py
@@ -43,14 +43,14 @@ def _is_request_to_detail_endpoint(self):
 
 
 class PaginateByMaxMixin(object):
-    def get_paginate_by(self, *args, **kwargs):
+
+    def get_page_size(self, request):
         if (get_rest_framework_features()['max_paginate_by'] and
-            self.paginate_by_param and
-            self.max_paginate_by and
-            self.request.QUERY_PARAMS.get(self.paginate_by_param) == 'max'):
-            return self.max_paginate_by
-        else:
-            return super(PaginateByMaxMixin, self).get_paginate_by(*args, **kwargs)
+            self.page_size_query_param and
+            self.max_page_size and
+            request.query_params.get(self.page_size_query_param) == 'max'):
+            return self.max_page_size
+        return super(PaginateByMaxMixin, self).get_page_size(request)
 
 
 class ReadOnlyCacheResponseAndETAGMixin(ReadOnlyETAGMixin, CacheResponseMixin):

diff --git a/tests_app/tests/functional/mixins/list_update_model_mixin/serializers.py b/tests_app/tests/functional/mixins/list_update_model_mixin/serializers.py
@@ -11,7 +11,7 @@ class UserSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = User
-        write_only_fields = ('password',)
+        extra_kwargs = {'password': {'write_only': True}}
         read_only_fields = ('name',)
         fields = [
             'id',
@@ -24,4 +24,4 @@ class Meta:
 
 class CommentSerializer(serializers.ModelSerializer):
     class Meta:
-        model = Comment
+        model = Comment
diff --git a/tests_app/tests/functional/mixins/list_update_model_mixin/tests.py b/tests_app/tests/functional/mixins/list_update_model_mixin/tests.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import json
 
-from django.utils import unittest
+import unittest
 
 from rest_framework_extensions.test import APITestCase
 from rest_framework_extensions.settings import extensions_api_settings
@@ -197,4 +197,4 @@ def test_should_not_update_hidden_fields(self):
         }
         resp = self.client.patch('/users/', data=json.dumps(data), content_type='application/json', **self.headers)
         self.assertEqual(resp.status_code, 204)
-        self.assertEqual(self.get_fresh_user().email, self.user.email)
+        self.assertEqual(self.get_fresh_user().email, self.user.email)
diff --git a/tests_app/tests/functional/mixins/paginate_by_max_mixin/pagination.py b/tests_app/tests/functional/mixins/paginate_by_max_mixin/pagination.py
@@ -0,0 +1,17 @@
+from rest_framework_extensions.mixins import PaginateByMaxMixin
+from rest_framework.pagination import PageNumberPagination
+
+
+class WithMaxPagination(PaginateByMaxMixin, PageNumberPagination):
+    page_size = 10
+    page_size_query_param = 'limit'
+    max_page_size = 20
+
+
+class FlexiblePagination(PageNumberPagination):
+    page_size = 10
+    page_size_query_param = 'page_size'
+
+
+class FixedPagination(PageNumberPagination):
+    page_size = 10
diff --git a/tests_app/tests/functional/mixins/paginate_by_max_mixin/tests.py b/tests_app/tests/functional/mixins/paginate_by_max_mixin/tests.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import datetime
+import unittest
 
 from django.test import TestCase
-from django.utils import unittest
 
 from rest_framework_extensions.utils import get_rest_framework_features
 
@@ -30,15 +30,15 @@ def test_default_page_size(self):
         self.assertEqual(len(resp.data['results']), 10)
 
     def test_custom_page_size__less_then_maximum(self):
-        resp = self.client.get('/comments/?page_size=15')
+        resp = self.client.get('/comments/?limit=15')
         self.assertEqual(len(resp.data['results']), 15)
 
     def test_custom_page_size__more_then_maximum(self):
-        resp = self.client.get('/comments/?page_size=25')
+        resp = self.client.get('/comments/?limit=25')
         self.assertEqual(len(resp.data['results']), 20)
 
     def test_custom_page_size_with_max_value(self):
-        resp = self.client.get('/comments/?page_size=max')
+        resp = self.client.get('/comments/?limit=max')
         self.assertEqual(len(resp.data['results']), 20)
 
     def test_custom_page_size_with_max_value__for_view_without__paginate_by_param__attribute(self):
@@ -70,13 +70,13 @@ def test_default_page_size(self):
         self.assertEqual(len(resp.data['results']), 10)
 
     def test_custom_page_size__less_then_maximum(self):
-        resp = self.client.get('/comments/?page_size=15')
+        resp = self.client.get('/comments/?limit=15')
         self.assertEqual(len(resp.data['results']), 15)
 
     def test_custom_page_size__more_then_maximum(self):
-        resp = self.client.get('/comments/?page_size=25')
+        resp = self.client.get('/comments/?limit=25')
         self.assertEqual(len(resp.data['results']), 25)
 
     def test_custom_page_size_with_max_value(self):
-        resp = self.client.get('/comments/?page_size=max')
-        self.assertEqual(len(resp.data['results']), 10)
+        resp = self.client.get('/comments/?limit=max')
+        self.assertEqual(len(resp.data['results']), 10)
diff --git a/tests_app/tests/functional/mixins/paginate_by_max_mixin/views.py b/tests_app/tests/functional/mixins/paginate_by_max_mixin/views.py
@@ -1,28 +1,24 @@
 # -*- coding: utf-8 -*-
 from rest_framework import viewsets
-from rest_framework_extensions.mixins import PaginateByMaxMixin
 
+from .pagination import WithMaxPagination, FixedPagination, FlexiblePagination
 from .models import CommentForPaginateByMaxMixin
 from .serializers import CommentSerializer
 
 
-class CommentViewSet(PaginateByMaxMixin, viewsets.ReadOnlyModelViewSet):
-    paginate_by_param = 'page_size'
-    paginate_by = 10
-    max_paginate_by = 20
+class CommentViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = CommentSerializer
+    pagination_class = WithMaxPagination
     queryset = CommentForPaginateByMaxMixin.objects.all()
 
 
-class CommentWithoutPaginateByParamViewSet(PaginateByMaxMixin, viewsets.ReadOnlyModelViewSet):
-    paginate_by = 10
-    max_paginate_by = 20
+class CommentWithoutPaginateByParamViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = CommentSerializer
+    pagination_class = FixedPagination
     queryset = CommentForPaginateByMaxMixin.objects.all()
 
 
-class CommentWithoutMaxPaginateByAttributeViewSet(PaginateByMaxMixin, viewsets.ReadOnlyModelViewSet):
-    paginate_by_param = 'page_size'
-    paginate_by = 10
+class CommentWithoutMaxPaginateByAttributeViewSet(viewsets.ReadOnlyModelViewSet):
+    pagination_class = FlexiblePagination
     serializer_class = CommentSerializer
-    queryset = CommentForPaginateByMaxMixin.objects.all()
+    queryset = CommentForPaginateByMaxMixin.objects.all()
diff --git a/tests_app/tests/functional/routers/extended_default_router/views.py b/tests_app/tests/functional/routers/extended_default_router/views.py
@@ -13,12 +13,12 @@
 
 
 class UserViewSet(NestedViewSetMixin, ModelViewSet):
-    model = DefaultRouterUserModel
+    queryset = DefaultRouterUserModel.objects.all()
 
 
 class GroupViewSet(NestedViewSetMixin, ModelViewSet):
-    model = DefaultRouterGroupModel
+    queryset = DefaultRouterGroupModel.objects.all()
 
 
 class PermissionViewSet(NestedViewSetMixin, ModelViewSet):
-    model = DefaultRouterPermissionModel
+    queryset = DefaultRouterPermissionModel.objects.all()
diff --git a/tests_app/tests/functional/routers/tests.py b/tests_app/tests/functional/routers/tests.py
@@ -45,4 +45,4 @@ def test_urls_can_have_trailing_slash_removed(self):
                     '^router-viewset/list_controller$',
                     '^router-viewset/{0}/detail_controller$'.format(lookup_allowed_symbols)]:
             msg = 'Should find url pattern with regexp %s' % exp
-            self.assertIsNotNone(get_url_pattern_by_regex_pattern(urls, exp), msg=msg)
+            self.assertIsNotNone(get_url_pattern_by_regex_pattern(urls, exp), msg=msg)
diff --git a/tests_app/tests/functional/routers/views.py b/tests_app/tests/functional/routers/views.py
@@ -6,12 +6,12 @@
 
 
 class RouterViewSet(viewsets.ModelViewSet):
-    model = RouterTestModel
+    queryset = RouterTestModel.objects.all()
 
     @action()
     def detail_controller(self):
         pass
 
     @action(is_for_list=True)
     def list_controller(self):
-        pass
+        pass
diff --git a/tests_app/tests/unit/etag/decorators/tests.py b/tests_app/tests/unit/etag/decorators/tests.py
@@ -17,7 +17,7 @@
 
 
 factory = APIRequestFactory()
-UNSAFE_METHODS = ['POST', 'PUT', 'DELETE', 'PATCH']
+UNSAFE_METHODS = ('POST', 'PUT', 'DELETE', 'PATCH')
 
 
 def default_etag_func(**kwargs):
@@ -319,6 +319,6 @@ def setUp(self):
 
     def test_for_all_methods(self):
         self.run_for_methods(
-            SAFE_METHODS + UNSAFE_METHODS,
+            tuple(SAFE_METHODS) + UNSAFE_METHODS,
             condition_failed_status=status.HTTP_412_PRECONDITION_FAILED
-        )
+        )
diff --git a/tests_app/tests/unit/key_constructor/constructor/tests.py b/tests_app/tests/unit/key_constructor/constructor/tests.py
@@ -80,7 +80,7 @@ class MyKeyConstructor(KeyConstructor):
         self.assertEqual(constructor_instance.prepare_key(one), constructor_instance.prepare_key(two))
 
     def prepare_key(self, key_dict):
-        return hashlib.sha256(json.dumps(key_dict, sort_keys=True).encode('utf-8')).hexdigest()
+        return hashlib.md5(json.dumps(key_dict, sort_keys=True).encode('utf-8')).hexdigest()
 
     def test_key_construction__with_bits_without_params(self):
         class MyKeyConstructor(KeyConstructor):
@@ -270,4 +270,4 @@ class View_2(viewsets.ReadOnlyModelViewSet):
         self.kwargs['view_instance'] = view_2_instance
         self.kwargs['view_instance'] = view_2_instance.retrieve
         response_2 = constructor_instance(**self.kwargs)
-        self.assertFalse(response_1 is response_2)
+        self.assertFalse(response_1 is response_2)
diff --git a/tests_app/tests/unit/serializers/models.py b/tests_app/tests/unit/serializers/models.py
@@ -20,8 +20,9 @@ class CommentModel(models.Model):
     users_liked = models.ManyToManyField(UserModel, blank=True, null=True)
     title = models.CharField(max_length=20)
     text = models.CharField(max_length=200)
-    attachment = models.FileField(upload_to=upload_to, blank=True, null=True)
+    attachment = models.FileField(
+        upload_to=upload_to, blank=True, null=True, max_length=500)
     hidden_text = models.CharField(max_length=200, blank=True, null=True)
 
     class Meta:
-        app_label = 'tests_app'
+        app_label = 'tests_app'