From 3f79a9a3d3e7692d90476f8a6907957b47aab821 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 22 Mar 2013 22:39:45 +0000 Subject: [PATCH 0001/1652] one-one writable nested modelserializers --- rest_framework/serializers.py | 11 +- rest_framework/tests/relations_nested.py | 190 ++++++++++++----------- 2 files changed, 110 insertions(+), 91 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 6aca2f574..26c34044c 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -753,7 +753,16 @@ class ModelSerializer(Serializer): if getattr(obj, '_related_data', None): for accessor_name, related in obj._related_data.items(): - setattr(obj, accessor_name, related) + if related is None: + previous = getattr(obj, accessor_name, related) + if previous: + previous.delete() + elif isinstance(related, models.Model): + fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name + setattr(related, fk_field, obj) + self.save_object(related) + else: + setattr(obj, accessor_name, related) del(obj._related_data) diff --git a/rest_framework/tests/relations_nested.py b/rest_framework/tests/relations_nested.py index a125ba656..4592e5593 100644 --- a/rest_framework/tests/relations_nested.py +++ b/rest_framework/tests/relations_nested.py @@ -1,115 +1,125 @@ from __future__ import unicode_literals +from django.db import models from django.test import TestCase from rest_framework import serializers -from rest_framework.tests.models import ForeignKeyTarget, ForeignKeySource, NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource -class ForeignKeySourceSerializer(serializers.ModelSerializer): +class OneToOneTarget(models.Model): + name = models.CharField(max_length=100) + + +class OneToOneTargetSource(models.Model): + name = models.CharField(max_length=100) + target = models.OneToOneField(OneToOneTarget, null=True, blank=True, + related_name='target_source') + + +class OneToOneSource(models.Model): + name = models.CharField(max_length=100) + target_source = models.OneToOneField(OneToOneTargetSource, related_name='source') + + +class OneToOneSourceSerializer(serializers.ModelSerializer): class Meta: - depth = 1 - model = ForeignKeySource + model = OneToOneSource + exclude = ('target_source', ) -class FlatForeignKeySourceSerializer(serializers.ModelSerializer): - class Meta: - model = ForeignKeySource - - -class ForeignKeyTargetSerializer(serializers.ModelSerializer): - sources = FlatForeignKeySourceSerializer(many=True) +class OneToOneTargetSourceSerializer(serializers.ModelSerializer): + source = OneToOneSourceSerializer() class Meta: - model = ForeignKeyTarget + model = OneToOneTargetSource + exclude = ('target', ) -class NullableForeignKeySourceSerializer(serializers.ModelSerializer): - class Meta: - depth = 1 - model = NullableForeignKeySource - - -class NullableOneToOneSourceSerializer(serializers.ModelSerializer): - class Meta: - model = NullableOneToOneSource - - -class NullableOneToOneTargetSerializer(serializers.ModelSerializer): - nullable_source = NullableOneToOneSourceSerializer() +class OneToOneTargetSerializer(serializers.ModelSerializer): + target_source = OneToOneTargetSourceSerializer() class Meta: model = OneToOneTarget -class ReverseForeignKeyTests(TestCase): +class NestedOneToOneTests(TestCase): def setUp(self): - target = ForeignKeyTarget(name='target-1') - target.save() - new_target = ForeignKeyTarget(name='target-2') - new_target.save() for idx in range(1, 4): - source = ForeignKeySource(name='source-%d' % idx, target=target) + target = OneToOneTarget(name='target-%d' % idx) + target.save() + target_source = OneToOneTargetSource(name='target-source-%d' % idx, target=target) + target_source.save() + source = OneToOneSource(name='source-%d' % idx, target_source=target_source) source.save() - def test_foreign_key_retrieve(self): - queryset = ForeignKeySource.objects.all() - serializer = ForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, - {'id': 2, 'name': 'source-2', 'target': {'id': 1, 'name': 'target-1'}}, - {'id': 3, 'name': 'source-3', 'target': {'id': 1, 'name': 'target-1'}}, - ] - self.assertEqual(serializer.data, expected) - - def test_reverse_foreign_key_retrieve(self): - queryset = ForeignKeyTarget.objects.all() - serializer = ForeignKeyTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': [ - {'id': 1, 'name': 'source-1', 'target': 1}, - {'id': 2, 'name': 'source-2', 'target': 1}, - {'id': 3, 'name': 'source-3', 'target': 1}, - ]}, - {'id': 2, 'name': 'target-2', 'sources': [ - ]} - ] - self.assertEqual(serializer.data, expected) - - -class NestedNullableForeignKeyTests(TestCase): - def setUp(self): - target = ForeignKeyTarget(name='target-1') - target.save() - for idx in range(1, 4): - if idx == 3: - target = None - source = NullableForeignKeySource(name='source-%d' % idx, target=target) - source.save() - - def test_foreign_key_retrieve_with_null(self): - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, - {'id': 2, 'name': 'source-2', 'target': {'id': 1, 'name': 'target-1'}}, - {'id': 3, 'name': 'source-3', 'target': None}, - ] - self.assertEqual(serializer.data, expected) - - -class NestedNullableOneToOneTests(TestCase): - def setUp(self): - target = OneToOneTarget(name='target-1') - target.save() - new_target = OneToOneTarget(name='target-2') - new_target.save() - source = NullableOneToOneSource(name='source-1', target=target) - source.save() - - def test_reverse_foreign_key_retrieve_with_null(self): + def test_one_to_one_retrieve(self): queryset = OneToOneTarget.objects.all() - serializer = NullableOneToOneTargetSerializer(queryset, many=True) + serializer = OneToOneTargetSerializer(queryset) expected = [ - {'id': 1, 'name': 'target-1', 'nullable_source': {'id': 1, 'name': 'source-1', 'target': 1}}, - {'id': 2, 'name': 'target-2', 'nullable_source': None}, + {'id': 1, 'name': 'target-1', 'target_source': {'id': 1, 'name': 'target-source-1', 'source': {'id': 1, 'name': 'source-1'}}}, + {'id': 2, 'name': 'target-2', 'target_source': {'id': 2, 'name': 'target-source-2', 'source': {'id': 2, 'name': 'source-2'}}}, + {'id': 3, 'name': 'target-3', 'target_source': {'id': 3, 'name': 'target-source-3', 'source': {'id': 3, 'name': 'source-3'}}} + ] + self.assertEqual(serializer.data, expected) + + def test_one_to_one_create(self): + data = {'id': 4, 'name': 'target-4', 'target_source': {'id': 4, 'name': 'target-source-4', 'source': {'id': 4, 'name': 'source-4'}}} + serializer = OneToOneTargetSerializer(data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'target-4') + + # Ensure (target 4, target_source 4, source 4) are added, and + # everything else is as expected. + queryset = OneToOneTarget.objects.all() + serializer = OneToOneTargetSerializer(queryset) + expected = [ + {'id': 1, 'name': 'target-1', 'target_source': {'id': 1, 'name': 'target-source-1', 'source': {'id': 1, 'name': 'source-1'}}}, + {'id': 2, 'name': 'target-2', 'target_source': {'id': 2, 'name': 'target-source-2', 'source': {'id': 2, 'name': 'source-2'}}}, + {'id': 3, 'name': 'target-3', 'target_source': {'id': 3, 'name': 'target-source-3', 'source': {'id': 3, 'name': 'source-3'}}}, + {'id': 4, 'name': 'target-4', 'target_source': {'id': 4, 'name': 'target-source-4', 'source': {'id': 4, 'name': 'source-4'}}} + ] + self.assertEqual(serializer.data, expected) + + def test_one_to_one_create_with_invalid_data(self): + data = {'id': 4, 'name': 'target-4', 'target_source': {'id': 4, 'name': 'target-source-4', 'source': {'id': 4}}} + serializer = OneToOneTargetSerializer(data=data) + self.assertFalse(serializer.is_valid()) + self.assertEqual(serializer.errors, {'target_source': [{'source': [{'name': ['This field is required.']}]}]}) + + def test_one_to_one_update(self): + data = {'id': 3, 'name': 'target-3-updated', 'target_source': {'id': 3, 'name': 'target-source-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}}} + instance = OneToOneTarget.objects.get(pk=3) + serializer = OneToOneTargetSerializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'target-3-updated') + + # Ensure (target 3, target_source 3, source 3) are updated, + # and everything else is as expected. + queryset = OneToOneTarget.objects.all() + serializer = OneToOneTargetSerializer(queryset) + expected = [ + {'id': 1, 'name': 'target-1', 'target_source': {'id': 1, 'name': 'target-source-1', 'source': {'id': 1, 'name': 'source-1'}}}, + {'id': 2, 'name': 'target-2', 'target_source': {'id': 2, 'name': 'target-source-2', 'source': {'id': 2, 'name': 'source-2'}}}, + {'id': 3, 'name': 'target-3-updated', 'target_source': {'id': 3, 'name': 'target-source-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}}} + ] + self.assertEqual(serializer.data, expected) + + def test_one_to_one_delete(self): + data = {'id': 3, 'name': 'target-3', 'target_source': None} + instance = OneToOneTarget.objects.get(pk=3) + serializer = OneToOneTargetSerializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + serializer.save() + + # Ensure (target_source 3, source 3) are deleted, + # and everything else is as expected. + queryset = OneToOneTarget.objects.all() + serializer = OneToOneTargetSerializer(queryset) + expected = [ + {'id': 1, 'name': 'target-1', 'target_source': {'id': 1, 'name': 'target-source-1', 'source': {'id': 1, 'name': 'source-1'}}}, + {'id': 2, 'name': 'target-2', 'target_source': {'id': 2, 'name': 'target-source-2', 'source': {'id': 2, 'name': 'source-2'}}}, + {'id': 3, 'name': 'target-3', 'target_source': None} ] self.assertEqual(serializer.data, expected) From d97e72cdb2f4fcc5aa2c19527a2b2ff11cf784bb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 25 Mar 2013 17:28:23 +0000 Subject: [PATCH 0002/1652] Cleanup one-one nested tests and implementation --- rest_framework/serializers.py | 37 ++++- rest_framework/tests/relations_nested.py | 194 +++++++++++++++-------- 2 files changed, 161 insertions(+), 70 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 26c34044c..668bcc49d 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -667,9 +667,12 @@ class ModelSerializer(Serializer): cls = self.opts.model opts = get_concrete_model(cls)._meta exclusions = [field.name for field in opts.fields + opts.many_to_many] + for field_name, field in self.fields.items(): field_name = field.source or field_name - if field_name in exclusions and not field.read_only: + if field_name in exclusions \ + and not field.read_only \ + and not isinstance(field, Serializer): exclusions.remove(field_name) return exclusions @@ -695,6 +698,7 @@ class ModelSerializer(Serializer): """ m2m_data = {} related_data = {} + nested_forward_relations = {} meta = self.opts.model._meta # Reverse fk or one-to-one relations @@ -714,6 +718,12 @@ class ModelSerializer(Serializer): if field.name in attrs: m2m_data[field.name] = attrs.pop(field.name) + # Nested forward relations - These need to be marked so we can save + # them before saving the parent model instance. + for field_name in attrs.keys(): + if isinstance(self.fields.get(field_name, None), Serializer): + nested_forward_relations[field_name] = attrs[field_name] + # Update an existing instance... if instance is not None: for key, val in attrs.items(): @@ -729,6 +739,7 @@ class ModelSerializer(Serializer): # at the point of save. instance._related_data = related_data instance._m2m_data = m2m_data + instance._nested_forward_relations = nested_forward_relations return instance @@ -744,6 +755,13 @@ class ModelSerializer(Serializer): """ Save the deserialized object and return it. """ + if getattr(obj, '_nested_forward_relations', None): + # Nested relationships need to be saved before we can save the + # parent instance. + for field_name, sub_object in obj._nested_forward_relations.items(): + self.save_object(sub_object) + setattr(obj, field_name, sub_object) + obj.save(**kwargs) if getattr(obj, '_m2m_data', None): @@ -753,15 +771,22 @@ class ModelSerializer(Serializer): if getattr(obj, '_related_data', None): for accessor_name, related in obj._related_data.items(): - if related is None: - previous = getattr(obj, accessor_name, related) - if previous: - previous.delete() - elif isinstance(related, models.Model): + field = self.fields.get(accessor_name, None) + if isinstance(field, Serializer): + # TODO: Following will be needed for reverse FK + # if field.many: + # # Nested reverse fk relationship + # for related_item in related: + # fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name + # setattr(related_item, fk_field, obj) + # self.save_object(related_item) + # else: + # Nested reverse one-one relationship fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name setattr(related, fk_field, obj) self.save_object(related) else: + # Reverse FK or reverse one-one setattr(obj, accessor_name, related) del(obj._related_data) diff --git a/rest_framework/tests/relations_nested.py b/rest_framework/tests/relations_nested.py index 4592e5593..e7af65651 100644 --- a/rest_framework/tests/relations_nested.py +++ b/rest_framework/tests/relations_nested.py @@ -8,61 +8,46 @@ class OneToOneTarget(models.Model): name = models.CharField(max_length=100) -class OneToOneTargetSource(models.Model): - name = models.CharField(max_length=100) - target = models.OneToOneField(OneToOneTarget, null=True, blank=True, - related_name='target_source') - - class OneToOneSource(models.Model): name = models.CharField(max_length=100) - target_source = models.OneToOneField(OneToOneTargetSource, related_name='source') + target = models.OneToOneField(OneToOneTarget, related_name='source') -class OneToOneSourceSerializer(serializers.ModelSerializer): - class Meta: - model = OneToOneSource - exclude = ('target_source', ) - - -class OneToOneTargetSourceSerializer(serializers.ModelSerializer): - source = OneToOneSourceSerializer() - - class Meta: - model = OneToOneTargetSource - exclude = ('target', ) - - -class OneToOneTargetSerializer(serializers.ModelSerializer): - target_source = OneToOneTargetSourceSerializer() - - class Meta: - model = OneToOneTarget - - -class NestedOneToOneTests(TestCase): +class ReverseNestedOneToOneTests(TestCase): def setUp(self): + class OneToOneSourceSerializer(serializers.ModelSerializer): + class Meta: + model = OneToOneSource + fields = ('id', 'name') + + class OneToOneTargetSerializer(serializers.ModelSerializer): + source = OneToOneSourceSerializer() + + class Meta: + model = OneToOneTarget + fields = ('id', 'name', 'source') + + self.Serializer = OneToOneTargetSerializer + for idx in range(1, 4): target = OneToOneTarget(name='target-%d' % idx) target.save() - target_source = OneToOneTargetSource(name='target-source-%d' % idx, target=target) - target_source.save() - source = OneToOneSource(name='source-%d' % idx, target_source=target_source) + source = OneToOneSource(name='source-%d' % idx, target=target) source.save() def test_one_to_one_retrieve(self): queryset = OneToOneTarget.objects.all() - serializer = OneToOneTargetSerializer(queryset) + serializer = self.Serializer(queryset) expected = [ - {'id': 1, 'name': 'target-1', 'target_source': {'id': 1, 'name': 'target-source-1', 'source': {'id': 1, 'name': 'source-1'}}}, - {'id': 2, 'name': 'target-2', 'target_source': {'id': 2, 'name': 'target-source-2', 'source': {'id': 2, 'name': 'source-2'}}}, - {'id': 3, 'name': 'target-3', 'target_source': {'id': 3, 'name': 'target-source-3', 'source': {'id': 3, 'name': 'source-3'}}} + {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, + {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, + {'id': 3, 'name': 'target-3', 'source': {'id': 3, 'name': 'source-3'}} ] self.assertEqual(serializer.data, expected) def test_one_to_one_create(self): - data = {'id': 4, 'name': 'target-4', 'target_source': {'id': 4, 'name': 'target-source-4', 'source': {'id': 4, 'name': 'source-4'}}} - serializer = OneToOneTargetSerializer(data=data) + data = {'id': 4, 'name': 'target-4', 'source': {'id': 4, 'name': 'source-4'}} + serializer = self.Serializer(data=data) self.assertTrue(serializer.is_valid()) obj = serializer.save() self.assertEqual(serializer.data, data) @@ -71,25 +56,25 @@ class NestedOneToOneTests(TestCase): # Ensure (target 4, target_source 4, source 4) are added, and # everything else is as expected. queryset = OneToOneTarget.objects.all() - serializer = OneToOneTargetSerializer(queryset) + serializer = self.Serializer(queryset) expected = [ - {'id': 1, 'name': 'target-1', 'target_source': {'id': 1, 'name': 'target-source-1', 'source': {'id': 1, 'name': 'source-1'}}}, - {'id': 2, 'name': 'target-2', 'target_source': {'id': 2, 'name': 'target-source-2', 'source': {'id': 2, 'name': 'source-2'}}}, - {'id': 3, 'name': 'target-3', 'target_source': {'id': 3, 'name': 'target-source-3', 'source': {'id': 3, 'name': 'source-3'}}}, - {'id': 4, 'name': 'target-4', 'target_source': {'id': 4, 'name': 'target-source-4', 'source': {'id': 4, 'name': 'source-4'}}} + {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, + {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, + {'id': 3, 'name': 'target-3', 'source': {'id': 3, 'name': 'source-3'}}, + {'id': 4, 'name': 'target-4', 'source': {'id': 4, 'name': 'source-4'}} ] self.assertEqual(serializer.data, expected) def test_one_to_one_create_with_invalid_data(self): - data = {'id': 4, 'name': 'target-4', 'target_source': {'id': 4, 'name': 'target-source-4', 'source': {'id': 4}}} - serializer = OneToOneTargetSerializer(data=data) + data = {'id': 4, 'name': 'target-4', 'source': {'id': 4}} + serializer = self.Serializer(data=data) self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'target_source': [{'source': [{'name': ['This field is required.']}]}]}) + self.assertEqual(serializer.errors, {'source': [{'name': ['This field is required.']}]}) def test_one_to_one_update(self): - data = {'id': 3, 'name': 'target-3-updated', 'target_source': {'id': 3, 'name': 'target-source-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}}} + data = {'id': 3, 'name': 'target-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}} instance = OneToOneTarget.objects.get(pk=3) - serializer = OneToOneTargetSerializer(instance, data=data) + serializer = self.Serializer(instance, data=data) self.assertTrue(serializer.is_valid()) obj = serializer.save() self.assertEqual(serializer.data, data) @@ -98,28 +83,109 @@ class NestedOneToOneTests(TestCase): # Ensure (target 3, target_source 3, source 3) are updated, # and everything else is as expected. queryset = OneToOneTarget.objects.all() - serializer = OneToOneTargetSerializer(queryset) + serializer = self.Serializer(queryset) expected = [ - {'id': 1, 'name': 'target-1', 'target_source': {'id': 1, 'name': 'target-source-1', 'source': {'id': 1, 'name': 'source-1'}}}, - {'id': 2, 'name': 'target-2', 'target_source': {'id': 2, 'name': 'target-source-2', 'source': {'id': 2, 'name': 'source-2'}}}, - {'id': 3, 'name': 'target-3-updated', 'target_source': {'id': 3, 'name': 'target-source-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}}} + {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, + {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, + {'id': 3, 'name': 'target-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}} ] self.assertEqual(serializer.data, expected) - def test_one_to_one_delete(self): - data = {'id': 3, 'name': 'target-3', 'target_source': None} - instance = OneToOneTarget.objects.get(pk=3) - serializer = OneToOneTargetSerializer(instance, data=data) + +class ForwardNestedOneToOneTests(TestCase): + def setUp(self): + class OneToOneTargetSerializer(serializers.ModelSerializer): + class Meta: + model = OneToOneTarget + fields = ('id', 'name') + + class OneToOneSourceSerializer(serializers.ModelSerializer): + target = OneToOneTargetSerializer() + + class Meta: + model = OneToOneSource + fields = ('id', 'name', 'target') + + self.Serializer = OneToOneSourceSerializer + + for idx in range(1, 4): + target = OneToOneTarget(name='target-%d' % idx) + target.save() + source = OneToOneSource(name='source-%d' % idx, target=target) + source.save() + + def test_one_to_one_retrieve(self): + queryset = OneToOneSource.objects.all() + serializer = self.Serializer(queryset) + expected = [ + {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, + {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, + {'id': 3, 'name': 'source-3', 'target': {'id': 3, 'name': 'target-3'}} + ] + self.assertEqual(serializer.data, expected) + + def test_one_to_one_create(self): + data = {'id': 4, 'name': 'source-4', 'target': {'id': 4, 'name': 'target-4'}} + serializer = self.Serializer(data=data) self.assertTrue(serializer.is_valid()) - serializer.save() + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'source-4') - # Ensure (target_source 3, source 3) are deleted, - # and everything else is as expected. - queryset = OneToOneTarget.objects.all() - serializer = OneToOneTargetSerializer(queryset) + # Ensure (target 4, target_source 4, source 4) are added, and + # everything else is as expected. + queryset = OneToOneSource.objects.all() + serializer = self.Serializer(queryset) expected = [ - {'id': 1, 'name': 'target-1', 'target_source': {'id': 1, 'name': 'target-source-1', 'source': {'id': 1, 'name': 'source-1'}}}, - {'id': 2, 'name': 'target-2', 'target_source': {'id': 2, 'name': 'target-source-2', 'source': {'id': 2, 'name': 'source-2'}}}, - {'id': 3, 'name': 'target-3', 'target_source': None} + {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, + {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, + {'id': 3, 'name': 'source-3', 'target': {'id': 3, 'name': 'target-3'}}, + {'id': 4, 'name': 'source-4', 'target': {'id': 4, 'name': 'target-4'}} ] self.assertEqual(serializer.data, expected) + + def test_one_to_one_create_with_invalid_data(self): + data = {'id': 4, 'name': 'source-4', 'target': {'id': 4}} + serializer = self.Serializer(data=data) + self.assertFalse(serializer.is_valid()) + self.assertEqual(serializer.errors, {'target': [{'name': ['This field is required.']}]}) + + def test_one_to_one_update(self): + data = {'id': 3, 'name': 'source-3-updated', 'target': {'id': 3, 'name': 'target-3-updated'}} + instance = OneToOneSource.objects.get(pk=3) + serializer = self.Serializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'source-3-updated') + + # Ensure (target 3, target_source 3, source 3) are updated, + # and everything else is as expected. + queryset = OneToOneSource.objects.all() + serializer = self.Serializer(queryset) + expected = [ + {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, + {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, + {'id': 3, 'name': 'source-3-updated', 'target': {'id': 3, 'name': 'target-3-updated'}} + ] + self.assertEqual(serializer.data, expected) + + + # TODO: Nullable 1-1 tests + # def test_one_to_one_delete(self): + # data = {'id': 3, 'name': 'target-3', 'target_source': None} + # instance = OneToOneTarget.objects.get(pk=3) + # serializer = self.Serializer(instance, data=data) + # self.assertTrue(serializer.is_valid()) + # serializer.save() + + # # Ensure (target_source 3, source 3) are deleted, + # # and everything else is as expected. + # queryset = OneToOneTarget.objects.all() + # serializer = self.Serializer(queryset) + # expected = [ + # {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, + # {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, + # {'id': 3, 'name': 'target-3', 'source': None} + # ] + # self.assertEqual(serializer.data, expected) From 73efa96de983fc644328d2fc498651aa917a2272 Mon Sep 17 00:00:00 2001 From: Mark Aaron Shirley Date: Sat, 6 Apr 2013 08:43:21 -0700 Subject: [PATCH 0003/1652] one-many writable nested modelserializer support --- rest_framework/serializers.py | 56 +++++++---- rest_framework/tests/relations_nested.py | 98 +++++++++++++++++++ .../tests/serializer_bulk_update.py | 6 +- 3 files changed, 139 insertions(+), 21 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 668bcc49d..73cad00f6 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -130,14 +130,14 @@ class BaseSerializer(WritableField): def __init__(self, instance=None, data=None, files=None, context=None, partial=False, many=None, - allow_delete=False, **kwargs): + allow_add_remove=False, **kwargs): super(BaseSerializer, self).__init__(**kwargs) self.opts = self._options_class(self.Meta) self.parent = None self.root = None self.partial = partial self.many = many - self.allow_delete = allow_delete + self.allow_add_remove = allow_add_remove self.context = context or {} @@ -154,8 +154,8 @@ class BaseSerializer(WritableField): if many and instance is not None and not hasattr(instance, '__iter__'): raise ValueError('instance should be a queryset or other iterable with many=True') - if allow_delete and not many: - raise ValueError('allow_delete should only be used for bulk updates, but you have not set many=True') + if allow_add_remove and not many: + raise ValueError('allow_add_remove should only be used for bulk updates, but you have not set many=True') ##### # Methods to determine which fields to use when (de)serializing objects. @@ -288,8 +288,15 @@ class BaseSerializer(WritableField): You should override this method to control how deserialized objects are instantiated. """ + removed_relations = [] + + # Deleted related objects + if self._deleted: + removed_relations = list(self._deleted) + if instance is not None: instance.update(attrs) + instance._removed_relations = removed_relations return instance return attrs @@ -377,6 +384,7 @@ class BaseSerializer(WritableField): # Set the serializer object if it exists obj = getattr(self.parent.object, field_name) if self.parent.object else None + obj = obj.all() if is_simple_callable(getattr(obj, 'all', None)) else obj if value in (None, ''): into[(self.source or field_name)] = None @@ -386,7 +394,8 @@ class BaseSerializer(WritableField): 'data': value, 'context': self.context, 'partial': self.partial, - 'many': self.many + 'many': self.many, + 'allow_add_remove': self.allow_add_remove } serializer = self.__class__(**kwargs) @@ -496,6 +505,9 @@ class BaseSerializer(WritableField): def save_object(self, obj, **kwargs): obj.save(**kwargs) + if self.allow_add_remove and hasattr(obj, '_removed_relations'): + [self.delete_object(item) for item in obj._removed_relations] + def delete_object(self, obj): obj.delete() @@ -508,7 +520,7 @@ class BaseSerializer(WritableField): else: self.save_object(self.object, **kwargs) - if self.allow_delete and self._deleted: + if self.allow_add_remove and self._deleted: [self.delete_object(item) for item in self._deleted] return self.object @@ -699,6 +711,7 @@ class ModelSerializer(Serializer): m2m_data = {} related_data = {} nested_forward_relations = {} + removed_relations = [] meta = self.opts.model._meta # Reverse fk or one-to-one relations @@ -724,6 +737,10 @@ class ModelSerializer(Serializer): if isinstance(self.fields.get(field_name, None), Serializer): nested_forward_relations[field_name] = attrs[field_name] + # Deleted related objects + if self._deleted: + removed_relations = list(self._deleted) + # Update an existing instance... if instance is not None: for key, val in attrs.items(): @@ -740,6 +757,7 @@ class ModelSerializer(Serializer): instance._related_data = related_data instance._m2m_data = m2m_data instance._nested_forward_relations = nested_forward_relations + instance._removed_relations = removed_relations return instance @@ -764,6 +782,9 @@ class ModelSerializer(Serializer): obj.save(**kwargs) + if self.allow_add_remove and hasattr(obj, '_removed_relations'): + [self.delete_object(item) for item in obj._removed_relations] + if getattr(obj, '_m2m_data', None): for accessor_name, object_list in obj._m2m_data.items(): setattr(obj, accessor_name, object_list) @@ -773,18 +794,17 @@ class ModelSerializer(Serializer): for accessor_name, related in obj._related_data.items(): field = self.fields.get(accessor_name, None) if isinstance(field, Serializer): - # TODO: Following will be needed for reverse FK - # if field.many: - # # Nested reverse fk relationship - # for related_item in related: - # fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name - # setattr(related_item, fk_field, obj) - # self.save_object(related_item) - # else: - # Nested reverse one-one relationship - fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name - setattr(related, fk_field, obj) - self.save_object(related) + if field.many: + # Nested reverse fk relationship + for related_item in related: + fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name + setattr(related_item, fk_field, obj) + self.save_object(related_item) + else: + # Nested reverse one-one relationship + fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name + setattr(related, fk_field, obj) + self.save_object(related) else: # Reverse FK or reverse one-one setattr(obj, accessor_name, related) diff --git a/rest_framework/tests/relations_nested.py b/rest_framework/tests/relations_nested.py index e7af65651..20683d4a6 100644 --- a/rest_framework/tests/relations_nested.py +++ b/rest_framework/tests/relations_nested.py @@ -13,6 +13,15 @@ class OneToOneSource(models.Model): target = models.OneToOneField(OneToOneTarget, related_name='source') +class OneToManyTarget(models.Model): + name = models.CharField(max_length=100) + + +class OneToManySource(models.Model): + name = models.CharField(max_length=100) + target = models.ForeignKey(OneToManyTarget, related_name='sources') + + class ReverseNestedOneToOneTests(TestCase): def setUp(self): class OneToOneSourceSerializer(serializers.ModelSerializer): @@ -189,3 +198,92 @@ class ForwardNestedOneToOneTests(TestCase): # {'id': 3, 'name': 'target-3', 'source': None} # ] # self.assertEqual(serializer.data, expected) + + +class ReverseNestedOneToManyTests(TestCase): + def setUp(self): + class OneToManySourceSerializer(serializers.ModelSerializer): + class Meta: + model = OneToManySource + fields = ('id', 'name') + + class OneToManyTargetSerializer(serializers.ModelSerializer): + sources = OneToManySourceSerializer(many=True, allow_add_remove=True) + + class Meta: + model = OneToManyTarget + fields = ('id', 'name', 'sources') + + self.Serializer = OneToManyTargetSerializer + + target = OneToManyTarget(name='target-1') + target.save() + for idx in range(1, 4): + source = OneToManySource(name='source-%d' % idx, target=target) + source.save() + + def test_one_to_many_retrieve(self): + queryset = OneToManyTarget.objects.all() + serializer = self.Serializer(queryset) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, + {'id': 2, 'name': 'source-2'}, + {'id': 3, 'name': 'source-3'}]}, + ] + self.assertEqual(serializer.data, expected) + + def test_one_to_many_create(self): + data = {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, + {'id': 2, 'name': 'source-2'}, + {'id': 3, 'name': 'source-3'}, + {'id': 4, 'name': 'source-4'}]} + instance = OneToManyTarget.objects.get(pk=1) + serializer = self.Serializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'target-1') + + # Ensure source 4 is added, and everything else is as + # expected. + queryset = OneToManyTarget.objects.all() + serializer = self.Serializer(queryset) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, + {'id': 2, 'name': 'source-2'}, + {'id': 3, 'name': 'source-3'}, + {'id': 4, 'name': 'source-4'}]} + ] + self.assertEqual(serializer.data, expected) + + def test_one_to_many_create_with_invalid_data(self): + data = {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, + {'id': 2, 'name': 'source-2'}, + {'id': 3, 'name': 'source-3'}, + {'id': 4}]} + serializer = self.Serializer(data=data) + self.assertFalse(serializer.is_valid()) + self.assertEqual(serializer.errors, {'sources': [{}, {}, {}, {'name': ['This field is required.']}]}) + + def test_one_to_many_update(self): + data = {'id': 1, 'name': 'target-1-updated', 'sources': [{'id': 1, 'name': 'source-1-updated'}, + {'id': 2, 'name': 'source-2'}, + {'id': 3, 'name': 'source-3'}]} + instance = OneToManyTarget.objects.get(pk=1) + serializer = self.Serializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'target-1-updated') + + # Ensure (target 1, source 1) are updated, + # and everything else is as expected. + queryset = OneToManyTarget.objects.all() + serializer = self.Serializer(queryset) + expected = [ + {'id': 1, 'name': 'target-1-updated', 'sources': [{'id': 1, 'name': 'source-1-updated'}, + {'id': 2, 'name': 'source-2'}, + {'id': 3, 'name': 'source-3'}]} + + ] + self.assertEqual(serializer.data, expected) diff --git a/rest_framework/tests/serializer_bulk_update.py b/rest_framework/tests/serializer_bulk_update.py index afc1a1a9f..5328e7331 100644 --- a/rest_framework/tests/serializer_bulk_update.py +++ b/rest_framework/tests/serializer_bulk_update.py @@ -201,7 +201,7 @@ class BulkUpdateSerializerTests(TestCase): 'author': 'Haruki Murakami' } ] - serializer = self.BookSerializer(self.books(), data=data, many=True, allow_delete=True) + serializer = self.BookSerializer(self.books(), data=data, many=True, allow_add_remove=True) self.assertEqual(serializer.is_valid(), True) self.assertEqual(serializer.data, data) serializer.save() @@ -223,7 +223,7 @@ class BulkUpdateSerializerTests(TestCase): 'author': 'Haruki Murakami' } ] - serializer = self.BookSerializer(self.books(), data=data, many=True, allow_delete=True) + serializer = self.BookSerializer(self.books(), data=data, many=True, allow_add_remove=True) self.assertEqual(serializer.is_valid(), True) self.assertEqual(serializer.data, data) serializer.save() @@ -249,6 +249,6 @@ class BulkUpdateSerializerTests(TestCase): {}, {'id': ['Enter a whole number.']} ] - serializer = self.BookSerializer(self.books(), data=data, many=True, allow_delete=True) + serializer = self.BookSerializer(self.books(), data=data, many=True, allow_add_remove=True) self.assertEqual(serializer.is_valid(), False) self.assertEqual(serializer.errors, expected_errors) From bda25479aa7e73c90bc77b7c7219eaa411af138e Mon Sep 17 00:00:00 2001 From: Mark Aaron Shirley Date: Wed, 10 Apr 2013 08:44:54 -0700 Subject: [PATCH 0004/1652] Update docs with allow_add_remove --- docs/api-guide/serializers.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 42e81cad5..aeb33916e 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -244,15 +244,15 @@ This allows you to write views that update or create multiple items when a `PUT` Bulk updates will update any instances that already exist, and create new instances for data items that do not have a corresponding instance. -When performing a bulk update you may want any items that are not present in the incoming data to be deleted. To do so, pass `allow_delete=True` to the serializer. +When performing a bulk update you may want any items that are not present in the incoming data to be deleted. To do so, pass `allow_add_remove=True` to the serializer. - serializer = BookSerializer(queryset, data=data, many=True, allow_delete=True) + serializer = BookSerializer(queryset, data=data, many=True, allow_add_remove=True) serializer.is_valid() # True serializer.save() # `.save()` will be called on each updated or newly created instance. # `.delete()` will be called on any other items in the `queryset`. -Passing `allow_delete=True` ensures that any update operations will completely overwrite the existing queryset, rather than simply updating any objects found in the incoming data. +Passing `allow_add_remove=True` ensures that any update operations will completely overwrite the existing queryset, rather than simply updating any objects found in the incoming data. #### How identity is determined when performing bulk updates From fdc5cc3d81679d30cd20acf063dc7dc74ad17d7a Mon Sep 17 00:00:00 2001 From: Mark Aaron Shirley Date: Thu, 18 Apr 2013 10:28:20 -0700 Subject: [PATCH 0005/1652] Fix model serializer nestesd delete behavior --- rest_framework/serializers.py | 40 +++++++++--------------- rest_framework/tests/relations_nested.py | 19 +++++++++++ 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0f0f11a4c..78c455481 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -20,6 +20,9 @@ from rest_framework.relations import * from rest_framework.fields import * +class RelationsList(list): + _deleted = [] + class NestedValidationError(ValidationError): """ The default ValidationError behavior is to stringify each item in the list @@ -149,7 +152,6 @@ class BaseSerializer(WritableField): self._data = None self._files = None self._errors = None - self._deleted = None if many and instance is not None and not hasattr(instance, '__iter__'): raise ValueError('instance should be a queryset or other iterable with many=True') @@ -288,15 +290,8 @@ class BaseSerializer(WritableField): You should override this method to control how deserialized objects are instantiated. """ - removed_relations = [] - - # Deleted related objects - if self._deleted: - removed_relations = list(self._deleted) - if instance is not None: instance.update(attrs) - instance._removed_relations = removed_relations return instance return attrs @@ -438,7 +433,7 @@ class BaseSerializer(WritableField): PendingDeprecationWarning, stacklevel=3) if many: - ret = [] + ret = RelationsList() errors = [] update = self.object is not None @@ -466,7 +461,7 @@ class BaseSerializer(WritableField): errors.append(self._errors) if update: - self._deleted = identity_to_objects.values() + ret._deleted = identity_to_objects.values() self._errors = any(errors) and errors or [] else: @@ -509,9 +504,6 @@ class BaseSerializer(WritableField): def save_object(self, obj, **kwargs): obj.save(**kwargs) - if self.allow_add_remove and hasattr(obj, '_removed_relations'): - [self.delete_object(item) for item in obj._removed_relations] - def delete_object(self, obj): obj.delete() @@ -521,11 +513,11 @@ class BaseSerializer(WritableField): """ if isinstance(self.object, list): [self.save_object(item, **kwargs) for item in self.object] - else: - self.save_object(self.object, **kwargs) - if self.allow_add_remove and self._deleted: - [self.delete_object(item) for item in self._deleted] + if self.allow_add_remove and self.object._deleted: + [self.delete_object(item) for item in self.object._deleted] + else: + self.save_object(self.object, **kwargs) return self.object @@ -715,7 +707,6 @@ class ModelSerializer(Serializer): m2m_data = {} related_data = {} nested_forward_relations = {} - removed_relations = [] meta = self.opts.model._meta # Reverse fk or one-to-one relations @@ -741,10 +732,6 @@ class ModelSerializer(Serializer): if isinstance(self.fields.get(field_name, None), Serializer): nested_forward_relations[field_name] = attrs[field_name] - # Deleted related objects - if self._deleted: - removed_relations = list(self._deleted) - # Update an existing instance... if instance is not None: for key, val in attrs.items(): @@ -761,7 +748,6 @@ class ModelSerializer(Serializer): instance._related_data = related_data instance._m2m_data = m2m_data instance._nested_forward_relations = nested_forward_relations - instance._removed_relations = removed_relations return instance @@ -786,9 +772,6 @@ class ModelSerializer(Serializer): obj.save(**kwargs) - if self.allow_add_remove and hasattr(obj, '_removed_relations'): - [self.delete_object(item) for item in obj._removed_relations] - if getattr(obj, '_m2m_data', None): for accessor_name, object_list in obj._m2m_data.items(): setattr(obj, accessor_name, object_list) @@ -804,6 +787,11 @@ class ModelSerializer(Serializer): fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name setattr(related_item, fk_field, obj) self.save_object(related_item) + + # Delete any removed objects + if field.allow_add_remove and related._deleted: + [self.delete_object(item) for item in related._deleted] + else: # Nested reverse one-one relationship fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name diff --git a/rest_framework/tests/relations_nested.py b/rest_framework/tests/relations_nested.py index 20683d4a6..22c98e7ff 100644 --- a/rest_framework/tests/relations_nested.py +++ b/rest_framework/tests/relations_nested.py @@ -287,3 +287,22 @@ class ReverseNestedOneToManyTests(TestCase): ] self.assertEqual(serializer.data, expected) + + def test_one_to_many_delete(self): + data = {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, + {'id': 3, 'name': 'source-3'}]} + instance = OneToManyTarget.objects.get(pk=1) + serializer = self.Serializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + serializer.save() + + # Ensure source 2 is deleted, and everything else is as + # expected. + queryset = OneToManyTarget.objects.all() + serializer = self.Serializer(queryset) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, + {'id': 3, 'name': 'source-3'}]} + + ] + self.assertEqual(serializer.data, expected) From 7e0a93f0eefead25f0e9b6615675f394af3a4ba0 Mon Sep 17 00:00:00 2001 From: Mark Aaron Shirley Date: Fri, 19 Apr 2013 10:46:57 -0700 Subject: [PATCH 0006/1652] Don't use field when saving related data --- rest_framework/serializers.py | 36 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 78c455481..b39cb8105 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -460,7 +460,7 @@ class BaseSerializer(WritableField): ret.append(self.from_native(item, None)) errors.append(self._errors) - if update: + if update and self.allow_add_remove: ret._deleted = identity_to_objects.values() self._errors = any(errors) and errors or [] @@ -514,7 +514,7 @@ class BaseSerializer(WritableField): if isinstance(self.object, list): [self.save_object(item, **kwargs) for item in self.object] - if self.allow_add_remove and self.object._deleted: + if self.object._deleted: [self.delete_object(item) for item in self.object._deleted] else: self.save_object(self.object, **kwargs) @@ -779,24 +779,22 @@ class ModelSerializer(Serializer): if getattr(obj, '_related_data', None): for accessor_name, related in obj._related_data.items(): - field = self.fields.get(accessor_name, None) - if isinstance(field, Serializer): - if field.many: - # Nested reverse fk relationship - for related_item in related: - fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name - setattr(related_item, fk_field, obj) - self.save_object(related_item) - - # Delete any removed objects - if field.allow_add_remove and related._deleted: - [self.delete_object(item) for item in related._deleted] - - else: - # Nested reverse one-one relationship + if isinstance(related, RelationsList): + # Nested reverse fk relationship + for related_item in related: fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name - setattr(related, fk_field, obj) - self.save_object(related) + setattr(related_item, fk_field, obj) + self.save_object(related_item) + + # Delete any removed objects + if related._deleted: + [self.delete_object(item) for item in related._deleted] + + elif isinstance(related, models.Model): + # Nested reverse one-one relationship + fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name + setattr(related, fk_field, obj) + self.save_object(related) else: # Reverse FK or reverse one-one setattr(obj, accessor_name, related) From 14482a966168a98d43099d00c163d1c8c3b6471b Mon Sep 17 00:00:00 2001 From: Mark Aaron Shirley Date: Wed, 8 May 2013 22:44:23 -0700 Subject: [PATCH 0007/1652] Fix deprecation warnings in relations_nested tests --- rest_framework/tests/relations_nested.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rest_framework/tests/relations_nested.py b/rest_framework/tests/relations_nested.py index 22c98e7ff..8325580f6 100644 --- a/rest_framework/tests/relations_nested.py +++ b/rest_framework/tests/relations_nested.py @@ -46,7 +46,7 @@ class ReverseNestedOneToOneTests(TestCase): def test_one_to_one_retrieve(self): queryset = OneToOneTarget.objects.all() - serializer = self.Serializer(queryset) + serializer = self.Serializer(queryset, many=True) expected = [ {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, @@ -65,7 +65,7 @@ class ReverseNestedOneToOneTests(TestCase): # Ensure (target 4, target_source 4, source 4) are added, and # everything else is as expected. queryset = OneToOneTarget.objects.all() - serializer = self.Serializer(queryset) + serializer = self.Serializer(queryset, many=True) expected = [ {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, @@ -92,7 +92,7 @@ class ReverseNestedOneToOneTests(TestCase): # Ensure (target 3, target_source 3, source 3) are updated, # and everything else is as expected. queryset = OneToOneTarget.objects.all() - serializer = self.Serializer(queryset) + serializer = self.Serializer(queryset, many=True) expected = [ {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, @@ -125,7 +125,7 @@ class ForwardNestedOneToOneTests(TestCase): def test_one_to_one_retrieve(self): queryset = OneToOneSource.objects.all() - serializer = self.Serializer(queryset) + serializer = self.Serializer(queryset, many=True) expected = [ {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, @@ -144,7 +144,7 @@ class ForwardNestedOneToOneTests(TestCase): # Ensure (target 4, target_source 4, source 4) are added, and # everything else is as expected. queryset = OneToOneSource.objects.all() - serializer = self.Serializer(queryset) + serializer = self.Serializer(queryset, many=True) expected = [ {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, @@ -171,7 +171,7 @@ class ForwardNestedOneToOneTests(TestCase): # Ensure (target 3, target_source 3, source 3) are updated, # and everything else is as expected. queryset = OneToOneSource.objects.all() - serializer = self.Serializer(queryset) + serializer = self.Serializer(queryset, many=True) expected = [ {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, @@ -224,7 +224,7 @@ class ReverseNestedOneToManyTests(TestCase): def test_one_to_many_retrieve(self): queryset = OneToManyTarget.objects.all() - serializer = self.Serializer(queryset) + serializer = self.Serializer(queryset, many=True) expected = [ {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, {'id': 2, 'name': 'source-2'}, @@ -247,7 +247,7 @@ class ReverseNestedOneToManyTests(TestCase): # Ensure source 4 is added, and everything else is as # expected. queryset = OneToManyTarget.objects.all() - serializer = self.Serializer(queryset) + serializer = self.Serializer(queryset, many=True) expected = [ {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, {'id': 2, 'name': 'source-2'}, @@ -279,7 +279,7 @@ class ReverseNestedOneToManyTests(TestCase): # Ensure (target 1, source 1) are updated, # and everything else is as expected. queryset = OneToManyTarget.objects.all() - serializer = self.Serializer(queryset) + serializer = self.Serializer(queryset, many=True) expected = [ {'id': 1, 'name': 'target-1-updated', 'sources': [{'id': 1, 'name': 'source-1-updated'}, {'id': 2, 'name': 'source-2'}, @@ -299,7 +299,7 @@ class ReverseNestedOneToManyTests(TestCase): # Ensure source 2 is deleted, and everything else is as # expected. queryset = OneToManyTarget.objects.all() - serializer = self.Serializer(queryset) + serializer = self.Serializer(queryset, many=True) expected = [ {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, {'id': 3, 'name': 'source-3'}]} From 3fcc01273c5efef26d911e50c02a4a43f89b34eb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 27 Jun 2013 20:29:52 +0100 Subject: [PATCH 0008/1652] Remove deprecated code --- rest_framework/compat.py | 5 +- rest_framework/fields.py | 7 --- rest_framework/permissions.py | 12 +---- rest_framework/relations.py | 69 ++++--------------------- rest_framework/serializers.py | 32 ++---------- rest_framework/tests/test_serializer.py | 4 +- 6 files changed, 21 insertions(+), 108 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index b748dcc51..161fffa8d 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -494,11 +494,14 @@ try: if provider_version in ('0.2.3', '0.2.4'): # 0.2.3 and 0.2.4 are supported version that do not support # timezone aware datetimes - from datetime.datetime import now as provider_now + import datetime + provider_now = datetime.datetime.now else: # Any other supported version does use timezone aware datetimes from django.utils.timezone import now as provider_now except ImportError: + import traceback + traceback.print_exc() oauth2_provider = None oauth2_provider_models = None oauth2_provider_forms = None diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 35848b4ce..2e23715de 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -224,13 +224,6 @@ class WritableField(Field): validators=[], error_messages=None, widget=None, default=None, blank=None): - # 'blank' is to be deprecated in favor of 'required' - if blank is not None: - warnings.warn('The `blank` keyword argument is deprecated. ' - 'Use the `required` keyword argument instead.', - DeprecationWarning, stacklevel=2) - required = not(blank) - super(WritableField, self).__init__(source=source, label=label, help_text=help_text) self.read_only = read_only diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 1036663e0..0c7b02ffa 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -2,13 +2,10 @@ Provides a set of pluggable permission policies. """ from __future__ import unicode_literals -import inspect -import warnings +from rest_framework.compat import oauth2_provider_scope, oauth2_constants SAFE_METHODS = ['GET', 'HEAD', 'OPTIONS'] -from rest_framework.compat import oauth2_provider_scope, oauth2_constants - class BasePermission(object): """ @@ -25,13 +22,6 @@ class BasePermission(object): """ Return `True` if permission is granted, `False` otherwise. """ - if len(inspect.getargspec(self.has_permission).args) == 4: - warnings.warn( - 'The `obj` argument in `has_permission` is deprecated. ' - 'Use `has_object_permission()` instead for object permissions.', - DeprecationWarning, stacklevel=2 - ) - return self.has_permission(request, view, obj) return True diff --git a/rest_framework/relations.py b/rest_framework/relations.py index edaf76d6e..ede694e31 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -40,14 +40,6 @@ class RelatedField(WritableField): many = False def __init__(self, *args, **kwargs): - - # 'null' is to be deprecated in favor of 'required' - if 'null' in kwargs: - warnings.warn('The `null` keyword argument is deprecated. ' - 'Use the `required` keyword argument instead.', - DeprecationWarning, stacklevel=2) - kwargs['required'] = not kwargs.pop('null') - queryset = kwargs.pop('queryset', None) self.many = kwargs.pop('many', self.many) if self.many: @@ -424,14 +416,11 @@ class HyperlinkedRelatedField(RelatedField): request = self.context.get('request', None) format = self.format or self.context.get('format', None) - if request is None: - msg = ( - "Using `HyperlinkedRelatedField` without including the request " - "in the serializer context is deprecated. " - "Add `context={'request': request}` when instantiating " - "the serializer." - ) - warnings.warn(msg, DeprecationWarning, stacklevel=4) + assert request is not None, ( + "`HyperlinkedRelatedField` requires the request in the serializer " + "context. Add `context={'request': request}` when instantiating " + "the serializer." + ) # If the object has not yet been saved then we cannot hyperlink to it. if getattr(obj, 'pk', None) is None: @@ -530,11 +519,11 @@ class HyperlinkedIdentityField(Field): format = self.context.get('format', None) view_name = self.view_name - if request is None: - warnings.warn("Using `HyperlinkedIdentityField` without including the " - "request in the serializer context is deprecated. " - "Add `context={'request': request}` when instantiating the serializer.", - DeprecationWarning, stacklevel=4) + assert request is not None, ( + "`HyperlinkedIdentityField` requires the request in the serializer" + " context. Add `context={'request': request}` when instantiating " + "the serializer." + ) # By default use whatever format is given for the current context # unless the target is a different type to the source. @@ -593,41 +582,3 @@ class HyperlinkedIdentityField(Field): pass raise NoReverseMatch() - - -### Old-style many classes for backwards compat - -class ManyRelatedField(RelatedField): - def __init__(self, *args, **kwargs): - warnings.warn('`ManyRelatedField()` is deprecated. ' - 'Use `RelatedField(many=True)` instead.', - DeprecationWarning, stacklevel=2) - kwargs['many'] = True - super(ManyRelatedField, self).__init__(*args, **kwargs) - - -class ManyPrimaryKeyRelatedField(PrimaryKeyRelatedField): - def __init__(self, *args, **kwargs): - warnings.warn('`ManyPrimaryKeyRelatedField()` is deprecated. ' - 'Use `PrimaryKeyRelatedField(many=True)` instead.', - DeprecationWarning, stacklevel=2) - kwargs['many'] = True - super(ManyPrimaryKeyRelatedField, self).__init__(*args, **kwargs) - - -class ManySlugRelatedField(SlugRelatedField): - def __init__(self, *args, **kwargs): - warnings.warn('`ManySlugRelatedField()` is deprecated. ' - 'Use `SlugRelatedField(many=True)` instead.', - DeprecationWarning, stacklevel=2) - kwargs['many'] = True - super(ManySlugRelatedField, self).__init__(*args, **kwargs) - - -class ManyHyperlinkedRelatedField(HyperlinkedRelatedField): - def __init__(self, *args, **kwargs): - warnings.warn('`ManyHyperlinkedRelatedField()` is deprecated. ' - 'Use `HyperlinkedRelatedField(many=True)` instead.', - DeprecationWarning, stacklevel=2) - kwargs['many'] = True - super(ManyHyperlinkedRelatedField, self).__init__(*args, **kwargs) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 023f7ccfb..ae39cce88 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -15,7 +15,6 @@ import copy import datetime import types from decimal import Decimal -from django.core.paginator import Page from django.db import models from django.forms import widgets from django.utils.datastructures import SortedDict @@ -141,7 +140,7 @@ class BaseSerializer(WritableField): _dict_class = SortedDictWithMetadata def __init__(self, instance=None, data=None, files=None, - context=None, partial=False, many=None, + context=None, partial=False, many=False, allow_add_remove=False, **kwargs): super(BaseSerializer, self).__init__(**kwargs) self.opts = self._options_class(self.Meta) @@ -348,12 +347,7 @@ class BaseSerializer(WritableField): if value is None: return None - if self.many is not None: - many = self.many - else: - many = hasattr(value, '__iter__') and not isinstance(value, (Page, dict, six.text_type)) - - if many: + if self.many: return [self.to_native(item) for item in value] return self.to_native(value) @@ -424,16 +418,7 @@ class BaseSerializer(WritableField): if self._errors is None: data, files = self.init_data, self.init_files - if self.many is not None: - many = self.many - else: - many = hasattr(data, '__iter__') and not isinstance(data, (Page, dict, six.text_type)) - if many: - warnings.warn('Implict list/queryset serialization is deprecated. ' - 'Use the `many=True` flag when instantiating the serializer.', - DeprecationWarning, stacklevel=3) - - if many: + if self.many: ret = [] errors = [] update = self.object is not None @@ -486,16 +471,7 @@ class BaseSerializer(WritableField): if self._data is None: obj = self.object - if self.many is not None: - many = self.many - else: - many = hasattr(obj, '__iter__') and not isinstance(obj, (Page, dict)) - if many: - warnings.warn('Implict list/queryset serialization is deprecated. ' - 'Use the `many=True` flag when instantiating the serializer.', - DeprecationWarning, stacklevel=2) - - if many: + if self.many: self._data = [self.to_native(item) for item in obj] else: self._data = self.to_native(obj) diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index 8b87a0847..151eb6484 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -1268,7 +1268,7 @@ class NestedSerializerContextTests(TestCase): model = Album fields = ("photo_set", "callable") - photo_set = PhotoSerializer(source="photo_set") + photo_set = PhotoSerializer(source="photo_set", many=True) callable = serializers.SerializerMethodField("_callable") def _callable(self, instance): @@ -1280,7 +1280,7 @@ class NestedSerializerContextTests(TestCase): albums = None class AlbumCollectionSerializer(serializers.Serializer): - albums = AlbumSerializer(source="albums") + albums = AlbumSerializer(source="albums", many=True) album1 = Album.objects.create(title="album 1") album2 = Album.objects.create(title="album 2") From 379ad8a82485e61b180ee823ba49799d39446aeb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 27 Jun 2013 20:36:14 +0100 Subject: [PATCH 0009/1652] pending deprecations -> deprecated --- rest_framework/generics.py | 32 +++++++++++++++---------------- rest_framework/mixins.py | 8 ++++---- rest_framework/relations.py | 36 +++++++++++++++++------------------ rest_framework/serializers.py | 8 ++++---- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 99e9782e2..874a142c8 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -108,11 +108,11 @@ class GenericAPIView(views.APIView): deprecated_style = False if page_size is not None: warnings.warn('The `page_size` parameter to `paginate_queryset()` ' - 'is due to be deprecated. ' + 'is deprecated. ' 'Note that the return style of this method is also ' 'changed, and will simply return a page object ' 'when called without a `page_size` argument.', - PendingDeprecationWarning, stacklevel=2) + DeprecationWarning, stacklevel=2) deprecated_style = True else: # Determine the required page size. @@ -123,10 +123,10 @@ class GenericAPIView(views.APIView): if not self.allow_empty: warnings.warn( - 'The `allow_empty` parameter is due to be deprecated. ' + 'The `allow_empty` parameter is deprecated. ' 'To use `allow_empty=False` style behavior, You should override ' '`get_queryset()` and explicitly raise a 404 on empty querysets.', - PendingDeprecationWarning, stacklevel=2 + DeprecationWarning, stacklevel=2 ) paginator = self.paginator_class(queryset, page_size, @@ -166,10 +166,10 @@ class GenericAPIView(views.APIView): if not filter_backends and self.filter_backend: warnings.warn( 'The `filter_backend` attribute and `FILTER_BACKEND` setting ' - 'are due to be deprecated in favor of a `filter_backends` ' + 'are deprecated in favor of a `filter_backends` ' 'attribute and `DEFAULT_FILTER_BACKENDS` setting, that take ' 'a *list* of filter backend classes.', - PendingDeprecationWarning, stacklevel=2 + DeprecationWarning, stacklevel=2 ) filter_backends = [self.filter_backend] @@ -192,8 +192,8 @@ class GenericAPIView(views.APIView): """ if queryset is not None: warnings.warn('The `queryset` parameter to `get_paginate_by()` ' - 'is due to be deprecated.', - PendingDeprecationWarning, stacklevel=2) + 'is deprecated.', + DeprecationWarning, stacklevel=2) if self.paginate_by_param: query_params = self.request.QUERY_PARAMS @@ -272,16 +272,16 @@ class GenericAPIView(views.APIView): filter_kwargs = {self.lookup_field: lookup} elif pk is not None and self.lookup_field == 'pk': warnings.warn( - 'The `pk_url_kwarg` attribute is due to be deprecated. ' + 'The `pk_url_kwarg` attribute is deprecated. ' 'Use the `lookup_field` attribute instead', - PendingDeprecationWarning + DeprecationWarning ) filter_kwargs = {'pk': pk} elif slug is not None and self.lookup_field == 'pk': warnings.warn( - 'The `slug_url_kwarg` attribute is due to be deprecated. ' + 'The `slug_url_kwarg` attribute is deprecated. ' 'Use the `lookup_field` attribute instead', - PendingDeprecationWarning + DeprecationWarning ) filter_kwargs = {self.slug_field: slug} else: @@ -482,9 +482,9 @@ class RetrieveUpdateDestroyAPIView(mixins.RetrieveModelMixin, class MultipleObjectAPIView(GenericAPIView): def __init__(self, *args, **kwargs): warnings.warn( - 'Subclassing `MultipleObjectAPIView` is due to be deprecated. ' + 'Subclassing `MultipleObjectAPIView` is deprecated. ' 'You should simply subclass `GenericAPIView` instead.', - PendingDeprecationWarning, stacklevel=2 + DeprecationWarning, stacklevel=2 ) super(MultipleObjectAPIView, self).__init__(*args, **kwargs) @@ -492,8 +492,8 @@ class MultipleObjectAPIView(GenericAPIView): class SingleObjectAPIView(GenericAPIView): def __init__(self, *args, **kwargs): warnings.warn( - 'Subclassing `SingleObjectAPIView` is due to be deprecated. ' + 'Subclassing `SingleObjectAPIView` is deprecated. ' 'You should simply subclass `GenericAPIView` instead.', - PendingDeprecationWarning, stacklevel=2 + DeprecationWarning, stacklevel=2 ) super(SingleObjectAPIView, self).__init__(*args, **kwargs) diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index f11def6d4..679dfa6c3 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -24,14 +24,14 @@ def _get_validation_exclusions(obj, pk=None, slug_field=None, lookup_field=None) include = [] if pk: - # Pending deprecation + # Deprecated pk_field = obj._meta.pk while pk_field.rel: pk_field = pk_field.rel.to._meta.pk include.append(pk_field.name) if slug_field: - # Pending deprecation + # Deprecated include.append(slug_field) if lookup_field and lookup_field != 'pk': @@ -77,10 +77,10 @@ class ListModelMixin(object): # `.allow_empty = False`, to raise 404 errors on empty querysets. if not self.allow_empty and not self.object_list: warnings.warn( - 'The `allow_empty` parameter is due to be deprecated. ' + 'The `allow_empty` parameter is deprecated. ' 'To use `allow_empty=False` style behavior, You should override ' '`get_queryset()` and explicitly raise a 404 on empty querysets.', - PendingDeprecationWarning + DeprecationWarning ) class_name = self.__class__.__name__ error_msg = self.empty_error % {'class_name': class_name} diff --git a/rest_framework/relations.py b/rest_framework/relations.py index ede694e31..f1f7dea72 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -314,7 +314,7 @@ class HyperlinkedRelatedField(RelatedField): 'incorrect_type': _('Incorrect type. Expected url string, received %s.'), } - # These are all pending deprecation + # These are all deprecated pk_url_kwarg = 'pk' slug_field = 'slug' slug_url_kwarg = None # Defaults to same as `slug_field` unless overridden @@ -328,16 +328,16 @@ class HyperlinkedRelatedField(RelatedField): self.lookup_field = kwargs.pop('lookup_field', self.lookup_field) self.format = kwargs.pop('format', None) - # These are pending deprecation + # These are deprecated if 'pk_url_kwarg' in kwargs: - msg = 'pk_url_kwarg is pending deprecation. Use lookup_field instead.' - warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) + msg = 'pk_url_kwarg is deprecated. Use lookup_field instead.' + warnings.warn(msg, DeprecationWarning, stacklevel=2) if 'slug_url_kwarg' in kwargs: - msg = 'slug_url_kwarg is pending deprecation. Use lookup_field instead.' - warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) + msg = 'slug_url_kwarg is deprecated. Use lookup_field instead.' + warnings.warn(msg, DeprecationWarning, stacklevel=2) if 'slug_field' in kwargs: - msg = 'slug_field is pending deprecation. Use lookup_field instead.' - warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) + msg = 'slug_field is deprecated. Use lookup_field instead.' + warnings.warn(msg, DeprecationWarning, stacklevel=2) self.pk_url_kwarg = kwargs.pop('pk_url_kwarg', self.pk_url_kwarg) self.slug_field = kwargs.pop('slug_field', self.slug_field) @@ -380,9 +380,9 @@ class HyperlinkedRelatedField(RelatedField): # If the lookup succeeds using the default slug params, # then `slug_field` is being used implicitly, and we # we need to warn about the pending deprecation. - msg = 'Implicit slug field hyperlinked fields are pending deprecation.' \ + msg = 'Implicit slug field hyperlinked fields are deprecated.' \ 'You should set `lookup_field=slug` on the HyperlinkedRelatedField.' - warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) + warnings.warn(msg, DeprecationWarning, stacklevel=2) return ret except NoReverseMatch: pass @@ -480,7 +480,7 @@ class HyperlinkedIdentityField(Field): lookup_field = 'pk' read_only = True - # These are all pending deprecation + # These are all deprecated pk_url_kwarg = 'pk' slug_field = 'slug' slug_url_kwarg = None # Defaults to same as `slug_field` unless overridden @@ -496,16 +496,16 @@ class HyperlinkedIdentityField(Field): lookup_field = kwargs.pop('lookup_field', None) self.lookup_field = lookup_field or self.lookup_field - # These are pending deprecation + # These are deprecated if 'pk_url_kwarg' in kwargs: - msg = 'pk_url_kwarg is pending deprecation. Use lookup_field instead.' - warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) + msg = 'pk_url_kwarg is deprecated. Use lookup_field instead.' + warnings.warn(msg, DeprecationWarning, stacklevel=2) if 'slug_url_kwarg' in kwargs: - msg = 'slug_url_kwarg is pending deprecation. Use lookup_field instead.' - warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) + msg = 'slug_url_kwarg is deprecated. Use lookup_field instead.' + warnings.warn(msg, DeprecationWarning, stacklevel=2) if 'slug_field' in kwargs: - msg = 'slug_field is pending deprecation. Use lookup_field instead.' - warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) + msg = 'slug_field is deprecated. Use lookup_field instead.' + warnings.warn(msg, DeprecationWarning, stacklevel=2) self.slug_field = kwargs.pop('slug_field', self.slug_field) default_slug_kwarg = self.slug_url_kwarg or self.slug_field diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index ae39cce88..dd9e14ad7 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -593,10 +593,10 @@ class ModelSerializer(Serializer): if len(inspect.getargspec(self.get_nested_field).args) == 2: warnings.warn( 'The `get_nested_field(model_field)` call signature ' - 'is due to be deprecated. ' + 'is deprecated. ' 'Use `get_nested_field(model_field, related_model, ' 'to_many) instead', - PendingDeprecationWarning + DeprecationWarning ) field = self.get_nested_field(model_field) else: @@ -605,10 +605,10 @@ class ModelSerializer(Serializer): if len(inspect.getargspec(self.get_nested_field).args) == 3: warnings.warn( 'The `get_related_field(model_field, to_many)` call ' - 'signature is due to be deprecated. ' + 'signature is deprecated. ' 'Use `get_related_field(model_field, related_model, ' 'to_many) instead', - PendingDeprecationWarning + DeprecationWarning ) field = self.get_related_field(model_field, to_many=to_many) else: From 7815811fe3047b5110e6993ecd72349f6f232232 Mon Sep 17 00:00:00 2001 From: Mark Aaron Shirley Date: Sun, 14 Jul 2013 18:13:37 -0700 Subject: [PATCH 0010/1652] Update nested serialization docs --- docs/api-guide/relations.md | 2 -- docs/api-guide/serializers.md | 17 ++++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 50c9bc546..21942eeff 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -213,8 +213,6 @@ Nested relationships can be expressed by using serializers as fields. If the field is used to represent a to-many relationship, you should add the `many=True` flag to the serializer field. -Note that nested relationships are currently read-only. For read-write relationships, you should use a flat relational style. - ## Example For example, the following serializer: diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index d9c23580c..23c999429 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -177,7 +177,7 @@ If a nested representation may optionally accept the `None` value you should pas content = serializers.CharField(max_length=200) created = serializers.DateTimeField() -Similarly if a nested representation should be a list of items, you should the `many=True` flag to the nested serialized. +Similarly if a nested representation should be a list of items, you should pass the `many=True` flag to the nested serialized. class CommentSerializer(serializers.Serializer): user = UserSerializer(required=False) @@ -185,11 +185,13 @@ Similarly if a nested representation should be a list of items, you should the ` content = serializers.CharField(max_length=200) created = serializers.DateTimeField() ---- +Validation of nested objects will work the same as before. Errors with nested objects will be nested under the field name of the nested object. -**Note**: Nested serializers are only suitable for read-only representations, as there are cases where they would have ambiguous or non-obvious behavior if used when updating instances. For read-write representations you should always use a flat representation, by using one of the `RelatedField` subclasses. - ---- + serializer = CommentSerializer(comment, data={'user': {'email': 'foobar', 'user': 'doe'}, 'content': 'baz'}) + serializer.is_valid() + # False + serializer.errors + # {'user': {'email': [u'Enter a valid e-mail address.']}, 'created': [u'This field is required.']} ## Dealing with multiple objects @@ -293,8 +295,7 @@ You can provide arbitrary additional context by passing a `context` argument whe The context dictionary can be used within any serializer field logic, such as a custom `.to_native()` method, by accessing the `self.context` attribute. ---- - +- # ModelSerializer Often you'll want serializer classes that map closely to model definitions. @@ -331,6 +332,8 @@ The default `ModelSerializer` uses primary keys for relationships, but you can a The `depth` option should be set to an integer value that indicates the depth of relationships that should be traversed before reverting to a flat representation. +If you want to customize the way the serialization is done (e.g. using `allow_add_remove`) you'll need to define the field yourself. + ## Specifying which fields should be read-only You may wish to specify multiple fields as read-only. Instead of adding each field explicitly with the `read_only=True` attribute, you may use the `read_only_fields` Meta option, like so: From b5dc6b61131cc36b0540133a28613c06e7f4e26a Mon Sep 17 00:00:00 2001 From: Mark Aaron Shirley Date: Sun, 14 Jul 2013 18:18:39 -0700 Subject: [PATCH 0011/1652] Fix docs typo --- docs/api-guide/serializers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 23c999429..022853caa 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -187,7 +187,7 @@ Similarly if a nested representation should be a list of items, you should pass Validation of nested objects will work the same as before. Errors with nested objects will be nested under the field name of the nested object. - serializer = CommentSerializer(comment, data={'user': {'email': 'foobar', 'user': 'doe'}, 'content': 'baz'}) + serializer = CommentSerializer(comment, data={'user': {'email': 'foobar', 'username': 'doe'}, 'content': 'baz'}) serializer.is_valid() # False serializer.errors From d72603bc6a16112008959c5267839f819c2bc43a Mon Sep 17 00:00:00 2001 From: Alex Burgel Date: Wed, 5 Jun 2013 17:39:14 -0400 Subject: [PATCH 0012/1652] Add support for collection routes to SimpleRouter --- rest_framework/decorators.py | 26 +++++++++++++++ rest_framework/routers.py | 33 +++++++++++++++++-- rest_framework/tests/test_routers.py | 48 +++++++++++++++++++++++++++- 3 files changed, 103 insertions(+), 4 deletions(-) diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index c69756a43..dacd380fb 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -113,6 +113,7 @@ def link(**kwargs): """ def decorator(func): func.bind_to_methods = ['get'] + func.collection = False func.kwargs = kwargs return func return decorator @@ -124,6 +125,31 @@ def action(methods=['post'], **kwargs): """ def decorator(func): func.bind_to_methods = methods + func.collection = False + func.kwargs = kwargs + return func + return decorator + + +def collection_link(**kwargs): + """ + Used to mark a method on a ViewSet that should be routed for GET requests. + """ + def decorator(func): + func.bind_to_methods = ['get'] + func.collection = True + func.kwargs = kwargs + return func + return decorator + + +def collection_action(methods=['post'], **kwargs): + """ + Used to mark a method on a ViewSet that should be routed for POST requests. + """ + def decorator(func): + func.bind_to_methods = methods + func.collection = True func.kwargs = kwargs return func return decorator diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 930011d39..9b859a7c7 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -88,6 +88,17 @@ class SimpleRouter(BaseRouter): name='{basename}-list', initkwargs={'suffix': 'List'} ), + # Dynamically generated collection routes. + # Generated using @collection_action or @collection_link decorators + # on methods of the viewset. + Route( + url=r'^{prefix}/{methodname}{trailing_slash}$', + mapping={ + '{httpmethod}': '{methodname}', + }, + name='{basename}-collection-{methodnamehyphen}', + initkwargs={} + ), # Detail route. Route( url=r'^{prefix}/{lookup}{trailing_slash}$', @@ -107,7 +118,7 @@ class SimpleRouter(BaseRouter): mapping={ '{httpmethod}': '{methodname}', }, - name='{basename}-{methodnamehyphen}', + name='{basename}-dynamic-{methodnamehyphen}', initkwargs={} ), ] @@ -142,20 +153,25 @@ class SimpleRouter(BaseRouter): known_actions = flatten([route.mapping.values() for route in self.routes]) # Determine any `@action` or `@link` decorated methods on the viewset + collection_routes = [] dynamic_routes = [] for methodname in dir(viewset): attr = getattr(viewset, methodname) httpmethods = getattr(attr, 'bind_to_methods', None) + collection = getattr(attr, 'collection', False) if httpmethods: if methodname in known_actions: raise ImproperlyConfigured('Cannot use @action or @link decorator on ' 'method "%s" as it is an existing route' % methodname) httpmethods = [method.lower() for method in httpmethods] - dynamic_routes.append((httpmethods, methodname)) + if collection: + collection_routes.append((httpmethods, methodname)) + else: + dynamic_routes.append((httpmethods, methodname)) ret = [] for route in self.routes: - if route.mapping == {'{httpmethod}': '{methodname}'}: + if route.name == '{basename}-dynamic-{methodnamehyphen}': # Dynamic routes (@link or @action decorator) for httpmethods, methodname in dynamic_routes: initkwargs = route.initkwargs.copy() @@ -166,6 +182,17 @@ class SimpleRouter(BaseRouter): name=replace_methodname(route.name, methodname), initkwargs=initkwargs, )) + elif route.name == '{basename}-collection-{methodnamehyphen}': + # Dynamic routes (@collection_link or @collection_action decorator) + for httpmethods, methodname in collection_routes: + initkwargs = route.initkwargs.copy() + initkwargs.update(getattr(viewset, methodname).kwargs) + ret.append(Route( + url=replace_methodname(route.url, methodname), + mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), + name=replace_methodname(route.name, methodname), + initkwargs=initkwargs, + )) else: # Standard route ret.append(route) diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py index 5fcccb741..60f150d2c 100644 --- a/rest_framework/tests/test_routers.py +++ b/rest_framework/tests/test_routers.py @@ -4,7 +4,7 @@ from django.test import TestCase from django.core.exceptions import ImproperlyConfigured from rest_framework import serializers, viewsets, permissions from rest_framework.compat import include, patterns, url -from rest_framework.decorators import link, action +from rest_framework.decorators import link, action, collection_link, collection_action from rest_framework.response import Response from rest_framework.routers import SimpleRouter, DefaultRouter from rest_framework.test import APIRequestFactory @@ -214,3 +214,49 @@ class TestActionAppliedToExistingRoute(TestCase): with self.assertRaises(ImproperlyConfigured): self.router.urls + + +class StaticAndDynamicViewSet(viewsets.ViewSet): + def list(self, request, *args, **kwargs): + return Response({'method': 'list'}) + + @collection_action() + def collection_action(self, request, *args, **kwargs): + return Response({'method': 'action1'}) + + @action() + def dynamic_action(self, request, *args, **kwargs): + return Response({'method': 'action2'}) + + @collection_link() + def collection_link(self, request, *args, **kwargs): + return Response({'method': 'link1'}) + + @link() + def dynamic_link(self, request, *args, **kwargs): + return Response({'method': 'link2'}) + + +class TestStaticAndDynamicRouter(TestCase): + def setUp(self): + self.router = SimpleRouter() + + def test_link_and_action_decorator(self): + routes = self.router.get_routes(StaticAndDynamicViewSet) + decorator_routes = [r for r in routes if not (r.name.endswith('-list') or r.name.endswith('-detail'))] + # Make sure all these endpoints exist and none have been clobbered + for i, endpoint in enumerate(['collection_action', 'collection_link', 'dynamic_action', 'dynamic_link']): + route = decorator_routes[i] + # check url listing + if endpoint.startswith('collection_'): + self.assertEqual(route.url, + '^{{prefix}}/{0}{{trailing_slash}}$'.format(endpoint)) + else: + self.assertEqual(route.url, + '^{{prefix}}/{{lookup}}/{0}{{trailing_slash}}$'.format(endpoint)) + # check method to function mapping + if endpoint.endswith('action'): + method_map = 'post' + else: + method_map = 'get' + self.assertEqual(route.mapping[method_map], endpoint) From 5b11e23f6fb35834057fba35832a597ce443cc77 Mon Sep 17 00:00:00 2001 From: Alex Burgel Date: Wed, 5 Jun 2013 17:41:29 -0400 Subject: [PATCH 0013/1652] Add docs for collection routes --- docs/api-guide/viewsets.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 47e59e2b2..9fa6615ba 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -92,7 +92,9 @@ The default routers included with REST framework will provide routes for a stand def destroy(self, request, pk=None): pass -If you have ad-hoc methods that you need to be routed to, you can mark them as requiring routing using the `@link` or `@action` decorators. The `@link` decorator will route `GET` requests, and the `@action` decorator will route `POST` requests. +If you have ad-hoc methods that you need to be routed to, you can mark them as requiring routing using the `@collection_link`, `@collection_action`, `@link`, or `@action` decorators. The `@collection_link` and `@link` decorator will route `GET` requests, and the `@collection_action` and `@action` decorator will route `POST` requests. + +The `@link` and `@action` decorators contain `pk` in their URL pattern and are intended for methods which require a single instance. The `@collection_link` and `@collection_action` decorators are intended for methods which operate on a collection of objects. For example: @@ -121,13 +123,20 @@ For example: return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) -The `@action` and `@link` decorators can additionally take extra arguments that will be set for the routed view only. For example... + @collection_link() + def recent_users(self, request): + recent_users = User.objects.all().order('-last_login') + page = self.paginate_queryset(recent_users) + serializer = self.get_pagination_serializer(page) + return Response(serializer.data) + +The decorators can additionally take extra arguments that will be set for the routed view only. For example... @action(permission_classes=[IsAdminOrIsSelf]) def set_password(self, request, pk=None): ... -The `@action` decorator will route `POST` requests by default, but may also accept other HTTP methods, by using the `method` argument. For example: +The `@collection_action` and `@action` decorators will route `POST` requests by default, but may also accept other HTTP methods, by using the `method` argument. For example: @action(methods=['POST', 'DELETE']) def unset_password(self, request, pk=None): From 57cf8b5fa4f62f9b58912f10536a7ae5076ce54c Mon Sep 17 00:00:00 2001 From: Alex Burgel Date: Thu, 6 Jun 2013 11:51:52 -0400 Subject: [PATCH 0014/1652] Rework extra routes doc for better readability --- docs/api-guide/viewsets.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 9fa6615ba..e83487fb0 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -92,7 +92,7 @@ The default routers included with REST framework will provide routes for a stand def destroy(self, request, pk=None): pass -If you have ad-hoc methods that you need to be routed to, you can mark them as requiring routing using the `@collection_link`, `@collection_action`, `@link`, or `@action` decorators. The `@collection_link` and `@link` decorator will route `GET` requests, and the `@collection_action` and `@action` decorator will route `POST` requests. +If you have ad-hoc methods that you need to be routed to, you can mark them as requiring routing using the `@link`, `@action`, `@collection_link`, or `@collection_action` decorators. The `@link` and `@collection_link` decorators will route `GET` requests, and the `@action` and `@collection_action` decorators will route `POST` requests. The `@link` and `@action` decorators contain `pk` in their URL pattern and are intended for methods which require a single instance. The `@collection_link` and `@collection_action` decorators are intended for methods which operate on a collection of objects. @@ -136,7 +136,7 @@ The decorators can additionally take extra arguments that will be set for the ro def set_password(self, request, pk=None): ... -The `@collection_action` and `@action` decorators will route `POST` requests by default, but may also accept other HTTP methods, by using the `method` argument. For example: +The `@action` and `@collection_action` decorators will route `POST` requests by default, but may also accept other HTTP methods, by using the `methods` argument. For example: @action(methods=['POST', 'DELETE']) def unset_password(self, request, pk=None): From 8d521c068a254cef604df1f15690275dca986778 Mon Sep 17 00:00:00 2001 From: Alex Burgel Date: Sun, 16 Jun 2013 12:43:59 -0400 Subject: [PATCH 0015/1652] Revert route name change and add key to Route object to identify different route types --- rest_framework/routers.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 9b859a7c7..541df4a9d 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -25,7 +25,7 @@ from rest_framework.reverse import reverse from rest_framework.urlpatterns import format_suffix_patterns -Route = namedtuple('Route', ['url', 'mapping', 'name', 'initkwargs']) +Route = namedtuple('Route', ['key', 'url', 'mapping', 'name', 'initkwargs']) def replace_methodname(format_string, methodname): @@ -80,6 +80,7 @@ class SimpleRouter(BaseRouter): routes = [ # List route. Route( + key='list', url=r'^{prefix}{trailing_slash}$', mapping={ 'get': 'list', @@ -92,15 +93,17 @@ class SimpleRouter(BaseRouter): # Generated using @collection_action or @collection_link decorators # on methods of the viewset. Route( + key='collection', url=r'^{prefix}/{methodname}{trailing_slash}$', mapping={ '{httpmethod}': '{methodname}', }, - name='{basename}-collection-{methodnamehyphen}', + name='{basename}-{methodnamehyphen}', initkwargs={} ), # Detail route. Route( + key='detail', url=r'^{prefix}/{lookup}{trailing_slash}$', mapping={ 'get': 'retrieve', @@ -114,11 +117,12 @@ class SimpleRouter(BaseRouter): # Dynamically generated routes. # Generated using @action or @link decorators on methods of the viewset. Route( + key='dynamic', url=r'^{prefix}/{lookup}/{methodname}{trailing_slash}$', mapping={ '{httpmethod}': '{methodname}', }, - name='{basename}-dynamic-{methodnamehyphen}', + name='{basename}-{methodnamehyphen}', initkwargs={} ), ] @@ -171,23 +175,25 @@ class SimpleRouter(BaseRouter): ret = [] for route in self.routes: - if route.name == '{basename}-dynamic-{methodnamehyphen}': + if route.key == 'dynamic': # Dynamic routes (@link or @action decorator) for httpmethods, methodname in dynamic_routes: initkwargs = route.initkwargs.copy() initkwargs.update(getattr(viewset, methodname).kwargs) ret.append(Route( + key=route.key, url=replace_methodname(route.url, methodname), mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), name=replace_methodname(route.name, methodname), initkwargs=initkwargs, )) - elif route.name == '{basename}-collection-{methodnamehyphen}': + elif route.key == 'collection': # Dynamic routes (@collection_link or @collection_action decorator) for httpmethods, methodname in collection_routes: initkwargs = route.initkwargs.copy() initkwargs.update(getattr(viewset, methodname).kwargs) ret.append(Route( + key=route.key, url=replace_methodname(route.url, methodname), mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), name=replace_methodname(route.name, methodname), From f02274307826ebf98998e502fecca171bb0de696 Mon Sep 17 00:00:00 2001 From: Alex Burgel Date: Sun, 16 Jun 2013 12:51:33 -0400 Subject: [PATCH 0016/1652] Rename router collection test case --- rest_framework/tests/test_routers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py index 60f150d2c..e0a7e292e 100644 --- a/rest_framework/tests/test_routers.py +++ b/rest_framework/tests/test_routers.py @@ -216,7 +216,7 @@ class TestActionAppliedToExistingRoute(TestCase): self.router.urls -class StaticAndDynamicViewSet(viewsets.ViewSet): +class CollectionAndDynamicViewSet(viewsets.ViewSet): def list(self, request, *args, **kwargs): return Response({'method': 'list'}) @@ -237,12 +237,12 @@ class StaticAndDynamicViewSet(viewsets.ViewSet): return Response({'method': 'link2'}) -class TestStaticAndDynamicRouter(TestCase): +class TestCollectionAndDynamicRouter(TestCase): def setUp(self): self.router = SimpleRouter() def test_link_and_action_decorator(self): - routes = self.router.get_routes(StaticAndDynamicViewSet) + routes = self.router.get_routes(CollectionAndDynamicViewSet) decorator_routes = [r for r in routes if not (r.name.endswith('-list') or r.name.endswith('-detail'))] # Make sure all these endpoints exist and none have been clobbered for i, endpoint in enumerate(['collection_action', 'collection_link', 'dynamic_action', 'dynamic_link']): From e14cbaf6961ad9c94deaf0417d8e8ce5ec96d0ac Mon Sep 17 00:00:00 2001 From: Alex Burgel Date: Sat, 13 Jul 2013 11:11:53 -0400 Subject: [PATCH 0017/1652] Changed collection_* decorators to list_* --- docs/api-guide/viewsets.md | 10 ++++----- rest_framework/decorators.py | 16 +++++++------- rest_framework/routers.py | 31 ++++++++++++++-------------- rest_framework/tests/test_routers.py | 24 ++++++++++----------- 4 files changed, 41 insertions(+), 40 deletions(-) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index e83487fb0..6d6bb1334 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -92,15 +92,15 @@ The default routers included with REST framework will provide routes for a stand def destroy(self, request, pk=None): pass -If you have ad-hoc methods that you need to be routed to, you can mark them as requiring routing using the `@link`, `@action`, `@collection_link`, or `@collection_action` decorators. The `@link` and `@collection_link` decorators will route `GET` requests, and the `@action` and `@collection_action` decorators will route `POST` requests. +If you have ad-hoc methods that you need to be routed to, you can mark them as requiring routing using the `@link`, `@action`, `@list_link`, or `@list_action` decorators. The `@link` and `@list_link` decorators will route `GET` requests, and the `@action` and `@list_action` decorators will route `POST` requests. -The `@link` and `@action` decorators contain `pk` in their URL pattern and are intended for methods which require a single instance. The `@collection_link` and `@collection_action` decorators are intended for methods which operate on a collection of objects. +The `@link` and `@action` decorators contain `pk` in their URL pattern and are intended for methods which require a single instance. The `@list_link` and `@list_action` decorators are intended for methods which operate on a list of objects. For example: from django.contrib.auth.models import User from rest_framework import viewsets - from rest_framework.decorators import action + from rest_framework.decorators import action, list_link from rest_framework.response import Response from myapp.serializers import UserSerializer, PasswordSerializer @@ -123,7 +123,7 @@ For example: return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - @collection_link() + @list_link() def recent_users(self, request): recent_users = User.objects.all().order('-last_login') page = self.paginate_queryset(recent_users) @@ -136,7 +136,7 @@ The decorators can additionally take extra arguments that will be set for the ro def set_password(self, request, pk=None): ... -The `@action` and `@collection_action` decorators will route `POST` requests by default, but may also accept other HTTP methods, by using the `methods` argument. For example: +The `@action` and `@list_action` decorators will route `POST` requests by default, but may also accept other HTTP methods, by using the `methods` argument. For example: @action(methods=['POST', 'DELETE']) def unset_password(self, request, pk=None): diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index dacd380fb..92f551db7 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -109,11 +109,11 @@ def permission_classes(permission_classes): def link(**kwargs): """ - Used to mark a method on a ViewSet that should be routed for GET requests. + Used to mark a method on a ViewSet that should be routed for detail GET requests. """ def decorator(func): func.bind_to_methods = ['get'] - func.collection = False + func.detail = True func.kwargs = kwargs return func return decorator @@ -121,35 +121,35 @@ def link(**kwargs): def action(methods=['post'], **kwargs): """ - Used to mark a method on a ViewSet that should be routed for POST requests. + Used to mark a method on a ViewSet that should be routed for detail POST requests. """ def decorator(func): func.bind_to_methods = methods - func.collection = False + func.detail = True func.kwargs = kwargs return func return decorator -def collection_link(**kwargs): +def list_link(**kwargs): """ Used to mark a method on a ViewSet that should be routed for GET requests. """ def decorator(func): func.bind_to_methods = ['get'] - func.collection = True + func.detail = False func.kwargs = kwargs return func return decorator -def collection_action(methods=['post'], **kwargs): +def list_action(methods=['post'], **kwargs): """ Used to mark a method on a ViewSet that should be routed for POST requests. """ def decorator(func): func.bind_to_methods = methods - func.collection = True + func.detail = False func.kwargs = kwargs return func return decorator diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 541df4a9d..c8f711e91 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -89,8 +89,8 @@ class SimpleRouter(BaseRouter): name='{basename}-list', initkwargs={'suffix': 'List'} ), - # Dynamically generated collection routes. - # Generated using @collection_action or @collection_link decorators + # Dynamically generated list routes. + # Generated using @list_action or @list_link decorators # on methods of the viewset. Route( key='collection', @@ -114,7 +114,7 @@ class SimpleRouter(BaseRouter): name='{basename}-detail', initkwargs={'suffix': 'Instance'} ), - # Dynamically generated routes. + # Dynamically generated detail routes. # Generated using @action or @link decorators on methods of the viewset. Route( key='dynamic', @@ -157,27 +157,28 @@ class SimpleRouter(BaseRouter): known_actions = flatten([route.mapping.values() for route in self.routes]) # Determine any `@action` or `@link` decorated methods on the viewset - collection_routes = [] - dynamic_routes = [] + detail_routes = [] + list_routes = [] for methodname in dir(viewset): attr = getattr(viewset, methodname) httpmethods = getattr(attr, 'bind_to_methods', None) - collection = getattr(attr, 'collection', False) + detail = getattr(attr, 'detail', True) if httpmethods: if methodname in known_actions: - raise ImproperlyConfigured('Cannot use @action or @link decorator on ' - 'method "%s" as it is an existing route' % methodname) + raise ImproperlyConfigured('Cannot use @action, @link, @list_action ' + 'or @list_link decorator on method "%s" ' + 'as it is an existing route' % methodname) httpmethods = [method.lower() for method in httpmethods] - if collection: - collection_routes.append((httpmethods, methodname)) + if detail: + detail_routes.append((httpmethods, methodname)) else: - dynamic_routes.append((httpmethods, methodname)) + list_routes.append((httpmethods, methodname)) ret = [] for route in self.routes: if route.key == 'dynamic': - # Dynamic routes (@link or @action decorator) - for httpmethods, methodname in dynamic_routes: + # Dynamic detail routes (@link or @action decorator) + for httpmethods, methodname in detail_routes: initkwargs = route.initkwargs.copy() initkwargs.update(getattr(viewset, methodname).kwargs) ret.append(Route( @@ -188,8 +189,8 @@ class SimpleRouter(BaseRouter): initkwargs=initkwargs, )) elif route.key == 'collection': - # Dynamic routes (@collection_link or @collection_action decorator) - for httpmethods, methodname in collection_routes: + # Dynamic list routes (@list_link or @list_action decorator) + for httpmethods, methodname in list_routes: initkwargs = route.initkwargs.copy() initkwargs.update(getattr(viewset, methodname).kwargs) ret.append(Route( diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py index e0a7e292e..393101763 100644 --- a/rest_framework/tests/test_routers.py +++ b/rest_framework/tests/test_routers.py @@ -4,7 +4,7 @@ from django.test import TestCase from django.core.exceptions import ImproperlyConfigured from rest_framework import serializers, viewsets, permissions from rest_framework.compat import include, patterns, url -from rest_framework.decorators import link, action, collection_link, collection_action +from rest_framework.decorators import link, action, list_link, list_action from rest_framework.response import Response from rest_framework.routers import SimpleRouter, DefaultRouter from rest_framework.test import APIRequestFactory @@ -216,39 +216,39 @@ class TestActionAppliedToExistingRoute(TestCase): self.router.urls -class CollectionAndDynamicViewSet(viewsets.ViewSet): +class DynamicListAndDetailViewSet(viewsets.ViewSet): def list(self, request, *args, **kwargs): return Response({'method': 'list'}) - @collection_action() - def collection_action(self, request, *args, **kwargs): + @list_action() + def list_action(self, request, *args, **kwargs): return Response({'method': 'action1'}) @action() - def dynamic_action(self, request, *args, **kwargs): + def detail_action(self, request, *args, **kwargs): return Response({'method': 'action2'}) - @collection_link() - def collection_link(self, request, *args, **kwargs): + @list_link() + def list_link(self, request, *args, **kwargs): return Response({'method': 'link1'}) @link() - def dynamic_link(self, request, *args, **kwargs): + def detail_link(self, request, *args, **kwargs): return Response({'method': 'link2'}) -class TestCollectionAndDynamicRouter(TestCase): +class TestDynamicListAndDetailRouter(TestCase): def setUp(self): self.router = SimpleRouter() def test_link_and_action_decorator(self): - routes = self.router.get_routes(CollectionAndDynamicViewSet) + routes = self.router.get_routes(DynamicListAndDetailViewSet) decorator_routes = [r for r in routes if not (r.name.endswith('-list') or r.name.endswith('-detail'))] # Make sure all these endpoints exist and none have been clobbered - for i, endpoint in enumerate(['collection_action', 'collection_link', 'dynamic_action', 'dynamic_link']): + for i, endpoint in enumerate(['list_action', 'list_link', 'detail_action', 'detail_link']): route = decorator_routes[i] # check url listing - if endpoint.startswith('collection_'): + if endpoint.startswith('list_'): self.assertEqual(route.url, '^{{prefix}}/{0}{{trailing_slash}}$'.format(endpoint)) else: From ca7ba07b4e42bd1c7c6bb8088c0c5a2c434b56ee Mon Sep 17 00:00:00 2001 From: Alex Burgel Date: Sat, 13 Jul 2013 11:12:59 -0400 Subject: [PATCH 0018/1652] Introduce DynamicDetailRoute and DynamicListRoute to distinguish between different route types --- rest_framework/routers.py | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index c8f711e91..b8f19b66a 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -25,7 +25,9 @@ from rest_framework.reverse import reverse from rest_framework.urlpatterns import format_suffix_patterns -Route = namedtuple('Route', ['key', 'url', 'mapping', 'name', 'initkwargs']) +Route = namedtuple('Route', ['url', 'mapping', 'name', 'initkwargs']) +DynamicDetailRoute = namedtuple('DynamicDetailRoute', ['url', 'name', 'initkwargs']) +DynamicListRoute = namedtuple('DynamicListRoute', ['url', 'name', 'initkwargs']) def replace_methodname(format_string, methodname): @@ -80,7 +82,6 @@ class SimpleRouter(BaseRouter): routes = [ # List route. Route( - key='list', url=r'^{prefix}{trailing_slash}$', mapping={ 'get': 'list', @@ -92,18 +93,13 @@ class SimpleRouter(BaseRouter): # Dynamically generated list routes. # Generated using @list_action or @list_link decorators # on methods of the viewset. - Route( - key='collection', + DynamicListRoute( url=r'^{prefix}/{methodname}{trailing_slash}$', - mapping={ - '{httpmethod}': '{methodname}', - }, name='{basename}-{methodnamehyphen}', initkwargs={} ), # Detail route. Route( - key='detail', url=r'^{prefix}/{lookup}{trailing_slash}$', mapping={ 'get': 'retrieve', @@ -116,12 +112,8 @@ class SimpleRouter(BaseRouter): ), # Dynamically generated detail routes. # Generated using @action or @link decorators on methods of the viewset. - Route( - key='dynamic', + DynamicDetailRoute( url=r'^{prefix}/{lookup}/{methodname}{trailing_slash}$', - mapping={ - '{httpmethod}': '{methodname}', - }, name='{basename}-{methodnamehyphen}', initkwargs={} ), @@ -154,7 +146,7 @@ class SimpleRouter(BaseRouter): Returns a list of the Route namedtuple. """ - known_actions = flatten([route.mapping.values() for route in self.routes]) + known_actions = flatten([route.mapping.values() for route in self.routes if isinstance(route, Route)]) # Determine any `@action` or `@link` decorated methods on the viewset detail_routes = [] @@ -176,25 +168,23 @@ class SimpleRouter(BaseRouter): ret = [] for route in self.routes: - if route.key == 'dynamic': + if isinstance(route, DynamicDetailRoute): # Dynamic detail routes (@link or @action decorator) for httpmethods, methodname in detail_routes: initkwargs = route.initkwargs.copy() initkwargs.update(getattr(viewset, methodname).kwargs) ret.append(Route( - key=route.key, url=replace_methodname(route.url, methodname), mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), name=replace_methodname(route.name, methodname), initkwargs=initkwargs, )) - elif route.key == 'collection': + elif isinstance(route, DynamicListRoute): # Dynamic list routes (@list_link or @list_action decorator) for httpmethods, methodname in list_routes: initkwargs = route.initkwargs.copy() initkwargs.update(getattr(viewset, methodname).kwargs) ret.append(Route( - key=route.key, url=replace_methodname(route.url, methodname), mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), name=replace_methodname(route.name, methodname), From eaae8fb2d973769a827214e0606a7e41028d5d34 Mon Sep 17 00:00:00 2001 From: Alex Burgel Date: Mon, 15 Jul 2013 18:35:13 -0400 Subject: [PATCH 0019/1652] Combined link_* and action_* decorators into detail_route and list_route, marked the originals as deprecated. --- docs/api-guide/routers.md | 16 +++++----- docs/api-guide/viewsets.md | 16 +++++----- docs/tutorial/6-viewsets-and-routers.md | 8 ++--- rest_framework/decorators.py | 19 +++++++----- rest_framework/routers.py | 14 ++++----- rest_framework/tests/test_routers.py | 40 ++++++++++++------------- 6 files changed, 59 insertions(+), 54 deletions(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 865829057..f196dc3cd 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -35,12 +35,12 @@ The example above would generate the following URL patterns: * URL pattern: `^accounts/$` Name: `'account-list'` * URL pattern: `^accounts/{pk}/$` Name: `'account-detail'` -### Extra link and actions +### Registering additional routes -Any methods on the viewset decorated with `@link` or `@action` will also be routed. +Any methods on the viewset decorated with `@detail_route` or `@list_route` will also be routed. For example, a given method like this on the `UserViewSet` class: - @action(permission_classes=[IsAdminOrIsSelf]) + @detail_route(methods=['post'], permission_classes=[IsAdminOrIsSelf]) def set_password(self, request, pk=None): ... @@ -52,7 +52,7 @@ The following URL pattern would additionally be generated: ## SimpleRouter -This router includes routes for the standard set of `list`, `create`, `retrieve`, `update`, `partial_update` and `destroy` actions. The viewset can also mark additional methods to be routed, using the `@link` or `@action` decorators. +This router includes routes for the standard set of `list`, `create`, `retrieve`, `update`, `partial_update` and `destroy` actions. The viewset can also mark additional methods to be routed, using the `@detail_route` or `@list_route` decorators. @@ -62,8 +62,8 @@ This router includes routes for the standard set of `list`, `create`, `retrieve` - - + +
URL StyleHTTP MethodActionURL Name
PUTupdate
PATCHpartial_update
DELETEdestroy
{prefix}/{lookup}/{methodname}/GET@link decorated method{basename}-{methodname}
POST@action decorated method
{prefix}/{lookup}/{methodname}/GET@detail_route decorated method{basename}-{methodname}
POST@detail_route decorated method
By default the URLs created by `SimpleRouter` are appending with a trailing slash. @@ -86,8 +86,8 @@ This router is similar to `SimpleRouter` as above, but additionally includes a d PUTupdate PATCHpartial_update DELETEdestroy - {prefix}/{lookup}/{methodname}/[.format]GET@link decorated method{basename}-{methodname} - POST@action decorated method + {prefix}/{lookup}/{methodname}/[.format]GET@detail_route decorated method{basename}-{methodname} + POST@detail_route decorated method As with `SimpleRouter` the trailing slashs on the URL routes can be removed by setting the `trailing_slash` argument to `False` when instantiating the router. diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 6d6bb1334..7a8d5979b 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -92,15 +92,15 @@ The default routers included with REST framework will provide routes for a stand def destroy(self, request, pk=None): pass -If you have ad-hoc methods that you need to be routed to, you can mark them as requiring routing using the `@link`, `@action`, `@list_link`, or `@list_action` decorators. The `@link` and `@list_link` decorators will route `GET` requests, and the `@action` and `@list_action` decorators will route `POST` requests. +If you have ad-hoc methods that you need to be routed to, you can mark them as requiring routing using the `@detail_route` or `@list_route` decorators. -The `@link` and `@action` decorators contain `pk` in their URL pattern and are intended for methods which require a single instance. The `@list_link` and `@list_action` decorators are intended for methods which operate on a list of objects. +The `@detail_route` decorator contains `pk` in its URL pattern and is intended for methods which require a single instance. The `@list_route` decorator is intended for methods which operate on a list of objects. For example: from django.contrib.auth.models import User from rest_framework import viewsets - from rest_framework.decorators import action, list_link + from rest_framework.decorators import detail_route, list_route from rest_framework.response import Response from myapp.serializers import UserSerializer, PasswordSerializer @@ -111,7 +111,7 @@ For example: queryset = User.objects.all() serializer_class = UserSerializer - @action() + @detail_route(methods=['post']) def set_password(self, request, pk=None): user = self.get_object() serializer = PasswordSerializer(data=request.DATA) @@ -123,7 +123,7 @@ For example: return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - @list_link() + @list_route() def recent_users(self, request): recent_users = User.objects.all().order('-last_login') page = self.paginate_queryset(recent_users) @@ -132,13 +132,13 @@ For example: The decorators can additionally take extra arguments that will be set for the routed view only. For example... - @action(permission_classes=[IsAdminOrIsSelf]) + @detail_route(methods=['post'], permission_classes=[IsAdminOrIsSelf]) def set_password(self, request, pk=None): ... -The `@action` and `@list_action` decorators will route `POST` requests by default, but may also accept other HTTP methods, by using the `methods` argument. For example: +By default, the decorators will route `GET` requests, but may also accept other HTTP methods, by using the `methods` argument. For example: - @action(methods=['POST', 'DELETE']) + @detail_route(methods=['post', 'delete']) def unset_password(self, request, pk=None): ... --- diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index f16add39d..f126ba045 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -25,7 +25,7 @@ Here we've used `ReadOnlyModelViewSet` class to automatically provide the defaul Next we're going to replace the `SnippetList`, `SnippetDetail` and `SnippetHighlight` view classes. We can remove the three views, and again replace them with a single class. - from rest_framework.decorators import link + from rest_framework.decorators import detail_route class SnippetViewSet(viewsets.ModelViewSet): """ @@ -39,7 +39,7 @@ Next we're going to replace the `SnippetList`, `SnippetDetail` and `SnippetHighl permission_classes = (permissions.IsAuthenticatedOrReadOnly, IsOwnerOrReadOnly,) - @link(renderer_classes=[renderers.StaticHTMLRenderer]) + @detail_route(renderer_classes=[renderers.StaticHTMLRenderer]) def highlight(self, request, *args, **kwargs): snippet = self.get_object() return Response(snippet.highlighted) @@ -49,9 +49,9 @@ Next we're going to replace the `SnippetList`, `SnippetDetail` and `SnippetHighl This time we've used the `ModelViewSet` class in order to get the complete set of default read and write operations. -Notice that we've also used the `@link` decorator to create a custom action, named `highlight`. This decorator can be used to add any custom endpoints that don't fit into the standard `create`/`update`/`delete` style. +Notice that we've also used the `@detail_route` decorator to create a custom action, named `highlight`. This decorator can be used to add any custom endpoints that don't fit into the standard `create`/`update`/`delete` style. -Custom actions which use the `@link` decorator will respond to `GET` requests. We could have instead used the `@action` decorator if we wanted an action that responded to `POST` requests. +Custom actions which use the `@detail_route` decorator will respond to `GET` requests. We can use the `methods` argument if we wanted an action that responded to `POST` requests. ## Binding ViewSets to URLs explicitly diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index 92f551db7..1ca176f2c 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -3,13 +3,14 @@ The most important decorator in this module is `@api_view`, which is used for writing function-based views with REST framework. There are also various decorators for setting the API policies on function -based views, as well as the `@action` and `@link` decorators, which are +based views, as well as the `@detail_route` and `@list_route` decorators, which are used to annotate methods on viewsets that should be included by routers. """ from __future__ import unicode_literals from rest_framework.compat import six from rest_framework.views import APIView import types +import warnings def api_view(http_method_names): @@ -111,6 +112,8 @@ def link(**kwargs): """ Used to mark a method on a ViewSet that should be routed for detail GET requests. """ + msg = 'link is pending deprecation. Use detail_route instead.' + warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) def decorator(func): func.bind_to_methods = ['get'] func.detail = True @@ -123,6 +126,8 @@ def action(methods=['post'], **kwargs): """ Used to mark a method on a ViewSet that should be routed for detail POST requests. """ + msg = 'action is pending deprecation. Use detail_route instead.' + warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) def decorator(func): func.bind_to_methods = methods func.detail = True @@ -131,21 +136,21 @@ def action(methods=['post'], **kwargs): return decorator -def list_link(**kwargs): +def detail_route(methods=['get'], **kwargs): """ - Used to mark a method on a ViewSet that should be routed for GET requests. + Used to mark a method on a ViewSet that should be routed for detail requests. """ def decorator(func): - func.bind_to_methods = ['get'] - func.detail = False + func.bind_to_methods = methods + func.detail = True func.kwargs = kwargs return func return decorator -def list_action(methods=['post'], **kwargs): +def list_route(methods=['get'], **kwargs): """ - Used to mark a method on a ViewSet that should be routed for POST requests. + Used to mark a method on a ViewSet that should be routed for list requests. """ def decorator(func): func.bind_to_methods = methods diff --git a/rest_framework/routers.py b/rest_framework/routers.py index b8f19b66a..b761ba9ae 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -91,7 +91,7 @@ class SimpleRouter(BaseRouter): initkwargs={'suffix': 'List'} ), # Dynamically generated list routes. - # Generated using @list_action or @list_link decorators + # Generated using @list_route decorator # on methods of the viewset. DynamicListRoute( url=r'^{prefix}/{methodname}{trailing_slash}$', @@ -111,7 +111,7 @@ class SimpleRouter(BaseRouter): initkwargs={'suffix': 'Instance'} ), # Dynamically generated detail routes. - # Generated using @action or @link decorators on methods of the viewset. + # Generated using @detail_route decorator on methods of the viewset. DynamicDetailRoute( url=r'^{prefix}/{lookup}/{methodname}{trailing_slash}$', name='{basename}-{methodnamehyphen}', @@ -148,7 +148,7 @@ class SimpleRouter(BaseRouter): known_actions = flatten([route.mapping.values() for route in self.routes if isinstance(route, Route)]) - # Determine any `@action` or `@link` decorated methods on the viewset + # Determine any `@detail_route` or `@list_route` decorated methods on the viewset detail_routes = [] list_routes = [] for methodname in dir(viewset): @@ -157,8 +157,8 @@ class SimpleRouter(BaseRouter): detail = getattr(attr, 'detail', True) if httpmethods: if methodname in known_actions: - raise ImproperlyConfigured('Cannot use @action, @link, @list_action ' - 'or @list_link decorator on method "%s" ' + raise ImproperlyConfigured('Cannot use @detail_route or @list_route ' + 'decorators on method "%s" ' 'as it is an existing route' % methodname) httpmethods = [method.lower() for method in httpmethods] if detail: @@ -169,7 +169,7 @@ class SimpleRouter(BaseRouter): ret = [] for route in self.routes: if isinstance(route, DynamicDetailRoute): - # Dynamic detail routes (@link or @action decorator) + # Dynamic detail routes (@detail_route decorator) for httpmethods, methodname in detail_routes: initkwargs = route.initkwargs.copy() initkwargs.update(getattr(viewset, methodname).kwargs) @@ -180,7 +180,7 @@ class SimpleRouter(BaseRouter): initkwargs=initkwargs, )) elif isinstance(route, DynamicListRoute): - # Dynamic list routes (@list_link or @list_action decorator) + # Dynamic list routes (@list_route decorator) for httpmethods, methodname in list_routes: initkwargs = route.initkwargs.copy() initkwargs.update(getattr(viewset, methodname).kwargs) diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py index 393101763..c3597e389 100644 --- a/rest_framework/tests/test_routers.py +++ b/rest_framework/tests/test_routers.py @@ -4,7 +4,7 @@ from django.test import TestCase from django.core.exceptions import ImproperlyConfigured from rest_framework import serializers, viewsets, permissions from rest_framework.compat import include, patterns, url -from rest_framework.decorators import link, action, list_link, list_action +from rest_framework.decorators import detail_route, list_route from rest_framework.response import Response from rest_framework.routers import SimpleRouter, DefaultRouter from rest_framework.test import APIRequestFactory @@ -18,23 +18,23 @@ class BasicViewSet(viewsets.ViewSet): def list(self, request, *args, **kwargs): return Response({'method': 'list'}) - @action() + @detail_route(methods=['post']) def action1(self, request, *args, **kwargs): return Response({'method': 'action1'}) - @action() + @detail_route(methods=['post']) def action2(self, request, *args, **kwargs): return Response({'method': 'action2'}) - @action(methods=['post', 'delete']) + @detail_route(methods=['post', 'delete']) def action3(self, request, *args, **kwargs): return Response({'method': 'action2'}) - @link() + @detail_route() def link1(self, request, *args, **kwargs): return Response({'method': 'link1'}) - @link() + @detail_route() def link2(self, request, *args, **kwargs): return Response({'method': 'link2'}) @@ -175,7 +175,7 @@ class TestActionKeywordArgs(TestCase): class TestViewSet(viewsets.ModelViewSet): permission_classes = [] - @action(permission_classes=[permissions.AllowAny]) + @detail_route(methods=['post'], permission_classes=[permissions.AllowAny]) def custom(self, request, *args, **kwargs): return Response({ 'permission_classes': self.permission_classes @@ -196,14 +196,14 @@ class TestActionKeywordArgs(TestCase): class TestActionAppliedToExistingRoute(TestCase): """ - Ensure `@action` decorator raises an except when applied + Ensure `@detail_route` decorator raises an except when applied to an existing route """ def test_exception_raised_when_action_applied_to_existing_route(self): class TestViewSet(viewsets.ModelViewSet): - @action() + @detail_route(methods=['post']) def retrieve(self, request, *args, **kwargs): return Response({ 'hello': 'world' @@ -220,20 +220,20 @@ class DynamicListAndDetailViewSet(viewsets.ViewSet): def list(self, request, *args, **kwargs): return Response({'method': 'list'}) - @list_action() - def list_action(self, request, *args, **kwargs): + @list_route(methods=['post']) + def list_route_post(self, request, *args, **kwargs): return Response({'method': 'action1'}) - @action() - def detail_action(self, request, *args, **kwargs): + @detail_route(methods=['post']) + def detail_route_post(self, request, *args, **kwargs): return Response({'method': 'action2'}) - @list_link() - def list_link(self, request, *args, **kwargs): + @list_route() + def list_route_get(self, request, *args, **kwargs): return Response({'method': 'link1'}) - @link() - def detail_link(self, request, *args, **kwargs): + @detail_route() + def detail_route_get(self, request, *args, **kwargs): return Response({'method': 'link2'}) @@ -241,11 +241,11 @@ class TestDynamicListAndDetailRouter(TestCase): def setUp(self): self.router = SimpleRouter() - def test_link_and_action_decorator(self): + def test_list_and_detail_route_decorators(self): routes = self.router.get_routes(DynamicListAndDetailViewSet) decorator_routes = [r for r in routes if not (r.name.endswith('-list') or r.name.endswith('-detail'))] # Make sure all these endpoints exist and none have been clobbered - for i, endpoint in enumerate(['list_action', 'list_link', 'detail_action', 'detail_link']): + for i, endpoint in enumerate(['list_route_get', 'list_route_post', 'detail_route_get', 'detail_route_post']): route = decorator_routes[i] # check url listing if endpoint.startswith('list_'): @@ -255,7 +255,7 @@ class TestDynamicListAndDetailRouter(TestCase): self.assertEqual(route.url, '^{{prefix}}/{{lookup}}/{0}{{trailing_slash}}$'.format(endpoint)) # check method to function mapping - if endpoint.endswith('action'): + if endpoint.endswith('_post'): method_map = 'post' else: method_map = 'get' From db9672d3048eebb3d3c3fb2b4a345e17b5aa23cc Mon Sep 17 00:00:00 2001 From: Alex Burgel Date: Wed, 24 Jul 2013 17:24:29 -0400 Subject: [PATCH 0020/1652] Add support for removing field files by sending an empty string --- rest_framework/fields.py | 5 ++++- rest_framework/tests/test_files.py | 28 ++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f99318877..9ba5c0eb7 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -307,7 +307,10 @@ class WritableField(Field): try: if self.use_files: files = files or {} - native = files[field_name] + try: + native = files[field_name] + except KeyError: + native = data[field_name] else: native = data[field_name] except KeyError: diff --git a/rest_framework/tests/test_files.py b/rest_framework/tests/test_files.py index 487046aca..495c2a7fd 100644 --- a/rest_framework/tests/test_files.py +++ b/rest_framework/tests/test_files.py @@ -7,13 +7,13 @@ import datetime class UploadedFile(object): - def __init__(self, file, created=None): + def __init__(self, file=None, created=None): self.file = file self.created = created or datetime.datetime.now() class UploadedFileSerializer(serializers.Serializer): - file = serializers.FileField() + file = serializers.FileField(required=False) created = serializers.DateTimeField() def restore_object(self, attrs, instance=None): @@ -47,5 +47,25 @@ class FileSerializerTests(TestCase): now = datetime.datetime.now() serializer = UploadedFileSerializer(data={'created': now}) - self.assertFalse(serializer.is_valid()) - self.assertIn('file', serializer.errors) + self.assertTrue(serializer.is_valid()) + self.assertEqual(serializer.object.created, now) + self.assertIsNone(serializer.object.file) + + def test_remove_with_empty_string(self): + """ + Passing empty string as data should cause file to be removed + + Test for: + https://github.com/tomchristie/django-rest-framework/issues/937 + """ + now = datetime.datetime.now() + file = BytesIO(six.b('stuff')) + file.name = 'stuff.txt' + file.size = len(file.getvalue()) + + uploaded_file = UploadedFile(file=file, created=now) + + serializer = UploadedFileSerializer(instance=uploaded_file, data={'created': now, 'file': ''}) + self.assertTrue(serializer.is_valid()) + self.assertEqual(serializer.object.created, uploaded_file.created) + self.assertIsNone(serializer.object.file) From 1a4ff1567ea4231cde9a2f23725550a754f3f54c Mon Sep 17 00:00:00 2001 From: James Rutherford Date: Mon, 29 Jul 2013 10:16:15 +0100 Subject: [PATCH 0021/1652] Updated authtoken docs to mention south migrations --- docs/api-guide/authentication.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index ee1282b5a..fd6bfb56a 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -121,7 +121,7 @@ To use the `TokenAuthentication` scheme, include `rest_framework.authtoken` in y 'rest_framework.authtoken' ) -Make sure to run `manage.py syncdb` after changing your settings. +Make sure to run `manage.py syncdb` after changing your settings. The `authtoken` database tables are managed by south (see [Schema migrations](#schema-migrations) below). You'll also need to create tokens for your users. From 195b1af7ba34b833fc17f5693d7fbd9c8e7cce78 Mon Sep 17 00:00:00 2001 From: James Rutherford Date: Mon, 29 Jul 2013 10:16:51 +0100 Subject: [PATCH 0022/1652] Minor typo fix --- docs/api-guide/authentication.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index fd6bfb56a..b1ab46227 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -203,7 +203,7 @@ You can do so by inserting a `needed_by` attribute in your user migration: For more details, see the [south documentation on dependencies][south-dependencies]. -Also not that if you're using a `post_save` signal to create tokens, then the first time you create the database tables, you'll need to ensure any migrations are run prior to creating any superusers. For example: +Also note that if you're using a `post_save` signal to create tokens, then the first time you create the database tables, you'll need to ensure any migrations are run prior to creating any superusers. For example: python manage.py syncdb --noinput # Won't create a superuser just yet, due to `--noinput`. python manage.py migrate From 205c626d6ec472603207e12f8cf9deb3f00bf729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Mon, 29 Jul 2013 15:53:26 +0200 Subject: [PATCH 0023/1652] Add @jimr for #1013 thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 95cac7176..4cc7f34b8 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -151,6 +151,7 @@ The following people have helped make REST framework great. * Will Kahn-Greene - [willkg] * Kevin Brown - [kevin-brown] * Rodrigo Martell - [coderigo] +* James Rutherford - [jimr] Many thanks to everyone who's contributed to the project. @@ -338,3 +339,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [coderigo]: https://github.com/coderigo [willkg]: https://github.com/willkg [kevin-brown]: https://github.com/kevin-brown +[jimr]: https://github.com/jimr From 56d19dcc1c71494e83336a799ccf1f500a5af3b8 Mon Sep 17 00:00:00 2001 From: leandersikma Date: Tue, 30 Jul 2013 11:26:17 +0200 Subject: [PATCH 0024/1652] Wrong name of the login_base html file. Changed rest_framework/base_login.html to rest_framework/login_base.html (which is the correct name the user should extends in their templates). --- docs/topics/browsable-api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/browsable-api.md b/docs/topics/browsable-api.md index 2ae8cadb9..b2c78f3c6 100644 --- a/docs/topics/browsable-api.md +++ b/docs/topics/browsable-api.md @@ -90,7 +90,7 @@ The browsable API makes use of the Bootstrap tooltips component. Any element wi ### Login Template -To add branding and customize the look-and-feel of the login template, create a template called `login.html` and add it to your project, eg: `templates/rest_framework/login.html`. The template should extend from `rest_framework/base_login.html`. +To add branding and customize the look-and-feel of the login template, create a template called `login.html` and add it to your project, eg: `templates/rest_framework/login.html`. The template should extend from `rest_framework/login_base.html`. You can add your site name or branding by including the branding block: From 294d957361c78cdafcef60f915738ed0e533327c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Wed, 31 Jul 2013 20:14:49 +0200 Subject: [PATCH 0025/1652] Add drf-any-permission docs entry --- docs/api-guide/permissions.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 2c0a055c8..57636bc6f 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -188,6 +188,16 @@ Note that the generic views will check the appropriate object level permissions, Also note that the generic views will only check the object-level permissions for views that retrieve a single model instance. If you require object-level filtering of list views, you'll need to filter the queryset separately. See the [filtering documentation][filtering] for more details. +--- + +# Third party packages + +The following third party packages are also available. + +## DRF Any Permissions + +The [DRF Any Permissions][drf-any-permissions] packages provides a different permission behavior in contrast to the REST framework. Only one of the given permissions have to be true in order to get access to the view. + [cite]: https://developer.apple.com/library/mac/#documentation/security/Conceptual/AuthenticationAndAuthorizationGuide/Authorization/Authorization.html [authentication]: authentication.md [throttling]: throttling.md @@ -197,3 +207,4 @@ Also note that the generic views will only check the object-level permissions fo [django-oauth2-provider]: https://github.com/caffeinehit/django-oauth2-provider [2.2-announcement]: ../topics/2.2-announcement.md [filtering]: filtering.md +[drf-any-permissions]: https://github.com/kevin-brown/drf-any-permissions From e61210399154723f342ab9295c938bf72c8da7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Wed, 31 Jul 2013 20:25:28 +0200 Subject: [PATCH 0026/1652] Fix typo --- docs/api-guide/permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 57636bc6f..5597886d2 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -196,7 +196,7 @@ The following third party packages are also available. ## DRF Any Permissions -The [DRF Any Permissions][drf-any-permissions] packages provides a different permission behavior in contrast to the REST framework. Only one of the given permissions have to be true in order to get access to the view. +The [DRF Any Permissions][drf-any-permissions] packages provides a different permission behavior in contrast to the REST framework. Only one of the given permissions has to be true in order to get access to the view. [cite]: https://developer.apple.com/library/mac/#documentation/security/Conceptual/AuthenticationAndAuthorizationGuide/Authorization/Authorization.html [authentication]: authentication.md From 3802442c89a722da7e48210d315856b5993fcdbe Mon Sep 17 00:00:00 2001 From: Ricky Rosario Date: Thu, 1 Aug 2013 17:02:16 -0400 Subject: [PATCH 0027/1652] Add missing comma to generic view example. --- docs/api-guide/generic-views.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 67853ed01..32a4feef4 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -40,7 +40,7 @@ For more complex cases you might also want to override various methods on the vi For very simple cases you might want to pass through any class attributes using the `.as_view()` method. For example, your URLconf might include something the following entry. - url(r'^/users/', ListCreateAPIView.as_view(model=User) name='user-list') + url(r'^/users/', ListCreateAPIView.as_view(model=User), name='user-list') --- From e4144b5b674cc8849c248727a09b82b82d1a01c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Fri, 2 Aug 2013 08:59:18 +0200 Subject: [PATCH 0028/1652] Add @rlr for #1022 thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 4cc7f34b8..d1fa3681d 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -152,6 +152,7 @@ The following people have helped make REST framework great. * Kevin Brown - [kevin-brown] * Rodrigo Martell - [coderigo] * James Rutherford - [jimr] +* ricky rosario - [rlr] Many thanks to everyone who's contributed to the project. @@ -340,3 +341,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [willkg]: https://github.com/willkg [kevin-brown]: https://github.com/kevin-brown [jimr]: https://github.com/jimr +[rlr]: https://github.com/rlr From 4ff1dc6a11ec9e1fd897cf2fdb74d57be7420515 Mon Sep 17 00:00:00 2001 From: James Summerfield Date: Sat, 3 Aug 2013 10:23:39 +0100 Subject: [PATCH 0029/1652] Fixing typos in routers.md --- docs/api-guide/routers.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 865829057..7f53f109d 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -38,7 +38,7 @@ The example above would generate the following URL patterns: ### Extra link and actions Any methods on the viewset decorated with `@link` or `@action` will also be routed. -For example, a given method like this on the `UserViewSet` class: +For example, given a method like this on the `UserViewSet` class: @action(permission_classes=[IsAdminOrIsSelf]) def set_password(self, request, pk=None): @@ -66,7 +66,7 @@ This router includes routes for the standard set of `list`, `create`, `retrieve` POST@action decorated method -By default the URLs created by `SimpleRouter` are appending with a trailing slash. +By default the URLs created by `SimpleRouter` are appended with a trailing slash. This behavior can be modified by setting the `trailing_slash` argument to `False` when instantiating the router. For example: router = SimpleRouter(trailing_slash=False) @@ -90,7 +90,7 @@ This router is similar to `SimpleRouter` as above, but additionally includes a d POST@action decorated method -As with `SimpleRouter` the trailing slashs on the URL routes can be removed by setting the `trailing_slash` argument to `False` when instantiating the router. +As with `SimpleRouter` the trailing slashes on the URL routes can be removed by setting the `trailing_slash` argument to `False` when instantiating the router. router = DefaultRouter(trailing_slash=False) @@ -139,7 +139,7 @@ The `SimpleRouter` class provides another example of setting the `.routes` attri ## Advanced custom routers -If you want to provide totally custom behavior, you can override `BaseRouter` and override the `get_urls(self)` method. The method should insect the registered viewsets and return a list of URL patterns. The registered prefix, viewset and basename tuples may be inspected by accessing the `self.registry` attribute. +If you want to provide totally custom behavior, you can override `BaseRouter` and override the `get_urls(self)` method. The method should inspect the registered viewsets and return a list of URL patterns. The registered prefix, viewset and basename tuples may be inspected by accessing the `self.registry` attribute. You may also want to override the `get_default_base_name(self, viewset)` method, or else always explicitly set the `base_name` argument when registering your viewsets with the router. From 4d8d2340be4de905af3488dc721c7b94b1371ef0 Mon Sep 17 00:00:00 2001 From: Veronica Lynn Date: Wed, 7 Aug 2013 14:00:06 -0400 Subject: [PATCH 0030/1652] Fixed typos in a bunch of docs --- docs/api-guide/permissions.md | 2 +- docs/api-guide/relations.md | 8 ++++---- docs/api-guide/renderers.md | 2 +- docs/api-guide/responses.md | 4 ++-- docs/api-guide/reverse.md | 2 +- docs/api-guide/routers.md | 2 +- docs/api-guide/serializers.md | 6 +++--- docs/api-guide/settings.md | 4 ++-- docs/api-guide/testing.md | 2 +- docs/api-guide/views.md | 2 +- docs/topics/2.2-announcement.md | 6 +++--- docs/topics/2.3-announcement.md | 12 ++++++------ docs/topics/documenting-your-api.md | 8 ++++---- docs/tutorial/1-serialization.md | 2 +- docs/tutorial/3-class-based-views.md | 2 +- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 5597886d2..096ef3691 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -147,7 +147,7 @@ If you need to test if a request is a read operation or a write operation, you s **Note**: In versions 2.0 and 2.1, the signature for the permission checks always included an optional `obj` parameter, like so: `.has_permission(self, request, view, obj=None)`. The method would be called twice, first for the global permission checks, with no object supplied, and second for the object-level check when required. -As of version 2.2 this signature has now been replaced with two separate method calls, which is more explict and obvious. The old style signature continues to work, but it's use will result in a `PendingDeprecationWarning`, which is silent by default. In 2.3 this will be escalated to a `DeprecationWarning`, and in 2.4 the old-style signature will be removed. +As of version 2.2 this signature has now been replaced with two separate method calls, which is more explicit and obvious. The old style signature continues to work, but its use will result in a `PendingDeprecationWarning`, which is silent by default. In 2.3 this will be escalated to a `DeprecationWarning`, and in 2.4 the old-style signature will be removed. For more details see the [2.2 release announcement][2.2-announcement]. diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 50c9bc546..829a3c548 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -39,7 +39,7 @@ In order to explain the various types of relational fields, we'll use a couple o ## RelatedField -`RelatedField` may be used to represent the target of the relationship using it's `__unicode__` method. +`RelatedField` may be used to represent the target of the relationship using its `__unicode__` method. For example, the following serializer. @@ -71,7 +71,7 @@ This field is read only. ## PrimaryKeyRelatedField -`PrimaryKeyRelatedField` may be used to represent the target of the relationship using it's primary key. +`PrimaryKeyRelatedField` may be used to represent the target of the relationship using its primary key. For example, the following serializer: @@ -252,7 +252,7 @@ If you want to implement a read-write relational field, you must also implement ## Example -For, example, we could define a relational field, to serialize a track to a custom string representation, using it's ordering, title, and duration. +For, example, we could define a relational field, to serialize a track to a custom string representation, using its ordering, title, and duration. import time @@ -386,7 +386,7 @@ For more information see [the Django documentation on generic relations][generic By default, relational fields that target a ``ManyToManyField`` with a ``through`` model specified are set to read-only. -If you exlicitly specify a relational field pointing to a +If you explicitly specify a relational field pointing to a ``ManyToManyField`` with a through model, be sure to set ``read_only`` to ``True``. diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index b434efe9a..bb3d20159 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -241,7 +241,7 @@ This renderer is used for rendering HTML multipart form data. **It is not suita To implement a custom renderer, you should override `BaseRenderer`, set the `.media_type` and `.format` properties, and implement the `.render(self, data, media_type=None, renderer_context=None)` method. -The method should return a bytestring, which wil be used as the body of the HTTP response. +The method should return a bytestring, which will be used as the body of the HTTP response. The arguments passed to the `.render()` method are: diff --git a/docs/api-guide/responses.md b/docs/api-guide/responses.md index 399b7c23f..5a42aa923 100644 --- a/docs/api-guide/responses.md +++ b/docs/api-guide/responses.md @@ -24,7 +24,7 @@ Unless you want to heavily customize REST framework for some reason, you should Unlike regular `HttpResponse` objects, you do not instantiate `Response` objects with rendered content. Instead you pass in unrendered data, which may consist of any Python primitives. -The renderers used by the `Response` class cannot natively handle complex datatypes such as Django model instances, so you need to serialize the data into primative datatypes before creating the `Response` object. +The renderers used by the `Response` class cannot natively handle complex datatypes such as Django model instances, so you need to serialize the data into primitive datatypes before creating the `Response` object. You can use REST framework's `Serializer` classes to perform this data serialization, or use your own custom serialization. @@ -54,7 +54,7 @@ The rendered content of the response. The `.render()` method must have been cal ## .template_name -The `template_name`, if supplied. Only required if `HTMLRenderer` or some other custom template renderer is the accepted renderer for the reponse. +The `template_name`, if supplied. Only required if `HTMLRenderer` or some other custom template renderer is the accepted renderer for the response. ## .accepted_renderer diff --git a/docs/api-guide/reverse.md b/docs/api-guide/reverse.md index 19930dc3f..942623666 100644 --- a/docs/api-guide/reverse.md +++ b/docs/api-guide/reverse.md @@ -17,7 +17,7 @@ The advantages of doing so are: REST framework provides two utility functions to make it more simple to return absolute URIs from your Web API. -There's no requirement for you to use them, but if you do then the self-describing API will be able to automatically hyperlink it's output for you, which makes browsing the API much easier. +There's no requirement for you to use them, but if you do then the self-describing API will be able to automatically hyperlink its output for you, which makes browsing the API much easier. ## reverse diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 7f53f109d..072a2e79a 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -96,7 +96,7 @@ As with `SimpleRouter` the trailing slashes on the URL routes can be removed by # Custom Routers -Implementing a custom router isn't something you'd need to do very often, but it can be useful if you have specific requirements about how the your URLs for your API are strutured. Doing so allows you to encapsulate the URL structure in a reusable way that ensures you don't have to write your URL patterns explicitly for each new view. +Implementing a custom router isn't something you'd need to do very often, but it can be useful if you have specific requirements about how the your URLs for your API are structured. Doing so allows you to encapsulate the URL structure in a reusable way that ensures you don't have to write your URL patterns explicitly for each new view. The simplest way to implement a custom router is to subclass one of the existing router classes. The `.routes` attribute is used to template the URL patterns that will be mapped to each viewset. The `.routes` attribute is a list of `Route` named tuples. diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index a1f0853e3..bbc8d019d 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -403,7 +403,7 @@ You can change the field that is used for object lookups by setting the `lookup_ Not that the `lookup_field` will be used as the default on *all* hyperlinked fields, including both the URL identity, and any hyperlinked relationships. -For more specfic requirements such as specifying a different lookup for each field, you'll want to set the fields on the serializer explicitly. For example: +For more specific requirements such as specifying a different lookup for each field, you'll want to set the fields on the serializer explicitly. For example: class AccountSerializer(serializers.HyperlinkedModelSerializer): url = serializers.HyperlinkedIdentityField( @@ -429,7 +429,7 @@ You can create customized subclasses of `ModelSerializer` or `HyperlinkedModelSe Doing so should be considered advanced usage, and will only be needed if you have some particular serializer requirements that you often need to repeat. -## Dynamically modifiying fields +## Dynamically modifying fields Once a serializer has been initialized, the dictionary of fields that are set on the serializer may be accessed using the `.fields` attribute. Accessing and modifying this attribute allows you to dynamically modify the serializer. @@ -449,7 +449,7 @@ For example, if you wanted to be able to set which fields should be used by a se # Don't pass the 'fields' arg up to the superclass fields = kwargs.pop('fields', None) - # Instatiate the superclass normally + # Instantiate the superclass normally super(DynamicFieldsModelSerializer, self).__init__(*args, **kwargs) if fields: diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 7b114983d..0be0eb24a 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -28,7 +28,7 @@ you should use the `api_settings` object. For example. print api_settings.DEFAULT_AUTHENTICATION_CLASSES -The `api_settings` object will check for any user-defined settings, and otherwise fallback to the default values. Any setting that uses string import paths to refer to a class will automatically import and return the referenced class, instead of the string literal. +The `api_settings` object will check for any user-defined settings, and otherwise fall back to the default values. Any setting that uses string import paths to refer to a class will automatically import and return the referenced class, instead of the string literal. --- @@ -165,7 +165,7 @@ Default: `'multipart'` The renderer classes that are supported when building test requests. -The format of any of these renderer classes may be used when contructing a test request, for example: `client.post('/users', {'username': 'jamie'}, format='json')` +The format of any of these renderer classes may be used when constructing a test request, for example: `client.post('/users', {'username': 'jamie'}, format='json')` Default: diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index 40b077633..92f8d54aa 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -34,7 +34,7 @@ To support a wider set of request formats, or change the default format, [see th #### Explicitly encoding the request body -If you need to explictly encode the request body, you can do so by setting the `content_type` flag. For example: +If you need to explicitly encode the request body, you can do so by setting the `content_type` flag. For example: request = factory.post('/notes/', json.dumps({'title': 'new idea'}), content_type='application/json') diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md index 683222d16..15581e098 100644 --- a/docs/api-guide/views.md +++ b/docs/api-guide/views.md @@ -110,7 +110,7 @@ You won't typically need to override this method. ### .finalize_response(self, request, response, \*args, **kwargs) -Ensures that any `Response` object returned from the handler method will be rendered into the correct content type, as determined by the content negotation. +Ensures that any `Response` object returned from the handler method will be rendered into the correct content type, as determined by the content negotiation. You won't typically need to override this method. diff --git a/docs/topics/2.2-announcement.md b/docs/topics/2.2-announcement.md index 02cac1295..7d2760499 100644 --- a/docs/topics/2.2-announcement.md +++ b/docs/topics/2.2-announcement.md @@ -136,15 +136,15 @@ Now becomes: def has_object_permission(self, request, view, obj): return obj.owner == request.user -If you're overriding the `BasePermission` class, the old-style signature will continue to function, and will correctly handle both global and object-level permissions checks, but it's use will raise a `PendingDeprecationWarning`. +If you're overriding the `BasePermission` class, the old-style signature will continue to function, and will correctly handle both global and object-level permissions checks, but its use will raise a `PendingDeprecationWarning`. Note also that the usage of the internal APIs for permission checking on the `View` class has been cleaned up slightly, and is now documented and subject to the deprecation policy in all future versions. ### More explicit hyperlink relations behavior -When using a serializer with a `HyperlinkedRelatedField` or `HyperlinkedIdentityField`, the hyperlinks would previously use absolute URLs if the serializer context included a `'request'` key, and fallback to using relative URLs otherwise. This could lead to non-obvious behavior, as it might not be clear why some serializers generated absolute URLs, and others do not. +When using a serializer with a `HyperlinkedRelatedField` or `HyperlinkedIdentityField`, the hyperlinks would previously use absolute URLs if the serializer context included a `'request'` key, and fall back to using relative URLs otherwise. This could lead to non-obvious behavior, as it might not be clear why some serializers generated absolute URLs, and others do not. -From version 2.2 onwards, serializers with hyperlinked relationships *always* require a `'request'` key to be supplied in the context dictionary. The implicit behavior will continue to function, but it's use will raise a `PendingDeprecationWarning`. +From version 2.2 onwards, serializers with hyperlinked relationships *always* require a `'request'` key to be supplied in the context dictionary. The implicit behavior will continue to function, but its use will raise a `PendingDeprecationWarning`. [xordoquy]: https://github.com/xordoquy [django-python-3]: https://docs.djangoproject.com/en/dev/faq/install/#can-i-use-django-with-python-3 diff --git a/docs/topics/2.3-announcement.md b/docs/topics/2.3-announcement.md index 9fdebcd90..ba4351459 100644 --- a/docs/topics/2.3-announcement.md +++ b/docs/topics/2.3-announcement.md @@ -131,7 +131,7 @@ The `get_object` and `get_paginate_by` methods no longer take an optional querys Using an optional queryset with these methods continues to be supported, but will raise a `PendingDeprecationWarning`. -The `paginate_queryset` method no longer takes a `page_size` argument, or returns a four-tuple of pagination information. Instead it simply takes a queryset argument, and either returns a `page` object with an appropraite page size, or returns `None`, if pagination is not configured for the view. +The `paginate_queryset` method no longer takes a `page_size` argument, or returns a four-tuple of pagination information. Instead it simply takes a queryset argument, and either returns a `page` object with an appropriate page size, or returns `None`, if pagination is not configured for the view. Using the `page_size` argument is still supported and will trigger the old-style return type, but will raise a `PendingDeprecationWarning`. @@ -195,13 +195,13 @@ Usage of the old-style attributes continues to be supported, but will raise a `P 2.3 introduces a `DecimalField` serializer field, which returns `Decimal` instances. -For most cases APIs using model fields will behave as previously, however if you are using a custom renderer, not provided by REST framework, then you may now need to add support for rendering `Decimal` instances to your renderer implmentation. +For most cases APIs using model fields will behave as previously, however if you are using a custom renderer, not provided by REST framework, then you may now need to add support for rendering `Decimal` instances to your renderer implementation. ## ModelSerializers and reverse relationships The support for adding reverse relationships to the `fields` option on a `ModelSerializer` class means that the `get_related_field` and `get_nested_field` method signatures have now changed. -In the unlikely event that you're providing a custom serializer class, and implementing these methods you should note the new call signature for both methods is now `(self, model_field, related_model, to_many)`. For revese relationships `model_field` will be `None`. +In the unlikely event that you're providing a custom serializer class, and implementing these methods you should note the new call signature for both methods is now `(self, model_field, related_model, to_many)`. For reverse relationships `model_field` will be `None`. The old-style signature will continue to function but will raise a `PendingDeprecationWarning`. @@ -219,7 +219,7 @@ Note that the relevant methods have always been private APIs, and the docstrings ## More explicit style -The usage of `model` attribute in generic Views is still supported, but it's usage is generally being discouraged throughout the documentation, in favour of the setting the more explict `queryset` and `serializer_class` attributes. +The usage of `model` attribute in generic Views is still supported, but it's usage is generally being discouraged throughout the documentation, in favour of the setting the more explicit `queryset` and `serializer_class` attributes. For example, the following is now the recommended style for using generic views: @@ -227,7 +227,7 @@ For example, the following is now the recommended style for using generic views: queryset = MyModel.objects.all() serializer_class = MyModelSerializer -Using an explict `queryset` and `serializer_class` attributes makes the functioning of the view more clear than using the shortcut `model` attribute. +Using an explicit `queryset` and `serializer_class` attributes makes the functioning of the view more clear than using the shortcut `model` attribute. It also makes the usage of the `get_queryset()` or `get_serializer_class()` methods more obvious. @@ -246,7 +246,7 @@ It also makes the usage of the `get_queryset()` or `get_serializer_class()` meth ## Django 1.3 support -The 2.3.x release series will be the last series to provide compatiblity with Django 1.3. +The 2.3.x release series will be the last series to provide compatibility with Django 1.3. ## Version 2.2 API changes diff --git a/docs/topics/documenting-your-api.md b/docs/topics/documenting-your-api.md index 7ee538f55..6291c924a 100644 --- a/docs/topics/documenting-your-api.md +++ b/docs/topics/documenting-your-api.md @@ -16,7 +16,7 @@ The most common way to document Web APIs today is to produce documentation that Marc Gibbons' [Django REST Swagger][django-rest-swagger] integrates REST framework with the [Swagger][swagger] API documentation tool. The package produces well presented API documentation, and includes interactive tools for testing API endpoints. -The pacakge is fully documented, well supported, and comes highly recommended. +The package is fully documented, well supported, and comes highly recommended. Django REST Swagger supports REST framework versions 2.3 and above. @@ -42,7 +42,7 @@ There are various other online tools and services for providing API documentatio ## Self describing APIs -The browsable API that REST framwork provides makes it possible for your API to be entirely self describing. The documentation for each API endpoint can be provided simply by visiting the URL in your browser. +The browsable API that REST framework provides makes it possible for your API to be entirely self describing. The documentation for each API endpoint can be provided simply by visiting the URL in your browser. ![Screenshot - Self describing API][image-self-describing-api] @@ -93,11 +93,11 @@ You can modify the response behavior to `OPTIONS` requests by overriding the `me ## The hypermedia approach -To be fully RESTful an API should present it's available actions as hypermedia controls in the responses that it sends. +To be fully RESTful an API should present its available actions as hypermedia controls in the responses that it sends. In this approach, rather than documenting the available API endpoints up front, the description instead concentrates on the *media types* that are used. The available actions take may be taken on any given URL are not strictly fixed, but are instead made available by the presence of link and form controls in the returned document. -To implement a hypermedia API you'll need to decide on an appropriate media type for the API, and implement a custom renderer and parser for that media type. The [REST, Hypermedia & HATEOAS][hypermedia-docs] section of the documention includes pointers to background reading, as well as links to various hypermedia formats. +To implement a hypermedia API you'll need to decide on an appropriate media type for the API, and implement a custom renderer and parser for that media type. The [REST, Hypermedia & HATEOAS][hypermedia-docs] section of the documentation includes pointers to background reading, as well as links to various hypermedia formats. [cite]: http://roy.gbiv.com/untangled/2008/rest-apis-must-be-hypertext-driven [django-rest-swagger]: https://github.com/marcgibbons/django-rest-swagger diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 2b214d6a6..22d29285b 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -236,7 +236,7 @@ Edit the `snippet/views.py` file, and add the following. class JSONResponse(HttpResponse): """ - An HttpResponse that renders it's content into JSON. + An HttpResponse that renders its content into JSON. """ def __init__(self, data, **kwargs): content = JSONRenderer().render(data) diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md index c1b3d8f23..9fc424fee 100644 --- a/docs/tutorial/3-class-based-views.md +++ b/docs/tutorial/3-class-based-views.md @@ -81,7 +81,7 @@ Okay, we're done. If you run the development server everything should be workin One of the big wins of using class based views is that it allows us to easily compose reusable bits of behaviour. -The create/retrieve/update/delete operations that we've been using so far are going to be pretty simliar for any model-backed API views we create. Those bits of common behaviour are implemented in REST framework's mixin classes. +The create/retrieve/update/delete operations that we've been using so far are going to be pretty similar for any model-backed API views we create. Those bits of common behaviour are implemented in REST framework's mixin classes. Let's take a look at how we can compose our views by using the mixin classes. From 2761d6a4724d3dc60f817ab0718446564ca62f80 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 7 Aug 2013 20:27:41 +0100 Subject: [PATCH 0031/1652] Added @kolvia. For multiple documentation fixes in #1026. Thank you! :) --- docs/topics/credits.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index d1fa3681d..855ee479e 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -152,7 +152,8 @@ The following people have helped make REST framework great. * Kevin Brown - [kevin-brown] * Rodrigo Martell - [coderigo] * James Rutherford - [jimr] -* ricky rosario - [rlr] +* Ricky Rosario - [rlr] +* Veronica Lynn - [kolvia] Many thanks to everyone who's contributed to the project. @@ -342,3 +343,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [kevin-brown]: https://github.com/kevin-brown [jimr]: https://github.com/jimr [rlr]: https://github.com/rlr +[kolvia]: https://github.com/kolvia From edd696292ca50cb9c10b50b0124a79135d007ea4 Mon Sep 17 00:00:00 2001 From: Dan Stephenson Date: Sat, 10 Aug 2013 01:12:36 +0100 Subject: [PATCH 0032/1652] Spelling correction on read_only_fields err msg --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 682a99a47..25825df4a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -683,7 +683,7 @@ class ModelSerializer(Serializer): # in the `read_only_fields` option for field_name in self.opts.read_only_fields: assert field_name not in self.base_fields.keys(), \ - "field '%s' on serializer '%s' specfied in " \ + "field '%s' on serializer '%s' specified in " \ "`read_only_fields`, but also added " \ "as an explict field. Remove it from `read_only_fields`." % \ (field_name, self.__class__.__name__) From bbdcbe945248c5448540a1ab746b8a4b8bc8f95b Mon Sep 17 00:00:00 2001 From: Dan Stephenson Date: Sat, 10 Aug 2013 01:22:47 +0100 Subject: [PATCH 0033/1652] Spelling correction on read_only_fields err msg just spotted extras --- rest_framework/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 682a99a47..9e85cb463 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -685,10 +685,10 @@ class ModelSerializer(Serializer): assert field_name not in self.base_fields.keys(), \ "field '%s' on serializer '%s' specfied in " \ "`read_only_fields`, but also added " \ - "as an explict field. Remove it from `read_only_fields`." % \ + "as an explicit field. Remove it from `read_only_fields`." % \ (field_name, self.__class__.__name__) assert field_name in ret, \ - "Noexistant field '%s' specified in `read_only_fields` " \ + "Non-existant field '%s' specified in `read_only_fields` " \ "on serializer '%s'." % \ (field_name, self.__class__.__name__) ret[field_name].read_only = True From 54b7b6760c40d9820268207a44996e2118430744 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 12 Aug 2013 09:27:34 +0100 Subject: [PATCH 0034/1652] Added @etos. For fixes in #1029, #1030 - Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 855ee479e..c563971c1 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -154,6 +154,7 @@ The following people have helped make REST framework great. * James Rutherford - [jimr] * Ricky Rosario - [rlr] * Veronica Lynn - [kolvia] +* Dan Stephenson - [etos] Many thanks to everyone who's contributed to the project. @@ -344,3 +345,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [jimr]: https://github.com/jimr [rlr]: https://github.com/rlr [kolvia]: https://github.com/kolvia +[etos]: https://github.com/etos From cd5f1bb229f82cb1bf00c322fd5b688cf0638e97 Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Mon, 12 Aug 2013 15:41:48 +0300 Subject: [PATCH 0035/1652] Fix PATCH button title in template --- rest_framework/templates/rest_framework/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 9d939e738..51f9c2916 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -196,7 +196,7 @@ {% endif %} {% if raw_data_patch_form %} - + {% endif %} From abe655e061871a568cccf473414e350f3eb61d8b Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Mon, 12 Aug 2013 21:01:37 +0300 Subject: [PATCH 0036/1652] Make OneToOneSource.target nullable --- rest_framework/tests/test_relations_nested.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rest_framework/tests/test_relations_nested.py b/rest_framework/tests/test_relations_nested.py index 8325580f6..30229687c 100644 --- a/rest_framework/tests/test_relations_nested.py +++ b/rest_framework/tests/test_relations_nested.py @@ -10,7 +10,8 @@ class OneToOneTarget(models.Model): class OneToOneSource(models.Model): name = models.CharField(max_length=100) - target = models.OneToOneField(OneToOneTarget, related_name='source') + target = models.OneToOneField(OneToOneTarget, related_name='source', + null=True, blank=True) class OneToManyTarget(models.Model): @@ -21,7 +22,7 @@ class OneToManySource(models.Model): name = models.CharField(max_length=100) target = models.ForeignKey(OneToManyTarget, related_name='sources') - + class ReverseNestedOneToOneTests(TestCase): def setUp(self): class OneToOneSourceSerializer(serializers.ModelSerializer): From 901d2b0eb8270befa051510e190f3d5679086c7f Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Mon, 12 Aug 2013 21:02:59 +0300 Subject: [PATCH 0037/1652] Failing test case for nullifying nested object --- rest_framework/tests/test_relations_nested.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/rest_framework/tests/test_relations_nested.py b/rest_framework/tests/test_relations_nested.py index 30229687c..d393b0c35 100644 --- a/rest_framework/tests/test_relations_nested.py +++ b/rest_framework/tests/test_relations_nested.py @@ -180,6 +180,25 @@ class ForwardNestedOneToOneTests(TestCase): ] self.assertEqual(serializer.data, expected) + def test_one_to_one_update_to_null(self): + data = {'id': 3, 'name': 'source-3-updated', 'target': None} + instance = OneToOneSource.objects.get(pk=3) + serializer = self.Serializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'source-3-updated') + self.assertEqual(obj.target, None) + + queryset = OneToOneSource.objects.all() + serializer = self.Serializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, + {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, + {'id': 3, 'name': 'source-3-updated', 'target': None} + ] + self.assertEqual(serializer.data, expected) # TODO: Nullable 1-1 tests # def test_one_to_one_delete(self): From ff1efcf60f0a9b66cdb736f8c0b2cfe2fc84cdf5 Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Mon, 12 Aug 2013 18:08:23 +0300 Subject: [PATCH 0038/1652] If null or blank - don't save the nested object --- rest_framework/serializers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index d8f9145ec..2b260c256 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -522,7 +522,7 @@ class BaseSerializer(WritableField): if self.object._deleted: [self.delete_object(item) for item in self.object._deleted] else: - self.save_object(self.object, **kwargs) + self.save_object(self.object, **kwargs) return self.object @@ -891,7 +891,8 @@ class ModelSerializer(Serializer): # Nested relationships need to be saved before we can save the # parent instance. for field_name, sub_object in obj._nested_forward_relations.items(): - self.save_object(sub_object) + if sub_object: + self.save_object(sub_object) setattr(obj, field_name, sub_object) obj.save(**kwargs) From 770d496307f1f9d3c8a95a167a506e59302f0de4 Mon Sep 17 00:00:00 2001 From: martync Date: Tue, 13 Aug 2013 09:19:40 +0200 Subject: [PATCH 0039/1652] Small typo --- docs/tutorial/6-viewsets-and-routers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index f16add39d..8a1a1ae0c 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -10,7 +10,7 @@ A `ViewSet` class is only bound to a set of method handlers at the last moment, Let's take our current set of views, and refactor them into view sets. -First of all let's refactor our `UserList` and `UserDetail` views into a single `UserViewSet`. We can remove the two views, and replace then with a single class: +First of all let's refactor our `UserList` and `UserDetail` views into a single `UserViewSet`. We can remove the two views, and replace them with a single class: from rest_framework import viewsets From 999056cde1c6355d5ca036f109b35b41cb9d47cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Tue, 13 Aug 2013 10:43:07 +0200 Subject: [PATCH 0040/1652] Add @martync for #1033 thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index c563971c1..b91f051b8 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -155,6 +155,7 @@ The following people have helped make REST framework great. * Ricky Rosario - [rlr] * Veronica Lynn - [kolvia] * Dan Stephenson - [etos] +* Martin Clement - [martync] Many thanks to everyone who's contributed to the project. @@ -346,3 +347,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [rlr]: https://github.com/rlr [kolvia]: https://github.com/kolvia [etos]: https://github.com/etos +[martync]: https://github.com/martync From e677f3ee5c9435594ce58a3256a119c08bdc1e42 Mon Sep 17 00:00:00 2001 From: Krzysztof Jurewicz Date: Tue, 13 Aug 2013 13:26:30 +0200 Subject: [PATCH 0041/1652] PATCH requests should not be able to create objects. --- rest_framework/mixins.py | 13 ++++++++----- rest_framework/tests/test_generics.py | 11 +++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index f11def6d4..59d644694 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -142,11 +142,14 @@ class UpdateModelMixin(object): try: return self.get_object() except Http404: - # If this is a PUT-as-create operation, we need to ensure that - # we have relevant permissions, as if this was a POST request. - # This will either raise a PermissionDenied exception, - # or simply return None - self.check_permissions(clone_request(self.request, 'POST')) + if self.request.method == 'PUT': + # For PUT-as-create operation, we need to ensure that we have + # relevant permissions, as if this was a POST request. This + # will either raise a PermissionDenied exception, or simply + # return None. + self.check_permissions(clone_request(self.request, 'POST')) + else: + raise def pre_save(self, obj): """ diff --git a/rest_framework/tests/test_generics.py b/rest_framework/tests/test_generics.py index 1550880b5..7a87d3892 100644 --- a/rest_framework/tests/test_generics.py +++ b/rest_framework/tests/test_generics.py @@ -338,6 +338,17 @@ class TestInstanceView(TestCase): new_obj = SlugBasedModel.objects.get(slug='test_slug') self.assertEqual(new_obj.text, 'foobar') + def test_patch_cannot_create_an_object(self): + """ + PATCH requests should not be able to create objects. + """ + data = {'text': 'foobar'} + request = factory.patch('/999', data, format='json') + with self.assertNumQueries(1): + response = self.view(request, pk=999).render() + self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + self.assertFalse(self.objects.filter(id=999).exists()) + class TestOverriddenGetObject(TestCase): """ From 1d8a80f5cc41f157403771439f15c9b7d615a43b Mon Sep 17 00:00:00 2001 From: Jeremy Satterfield Date: Tue, 13 Aug 2013 15:31:58 -0500 Subject: [PATCH 0042/1652] don't set X-Throttle-Wait-Second header if throttle wait is None --- rest_framework/tests/test_throttling.py | 33 ++++++++++++++++++++++++- rest_framework/views.py | 2 +- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/rest_framework/tests/test_throttling.py b/rest_framework/tests/test_throttling.py index 19bc691ae..41bff6926 100644 --- a/rest_framework/tests/test_throttling.py +++ b/rest_framework/tests/test_throttling.py @@ -7,7 +7,7 @@ from django.contrib.auth.models import User from django.core.cache import cache from rest_framework.test import APIRequestFactory from rest_framework.views import APIView -from rest_framework.throttling import UserRateThrottle, ScopedRateThrottle +from rest_framework.throttling import BaseThrottle, UserRateThrottle, ScopedRateThrottle from rest_framework.response import Response @@ -21,6 +21,14 @@ class User3MinRateThrottle(UserRateThrottle): scope = 'minutes' +class NonTimeThrottle(BaseThrottle): + def allow_request(self, request, view): + if not hasattr(self.__class__, 'called'): + self.__class__.called = True + return True + return False + + class MockView(APIView): throttle_classes = (User3SecRateThrottle,) @@ -35,6 +43,13 @@ class MockView_MinuteThrottling(APIView): return Response('foo') +class MockView_NonTimeThrottling(APIView): + throttle_classes = (NonTimeThrottle,) + + def get(self, request): + return Response('foo') + + class ThrottlingTests(TestCase): def setUp(self): """ @@ -140,6 +155,22 @@ class ThrottlingTests(TestCase): (80, None) )) + def test_non_time_throttle(self): + """ + Ensure for second based throttles. + """ + request = self.factory.get('/') + + self.assertFalse(hasattr(MockView_NonTimeThrottling.throttle_classes[0], 'called')) + + response = MockView_NonTimeThrottling.as_view()(request) + self.assertFalse('X-Throttle-Wait-Seconds' in response) + + self.assertTrue(MockView_NonTimeThrottling.throttle_classes[0].called) + + response = MockView_NonTimeThrottling.as_view()(request) + self.assertFalse('X-Throttle-Wait-Seconds' in response) + class ScopedRateThrottleTests(TestCase): """ diff --git a/rest_framework/views.py b/rest_framework/views.py index 37bba7f02..d51233a93 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -269,7 +269,7 @@ class APIView(View): Handle any exception that occurs, by returning an appropriate response, or re-raising the error. """ - if isinstance(exc, exceptions.Throttled): + if isinstance(exc, exceptions.Throttled) and exc.wait is not None: # Throttle wait header self.headers['X-Throttle-Wait-Seconds'] = '%d' % exc.wait From 2f03870ae12479cbfdce68db1a30bad6fa15b311 Mon Sep 17 00:00:00 2001 From: JT Date: Tue, 13 Aug 2013 18:48:49 -0500 Subject: [PATCH 0043/1652] Fix for "No module named compat" --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f99318877..add9d224d 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -924,7 +924,7 @@ class ImageField(FileField): if f is None: return None - from compat import Image + from rest_framework.compat import Image assert Image is not None, 'PIL must be installed for ImageField support' # We need to get a file object for PIL. We might have a path or we might From 7bc63fbb11525c37fa73e1ffa9a6409a48aab4ac Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 14 Aug 2013 13:17:30 +0100 Subject: [PATCH 0044/1652] Added @jsatt. For fix & tests in #1037. --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index b91f051b8..1b34d5e0c 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -156,6 +156,7 @@ The following people have helped make REST framework great. * Veronica Lynn - [kolvia] * Dan Stephenson - [etos] * Martin Clement - [martync] +* Jeremy Satterfield - [jsatt] Many thanks to everyone who's contributed to the project. @@ -348,3 +349,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [kolvia]: https://github.com/kolvia [etos]: https://github.com/etos [martync]: https://github.com/martync +[jsatt]: https://github.com/jsatt From 486f4c8047b18cc753e1969079b58ca3da6ab43f Mon Sep 17 00:00:00 2001 From: Chad Barrington Date: Wed, 14 Aug 2013 15:18:44 -0500 Subject: [PATCH 0045/1652] Update filters.py Here's a little cleanup for ya, brah! --- rest_framework/filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index c058bc715..fbfdd099e 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -134,7 +134,7 @@ class OrderingFilter(BaseFilterBackend): ordering = self.remove_invalid_fields(queryset, ordering) if not ordering: - # Use 'ordering' attribtue by default + # Use 'ordering' attribute by default ordering = self.get_default_ordering(view) if ordering: From 99083baf25d3145d034336b2569b79488cf1662b Mon Sep 17 00:00:00 2001 From: Chad Barrington Date: Wed, 14 Aug 2013 16:01:25 -0500 Subject: [PATCH 0046/1652] Update filters.py Fixed cut n pasted get_ordering docstring for ya bro. --- rest_framework/filters.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index fbfdd099e..4079e1bd5 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -109,8 +109,7 @@ class OrderingFilter(BaseFilterBackend): def get_ordering(self, request): """ - Search terms are set by a ?search=... query parameter, - and may be comma and/or whitespace delimited. + Ordering is set by a comma delimited ?ordering=... query parameter. """ params = request.QUERY_PARAMS.get(self.ordering_param) if params: From d07dae6e79d53fdcfc7d88e085fe7e6da97c9c74 Mon Sep 17 00:00:00 2001 From: Christopher Paolini Date: Thu, 15 Aug 2013 12:41:52 -0400 Subject: [PATCH 0047/1652] Ability to override name/description of view Added settings and additions to formatting.py --- rest_framework/settings.py | 4 ++++ rest_framework/utils/formatting.py | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 8fd177d58..b65e42cfe 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -69,6 +69,10 @@ DEFAULTS = { 'PAGINATE_BY': None, 'PAGINATE_BY_PARAM': None, + # View configuration + 'VIEW_NAME_FUNCTION': None, + 'VIEW_DESCRIPTION_FUNCTION': None, + # Authentication 'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser', 'UNAUTHENTICATED_TOKEN': None, diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index 4bec83877..c908ce664 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -7,6 +7,7 @@ from django.utils.html import escape from django.utils.safestring import mark_safe from rest_framework.compat import apply_markdown, smart_text import re +from rest_framework.settings import api_settings def _remove_trailing_string(content, trailing): @@ -48,7 +49,14 @@ def _camelcase_to_spaces(content): def get_view_name(cls, suffix=None): """ Return a formatted name for an `APIView` class or `@api_view` function. + If a VIEW_NAME_FUNCTION is set in settings the value of that will be used + if that value is "falsy" then the normal formatting will be used. """ + if api_settings.VIEW_NAME_FUNCTION: + name = api_settings.VIEW_NAME_FUNCTION(cls, suffix) + if name: + return name + name = cls.__name__ name = _remove_trailing_string(name, 'View') name = _remove_trailing_string(name, 'ViewSet') @@ -61,7 +69,14 @@ def get_view_name(cls, suffix=None): def get_view_description(cls, html=False): """ Return a description for an `APIView` class or `@api_view` function. + If a VIEW_DESCRIPTION_FUNCTION is set in settings the value of that will be used + if that value is "falsy" then the normal formatting will be used. """ + if api_settings.VIEW_DESCRIPTION_FUNCTION: + description = api_settings.VIEW_DESCRIPTION_FUNCTION(cls) + if description: + return markup_description(description) + description = cls.__doc__ or '' description = _remove_leading_indent(smart_text(description)) if html: From f34b9ff0498ca054bfe65b4da99b01d48ff052b8 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 15 Aug 2013 21:36:45 +0100 Subject: [PATCH 0048/1652] AnonRateThrottle should always allow authenticated users. Closes #994 --- rest_framework/throttling.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index f6bb1cc84..65b455930 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -96,6 +96,9 @@ class SimpleRateThrottle(BaseThrottle): return True self.key = self.get_cache_key(request, view) + if self.key is None: + return True + self.history = cache.get(self.key, []) self.now = self.timer() From d5b56310b0cc99df1cd1e61fc35f251c46036d62 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 16 Aug 2013 13:23:27 +0100 Subject: [PATCH 0049/1652] Update release notes --- docs/topics/release-notes.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index d379ab74f..876f46d8c 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,17 @@ You can determine your currently installed version using `pip freeze`: ## 2.3.x series +### master + +* Added `APITestClient`, `APIRequestFactory` and `APITestCase` etc... +* Refactor `SessionAuthentication` to allow esier override for CSRF exemption. +* Remove 'Hold down "Control" message from help_text". +* Added admin configuration for tokens. +* Bugfix: `AnonRateThrottle` fixed to not throttle authenticated users. +* Bugfix: Don't set `X-Throttle-Wait-Seconds` when throttle does not have `wait` value. +* Bugfix: Fixed `PATCH` button title in browsable API. +* Bugfix: Fix issue with OAuth2 provider naive datetimes. + ### 2.3.6 **Date**: 27th June 2013 From 13ca305b06a6d9bf982559640fa488f7ad31e2f8 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 16 Aug 2013 13:27:21 +0100 Subject: [PATCH 0050/1652] Tweak docs. --- docs/api-guide/permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 096ef3691..c6372f981 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -196,7 +196,7 @@ The following third party packages are also available. ## DRF Any Permissions -The [DRF Any Permissions][drf-any-permissions] packages provides a different permission behavior in contrast to the REST framework. Only one of the given permissions has to be true in order to get access to the view. +The [DRF Any Permissions][drf-any-permissions] packages provides a different permission behavior in contrast to REST framework. Instead of all specified permissions being required, only one of the given permissions has to be true in order to get access to the view. [cite]: https://developer.apple.com/library/mac/#documentation/security/Conceptual/AuthenticationAndAuthorizationGuide/Authorization/Authorization.html [authentication]: authentication.md From f6f69dc71d4db7492b5feecc69627dff0031e2b9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 16 Aug 2013 14:03:20 +0100 Subject: [PATCH 0051/1652] Version 2.3.7 --- docs/topics/release-notes.md | 8 +++++--- rest_framework/__init__.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 876f46d8c..624d9acd4 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,12 +40,14 @@ You can determine your currently installed version using `pip freeze`: ## 2.3.x series -### master +### 2.3.7 + +**Date**: 16th August 2013 * Added `APITestClient`, `APIRequestFactory` and `APITestCase` etc... * Refactor `SessionAuthentication` to allow esier override for CSRF exemption. -* Remove 'Hold down "Control" message from help_text". -* Added admin configuration for tokens. +* Remove 'Hold down "Control" message from help_text' widget messaging when not appropriate. +* Added admin configuration for auth tokens. * Bugfix: `AnonRateThrottle` fixed to not throttle authenticated users. * Bugfix: Don't set `X-Throttle-Wait-Seconds` when throttle does not have `wait` value. * Bugfix: Fixed `PATCH` button title in browsable API. diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 776618ac3..087808e0b 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -1,4 +1,4 @@ -__version__ = '2.3.6' +__version__ = '2.3.7' VERSION = __version__ # synonym From c1ccd8b5b5aef1bd209862f9431c9c03e25ae755 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 16 Aug 2013 14:12:24 +0100 Subject: [PATCH 0052/1652] Update docs to include testing. --- docs/index.md | 2 ++ docs/template.html | 1 + mkdocs.py | 1 + 3 files changed, 4 insertions(+) diff --git a/docs/index.md b/docs/index.md index 99cd6b882..a0ae2984d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -164,6 +164,7 @@ The API guide is your complete reference manual to all the functionality provide * [Returning URLs][reverse] * [Exceptions][exceptions] * [Status codes][status] +* [Testing][testing] * [Settings][settings] ## Topics @@ -288,6 +289,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [reverse]: api-guide/reverse.md [exceptions]: api-guide/exceptions.md [status]: api-guide/status-codes.md +[testing]: api-guide/testing.md [settings]: api-guide/settings.md [documenting-your-api]: topics/documenting-your-api.md diff --git a/docs/template.html b/docs/template.html index 27bc10622..a20c81110 100644 --- a/docs/template.html +++ b/docs/template.html @@ -89,6 +89,7 @@
  • Returning URLs
  • Exceptions
  • Status codes
    • +
  • Testing
  • Settings
    • diff --git a/mkdocs.py b/mkdocs.py index 1e3f1db3f..13228a0ce 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -69,6 +69,7 @@ path_list = [ 'api-guide/reverse.md', 'api-guide/exceptions.md', 'api-guide/status-codes.md', + 'api-guide/testing.md', 'api-guide/settings.md', 'topics/documenting-your-api.md', 'topics/ajax-csrf-cors.md', From 430f00847aece92172ad1ef3a0112897d8931019 Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Fri, 16 Aug 2013 09:20:49 -0400 Subject: [PATCH 0053/1652] Add test for BooleanField and required This tests setting required=True on a BooleanField. Test for issue #1004. --- rest_framework/tests/test_fields.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py index 6836ec86f..ebccba7d1 100644 --- a/rest_framework/tests/test_fields.py +++ b/rest_framework/tests/test_fields.py @@ -896,3 +896,12 @@ class CustomIntegerField(TestCase): self.assertFalse(serializer.is_valid()) +class BooleanField(TestCase): + """ + Tests for BooleanField + """ + def test_boolean_required(self): + class BooleanRequiredSerializer(serializers.Serializer): + bool_field = serializers.BooleanField(required=True) + + self.assertFalse(BooleanRequiredSerializer(data={}).is_valid()) From a95984e4d4b034c196d40f74fbdc6345e6d4124c Mon Sep 17 00:00:00 2001 From: Christopher Paolini Date: Fri, 16 Aug 2013 13:23:04 -0400 Subject: [PATCH 0054/1652] Settings now have default functions Updated the setting to have a default function. --- rest_framework/settings.py | 6 ++-- rest_framework/utils/formatting.py | 46 +++++++++++++----------------- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/rest_framework/settings.py b/rest_framework/settings.py index b65e42cfe..0b2bdb62d 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -70,8 +70,8 @@ DEFAULTS = { 'PAGINATE_BY_PARAM': None, # View configuration - 'VIEW_NAME_FUNCTION': None, - 'VIEW_DESCRIPTION_FUNCTION': None, + 'VIEW_NAME_FUNCTION': 'rest_framework.utils.formatting.view_name', + 'VIEW_DESCRIPTION_FUNCTION': 'rest_framework.utils.formatting.view_description', # Authentication 'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser', @@ -129,6 +129,8 @@ IMPORT_STRINGS = ( 'TEST_REQUEST_RENDERER_CLASSES', 'UNAUTHENTICATED_USER', 'UNAUTHENTICATED_TOKEN', + 'VIEW_NAME_FUNCTION', + 'VIEW_DESCRIPTION_FUNCTION' ) diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index c908ce664..4f59f6591 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -49,39 +49,15 @@ def _camelcase_to_spaces(content): def get_view_name(cls, suffix=None): """ Return a formatted name for an `APIView` class or `@api_view` function. - If a VIEW_NAME_FUNCTION is set in settings the value of that will be used - if that value is "falsy" then the normal formatting will be used. """ - if api_settings.VIEW_NAME_FUNCTION: - name = api_settings.VIEW_NAME_FUNCTION(cls, suffix) - if name: - return name - - name = cls.__name__ - name = _remove_trailing_string(name, 'View') - name = _remove_trailing_string(name, 'ViewSet') - name = _camelcase_to_spaces(name) - if suffix: - name += ' ' + suffix - return name + return api_settings.VIEW_NAME_FUNCTION(cls, suffix) def get_view_description(cls, html=False): """ Return a description for an `APIView` class or `@api_view` function. - If a VIEW_DESCRIPTION_FUNCTION is set in settings the value of that will be used - if that value is "falsy" then the normal formatting will be used. """ - if api_settings.VIEW_DESCRIPTION_FUNCTION: - description = api_settings.VIEW_DESCRIPTION_FUNCTION(cls) - if description: - return markup_description(description) - - description = cls.__doc__ or '' - description = _remove_leading_indent(smart_text(description)) - if html: - return markup_description(description) - return description + return api_settings.VIEW_DESCRIPTION_FUNCTION(cls) def markup_description(description): @@ -93,3 +69,21 @@ def markup_description(description): else: description = escape(description).replace('\n', '
    ') return mark_safe(description) + + +def view_name(cls, suffix=None): + name = cls.__name__ + name = _remove_trailing_string(name, 'View') + name = _remove_trailing_string(name, 'ViewSet') + name = _camelcase_to_spaces(name) + if suffix: + name += ' ' + suffix + + return name + +def view_description(cls, html=False): + description = cls.__doc__ or '' + description = _remove_leading_indent(smart_text(description)) + if html: + return markup_description(description) + return description \ No newline at end of file From e6662d434f0214d21d38e4388a40fd63e1f9dcc6 Mon Sep 17 00:00:00 2001 From: Christopher Paolini Date: Sat, 17 Aug 2013 17:44:51 -0400 Subject: [PATCH 0055/1652] Improved view/description function setting Now supports each View having its own name and description function and overriding the global default. --- rest_framework/renderers.py | 5 ++--- rest_framework/utils/breadcrumbs.py | 5 ++--- rest_framework/utils/formatting.py | 15 --------------- rest_framework/views.py | 27 ++++++++++++++++++++------- 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 3a03ca332..1006e26cf 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -24,7 +24,6 @@ from rest_framework.settings import api_settings from rest_framework.request import clone_request from rest_framework.utils import encoders from rest_framework.utils.breadcrumbs import get_breadcrumbs -from rest_framework.utils.formatting import get_view_name, get_view_description from rest_framework import exceptions, parsers, status, VERSION @@ -498,10 +497,10 @@ class BrowsableAPIRenderer(BaseRenderer): return GenericContentForm() def get_name(self, view): - return get_view_name(view.__class__, getattr(view, 'suffix', None)) + return view.get_view_name() def get_description(self, view): - return get_view_description(view.__class__, html=True) + return view.get_view_description(html=True) def get_breadcrumbs(self, request): return get_breadcrumbs(request.path) diff --git a/rest_framework/utils/breadcrumbs.py b/rest_framework/utils/breadcrumbs.py index d51374b0a..0384faba3 100644 --- a/rest_framework/utils/breadcrumbs.py +++ b/rest_framework/utils/breadcrumbs.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals from django.core.urlresolvers import resolve, get_script_prefix -from rest_framework.utils.formatting import get_view_name def get_breadcrumbs(url): @@ -29,8 +28,8 @@ def get_breadcrumbs(url): # Don't list the same view twice in a row. # Probably an optional trailing slash. if not seen or seen[-1] != view: - suffix = getattr(view, 'suffix', None) - name = get_view_name(view.cls, suffix) + instance = view.cls() + name = instance.get_view_name() breadcrumbs_list.insert(0, (name, prefix + url)) seen.append(view) diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index 4f59f6591..5780301af 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -45,21 +45,6 @@ def _camelcase_to_spaces(content): content = re.sub(camelcase_boundry, ' \\1', content).strip() return ' '.join(content.split('_')).title() - -def get_view_name(cls, suffix=None): - """ - Return a formatted name for an `APIView` class or `@api_view` function. - """ - return api_settings.VIEW_NAME_FUNCTION(cls, suffix) - - -def get_view_description(cls, html=False): - """ - Return a description for an `APIView` class or `@api_view` function. - """ - return api_settings.VIEW_DESCRIPTION_FUNCTION(cls) - - def markup_description(description): """ Apply HTML markup to the given description. diff --git a/rest_framework/views.py b/rest_framework/views.py index d51233a93..4553714a9 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -12,7 +12,6 @@ from rest_framework.compat import View, HttpResponseBase from rest_framework.request import Request from rest_framework.response import Response from rest_framework.settings import api_settings -from rest_framework.utils.formatting import get_view_name, get_view_description class APIView(View): @@ -25,6 +24,9 @@ class APIView(View): permission_classes = api_settings.DEFAULT_PERMISSION_CLASSES content_negotiation_class = api_settings.DEFAULT_CONTENT_NEGOTIATION_CLASS + view_name_function = api_settings.VIEW_NAME_FUNCTION + view_description_function = api_settings.VIEW_DESCRIPTION_FUNCTION + @classmethod def as_view(cls, **initkwargs): """ @@ -157,6 +159,21 @@ class APIView(View): self._negotiator = self.content_negotiation_class() return self._negotiator + def get_view_name(self): + """ + Get the view name + """ + # This is used by ViewSets to disambiguate instance vs list views + view_name_suffix = getattr(self, 'suffix', None) + + return self.view_name_function(self.__class__, view_name_suffix) + + def get_view_description(self, html=False): + """ + Get the view description + """ + return self.view_description_function(self.__class__, html) + # API policy implementation methods def perform_content_negotiation(self, request, force=False): @@ -342,16 +359,12 @@ class APIView(View): Return a dictionary of metadata about the view. Used to return responses for OPTIONS requests. """ - - # This is used by ViewSets to disambiguate instance vs list views - view_name_suffix = getattr(self, 'suffix', None) - # By default we can't provide any form-like information, however the # generic views override this implementation and add additional # information for POST and PUT methods, based on the serializer. ret = SortedDict() - ret['name'] = get_view_name(self.__class__, view_name_suffix) - ret['description'] = get_view_description(self.__class__) + ret['name'] = self.get_view_name() + ret['description'] = self.get_view_description() ret['renders'] = [renderer.media_type for renderer in self.renderer_classes] ret['parses'] = [parser.media_type for parser in self.parser_classes] return ret From 11d7c1838a1146728528d762cdf6bf329321c1d1 Mon Sep 17 00:00:00 2001 From: Christopher Paolini Date: Sat, 17 Aug 2013 17:52:08 -0400 Subject: [PATCH 0056/1652] Updated default view name/description functions Forgot to update the default view name/description functions to the new setup. --- rest_framework/utils/formatting.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index 5780301af..89a89252e 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -56,8 +56,8 @@ def markup_description(description): return mark_safe(description) -def view_name(cls, suffix=None): - name = cls.__name__ +def view_name(instance, view, suffix=None): + name = view.__name__ name = _remove_trailing_string(name, 'View') name = _remove_trailing_string(name, 'ViewSet') name = _camelcase_to_spaces(name) @@ -66,8 +66,8 @@ def view_name(cls, suffix=None): return name -def view_description(cls, html=False): - description = cls.__doc__ or '' +def view_description(instance, view, html=False): + description = view.__doc__ or '' description = _remove_leading_indent(smart_text(description)) if html: return markup_description(description) From 5a374955b14e1f1fdc85f0fa68284dbf6b83ab5f Mon Sep 17 00:00:00 2001 From: Christopher Paolini Date: Sun, 18 Aug 2013 00:29:05 -0400 Subject: [PATCH 0057/1652] Updated tests for view name and description Updated the tests to use the default view_name and view_description functions in the formatter through the default in settings. --- rest_framework/tests/test_description.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rest_framework/tests/test_description.py b/rest_framework/tests/test_description.py index 8019f5eca..4c03c1ded 100644 --- a/rest_framework/tests/test_description.py +++ b/rest_framework/tests/test_description.py @@ -6,7 +6,6 @@ from rest_framework.compat import apply_markdown, smart_text from rest_framework.views import APIView from rest_framework.tests.description import ViewWithNonASCIICharactersInDocstring from rest_framework.tests.description import UTF8_TEST_DOCSTRING -from rest_framework.utils.formatting import get_view_name, get_view_description # We check that docstrings get nicely un-indented. DESCRIPTION = """an example docstring @@ -58,7 +57,7 @@ class TestViewNamesAndDescriptions(TestCase): """ class MockView(APIView): pass - self.assertEqual(get_view_name(MockView), 'Mock') + self.assertEqual(MockView().get_view_name(), 'Mock') def test_view_description_uses_docstring(self): """Ensure view descriptions are based on the docstring.""" @@ -78,7 +77,7 @@ class TestViewNamesAndDescriptions(TestCase): # hash style header #""" - self.assertEqual(get_view_description(MockView), DESCRIPTION) + self.assertEqual(MockView().get_view_description(), DESCRIPTION) def test_view_description_supports_unicode(self): """ @@ -86,7 +85,7 @@ class TestViewNamesAndDescriptions(TestCase): """ self.assertEqual( - get_view_description(ViewWithNonASCIICharactersInDocstring), + ViewWithNonASCIICharactersInDocstring().get_view_description(), smart_text(UTF8_TEST_DOCSTRING) ) @@ -97,7 +96,7 @@ class TestViewNamesAndDescriptions(TestCase): """ class MockView(APIView): pass - self.assertEqual(get_view_description(MockView), '') + self.assertEqual(MockView().get_view_description(), '') def test_markdown(self): """ From 89b0a539c389477cfd7df7df461868b85f618d95 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 19 Aug 2013 08:24:27 +0100 Subject: [PATCH 0058/1652] Move view name/description functions into public space --- rest_framework/settings.py | 4 ++-- rest_framework/utils/formatting.py | 36 +++++++++--------------------- rest_framework/views.py | 21 ++++++++++++++++- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 0b2bdb62d..7d25e5131 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -70,8 +70,8 @@ DEFAULTS = { 'PAGINATE_BY_PARAM': None, # View configuration - 'VIEW_NAME_FUNCTION': 'rest_framework.utils.formatting.view_name', - 'VIEW_DESCRIPTION_FUNCTION': 'rest_framework.utils.formatting.view_description', + 'VIEW_NAME_FUNCTION': 'rest_framework.views.get_view_name', + 'VIEW_DESCRIPTION_FUNCTION': 'rest_framework.views.get_view_description', # Authentication 'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser', diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index 89a89252e..4b59ba840 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -5,12 +5,13 @@ from __future__ import unicode_literals from django.utils.html import escape from django.utils.safestring import mark_safe -from rest_framework.compat import apply_markdown, smart_text -import re +from rest_framework.compat import apply_markdown from rest_framework.settings import api_settings +from textwrap import dedent +import re -def _remove_trailing_string(content, trailing): +def remove_trailing_string(content, trailing): """ Strip trailing component `trailing` from `content` if it exists. Used when generating names from view classes. @@ -20,10 +21,14 @@ def _remove_trailing_string(content, trailing): return content -def _remove_leading_indent(content): +def dedent(content): """ Remove leading indent from a block of text. Used when generating descriptions from docstrings. + + Note that python's `textwrap.dedent` doesn't quite cut it, + as it fails to dedent multiline docstrings that include + unindented text on the initial line. """ whitespace_counts = [len(line) - len(line.lstrip(' ')) for line in content.splitlines()[1:] if line.lstrip()] @@ -32,11 +37,10 @@ def _remove_leading_indent(content): if whitespace_counts: whitespace_pattern = '^' + (' ' * min(whitespace_counts)) content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) - content = content.strip('\n') - return content + return content.strip() -def _camelcase_to_spaces(content): +def camelcase_to_spaces(content): """ Translate 'CamelCaseNames' to 'Camel Case Names'. Used when generating names from view classes. @@ -54,21 +58,3 @@ def markup_description(description): else: description = escape(description).replace('\n', '
    ') return mark_safe(description) - - -def view_name(instance, view, suffix=None): - name = view.__name__ - name = _remove_trailing_string(name, 'View') - name = _remove_trailing_string(name, 'ViewSet') - name = _camelcase_to_spaces(name) - if suffix: - name += ' ' + suffix - - return name - -def view_description(instance, view, html=False): - description = view.__doc__ or '' - description = _remove_leading_indent(smart_text(description)) - if html: - return markup_description(description) - return description \ No newline at end of file diff --git a/rest_framework/views.py b/rest_framework/views.py index 4553714a9..431e21f95 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -8,10 +8,29 @@ from django.http import Http404 from django.utils.datastructures import SortedDict from django.views.decorators.csrf import csrf_exempt from rest_framework import status, exceptions -from rest_framework.compat import View, HttpResponseBase +from rest_framework.compat import smart_text, HttpResponseBase, View from rest_framework.request import Request from rest_framework.response import Response from rest_framework.settings import api_settings +from rest_framework.utils import formatting + + +def get_view_name(instance, view, suffix=None): + name = view.__name__ + name = formatting.remove_trailing_string(name, 'View') + name = formatting.remove_trailing_string(name, 'ViewSet') + name = formatting.camelcase_to_spaces(name) + if suffix: + name += ' ' + suffix + + return name + +def get_view_description(instance, view, html=False): + description = view.__doc__ or '' + description = formatting.dedent(smart_text(description)) + if html: + return formatting.markup_description(description) + return description class APIView(View): From 512067062419b736b65ca27bdb5663d863c775dd Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 19 Aug 2013 08:45:53 +0100 Subject: [PATCH 0059/1652] Document customizable view names/descriptions --- docs/api-guide/settings.md | 34 ++++++++++++++++++++++++++++++ rest_framework/views.py | 42 ++++++++++++++++++-------------------- 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 0be0eb24a..fe7925a5a 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -274,6 +274,40 @@ Default: `['iso-8601']` --- +## View names and descriptions + +**The following settings are used to generate the view names and descriptions, as used in responses to `OPTIONS` requests, and as used in the browsable API.** + +#### VIEW_NAME_FUNCTION + +A string representing the function that should be used when generating view names. + +This should be a function with the following signature: + + view_name(cls, suffix=None) + +* `cls`: The view class. Typically the name function would inspect the name of the class when generating a descriptive name, by accessing `cls.__name__`. +* `suffix`: The optional suffix used when differentiating individual views in a viewset. + +Default: `'rest_framework.views.get_view_name'` + +#### VIEW_DESCRIPTION_FUNCTION + +A string representing the function that should be used when generating view descriptions. + +This setting can be changed to support markup styles other than the default markdown. For example, you can use it to support `rst` markup in your view docstrings being output in the browsable API. + +This should be a function with the following signature: + + view_description(cls, html=False) + +* `cls`: The view class. Typically the description function would inspect the docstring of the class when generating a description, by accessing `cls.__doc__` +* `html`: A boolean indicating if HTML output is required. `True` when used in the browsable API, and `False` when used in generating `OPTIONS` responses. + +Default: `'rest_framework.views.get_view_description'` + +--- + ## Miscellaneous settings #### FORMAT_SUFFIX_KWARG diff --git a/rest_framework/views.py b/rest_framework/views.py index 431e21f95..727a9f956 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -15,8 +15,8 @@ from rest_framework.settings import api_settings from rest_framework.utils import formatting -def get_view_name(instance, view, suffix=None): - name = view.__name__ +def get_view_name(cls, suffix=None): + name = cls.__name__ name = formatting.remove_trailing_string(name, 'View') name = formatting.remove_trailing_string(name, 'ViewSet') name = formatting.camelcase_to_spaces(name) @@ -25,8 +25,8 @@ def get_view_name(instance, view, suffix=None): return name -def get_view_description(instance, view, html=False): - description = view.__doc__ or '' +def get_view_description(cls, html=False): + description = cls.__doc__ or '' description = formatting.dedent(smart_text(description)) if html: return formatting.markup_description(description) @@ -43,9 +43,6 @@ class APIView(View): permission_classes = api_settings.DEFAULT_PERMISSION_CLASSES content_negotiation_class = api_settings.DEFAULT_CONTENT_NEGOTIATION_CLASS - view_name_function = api_settings.VIEW_NAME_FUNCTION - view_description_function = api_settings.VIEW_DESCRIPTION_FUNCTION - @classmethod def as_view(cls, **initkwargs): """ @@ -131,6 +128,22 @@ class APIView(View): 'request': getattr(self, 'request', None) } + def get_view_name(self): + """ + Return the view name, as used in OPTIONS responses and in the + browsable API. + """ + func = api_settings.VIEW_NAME_FUNCTION + return func(self.__class__, getattr(self, 'suffix', None)) + + def get_view_description(self, html=False): + """ + Return some descriptive text for the view, as used in OPTIONS responses + and in the browsable API. + """ + func = api_settings.VIEW_DESCRIPTION_FUNCTION + return func(self.__class__, html) + # API policy instantiation methods def get_format_suffix(self, **kwargs): @@ -178,21 +191,6 @@ class APIView(View): self._negotiator = self.content_negotiation_class() return self._negotiator - def get_view_name(self): - """ - Get the view name - """ - # This is used by ViewSets to disambiguate instance vs list views - view_name_suffix = getattr(self, 'suffix', None) - - return self.view_name_function(self.__class__, view_name_suffix) - - def get_view_description(self, html=False): - """ - Get the view description - """ - return self.view_description_function(self.__class__, html) - # API policy implementation methods def perform_content_negotiation(self, request, force=False): From 3a99b0af5074bfae90ec3986f277720df5a13583 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 19 Aug 2013 08:47:52 +0100 Subject: [PATCH 0060/1652] Added @chrispaolini. For customizable view names/descriptions in #1043. Thanks! :) --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 1b34d5e0c..e9b600749 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -157,6 +157,7 @@ The following people have helped make REST framework great. * Dan Stephenson - [etos] * Martin Clement - [martync] * Jeremy Satterfield - [jsatt] +* Christopher Paolini - [chrispaolini] Many thanks to everyone who's contributed to the project. @@ -350,3 +351,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [etos]: https://github.com/etos [martync]: https://github.com/martync [jsatt]: https://github.com/jsatt +[chrispaolini]: https://github.com/chrispaolini From 34d65119fc1c200b76a8af7213a92d6b279bd478 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 19 Aug 2013 08:54:48 +0100 Subject: [PATCH 0061/1652] Update release notes. --- docs/topics/release-notes.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 624d9acd4..52abfc08e 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,10 @@ You can determine your currently installed version using `pip freeze`: ## 2.3.x series +### Master + +* Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. + ### 2.3.7 **Date**: 16th August 2013 From 4292cc18fa3e4b3f5e67c02c3780cdcbf901a0a1 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 19 Aug 2013 20:53:30 +0100 Subject: [PATCH 0062/1652] Docs tweaking --- docs/api-guide/routers.md | 11 +++++++---- docs/api-guide/viewsets.md | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 7884c2e94..c84654189 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -48,6 +48,8 @@ The following URL pattern would additionally be generated: * URL pattern: `^users/{pk}/set_password/$` Name: `'user-set-password'` +For more information see the viewset documentation on [marking extra actions for routing][route-decorators]. + # API Guide ## SimpleRouter @@ -58,12 +60,12 @@ This router includes routes for the standard set of `list`, `create`, `retrieve` URL StyleHTTP MethodActionURL Name {prefix}/GETlist{basename}-list POSTcreate + {prefix}/{methodname}/GET, or as specified by `methods` argument`@list_route` decorated method{basename}-{methodname} {prefix}/{lookup}/GETretrieve{basename}-detail PUTupdate PATCHpartial_update DELETEdestroy - {prefix}/{lookup}/{methodname}/GET@detail_route decorated method{basename}-{methodname} - POST@detail_route decorated method + {prefix}/{lookup}/{methodname}/GET, or as specified by `methods` argument`@detail_route` decorated method{basename}-{methodname} By default the URLs created by `SimpleRouter` are appended with a trailing slash. @@ -82,12 +84,12 @@ This router is similar to `SimpleRouter` as above, but additionally includes a d [.format]GETautomatically generated root viewapi-root {prefix}/[.format]GETlist{basename}-list POSTcreate + {prefix}/{methodname}/[.format]GET, or as specified by `methods` argument`@list_route` decorated method{basename}-{methodname} {prefix}/{lookup}/[.format]GETretrieve{basename}-detail PUTupdate PATCHpartial_update DELETEdestroy - {prefix}/{lookup}/{methodname}/[.format]GET@detail_route decorated method{basename}-{methodname} - POST@detail_route decorated method + {prefix}/{lookup}/{methodname}/[.format]GET, or as specified by `methods` argument`@detail_route` decorated method{basename}-{methodname} As with `SimpleRouter` the trailing slashes on the URL routes can be removed by setting the `trailing_slash` argument to `False` when instantiating the router. @@ -144,3 +146,4 @@ If you want to provide totally custom behavior, you can override `BaseRouter` an You may also want to override the `get_default_base_name(self, viewset)` method, or else always explicitly set the `base_name` argument when registering your viewsets with the router. [cite]: http://guides.rubyonrails.org/routing.html +[route-decorators]: viewsets.html#marking-extra-actions-for-routing \ No newline at end of file diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 95efc229f..9005e7cbc 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -61,7 +61,7 @@ There are two main advantages of using a `ViewSet` class over using a `View` cla Both of these come with a trade-off. Using regular views and URL confs is more explicit and gives you more control. ViewSets are helpful if you want to get up and running quickly, or when you have a large API and you want to enforce a consistent URL configuration throughout. -## Marking extra methods for routing +## Marking extra actions for routing The default routers included with REST framework will provide routes for a standard set of create/retrieve/update/destroy style operations, as shown below: From 8acee2e626746f3096c49b3ebb13aaf7dc882917 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 19 Aug 2013 21:02:22 +0100 Subject: [PATCH 0063/1652] Commenting link/action decorators as pending deprecation --- rest_framework/decorators.py | 51 ++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index 1ca176f2c..18e41a18d 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -108,6 +108,31 @@ def permission_classes(permission_classes): return decorator +def detail_route(methods=['get'], **kwargs): + """ + Used to mark a method on a ViewSet that should be routed for detail requests. + """ + def decorator(func): + func.bind_to_methods = methods + func.detail = True + func.kwargs = kwargs + return func + return decorator + + +def list_route(methods=['get'], **kwargs): + """ + Used to mark a method on a ViewSet that should be routed for list requests. + """ + def decorator(func): + func.bind_to_methods = methods + func.detail = False + func.kwargs = kwargs + return func + return decorator + +# These are now pending deprecation, in favor of `detail_route` and `list_route`. + def link(**kwargs): """ Used to mark a method on a ViewSet that should be routed for detail GET requests. @@ -133,28 +158,4 @@ def action(methods=['post'], **kwargs): func.detail = True func.kwargs = kwargs return func - return decorator - - -def detail_route(methods=['get'], **kwargs): - """ - Used to mark a method on a ViewSet that should be routed for detail requests. - """ - def decorator(func): - func.bind_to_methods = methods - func.detail = True - func.kwargs = kwargs - return func - return decorator - - -def list_route(methods=['get'], **kwargs): - """ - Used to mark a method on a ViewSet that should be routed for list requests. - """ - def decorator(func): - func.bind_to_methods = methods - func.detail = False - func.kwargs = kwargs - return func - return decorator + return decorator \ No newline at end of file From 28ff6fb1ec02b7a04c4a0db54885f3735b6dd43f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 19 Aug 2013 21:44:47 +0100 Subject: [PATCH 0064/1652] Only HTML forms should have implicit default False for boolean fields --- rest_framework/fields.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index add9d224d..07779c472 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -16,6 +16,7 @@ from django.core import validators from django.core.exceptions import ValidationError from django.conf import settings from django.db.models.fields import BLANK_CHOICE_DASH +from django.http import QueryDict from django.forms import widgets from django.utils.encoding import is_protected_type from django.utils.translation import ugettext_lazy as _ @@ -399,10 +400,15 @@ class BooleanField(WritableField): } empty = False - # Note: we set default to `False` in order to fill in missing value not - # supplied by html form. TODO: Fix so that only html form input gets - # this behavior. - default = False + def field_from_native(self, data, files, field_name, into): + # HTML checkboxes do not explicitly represent unchecked as `False` + # we deal with that here... + if isinstance(data, QueryDict): + self.default = False + + return super(BooleanField, self).field_from_native( + data, files, field_name, into + ) def from_native(self, value): if value in ('true', 't', 'True', '1'): From f84d4951bfcc8887d57ca5fa0321cfdbb18a9b6d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 19 Aug 2013 21:46:34 +0100 Subject: [PATCH 0065/1652] Update release notes --- docs/topics/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 52abfc08e..dfc4bfbb9 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -43,6 +43,7 @@ You can determine your currently installed version using `pip freeze`: ### Master * Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. +* Bugfix: `required=True` argument fixed for boolean serializer fields. ### 2.3.7 From 1bf712341508b5d9aa07fb62f55b7e495278fabf Mon Sep 17 00:00:00 2001 From: Filipe Ximenes Date: Tue, 20 Aug 2013 16:24:13 -0300 Subject: [PATCH 0066/1652] improving documentation about object level permissions #1049 --- docs/api-guide/generic-views.md | 5 ++++- docs/api-guide/permissions.md | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 32a4feef4..2a585f9c2 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -108,7 +108,10 @@ For example: filter = {} for field in self.multiple_lookup_fields: filter[field] = self.kwargs[field] - return get_object_or_404(queryset, **filter) + + obj = get_object_or_404(queryset, **filter) + self.check_object_permissions(self.request, obj) + return obj #### `get_serializer_class(self)` diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index c6372f981..bb7343aff 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -28,6 +28,13 @@ If you're writing your own views and want to enforce object level permissions, you'll need to explicitly call the `.check_object_permissions(request, obj)` method on the view at the point at which you've retrieved the object. This will either raise a `PermissionDenied` or `NotAuthenticated` exception, or simply return if the view has the appropriate permissions. +For example: + + def get_object(self): + obj = get_object_or_404(self.get_queryset()) + self.check_object_permissions(self.request, obj) + return obj + ## Setting the permission policy The default permission policy may be set globally, using the `DEFAULT_PERMISSION_CLASSES` setting. For example. From 5e40e50f2b187fe2ff2e8ee63b4e39ece42f1521 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 21 Aug 2013 19:46:09 +0100 Subject: [PATCH 0067/1652] Include import paths throughout docs. Closes #1051. Thanks to @pydanny for the report. --- docs/api-guide/authentication.md | 14 ++++++++++++++ docs/api-guide/content-negotiation.md | 6 ++++++ docs/api-guide/fields.md | 13 ++++++++----- docs/api-guide/filtering.md | 14 ++++++++++++++ docs/api-guide/generic-views.md | 5 +++++ docs/api-guide/pagination.md | 7 ++++++- docs/api-guide/parsers.md | 4 ++++ docs/api-guide/permissions.md | 6 ++++++ docs/api-guide/relations.md | 11 ++++++----- docs/api-guide/renderers.md | 9 +++++++-- docs/api-guide/reverse.md | 4 ++-- docs/api-guide/routers.md | 7 +++++++ docs/api-guide/serializers.md | 7 +++++++ docs/api-guide/status-codes.md | 1 + docs/api-guide/testing.md | 21 ++++++++++++++++++--- docs/api-guide/throttling.md | 4 ++++ docs/api-guide/viewsets.md | 9 +++++++++ 17 files changed, 124 insertions(+), 18 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index b1ab46227..f30b16ed5 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -46,6 +46,11 @@ The default authentication schemes may be set globally, using the `DEFAULT_AUTHE You can also set the authentication scheme on a per-view or per-viewset basis, using the `APIView` class based views. + from rest_framework.authentication import SessionAuthentication, BasicAuthentication + from rest_framework.permissions import IsAuthenticated + from rest_framework.response import Response + from rest_framework.views import APIView + class ExampleView(APIView): authentication_classes = (SessionAuthentication, BasicAuthentication) permission_classes = (IsAuthenticated,) @@ -157,11 +162,16 @@ The `curl` command line tool may be useful for testing token authenticated APIs. If you want every user to have an automatically generated Token, you can simply catch the User's `post_save` signal. + from django.dispatch import receiver + from rest_framework.authtoken.models import Token + @receiver(post_save, sender=User) def create_auth_token(sender, instance=None, created=False, **kwargs): if created: Token.objects.create(user=instance) +Note that you'll want to ensure you place this code snippet in an installed `models.py` module, or some other location that will be imported by Django on startup. + If you've already created some users, you can generate tokens for all existing users like this: from django.contrib.auth.models import User @@ -336,6 +346,10 @@ If the `.authenticate_header()` method is not overridden, the authentication sch The following example will authenticate any incoming request as the user given by the username in a custom request header named 'X_USERNAME'. + from django.contrib.auth.models import User + from rest_framework import authentication + from rest_framework import exceptions + class ExampleAuthentication(authentication.BaseAuthentication): def authenticate(self, request): username = request.META.get('X_USERNAME') diff --git a/docs/api-guide/content-negotiation.md b/docs/api-guide/content-negotiation.md index 2a7742786..94dd59cac 100644 --- a/docs/api-guide/content-negotiation.md +++ b/docs/api-guide/content-negotiation.md @@ -54,6 +54,8 @@ The `select_renderer()` method should return a two-tuple of (renderer instance, The following is a custom content negotiation class which ignores the client request when selecting the appropriate parser or renderer. + from rest_framework.negotiation import BaseContentNegotiation + class IgnoreClientContentNegotiation(BaseContentNegotiation): def select_parser(self, request, parsers): """ @@ -77,6 +79,10 @@ The default content negotiation class may be set globally, using the `DEFAULT_CO You can also set the content negotiation used for an individual view, or viewset, using the `APIView` class based views. + from myapp.negotiation import IgnoreClientContentNegotiation + from rest_framework.response import Response + from rest_framework.views import APIView + class NoNegotiationView(APIView): """ An example view that does not perform content negotiation. diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index d69730c98..962c49e2a 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -78,6 +78,9 @@ A generic, **read-only** field. You can use this field for any attribute that d For example, using the following model. + from django.db import models + from django.utils.timezone import now + class Account(models.Model): owner = models.ForeignKey('auth.user') name = models.CharField(max_length=100) @@ -85,13 +88,14 @@ For example, using the following model. payment_expiry = models.DateTimeField() def has_expired(self): - now = datetime.datetime.now() - return now > self.payment_expiry + return now() > self.payment_expiry A serializer definition that looked like this: + from rest_framework import serializers + class AccountSerializer(serializers.HyperlinkedModelSerializer): - expired = Field(source='has_expired') + expired = serializers.Field(source='has_expired') class Meta: fields = ('url', 'owner', 'name', 'expired') @@ -125,12 +129,11 @@ The `ModelField` class is generally intended for internal use, but can be used b This is a read-only field. It gets its value by calling a method on the serializer class it is attached to. It can be used to add any sort of data to the serialized representation of your object. The field's constructor accepts a single argument, which is the name of the method on the serializer to be called. The method should accept a single argument (in addition to `self`), which is the object being serialized. It should return whatever you want to be included in the serialized representation of the object. For example: - from rest_framework import serializers from django.contrib.auth.models import User from django.utils.timezone import now + from rest_framework import serializers class UserSerializer(serializers.ModelSerializer): - days_since_joined = serializers.SerializerMethodField('get_days_since_joined') class Meta: diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 05c997a39..649462da7 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -20,6 +20,10 @@ You can do so by filtering based on the value of `request.user`. For example: + from myapp.models import Purchase + from myapp.serializers import PurchaseSerializer + from rest_framework import generics + class PurchaseList(generics.ListAPIView) serializer_class = PurchaseSerializer @@ -90,6 +94,11 @@ The default filter backends may be set globally, using the `DEFAULT_FILTER_BACKE You can also set the filter backends on a per-view, or per-viewset basis, using the `GenericAPIView` class based views. + from django.contrib.auth.models import User + from myapp.serializers import UserSerializer + from rest_framework import filters + from rest_framework import generics + class UserListView(generics.ListAPIView): queryset = User.objects.all() serializer = UserSerializer @@ -150,6 +159,11 @@ This will automatically create a `FilterSet` class for the given fields, and wil For more advanced filtering requirements you can specify a `FilterSet` class that should be used by the view. For example: + import django_filters + from myapp.models import Product + from myapp.serializers import ProductSerializer + from rest_framework import generics + class ProductFilter(django_filters.FilterSet): min_price = django_filters.NumberFilter(lookup_type='gte') max_price = django_filters.NumberFilter(lookup_type='lte') diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 32a4feef4..7f754df8c 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -17,6 +17,11 @@ If the generic views don't suit the needs of your API, you can drop down to usin Typically when using the generic views, you'll override the view, and set several class attributes. + from django.contrib.auth.models import User + from myapp.serializers import UserSerializer + from rest_framework import generics + from rest_framework.permissions import IsAdminUser + class UserList(generics.ListCreateAPIView): queryset = User.objects.all() serializer_class = UserSerializer diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 912ce41bd..ca0174b76 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -13,6 +13,7 @@ REST framework includes a `PaginationSerializer` class that makes it easy to ret Let's start by taking a look at an example from the Django documentation. from django.core.paginator import Paginator + objects = ['john', 'paul', 'george', 'ringo'] paginator = Paginator(objects, 2) page = paginator.page(1) @@ -22,6 +23,7 @@ Let's start by taking a look at an example from the Django documentation. At this point we've got a page object. If we wanted to return this page object as a JSON response, we'd need to provide the client with context such as next and previous links, so that it would be able to page through the remaining results. from rest_framework.pagination import PaginationSerializer + serializer = PaginationSerializer(instance=page) serializer.data # {'count': 4, 'next': '?page=2', 'previous': None, 'results': [u'john', u'paul']} @@ -114,6 +116,9 @@ You can also override the name used for the object list field, by setting the `r For example, to nest a pair of links labelled 'prev' and 'next', and set the name for the results field to 'objects', you might use something like this. + from rest_framework import pagination + from rest_framework import serializers + class LinksSerializer(serializers.Serializer): next = pagination.NextPageField(source='*') prev = pagination.PreviousPageField(source='*') @@ -135,7 +140,7 @@ To have your custom pagination serializer be used by default, use the `DEFAULT_P Alternatively, to set your custom pagination serializer on a per-view basis, use the `pagination_serializer_class` attribute on a generic class based view: - class PaginatedListView(ListAPIView): + class PaginatedListView(generics.ListAPIView): model = ExampleModel pagination_serializer_class = CustomPaginationSerializer paginate_by = 10 diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index 5bd79a317..d3c42b1c2 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -37,6 +37,10 @@ The default set of parsers may be set globally, using the `DEFAULT_PARSER_CLASSE You can also set the renderers used for an individual view, or viewset, using the `APIView` class based views. + from rest_framework.parsers import YAMLParser + from rest_framework.response import Response + from rest_framework.views import APIView + class ExampleView(APIView): """ A view that can accept POST requests with YAML content. diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index c6372f981..a3d86ed49 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -47,6 +47,10 @@ If not specified, this setting defaults to allowing unrestricted access: You can also set the authentication policy on a per-view, or per-viewset basis, using the `APIView` class based views. + from rest_framework.permissions import IsAuthenticated + from rest_framework.responses import Response + from rest_framework.views import APIView + class ExampleView(APIView): permission_classes = (IsAuthenticated,) @@ -157,6 +161,8 @@ For more details see the [2.2 release announcement][2.2-announcement]. The following is an example of a permission class that checks the incoming request's IP address against a blacklist, and denies the request if the IP has been blacklisted. + from rest_framework import permissions + class BlacklistPermission(permissions.BasePermission): """ Global permission check for blacklisted IPs. diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 829a3c548..aa14bc725 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -76,7 +76,7 @@ This field is read only. For example, the following serializer: class AlbumSerializer(serializers.ModelSerializer): - tracks = PrimaryKeyRelatedField(many=True, read_only=True) + tracks = serializers.PrimaryKeyRelatedField(many=True, read_only=True) class Meta: model = Album @@ -110,8 +110,8 @@ By default this field is read-write, although you can change this behavior using For example, the following serializer: class AlbumSerializer(serializers.ModelSerializer): - tracks = HyperlinkedRelatedField(many=True, read_only=True, - view_name='track-detail') + tracks = serializers.HyperlinkedRelatedField(many=True, read_only=True, + view_name='track-detail') class Meta: model = Album @@ -148,7 +148,8 @@ By default this field is read-write, although you can change this behavior using For example, the following serializer: class AlbumSerializer(serializers.ModelSerializer): - tracks = SlugRelatedField(many=True, read_only=True, slug_field='title') + tracks = serializers.SlugRelatedField(many=True, read_only=True, + slug_field='title') class Meta: model = Album @@ -183,7 +184,7 @@ When using `SlugRelatedField` as a read-write field, you will normally want to e This field can be applied as an identity relationship, such as the `'url'` field on a HyperlinkedModelSerializer. It can also be used for an attribute on the object. For example, the following serializer: class AlbumSerializer(serializers.HyperlinkedModelSerializer): - track_listing = HyperlinkedIdentityField(view_name='track-list') + track_listing = serializers.HyperlinkedIdentityField(view_name='track-list') class Meta: model = Album diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index bb3d20159..7fc1fc1fd 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -30,11 +30,16 @@ The default set of renderers may be set globally, using the `DEFAULT_RENDERER_CL You can also set the renderers used for an individual view, or viewset, using the `APIView` class based views. + from django.contrib.auth.models import User + from rest_framework.renderers import JSONRenderer, YAMLRenderer + from rest_framework.response import Response + from rest_framework.views import APIView + class UserCountView(APIView): """ - A view that returns the count of active users, in JSON or JSONp. + A view that returns the count of active users, in JSON or YAML. """ - renderer_classes = (JSONRenderer, JSONPRenderer) + renderer_classes = (JSONRenderer, YAMLRenderer) def get(self, request, format=None): user_count = User.objects.filter(active=True).count() diff --git a/docs/api-guide/reverse.md b/docs/api-guide/reverse.md index 942623666..383eca4ce 100644 --- a/docs/api-guide/reverse.md +++ b/docs/api-guide/reverse.md @@ -27,13 +27,13 @@ Has the same behavior as [`django.core.urlresolvers.reverse`][reverse], except t You should **include the request as a keyword argument** to the function, for example: - import datetime from rest_framework.reverse import reverse from rest_framework.views import APIView + from django.utils.timezone import now class APIRootView(APIView): def get(self, request): - year = datetime.datetime.now().year + year = now().year data = { ... 'year-summary-url': reverse('year-summary', args=[year], request=request) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 072a2e79a..fb48197e9 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -14,6 +14,8 @@ REST framework adds support for automatic URL routing to Django, and provides yo Here's an example of a simple URL conf, that uses `DefaultRouter`. + from rest_framework import routers + router = routers.SimpleRouter() router.register(r'users', UserViewSet) router.register(r'accounts', AccountViewSet) @@ -40,6 +42,9 @@ The example above would generate the following URL patterns: Any methods on the viewset decorated with `@link` or `@action` will also be routed. For example, given a method like this on the `UserViewSet` class: + from myapp.permissions import IsAdminOrIsSelf + from rest_framework.decorators import action + @action(permission_classes=[IsAdminOrIsSelf]) def set_password(self, request, pk=None): ... @@ -120,6 +125,8 @@ The arguments to the `Route` named tuple are: The following example will only route to the `list` and `retrieve` actions, and does not use the trailing slash convention. + from rest_framework.routers import Route, SimpleRouter + class ReadOnlyRouter(SimpleRouter): """ A router for read-only APIs, which doesn't use trailing slashes. diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index bbc8d019d..d9fd46437 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -28,6 +28,8 @@ We'll declare a serializer that we can use to serialize and deserialize `Comment Declaring a serializer looks very similar to declaring a form: + from rest_framework import serializers + class CommentSerializer(serializers.Serializer): email = serializers.EmailField() content = serializers.CharField(max_length=200) @@ -59,6 +61,8 @@ We can now use `CommentSerializer` to serialize a comment, or list of comments. At this point we've translated the model instance into Python native datatypes. To finalise the serialization process we render the data into `json`. + from rest_framework.renderers import JSONRenderer + json = JSONRenderer().render(serializer.data) json # '{"email": "leila@example.com", "content": "foo bar", "created": "2012-08-22T16:20:09.822"}' @@ -67,6 +71,9 @@ At this point we've translated the model instance into Python native datatypes. Deserialization is similar. First we parse a stream into Python native datatypes... + from StringIO import StringIO + from rest_framework.parsers import JSONParser + stream = StringIO(json) data = JSONParser().parse(stream) diff --git a/docs/api-guide/status-codes.md b/docs/api-guide/status-codes.md index db2e059c3..409f659b2 100644 --- a/docs/api-guide/status-codes.md +++ b/docs/api-guide/status-codes.md @@ -9,6 +9,7 @@ Using bare status codes in your responses isn't recommended. REST framework includes a set of named constants that you can use to make more code more obvious and readable. from rest_framework import status + from rest_framework.response import Response def empty_view(self): content = {'please move along': 'nothing to see here'} diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index 92f8d54aa..b3880f8f0 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -16,6 +16,8 @@ Extends [Django's existing `RequestFactory` class][requestfactory]. The `APIRequestFactory` class supports an almost identical API to Django's standard `RequestFactory` class. This means the that standard `.get()`, `.post()`, `.put()`, `.patch()`, `.delete()`, `.head()` and `.options()` methods are all available. + from rest_framework.test import APIRequestFactory + # Using the standard RequestFactory API to create a form POST request factory = APIRequestFactory() request = factory.post('/notes/', {'title': 'new idea'}) @@ -49,6 +51,8 @@ For example, using `APIRequestFactory`, you can make a form PUT request like so: Using Django's `RequestFactory`, you'd need to explicitly encode the data yourself: + from django.test.client import encode_multipart, RequestFactory + factory = RequestFactory() data = {'title': 'remember to email dave'} content = encode_multipart('BoUnDaRyStRiNg', data) @@ -72,6 +76,12 @@ To forcibly authenticate a request, use the `force_authenticate()` method. The signature for the method is `force_authenticate(request, user=None, token=None)`. When making the call, either or both of the user and token may be set. +For example, when forcibly authenticating using a token, you might do something like the following: + + user = User.objects.get(username='olivia') + request = factory.get('/accounts/django-superstars/') + force_authenticate(request, user=user, token=user.token) + --- **Note**: When using `APIRequestFactory`, the object that is returned is Django's standard `HttpRequest`, and not REST framework's `Request` object, which is only generated once the view is called. @@ -105,6 +115,8 @@ Extends [Django's existing `Client` class][client]. The `APIClient` class supports the same request interface as `APIRequestFactory`. This means the that standard `.get()`, `.post()`, `.put()`, `.patch()`, `.delete()`, `.head()` and `.options()` methods are all available. For example: + from rest_framework.test import APIClient + client = APIClient() client.post('/notes/', {'title': 'new idea'}, format='json') @@ -131,8 +143,11 @@ The `login` method is appropriate for testing APIs that use session authenticati The `credentials` method can be used to set headers that will then be included on all subsequent requests by the test client. + from rest_framework.authtoken.models import Token + from rest_framework.test import APIClient + # Include an appropriate `Authorization:` header on all requests. - token = Token.objects.get(username='lauren') + token = Token.objects.get(user__username='lauren') client = APIClient() client.credentials(HTTP_AUTHORIZATION='Token ' + token.key) @@ -190,10 +205,10 @@ You can use any of REST framework's test case classes as you would for the regul Ensure we can create a new account object. """ url = reverse('account-list') - data = {'name': 'DabApps'} + expected = {'name': 'DabApps'} response = self.client.post(url, data, format='json') self.assertEqual(response.status_code, status.HTTP_201_CREATED) - self.assertEqual(response.data, data) + self.assertEqual(response.data, expected) --- diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index 56f32f58a..42f9c228d 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -43,6 +43,10 @@ The rate descriptions used in `DEFAULT_THROTTLE_RATES` may include `second`, `mi You can also set the throttling policy on a per-view or per-viewset basis, using the `APIView` class based views. + from rest_framework.response import Response + from rest_framework.throttling import UserRateThrottle + from rest_framework.views import APIView + class ExampleView(APIView): throttle_classes = (UserRateThrottle,) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 0c68afb0b..61f9d2f85 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -19,6 +19,12 @@ Typically, rather than explicitly registering the views in a viewset in the urlc Let's define a simple viewset that can be used to list or retrieve all the users in the system. + from django.contrib.auth.models import User + from django.shortcuts import get_object_or_404 + from myapps.serializers import UserSerializer + from rest_framework import viewsets + from rest_framewor.responses import Response + class UserViewSet(viewsets.ViewSet): """ A simple ViewSet that for listing or retrieving users. @@ -41,6 +47,9 @@ If we need to, we can bind this viewset into two separate views, like so: Typically we wouldn't do this, but would instead register the viewset with a router, and allow the urlconf to be automatically generated. + from myapp.views import UserViewSet + from rest_framework.routers import DefaultRouter + router = DefaultRouter() router.register(r'users', UserViewSet) urlpatterns = router.urls From cf6ae397db1353370fef05df99a8d321806a6f58 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 21 Aug 2013 19:57:30 +0100 Subject: [PATCH 0068/1652] Docs tweaking around `check_object_permissions` --- docs/api-guide/generic-views.md | 2 ++ docs/api-guide/permissions.md | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 281a0481f..931cae542 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -118,6 +118,8 @@ For example: self.check_object_permissions(self.request, obj) return obj +Note that if your API doesn't include any object level permissions, you may optionally exclude the ``self.check_object_permissions, and simply return the object from the `get_object_or_404` lookup. + #### `get_serializer_class(self)` Returns the class that should be used for the serializer. Defaults to returning the `serializer_class` attribute, or dynamically generating a serializer class if the `model` shortcut is being used. diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 6b80a98c2..12aa4c18b 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -25,7 +25,8 @@ Object level permissions are run by REST framework's generic views when `.get_ob As with view level permissions, an `exceptions.PermissionDenied` exception will be raised if the user is not allowed to act on the given object. If you're writing your own views and want to enforce object level permissions, -you'll need to explicitly call the `.check_object_permissions(request, obj)` method on the view at the point at which you've retrieved the object. +or if you override the `get_object` method on a generic view, then you'll need to explicitly call the `.check_object_permissions(request, obj)` method on the view at the point at which you've retrieved the object. + This will either raise a `PermissionDenied` or `NotAuthenticated` exception, or simply return if the view has the appropriate permissions. For example: From 4338e1e43fb6725cc89f3390943d9b86880bd678 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 21 Aug 2013 20:00:35 +0100 Subject: [PATCH 0069/1652] Added @filipeximenes For work on #1050. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index e9b600749..a894ee7cc 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -158,6 +158,7 @@ The following people have helped make REST framework great. * Martin Clement - [martync] * Jeremy Satterfield - [jsatt] * Christopher Paolini - [chrispaolini] +* Filipe A Ximenes - [filipeximenes] Many thanks to everyone who's contributed to the project. @@ -352,3 +353,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [martync]: https://github.com/martync [jsatt]: https://github.com/jsatt [chrispaolini]: https://github.com/chrispaolini +[filipeximenes]: https://github.com/filipeximenes From 815ef50735f50c7aff5255e60f1b484e75178e87 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 21 Aug 2013 21:18:46 +0100 Subject: [PATCH 0070/1652] If page size query param <= 0, just use default page size. Closes #1028 --- rest_framework/generics.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 874a142c8..bcd62bf9d 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -14,6 +14,15 @@ from rest_framework.settings import api_settings import warnings +def strict_positive_int(integer_string): + """ + Cast a string to a strictly positive integer. + """ + ret = int(integer_string) + if ret <= 0: + raise ValueError() + return ret + def get_object_or_404(queryset, **filter_kwargs): """ Same as Django's standard shortcut, but make sure to raise 404 @@ -198,7 +207,7 @@ class GenericAPIView(views.APIView): if self.paginate_by_param: query_params = self.request.QUERY_PARAMS try: - return int(query_params[self.paginate_by_param]) + return strict_positive_int(query_params[self.paginate_by_param]) except (KeyError, ValueError): pass From 2bcad32dcb57ae9419f6a901e081f0dcdc1a6f87 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 21 Aug 2013 21:22:12 +0100 Subject: [PATCH 0071/1652] If page size query param <= 0, just use default page size. Closes #1028. --- rest_framework/generics.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 99e9782e2..5ecf6310d 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -14,6 +14,15 @@ from rest_framework.settings import api_settings import warnings +def strict_positive_int(integer_string): + """ + Cast a string to a strictly positive integer. + """ + ret = int(integer_string) + if ret <= 0: + raise ValueError() + return ret + def get_object_or_404(queryset, **filter_kwargs): """ Same as Django's standard shortcut, but make sure to raise 404 @@ -135,7 +144,7 @@ class GenericAPIView(views.APIView): page_query_param = self.request.QUERY_PARAMS.get(self.page_kwarg) page = page_kwarg or page_query_param or 1 try: - page_number = int(page) + page_number = strict_positive_int(page) except ValueError: if page == 'last': page_number = paginator.num_pages From 44ceef841543877a700c3fb4a0f84dfecbad0cbb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 21 Aug 2013 21:30:25 +0100 Subject: [PATCH 0072/1652] Updating 2.4.0 release notes --- .travis.yml | 1 + docs/topics/release-notes.md | 5 +- rest_framework/compat.py | 2 +- rest_framework/six.py | 389 ----------------------------------- tox.ini | 2 + 5 files changed, 8 insertions(+), 391 deletions(-) delete mode 100644 rest_framework/six.py diff --git a/.travis.yml b/.travis.yml index 6a4532411..f8640db2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ install: - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.0 --use-mirrors; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4 --use-mirrors; fi" - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi" + - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install six --use-mirrors; fi" - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.6 --use-mirrors; fi" - export PYTHONPATH=. diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 52abfc08e..f3bb19c67 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,9 +40,12 @@ You can determine your currently installed version using `pip freeze`: ## 2.3.x series -### Master +### 2.4.0 +* `@detail_route` and `@list_route` decorators replace `@action` and `@link`. +* `six` no longer bundled. For Django <= 1.4.1, install `six` package. * Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. +* Bugfix: `?page_size=0` query parameter now falls back to default page size for view, instead of always turning pagination off. ### 2.3.7 diff --git a/rest_framework/compat.py b/rest_framework/compat.py index baee3a9c2..178a697f3 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -14,7 +14,7 @@ from django.conf import settings try: from django.utils import six except ImportError: - from rest_framework import six + import six # location of patterns, url, include changes in 1.4 onwards try: diff --git a/rest_framework/six.py b/rest_framework/six.py deleted file mode 100644 index 9e3823128..000000000 --- a/rest_framework/six.py +++ /dev/null @@ -1,389 +0,0 @@ -"""Utilities for writing code that runs on Python 2 and 3""" - -import operator -import sys -import types - -__author__ = "Benjamin Peterson " -__version__ = "1.2.0" - - -# True if we are running on Python 3. -PY3 = sys.version_info[0] == 3 - -if PY3: - string_types = str, - integer_types = int, - class_types = type, - text_type = str - binary_type = bytes - - MAXSIZE = sys.maxsize -else: - string_types = basestring, - integer_types = (int, long) - class_types = (type, types.ClassType) - text_type = unicode - binary_type = str - - if sys.platform == "java": - # Jython always uses 32 bits. - MAXSIZE = int((1 << 31) - 1) - else: - # It's possible to have sizeof(long) != sizeof(Py_ssize_t). - class X(object): - def __len__(self): - return 1 << 31 - try: - len(X()) - except OverflowError: - # 32-bit - MAXSIZE = int((1 << 31) - 1) - else: - # 64-bit - MAXSIZE = int((1 << 63) - 1) - del X - - -def _add_doc(func, doc): - """Add documentation to a function.""" - func.__doc__ = doc - - -def _import_module(name): - """Import module, returning the module after the last dot.""" - __import__(name) - return sys.modules[name] - - -class _LazyDescr(object): - - def __init__(self, name): - self.name = name - - def __get__(self, obj, tp): - result = self._resolve() - setattr(obj, self.name, result) - # This is a bit ugly, but it avoids running this again. - delattr(tp, self.name) - return result - - -class MovedModule(_LazyDescr): - - def __init__(self, name, old, new=None): - super(MovedModule, self).__init__(name) - if PY3: - if new is None: - new = name - self.mod = new - else: - self.mod = old - - def _resolve(self): - return _import_module(self.mod) - - -class MovedAttribute(_LazyDescr): - - def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None): - super(MovedAttribute, self).__init__(name) - if PY3: - if new_mod is None: - new_mod = name - self.mod = new_mod - if new_attr is None: - if old_attr is None: - new_attr = name - else: - new_attr = old_attr - self.attr = new_attr - else: - self.mod = old_mod - if old_attr is None: - old_attr = name - self.attr = old_attr - - def _resolve(self): - module = _import_module(self.mod) - return getattr(module, self.attr) - - - -class _MovedItems(types.ModuleType): - """Lazy loading of moved objects""" - - -_moved_attributes = [ - MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"), - MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"), - MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"), - MovedAttribute("map", "itertools", "builtins", "imap", "map"), - MovedAttribute("reload_module", "__builtin__", "imp", "reload"), - MovedAttribute("reduce", "__builtin__", "functools"), - MovedAttribute("StringIO", "StringIO", "io"), - MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"), - MovedAttribute("zip", "itertools", "builtins", "izip", "zip"), - - MovedModule("builtins", "__builtin__"), - MovedModule("configparser", "ConfigParser"), - MovedModule("copyreg", "copy_reg"), - MovedModule("http_cookiejar", "cookielib", "http.cookiejar"), - MovedModule("http_cookies", "Cookie", "http.cookies"), - MovedModule("html_entities", "htmlentitydefs", "html.entities"), - MovedModule("html_parser", "HTMLParser", "html.parser"), - MovedModule("http_client", "httplib", "http.client"), - MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"), - MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"), - MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"), - MovedModule("cPickle", "cPickle", "pickle"), - MovedModule("queue", "Queue"), - MovedModule("reprlib", "repr"), - MovedModule("socketserver", "SocketServer"), - MovedModule("tkinter", "Tkinter"), - MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"), - MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"), - MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"), - MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"), - MovedModule("tkinter_tix", "Tix", "tkinter.tix"), - MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"), - MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"), - MovedModule("tkinter_colorchooser", "tkColorChooser", - "tkinter.colorchooser"), - MovedModule("tkinter_commondialog", "tkCommonDialog", - "tkinter.commondialog"), - MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"), - MovedModule("tkinter_font", "tkFont", "tkinter.font"), - MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"), - MovedModule("tkinter_tksimpledialog", "tkSimpleDialog", - "tkinter.simpledialog"), - MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"), - MovedModule("winreg", "_winreg"), -] -for attr in _moved_attributes: - setattr(_MovedItems, attr.name, attr) -del attr - -moves = sys.modules["django.utils.six.moves"] = _MovedItems("moves") - - -def add_move(move): - """Add an item to six.moves.""" - setattr(_MovedItems, move.name, move) - - -def remove_move(name): - """Remove item from six.moves.""" - try: - delattr(_MovedItems, name) - except AttributeError: - try: - del moves.__dict__[name] - except KeyError: - raise AttributeError("no such move, %r" % (name,)) - - -if PY3: - _meth_func = "__func__" - _meth_self = "__self__" - - _func_code = "__code__" - _func_defaults = "__defaults__" - - _iterkeys = "keys" - _itervalues = "values" - _iteritems = "items" -else: - _meth_func = "im_func" - _meth_self = "im_self" - - _func_code = "func_code" - _func_defaults = "func_defaults" - - _iterkeys = "iterkeys" - _itervalues = "itervalues" - _iteritems = "iteritems" - - -try: - advance_iterator = next -except NameError: - def advance_iterator(it): - return it.next() -next = advance_iterator - - -if PY3: - def get_unbound_function(unbound): - return unbound - - Iterator = object - - def callable(obj): - return any("__call__" in klass.__dict__ for klass in type(obj).__mro__) -else: - def get_unbound_function(unbound): - return unbound.im_func - - class Iterator(object): - - def next(self): - return type(self).__next__(self) - - callable = callable -_add_doc(get_unbound_function, - """Get the function out of a possibly unbound function""") - - -get_method_function = operator.attrgetter(_meth_func) -get_method_self = operator.attrgetter(_meth_self) -get_function_code = operator.attrgetter(_func_code) -get_function_defaults = operator.attrgetter(_func_defaults) - - -def iterkeys(d): - """Return an iterator over the keys of a dictionary.""" - return iter(getattr(d, _iterkeys)()) - -def itervalues(d): - """Return an iterator over the values of a dictionary.""" - return iter(getattr(d, _itervalues)()) - -def iteritems(d): - """Return an iterator over the (key, value) pairs of a dictionary.""" - return iter(getattr(d, _iteritems)()) - - -if PY3: - def b(s): - return s.encode("latin-1") - def u(s): - return s - if sys.version_info[1] <= 1: - def int2byte(i): - return bytes((i,)) - else: - # This is about 2x faster than the implementation above on 3.2+ - int2byte = operator.methodcaller("to_bytes", 1, "big") - import io - StringIO = io.StringIO - BytesIO = io.BytesIO -else: - def b(s): - return s - def u(s): - return unicode(s, "unicode_escape") - int2byte = chr - import StringIO - StringIO = BytesIO = StringIO.StringIO -_add_doc(b, """Byte literal""") -_add_doc(u, """Text literal""") - - -if PY3: - import builtins - exec_ = getattr(builtins, "exec") - - - def reraise(tp, value, tb=None): - if value.__traceback__ is not tb: - raise value.with_traceback(tb) - raise value - - - print_ = getattr(builtins, "print") - del builtins - -else: - def exec_(code, globs=None, locs=None): - """Execute code in a namespace.""" - if globs is None: - frame = sys._getframe(1) - globs = frame.f_globals - if locs is None: - locs = frame.f_locals - del frame - elif locs is None: - locs = globs - exec("""exec code in globs, locs""") - - - exec_("""def reraise(tp, value, tb=None): - raise tp, value, tb -""") - - - def print_(*args, **kwargs): - """The new-style print function.""" - fp = kwargs.pop("file", sys.stdout) - if fp is None: - return - def write(data): - if not isinstance(data, basestring): - data = str(data) - fp.write(data) - want_unicode = False - sep = kwargs.pop("sep", None) - if sep is not None: - if isinstance(sep, unicode): - want_unicode = True - elif not isinstance(sep, str): - raise TypeError("sep must be None or a string") - end = kwargs.pop("end", None) - if end is not None: - if isinstance(end, unicode): - want_unicode = True - elif not isinstance(end, str): - raise TypeError("end must be None or a string") - if kwargs: - raise TypeError("invalid keyword arguments to print()") - if not want_unicode: - for arg in args: - if isinstance(arg, unicode): - want_unicode = True - break - if want_unicode: - newline = unicode("\n") - space = unicode(" ") - else: - newline = "\n" - space = " " - if sep is None: - sep = space - if end is None: - end = newline - for i, arg in enumerate(args): - if i: - write(sep) - write(arg) - write(end) - -_add_doc(reraise, """Reraise an exception.""") - - -def with_metaclass(meta, base=object): - """Create a base class with a metaclass.""" - return meta("NewBase", (base,), {}) - - -### Additional customizations for Django ### - -if PY3: - _iterlists = "lists" - _assertRaisesRegex = "assertRaisesRegex" -else: - _iterlists = "iterlists" - _assertRaisesRegex = "assertRaisesRegexp" - - -def iterlists(d): - """Return an iterator over the values of a MultiValueDict.""" - return getattr(d, _iterlists)() - - -def assertRaisesRegex(self, *args, **kwargs): - return getattr(self, _assertRaisesRegex)(*args, **kwargs) - - -add_move(MovedModule("_dummy_thread", "dummy_thread")) -add_move(MovedModule("_thread", "thread")) diff --git a/tox.ini b/tox.ini index aa97fd350..6ec400ddf 100644 --- a/tox.ini +++ b/tox.ini @@ -91,6 +91,7 @@ deps = django==1.3.5 django-oauth-plus==2.0 oauth2==1.5.211 django-oauth2-provider==0.2.3 + six [testenv:py2.6-django1.3] basepython = python2.6 @@ -100,3 +101,4 @@ deps = django==1.3.5 django-oauth-plus==2.0 oauth2==1.5.211 django-oauth2-provider==0.2.3 + six From f631f55f8ebdf3d4e478aa5ca435ad36e86bee0f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 21 Aug 2013 21:35:17 +0100 Subject: [PATCH 0073/1652] Tweak comment --- rest_framework/compat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 178a697f3..66be96a62 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -10,7 +10,7 @@ import django from django.core.exceptions import ImproperlyConfigured from django.conf import settings -# Try to import six from Django, fallback to included `six`. +# Try to import six from Django, fallback to external `six` package. try: from django.utils import six except ImportError: From ec5955101b4b15b828ac5b6fc54e8d10f2a7c64a Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Thu, 22 Aug 2013 12:40:12 -0300 Subject: [PATCH 0074/1652] Update parsers.md s/renderers/parsers/ --- docs/api-guide/parsers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index d3c42b1c2..1030fcb65 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -34,7 +34,7 @@ The default set of parsers may be set globally, using the `DEFAULT_PARSER_CLASSE ) } -You can also set the renderers used for an individual view, or viewset, +You can also set the parsers used for an individual view, or viewset, using the `APIView` class based views. from rest_framework.parsers import YAMLParser From b8561f41238e0ad79b2cc823518a93314d987979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Thu, 22 Aug 2013 17:52:22 +0200 Subject: [PATCH 0075/1652] Add @ramiro for #1056 thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index a894ee7cc..16ea78c42 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -159,6 +159,7 @@ The following people have helped make REST framework great. * Jeremy Satterfield - [jsatt] * Christopher Paolini - [chrispaolini] * Filipe A Ximenes - [filipeximenes] +* Ramiro Morales - [ramiro] Many thanks to everyone who's contributed to the project. @@ -354,3 +355,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [jsatt]: https://github.com/jsatt [chrispaolini]: https://github.com/chrispaolini [filipeximenes]: https://github.com/filipeximenes +[ramiro]: https://github.com/ramiro From 19a774f97292444a48c5b7521e1b0c0ea48b6502 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 11:21:45 +0100 Subject: [PATCH 0076/1652] force_authenticate(None) also clears session info. Closes #1055. --- docs/topics/release-notes.md | 1 + rest_framework/test.py | 2 ++ rest_framework/tests/test_testing.py | 30 ++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index dfc4bfbb9..af90b1ea3 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -44,6 +44,7 @@ You can determine your currently installed version using `pip freeze`: * Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. * Bugfix: `required=True` argument fixed for boolean serializer fields. +* Bugfix: `client.force_authenticate(None)` should also clear session info if it exists. ### 2.3.7 diff --git a/rest_framework/test.py b/rest_framework/test.py index a18f5a293..234d10a4a 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -134,6 +134,8 @@ class APIClient(APIRequestFactory, DjangoClient): """ self.handler._force_user = user self.handler._force_token = token + if user is None: + self.logout() # Also clear any possible session info if required def request(self, **kwargs): # Ensure that any credentials set get added to every request. diff --git a/rest_framework/tests/test_testing.py b/rest_framework/tests/test_testing.py index 49d45fc29..48b8956b5 100644 --- a/rest_framework/tests/test_testing.py +++ b/rest_framework/tests/test_testing.py @@ -17,8 +17,18 @@ def view(request): }) +@api_view(['GET', 'POST']) +def session_view(request): + active_session = request.session.get('active_session', False) + request.session['active_session'] = True + return Response({ + 'active_session': active_session + }) + + urlpatterns = patterns('', url(r'^view/$', view), + url(r'^session-view/$', session_view), ) @@ -46,6 +56,26 @@ class TestAPITestClient(TestCase): response = self.client.get('/view/') self.assertEqual(response.data['user'], 'example') + def test_force_authenticate_with_sessions(self): + """ + Setting `.force_authenticate()` forcibly authenticates each request. + """ + user = User.objects.create_user('example', 'example@example.com') + self.client.force_authenticate(user) + + # First request does not yet have an active session + response = self.client.get('/session-view/') + self.assertEqual(response.data['active_session'], False) + + # Subsequant requests have an active session + response = self.client.get('/session-view/') + self.assertEqual(response.data['active_session'], True) + + # Force authenticating as `None` should also logout the user session. + self.client.force_authenticate(None) + response = self.client.get('/session-view/') + self.assertEqual(response.data['active_session'], False) + def test_csrf_exempt_by_default(self): """ By default, the test client is CSRF exempt. From dba602781355f6ee0cbc34775209cd37a52ca4d4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 11:27:12 +0100 Subject: [PATCH 0077/1652] Add missing period. --- docs/api-guide/testing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index b3880f8f0..35c1f7660 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -2,7 +2,7 @@ # Testing -> Code without tests is broken as designed +> Code without tests is broken as designed. > > — [Jacob Kaplan-Moss][cite] From 95b2bf50fbb9b95facebb23812bbbb2e27a76035 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 12:03:54 +0100 Subject: [PATCH 0078/1652] Add validation error test when passing non-file to FileField --- rest_framework/tests/test_files.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/rest_framework/tests/test_files.py b/rest_framework/tests/test_files.py index 495c2a7fd..c13c38b86 100644 --- a/rest_framework/tests/test_files.py +++ b/rest_framework/tests/test_files.py @@ -69,3 +69,14 @@ class FileSerializerTests(TestCase): self.assertTrue(serializer.is_valid()) self.assertEqual(serializer.object.created, uploaded_file.created) self.assertIsNone(serializer.object.file) + + def test_validation_error_with_non_file(self): + """ + Passing non-files should raise a validation error. + """ + now = datetime.datetime.now() + errmsg = 'No file was submitted. Check the encoding type on the form.' + + serializer = UploadedFileSerializer(data={'created': now, 'file': 'abc'}) + self.assertFalse(serializer.is_valid()) + self.assertEqual(serializer.errors, {'file': [errmsg]}) From f2b190e3740e50508b3da1ec52048a3c90add3b1 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 12:06:23 +0100 Subject: [PATCH 0079/1652] Update release notes --- docs/topics/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index af90b1ea3..626831cbf 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -45,6 +45,7 @@ You can determine your currently installed version using `pip freeze`: * Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. * Bugfix: `required=True` argument fixed for boolean serializer fields. * Bugfix: `client.force_authenticate(None)` should also clear session info if it exists. +* Bugfix: Client sending emptry string instead of file now clears `FileField`. ### 2.3.7 From e7927e9bca5bc0d0ac3b528e68244c713c5df97f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 13:35:50 +0100 Subject: [PATCH 0080/1652] Extra docs on PATCH with no object. --- rest_framework/mixins.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 59d644694..426865ff9 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -149,6 +149,8 @@ class UpdateModelMixin(object): # return None. self.check_permissions(clone_request(self.request, 'POST')) else: + # PATCH requests where the object does not exist should still + # return a 404 response. raise def pre_save(self, obj): From 7bbe0f868f02e3da902c6e0d11bf5b10bc55f616 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 13:37:25 +0100 Subject: [PATCH 0081/1652] Added @krzysiekj For work on #1034. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 16ea78c42..e6d09bc23 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -160,6 +160,7 @@ The following people have helped make REST framework great. * Christopher Paolini - [chrispaolini] * Filipe A Ximenes - [filipeximenes] * Ramiro Morales - [ramiro] +* Krzysztof Jurewicz - [krzysiekj] Many thanks to everyone who's contributed to the project. @@ -356,3 +357,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [chrispaolini]: https://github.com/chrispaolini [filipeximenes]: https://github.com/filipeximenes [ramiro]: https://github.com/ramiro +[krzysiekj]: https://github.com/krzysiekj From e03854ba6a74428675c40d469a7768cc5131035f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 14:06:14 +0100 Subject: [PATCH 0082/1652] Tweaks to display nested data in empty serializers --- rest_framework/relations.py | 9 +++++++-- rest_framework/serializers.py | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index edaf76d6e..7408758e6 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -134,9 +134,9 @@ class RelatedField(WritableField): value = obj for component in source.split('.'): - value = get_component(value, component) if value is None: break + value = get_component(value, component) except ObjectDoesNotExist: return None @@ -567,8 +567,13 @@ class HyperlinkedIdentityField(Field): May raise a `NoReverseMatch` if the `view_name` and `lookup_field` attributes are not configured to correctly match the URL conf. """ - lookup_field = getattr(obj, self.lookup_field) + lookup_field = getattr(obj, self.lookup_field, None) kwargs = {self.lookup_field: lookup_field} + + # Handle unsaved object case + if lookup_field is None: + return None + try: return reverse(view_name, kwargs=kwargs, request=request, format=format) except NoReverseMatch: diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 2b260c256..22525964c 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -338,9 +338,9 @@ class BaseSerializer(WritableField): value = obj for component in source.split('.'): - value = get_component(value, component) if value is None: - break + return self.to_native(None) + value = get_component(value, component) except ObjectDoesNotExist: return None From 0966a2680ba02e6a4586bd2777ed593fcc66a453 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 14:38:31 +0100 Subject: [PATCH 0083/1652] First pass at HTMLFormRenderer --- rest_framework/renderers.py | 97 +++++++++++-------- .../templates/rest_framework/base.html | 10 +- 2 files changed, 58 insertions(+), 49 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 1006e26cf..a73b2d732 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -316,6 +316,59 @@ class StaticHTMLRenderer(TemplateHTMLRenderer): return data +class HTMLFormRenderer(BaseRenderer): + template = 'rest_framework/form.html' + + def serializer_to_form_fields(self, serializer): + fields = {} + for k, v in serializer.get_fields().items(): + if getattr(v, 'read_only', True): + continue + + kwargs = {} + kwargs['required'] = v.required + + #if getattr(v, 'queryset', None): + # kwargs['queryset'] = v.queryset + + if getattr(v, 'choices', None) is not None: + kwargs['choices'] = v.choices + + if getattr(v, 'regex', None) is not None: + kwargs['regex'] = v.regex + + if getattr(v, 'widget', None): + widget = copy.deepcopy(v.widget) + kwargs['widget'] = widget + + if getattr(v, 'default', None) is not None: + kwargs['initial'] = v.default + + if getattr(v, 'label', None) is not None: + kwargs['label'] = v.label + + if getattr(v, 'help_text', None) is not None: + kwargs['help_text'] = v.help_text + + fields[k] = v.form_field_class(**kwargs) + + return fields + + def render(self, serializer, obj, request): + fields = self.serializer_to_form_fields(serializer) + + # Creating an on the fly form see: + # http://stackoverflow.com/questions/3915024/dynamically-creating-classes-python + OnTheFlyForm = type(str("OnTheFlyForm"), (forms.Form,), fields) + data = (obj is not None) and serializer.data or None + form_instance = OnTheFlyForm(data) + + template = loader.get_template(self.template) + context = RequestContext(request, {'form': form_instance}) + + return template.render(context) + + class BrowsableAPIRenderer(BaseRenderer): """ HTML renderer used to self-document the API. @@ -371,41 +424,6 @@ class BrowsableAPIRenderer(BaseRenderer): return False # Doesn't have permissions return True - def serializer_to_form_fields(self, serializer): - fields = {} - for k, v in serializer.get_fields().items(): - if getattr(v, 'read_only', True): - continue - - kwargs = {} - kwargs['required'] = v.required - - #if getattr(v, 'queryset', None): - # kwargs['queryset'] = v.queryset - - if getattr(v, 'choices', None) is not None: - kwargs['choices'] = v.choices - - if getattr(v, 'regex', None) is not None: - kwargs['regex'] = v.regex - - if getattr(v, 'widget', None): - widget = copy.deepcopy(v.widget) - kwargs['widget'] = widget - - if getattr(v, 'default', None) is not None: - kwargs['initial'] = v.default - - if getattr(v, 'label', None) is not None: - kwargs['label'] = v.label - - if getattr(v, 'help_text', None) is not None: - kwargs['help_text'] = v.help_text - - fields[k] = v.form_field_class(**kwargs) - - return fields - def _get_form(self, view, method, request): # We need to impersonate a request with the correct method, # so that eg. any dynamic get_serializer_class methods return the @@ -447,14 +465,7 @@ class BrowsableAPIRenderer(BaseRenderer): return serializer = view.get_serializer(instance=obj) - fields = self.serializer_to_form_fields(serializer) - - # Creating an on the fly form see: - # http://stackoverflow.com/questions/3915024/dynamically-creating-classes-python - OnTheFlyForm = type(str("OnTheFlyForm"), (forms.Form,), fields) - data = (obj is not None) and serializer.data or None - form_instance = OnTheFlyForm(data) - return form_instance + return HTMLFormRenderer().render(serializer, obj, request) def get_raw_data_form(self, view, method, request, media_types): """ diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 51f9c2916..6ae47563d 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -136,9 +136,9 @@ {% if post_form %}
    {% with form=post_form %} -
    +
    - {% include "rest_framework/form.html" %} + {{ post_form }}
    @@ -174,16 +174,14 @@
    {% if put_form %}
    - {% with form=put_form %} - +
    - {% include "rest_framework/form.html" %} + {{ put_form }}
    - {% endwith %}
    {% endif %}
    From 005f475c6af023cc7c75cf38d3a89e22638e5d84 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 14:58:06 +0100 Subject: [PATCH 0084/1652] Don't consume .json style suffixes with routers. When trailing slash is false, the lookup regex should not consume '.' characters. Fixes #1057. --- rest_framework/routers.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 930011d39..3fee1e494 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -189,7 +189,11 @@ class SimpleRouter(BaseRouter): Given a viewset, return the portion of URL regex that is used to match against a single instance. """ - base_regex = '(?P<{lookup_field}>[^/]+)' + if self.trailing_slash: + base_regex = '(?P<{lookup_field}>[^/]+)' + else: + # Don't consume `.json` style suffixes + base_regex = '(?P<{lookup_field}>[^/.]+)' lookup_field = getattr(viewset, 'lookup_field', 'pk') return base_regex.format(lookup_field=lookup_field) From 1c935cd3d271efd06f1621c9dddb9e1cd0333e20 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 15:18:47 +0100 Subject: [PATCH 0085/1652] Fix failing test for router with no trailing slash --- rest_framework/tests/test_routers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py index 5fcccb741..e723f7d45 100644 --- a/rest_framework/tests/test_routers.py +++ b/rest_framework/tests/test_routers.py @@ -146,7 +146,7 @@ class TestTrailingSlashRemoved(TestCase): self.urls = self.router.urls def test_urls_can_have_trailing_slash_removed(self): - expected = ['^notes$', '^notes/(?P[^/]+)$'] + expected = ['^notes$', '^notes/(?P[^/.]+)$'] for idx in range(len(expected)): self.assertEqual(expected[idx], self.urls[idx].regex.pattern) From 10d386ec6a4822402b5ffea46bdd9e7d72db519b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 16:10:20 +0100 Subject: [PATCH 0086/1652] Cleanup and dealing with empty form data. --- rest_framework/relations.py | 2 + rest_framework/renderers.py | 103 ++++++++++++++++++---------------- rest_framework/serializers.py | 3 +- 3 files changed, 58 insertions(+), 50 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 7408758e6..3ad16ee5e 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -244,6 +244,8 @@ class PrimaryKeyRelatedField(RelatedField): source = self.source or field_name queryset = obj for component in source.split('.'): + if queryset is None: + return [] queryset = get_component(queryset, component) # Forward relationship diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index a73b2d732..a8670546b 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -319,52 +319,53 @@ class StaticHTMLRenderer(TemplateHTMLRenderer): class HTMLFormRenderer(BaseRenderer): template = 'rest_framework/form.html' - def serializer_to_form_fields(self, serializer): + def data_to_form_fields(self, data): fields = {} - for k, v in serializer.get_fields().items(): - if getattr(v, 'read_only', True): + for key, val in data.fields.items(): + if getattr(val, 'read_only', True): continue kwargs = {} - kwargs['required'] = v.required + kwargs['required'] = val.required #if getattr(v, 'queryset', None): # kwargs['queryset'] = v.queryset - if getattr(v, 'choices', None) is not None: - kwargs['choices'] = v.choices + if getattr(val, 'choices', None) is not None: + kwargs['choices'] = val.choices - if getattr(v, 'regex', None) is not None: - kwargs['regex'] = v.regex + if getattr(val, 'regex', None) is not None: + kwargs['regex'] = val.regex - if getattr(v, 'widget', None): - widget = copy.deepcopy(v.widget) + if getattr(val, 'widget', None): + widget = copy.deepcopy(val.widget) kwargs['widget'] = widget - if getattr(v, 'default', None) is not None: - kwargs['initial'] = v.default + if getattr(val, 'default', None) is not None: + kwargs['initial'] = val.default - if getattr(v, 'label', None) is not None: - kwargs['label'] = v.label + if getattr(val, 'label', None) is not None: + kwargs['label'] = val.label - if getattr(v, 'help_text', None) is not None: - kwargs['help_text'] = v.help_text + if getattr(val, 'help_text', None) is not None: + kwargs['help_text'] = val.help_text - fields[k] = v.form_field_class(**kwargs) + fields[key] = val.form_field_class(**kwargs) return fields - def render(self, serializer, obj, request): - fields = self.serializer_to_form_fields(serializer) + def render(self, data, accepted_media_type=None, renderer_context=None): + self.renderer_context = renderer_context or {} + request = renderer_context['request'] # Creating an on the fly form see: # http://stackoverflow.com/questions/3915024/dynamically-creating-classes-python - OnTheFlyForm = type(str("OnTheFlyForm"), (forms.Form,), fields) - data = (obj is not None) and serializer.data or None - form_instance = OnTheFlyForm(data) + fields = self.data_to_form_fields(data) + DynamicForm = type(str('DynamicForm'), (forms.Form,), fields) + data = None if data.empty else data template = loader.get_template(self.template) - context = RequestContext(request, {'form': form_instance}) + context = RequestContext(request, {'form': DynamicForm(data)}) return template.render(context) @@ -377,6 +378,7 @@ class BrowsableAPIRenderer(BaseRenderer): format = 'api' template = 'rest_framework/api.html' charset = 'utf-8' + form_renderer_class = HTMLFormRenderer def get_default_renderer(self, view): """ @@ -424,7 +426,7 @@ class BrowsableAPIRenderer(BaseRenderer): return False # Doesn't have permissions return True - def _get_form(self, view, method, request): + def _get_rendered_html_form(self, view, method, request): # We need to impersonate a request with the correct method, # so that eg. any dynamic get_serializer_class methods return the # correct form for each method. @@ -432,27 +434,16 @@ class BrowsableAPIRenderer(BaseRenderer): request = clone_request(request, method) view.request = request try: - return self.get_form(view, method, request) + return self.get_rendered_html_form(view, method, request) finally: view.request = restore - def _get_raw_data_form(self, view, method, request, media_types): - # We need to impersonate a request with the correct method, - # so that eg. any dynamic get_serializer_class methods return the - # correct form for each method. - restore = view.request - request = clone_request(request, method) - view.request = request - try: - return self.get_raw_data_form(view, method, request, media_types) - finally: - view.request = restore - - def get_form(self, view, method, request): + def get_rendered_html_form(self, view, method, request): """ - Get a form, possibly bound to either the input or output data. - In the absence on of the Resource having an associated form then - provide a form that can be used to submit arbitrary content. + Return a string representing a rendered HTML form, possibly bound to + either the input or output data. + + In the absence of the View having an associated form then return None. """ obj = getattr(view, 'object', None) if not self.show_form_for_method(view, method, request, obj): @@ -465,7 +456,21 @@ class BrowsableAPIRenderer(BaseRenderer): return serializer = view.get_serializer(instance=obj) - return HTMLFormRenderer().render(serializer, obj, request) + data = serializer.data + form_renderer = self.form_renderer_class() + return form_renderer.render(data, self.accepted_media_type, self.renderer_context) + + def _get_raw_data_form(self, view, method, request, media_types): + # We need to impersonate a request with the correct method, + # so that eg. any dynamic get_serializer_class methods return the + # correct form for each method. + restore = view.request + request = clone_request(request, method) + view.request = request + try: + return self.get_raw_data_form(view, method, request, media_types) + finally: + view.request = restore def get_raw_data_form(self, view, method, request, media_types): """ @@ -520,8 +525,8 @@ class BrowsableAPIRenderer(BaseRenderer): """ Render the HTML for the browsable API representation. """ - accepted_media_type = accepted_media_type or '' - renderer_context = renderer_context or {} + self.accepted_media_type = accepted_media_type or '' + self.renderer_context = renderer_context or {} view = renderer_context['view'] request = renderer_context['request'] @@ -531,11 +536,11 @@ class BrowsableAPIRenderer(BaseRenderer): renderer = self.get_default_renderer(view) content = self.get_content(renderer, data, accepted_media_type, renderer_context) - put_form = self._get_form(view, 'PUT', request) - post_form = self._get_form(view, 'POST', request) - patch_form = self._get_form(view, 'PATCH', request) - delete_form = self._get_form(view, 'DELETE', request) - options_form = self._get_form(view, 'OPTIONS', request) + put_form = self._get_rendered_html_form(view, 'PUT', request) + post_form = self._get_rendered_html_form(view, 'POST', request) + patch_form = self._get_rendered_html_form(view, 'PATCH', request) + delete_form = self._get_rendered_html_form(view, 'DELETE', request) + options_form = self._get_rendered_html_form(view, 'OPTIONS', request) raw_data_put_form = self._get_raw_data_form(view, 'PUT', request, media_types) raw_data_post_form = self._get_raw_data_form(view, 'POST', request, media_types) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index fde06d834..97e0a005f 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -300,7 +300,8 @@ class BaseSerializer(WritableField): Serialize objects -> primitives. """ ret = self._dict_class() - ret.fields = {} + ret.fields = self._dict_class() + ret.empty = obj is None for field_name, field in self.fields.items(): field.initialize(parent=self, field_name=field_name) From e23d5888522f98c30418452c0f833cf11589e0c1 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 16:16:41 +0100 Subject: [PATCH 0087/1652] Adding standard renderer attributes and documenting --- rest_framework/renderers.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index a8670546b..9885c8ddc 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -317,7 +317,18 @@ class StaticHTMLRenderer(TemplateHTMLRenderer): class HTMLFormRenderer(BaseRenderer): + """ + Renderers serializer data into an HTML form. + + If the serializer was instantiated without an object then this will + return an HTML form not bound to any object, + otherwise it will return an HTML form with the appropriate initial data + populated from the object. + """ + media_type = 'text/html' + format = 'form' template = 'rest_framework/form.html' + charset = 'utf-8' def data_to_form_fields(self, data): fields = {} From 436e66a42db21b52fd5e1582011d2f0f7f81f9c7 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 16:45:55 +0100 Subject: [PATCH 0088/1652] JSON responses should not include a charset --- docs/api-guide/renderers.md | 9 ++++++--- rest_framework/renderers.py | 17 +++++++++++------ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 7fc1fc1fd..d46d05686 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -88,7 +88,7 @@ The client may additionally include an `'indent'` media type parameter, in which **.format**: `'.json'` -**.charset**: `utf-8` +**.charset**: `None` ## UnicodeJSONRenderer @@ -110,7 +110,7 @@ Both the `JSONRenderer` and `UnicodeJSONRenderer` styles conform to [RFC 4627][r **.format**: `'.json'` -**.charset**: `utf-8` +**.charset**: `None` ## JSONPRenderer @@ -295,12 +295,15 @@ By default renderer classes are assumed to be using the `UTF-8` encoding. To us Note that if a renderer class returns a unicode string, then the response content will be coerced into a bytestring by the `Response` class, with the `charset` attribute set on the renderer used to determine the encoding. -If the renderer returns a bytestring representing raw binary content, you should set a charset value of `None`, which will ensure the `Content-Type` header of the response will not have a `charset` value set. Doing so will also ensure that the browsable API will not attempt to display the binary content as a string. +If the renderer returns a bytestring representing raw binary content, you should set a charset value of `None`, which will ensure the `Content-Type` header of the response will not have a `charset` value set. + +In some cases you may also want to set the `render_style` attribute to `'binary'`. Doing so will also ensure that the browsable API will not attempt to display the binary content as a string. class JPEGRenderer(renderers.BaseRenderer): media_type = 'image/jpeg' format = 'jpg' charset = None + render_style = 'binary' def render(self, data, media_type=None, renderer_context=None): return data diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 1006e26cf..c87014e27 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -36,6 +36,7 @@ class BaseRenderer(object): media_type = None format = None charset = 'utf-8' + render_style = 'text' def render(self, data, accepted_media_type=None, renderer_context=None): raise NotImplemented('Renderer class requires .render() to be implemented') @@ -51,16 +52,17 @@ class JSONRenderer(BaseRenderer): format = 'json' encoder_class = encoders.JSONEncoder ensure_ascii = True - charset = 'utf-8' - # Note that JSON encodings must be utf-8, utf-16 or utf-32. + charset = None + # JSON is a binary encoding, that can be encoded as utf-8, utf-16 or utf-32. # See: http://www.ietf.org/rfc/rfc4627.txt + # Also: http://lucumr.pocoo.org/2013/7/19/application-mimetypes-and-encodings/ def render(self, data, accepted_media_type=None, renderer_context=None): """ Render `data` into JSON. """ if data is None: - return '' + return bytes() # If 'indent' is provided in the context, then pretty print the result. # E.g. If we're being called by the BrowsableAPIRenderer. @@ -85,13 +87,12 @@ class JSONRenderer(BaseRenderer): # and may (or may not) be unicode. # On python 3.x json.dumps() returns unicode strings. if isinstance(ret, six.text_type): - return bytes(ret.encode(self.charset)) + return bytes(ret.encode('utf-8')) return ret class UnicodeJSONRenderer(JSONRenderer): ensure_ascii = False - charset = 'utf-8' """ Renderer which serializes to JSON. Does *not* apply JSON's character escaping for non-ascii characters. @@ -108,6 +109,7 @@ class JSONPRenderer(JSONRenderer): format = 'jsonp' callback_parameter = 'callback' default_callback = 'callback' + charset = 'utf-8' def get_callback(self, renderer_context): """ @@ -348,7 +350,10 @@ class BrowsableAPIRenderer(BaseRenderer): renderer_context['indent'] = 4 content = renderer.render(data, accepted_media_type, renderer_context) - if renderer.charset is None: + render_style = getattr(renderer, 'render_style', 'text') + assert render_style in ['text', 'binary'], 'Expected .render_style ' \ + '"text" or "binary", but got "%s"' % render_style + if render_style == 'binary': return '[%d bytes of binary content]' % len(content) return content From be0f5850c398b7f7397d66eaed26d6b78163b259 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 16:51:34 +0100 Subject: [PATCH 0089/1652] Extra docs --- rest_framework/renderers.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index c07b1652c..b30f2ea9f 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -326,6 +326,8 @@ class HTMLFormRenderer(BaseRenderer): return an HTML form not bound to any object, otherwise it will return an HTML form with the appropriate initial data populated from the object. + + Note that rendering of field and form errors is not currently supported. """ media_type = 'text/html' format = 'form' @@ -368,6 +370,18 @@ class HTMLFormRenderer(BaseRenderer): return fields def render(self, data, accepted_media_type=None, renderer_context=None): + """ + Render serializer data and return an HTML form, as a string. + """ + # The HTMLFormRenderer currently uses something of a hack to render + # the content, by translating each of the serializer fields into + # an html form field, creating a dynamic form using those fields, + # and then rendering that form. + + # This isn't strictly neccessary, as we could render the serilizer + # fields to HTML directly. The implementation is historical and will + # likely change at some point. + self.renderer_context = renderer_context or {} request = renderer_context['request'] From c7847ebc45f38e4d735b77c54ad1a55c87242fac Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 23 Aug 2013 17:10:50 +0100 Subject: [PATCH 0090/1652] Docs for HTMLFormRenderer --- docs/api-guide/renderers.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index d46d05686..c116ceda6 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -212,6 +212,18 @@ You can use `TemplateHTMLRenderer` either to return regular HTML pages using RES See also: `TemplateHTMLRenderer` +## HTMLFormRenderer + +Renders data returned by a serializer into an HTML form. The output of this renderer does not include the enclosing `
    ` tags or an submit actions, as you'll probably need those to include the desired method and URL. Also note that the `HTMLFormRenderer` does not yet support including field error messages. + +**.media_type**: `text/html` + +**.format**: `'.form'` + +**.charset**: `utf-8` + +**.template**: `'rest_framework/form.html'` + ## BrowsableAPIRenderer Renders data into HTML for the Browsable API. This renderer will determine which other renderer would have been given highest priority, and use that to display an API style response within the HTML page. @@ -222,6 +234,8 @@ Renders data into HTML for the Browsable API. This renderer will determine whic **.charset**: `utf-8` +**.template**: `'rest_framework/api.html'` + #### Customizing BrowsableAPIRenderer By default the response content will be rendered with the highest priority renderer apart from `BrowseableAPIRenderer`. If you need to customize this behavior, for example to use HTML as the default return format, but use JSON in the browsable API, you can do so by overriding the `get_default_renderer()` method. For example: From 9d3fae27fd9c3236dfd9c26ae9b830deb6fa4e9b Mon Sep 17 00:00:00 2001 From: Eric Buehl Date: Fri, 23 Aug 2013 16:48:32 +0000 Subject: [PATCH 0091/1652] parameterize identity field class to allow for easier subclassing --- rest_framework/serializers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 31cfa3447..abb969410 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -903,6 +903,7 @@ class HyperlinkedModelSerializer(ModelSerializer): _options_class = HyperlinkedModelSerializerOptions _default_view_name = '%(model_name)s-detail' _hyperlink_field_class = HyperlinkedRelatedField + _hyperlink_identify_field_class = HyperlinkedIdentityField def get_default_fields(self): fields = super(HyperlinkedModelSerializer, self).get_default_fields() @@ -911,7 +912,7 @@ class HyperlinkedModelSerializer(ModelSerializer): self.opts.view_name = self._get_default_view_name(self.opts.model) if 'url' not in fields: - url_field = HyperlinkedIdentityField( + url_field = self._hyperlink_identify_field_class( view_name=self.opts.view_name, lookup_field=self.opts.lookup_field ) From 53d60543c3a5c637491aaeb887269627ce9179ab Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sun, 25 Aug 2013 20:31:04 +0100 Subject: [PATCH 0092/1652] Add warning against HTMLFormRenderer --- docs/api-guide/renderers.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index c116ceda6..657377d92 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -216,6 +216,8 @@ See also: `TemplateHTMLRenderer` Renders data returned by a serializer into an HTML form. The output of this renderer does not include the enclosing `` tags or an submit actions, as you'll probably need those to include the desired method and URL. Also note that the `HTMLFormRenderer` does not yet support including field error messages. +Note that the template used by the `HTMLFormRenderer` class, and the context submitted to it **may be subject to change**. If you need to use this renderer class it is advised that you either make a local copy of the class and templates, or follow the release note on REST framework upgrades closely. + **.media_type**: `text/html` **.format**: `'.form'` From 23400357895dbbf1e91fa720af080eb1b6e23a00 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sun, 25 Aug 2013 20:48:10 +0100 Subject: [PATCH 0093/1652] Added @ericbuehl For pull request #1058. Thank you! :) --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index e6d09bc23..09d91480b 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -161,6 +161,7 @@ The following people have helped make REST framework great. * Filipe A Ximenes - [filipeximenes] * Ramiro Morales - [ramiro] * Krzysztof Jurewicz - [krzysiekj] +* Eric Buehl - [ericbuehl] Many thanks to everyone who's contributed to the project. @@ -358,3 +359,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [filipeximenes]: https://github.com/filipeximenes [ramiro]: https://github.com/ramiro [krzysiekj]: https://github.com/krzysiekj +[ericbuehl]: https://github.com/ericbuehl From afee470aca28c73fb0f107e99fdb98e5a2d5a135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20=C3=98llegaard?= Date: Mon, 26 Aug 2013 11:02:01 +0200 Subject: [PATCH 0094/1652] More information on how actions are mapped to URLs in viewsets --- docs/api-guide/viewsets.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 61f9d2f85..2e65b7a43 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -142,6 +142,10 @@ The `@action` decorator will route `POST` requests by default, but may also acce @action(methods=['POST', 'DELETE']) def unset_password(self, request, pk=None): ... + +The two new actions will then be available at the urls `^users/{pk}/set_password/$` and `^users/{pk}/unset_password/$` + + --- # API Reference From 316de3a8a314162e3d6ec081344eabca3a4d91b9 Mon Sep 17 00:00:00 2001 From: Alexander Akhmetov Date: Mon, 26 Aug 2013 20:05:36 +0400 Subject: [PATCH 0095/1652] Added max_paginate_by parameter --- rest_framework/generics.py | 10 ++++-- rest_framework/settings.py | 1 + rest_framework/tests/test_pagination.py | 46 +++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 5ecf6310d..33affee88 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -56,6 +56,7 @@ class GenericAPIView(views.APIView): # Pagination settings paginate_by = api_settings.PAGINATE_BY paginate_by_param = api_settings.PAGINATE_BY_PARAM + max_paginate_by = api_settings.MAX_PAGINATE_BY pagination_serializer_class = api_settings.DEFAULT_PAGINATION_SERIALIZER_CLASS page_kwarg = 'page' @@ -207,11 +208,16 @@ class GenericAPIView(views.APIView): if self.paginate_by_param: query_params = self.request.QUERY_PARAMS try: - return int(query_params[self.paginate_by_param]) + paginate_by_param = int(query_params[self.paginate_by_param]) except (KeyError, ValueError): pass + else: + if self.max_paginate_by: + return min(self.max_paginate_by, paginate_by_param) + else: + return paginate_by_param - return self.paginate_by + return min(self.max_paginate_by, self.paginate_by) or self.paginate_by def get_serializer_class(self): """ diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 7d25e5131..b8e40bfa5 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -68,6 +68,7 @@ DEFAULTS = { # Pagination 'PAGINATE_BY': None, 'PAGINATE_BY_PARAM': None, + 'MAX_PAGINATE_BY': None, # View configuration 'VIEW_NAME_FUNCTION': 'rest_framework.views.get_view_name', diff --git a/rest_framework/tests/test_pagination.py b/rest_framework/tests/test_pagination.py index 85d4640ea..cbed16047 100644 --- a/rest_framework/tests/test_pagination.py +++ b/rest_framework/tests/test_pagination.py @@ -42,6 +42,16 @@ class PaginateByParamView(generics.ListAPIView): paginate_by_param = 'page_size' +class MaxPaginateByView(generics.ListAPIView): + """ + View for testing custom max_paginate_by usage + """ + model = BasicModel + paginate_by = 5 + max_paginate_by = 3 + paginate_by_param = 'page_size' + + class IntegrationTestPagination(TestCase): """ Integration tests for paginated list views. @@ -313,6 +323,42 @@ class TestCustomPaginateByParam(TestCase): self.assertEqual(response.data['results'], self.data[:5]) +class TestMaxPaginateByParam(TestCase): + """ + Tests for list views with max_paginate_by kwarg + """ + + def setUp(self): + """ + Create 13 BasicModel instances. + """ + for i in range(13): + BasicModel(text=i).save() + self.objects = BasicModel.objects + self.data = [ + {'id': obj.id, 'text': obj.text} + for obj in self.objects.all() + ] + self.view = MaxPaginateByView.as_view() + + def test_max_paginate_by(self): + """ + If max_paginate_by is set and it less than paginate_by, new kwarg should limit requests for review. + """ + request = factory.get('/?page_size=10') + response = self.view(request).render() + self.assertEqual(response.data['count'], 13) + self.assertEqual(response.data['results'], self.data[:3]) + + def test_max_paginate_by_without_page_size_param(self): + """ + If max_paginate_by is set, new kwarg should limit requests for review. + """ + request = factory.get('/') + response = self.view(request).render() + self.assertEqual(response.data['results'], self.data[:3]) + + ### Tests for context in pagination serializers class CustomField(serializers.Field): From c3e273a90e08cc5215f9e9ea0508b62809b181a4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 27 Aug 2013 09:16:20 +0100 Subject: [PATCH 0096/1652] Added @kristianoellegaard. For docs addition #1059. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 09d91480b..9b13131a6 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -162,6 +162,7 @@ The following people have helped make REST framework great. * Ramiro Morales - [ramiro] * Krzysztof Jurewicz - [krzysiekj] * Eric Buehl - [ericbuehl] +* Kristian Øllegaard - [kristianoellegaard] Many thanks to everyone who's contributed to the project. @@ -360,3 +361,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [ramiro]: https://github.com/ramiro [krzysiekj]: https://github.com/krzysiekj [ericbuehl]: https://github.com/ericbuehl +[kristianoellegaard]: https://github.com/kristianoellegaard From 8d590ebfded0968e458f8e3a87efabec8384586e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 27 Aug 2013 11:22:19 +0100 Subject: [PATCH 0097/1652] First hacky pass at displaying raw data --- rest_framework/parsers.py | 9 +++++++-- rest_framework/renderers.py | 27 +++++++++++++++++++++++-- rest_framework/serializers.py | 2 ++ rest_framework/tests/test_serializer.py | 2 +- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index 96bfac84a..c635505a4 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -10,9 +10,9 @@ from django.core.files.uploadhandler import StopFutureHandlers from django.http import QueryDict from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter -from rest_framework.compat import yaml, etree +from rest_framework.compat import etree, six, yaml from rest_framework.exceptions import ParseError -from rest_framework.compat import six +from rest_framework.renderers import UnicodeJSONRenderer import json import datetime import decimal @@ -32,6 +32,8 @@ class BaseParser(object): media_type = None + supports_html_forms = False + def parse(self, stream, media_type=None, parser_context=None): """ Given a stream to read from, return the parsed representation. @@ -47,6 +49,7 @@ class JSONParser(BaseParser): """ media_type = 'application/json' + renderer_class = UnicodeJSONRenderer def parse(self, stream, media_type=None, parser_context=None): """ @@ -91,6 +94,7 @@ class FormParser(BaseParser): """ media_type = 'application/x-www-form-urlencoded' + supports_html_forms = True def parse(self, stream, media_type=None, parser_context=None): """ @@ -109,6 +113,7 @@ class MultiPartParser(BaseParser): """ media_type = 'multipart/form-data' + supports_html_forms = True def parse(self, stream, media_type=None, parser_context=None): """ diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index b30f2ea9f..cc8de9590 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -24,7 +24,7 @@ from rest_framework.settings import api_settings from rest_framework.request import clone_request from rest_framework.utils import encoders from rest_framework.utils.breadcrumbs import get_breadcrumbs -from rest_framework import exceptions, parsers, status, VERSION +from rest_framework import exceptions, status, VERSION class BaseRenderer(object): @@ -482,7 +482,7 @@ class BrowsableAPIRenderer(BaseRenderer): if method in ('DELETE', 'OPTIONS'): return True # Don't actually need to return a form - if not getattr(view, 'get_serializer', None) or not parsers.FormParser in view.parser_classes: + if not getattr(view, 'get_serializer', None) or not any(parser.supports_html_forms for parser in view.parser_classes): return serializer = view.get_serializer(instance=obj) @@ -561,6 +561,29 @@ class BrowsableAPIRenderer(BaseRenderer): view = renderer_context['view'] request = renderer_context['request'] response = renderer_context['response'] + + obj = getattr(view, 'object', None) + if getattr(view, 'get_serializer', None): + serializer = view.get_serializer(instance=obj) + else: + serializer = None + + parsers = [] + for parser_class in view.parser_classes: + content = None + renderer_class = getattr(parser_class, 'renderer_class', None) + if renderer_class and serializer: + renderer = renderer_class() + context = renderer_context.copy() + context['indent'] = 4 + content = renderer.render(serializer.data, accepted_media_type, context) + print content + parsers.append({ + 'media_type': parser_class.media_type, + 'content': content + }) + + media_types = [parser.media_type for parser in view.parser_classes] renderer = self.get_default_renderer(view) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index abff68983..202d3a096 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -304,6 +304,8 @@ class BaseSerializer(WritableField): ret.empty = obj is None for field_name, field in self.fields.items(): + if obj is None and field.read_only: + continue field.initialize(parent=self, field_name=field_name) key = self.get_field_key(field_name) value = field.field_to_native(obj, field_name) diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index c24976603..7c2a276ed 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -158,7 +158,7 @@ class BasicTests(TestCase): 'email': '', 'content': '', 'created': None, - 'sub_comment': '' + #'sub_comment': '' } self.assertEqual(serializer.data, expected) From dce47a11d3d65a697ea8aa322455d626190bc1e5 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 27 Aug 2013 12:32:13 +0100 Subject: [PATCH 0098/1652] Move settings into more sensible ordering --- rest_framework/settings.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 7d25e5131..2ee15ac7c 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -48,7 +48,6 @@ DEFAULTS = { ), 'DEFAULT_THROTTLE_CLASSES': ( ), - 'DEFAULT_CONTENT_NEGOTIATION_CLASS': 'rest_framework.negotiation.DefaultContentNegotiation', @@ -69,14 +68,14 @@ DEFAULTS = { 'PAGINATE_BY': None, 'PAGINATE_BY_PARAM': None, - # View configuration - 'VIEW_NAME_FUNCTION': 'rest_framework.views.get_view_name', - 'VIEW_DESCRIPTION_FUNCTION': 'rest_framework.views.get_view_description', - # Authentication 'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser', 'UNAUTHENTICATED_TOKEN': None, + # View configuration + 'VIEW_NAME_FUNCTION': 'rest_framework.views.get_view_name', + 'VIEW_DESCRIPTION_FUNCTION': 'rest_framework.views.get_view_description', + # Testing 'TEST_REQUEST_RENDERER_CLASSES': ( 'rest_framework.renderers.MultiPartRenderer', From b430503fa657330b606a9c632ea0decc4254163e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 27 Aug 2013 12:32:33 +0100 Subject: [PATCH 0099/1652] Move exception handler out of main view --- rest_framework/views.py | 79 +++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index 727a9f956..7cb71ccf8 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -15,8 +15,14 @@ from rest_framework.settings import api_settings from rest_framework.utils import formatting -def get_view_name(cls, suffix=None): - name = cls.__name__ +def get_view_name(view_cls, suffix=None): + """ + Given a view class, return a textual name to represent the view. + This name is used in the browsable API, and in OPTIONS responses. + + This function is the default for the `VIEW_NAME_FUNCTION` setting. + """ + name = view_cls.__name__ name = formatting.remove_trailing_string(name, 'View') name = formatting.remove_trailing_string(name, 'ViewSet') name = formatting.camelcase_to_spaces(name) @@ -25,14 +31,53 @@ def get_view_name(cls, suffix=None): return name -def get_view_description(cls, html=False): - description = cls.__doc__ or '' +def get_view_description(view_cls, html=False): + """ + Given a view class, return a textual description to represent the view. + This name is used in the browsable API, and in OPTIONS responses. + + This function is the default for the `VIEW_DESCRIPTION_FUNCTION` setting. + """ + description = view_cls.__doc__ or '' description = formatting.dedent(smart_text(description)) if html: return formatting.markup_description(description) return description +def exception_handler(exc): + """ + Returns the response that should be used for any given exception. + + By default we handle the REST framework `APIException`, and also + Django's builtin `Http404` and `PermissionDenied` exceptions. + + Any unhandled exceptions may return `None`, which will cause a 500 error + to be raised. + """ + if isinstance(exc, exceptions.APIException): + headers = {} + if getattr(exc, 'auth_header', None): + headers['WWW-Authenticate'] = exc.auth_header + if getattr(exc, 'wait', None): + headers['X-Throttle-Wait-Seconds'] = '%d' % exc.wait + + return Response({'detail': exc.detail}, + status=exc.status_code, + headers=headers) + + elif isinstance(exc, Http404): + return Response({'detail': 'Not found'}, + status=status.HTTP_404_NOT_FOUND) + + elif isinstance(exc, PermissionDenied): + return Response({'detail': 'Permission denied'}, + status=status.HTTP_403_FORBIDDEN) + + # Note: Unhandled exceptions will raise a 500 error. + return None + + class APIView(View): settings = api_settings @@ -303,33 +348,23 @@ class APIView(View): Handle any exception that occurs, by returning an appropriate response, or re-raising the error. """ - if isinstance(exc, exceptions.Throttled) and exc.wait is not None: - # Throttle wait header - self.headers['X-Throttle-Wait-Seconds'] = '%d' % exc.wait - if isinstance(exc, (exceptions.NotAuthenticated, exceptions.AuthenticationFailed)): # WWW-Authenticate header for 401 responses, else coerce to 403 auth_header = self.get_authenticate_header(self.request) if auth_header: - self.headers['WWW-Authenticate'] = auth_header + exc.auth_header = auth_header else: exc.status_code = status.HTTP_403_FORBIDDEN - if isinstance(exc, exceptions.APIException): - return Response({'detail': exc.detail}, - status=exc.status_code, - exception=True) - elif isinstance(exc, Http404): - return Response({'detail': 'Not found'}, - status=status.HTTP_404_NOT_FOUND, - exception=True) - elif isinstance(exc, PermissionDenied): - return Response({'detail': 'Permission denied'}, - status=status.HTTP_403_FORBIDDEN, - exception=True) - raise + response = exception_handler(exc) + + if response is None: + raise + + response.exception = True + return response # Note: session based authentication is explicitly CSRF validated, # all other authentication is CSRF exempt. From b54cbd292c5680f4de0e028ff1cb2a9ab1cd34ff Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 27 Aug 2013 12:36:06 +0100 Subject: [PATCH 0100/1652] Use view.settings for API settings, to make testing easier. --- rest_framework/views.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index 7cb71ccf8..4cff04224 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -79,8 +79,8 @@ def exception_handler(exc): class APIView(View): - settings = api_settings + # The following policies may be set at either globally, or per-view. renderer_classes = api_settings.DEFAULT_RENDERER_CLASSES parser_classes = api_settings.DEFAULT_PARSER_CLASSES authentication_classes = api_settings.DEFAULT_AUTHENTICATION_CLASSES @@ -88,6 +88,9 @@ class APIView(View): permission_classes = api_settings.DEFAULT_PERMISSION_CLASSES content_negotiation_class = api_settings.DEFAULT_CONTENT_NEGOTIATION_CLASS + # Allow dependancy injection of other settings to make testing easier. + settings = api_settings + @classmethod def as_view(cls, **initkwargs): """ @@ -178,7 +181,7 @@ class APIView(View): Return the view name, as used in OPTIONS responses and in the browsable API. """ - func = api_settings.VIEW_NAME_FUNCTION + func = self.settings.VIEW_NAME_FUNCTION return func(self.__class__, getattr(self, 'suffix', None)) def get_view_description(self, html=False): @@ -186,7 +189,7 @@ class APIView(View): Return some descriptive text for the view, as used in OPTIONS responses and in the browsable API. """ - func = api_settings.VIEW_DESCRIPTION_FUNCTION + func = self.settings.VIEW_DESCRIPTION_FUNCTION return func(self.__class__, html) # API policy instantiation methods From ea6eee304c230a9277fdc76f4ac91654e0019b7a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 27 Aug 2013 12:37:55 +0100 Subject: [PATCH 0101/1652] Note 'request.session' as available on requests. --- docs/api-guide/requests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/requests.md b/docs/api-guide/requests.md index 39a34fcfb..0696fedf6 100644 --- a/docs/api-guide/requests.md +++ b/docs/api-guide/requests.md @@ -117,7 +117,7 @@ For more information see the [browser enhancements documentation]. # Standard HttpRequest attributes -As REST framework's `Request` extends Django's `HttpRequest`, all the other standard attributes and methods are also available. For example the `request.META` dictionary is available as normal. +As REST framework's `Request` extends Django's `HttpRequest`, all the other standard attributes and methods are also available. For example the `request.META` and `request.session` dictionaries are available as normal. Note that due to implementation reasons the `Request` class does not inherit from `HttpRequest` class, but instead extends the class using composition. From 7fb3f078f0973acc1d108d8c617b26b6845599f7 Mon Sep 17 00:00:00 2001 From: Alexander Akhmetov Date: Tue, 27 Aug 2013 17:38:41 +0400 Subject: [PATCH 0102/1652] fix for python3 --- rest_framework/generics.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 33affee88..ce6c462a3 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -212,12 +212,15 @@ class GenericAPIView(views.APIView): except (KeyError, ValueError): pass else: - if self.max_paginate_by: + if self.max_paginate_by is not None: return min(self.max_paginate_by, paginate_by_param) else: return paginate_by_param - return min(self.max_paginate_by, self.paginate_by) or self.paginate_by + if self.max_paginate_by: + return min(self.max_paginate_by, self.paginate_by) + else: + return self.paginate_by def get_serializer_class(self): """ From 4c53fb883fe719c3ca6244aeb8c405a24eb89a40 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 28 Aug 2013 12:52:38 +0100 Subject: [PATCH 0103/1652] Tweak MAX_PAGINATE_BY behavior in edge case. Always respect `paginate_by` settings if client does not specify page size. (Even if the developer has misconfigured, so that `paginate_by > max`.) --- rest_framework/generics.py | 20 ++++++++------------ rest_framework/tests/test_pagination.py | 11 ++++++----- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index ce6c462a3..14feed204 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -14,13 +14,15 @@ from rest_framework.settings import api_settings import warnings -def strict_positive_int(integer_string): +def strict_positive_int(integer_string, cutoff=None): """ Cast a string to a strictly positive integer. """ ret = int(integer_string) if ret <= 0: raise ValueError() + if cutoff: + ret = min(ret, cutoff) return ret def get_object_or_404(queryset, **filter_kwargs): @@ -206,21 +208,15 @@ class GenericAPIView(views.APIView): PendingDeprecationWarning, stacklevel=2) if self.paginate_by_param: - query_params = self.request.QUERY_PARAMS try: - paginate_by_param = int(query_params[self.paginate_by_param]) + return strict_positive_int( + self.request.QUERY_PARAMS[self.paginate_by_param], + cutoff=self.max_paginate_by + ) except (KeyError, ValueError): pass - else: - if self.max_paginate_by is not None: - return min(self.max_paginate_by, paginate_by_param) - else: - return paginate_by_param - if self.max_paginate_by: - return min(self.max_paginate_by, self.paginate_by) - else: - return self.paginate_by + return self.paginate_by def get_serializer_class(self): """ diff --git a/rest_framework/tests/test_pagination.py b/rest_framework/tests/test_pagination.py index cbed16047..4170d4b64 100644 --- a/rest_framework/tests/test_pagination.py +++ b/rest_framework/tests/test_pagination.py @@ -47,8 +47,8 @@ class MaxPaginateByView(generics.ListAPIView): View for testing custom max_paginate_by usage """ model = BasicModel - paginate_by = 5 - max_paginate_by = 3 + paginate_by = 3 + max_paginate_by = 5 paginate_by_param = 'page_size' @@ -343,16 +343,17 @@ class TestMaxPaginateByParam(TestCase): def test_max_paginate_by(self): """ - If max_paginate_by is set and it less than paginate_by, new kwarg should limit requests for review. + If max_paginate_by is set, it should limit page size for the view. """ request = factory.get('/?page_size=10') response = self.view(request).render() self.assertEqual(response.data['count'], 13) - self.assertEqual(response.data['results'], self.data[:3]) + self.assertEqual(response.data['results'], self.data[:5]) def test_max_paginate_by_without_page_size_param(self): """ - If max_paginate_by is set, new kwarg should limit requests for review. + If max_paginate_by is set, but client does not specifiy page_size, + standard `paginate_by` behavior should be used. """ request = factory.get('/') response = self.view(request).render() From 848567a0cd4f244bfe9fd68e97ae672bd259fd92 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 28 Aug 2013 12:55:49 +0100 Subject: [PATCH 0104/1652] Docs for `MAX_PAGINATE_BY` setting & view attribute. --- docs/api-guide/pagination.md | 8 +++++--- docs/api-guide/settings.md | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index ca0174b76..0829589f8 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -85,11 +85,12 @@ We could now use our pagination serializer in a view like this. The generic class based views `ListAPIView` and `ListCreateAPIView` provide pagination of the returned querysets by default. You can customise this behaviour by altering the pagination style, by modifying the default number of results, by allowing clients to override the page size using a query parameter, or by turning pagination off completely. -The default pagination style may be set globally, using the `DEFAULT_PAGINATION_SERIALIZER_CLASS`, `PAGINATE_BY` and `PAGINATE_BY_PARAM` settings. For example. +The default pagination style may be set globally, using the `DEFAULT_PAGINATION_SERIALIZER_CLASS`, `PAGINATE_BY`, `PAGINATE_BY_PARAM`, and `MAX_PAGINATE_BY` settings. For example. REST_FRAMEWORK = { - 'PAGINATE_BY': 10, - 'PAGINATE_BY_PARAM': 'page_size' + 'PAGINATE_BY': 10, # Default to 10 + 'PAGINATE_BY_PARAM': 'page_size', # Allow client to override, using `?page_size=xxx`. + 'MAX_PAGINATE_BY': 100 # Maximum limit allowed when using `?page_size=xxx`. } You can also set the pagination style on a per-view basis, using the `ListAPIView` generic class-based view. @@ -99,6 +100,7 @@ You can also set the pagination style on a per-view basis, using the `ListAPIVie serializer_class = ExampleModelSerializer paginate_by = 10 paginate_by_param = 'page_size' + max_paginate_by = 100 Note that using a `paginate_by` value of `None` will turn off pagination for the view. diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index fe7925a5a..542e8c5fa 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -127,6 +127,35 @@ Default: `None` The name of a query parameter, which can be used by the client to override the default page size to use for pagination. If set to `None`, clients may not override the default page size. +For example, given the following settings: + + REST_FRAMEWORK = { + 'PAGINATE_BY': 10, + 'PAGINATE_BY_PARAM': 'page_size', + } + +A client would be able to modify the pagination size by using the `page_size` query parameter. For example: + + GET http://example.com/api/accounts?page_size=25 + +Default: `None` + +#### MAX_PAGINATE_BY + +The maximum page size to allow when the page size is specified by the client. If set to `None`, then no maximum limit is applied. + +For example, given the following settings: + + REST_FRAMEWORK = { + 'PAGINATE_BY': 10, + 'PAGINATE_BY_PARAM': 'page_size', + 'MAX_PAGINATE_BY': 100 + } + +A client request like the following would return a paginated list of up to 100 items. + + GET http://example.com/api/accounts?page_size=999 + Default: `None` --- From d7224afe5458f0b1016a80feec31c410c335dbce Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 28 Aug 2013 12:57:29 +0100 Subject: [PATCH 0105/1652] Added @alexander-akhmetov. For work on MAX_PAGINATE_BY, #1063. Thanks! :) --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 9b13131a6..49f06e785 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -163,6 +163,7 @@ The following people have helped make REST framework great. * Krzysztof Jurewicz - [krzysiekj] * Eric Buehl - [ericbuehl] * Kristian Øllegaard - [kristianoellegaard] +* Alexander Akhmetov - [alexander-akhmetov] Many thanks to everyone who's contributed to the project. @@ -362,3 +363,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [krzysiekj]: https://github.com/krzysiekj [ericbuehl]: https://github.com/ericbuehl [kristianoellegaard]: https://github.com/kristianoellegaard +[alexander-akhmetov]: htttps://github.com/alexander-akhmetov \ No newline at end of file From 97b52156cc0e96c2edb7e1b176838bfd9c22321a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 28 Aug 2013 13:34:14 +0100 Subject: [PATCH 0106/1652] Added `.cache` attribute on throttles. Closes #1066. More localised than a new settings key, and more flexible in that different throttles can use different behavior. Thanks to @chicheng for the report! :) --- docs/api-guide/throttling.md | 7 +++++++ rest_framework/throttling.py | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index 42f9c228d..cc4692171 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -70,6 +70,13 @@ Or, if you're using the `@api_view` decorator with function based views. The throttle classes provided by REST framework use Django's cache backend. You should make sure that you've set appropriate [cache settings][cache-setting]. The default value of `LocMemCache` backend should be okay for simple setups. See Django's [cache documentation][cache-docs] for more details. +If you need to use a cache other than `'default'`, you can do so by creating a custom throttle class and setting the `cache` attribute. For example: + + class CustomAnonRateThrottle(AnonRateThrottle): + cache = get_cache('alternate') + +You'll need to rememeber to also set your custom throttle class in the `'DEFAULT_THROTTLE_CLASSES'` settings key, or using the `throttle_classes` view attribute. + --- # API Reference diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index 65b455930..8943f22c1 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -2,7 +2,7 @@ Provides various throttling policies. """ from __future__ import unicode_literals -from django.core.cache import cache +from django.core.cache import cache as default_cache from django.core.exceptions import ImproperlyConfigured from rest_framework.settings import api_settings import time @@ -39,6 +39,7 @@ class SimpleRateThrottle(BaseThrottle): Previous request information used for throttling is stored in the cache. """ + cache = default_cache timer = time.time cache_format = 'throtte_%(scope)s_%(ident)s' scope = None @@ -99,7 +100,7 @@ class SimpleRateThrottle(BaseThrottle): if self.key is None: return True - self.history = cache.get(self.key, []) + self.history = self.cache.get(self.key, []) self.now = self.timer() # Drop any requests from the history which have now passed the @@ -116,7 +117,7 @@ class SimpleRateThrottle(BaseThrottle): into the cache. """ self.history.insert(0, self.now) - cache.set(self.key, self.history, self.duration) + self.cache.set(self.key, self.history, self.duration) return True def throttle_failure(self): From 711fb9761c9722a83c083257d15c0ec8f755ca7a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 28 Aug 2013 13:35:27 +0100 Subject: [PATCH 0107/1652] Update release notes. --- docs/topics/release-notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 626831cbf..516efdc85 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -43,6 +43,8 @@ You can determine your currently installed version using `pip freeze`: ### Master * Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. +* Added `MAX_PAGINATE_BY` setting and `max_paginate_by` generic view attribute. +* Added `cache` attribute to throttles to allow overriding of default cache. * Bugfix: `required=True` argument fixed for boolean serializer fields. * Bugfix: `client.force_authenticate(None)` should also clear session info if it exists. * Bugfix: Client sending emptry string instead of file now clears `FileField`. From 2d5e14a8d39a53c8a2e6d28fb8ae7debb5fbd388 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 28 Aug 2013 15:32:41 +0100 Subject: [PATCH 0108/1652] Throttles now use HTTP_X_FORWARDED_FOR, falling back to REMOTE_ADDR to identify anonymous requests --- rest_framework/throttling.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index 8943f22c1..a946d837f 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -152,7 +152,9 @@ class AnonRateThrottle(SimpleRateThrottle): if request.user.is_authenticated(): return None # Only throttle unauthenticated requests. - ident = request.META.get('REMOTE_ADDR', None) + ident = request.META.get('HTTP_X_FORWARDED_FOR') + if ident is None: + ident = request.META.get('REMOTE_ADDR') return self.cache_format % { 'scope': self.scope, From 18007d68464b0cfab970e2a60aed0d41c4de4dac Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 28 Aug 2013 21:52:56 +0100 Subject: [PATCH 0109/1652] Simplifying raw data renderering support --- rest_framework/parsers.py | 10 +++------- rest_framework/renderers.py | 10 ++++++++-- rest_framework/serializers.py | 2 -- rest_framework/tests/test_serializer.py | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index c635505a4..23387dffb 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -12,7 +12,7 @@ from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter from rest_framework.compat import etree, six, yaml from rest_framework.exceptions import ParseError -from rest_framework.renderers import UnicodeJSONRenderer +from rest_framework import renderers import json import datetime import decimal @@ -32,8 +32,6 @@ class BaseParser(object): media_type = None - supports_html_forms = False - def parse(self, stream, media_type=None, parser_context=None): """ Given a stream to read from, return the parsed representation. @@ -49,7 +47,7 @@ class JSONParser(BaseParser): """ media_type = 'application/json' - renderer_class = UnicodeJSONRenderer + renderer_class = renderers.UnicodeJSONRenderer def parse(self, stream, media_type=None, parser_context=None): """ @@ -94,7 +92,6 @@ class FormParser(BaseParser): """ media_type = 'application/x-www-form-urlencoded' - supports_html_forms = True def parse(self, stream, media_type=None, parser_context=None): """ @@ -113,7 +110,6 @@ class MultiPartParser(BaseParser): """ media_type = 'multipart/form-data' - supports_html_forms = True def parse(self, stream, media_type=None, parser_context=None): """ @@ -134,7 +130,7 @@ class MultiPartParser(BaseParser): data, files = parser.parse() return DataAndFiles(data, files) except MultiPartParserError as exc: - raise ParseError('Multipart form parse error - %s' % six.u(exc)) + raise ParseError('Multipart form parse error - %s' % six.u(exc.strerror)) class XMLParser(BaseParser): diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index cc8de9590..cd55c7830 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -21,7 +21,7 @@ from rest_framework.compat import six from rest_framework.compat import smart_text from rest_framework.compat import yaml from rest_framework.settings import api_settings -from rest_framework.request import clone_request +from rest_framework.request import clone_request, is_form_media_type from rest_framework.utils import encoders from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework import exceptions, status, VERSION @@ -482,7 +482,7 @@ class BrowsableAPIRenderer(BaseRenderer): if method in ('DELETE', 'OPTIONS'): return True # Don't actually need to return a form - if not getattr(view, 'get_serializer', None) or not any(parser.supports_html_forms for parser in view.parser_classes): + if not getattr(view, 'get_serializer', None) or not any(is_form_media_type(parser.media_type) for parser in view.parser_classes): return serializer = view.get_serializer(instance=obj) @@ -565,11 +565,16 @@ class BrowsableAPIRenderer(BaseRenderer): obj = getattr(view, 'object', None) if getattr(view, 'get_serializer', None): serializer = view.get_serializer(instance=obj) + for field_name, field in serializer.fields.items(): + if field.read_only: + del serializer.fields[field_name] else: serializer = None parsers = [] for parser_class in view.parser_classes: + if is_form_media_type(parser_class.media_type): + continue content = None renderer_class = getattr(parser_class, 'renderer_class', None) if renderer_class and serializer: @@ -650,3 +655,4 @@ class MultiPartRenderer(BaseRenderer): def render(self, data, accepted_media_type=None, renderer_context=None): return encode_multipart(self.BOUNDARY, data) + diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 202d3a096..abff68983 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -304,8 +304,6 @@ class BaseSerializer(WritableField): ret.empty = obj is None for field_name, field in self.fields.items(): - if obj is None and field.read_only: - continue field.initialize(parent=self, field_name=field_name) key = self.get_field_key(field_name) value = field.field_to_native(obj, field_name) diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index 7c2a276ed..c24976603 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -158,7 +158,7 @@ class BasicTests(TestCase): 'email': '', 'content': '', 'created': None, - #'sub_comment': '' + 'sub_comment': '' } self.assertEqual(serializer.data, expected) From 2d37952e7872f7f69f588b02941ba6f5d739cdb6 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 29 Aug 2013 00:50:54 +0200 Subject: [PATCH 0110/1652] Add composed-permissions entry to the api-guide. --- docs/api-guide/permissions.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 12aa4c18b..a7bf15556 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -212,6 +212,10 @@ The following third party packages are also available. The [DRF Any Permissions][drf-any-permissions] packages provides a different permission behavior in contrast to REST framework. Instead of all specified permissions being required, only one of the given permissions has to be true in order to get access to the view. +## Composed Permissions + +The [Composed Permissions][composed-permissions] package provides a simple way to define complex and multi-depth (with logic operators) permission objects, using small and reusable components. + [cite]: https://developer.apple.com/library/mac/#documentation/security/Conceptual/AuthenticationAndAuthorizationGuide/Authorization/Authorization.html [authentication]: authentication.md [throttling]: throttling.md @@ -222,3 +226,4 @@ The [DRF Any Permissions][drf-any-permissions] packages provides a different per [2.2-announcement]: ../topics/2.2-announcement.md [filtering]: filtering.md [drf-any-permissions]: https://github.com/kevin-brown/drf-any-permissions +[composed-permissions]: https://github.com/niwibe/djangorestframework-composed-permissions From 94cd1369437f84adefb46462439b46dc5208ab1d Mon Sep 17 00:00:00 2001 From: Craig de Stigter Date: Thu, 29 Aug 2013 17:35:15 +1200 Subject: [PATCH 0111/1652] add transform_ methods to serializers, which basically do the opposite of validate_ on a per-field basis. --- rest_framework/serializers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 31cfa3447..8ba1b1959 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -304,6 +304,9 @@ class BaseSerializer(WritableField): field.initialize(parent=self, field_name=field_name) key = self.get_field_key(field_name) value = field.field_to_native(obj, field_name) + method = getattr(self, 'transform_%s' % field_name, None) + if callable(method): + value = method(obj, value) ret[key] = value ret.fields[key] = field return ret From bf07b8e616bd92e4ae3c2c09b198181d7075e6bd Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Aug 2013 08:53:19 +0100 Subject: [PATCH 0112/1652] Better docs for customizing dynamic routes. Refs #908 --- docs/api-guide/routers.md | 81 +++++++++++++++++++++++++++++++++------ 1 file changed, 70 insertions(+), 11 deletions(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index f083b3d45..730fa876a 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -123,28 +123,87 @@ The arguments to the `Route` named tuple are: **initkwargs**: A dictionary of any additional arguments that should be passed when instantiating the view. Note that the `suffix` argument is reserved for identifying the viewset type, used when generating the view name and breadcrumb links. +## Customizing dynamic routes + +You can also customize how the `@list_route` and `@detail_route` decorators are routed. +To route either or both of these decorators, include a `DynamicListRoute` and/or `DynamicDetailRoute` named tuple in the `.routes` list. + +The arguments to `DynamicListRoute` and `DynamicDetailRoute` are: + +**url**: A string representing the URL to be routed. May include the same format strings as `Route`, and additionally accepts the `{methodname}` and `{methodnamehyphen}` format strings. + +**name**: The name of the URL as used in `reverse` calls. May include the following format strings: `{basename}`, `{methodname}` and `{methodnamehyphen}`. + +**initkwargs**: A dictionary of any additional arguments that should be passed when instantiating the view. + ## Example The following example will only route to the `list` and `retrieve` actions, and does not use the trailing slash convention. - from rest_framework.routers import Route, SimpleRouter + from rest_framework.routers import Route, DynamicDetailRoute, SimpleRouter - class ReadOnlyRouter(SimpleRouter): + class CustomReadOnlyRouter(SimpleRouter): """ A router for read-only APIs, which doesn't use trailing slashes. """ routes = [ - Route(url=r'^{prefix}$', - mapping={'get': 'list'}, - name='{basename}-list', - initkwargs={'suffix': 'List'}), - Route(url=r'^{prefix}/{lookup}$', - mapping={'get': 'retrieve'}, - name='{basename}-detail', - initkwargs={'suffix': 'Detail'}) + Route( + url=r'^{prefix}$', + mapping={'get': 'list'}, + name='{basename}-list', + initkwargs={'suffix': 'List'} + ), + Route( + url=r'^{prefix}/{lookup}$', + mapping={'get': 'retrieve'}, + name='{basename}-detail', + initkwargs={'suffix': 'Detail'} + ), + DynamicDetailRoute( + url=r'^{prefix}/{lookup}/{methodnamehyphen}$', + name='{basename}-{methodnamehyphen}', + initkwargs={} + ) ] -The `SimpleRouter` class provides another example of setting the `.routes` attribute. +Let's take a look at the routes our `CustomReadOnlyRouter` would generate for a simple viewset. + +`views.py`: + + class UserViewSet(viewsets.ReadOnlyModelViewSet): + """ + A viewset that provides the standard actions + """ + queryset = User.objects.all() + serializer_class = UserSerializer + lookup_field = 'username' + + @detail_route() + def group_names(self, request): + """ + Returns a list of all the group names that the given + user belongs to. + """ + user = self.get_object() + groups = user.groups.all() + return Response([group.name for group in groups]) + +`urls.py`: + + router = CustomReadOnlyRouter() + router.register('users', UserViewSet) + urlpatterns = router.urls + +The following mappings would be generated... + + + + + + +
    URLHTTP MethodActionURL Name
    /usersGETlistuser-list
    /users/{username}GETretrieveuser-detail
    /users/{username}/group-namesGETgroup_namesuser-group-names
    + +For another example of setting the `.routes` attribute, see the source code for the `SimpleRouter` class. ## Advanced custom routers From 6f8acb5a768d5d79efd7b39c5229bc4262e467a0 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Aug 2013 09:31:12 +0100 Subject: [PATCH 0113/1652] Added @niwibe For docs addition #1070 - Thanks! --- docs/topics/credits.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 49f06e785..47807a0ed 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -164,6 +164,7 @@ The following people have helped make REST framework great. * Eric Buehl - [ericbuehl] * Kristian Øllegaard - [kristianoellegaard] * Alexander Akhmetov - [alexander-akhmetov] +* Andrey Antukh - [niwibe] Many thanks to everyone who's contributed to the project. @@ -363,4 +364,5 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [krzysiekj]: https://github.com/krzysiekj [ericbuehl]: https://github.com/ericbuehl [kristianoellegaard]: https://github.com/kristianoellegaard -[alexander-akhmetov]: htttps://github.com/alexander-akhmetov \ No newline at end of file +[alexander-akhmetov]: https://github.com/alexander-akhmetov +[niwibe]: https://github.com/niwibe From 37e2720a40d39688f5e6ebb3b5c5aad68b8c25d4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Aug 2013 12:55:56 +0100 Subject: [PATCH 0114/1652] Add `override_method` context manager and cleanup. --- rest_framework/renderers.py | 149 ++++++++++++------------------------ rest_framework/request.py | 23 ++++++ 2 files changed, 73 insertions(+), 99 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index cd55c7830..34860f6ac 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -21,7 +21,7 @@ from rest_framework.compat import six from rest_framework.compat import smart_text from rest_framework.compat import yaml from rest_framework.settings import api_settings -from rest_framework.request import clone_request, is_form_media_type +from rest_framework.request import is_form_media_type, override_method from rest_framework.utils import encoders from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework import exceptions, status, VERSION @@ -456,18 +456,6 @@ class BrowsableAPIRenderer(BaseRenderer): return False # Doesn't have permissions return True - def _get_rendered_html_form(self, view, method, request): - # We need to impersonate a request with the correct method, - # so that eg. any dynamic get_serializer_class methods return the - # correct form for each method. - restore = view.request - request = clone_request(request, method) - view.request = request - try: - return self.get_rendered_html_form(view, method, request) - finally: - view.request = restore - def get_rendered_html_form(self, view, method, request): """ Return a string representing a rendered HTML form, possibly bound to @@ -475,32 +463,22 @@ class BrowsableAPIRenderer(BaseRenderer): In the absence of the View having an associated form then return None. """ - obj = getattr(view, 'object', None) - if not self.show_form_for_method(view, method, request, obj): - return + with override_method(view, request, method) as request: + obj = getattr(view, 'object', None) + if not self.show_form_for_method(view, method, request, obj): + return - if method in ('DELETE', 'OPTIONS'): - return True # Don't actually need to return a form + if method in ('DELETE', 'OPTIONS'): + return True # Don't actually need to return a form - if not getattr(view, 'get_serializer', None) or not any(is_form_media_type(parser.media_type) for parser in view.parser_classes): - return + if (not getattr(view, 'get_serializer', None) + or not any(is_form_media_type(parser.media_type) for parser in view.parser_classes)): + return - serializer = view.get_serializer(instance=obj) - data = serializer.data - form_renderer = self.form_renderer_class() - return form_renderer.render(data, self.accepted_media_type, self.renderer_context) - - def _get_raw_data_form(self, view, method, request, media_types): - # We need to impersonate a request with the correct method, - # so that eg. any dynamic get_serializer_class methods return the - # correct form for each method. - restore = view.request - request = clone_request(request, method) - view.request = request - try: - return self.get_raw_data_form(view, method, request, media_types) - finally: - view.request = restore + serializer = view.get_serializer(instance=obj) + data = serializer.data + form_renderer = self.form_renderer_class() + return form_renderer.render(data, self.accepted_media_type, self.renderer_context) def get_raw_data_form(self, view, method, request, media_types): """ @@ -508,39 +486,39 @@ class BrowsableAPIRenderer(BaseRenderer): via standard HTML forms. (Which are typically application/x-www-form-urlencoded) """ + with override_method(view, request, method) as request: + # If we're not using content overloading there's no point in supplying a generic form, + # as the view won't treat the form's value as the content of the request. + if not (api_settings.FORM_CONTENT_OVERRIDE + and api_settings.FORM_CONTENTTYPE_OVERRIDE): + return None - # If we're not using content overloading there's no point in supplying a generic form, - # as the view won't treat the form's value as the content of the request. - if not (api_settings.FORM_CONTENT_OVERRIDE - and api_settings.FORM_CONTENTTYPE_OVERRIDE): - return None + # Check permissions + obj = getattr(view, 'object', None) + if not self.show_form_for_method(view, method, request, obj): + return - # Check permissions - obj = getattr(view, 'object', None) - if not self.show_form_for_method(view, method, request, obj): - return + content_type_field = api_settings.FORM_CONTENTTYPE_OVERRIDE + content_field = api_settings.FORM_CONTENT_OVERRIDE + choices = [(media_type, media_type) for media_type in media_types] + initial = media_types[0] - content_type_field = api_settings.FORM_CONTENTTYPE_OVERRIDE - content_field = api_settings.FORM_CONTENT_OVERRIDE - choices = [(media_type, media_type) for media_type in media_types] - initial = media_types[0] + # NB. http://jacobian.org/writing/dynamic-form-generation/ + class GenericContentForm(forms.Form): + def __init__(self): + super(GenericContentForm, self).__init__() - # NB. http://jacobian.org/writing/dynamic-form-generation/ - class GenericContentForm(forms.Form): - def __init__(self): - super(GenericContentForm, self).__init__() + self.fields[content_type_field] = forms.ChoiceField( + label='Media type', + choices=choices, + initial=initial + ) + self.fields[content_field] = forms.CharField( + label='Content', + widget=forms.Textarea + ) - self.fields[content_type_field] = forms.ChoiceField( - label='Media type', - choices=choices, - initial=initial - ) - self.fields[content_field] = forms.CharField( - label='Content', - widget=forms.Textarea - ) - - return GenericContentForm() + return GenericContentForm() def get_name(self, view): return view.get_view_name() @@ -562,47 +540,20 @@ class BrowsableAPIRenderer(BaseRenderer): request = renderer_context['request'] response = renderer_context['response'] - obj = getattr(view, 'object', None) - if getattr(view, 'get_serializer', None): - serializer = view.get_serializer(instance=obj) - for field_name, field in serializer.fields.items(): - if field.read_only: - del serializer.fields[field_name] - else: - serializer = None - - parsers = [] - for parser_class in view.parser_classes: - if is_form_media_type(parser_class.media_type): - continue - content = None - renderer_class = getattr(parser_class, 'renderer_class', None) - if renderer_class and serializer: - renderer = renderer_class() - context = renderer_context.copy() - context['indent'] = 4 - content = renderer.render(serializer.data, accepted_media_type, context) - print content - parsers.append({ - 'media_type': parser_class.media_type, - 'content': content - }) - - media_types = [parser.media_type for parser in view.parser_classes] renderer = self.get_default_renderer(view) content = self.get_content(renderer, data, accepted_media_type, renderer_context) - put_form = self._get_rendered_html_form(view, 'PUT', request) - post_form = self._get_rendered_html_form(view, 'POST', request) - patch_form = self._get_rendered_html_form(view, 'PATCH', request) - delete_form = self._get_rendered_html_form(view, 'DELETE', request) - options_form = self._get_rendered_html_form(view, 'OPTIONS', request) + put_form = self.get_rendered_html_form(view, 'PUT', request) + post_form = self.get_rendered_html_form(view, 'POST', request) + patch_form = self.get_rendered_html_form(view, 'PATCH', request) + delete_form = self.get_rendered_html_form(view, 'DELETE', request) + options_form = self.get_rendered_html_form(view, 'OPTIONS', request) - raw_data_put_form = self._get_raw_data_form(view, 'PUT', request, media_types) - raw_data_post_form = self._get_raw_data_form(view, 'POST', request, media_types) - raw_data_patch_form = self._get_raw_data_form(view, 'PATCH', request, media_types) + raw_data_put_form = self.get_raw_data_form(view, 'PUT', request, media_types) + raw_data_post_form = self.get_raw_data_form(view, 'POST', request, media_types) + raw_data_patch_form = self.get_raw_data_form(view, 'PATCH', request, media_types) raw_data_put_or_patch_form = raw_data_put_form or raw_data_patch_form name = self.get_name(view) diff --git a/rest_framework/request.py b/rest_framework/request.py index 919716f49..977d4d965 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -28,6 +28,29 @@ def is_form_media_type(media_type): base_media_type == 'multipart/form-data') +class override_method(object): + """ + A context manager that temporarily overrides the method on a request, + additionally setting the `view.request` attribute. + + Usage: + + with override_method(view, request, 'POST') as request: + ... # Do stuff with `view` and `request` + """ + def __init__(self, view, request, method): + self.view = view + self.request = request + self.method = method + + def __enter__(self): + self.view.request = clone_request(self.request, self.method) + return self.view.request + + def __exit__(self, *args, **kwarg): + self.view.request = self.request + + class Empty(object): """ Placeholder for unset attributes. From da9c17067c3150897da4cab149f12dee08768346 Mon Sep 17 00:00:00 2001 From: Brett Koonce Date: Thu, 29 Aug 2013 09:23:34 -0500 Subject: [PATCH 0115/1652] minor sp --- docs/api-guide/generic-views.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 931cae542..7185b6b68 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -73,7 +73,7 @@ The following attributes control the basic view behavior. **Pagination**: -The following attibutes are used to control pagination when used with list views. +The following attributes are used to control pagination when used with list views. * `paginate_by` - The size of pages to use with paginated data. If set to `None` then pagination is turned off. If unset this uses the same value as the `PAGINATE_BY` setting, which defaults to `None`. * `paginate_by_param` - The name of a query parameter, which can be used by the client to override the default page size to use for pagination. If unset this uses the same value as the `PAGINATE_BY_PARAM` setting, which defaults to `None`. @@ -135,7 +135,7 @@ For example: #### `get_paginate_by(self)` -Returns the page size to use with pagination. By default this uses the `paginate_by` attribute, and may be overridden by the cient if the `paginate_by_param` attribute is set. +Returns the page size to use with pagination. By default this uses the `paginate_by` attribute, and may be overridden by the client if the `paginate_by_param` attribute is set. You may want to override this method to provide more complex behavior such as modifying page sizes based on the media type of the response. From 11071499a777ecfee6edfb7e92ecf9a12d35eeb7 Mon Sep 17 00:00:00 2001 From: Mathieu Pillard Date: Thu, 29 Aug 2013 18:10:47 +0200 Subject: [PATCH 0116/1652] Make ChoiceField.from_native() follow IntegerField behaviour on empty values --- rest_framework/fields.py | 5 +++++ rest_framework/tests/test_fields.py | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 3e0ca1a18..210c2537d 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -514,6 +514,11 @@ class ChoiceField(WritableField): return True return False + def from_native(self, value): + if value in validators.EMPTY_VALUES: + return None + return super(ChoiceField, self).from_native(value) + class EmailField(CharField): type_name = 'EmailField' diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py index ebccba7d1..34fbab9c9 100644 --- a/rest_framework/tests/test_fields.py +++ b/rest_framework/tests/test_fields.py @@ -688,6 +688,14 @@ class ChoiceFieldTests(TestCase): f = serializers.ChoiceField(required=False, choices=self.SAMPLE_CHOICES) self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + self.SAMPLE_CHOICES) + def test_from_native_empty(self): + """ + Make sure from_native() returns None on empty param. + """ + f = serializers.ChoiceField(choices=self.SAMPLE_CHOICES) + result = f.from_native('') + self.assertEqual(result, None) + class EmailFieldTests(TestCase): """ From c7f3b8bebef33093d4e949f797565c4cbcd2695d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Aug 2013 17:23:26 +0100 Subject: [PATCH 0117/1652] Include serialized content in raw data form. --- rest_framework/renderers.py | 43 +++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 34860f6ac..077d6ebec 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -480,15 +480,16 @@ class BrowsableAPIRenderer(BaseRenderer): form_renderer = self.form_renderer_class() return form_renderer.render(data, self.accepted_media_type, self.renderer_context) - def get_raw_data_form(self, view, method, request, media_types): + def get_raw_data_form(self, view, method, request): """ Returns a form that allows for arbitrary content types to be tunneled via standard HTML forms. (Which are typically application/x-www-form-urlencoded) """ with override_method(view, request, method) as request: - # If we're not using content overloading there's no point in supplying a generic form, - # as the view won't treat the form's value as the content of the request. + # If we're not using content overloading there's no point in + # supplying a generic form, as the view won't treat the form's + # value as the content of the request. if not (api_settings.FORM_CONTENT_OVERRIDE and api_settings.FORM_CONTENTTYPE_OVERRIDE): return None @@ -498,8 +499,33 @@ class BrowsableAPIRenderer(BaseRenderer): if not self.show_form_for_method(view, method, request, obj): return + # If possible, serialize the initial content for the generic form + default_parser = view.parser_classes[0] + renderer_class = getattr(default_parser, 'renderer_class', None) + if (hasattr(view, 'get_serializer') and renderer_class): + # View has a serializer defined and parser class has a + # corresponding renderer that can be used to render the data. + + # Get a read-only version of the serializer + serializer = view.get_serializer(instance=obj) + for field_name, field in serializer.fields.items(): + if field.read_only: + del serializer.fields[field_name] + + # Render the raw data content + renderer = renderer_class() + accepted = self.accepted_media_type + context = self.renderer_context.copy().update({'indent': 4}) + content = renderer.render(serializer.data, accepted, context) + else: + content = None + + # Generate a generic form that includes a content type field, + # and a content field. content_type_field = api_settings.FORM_CONTENTTYPE_OVERRIDE content_field = api_settings.FORM_CONTENT_OVERRIDE + + media_types = [parser.media_type for parser in view.parser_classes] choices = [(media_type, media_type) for media_type in media_types] initial = media_types[0] @@ -515,7 +541,8 @@ class BrowsableAPIRenderer(BaseRenderer): ) self.fields[content_field] = forms.CharField( label='Content', - widget=forms.Textarea + widget=forms.Textarea, + initial=content ) return GenericContentForm() @@ -540,8 +567,6 @@ class BrowsableAPIRenderer(BaseRenderer): request = renderer_context['request'] response = renderer_context['response'] - media_types = [parser.media_type for parser in view.parser_classes] - renderer = self.get_default_renderer(view) content = self.get_content(renderer, data, accepted_media_type, renderer_context) @@ -551,9 +576,9 @@ class BrowsableAPIRenderer(BaseRenderer): delete_form = self.get_rendered_html_form(view, 'DELETE', request) options_form = self.get_rendered_html_form(view, 'OPTIONS', request) - raw_data_put_form = self.get_raw_data_form(view, 'PUT', request, media_types) - raw_data_post_form = self.get_raw_data_form(view, 'POST', request, media_types) - raw_data_patch_form = self.get_raw_data_form(view, 'PATCH', request, media_types) + raw_data_put_form = self.get_raw_data_form(view, 'PUT', request) + raw_data_post_form = self.get_raw_data_form(view, 'POST', request) + raw_data_patch_form = self.get_raw_data_form(view, 'PATCH', request) raw_data_put_or_patch_form = raw_data_put_form or raw_data_patch_form name = self.get_name(view) From 4b46de7dcebb31e9f7de11926ab5a4ecaa80c770 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Aug 2013 17:27:00 +0100 Subject: [PATCH 0118/1652] Added @diox for fix #1074. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 47807a0ed..b2d3d5d29 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -165,6 +165,7 @@ The following people have helped make REST framework great. * Kristian Øllegaard - [kristianoellegaard] * Alexander Akhmetov - [alexander-akhmetov] * Andrey Antukh - [niwibe] +* Mathieu Pillard - [diox] Many thanks to everyone who's contributed to the project. @@ -366,3 +367,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [kristianoellegaard]: https://github.com/kristianoellegaard [alexander-akhmetov]: https://github.com/alexander-akhmetov [niwibe]: https://github.com/niwibe +[diox]: https://github.com/diox From ac0fb01be3f33fab8d94117daf84a065f67bc343 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Aug 2013 17:27:08 +0100 Subject: [PATCH 0119/1652] Update release notes. --- docs/topics/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 516efdc85..a901412f3 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -48,6 +48,7 @@ You can determine your currently installed version using `pip freeze`: * Bugfix: `required=True` argument fixed for boolean serializer fields. * Bugfix: `client.force_authenticate(None)` should also clear session info if it exists. * Bugfix: Client sending emptry string instead of file now clears `FileField`. +* Bugfix: Empty values on ChoiceFields with `required=False` now consistently return `None`. ### 2.3.7 From 556b4bbba9a735cd372d5b12e9fdccd256643cb2 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Aug 2013 20:04:00 +0100 Subject: [PATCH 0120/1652] Added note on botbot IRC archives --- docs/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index a0ae2984d..e0a2e911b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -200,7 +200,7 @@ To run the tests against all supported configurations, first install [the tox te ## Support -For support please see the [REST framework discussion group][group], try the `#restframework` channel on `irc.freenode.net`, or raise a question on [Stack Overflow][stack-overflow], making sure to include the ['django-rest-framework'][django-rest-framework-tag] tag. +For support please see the [REST framework discussion group][group], try the `#restframework` channel on `irc.freenode.net`, search [the IRC archives][botbot], or raise a question on [Stack Overflow][stack-overflow], making sure to include the ['django-rest-framework'][django-rest-framework-tag] tag. [Paid support is available][paid-support] from [DabApps][dabapps], and can include work on REST framework core, or support with building your REST framework API. Please [contact DabApps][contact-dabapps] if you'd like to discuss commercial support options. @@ -307,6 +307,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [tox]: http://testrun.org/tox/latest/ [group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework +[botbot]: https://botbot.me/freenode/restframework/ [stack-overflow]: http://stackoverflow.com/ [django-rest-framework-tag]: http://stackoverflow.com/questions/tagged/django-rest-framework [django-tag]: http://stackoverflow.com/questions/tagged/django From 1fa2d823cc9f2dcf301b0e3ce7f47acfcdfcb305 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Aug 2013 20:35:59 +0100 Subject: [PATCH 0121/1652] Preserve tab preference in cookies. --- .../static/rest_framework/js/default.js | 45 ++++++++++++++++++- .../templates/rest_framework/base.html | 4 +- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/rest_framework/static/rest_framework/js/default.js b/rest_framework/static/rest_framework/js/default.js index c74829d7d..a57b1cb81 100644 --- a/rest_framework/static/rest_framework/js/default.js +++ b/rest_framework/static/rest_framework/js/default.js @@ -1,13 +1,56 @@ +function getCookie(c_name) +{ + // From http://www.w3schools.com/js/js_cookies.asp + var c_value = document.cookie; + var c_start = c_value.indexOf(" " + c_name + "="); + if (c_start == -1) { + c_start = c_value.indexOf(c_name + "="); + } + if (c_start == -1) { + c_value = null; + } else { + c_start = c_value.indexOf("=", c_start) + 1; + var c_end = c_value.indexOf(";", c_start); + if (c_end == -1) { + c_end = c_value.length; + } + c_value = unescape(c_value.substring(c_start,c_end)); + } + return c_value; +} + +// JSON highlighting. prettyPrint(); +// Bootstrap tooltips. $('.js-tooltip').tooltip({ delay: 1000 }); +// Deal with rounded tab styling after tab clicks. $('a[data-toggle="tab"]:first').on('shown', function (e) { $(e.target).parents('.tabbable').addClass('first-tab-active'); }); $('a[data-toggle="tab"]:not(:first)').on('shown', function (e) { $(e.target).parents('.tabbable').removeClass('first-tab-active'); }); -$('.form-switcher a:first').tab('show'); + +$('a[data-toggle="tab"]').click(function(){ + document.cookie="tab=" + this.name; +}); + +// Store tab preference in cookies & display appropriate tab on load. +var selectedTab = null; +var selectedTabName = getCookie('tab'); + +if (selectedTabName) { + selectedTab = $('.form-switcher a[name=' + selectedTabName + ']'); +} + +if (selectedTab && selectedTab.length > 0) { + // Display whichever tab is selected. + selectedTab.tab('show'); +} else { + // If no tab selected, display rightmost tab. + $('.form-switcher a:first').tab('show'); +} diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 6ae47563d..816970634 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -128,8 +128,8 @@
    {% if post_form %} {% endif %}
    From 44f8d1bef22d5f308fdbdfc29e6418816c3c27dd Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Aug 2013 20:38:55 +0100 Subject: [PATCH 0122/1652] Fix tab preferences on PUT forms --- rest_framework/templates/rest_framework/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 816970634..aa90e90c4 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -167,8 +167,8 @@
    {% if put_form %} {% endif %}
    From e4d2f54529bcf538be93da5770e05b88a32da1c7 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Aug 2013 20:39:05 +0100 Subject: [PATCH 0123/1652] Fix indenting on raw data forms --- rest_framework/renderers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 077d6ebec..525e44d57 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -515,7 +515,8 @@ class BrowsableAPIRenderer(BaseRenderer): # Render the raw data content renderer = renderer_class() accepted = self.accepted_media_type - context = self.renderer_context.copy().update({'indent': 4}) + context = self.renderer_context.copy() + context['indent'] = 4 content = renderer.render(serializer.data, accepted, context) else: content = None From 02b6836ee88498861521dfff743467b0456ad109 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Aug 2013 20:51:51 +0100 Subject: [PATCH 0124/1652] Fix breadcrumb view names --- rest_framework/utils/breadcrumbs.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rest_framework/utils/breadcrumbs.py b/rest_framework/utils/breadcrumbs.py index 0384faba3..e6690d170 100644 --- a/rest_framework/utils/breadcrumbs.py +++ b/rest_framework/utils/breadcrumbs.py @@ -8,8 +8,11 @@ def get_breadcrumbs(url): tuple of (name, url). """ + from rest_framework.settings import api_settings from rest_framework.views import APIView + view_name_func = api_settings.VIEW_NAME_FUNCTION + def breadcrumbs_recursive(url, breadcrumbs_list, prefix, seen): """ Add tuples of (name, url) to the breadcrumbs list, @@ -28,8 +31,8 @@ def get_breadcrumbs(url): # Don't list the same view twice in a row. # Probably an optional trailing slash. if not seen or seen[-1] != view: - instance = view.cls() - name = instance.get_view_name() + suffix = getattr(view, 'suffix', None) + name = view_name_func(cls, suffix) breadcrumbs_list.insert(0, (name, prefix + url)) seen.append(view) From 2247fd68e9b3bbc91075a11f44db16fc40497b2a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 29 Aug 2013 21:24:29 +0100 Subject: [PATCH 0125/1652] Fix multipart error when used via content-type overloading --- rest_framework/parsers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index 23387dffb..98fc03417 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -122,7 +122,8 @@ class MultiPartParser(BaseParser): parser_context = parser_context or {} request = parser_context['request'] encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET) - meta = request.META + meta = request.META.copy() + meta['CONTENT_TYPE'] = media_type upload_handlers = request.upload_handlers try: @@ -130,7 +131,7 @@ class MultiPartParser(BaseParser): data, files = parser.parse() return DataAndFiles(data, files) except MultiPartParserError as exc: - raise ParseError('Multipart form parse error - %s' % six.u(exc.strerror)) + raise ParseError('Multipart form parse error - %s' % str(exc)) class XMLParser(BaseParser): From 3fba60e99c75dda4e14f7fe4f941d6fc84e4c986 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 30 Aug 2013 09:02:54 +0100 Subject: [PATCH 0126/1652] Drop broken placeholder serializations. --- rest_framework/renderers.py | 13 ++++++++++--- rest_framework/serializers.py | 3 ++- rest_framework/tests/test_serializer.py | 1 - 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 525e44d57..fca67eeeb 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -338,6 +338,11 @@ class HTMLFormRenderer(BaseRenderer): fields = {} for key, val in data.fields.items(): if getattr(val, 'read_only', True): + # Don't include read-only fields. + continue + + if getattr(val, 'fields', None): + # Nested data not supported by HTML forms. continue kwargs = {} @@ -476,6 +481,7 @@ class BrowsableAPIRenderer(BaseRenderer): return serializer = view.get_serializer(instance=obj) + data = serializer.data form_renderer = self.form_renderer_class() return form_renderer.render(data, self.accepted_media_type, self.renderer_context) @@ -508,9 +514,10 @@ class BrowsableAPIRenderer(BaseRenderer): # Get a read-only version of the serializer serializer = view.get_serializer(instance=obj) - for field_name, field in serializer.fields.items(): - if field.read_only: - del serializer.fields[field_name] + if obj is None: + for name, field in serializer.fields.items(): + if getattr(field, 'read_only', None): + del serializer.fields[name] # Render the raw data content renderer = renderer_class() diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index abff68983..a63c7f6c2 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -334,13 +334,14 @@ class BaseSerializer(WritableField): if self.source == '*': return self.to_native(obj) + # Get the raw field value try: source = self.source or field_name value = obj for component in source.split('.'): if value is None: - return self.to_native(None) + break value = get_component(value, component) except ObjectDoesNotExist: return None diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index c24976603..957e3bd2b 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -158,7 +158,6 @@ class BasicTests(TestCase): 'email': '', 'content': '', 'created': None, - 'sub_comment': '' } self.assertEqual(serializer.data, expected) From cba972911a90bdc0050bc48397bc70e1a062040d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 30 Aug 2013 09:12:39 +0100 Subject: [PATCH 0127/1652] Fix failing empty serializer test --- rest_framework/tests/test_serializer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index 957e3bd2b..c24976603 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -158,6 +158,7 @@ class BasicTests(TestCase): 'email': '', 'content': '', 'created': None, + 'sub_comment': '' } self.assertEqual(serializer.data, expected) From f3ab0b2b1d5734314dbe3cdd13cd7c4f0531bf7d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 30 Aug 2013 09:20:12 +0100 Subject: [PATCH 0128/1652] Browsable API tab preferences should be site-wide --- rest_framework/static/rest_framework/js/default.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/static/rest_framework/js/default.js b/rest_framework/static/rest_framework/js/default.js index a57b1cb81..bcb1964db 100644 --- a/rest_framework/static/rest_framework/js/default.js +++ b/rest_framework/static/rest_framework/js/default.js @@ -36,12 +36,12 @@ $('a[data-toggle="tab"]:not(:first)').on('shown', function (e) { }); $('a[data-toggle="tab"]').click(function(){ - document.cookie="tab=" + this.name; + document.cookie="tabstyle=" + this.name + "; path=/"; }); // Store tab preference in cookies & display appropriate tab on load. var selectedTab = null; -var selectedTabName = getCookie('tab'); +var selectedTabName = getCookie('tabstyle'); if (selectedTabName) { selectedTab = $('.form-switcher a[name=' + selectedTabName + ']'); From f8101114d1ec13e296cb393b43b0ebd9618fa997 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 30 Aug 2013 09:31:35 +0100 Subject: [PATCH 0129/1652] Update release notes --- docs/topics/release-notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index a901412f3..708aef388 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -45,6 +45,8 @@ You can determine your currently installed version using `pip freeze`: * Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. * Added `MAX_PAGINATE_BY` setting and `max_paginate_by` generic view attribute. * Added `cache` attribute to throttles to allow overriding of default cache. +* 'Raw data' tab in browsable API now contains pre-populated data. +* 'Raw data' and 'HTML form' tab preference in browseable API now saved between page views. * Bugfix: `required=True` argument fixed for boolean serializer fields. * Bugfix: `client.force_authenticate(None)` should also clear session info if it exists. * Bugfix: Client sending emptry string instead of file now clears `FileField`. From 3063a50fc20f0bfb7308e668cf083c5ae0876dac Mon Sep 17 00:00:00 2001 From: Edmond Wong Date: Fri, 30 Aug 2013 18:03:44 -0700 Subject: [PATCH 0130/1652] Allow OPTIONS to retrieve PUT field metadata on empty objects This allows OPTIONS to return the PUT endpoint's object serializer metadata when the object hasn't been created yet. --- rest_framework/generics.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 14feed204..4d909ef1c 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -356,8 +356,13 @@ class GenericAPIView(views.APIView): self.check_permissions(cloned_request) # Test object permissions if method == 'PUT': - self.get_object() - except (exceptions.APIException, PermissionDenied, Http404): + try: + self.get_object() + except Http404: + # Http404 should be acceptable and the serializer + # metadata should be populated. + pass + except (exceptions.APIException, PermissionDenied): pass else: # If user has appropriate permissions for the view, include From 85ab879a85ac4a7a3f6a965ab78839ac16aed912 Mon Sep 17 00:00:00 2001 From: tom-leys Date: Sat, 31 Aug 2013 19:40:53 +1200 Subject: [PATCH 0131/1652] Updated tutorial part 6: 2 examples were missing includes --- docs/tutorial/6-viewsets-and-routers.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index 8a1a1ae0c..870632f1b 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -61,6 +61,7 @@ To see what's going on under the hood let's first explicitly create a set of vie In the `urls.py` file we bind our `ViewSet` classes into a set of concrete views. from snippets.views import SnippetViewSet, UserViewSet + from rest_framework import renderers snippet_list = SnippetViewSet.as_view({ 'get': 'list', @@ -101,6 +102,7 @@ Because we're using `ViewSet` classes rather than `View` classes, we actually do Here's our re-wired `urls.py` file. + from django.conf.urls import patterns, url, include from snippets import views from rest_framework.routers import DefaultRouter From a15cda4be4e14f5de5db41a4f664ee95107e0984 Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Sat, 31 Aug 2013 17:10:15 +0300 Subject: [PATCH 0132/1652] Regression test for #1072 --- rest_framework/tests/test_relations_pk.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rest_framework/tests/test_relations_pk.py b/rest_framework/tests/test_relations_pk.py index e2a1b8152..3815afdd8 100644 --- a/rest_framework/tests/test_relations_pk.py +++ b/rest_framework/tests/test_relations_pk.py @@ -283,6 +283,15 @@ class PKForeignKeyTests(TestCase): self.assertFalse(serializer.is_valid()) self.assertEqual(serializer.errors, {'target': ['This field is required.']}) + def test_foreign_key_with_empty(self): + """ + Regression test for #1072 + + https://github.com/tomchristie/django-rest-framework/issues/1072 + """ + serializer = NullableForeignKeySourceSerializer() + self.assertEqual(serializer.data['target'], None) + class PKNullableForeignKeyTests(TestCase): def setUp(self): From 745ebeca77e6bcbec4eb94fb98206d6913e3d049 Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Sat, 31 Aug 2013 17:20:49 +0300 Subject: [PATCH 0133/1652] Handle case where obj=None in PKRelatedField.field_to_native() Fixes #1072 --- rest_framework/relations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 3ad16ee5e..35c00bf1d 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -264,7 +264,7 @@ class PrimaryKeyRelatedField(RelatedField): # RelatedObject (reverse relationship) try: pk = getattr(obj, self.source or field_name).pk - except ObjectDoesNotExist: + except (ObjectDoesNotExist, AttributeError): return None # Forward relationship From 8b245fed14abff62a34e81f4ce8da1c396ba7712 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 2 Sep 2013 09:17:51 +0100 Subject: [PATCH 0134/1652] Add windows virtualenv activate instruction Closes #1075. --- docs/tutorial/quickstart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index f15e75c04..06eec3c4e 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -12,7 +12,7 @@ Create a new Django project named `tutorial`, then start a new app called `quick # Create a virtualenv to isolate our package dependencies locally virtualenv env - source env/bin/activate + source env/bin/activate # On Windows use `env\Scripts\activate` # Install Django and Django REST framework into the virtualenv pip install django From d0123a1385b18f25da766c177056c308fbb74b67 Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Mon, 2 Sep 2013 10:23:54 -0400 Subject: [PATCH 0135/1652] Changed DOAC documentation link --- docs/api-guide/authentication.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index f30b16ed5..7caeac1e2 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -404,4 +404,4 @@ The [Django OAuth2 Consumer][doac] library from [Rediker Software][rediker] is a [oauthlib]: https://github.com/idan/oauthlib [doac]: https://github.com/Rediker-Software/doac [rediker]: https://github.com/Rediker-Software -[doac-rest-framework]: https://github.com/Rediker-Software/doac/blob/master/docs/markdown/integrations.md# +[doac-rest-framework]: https://github.com/Rediker-Software/doac/blob/master/docs/integrations.md# From 6e7e4fc01c5ddaf668f17f1d1f201a14a26f72f3 Mon Sep 17 00:00:00 2001 From: Edmond Wong Date: Tue, 3 Sep 2013 12:30:18 -0700 Subject: [PATCH 0136/1652] Added test for OPTIONS before object creation from a PUT --- rest_framework/generics.py | 4 ++- rest_framework/tests/test_generics.py | 42 +++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 4d909ef1c..7d1bf7945 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -360,7 +360,9 @@ class GenericAPIView(views.APIView): self.get_object() except Http404: # Http404 should be acceptable and the serializer - # metadata should be populated. + # metadata should be populated. Except this so the + # outer "else" clause of the try-except-else block + # will be executed. pass except (exceptions.APIException, PermissionDenied): pass diff --git a/rest_framework/tests/test_generics.py b/rest_framework/tests/test_generics.py index 7a87d3892..79cd99ac5 100644 --- a/rest_framework/tests/test_generics.py +++ b/rest_framework/tests/test_generics.py @@ -272,6 +272,48 @@ class TestInstanceView(TestCase): self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.data, expected) + def test_options_before_instance_create(self): + """ + OPTIONS requests to RetrieveUpdateDestroyAPIView should return metadata + before the instance has been created + """ + request = factory.options('/999') + with self.assertNumQueries(1): + response = self.view(request, pk=999).render() + expected = { + 'parses': [ + 'application/json', + 'application/x-www-form-urlencoded', + 'multipart/form-data' + ], + 'renders': [ + 'application/json', + 'text/html' + ], + 'name': 'Instance', + 'description': 'Example description for OPTIONS.', + 'actions': { + 'PUT': { + 'text': { + 'max_length': 100, + 'read_only': False, + 'required': True, + 'type': 'string', + 'label': 'Text comes here', + 'help_text': 'Text description.' + }, + 'id': { + 'read_only': True, + 'required': False, + 'type': 'integer', + 'label': 'ID', + }, + } + } + } + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data, expected) + def test_get_instance_view_incorrect_arg(self): """ GET requests with an incorrect pk type, should raise 404, not 500. From c4cb26f73bee65b068f140f1f931ede43e41f58a Mon Sep 17 00:00:00 2001 From: Tyler Hayes Date: Wed, 4 Sep 2013 03:38:34 -0700 Subject: [PATCH 0137/1652] Tiny typo fix --- docs/api-guide/serializers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 5d7e2ac87..a3cd1d6ab 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -250,7 +250,7 @@ This allows you to write views that update or create multiple items when a `PUT` serializer = BookSerializer(queryset, data=data, many=True) serializer.is_valid() # True - serialize.save() # `.save()` will be called on each updated or newly created instance. + serializer.save() # `.save()` will be called on each updated or newly created instance. By default bulk updates will be limited to updating instances that already exist in the provided queryset. From b47f1b0257e8688acb67ffd806efe0ffc2c1915b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 5 Sep 2013 20:25:45 +0100 Subject: [PATCH 0138/1652] Added @edmundwong for work on #1076. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index b2d3d5d29..07e2ec47d 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -166,6 +166,7 @@ The following people have helped make REST framework great. * Alexander Akhmetov - [alexander-akhmetov] * Andrey Antukh - [niwibe] * Mathieu Pillard - [diox] +* Edmond Wong - [edmondwong] Many thanks to everyone who's contributed to the project. @@ -368,3 +369,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [alexander-akhmetov]: https://github.com/alexander-akhmetov [niwibe]: https://github.com/niwibe [diox]: https://github.com/diox +[edmondwong]: https://github.com/edmondwong From 916d8ab37da2f0c4412507710649ba0f352f29bb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 6 Sep 2013 12:19:51 +0100 Subject: [PATCH 0139/1652] Fix typo --- docs/api-guide/relations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 15ba9a3a1..5ec4b22fc 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -421,7 +421,7 @@ For example, if all your object URLs used both a account and a slug in the the U def get_object(self, queryset, view_name, view_args, view_kwargs): account = view_kwargs['account'] slug = view_kwargs['slug'] - return queryset.get(account=account, slug=sug) + return queryset.get(account=account, slug=slug) --- From 4a9dcfa76089143bbeb5cd43fa3a406365d89e96 Mon Sep 17 00:00:00 2001 From: bwreilly Date: Fri, 6 Sep 2013 11:01:31 -0500 Subject: [PATCH 0140/1652] added guardian as optional requirement, stubbed out object-level permission class --- docs/index.md | 1 + rest_framework/compat.py | 6 ++++++ rest_framework/permissions.py | 7 ++++++- rest_framework/tests/test_permissions.py | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index e0a2e911b..d83fbff1f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -42,6 +42,7 @@ The following packages are optional: * [django-filter][django-filter] (0.5.4+) - Filtering support. * [django-oauth-plus][django-oauth-plus] (2.0+) and [oauth2][oauth2] (1.5.211+) - OAuth 1.0a support. * [django-oauth2-provider][django-oauth2-provider] (0.2.3+) - OAuth 2.0 support. +* [django-guardian][django-guardian] (1.1.1+) - Object level permissions support. **Note**: The `oauth2` Python package is badly misnamed, and actually provides OAuth 1.0a support. Also note that packages required for both OAuth 1.0a, and OAuth 2.0 are not yet Python 3 compatible. diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 6f7447add..b9d1dae6b 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -47,6 +47,12 @@ try: except ImportError: django_filters = None +# guardian is optional +try: + import guardian +except ImportError: + guardian = None + # cStringIO only if it's available, otherwise StringIO try: diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 1036663e0..6d213ba12 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -7,7 +7,7 @@ import warnings SAFE_METHODS = ['GET', 'HEAD', 'OPTIONS'] -from rest_framework.compat import oauth2_provider_scope, oauth2_constants +from rest_framework.compat import oauth2_provider_scope, oauth2_constants, guardian class BasePermission(object): @@ -151,6 +151,11 @@ class DjangoModelPermissionsOrAnonReadOnly(DjangoModelPermissions): authenticated_users_only = False +class DjangoObjectLevelModelPermissions(DjangoModelPermissions): + def __init__(self): + assert guardian, 'Using DjangoObjectLevelModelPermissions, but guardian is not installed' + + class TokenHasReadWriteScope(BasePermission): """ The request is authenticated as a user and the token used has the right scope diff --git a/rest_framework/tests/test_permissions.py b/rest_framework/tests/test_permissions.py index e2cca3808..d1171cce5 100644 --- a/rest_framework/tests/test_permissions.py +++ b/rest_framework/tests/test_permissions.py @@ -4,6 +4,7 @@ from django.db import models from django.test import TestCase from rest_framework import generics, status, permissions, authentication, HTTP_HEADER_ENCODING from rest_framework.test import APIRequestFactory +from rest_framework.compat import guardian import base64 factory = APIRequestFactory() From b07de86ad372a185c05c1dd77ccd7bee3801996e Mon Sep 17 00:00:00 2001 From: bwreilly Date: Fri, 6 Sep 2013 12:35:06 -0500 Subject: [PATCH 0141/1652] some properly failing tests, set up for standard permissions --- rest_framework/permissions.py | 2 +- rest_framework/runtests/settings.py | 11 +++ rest_framework/tests/test_permissions.py | 99 ++++++++++++++---------- tox.ini | 8 ++ 4 files changed, 79 insertions(+), 41 deletions(-) diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 6d213ba12..b67be4141 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -153,7 +153,7 @@ class DjangoModelPermissionsOrAnonReadOnly(DjangoModelPermissions): class DjangoObjectLevelModelPermissions(DjangoModelPermissions): def __init__(self): - assert guardian, 'Using DjangoObjectLevelModelPermissions, but guardian is not installed' + assert guardian, 'Using DjangoObjectLevelModelPermissions, but django-guardian is not installed' class TokenHasReadWriteScope(BasePermission): diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py index b3702d0bf..6750376f0 100644 --- a/rest_framework/runtests/settings.py +++ b/rest_framework/runtests/settings.py @@ -123,6 +123,17 @@ else: 'provider.oauth2', ) +# guardian is optional +try: + import guardian +except ImportError: + pass +else: + ANONYMOUS_USER_ID = -1 + INSTALLED_APPS += ( + 'guardian', + ) + STATIC_URL = '/static/' PASSWORD_HASHERS = ( diff --git a/rest_framework/tests/test_permissions.py b/rest_framework/tests/test_permissions.py index d1171cce5..dcdb4eea6 100644 --- a/rest_framework/tests/test_permissions.py +++ b/rest_framework/tests/test_permissions.py @@ -3,17 +3,14 @@ from django.contrib.auth.models import User, Permission from django.db import models from django.test import TestCase from rest_framework import generics, status, permissions, authentication, HTTP_HEADER_ENCODING -from rest_framework.test import APIRequestFactory from rest_framework.compat import guardian +from rest_framework.test import APIRequestFactory +from rest_framework.tests.models import BasicModel +from rest_framework.settings import api_settings import base64 factory = APIRequestFactory() - -class BasicModel(models.Model): - text = models.CharField(max_length=100) - - class RootView(generics.ListCreateAPIView): model = BasicModel authentication_classes = [authentication.BasicAuthentication] @@ -145,45 +142,67 @@ class ModelPermissionsIntegrationTests(TestCase): self.assertEqual(list(response.data['actions'].keys()), ['PUT']) -class OwnerModel(models.Model): - text = models.CharField(max_length=100) - owner = models.ForeignKey(User) +class BasicPermModel(BasicModel): + class Meta: + app_label = 'tests' + permissions = ( + ('read_basicpermmodel', "Can view basic perm model"), + # add, change, delete built in to django + ) -class IsOwnerPermission(permissions.BasePermission): - def has_object_permission(self, request, view, obj): - return request.user == obj.owner - - -class OwnerInstanceView(generics.RetrieveUpdateDestroyAPIView): - model = OwnerModel +class ObjectPermissionInstanceView(generics.RetrieveUpdateDestroyAPIView): + model = BasicModel authentication_classes = [authentication.BasicAuthentication] - permission_classes = [IsOwnerPermission] + permission_classes = [permissions.DjangoObjectLevelModelPermissions] -owner_instance_view = OwnerInstanceView.as_view() +object_permissions_view = ObjectPermissionInstanceView.as_view() + +if guardian: + class ObjectPermissionsIntegrationTests(TestCase): + """ + Integration tests for the object level permissions API. + """ + + def setUp(self): + # create users + User.objects.create_user('no_permission', 'no_permission@example.com', 'password') + reader = User.objects.create_user('reader', 'reader@example.com', 'password') + writer = User.objects.create_user('writer', 'writer@example.com', 'password') + full_access = User.objects.create_user('full_access', 'full_access@example.com', 'password') + + model = BasicPermModel.objects.create(text='foo') + + # assign permissions appropriately + from guardian.shortcuts import assign_perm + + read = "read_basicpermmodel" + write = "change_basicpermmodel" + delete = "delete_basicpermmodel" + app_label = 'tests.' + # model level permissions + assign_perm(app_label + delete, full_access, obj=model) + (assign_perm(app_label + write, user, obj=model) for user in (writer, full_access)) + (assign_perm(app_label + read, user, obj=model) for user in (reader, writer, full_access)) + + # object level permissions + assign_perm(delete, full_access, obj=model) + (assign_perm(write, user, obj=model) for user in (writer, full_access)) + (assign_perm(read, user, obj=model) for user in (reader, writer, full_access)) + + self.no_permission_credentials = basic_auth_header('no_permission', 'password') + self.reader_credentials = basic_auth_header('reader', 'password') + self.writer_credentials = basic_auth_header('writer', 'password') + self.full_access_credentials = basic_auth_header('full_access', 'password') -class ObjectPermissionsIntegrationTests(TestCase): - """ - Integration tests for the object level permissions API. - """ + def test_has_delete_permissions(self): + request = factory.delete('/1', HTTP_AUTHORIZATION=self.full_access_credentials) + response = object_permissions_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) - def setUp(self): - User.objects.create_user('not_owner', 'not_owner@example.com', 'password') - user = User.objects.create_user('owner', 'owner@example.com', 'password') - - self.not_owner_credentials = basic_auth_header('not_owner', 'password') - self.owner_credentials = basic_auth_header('owner', 'password') - - OwnerModel(text='foo', owner=user).save() - - def test_owner_has_delete_permissions(self): - request = factory.delete('/1', HTTP_AUTHORIZATION=self.owner_credentials) - response = owner_instance_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) - - def test_non_owner_does_not_have_delete_permissions(self): - request = factory.delete('/1', HTTP_AUTHORIZATION=self.not_owner_credentials) - response = owner_instance_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) + def test_no_delete_permissions(self): + request = factory.delete('/1', HTTP_AUTHORIZATION=self.writer_credentials) + response = object_permissions_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) diff --git a/tox.ini b/tox.ini index aa97fd350..6e3b8e0a8 100644 --- a/tox.ini +++ b/tox.ini @@ -25,6 +25,7 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/ django-oauth-plus==2.0 oauth2==1.5.211 django-oauth2-provider==0.2.4 + django-guardian==1.1.1 [testenv:py2.6-django1.6] basepython = python2.6 @@ -34,6 +35,7 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/ django-oauth-plus==2.0 oauth2==1.5.211 django-oauth2-provider==0.2.4 + django-guardian==1.1.1 [testenv:py3.3-django1.5] basepython = python3.3 @@ -55,6 +57,7 @@ deps = django==1.5 django-oauth-plus==2.0 oauth2==1.5.211 django-oauth2-provider==0.2.3 + django-guardian==1.1.1 [testenv:py2.6-django1.5] basepython = python2.6 @@ -64,6 +67,7 @@ deps = django==1.5 django-oauth-plus==2.0 oauth2==1.5.211 django-oauth2-provider==0.2.3 + django-guardian==1.1.1 [testenv:py2.7-django1.4] basepython = python2.7 @@ -73,6 +77,7 @@ deps = django==1.4.3 django-oauth-plus==2.0 oauth2==1.5.211 django-oauth2-provider==0.2.3 + django-guardian==1.1.1 [testenv:py2.6-django1.4] basepython = python2.6 @@ -82,6 +87,7 @@ deps = django==1.4.3 django-oauth-plus==2.0 oauth2==1.5.211 django-oauth2-provider==0.2.3 + django-guardian==1.1.1 [testenv:py2.7-django1.3] basepython = python2.7 @@ -91,6 +97,7 @@ deps = django==1.3.5 django-oauth-plus==2.0 oauth2==1.5.211 django-oauth2-provider==0.2.3 + django-guardian==1.1.1 [testenv:py2.6-django1.3] basepython = python2.6 @@ -100,3 +107,4 @@ deps = django==1.3.5 django-oauth-plus==2.0 oauth2==1.5.211 django-oauth2-provider==0.2.3 + django-guardian==1.1.1 From b5523bcc7ddab97620fd7b49e385b44c664ca899 Mon Sep 17 00:00:00 2001 From: Andy Freeland Date: Fri, 6 Sep 2013 11:40:34 -0500 Subject: [PATCH 0142/1652] Support customizable view EXCEPTION_HANDLER Add `api_settings.EXCEPTION_HANDLER` to support custom error responses. Fixes #907. --- docs/api-guide/settings.md | 16 +++++++++++- rest_framework/settings.py | 4 +++ rest_framework/tests/test_views.py | 41 ++++++++++++++++++++++++++++++ rest_framework/views.py | 2 +- 4 files changed, 61 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 542e8c5fa..13f96f9a3 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -25,7 +25,7 @@ If you need to access the values of REST framework's API settings in your projec you should use the `api_settings` object. For example. from rest_framework.settings import api_settings - + print api_settings.DEFAULT_AUTHENTICATION_CLASSES The `api_settings` object will check for any user-defined settings, and otherwise fall back to the default values. Any setting that uses string import paths to refer to a class will automatically import and return the referenced class, instead of the string literal. @@ -339,6 +339,20 @@ Default: `'rest_framework.views.get_view_description'` ## Miscellaneous settings +#### EXCEPTION_HANDLER + +A string representing the function that should be used when returning a response for any given exception. If the function returns `None`, a 500 error will be raised. + +This setting can be changed to support error responses other than the default `{"detail": "Failure..."}` responses. For example, you can use it to provide API responses like `{"errors": [{"message": "Failure...", "code": ""} ...]}`. + +This should be a function with the following signature: + + exception_handler(exc) + +* `exc`: The exception. + +Default: `'rest_framework.views.exception_handler'` + #### FORMAT_SUFFIX_KWARG The name of a parameter in the URL conf that may be used to provide a format suffix. diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 8c0847512..8abaf1409 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -77,6 +77,9 @@ DEFAULTS = { 'VIEW_NAME_FUNCTION': 'rest_framework.views.get_view_name', 'VIEW_DESCRIPTION_FUNCTION': 'rest_framework.views.get_view_description', + # Exception handling + 'EXCEPTION_HANDLER': 'rest_framework.views.exception_handler', + # Testing 'TEST_REQUEST_RENDERER_CLASSES': ( 'rest_framework.renderers.MultiPartRenderer', @@ -125,6 +128,7 @@ IMPORT_STRINGS = ( 'DEFAULT_MODEL_SERIALIZER_CLASS', 'DEFAULT_PAGINATION_SERIALIZER_CLASS', 'DEFAULT_FILTER_BACKENDS', + 'EXCEPTION_HANDLER', 'FILTER_BACKEND', 'TEST_REQUEST_RENDERER_CLASSES', 'UNAUTHENTICATED_USER', diff --git a/rest_framework/tests/test_views.py b/rest_framework/tests/test_views.py index c0bec5aed..65c7e50ea 100644 --- a/rest_framework/tests/test_views.py +++ b/rest_framework/tests/test_views.py @@ -32,6 +32,16 @@ def basic_view(request): return {'method': 'PATCH', 'data': request.DATA} +class ErrorView(APIView): + def get(self, request, *args, **kwargs): + raise Exception + + +@api_view(['GET']) +def error_view(request): + raise Exception + + def sanitise_json_error(error_dict): """ Exact contents of JSON error messages depend on the installed version @@ -99,3 +109,34 @@ class FunctionBasedViewIntegrationTests(TestCase): } self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertEqual(sanitise_json_error(response.data), expected) + + +class TestCustomExceptionHandler(TestCase): + def setUp(self): + self.DEFAULT_HANDLER = api_settings.EXCEPTION_HANDLER + + def exception_handler(exc): + return Response('Error!', status=status.HTTP_400_BAD_REQUEST) + + api_settings.EXCEPTION_HANDLER = exception_handler + + def tearDown(self): + api_settings.EXCEPTION_HANDLER = self.DEFAULT_HANDLER + + def test_class_based_view_exception_handler(self): + view = ErrorView.as_view() + + request = factory.get('/', content_type='application/json') + response = view(request) + expected = 'Error!' + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + self.assertEqual(response.data, expected) + + def test_function_based_view_exception_handler(self): + view = error_view + + request = factory.get('/', content_type='application/json') + response = view(request) + expected = 'Error!' + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + self.assertEqual(response.data, expected) diff --git a/rest_framework/views.py b/rest_framework/views.py index 4cff04224..853e64614 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -361,7 +361,7 @@ class APIView(View): else: exc.status_code = status.HTTP_403_FORBIDDEN - response = exception_handler(exc) + response = self.settings.EXCEPTION_HANDLER(exc) if response is None: raise From bae0ef6b5dcb0abf2be865340e5476aeab5ce137 Mon Sep 17 00:00:00 2001 From: Andy Freeland Date: Fri, 6 Sep 2013 13:57:32 -0500 Subject: [PATCH 0143/1652] Add EXCEPTION_HANDLER docs to exception docs --- docs/api-guide/exceptions.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index 8b3e50f1e..fa5053dfe 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -30,9 +30,27 @@ Might receive an error response indicating that the `DELETE` method is not allow HTTP/1.1 405 Method Not Allowed Content-Type: application/json; charset=utf-8 Content-Length: 42 - + {"detail": "Method 'DELETE' not allowed."} +## Custom exception handling + +To implement custom exception handling (e.g. to handle additional exception classes or to override the error response format), create an exception handler function with the following signature: + + exception_handler(exc) + +* `exc`: The exception. + +If the function returns `None`, a 500 error will be raised. + +The exception handler is set globally, using the `EXCEPTION_HANDLER` setting. For example: + + 'EXCEPTION_HANDLER': 'project.app.module.function' + +If not specified, this setting defaults to the exception handler described above: + + 'EXCEPTION_HANDLER': 'rest_framework.views.exception_handler' + --- # API Reference From b6c0c815aa75b3f2fe0fae3a2221e7d0e976418b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sat, 7 Sep 2013 20:45:43 +0100 Subject: [PATCH 0144/1652] Extra docs on custom exception handling. --- docs/api-guide/exceptions.md | 43 ++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index fa5053dfe..0c48783a3 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -28,28 +28,53 @@ For example, the following request: Might receive an error response indicating that the `DELETE` method is not allowed on that resource: HTTP/1.1 405 Method Not Allowed - Content-Type: application/json; charset=utf-8 + Content-Type: application/json Content-Length: 42 {"detail": "Method 'DELETE' not allowed."} ## Custom exception handling -To implement custom exception handling (e.g. to handle additional exception classes or to override the error response format), create an exception handler function with the following signature: +You can implement custom exception handling by creating a handler function that converts exceptions raised in your API views into response objects. This allows you to control the style of error responses used by your API. - exception_handler(exc) +The function must take a single argument, which is the exception to be handled, and should either return a `Response` object, or return `None` if the exception cannot be handled. If the handler returns `None` then the exception will be re-raised and Django will return a standard HTTP 500 'server error' response. -* `exc`: The exception. +For example, you might want to ensure that all error responses include the HTTP status code in the body of the response, like so: -If the function returns `None`, a 500 error will be raised. + HTTP/1.1 405 Method Not Allowed + Content-Type: application/json + Content-Length: 62 -The exception handler is set globally, using the `EXCEPTION_HANDLER` setting. For example: + {"status_code": 405, "detail": "Method 'DELETE' not allowed."} - 'EXCEPTION_HANDLER': 'project.app.module.function' +In order to alter the style of the response, you could write the following custom exception handler: -If not specified, this setting defaults to the exception handler described above: + from rest_framework.views import exception_handler - 'EXCEPTION_HANDLER': 'rest_framework.views.exception_handler' + def custom_exception_handler(exc): + # Call REST framework's default exception handler first, + # to get the standard error response. + response = exception_handler(exc) + + # Now add the HTTP status code to the response. + if response is not None: + response.data['status_code'] = response.status_code + + return response + +The exception handler must also be configured in your settings, using the `EXCEPTION_HANDLER` setting key. For example: + + REST_FRAMEWORK = { + 'EXCEPTION_HANDLER': 'my_project.my_app.utils.custom_exception_handler' + } + +If not specified, the `'EXCEPTION_HANDLER'` setting defaults to the standard exception handler provided by REST framework: + + REST_FRAMEWORK = { + 'EXCEPTION_HANDLER': 'rest_framework.views.exception_handler' + } + +Note that the exception handler will only be called for responses generated by raised exceptions. It will not be used for any responses returned directly by the view, such as the `HTTP_400_BAD_REQUEST` responses that are returned by the generic views when serializer validation fails. --- From 57d6b5fb7c2652bb4c68edd1bcc95be736b06b31 Mon Sep 17 00:00:00 2001 From: bwreilly Date: Sat, 7 Sep 2013 23:16:43 -0500 Subject: [PATCH 0145/1652] necessary test settings for guardian --- rest_framework/runtests/settings.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py index 6750376f0..be7216580 100644 --- a/rest_framework/runtests/settings.py +++ b/rest_framework/runtests/settings.py @@ -130,6 +130,10 @@ except ImportError: pass else: ANONYMOUS_USER_ID = -1 + AUTHENTICATION_BACKENDS = ( + 'django.contrib.auth.backends.ModelBackend', # default + 'guardian.backends.ObjectPermissionBackend', + ) INSTALLED_APPS += ( 'guardian', ) From 118645e4806effaa35726012a983676b2c55b6dd Mon Sep 17 00:00:00 2001 From: bwreilly Date: Sat, 7 Sep 2013 23:18:52 -0500 Subject: [PATCH 0146/1652] first pass at object level permissions and tests --- rest_framework/permissions.py | 46 +++++++ rest_framework/tests/test_permissions.py | 148 +++++++++++++++++------ 2 files changed, 157 insertions(+), 37 deletions(-) diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index b67be4141..2d8a30e91 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -7,6 +7,7 @@ import warnings SAFE_METHODS = ['GET', 'HEAD', 'OPTIONS'] +from django.http import Http404 from rest_framework.compat import oauth2_provider_scope, oauth2_constants, guardian @@ -152,9 +153,54 @@ class DjangoModelPermissionsOrAnonReadOnly(DjangoModelPermissions): class DjangoObjectLevelModelPermissions(DjangoModelPermissions): + """ + Basic object level permissions utilizing django-guardian. + """ + def __init__(self): assert guardian, 'Using DjangoObjectLevelModelPermissions, but django-guardian is not installed' + action_perm_map = { + 'list': 'read', + 'retrieve': 'read', + 'create': 'add', + 'partial_update': 'change', + 'update': 'change', + 'destroy': 'delete', + } + + def _get_names(self, view): + model_cls = getattr(view, 'model', None) + queryset = getattr(view, 'queryset', None) + + if model_cls is None and queryset is not None: + model_cls = queryset.model + if not model_cls: # no model, no model based permissions + return None + model_name = model_cls._meta.module_name + return model_name + + def has_permission(self, request, view): + if view.action == 'list': + user = request.user + queryset = view.get_queryset() + model_name = self._get_names(view) + view.queryset = guardian.shortcuts.get_objects_for_user(user, 'read_' + model_name, queryset) #TODO: move to filter + return super(DjangoObjectLevelModelPermissions, self).has_permission(request, view) + + def has_object_permission(self, request, view, obj): + user = request.user + model_name = self._get_names(view) + action = self.action_perm_map.get(view.action) + + assert action, "Tried to determine object permissions but no action specified in view" + + perm = "{action}_{model_name}".format(action=action, model_name=model_name) + check = user.has_perm(perm, obj) + if not check: + raise Http404 + return user.has_perm(perm, obj) + class TokenHasReadWriteScope(BasePermission): """ diff --git a/rest_framework/tests/test_permissions.py b/rest_framework/tests/test_permissions.py index dcdb4eea6..d64ab04eb 100644 --- a/rest_framework/tests/test_permissions.py +++ b/rest_framework/tests/test_permissions.py @@ -1,12 +1,11 @@ from __future__ import unicode_literals -from django.contrib.auth.models import User, Permission +from django.contrib.auth.models import User, Permission, Group from django.db import models from django.test import TestCase from rest_framework import generics, status, permissions, authentication, HTTP_HEADER_ENCODING from rest_framework.compat import guardian from rest_framework.test import APIRequestFactory from rest_framework.tests.models import BasicModel -from rest_framework.settings import api_settings import base64 factory = APIRequestFactory() @@ -142,67 +141,142 @@ class ModelPermissionsIntegrationTests(TestCase): self.assertEqual(list(response.data['actions'].keys()), ['PUT']) -class BasicPermModel(BasicModel): +class BasicPermModel(models.Model): + text = models.CharField(max_length=100) class Meta: app_label = 'tests' permissions = ( - ('read_basicpermmodel', "Can view basic perm model"), + ('read_basicpermmodel', 'Can view basic perm model'), # add, change, delete built in to django ) class ObjectPermissionInstanceView(generics.RetrieveUpdateDestroyAPIView): - model = BasicModel + model = BasicPermModel authentication_classes = [authentication.BasicAuthentication] permission_classes = [permissions.DjangoObjectLevelModelPermissions] - object_permissions_view = ObjectPermissionInstanceView.as_view() +class ObjectPermissionListView(generics.ListAPIView): + model = BasicPermModel + authentication_classes = [authentication.BasicAuthentication] + permission_classes = [permissions.DjangoObjectLevelModelPermissions] + +object_permissions_list_view = ObjectPermissionListView.as_view() + if guardian: + from guardian.shortcuts import assign_perm + class ObjectPermissionsIntegrationTests(TestCase): """ Integration tests for the object level permissions API. """ + @classmethod + def setUpClass(cls): + # create users + create = User.objects.create_user + users = { + 'fullaccess': create('fullaccess', 'fullaccess@example.com', 'password'), + 'readonly': create('readonly', 'readonly@example.com', 'password'), + 'writeonly': create('writeonly', 'writeonly@example.com', 'password'), + 'deleteonly': create('deleteonly', 'deleteonly@example.com', 'password'), + } + + # give everyone model level permissions, as we are not testing those + everyone = Group.objects.create(name='everyone') + model_name = BasicPermModel._meta.module_name + app_label = BasicPermModel._meta.app_label + f = '{0}_{1}'.format + perms = { + 'read': f('read', model_name), + 'change': f('change', model_name), + 'delete': f('delete', model_name) + } + for perm in perms.values(): + perm = '{0}.{1}'.format(app_label, perm) + assign_perm(perm, everyone) + everyone.user_set.add(*users.values()) + + cls.perms = perms + cls.users = users def setUp(self): - # create users - User.objects.create_user('no_permission', 'no_permission@example.com', 'password') - reader = User.objects.create_user('reader', 'reader@example.com', 'password') - writer = User.objects.create_user('writer', 'writer@example.com', 'password') - full_access = User.objects.create_user('full_access', 'full_access@example.com', 'password') - + perms = self.perms + users = self.users + + # appropriate object level permissions + readers = Group.objects.create(name='readers') + writers = Group.objects.create(name='writers') + deleters = Group.objects.create(name='deleters') + model = BasicPermModel.objects.create(text='foo') + + assign_perm(perms['read'], readers, model) + assign_perm(perms['change'], writers, model) + assign_perm(perms['delete'], deleters, model) - # assign permissions appropriately - from guardian.shortcuts import assign_perm + readers.user_set.add(users['fullaccess'], users['readonly']) + writers.user_set.add(users['fullaccess'], users['writeonly']) + deleters.user_set.add(users['fullaccess'], users['deleteonly']) - read = "read_basicpermmodel" - write = "change_basicpermmodel" - delete = "delete_basicpermmodel" - app_label = 'tests.' - # model level permissions - assign_perm(app_label + delete, full_access, obj=model) - (assign_perm(app_label + write, user, obj=model) for user in (writer, full_access)) - (assign_perm(app_label + read, user, obj=model) for user in (reader, writer, full_access)) + self.credentials = {} + for user in users.values(): + self.credentials[user.username] = basic_auth_header(user.username, 'password') - # object level permissions - assign_perm(delete, full_access, obj=model) - (assign_perm(write, user, obj=model) for user in (writer, full_access)) - (assign_perm(read, user, obj=model) for user in (reader, writer, full_access)) - - self.no_permission_credentials = basic_auth_header('no_permission', 'password') - self.reader_credentials = basic_auth_header('reader', 'password') - self.writer_credentials = basic_auth_header('writer', 'password') - self.full_access_credentials = basic_auth_header('full_access', 'password') - - - def test_has_delete_permissions(self): - request = factory.delete('/1', HTTP_AUTHORIZATION=self.full_access_credentials) + # Delete + def test_can_delete_permissions(self): + request = factory.delete('/1', HTTP_AUTHORIZATION=self.credentials['deleteonly']) + object_permissions_view.cls.action = 'destroy' response = object_permissions_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) - def test_no_delete_permissions(self): - request = factory.delete('/1', HTTP_AUTHORIZATION=self.writer_credentials) + def test_cannot_delete_permissions(self): + request = factory.delete('/1', HTTP_AUTHORIZATION=self.credentials['readonly']) + object_permissions_view.cls.action = 'destroy' response = object_permissions_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + + # Update + def test_can_update_permissions(self): + request = factory.patch('/1', {'text': 'foobar'}, format='json', + HTTP_AUTHORIZATION=self.credentials['writeonly']) + object_permissions_view.cls.action = 'partial_update' + response = object_permissions_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data.get('text'), 'foobar') + + def test_cannot_update_permissions(self): + request = factory.patch('/1', {'text': 'foobar'}, format='json', + HTTP_AUTHORIZATION=self.credentials['deleteonly']) + object_permissions_view.cls.action = 'partial_update' + response = object_permissions_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + + # Read + def test_can_read_permissions(self): + request = factory.get('/1', HTTP_AUTHORIZATION=self.credentials['readonly']) + object_permissions_view.cls.action = 'retrieve' + response = object_permissions_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_200_OK) + + def test_cannot_read_permissions(self): + request = factory.get('/1', HTTP_AUTHORIZATION=self.credentials['writeonly']) + object_permissions_view.cls.action = 'retrieve' + response = object_permissions_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + + # Read list + def test_can_read_list_permissions(self): + request = factory.get('/', HTTP_AUTHORIZATION=self.credentials['readonly']) + object_permissions_list_view.cls.action = 'list' + response = object_permissions_list_view(request) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data[0].get('id'), 1) + + def test_cannot_read_list_permissions(self): + request = factory.get('/', HTTP_AUTHORIZATION=self.credentials['writeonly']) + object_permissions_list_view.cls.action = 'list' + response = object_permissions_list_view(request) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertListEqual(response.data, []) \ No newline at end of file From 9ff0f6d3bff3c1d02d2ccaf4f1500e25cb97620d Mon Sep 17 00:00:00 2001 From: bwreilly Date: Sat, 7 Sep 2013 23:48:03 -0500 Subject: [PATCH 0147/1652] switch to a dedicated filter for read list object permissions --- rest_framework/filters.py | 18 +++++++++++++++++- rest_framework/permissions.py | 13 ++++++------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 4079e1bd5..6d46ad233 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -4,7 +4,7 @@ returned by list views. """ from __future__ import unicode_literals from django.db import models -from rest_framework.compat import django_filters, six +from rest_framework.compat import django_filters, six, guardian from functools import reduce import operator @@ -23,6 +23,22 @@ class BaseFilterBackend(object): raise NotImplementedError(".filter_queryset() must be overridden.") +class ObjectPermissionReaderFilter(BaseFilterBackend): + """ + A filter backend that limits results to those where the requesting user + has read object level permissions. + """ + def __init__(self): + assert guardian, 'Using ObjectPermissionReaderFilter, but django-guardian is not installed' + + def filter_queryset(self, request, queryset, view): + user = request.user + model_cls = queryset.model + model_name = model_cls._meta.module_name + permission = 'read_' + model_name + return guardian.shortcuts.get_objects_for_user(user, permission, queryset) + + class DjangoFilterBackend(BaseFilterBackend): """ A filter backend that uses django-filter. diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 2d8a30e91..0d5e0e787 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -9,6 +9,7 @@ SAFE_METHODS = ['GET', 'HEAD', 'OPTIONS'] from django.http import Http404 from rest_framework.compat import oauth2_provider_scope, oauth2_constants, guardian +from rest_framework.filters import ObjectPermissionReaderFilter class BasePermission(object): @@ -169,7 +170,7 @@ class DjangoObjectLevelModelPermissions(DjangoModelPermissions): 'destroy': 'delete', } - def _get_names(self, view): + def _get_model_name(self, view): model_cls = getattr(view, 'model', None) queryset = getattr(view, 'queryset', None) @@ -182,19 +183,17 @@ class DjangoObjectLevelModelPermissions(DjangoModelPermissions): def has_permission(self, request, view): if view.action == 'list': - user = request.user queryset = view.get_queryset() - model_name = self._get_names(view) - view.queryset = guardian.shortcuts.get_objects_for_user(user, 'read_' + model_name, queryset) #TODO: move to filter + view.queryset = ObjectPermissionReaderFilter().filter_queryset(request, queryset, view) return super(DjangoObjectLevelModelPermissions, self).has_permission(request, view) def has_object_permission(self, request, view, obj): - user = request.user - model_name = self._get_names(view) action = self.action_perm_map.get(view.action) - assert action, "Tried to determine object permissions but no action specified in view" + user = request.user + model_name = self._get_model_name(view) + perm = "{action}_{model_name}".format(action=action, model_name=model_name) check = user.has_perm(perm, obj) if not check: From 0183c69538de7b6dc4e9b0602fc364e789e0cab6 Mon Sep 17 00:00:00 2001 From: bwreilly Date: Mon, 9 Sep 2013 08:39:09 -0700 Subject: [PATCH 0148/1652] removed unnecessary guardian req and view.action parsing --- rest_framework/permissions.py | 52 +++++++++++------------- rest_framework/tests/test_permissions.py | 11 ++--- 2 files changed, 26 insertions(+), 37 deletions(-) diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 0d5e0e787..61a33bdd3 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -8,8 +8,7 @@ import warnings SAFE_METHODS = ['GET', 'HEAD', 'OPTIONS'] from django.http import Http404 -from rest_framework.compat import oauth2_provider_scope, oauth2_constants, guardian -from rest_framework.filters import ObjectPermissionReaderFilter +from rest_framework.compat import oauth2_provider_scope, oauth2_constants class BasePermission(object): @@ -158,47 +157,42 @@ class DjangoObjectLevelModelPermissions(DjangoModelPermissions): Basic object level permissions utilizing django-guardian. """ - def __init__(self): - assert guardian, 'Using DjangoObjectLevelModelPermissions, but django-guardian is not installed' - - action_perm_map = { - 'list': 'read', - 'retrieve': 'read', - 'create': 'add', - 'partial_update': 'change', - 'update': 'change', - 'destroy': 'delete', + actions_map = { + 'GET': ['read_%(model_name)s'], + 'OPTIONS': ['read_%(model_name)s'], + 'HEAD': ['read_%(model_name)s'], + 'POST': ['add_%(model_name)s'], + 'PUT': ['change_%(model_name)s'], + 'PATCH': ['change_%(model_name)s'], + 'DELETE': ['delete_%(model_name)s'], } - def _get_model_name(self, view): - model_cls = getattr(view, 'model', None) - queryset = getattr(view, 'queryset', None) - - if model_cls is None and queryset is not None: - model_cls = queryset.model - if not model_cls: # no model, no model based permissions - return None - model_name = model_cls._meta.module_name - return model_name + def get_required_object_permissions(self, method, model_cls): + kwargs = { + 'model_name': model_cls._meta.module_name + } + return [perm % kwargs for perm in self.actions_map[method]] def has_permission(self, request, view): - if view.action == 'list': + if getattr(view, 'action', None) == 'list': queryset = view.get_queryset() view.queryset = ObjectPermissionReaderFilter().filter_queryset(request, queryset, view) return super(DjangoObjectLevelModelPermissions, self).has_permission(request, view) def has_object_permission(self, request, view, obj): - action = self.action_perm_map.get(view.action) - assert action, "Tried to determine object permissions but no action specified in view" + model_cls = getattr(view, 'model', None) + queryset = getattr(view, 'queryset', None) + if model_cls is None and queryset is not None: + model_cls = queryset.model + + perms = self.get_required_object_permissions(request.method, model_cls) user = request.user - model_name = self._get_model_name(view) - perm = "{action}_{model_name}".format(action=action, model_name=model_name) - check = user.has_perm(perm, obj) + check = user.has_perms(perms, obj) if not check: raise Http404 - return user.has_perm(perm, obj) + return user.has_perms(perms, obj) class TokenHasReadWriteScope(BasePermission): diff --git a/rest_framework/tests/test_permissions.py b/rest_framework/tests/test_permissions.py index d64ab04eb..2d866cd09 100644 --- a/rest_framework/tests/test_permissions.py +++ b/rest_framework/tests/test_permissions.py @@ -4,6 +4,7 @@ from django.db import models from django.test import TestCase from rest_framework import generics, status, permissions, authentication, HTTP_HEADER_ENCODING from rest_framework.compat import guardian +from rest_framework.filters import ObjectPermissionReaderFilter from rest_framework.test import APIRequestFactory from rest_framework.tests.models import BasicModel import base64 @@ -227,13 +228,11 @@ if guardian: # Delete def test_can_delete_permissions(self): request = factory.delete('/1', HTTP_AUTHORIZATION=self.credentials['deleteonly']) - object_permissions_view.cls.action = 'destroy' response = object_permissions_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) def test_cannot_delete_permissions(self): request = factory.delete('/1', HTTP_AUTHORIZATION=self.credentials['readonly']) - object_permissions_view.cls.action = 'destroy' response = object_permissions_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) @@ -241,7 +240,6 @@ if guardian: def test_can_update_permissions(self): request = factory.patch('/1', {'text': 'foobar'}, format='json', HTTP_AUTHORIZATION=self.credentials['writeonly']) - object_permissions_view.cls.action = 'partial_update' response = object_permissions_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.data.get('text'), 'foobar') @@ -249,34 +247,31 @@ if guardian: def test_cannot_update_permissions(self): request = factory.patch('/1', {'text': 'foobar'}, format='json', HTTP_AUTHORIZATION=self.credentials['deleteonly']) - object_permissions_view.cls.action = 'partial_update' response = object_permissions_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) # Read def test_can_read_permissions(self): request = factory.get('/1', HTTP_AUTHORIZATION=self.credentials['readonly']) - object_permissions_view.cls.action = 'retrieve' response = object_permissions_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_200_OK) def test_cannot_read_permissions(self): request = factory.get('/1', HTTP_AUTHORIZATION=self.credentials['writeonly']) - object_permissions_view.cls.action = 'retrieve' response = object_permissions_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) # Read list def test_can_read_list_permissions(self): request = factory.get('/', HTTP_AUTHORIZATION=self.credentials['readonly']) - object_permissions_list_view.cls.action = 'list' + object_permissions_list_view.cls.filter_backends = (ObjectPermissionReaderFilter,) response = object_permissions_list_view(request) self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.data[0].get('id'), 1) def test_cannot_read_list_permissions(self): request = factory.get('/', HTTP_AUTHORIZATION=self.credentials['writeonly']) - object_permissions_list_view.cls.action = 'list' + object_permissions_list_view.cls.filter_backends = (ObjectPermissionReaderFilter,) response = object_permissions_list_view(request) self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertListEqual(response.data, []) \ No newline at end of file From 23fc9dd53fcd9cc25e2c77e5ffae395f04d4990d Mon Sep 17 00:00:00 2001 From: bwreilly Date: Mon, 9 Sep 2013 09:32:29 -0700 Subject: [PATCH 0149/1652] better doc for object permissions, drop redundant has_permission call --- rest_framework/permissions.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 61a33bdd3..70bf9c61e 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -154,7 +154,14 @@ class DjangoModelPermissionsOrAnonReadOnly(DjangoModelPermissions): class DjangoObjectLevelModelPermissions(DjangoModelPermissions): """ - Basic object level permissions utilizing django-guardian. + The request is authenticated using `django.contrib.auth` permissions. + See: https://docs.djangoproject.com/en/dev/topics/auth/#permissions + + It ensures that the user is authenticated, and has the appropriate + `add`/`change`/`delete` permissions on the object using .has_perms. + + This permission can only be applied against view classes that + provide a `.model` or `.queryset` attribute. """ actions_map = { @@ -173,12 +180,6 @@ class DjangoObjectLevelModelPermissions(DjangoModelPermissions): } return [perm % kwargs for perm in self.actions_map[method]] - def has_permission(self, request, view): - if getattr(view, 'action', None) == 'list': - queryset = view.get_queryset() - view.queryset = ObjectPermissionReaderFilter().filter_queryset(request, queryset, view) - return super(DjangoObjectLevelModelPermissions, self).has_permission(request, view) - def has_object_permission(self, request, view, obj): model_cls = getattr(view, 'model', None) queryset = getattr(view, 'queryset', None) From f5c34926d6a4b4b29fb083d25b99b10d7431eee4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 9 Sep 2013 20:41:54 +0100 Subject: [PATCH 0150/1652] Update release-notes.md --- docs/topics/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 708aef388..1f363310d 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,6 +42,7 @@ You can determine your currently installed version using `pip freeze`: ### Master +* Support customizable exception handling, using the `EXCEPTION_HANDLER` setting. * Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. * Added `MAX_PAGINATE_BY` setting and `max_paginate_by` generic view attribute. * Added `cache` attribute to throttles to allow overriding of default cache. From 222c1d1122b13940fa6072a1dfb89b25491ee6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ociepka?= Date: Tue, 10 Sep 2013 12:02:14 +0200 Subject: [PATCH 0151/1652] Add order_by to the AutoFilterSet `AutoFilterSet` should contains `order_by` set to all by default. --- rest_framework/filters.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 4079e1bd5..1e58d173d 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -53,6 +53,7 @@ class DjangoFilterBackend(BaseFilterBackend): class Meta: model = queryset.model fields = filter_fields + order_by = True return AutoFilterSet return None From 5970baa20112921217ae4f2c2a9f175df25922db Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 10 Sep 2013 21:00:13 +0100 Subject: [PATCH 0152/1652] Tweaks and docs to object-level model permissions. --- docs/api-guide/filtering.md | 46 +++++ docs/api-guide/permissions.md | 18 +- rest_framework/filters.py | 37 ++-- rest_framework/permissions.py | 47 +++-- rest_framework/tests/test_permissions.py | 217 +++++++++++++---------- 5 files changed, 235 insertions(+), 130 deletions(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 649462da7..859e8d52a 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -257,6 +257,49 @@ The `ordering` attribute may be either a string or a list/tuple of strings. --- +## DjangoObjectPermissionsFilter + +The `DjangoObjectPermissionsFilter` is intended to be used together with the [`django-guardian`][guardian] package, with custom `'view'` permissions added. The filter will ensure that querysets only returns objects for which the user has the appropriate view permission. + +This filter class must be used with views that provide either a `queryset` or a `model` attribute. + +If you're using `DjangoObjectPermissionsFilter`, you'll probably also want to add an appropriate object permissions class, to ensure that users can only operate on instances if they have the appropriate object permissions. The easiest way to do this is to subclass `DjangoObjectPermissions` and add `'view'` permissions to the `perms_map` attribute. + +A complete example using both `DjangoObjectPermissionsFilter` and `DjangoObjectPermissions` might look something like this. + +**permissions.py**: + + class CustomObjectPermissions(permissions.DjangoObjectPermissions): + """ + Similar to `DjangoObjectPermissions`, but adding 'view' permissions. + """ + perms_map = { + 'GET': ['%(app_label)s.view_%(model_name)s'], + 'OPTIONS': ['%(app_label)s.view_%(model_name)s'], + 'HEAD': ['%(app_label)s.view_%(model_name)s'], + 'POST': ['%(app_label)s.add_%(model_name)s'], + 'PUT': ['%(app_label)s.change_%(model_name)s'], + 'PATCH': ['%(app_label)s.change_%(model_name)s'], + 'DELETE': ['%(app_label)s.delete_%(model_name)s'], + } + +**views.py**: + + class EventViewSet(viewsets.ModelViewSet): + """ + Viewset that only lists events if user has 'view' permissions, and only + allows operations on individual events if user has appropriate 'view', 'add', + 'change' or 'delete' permissions. + """ + queryset = Event.objects.all() + serializer = EventSerializer + filter_backends = (filters.DjangoObjectPermissionsFilter,) + permission_classes = (myapp.permissions.CustomObjectPermissions,) + +For more information on adding `'view'` permissions for models, see the [relevant section][view-permissions] of the `django-guardian` documentation, and [this blogpost][view-permissions-blogpost]. + +--- + # Custom generic filtering You can also provide your own generic filtering backend, or write an installable app for other developers to use. @@ -281,5 +324,8 @@ We could achieve the same behavior by overriding `get_queryset()` on the views, [cite]: https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-specific-objects-with-filters [django-filter]: https://github.com/alex/django-filter [django-filter-docs]: https://django-filter.readthedocs.org/en/latest/index.html +[guardian]: http://pythonhosted.org/django-guardian/ +[view-permissions]: http://pythonhosted.org/django-guardian/userguide/assign.html +[view-permissions-blogpost]: http://blog.nyaruka.com/adding-a-view-permission-to-django-models [nullbooleanselect]: https://github.com/django/django/blob/master/django/forms/widgets.py [search-django-admin]: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#django.contrib.admin.ModelAdmin.search_fields diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index a7bf15556..871de84ec 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -120,7 +120,21 @@ To use custom model permissions, override `DjangoModelPermissions` and set the ` ## DjangoModelPermissionsOrAnonReadOnly -Similar to `DjangoModelPermissions`, but also allows unauthenticated users to have read-only access to the API. +Similar to `DjangoModelPermissions`, but also allows unauthenticated users to have read-only access to the API. + +## DjangoObjectPermissions + +This permission class ties into Django's standard [object permissions framework][objectpermissions] that allows per-object permissions on models. In order to use this permission class, you'll also need to add a permission backend that supports object-level permissions, such as [django-guardian][guardian]. + +When applied to a view that has a `.model` property, authorization will only be granted if the user *is authenticated* and has the *relevant per-object permissions* and *relevant model permissions* assigned. + +* `POST` requests require the user to have the `add` permission on the model instance. +* `PUT` and `PATCH` requests require the user to have the `change` permission on the model instance. +* `DELETE` requests require the user to have the `delete` permission on the model instance. + +Note that `DjangoObjectPermissions` **does not** require the `django-guardian` package, and should support other object-level backends equally well. + +As with `DjangoModelPermissions` you can use custom model permissions by overriding `DjangoModelPermissions` and setting the `.perms_map` property. Refer to the source code for details. Note that if you add a custom `view` permission for `GET`, `HEAD` and `OPTIONS` requests, you'll probably also want to consider adding the `DjangoObjectPermissionsFilter` class to ensure that list endpoints only return results including objects for which the user has appropriate view permissions. ## TokenHasReadWriteScope @@ -220,7 +234,9 @@ The [Composed Permissions][composed-permissions] package provides a simple way t [authentication]: authentication.md [throttling]: throttling.md [contribauth]: https://docs.djangoproject.com/en/1.0/topics/auth/#permissions +[objectpermissions]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#handling-object-permissions [guardian]: https://github.com/lukaszb/django-guardian +[get_objects_for_user]: http://pythonhosted.org/django-guardian/api/guardian.shortcuts.html#get-objects-for-user [django-oauth-plus]: http://code.larlet.fr/django-oauth-plus [django-oauth2-provider]: https://github.com/caffeinehit/django-oauth2-provider [2.2-announcement]: ../topics/2.2-announcement.md diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 6d46ad233..1693bcd24 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -23,22 +23,6 @@ class BaseFilterBackend(object): raise NotImplementedError(".filter_queryset() must be overridden.") -class ObjectPermissionReaderFilter(BaseFilterBackend): - """ - A filter backend that limits results to those where the requesting user - has read object level permissions. - """ - def __init__(self): - assert guardian, 'Using ObjectPermissionReaderFilter, but django-guardian is not installed' - - def filter_queryset(self, request, queryset, view): - user = request.user - model_cls = queryset.model - model_name = model_cls._meta.module_name - permission = 'read_' + model_name - return guardian.shortcuts.get_objects_for_user(user, permission, queryset) - - class DjangoFilterBackend(BaseFilterBackend): """ A filter backend that uses django-filter. @@ -156,3 +140,24 @@ class OrderingFilter(BaseFilterBackend): return queryset.order_by(*ordering) return queryset + + +class DjangoObjectPermissionsFilter(BaseFilterBackend): + """ + A filter backend that limits results to those where the requesting user + has read object level permissions. + """ + def __init__(self): + assert guardian, 'Using DjangoObjectPermissionsFilter, but django-guardian is not installed' + + perm_format = '%(app_label)s.view_%(model_name)s' + + def filter_queryset(self, request, queryset, view): + user = request.user + model_cls = queryset.model + kwargs = { + 'app_label': model_cls._meta.app_label, + 'model_name': model_cls._meta.module_name + } + permission = self.perm_format % kwargs + return guardian.shortcuts.get_objects_for_user(user, permission, queryset) diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 70bf9c61e..531847988 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -152,10 +152,10 @@ class DjangoModelPermissionsOrAnonReadOnly(DjangoModelPermissions): authenticated_users_only = False -class DjangoObjectLevelModelPermissions(DjangoModelPermissions): +class DjangoObjectPermissions(DjangoModelPermissions): """ - The request is authenticated using `django.contrib.auth` permissions. - See: https://docs.djangoproject.com/en/dev/topics/auth/#permissions + The request is authenticated using Django's object-level permissions. + It requires an object-permissions-enabled backend, such as Django Guardian. It ensures that the user is authenticated, and has the appropriate `add`/`change`/`delete` permissions on the object using .has_perms. @@ -164,21 +164,22 @@ class DjangoObjectLevelModelPermissions(DjangoModelPermissions): provide a `.model` or `.queryset` attribute. """ - actions_map = { - 'GET': ['read_%(model_name)s'], - 'OPTIONS': ['read_%(model_name)s'], - 'HEAD': ['read_%(model_name)s'], - 'POST': ['add_%(model_name)s'], - 'PUT': ['change_%(model_name)s'], - 'PATCH': ['change_%(model_name)s'], - 'DELETE': ['delete_%(model_name)s'], + perms_map = { + 'GET': [], + 'OPTIONS': [], + 'HEAD': [], + 'POST': ['%(app_label)s.add_%(model_name)s'], + 'PUT': ['%(app_label)s.change_%(model_name)s'], + 'PATCH': ['%(app_label)s.change_%(model_name)s'], + 'DELETE': ['%(app_label)s.delete_%(model_name)s'], } def get_required_object_permissions(self, method, model_cls): kwargs = { + 'app_label': model_cls._meta.app_label, 'model_name': model_cls._meta.module_name } - return [perm % kwargs for perm in self.actions_map[method]] + return [perm % kwargs for perm in self.perms_map[method]] def has_object_permission(self, request, view, obj): model_cls = getattr(view, 'model', None) @@ -190,10 +191,24 @@ class DjangoObjectLevelModelPermissions(DjangoModelPermissions): perms = self.get_required_object_permissions(request.method, model_cls) user = request.user - check = user.has_perms(perms, obj) - if not check: - raise Http404 - return user.has_perms(perms, obj) + if not user.has_perms(perms, obj): + # If the user does not have permissions we need to determine if + # they have read permissions to see 403, or not, and simply see + # a 404 reponse. + + if request.method in ('GET', 'OPTIONS', 'HEAD'): + # Read permissions already checked and failed, no need + # to make another lookup. + raise Http404 + + read_perms = self.get_required_object_permissions('GET', model_cls) + if not user.has_perms(read_perms, obj): + raise Http404 + + # Has read permissions. + return False + + return True class TokenHasReadWriteScope(BasePermission): diff --git a/rest_framework/tests/test_permissions.py b/rest_framework/tests/test_permissions.py index 2d866cd09..d08124f48 100644 --- a/rest_framework/tests/test_permissions.py +++ b/rest_framework/tests/test_permissions.py @@ -2,9 +2,10 @@ from __future__ import unicode_literals from django.contrib.auth.models import User, Permission, Group from django.db import models from django.test import TestCase +from django.utils import unittest from rest_framework import generics, status, permissions, authentication, HTTP_HEADER_ENCODING from rest_framework.compat import guardian -from rest_framework.filters import ObjectPermissionReaderFilter +from rest_framework.filters import DjangoObjectPermissionsFilter from rest_framework.test import APIRequestFactory from rest_framework.tests.models import BasicModel import base64 @@ -148,130 +149,152 @@ class BasicPermModel(models.Model): class Meta: app_label = 'tests' permissions = ( - ('read_basicpermmodel', 'Can view basic perm model'), + ('view_basicpermmodel', 'Can view basic perm model'), # add, change, delete built in to django ) +# Custom object-level permission, that includes 'view' permissions +class ViewObjectPermissions(permissions.DjangoObjectPermissions): + perms_map = { + 'GET': ['%(app_label)s.view_%(model_name)s'], + 'OPTIONS': ['%(app_label)s.view_%(model_name)s'], + 'HEAD': ['%(app_label)s.view_%(model_name)s'], + 'POST': ['%(app_label)s.add_%(model_name)s'], + 'PUT': ['%(app_label)s.change_%(model_name)s'], + 'PATCH': ['%(app_label)s.change_%(model_name)s'], + 'DELETE': ['%(app_label)s.delete_%(model_name)s'], + } + + class ObjectPermissionInstanceView(generics.RetrieveUpdateDestroyAPIView): model = BasicPermModel authentication_classes = [authentication.BasicAuthentication] - permission_classes = [permissions.DjangoObjectLevelModelPermissions] + permission_classes = [ViewObjectPermissions] object_permissions_view = ObjectPermissionInstanceView.as_view() + class ObjectPermissionListView(generics.ListAPIView): model = BasicPermModel authentication_classes = [authentication.BasicAuthentication] - permission_classes = [permissions.DjangoObjectLevelModelPermissions] + permission_classes = [ViewObjectPermissions] object_permissions_list_view = ObjectPermissionListView.as_view() -if guardian: - from guardian.shortcuts import assign_perm - class ObjectPermissionsIntegrationTests(TestCase): - """ - Integration tests for the object level permissions API. - """ - @classmethod - def setUpClass(cls): - # create users - create = User.objects.create_user - users = { - 'fullaccess': create('fullaccess', 'fullaccess@example.com', 'password'), - 'readonly': create('readonly', 'readonly@example.com', 'password'), - 'writeonly': create('writeonly', 'writeonly@example.com', 'password'), - 'deleteonly': create('deleteonly', 'deleteonly@example.com', 'password'), - } +@unittest.skipUnless(guardian, 'django-guardian not installed') +class ObjectPermissionsIntegrationTests(TestCase): + """ + Integration tests for the object level permissions API. + """ + @classmethod + def setUpClass(cls): + from guardian.shortcuts import assign_perm - # give everyone model level permissions, as we are not testing those - everyone = Group.objects.create(name='everyone') - model_name = BasicPermModel._meta.module_name - app_label = BasicPermModel._meta.app_label - f = '{0}_{1}'.format - perms = { - 'read': f('read', model_name), - 'change': f('change', model_name), - 'delete': f('delete', model_name) - } - for perm in perms.values(): - perm = '{0}.{1}'.format(app_label, perm) - assign_perm(perm, everyone) - everyone.user_set.add(*users.values()) + # create users + create = User.objects.create_user + users = { + 'fullaccess': create('fullaccess', 'fullaccess@example.com', 'password'), + 'readonly': create('readonly', 'readonly@example.com', 'password'), + 'writeonly': create('writeonly', 'writeonly@example.com', 'password'), + 'deleteonly': create('deleteonly', 'deleteonly@example.com', 'password'), + } - cls.perms = perms - cls.users = users + # give everyone model level permissions, as we are not testing those + everyone = Group.objects.create(name='everyone') + model_name = BasicPermModel._meta.module_name + app_label = BasicPermModel._meta.app_label + f = '{0}_{1}'.format + perms = { + 'view': f('view', model_name), + 'change': f('change', model_name), + 'delete': f('delete', model_name) + } + for perm in perms.values(): + perm = '{0}.{1}'.format(app_label, perm) + assign_perm(perm, everyone) + everyone.user_set.add(*users.values()) - def setUp(self): - perms = self.perms - users = self.users + cls.perms = perms + cls.users = users - # appropriate object level permissions - readers = Group.objects.create(name='readers') - writers = Group.objects.create(name='writers') - deleters = Group.objects.create(name='deleters') + def setUp(self): + from guardian.shortcuts import assign_perm + perms = self.perms + users = self.users - model = BasicPermModel.objects.create(text='foo') - - assign_perm(perms['read'], readers, model) - assign_perm(perms['change'], writers, model) - assign_perm(perms['delete'], deleters, model) + # appropriate object level permissions + readers = Group.objects.create(name='readers') + writers = Group.objects.create(name='writers') + deleters = Group.objects.create(name='deleters') - readers.user_set.add(users['fullaccess'], users['readonly']) - writers.user_set.add(users['fullaccess'], users['writeonly']) - deleters.user_set.add(users['fullaccess'], users['deleteonly']) + model = BasicPermModel.objects.create(text='foo') + + assign_perm(perms['view'], readers, model) + assign_perm(perms['change'], writers, model) + assign_perm(perms['delete'], deleters, model) - self.credentials = {} - for user in users.values(): - self.credentials[user.username] = basic_auth_header(user.username, 'password') + readers.user_set.add(users['fullaccess'], users['readonly']) + writers.user_set.add(users['fullaccess'], users['writeonly']) + deleters.user_set.add(users['fullaccess'], users['deleteonly']) - # Delete - def test_can_delete_permissions(self): - request = factory.delete('/1', HTTP_AUTHORIZATION=self.credentials['deleteonly']) - response = object_permissions_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) + self.credentials = {} + for user in users.values(): + self.credentials[user.username] = basic_auth_header(user.username, 'password') - def test_cannot_delete_permissions(self): - request = factory.delete('/1', HTTP_AUTHORIZATION=self.credentials['readonly']) - response = object_permissions_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + # Delete + def test_can_delete_permissions(self): + request = factory.delete('/1', HTTP_AUTHORIZATION=self.credentials['deleteonly']) + response = object_permissions_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) - # Update - def test_can_update_permissions(self): - request = factory.patch('/1', {'text': 'foobar'}, format='json', - HTTP_AUTHORIZATION=self.credentials['writeonly']) - response = object_permissions_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data.get('text'), 'foobar') + def test_cannot_delete_permissions(self): + request = factory.delete('/1', HTTP_AUTHORIZATION=self.credentials['readonly']) + response = object_permissions_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - def test_cannot_update_permissions(self): - request = factory.patch('/1', {'text': 'foobar'}, format='json', - HTTP_AUTHORIZATION=self.credentials['deleteonly']) - response = object_permissions_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + # Update + def test_can_update_permissions(self): + request = factory.patch('/1', {'text': 'foobar'}, format='json', + HTTP_AUTHORIZATION=self.credentials['writeonly']) + response = object_permissions_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data.get('text'), 'foobar') - # Read - def test_can_read_permissions(self): - request = factory.get('/1', HTTP_AUTHORIZATION=self.credentials['readonly']) - response = object_permissions_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_200_OK) + def test_cannot_update_permissions(self): + request = factory.patch('/1', {'text': 'foobar'}, format='json', + HTTP_AUTHORIZATION=self.credentials['deleteonly']) + response = object_permissions_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) - def test_cannot_read_permissions(self): - request = factory.get('/1', HTTP_AUTHORIZATION=self.credentials['writeonly']) - response = object_permissions_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + def test_cannot_update_permissions_non_existing(self): + request = factory.patch('/999', {'text': 'foobar'}, format='json', + HTTP_AUTHORIZATION=self.credentials['deleteonly']) + response = object_permissions_view(request, pk='999') + self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) - # Read list - def test_can_read_list_permissions(self): - request = factory.get('/', HTTP_AUTHORIZATION=self.credentials['readonly']) - object_permissions_list_view.cls.filter_backends = (ObjectPermissionReaderFilter,) - response = object_permissions_list_view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data[0].get('id'), 1) + # Read + def test_can_read_permissions(self): + request = factory.get('/1', HTTP_AUTHORIZATION=self.credentials['readonly']) + response = object_permissions_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_200_OK) - def test_cannot_read_list_permissions(self): - request = factory.get('/', HTTP_AUTHORIZATION=self.credentials['writeonly']) - object_permissions_list_view.cls.filter_backends = (ObjectPermissionReaderFilter,) - response = object_permissions_list_view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertListEqual(response.data, []) \ No newline at end of file + def test_cannot_read_permissions(self): + request = factory.get('/1', HTTP_AUTHORIZATION=self.credentials['writeonly']) + response = object_permissions_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + + # Read list + def test_can_read_list_permissions(self): + request = factory.get('/', HTTP_AUTHORIZATION=self.credentials['readonly']) + object_permissions_list_view.cls.filter_backends = (DjangoObjectPermissionsFilter,) + response = object_permissions_list_view(request) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data[0].get('id'), 1) + + def test_cannot_read_list_permissions(self): + request = factory.get('/', HTTP_AUTHORIZATION=self.credentials['writeonly']) + object_permissions_list_view.cls.filter_backends = (DjangoObjectPermissionsFilter,) + response = object_permissions_list_view(request) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertListEqual(response.data, []) From 101da4581083d75636b24c50638e7f288d1fe240 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 10 Sep 2013 21:06:42 +0100 Subject: [PATCH 0153/1652] Updated release notes --- docs/topics/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 1f363310d..ff3dae097 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,6 +42,7 @@ You can determine your currently installed version using `pip freeze`: ### Master +* Added `DjangoObjectPermissions`, and `DjangoObjectPermissionsFilter`. * Support customizable exception handling, using the `EXCEPTION_HANDLER` setting. * Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. * Added `MAX_PAGINATE_BY` setting and `max_paginate_by` generic view attribute. From a1d7ed20d256730492659f6ba6193faf1f12a581 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 10 Sep 2013 21:06:53 +0100 Subject: [PATCH 0154/1652] Add Django Guardian to travis testing --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6a4532411..d12479e9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ install: - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211 --use-mirrors; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.0 --use-mirrors; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4 --use-mirrors; fi" + - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-guardian==1.1.1 --use-mirrors; fi" - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi" - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.6 --use-mirrors; fi" - export PYTHONPATH=. From e021472a1667c4902000bb40e0c19f64160b1584 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 10 Sep 2013 21:07:20 +0100 Subject: [PATCH 0155/1652] Added @bwreilly for awesome work on #1093. Thanks!!! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 07e2ec47d..8269580ef 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -167,6 +167,7 @@ The following people have helped make REST framework great. * Andrey Antukh - [niwibe] * Mathieu Pillard - [diox] * Edmond Wong - [edmondwong] +* Ben Reilly - [bwreilly] Many thanks to everyone who's contributed to the project. @@ -370,3 +371,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [niwibe]: https://github.com/niwibe [diox]: https://github.com/diox [edmondwong]: https://github.com/edmondwong +[bwreilly]: https://github.com/bwreilly From 195790e60b117eff421eb8f04a9f9f3527e797b8 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 11 Sep 2013 09:09:30 +0100 Subject: [PATCH 0156/1652] Version 2.3.8 --- docs/topics/release-notes.md | 4 +++- rest_framework/__init__.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index ff3dae097..3b35d9ed6 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,7 +40,9 @@ You can determine your currently installed version using `pip freeze`: ## 2.3.x series -### Master +### 2.3.8 + +**Date**: 11th September 2013 * Added `DjangoObjectPermissions`, and `DjangoObjectPermissionsFilter`. * Support customizable exception handling, using the `EXCEPTION_HANDLER` setting. diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 087808e0b..2bd2991ba 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -1,4 +1,4 @@ -__version__ = '2.3.7' +__version__ = '2.3.8' VERSION = __version__ # synonym From 2a6a2013df4fcb8e09425e9fa758b91b3a23b751 Mon Sep 17 00:00:00 2001 From: Diego Ponciano Date: Wed, 11 Sep 2013 17:25:57 -0300 Subject: [PATCH 0157/1652] small typo correction on ViewSet example code --- docs/api-guide/viewsets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 2e65b7a43..1062cb32c 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -23,7 +23,7 @@ Let's define a simple viewset that can be used to list or retrieve all the users from django.shortcuts import get_object_or_404 from myapps.serializers import UserSerializer from rest_framework import viewsets - from rest_framewor.responses import Response + from rest_framework.response import Response class UserViewSet(viewsets.ViewSet): """ From 59cce01b3359aa009e697a99eabbf2ef322b28e2 Mon Sep 17 00:00:00 2001 From: Philip Douglas Date: Thu, 12 Sep 2013 16:03:20 +0100 Subject: [PATCH 0158/1652] Fix error when serializer gets files but no data --- rest_framework/serializers.py | 2 +- rest_framework/tests/test_files.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index a63c7f6c2..778e72d1a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -156,7 +156,7 @@ class BaseSerializer(WritableField): self.context = context or {} - self.init_data = data + self.init_data = data or {} self.init_files = files self.object = instance self.fields = self.get_fields() diff --git a/rest_framework/tests/test_files.py b/rest_framework/tests/test_files.py index c13c38b86..127e379e9 100644 --- a/rest_framework/tests/test_files.py +++ b/rest_framework/tests/test_files.py @@ -80,3 +80,16 @@ class FileSerializerTests(TestCase): serializer = UploadedFileSerializer(data={'created': now, 'file': 'abc'}) self.assertFalse(serializer.is_valid()) self.assertEqual(serializer.errors, {'file': [errmsg]}) + + def test_validation_with_no_data(self): + """ + Validation should still function when no data dictionary is provided. + """ + now = datetime.datetime.now() + file = BytesIO(six.b('stuff')) + file.name = 'stuff.txt' + file.size = len(file.getvalue()) + uploaded_file = UploadedFile(file=file, created=now) + + serializer = UploadedFileSerializer(files={'file': file}) + self.assertFalse(serializer.is_valid()) \ No newline at end of file From 6e4bdb55969171c87296aba9711dbc77f8a1e366 Mon Sep 17 00:00:00 2001 From: Philip Douglas Date: Thu, 12 Sep 2013 16:04:33 +0100 Subject: [PATCH 0159/1652] Add missing newline at the end of test file --- rest_framework/tests/test_files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/tests/test_files.py b/rest_framework/tests/test_files.py index 127e379e9..78f4cf425 100644 --- a/rest_framework/tests/test_files.py +++ b/rest_framework/tests/test_files.py @@ -92,4 +92,4 @@ class FileSerializerTests(TestCase): uploaded_file = UploadedFile(file=file, created=now) serializer = UploadedFileSerializer(files={'file': file}) - self.assertFalse(serializer.is_valid()) \ No newline at end of file + self.assertFalse(serializer.is_valid()) From dfc430cabaf76a1b3382a614cc692e4a52b09bcd Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 12 Sep 2013 20:27:23 +0100 Subject: [PATCH 0160/1652] Fix django guardian link --- docs/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/index.md b/docs/index.md index d83fbff1f..bb2129f6f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -251,6 +251,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [oauth2]: https://github.com/simplegeo/python-oauth2 [django-oauth-plus]: https://bitbucket.org/david/django-oauth-plus/wiki/Home [django-oauth2-provider]: https://github.com/caffeinehit/django-oauth2-provider +[django-guardian]: https://github.com/lukaszb/django-guardian [0.4]: https://github.com/tomchristie/django-rest-framework/tree/0.4.X [image]: img/quickstart.png [index]: . From 895beb89c60cea534f85b8a7749615755c4d43b5 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 12 Sep 2013 21:41:21 +0100 Subject: [PATCH 0161/1652] Note on '.model' as default only, with 'serializer_class', and 'queryset' attributes prefered. Closes #1100 --- docs/api-guide/generic-views.md | 2 +- docs/topics/writable-nested-serializers.md | 47 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 docs/topics/writable-nested-serializers.md diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 7185b6b68..dc0076dff 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -69,7 +69,7 @@ The following attributes control the basic view behavior. **Shortcuts**: -* `model` - This shortcut may be used instead of setting either (or both) of the `queryset`/`serializer_class` attributes, although using the explicit style is generally preferred. If used instead of `serializer_class`, then then `DEFAULT_MODEL_SERIALIZER_CLASS` setting will determine the base serializer class. +* `model` - This shortcut may be used instead of setting either (or both) of the `queryset`/`serializer_class` attributes, although using the explicit style is generally preferred. If used instead of `serializer_class`, then then `DEFAULT_MODEL_SERIALIZER_CLASS` setting will determine the base serializer class. Note that `model` is only ever used for generating a default queryset or serializer class - the `queryset` and `serializer_class` attributes are always preferred if provided. **Pagination**: diff --git a/docs/topics/writable-nested-serializers.md b/docs/topics/writable-nested-serializers.md new file mode 100644 index 000000000..66ea78150 --- /dev/null +++ b/docs/topics/writable-nested-serializers.md @@ -0,0 +1,47 @@ +> To save HTTP requests, it may be convenient to send related documents along with the request. +> +> — [JSON API specification for Ember Data][cite]. + +# Writable nested serializers + +Although flat data structures serve to properly delineate between the individual entities in your service, there are cases where it may be more appropriate or convenient to use nested data structures. + +Nested data structures are easy enough to work with if they're read-only - simply nest your serializer classes and you're good to go. However, there are a few more subtleties to using writable nested serializers, due to the dependancies between the various model instances, and the need to save or delete multiple instances in a single action. + +## One-to-many data structures + +*Example of a **read-only** nested serializer. Nothing complex to worry about here.* + + class ToDoItemSerializer(serializers.ModelSerializer): + class Meta: + model = ToDoItem + fields = ('text', 'is_completed') + + class ToDoListSerializer(serializers.ModelSerializer): + items = ToDoItemSerializer(many=True, read_only=True) + + class Meta: + model = ToDoList + fields = ('title', 'items') + +Some example output from our serializer. + + { + 'title': 'Leaving party preperations', + 'items': { + {'text': 'Compile playlist', 'is_completed': True}, + {'text': 'Send invites', 'is_completed': False}, + {'text': 'Clean house', 'is_completed': False} + } + } + +Let's take a look at updating our nested one-to-many data structure. + +### Validation errors + +### Adding and removing items + +### Making PATCH requests + + +[cite]: http://jsonapi.org/format/#url-based-json-api \ No newline at end of file From d489c5c88144a25ef0d61fb8deb0b77f3a061480 Mon Sep 17 00:00:00 2001 From: David Pretty Date: Fri, 13 Sep 2013 13:36:18 +1000 Subject: [PATCH 0162/1652] Let JSONEncoder handle Numpy data types. json.JSONEncoder cannot serialize Numpy data types. Numpy arrays and array scalars have a tolist() method which casts the object to a standard python data type. --- rest_framework/utils/encoders.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index b26a2085a..7efd5417b 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -42,6 +42,8 @@ class JSONEncoder(json.JSONEncoder): return str(o.total_seconds()) elif isinstance(o, decimal.Decimal): return str(o) + elif hasattr(o, 'tolist'): + return o.tolist() elif hasattr(o, '__iter__'): return [i for i in o] return super(JSONEncoder, self).default(o) From 272a6abf91c51b44781d27af5352c7e36c8fa91c Mon Sep 17 00:00:00 2001 From: Philip Douglas Date: Fri, 13 Sep 2013 10:46:24 +0100 Subject: [PATCH 0163/1652] Try a more localised fix to the data=None problem --- rest_framework/fields.py | 1 + rest_framework/serializers.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 210c2537d..0c3817b57 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -306,6 +306,7 @@ class WritableField(Field): return try: + data = data or {} if self.use_files: files = files or {} try: diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 778e72d1a..a63c7f6c2 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -156,7 +156,7 @@ class BaseSerializer(WritableField): self.context = context or {} - self.init_data = data or {} + self.init_data = data self.init_files = files self.object = instance self.fields = self.get_fields() From 0de1a1a0ad0ff96292b14d707730dc47b1943c26 Mon Sep 17 00:00:00 2001 From: Rajiv Bose Date: Fri, 13 Sep 2013 11:55:16 +0100 Subject: [PATCH 0164/1652] Typo in strings referring to Python package, django-filter. On skip of django_filters related unit-tests the reason given states the Python package 'django-filters' is not install. However, the Python package required to run django_filters related tests is 'django-filter'. --- rest_framework/tests/test_filters.py | 14 +++++++------- rest_framework/tests/test_pagination.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rest_framework/tests/test_filters.py b/rest_framework/tests/test_filters.py index c9d9e7ffa..379db29d8 100644 --- a/rest_framework/tests/test_filters.py +++ b/rest_framework/tests/test_filters.py @@ -113,7 +113,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): Integration tests for filtered list views. """ - @unittest.skipUnless(django_filters, 'django-filters not installed') + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_get_filtered_fields_root_view(self): """ GET requests to paginated ListCreateAPIView should return paginated results. @@ -142,7 +142,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): expected_data = [f for f in self.data if f['date'] == search_date] self.assertEqual(response.data, expected_data) - @unittest.skipUnless(django_filters, 'django-filters not installed') + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_filter_with_queryset(self): """ Regression test for #814. @@ -157,7 +157,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): expected_data = [f for f in self.data if f['decimal'] == search_decimal] self.assertEqual(response.data, expected_data) - @unittest.skipUnless(django_filters, 'django-filters not installed') + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_filter_with_get_queryset_only(self): """ Regression test for #834. @@ -168,7 +168,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): # Used to raise "issubclass() arg 2 must be a class or tuple of classes" # here when neither `model' nor `queryset' was specified. - @unittest.skipUnless(django_filters, 'django-filters not installed') + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_get_filtered_class_root_view(self): """ GET requests to filtered ListCreateAPIView that have a filter_class set @@ -216,7 +216,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): f['decimal'] < search_decimal] self.assertEqual(response.data, expected_data) - @unittest.skipUnless(django_filters, 'django-filters not installed') + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_incorrectly_configured_filter(self): """ An error should be displayed when the filter class is misconfigured. @@ -226,7 +226,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/') self.assertRaises(AssertionError, view, request) - @unittest.skipUnless(django_filters, 'django-filters not installed') + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_unknown_filter(self): """ GET requests with filters that aren't configured should return 200. @@ -248,7 +248,7 @@ class IntegrationTestDetailFiltering(CommonFilteringTestCase): def _get_url(self, item): return reverse('detail-view', kwargs=dict(pk=item.pk)) - @unittest.skipUnless(django_filters, 'django-filters not installed') + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_get_filtered_detail_view(self): """ GET requests to filtered RetrieveAPIView that have a filter_class set diff --git a/rest_framework/tests/test_pagination.py b/rest_framework/tests/test_pagination.py index 4170d4b64..d6bc7895c 100644 --- a/rest_framework/tests/test_pagination.py +++ b/rest_framework/tests/test_pagination.py @@ -122,7 +122,7 @@ class IntegrationTestPaginationAndFiltering(TestCase): for obj in self.objects.all() ] - @unittest.skipUnless(django_filters, 'django-filters not installed') + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_get_django_filter_paginated_filtered_root_view(self): """ GET requests to paginated filtered ListCreateAPIView should return From bb3261ca489104e3dea434aa11d76f370e938ca8 Mon Sep 17 00:00:00 2001 From: Tai Lee Date: Fri, 13 Sep 2013 22:51:11 +1000 Subject: [PATCH 0165/1652] Fixed #1105 -- Add hook for custom context in `BrowsableAPIRenderer`. Replace hard coded response status check with `allow_form` context variable, so that it can be overridden in a custom renderer class. --- rest_framework/renderers.py | 47 +++++++++---------- .../templates/rest_framework/base.html | 2 +- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index fca67eeeb..6597123f8 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -564,9 +564,9 @@ class BrowsableAPIRenderer(BaseRenderer): def get_breadcrumbs(self, request): return get_breadcrumbs(request.path) - def render(self, data, accepted_media_type=None, renderer_context=None): + def get_context(self, data, accepted_media_type, renderer_context): """ - Render the HTML for the browsable API representation. + Returns the context used to render. """ self.accepted_media_type = accepted_media_type or '' self.renderer_context = renderer_context or {} @@ -576,55 +576,52 @@ class BrowsableAPIRenderer(BaseRenderer): response = renderer_context['response'] renderer = self.get_default_renderer(view) - content = self.get_content(renderer, data, accepted_media_type, renderer_context) - - put_form = self.get_rendered_html_form(view, 'PUT', request) - post_form = self.get_rendered_html_form(view, 'POST', request) - patch_form = self.get_rendered_html_form(view, 'PATCH', request) - delete_form = self.get_rendered_html_form(view, 'DELETE', request) - options_form = self.get_rendered_html_form(view, 'OPTIONS', request) raw_data_put_form = self.get_raw_data_form(view, 'PUT', request) - raw_data_post_form = self.get_raw_data_form(view, 'POST', request) raw_data_patch_form = self.get_raw_data_form(view, 'PATCH', request) raw_data_put_or_patch_form = raw_data_put_form or raw_data_patch_form - name = self.get_name(view) - description = self.get_description(view) - breadcrumb_list = self.get_breadcrumbs(request) - - template = loader.get_template(self.template) context = RequestContext(request, { - 'content': content, + 'content': self.get_content(renderer, data, accepted_media_type, renderer_context), 'view': view, 'request': request, 'response': response, - 'description': description, - 'name': name, + 'description': self.get_description(view), + 'name': self.get_name(view), 'version': VERSION, - 'breadcrumblist': breadcrumb_list, + 'breadcrumblist': self.get_breadcrumbs(request), 'allowed_methods': view.allowed_methods, 'available_formats': [renderer.format for renderer in view.renderer_classes], - 'put_form': put_form, - 'post_form': post_form, - 'patch_form': patch_form, - 'delete_form': delete_form, - 'options_form': options_form, + 'put_form': self.get_rendered_html_form(view, 'PUT', request), + 'post_form': self.get_rendered_html_form(view, 'POST', request), + 'patch_form': self.get_rendered_html_form(view, 'PATCH', request), + 'delete_form': self.get_rendered_html_form(view, 'DELETE', request), + 'options_form': self.get_rendered_html_form(view, 'OPTIONS', request), 'raw_data_put_form': raw_data_put_form, - 'raw_data_post_form': raw_data_post_form, + 'raw_data_post_form': self.get_raw_data_form(view, 'POST', request), 'raw_data_patch_form': raw_data_patch_form, 'raw_data_put_or_patch_form': raw_data_put_or_patch_form, + 'allow_form': bool(response.status_code != 403), + 'api_settings': api_settings }) + return context + def render(self, data, accepted_media_type=None, renderer_context=None): + """ + Render the HTML for the browsable API representation. + """ + template = loader.get_template(self.template) + context = self.get_context(data, accepted_media_type, renderer_context) ret = template.render(context) # Munge DELETE Response code to allow us to return content # (Do this *after* we've rendered the template so that we include # the normal deletion response code in the output) + response = renderer_context['response'] if response.status_code == status.HTTP_204_NO_CONTENT: response.status_code = status.HTTP_200_OK diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index aa90e90c4..88e58deb0 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -122,7 +122,7 @@
    - {% if response.status_code != 403 %} + {% if allow_form %} {% if post_form or raw_data_post_form %}
    From a9dbd46c9470003a1dd41e66a113d50b0217a110 Mon Sep 17 00:00:00 2001 From: Tai Lee Date: Sat, 14 Sep 2013 00:54:44 +1000 Subject: [PATCH 0166/1652] Refs #1109 -- Update docs. Integrate changes from feedback. --- docs/topics/browsable-api.md | 3 +++ rest_framework/renderers.py | 13 +++++++------ rest_framework/templates/rest_framework/base.html | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/topics/browsable-api.md b/docs/topics/browsable-api.md index b2c78f3c6..e32db6958 100644 --- a/docs/topics/browsable-api.md +++ b/docs/topics/browsable-api.md @@ -115,6 +115,7 @@ The context that's available to the template: * `name` : The name of the resource * `post_form` : A form instance for use by the POST form (if allowed) * `put_form` : A form instance for use by the PUT form (if allowed) +* `display_edit_forms` : A boolean indicating whether or not POST, PUT and PATCH forms will be displayed * `request` : The request object * `response` : The response object * `version` : The version of Django REST Framework @@ -122,6 +123,8 @@ The context that's available to the template: * `FORMAT_PARAM` : The view can accept a format override * `METHOD_PARAM` : The view can accept a method override +You can override the `BrowsableAPIRenderer.get_context()` method to customise the context that gets passed to the template. + #### Not using base.html For more advanced customization, such as not having a Bootstrap basis or tighter integration with the rest of your site, you can simply choose not to have `api.html` extend `base.html`. Then the page content and capabilities are entirely up to you. diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 6597123f8..2ce51e97b 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -568,9 +568,6 @@ class BrowsableAPIRenderer(BaseRenderer): """ Returns the context used to render. """ - self.accepted_media_type = accepted_media_type or '' - self.renderer_context = renderer_context or {} - view = renderer_context['view'] request = renderer_context['request'] response = renderer_context['response'] @@ -581,7 +578,7 @@ class BrowsableAPIRenderer(BaseRenderer): raw_data_patch_form = self.get_raw_data_form(view, 'PATCH', request) raw_data_put_or_patch_form = raw_data_put_form or raw_data_patch_form - context = RequestContext(request, { + context = { 'content': self.get_content(renderer, data, accepted_media_type, renderer_context), 'view': view, 'request': request, @@ -604,18 +601,22 @@ class BrowsableAPIRenderer(BaseRenderer): 'raw_data_patch_form': raw_data_patch_form, 'raw_data_put_or_patch_form': raw_data_put_or_patch_form, - 'allow_form': bool(response.status_code != 403), + 'display_edit_forms': bool(response.status_code != 403), 'api_settings': api_settings - }) + } return context def render(self, data, accepted_media_type=None, renderer_context=None): """ Render the HTML for the browsable API representation. """ + self.accepted_media_type = accepted_media_type or '' + self.renderer_context = renderer_context or {} + template = loader.get_template(self.template) context = self.get_context(data, accepted_media_type, renderer_context) + context = RequestContext(renderer_context['request'], context) ret = template.render(context) # Munge DELETE Response code to allow us to return content diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 88e58deb0..2776d5500 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -122,7 +122,7 @@
    - {% if allow_form %} + {% if display_edit_forms %} {% if post_form or raw_data_post_form %}
    From d75ecb3d69d01849685864341c89d59e6a3121cd Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 13 Sep 2013 19:40:58 +0100 Subject: [PATCH 0167/1652] Added @mrmachine. Thanks! For work on #1109. --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 8269580ef..4483f1707 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -168,6 +168,7 @@ The following people have helped make REST framework great. * Mathieu Pillard - [diox] * Edmond Wong - [edmondwong] * Ben Reilly - [bwreilly] +* Tai Lee - [mrmachine] Many thanks to everyone who's contributed to the project. @@ -372,3 +373,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [diox]: https://github.com/diox [edmondwong]: https://github.com/edmondwong [bwreilly]: https://github.com/bwreilly +[mrmachine]: https://github.com/mrmachine From e8c6cd5622f62fcf2d4cf2b28b504fe5ff5228f9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 13 Sep 2013 19:43:15 +0100 Subject: [PATCH 0168/1652] Update release notes. --- docs/topics/release-notes.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 3b35d9ed6..e4294ae33 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,11 @@ You can determine your currently installed version using `pip freeze`: ## 2.3.x series +### Master + +* Added JSON renderer support for numpy scalars. +* Added `get_context` hook in `BrowsableAPIRenderer`. + ### 2.3.8 **Date**: 11th September 2013 From b74c5235c509738c7afea0be0dd8283bb8339ebe Mon Sep 17 00:00:00 2001 From: Colin Huang Date: Sun, 15 Sep 2013 21:56:43 -0700 Subject: [PATCH 0169/1652] [Add]: CustomValidationTests.test_partial_update This test is to make sure that validate_ is not called when partial=True and is not found in .data. --- rest_framework/tests/test_serializer.py | 27 +++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index c24976603..9792685ec 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -496,6 +496,33 @@ class CustomValidationTests(TestCase): self.assertFalse(serializer.is_valid()) self.assertEqual(serializer.errors, {'email': ['Enter a valid email address.']}) + def test_partial_update(self): + """ + Make sure that validate_email isn't called when partial=True and email + isn't found in data. + """ + initial_data = { + 'email': 'tom@example.com', + 'content': 'A test comment', + 'created': datetime.datetime(2012, 1, 1) + } + + serializer = self.CommentSerializerWithFieldValidator(data=initial_data) + self.assertEqual(serializer.is_valid(), True) + instance = serializer.object + + new_content = 'An *updated* test comment' + partial_data = { + 'content': new_content + } + + serializer = self.CommentSerializerWithFieldValidator(instance=instance, + data=partial_data, + partial=True) + self.assertEqual(serializer.is_valid(), True) + instance = serializer.object + self.assertEqual(instance.content, new_content) + class PositiveIntegerAsChoiceTests(TestCase): def test_positive_integer_in_json_is_correctly_parsed(self): From 3d8fad04446110db93ed2a13866e91beb9604934 Mon Sep 17 00:00:00 2001 From: Braulio Soncco Date: Wed, 18 Sep 2013 00:33:05 -0500 Subject: [PATCH 0170/1652] Fixing simple typo --- docs/tutorial/2-requests-and-responses.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 30966a106..6ff97f37d 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -147,7 +147,7 @@ Similarly, we can control the format of the request that we send, using the `Con # POST using form data curl -X POST http://127.0.0.1:8000/snippets/ -d "code=print 123" - {"id": 3, "title": "", "code": "123", "linenos": false, "language": "python", "style": "friendly"} + {"id": 3, "title": "", "code": "print 123", "linenos": false, "language": "python", "style": "friendly"} # POST using JSON curl -X POST http://127.0.0.1:8000/snippets/ -d '{"code": "print 456"}' -H "Content-Type: application/json" From f07a4f4ca3812fbe45d698e4ba0f9ff9099b6887 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Fri, 20 Sep 2013 14:10:16 +0200 Subject: [PATCH 0171/1652] Clear cached serializer data on `save()` + test. Fixes #1116. --- rest_framework/serializers.py | 3 +++ rest_framework/tests/test_serializer.py | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index a63c7f6c2..8d2e0feb8 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -518,6 +518,9 @@ class BaseSerializer(WritableField): """ Save the deserialized object and return it. """ + # Clear cached _data, which may be invalidated by `save()` + self._data = None + if isinstance(self.object, list): [self.save_object(item, **kwargs) for item in self.object] diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index c24976603..43d244119 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import models from django.db.models.fields import BLANK_CHOICE_DASH @@ -136,6 +137,7 @@ class BasicTests(TestCase): 'Happy new year!', datetime.datetime(2012, 1, 1) ) + self.actionitem = ActionItem(title='Some to do item',) self.data = { 'email': 'tom@example.com', 'content': 'Happy new year!', @@ -264,6 +266,20 @@ class BasicTests(TestCase): """ self.assertRaises(AssertionError, PersonSerializerInvalidReadOnly, []) + def test_serializer_data_is_cleared_on_save(self): + """ + Check _data attribute is cleared on `save()` + + Regression test for #1116 + — id field is not populated is `data` is accessed prior to `save()` + """ + serializer = ActionItemSerializer(self.actionitem) + self.assertIsNone(serializer.data.get('id',None), 'New instance. `id` should not be set.') + serializer.save() + self.assertIsNotNone(serializer.data.get('id',None), 'Model is saved. `id` should be set.') + + + class DictStyleSerializer(serializers.Serializer): """ From b82c44af48f25c0a60880b8d702caf6a74d80baa Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Fri, 20 Sep 2013 14:20:21 +0200 Subject: [PATCH 0172/1652] Correct typo in doc string. --- rest_framework/tests/test_serializer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index 43d244119..8d246b010 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -271,7 +271,7 @@ class BasicTests(TestCase): Check _data attribute is cleared on `save()` Regression test for #1116 - — id field is not populated is `data` is accessed prior to `save()` + — id field is not populated if `data` is accessed prior to `save()` """ serializer = ActionItemSerializer(self.actionitem) self.assertIsNone(serializer.data.get('id',None), 'New instance. `id` should not be set.') From de6e7accef0f144f4bcae9618604d462b1d9d321 Mon Sep 17 00:00:00 2001 From: John Mee Date: Mon, 23 Sep 2013 14:03:09 +1000 Subject: [PATCH 0173/1652] Mindnumbingly trivial single-char typo. --- docs/tutorial/quickstart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 06eec3c4e..80bb9abb4 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -85,7 +85,7 @@ Right, we'd better write some views then. Open `quickstart/views.py` and get ty queryset = Group.objects.all() serializer_class = GroupSerializer -Rather that write multiple views we're grouping together all the common behavior into classes called `ViewSets`. +Rather than write multiple views we're grouping together all the common behavior into classes called `ViewSets`. We can easily break these down into individual views if we need to, but using viewsets keeps the view logic nicely organized as well as being very concise. From fda0c520bd3fb81c7eec06da70bb7abfed519d93 Mon Sep 17 00:00:00 2001 From: Grzegorz Kapkowski Date: Mon, 23 Sep 2013 16:10:46 +0200 Subject: [PATCH 0174/1652] Match docs to current code. --- docs/api-guide/filtering.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 859e8d52a..784aa585e 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -195,9 +195,9 @@ For more details on using filter sets see the [django-filter documentation][djan ## SearchFilter -The `SearchFilterBackend` class supports simple single query parameter based searching, and is based on the [Django admin's search functionality][search-django-admin]. +The `SearchFilter` class supports simple single query parameter based searching, and is based on the [Django admin's search functionality][search-django-admin]. -The `SearchFilterBackend` class will only be applied if the view has a `search_fields` attribute set. The `search_fields` attribute should be a list of names of text type fields on the model, such as `CharField` or `TextField`. +The `SearchFilter` class will only be applied if the view has a `search_fields` attribute set. The `search_fields` attribute should be a list of names of text type fields on the model, such as `CharField` or `TextField`. class UserListView(generics.ListAPIView): queryset = User.objects.all() From abbe9213f98b5e1d3b53db2c1711d9221c5b257f Mon Sep 17 00:00:00 2001 From: Markus Kaiserswerth Date: Mon, 23 Sep 2013 17:48:25 +0200 Subject: [PATCH 0175/1652] Address pending deprecation of Model._meta.module_name in Django 1.6 --- rest_framework/compat.py | 8 ++++++++ rest_framework/filters.py | 4 ++-- rest_framework/permissions.py | 7 ++++--- rest_framework/tests/test_permissions.py | 4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index b9d1dae6b..581e29fc7 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -80,6 +80,14 @@ except ImportError: Image = None +def get_model_name(model_cls): + try: + return model_cls._meta.model_name + except AttributeError: + # < 1.6 used module_name instead of model_name + return model_cls._meta.module_name + + def get_concrete_model(model_cls): try: return model_cls._meta.concrete_model diff --git a/rest_framework/filters.py b/rest_framework/filters.py index b8fe7f77e..e287a1683 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -4,7 +4,7 @@ returned by list views. """ from __future__ import unicode_literals from django.db import models -from rest_framework.compat import django_filters, six, guardian +from rest_framework.compat import django_filters, six, guardian, get_model_name from functools import reduce import operator @@ -158,7 +158,7 @@ class DjangoObjectPermissionsFilter(BaseFilterBackend): model_cls = queryset.model kwargs = { 'app_label': model_cls._meta.app_label, - 'model_name': model_cls._meta.module_name + 'model_name': get_model_name(model_cls) } permission = self.perm_format % kwargs return guardian.shortcuts.get_objects_for_user(user, permission, queryset) diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 531847988..ab6655e7b 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -8,7 +8,8 @@ import warnings SAFE_METHODS = ['GET', 'HEAD', 'OPTIONS'] from django.http import Http404 -from rest_framework.compat import oauth2_provider_scope, oauth2_constants +from rest_framework.compat import (get_model_name, oauth2_provider_scope, + oauth2_constants) class BasePermission(object): @@ -116,7 +117,7 @@ class DjangoModelPermissions(BasePermission): """ kwargs = { 'app_label': model_cls._meta.app_label, - 'model_name': model_cls._meta.module_name + 'model_name': get_model_name(model_cls) } return [perm % kwargs for perm in self.perms_map[method]] @@ -177,7 +178,7 @@ class DjangoObjectPermissions(DjangoModelPermissions): def get_required_object_permissions(self, method, model_cls): kwargs = { 'app_label': model_cls._meta.app_label, - 'model_name': model_cls._meta.module_name + 'model_name': get_model_name(model_cls) } return [perm % kwargs for perm in self.perms_map[method]] diff --git a/rest_framework/tests/test_permissions.py b/rest_framework/tests/test_permissions.py index d08124f48..6e3a63034 100644 --- a/rest_framework/tests/test_permissions.py +++ b/rest_framework/tests/test_permissions.py @@ -4,7 +4,7 @@ from django.db import models from django.test import TestCase from django.utils import unittest from rest_framework import generics, status, permissions, authentication, HTTP_HEADER_ENCODING -from rest_framework.compat import guardian +from rest_framework.compat import guardian, get_model_name from rest_framework.filters import DjangoObjectPermissionsFilter from rest_framework.test import APIRequestFactory from rest_framework.tests.models import BasicModel @@ -202,7 +202,7 @@ class ObjectPermissionsIntegrationTests(TestCase): # give everyone model level permissions, as we are not testing those everyone = Group.objects.create(name='everyone') - model_name = BasicPermModel._meta.module_name + model_name = get_model_name(BasicPermModel) app_label = BasicPermModel._meta.app_label f = '{0}_{1}'.format perms = { From 57a51f790bdff6c1cf34f3c6d64b0bef3033d89e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 24 Sep 2013 09:21:55 +0100 Subject: [PATCH 0176/1652] Added @mkai, for work on #1126. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 4483f1707..b5dce5040 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -169,6 +169,7 @@ The following people have helped make REST framework great. * Edmond Wong - [edmondwong] * Ben Reilly - [bwreilly] * Tai Lee - [mrmachine] +* Markus Kaiserswerth - [mkai] Many thanks to everyone who's contributed to the project. @@ -374,3 +375,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [edmondwong]: https://github.com/edmondwong [bwreilly]: https://github.com/bwreilly [mrmachine]: https://github.com/mrmachine +[mkai]: https://github.com/mkai From e441f85109e64345a12e65062fc0e51c5787e67f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 25 Sep 2013 10:30:04 +0100 Subject: [PATCH 0177/1652] Drop 1.3 support --- .travis.yml | 12 +- rest_framework/authentication.py | 2 +- rest_framework/compat.py | 381 +----------------- rest_framework/fields.py | 4 +- rest_framework/routers.py | 2 +- rest_framework/runtests/settings.py | 5 +- rest_framework/runtests/urls.py | 2 +- rest_framework/serializers.py | 6 +- .../templates/rest_framework/base.html | 1 + .../templates/rest_framework/login_base.html | 1 + rest_framework/templatetags/rest_framework.py | 87 +--- rest_framework/tests/test_authentication.py | 2 +- rest_framework/tests/test_breadcrumbs.py | 2 +- rest_framework/tests/test_filters.py | 3 +- rest_framework/tests/test_htmlrenderer.py | 2 +- .../tests/test_hyperlinkedserializers.py | 4 +- .../tests/test_relations_hyperlink.py | 2 +- rest_framework/tests/test_renderers.py | 3 +- rest_framework/tests/test_request.py | 2 +- rest_framework/tests/test_response.py | 2 +- rest_framework/tests/test_reverse.py | 2 +- rest_framework/tests/test_routers.py | 2 +- rest_framework/tests/test_testing.py | 2 +- rest_framework/tests/test_urlpatterns.py | 2 +- rest_framework/urlpatterns.py | 2 +- rest_framework/urls.py | 2 +- rest_framework/utils/encoders.py | 3 +- tox.ini | 22 +- 28 files changed, 56 insertions(+), 506 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ebe715a0..456f8e9c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,18 +10,15 @@ env: - DJANGO="https://www.djangoproject.com/download/1.6a1/tarball/" - DJANGO="django==1.5.1 --use-mirrors" - DJANGO="django==1.4.5 --use-mirrors" - - DJANGO="django==1.3.7 --use-mirrors" install: - pip install $DJANGO - - pip install defusedxml==0.3 + - pip install defusedxml==0.3 --use-mirrors + - pip install django-filter==0.6 --use-mirrors - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211 --use-mirrors; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.0 --use-mirrors; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4 --use-mirrors; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-guardian==1.1.1 --use-mirrors; fi" - - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi" - - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install six --use-mirrors; fi" - - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.6 --use-mirrors; fi" - export PYTHONPATH=. script: @@ -31,10 +28,5 @@ matrix: exclude: - python: "3.2" env: DJANGO="django==1.4.5 --use-mirrors" - - python: "3.2" - env: DJANGO="django==1.3.7 --use-mirrors" - python: "3.3" env: DJANGO="django==1.4.5 --use-mirrors" - - python: "3.3" - env: DJANGO="django==1.3.7 --use-mirrors" - diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index cf001a24d..db5cce40d 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -6,8 +6,8 @@ import base64 from django.contrib.auth import authenticate from django.core.exceptions import ImproperlyConfigured +from django.middleware.csrf import CsrfViewMiddleware from rest_framework import exceptions, HTTP_HEADER_ENCODING -from rest_framework.compat import CsrfViewMiddleware from rest_framework.compat import oauth, oauth_provider, oauth_provider_store from rest_framework.compat import oauth2_provider, provider_now from rest_framework.authtoken.models import Token diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 1238f043a..f048b10ad 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -5,25 +5,19 @@ versions of django/python, and compatibility wrappers around optional packages. # flake8: noqa from __future__ import unicode_literals - import django from django.core.exceptions import ImproperlyConfigured from django.conf import settings + # Try to import six from Django, fallback to external `six` package. try: from django.utils import six except ImportError: import six -# location of patterns, url, include changes in 1.4 onwards -try: - from django.conf.urls import patterns, url, include -except ImportError: - from django.conf.urls.defaults import patterns, url, include - -# Handle django.utils.encoding rename: -# smart_unicode -> smart_text +# Handle django.utils.encoding rename in 1.5 onwards. +# smart_unicode -> smart_text # force_unicode -> force_text try: from django.utils.encoding import smart_text @@ -41,13 +35,15 @@ try: except ImportError: from django.http import HttpResponse as HttpResponseBase + # django-filter is optional try: import django_filters except ImportError: django_filters = None -# guardian is optional + +# django-guardian is optional try: import guardian except ImportError: @@ -80,14 +76,6 @@ except ImportError: Image = None -def get_concrete_model(model_cls): - try: - return model_cls._meta.concrete_model - except AttributeError: - # 1.3 does not include concrete model - return model_cls - - # Django 1.5 add support for custom auth user model if django.VERSION >= (1, 5): AUTH_USER_MODEL = settings.AUTH_USER_MODEL @@ -95,46 +83,13 @@ else: AUTH_USER_MODEL = 'auth.User' +# View._allowed_methods only present from 1.5 onwards if django.VERSION >= (1, 5): from django.views.generic import View else: - from django.views.generic import View as _View - from django.utils.decorators import classonlymethod - from django.utils.functional import update_wrapper + from django.views.generic import View as DjangoView - class View(_View): - # 1.3 does not include head method in base View class - # See: https://code.djangoproject.com/ticket/15668 - @classonlymethod - def as_view(cls, **initkwargs): - """ - Main entry point for a request-response process. - """ - # sanitize keyword arguments - for key in initkwargs: - if key in cls.http_method_names: - raise TypeError("You tried to pass in the %s method name as a " - "keyword argument to %s(). Don't do that." - % (key, cls.__name__)) - if not hasattr(cls, key): - raise TypeError("%s() received an invalid keyword %r" % ( - cls.__name__, key)) - - def view(request, *args, **kwargs): - self = cls(**initkwargs) - if hasattr(self, 'get') and not hasattr(self, 'head'): - self.head = self.get - return self.dispatch(request, *args, **kwargs) - - # take name and docstring from class - update_wrapper(view, cls, updated=()) - - # and possible attributes set by decorators - # like csrf_exempt from dispatch - update_wrapper(view, cls.dispatch, assigned=()) - return view - - # _allowed_methods only present from 1.5 onwards + class View(DjangoView): def _allowed_methods(self): return [m.upper() for m in self.http_method_names if hasattr(self, m)] @@ -144,316 +99,16 @@ if 'patch' not in View.http_method_names: View.http_method_names = View.http_method_names + ['patch'] -# PUT, DELETE do not require CSRF until 1.4. They should. Make it better. -if django.VERSION >= (1, 4): - from django.middleware.csrf import CsrfViewMiddleware -else: - import hashlib - import re - import random - import logging - - from django.conf import settings - from django.core.urlresolvers import get_callable - - try: - from logging import NullHandler - except ImportError: - class NullHandler(logging.Handler): - def emit(self, record): - pass - - logger = logging.getLogger('django.request') - - if not logger.handlers: - logger.addHandler(NullHandler()) - - def same_origin(url1, url2): - """ - Checks if two URLs are 'same-origin' - """ - p1, p2 = urlparse.urlparse(url1), urlparse.urlparse(url2) - return p1[0:2] == p2[0:2] - - def constant_time_compare(val1, val2): - """ - Returns True if the two strings are equal, False otherwise. - - The time taken is independent of the number of characters that match. - """ - if len(val1) != len(val2): - return False - result = 0 - for x, y in zip(val1, val2): - result |= ord(x) ^ ord(y) - return result == 0 - - # Use the system (hardware-based) random number generator if it exists. - if hasattr(random, 'SystemRandom'): - randrange = random.SystemRandom().randrange - else: - randrange = random.randrange - - _MAX_CSRF_KEY = 18446744073709551616 # 2 << 63 - - REASON_NO_REFERER = "Referer checking failed - no Referer." - REASON_BAD_REFERER = "Referer checking failed - %s does not match %s." - REASON_NO_CSRF_COOKIE = "CSRF cookie not set." - REASON_BAD_TOKEN = "CSRF token missing or incorrect." - - def _get_failure_view(): - """ - Returns the view to be used for CSRF rejections - """ - return get_callable(settings.CSRF_FAILURE_VIEW) - - def _get_new_csrf_key(): - return hashlib.md5("%s%s" % (randrange(0, _MAX_CSRF_KEY), settings.SECRET_KEY)).hexdigest() - - def get_token(request): - """ - Returns the the CSRF token required for a POST form. The token is an - alphanumeric value. - - A side effect of calling this function is to make the the csrf_protect - decorator and the CsrfViewMiddleware add a CSRF cookie and a 'Vary: Cookie' - header to the outgoing response. For this reason, you may need to use this - function lazily, as is done by the csrf context processor. - """ - request.META["CSRF_COOKIE_USED"] = True - return request.META.get("CSRF_COOKIE", None) - - def _sanitize_token(token): - # Allow only alphanum, and ensure we return a 'str' for the sake of the post - # processing middleware. - token = re.sub('[^a-zA-Z0-9]', '', str(token.decode('ascii', 'ignore'))) - if token == "": - # In case the cookie has been truncated to nothing at some point. - return _get_new_csrf_key() - else: - return token - - class CsrfViewMiddleware(object): - """ - Middleware that requires a present and correct csrfmiddlewaretoken - for POST requests that have a CSRF cookie, and sets an outgoing - CSRF cookie. - - This middleware should be used in conjunction with the csrf_token template - tag. - """ - # The _accept and _reject methods currently only exist for the sake of the - # requires_csrf_token decorator. - def _accept(self, request): - # Avoid checking the request twice by adding a custom attribute to - # request. This will be relevant when both decorator and middleware - # are used. - request.csrf_processing_done = True - return None - - def _reject(self, request, reason): - return _get_failure_view()(request, reason=reason) - - def process_view(self, request, callback, callback_args, callback_kwargs): - - if getattr(request, 'csrf_processing_done', False): - return None - - try: - csrf_token = _sanitize_token(request.COOKIES[settings.CSRF_COOKIE_NAME]) - # Use same token next time - request.META['CSRF_COOKIE'] = csrf_token - except KeyError: - csrf_token = None - # Generate token and store it in the request, so it's available to the view. - request.META["CSRF_COOKIE"] = _get_new_csrf_key() - - # Wait until request.META["CSRF_COOKIE"] has been manipulated before - # bailing out, so that get_token still works - if getattr(callback, 'csrf_exempt', False): - return None - - # Assume that anything not defined as 'safe' by RC2616 needs protection. - if request.method not in ('GET', 'HEAD', 'OPTIONS', 'TRACE'): - if getattr(request, '_dont_enforce_csrf_checks', False): - # Mechanism to turn off CSRF checks for test suite. It comes after - # the creation of CSRF cookies, so that everything else continues to - # work exactly the same (e.g. cookies are sent etc), but before the - # any branches that call reject() - return self._accept(request) - - if request.is_secure(): - # Suppose user visits http://example.com/ - # An active network attacker,(man-in-the-middle, MITM) sends a - # POST form which targets https://example.com/detonate-bomb/ and - # submits it via javascript. - # - # The attacker will need to provide a CSRF cookie and token, but - # that is no problem for a MITM and the session independent - # nonce we are using. So the MITM can circumvent the CSRF - # protection. This is true for any HTTP connection, but anyone - # using HTTPS expects better! For this reason, for - # https://example.com/ we need additional protection that treats - # http://example.com/ as completely untrusted. Under HTTPS, - # Barth et al. found that the Referer header is missing for - # same-domain requests in only about 0.2% of cases or less, so - # we can use strict Referer checking. - referer = request.META.get('HTTP_REFERER') - if referer is None: - logger.warning('Forbidden (%s): %s' % (REASON_NO_REFERER, request.path), - extra={ - 'status_code': 403, - 'request': request, - } - ) - return self._reject(request, REASON_NO_REFERER) - - # Note that request.get_host() includes the port - good_referer = 'https://%s/' % request.get_host() - if not same_origin(referer, good_referer): - reason = REASON_BAD_REFERER % (referer, good_referer) - logger.warning('Forbidden (%s): %s' % (reason, request.path), - extra={ - 'status_code': 403, - 'request': request, - } - ) - return self._reject(request, reason) - - if csrf_token is None: - # No CSRF cookie. For POST requests, we insist on a CSRF cookie, - # and in this way we can avoid all CSRF attacks, including login - # CSRF. - logger.warning('Forbidden (%s): %s' % (REASON_NO_CSRF_COOKIE, request.path), - extra={ - 'status_code': 403, - 'request': request, - } - ) - return self._reject(request, REASON_NO_CSRF_COOKIE) - - # check non-cookie token for match - request_csrf_token = "" - if request.method == "POST": - request_csrf_token = request.POST.get('csrfmiddlewaretoken', '') - - if request_csrf_token == "": - # Fall back to X-CSRFToken, to make things easier for AJAX, - # and possible for PUT/DELETE - request_csrf_token = request.META.get('HTTP_X_CSRFTOKEN', '') - - if not constant_time_compare(request_csrf_token, csrf_token): - logger.warning('Forbidden (%s): %s' % (REASON_BAD_TOKEN, request.path), - extra={ - 'status_code': 403, - 'request': request, - } - ) - return self._reject(request, REASON_BAD_TOKEN) - - return self._accept(request) - -# timezone support is new in Django 1.4 -try: - from django.utils import timezone -except ImportError: - timezone = None - -# dateparse is ALSO new in Django 1.4 -try: - from django.utils.dateparse import parse_date, parse_datetime, parse_time -except ImportError: - import datetime - import re - - date_re = re.compile( - r'(?P\d{4})-(?P\d{1,2})-(?P\d{1,2})$' - ) - - datetime_re = re.compile( - r'(?P\d{4})-(?P\d{1,2})-(?P\d{1,2})' - r'[T ](?P\d{1,2}):(?P\d{1,2})' - r'(?::(?P\d{1,2})(?:\.(?P\d{1,6})\d{0,6})?)?' - r'(?PZ|[+-]\d{1,2}:\d{1,2})?$' - ) - - time_re = re.compile( - r'(?P\d{1,2}):(?P\d{1,2})' - r'(?::(?P\d{1,2})(?:\.(?P\d{1,6})\d{0,6})?)?' - ) - - def parse_date(value): - match = date_re.match(value) - if match: - kw = dict((k, int(v)) for k, v in match.groupdict().iteritems()) - return datetime.date(**kw) - - def parse_time(value): - match = time_re.match(value) - if match: - kw = match.groupdict() - if kw['microsecond']: - kw['microsecond'] = kw['microsecond'].ljust(6, '0') - kw = dict((k, int(v)) for k, v in kw.iteritems() if v is not None) - return datetime.time(**kw) - - def parse_datetime(value): - """Parse datetime, but w/o the timezone awareness in 1.4""" - match = datetime_re.match(value) - if match: - kw = match.groupdict() - if kw['microsecond']: - kw['microsecond'] = kw['microsecond'].ljust(6, '0') - kw = dict((k, int(v)) for k, v in kw.iteritems() if v is not None) - return datetime.datetime(**kw) - - -# smart_urlquote is new on Django 1.4 -try: - from django.utils.html import smart_urlquote -except ImportError: - import re - from django.utils.encoding import smart_str - try: - from urllib.parse import quote, urlsplit, urlunsplit - except ImportError: # Python 2 - from urllib import quote - from urlparse import urlsplit, urlunsplit - - unquoted_percents_re = re.compile(r'%(?![0-9A-Fa-f]{2})') - - def smart_urlquote(url): - "Quotes a URL if it isn't already quoted." - # Handle IDN before quoting. - scheme, netloc, path, query, fragment = urlsplit(url) - try: - netloc = netloc.encode('idna').decode('ascii') # IDN -> ACE - except UnicodeError: # invalid domain part - pass - else: - url = urlunsplit((scheme, netloc, path, query, fragment)) - - # An URL is considered unquoted if it contains no % characters or - # contains a % not followed by two hexadecimal digits. See #9655. - if '%' not in url or unquoted_percents_re.search(url): - # See http://bugs.python.org/issue2637 - url = quote(smart_str(url), safe=b'!*\'();:@&=+$,/?#[]~') - - return force_text(url) - - -# RequestFactory only provide `generic` from 1.5 onwards - +# RequestFactory only provides `generic` from 1.5 onwards from django.test.client import RequestFactory as DjangoRequestFactory from django.test.client import FakePayload try: # In 1.5 the test client uses force_bytes from django.utils.encoding import force_bytes_or_smart_bytes except ImportError: - # In 1.3 and 1.4 the test client just uses smart_str + # In 1.4 the test client just uses smart_str from django.utils.encoding import smart_str as force_bytes_or_smart_bytes - class RequestFactory(DjangoRequestFactory): def generic(self, method, path, data='', content_type='application/octet-stream', **extra): @@ -478,6 +133,7 @@ class RequestFactory(DjangoRequestFactory): r.update(extra) return self.request(**r) + # Markdown is optional try: import markdown @@ -492,7 +148,6 @@ try: safe_mode = False md = markdown.Markdown(extensions=extensions, safe_mode=safe_mode) return md.convert(text) - except ImportError: apply_markdown = None @@ -510,14 +165,16 @@ try: except ImportError: etree = None -# OAuth is optional + +# OAuth2 is optional try: # Note: The `oauth2` package actually provides oauth1.0a support. Urg. import oauth2 as oauth except ImportError: oauth = None -# OAuth is optional + +# OAuthProvider is optional try: import oauth_provider from oauth_provider.store import store as oauth_provider_store @@ -525,6 +182,7 @@ except (ImportError, ImproperlyConfigured): oauth_provider = None oauth_provider_store = None + # OAuth 2 support is optional try: import provider.oauth2 as oauth2_provider @@ -542,8 +200,6 @@ try: # Any other supported version does use timezone aware datetimes from django.utils.timezone import now as provider_now except ImportError: - import traceback - traceback.print_exc() oauth2_provider = None oauth2_provider_models = None oauth2_provider_forms = None @@ -551,7 +207,8 @@ except ImportError: oauth2_constants = None provider_now = None -# Handle lazy strings + +# Handle lazy strings across Py2/Py3 from django.utils.functional import Promise if six.PY3: diff --git a/rest_framework/fields.py b/rest_framework/fields.py index b3a9b0dfe..f340510d3 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -18,12 +18,14 @@ from django.conf import settings from django.db.models.fields import BLANK_CHOICE_DASH from django.http import QueryDict from django.forms import widgets +from django.utils import timezone from django.utils.encoding import is_protected_type from django.utils.translation import ugettext_lazy as _ from django.utils.datastructures import SortedDict +from django.utils.dateparse import parse_date, parse_datetime, parse_time from rest_framework import ISO_8601 from rest_framework.compat import ( - timezone, parse_date, parse_datetime, parse_time, BytesIO, six, smart_text, + BytesIO, six, smart_text, force_text, is_non_str_iterable ) from rest_framework.settings import api_settings diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 1c7a81585..790299cc3 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -17,9 +17,9 @@ from __future__ import unicode_literals import itertools from collections import namedtuple +from django.conf.urls import patterns, url from django.core.exceptions import ImproperlyConfigured from rest_framework import views -from rest_framework.compat import patterns, url from rest_framework.response import Response from rest_framework.reverse import reverse from rest_framework.urlpatterns import format_suffix_patterns diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py index be7216580..12aa73e7b 100644 --- a/rest_framework/runtests/settings.py +++ b/rest_framework/runtests/settings.py @@ -93,10 +93,7 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.messages', - # Uncomment the next line to enable the admin: - # 'django.contrib.admin', - # Uncomment the next line to enable admin documentation: - # 'django.contrib.admindocs', + 'django.contrib.staticfiles', 'rest_framework', 'rest_framework.authtoken', 'rest_framework.tests', diff --git a/rest_framework/runtests/urls.py b/rest_framework/runtests/urls.py index ed5baeae6..dff710115 100644 --- a/rest_framework/runtests/urls.py +++ b/rest_framework/runtests/urls.py @@ -1,7 +1,7 @@ """ Blank URLConf just to keep runtests.py happy. """ -from rest_framework.compat import patterns +from django.conf.urls import patterns urlpatterns = patterns('', ) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index f17757625..9e3881a2c 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -18,7 +18,7 @@ from decimal import Decimal from django.db import models from django.forms import widgets from django.utils.datastructures import SortedDict -from rest_framework.compat import get_concrete_model, six +from rest_framework.compat import six # Note: We do the following so that users of the framework can use this style: # @@ -575,7 +575,7 @@ class ModelSerializer(Serializer): cls = self.opts.model assert cls is not None, \ "Serializer class '%s' is missing 'model' Meta option" % self.__class__.__name__ - opts = get_concrete_model(cls)._meta + opts = cls._meta.concrete_model._meta ret = SortedDict() nested = bool(self.opts.depth) @@ -784,7 +784,7 @@ class ModelSerializer(Serializer): Return a list of field names to exclude from model validation. """ cls = self.opts.model - opts = get_concrete_model(cls)._meta + opts = cls._meta.concrete_model._meta exclusions = [field.name for field in opts.fields + opts.many_to_many] for field_name, field in self.fields.items(): diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 2776d5500..47377d51f 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -1,4 +1,5 @@ {% load url from future %} +{% load staticfiles %} {% load rest_framework %} diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html index be9a0072a..be83c2f53 100644 --- a/rest_framework/templates/rest_framework/login_base.html +++ b/rest_framework/templates/rest_framework/login_base.html @@ -1,4 +1,5 @@ {% load url from future %} +{% load staticfiles %} {% load rest_framework %} diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index e9c1cdd54..55f361490 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -2,97 +2,14 @@ from __future__ import unicode_literals, absolute_import from django import template from django.core.urlresolvers import reverse, NoReverseMatch from django.http import QueryDict -from django.utils.html import escape +from django.utils.html import escape, smart_urlquote from django.utils.safestring import SafeData, mark_safe -from rest_framework.compat import urlparse, force_text, six, smart_urlquote +from rest_framework.compat import urlparse, force_text, six import re, string register = template.Library() -# Note we don't use 'load staticfiles', because we need a 1.3 compatible -# version, so instead we include the `static` template tag ourselves. - -# When 1.3 becomes unsupported by REST framework, we can instead start to -# use the {% load staticfiles %} tag, remove the following code, -# and add a dependency that `django.contrib.staticfiles` must be installed. - -# Note: We can't put this into the `compat` module because the compat import -# from rest_framework.compat import ... -# conflicts with this rest_framework template tag module. - -try: # Django 1.5+ - from django.contrib.staticfiles.templatetags.staticfiles import StaticFilesNode - - @register.tag('static') - def do_static(parser, token): - return StaticFilesNode.handle_token(parser, token) - -except ImportError: - try: # Django 1.4 - from django.contrib.staticfiles.storage import staticfiles_storage - - @register.simple_tag - def static(path): - """ - A template tag that returns the URL to a file - using staticfiles' storage backend - """ - return staticfiles_storage.url(path) - - except ImportError: # Django 1.3 - from urlparse import urljoin - from django import template - from django.templatetags.static import PrefixNode - - class StaticNode(template.Node): - def __init__(self, varname=None, path=None): - if path is None: - raise template.TemplateSyntaxError( - "Static template nodes must be given a path to return.") - self.path = path - self.varname = varname - - def url(self, context): - path = self.path.resolve(context) - return self.handle_simple(path) - - def render(self, context): - url = self.url(context) - if self.varname is None: - return url - context[self.varname] = url - return '' - - @classmethod - def handle_simple(cls, path): - return urljoin(PrefixNode.handle_simple("STATIC_URL"), path) - - @classmethod - def handle_token(cls, parser, token): - """ - Class method to parse prefix node and return a Node. - """ - bits = token.split_contents() - - if len(bits) < 2: - raise template.TemplateSyntaxError( - "'%s' takes at least one argument (path to file)" % bits[0]) - - path = parser.compile_filter(bits[1]) - - if len(bits) >= 2 and bits[-2] == 'as': - varname = bits[3] - else: - varname = None - - return cls(varname, path) - - @register.tag('static') - def do_static_13(parser, token): - return StaticNode.handle_token(parser, token) - - def replace_query_param(url, key, val): """ Given a URL and a key/val pair, set or replace an item in the query diff --git a/rest_framework/tests/test_authentication.py b/rest_framework/tests/test_authentication.py index a44813b69..e9a817c0f 100644 --- a/rest_framework/tests/test_authentication.py +++ b/rest_framework/tests/test_authentication.py @@ -1,4 +1,5 @@ from __future__ import unicode_literals +from django.conf.urls import patterns, url, include from django.contrib.auth.models import User from django.http import HttpResponse from django.test import TestCase @@ -18,7 +19,6 @@ from rest_framework.authentication import ( OAuth2Authentication ) from rest_framework.authtoken.models import Token -from rest_framework.compat import patterns, url, include from rest_framework.compat import oauth2_provider, oauth2_provider_models, oauth2_provider_scope from rest_framework.compat import oauth, oauth_provider from rest_framework.test import APIRequestFactory, APIClient diff --git a/rest_framework/tests/test_breadcrumbs.py b/rest_framework/tests/test_breadcrumbs.py index 41ddf2cea..33740cbb2 100644 --- a/rest_framework/tests/test_breadcrumbs.py +++ b/rest_framework/tests/test_breadcrumbs.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals +from django.conf.urls import patterns, url from django.test import TestCase -from rest_framework.compat import patterns, url from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework.views import APIView diff --git a/rest_framework/tests/test_filters.py b/rest_framework/tests/test_filters.py index 379db29d8..9697c5eef 100644 --- a/rest_framework/tests/test_filters.py +++ b/rest_framework/tests/test_filters.py @@ -1,12 +1,13 @@ from __future__ import unicode_literals import datetime from decimal import Decimal +from django.conf.urls import patterns, url from django.db import models from django.core.urlresolvers import reverse from django.test import TestCase from django.utils import unittest from rest_framework import generics, serializers, status, filters -from rest_framework.compat import django_filters, patterns, url +from rest_framework.compat import django_filters from rest_framework.test import APIRequestFactory from rest_framework.tests.models import BasicModel diff --git a/rest_framework/tests/test_htmlrenderer.py b/rest_framework/tests/test_htmlrenderer.py index 8957a43c7..6c570dfdc 100644 --- a/rest_framework/tests/test_htmlrenderer.py +++ b/rest_framework/tests/test_htmlrenderer.py @@ -1,11 +1,11 @@ from __future__ import unicode_literals from django.core.exceptions import PermissionDenied +from django.conf.urls import patterns, url from django.http import Http404 from django.test import TestCase from django.template import TemplateDoesNotExist, Template import django.template.loader from rest_framework import status -from rest_framework.compat import patterns, url from rest_framework.decorators import api_view, renderer_classes from rest_framework.renderers import TemplateHTMLRenderer from rest_framework.response import Response diff --git a/rest_framework/tests/test_hyperlinkedserializers.py b/rest_framework/tests/test_hyperlinkedserializers.py index 61e613d75..ea7f70f2f 100644 --- a/rest_framework/tests/test_hyperlinkedserializers.py +++ b/rest_framework/tests/test_hyperlinkedserializers.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals import json +from django.conf.urls import patterns, url from django.test import TestCase from rest_framework import generics, status, serializers -from rest_framework.compat import patterns, url from rest_framework.test import APIRequestFactory from rest_framework.tests.models import ( Anchor, BasicModel, ManyToManyModel, BlogPost, BlogPostComment, @@ -24,7 +24,7 @@ class BlogPostCommentSerializer(serializers.ModelSerializer): class PhotoSerializer(serializers.Serializer): description = serializers.CharField() - album_url = serializers.HyperlinkedRelatedField(source='album', view_name='album-detail', queryset=Album.objects.all(), lookup_field='title', slug_url_kwarg='title') + album_url = serializers.HyperlinkedRelatedField(source='album', view_name='album-detail', queryset=Album.objects.all(), lookup_field='title') def restore_object(self, attrs, instance=None): return Photo(**attrs) diff --git a/rest_framework/tests/test_relations_hyperlink.py b/rest_framework/tests/test_relations_hyperlink.py index 3c4d39af6..fa6b01aca 100644 --- a/rest_framework/tests/test_relations_hyperlink.py +++ b/rest_framework/tests/test_relations_hyperlink.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals +from django.conf.urls import patterns, url from django.test import TestCase from rest_framework import serializers -from rest_framework.compat import patterns, url from rest_framework.test import APIRequestFactory from rest_framework.tests.models import ( BlogPost, diff --git a/rest_framework/tests/test_renderers.py b/rest_framework/tests/test_renderers.py index df6f4aa63..9d1dd77e5 100644 --- a/rest_framework/tests/test_renderers.py +++ b/rest_framework/tests/test_renderers.py @@ -2,12 +2,13 @@ from __future__ import unicode_literals from decimal import Decimal +from django.conf.urls import patterns, url, include from django.core.cache import cache from django.test import TestCase from django.utils import unittest from django.utils.translation import ugettext_lazy as _ from rest_framework import status, permissions -from rest_framework.compat import yaml, etree, patterns, url, include, six, StringIO +from rest_framework.compat import yaml, etree, six, StringIO from rest_framework.response import Response from rest_framework.views import APIView from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \ diff --git a/rest_framework/tests/test_request.py b/rest_framework/tests/test_request.py index 969d8024a..d63634258 100644 --- a/rest_framework/tests/test_request.py +++ b/rest_framework/tests/test_request.py @@ -2,13 +2,13 @@ Tests for content parsing, and form-overloaded content parsing. """ from __future__ import unicode_literals +from django.conf.urls import patterns from django.contrib.auth.models import User from django.contrib.auth import authenticate, login, logout from django.contrib.sessions.middleware import SessionMiddleware from django.test import TestCase from rest_framework import status from rest_framework.authentication import SessionAuthentication -from rest_framework.compat import patterns from rest_framework.parsers import ( BaseParser, FormParser, diff --git a/rest_framework/tests/test_response.py b/rest_framework/tests/test_response.py index eea3c6418..1c4c551cf 100644 --- a/rest_framework/tests/test_response.py +++ b/rest_framework/tests/test_response.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals +from django.conf.urls import patterns, url, include from django.test import TestCase from rest_framework.tests.models import BasicModel, BasicModelSerializer -from rest_framework.compat import patterns, url, include from rest_framework.response import Response from rest_framework.views import APIView from rest_framework import generics diff --git a/rest_framework/tests/test_reverse.py b/rest_framework/tests/test_reverse.py index 690a30b11..320b125d2 100644 --- a/rest_framework/tests/test_reverse.py +++ b/rest_framework/tests/test_reverse.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals +from django.conf.urls import patterns, url from django.test import TestCase -from rest_framework.compat import patterns, url from rest_framework.reverse import reverse from rest_framework.test import APIRequestFactory diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py index 3f456fefd..1c34648f4 100644 --- a/rest_framework/tests/test_routers.py +++ b/rest_framework/tests/test_routers.py @@ -1,9 +1,9 @@ from __future__ import unicode_literals +from django.conf.urls import patterns, url, include from django.db import models from django.test import TestCase from django.core.exceptions import ImproperlyConfigured from rest_framework import serializers, viewsets, permissions -from rest_framework.compat import include, patterns, url from rest_framework.decorators import detail_route, list_route from rest_framework.response import Response from rest_framework.routers import SimpleRouter, DefaultRouter diff --git a/rest_framework/tests/test_testing.py b/rest_framework/tests/test_testing.py index 48b8956b5..c08dd4932 100644 --- a/rest_framework/tests/test_testing.py +++ b/rest_framework/tests/test_testing.py @@ -1,9 +1,9 @@ # -- coding: utf-8 -- from __future__ import unicode_literals +from django.conf.urls import patterns, url from django.contrib.auth.models import User from django.test import TestCase -from rest_framework.compat import patterns, url from rest_framework.decorators import api_view from rest_framework.response import Response from rest_framework.test import APIClient, APIRequestFactory, force_authenticate diff --git a/rest_framework/tests/test_urlpatterns.py b/rest_framework/tests/test_urlpatterns.py index 8132ec4c8..e0060e690 100644 --- a/rest_framework/tests/test_urlpatterns.py +++ b/rest_framework/tests/test_urlpatterns.py @@ -1,9 +1,9 @@ from __future__ import unicode_literals from collections import namedtuple +from django.conf.urls import patterns, url, include from django.core import urlresolvers from django.test import TestCase from rest_framework.test import APIRequestFactory -from rest_framework.compat import patterns, url, include from rest_framework.urlpatterns import format_suffix_patterns diff --git a/rest_framework/urlpatterns.py b/rest_framework/urlpatterns.py index d9143bb4c..a62530c74 100644 --- a/rest_framework/urlpatterns.py +++ b/rest_framework/urlpatterns.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals +from django.conf.urls import url, include from django.core.urlresolvers import RegexURLResolver -from rest_framework.compat import url, include from rest_framework.settings import api_settings diff --git a/rest_framework/urls.py b/rest_framework/urls.py index 9c4719f1d..87ec0f0ae 100644 --- a/rest_framework/urls.py +++ b/rest_framework/urls.py @@ -13,7 +13,7 @@ your authentication settings include `SessionAuthentication`. ) """ from __future__ import unicode_literals -from rest_framework.compat import patterns, url +from django.conf.urls import patterns, url template_name = {'template_name': 'rest_framework/login.html'} diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 7efd5417b..13a855509 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -2,9 +2,10 @@ Helper classes for parsers. """ from __future__ import unicode_literals +from django.utils import timezone from django.utils.datastructures import SortedDict from django.utils.functional import Promise -from rest_framework.compat import timezone, force_text +from rest_framework.compat import force_text from rest_framework.serializers import DictWithMetadata, SortedDictWithMetadata import datetime import decimal diff --git a/tox.ini b/tox.ini index 6e3b8e0a8..7bd140e1c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] downloadcache = {toxworkdir}/cache/ -envlist = py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4,py2.7-django1.3,py2.6-django1.3 +envlist = py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5,py2.7-django1.4,py2.6-django1.4 [testenv] commands = {envpython} rest_framework/runtests/runtests.py @@ -88,23 +88,3 @@ deps = django==1.4.3 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.1.1 - -[testenv:py2.7-django1.3] -basepython = python2.7 -deps = django==1.3.5 - django-filter==0.5.4 - defusedxml==0.3 - django-oauth-plus==2.0 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 - django-guardian==1.1.1 - -[testenv:py2.6-django1.3] -basepython = python2.6 -deps = django==1.3.5 - django-filter==0.5.4 - defusedxml==0.3 - django-oauth-plus==2.0 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 - django-guardian==1.1.1 From 1bd8fe415296739521fd2e75c0b604cbf3dd3a83 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 25 Sep 2013 10:36:08 +0100 Subject: [PATCH 0178/1652] Whitespace fix --- rest_framework/compat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index f048b10ad..efd2581fe 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -17,7 +17,7 @@ except ImportError: import six # Handle django.utils.encoding rename in 1.5 onwards. -# smart_unicode -> smart_text +# smart_unicode -> smart_text # force_unicode -> force_text try: from django.utils.encoding import smart_text From 75d6446c8799763dccde0f5f03fbcae39c18dc7f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 26 Sep 2013 16:09:08 +0100 Subject: [PATCH 0179/1652] Allow .template_name attribute specified on view. Closes #1000 --- rest_framework/renderers.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 2ce51e97b..a27160d46 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -272,7 +272,9 @@ class TemplateHTMLRenderer(BaseRenderer): return [self.template_name] elif hasattr(view, 'get_template_names'): return view.get_template_names() - raise ImproperlyConfigured('Returned a template response with no template_name') + elif hasattr(view, 'template_name'): + return [view.template_name] + raise ImproperlyConfigured('Returned a template response with no `template_name` attribute set on either the view or response') def get_exception_template(self, response): template_names = [name % {'status_code': response.status_code} @@ -388,7 +390,7 @@ class HTMLFormRenderer(BaseRenderer): # likely change at some point. self.renderer_context = renderer_context or {} - request = renderer_context['request'] + request = self.renderer_context['request'] # Creating an on the fly form see: # http://stackoverflow.com/questions/3915024/dynamically-creating-classes-python @@ -419,8 +421,13 @@ class BrowsableAPIRenderer(BaseRenderer): """ renderers = [renderer for renderer in view.renderer_classes if not issubclass(renderer, BrowsableAPIRenderer)] + non_template_renderers = [renderer for renderer in renderers + if not hasattr(renderer, 'get_template_names')] + if not renderers: return None + elif non_template_renderers: + return non_template_renderers[0]() return renderers[0]() def get_content(self, renderer, data, From 49847584a8524883181e4118a9df9bb62f597271 Mon Sep 17 00:00:00 2001 From: Krzysztof Jurewicz Date: Sun, 29 Sep 2013 12:49:38 +0200 Subject: [PATCH 0180/1652] Minor documentation fix. --- docs/topics/ajax-csrf-cors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/ajax-csrf-cors.md b/docs/topics/ajax-csrf-cors.md index 0555b84dd..97dd4710b 100644 --- a/docs/topics/ajax-csrf-cors.md +++ b/docs/topics/ajax-csrf-cors.md @@ -6,7 +6,7 @@ ## Javascript clients -If your building a javascript client to interface with your Web API, you'll need to consider if the client can use the same authentication policy that is used by the rest of the website, and also determine if you need to use CSRF tokens or CORS headers. +If you’re building a JavaScript client to interface with your Web API, you'll need to consider if the client can use the same authentication policy that is used by the rest of the website, and also determine if you need to use CSRF tokens or CORS headers. AJAX requests that are made within the same context as the API they are interacting with will typically use `SessionAuthentication`. This ensures that once a user has logged in, any AJAX requests made can be authenticated using the same session-based authentication that is used for the rest of the website. From 8a1d3275795a6eea931cb0b67465c88d745bd2b6 Mon Sep 17 00:00:00 2001 From: Doron Pearl Date: Mon, 30 Sep 2013 14:08:46 -0400 Subject: [PATCH 0181/1652] corrected doc for throttle_classes decorator the decorator actually expects an array and otherwise raise an exception. --- docs/api-guide/throttling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index cc4692171..fc1525df6 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -59,7 +59,7 @@ using the `APIView` class based views. Or, if you're using the `@api_view` decorator with function based views. @api_view('GET') - @throttle_classes(UserRateThrottle) + @throttle_classes([UserRateThrottle]) def example_view(request, format=None): content = { 'status': 'request was permitted' From 61dd9ce914382ad7b26e2654a590215885308828 Mon Sep 17 00:00:00 2001 From: Jeff Date: Tue, 1 Oct 2013 15:47:47 -0600 Subject: [PATCH 0182/1652] Update release-notes.md Simple typo fix. --- docs/topics/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index e4294ae33..3df8869a2 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -58,7 +58,7 @@ You can determine your currently installed version using `pip freeze`: * 'Raw data' and 'HTML form' tab preference in browseable API now saved between page views. * Bugfix: `required=True` argument fixed for boolean serializer fields. * Bugfix: `client.force_authenticate(None)` should also clear session info if it exists. -* Bugfix: Client sending emptry string instead of file now clears `FileField`. +* Bugfix: Client sending empty string instead of file now clears `FileField`. * Bugfix: Empty values on ChoiceFields with `required=False` now consistently return `None`. ### 2.3.7 From a14f1e886402b8d0f742fdbb912b03a4004e1735 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 2 Oct 2013 13:45:35 +0100 Subject: [PATCH 0183/1652] Serializers can now be rendered directly to HTML --- rest_framework/fields.py | 21 +++++++ rest_framework/renderers.py | 62 +------------------ rest_framework/serializers.py | 19 +++++- .../templates/rest_framework/form.html | 12 ++-- 4 files changed, 49 insertions(+), 65 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 210c2537d..16344d01b 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -123,6 +123,7 @@ class Field(object): use_files = False form_field_class = forms.CharField type_label = 'field' + widget = None def __init__(self, source=None, label=None, help_text=None): self.parent = None @@ -134,9 +135,29 @@ class Field(object): if label is not None: self.label = smart_text(label) + else: + self.label = None if help_text is not None: self.help_text = strip_multiple_choice_msg(smart_text(help_text)) + else: + self.help_text = None + + self._errors = [] + self._value = None + self._name = None + + @property + def errors(self): + return self._errors + + def widget_html(self): + if not self.widget: + return '' + return self.widget.render(self._name, self._value) + + def label_tag(self): + return '' % (self._name, self.label) def initialize(self, parent, field_name): """ diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index a27160d46..0e17edafb 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -336,71 +336,15 @@ class HTMLFormRenderer(BaseRenderer): template = 'rest_framework/form.html' charset = 'utf-8' - def data_to_form_fields(self, data): - fields = {} - for key, val in data.fields.items(): - if getattr(val, 'read_only', True): - # Don't include read-only fields. - continue - - if getattr(val, 'fields', None): - # Nested data not supported by HTML forms. - continue - - kwargs = {} - kwargs['required'] = val.required - - #if getattr(v, 'queryset', None): - # kwargs['queryset'] = v.queryset - - if getattr(val, 'choices', None) is not None: - kwargs['choices'] = val.choices - - if getattr(val, 'regex', None) is not None: - kwargs['regex'] = val.regex - - if getattr(val, 'widget', None): - widget = copy.deepcopy(val.widget) - kwargs['widget'] = widget - - if getattr(val, 'default', None) is not None: - kwargs['initial'] = val.default - - if getattr(val, 'label', None) is not None: - kwargs['label'] = val.label - - if getattr(val, 'help_text', None) is not None: - kwargs['help_text'] = val.help_text - - fields[key] = val.form_field_class(**kwargs) - - return fields - def render(self, data, accepted_media_type=None, renderer_context=None): """ Render serializer data and return an HTML form, as a string. """ - # The HTMLFormRenderer currently uses something of a hack to render - # the content, by translating each of the serializer fields into - # an html form field, creating a dynamic form using those fields, - # and then rendering that form. - - # This isn't strictly neccessary, as we could render the serilizer - # fields to HTML directly. The implementation is historical and will - # likely change at some point. - - self.renderer_context = renderer_context or {} - request = self.renderer_context['request'] - - # Creating an on the fly form see: - # http://stackoverflow.com/questions/3915024/dynamically-creating-classes-python - fields = self.data_to_form_fields(data) - DynamicForm = type(str('DynamicForm'), (forms.Form,), fields) - data = None if data.empty else data + renderer_context = renderer_context or {} + request = renderer_context['request'] template = loader.get_template(self.template) - context = RequestContext(request, {'form': DynamicForm(data)}) - + context = RequestContext(request, {'form': data}) return template.render(context) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 8d2e0feb8..206a8123b 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -32,6 +32,13 @@ from rest_framework.relations import * from rest_framework.fields import * +def pretty_name(name): + """Converts 'first_name' to 'First name'""" + if not name: + return '' + return name.replace('_', ' ').capitalize() + + class RelationsList(list): _deleted = [] @@ -306,7 +313,17 @@ class BaseSerializer(WritableField): for field_name, field in self.fields.items(): field.initialize(parent=self, field_name=field_name) key = self.get_field_key(field_name) - value = field.field_to_native(obj, field_name) + if self._errors: + value = self.init_data.get(field_name) + else: + value = field.field_to_native(obj, field_name) + + field._errors = self._errors.get(key) if self._errors else None + field._name = field_name + field._value = value + if not field.label: + field.label = pretty_name(key) + ret[key] = value ret.fields[key] = field return ret diff --git a/rest_framework/templates/rest_framework/form.html b/rest_framework/templates/rest_framework/form.html index b27f652e9..b1e148df7 100644 --- a/rest_framework/templates/rest_framework/form.html +++ b/rest_framework/templates/rest_framework/form.html @@ -1,13 +1,15 @@ {% load rest_framework %} {% csrf_token %} {{ form.non_field_errors }} -{% for field in form %} -
    +{% for field in form.fields.values %} + {% if not field.read_only %} +
    {{ field.label_tag|add_class:"control-label" }}
    - {{ field }} - {{ field.help_text }} - + {{ field.widget_html }} + {% if field.help_text %}{{ field.help_text }}{% endif %} + {% for error in field.errors %}{{ error }}{% endfor %}
    + {% endif %} {% endfor %} From 8d4ba478cc5725b4de6ab86b4825b1ea94cb4c7b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 2 Oct 2013 16:13:34 +0100 Subject: [PATCH 0184/1652] Fix rendering of forms and add error rendering on HTML form --- rest_framework/renderers.py | 16 +++++++++--- rest_framework/serializers.py | 26 +++++++++---------- .../templates/rest_framework/base.html | 4 +-- .../rest_framework/raw_data_form.html | 12 +++++++++ 4 files changed, 39 insertions(+), 19 deletions(-) create mode 100644 rest_framework/templates/rest_framework/raw_data_form.html diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 0e17edafb..fe4f43d48 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -419,6 +419,13 @@ class BrowsableAPIRenderer(BaseRenderer): In the absence of the View having an associated form then return None. """ + if request.method == method: + data = request.DATA + files = request.FILES + else: + data = None + files = None + with override_method(view, request, method) as request: obj = getattr(view, 'object', None) if not self.show_form_for_method(view, method, request, obj): @@ -431,9 +438,10 @@ class BrowsableAPIRenderer(BaseRenderer): or not any(is_form_media_type(parser.media_type) for parser in view.parser_classes)): return - serializer = view.get_serializer(instance=obj) - + serializer = view.get_serializer(instance=obj, data=data, files=files) + serializer.is_valid() data = serializer.data + form_renderer = self.form_renderer_class() return form_renderer.render(data, self.accepted_media_type, self.renderer_context) @@ -525,6 +533,7 @@ class BrowsableAPIRenderer(BaseRenderer): renderer = self.get_default_renderer(view) + raw_data_post_form = self.get_raw_data_form(view, 'POST', request) raw_data_put_form = self.get_raw_data_form(view, 'PUT', request) raw_data_patch_form = self.get_raw_data_form(view, 'PATCH', request) raw_data_put_or_patch_form = raw_data_put_form or raw_data_patch_form @@ -543,12 +552,11 @@ class BrowsableAPIRenderer(BaseRenderer): 'put_form': self.get_rendered_html_form(view, 'PUT', request), 'post_form': self.get_rendered_html_form(view, 'POST', request), - 'patch_form': self.get_rendered_html_form(view, 'PATCH', request), 'delete_form': self.get_rendered_html_form(view, 'DELETE', request), 'options_form': self.get_rendered_html_form(view, 'OPTIONS', request), 'raw_data_put_form': raw_data_put_form, - 'raw_data_post_form': self.get_raw_data_form(view, 'POST', request), + 'raw_data_post_form': raw_data_post_form, 'raw_data_patch_form': raw_data_patch_form, 'raw_data_put_or_patch_form': raw_data_put_or_patch_form, diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 206a8123b..bc9f73d11 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -308,24 +308,14 @@ class BaseSerializer(WritableField): """ ret = self._dict_class() ret.fields = self._dict_class() - ret.empty = obj is None for field_name, field in self.fields.items(): field.initialize(parent=self, field_name=field_name) key = self.get_field_key(field_name) - if self._errors: - value = self.init_data.get(field_name) - else: - value = field.field_to_native(obj, field_name) - - field._errors = self._errors.get(key) if self._errors else None - field._name = field_name - field._value = value - if not field.label: - field.label = pretty_name(key) - + value = field.field_to_native(obj, field_name) ret[key] = value - ret.fields[key] = field + ret.fields[key] = self.augment_field(field, field_name, key, value) + return ret def from_native(self, data, files): @@ -333,6 +323,7 @@ class BaseSerializer(WritableField): Deserialize primitives -> objects. """ self._errors = {} + if data is not None or files is not None: attrs = self.restore_fields(data, files) if attrs is not None: @@ -343,6 +334,15 @@ class BaseSerializer(WritableField): if not self._errors: return self.restore_object(attrs, instance=getattr(self, 'object', None)) + def augment_field(self, field, field_name, key, value): + # This horrible stuff is to manage serializers rendering to HTML + field._errors = self._errors.get(key) if self._errors else None + field._name = field_name + field._value = self.init_data.get(key) if self._errors and self.init_data else value + if not field.label: + field.label = pretty_name(key) + return field + def field_to_native(self, obj, field_name): """ Override default so that the serializer can be used as a nested field diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 2776d5500..33be36db8 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -151,7 +151,7 @@ {% with form=raw_data_post_form %}
    - {% include "rest_framework/form.html" %} + {% include "rest_framework/raw_data_form.html" %}
    @@ -188,7 +188,7 @@ {% with form=raw_data_put_or_patch_form %}
    - {% include "rest_framework/form.html" %} + {% include "rest_framework/raw_data_form.html" %}
    {% if raw_data_put_form %} diff --git a/rest_framework/templates/rest_framework/raw_data_form.html b/rest_framework/templates/rest_framework/raw_data_form.html new file mode 100644 index 000000000..075279f7e --- /dev/null +++ b/rest_framework/templates/rest_framework/raw_data_form.html @@ -0,0 +1,12 @@ +{% load rest_framework %} +{% csrf_token %} +{{ form.non_field_errors }} +{% for field in form %} +
    + {{ field.label_tag|add_class:"control-label" }} +
    + {{ field }} + {{ field.help_text }} +
    +
    +{% endfor %} From dc650f77b5f377bbfab3da66455feb57b195a1da Mon Sep 17 00:00:00 2001 From: Craig de Stigter Date: Thu, 3 Oct 2013 11:34:42 +1300 Subject: [PATCH 0185/1652] add tests for transform_fieldname methods --- rest_framework/tests/test_serializer.py | 35 +++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index c24976603..ca876eae4 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -1643,3 +1643,38 @@ class SerializerSupportsManyRelationships(TestCase): serializer = SimpleSlugSourceModelSerializer(data={'text': 'foo', 'targets': [1, 2]}) self.assertTrue(serializer.is_valid()) self.assertEqual(serializer.data, {'text': 'foo', 'targets': [1, 2]}) + + +class TransformMethodsSerializer(serializers.Serializer): + a = serializers.CharField() + b_renamed = serializers.CharField(source='b') + + def transform_a(self, obj, value): + return value.lower() + + def transform_b_renamed(self, obj, value): + if value is not None: + return 'and ' + value + + +class TestSerializerTransformMethods(TestCase): + def setUp(self): + self.s = TransformMethodsSerializer() + + def test_transform_methods(self): + self.assertEqual( + self.s.to_native({'a': 'GREEN EGGS', 'b': 'HAM'}), + { + 'a': 'green eggs', + 'b_renamed': 'and HAM', + } + ) + + def test_missing_fields(self): + self.assertEqual( + self.s.to_native({'a': 'GREEN EGGS'}), + { + 'a': 'green eggs', + 'b_renamed': None, + } + ) From 42bbf6907e041d6abe773854b9aaa53eded82f4e Mon Sep 17 00:00:00 2001 From: Craig de Stigter Date: Thu, 3 Oct 2013 12:38:42 +1300 Subject: [PATCH 0186/1652] docs: add paragraph on transform_fieldname methods --- docs/api-guide/serializers.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index bbc8d019d..2d3e999f9 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -63,6 +63,21 @@ At this point we've translated the model instance into Python native datatypes. json # '{"email": "leila@example.com", "content": "foo bar", "created": "2012-08-22T16:20:09.822"}' +### Customizing field representation + +Sometimes when serializing objects, you may not want to represent everything exactly the way it is in your model. + +If you need to customize the serialized value of a particular field, you can do this by creating a `transform_` method. For example if you needed to render some markdown from a text field: + + description = serializers.TextField() + description_html = serializers.TextField(source='description', read_only=True) + + def transform_description_html(self, obj, value): + from django.contrib.markup.templatetags.markup import markdown + return markdown(value) + +These methods are essentially the reverse of `validate_` (see *Validation* below.) + ## Deserializing objects Deserialization is similar. First we parse a stream into Python native datatypes... From f6301636fb52dc6e02fd55e1c07c0be0a3b4ebfd Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 3 Oct 2013 15:18:38 +0100 Subject: [PATCH 0187/1652] Drop erronous left-over bit of docs. Closes #1147 --- docs/api-guide/serializers.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index a3cd1d6ab..6b91aa764 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -84,7 +84,6 @@ Deserialization is similar. First we parse a stream into Python native datatype # True serializer.object # - >>> serializer.deserialize('json', stream) When deserializing data, we can either create a new instance, or update an existing instance. From ab4be47379ba49092063f843fd446919534db776 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Thu, 3 Oct 2013 17:34:34 +0200 Subject: [PATCH 0188/1652] Fixed code example. --- docs/api-guide/routers.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 730fa876a..f20a695b6 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -42,12 +42,15 @@ The example above would generate the following URL patterns: Any methods on the viewset decorated with `@detail_route` or `@list_route` will also be routed. For example, given a method like this on the `UserViewSet` class: - from myapp.permissions import IsAdminOrIsSelf + from myapp.permissions import IsAdminOrIsSelf from rest_framework.decorators import detail_route - - @detail_route(methods=['post'], permission_classes=[IsAdminOrIsSelf]) - def set_password(self, request, pk=None): + + class UserViewSet(ModelViewSet): ... + + @detail_route(methods=['post'], permission_classes=[IsAdminOrIsSelf]) + def set_password(self, request, pk=None): + ... The following URL pattern would additionally be generated: From 3e94f4dc709143d577433c164873654e7c0579f8 Mon Sep 17 00:00:00 2001 From: Henry Clifford Date: Fri, 4 Oct 2013 10:49:56 -0400 Subject: [PATCH 0189/1652] support args on get_object_or_404 --- rest_framework/generics.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 7d1bf7945..4f134bce6 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -25,13 +25,13 @@ def strict_positive_int(integer_string, cutoff=None): ret = min(ret, cutoff) return ret -def get_object_or_404(queryset, **filter_kwargs): +def get_object_or_404(queryset, *filter_args, **filter_kwargs): """ Same as Django's standard shortcut, but make sure to raise 404 if the filter_kwargs don't match the required types. """ try: - return _get_object_or_404(queryset, **filter_kwargs) + return _get_object_or_404(queryset, *filter_args, **filter_kwargs) except (TypeError, ValueError): raise Http404 From 3833f1d55f97db33596242d89dbed997221f3b82 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 4 Oct 2013 15:55:57 +0100 Subject: [PATCH 0190/1652] Added @hcliff for #1153. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index b5dce5040..586bb0f00 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -170,6 +170,7 @@ The following people have helped make REST framework great. * Ben Reilly - [bwreilly] * Tai Lee - [mrmachine] * Markus Kaiserswerth - [mkai] +* Henry Clifford - [hcliff] Many thanks to everyone who's contributed to the project. @@ -376,3 +377,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [bwreilly]: https://github.com/bwreilly [mrmachine]: https://github.com/mrmachine [mkai]: https://github.com/mkai +[hcliff]: https://github.com/hcliff From 48a38386afb8a8619d2f089ebce364c7a0a845b4 Mon Sep 17 00:00:00 2001 From: dpetzel Date: Sat, 5 Oct 2013 19:29:25 -0400 Subject: [PATCH 0191/1652] **very minor** typo fix --- docs/tutorial/1-serialization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 22d29285b..e1c0009c3 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -225,7 +225,7 @@ For the moment we won't use any of REST framework's other features, we'll just w We'll start off by creating a subclass of HttpResponse that we can use to render any data we return into `json`. -Edit the `snippet/views.py` file, and add the following. +Edit the `snippets/views.py` file, and add the following. from django.http import HttpResponse from django.views.decorators.csrf import csrf_exempt From 864497eebbd39ab3e811c589a44a43176caef1bf Mon Sep 17 00:00:00 2001 From: dpetzel Date: Sat, 5 Oct 2013 23:16:58 -0400 Subject: [PATCH 0192/1652] Be sure to import UserSerializer --- docs/tutorial/4-authentication-and-permissions.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 393d879a4..510aa2439 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -75,6 +75,10 @@ We'll also add a couple of views. We'd like to just use read-only views for the class UserDetail(generics.RetrieveAPIView): queryset = User.objects.all() serializer_class = UserSerializer + +Make sure to also import the `UserSerializer` class + + from snippets.serializers import UserSerializer Finally we need to add those views into the API, by referencing them from the URL conf. From 9e29c6389529210978d58cee78e437b901f9daa2 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 10 Oct 2013 17:33:22 +0100 Subject: [PATCH 0193/1652] Ensure read-only fields don't break with current HTML renderer behavior --- rest_framework/fields.py | 3 +++ rest_framework/serializers.py | 2 ++ rest_framework/tests/test_serializer.py | 3 +-- rest_framework/tests/test_serializer_empty.py | 15 +++++++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 rest_framework/tests/test_serializer_empty.py diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 16344d01b..6b039f6c2 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -777,6 +777,7 @@ class IntegerField(WritableField): type_name = 'IntegerField' type_label = 'integer' form_field_class = forms.IntegerField + empty = 0 default_error_messages = { 'invalid': _('Enter a whole number.'), @@ -808,6 +809,7 @@ class FloatField(WritableField): type_name = 'FloatField' type_label = 'float' form_field_class = forms.FloatField + empty = 0 default_error_messages = { 'invalid': _("'%s' value must be a float."), @@ -828,6 +830,7 @@ class DecimalField(WritableField): type_name = 'DecimalField' type_label = 'decimal' form_field_class = forms.DecimalField + empty = Decimal('0') default_error_messages = { 'invalid': _('Enter a number.'), diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index bc9f73d11..8e9456885 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -310,6 +310,8 @@ class BaseSerializer(WritableField): ret.fields = self._dict_class() for field_name, field in self.fields.items(): + if field.read_only and obj is None: + continue field.initialize(parent=self, field_name=field_name) key = self.get_field_key(field_name) value = field.field_to_native(obj, field_name) diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index 8d246b010..d4e5a93f6 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -159,8 +159,7 @@ class BasicTests(TestCase): expected = { 'email': '', 'content': '', - 'created': None, - 'sub_comment': '' + 'created': None } self.assertEqual(serializer.data, expected) diff --git a/rest_framework/tests/test_serializer_empty.py b/rest_framework/tests/test_serializer_empty.py new file mode 100644 index 000000000..30cff3615 --- /dev/null +++ b/rest_framework/tests/test_serializer_empty.py @@ -0,0 +1,15 @@ +from django.test import TestCase +from rest_framework import serializers + + +class EmptySerializerTestCase(TestCase): + def test_empty_serializer(self): + class FooBarSerializer(serializers.Serializer): + foo = serializers.IntegerField() + bar = serializers.SerializerMethodField('get_bar') + + def get_bar(self, obj): + return 'bar' + + serializer = FooBarSerializer() + self.assertEquals(serializer.data, {'foo': 0}) From 7c3769f04b5ec2cd14dcbd7e3601d59092255906 Mon Sep 17 00:00:00 2001 From: Craig de Stigter Date: Fri, 11 Oct 2013 15:31:55 +1300 Subject: [PATCH 0194/1652] fix writing into foreign key with non-null source --- rest_framework/serializers.py | 2 +- .../tests/test_serializer_nested.py | 67 +++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 33db82ee1..fa5ac1431 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -403,7 +403,7 @@ class BaseSerializer(WritableField): return # Set the serializer object if it exists - obj = getattr(self.parent.object, field_name) if self.parent.object else None + obj = get_component(self.parent.object, self.source or field_name) if self.parent.object else None obj = obj.all() if is_simple_callable(getattr(obj, 'all', None)) else obj if self.source == '*': diff --git a/rest_framework/tests/test_serializer_nested.py b/rest_framework/tests/test_serializer_nested.py index 71d0e24b5..e454235a1 100644 --- a/rest_framework/tests/test_serializer_nested.py +++ b/rest_framework/tests/test_serializer_nested.py @@ -244,3 +244,70 @@ class WritableNestedSerializerObjectTests(TestCase): serializer = self.AlbumSerializer(data=data, many=True) self.assertEqual(serializer.is_valid(), True) self.assertEqual(serializer.object, expected_object) + + +class ForeignKeyNestedSerializerUpdateTests(TestCase): + def setUp(self): + class Artist(object): + def __init__(self, name): + self.name = name + + def __eq__(self, other): + return self.name == other.name + + class Album(object): + def __init__(self, name, artist): + self.name, self.artist = name, artist + + def __eq__(self, other): + return self.name == other.name and self.artist == other.artist + + class ArtistSerializer(serializers.Serializer): + name = serializers.CharField() + + def restore_object(self, attrs, instance=None): + if instance: + instance.name = attrs['name'] + else: + instance = Artist(attrs['name']) + return instance + + class AlbumSerializer(serializers.Serializer): + name = serializers.CharField() + by = ArtistSerializer(source='artist') + + def restore_object(self, attrs, instance=None): + if instance: + instance.name = attrs['name'] + instance.artist = attrs['artist'] + else: + instance = Album(attrs['name'], attrs['artist']) + return instance + + self.Artist = Artist + self.Album = Album + self.AlbumSerializer = AlbumSerializer + + def test_create_via_foreign_key_with_source(self): + """ + Check that we can both *create* and *update* into objects across + ForeignKeys that have a `source` specified. + Regression test for # + """ + data = { + 'name': 'Discovery', + 'by': {'name': 'Daft Punk'}, + } + + expected = self.Album(artist=self.Artist('Daft Punk'), name='Discovery') + + # create + serializer = self.AlbumSerializer(data=data) + self.assertEqual(serializer.is_valid(), True) + self.assertEqual(serializer.object, expected) + + # update + original = self.Album(artist=self.Artist('The Bats'), name='Free All the Monsters') + serializer = self.AlbumSerializer(instance=original, data=data) + self.assertEqual(serializer.is_valid(), True) + self.assertEqual(serializer.object, expected) From 86ea969e1154de20a53fc5b853e8340508648e98 Mon Sep 17 00:00:00 2001 From: Craig de Stigter Date: Fri, 11 Oct 2013 15:50:07 +1300 Subject: [PATCH 0195/1652] fix ticket link in test docstring --- rest_framework/tests/test_serializer_nested.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/tests/test_serializer_nested.py b/rest_framework/tests/test_serializer_nested.py index e454235a1..029f8bffd 100644 --- a/rest_framework/tests/test_serializer_nested.py +++ b/rest_framework/tests/test_serializer_nested.py @@ -292,7 +292,7 @@ class ForeignKeyNestedSerializerUpdateTests(TestCase): """ Check that we can both *create* and *update* into objects across ForeignKeys that have a `source` specified. - Regression test for # + Regression test for #1170 """ data = { 'name': 'Discovery', From 89ac03af26a63a2126165e8995f7936798ce0450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20L=C3=A1zaro?= Date: Sat, 12 Oct 2013 20:31:33 +0200 Subject: [PATCH 0196/1652] Add missing commas in relations.md --- docs/api-guide/relations.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 5ec4b22fc..b9d96b5e3 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -54,7 +54,7 @@ Would serialize to the following representation. { 'album_name': 'Things We Lost In The Fire', - 'artist': 'Low' + 'artist': 'Low', 'tracks': [ '1: Sunflower', '2: Whitetail', @@ -86,7 +86,7 @@ Would serialize to a representation like this: { 'album_name': 'The Roots', - 'artist': 'Undun' + 'artist': 'Undun', 'tracks': [ 89, 90, @@ -121,7 +121,7 @@ Would serialize to a representation like this: { 'album_name': 'Graceland', - 'artist': 'Paul Simon' + 'artist': 'Paul Simon', 'tracks': [ 'http://www.example.com/api/tracks/45/', 'http://www.example.com/api/tracks/46/', @@ -159,7 +159,7 @@ Would serialize to a representation like this: { 'album_name': 'Dear John', - 'artist': 'Loney Dear' + 'artist': 'Loney Dear', 'tracks': [ 'Airport Surroundings', 'Everything Turns to You', @@ -194,7 +194,7 @@ Would serialize to a representation like this: { 'album_name': 'The Eraser', - 'artist': 'Thom Yorke' + 'artist': 'Thom Yorke', 'track_listing': 'http://www.example.com/api/track_list/12/', } @@ -234,7 +234,7 @@ Would serialize to a nested representation like this: { 'album_name': 'The Grey Album', - 'artist': 'Danger Mouse' + 'artist': 'Danger Mouse', 'tracks': [ {'order': 1, 'title': 'Public Service Announcement'}, {'order': 2, 'title': 'What More Can I Say'}, @@ -271,7 +271,7 @@ This custom field would then serialize to the following representation. { 'album_name': 'Sometimes I Wish We Were an Eagle', - 'artist': 'Bill Callahan' + 'artist': 'Bill Callahan', 'tracks': [ 'Track 1: Jim Cain (04:39)', 'Track 2: Eid Ma Clack Shaw (04:19)', From c6be12f02b5e07e412c8c91b368566a85364b907 Mon Sep 17 00:00:00 2001 From: Colin Huang Date: Sun, 15 Sep 2013 18:03:52 -0700 Subject: [PATCH 0197/1652] [Fix]: Error with partial=True and validate_ The error occurs when serializer is set with partial=True and a field-level validation is defined on a field, for which there's no corresponding update value in .data --- rest_framework/serializers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index a63c7f6c2..0b5ae042a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -255,10 +255,13 @@ class BaseSerializer(WritableField): for field_name, field in self.fields.items(): if field_name in self._errors: continue + + source = field.source or field_name + if self.partial and source not in attrs: + continue try: validate_method = getattr(self, 'validate_%s' % field_name, None) if validate_method: - source = field.source or field_name attrs = validate_method(attrs, source) except ValidationError as err: self._errors[field_name] = self._errors.get(field_name, []) + list(err.messages) From e83bc003234418fc6b21b841de216319491bd38d Mon Sep 17 00:00:00 2001 From: Rikki Date: Wed, 16 Oct 2013 03:03:51 +0100 Subject: [PATCH 0198/1652] Added name of file to edit So reader doesn't have to remember, or check through all the files to find where this code fragment was, mention the file name when it is relevant. --- docs/tutorial/2-requests-and-responses.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 6ff97f37d..ba9eb7237 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -35,7 +35,7 @@ The wrappers also provide behaviour such as returning `405 Method Not Allowed` r Okay, let's go ahead and start using these new components to write a few views. -We don't need our `JSONResponse` class anymore, so go ahead and delete that. Once that's done we can start refactoring our views slightly. +We don't need our `JSONResponse` class in `views.py` anymore, so go ahead and delete that. Once that's done we can start refactoring our views slightly. from rest_framework import status from rest_framework.decorators import api_view @@ -64,7 +64,7 @@ We don't need our `JSONResponse` class anymore, so go ahead and delete that. On Our instance view is an improvement over the previous example. It's a little more concise, and the code now feels very similar to if we were working with the Forms API. We're also using named status codes, which makes the response meanings more obvious. -Here is the view for an individual snippet. +Here is the view for an individual snippet (still in `views.py`). @api_view(['GET', 'PUT', 'DELETE']) def snippet_detail(request, pk): From cb123e896ed2dca230088296db9663af5a53252d Mon Sep 17 00:00:00 2001 From: Rikki Date: Wed, 16 Oct 2013 03:08:43 +0100 Subject: [PATCH 0199/1652] Mention name of file to edit To reduce unnecessary cognitive load of the learner, name the file they are putting this code in. --- docs/tutorial/3-class-based-views.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md index 9fc424fee..67a75d9f4 100644 --- a/docs/tutorial/3-class-based-views.md +++ b/docs/tutorial/3-class-based-views.md @@ -4,7 +4,7 @@ We can also write our API views using class based views, rather than function ba ## Rewriting our API using class based views -We'll start by rewriting the root view as a class based view. All this involves is a little bit of refactoring. +We'll start by rewriting the root view as a class based view. All this involves is a little bit of refactoring of `views.py`. from snippets.models import Snippet from snippets.serializers import SnippetSerializer @@ -30,7 +30,7 @@ We'll start by rewriting the root view as a class based view. All this involves return Response(serializer.data, status=status.HTTP_201_CREATED) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) -So far, so good. It looks pretty similar to the previous case, but we've got better separation between the different HTTP methods. We'll also need to update the instance view. +So far, so good. It looks pretty similar to the previous case, but we've got better separation between the different HTTP methods. We'll also need to update the instance view in `views.py`. class SnippetDetail(APIView): """ @@ -62,7 +62,7 @@ So far, so good. It looks pretty similar to the previous case, but we've got be That's looking good. Again, it's still pretty similar to the function based view right now. -We'll also need to refactor our URLconf slightly now we're using class based views. +We'll also need to refactor our `urls.py` slightly now we're using class based views. from django.conf.urls import patterns, url from rest_framework.urlpatterns import format_suffix_patterns @@ -83,7 +83,7 @@ One of the big wins of using class based views is that it allows us to easily co The create/retrieve/update/delete operations that we've been using so far are going to be pretty similar for any model-backed API views we create. Those bits of common behaviour are implemented in REST framework's mixin classes. -Let's take a look at how we can compose our views by using the mixin classes. +Let's take a look at how we can compose our `views.py` by using the mixin classes. from snippets.models import Snippet from snippets.serializers import SnippetSerializer @@ -126,7 +126,7 @@ Pretty similar. Again we're using the `GenericAPIView` class to provide the cor ## Using generic class based views -Using the mixin classes we've rewritten the views to use slightly less code than before, but we can go one step further. REST framework provides a set of already mixed-in generic views that we can use. +Using the mixin classes we've rewritten the views to use slightly less code than before, but we can go one step further. REST framework provides a set of already mixed-in generic views that we can use to trim down `views.py` even more. from snippets.models import Snippet from snippets.serializers import SnippetSerializer From bf6084895263f827a80191fd6ed4eb437b555f9a Mon Sep 17 00:00:00 2001 From: Rikki Date: Wed, 16 Oct 2013 03:21:43 +0100 Subject: [PATCH 0200/1652] Using the filenames where relevant Sometimes it's hard to tell which file the code is intended to go in. Now it spells it out. --- docs/tutorial/4-authentication-and-permissions.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 510aa2439..ecf92a7b1 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -12,7 +12,7 @@ Currently our API doesn't have any restrictions on who can edit or delete code s We're going to make a couple of changes to our `Snippet` model class. First, let's add a couple of fields. One of those fields will be used to represent the user who created the code snippet. The other field will be used to store the highlighted HTML representation of the code. -Add the following two fields to the model. +Add the following two fields to the `Snippet` model in `models.py`. owner = models.ForeignKey('auth.User', related_name='snippets') highlighted = models.TextField() @@ -52,7 +52,7 @@ You might also want to create a few different users, to use for testing the API. ## Adding endpoints for our User models -Now that we've got some users to work with, we'd better add representations of those users to our API. Creating a new serializer is easy: +Now that we've got some users to work with, we'd better add representations of those users to our API. Creating a new serializer is easy. In `serializers.py` add: from django.contrib.auth.models import User @@ -65,7 +65,7 @@ Now that we've got some users to work with, we'd better add representations of t Because `'snippets'` is a *reverse* relationship on the User model, it will not be included by default when using the `ModelSerializer` class, so we needed to add an explicit field for it. -We'll also add a couple of views. We'd like to just use read-only views for the user representations, so we'll use the `ListAPIView` and `RetrieveAPIView` generic class based views. +We'll also add a couple of views to `views.py`. We'd like to just use read-only views for the user representations, so we'll use the `ListAPIView` and `RetrieveAPIView` generic class based views. class UserList(generics.ListAPIView): queryset = User.objects.all() @@ -80,7 +80,7 @@ Make sure to also import the `UserSerializer` class from snippets.serializers import UserSerializer -Finally we need to add those views into the API, by referencing them from the URL conf. +Finally we need to add those views into the API, by referencing them from the URL conf. Add the following to the patterns in `urls.py`. url(r'^users/$', views.UserList.as_view()), url(r'^users/(?P[0-9]+)/$', views.UserDetail.as_view()), @@ -98,7 +98,7 @@ On **both** the `SnippetList` and `SnippetDetail` view classes, add the followin ## Updating our serializer -Now that snippets are associated with the user that created them, let's update our `SnippetSerializer` to reflect that. Add the following field to the serializer definition: +Now that snippets are associated with the user that created them, let's update our `SnippetSerializer` to reflect that. Add the following field to the serializer definition in `serializers.py`: owner = serializers.Field(source='owner.username') From d31fd33f4bbd52fa60949b15c2614528991e2c7a Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Tue, 8 Oct 2013 16:15:15 +0200 Subject: [PATCH 0201/1652] Allow to customize description so that markup can be accepted if needed. --- rest_framework/templates/rest_framework/base.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 33be36db8..7ab17dff4 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -110,7 +110,9 @@

    {{ name }}

    + {% block description %} {{ description }} + {% endblock %} 
    {{ request.method }} {{ request.get_full_path }}
    From 8a5fea06f01ed4c5114ec0743516b6e6179c88b4 Mon Sep 17 00:00:00 2001 From: badaud_t Date: Thu, 17 Oct 2013 01:07:50 +0200 Subject: [PATCH 0202/1652] Fix typo YAMLRendererTests --- rest_framework/tests/test_renderers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/tests/test_renderers.py b/rest_framework/tests/test_renderers.py index df6f4aa63..78a7dac89 100644 --- a/rest_framework/tests/test_renderers.py +++ b/rest_framework/tests/test_renderers.py @@ -328,7 +328,7 @@ if yaml: class YAMLRendererTests(TestCase): """ - Tests specific to the JSON Renderer + Tests specific to the YAML Renderer """ def test_render(self): From b730aec0f46e2b849b3c597bcf1a1bcdc158e415 Mon Sep 17 00:00:00 2001 From: badaud_t Date: Thu, 17 Oct 2013 01:08:24 +0200 Subject: [PATCH 0203/1652] Fix decimal support with YAMLRenderer --- rest_framework/tests/test_renderers.py | 11 +++++++++++ rest_framework/utils/encoders.py | 3 +++ 2 files changed, 14 insertions(+) diff --git a/rest_framework/tests/test_renderers.py b/rest_framework/tests/test_renderers.py index 78a7dac89..76299a890 100644 --- a/rest_framework/tests/test_renderers.py +++ b/rest_framework/tests/test_renderers.py @@ -354,6 +354,17 @@ if yaml: data = parser.parse(StringIO(content)) self.assertEqual(obj, data) + def test_render_decimal(self): + """ + Test YAML decimal rendering. + """ + renderer = YAMLRenderer() + content = renderer.render({'field': Decimal('111.2')}, 'application/yaml') + self.assertYAMLContains(content, "field: '111.2'") + + def assertYAMLContains(self, content, string): + self.assertTrue(string in content, '%r not in %r' % (string, content)) + class XMLRendererTestCase(TestCase): """ diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 7efd5417b..35ad206b9 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -89,6 +89,9 @@ else: node.flow_style = best_style return node + SafeDumper.add_representer(decimal.Decimal, + SafeDumper.represent_decimal) + SafeDumper.add_representer(SortedDict, yaml.representer.SafeRepresenter.represent_dict) SafeDumper.add_representer(DictWithMetadata, From 545ee013e332db0a81e5bd82b76f30b7d2d08b12 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 17 Oct 2013 09:40:06 +0100 Subject: [PATCH 0204/1652] Added @badale, for work on #1179. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 586bb0f00..9a20028cd 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -171,6 +171,7 @@ The following people have helped make REST framework great. * Tai Lee - [mrmachine] * Markus Kaiserswerth - [mkai] * Henry Clifford - [hcliff] +* Thomas Badaud - [badale] Many thanks to everyone who's contributed to the project. @@ -378,3 +379,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [mrmachine]: https://github.com/mrmachine [mkai]: https://github.com/mkai [hcliff]: https://github.com/hcliff +[badale]: https://github.com/badale From cc3c16eaa09c7dc63592ae8bf4ee30f1af263be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Reni=C3=A9?= Date: Mon, 14 Oct 2013 16:28:32 +0200 Subject: [PATCH 0205/1652] Fix a docstring to reflect what the method does --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 33db82ee1..6801e24d4 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -912,7 +912,7 @@ class ModelSerializer(Serializer): def save_object(self, obj, **kwargs): """ - Save the deserialized object and return it. + Save the deserialized object. """ if getattr(obj, '_nested_forward_relations', None): # Nested relationships need to be saved before we can save the From daf927ef68ce992055e8b7bc1a07cf03ee67b742 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 17 Oct 2013 12:28:58 -0700 Subject: [PATCH 0206/1652] add @tamakisquare for work on #1111 --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 9a20028cd..e9c45965d 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -172,6 +172,7 @@ The following people have helped make REST framework great. * Markus Kaiserswerth - [mkai] * Henry Clifford - [hcliff] * Thomas Badaud - [badale] +* Colin Huang - [tamakisquare] Many thanks to everyone who's contributed to the project. @@ -380,3 +381,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [mkai]: https://github.com/mkai [hcliff]: https://github.com/hcliff [badale]: https://github.com/badale +[tamakisquare]: https://github.com/tamakisquare From 78c8e6de40f89580b9a4cefb6595d52bc1a6afbc Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 18 Oct 2013 09:10:54 +0100 Subject: [PATCH 0207/1652] Update 2-requests-and-responses.md --- docs/tutorial/2-requests-and-responses.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index ba9eb7237..7fa4f3e4a 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -64,7 +64,7 @@ We don't need our `JSONResponse` class in `views.py` anymore, so go ahead and de Our instance view is an improvement over the previous example. It's a little more concise, and the code now feels very similar to if we were working with the Forms API. We're also using named status codes, which makes the response meanings more obvious. -Here is the view for an individual snippet (still in `views.py`). +Here is the view for an individual snippet, in the `views.py` module. @api_view(['GET', 'PUT', 'DELETE']) def snippet_detail(request, pk): From c3aeb16557f2cbb1c1218b5af7bab646e4958234 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 18 Oct 2013 09:32:04 +0100 Subject: [PATCH 0208/1652] Update 3-class-based-views.md --- docs/tutorial/3-class-based-views.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md index 67a75d9f4..b37bc31bd 100644 --- a/docs/tutorial/3-class-based-views.md +++ b/docs/tutorial/3-class-based-views.md @@ -83,7 +83,7 @@ One of the big wins of using class based views is that it allows us to easily co The create/retrieve/update/delete operations that we've been using so far are going to be pretty similar for any model-backed API views we create. Those bits of common behaviour are implemented in REST framework's mixin classes. -Let's take a look at how we can compose our `views.py` by using the mixin classes. +Let's take a look at how we can compose the views by using the mixin classes. Here's our `views.py` module again. from snippets.models import Snippet from snippets.serializers import SnippetSerializer @@ -126,7 +126,7 @@ Pretty similar. Again we're using the `GenericAPIView` class to provide the cor ## Using generic class based views -Using the mixin classes we've rewritten the views to use slightly less code than before, but we can go one step further. REST framework provides a set of already mixed-in generic views that we can use to trim down `views.py` even more. +Using the mixin classes we've rewritten the views to use slightly less code than before, but we can go one step further. REST framework provides a set of already mixed-in generic views that we can use to trim down our `views.py` module even more. from snippets.models import Snippet from snippets.serializers import SnippetSerializer From 735c75abb9e612fa0f1e6bdfa4283610752056d2 Mon Sep 17 00:00:00 2001 From: dpetzel Date: Fri, 18 Oct 2013 21:10:49 -0400 Subject: [PATCH 0209/1652] add test case around ensuring proper field inference for boolean model field types --- rest_framework/tests/models.py | 1 + rest_framework/tests/test_serializer.py | 32 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py index 1598ecd94..32a726c0b 100644 --- a/rest_framework/tests/models.py +++ b/rest_framework/tests/models.py @@ -70,6 +70,7 @@ class Comment(RESTFrameworkModel): class ActionItem(RESTFrameworkModel): title = models.CharField(max_length=200) + started = models.NullBooleanField(default=False) done = models.BooleanField(default=False) info = CustomField(default='---', max_length=12) diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index 1f85a4749..a7ea3ac0b 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -1720,3 +1720,35 @@ class TestSerializerTransformMethods(TestCase): 'b_renamed': None, } ) + +class BoolenFieldTypeTest(TestCase): + ''' + Ensure the various Boolean based model fields are rendered as the proper + field type + + ''' + + def setUp(self): + ''' + Setup an ActionItemSerializer for BooleanTesting + ''' + data = { + 'title': 'b' * 201, + } + self.serializer = ActionItemSerializer(data=data) + + def test_booleanfield_type(self): + ''' + Test that BooleanField is infered from models.BooleanField + ''' + bfield = self.serializer.get_fields()['done'] + self.assertEqual(type(bfield), fields.BooleanField) + + def test_nullbooleanfield_type(self): + ''' + Test that BooleanField is infered from models.NullBooleanField + + https://groups.google.com/forum/#!topic/django-rest-framework/D9mXEftpuQ8 + ''' + bfield = self.serializer.get_fields()['started'] + self.assertEqual(type(bfield), fields.BooleanField) From 17a00be830a3b8861be5014e94850f7a8f4ecd25 Mon Sep 17 00:00:00 2001 From: dpetzel Date: Fri, 18 Oct 2013 21:13:20 -0400 Subject: [PATCH 0210/1652] This fix results in models.NullBooleanField rendering as a checkbox in the browsable API --- rest_framework/serializers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 4210d058b..f30f1fd8b 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -606,6 +606,7 @@ class ModelSerializer(Serializer): models.TextField: CharField, models.CommaSeparatedIntegerField: CharField, models.BooleanField: BooleanField, + models.NullBooleanField: BooleanField, models.FileField: FileField, models.ImageField: ImageField, } From 63e6a3b4925bf54e80ae63502a0353136e846b31 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Sat, 19 Oct 2013 20:43:23 -0700 Subject: [PATCH 0211/1652] paginator should validate page and provide default - use the standard paginator.validate_number method rather strict_postive_int. - support optional paginator method, default_page_number, to get the default page number rather than hard-coding it to 1 - this allows supporting non-integer based pagination which can be an important performance tweak on extermely large datasets or high request loads - relatively thorough unit tests of the changes --- rest_framework/generics.py | 14 +++- rest_framework/tests/test_pagination.py | 88 +++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 3 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 4f134bce6..6b42a1d5f 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -145,10 +145,18 @@ class GenericAPIView(views.APIView): allow_empty_first_page=self.allow_empty) page_kwarg = self.kwargs.get(self.page_kwarg) page_query_param = self.request.QUERY_PARAMS.get(self.page_kwarg) - page = page_kwarg or page_query_param or 1 + page = page_kwarg or page_query_param + if not page: + # we didn't recieve a page + if hasattr(paginator, 'default_page_number'): + # our paginator has a method that will provide a default + page = paginator.default_page_number() + else: + # fall back on the base default value + page = 1 try: - page_number = strict_positive_int(page) - except ValueError: + page_number = paginator.validate_number(page) + except InvalidPage: if page == 'last': page_number = paginator.num_pages else: diff --git a/rest_framework/tests/test_pagination.py b/rest_framework/tests/test_pagination.py index d6bc7895c..a1118f1ec 100644 --- a/rest_framework/tests/test_pagination.py +++ b/rest_framework/tests/test_pagination.py @@ -430,3 +430,91 @@ class TestCustomPaginationSerializer(TestCase): 'objects': ['john', 'paul'] } self.assertEqual(serializer.data, expected) + + +class NonIntegerPage(object): + + def __init__(self, paginator, object_list, prev_token, token, next_token): + self.paginator = paginator + self.object_list = object_list + self.prev_token = prev_token + self.token = token + self.next_token = next_token + + def has_next(self): + return not not self.next_token + + def next_page_number(self): + return self.next_token + + def has_previous(self): + return not not self.prev_token + + def previous_page_number(self): + return self.prev_token + + +class NonIntegerPaginator(object): + + def __init__(self, object_list, per_page): + self.object_list = object_list + self.per_page = per_page + + def count(self): + # pretend like we don't know how many pages we have + return None + + def default_page_token(self): + return None + + def page(self, token=None): + if token: + try: + first = self.object_list.index(token) + except ValueError: + first = 0 + else: + first = 0 + n = len(self.object_list) + last = min(first + self.per_page, n) + prev_token = self.object_list[last - (2 * self.per_page)] if first else None + next_token = self.object_list[last] if last < n else None + return NonIntegerPage(self, self.object_list[first:last], prev_token, token, next_token) + + +class TestNonIntegerPagination(TestCase): + + + def test_custom_pagination_serializer(self): + objects = ['john', 'paul', 'george', 'ringo'] + paginator = NonIntegerPaginator(objects, 2) + + request = APIRequestFactory().get('/foobar') + serializer = CustomPaginationSerializer( + instance=paginator.page(), + context={'request': request} + ) + expected = { + 'links': { + 'next': 'http://testserver/foobar?page={0}'.format(objects[2]), + 'prev': None + }, + 'total_results': None, + 'objects': objects[:2] + } + self.assertEqual(serializer.data, expected) + + request = APIRequestFactory().get('/foobar') + serializer = CustomPaginationSerializer( + instance=paginator.page('george'), + context={'request': request} + ) + expected = { + 'links': { + 'next': None, + 'prev': 'http://testserver/foobar?page={0}'.format(objects[0]), + }, + 'total_results': None, + 'objects': objects[2:] + } + self.assertEqual(serializer.data, expected) From ed9c3258a6f9df6fabb569a65f3eb3363affa523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 21 Oct 2013 10:24:06 +0200 Subject: [PATCH 0212/1652] Remove the detail=None from APIException signature The documentation not match with the implementation. The APIException doesn't have detail parameter in the constructor class, actually doesn't have constructor method at all. --- docs/api-guide/exceptions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index 0c48783a3..c46d415e4 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -82,7 +82,7 @@ Note that the exception handler will only be called for responses generated by r ## APIException -**Signature:** `APIException(detail=None)` +**Signature:** `APIException()` The **base class** for all exceptions raised inside REST framework. From 70b0798118c8c02903421bca03e0406fe65d737f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 21 Oct 2013 09:30:01 +0100 Subject: [PATCH 0213/1652] Add invite signup --- docs/template.html | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/docs/template.html b/docs/template.html index a20c81110..749d0afe3 100644 --- a/docs/template.html +++ b/docs/template.html @@ -167,7 +167,32 @@
      {{ toc }} +
      +
      + +

      The team behind REST framework are launching a new API service.

      + +

      If you want to be first in line when we start issuing invitations, please sign up here:

      + + + + +
      + + +
      + +
      +
    + + +
    From 76672787cdba6a4ab8173b51fa099c910556889b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 21 Oct 2013 09:47:07 +0100 Subject: [PATCH 0214/1652] Added . Closes #1188. --- docs/api-guide/generic-views.md | 3 ++- rest_framework/generics.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index dc0076dff..24fc0bc71 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -65,7 +65,8 @@ The following attributes control the basic view behavior. * `queryset` - The queryset that should be used for returning objects from this view. Typically, you must either set this attribute, or override the `get_queryset()` method. * `serializer_class` - The serializer class that should be used for validating and deserializing input, and for serializing output. Typically, you must either set this attribute, or override the `get_serializer_class()` method. -* `lookup_field` - The field that should be used to lookup individual model instances. Defaults to `'pk'`. The URL conf should include a keyword argument corresponding to this value. More complex lookup styles can be supported by overriding the `get_object()` method. Note that when using hyperlinked APIs you'll need to ensure that *both* the API views *and* the serializer classes use lookup fields that correctly correspond with the URL conf. +* `lookup_field` - The model field that should be used to for performing object lookup of individual model instances. Defaults to `'pk'`. Note that when using hyperlinked APIs you'll need to ensure that *both* the API views *and* the serializer classes set the lookup fields if you need to use a custom value. +* `lookup_url_kwarg` - The URL keyword argument that should be used for object lookup. The URL conf should include a keyword argument corresponding to this value. If unset this defaults to using the same value as `lookup_field`. **Shortcuts**: diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 4f134bce6..f46dea762 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -54,6 +54,7 @@ class GenericAPIView(views.APIView): # If you want to use object lookups other than pk, set this attribute. # For more complex lookup requirements override `get_object()`. lookup_field = 'pk' + lookup_url_kwarg = None # Pagination settings paginate_by = api_settings.PAGINATE_BY @@ -278,9 +279,11 @@ class GenericAPIView(views.APIView): pass # Deprecation warning # Perform the lookup filtering. + # Note that `pk` and `slug` are deprecated styles of lookup filtering. + lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field + lookup = self.kwargs.get(lookup_url_kwarg, None) pk = self.kwargs.get(self.pk_url_kwarg, None) slug = self.kwargs.get(self.slug_url_kwarg, None) - lookup = self.kwargs.get(self.lookup_field, None) if lookup is not None: filter_kwargs = {self.lookup_field: lookup} From 216ac8a5c1ba39bf24e4e91b6fac7e0ac1dee7e4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 21 Oct 2013 17:19:28 +0100 Subject: [PATCH 0215/1652] Use lookup_url_kwarg in presave if required --- rest_framework/mixins.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 426865ff9..4606c78b6 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -158,7 +158,8 @@ class UpdateModelMixin(object): Set any attributes on the object that are implicit in the request. """ # pk and/or slug attributes are implicit in the URL. - lookup = self.kwargs.get(self.lookup_field, None) + lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field + lookup = self.kwargs.get(lookup_url_kwarg, None) pk = self.kwargs.get(self.pk_url_kwarg, None) slug = self.kwargs.get(self.slug_url_kwarg, None) slug_field = slug and self.slug_field or None From f0a129dcda3d671b88b5049d9ddaec53a4b32faf Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Mon, 21 Oct 2013 14:23:06 -0700 Subject: [PATCH 0216/1652] retract the default page stuff. better way comming in a seperate pr --- rest_framework/generics.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 6b42a1d5f..4015ab20a 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -145,15 +145,7 @@ class GenericAPIView(views.APIView): allow_empty_first_page=self.allow_empty) page_kwarg = self.kwargs.get(self.page_kwarg) page_query_param = self.request.QUERY_PARAMS.get(self.page_kwarg) - page = page_kwarg or page_query_param - if not page: - # we didn't recieve a page - if hasattr(paginator, 'default_page_number'): - # our paginator has a method that will provide a default - page = paginator.default_page_number() - else: - # fall back on the base default value - page = 1 + page = page_kwarg or page_query_param or 1 try: page_number = paginator.validate_number(page) except InvalidPage: From c36122a7ba2cdc69f94f5732f26428329be54200 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Mon, 21 Oct 2013 14:26:21 -0700 Subject: [PATCH 0217/1652] remove stray func from test --- rest_framework/tests/test_pagination.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/rest_framework/tests/test_pagination.py b/rest_framework/tests/test_pagination.py index a1118f1ec..cadb515fa 100644 --- a/rest_framework/tests/test_pagination.py +++ b/rest_framework/tests/test_pagination.py @@ -464,9 +464,6 @@ class NonIntegerPaginator(object): # pretend like we don't know how many pages we have return None - def default_page_token(self): - return None - def page(self, token=None): if token: try: From fa87fac61b87858e80788fc233591fa11dbc18e7 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 22 Oct 2013 10:21:06 +0100 Subject: [PATCH 0218/1652] Added @ross for work on #1187. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index e9c45965d..cd3b37107 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -173,6 +173,7 @@ The following people have helped make REST framework great. * Henry Clifford - [hcliff] * Thomas Badaud - [badale] * Colin Huang - [tamakisquare] +* Ross McFarland - [ross] Many thanks to everyone who's contributed to the project. @@ -382,3 +383,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [hcliff]: https://github.com/hcliff [badale]: https://github.com/badale [tamakisquare]: https://github.com/tamakisquare +[ross]: https://github.com/ross From 25c9d552c05527f4b8b257d59cd7be39005f3668 Mon Sep 17 00:00:00 2001 From: Jacek Bzdak Date: Tue, 22 Oct 2013 13:11:14 +0200 Subject: [PATCH 0219/1652] Explained a bit more about django-filter implementation. Well, I spent some time trying to gues how djang-filter works, and if this changes would be introduced, I would have saved this time. --- docs/api-guide/filtering.md | 43 +++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 784aa585e..bcb0bb413 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -165,8 +165,8 @@ For more advanced filtering requirements you can specify a `FilterSet` class tha from rest_framework import generics class ProductFilter(django_filters.FilterSet): - min_price = django_filters.NumberFilter(lookup_type='gte') - max_price = django_filters.NumberFilter(lookup_type='lte') + min_price = django_filters.NumberFilter(name="price", lookup_type='gte') + max_price = django_filters.NumberFilter(name="price", lookup_type='lte') class Meta: model = Product fields = ['category', 'in_stock', 'min_price', 'max_price'] @@ -176,12 +176,51 @@ For more advanced filtering requirements you can specify a `FilterSet` class tha serializer_class = ProductSerializer filter_class = ProductFilter + Which will allow you to make requests such as: http://example.com/api/products?category=clothing&max_price=10.00 For more details on using filter sets see the [django-filter documentation][django-filter-docs]. +You can also span relationships using `django-filter`, let's assume that each +product has foreign key to `Manufacturer` model, so we create filter that +filters using `Manufacturer` name. For example: + + import django_filters + from myapp.models import Product + from myapp.serializers import ProductSerializer + from rest_framework import generics + + class ProductFilter(django_filters.FilterSet): + class Meta: + model = Product + fields = ['category', 'in_stock', 'manufacturer__name`] + +This enables us to make queries like: + + http://example.com/api/products?manufacturer__name=foo + +This is nice, but it shows underlying model structure in REST API, which may +be undesired, but you can use: + + import django_filters + from myapp.models import Product + from myapp.serializers import ProductSerializer + from rest_framework import generics + + class ProductFilter(django_filters.FilterSet): + + manufacturer = django_filters.CharFilter(name="manufacturer__name") + + class Meta: + model = Product + fields = ['category', 'in_stock', 'manufacturer`] + +And now you can execute: + + http://example.com/api/products?manufacturer=foo + --- **Hints & Tips** From cc9c7cd8a479b7fa76a66b8669e4a62fd78be867 Mon Sep 17 00:00:00 2001 From: Jacek Bzdak Date: Tue, 22 Oct 2013 13:15:48 +0200 Subject: [PATCH 0220/1652] Small documentation fix --- docs/api-guide/filtering.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index bcb0bb413..a0132ffcb 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -181,8 +181,6 @@ Which will allow you to make requests such as: http://example.com/api/products?category=clothing&max_price=10.00 -For more details on using filter sets see the [django-filter documentation][django-filter-docs]. - You can also span relationships using `django-filter`, let's assume that each product has foreign key to `Manufacturer` model, so we create filter that filters using `Manufacturer` name. For example: @@ -220,6 +218,8 @@ be undesired, but you can use: And now you can execute: http://example.com/api/products?manufacturer=foo + +For more details on using filter sets see the [django-filter documentation][django-filter-docs]. --- From f92d8bd9721d788e3017c16fb285189c88112a46 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 22 Oct 2013 12:21:26 +0100 Subject: [PATCH 0221/1652] Added @jbzdak, for the nice docs improvements in #1191. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index cd3b37107..bcf77b032 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -174,6 +174,7 @@ The following people have helped make REST framework great. * Thomas Badaud - [badale] * Colin Huang - [tamakisquare] * Ross McFarland - [ross] +* Jacek Bzdak - [jbzdak] Many thanks to everyone who's contributed to the project. @@ -384,3 +385,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [badale]: https://github.com/badale [tamakisquare]: https://github.com/tamakisquare [ross]: https://github.com/ross +[jbzdak]: https://github.com/jbzdak From 6b3500b684a43fb67c42231859fa27cf5193298a Mon Sep 17 00:00:00 2001 From: alexanderlukanin13 Date: Thu, 24 Oct 2013 17:52:52 +0600 Subject: [PATCH 0222/1652] Fixed UnicodeEncodeError when POST JSON via web interface; added test --- rest_framework/request.py | 2 +- rest_framework/tests/test_request.py | 32 +++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index 977d4d965..b883d0d4f 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -334,7 +334,7 @@ class Request(object): self._CONTENT_PARAM in self._data and self._CONTENTTYPE_PARAM in self._data): self._content_type = self._data[self._CONTENTTYPE_PARAM] - self._stream = BytesIO(self._data[self._CONTENT_PARAM].encode(HTTP_HEADER_ENCODING)) + self._stream = BytesIO(self._data[self._CONTENT_PARAM].encode(self.parser_context['encoding'])) self._data, self._files = (Empty, Empty) def _parse(self): diff --git a/rest_framework/tests/test_request.py b/rest_framework/tests/test_request.py index 969d8024a..a60e7615e 100644 --- a/rest_framework/tests/test_request.py +++ b/rest_framework/tests/test_request.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals from django.contrib.auth.models import User from django.contrib.auth import authenticate, login, logout from django.contrib.sessions.middleware import SessionMiddleware +from django.core.handlers.wsgi import WSGIRequest from django.test import TestCase from rest_framework import status from rest_framework.authentication import SessionAuthentication @@ -15,12 +16,13 @@ from rest_framework.parsers import ( MultiPartParser, JSONParser ) -from rest_framework.request import Request +from rest_framework.request import Request, Empty from rest_framework.response import Response from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory, APIClient from rest_framework.views import APIView from rest_framework.compat import six +from io import BytesIO import json @@ -146,6 +148,34 @@ class TestContentParsing(TestCase): request.parsers = (JSONParser(), ) self.assertEqual(request.DATA, json_data) + def test_form_POST_unicode(self): + """ + JSON POST via default web interface with unicode data + """ + # Note: environ and other variables here have simplified content compared to real Request + CONTENT = b'_content_type=application%2Fjson&_content=%7B%22request%22%3A+4%2C+%22firm%22%3A+1%2C+%22text%22%3A+%22%D0%9F%D1%80%D0%B8%D0%B2%D0%B5%D1%82%21%22%7D' + environ = { + 'REQUEST_METHOD': 'POST', + 'CONTENT_TYPE': 'application/x-www-form-urlencoded', + 'CONTENT_LENGTH': len(CONTENT), + 'wsgi.input': BytesIO(CONTENT), + } + wsgi_request = WSGIRequest(environ=environ) + wsgi_request._load_post_and_files() + parsers = (JSONParser(), FormParser(), MultiPartParser()) + parser_context = { + 'encoding': 'utf-8', + 'kwargs': {}, + 'args': (), + } + request = Request(wsgi_request, parsers=parsers, parser_context=parser_context) + method = request.method + self.assertEqual(method, 'POST') + self.assertEqual(request._content_type, 'application/json') + self.assertEqual(request._stream.getvalue(), b'{"request": 4, "firm": 1, "text": "\xd0\x9f\xd1\x80\xd0\xb8\xd0\xb2\xd0\xb5\xd1\x82!"}') + self.assertEqual(request._data, Empty) + self.assertEqual(request._files, Empty) + # def test_accessing_post_after_data_form(self): # """ # Ensures request.POST can be accessed after request.DATA in From 63023078856e78fa043df96378137fd7acc2c1de Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 24 Oct 2013 13:45:16 +0100 Subject: [PATCH 0223/1652] Update comment in `get_parser_context`. --- rest_framework/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index 853e64614..e863af6dd 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -154,8 +154,8 @@ class APIView(View): Returns a dict that is passed through to Parser.parse(), as the `parser_context` keyword argument. """ - # Note: Additionally `request` will also be added to the context - # by the Request object. + # Note: Additionally `request` and `encoding` will also be added + # to the context by the Request object. return { 'view': self, 'args': getattr(self, 'args', ()), From 4d894fd39ec5670e72756c26908468fd743354c6 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 24 Oct 2013 13:50:05 +0100 Subject: [PATCH 0224/1652] Added @alexanderlukanin13 for fix #1198. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index bcf77b032..028dfffc8 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -175,6 +175,7 @@ The following people have helped make REST framework great. * Colin Huang - [tamakisquare] * Ross McFarland - [ross] * Jacek Bzdak - [jbzdak] +* Alexander Lukanin - [alexanderlukanin13] Many thanks to everyone who's contributed to the project. @@ -386,3 +387,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [tamakisquare]: https://github.com/tamakisquare [ross]: https://github.com/ross [jbzdak]: https://github.com/jbzdak +[alexanderlukanin13]: https://github.com/alexanderlukanin13 From c92af2b1dd25acebe440f667ede3bad4906b9b28 Mon Sep 17 00:00:00 2001 From: Yamila Date: Thu, 24 Oct 2013 15:56:53 +0200 Subject: [PATCH 0225/1652] Typo on generic-views.md --- docs/api-guide/generic-views.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 24fc0bc71..9681c8c72 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -125,7 +125,7 @@ Note that if your API doesn't include any object level permissions, you may opti Returns the class that should be used for the serializer. Defaults to returning the `serializer_class` attribute, or dynamically generating a serializer class if the `model` shortcut is being used. -May be override to provide dynamic behavior such as using different serializers for read and write operations, or providing different serializers to different types of uesr. +May be override to provide dynamic behavior such as using different serializers for read and write operations, or providing different serializers to different types of users. For example: From 82e9ddcf7a5cb5fda81e84326bb6f8181ccdffab Mon Sep 17 00:00:00 2001 From: Yamila Moreno Date: Thu, 24 Oct 2013 15:39:02 +0200 Subject: [PATCH 0226/1652] Added get_filter_backends method --- docs/api-guide/generic-views.md | 20 ++++++++++++++++++-- rest_framework/generics.py | 12 +++++++++--- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 24fc0bc71..8fedcdaa0 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -121,6 +121,22 @@ For example: Note that if your API doesn't include any object level permissions, you may optionally exclude the ``self.check_object_permissions, and simply return the object from the `get_object_or_404` lookup. +#### `get_filter_backends(self)` + +Returns the classes that should be used to filter the queryset. Defaults to returning the `filter_backends` attribute. + +May be override to provide more complex behavior with filters, as using different (or even exlusive) lists of filter_backends depending on different criteria. + +For example: + + def get_filter_backends(self): + if "geo_route" in self.request.QUERY_PARAMS: + return (GeoRouteFilter, CategoryFilter) + elif "geo_point" in self.request.QUERY_PARAMS: + return (GeoPointFilter, CategoryFilter) + + return (CategoryFilter,) + #### `get_serializer_class(self)` Returns the class that should be used for the serializer. Defaults to returning the `serializer_class` attribute, or dynamically generating a serializer class if the `model` shortcut is being used. @@ -328,7 +344,7 @@ You can then simply apply this mixin to a view or viewset anytime you need to ap serializer_class = UserSerializer lookup_fields = ('account', 'username') -Using custom mixins is a good option if you have custom behavior that needs to be used +Using custom mixins is a good option if you have custom behavior that needs to be used ## Creating custom base classes @@ -337,7 +353,7 @@ If you are using a mixin across multiple views, you can take this a step further class BaseRetrieveView(MultipleFieldLookupMixin, generics.RetrieveAPIView): pass - + class BaseRetrieveUpdateDestroyView(MultipleFieldLookupMixin, generics.RetrieveUpdateDestroyAPIView): pass diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 6d204cf5f..7cb80a84c 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -175,6 +175,14 @@ class GenericAPIView(views.APIView): method if you want to apply the configured filtering backend to the default queryset. """ + for backend in self.get_filter_backends(): + queryset = backend().filter_queryset(self.request, queryset, self) + return queryset + + def get_filter_backends(self): + """ + Returns the list of filter backends that this view requires. + """ filter_backends = self.filter_backends or [] if not filter_backends and self.filter_backend: warnings.warn( @@ -185,10 +193,8 @@ class GenericAPIView(views.APIView): PendingDeprecationWarning, stacklevel=2 ) filter_backends = [self.filter_backend] + return filter_backends - for backend in filter_backends: - queryset = backend().filter_queryset(self.request, queryset, self) - return queryset ######################## ### The following methods provide default implementations From 2ddf7869e3ce57d056c5b0546154c7bbe524cc09 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 24 Oct 2013 15:29:40 +0100 Subject: [PATCH 0227/1652] Added @yamila-moreno for work on #1199. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 028dfffc8..e6de1dbe3 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -176,6 +176,7 @@ The following people have helped make REST framework great. * Ross McFarland - [ross] * Jacek Bzdak - [jbzdak] * Alexander Lukanin - [alexanderlukanin13] +* Yamila Moreno - [yamila-moreno] Many thanks to everyone who's contributed to the project. @@ -388,3 +389,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [ross]: https://github.com/ross [jbzdak]: https://github.com/jbzdak [alexanderlukanin13]: https://github.com/alexanderlukanin13 +[yamila-moreno]: https://github.com/yamila-moreno From 7a87893b962d155f5e9d06bd0001a7f994419a2d Mon Sep 17 00:00:00 2001 From: Chris Guethle Date: Thu, 24 Oct 2013 09:40:43 -0500 Subject: [PATCH 0228/1652] reworked APIException, pushing some of the status_code and detail management up. Also, makes the APIException useful in isolation (defaults to status code 500) --- rest_framework/exceptions.py | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 425a72149..2bd21de3b 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -13,47 +13,40 @@ class APIException(Exception): Base class for REST framework exceptions. Subclasses should provide `.status_code` and `.detail` properties. """ - pass + status_code = status.HTTP_500_INTERNAL_SERVER_ERROR + default_detail = "" + + def __init__(self, detail=None, status_code=None): + self.status_code = status_code or self.status_code + self.detail = detail or self.default_detail class ParseError(APIException): status_code = status.HTTP_400_BAD_REQUEST default_detail = 'Malformed request.' - def __init__(self, detail=None): - self.detail = detail or self.default_detail - class AuthenticationFailed(APIException): status_code = status.HTTP_401_UNAUTHORIZED default_detail = 'Incorrect authentication credentials.' - def __init__(self, detail=None): - self.detail = detail or self.default_detail - class NotAuthenticated(APIException): status_code = status.HTTP_401_UNAUTHORIZED default_detail = 'Authentication credentials were not provided.' - def __init__(self, detail=None): - self.detail = detail or self.default_detail - class PermissionDenied(APIException): status_code = status.HTTP_403_FORBIDDEN default_detail = 'You do not have permission to perform this action.' - def __init__(self, detail=None): - self.detail = detail or self.default_detail - class MethodNotAllowed(APIException): status_code = status.HTTP_405_METHOD_NOT_ALLOWED default_detail = "Method '%s' not allowed." def __init__(self, method, detail=None): - self.detail = (detail or self.default_detail) % method + super(MethodNotAllowed, self).__init__((detail or self.default_detail) % method) class NotAcceptable(APIException): @@ -61,7 +54,7 @@ class NotAcceptable(APIException): default_detail = "Could not satisfy the request's Accept header" def __init__(self, detail=None, available_renderers=None): - self.detail = detail or self.default_detail + super(NotAcceptable, self).__init__(detail) self.available_renderers = available_renderers @@ -70,19 +63,19 @@ class UnsupportedMediaType(APIException): default_detail = "Unsupported media type '%s' in request." def __init__(self, media_type, detail=None): - self.detail = (detail or self.default_detail) % media_type + super(UnsupportedMediaType, self).__init__((detail or self.default_detail) % media_type) class Throttled(APIException): status_code = status.HTTP_429_TOO_MANY_REQUESTS - default_detail = "Request was throttled." + default_detail = 'Request was throttled.' extra_detail = "Expected available in %d second%s." def __init__(self, wait=None, detail=None): + super(Throttled, self).__init__(detail) + import math self.wait = wait and math.ceil(wait) or None if wait is not None: - format = detail or self.default_detail + self.extra_detail - self.detail = format % (self.wait, self.wait != 1 and 's' or '') - else: - self.detail = detail or self.default_detail + format = self.detail + self.extra_detail + self.detail = format % (self.wait, self.wait != 1 and 's' or '') \ No newline at end of file From be55a3c5c7f0c573129903e29b7c9dfc02dd5958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Rozto=C4=8Dil?= Date: Thu, 24 Oct 2013 17:53:02 +0200 Subject: [PATCH 0229/1652] Removed commented-out credits from footer to make django-debug-toolbar work. The comment, although valid, caused that the Django debug toolbar's injected HTML was partially commented-out and thus the toolbar didn't work as expected. --- rest_framework/templates/rest_framework/base.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 7ab17dff4..495163b64 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -221,9 +221,6 @@
    {% block footer %} - {% endblock %} {% block script %} From 7d5499bcac379a506f78fc0065ebe31c8d01240f Mon Sep 17 00:00:00 2001 From: Kit Randel Date: Fri, 25 Oct 2013 11:45:33 +1300 Subject: [PATCH 0230/1652] In the API test client example 'data' was not defined. There's also no need to define 'expected' as we can just test against the dict. --- docs/api-guide/testing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index 35c1f7660..4a8a91682 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -205,10 +205,10 @@ You can use any of REST framework's test case classes as you would for the regul Ensure we can create a new account object. """ url = reverse('account-list') - expected = {'name': 'DabApps'} + data = {'name': 'DabApps'} response = self.client.post(url, data, format='json') self.assertEqual(response.status_code, status.HTTP_201_CREATED) - self.assertEqual(response.data, expected) + self.assertEqual(response.data, data) --- From 458af921f36cec48ff6c27f4824d69f1aafcd18e Mon Sep 17 00:00:00 2001 From: "S. Andrew Sheppard" Date: Tue, 29 Oct 2013 15:10:06 -0500 Subject: [PATCH 0231/1652] minor typo --- rest_framework/viewsets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py index d91323f22..7eb29f99b 100644 --- a/rest_framework/viewsets.py +++ b/rest_framework/viewsets.py @@ -9,7 +9,7 @@ Actions are only bound to methods at the point of instantiating the views. user_detail = UserViewSet.as_view({'get': 'retrieve'}) Typically, rather than instantiate views from viewsets directly, you'll -regsiter the viewset with a router and let the URL conf be determined +register the viewset with a router and let the URL conf be determined automatically. router = DefaultRouter() From f72488d60915f2f77234bc75ccfd604cc6a4143f Mon Sep 17 00:00:00 2001 From: erkarl Date: Thu, 31 Oct 2013 03:47:23 +0200 Subject: [PATCH 0232/1652] Updated OAuth2 authentication docs. --- docs/api-guide/authentication.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 7caeac1e2..1a1c68b84 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -265,6 +265,12 @@ This authentication class depends on the optional [django-oauth2-provider][djang 'provider.oauth2', ) +Then add `OAuth2Authentication` to your global `DEFAULT_AUTHENTICATION` setting: + + 'DEFAULT_AUTHENTICATION_CLASSES': ( + 'rest_framework.authentication.OAuth2Authentication', + ), + You must also include the following in your root `urls.py` module: url(r'^oauth2/', include('provider.oauth2.urls', namespace='oauth2')), From e33435d0da0dba13fae39070b3d87ad8af47862f Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Thu, 31 Oct 2013 15:03:50 -0700 Subject: [PATCH 0233/1652] Fixed exception handling with YAML and XML parsers. --- rest_framework/parsers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index 98fc03417..f1b3e38d4 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -83,7 +83,7 @@ class YAMLParser(BaseParser): data = stream.read().decode(encoding) return yaml.safe_load(data) except (ValueError, yaml.parser.ParserError) as exc: - raise ParseError('YAML parse error - %s' % six.u(exc)) + raise ParseError('YAML parse error - %s' % six.text_type(exc)) class FormParser(BaseParser): @@ -153,7 +153,7 @@ class XMLParser(BaseParser): try: tree = etree.parse(stream, parser=parser, forbid_dtd=True) except (etree.ParseError, ValueError) as exc: - raise ParseError('XML parse error - %s' % six.u(exc)) + raise ParseError('XML parse error - %s' % six.text_type(exc)) data = self._xml_convert(tree.getroot()) return data From 5e0538fcda75eed82ed183c7c4dcfcda5ad35d5f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sat, 2 Nov 2013 09:15:35 +0000 Subject: [PATCH 0234/1652] Added @robhudson for work on #1211. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index e6de1dbe3..9751850ba 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -177,6 +177,7 @@ The following people have helped make REST framework great. * Jacek Bzdak - [jbzdak] * Alexander Lukanin - [alexanderlukanin13] * Yamila Moreno - [yamila-moreno] +* Rob Hudson - [robhudson] Many thanks to everyone who's contributed to the project. @@ -390,3 +391,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [jbzdak]: https://github.com/jbzdak [alexanderlukanin13]: https://github.com/alexanderlukanin13 [yamila-moreno]: https://github.com/yamila-moreno +[robhudson]: https://github.com/robhudson From 53258908210b1eabd0ee204653a589d6579ac772 Mon Sep 17 00:00:00 2001 From: Mathieu Pillard Date: Tue, 5 Nov 2013 17:21:18 +0100 Subject: [PATCH 0235/1652] Improve handling of 'empty' values for ChoiceField The empty value defaults back to '' (for backwards-compatibility) but is changed automatically to None for ModelSerializers if the `null` property is set on the db field. --- rest_framework/fields.py | 8 ++-- rest_framework/serializers.py | 2 + rest_framework/tests/test_fields.py | 74 +++++++++++++++++++++++------ 3 files changed, 66 insertions(+), 18 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index e23fc0010..6c07dbb3b 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -497,6 +497,7 @@ class ChoiceField(WritableField): } def __init__(self, choices=(), *args, **kwargs): + self.empty = kwargs.pop('empty', '') super(ChoiceField, self).__init__(*args, **kwargs) self.choices = choices if not self.required: @@ -537,9 +538,10 @@ class ChoiceField(WritableField): return False def from_native(self, value): - if value in validators.EMPTY_VALUES: - return None - return super(ChoiceField, self).from_native(value) + value = super(ChoiceField, self).from_native(value) + if value == self.empty or value in validators.EMPTY_VALUES: + return self.empty + return value class EmailField(CharField): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 4210d058b..5240dbf6b 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -794,6 +794,8 @@ class ModelSerializer(Serializer): # TODO: TypedChoiceField? if model_field.flatchoices: # This ModelField contains choices kwargs['choices'] = model_field.flatchoices + if model_field.null: + kwargs['empty'] = None return ChoiceField(**kwargs) # put this below the ChoiceField because min_value isn't a valid initializer diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py index 34fbab9c9..333476bac 100644 --- a/rest_framework/tests/test_fields.py +++ b/rest_framework/tests/test_fields.py @@ -42,6 +42,31 @@ class TimeFieldModelSerializer(serializers.ModelSerializer): model = TimeFieldModel +SAMPLE_CHOICES = [ + ('red', 'Red'), + ('green', 'Green'), + ('blue', 'Blue'), +] + + +class ChoiceFieldModel(models.Model): + choice = models.CharField(choices=SAMPLE_CHOICES, blank=True, max_length=255) + + +class ChoiceFieldModelSerializer(serializers.ModelSerializer): + class Meta: + model = ChoiceFieldModel + + +class ChoiceFieldModelWithNull(models.Model): + choice = models.CharField(choices=SAMPLE_CHOICES, blank=True, null=True, max_length=255) + + +class ChoiceFieldModelWithNullSerializer(serializers.ModelSerializer): + class Meta: + model = ChoiceFieldModelWithNull + + class BasicFieldTests(TestCase): def test_auto_now_fields_read_only(self): """ @@ -667,34 +692,53 @@ class ChoiceFieldTests(TestCase): """ Tests for the ChoiceField options generator """ - - SAMPLE_CHOICES = [ - ('red', 'Red'), - ('green', 'Green'), - ('blue', 'Blue'), - ] - def test_choices_required(self): """ Make sure proper choices are rendered if field is required """ - f = serializers.ChoiceField(required=True, choices=self.SAMPLE_CHOICES) - self.assertEqual(f.choices, self.SAMPLE_CHOICES) + f = serializers.ChoiceField(required=True, choices=SAMPLE_CHOICES) + self.assertEqual(f.choices, SAMPLE_CHOICES) def test_choices_not_required(self): """ Make sure proper choices (plus blank) are rendered if the field isn't required """ - f = serializers.ChoiceField(required=False, choices=self.SAMPLE_CHOICES) - self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + self.SAMPLE_CHOICES) + f = serializers.ChoiceField(required=False, choices=SAMPLE_CHOICES) + self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + SAMPLE_CHOICES) + + def test_invalid_choice_model(self): + s = ChoiceFieldModelSerializer(data={'choice' : 'wrong_value'}) + self.assertFalse(s.is_valid()) + self.assertEqual(s.errors, {'choice': [u'Select a valid choice. wrong_value is not one of the available choices.']}) + self.assertEqual(s.data['choice'], '') + + def test_empty_choice_model(self): + """ + Test that the 'empty' value is correctly passed and used depending on the 'null' property on the model field. + """ + s = ChoiceFieldModelSerializer(data={'choice' : ''}) + self.assertTrue(s.is_valid()) + self.assertEqual(s.data['choice'], '') + + s = ChoiceFieldModelWithNullSerializer(data={'choice' : ''}) + self.assertTrue(s.is_valid()) + self.assertEqual(s.data['choice'], None) def test_from_native_empty(self): """ - Make sure from_native() returns None on empty param. + Make sure from_native() returns an empty string on empty param by default. """ - f = serializers.ChoiceField(choices=self.SAMPLE_CHOICES) - result = f.from_native('') - self.assertEqual(result, None) + f = serializers.ChoiceField(choices=SAMPLE_CHOICES) + self.assertEqual(f.from_native(''), '') + self.assertEqual(f.from_native(None), '') + + def test_from_native_empty_override(self): + """ + Make sure you can override from_native() behavior regarding empty values. + """ + f = serializers.ChoiceField(choices=SAMPLE_CHOICES, empty=None) + self.assertEqual(f.from_native(''), None) + self.assertEqual(f.from_native(None), None) class EmailFieldTests(TestCase): From 5829eb7a5b0d45fe668d7ce1ad394a7b5966c70d Mon Sep 17 00:00:00 2001 From: Mathieu Pillard Date: Wed, 6 Nov 2013 12:51:40 +0100 Subject: [PATCH 0236/1652] Drop u'' prefix for python 3.x compatibility --- rest_framework/tests/test_fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py index 333476bac..ab2cceacd 100644 --- a/rest_framework/tests/test_fields.py +++ b/rest_framework/tests/test_fields.py @@ -709,7 +709,7 @@ class ChoiceFieldTests(TestCase): def test_invalid_choice_model(self): s = ChoiceFieldModelSerializer(data={'choice' : 'wrong_value'}) self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'choice': [u'Select a valid choice. wrong_value is not one of the available choices.']}) + self.assertEqual(s.errors, {'choice': ['Select a valid choice. wrong_value is not one of the available choices.']}) self.assertEqual(s.data['choice'], '') def test_empty_choice_model(self): From 1296753b5c55de19e057eb6fde73da2b41f7032b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Reni=C3=A9?= Date: Fri, 8 Nov 2013 11:58:14 +0100 Subject: [PATCH 0237/1652] Updated versions in tox and travis config --- .travis.yml | 28 ++++++++++++++-------------- tox.ini | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index d12479e9e..386c1d644 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,20 +7,20 @@ python: - "3.3" env: - - DJANGO="https://www.djangoproject.com/download/1.6a1/tarball/" - - DJANGO="django==1.5.1 --use-mirrors" - - DJANGO="django==1.4.5 --use-mirrors" - - DJANGO="django==1.3.7 --use-mirrors" + - DJANGO="django==1.6" + - DJANGO="django==1.5.5" + - DJANGO="django==1.4.10" + - DJANGO="django==1.3.7" install: - pip install $DJANGO - pip install defusedxml==0.3 - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211 --use-mirrors; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.0 --use-mirrors; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4 --use-mirrors; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-guardian==1.1.1 --use-mirrors; fi" - - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4 --use-mirrors; fi" - - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.6 --use-mirrors; fi" + - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211; fi" + - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.0; fi" + - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi" + - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-guardian==1.1.1; fi" + - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi" + - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.6; fi" - export PYTHONPATH=. script: @@ -29,11 +29,11 @@ script: matrix: exclude: - python: "3.2" - env: DJANGO="django==1.4.5 --use-mirrors" + env: DJANGO="django==1.4.5" - python: "3.2" - env: DJANGO="django==1.3.7 --use-mirrors" + env: DJANGO="django==1.3.7" - python: "3.3" - env: DJANGO="django==1.4.5 --use-mirrors" + env: DJANGO="django==1.4.5" - python: "3.3" - env: DJANGO="django==1.3.7 --use-mirrors" + env: DJANGO="django==1.3.7" diff --git a/tox.ini b/tox.ini index 6e3b8e0a8..1fa0a958f 100644 --- a/tox.ini +++ b/tox.ini @@ -7,19 +7,19 @@ commands = {envpython} rest_framework/runtests/runtests.py [testenv:py3.3-django1.6] basepython = python3.3 -deps = https://www.djangoproject.com/download/1.6a1/tarball/ +deps = Django==1.6 django-filter==0.6a1 defusedxml==0.3 [testenv:py3.2-django1.6] basepython = python3.2 -deps = https://www.djangoproject.com/download/1.6a1/tarball/ +deps = Django==1.6 django-filter==0.6a1 defusedxml==0.3 [testenv:py2.7-django1.6] basepython = python2.7 -deps = https://www.djangoproject.com/download/1.6a1/tarball/ +deps = Django==1.6 django-filter==0.6a1 defusedxml==0.3 django-oauth-plus==2.0 @@ -29,7 +29,7 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/ [testenv:py2.6-django1.6] basepython = python2.6 -deps = https://www.djangoproject.com/download/1.6a1/tarball/ +deps = Django==1.6 django-filter==0.6a1 defusedxml==0.3 django-oauth-plus==2.0 @@ -39,19 +39,19 @@ deps = https://www.djangoproject.com/download/1.6a1/tarball/ [testenv:py3.3-django1.5] basepython = python3.3 -deps = django==1.5 +deps = django==1.5.5 django-filter==0.6a1 defusedxml==0.3 [testenv:py3.2-django1.5] basepython = python3.2 -deps = django==1.5 +deps = django==1.5.5 django-filter==0.6a1 defusedxml==0.3 [testenv:py2.7-django1.5] basepython = python2.7 -deps = django==1.5 +deps = django==1.5.5 django-filter==0.6a1 defusedxml==0.3 django-oauth-plus==2.0 @@ -61,7 +61,7 @@ deps = django==1.5 [testenv:py2.6-django1.5] basepython = python2.6 -deps = django==1.5 +deps = django==1.5.5 django-filter==0.6a1 defusedxml==0.3 django-oauth-plus==2.0 @@ -71,7 +71,7 @@ deps = django==1.5 [testenv:py2.7-django1.4] basepython = python2.7 -deps = django==1.4.3 +deps = django==1.4.10 django-filter==0.6a1 defusedxml==0.3 django-oauth-plus==2.0 @@ -81,7 +81,7 @@ deps = django==1.4.3 [testenv:py2.6-django1.4] basepython = python2.6 -deps = django==1.4.3 +deps = django==1.4.10 django-filter==0.6a1 defusedxml==0.3 django-oauth-plus==2.0 From d4a50429b098656e7a0855c6acf12f0aa4bc434f Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Fri, 8 Nov 2013 13:12:40 +0100 Subject: [PATCH 0238/1652] Fixed a regression with ValidationError under Django 1.6 --- rest_framework/serializers.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 5240dbf6b..7cdb55c8c 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -42,6 +42,7 @@ def pretty_name(name): class RelationsList(list): _deleted = [] + class NestedValidationError(ValidationError): """ The default ValidationError behavior is to stringify each item in the list @@ -56,9 +57,13 @@ class NestedValidationError(ValidationError): def __init__(self, message): if isinstance(message, dict): - self.messages = [message] + self._messages = [message] else: - self.messages = message + self._messages = message + + @property + def messages(self): + return self._messages class DictWithMetadata(dict): From b7b57adee2cc5a785a5df492424969c8ba311aa8 Mon Sep 17 00:00:00 2001 From: Ben Pietravalle Date: Fri, 8 Nov 2013 13:19:40 +0000 Subject: [PATCH 0239/1652] Fix object creation with reverse M2M when related_name unspecified It seems that field.related_query_name() does not return the related_name for reverse M2M relations when related_name is not explicitly set in the M2M field definition. So, change to use obj.get_accessor_name(), where obj is an instance of RelatedObject, as are returned by a model's _meta.get_all_related_many_to_many_objects(), or as in the tuples returned by _meta.get_all_m2m_objects_with_model(). --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 5240dbf6b..244fbe634 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -873,7 +873,7 @@ class ModelSerializer(Serializer): # Reverse m2m relations for (obj, model) in meta.get_all_related_m2m_objects_with_model(): - field_name = obj.field.related_query_name() + field_name = obj.get_accessor_name() if field_name in attrs: m2m_data[field_name] = attrs.pop(field_name) From f2ea5780d2d6e783019bceb73c79bb9445e99e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Reni=C3=A9?= Date: Fri, 8 Nov 2013 14:58:36 +0100 Subject: [PATCH 0240/1652] Exclude 1.4 on python 3 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 386c1d644..bcf1bae0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,11 +29,11 @@ script: matrix: exclude: - python: "3.2" - env: DJANGO="django==1.4.5" + env: DJANGO="django==1.4.10" - python: "3.2" env: DJANGO="django==1.3.7" - python: "3.3" - env: DJANGO="django==1.4.5" + env: DJANGO="django==1.4.10" - python: "3.3" env: DJANGO="django==1.3.7" From fd2c291c4d9243937a31e0e6f523016067824b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dog=CC=86an=20C=CC=A7ec=CC=A7en?= Date: Mon, 11 Nov 2013 11:54:30 +0200 Subject: [PATCH 0241/1652] Typo on api-guide/fields.md and serializers.py --- docs/api-guide/fields.md | 4 ++-- rest_framework/serializers.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 962c49e2a..4272c9a7a 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -299,9 +299,9 @@ Django's regular [FILE_UPLOAD_HANDLERS] are used for handling uploaded files. # Custom fields -If you want to create a custom field, you'll probably want to override either one or both of the `.to_native()` and `.from_native()` methods. These two methods are used to convert between the initial datatype, and a primative, serializable datatype. Primative datatypes may be any of a number, string, date/time/datetime or None. They may also be any list or dictionary like object that only contains other primative objects. +If you want to create a custom field, you'll probably want to override either one or both of the `.to_native()` and `.from_native()` methods. These two methods are used to convert between the initial datatype, and a primitive, serializable datatype. Primitive datatypes may be any of a number, string, date/time/datetime or None. They may also be any list or dictionary like object that only contains other primitive objects. -The `.to_native()` method is called to convert the initial datatype into a primative, serializable datatype. The `from_native()` method is called to restore a primative datatype into it's initial representation. +The `.to_native()` method is called to convert the initial datatype into a primitive, serializable datatype. The `from_native()` method is called to restore a primitive datatype into it's initial representation. ## Examples diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 160954527..163abf4f0 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -6,8 +6,8 @@ form encoded input. Serialization in REST framework is a two-phase process: 1. Serializers marshal between complex types like model instances, and -python primatives. -2. The process of marshalling between python primatives and request and +python primitives. +2. The process of marshalling between python primitives and request and response content is handled by parsers and renderers. """ from __future__ import unicode_literals From 52ac2199a8b332f7a485d5c22b1a53633b4be9dd Mon Sep 17 00:00:00 2001 From: Jacob Haslehurst Date: Mon, 11 Nov 2013 22:24:37 +1100 Subject: [PATCH 0242/1652] Added drf-ujson-renderer to renderers docs drf-ujson-renderer is a third party renderer that implements JSON renderering using UltraJSON --- docs/api-guide/renderers.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 657377d92..1f286ef10 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -409,6 +409,10 @@ The following third party packages are also available. Comma-separated values are a plain-text tabular data format, that can be easily imported into spreadsheet applications. [Mjumbe Poe][mjumbewu] maintains the [djangorestframework-csv][djangorestframework-csv] package which provides CSV renderer support for REST framework. +## UltraJSON + +[UltraJSON][ultrajson] is a blazing-fast C JSON encoder which can give 2-10x performance increases on typical workloads. [Jacob Haslehurst][hzy] maintains the [drf-ujson-renderer][drf-ujson-renderer] package which implements JSON rendering using the UJSON package. + [cite]: https://docs.djangoproject.com/en/dev/ref/template-response/#the-rendering-process [conneg]: content-negotiation.md [browser-accept-headers]: http://www.gethifi.com/blog/browser-rest-http-accept-headers @@ -426,3 +430,6 @@ Comma-separated values are a plain-text tabular data format, that can be easily [mjumbewu]: https://github.com/mjumbewu [djangorestframework-msgpack]: https://github.com/juanriaza/django-rest-framework-msgpack [djangorestframework-csv]: https://github.com/mjumbewu/django-rest-framework-csv +[ultrajson]: https://github.com/esnme/ultrajson +[hzy]: https://github.com/hzy +[drf-ujson-renderer]: https://github.com/gizmag/drf-ujson-renderer From d1dc68d7550e90ba56a3122f8de1f38bb5aa1e3a Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 12 Nov 2013 23:40:07 +0000 Subject: [PATCH 0243/1652] Add queryset aggregates to allowed fields in OrderingFilter --- rest_framework/filters.py | 1 + rest_framework/tests/test_filters.py | 39 ++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index e287a1683..5c6a187c4 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -124,6 +124,7 @@ class OrderingFilter(BaseFilterBackend): def remove_invalid_fields(self, queryset, ordering): field_names = [field.name for field in queryset.model._meta.fields] + field_names += queryset.query.aggregates.keys() return [term for term in ordering if term.lstrip('-') in field_names] def filter_queryset(self, request, queryset, view): diff --git a/rest_framework/tests/test_filters.py b/rest_framework/tests/test_filters.py index 379db29d8..614f45cc7 100644 --- a/rest_framework/tests/test_filters.py +++ b/rest_framework/tests/test_filters.py @@ -363,6 +363,12 @@ class OrdringFilterModel(models.Model): text = models.CharField(max_length=100) +class OrderingFilterRelatedModel(models.Model): + related_object = models.ForeignKey(OrdringFilterModel, + related_name="relateds") + + + class OrderingFilterTests(TestCase): def setUp(self): # Sequence of title/text is: @@ -472,3 +478,36 @@ class OrderingFilterTests(TestCase): {'id': 1, 'title': 'zyx', 'text': 'abc'}, ] ) + + def test_ordering_by_aggregate_field(self): + # create some related models to aggregate order by + num_objs = [2, 5, 3] + for obj, num_relateds in zip(OrdringFilterModel.objects.all(), + num_objs): + for _ in range(num_relateds): + new_related = OrderingFilterRelatedModel( + related_object=obj + ) + new_related.save() + + class OrderingListView(generics.ListAPIView): + model = OrdringFilterModel + filter_backends = (filters.OrderingFilter,) + ordering = 'title' + queryset = OrdringFilterModel.objects.all().annotate( + models.Count("relateds")) + + view = OrderingListView.as_view() + request = factory.get('?ordering=relateds__count') + response = view(request) + self.assertEqual( + response.data, + [ + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + ] + ) + + + From f4e610248b94f9a7708ec564fc545ce41561e6c5 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 12 Nov 2013 23:46:01 +0000 Subject: [PATCH 0244/1652] Bump version --- rest_framework/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 2bd2991ba..de82fef51 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -1,4 +1,4 @@ -__version__ = '2.3.8' +__version__ = '2.3.9' VERSION = __version__ # synonym From e29942948f320088fbbf9a08cfd8579e0ef2e26f Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 13 Nov 2013 12:06:59 +0000 Subject: [PATCH 0245/1652] Undo version bump --- rest_framework/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index de82fef51..2bd2991ba 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -1,4 +1,4 @@ -__version__ = '2.3.9' +__version__ = '2.3.8' VERSION = __version__ # synonym From 72d72e4d3e497000bab8019151972b0e71f6957a Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 13 Nov 2013 14:32:37 +0000 Subject: [PATCH 0246/1652] Add Alex Good to credits (Whoop!) --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 9751850ba..e6c9c034f 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -178,6 +178,7 @@ The following people have helped make REST framework great. * Alexander Lukanin - [alexanderlukanin13] * Yamila Moreno - [yamila-moreno] * Rob Hudson - [robhudson] +* Alex Good - [alexjg] Many thanks to everyone who's contributed to the project. @@ -392,3 +393,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [alexanderlukanin13]: https://github.com/alexanderlukanin13 [yamila-moreno]: https://github.com/yamila-moreno [robhudson]: https://github.com/robhudson +[alexjg]: https://github.com/alexjg From 6be62bc1d77f77978847584c358c7c00c34c0992 Mon Sep 17 00:00:00 2001 From: jgomezb Date: Thu, 14 Nov 2013 09:22:07 +0100 Subject: [PATCH 0247/1652] Update urlpatterns.py Allow numbers in format extension. --- rest_framework/urlpatterns.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/urlpatterns.py b/rest_framework/urlpatterns.py index d9143bb4c..0ff137b00 100644 --- a/rest_framework/urlpatterns.py +++ b/rest_framework/urlpatterns.py @@ -57,6 +57,6 @@ def format_suffix_patterns(urlpatterns, suffix_required=False, allowed=None): allowed_pattern = '(%s)' % '|'.join(allowed) suffix_pattern = r'\.(?P<%s>%s)$' % (suffix_kwarg, allowed_pattern) else: - suffix_pattern = r'\.(?P<%s>[a-z]+)$' % suffix_kwarg + suffix_pattern = r'\.(?P<%s>[a-z0-9]+)$' % suffix_kwarg return apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required) From 5239362951956f130a1ef91d12d6b7d680220104 Mon Sep 17 00:00:00 2001 From: Philip Forget Date: Thu, 14 Nov 2013 18:02:07 -0500 Subject: [PATCH 0248/1652] pass oauth_timestamp to oauth_provider --- rest_framework/authentication.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index cf001a24d..bca542ebb 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -281,7 +281,8 @@ class OAuthAuthentication(BaseAuthentication): """ Checks nonce of request, and return True if valid. """ - return oauth_provider_store.check_nonce(request, oauth_request, oauth_request['oauth_nonce']) + return oauth_provider_store.check_nonce(request, oauth_request, + oauth_request['oauth_nonce'], oauth_request['oauth_timestamp']) class OAuth2Authentication(BaseAuthentication): From 1d1b2f765cbf3a56c677c44eee99260c8979a0a0 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 15 Nov 2013 13:55:02 +0000 Subject: [PATCH 0249/1652] Version 2.3.9 --- docs/topics/release-notes.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 3df8869a2..6c1447d53 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,10 +40,21 @@ You can determine your currently installed version using `pip freeze`: ## 2.3.x series -### Master +### 2.3.9 +**Date**: 15th November 2013 + +* Fix Django 1.6 exception API compatibility issue caused by `ValidationError`. +* Include errors in HTML forms in browsable API. * Added JSON renderer support for numpy scalars. +* Added `transform_` hooks on serializers for easily modifying field output. * Added `get_context` hook in `BrowsableAPIRenderer`. +* Allow serializers to be passed `files` but no `data`. +* `HTMLFormRenderer` now renders serializers directly to HTML without needing to create an intermediate form object. +* Added `get_filter_backends` hook. +* Added queryset aggregates to allowed fields in `OrderingFilter`. +* Bugfix: Fix decimal suppoprt with `YAMLRenderer`. +* Bugfix: Fix submission of unicode in browsable API through raw data form. ### 2.3.8 From 7a0e2ed6f6ce2f3b33af2c228f1895273eb9bc73 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 15 Nov 2013 13:55:36 +0000 Subject: [PATCH 0250/1652] Version 2.3.9 --- rest_framework/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 2bd2991ba..de82fef51 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -1,4 +1,4 @@ -__version__ = '2.3.8' +__version__ = '2.3.9' VERSION = __version__ # synonym From 128bda5712ef041514c5e2feadef0ad248f33f54 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 15 Nov 2013 15:24:32 +0000 Subject: [PATCH 0251/1652] Use less specfic language in UltaJSON notes --- docs/api-guide/renderers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 1f286ef10..858e2f072 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -411,7 +411,7 @@ Comma-separated values are a plain-text tabular data format, that can be easily ## UltraJSON -[UltraJSON][ultrajson] is a blazing-fast C JSON encoder which can give 2-10x performance increases on typical workloads. [Jacob Haslehurst][hzy] maintains the [drf-ujson-renderer][drf-ujson-renderer] package which implements JSON rendering using the UJSON package. +[UltraJSON][ultrajson] is an optimized C JSON encoder which can give significantly faster JSON rendering. [Jacob Haslehurst][hzy] maintains the [drf-ujson-renderer][drf-ujson-renderer] package which implements JSON rendering using the UJSON package. [cite]: https://docs.djangoproject.com/en/dev/ref/template-response/#the-rendering-process [conneg]: content-negotiation.md From 4807e00bffc0116630af42b86049f197f8d4fc99 Mon Sep 17 00:00:00 2001 From: George Hickman Date: Fri, 15 Nov 2013 15:49:53 +0000 Subject: [PATCH 0252/1652] Set up wheel distribution support --- setup.cfg | 2 ++ setup.py | 1 + 2 files changed, 3 insertions(+) create mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 000000000..5e4090017 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[wheel] +universal = 1 diff --git a/setup.py b/setup.py index adf083cbf..96fbc4f41 100755 --- a/setup.py +++ b/setup.py @@ -45,6 +45,7 @@ version = get_version('rest_framework') if sys.argv[-1] == 'publish': os.system("python setup.py sdist upload") + os.system("python setup.py bdist_wheel upload") print("You probably want to also tag the version now:") print(" git tag -a %s -m 'version %s'" % (version, version)) print(" git push --tags") From 4b947a6a2af83592d1542d8984b9e5013efd0b1e Mon Sep 17 00:00:00 2001 From: Philip Forget Date: Fri, 15 Nov 2013 12:18:22 -0500 Subject: [PATCH 0253/1652] update requirements for django-oauth-plus to 2.2.1 --- .travis.yml | 2 +- tox.ini | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index bcf1bae0e..18fe66abd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ install: - pip install $DJANGO - pip install defusedxml==0.3 - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.0; fi" + - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.2.1; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-guardian==1.1.1; fi" - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi" diff --git a/tox.ini b/tox.ini index 1fa0a958f..77766d20b 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ basepython = python2.7 deps = Django==1.6 django-filter==0.6a1 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.4 django-guardian==1.1.1 @@ -32,7 +32,7 @@ basepython = python2.6 deps = Django==1.6 django-filter==0.6a1 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.4 django-guardian==1.1.1 @@ -54,7 +54,7 @@ basepython = python2.7 deps = django==1.5.5 django-filter==0.6a1 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.1.1 @@ -64,7 +64,7 @@ basepython = python2.6 deps = django==1.5.5 django-filter==0.6a1 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.1.1 @@ -74,7 +74,7 @@ basepython = python2.7 deps = django==1.4.10 django-filter==0.6a1 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.1.1 @@ -84,7 +84,7 @@ basepython = python2.6 deps = django==1.4.10 django-filter==0.6a1 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.1.1 @@ -94,7 +94,7 @@ basepython = python2.7 deps = django==1.3.5 django-filter==0.5.4 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.1.1 @@ -104,7 +104,7 @@ basepython = python2.6 deps = django==1.3.5 django-filter==0.5.4 defusedxml==0.3 - django-oauth-plus==2.0 + django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.1.1 From b86765d9c02388f6bb82dbb5824a005e8fe73dec Mon Sep 17 00:00:00 2001 From: Philip Forget Date: Fri, 15 Nov 2013 12:25:32 -0500 Subject: [PATCH 0254/1652] add auth param to request client calls --- rest_framework/tests/test_authentication.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rest_framework/tests/test_authentication.py b/rest_framework/tests/test_authentication.py index a44813b69..fe11423dc 100644 --- a/rest_framework/tests/test_authentication.py +++ b/rest_framework/tests/test_authentication.py @@ -362,7 +362,8 @@ class OAuthTests(TestCase): def test_post_form_with_urlencoded_parameters(self): """Ensure POSTing with x-www-form-urlencoded auth parameters passes""" params = self._create_authorization_url_parameters() - response = self.csrf_client.post('/oauth/', params) + auth = self._create_authorization_header() + response = self.csrf_client.post('/oauth/', params, HTTP_AUTHORIZATION=auth) self.assertEqual(response.status_code, 200) @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') @@ -424,7 +425,8 @@ class OAuthTests(TestCase): read_write_access_token.resource.is_readonly = False read_write_access_token.resource.save() params = self._create_authorization_url_parameters() - response = self.csrf_client.post('/oauth-with-scope/', params) + auth = self._create_authorization_header() + response = self.csrf_client.post('/oauth-with-scope/', params, HTTP_AUTHORIZATION=auth) self.assertEqual(response.status_code, 200) @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') From ad7aa8fe485580e1bdff53d39fe3ea282d908a04 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Sun, 17 Nov 2013 01:27:16 +0100 Subject: [PATCH 0255/1652] =?UTF-8?q?Fixed=20the=20nested=20model=20serial?= =?UTF-8?q?izers=20in=20case=20of=20the=20related=5Fname=20isn=E2=80=99t?= =?UTF-8?q?=20set.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rest_framework/serializers.py | 2 +- .../tests/test_serializer_nested.py | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 163abf4f0..e20e582ec 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -872,7 +872,7 @@ class ModelSerializer(Serializer): # Reverse fk or one-to-one relations for (obj, model) in meta.get_all_related_objects_with_model(): - field_name = obj.field.related_query_name() + field_name = obj.get_accessor_name() if field_name in attrs: related_data[field_name] = attrs.pop(field_name) diff --git a/rest_framework/tests/test_serializer_nested.py b/rest_framework/tests/test_serializer_nested.py index 029f8bffd..7114a0603 100644 --- a/rest_framework/tests/test_serializer_nested.py +++ b/rest_framework/tests/test_serializer_nested.py @@ -6,6 +6,7 @@ Doesn't cover model serializers. from __future__ import unicode_literals from django.test import TestCase from rest_framework import serializers +from . import models class WritableNestedSerializerBasicTests(TestCase): @@ -311,3 +312,37 @@ class ForeignKeyNestedSerializerUpdateTests(TestCase): serializer = self.AlbumSerializer(instance=original, data=data) self.assertEqual(serializer.is_valid(), True) self.assertEqual(serializer.object, expected) + + +class NestedModelSerializerUpdateTests(TestCase): + def test_second_nested_level(self): + john = models.Person.objects.create(name="john") + + post = john.blogpost_set.create(title="Test blog post") + post.blogpostcomment_set.create(text="I hate this blog post") + post.blogpostcomment_set.create(text="I love this blog post") + + class BlogPostCommentSerializer(serializers.ModelSerializer): + class Meta: + model = models.BlogPostComment + + class BlogPostSerializer(serializers.ModelSerializer): + comments = BlogPostCommentSerializer(many=True, source='blogpostcomment_set') + class Meta: + model = models.BlogPost + fields = ('id', 'title', 'comments') + + class PersonSerializer(serializers.ModelSerializer): + posts = BlogPostSerializer(many=True, source='blogpost_set') + class Meta: + model = models.Person + fields = ('id', 'name', 'age', 'posts') + + serialize = PersonSerializer(instance=john) + deserialize = PersonSerializer(data=serialize.data, instance=john) + self.assertTrue(deserialize.is_valid()) + + result = deserialize.object + result.save() + self.assertEqual(result.id, john.id) + From f322e894aebd042a9edb0e333662d0b0ed1ba750 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Mon, 18 Nov 2013 09:21:09 +0200 Subject: [PATCH 0256/1652] Enabled syntax highlighting in the README file. --- README.md | 63 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 62883e32e..684868006 100644 --- a/README.md +++ b/README.md @@ -48,48 +48,51 @@ Let's take a look at a quick example of using REST framework to build a simple m Here's our project's root `urls.py` module: - from django.conf.urls.defaults import url, patterns, include - from django.contrib.auth.models import User, Group - from rest_framework import viewsets, routers +```python +from django.conf.urls.defaults import url, patterns, include +from django.contrib.auth.models import User, Group +from rest_framework import viewsets, routers - # ViewSets define the view behavior. - class UserViewSet(viewsets.ModelViewSet): - model = User +# ViewSets define the view behavior. +class UserViewSet(viewsets.ModelViewSet): + model = User - class GroupViewSet(viewsets.ModelViewSet): - model = Group +class GroupViewSet(viewsets.ModelViewSet): + model = Group - # Routers provide an easy way of automatically determining the URL conf - router = routers.DefaultRouter() - router.register(r'users', UserViewSet) - router.register(r'groups', GroupViewSet) +# Routers provide an easy way of automatically determining the URL conf +router = routers.DefaultRouter() +router.register(r'users', UserViewSet) +router.register(r'groups', GroupViewSet) - # Wire up our API using automatic URL routing. - # Additionally, we include login URLs for the browseable API. - urlpatterns = patterns('', - url(r'^', include(router.urls)), - url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) - ) +# Wire up our API using automatic URL routing. +# Additionally, we include login URLs for the browseable API. +urlpatterns = patterns('', + url(r'^', include(router.urls)), + url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) +) +``` We'd also like to configure a couple of settings for our API. Add the following to your `settings.py` module: - REST_FRAMEWORK = { - # Use hyperlinked styles by default. - # Only used if the `serializer_class` attribute is not set on a view. - 'DEFAULT_MODEL_SERIALIZER_CLASS': - 'rest_framework.serializers.HyperlinkedModelSerializer', - - # Use Django's standard `django.contrib.auth` permissions, - # or allow read-only access for unauthenticated users. - 'DEFAULT_PERMISSION_CLASSES': [ - 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly' - ] - } +```python +REST_FRAMEWORK = { + # Use hyperlinked styles by default. + # Only used if the `serializer_class` attribute is not set on a view. + 'DEFAULT_MODEL_SERIALIZER_CLASS': + 'rest_framework.serializers.HyperlinkedModelSerializer', + # Use Django's standard `django.contrib.auth` permissions, + # or allow read-only access for unauthenticated users. + 'DEFAULT_PERMISSION_CLASSES': [ + 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly' + ] +} +``` Don't forget to make sure you've also added `rest_framework` to your `INSTALLED_APPS` setting. That's it, we're done! From 075b8c1037588a590360ab5290b25648367a26c5 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 18 Nov 2013 09:29:09 +0000 Subject: [PATCH 0257/1652] Add User import. Refs #599 --- docs/tutorial/4-authentication-and-permissions.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index ecf92a7b1..b472322a3 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -67,6 +67,9 @@ Because `'snippets'` is a *reverse* relationship on the User model, it will not We'll also add a couple of views to `views.py`. We'd like to just use read-only views for the user representations, so we'll use the `ListAPIView` and `RetrieveAPIView` generic class based views. + from django.contrib.auth.models import User + + class UserList(generics.ListAPIView): queryset = User.objects.all() serializer_class = UserSerializer From a8b15f4290f4bad17d0dd599b8d5c29c155b89e5 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 18 Nov 2013 15:06:39 +0100 Subject: [PATCH 0258/1652] =?UTF-8?q?Another=20fix=20for=20nested=20writab?= =?UTF-8?q?le=20serializers=20in=20case=20of=20the=20related=5Fname=20isn?= =?UTF-8?q?=E2=80=99t=20set=20on=20the=20ForeignKey.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rest_framework/serializers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index e20e582ec..5059c71b3 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -940,11 +940,12 @@ class ModelSerializer(Serializer): del(obj._m2m_data) if getattr(obj, '_related_data', None): + related_fields = dict(((f.get_accessor_name(), f) for f, m in obj._meta.get_all_related_objects_with_model())) for accessor_name, related in obj._related_data.items(): if isinstance(related, RelationsList): # Nested reverse fk relationship for related_item in related: - fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name + fk_field = related_fields[accessor_name].field.name setattr(related_item, fk_field, obj) self.save_object(related_item) From 20325cce1808cc3facd60acb15115d285ca10b0f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 18 Nov 2013 16:10:14 +0000 Subject: [PATCH 0259/1652] Drop .html suffixes in docs --- docs/template.html | 1 + mkdocs.py | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/template.html b/docs/template.html index 749d0afe3..874ace540 100644 --- a/docs/template.html +++ b/docs/template.html @@ -4,6 +4,7 @@ {{ title }} + diff --git a/mkdocs.py b/mkdocs.py index 13228a0ce..380a91e72 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -19,7 +19,7 @@ if local: index = 'index.html' else: base_url = 'http://django-rest-framework.org' - suffix = '.html' + suffix = '' index = '' @@ -90,7 +90,10 @@ for idx in range(len(path_list)): path = path_list[idx] rel = '../' * path.count('/') - if idx > 0: + if idx == 1 and not local: + # Link back to '/', not '/index' + prev_url_map[path] = '/' + elif idx > 0: prev_url_map[path] = rel + path_list[idx - 1][:-3] + suffix if idx < len(path_list) - 1: @@ -143,6 +146,7 @@ for (dirpath, dirnames, filenames) in os.walk(docs_dir): else: main_title = 'Django REST framework - ' + main_title + canonical_url = base_url + '/' + relative_path[:-3] + suffix prev_url = prev_url_map.get(relative_path) next_url = next_url_map.get(relative_path) @@ -152,6 +156,7 @@ for (dirpath, dirnames, filenames) in os.walk(docs_dir): output = output.replace('{{ title }}', main_title) output = output.replace('{{ description }}', description) output = output.replace('{{ page_id }}', filename[:-3]) + output = output.replace('{{ canonical_url }}', canonical_url) if prev_url: output = output.replace('{{ prev_url }}', prev_url) From bc69a6d983072ecbcf0c7a79b0b954f0c92892a4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 18 Nov 2013 16:10:26 +0000 Subject: [PATCH 0260/1652] Add a 404 page to the docs --- docs/404.html | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 docs/404.html diff --git a/docs/404.html b/docs/404.html new file mode 100644 index 000000000..4938da6ea --- /dev/null +++ b/docs/404.html @@ -0,0 +1,201 @@ + + + + + Django REST framework - 404 - Page not found + + + + + + + + + + + + + + + + + + + +
    + +
    +
    +
    + GitHub + Next + Previous + Search + + + + + + Django REST framework +
    + +
      + +
    +
    +
    +
    +
    + +
    +
    + + + + +
    +
    +

    404

    +

    Page not found

    +

    Try the homepage, or search the documentation.

    +
    +
    +
    +
    + +
    +
    + + + + + + + + + + From 88f5921f2fb7f4480e5d3da97508c815bba17155 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 18 Nov 2013 20:15:35 +0100 Subject: [PATCH 0261/1652] Removed the DynamicSerializerView duplication --- rest_framework/tests/test_generics.py | 41 +++++++++++++-------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/rest_framework/tests/test_generics.py b/rest_framework/tests/test_generics.py index 79cd99ac5..3fcef6060 100644 --- a/rest_framework/tests/test_generics.py +++ b/rest_framework/tests/test_generics.py @@ -508,6 +508,25 @@ class ExclusiveFilterBackend(object): return queryset.filter(text='other') +class TwoFieldModel(models.Model): + field_a = models.CharField(max_length=100) + field_b = models.CharField(max_length=100) + + +class DynamicSerializerView(generics.ListCreateAPIView): + model = TwoFieldModel + renderer_classes = (renderers.BrowsableAPIRenderer, renderers.JSONRenderer) + + def get_serializer_class(self): + if self.request.method == 'POST': + class DynamicSerializer(serializers.ModelSerializer): + class Meta: + model = TwoFieldModel + fields = ('field_b',) + return DynamicSerializer + return super(DynamicSerializerView, self).get_serializer_class() + + class TestFilterBackendAppliedToViews(TestCase): def setUp(self): @@ -564,28 +583,6 @@ class TestFilterBackendAppliedToViews(TestCase): self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.data, {'id': 1, 'text': 'foo'}) - -class TwoFieldModel(models.Model): - field_a = models.CharField(max_length=100) - field_b = models.CharField(max_length=100) - - -class DynamicSerializerView(generics.ListCreateAPIView): - model = TwoFieldModel - renderer_classes = (renderers.BrowsableAPIRenderer, renderers.JSONRenderer) - - def get_serializer_class(self): - if self.request.method == 'POST': - class DynamicSerializer(serializers.ModelSerializer): - class Meta: - model = TwoFieldModel - fields = ('field_b',) - return DynamicSerializer - return super(DynamicSerializerView, self).get_serializer_class() - - -class TestFilterBackendAppliedToViews(TestCase): - def test_dynamic_serializer_form_in_browsable_api(self): """ GET requests to ListCreateAPIView should return filtered list. From 6330212453bcddab9ecc8dcf0c368c3e8af8876d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 19 Nov 2013 10:27:04 +0000 Subject: [PATCH 0262/1652] Canonical page for index should be '/', not '/index' --- mkdocs.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mkdocs.py b/mkdocs.py index 380a91e72..d1790168a 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -146,7 +146,10 @@ for (dirpath, dirnames, filenames) in os.walk(docs_dir): else: main_title = 'Django REST framework - ' + main_title - canonical_url = base_url + '/' + relative_path[:-3] + suffix + if relative_path == 'index.md': + canonical_url = base_url + else: + canonical_url = base_url + '/' + relative_path[:-3] + suffix prev_url = prev_url_map.get(relative_path) next_url = next_url_map.get(relative_path) From ca2bd616d989f78d00641231e645198a6c95caa0 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 19 Nov 2013 11:01:27 +0000 Subject: [PATCH 0263/1652] Remove a couple of .html suffixes in docs --- docs/index.md | 10 +++++----- docs/topics/2.2-announcement.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/index.md b/docs/index.md index bb2129f6f..775fae620 100644 --- a/docs/index.md +++ b/docs/index.md @@ -255,11 +255,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [0.4]: https://github.com/tomchristie/django-rest-framework/tree/0.4.X [image]: img/quickstart.png [index]: . -[oauth1-section]: api-guide/authentication.html#oauthauthentication -[oauth2-section]: api-guide/authentication.html#oauth2authentication -[serializer-section]: api-guide/serializers.html#serializers -[modelserializer-section]: api-guide/serializers.html#modelserializer -[functionview-section]: api-guide/views.html#function-based-views +[oauth1-section]: api-guide/authentication#oauthauthentication +[oauth2-section]: api-guide/authentication#oauth2authentication +[serializer-section]: api-guide/serializers#serializers +[modelserializer-section]: api-guide/serializers#modelserializer +[functionview-section]: api-guide/views#function-based-views [sandbox]: http://restframework.herokuapp.com/ [quickstart]: tutorial/quickstart.md diff --git a/docs/topics/2.2-announcement.md b/docs/topics/2.2-announcement.md index 7d2760499..0f980e1cb 100644 --- a/docs/topics/2.2-announcement.md +++ b/docs/topics/2.2-announcement.md @@ -151,7 +151,7 @@ From version 2.2 onwards, serializers with hyperlinked relationships *always* re [porting-python-3]: https://docs.djangoproject.com/en/dev/topics/python3/ [python-compat]: https://docs.djangoproject.com/en/dev/releases/1.5/#python-compatibility [django-deprecation-policy]: https://docs.djangoproject.com/en/dev/internals/release-process/#internal-release-deprecation-policy -[credits]: http://django-rest-framework.org/topics/credits.html +[credits]: http://django-rest-framework.org/topics/credits [mailing-list]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework [django-rest-framework-docs]: https://github.com/marcgibbons/django-rest-framework-docs [marcgibbons]: https://github.com/marcgibbons/ From 9cea6880f7103c4e9407f975753c830f109c8c7c Mon Sep 17 00:00:00 2001 From: Krzysztof Jurewicz Date: Tue, 19 Nov 2013 15:49:31 +0100 Subject: [PATCH 0264/1652] Added handling of validation errors in PUT-as-create. Fixes #1035. --- rest_framework/mixins.py | 8 +++++++- rest_framework/tests/test_generics.py | 19 +++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 4606c78b6..79f79c30c 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -6,6 +6,7 @@ which allows mixin classes to be composed in interesting ways. """ from __future__ import unicode_literals +from django.core.exceptions import ValidationError from django.http import Http404 from rest_framework import status from rest_framework.response import Response @@ -127,7 +128,12 @@ class UpdateModelMixin(object): files=request.FILES, partial=partial) if serializer.is_valid(): - self.pre_save(serializer.object) + try: + self.pre_save(serializer.object) + except ValidationError as err: + # full_clean on model instance may be called in pre_save, so we + # have to handle eventual errors. + return Response(err.message_dict, status=status.HTTP_400_BAD_REQUEST) self.object = serializer.save(**save_kwargs) self.post_save(self.object, created=created) return Response(serializer.data, status=success_status_code) diff --git a/rest_framework/tests/test_generics.py b/rest_framework/tests/test_generics.py index 3fcef6060..996bd5b0e 100644 --- a/rest_framework/tests/test_generics.py +++ b/rest_framework/tests/test_generics.py @@ -23,6 +23,10 @@ class InstanceView(generics.RetrieveUpdateDestroyAPIView): """ model = BasicModel + def get_queryset(self): + queryset = super(InstanceView, self).get_queryset() + return queryset.exclude(text='filtered out') + class SlugSerializer(serializers.ModelSerializer): slug = serializers.Field() # read only @@ -160,10 +164,10 @@ class TestInstanceView(TestCase): """ Create 3 BasicModel intances. """ - items = ['foo', 'bar', 'baz'] + items = ['foo', 'bar', 'baz', 'filtered out'] for item in items: BasicModel(text=item).save() - self.objects = BasicModel.objects + self.objects = BasicModel.objects.exclude(text='filtered out') self.data = [ {'id': obj.id, 'text': obj.text} for obj in self.objects.all() @@ -352,6 +356,17 @@ class TestInstanceView(TestCase): updated = self.objects.get(id=1) self.assertEqual(updated.text, 'foobar') + def test_put_to_filtered_out_instance(self): + """ + PUT requests to an URL of instance which is filtered out should not be + able to create new objects. + """ + data = {'text': 'foo'} + filtered_out_pk = BasicModel.objects.filter(text='filtered out')[0].pk + request = factory.put('/{0}'.format(filtered_out_pk), data, format='json') + response = self.view(request, pk=filtered_out_pk).render() + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + def test_put_as_create_on_id_based_url(self): """ PUT requests to RetrieveUpdateDestroyAPIView should create an object From 304b193efe076868ceca624543183791f5931726 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 19 Nov 2013 15:58:34 +0000 Subject: [PATCH 0265/1652] Update release-notes.md --- docs/topics/release-notes.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 6c1447d53..0759bd9d1 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,10 @@ You can determine your currently installed version using `pip freeze`: ## 2.3.x series +### Master + +* Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400. + ### 2.3.9 **Date**: 15th November 2013 From 3765865b4bf69d76d5bcb8e9c8071f4380b54177 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 20 Nov 2013 17:40:56 +0000 Subject: [PATCH 0266/1652] Update 'default' explanation. Closes #1239 --- docs/api-guide/fields.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 4272c9a7a..03c5af32a 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -41,7 +41,7 @@ Defaults to `True`. ### `default` -If set, this gives the default value that will be used for the field if none is supplied. If not set the default behavior is to not populate the attribute at all. +If set, this gives the default value that will be used for the field if no input value is supplied. If not set the default behavior is to not populate the attribute at all. May be set to a function or other callable, in which case the value will be evaluated each time it is used. From 263281d71d0425d7bb9b4ebbdf1811ef637ee60a Mon Sep 17 00:00:00 2001 From: Malcolm Box Date: Thu, 21 Nov 2013 20:09:48 +0000 Subject: [PATCH 0267/1652] Fix issue #1231: JSONEncoder doesn't handle dict-like objects Check for __getitem__ and then attempt to convert to a dict. The check for __getitem__ is there as there's no universal way to check if an object is a mapping type, but this is a likely proxy --- rest_framework/tests/test_renderers.py | 57 ++++++++++++++++++++++++++ rest_framework/utils/encoders.py | 6 +++ 2 files changed, 63 insertions(+) diff --git a/rest_framework/tests/test_renderers.py b/rest_framework/tests/test_renderers.py index 76299a890..18da6ef85 100644 --- a/rest_framework/tests/test_renderers.py +++ b/rest_framework/tests/test_renderers.py @@ -18,6 +18,9 @@ from rest_framework.test import APIRequestFactory import datetime import pickle import re +import UserDict +import collections +import json DUMMYSTATUS = status.HTTP_200_OK @@ -244,6 +247,60 @@ class JSONRendererTests(TestCase): ret = JSONRenderer().render(_('test')) self.assertEqual(ret, b'"test"') + def test_render_userdict_obj(self): + class DictLike(UserDict.DictMixin): + def __init__(self): + self._dict = dict() + def __getitem__(self, key): + return self._dict.__getitem__(key) + def __setitem__(self, key, value): + return self._dict.__setitem__(key, value) + def __delitem__(self, key): + return self._dict.__delitem__(key) + def keys(self): + return self._dict.keys() + x = DictLike() + x['a'] = 1 + x['b'] = "string value" + ret = JSONRenderer().render(x) + self.assertEquals(json.loads(ret), {u'a': 1, u'b': u'string value'}) + + def test_render_dict_abc_obj(self): + class Dict(collections.MutableMapping): + def __init__(self): + self._dict = dict() + def __getitem__(self, key): + return self._dict.__getitem__(key) + def __setitem__(self, key, value): + return self._dict.__setitem__(key, value) + def __delitem__(self, key): + return self._dict.__delitem__(key) + def __iter__(self): + return self._dict.__iter__() + def __len__(self): + return self._dict.__len__() + + x = Dict() + x['key'] = 'string value' + x[2] = 3 + ret = JSONRenderer().render(x) + self.assertEquals(json.loads(ret), {u'key': 'string value', u'2': 3}) + + + def test_render_obj_with_getitem(self): + class DictLike(object): + def __init__(self): + self._dict = {} + def set(self, value): + self._dict = dict(value) + def __getitem__(self, key): + return self._dict[key] + + x = DictLike() + x.set({'a': 1, 'b': 'string'}) + with self.assertRaises(TypeError): + JSONRenderer().render(x) + def test_without_content_type_args(self): """ Test basic JSON rendering. diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 35ad206b9..22b1ab3de 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -44,6 +44,12 @@ class JSONEncoder(json.JSONEncoder): return str(o) elif hasattr(o, 'tolist'): return o.tolist() + elif hasattr(o, '__getitem__'): + try: + return dict(o) + except KeyError: + # Couldn't convert to a dict, fall through + pass elif hasattr(o, '__iter__'): return [i for i in o] return super(JSONEncoder, self).default(o) From 6af31ed3945fd051a6e8c08851d7a656637d1f00 Mon Sep 17 00:00:00 2001 From: Malcolm Box Date: Fri, 22 Nov 2013 10:59:48 +0000 Subject: [PATCH 0268/1652] Remove u from literals --- rest_framework/tests/test_renderers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/tests/test_renderers.py b/rest_framework/tests/test_renderers.py index 18da6ef85..9c9c7452e 100644 --- a/rest_framework/tests/test_renderers.py +++ b/rest_framework/tests/test_renderers.py @@ -263,7 +263,7 @@ class JSONRendererTests(TestCase): x['a'] = 1 x['b'] = "string value" ret = JSONRenderer().render(x) - self.assertEquals(json.loads(ret), {u'a': 1, u'b': u'string value'}) + self.assertEquals(json.loads(ret), {'a': 1, 'b': 'string value'}) def test_render_dict_abc_obj(self): class Dict(collections.MutableMapping): @@ -284,7 +284,7 @@ class JSONRendererTests(TestCase): x['key'] = 'string value' x[2] = 3 ret = JSONRenderer().render(x) - self.assertEquals(json.loads(ret), {u'key': 'string value', u'2': 3}) + self.assertEquals(json.loads(ret), {'key': 'string value', '2': 3}) def test_render_obj_with_getitem(self): From a38d9d5b24501ae0e279c9afbea08e423112ba34 Mon Sep 17 00:00:00 2001 From: Ian Foote Date: Tue, 26 Nov 2013 09:33:47 +0000 Subject: [PATCH 0269/1652] Add choices to options metadata for ChoiceField. --- rest_framework/fields.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 6c07dbb3b..80eff66c4 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -514,6 +514,11 @@ class ChoiceField(WritableField): choices = property(_get_choices, _set_choices) + def metadata(self): + data = super(ChoiceField, self).metadata() + data['choices'] = self.choices + return data + def validate(self, value): """ Validates that the input is in self.choices. From 2484fc914159571a3867c2dae2d9b51314f4581d Mon Sep 17 00:00:00 2001 From: Ian Foote Date: Tue, 26 Nov 2013 17:10:16 +0000 Subject: [PATCH 0270/1652] Add more context to the ChoiceField metadata. --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 80eff66c4..1657e57f3 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -516,7 +516,7 @@ class ChoiceField(WritableField): def metadata(self): data = super(ChoiceField, self).metadata() - data['choices'] = self.choices + data['choices'] = [{'value': v, 'name': n} for v, n in self.choices] return data def validate(self, value): From 8d09f56061a3ee82e31fb646cfa84484ae525f88 Mon Sep 17 00:00:00 2001 From: Ian Foote Date: Wed, 27 Nov 2013 11:00:15 +0000 Subject: [PATCH 0271/1652] Add unittests for ChoiceField metadata. Rename 'name' to 'display_name'. --- rest_framework/fields.py | 2 +- rest_framework/tests/test_fields.py | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 1657e57f3..0fca718e7 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -516,7 +516,7 @@ class ChoiceField(WritableField): def metadata(self): data = super(ChoiceField, self).metadata() - data['choices'] = [{'value': v, 'name': n} for v, n in self.choices] + data['choices'] = [{'value': v, 'display_name': n} for v, n in self.choices] return data def validate(self, value): diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py index ab2cceacd..5c96bce92 100644 --- a/rest_framework/tests/test_fields.py +++ b/rest_framework/tests/test_fields.py @@ -707,20 +707,21 @@ class ChoiceFieldTests(TestCase): self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + SAMPLE_CHOICES) def test_invalid_choice_model(self): - s = ChoiceFieldModelSerializer(data={'choice' : 'wrong_value'}) + s = ChoiceFieldModelSerializer(data={'choice': 'wrong_value'}) self.assertFalse(s.is_valid()) self.assertEqual(s.errors, {'choice': ['Select a valid choice. wrong_value is not one of the available choices.']}) self.assertEqual(s.data['choice'], '') def test_empty_choice_model(self): """ - Test that the 'empty' value is correctly passed and used depending on the 'null' property on the model field. + Test that the 'empty' value is correctly passed and used depending on + the 'null' property on the model field. """ - s = ChoiceFieldModelSerializer(data={'choice' : ''}) + s = ChoiceFieldModelSerializer(data={'choice': ''}) self.assertTrue(s.is_valid()) self.assertEqual(s.data['choice'], '') - s = ChoiceFieldModelWithNullSerializer(data={'choice' : ''}) + s = ChoiceFieldModelWithNullSerializer(data={'choice': ''}) self.assertTrue(s.is_valid()) self.assertEqual(s.data['choice'], None) @@ -740,6 +741,23 @@ class ChoiceFieldTests(TestCase): self.assertEqual(f.from_native(''), None) self.assertEqual(f.from_native(None), None) + def test_metadata_choices(self): + """ + Make sure proper choices are included in the field's metadata. + """ + choices = [{'value': v, 'display_name': n} for v, n in SAMPLE_CHOICES] + f = serializers.ChoiceField(choices=SAMPLE_CHOICES) + self.assertEqual(f.metadata()['choices'], choices) + + def test_metadata_choices_not_required(self): + """ + Make sure proper choices are included in the field's metadata. + """ + choices = [{'value': v, 'display_name': n} + for v, n in models.fields.BLANK_CHOICE_DASH + SAMPLE_CHOICES] + f = serializers.ChoiceField(required=False, choices=SAMPLE_CHOICES) + self.assertEqual(f.metadata()['choices'], choices) + class EmailFieldTests(TestCase): """ From 2dce8d7a8a0e64f84994b6ac437e2d96920f094e Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 27 Nov 2013 13:23:49 +0200 Subject: [PATCH 0272/1652] Recommend using Pillow instead of PIL. --- docs/api-guide/fields.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 03c5af32a..b0dedd394 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -286,7 +286,7 @@ An image representation. Corresponds to `django.forms.fields.ImageField`. -Requires the `PIL` package. +Requires either the `Pillow` package or `PIL` package. It is strongly recommends to use `Pillow` where possible. `PIL` is practically unmaintained and introduces [many problems][pilproblems]. Signature and validation is the same as with `FileField`. @@ -345,3 +345,4 @@ As an example, let's create a field that can be used represent the class name of [ecma262]: http://ecma-international.org/ecma-262/5.1/#sec-15.9.1.15 [strftime]: http://docs.python.org/2/library/datetime.html#strftime-and-strptime-behavior [iso8601]: http://www.w3.org/TR/NOTE-datetime +[pilproblems]: http://pillow.readthedocs.org/en/latest/about.html From b8f8fb7779dc01b5117e468345aaf99304f807ac Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 27 Nov 2013 13:26:49 +0200 Subject: [PATCH 0273/1652] Updated the assertion message of the ImageField. --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 6c07dbb3b..463d296f6 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -966,7 +966,7 @@ class ImageField(FileField): return None from rest_framework.compat import Image - assert Image is not None, 'PIL must be installed for ImageField support' + assert Image is not None, 'Either Pillow or PIL must be installed for ImageField support.' # We need to get a file object for PIL. We might have a path or we might # have to read the data into memory. From c46106c96158a99eb2ff29c464a2fa60aff23122 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Wed, 27 Nov 2013 14:47:37 +0200 Subject: [PATCH 0274/1652] Rephrased documentation changes according to feedback on IRC. --- docs/api-guide/fields.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index b0dedd394..e05c03061 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -286,7 +286,7 @@ An image representation. Corresponds to `django.forms.fields.ImageField`. -Requires either the `Pillow` package or `PIL` package. It is strongly recommends to use `Pillow` where possible. `PIL` is practically unmaintained and introduces [many problems][pilproblems]. +Requires either the `Pillow` package or `PIL` package. The `Pillow` package is recommended, as `PIL` is no longer actively maintained. Signature and validation is the same as with `FileField`. @@ -345,4 +345,3 @@ As an example, let's create a field that can be used represent the class name of [ecma262]: http://ecma-international.org/ecma-262/5.1/#sec-15.9.1.15 [strftime]: http://docs.python.org/2/library/datetime.html#strftime-and-strptime-behavior [iso8601]: http://www.w3.org/TR/NOTE-datetime -[pilproblems]: http://pillow.readthedocs.org/en/latest/about.html From 850cd83ba709e863598f8eec3d6551ef3bc3801c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Mon, 2 Dec 2013 11:44:04 +0100 Subject: [PATCH 0275/1652] Fix TemplateHTMLRenderer example --- docs/api-guide/renderers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 858e2f072..f30fa26a4 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -167,14 +167,14 @@ The template name is determined by (in order of preference): An example of a view that uses `TemplateHTMLRenderer`: - class UserDetail(generics.RetrieveUserAPIView): + class UserDetail(generics.RetrieveAPIView): """ A view that returns a templated HTML representations of a given user. """ queryset = User.objects.all() renderer_classes = (TemplateHTMLRenderer,) - def get(self, request, *args, **kwargs) + def get(self, request, *args, **kwargs): self.object = self.get_object() return Response({'user': self.object}, template_name='user_detail.html') From 699ec7236b326c97a98c6058280b822c701393fe Mon Sep 17 00:00:00 2001 From: Pablo Recio Date: Tue, 3 Dec 2013 00:07:41 +0000 Subject: [PATCH 0276/1652] Adds pre_delete and post_delete hooks on --- docs/api-guide/generic-views.md | 4 +++- rest_framework/generics.py | 12 ++++++++++++ rest_framework/mixins.py | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index b92427244..83c3e45f6 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -163,12 +163,14 @@ For example: return 20 return 100 -**Save hooks**: +**Save / deletion hooks**: The following methods are provided as placeholder interfaces. They contain empty implementations and are not called directly by `GenericAPIView`, but they are overridden and used by some of the mixin classes. * `pre_save(self, obj)` - A hook that is called before saving an object. * `post_save(self, obj, created=False)` - A hook that is called after saving an object. +* `pre_delete(self, obj)` - A hook that is called before deleting an object. +* `post_delete(self, obj)` - A hook that is called after deleting an object. The `pre_save` method in particular is a useful hook for setting attributes that are implicit in the request, but are not part of the request data. For instance, you might set an attribute on the object based on the request user, or based on a URL keyword argument. diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 7cb80a84c..fd411ad38 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -344,6 +344,18 @@ class GenericAPIView(views.APIView): """ pass + def pre_delete(self, obj): + """ + Placeholder method for calling before deleting an object. + """ + pass + + def post_delete(self, obj): + """ + Placeholder method for calling after saving an object. + """ + pass + def metadata(self, request): """ Return a dictionary of metadata about the view. diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 79f79c30c..43950c4bf 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -192,5 +192,7 @@ class DestroyModelMixin(object): """ def destroy(self, request, *args, **kwargs): obj = self.get_object() + self.pre_delete(obj) obj.delete() + self.post_delete(obj) return Response(status=status.HTTP_204_NO_CONTENT) From fe4c7d4000675a1720e7d3e02c3014a693d835aa Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 3 Dec 2013 08:26:58 +0000 Subject: [PATCH 0277/1652] Update release-notes.md --- docs/topics/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 0759bd9d1..c7e24a5ee 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,6 +42,7 @@ You can determine your currently installed version using `pip freeze`: ### Master +* Added `pre_delete()` and `post_delete()` method hooks. * Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400. ### 2.3.9 From c1d9a96df03ea81454d7d0e3583c68e270ed5043 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 3 Dec 2013 08:58:05 +0000 Subject: [PATCH 0278/1652] Catch errors during parsing and set empty .DATA/.FILES before re-raising. --- rest_framework/request.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index b883d0d4f..9b551aa80 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -356,7 +356,16 @@ class Request(object): if not parser: raise exceptions.UnsupportedMediaType(media_type) - parsed = parser.parse(stream, media_type, self.parser_context) + try: + parsed = parser.parse(stream, media_type, self.parser_context) + except: + # If we get an exception during parsing, fill in empty data and + # re-raise. Ensures we don't simply repeat the error when + # attempting to render the browsable renderer response, or when + # logging the request or similar. + self._data = QueryDict('', self._request._encoding) + self._files = MultiValueDict() + raise # Parser classes may return the raw data, or a # DataAndFiles object. Unpack the result as required. From b92c911cf66805f7826713c68f4e6704b2ad4589 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 3 Dec 2013 16:05:19 +0000 Subject: [PATCH 0279/1652] Update release-notes.md --- docs/topics/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index c7e24a5ee..f9ad55f76 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,6 +42,7 @@ You can determine your currently installed version using `pip freeze`: ### Master +* Add in choices information for ChoiceFields in response to `OPTIONS` requests. * Added `pre_delete()` and `post_delete()` method hooks. * Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400. From 9f1918e41e1b8dcfa621b00788bab865f2fc31aa Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 3 Dec 2013 16:06:57 +0000 Subject: [PATCH 0280/1652] Added @ian-foote, for work on #1250. Thanks! --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index e6c9c034f..3395cd9e2 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -179,6 +179,7 @@ The following people have helped make REST framework great. * Yamila Moreno - [yamila-moreno] * Rob Hudson - [robhudson] * Alex Good - [alexjg] +* Ian Foote - [ian-foote] Many thanks to everyone who's contributed to the project. @@ -394,3 +395,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [yamila-moreno]: https://github.com/yamila-moreno [robhudson]: https://github.com/robhudson [alexjg]: https://github.com/alexjg +[ian-foote]: https://github.com/ian-foote From 774298f145d18292b76f2bd90469e25c1950b1af Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 3 Dec 2013 16:18:35 +0000 Subject: [PATCH 0281/1652] First pass at a test for ParseErrors breaking the browsable API --- rest_framework/tests/test_renderers.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rest_framework/tests/test_renderers.py b/rest_framework/tests/test_renderers.py index 76299a890..549e763b1 100644 --- a/rest_framework/tests/test_renderers.py +++ b/rest_framework/tests/test_renderers.py @@ -88,6 +88,7 @@ urlpatterns = patterns('', url(r'^cache$', MockGETView.as_view()), url(r'^jsonp/jsonrenderer$', MockGETView.as_view(renderer_classes=[JSONRenderer, JSONPRenderer])), url(r'^jsonp/nojsonrenderer$', MockGETView.as_view(renderer_classes=[JSONPRenderer])), + url(r'^parseerror$', MockGETView.as_view(renderer_classes=[JSONRenderer, BrowsableAPIRenderer])), url(r'^html$', HTMLView.as_view()), url(r'^html1$', HTMLView1.as_view()), url(r'^api', include('rest_framework.urls', namespace='rest_framework')) @@ -219,6 +220,12 @@ class RendererEndToEndTests(TestCase): self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT)) self.assertEqual(resp.status_code, DUMMYSTATUS) + def test_parse_error_renderers_browsable_api(self): + """Invalid data should still render the browsable API correctly.""" + resp = self.client.post('/parseerror', data='foobar', content_type='application/json', HTTP_ACCEPT='text/html') + self.assertEqual(resp['Content-Type'], 'text/html; charset=utf-8') + self.assertContains(resp.content, 'Mock GET View') + self.assertEqual(resp.status_code, status.HTTP_400_) _flat_repr = '{"foo": ["bar", "baz"]}' _indented_repr = '{\n "foo": [\n "bar",\n "baz"\n ]\n}' From 38d78b21c0a7c68c205ebe6e79433ca51fe609ce Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 3 Dec 2013 16:55:11 +0000 Subject: [PATCH 0282/1652] Remove Content-Type header from empty responses. Fixes #1196 --- docs/topics/release-notes.md | 1 + rest_framework/response.py | 4 ++++ rest_framework/tests/test_renderers.py | 18 +++++++++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index f9ad55f76..e6085f592 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -44,6 +44,7 @@ You can determine your currently installed version using `pip freeze`: * Add in choices information for ChoiceFields in response to `OPTIONS` requests. * Added `pre_delete()` and `post_delete()` method hooks. +* Bugfix: Responses without any content no longer include an HTTP `'Content-Type'` header. * Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400. ### 2.3.9 diff --git a/rest_framework/response.py b/rest_framework/response.py index 5877c8a3e..1dc6abcf6 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -61,6 +61,10 @@ class Response(SimpleTemplateResponse): assert charset, 'renderer returned unicode, and did not specify ' \ 'a charset value.' return bytes(ret.encode(charset)) + + if not ret: + del self['Content-Type'] + return ret @property diff --git a/rest_framework/tests/test_renderers.py b/rest_framework/tests/test_renderers.py index 76299a890..f7de8fd72 100644 --- a/rest_framework/tests/test_renderers.py +++ b/rest_framework/tests/test_renderers.py @@ -64,11 +64,16 @@ class MockView(APIView): class MockGETView(APIView): - def get(self, request, **kwargs): return Response({'foo': ['bar', 'baz']}) +class EmptyGETView(APIView): + renderer_classes = (JSONRenderer,) + + def get(self, request, **kwargs): + return Response(status=status.HTTP_204_NO_CONTENT) + class HTMLView(APIView): renderer_classes = (BrowsableAPIRenderer, ) @@ -90,6 +95,7 @@ urlpatterns = patterns('', url(r'^jsonp/nojsonrenderer$', MockGETView.as_view(renderer_classes=[JSONPRenderer])), url(r'^html$', HTMLView.as_view()), url(r'^html1$', HTMLView1.as_view()), + url(r'^empty$', EmptyGETView.as_view()), url(r'^api', include('rest_framework.urls', namespace='rest_framework')) ) @@ -219,6 +225,16 @@ class RendererEndToEndTests(TestCase): self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT)) self.assertEqual(resp.status_code, DUMMYSTATUS) + def test_204_no_content_responses_have_no_content_type_set(self): + """ + Regression test for #1196 + + https://github.com/tomchristie/django-rest-framework/issues/1196 + """ + resp = self.client.get('/empty') + self.assertEqual(resp.get('Content-Type', None), None) + self.assertEqual(resp.status_code, status.HTTP_204_NO_CONTENT) + _flat_repr = '{"foo": ["bar", "baz"]}' _indented_repr = '{\n "foo": [\n "bar",\n "baz"\n ]\n}' From 3c3906e278d5e707ab1fd72bdbcb79649777df33 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 4 Dec 2013 08:51:34 +0000 Subject: [PATCH 0283/1652] Clarify wording, fixes #1133. --- docs/api-guide/viewsets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 1062cb32c..4fdd9364d 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -170,7 +170,7 @@ The actions provided by the `ModelViewSet` class are `.list()`, `.retrieve()`, #### Example -Because `ModelViewSet` extends `GenericAPIView`, you'll normally need to provide at least the `queryset` and `serializer_class` attributes. For example: +Because `ModelViewSet` extends `GenericAPIView`, you'll normally need to provide at least the `queryset` and `serializer_class` attributes, or the `model` attribute shortcut. For example: class AccountViewSet(viewsets.ModelViewSet): """ From de5b9e39dd4c21f4dcceb7cf13c7366b0fb74ec9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 4 Dec 2013 14:59:09 +0000 Subject: [PATCH 0284/1652] First pass on contribution guide --- docs/img/travis-status.png | Bin 0 -> 10023 bytes docs/index.md | 1 + docs/template.html | 1 + docs/topics/contributing.md | 91 ++++++++++++++++++++++++------------ 4 files changed, 64 insertions(+), 29 deletions(-) create mode 100644 docs/img/travis-status.png diff --git a/docs/img/travis-status.png b/docs/img/travis-status.png new file mode 100644 index 0000000000000000000000000000000000000000..fec98cf9b2ba728a532df7b50b89f505053e9012 GIT binary patch literal 10023 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 zm{-Browser enhancements
  • The Browsable API
  • REST, Hypermedia & HATEOAS
    • +
  • Contributing to REST framework
  • 2.0 Announcement
  • 2.2 Announcement
  • 2.3 Announcement
    • diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 123e4a8a1..2b18c4f68 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -6,19 +6,27 @@ There are many ways you can contribute to Django REST framework. We'd like it to be a community-led project, so please get involved and help shape the future of the project. -# Community +## Community -If you use and enjoy REST framework please consider [staring the project on GitHub][github], and [upvoting it on Django packages][django-packages]. Doing so helps potential new users see that the project is well used, and help us continue to attract new users. +The most important thing you can do to help push the REST framework project forward is to be actively involved wherever possible. Code contributions are often overvalued as being the primary way to get involved in a project, we don't believe that needs to be the case. -You might also consider writing a blog post on your experience with using REST framework, writing a tutorial about using the project with a particular javascript framework, or simply sharing the love on Twitter. +If you use REST framework, we'd love you to be vocal about your experiances with it - you might consider writing a blog post on your experience with using REST framework, or publishing a tutorial about using the project with a particular javascript framework. Experiances from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are and aren't easy to understand and work with. Other really great ways you can help move the community forward include helping answer questions on the [discussion group][google-group], or setting up an [email alert on StackOverflow][so-filter] so that you get notified of any new questions with the `django-rest-framework` tag. When answering questions make sure to help future contributors find their way around by hyperlinking wherever possible to related threads and tickets, and include backlinks from those items if relevant. +## Code of conduct + +Please keep the tone polite & professional. For some users a discussion on the REST framework mailing list or ticket tracker may be their first engagement with the open source community. First impressions count, so let's try to make everyone feel welcome. + +Be mindful in the language you choose. As an example, in an environment that is heavily male-dominated, posts that start 'Hey guys,' can come across as unintentionally exclusive. It's just as easy, and more inclusive to use gender neutral language in those situations. + +The [Django code of conduct][code-of-conduct] gives a fuller set of guidelines for participating in community forums. + # Issues -It's really helpful if you make sure you address issues to the correct channel. Usage questions should be directed to the [discussion group][google-group]. Feature requests, bug reports and other issues should be raised on the GitHub [issue tracker][issues]. +It's really helpful if you can make sure to address issues on the correct channel. Usage questions should be directed to the [discussion group][google-group]. Feature requests, bug reports and other issues should be raised on the GitHub [issue tracker][issues]. Some tips on good issue reporting: @@ -26,30 +34,61 @@ Some tips on good issue reporting: * Search the issue list first for related items, and make sure you're running the latest version of REST framework before reporting an issue. * If reporting a bug, then try to include a pull request with a failing test case. This will help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one. +## Triaging issues +Getting involved in triaging incoming issues is a good way to start contributing. Every single ticket that comes into the ticket tracker needs to be reviewed in order to determine what the next steps should be. Anyone can help out with this, you just need to be willing to -* TODO: Triage +* Read through the ticket - does it make sense, is it missing any context that would help explain it better? +* Is the ticket reported in the correct place, would it be better suited as a discussion on the discussion group? +* If the ticket is a bug report, can you reproduce it? Are you able to write a failing test case that demonstrates the issue and that can be submitted as a pull request? +* If the ticket is a feature request, do you agree with it, and could the feature request instead be implemented as a third party package? # Development +To start developing on Django REST framework, clone the repo: -* git clone & PYTHONPATH -* Pep8 -* Recommend editor that runs pep8 + git clone git@github.com:tomchristie/django-rest-framework.git -### Pull requests +Changes should broadly follow the [PEP 8][pep-8] style conventions, and we recommend you setup your editor to automatically indicated non-conforming styles. -* Make pull requests early -* Describe branching +## Testing -### Managing compatibility issues +To run the tests, clone the repository, and then: -* Describe compat module + # Setup the virtual environment + virtualenv env + env/bin/activate + pip install -r requirements.txt + pip install -r optionals.txt -# Testing + # Run the tests + rest_framework/runtests/runtests.py -* Running the tests -* tox +You can also use the excellent `[tox][tox]` testing tool to run the tests against all supported versions of Python and Django. Install `tox` globally, and then simply run: + + tox + +## Pull requests + +It's a good idea to make pull requests early on. A pull request represents the start of a discussion, and doesn't necessarily need to be the final, finished submission. + +It's also always best to make a new branch before starting work on a pull request. This means that you'll be able to later switch back to working on another seperate issue without interfering with an ongoing pull requests. + +It's also useful to remember that if you have an outstanding pull request then pushing new commits to your GitHub repo will also automatically update the pull requests. + +GitHub's documentation for working on pull requests is [available here][pull-requests]. + +Always run the tests before submitting pull requests, and ideally run `tox` in order to check that your modifications are compatible with both Python 2 and Python 3, and that they run properly on all supported versions of Django. + +Once you've made a pull request take a look at the travis build status in the GitHub interface and make sure the tests are runnning as you'd expect. + +![Travis status][travis-status] + +*Above: Travis build notifications* + +## Managing compatibility issues + +Sometimes, in order to ensure your code works on various different versions of Django, Python or third party libraries, you'll need to run slightly different code depending on the environment. Any code that branches in this way should be isolated into the `compat.py` module, and should provide a single common interface that the rest of the codebase can use. # Documentation @@ -77,7 +116,7 @@ Some other tips: * Keep paragraphs reasonably short. * Use double spacing after the end of sentences. -* Don't use the abbreviations such as 'e.g..' but instead use long form, such as 'For example'. +* Don't use the abbreviations such as 'e.g.' but instead use long form, such as 'For example'. ## Markdown style @@ -118,25 +157,19 @@ If you want to draw attention to a note or warning, use a pair of enclosing line --- - **Note:** Make sure you do this thing. + **Note:** A useful documentation note. --- -# Third party packages - -* Django reusable app - -# Core committers - -* Still use pull reqs -* Credits - [cite]: http://www.w3.org/People/Berners-Lee/FAQ.html -[github]: https://github.com/tomchristie/django-rest-framework -[django-packages]: https://www.djangopackages.com/grids/g/api/ +[code-of-conduct]: https://www.djangoproject.com/conduct/ [google-group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework [so-filter]: http://stackexchange.com/filters/66475/rest-framework [issues]: https://github.com/tomchristie/django-rest-framework/issues?state=open +[pep-8]: http://www.python.org/dev/peps/pep-0008/ +[travis-status]: ../img/travis-status.png +[pull-requests]: https://help.github.com/articles/using-pull-requests +[tox]: http://tox.readthedocs.org/en/latest/ [markdown]: http://daringfireball.net/projects/markdown/basics [docs]: https://github.com/tomchristie/django-rest-framework/tree/master/docs [mou]: http://mouapp.com/ From f2682537e0fa91bb415be1a64e6bc85275129141 Mon Sep 17 00:00:00 2001 From: Drew Kowalik Date: Wed, 4 Dec 2013 16:10:05 -0800 Subject: [PATCH 0285/1652] fix broken documentation links --- docs/api-guide/views.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md index 15581e098..194a7a6b3 100644 --- a/docs/api-guide/views.md +++ b/docs/api-guide/views.md @@ -168,5 +168,5 @@ Each of these decorators takes a single argument which must be a list or tuple o [cite]: http://reinout.vanrees.org/weblog/2011/08/24/class-based-views-usage.html [cite2]: http://www.boredomandlaziness.org/2012/05/djangos-cbvs-are-not-mistake-but.html -[settings]: api-guide/settings.md -[throttling]: api-guide/throttling.md +[settings]: settings.md +[throttling]: throttling.md From f8088bedef04c5bc487bdc764ac54d1f18f42c26 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 5 Dec 2013 09:01:00 +0000 Subject: [PATCH 0286/1652] Upgrade JSONP security warning. --- docs/api-guide/renderers.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index f30fa26a4..cf2005691 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -118,7 +118,13 @@ Renders the request data into `JSONP`. The `JSONP` media type provides a mechan The javascript callback function must be set by the client including a `callback` URL query parameter. For example `http://example.com/api/users?callback=jsonpCallback`. If the callback function is not explicitly set by the client it will default to `'callback'`. -**Note**: If you require cross-domain AJAX requests, you may want to consider using the more modern approach of [CORS][cors] as an alternative to `JSONP`. See the [CORS documentation][cors-docs] for more details. +--- + +**Warning**: If you require cross-domain AJAX requests, you should almost certainly be using the more modern approach of [CORS][cors] as an alternative to `JSONP`. See the [CORS documentation][cors-docs] for more details. + +The `jsonp` approach is essentially a browser hack, and is [only appropriate for globally readable API endpoints][jsonp-security], where `GET` requests are unauthenticated and do not require any user permissions. + +--- **.media_type**: `application/javascript` @@ -419,6 +425,7 @@ Comma-separated values are a plain-text tabular data format, that can be easily [rfc4627]: http://www.ietf.org/rfc/rfc4627.txt [cors]: http://www.w3.org/TR/cors/ [cors-docs]: ../topics/ajax-csrf-cors.md +[jsonp-security]: http://stackoverflow.com/questions/613962/is-jsonp-safe-to-use [testing]: testing.md [HATEOAS]: http://timelessrepo.com/haters-gonna-hateoas [quote]: http://roy.gbiv.com/untangled/2008/rest-apis-must-be-hypertext-driven From 1f8069c0a9740297e7b5d5fa0c81830c876d7240 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 5 Dec 2013 11:05:25 +0000 Subject: [PATCH 0287/1652] Boilerplate cuteness --- rest_framework/__init__.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index de82fef51..b6a4d3a04 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -1,6 +1,20 @@ -__version__ = '2.3.9' +""" +______ _____ _____ _____ __ _ +| ___ \ ___/ ___|_ _| / _| | | +| |_/ / |__ \ `--. | | | |_ _ __ __ _ _ __ ___ _____ _____ _ __| | __ +| /| __| `--. \ | | | _| '__/ _` | '_ ` _ \ / _ \ \ /\ / / _ \| '__| |/ / +| |\ \| |___/\__/ / | | | | | | | (_| | | | | | | __/\ V V / (_) | | | < +\_| \_\____/\____/ \_/ |_| |_| \__,_|_| |_| |_|\___| \_/\_/ \___/|_| |_|\_| +""" -VERSION = __version__ # synonym +__title__ = 'Django REST framework' +__version__ = '2.3.9' +__author__ = 'Tom Christie' +__license__ = 'BSD 2-Clause' +__copyright__ = 'Copyright 2011-2013 Tom Christie' + +# Version synonym +VERSION = __version__ # Header encoding (see RFC5987) HTTP_HEADER_ENCODING = 'iso-8859-1' From 79596dc613bbf24aac7b5c56179cbc5c46eacdf3 Mon Sep 17 00:00:00 2001 From: Justin Davis Date: Thu, 5 Dec 2013 13:17:23 -0800 Subject: [PATCH 0288/1652] fix setup.py with new __init__.py boilerplate --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 26d072837..1a487f178 100755 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ def get_version(package): Return package version as listed in `__version__` in `init.py`. """ init_py = open(os.path.join(package, '__init__.py')).read() - return re.match("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1) + return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1) def get_packages(package): From cf6c11bd4b7e7fdaa1de659d69792030e565412a Mon Sep 17 00:00:00 2001 From: Chuck Harmston Date: Fri, 6 Dec 2013 14:00:23 -0600 Subject: [PATCH 0289/1652] Raise appropriate error in serializer when making a partial update to set a required RelatedField to null (issue #1158) --- rest_framework/serializers.py | 5 ++++- rest_framework/tests/test_serializer.py | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 163abf4f0..44e4b04b1 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -896,7 +896,10 @@ class ModelSerializer(Serializer): # Update an existing instance... if instance is not None: for key, val in attrs.items(): - setattr(instance, key, val) + try: + setattr(instance, key, val) + except ValueError: + self._errors[key] = self.error_messages['required'] # ...or create a new instance else: diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index 1f85a4749..eca467ee2 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -558,6 +558,29 @@ class ModelValidationTests(TestCase): self.assertFalse(second_serializer.is_valid()) self.assertEqual(second_serializer.errors, {'title': ['Album with this Title already exists.']}) + def test_foreign_key_is_null_with_partial(self): + """ + Test ModelSerializer validation with partial=True + + Specifically test that a null foreign key does not pass validation + """ + album = Album(title='test') + album.save() + + class PhotoSerializer(serializers.ModelSerializer): + class Meta: + model = Photo + + photo_serializer = PhotoSerializer(data={'description': 'test', 'album': album.pk}) + self.assertTrue(photo_serializer.is_valid()) + photo = photo_serializer.save() + + # Updating only the album (foreign key) + photo_serializer = PhotoSerializer(instance=photo, data={'album': ''}, partial=True) + self.assertFalse(photo_serializer.is_valid()) + self.assertTrue('album' in photo_serializer.errors) + self.assertEqual(photo_serializer.errors['album'], photo_serializer.error_messages['required']) + def test_foreign_key_with_partial(self): """ Test ModelSerializer validation with partial=True From 51359e461299905c6cd359000941f9da3d561f7d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 6 Dec 2013 21:42:52 +0000 Subject: [PATCH 0290/1652] Added @chuckharmston for kickass bug squashing in #1272 --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 3395cd9e2..1a838421d 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -180,6 +180,7 @@ The following people have helped make REST framework great. * Rob Hudson - [robhudson] * Alex Good - [alexjg] * Ian Foote - [ian-foote] +* Chuck Harmston - [chuckharmston] Many thanks to everyone who's contributed to the project. @@ -396,3 +397,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [robhudson]: https://github.com/robhudson [alexjg]: https://github.com/alexjg [ian-foote]: https://github.com/ian-foote +[chuckharmston]: https://github.com/chuckharmston From 85d9eb0f7ed3ef66a25a443b34ead914a506462c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 6 Dec 2013 21:47:26 +0000 Subject: [PATCH 0291/1652] Update release-notes.md --- docs/topics/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index e6085f592..2df2cf931 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -44,6 +44,7 @@ You can determine your currently installed version using `pip freeze`: * Add in choices information for ChoiceFields in response to `OPTIONS` requests. * Added `pre_delete()` and `post_delete()` method hooks. +* Bugfix: Partial updates which erronously set a related field to `None` now correctly fail validation instead of raising an exception. * Bugfix: Responses without any content no longer include an HTTP `'Content-Type'` header. * Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400. From 910de38a9c8cd03243e738c8f4adcbade8a4d7d6 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 6 Dec 2013 22:13:50 +0000 Subject: [PATCH 0292/1652] Version 2.3.10 --- docs/api-guide/status-codes.md | 21 ++++++++++++++++++ docs/topics/release-notes.md | 5 ++++- rest_framework/__init__.py | 2 +- rest_framework/status.py | 17 +++++++++++++++ rest_framework/tests/test_status.py | 33 +++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 rest_framework/tests/test_status.py diff --git a/docs/api-guide/status-codes.md b/docs/api-guide/status-codes.md index 409f659b2..64c464349 100644 --- a/docs/api-guide/status-codes.md +++ b/docs/api-guide/status-codes.md @@ -17,6 +17,18 @@ Using bare status codes in your responses isn't recommended. REST framework inc The full set of HTTP status codes included in the `status` module is listed below. +The module also includes a set of helper functions for testing if a status code is in a given range. + + from rest_framework import status + from rest_framework.test import APITestCase + + class ExampleTestCase(APITestCase): + def test_url_root(self): + url = reverse('index') + response = self.client.get(url) + self.assertTrue(status.is_success(response.status_code)) + + For more information on proper usage of HTTP status codes see [RFC 2616][rfc2616] and [RFC 6585][rfc6585]. @@ -90,6 +102,15 @@ Response status codes beginning with the digit "5" indicate cases in which the s HTTP_505_HTTP_VERSION_NOT_SUPPORTED HTTP_511_NETWORK_AUTHENTICATION_REQUIRED +## Helper functions + +The following helper functions are available for identifying the category of the response code. + + is_informational() # 1xx + is_success() # 2xx + is_redirect() # 3xx + is_client_error() # 4xx + is_server_error() # 5xx [rfc2324]: http://www.ietf.org/rfc/rfc2324.txt [rfc2616]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 2df2cf931..b080ad436 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,10 +40,13 @@ You can determine your currently installed version using `pip freeze`: ## 2.3.x series -### Master +### 2.3.10 + +**Date**: 6th December 2013 * Add in choices information for ChoiceFields in response to `OPTIONS` requests. * Added `pre_delete()` and `post_delete()` method hooks. +* Added status code category helper functions. * Bugfix: Partial updates which erronously set a related field to `None` now correctly fail validation instead of raising an exception. * Bugfix: Responses without any content no longer include an HTTP `'Content-Type'` header. * Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400. diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index b6a4d3a04..f5483b9d6 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ _ """ __title__ = 'Django REST framework' -__version__ = '2.3.9' +__version__ = '2.3.10' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2013 Tom Christie' diff --git a/rest_framework/status.py b/rest_framework/status.py index b9f249f9f..764353711 100644 --- a/rest_framework/status.py +++ b/rest_framework/status.py @@ -6,6 +6,23 @@ And RFC 6585 - http://tools.ietf.org/html/rfc6585 """ from __future__ import unicode_literals + +def is_informational(code): + return code >= 100 and code <= 199 + +def is_success(code): + return code >= 200 and code <= 299 + +def is_redirect(code): + return code >= 300 and code <= 399 + +def is_client_error(code): + return code >= 400 and code <= 499 + +def is_server_error(code): + return code >= 500 and code <= 599 + + HTTP_100_CONTINUE = 100 HTTP_101_SWITCHING_PROTOCOLS = 101 HTTP_200_OK = 200 diff --git a/rest_framework/tests/test_status.py b/rest_framework/tests/test_status.py new file mode 100644 index 000000000..7b1bdae31 --- /dev/null +++ b/rest_framework/tests/test_status.py @@ -0,0 +1,33 @@ +from __future__ import unicode_literals +from django.test import TestCase +from rest_framework.status import ( + is_informational, is_success, is_redirect, is_client_error, is_server_error +) + + +class TestStatus(TestCase): + def test_status_categories(self): + self.assertFalse(is_informational(99)) + self.assertTrue(is_informational(100)) + self.assertTrue(is_informational(199)) + self.assertFalse(is_informational(200)) + + self.assertFalse(is_success(199)) + self.assertTrue(is_success(200)) + self.assertTrue(is_success(299)) + self.assertFalse(is_success(300)) + + self.assertFalse(is_redirect(299)) + self.assertTrue(is_redirect(300)) + self.assertTrue(is_redirect(399)) + self.assertFalse(is_redirect(400)) + + self.assertFalse(is_client_error(399)) + self.assertTrue(is_client_error(400)) + self.assertTrue(is_client_error(499)) + self.assertFalse(is_client_error(500)) + + self.assertFalse(is_server_error(499)) + self.assertTrue(is_server_error(500)) + self.assertTrue(is_server_error(599)) + self.assertFalse(is_server_error(600)) \ No newline at end of file From 9ab0759e38492d9950d66299ed5c58155d39e696 Mon Sep 17 00:00:00 2001 From: kahnjw Date: Fri, 6 Dec 2013 14:21:33 -0800 Subject: [PATCH 0293/1652] Add tests to pass for get_ident method in BaseThrottle class. --- rest_framework/tests/test_throttling.py | 65 +++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/rest_framework/tests/test_throttling.py b/rest_framework/tests/test_throttling.py index 41bff6926..031276968 100644 --- a/rest_framework/tests/test_throttling.py +++ b/rest_framework/tests/test_throttling.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals from django.test import TestCase from django.contrib.auth.models import User from django.core.cache import cache +from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory from rest_framework.views import APIView from rest_framework.throttling import BaseThrottle, UserRateThrottle, ScopedRateThrottle @@ -275,3 +276,67 @@ class ScopedRateThrottleTests(TestCase): self.increment_timer() response = self.unscoped_view(request) self.assertEqual(200, response.status_code) + +class XffTestingBase(TestCase): + def setUp(self): + + class Throttle(ScopedRateThrottle): + THROTTLE_RATES = {'test_limit': '1/day'} + TIMER_SECONDS = 0 + timer = lambda self: self.TIMER_SECONDS + + class View(APIView): + throttle_classes = (Throttle,) + throttle_scope = 'test_limit' + + def get(self, request): + return Response('test_limit') + + cache.clear() + self.throttle = Throttle() + self.view = View.as_view() + self.request = APIRequestFactory().get('/some_uri') + self.request.META['REMOTE_ADDR'] = '3.3.3.3' + self.request.META['HTTP_X_FORWARDED_FOR'] = '0.0.0.0, 1.1.1.1, 2.2.2.2' + + def config_proxy(self, num_proxies): + setattr(api_settings, 'NUM_PROXIES', num_proxies) + + +class IdWithXffBasicTests(XffTestingBase): + def test_accepts_request_under_limit(self): + self.config_proxy(0) + self.assertEqual(200, self.view(self.request).status_code) + + def test_denies_request_over_limit(self): + self.config_proxy(0) + self.view(self.request) + self.assertEqual(429, self.view(self.request).status_code) + + +class XffSpoofingTests(XffTestingBase): + def test_xff_spoofing_doesnt_change_machine_id_with_one_app_proxy(self): + self.config_proxy(1) + self.view(self.request) + self.request.META['HTTP_X_FORWARDED_FOR'] = '4.4.4.4, 5.5.5.5, 2.2.2.2' + self.assertEqual(429, self.view(self.request).status_code) + + def test_xff_spoofing_doesnt_change_machine_id_with_two_app_proxies(self): + self.config_proxy(2) + self.view(self.request) + self.request.META['HTTP_X_FORWARDED_FOR'] = '4.4.4.4, 1.1.1.1, 2.2.2.2' + self.assertEqual(429, self.view(self.request).status_code) + + +class XffUniqueMachinesTest(XffTestingBase): + def test_unique_clients_are_counted_independently_with_one_proxy(self): + self.config_proxy(1) + self.view(self.request) + self.request.META['HTTP_X_FORWARDED_FOR'] = '0.0.0.0, 1.1.1.1, 7.7.7.7' + self.assertEqual(200, self.view(self.request).status_code) + + def test_unique_clients_are_counted_independently_with_two_proxies(self): + self.config_proxy(2) + self.view(self.request) + self.request.META['HTTP_X_FORWARDED_FOR'] = '0.0.0.0, 7.7.7.7, 2.2.2.2' + self.assertEqual(200, self.view(self.request).status_code) From 89f26c5e040febd27bc9142b0096ca119bb3fa32 Mon Sep 17 00:00:00 2001 From: kahnjw Date: Fri, 6 Dec 2013 14:21:52 -0800 Subject: [PATCH 0294/1652] Add get_ident method to pass new tests. --- rest_framework/settings.py | 1 + rest_framework/throttling.py | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 8abaf1409..383de72ea 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -63,6 +63,7 @@ DEFAULTS = { 'user': None, 'anon': None, }, + 'NUM_PROXIES': None, # Pagination 'PAGINATE_BY': None, diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index a946d837f..60e46d479 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -18,6 +18,21 @@ class BaseThrottle(object): """ raise NotImplementedError('.allow_request() must be overridden') + def get_ident(self, request): + """ + Identify the machine making the request by parsing HTTP_X_FORWARDED_FOR + if present and number of proxies is > 0. If not use all of + HTTP_X_FORWARDED_FOR if it is available, if not use REMOTE_ADDR. + """ + xff = request.META.get('HTTP_X_FORWARDED_FOR') + remote_addr = request.META.get('REMOTE_ADDR') + num_proxies = api_settings.NUM_PROXIES + + if xff and num_proxies: + return xff.split(',')[-min(num_proxies, len(xff))].strip() + + return xff if xff else remote_addr + def wait(self): """ Optionally, return a recommended number of seconds to wait before @@ -152,13 +167,9 @@ class AnonRateThrottle(SimpleRateThrottle): if request.user.is_authenticated(): return None # Only throttle unauthenticated requests. - ident = request.META.get('HTTP_X_FORWARDED_FOR') - if ident is None: - ident = request.META.get('REMOTE_ADDR') - return self.cache_format % { 'scope': self.scope, - 'ident': ident + 'ident': self.get_ident(request) } @@ -176,7 +187,7 @@ class UserRateThrottle(SimpleRateThrottle): if request.user.is_authenticated(): ident = request.user.id else: - ident = request.META.get('REMOTE_ADDR', None) + ident = self.get_ident(request) return self.cache_format % { 'scope': self.scope, @@ -224,7 +235,7 @@ class ScopedRateThrottle(SimpleRateThrottle): if request.user.is_authenticated(): ident = request.user.id else: - ident = request.META.get('REMOTE_ADDR', None) + ident = self.get_ident(request) return self.cache_format % { 'scope': self.scope, From 100a933279e3119e2627d744cd7eb472b542f6fe Mon Sep 17 00:00:00 2001 From: kahnjw Date: Fri, 6 Dec 2013 14:22:08 -0800 Subject: [PATCH 0295/1652] Add documentation to explain what effect these changes have. --- docs/api-guide/throttling.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index cc4692171..ee57383cd 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -35,11 +35,16 @@ The default throttling policy may be set globally, using the `DEFAULT_THROTTLE_C 'DEFAULT_THROTTLE_RATES': { 'anon': '100/day', 'user': '1000/day' - } + }, + 'NUM_PROXIES': 2, } The rate descriptions used in `DEFAULT_THROTTLE_RATES` may include `second`, `minute`, `hour` or `day` as the throttle period. +By default Django REST Framework will try to use the `HTTP_X_FORWARDED_FOR` header to uniquely identify client machines for throttling. If HTTP_X_FORWARDED_FOR is not present `REMOTE_ADDR` header value will be used. + +To help Django REST Framework identify unique clients the number of application proxies can be set using `NUM_PROXIES`. This setting will allow the throttle to correctly identify unique requests whenthere are multiple application side proxies in front of the server. `NUM_PROXIES` should be set to an integer. It is important to understand that if you configure `NUM_PROXIES > 0` all clients behind a unique [NAT'd](http://en.wikipedia.org/wiki/Network_address_translation) gateway will be treated as a single client. + You can also set the throttling policy on a per-view or per-viewset basis, using the `APIView` class based views. From 196c5952e4f610054e832aef36cb2383b8c129c0 Mon Sep 17 00:00:00 2001 From: kahnjw Date: Fri, 6 Dec 2013 14:24:16 -0800 Subject: [PATCH 0296/1652] Fix typo --- docs/api-guide/throttling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index ee57383cd..69b15a829 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -43,7 +43,7 @@ The rate descriptions used in `DEFAULT_THROTTLE_RATES` may include `second`, `mi By default Django REST Framework will try to use the `HTTP_X_FORWARDED_FOR` header to uniquely identify client machines for throttling. If HTTP_X_FORWARDED_FOR is not present `REMOTE_ADDR` header value will be used. -To help Django REST Framework identify unique clients the number of application proxies can be set using `NUM_PROXIES`. This setting will allow the throttle to correctly identify unique requests whenthere are multiple application side proxies in front of the server. `NUM_PROXIES` should be set to an integer. It is important to understand that if you configure `NUM_PROXIES > 0` all clients behind a unique [NAT'd](http://en.wikipedia.org/wiki/Network_address_translation) gateway will be treated as a single client. +To help Django REST Framework identify unique clients the number of application proxies can be set using `NUM_PROXIES`. This setting will allow the throttle to correctly identify unique requests when there are multiple application side proxies in front of the server. `NUM_PROXIES` should be set to an integer. It is important to understand that if you configure `NUM_PROXIES > 0` all clients behind a unique [NAT'd](http://en.wikipedia.org/wiki/Network_address_translation) gateway will be treated as a single client. You can also set the throttling policy on a per-view or per-viewset basis, using the `APIView` class based views. From 887da7f6c5a9e7b5007f5e4af32a6b93b18c70ea Mon Sep 17 00:00:00 2001 From: kahnjw Date: Fri, 6 Dec 2013 14:30:33 -0800 Subject: [PATCH 0297/1652] Add missing tick marks --- docs/api-guide/throttling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index 69b15a829..34418e84d 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -41,7 +41,7 @@ The default throttling policy may be set globally, using the `DEFAULT_THROTTLE_C The rate descriptions used in `DEFAULT_THROTTLE_RATES` may include `second`, `minute`, `hour` or `day` as the throttle period. -By default Django REST Framework will try to use the `HTTP_X_FORWARDED_FOR` header to uniquely identify client machines for throttling. If HTTP_X_FORWARDED_FOR is not present `REMOTE_ADDR` header value will be used. +By default Django REST Framework will try to use the `HTTP_X_FORWARDED_FOR` header to uniquely identify client machines for throttling. If `HTTP_X_FORWARDED_FOR` is not present `REMOTE_ADDR` header value will be used. To help Django REST Framework identify unique clients the number of application proxies can be set using `NUM_PROXIES`. This setting will allow the throttle to correctly identify unique requests when there are multiple application side proxies in front of the server. `NUM_PROXIES` should be set to an integer. It is important to understand that if you configure `NUM_PROXIES > 0` all clients behind a unique [NAT'd](http://en.wikipedia.org/wiki/Network_address_translation) gateway will be treated as a single client. From 23db6c98495d7b3c18a3069c6cb770d5cbc18ee1 Mon Sep 17 00:00:00 2001 From: kahnjw Date: Fri, 6 Dec 2013 14:52:39 -0800 Subject: [PATCH 0298/1652] PEP8 Compliance --- rest_framework/tests/test_throttling.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rest_framework/tests/test_throttling.py b/rest_framework/tests/test_throttling.py index 031276968..8c5eefe9c 100644 --- a/rest_framework/tests/test_throttling.py +++ b/rest_framework/tests/test_throttling.py @@ -277,6 +277,7 @@ class ScopedRateThrottleTests(TestCase): response = self.unscoped_view(request) self.assertEqual(200, response.status_code) + class XffTestingBase(TestCase): def setUp(self): From db19fba50d65c1093efa25bd5ed1230b6404c8ca Mon Sep 17 00:00:00 2001 From: Andy Wilson Date: Fri, 6 Dec 2013 22:31:07 -0600 Subject: [PATCH 0299/1652] update installation example to work with django 1.6 looks like django.conf.urls.defaults was deprecated as of django 1.6 --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 3e5adbc4a..badd6f60a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -100,7 +100,7 @@ Don't forget to make sure you've also added `rest_framework` to your `INSTALLED_ We're ready to create our API now. Here's our project's root `urls.py` module: - from django.conf.urls.defaults import url, patterns, include + from django.conf.urls import url, patterns, include from django.contrib.auth.models import User, Group from rest_framework import viewsets, routers From 3399158d62416af56201eac63cc20d8934f08de2 Mon Sep 17 00:00:00 2001 From: taras Date: Sun, 8 Dec 2013 11:40:40 -0500 Subject: [PATCH 0300/1652] RelatedField is function of serializer class --- docs/api-guide/relations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index b9d96b5e3..556429bb9 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -44,7 +44,7 @@ In order to explain the various types of relational fields, we'll use a couple o For example, the following serializer. class AlbumSerializer(serializers.ModelSerializer): - tracks = RelatedField(many=True) + tracks = serializers.RelatedField(many=True) class Meta: model = Album From b8732d21652cf6b6e3c3e9807594b508be6583f8 Mon Sep 17 00:00:00 2001 From: Rustam Lalkaka Date: Sun, 8 Dec 2013 19:34:24 -0500 Subject: [PATCH 0301/1652] Minor grammar fix -- 'team' is singular --- docs/template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/template.html b/docs/template.html index 5a0bdbfd4..c065237a5 100644 --- a/docs/template.html +++ b/docs/template.html @@ -172,7 +172,7 @@
    -

    The team behind REST framework are launching a new API service.

    +

    The team behind REST framework is launching a new API service.

    If you want to be first in line when we start issuing invitations, please sign up here:

    From 06d8a31e132c99a9645e26b5def3a1d9b9585c24 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 9 Dec 2013 07:34:08 +0000 Subject: [PATCH 0302/1652] Catch and mask ParseErrors that occur during rendering of the BrowsableAPI. --- rest_framework/renderers.py | 9 +++++++-- rest_framework/request.py | 2 +- rest_framework/tests/test_renderers.py | 12 +++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index fe4f43d48..2fdd33376 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -20,6 +20,7 @@ from rest_framework.compat import StringIO from rest_framework.compat import six from rest_framework.compat import smart_text from rest_framework.compat import yaml +from rest_framework.exceptions import ParseError from rest_framework.settings import api_settings from rest_framework.request import is_form_media_type, override_method from rest_framework.utils import encoders @@ -420,8 +421,12 @@ class BrowsableAPIRenderer(BaseRenderer): In the absence of the View having an associated form then return None. """ if request.method == method: - data = request.DATA - files = request.FILES + try: + data = request.DATA + files = request.FILES + except ParseError: + data = None + files = None else: data = None files = None diff --git a/rest_framework/request.py b/rest_framework/request.py index 9b551aa80..fcea25083 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -362,7 +362,7 @@ class Request(object): # If we get an exception during parsing, fill in empty data and # re-raise. Ensures we don't simply repeat the error when # attempting to render the browsable renderer response, or when - # logging the request or similar. + # logging the request or similar. self._data = QueryDict('', self._request._encoding) self._files = MultiValueDict() raise diff --git a/rest_framework/tests/test_renderers.py b/rest_framework/tests/test_renderers.py index 549e763b1..10aa4248b 100644 --- a/rest_framework/tests/test_renderers.py +++ b/rest_framework/tests/test_renderers.py @@ -69,6 +69,12 @@ class MockGETView(APIView): return Response({'foo': ['bar', 'baz']}) +class MockPOSTView(APIView): + + def post(self, request, **kwargs): + return Response({'foo': request.DATA}) + + class HTMLView(APIView): renderer_classes = (BrowsableAPIRenderer, ) @@ -88,7 +94,7 @@ urlpatterns = patterns('', url(r'^cache$', MockGETView.as_view()), url(r'^jsonp/jsonrenderer$', MockGETView.as_view(renderer_classes=[JSONRenderer, JSONPRenderer])), url(r'^jsonp/nojsonrenderer$', MockGETView.as_view(renderer_classes=[JSONPRenderer])), - url(r'^parseerror$', MockGETView.as_view(renderer_classes=[JSONRenderer, BrowsableAPIRenderer])), + url(r'^parseerror$', MockPOSTView.as_view(renderer_classes=[JSONRenderer, BrowsableAPIRenderer])), url(r'^html$', HTMLView.as_view()), url(r'^html1$', HTMLView1.as_view()), url(r'^api', include('rest_framework.urls', namespace='rest_framework')) @@ -224,8 +230,8 @@ class RendererEndToEndTests(TestCase): """Invalid data should still render the browsable API correctly.""" resp = self.client.post('/parseerror', data='foobar', content_type='application/json', HTTP_ACCEPT='text/html') self.assertEqual(resp['Content-Type'], 'text/html; charset=utf-8') - self.assertContains(resp.content, 'Mock GET View') - self.assertEqual(resp.status_code, status.HTTP_400_) + self.assertIn('Mock Post', resp.content) + self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST) _flat_repr = '{"foo": ["bar", "baz"]}' _indented_repr = '{\n "foo": [\n "bar",\n "baz"\n ]\n}' From 4e9385e709bcee87456a99839841ecf6b56f337a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 9 Dec 2013 07:37:13 +0000 Subject: [PATCH 0303/1652] Drop unneeded assert --- rest_framework/tests/test_renderers.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rest_framework/tests/test_renderers.py b/rest_framework/tests/test_renderers.py index 10aa4248b..f4818eef2 100644 --- a/rest_framework/tests/test_renderers.py +++ b/rest_framework/tests/test_renderers.py @@ -230,7 +230,6 @@ class RendererEndToEndTests(TestCase): """Invalid data should still render the browsable API correctly.""" resp = self.client.post('/parseerror', data='foobar', content_type='application/json', HTTP_ACCEPT='text/html') self.assertEqual(resp['Content-Type'], 'text/html; charset=utf-8') - self.assertIn('Mock Post', resp.content) self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST) _flat_repr = '{"foo": ["bar", "baz"]}' From e80b353085c460c5ab7e9b4d22249f01176c5eb1 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 9 Dec 2013 08:10:51 +0000 Subject: [PATCH 0304/1652] Add notes to contributing docs --- docs/topics/contributing.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 2b18c4f68..4dd2718f2 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -33,6 +33,8 @@ Some tips on good issue reporting: * When describing issues try to phrase your ticket in terms of the *behavior* you think needs changing rather than the *code* you think need changing. * Search the issue list first for related items, and make sure you're running the latest version of REST framework before reporting an issue. * If reporting a bug, then try to include a pull request with a failing test case. This will help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one. +* Feature requests will often be closed with a recommendation that they be implemented outside of the core REST framework library. Keeping new feature requests implemented as third party libraries allows us to keep down the maintainence overhead of REST framework, so that the focus can be on continued stability, bugfixes, and great documentation. +* Closing an issue doesn't necessarily mean the end of a discussion. If you believe your issue has been closed incorrectly, explain why and we'll consider if it needs to be reopened. ## Triaging issues @@ -42,6 +44,7 @@ Getting involved in triaging incoming issues is a good way to start contributing * Is the ticket reported in the correct place, would it be better suited as a discussion on the discussion group? * If the ticket is a bug report, can you reproduce it? Are you able to write a failing test case that demonstrates the issue and that can be submitted as a pull request? * If the ticket is a feature request, do you agree with it, and could the feature request instead be implemented as a third party package? +* If a ticket hasn't had much activity and it addresses something you need, then comment on the ticket and try to find out what's needed to get it moving again. # Development From 23369650e3502305ebf5d682e141c7d47db89111 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 9 Dec 2013 08:14:21 +0000 Subject: [PATCH 0305/1652] Add notes to contributing docs --- docs/topics/contributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 4dd2718f2..b3ab52bbf 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -10,7 +10,7 @@ There are many ways you can contribute to Django REST framework. We'd like it t The most important thing you can do to help push the REST framework project forward is to be actively involved wherever possible. Code contributions are often overvalued as being the primary way to get involved in a project, we don't believe that needs to be the case. -If you use REST framework, we'd love you to be vocal about your experiances with it - you might consider writing a blog post on your experience with using REST framework, or publishing a tutorial about using the project with a particular javascript framework. Experiances from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are and aren't easy to understand and work with. +If you use REST framework, we'd love you to be vocal about your experiences with it - you might consider writing a blog post about using REST framework, or publishing a tutorial about building a project with a particularJjavascript framework. Experiences from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are more difficult to understand and work with. Other really great ways you can help move the community forward include helping answer questions on the [discussion group][google-group], or setting up an [email alert on StackOverflow][so-filter] so that you get notified of any new questions with the `django-rest-framework` tag. From e6f6bb5c7e3e882b0215c981e2f2b6a576820100 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 9 Dec 2013 08:42:09 +0000 Subject: [PATCH 0306/1652] Add notes to contributing docs --- docs/topics/contributing.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index b3ab52bbf..77c60fb47 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -164,6 +164,16 @@ If you want to draw attention to a note or warning, use a pair of enclosing line --- +## Third party packages + +New features to REST framework are generally recommended to be implemented as third party libraries that are developed outside of the core framework. Ideally third party libraries should be properly documented and packaged, and made available on PyPI. + +If you have some functionality that you would like to implement as a third party package it's worth contacting the [discussion group][google-group] as others may be willing to get involved. We strongly encourage third party package development and will always try to prioritize time spent helping their development, documentation and packaging. + +Once your package is decently documented and available on PyPI open a pull request or issue, and we'll add a link to it from the main documentation. + +We recommend the [`django-reusable-app`][django-reusable-app] template as a good resource for getting up and running with implementing a third party Django package. + [cite]: http://www.w3.org/People/Berners-Lee/FAQ.html [code-of-conduct]: https://www.djangoproject.com/conduct/ [google-group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework @@ -176,3 +186,4 @@ If you want to draw attention to a note or warning, use a pair of enclosing line [markdown]: http://daringfireball.net/projects/markdown/basics [docs]: https://github.com/tomchristie/django-rest-framework/tree/master/docs [mou]: http://mouapp.com/ +[django-reusable-app]: https://github.com/dabapps/django-reusable-app From c1be503308e755d72aae2c9695739bd33631e18b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 9 Dec 2013 08:46:18 +0000 Subject: [PATCH 0307/1652] Add notes to contributing docs --- docs/topics/contributing.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 77c60fb47..906950bb5 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -164,16 +164,20 @@ If you want to draw attention to a note or warning, use a pair of enclosing line --- -## Third party packages +# Third party packages New features to REST framework are generally recommended to be implemented as third party libraries that are developed outside of the core framework. Ideally third party libraries should be properly documented and packaged, and made available on PyPI. +## Getting started + If you have some functionality that you would like to implement as a third party package it's worth contacting the [discussion group][google-group] as others may be willing to get involved. We strongly encourage third party package development and will always try to prioritize time spent helping their development, documentation and packaging. -Once your package is decently documented and available on PyPI open a pull request or issue, and we'll add a link to it from the main documentation. - We recommend the [`django-reusable-app`][django-reusable-app] template as a good resource for getting up and running with implementing a third party Django package. +## Linking to your package + +Once your package is decently documented and available on PyPI open a pull request or issue, and we'll add a link to it from the main REST framework documentation. + [cite]: http://www.w3.org/People/Berners-Lee/FAQ.html [code-of-conduct]: https://www.djangoproject.com/conduct/ [google-group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework From ddd17c69e7abdd70448fa0f2f2a807d600b3391d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 9 Dec 2013 09:24:10 +0000 Subject: [PATCH 0308/1652] Fix compat issues for #1231 --- rest_framework/compat.py | 7 ++++++ rest_framework/tests/test_renderers.py | 31 ++++++-------------------- rest_framework/utils/encoders.py | 3 +-- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 581e29fc7..05bd99e0c 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -69,6 +69,13 @@ try: except ImportError: import urlparse +# UserDict moves in Python 3 +try: + from UserDict import UserDict + from UserDict import DictMixin +except ImportError: + from collections import UserDict + from collections import MutableMapping as DictMixin # Try to import PIL in either of the two ways it can end up installed. try: diff --git a/rest_framework/tests/test_renderers.py b/rest_framework/tests/test_renderers.py index d720bc51a..2ae8ae18c 100644 --- a/rest_framework/tests/test_renderers.py +++ b/rest_framework/tests/test_renderers.py @@ -15,12 +15,11 @@ from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \ from rest_framework.parsers import YAMLParser, XMLParser from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory +from collections import MutableMapping import datetime +import json import pickle import re -import UserDict -import collections -import json DUMMYSTATUS = status.HTTP_200_OK @@ -277,26 +276,8 @@ class JSONRendererTests(TestCase): ret = JSONRenderer().render(_('test')) self.assertEqual(ret, b'"test"') - def test_render_userdict_obj(self): - class DictLike(UserDict.DictMixin): - def __init__(self): - self._dict = dict() - def __getitem__(self, key): - return self._dict.__getitem__(key) - def __setitem__(self, key, value): - return self._dict.__setitem__(key, value) - def __delitem__(self, key): - return self._dict.__delitem__(key) - def keys(self): - return self._dict.keys() - x = DictLike() - x['a'] = 1 - x['b'] = "string value" - ret = JSONRenderer().render(x) - self.assertEquals(json.loads(ret), {'a': 1, 'b': 'string value'}) - def test_render_dict_abc_obj(self): - class Dict(collections.MutableMapping): + class Dict(MutableMapping): def __init__(self): self._dict = dict() def __getitem__(self, key): @@ -309,13 +290,15 @@ class JSONRendererTests(TestCase): return self._dict.__iter__() def __len__(self): return self._dict.__len__() + def keys(self): + return self._dict.keys() x = Dict() x['key'] = 'string value' x[2] = 3 ret = JSONRenderer().render(x) - self.assertEquals(json.loads(ret), {'key': 'string value', '2': 3}) - + data = json.loads(ret.decode('utf-8')) + self.assertEquals(data, {'key': 'string value', '2': 3}) def test_render_obj_with_getitem(self): class DictLike(object): diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 22b1ab3de..3ac920c6f 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -47,8 +47,7 @@ class JSONEncoder(json.JSONEncoder): elif hasattr(o, '__getitem__'): try: return dict(o) - except KeyError: - # Couldn't convert to a dict, fall through + except: pass elif hasattr(o, '__iter__'): return [i for i in o] From 2c898bd9018e40a8d0e4718fb2a0e3672e64782c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 9 Dec 2013 09:27:10 +0000 Subject: [PATCH 0309/1652] Update release notes --- docs/topics/release-notes.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index b080ad436..d3f85e6ee 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,10 @@ You can determine your currently installed version using `pip freeze`: ## 2.3.x series +### Master + +* JSON renderer now deals with objects that implement a dict-like interface. + ### 2.3.10 **Date**: 6th December 2013 From de319f3e28d27d71fffce7c8f12c23363d5c25eb Mon Sep 17 00:00:00 2001 From: Ian Date: Mon, 9 Dec 2013 09:53:16 +0000 Subject: [PATCH 0310/1652] Fix typo "Not" -> "Note" --- docs/api-guide/serializers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 4c3fb9d33..6fc25f57a 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -425,7 +425,7 @@ You can change the field that is used for object lookups by setting the `lookup_ fields = ('url', 'account_name', 'users', 'created') lookup_field = 'slug' -Not that the `lookup_field` will be used as the default on *all* hyperlinked fields, including both the URL identity, and any hyperlinked relationships. +Note that the `lookup_field` will be used as the default on *all* hyperlinked fields, including both the URL identity, and any hyperlinked relationships. For more specific requirements such as specifying a different lookup for each field, you'll want to set the fields on the serializer explicitly. For example: From 9ba7be959c2a2fea989527c590ce833df5925e63 Mon Sep 17 00:00:00 2001 From: Maxim Kamenkov Date: Mon, 9 Dec 2013 20:33:06 +0200 Subject: [PATCH 0311/1652] Added REST Condition to 3rd party permissions packages list. --- docs/api-guide/permissions.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 871de84ec..60624b630 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -230,6 +230,10 @@ The [DRF Any Permissions][drf-any-permissions] packages provides a different per The [Composed Permissions][composed-permissions] package provides a simple way to define complex and multi-depth (with logic operators) permission objects, using small and reusable components. +## REST Condition + +The [REST Condition][rest-condition] yet another but simple and convenient extension for complex permissions tree. The extension allows to combine permissions with logical operators rules. Logical expressions can be used along with the usual permissions classes in api views. + [cite]: https://developer.apple.com/library/mac/#documentation/security/Conceptual/AuthenticationAndAuthorizationGuide/Authorization/Authorization.html [authentication]: authentication.md [throttling]: throttling.md @@ -243,3 +247,4 @@ The [Composed Permissions][composed-permissions] package provides a simple way t [filtering]: filtering.md [drf-any-permissions]: https://github.com/kevin-brown/drf-any-permissions [composed-permissions]: https://github.com/niwibe/djangorestframework-composed-permissions +[rest-condition]: https://github.com/caxap/rest_condition From 785a42cd5aee9e96f9b780ff144fa13c16189748 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 10 Dec 2013 08:38:43 +0000 Subject: [PATCH 0312/1652] Tweak REST condition text. --- docs/api-guide/permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 60624b630..6a0f48f44 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -232,7 +232,7 @@ The [Composed Permissions][composed-permissions] package provides a simple way t ## REST Condition -The [REST Condition][rest-condition] yet another but simple and convenient extension for complex permissions tree. The extension allows to combine permissions with logical operators rules. Logical expressions can be used along with the usual permissions classes in api views. +The [REST Condition][rest-condition] package is another extension for building complex permissions in a simple and convenient way. The extension allows you to combine permissions with logical operators. [cite]: https://developer.apple.com/library/mac/#documentation/security/Conceptual/AuthenticationAndAuthorizationGuide/Authorization/Authorization.html [authentication]: authentication.md From 3a1c40f81488c241cb64860d6cc510f8e71c0c40 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 10 Dec 2013 08:46:44 +0000 Subject: [PATCH 0313/1652] Refine model manager behavior so as not to use the behavior in incorrect cases. Closes #1205 --- rest_framework/serializers.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 44e4b04b1..0d35fb327 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -412,7 +412,13 @@ class BaseSerializer(WritableField): # Set the serializer object if it exists obj = get_component(self.parent.object, self.source or field_name) if self.parent.object else None - obj = obj.all() if is_simple_callable(getattr(obj, 'all', None)) else obj + + # If we have a model manager or similar object then we need + # to iterate through each instance. + if (self.many and + not hasattr(obj, '__iter__') and + is_simple_callable(getattr(obj, 'all', None))): + obj = obj.all() if self.source == '*': if value: From 40164fcc6241489033d7015d429cbe0afc674d37 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 10 Dec 2013 08:49:54 +0000 Subject: [PATCH 0314/1652] Update release notes --- docs/topics/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index d3f85e6ee..e186893e1 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -43,6 +43,7 @@ You can determine your currently installed version using `pip freeze`: ### Master * JSON renderer now deals with objects that implement a dict-like interface. +* Bugfix: Refine behavior that call's model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unneccessary queryset re-evaluations. ### 2.3.10 From c09ad1bedc8559b2e6eadf0e5b8f3732af2d9d29 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 10 Dec 2013 08:53:38 +0000 Subject: [PATCH 0315/1652] Remove incorrect apostrophe --- docs/topics/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index e186893e1..1ddd83519 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -43,7 +43,7 @@ You can determine your currently installed version using `pip freeze`: ### Master * JSON renderer now deals with objects that implement a dict-like interface. -* Bugfix: Refine behavior that call's model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unneccessary queryset re-evaluations. +* Bugfix: Refine behavior that calls model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unneccessary queryset re-evaluations. ### 2.3.10 From d3a118c728729f63f7e7c7c39b62a7932ca06391 Mon Sep 17 00:00:00 2001 From: Alan Justino Date: Tue, 10 Dec 2013 17:14:17 -0200 Subject: [PATCH 0316/1652] SimpleRouter.get_lookup_regex got lookup_prefix This allows @alanjds/drf-nested-routers to not duplicate/monkeypatch work made here --- rest_framework/routers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 3fee1e494..7915991d9 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -184,18 +184,18 @@ class SimpleRouter(BaseRouter): bound_methods[method] = action return bound_methods - def get_lookup_regex(self, viewset): + def get_lookup_regex(self, viewset, lookup_prefix=''): """ Given a viewset, return the portion of URL regex that is used to match against a single instance. """ if self.trailing_slash: - base_regex = '(?P<{lookup_field}>[^/]+)' + base_regex = '(?P<{lookup_prefix}{lookup_field}>[^/]+)' else: # Don't consume `.json` style suffixes - base_regex = '(?P<{lookup_field}>[^/.]+)' + base_regex = '(?P<{lookup_prefix}{lookup_field}>[^/.]+)' lookup_field = getattr(viewset, 'lookup_field', 'pk') - return base_regex.format(lookup_field=lookup_field) + return base_regex.format(lookup_field=lookup_field, lookup_prefix=lookup_prefix) def get_urls(self): """ From 7382f8c6adc17c9feb02d028f7791af632d6dd3b Mon Sep 17 00:00:00 2001 From: David Ray Date: Tue, 10 Dec 2013 14:56:07 -0500 Subject: [PATCH 0317/1652] Update routers.md Reference to ```DefaultRouter``` should be ```SimpleRouter``` --- docs/api-guide/routers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index fb48197e9..8151e60f2 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -12,7 +12,7 @@ REST framework adds support for automatic URL routing to Django, and provides yo ## Usage -Here's an example of a simple URL conf, that uses `DefaultRouter`. +Here's an example of a simple URL conf, that uses `SimpleRouter`. from rest_framework import routers From 5acefd3b17e498af756fa48e27d7f8ce19322c7a Mon Sep 17 00:00:00 2001 From: OddBloke Date: Wed, 11 Dec 2013 13:55:54 +0000 Subject: [PATCH 0318/1652] Add full required imports to Generating Tokens example Previously we were missing User and post_save. --- docs/api-guide/authentication.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 1a1c68b84..ef77e02c5 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -162,6 +162,8 @@ The `curl` command line tool may be useful for testing token authenticated APIs. If you want every user to have an automatically generated Token, you can simply catch the User's `post_save` signal. + from django.contrib.auth.models import User + from django.db.models.signals import post_save from django.dispatch import receiver from rest_framework.authtoken.models import Token From 4f473f0b9e918f2e071da0c84bd9b584c00ac919 Mon Sep 17 00:00:00 2001 From: OddBloke Date: Wed, 11 Dec 2013 13:56:56 +0000 Subject: [PATCH 0319/1652] Use get_user_model instead of User in Generating Tokens example Because that's a better way of doing it. --- docs/api-guide/authentication.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index ef77e02c5..53efc49a0 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -162,12 +162,12 @@ The `curl` command line tool may be useful for testing token authenticated APIs. If you want every user to have an automatically generated Token, you can simply catch the User's `post_save` signal. - from django.contrib.auth.models import User + from django.contrib.auth import get_user_model from django.db.models.signals import post_save from django.dispatch import receiver from rest_framework.authtoken.models import Token - @receiver(post_save, sender=User) + @receiver(post_save, sender=get_user_model()) def create_auth_token(sender, instance=None, created=False, **kwargs): if created: Token.objects.create(user=instance) From df2d9034c2a5a07dc3aa5455db892ee94cbed467 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 12 Dec 2013 23:10:31 +0000 Subject: [PATCH 0320/1652] Add third party packages --- docs/api-guide/filtering.md | 9 +++++++++ docs/api-guide/routers.md | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index a0132ffcb..0e02a2a7d 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -360,6 +360,14 @@ For example, you might need to restrict users to only being able to see objects We could achieve the same behavior by overriding `get_queryset()` on the views, but using a filter backend allows you to more easily add this restriction to multiple views, or to apply it across the entire API. +# Third party packages + +The following third party packages provide additional filter implementations. + +## Django REST framework chain + +The [django-rest-framework-chain package][django-rest-framework-chain] works together with the `DjangoFilterBackend` class, and allows you to easily create filters across relationships, or create multiple filter lookup types for a given field. + [cite]: https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-specific-objects-with-filters [django-filter]: https://github.com/alex/django-filter [django-filter-docs]: https://django-filter.readthedocs.org/en/latest/index.html @@ -368,3 +376,4 @@ We could achieve the same behavior by overriding `get_queryset()` on the views, [view-permissions-blogpost]: http://blog.nyaruka.com/adding-a-view-permission-to-django-models [nullbooleanselect]: https://github.com/django/django/blob/master/django/forms/widgets.py [search-django-admin]: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#django.contrib.admin.ModelAdmin.search_fields +[django-rest-framework-chain]: https://github.com/philipn/django-rest-framework-chain diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 8151e60f2..9001b8597 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -150,4 +150,13 @@ If you want to provide totally custom behavior, you can override `BaseRouter` an You may also want to override the `get_default_base_name(self, viewset)` method, or else always explicitly set the `base_name` argument when registering your viewsets with the router. +# Third Party Packages + +The following third party packages provide router implementations that extend the default functionality provided by REST framework. + +## DRF Nested Routers + +The [drf-nested-routers package][drf-nested-routers] provides routers and relationship fields for working with nested resources. + [cite]: http://guides.rubyonrails.org/routing.html +[drf-nested-routers]: https://github.com/alanjds/drf-nested-routers From 83da4949c099fcf7e7636c98b9052b502e1bf74b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 13 Dec 2013 00:02:18 +0000 Subject: [PATCH 0321/1652] Allow NUM_PROXIES=0 and include more docs --- docs/api-guide/settings.md | 6 ++++++ docs/api-guide/throttling.md | 18 ++++++++++++------ rest_framework/throttling.py | 8 ++++++-- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 13f96f9a3..d8c878ff8 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -359,5 +359,11 @@ The name of a parameter in the URL conf that may be used to provide a format suf Default: `'format'` +#### NUM_PROXIES + +An integer of 0 or more, that may be used to specify the number of application proxies that the API runs behind. This allows throttling to more accurately identify client IP addresses. If set to `None` then less strict IP matching will be used by the throttle classes. + +Default: `None` + [cite]: http://www.python.org/dev/peps/pep-0020/ [strftime]: http://docs.python.org/2/library/time.html#time.strftime diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index 34418e84d..b2a5bb194 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -35,16 +35,11 @@ The default throttling policy may be set globally, using the `DEFAULT_THROTTLE_C 'DEFAULT_THROTTLE_RATES': { 'anon': '100/day', 'user': '1000/day' - }, - 'NUM_PROXIES': 2, + } } The rate descriptions used in `DEFAULT_THROTTLE_RATES` may include `second`, `minute`, `hour` or `day` as the throttle period. -By default Django REST Framework will try to use the `HTTP_X_FORWARDED_FOR` header to uniquely identify client machines for throttling. If `HTTP_X_FORWARDED_FOR` is not present `REMOTE_ADDR` header value will be used. - -To help Django REST Framework identify unique clients the number of application proxies can be set using `NUM_PROXIES`. This setting will allow the throttle to correctly identify unique requests when there are multiple application side proxies in front of the server. `NUM_PROXIES` should be set to an integer. It is important to understand that if you configure `NUM_PROXIES > 0` all clients behind a unique [NAT'd](http://en.wikipedia.org/wiki/Network_address_translation) gateway will be treated as a single client. - You can also set the throttling policy on a per-view or per-viewset basis, using the `APIView` class based views. @@ -71,6 +66,16 @@ Or, if you're using the `@api_view` decorator with function based views. } return Response(content) +## How clients are identified + +By default the `X-Forwarded-For` HTTP header is used to uniquely identify client machines for throttling. If the `X-Forwarded-For` header is not present, then the value of the `Remote-Addr` header will be used. + +If you need to more strictly identify unique clients, you'll need to configure the number of application proxies that the API runs behind by setting the `NUM_PROXIES` setting. This setting should be an integer of 0 or more, and will allow the throttle to identify the client IP as being the last IP address in the `X-Forwarded-For` header, once any application proxy IP addresses have first been excluded. + +It is important to understand that if you configure the `NUM_PROXIES` setting, then all clients behind a unique [NAT'd](http://en.wikipedia.org/wiki/Network_address_translation) gateway will be treated as a single client. + +Further context on how the `X-Forwarded-For` header works, and identifier a remote client IP can be [found here][identifing-clients]. + ## Setting up the cache The throttle classes provided by REST framework use Django's cache backend. You should make sure that you've set appropriate [cache settings][cache-setting]. The default value of `LocMemCache` backend should be okay for simple setups. See Django's [cache documentation][cache-docs] for more details. @@ -183,5 +188,6 @@ The following is an example of a rate throttle, that will randomly throttle 1 in [cite]: https://dev.twitter.com/docs/error-codes-responses [permissions]: permissions.md +[identifing-clients]: http://oxpedia.org/wiki/index.php?title=AppSuite:Grizzly#Multiple_Proxies_in_front_of_the_cluster [cache-setting]: https://docs.djangoproject.com/en/dev/ref/settings/#caches [cache-docs]: https://docs.djangoproject.com/en/dev/topics/cache/#setting-up-the-cache diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index 60e46d479..c40f3065b 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -28,8 +28,12 @@ class BaseThrottle(object): remote_addr = request.META.get('REMOTE_ADDR') num_proxies = api_settings.NUM_PROXIES - if xff and num_proxies: - return xff.split(',')[-min(num_proxies, len(xff))].strip() + if num_proxies is not None: + if num_proxies == 0 or xff is None: + return remote_addr + addrs = xff.split(',') + client_addr = addrs[-min(num_proxies, len(xff))] + return client_addr.strip() return xff if xff else remote_addr From ed931b90ae9e72f963673e6e188b1802a5a65360 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 13 Dec 2013 00:11:59 +0000 Subject: [PATCH 0322/1652] Further docs tweaks --- docs/api-guide/throttling.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index b2a5bb194..536f0ab78 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -68,13 +68,13 @@ Or, if you're using the `@api_view` decorator with function based views. ## How clients are identified -By default the `X-Forwarded-For` HTTP header is used to uniquely identify client machines for throttling. If the `X-Forwarded-For` header is not present, then the value of the `Remote-Addr` header will be used. +The `X-Forwarded-For` and `Remote-Addr` HTTP headers are used to uniquely identify client IP addresses for throttling. If the `X-Forwarded-For` header is present then it will be used, otherwise the value of the `Remote-Addr` header will be used. -If you need to more strictly identify unique clients, you'll need to configure the number of application proxies that the API runs behind by setting the `NUM_PROXIES` setting. This setting should be an integer of 0 or more, and will allow the throttle to identify the client IP as being the last IP address in the `X-Forwarded-For` header, once any application proxy IP addresses have first been excluded. +If you need to strictly identify unique client IP addresses, you'll need to first configure the number of application proxies that the API runs behind by setting the `NUM_PROXIES` setting. This setting should be an integer of zero or more. If set to non-zero then the client IP will be identified as being the last IP address in the `X-Forwarded-For` header, once any application proxy IP addresses have first been excluded. If set to zero, then the `Remote-Addr` header will always be used as the identifying IP address. It is important to understand that if you configure the `NUM_PROXIES` setting, then all clients behind a unique [NAT'd](http://en.wikipedia.org/wiki/Network_address_translation) gateway will be treated as a single client. -Further context on how the `X-Forwarded-For` header works, and identifier a remote client IP can be [found here][identifing-clients]. +Further context on how the `X-Forwarded-For` header works, and identifing a remote client IP can be [found here][identifing-clients]. ## Setting up the cache From 73e8536e0d38f6677ac30aa2b3ba80563961191f Mon Sep 17 00:00:00 2001 From: "S. Andrew Sheppard" Date: Thu, 12 Dec 2013 21:45:44 -0600 Subject: [PATCH 0323/1652] third-party package: wq.db --- docs/api-guide/routers.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 8151e60f2..ed9031144 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -150,4 +150,18 @@ If you want to provide totally custom behavior, you can override `BaseRouter` an You may also want to override the `get_default_base_name(self, viewset)` method, or else always explicitly set the `base_name` argument when registering your viewsets with the router. +# Third party packages + +The following third party packages are also available. + +## wq.db + +[wq.db] provides an advanced [Router][wq.db-router] class (and singleton instance) that extends `DefaultRouter` with a `register_model()` API. Much like Django's `admin.site.register`, the only required argument to `app.router.register_model` is a model class. Reasonable defaults for a url prefix and viewset will be inferred from the model and global configuration. + + from wq.db.rest import app + from .models import MyModel + app.router.register_model(MyModel) + [cite]: http://guides.rubyonrails.org/routing.html +[wq.db]: http://wq.io/wq.db +[wq.db-router]: http://wq.io/docs/app.py From 0453cbd56bf5c553412b61a2a5e5522a2d44a419 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 13 Dec 2013 11:09:54 +0000 Subject: [PATCH 0324/1652] Clean up implementation --- rest_framework/serializers.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 34f315318..40caa1f38 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -949,7 +949,11 @@ class ModelSerializer(Serializer): del(obj._m2m_data) if getattr(obj, '_related_data', None): - related_fields = dict(((f.get_accessor_name(), f) for f, m in obj._meta.get_all_related_objects_with_model())) + related_fields = dict([ + (field.get_accessor_name(), field) + for field, model + in obj._meta.get_all_related_objects_with_model() + ]) for accessor_name, related in obj._related_data.items(): if isinstance(related, RelationsList): # Nested reverse fk relationship From ca244ad614e2f6fb4fef1dc9987be996d2624303 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 13 Dec 2013 15:30:59 +0000 Subject: [PATCH 0325/1652] Expanded notes in quickstart. Closes #1127. Closes #1128. --- docs/index.md | 2 +- docs/tutorial/quickstart.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index badd6f60a..04804fa79 100644 --- a/docs/index.md +++ b/docs/index.md @@ -112,7 +112,7 @@ Here's our project's root `urls.py` module: model = Group - # Routers provide an easy way of automatically determining the URL conf + # Routers provide an easy way of automatically determining the URL conf. router = routers.DefaultRouter() router.register(r'users', UserViewSet) router.register(r'groups', GroupViewSet) diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 80bb9abb4..8bf8c7f5c 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -89,6 +89,10 @@ Rather than write multiple views we're grouping together all the common behavior We can easily break these down into individual views if we need to, but using viewsets keeps the view logic nicely organized as well as being very concise. +Notice that our viewset classes here are a little different from those in the [frontpage example][readme-example-api], as they include `queryset` and `serializer_class` attributes, instead of a `model` attribute. + +For trivial cases you can simply set a `model` attribute on the `ViewSet` class and the serializer and queryset will be automatically generated for you. Setting the `queryset` and/or `serializer_class` attributes gives you more explicit control of the API behaviour, and is the recommended style for most applications. + ## URLs Okay, now let's wire up the API URLs. On to `tutorial/urls.py`... @@ -169,6 +173,7 @@ Great, that was easy! If you want to get a more in depth understanding of how REST framework fits together head on over to [the tutorial][tutorial], or start browsing the [API guide][guide]. +[readme-example-api]: ../#example [image]: ../img/quickstart.png [tutorial]: 1-serialization.md [guide]: ../#api-guide From 90edcbf938ed8d6f3b783372c17e60bbf0761b61 Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Fri, 13 Dec 2013 12:41:44 -0500 Subject: [PATCH 0326/1652] Fix default values always being False for browsable API This fixes a bug that was introduced in 28ff6fb [1] for the browsable API, specifically with how it handled default values for boolean fields. Previously, it had a global default for boolean fields set to `False`, which was different than the standard None that was used elsewhere. Because this only needed to be done for the browsable API, a fix was put into place that only set the default to `False` when form data was passed into the serializer. This had the unintended side effect of overriding any default set on the boolean field. This fixes #1101 [2] by only overriding the default if the default is `None`, which is the default for all fields. [1]: https://github.com/tomchristie/django-rest-framework/commit/28ff6fb1ec02b7a04c4a0db54885f3735b6dd43f [2]: https://github.com/tomchristie/django-rest-framework/issues/1101 --- rest_framework/fields.py | 2 +- rest_framework/tests/test_serializer.py | 39 +++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 5a4f04a5b..f1de447c7 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -428,7 +428,7 @@ class BooleanField(WritableField): def field_from_native(self, data, files, field_name, into): # HTML checkboxes do not explicitly represent unchecked as `False` # we deal with that here... - if isinstance(data, QueryDict): + if isinstance(data, QueryDict) and self.default is None: self.default = False return super(BooleanField, self).field_from_native( diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index eca467ee2..14d1c664e 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -1743,3 +1743,42 @@ class TestSerializerTransformMethods(TestCase): 'b_renamed': None, } ) + + +class DefaultTrueBooleanModel(models.Model): + cat = models.BooleanField(default=True) + dog = models.BooleanField(default=False) + + +class SerializerDefaultTrueBoolean(TestCase): + + def setUp(self): + super(SerializerDefaultTrueBoolean, self).setUp() + + class DefaultTrueBooleanSerializer(serializers.ModelSerializer): + class Meta: + model = DefaultTrueBooleanModel + fields = ('cat', 'dog') + + self.default_true_boolean_serializer = DefaultTrueBooleanSerializer + + def test_enabled_as_false(self): + serializer = self.default_true_boolean_serializer(data={'cat': False, + 'dog': False}) + self.assertEqual(serializer.is_valid(), True) + self.assertEqual(serializer.data['cat'], False) + self.assertEqual(serializer.data['dog'], False) + + def test_enabled_as_true(self): + serializer = self.default_true_boolean_serializer(data={'cat': True, + 'dog': True}) + self.assertEqual(serializer.is_valid(), True) + self.assertEqual(serializer.data['cat'], True) + self.assertEqual(serializer.data['dog'], True) + + def test_enabled_partial(self): + serializer = self.default_true_boolean_serializer(data={'cat': False}, + partial=True) + self.assertEqual(serializer.is_valid(), True) + self.assertEqual(serializer.data['cat'], False) + self.assertEqual(serializer.data['dog'], False) From 87b99d1ac8ce212dd0751f597e3279d80d4fcad1 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 13 Dec 2013 20:17:26 +0000 Subject: [PATCH 0327/1652] Update release notes --- docs/topics/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 1ddd83519..54865053e 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -44,6 +44,7 @@ You can determine your currently installed version using `pip freeze`: * JSON renderer now deals with objects that implement a dict-like interface. * Bugfix: Refine behavior that calls model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unneccessary queryset re-evaluations. +* Bugfix: Allow defaults on BooleanFields to be properly honored when values are not supplied. ### 2.3.10 From 193af483efca2aaaebc186301b88f5735c87e638 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 13 Dec 2013 20:22:56 +0000 Subject: [PATCH 0328/1652] Add notes on lookup_prefix argument and why it's there even though unused by the default implementations. --- rest_framework/routers.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 7915991d9..97b35c10a 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -188,6 +188,12 @@ class SimpleRouter(BaseRouter): """ Given a viewset, return the portion of URL regex that is used to match against a single instance. + + Note that lookup_prefix is not used directly inside REST rest_framework + itself, but is required in order to nicely support nested router + implementations, such as drf-nested-routers. + + https://github.com/alanjds/drf-nested-routers """ if self.trailing_slash: base_regex = '(?P<{lookup_prefix}{lookup_field}>[^/]+)' From 39dbea4da43f829863d395d5f2ee158837f2afe2 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 13 Dec 2013 20:27:17 +0000 Subject: [PATCH 0329/1652] Links to drf-nested-routers --- docs/api-guide/relations.md | 11 +++++++++++ docs/api-guide/routers.md | 4 +--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 556429bb9..1b089c541 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -442,7 +442,18 @@ In the 2.4 release, these parts of the API will be removed entirely. For more details see the [2.2 release announcement][2.2-announcement]. +--- + +# Third Party Packages + +The following third party packages are also available. + +## DRF Nested Routers + +The [drf-nested-routers package][drf-nested-routers] provides routers and relationship fields for working with nested resources. + [cite]: http://lwn.net/Articles/193245/ [reverse-relationships]: https://docs.djangoproject.com/en/dev/topics/db/queries/#following-relationships-backward [generic-relations]: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/#id1 [2.2-announcement]: ../topics/2.2-announcement.md +[drf-nested-routers]: https://github.com/alanjds/drf-nested-routers diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 54fae65f5..895589db9 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -158,9 +158,6 @@ The following third party packages are also available. The [drf-nested-routers package][drf-nested-routers] provides routers and relationship fields for working with nested resources. -[cite]: http://guides.rubyonrails.org/routing.html -[drf-nested-routers]: https://github.com/alanjds/drf-nested-routers - ## wq.db The [wq.db package][wq.db] provides an advanced [Router][wq.db-router] class (and singleton instance) that extends `DefaultRouter` with a `register_model()` API. Much like Django's `admin.site.register`, the only required argument to `app.router.register_model` is a model class. Reasonable defaults for a url prefix and viewset will be inferred from the model and global configuration. @@ -171,5 +168,6 @@ The [wq.db package][wq.db] provides an advanced [Router][wq.db-router] class (an app.router.register_model(MyModel) [cite]: http://guides.rubyonrails.org/routing.html +[drf-nested-routers]: https://github.com/alanjds/drf-nested-routers [wq.db]: http://wq.io/wq.db [wq.db-router]: http://wq.io/docs/app.py From a87c55a93a7ca380bc49425cc6df00f4eba99aa2 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 13 Dec 2013 21:57:07 +0000 Subject: [PATCH 0330/1652] Compat fixes for django-oauth-plus versions 2.0-2.2.1 --- rest_framework/authentication.py | 7 ++++--- rest_framework/compat.py | 15 +++++++++++++++ rest_framework/tests/test_authentication.py | 20 ++++++++++---------- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index bca542ebb..e491ce5f9 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -9,7 +9,7 @@ from django.core.exceptions import ImproperlyConfigured from rest_framework import exceptions, HTTP_HEADER_ENCODING from rest_framework.compat import CsrfViewMiddleware from rest_framework.compat import oauth, oauth_provider, oauth_provider_store -from rest_framework.compat import oauth2_provider, provider_now +from rest_framework.compat import oauth2_provider, provider_now, check_nonce from rest_framework.authtoken.models import Token @@ -281,8 +281,9 @@ class OAuthAuthentication(BaseAuthentication): """ Checks nonce of request, and return True if valid. """ - return oauth_provider_store.check_nonce(request, oauth_request, - oauth_request['oauth_nonce'], oauth_request['oauth_timestamp']) + oauth_nonce = oauth_request['oauth_nonce'] + oauth_timestamp = oauth_request['oauth_timestamp'] + return check_nonce(request, oauth_request, oauth_nonce, oauth_timestamp) class OAuth2Authentication(BaseAuthentication): diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 05bd99e0c..88211becb 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -7,6 +7,7 @@ versions of django/python, and compatibility wrappers around optional packages. from __future__ import unicode_literals import django +import inspect from django.core.exceptions import ImproperlyConfigured from django.conf import settings @@ -536,9 +537,23 @@ except ImportError: try: import oauth_provider from oauth_provider.store import store as oauth_provider_store + + # check_nonce's calling signature in django-oauth-plus changes sometime + # between versions 2.0 and 2.2.1 + def check_nonce(request, oauth_request, oauth_nonce, oauth_timestamp): + check_nonce_args = inspect.getargspec(oauth_provider_store.check_nonce).args + if 'timestamp' in check_nonce_args: + return oauth_provider_store.check_nonce( + request, oauth_request, oauth_nonce, oauth_timestamp + ) + return oauth_provider_store.check_nonce( + request, oauth_request, oauth_nonce + ) + except (ImportError, ImproperlyConfigured): oauth_provider = None oauth_provider_store = None + check_nonce = None # OAuth 2 support is optional try: diff --git a/rest_framework/tests/test_authentication.py b/rest_framework/tests/test_authentication.py index fe11423dc..f072b81b7 100644 --- a/rest_framework/tests/test_authentication.py +++ b/rest_framework/tests/test_authentication.py @@ -249,7 +249,7 @@ class OAuthTests(TestCase): def setUp(self): # these imports are here because oauth is optional and hiding them in try..except block or compat # could obscure problems if something breaks - from oauth_provider.models import Consumer, Resource + from oauth_provider.models import Consumer, Scope from oauth_provider.models import Token as OAuthToken from oauth_provider import consts @@ -269,8 +269,8 @@ class OAuthTests(TestCase): self.consumer = Consumer.objects.create(key=self.CONSUMER_KEY, secret=self.CONSUMER_SECRET, name='example', user=self.user, status=self.consts.ACCEPTED) - self.resource = Resource.objects.create(name="resource name", url="api/") - self.token = OAuthToken.objects.create(user=self.user, consumer=self.consumer, resource=self.resource, + self.scope = Scope.objects.create(name="resource name", url="api/") + self.token = OAuthToken.objects.create(user=self.user, consumer=self.consumer, scope=self.scope, token_type=OAuthToken.ACCESS, key=self.TOKEN_KEY, secret=self.TOKEN_SECRET, is_approved=True ) @@ -398,10 +398,10 @@ class OAuthTests(TestCase): @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') @unittest.skipUnless(oauth, 'oauth2 not installed') def test_get_form_with_readonly_resource_passing_auth(self): - """Ensure POSTing with a readonly resource instead of a write scope fails""" + """Ensure POSTing with a readonly scope instead of a write scope fails""" read_only_access_token = self.token - read_only_access_token.resource.is_readonly = True - read_only_access_token.resource.save() + read_only_access_token.scope.is_readonly = True + read_only_access_token.scope.save() params = self._create_authorization_url_parameters() response = self.csrf_client.get('/oauth-with-scope/', params) self.assertEqual(response.status_code, 200) @@ -411,8 +411,8 @@ class OAuthTests(TestCase): def test_post_form_with_readonly_resource_failing_auth(self): """Ensure POSTing with a readonly resource instead of a write scope fails""" read_only_access_token = self.token - read_only_access_token.resource.is_readonly = True - read_only_access_token.resource.save() + read_only_access_token.scope.is_readonly = True + read_only_access_token.scope.save() params = self._create_authorization_url_parameters() response = self.csrf_client.post('/oauth-with-scope/', params) self.assertIn(response.status_code, (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)) @@ -422,8 +422,8 @@ class OAuthTests(TestCase): def test_post_form_with_write_resource_passing_auth(self): """Ensure POSTing with a write resource succeed""" read_write_access_token = self.token - read_write_access_token.resource.is_readonly = False - read_write_access_token.resource.save() + read_write_access_token.scope.is_readonly = False + read_write_access_token.scope.save() params = self._create_authorization_url_parameters() auth = self._create_authorization_header() response = self.csrf_client.post('/oauth-with-scope/', params, HTTP_AUTHORIZATION=auth) From 54d3c6a725358ee5bb3e07450fb5efbaf957e1b7 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 13 Dec 2013 21:59:47 +0000 Subject: [PATCH 0331/1652] Updated release notes --- docs/topics/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 54865053e..f171b1f50 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -43,6 +43,7 @@ You can determine your currently installed version using `pip freeze`: ### Master * JSON renderer now deals with objects that implement a dict-like interface. +* Fix compatiblity with newer versions of `django-oauth-plus`. * Bugfix: Refine behavior that calls model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unneccessary queryset re-evaluations. * Bugfix: Allow defaults on BooleanFields to be properly honored when values are not supplied. From f78b3187df11925caf07f9d86eb868de906c60c8 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 13 Dec 2013 22:01:19 +0000 Subject: [PATCH 0332/1652] Added @philipforget for work on #1232. Thanks :) --- docs/topics/credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 1a838421d..d4c00bc4e 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -181,6 +181,7 @@ The following people have helped make REST framework great. * Alex Good - [alexjg] * Ian Foote - [ian-foote] * Chuck Harmston - [chuckharmston] +* Philip Forget - [philipforget] Many thanks to everyone who's contributed to the project. @@ -398,3 +399,4 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [alexjg]: https://github.com/alexjg [ian-foote]: https://github.com/ian-foote [chuckharmston]: https://github.com/chuckharmston +[philipforget]: https://github.com/philipforget From 6b6b255684e8cfc25bf91168b46e9ab6512b800a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sat, 14 Dec 2013 20:42:58 +0000 Subject: [PATCH 0333/1652] Add note on pagination bugfix. Closes #1293. --- docs/topics/release-notes.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index f171b1f50..d1ace1164 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -89,6 +89,19 @@ You can determine your currently installed version using `pip freeze`: * Bugfix: `client.force_authenticate(None)` should also clear session info if it exists. * Bugfix: Client sending empty string instead of file now clears `FileField`. * Bugfix: Empty values on ChoiceFields with `required=False` now consistently return `None`. +* Bugfix: Clients setting `page=0` now simply returns the default page size, instead of disabling pagination. [*] + +--- + +[*] Note that the change in `page=0` behaviour fixes what is considered to be a bug in how clients can effect the pagination size. However if you were relying on this behavior you will need to add the following mixin to your list views in order to preserve the existing behavior. + + class DisablePaginationMixin(object): + def get_paginate_by(self, queryset=None): + if self.request.QUERY_PARAMS['self.paginate_by_param'] == '0': + return None + return super(DisablePaginationMixin, self).get_paginate_by(queryset) + +--- ### 2.3.7 From 69fef838cce33b9079640f83cc03edc30f56f5f1 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sat, 14 Dec 2013 21:05:11 +0000 Subject: [PATCH 0334/1652] Update django-oauth-plus version --- optionals.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optionals.txt b/optionals.txt index 4ebfceab4..96f4b2f44 100644 --- a/optionals.txt +++ b/optionals.txt @@ -2,6 +2,6 @@ markdown>=2.1.0 PyYAML>=3.10 defusedxml>=0.3 django-filter>=0.5.4 -django-oauth-plus>=2.0 +django-oauth-plus>=2.2.1 oauth2>=1.5.211 django-oauth2-provider>=0.2.4 From 4a134eefa2c3b71aa1dc6a4ec94716fe41dca8f5 Mon Sep 17 00:00:00 2001 From: Craig de Stigter Date: Mon, 16 Dec 2013 15:51:43 +1300 Subject: [PATCH 0335/1652] Fix expansion of writable nested serializers where the inner fields have source set. --- rest_framework/serializers.py | 4 +++- rest_framework/tests/test_serializer.py | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 40caa1f38..d9313342c 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -422,7 +422,9 @@ class BaseSerializer(WritableField): if self.source == '*': if value: - into.update(value) + reverted_data = self.restore_fields(value, {}) + if not self._errors: + into.update(reverted_data) else: if value in (None, ''): into[(self.source or field_name)] = None diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index 14d1c664e..7808ba1ae 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -105,6 +105,17 @@ class ModelSerializerWithNestedSerializer(serializers.ModelSerializer): model = Person +class NestedSerializerWithRenamedField(serializers.Serializer): + renamed_info = serializers.Field(source='info') + + +class ModelSerializerWithNestedSerializerWithRenamedField(serializers.ModelSerializer): + nested = NestedSerializerWithRenamedField(source='*') + + class Meta: + model = Person + + class PersonSerializerInvalidReadOnly(serializers.ModelSerializer): """ Testing for #652. @@ -456,6 +467,20 @@ class ValidationTests(TestCase): ) self.assertEqual(serializer.is_valid(), True) + def test_writable_star_source_with_inner_source_fields(self): + """ + Tests that a serializer with source="*" correctly expands the + it's fields into the outer serializer even if they have their + own 'source' parameters. + """ + + serializer = ModelSerializerWithNestedSerializerWithRenamedField(data={ + 'name': 'marko', + 'nested': {'renamed_info': 'hi'}}, + ) + self.assertEqual(serializer.is_valid(), True) + self.assertEqual(serializer.errors, {}) + class CustomValidationTests(TestCase): class CommentSerializerWithFieldValidator(CommentSerializer): From fc2dee844ab0ca77928f296f13777bf01d94e6fd Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 16 Dec 2013 08:59:10 +0000 Subject: [PATCH 0336/1652] Don't import compat.py from authtoken.models. Closes #1297 --- rest_framework/authtoken/models.py | 8 +++++++- rest_framework/compat.py | 7 ------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index 7601f5b79..024f62bfe 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -1,11 +1,17 @@ import uuid import hmac from hashlib import sha1 -from rest_framework.compat import AUTH_USER_MODEL from django.conf import settings from django.db import models +# Prior to Django 1.5, the AUTH_USER_MODEL setting does not exist. +# Note that we don't perform this code in the compat module due to +# bug report #1297 +# See: https://github.com/tomchristie/django-rest-framework/issues/1297 +AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User') + + class Token(models.Model): """ The default authorization token model. diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 88211becb..b69749feb 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -104,13 +104,6 @@ def get_concrete_model(model_cls): return model_cls -# Django 1.5 add support for custom auth user model -if django.VERSION >= (1, 5): - AUTH_USER_MODEL = settings.AUTH_USER_MODEL -else: - AUTH_USER_MODEL = 'auth.User' - - if django.VERSION >= (1, 5): from django.views.generic import View else: From 31dd160256a86c261099602dadb1163811a41e23 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 16 Dec 2013 11:59:14 +0000 Subject: [PATCH 0337/1652] Typo --- docs/topics/contributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 906950bb5..30d292f80 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -10,7 +10,7 @@ There are many ways you can contribute to Django REST framework. We'd like it t The most important thing you can do to help push the REST framework project forward is to be actively involved wherever possible. Code contributions are often overvalued as being the primary way to get involved in a project, we don't believe that needs to be the case. -If you use REST framework, we'd love you to be vocal about your experiences with it - you might consider writing a blog post about using REST framework, or publishing a tutorial about building a project with a particularJjavascript framework. Experiences from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are more difficult to understand and work with. +If you use REST framework, we'd love you to be vocal about your experiences with it - you might consider writing a blog post about using REST framework, or publishing a tutorial about building a project with a particular Javascript framework. Experiences from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are more difficult to understand and work with. Other really great ways you can help move the community forward include helping answer questions on the [discussion group][google-group], or setting up an [email alert on StackOverflow][so-filter] so that you get notified of any new questions with the `django-rest-framework` tag. From f0f7a91b3157790aac8c568e3349dde8dca1fac5 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 16 Dec 2013 11:59:37 +0000 Subject: [PATCH 0338/1652] Add CONTRIBUTING.md --- CONTRIBUTING.md | 193 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..e0544a479 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,193 @@ +# Contributing to REST framework + +> The world can only really be changed one piece at a time. The art is picking that piece. +> +> — [Tim Berners-Lee][cite] + +There are many ways you can contribute to Django REST framework. We'd like it to be a community-led project, so please get involved and help shape the future of the project. + +## Community + +The most important thing you can do to help push the REST framework project forward is to be actively involved wherever possible. Code contributions are often overvalued as being the primary way to get involved in a project, we don't believe that needs to be the case. + +If you use REST framework, we'd love you to be vocal about your experiences with it - you might consider writing a blog post about using REST framework, or publishing a tutorial about building a project with a particular Javascript framework. Experiences from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are more difficult to understand and work with. + +Other really great ways you can help move the community forward include helping answer questions on the [discussion group][google-group], or setting up an [email alert on StackOverflow][so-filter] so that you get notified of any new questions with the `django-rest-framework` tag. + +When answering questions make sure to help future contributors find their way around by hyperlinking wherever possible to related threads and tickets, and include backlinks from those items if relevant. + +## Code of conduct + +Please keep the tone polite & professional. For some users a discussion on the REST framework mailing list or ticket tracker may be their first engagement with the open source community. First impressions count, so let's try to make everyone feel welcome. + +Be mindful in the language you choose. As an example, in an environment that is heavily male-dominated, posts that start 'Hey guys,' can come across as unintentionally exclusive. It's just as easy, and more inclusive to use gender neutral language in those situations. + +The [Django code of conduct][code-of-conduct] gives a fuller set of guidelines for participating in community forums. + +# Issues + +It's really helpful if you can make sure to address issues on the correct channel. Usage questions should be directed to the [discussion group][google-group]. Feature requests, bug reports and other issues should be raised on the GitHub [issue tracker][issues]. + +Some tips on good issue reporting: + +* When describing issues try to phrase your ticket in terms of the *behavior* you think needs changing rather than the *code* you think need changing. +* Search the issue list first for related items, and make sure you're running the latest version of REST framework before reporting an issue. +* If reporting a bug, then try to include a pull request with a failing test case. This will help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one. +* Feature requests will often be closed with a recommendation that they be implemented outside of the core REST framework library. Keeping new feature requests implemented as third party libraries allows us to keep down the maintainence overhead of REST framework, so that the focus can be on continued stability, bugfixes, and great documentation. +* Closing an issue doesn't necessarily mean the end of a discussion. If you believe your issue has been closed incorrectly, explain why and we'll consider if it needs to be reopened. + +## Triaging issues + +Getting involved in triaging incoming issues is a good way to start contributing. Every single ticket that comes into the ticket tracker needs to be reviewed in order to determine what the next steps should be. Anyone can help out with this, you just need to be willing to + +* Read through the ticket - does it make sense, is it missing any context that would help explain it better? +* Is the ticket reported in the correct place, would it be better suited as a discussion on the discussion group? +* If the ticket is a bug report, can you reproduce it? Are you able to write a failing test case that demonstrates the issue and that can be submitted as a pull request? +* If the ticket is a feature request, do you agree with it, and could the feature request instead be implemented as a third party package? +* If a ticket hasn't had much activity and it addresses something you need, then comment on the ticket and try to find out what's needed to get it moving again. + +# Development + +To start developing on Django REST framework, clone the repo: + + git clone git@github.com:tomchristie/django-rest-framework.git + +Changes should broadly follow the [PEP 8][pep-8] style conventions, and we recommend you setup your editor to automatically indicated non-conforming styles. + +## Testing + +To run the tests, clone the repository, and then: + + # Setup the virtual environment + virtualenv env + env/bin/activate + pip install -r requirements.txt + pip install -r optionals.txt + + # Run the tests + rest_framework/runtests/runtests.py + +You can also use the excellent `[tox][tox]` testing tool to run the tests against all supported versions of Python and Django. Install `tox` globally, and then simply run: + + tox + +## Pull requests + +It's a good idea to make pull requests early on. A pull request represents the start of a discussion, and doesn't necessarily need to be the final, finished submission. + +It's also always best to make a new branch before starting work on a pull request. This means that you'll be able to later switch back to working on another seperate issue without interfering with an ongoing pull requests. + +It's also useful to remember that if you have an outstanding pull request then pushing new commits to your GitHub repo will also automatically update the pull requests. + +GitHub's documentation for working on pull requests is [available here][pull-requests]. + +Always run the tests before submitting pull requests, and ideally run `tox` in order to check that your modifications are compatible with both Python 2 and Python 3, and that they run properly on all supported versions of Django. + +Once you've made a pull request take a look at the travis build status in the GitHub interface and make sure the tests are runnning as you'd expect. + +![Travis status][travis-status] + +*Above: Travis build notifications* + +## Managing compatibility issues + +Sometimes, in order to ensure your code works on various different versions of Django, Python or third party libraries, you'll need to run slightly different code depending on the environment. Any code that branches in this way should be isolated into the `compat.py` module, and should provide a single common interface that the rest of the codebase can use. + +# Documentation + +The documentation for REST framework is built from the [Markdown][markdown] source files in [the docs directory][docs]. + +There are many great markdown editors that make working with the documentation really easy. The [Mou editor for Mac][mou] is one such editor that comes highly recommended. + +## Building the documentation + +To build the documentation, simply run the `mkdocs.py` script. + + ./mkdocs.py + +This will build the html output into the `html` directory. + +You can build the documentation and open a preview in a browser window by using the `-p` flag. + + ./mkdocs.py -p + +## Language style + +Documentation should be in American English. The tone of the documentation is very important - try to stick to a simple, plain, objective and well-balanced style where possible. + +Some other tips: + +* Keep paragraphs reasonably short. +* Use double spacing after the end of sentences. +* Don't use the abbreviations such as 'e.g.' but instead use long form, such as 'For example'. + +## Markdown style + +There are a couple of conventions you should follow when working on the documentation. + +##### 1. Headers + +Headers should use the hash style. For example: + + ### Some important topic + +The underline style should not be used. **Don't do this:** + + Some important topic + ==================== + +##### 2. Links + +Links should always use the reference style, with the referenced hyperlinks kept at the end of the document. + + Here is a link to [some other thing][other-thing]. + + More text... + + [other-thing]: http://example.com/other/thing + +This style helps keep the documentation source consistent and readable. + +If you are hyperlinking to another REST framework document, you should use a relative link, and link to the `.md` suffix. For example: + + [authentication]: ../api-guide/authentication.md + +Linking in this style means you'll be able to click the hyperlink in your markdown editor to open the referenced document. When the documentation is built, these links will be converted into regular links to HTML pages. + +##### 3. Notes + +If you want to draw attention to a note or warning, use a pair of enclosing lines, like so: + + --- + + **Note:** A useful documentation note. + + --- + +# Third party packages + +New features to REST framework are generally recommended to be implemented as third party libraries that are developed outside of the core framework. Ideally third party libraries should be properly documented and packaged, and made available on PyPI. + +## Getting started + +If you have some functionality that you would like to implement as a third party package it's worth contacting the [discussion group][google-group] as others may be willing to get involved. We strongly encourage third party package development and will always try to prioritize time spent helping their development, documentation and packaging. + +We recommend the [`django-reusable-app`][django-reusable-app] template as a good resource for getting up and running with implementing a third party Django package. + +## Linking to your package + +Once your package is decently documented and available on PyPI open a pull request or issue, and we'll add a link to it from the main REST framework documentation. + +[cite]: http://www.w3.org/People/Berners-Lee/FAQ.html +[code-of-conduct]: https://www.djangoproject.com/conduct/ +[google-group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework +[so-filter]: http://stackexchange.com/filters/66475/rest-framework +[issues]: https://github.com/tomchristie/django-rest-framework/issues?state=open +[pep-8]: http://www.python.org/dev/peps/pep-0008/ +[travis-status]: https://raw.github.com/tomchristie/django-rest-framework/master/docs/img/travis-status.png +[pull-requests]: https://help.github.com/articles/using-pull-requests +[tox]: http://tox.readthedocs.org/en/latest/ +[markdown]: http://daringfireball.net/projects/markdown/basics +[docs]: https://github.com/tomchristie/django-rest-framework/tree/master/docs +[mou]: http://mouapp.com/ +[django-reusable-app]: https://github.com/dabapps/django-reusable-app From 802648045476f91f1c4b6a9f507cc08625194c2c Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 17 Dec 2013 10:30:23 +0100 Subject: [PATCH 0339/1652] Use the BytesIO for buffering bytes and import the one from the compat module. --- docs/tutorial/1-serialization.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index e1c0009c3..4d4e7258f 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -183,9 +183,9 @@ At this point we've translated the model instance into Python native datatypes. Deserialization is similar. First we parse a stream into Python native datatypes... - import StringIO + from rest_framework.compat import BytesIO - stream = StringIO.StringIO(content) + stream = BytesIO(content) data = JSONParser().parse(stream) ...then we restore those native datatypes into to a fully populated object instance. From 02ae1682b5585581e88bbd996f7cb7fd22b146f7 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 17 Dec 2013 09:45:28 +0000 Subject: [PATCH 0340/1652] Add note on compat import in tutorial --- docs/tutorial/1-serialization.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 4d4e7258f..e015a545f 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -183,6 +183,8 @@ At this point we've translated the model instance into Python native datatypes. Deserialization is similar. First we parse a stream into Python native datatypes... + # This import will use either `StringIO.StringIO` or `io.BytesIO` + # as appropriate, depending on if we're running Python 2 or Python 3. from rest_framework.compat import BytesIO stream = BytesIO(content) From 0e3822d6e0ea71d43ce7108b43184a6b3eba3f3a Mon Sep 17 00:00:00 2001 From: Lukasz Balcerzak Date: Fri, 20 Dec 2013 16:53:06 +0100 Subject: [PATCH 0341/1652] Updated test class name to be unique --- rest_framework/tests/test_validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/tests/test_validation.py b/rest_framework/tests/test_validation.py index ebfdff9cd..ce7022cdf 100644 --- a/rest_framework/tests/test_validation.py +++ b/rest_framework/tests/test_validation.py @@ -52,7 +52,7 @@ class ShouldValidateModelSerializer(serializers.ModelSerializer): fields = ('renamed',) -class TestPreSaveValidationExclusions(TestCase): +class TestPreSaveValidationExclusionsSerializer(TestCase): def test_renamed_fields_are_model_validated(self): """ Ensure fields with 'source' applied do get still get model validation. From 71aa5f3c455db9bea5163dca70bfe6f3b3c924be Mon Sep 17 00:00:00 2001 From: Lukasz Balcerzak Date: Fri, 20 Dec 2013 17:16:24 +0100 Subject: [PATCH 0342/1652] Added missing custom validation method test --- rest_framework/tests/test_validation.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/rest_framework/tests/test_validation.py b/rest_framework/tests/test_validation.py index ebfdff9cd..371697f8f 100644 --- a/rest_framework/tests/test_validation.py +++ b/rest_framework/tests/test_validation.py @@ -47,6 +47,12 @@ class ShouldValidateModel(models.Model): class ShouldValidateModelSerializer(serializers.ModelSerializer): renamed = serializers.CharField(source='should_validate_field', required=False) + def validate_renamed(self, attrs, source): + value = attrs[source] + if len(value) < 3: + raise serializers.ValidationError('Minimum 3 characters.') + return attrs + class Meta: model = ShouldValidateModel fields = ('renamed',) @@ -63,6 +69,13 @@ class TestPreSaveValidationExclusions(TestCase): self.assertEqual(serializer.is_valid(), False) +class TestCustomValidationMethods(TestCase): + def test_custom_validation_method_is_executed(self): + serializer = ShouldValidateModelSerializer(data={'renamed': 'fo'}) + self.assertFalse(serializer.is_valid()) + self.assertIn('renamed', serializer.errors) + + class ValidationSerializer(serializers.Serializer): foo = serializers.CharField() From 973f898a4b8042775a94d3e76188b43f13d493a8 Mon Sep 17 00:00:00 2001 From: Lukasz Balcerzak Date: Fri, 20 Dec 2013 17:45:56 +0100 Subject: [PATCH 0343/1652] Should it be that way? --- rest_framework/tests/test_validation.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rest_framework/tests/test_validation.py b/rest_framework/tests/test_validation.py index ce7022cdf..ab75da252 100644 --- a/rest_framework/tests/test_validation.py +++ b/rest_framework/tests/test_validation.py @@ -61,6 +61,8 @@ class TestPreSaveValidationExclusionsSerializer(TestCase): # does not have `blank=True`, so this serializer should not validate. serializer = ShouldValidateModelSerializer(data={'renamed': ''}) self.assertEqual(serializer.is_valid(), False) + self.assertIn('renamed', serializer.errors) + self.assertNotIn('should_validate_field', serializer.errors) class ValidationSerializer(serializers.Serializer): From 22343ee11764aac3686ad500da5c9aae30540e8e Mon Sep 17 00:00:00 2001 From: Vitaly Babiy Date: Sat, 21 Dec 2013 07:05:21 -0500 Subject: [PATCH 0344/1652] Added links to djangorestframework-camel-case in the third party sections of the docs for both parsers and renderers. --- docs/api-guide/parsers.md | 6 ++++++ docs/api-guide/renderers.md | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index 1030fcb65..db0b666fb 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -186,9 +186,15 @@ The following third party packages are also available. [MessagePack][messagepack] is a fast, efficient binary serialization format. [Juan Riaza][juanriaza] maintains the [djangorestframework-msgpack][djangorestframework-msgpack] package which provides MessagePack renderer and parser support for REST framework. +## CamelCase JSON + +[djangorestframework-camel-case] provides a camelCase JSON parser for django REST framework, its maintained by [vbabiy] + [jquery-ajax]: http://api.jquery.com/jQuery.ajax/ [cite]: https://groups.google.com/d/topic/django-developers/dxI4qVzrBY4/discussion [upload-handlers]: https://docs.djangoproject.com/en/dev/topics/http/file-uploads/#upload-handlers [messagepack]: https://github.com/juanriaza/django-rest-framework-msgpack [juanriaza]: https://github.com/juanriaza +[vbabiy]: https://github.com/vbabiy [djangorestframework-msgpack]: https://github.com/juanriaza/django-rest-framework-msgpack +[djangorestframework-camel-case]: https://github.com/vbabiy/djangorestframework-camel-case \ No newline at end of file diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index cf2005691..673b59025 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -419,6 +419,11 @@ Comma-separated values are a plain-text tabular data format, that can be easily [UltraJSON][ultrajson] is an optimized C JSON encoder which can give significantly faster JSON rendering. [Jacob Haslehurst][hzy] maintains the [drf-ujson-renderer][drf-ujson-renderer] package which implements JSON rendering using the UJSON package. +## CamelCase JSON + +[djangorestframework-camel-case] provides a camelCase JSON render for django REST framework, its maintained by [vbabiy] + + [cite]: https://docs.djangoproject.com/en/dev/ref/template-response/#the-rendering-process [conneg]: content-negotiation.md [browser-accept-headers]: http://www.gethifi.com/blog/browser-rest-http-accept-headers @@ -435,8 +440,10 @@ Comma-separated values are a plain-text tabular data format, that can be easily [messagepack]: http://msgpack.org/ [juanriaza]: https://github.com/juanriaza [mjumbewu]: https://github.com/mjumbewu +[vbabiy]: https://github.com/vbabiy [djangorestframework-msgpack]: https://github.com/juanriaza/django-rest-framework-msgpack [djangorestframework-csv]: https://github.com/mjumbewu/django-rest-framework-csv [ultrajson]: https://github.com/esnme/ultrajson [hzy]: https://github.com/hzy [drf-ujson-renderer]: https://github.com/gizmag/drf-ujson-renderer +[djangorestframework-camel-case]: https://github.com/vbabiy/djangorestframework-camel-case \ No newline at end of file From 1f3ded4559ad18d03ee49b3befd19ddaea7e70b2 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sat, 21 Dec 2013 17:18:25 +0000 Subject: [PATCH 0345/1652] Docs tweaks --- docs/api-guide/parsers.md | 2 +- docs/api-guide/renderers.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index db0b666fb..72a4af643 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -188,7 +188,7 @@ The following third party packages are also available. ## CamelCase JSON -[djangorestframework-camel-case] provides a camelCase JSON parser for django REST framework, its maintained by [vbabiy] +[djangorestframework-camel-case] provides camel case JSON renderers and parsers for REST framework. This allows serializers to use Python-style underscored field names, but be exposed in the API as Javascript-style camel case field names. It is maintained by [Vitaly Babiy][vbabiy]. [jquery-ajax]: http://api.jquery.com/jQuery.ajax/ [cite]: https://groups.google.com/d/topic/django-developers/dxI4qVzrBY4/discussion diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 673b59025..7798827bc 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -421,7 +421,7 @@ Comma-separated values are a plain-text tabular data format, that can be easily ## CamelCase JSON -[djangorestframework-camel-case] provides a camelCase JSON render for django REST framework, its maintained by [vbabiy] +[djangorestframework-camel-case] provides camel case JSON renderers and parsers for REST framework. This allows serializers to use Python-style underscored field names, but be exposed in the API as Javascript-style camel case field names. It is maintained by [Vitaly Babiy][vbabiy]. [cite]: https://docs.djangoproject.com/en/dev/ref/template-response/#the-rendering-process From bc0e994784f46330b4e849c3326fbd5c500298b3 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sat, 21 Dec 2013 21:10:05 +0000 Subject: [PATCH 0346/1652] Added example of using APIException class. Closes #1300 --- docs/api-guide/exceptions.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index c46d415e4..221df679d 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -88,6 +88,14 @@ The **base class** for all exceptions raised inside REST framework. To provide a custom exception, subclass `APIException` and set the `.status_code` and `.detail` properties on the class. +For example, if your API relies on a third party service that may sometimes be unreachable, you might want to implement an exception for the "503 Service Unavailable" HTTP response code. You could do this like so: + + from rest_framework.exceptions import APIException + + class ServiceUnavailable(APIException): + status_code = 503 + detail = 'Service temporarily unavailable, try again later.' + ## ParseError **Signature:** `ParseError(detail=None)` From a439c80cd856f0661cb66003263c454c5108fe0b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sat, 21 Dec 2013 21:21:53 +0000 Subject: [PATCH 0347/1652] Less brittle through relationship testing. Closes #1292. --- rest_framework/serializers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 28a098805..8351b3df6 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -713,7 +713,9 @@ class ModelSerializer(Serializer): is_m2m = isinstance(relation.field, models.fields.related.ManyToManyField) - if is_m2m and not relation.field.rel.through._meta.auto_created: + if (is_m2m and + hasattr(relation.field.rel, 'through') and + not relation.field.rel.through._meta.auto_created): has_through_model = True if nested: From 71ab7cda2a28b0df8df54c1446b4780413909acb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sat, 21 Dec 2013 21:54:51 +0000 Subject: [PATCH 0348/1652] Additional test for 'source' behaviour. Refs #1302 --- rest_framework/tests/test_validation.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/tests/test_validation.py b/rest_framework/tests/test_validation.py index 3fb6ba373..8a8187fa8 100644 --- a/rest_framework/tests/test_validation.py +++ b/rest_framework/tests/test_validation.py @@ -75,6 +75,10 @@ class TestCustomValidationMethods(TestCase): self.assertFalse(serializer.is_valid()) self.assertIn('renamed', serializer.errors) + def test_custom_validation_method_passing(self): + serializer = ShouldValidateModelSerializer(data={'renamed': 'foo'}) + self.assertTrue(serializer.is_valid()) + class ValidationSerializer(serializers.Serializer): foo = serializers.CharField() From 2d6d725c2f7f2226f9287211e64037816f8f2cac Mon Sep 17 00:00:00 2001 From: amatellanes Date: Sun, 22 Dec 2013 12:39:47 +0100 Subject: [PATCH 0349/1652] Simplified some functions --- rest_framework/permissions.py | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index ab6655e7b..f24a51235 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -54,9 +54,7 @@ class IsAuthenticated(BasePermission): """ def has_permission(self, request, view): - if request.user and request.user.is_authenticated(): - return True - return False + return request.user and request.user.is_authenticated() class IsAdminUser(BasePermission): @@ -65,9 +63,7 @@ class IsAdminUser(BasePermission): """ def has_permission(self, request, view): - if request.user and request.user.is_staff: - return True - return False + return request.user and request.user.is_staff class IsAuthenticatedOrReadOnly(BasePermission): @@ -76,11 +72,9 @@ class IsAuthenticatedOrReadOnly(BasePermission): """ def has_permission(self, request, view): - if (request.method in SAFE_METHODS or - request.user and - request.user.is_authenticated()): - return True - return False + return (request.method in SAFE_METHODS or + request.user and + request.user.is_authenticated()) class DjangoModelPermissions(BasePermission): @@ -138,11 +132,9 @@ class DjangoModelPermissions(BasePermission): perms = self.get_required_permissions(request.method, model_cls) - if (request.user and + return (request.user and (request.user.is_authenticated() or not self.authenticated_users_only) and - request.user.has_perms(perms)): - return True - return False + request.user.has_perms(perms)) class DjangoModelPermissionsOrAnonReadOnly(DjangoModelPermissions): From e5caf48a12e777df3e5801fa19d98f59b6453aa2 Mon Sep 17 00:00:00 2001 From: bennbollay Date: Sun, 22 Dec 2013 16:53:52 -0800 Subject: [PATCH 0350/1652] Change the page title to prioritize page content When many tab's are open (which is necessary for DRF's documentation), it becomes impossible to determine which tab contains which pieces of documentation. That they are all related is obvious by the use of a common icon, just not the specific page each tab is loaded to. This change inverts the order of the title to maintain as much useful context as possible on the tabbar. --- mkdocs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.py b/mkdocs.py index d1790168a..09c9dcc67 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -144,7 +144,7 @@ for (dirpath, dirnames, filenames) in os.walk(docs_dir): if filename == 'index.md': main_title = 'Django REST framework - APIs made easy' else: - main_title = 'Django REST framework - ' + main_title + main_title = main_title + ' - Django REST framework' if relative_path == 'index.md': canonical_url = base_url From 80e9f0d64b0ace50d413eaccbf28a3b4ded75ed3 Mon Sep 17 00:00:00 2001 From: Yin Jifeng Date: Mon, 23 Dec 2013 11:02:07 +0800 Subject: [PATCH 0351/1652] fix url double quoted in Django 1.6 get_full_path returns unicode, so we use build_absolute_uri which returns iri_to_uri'ed one --- rest_framework/templatetags/rest_framework.py | 2 +- rest_framework/tests/test_templatetags.py | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 rest_framework/tests/test_templatetags.py diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index e9c1cdd54..5c267ab36 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -144,7 +144,7 @@ def add_query_param(request, key, val): """ Add a query parameter to the current request url, and return the new url. """ - return replace_query_param(request.get_full_path(), key, val) + return replace_query_param(request.build_absolute_uri(), key, val) @register.filter diff --git a/rest_framework/tests/test_templatetags.py b/rest_framework/tests/test_templatetags.py new file mode 100644 index 000000000..cbac768a3 --- /dev/null +++ b/rest_framework/tests/test_templatetags.py @@ -0,0 +1,18 @@ +# encoding: utf-8 +from __future__ import unicode_literals +from django.test import TestCase +from rest_framework.test import APIRequestFactory +from rest_framework.templatetags.rest_framework import add_query_param + +factory = APIRequestFactory() + + +class TemplateTagTests(TestCase): + + def test_add_query_param_with_non_latin_charactor(self): + request = factory.get("/?q=查询") + json_url = add_query_param(request, "format", "json") + self.assertIn(json_url, [ + "http://testserver/?format=json&q=%E6%9F%A5%E8%AF%A2", + "http://testserver/?q=%E6%9F%A5%E8%AF%A2&format=json", + ]) From d6806340e54408858da4b2dc991be99edd65df76 Mon Sep 17 00:00:00 2001 From: amatellanes Date: Mon, 23 Dec 2013 08:50:46 +0100 Subject: [PATCH 0352/1652] Simplified some examples in tutorial --- docs/tutorial/1-serialization.md | 6 ++---- docs/tutorial/2-requests-and-responses.md | 6 ++---- docs/tutorial/4-authentication-and-permissions.md | 7 ++----- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index e015a545f..2298df59a 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -263,8 +263,7 @@ The root of our API is going to be a view that supports listing all the existing if serializer.is_valid(): serializer.save() return JSONResponse(serializer.data, status=201) - else: - return JSONResponse(serializer.errors, status=400) + return JSONResponse(serializer.errors, status=400) Note that because we want to be able to POST to this view from clients that won't have a CSRF token we need to mark the view as `csrf_exempt`. This isn't something that you'd normally want to do, and REST framework views actually use more sensible behavior than this, but it'll do for our purposes right now. @@ -290,8 +289,7 @@ We'll also need a view which corresponds to an individual snippet, and can be us if serializer.is_valid(): serializer.save() return JSONResponse(serializer.data) - else: - return JSONResponse(serializer.errors, status=400) + return JSONResponse(serializer.errors, status=400) elif request.method == 'DELETE': snippet.delete() diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 7fa4f3e4a..603edd081 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -59,8 +59,7 @@ We don't need our `JSONResponse` class in `views.py` anymore, so go ahead and de if serializer.is_valid(): serializer.save() return Response(serializer.data, status=status.HTTP_201_CREATED) - else: - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) Our instance view is an improvement over the previous example. It's a little more concise, and the code now feels very similar to if we were working with the Forms API. We're also using named status codes, which makes the response meanings more obvious. @@ -85,8 +84,7 @@ Here is the view for an individual snippet, in the `views.py` module. if serializer.is_valid(): serializer.save() return Response(serializer.data) - else: - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) elif request.method == 'DELETE': snippet.delete() diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index b472322a3..986f13ff3 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -163,15 +163,12 @@ In the snippets app, create a new file, `permissions.py` """ Custom permission to only allow owners of an object to edit it. """ - + def has_object_permission(self, request, view, obj): # Read permissions are allowed to any request, # so we'll always allow GET, HEAD or OPTIONS requests. - if request.method in permissions.SAFE_METHODS: - return True - # Write permissions are only allowed to the owner of the snippet - return obj.owner == request.user + return request.method in permissions.SAFE_METHODS or obj.owner == request.user Now we can add that custom permission to our snippet instance endpoint, by editing the `permission_classes` property on the `SnippetDetail` class: From 74f1cf635536ea99937954a11fa11531a832ebc2 Mon Sep 17 00:00:00 2001 From: amatellanes Date: Mon, 23 Dec 2013 08:56:34 +0100 Subject: [PATCH 0353/1652] Revert "Simplified some examples in tutorial" This reverts commit d6806340e54408858da4b2dc991be99edd65df76. --- docs/tutorial/1-serialization.md | 6 ++++-- docs/tutorial/2-requests-and-responses.md | 6 ++++-- docs/tutorial/4-authentication-and-permissions.md | 7 +++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 2298df59a..e015a545f 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -263,7 +263,8 @@ The root of our API is going to be a view that supports listing all the existing if serializer.is_valid(): serializer.save() return JSONResponse(serializer.data, status=201) - return JSONResponse(serializer.errors, status=400) + else: + return JSONResponse(serializer.errors, status=400) Note that because we want to be able to POST to this view from clients that won't have a CSRF token we need to mark the view as `csrf_exempt`. This isn't something that you'd normally want to do, and REST framework views actually use more sensible behavior than this, but it'll do for our purposes right now. @@ -289,7 +290,8 @@ We'll also need a view which corresponds to an individual snippet, and can be us if serializer.is_valid(): serializer.save() return JSONResponse(serializer.data) - return JSONResponse(serializer.errors, status=400) + else: + return JSONResponse(serializer.errors, status=400) elif request.method == 'DELETE': snippet.delete() diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 603edd081..7fa4f3e4a 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -59,7 +59,8 @@ We don't need our `JSONResponse` class in `views.py` anymore, so go ahead and de if serializer.is_valid(): serializer.save() return Response(serializer.data, status=status.HTTP_201_CREATED) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + else: + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) Our instance view is an improvement over the previous example. It's a little more concise, and the code now feels very similar to if we were working with the Forms API. We're also using named status codes, which makes the response meanings more obvious. @@ -84,7 +85,8 @@ Here is the view for an individual snippet, in the `views.py` module. if serializer.is_valid(): serializer.save() return Response(serializer.data) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + else: + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) elif request.method == 'DELETE': snippet.delete() diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 986f13ff3..b472322a3 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -163,12 +163,15 @@ In the snippets app, create a new file, `permissions.py` """ Custom permission to only allow owners of an object to edit it. """ - + def has_object_permission(self, request, view, obj): # Read permissions are allowed to any request, # so we'll always allow GET, HEAD or OPTIONS requests. + if request.method in permissions.SAFE_METHODS: + return True + # Write permissions are only allowed to the owner of the snippet - return request.method in permissions.SAFE_METHODS or obj.owner == request.user + return obj.owner == request.user Now we can add that custom permission to our snippet instance endpoint, by editing the `permission_classes` property on the `SnippetDetail` class: From 2846ddb5d2ba84b3905d4dc0593afe3a0d4b2749 Mon Sep 17 00:00:00 2001 From: amatellanes Date: Mon, 23 Dec 2013 09:06:03 +0100 Subject: [PATCH 0354/1652] Simplified some examples in tutorial --- docs/tutorial/1-serialization.md | 6 ++---- docs/tutorial/2-requests-and-responses.md | 6 ++---- docs/tutorial/4-authentication-and-permissions.md | 7 ++----- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index e015a545f..2298df59a 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -263,8 +263,7 @@ The root of our API is going to be a view that supports listing all the existing if serializer.is_valid(): serializer.save() return JSONResponse(serializer.data, status=201) - else: - return JSONResponse(serializer.errors, status=400) + return JSONResponse(serializer.errors, status=400) Note that because we want to be able to POST to this view from clients that won't have a CSRF token we need to mark the view as `csrf_exempt`. This isn't something that you'd normally want to do, and REST framework views actually use more sensible behavior than this, but it'll do for our purposes right now. @@ -290,8 +289,7 @@ We'll also need a view which corresponds to an individual snippet, and can be us if serializer.is_valid(): serializer.save() return JSONResponse(serializer.data) - else: - return JSONResponse(serializer.errors, status=400) + return JSONResponse(serializer.errors, status=400) elif request.method == 'DELETE': snippet.delete() diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 7fa4f3e4a..603edd081 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -59,8 +59,7 @@ We don't need our `JSONResponse` class in `views.py` anymore, so go ahead and de if serializer.is_valid(): serializer.save() return Response(serializer.data, status=status.HTTP_201_CREATED) - else: - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) Our instance view is an improvement over the previous example. It's a little more concise, and the code now feels very similar to if we were working with the Forms API. We're also using named status codes, which makes the response meanings more obvious. @@ -85,8 +84,7 @@ Here is the view for an individual snippet, in the `views.py` module. if serializer.is_valid(): serializer.save() return Response(serializer.data) - else: - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) elif request.method == 'DELETE': snippet.delete() diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index b472322a3..986f13ff3 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -163,15 +163,12 @@ In the snippets app, create a new file, `permissions.py` """ Custom permission to only allow owners of an object to edit it. """ - + def has_object_permission(self, request, view, obj): # Read permissions are allowed to any request, # so we'll always allow GET, HEAD or OPTIONS requests. - if request.method in permissions.SAFE_METHODS: - return True - # Write permissions are only allowed to the owner of the snippet - return obj.owner == request.user + return request.method in permissions.SAFE_METHODS or obj.owner == request.user Now we can add that custom permission to our snippet instance endpoint, by editing the `permission_classes` property on the `SnippetDetail` class: From d8a95b4b6d4480089d38808b45a7b47f30e81cdd Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 23 Dec 2013 09:12:34 +0000 Subject: [PATCH 0355/1652] Back out permissions example change in favor of easier to follow example --- docs/tutorial/4-authentication-and-permissions.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 986f13ff3..bdc6b5791 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -163,12 +163,15 @@ In the snippets app, create a new file, `permissions.py` """ Custom permission to only allow owners of an object to edit it. """ - + def has_object_permission(self, request, view, obj): # Read permissions are allowed to any request, # so we'll always allow GET, HEAD or OPTIONS requests. - # Write permissions are only allowed to the owner of the snippet - return request.method in permissions.SAFE_METHODS or obj.owner == request.user + if request.method in permissions.SAFE_METHODS: + return True + + # Write permissions are only allowed to the owner of the snippet. + return obj.owner == request.user Now we can add that custom permission to our snippet instance endpoint, by editing the `permission_classes` property on the `SnippetDetail` class: From 3f5e3c28f5a4f8b12f5f3ae6c7b571d08be2bf7e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 23 Dec 2013 11:55:25 +0000 Subject: [PATCH 0356/1652] Updated tests to pass in python 3 --- rest_framework/templatetags/rest_framework.py | 5 ++++- rest_framework/tests/test_templatetags.py | 11 ++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 5c267ab36..83c046f99 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals, absolute_import from django import template from django.core.urlresolvers import reverse, NoReverseMatch from django.http import QueryDict +from django.utils.encoding import iri_to_uri from django.utils.html import escape from django.utils.safestring import SafeData, mark_safe from rest_framework.compat import urlparse, force_text, six, smart_urlquote @@ -144,7 +145,9 @@ def add_query_param(request, key, val): """ Add a query parameter to the current request url, and return the new url. """ - return replace_query_param(request.build_absolute_uri(), key, val) + iri = request.get_full_path() + uri = iri_to_uri(iri) + return replace_query_param(uri, key, val) @register.filter diff --git a/rest_framework/tests/test_templatetags.py b/rest_framework/tests/test_templatetags.py index cbac768a3..7ac90ae60 100644 --- a/rest_framework/tests/test_templatetags.py +++ b/rest_framework/tests/test_templatetags.py @@ -10,9 +10,10 @@ factory = APIRequestFactory() class TemplateTagTests(TestCase): def test_add_query_param_with_non_latin_charactor(self): - request = factory.get("/?q=查询") + # Ensure we don't double-escape non-latin characters + # that are present in the querystring. + # https://github.com/tomchristie/django-rest-framework/pull/1314 + request = factory.get("/", {'q': '查询'}) json_url = add_query_param(request, "format", "json") - self.assertIn(json_url, [ - "http://testserver/?format=json&q=%E6%9F%A5%E8%AF%A2", - "http://testserver/?q=%E6%9F%A5%E8%AF%A2&format=json", - ]) + self.assertIn("q=%E6%9F%A5%E8%AF%A2", json_url) + self.assertIn("format=json") From bed2f08c24a13831590ae5fc8cefbb1bca300a96 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 23 Dec 2013 11:57:25 +0000 Subject: [PATCH 0357/1652] Updated release notes --- docs/topics/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index d1ace1164..b09bd0bea 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -46,6 +46,7 @@ You can determine your currently installed version using `pip freeze`: * Fix compatiblity with newer versions of `django-oauth-plus`. * Bugfix: Refine behavior that calls model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unneccessary queryset re-evaluations. * Bugfix: Allow defaults on BooleanFields to be properly honored when values are not supplied. +* Bugfix: Prevent double-escaping of non-latin1 URL query params when appending `format=json` params. ### 2.3.10 From feddd16c54c99977bd5503fd09232828c280fc10 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 23 Dec 2013 12:04:17 +0000 Subject: [PATCH 0358/1652] Tweak test style --- rest_framework/tests/test_templatetags.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/tests/test_templatetags.py b/rest_framework/tests/test_templatetags.py index 7ac90ae60..609a9e089 100644 --- a/rest_framework/tests/test_templatetags.py +++ b/rest_framework/tests/test_templatetags.py @@ -12,8 +12,8 @@ class TemplateTagTests(TestCase): def test_add_query_param_with_non_latin_charactor(self): # Ensure we don't double-escape non-latin characters # that are present in the querystring. - # https://github.com/tomchristie/django-rest-framework/pull/1314 + # See #1314. request = factory.get("/", {'q': '查询'}) json_url = add_query_param(request, "format", "json") self.assertIn("q=%E6%9F%A5%E8%AF%A2", json_url) - self.assertIn("format=json") + self.assertIn("format=json", json_url) From d24ea39a4e4131486d45492339dcbbfefb6a933b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 23 Dec 2013 14:29:22 +0000 Subject: [PATCH 0359/1652] Added note on view_name in hyperlinked relationships. Closes #1221 --- docs/api-guide/relations.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 1b089c541..4bee75af7 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -134,7 +134,7 @@ By default this field is read-write, although you can change this behavior using **Arguments**: -* `view_name` - The view name that should be used as the target of the relationship. **required**. +* `view_name` - The view name that should be used as the target of the relationship. If you're using [the standard router classes][routers] this wil be a string with the format `-detail`. **required**. * `many` - If applied to a to-many relationship, you should set this argument to `True`. * `required` - If set to `False`, the field will accept values of `None` or the empty-string for nullable relationships. * `queryset` - By default `ModelSerializer` classes will use the default queryset for the relationship. `Serializer` classes must either set a queryset explicitly, or set `read_only=True`. @@ -202,7 +202,7 @@ This field is always read-only. **Arguments**: -* `view_name` - The view name that should be used as the target of the relationship. **required**. +* `view_name` - The view name that should be used as the target of the relationship. If you're using [the standard router classes][routers] this wil be a string with the format `-detail`. **required**. * `lookup_field` - The field on the target that should be used for the lookup. Should correspond to a URL keyword argument on the referenced view. Default is `'pk'`. * `format` - If using format suffixes, hyperlinked fields will use the same format suffix for the target unless overridden by using the `format` argument. @@ -454,6 +454,7 @@ The [drf-nested-routers package][drf-nested-routers] provides routers and relati [cite]: http://lwn.net/Articles/193245/ [reverse-relationships]: https://docs.djangoproject.com/en/dev/topics/db/queries/#following-relationships-backward +[routers]: http://django-rest-framework.org/api-guide/routers#defaultrouter [generic-relations]: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/#id1 [2.2-announcement]: ../topics/2.2-announcement.md [drf-nested-routers]: https://github.com/alanjds/drf-nested-routers From 75e872473197f9b810c9daf348cb452faadac476 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 23 Dec 2013 14:38:51 +0000 Subject: [PATCH 0360/1652] Fuller notes on the 'base_name' argument. Closes #1160. --- docs/api-guide/routers.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 895589db9..7efc140a5 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -37,6 +37,18 @@ The example above would generate the following URL patterns: * URL pattern: `^accounts/$` Name: `'account-list'` * URL pattern: `^accounts/{pk}/$` Name: `'account-detail'` +--- + +**Note**: The `base_name` argument is used to specify the initial part of the view name pattern. In the example above, that's the `user` or `account` part. + +Typically you won't *need* to specify the `base-name` argument, but if you have a viewset where you've defined a custom `get_queryset` method, then the viewset may not have any `.model` or `.queryset` attribute set. If you try to register that viewset you'll see an error like this: + + 'base_name' argument not specified, and could not automatically determine the name from the viewset, as it does not have a '.model' or '.queryset' attribute. + +This means you'll need to explicitly set the `base_name` argument when registering the viewset, as it could not be automatically determined from the model name. + +--- + ### Extra link and actions Any methods on the viewset decorated with `@link` or `@action` will also be routed. From 25bd6d1d4b7a85279047ab8e35f6faee0bc10a1a Mon Sep 17 00:00:00 2001 From: "S. Andrew Sheppard" Date: Mon, 23 Dec 2013 22:27:40 -0600 Subject: [PATCH 0361/1652] can't save genericrelations via nested serializers in django 1.6 --- rest_framework/tests/test_genericrelations.py | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/rest_framework/tests/test_genericrelations.py b/rest_framework/tests/test_genericrelations.py index c38bfb9f3..2d3413444 100644 --- a/rest_framework/tests/test_genericrelations.py +++ b/rest_framework/tests/test_genericrelations.py @@ -69,6 +69,35 @@ class TestGenericRelations(TestCase): } self.assertEqual(serializer.data, expected) + def test_generic_nested_relation(self): + """ + Test saving a GenericRelation field via a nested serializer. + """ + + class TagSerializer(serializers.ModelSerializer): + class Meta: + model = Tag + exclude = ('content_type', 'object_id') + + class BookmarkSerializer(serializers.ModelSerializer): + tags = TagSerializer() + + class Meta: + model = Bookmark + exclude = ('id',) + + data = { + 'url': 'https://docs.djangoproject.com/', + 'tags': [ + {'tag': 'contenttypes'}, + {'tag': 'genericrelations'}, + ] + } + serializer = BookmarkSerializer(data=data) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.object.tags.count(), 2) + def test_generic_fk(self): """ Test a relationship that spans a GenericForeignKey field. From d30ce2575c6b3901f15eb96eeaf66cc65e1d298b Mon Sep 17 00:00:00 2001 From: "S. Andrew Sheppard" Date: Mon, 23 Dec 2013 22:31:31 -0600 Subject: [PATCH 0362/1652] fix for genericrelation saving --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 8351b3df6..c0c810ab9 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -894,7 +894,7 @@ class ModelSerializer(Serializer): m2m_data[field_name] = attrs.pop(field_name) # Forward m2m relations - for field in meta.many_to_many: + for field in meta.many_to_many + meta.virtual_fields: if field.name in attrs: m2m_data[field.name] = attrs.pop(field.name) From 1f3f2741f519967aa236cd861a79c2c459063197 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 2 Jan 2014 09:28:34 +0000 Subject: [PATCH 0363/1652] Happy new year --- README.md | 2 +- docs/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 684868006..8c6822312 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ Send a description of the issue via email to [rest-framework-security@googlegrou # License -Copyright (c) 2011-2013, Tom Christie +Copyright (c) 2011-2014, Tom Christie All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/docs/index.md b/docs/index.md index 04804fa79..7688d4281 100644 --- a/docs/index.md +++ b/docs/index.md @@ -219,7 +219,7 @@ Send a description of the issue via email to [rest-framework-security@googlegrou ## License -Copyright (c) 2011-2013, Tom Christie +Copyright (c) 2011-2014, Tom Christie All rights reserved. Redistribution and use in source and binary forms, with or without From 0672d6de6e47ba0269a58ad0da3cc7ff4c82908e Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Thu, 2 Jan 2014 16:46:57 -0500 Subject: [PATCH 0364/1652] Fix bugfix note This fixes a bugfix note that was added because of #1293, which pointed out that a change in a bugfix [1] broke backwards compatibility. The bugfix did not work as expected because a variable was quoted when it should not have been. This removes the quotes around the variable, which brings back the expected functionality. --- docs/topics/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index b09bd0bea..ca966d20e 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -98,7 +98,7 @@ You can determine your currently installed version using `pip freeze`: class DisablePaginationMixin(object): def get_paginate_by(self, queryset=None): - if self.request.QUERY_PARAMS['self.paginate_by_param'] == '0': + if self.request.QUERY_PARAMS[self.paginate_by_param] == '0': return None return super(DisablePaginationMixin, self).get_paginate_by(queryset) From e032bad1a7c1f9ad2d9c591617ea92b2e802d7e5 Mon Sep 17 00:00:00 2001 From: Paul Melnikow Date: Thu, 2 Jan 2014 16:54:06 -0500 Subject: [PATCH 0365/1652] FIx link to tox --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e0544a479..a7aa6fc40 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -67,7 +67,7 @@ To run the tests, clone the repository, and then: # Run the tests rest_framework/runtests/runtests.py -You can also use the excellent `[tox][tox]` testing tool to run the tests against all supported versions of Python and Django. Install `tox` globally, and then simply run: +You can also use the excellent [`tox`][tox] testing tool to run the tests against all supported versions of Python and Django. Install `tox` globally, and then simply run: tox From e020c51b44b9acecdb01cc90f2d6da977ba5ea0f Mon Sep 17 00:00:00 2001 From: Steven Cummings Date: Thu, 2 Jan 2014 17:18:08 -0600 Subject: [PATCH 0366/1652] FIX BaseSerializer.from_native has an altered signature * base classes define it with one parameter * BaseSerializer currently defines a second parameter, which we make optional here for method-dispatch passivity --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index c0c810ab9..b22ca5783 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -331,7 +331,7 @@ class BaseSerializer(WritableField): return ret - def from_native(self, data, files): + def from_native(self, data, files=None): """ Deserialize primitives -> objects. """ From 3050f0e82a60a12dc35ef7947c2f47de12387919 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 3 Jan 2014 13:06:41 +0000 Subject: [PATCH 0367/1652] Frontpage tweaks --- README.md | 6 +++--- docs/img/logo.png | Bin 0 -> 45955 bytes docs/index.md | 26 +++++++++++++++++++------- 3 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 docs/img/logo.png diff --git a/README.md b/README.md index 8c6822312..403f9c0af 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# Django REST framework - -**Awesome web-browseable Web APIs.** + [![build-status-image]][travis] +**Awesome web-browseable Web APIs.** + **Note**: Full documentation for the project is available at [http://django-rest-framework.org][docs]. # Overview diff --git a/docs/img/logo.png b/docs/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0f0cf800d316496efbd89f55365bacad00f0ef96 GIT binary patch literal 45955 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 + -# Django REST framework +--- -**Awesome web-browsable Web APIs.** +

    + +

    + + Django REST framework is a powerful and flexible toolkit that makes it easy to build Web APIs. @@ -20,13 +26,16 @@ Some reasons you might want to use REST framework: * [Serialization][serializers] that supports both [ORM][modelserializer-section] and [non-ORM][serializer-section] data sources. * Customizable all the way down - just use [regular function-based views][functionview-section] if you don't need the [more][generic-views] [powerful][viewsets] [features][routers]. * [Extensive documentation][index], and [great community support][group]. +* Used and trusted by large companies such as [Mozilla][mozilla] and [Eventbrite][eventbrite]. -There is a live example API for testing purposes, [available here][sandbox]. - -**Below**: *Screenshot from the browsable API* +--- ![Screenshot][image] +**Above**: *Screenshot from the browsable API* + +---- + ## Requirements REST framework requires the following: @@ -140,6 +149,8 @@ The tutorial will walk you through the building blocks that make up REST framewo * [5 - Relationships & hyperlinked APIs][tut-5] * [6 - Viewsets & routers][tut-6] +There is a live example API of the finished tutorial API for testing purposes, [available here][sandbox]. + ## API Guide The API guide is your complete reference manual to all the functionality provided by REST framework. @@ -244,7 +255,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master [travis-build-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master -[urlobject]: https://github.com/zacharyvoase/urlobject +[mozilla]: http://www.mozilla.org/en-US/about/ +[eventbrite]: https://www.eventbrite.co.uk/about/ [markdown]: http://pypi.python.org/pypi/Markdown/ [yaml]: http://pypi.python.org/pypi/PyYAML [defusedxml]: https://pypi.python.org/pypi/defusedxml From 442916b9649baaf305ff094fe05f026ad04c7818 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 3 Jan 2014 13:24:52 +0000 Subject: [PATCH 0368/1652] Link to BrightAPI, and remove ad except from frontpage --- docs/template.html | 23 ++--------------------- mkdocs.py | 6 ++++++ 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/docs/template.html b/docs/template.html index c065237a5..a397d067b 100644 --- a/docs/template.html +++ b/docs/template.html @@ -170,31 +170,12 @@
      {{ toc }}
      -
      -

      The team behind REST framework is launching a new API service.

      +{{ ad_block }} -

      If you want to be first in line when we start issuing invitations, please sign up here:

      - - - - -
      -
      - -
      -
      -
      -
    + - -

    @@ -7,9 +7,15 @@

    diff --git a/mkdocs.py b/mkdocs.py index 09c9dcc67..92679a21e 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -161,6 +161,12 @@ for (dirpath, dirnames, filenames) in os.walk(docs_dir): output = output.replace('{{ page_id }}', filename[:-3]) output = output.replace('{{ canonical_url }}', canonical_url) + if filename =='index.md': + output = output.replace('{{ ad_block }}', """

    The team behind REST framework is launching a new API service.

    +

    If you want to be first in line when we start issuing invitations, please sign up here.

    """) + else: + output = output.replace('{{ ad_block }}', '') + if prev_url: output = output.replace('{{ prev_url }}', prev_url) output = output.replace('{{ prev_url_disabled }}', '') From a1d7aa8f712b659f9d8302a2d2a098d2538e6c89 Mon Sep 17 00:00:00 2001 From: Paul Melnikow Date: Thu, 2 Jan 2014 17:44:47 -0500 Subject: [PATCH 0369/1652] Allow viewset to specify lookup value regex for routing This patch allows a viewset to define a pattern for its lookup field, which the router will honor. Without this patch, any characters are allowed in the lookup field, and overriding this behavior requires subclassing router and copying and pasting the implementation of get_lookup_regex. It's possible it would be better to remove this functionality from the routers and simply expose a parameter to get_lookup_regex which allows overriding the lookup_regex. That way the viewset config logic could be in the a subclass, which could invoke the super method directly. I'm using this now for PostgreSQL UUID fields using https://github.com/dcramer/django-uuidfield . Without this patch, that field passes the lookup string to the database driver, which raises a DataError to complain about the invalid UUID. It's possible the field ought to signal this error in a different way, which could obviate the need to specify a pattern. --- docs/api-guide/routers.md | 6 ++++++ rest_framework/routers.py | 20 ++++++++++++++------ rest_framework/tests/test_routers.py | 21 +++++++++++++++++++++ 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 846ac9f9d..f3beabdd3 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -83,6 +83,12 @@ This behavior can be modified by setting the `trailing_slash` argument to `False Trailing slashes are conventional in Django, but are not used by default in some other frameworks such as Rails. Which style you choose to use is largely a matter of preference, although some javascript frameworks may expect a particular routing style. +With `trailing_slash` set to True, the router will match lookup values containing any characters except slashes and dots. When set to False, dots are allowed. To restrict the lookup pattern, set the `lookup_field_regex` attribute on the viewset. For example, you can limit the lookup to valid UUIDs: + + class MyModelViewSet(mixins.RetrieveModelMixin, viewsets.GenericViewSet): + lookup_field = 'my_model_id' + lookup_value_regex = '[0-9a-f]{32}' + ## DefaultRouter This router is similar to `SimpleRouter` as above, but additionally includes a default API root view, that returns a response containing hyperlinks to all the list views. It also generates routes for optional `.json` style format suffixes. diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 740d58f0d..8766ecb2f 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -219,13 +219,21 @@ class SimpleRouter(BaseRouter): https://github.com/alanjds/drf-nested-routers """ - if self.trailing_slash: - base_regex = '(?P<{lookup_prefix}{lookup_field}>[^/]+)' - else: - # Don't consume `.json` style suffixes - base_regex = '(?P<{lookup_prefix}{lookup_field}>[^/.]+)' + base_regex = '(?P<{lookup_prefix}{lookup_field}>{lookup_value})' lookup_field = getattr(viewset, 'lookup_field', 'pk') - return base_regex.format(lookup_field=lookup_field, lookup_prefix=lookup_prefix) + try: + lookup_value = viewset.lookup_value_regex + except AttributeError: + if self.trailing_slash: + lookup_value = '[^/]+' + else: + # Don't consume `.json` style suffixes + lookup_value = '[^/.]+' + return base_regex.format( + lookup_prefix=lookup_prefix, + lookup_field=lookup_field, + lookup_value=lookup_value + ) def get_urls(self): """ diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py index 1c34648f4..0f6d62c7c 100644 --- a/rest_framework/tests/test_routers.py +++ b/rest_framework/tests/test_routers.py @@ -121,6 +121,27 @@ class TestCustomLookupFields(TestCase): ) +class TestLookupValueRegex(TestCase): + """ + Ensure the router honors lookup_value_regex when applied + to the viewset. + """ + def setUp(self): + class NoteViewSet(viewsets.ModelViewSet): + queryset = RouterTestModel.objects.all() + lookup_field = 'uuid' + lookup_value_regex = '[0-9a-f]{32}' + + self.router = SimpleRouter() + self.router.register(r'notes', NoteViewSet) + self.urls = self.router.urls + + def test_urls_limited_by_lookup_value_regex(self): + expected = ['^notes/$', '^notes/(?P[0-9a-f]{32})/$'] + for idx in range(len(expected)): + self.assertEqual(expected[idx], self.urls[idx].regex.pattern) + + class TestTrailingSlashIncluded(TestCase): def setUp(self): class NoteViewSet(viewsets.ModelViewSet): From 3cd15fb1713dfc49e1bf1fd48045ca3ae5654e18 Mon Sep 17 00:00:00 2001 From: Paul Melnikow Date: Sat, 4 Jan 2014 16:57:50 -0500 Subject: [PATCH 0370/1652] Router: Do not automatically adjust lookup_regex when trailing_slash is True BREAKING CHANGE When trailing_slash is set to True, the router no longer will adjust the lookup regex to allow it to include periods. To simulate the old behavior, the programmer should specify `lookup_regex = '[^/]+'` on the viewset. https://github.com/tomchristie/django-rest-framework/pull/1328#issuecomment-31517099 --- docs/api-guide/routers.md | 2 +- rest_framework/routers.py | 7 ++----- rest_framework/tests/test_routers.py | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index f3beabdd3..6b4ae6dbd 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -83,7 +83,7 @@ This behavior can be modified by setting the `trailing_slash` argument to `False Trailing slashes are conventional in Django, but are not used by default in some other frameworks such as Rails. Which style you choose to use is largely a matter of preference, although some javascript frameworks may expect a particular routing style. -With `trailing_slash` set to True, the router will match lookup values containing any characters except slashes and dots. When set to False, dots are allowed. To restrict the lookup pattern, set the `lookup_field_regex` attribute on the viewset. For example, you can limit the lookup to valid UUIDs: +The router will match lookup values containing any characters except slashes and period characters. For a more restrictive (or lenient) lookup pattern, set the `lookup_field_regex` attribute on the viewset. For example, you can limit the lookup to valid UUIDs: class MyModelViewSet(mixins.RetrieveModelMixin, viewsets.GenericViewSet): lookup_field = 'my_model_id' diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 8766ecb2f..df1233fdd 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -224,11 +224,8 @@ class SimpleRouter(BaseRouter): try: lookup_value = viewset.lookup_value_regex except AttributeError: - if self.trailing_slash: - lookup_value = '[^/]+' - else: - # Don't consume `.json` style suffixes - lookup_value = '[^/.]+' + # Don't consume `.json` style suffixes + lookup_value = '[^/.]+' return base_regex.format( lookup_prefix=lookup_prefix, lookup_field=lookup_field, diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py index 0f6d62c7c..e41da57f5 100644 --- a/rest_framework/tests/test_routers.py +++ b/rest_framework/tests/test_routers.py @@ -152,7 +152,7 @@ class TestTrailingSlashIncluded(TestCase): self.urls = self.router.urls def test_urls_have_trailing_slash_by_default(self): - expected = ['^notes/$', '^notes/(?P[^/]+)/$'] + expected = ['^notes/$', '^notes/(?P[^/.]+)/$'] for idx in range(len(expected)): self.assertEqual(expected[idx], self.urls[idx].regex.pattern) From 899381575a6038f550a064261ed5c6ba0655211b Mon Sep 17 00:00:00 2001 From: Paul Melnikow Date: Sat, 4 Jan 2014 17:03:01 -0500 Subject: [PATCH 0371/1652] Fix a typo --- docs/api-guide/routers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 6b4ae6dbd..249e99a48 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -83,7 +83,7 @@ This behavior can be modified by setting the `trailing_slash` argument to `False Trailing slashes are conventional in Django, but are not used by default in some other frameworks such as Rails. Which style you choose to use is largely a matter of preference, although some javascript frameworks may expect a particular routing style. -The router will match lookup values containing any characters except slashes and period characters. For a more restrictive (or lenient) lookup pattern, set the `lookup_field_regex` attribute on the viewset. For example, you can limit the lookup to valid UUIDs: +The router will match lookup values containing any characters except slashes and period characters. For a more restrictive (or lenient) lookup pattern, set the `lookup_value_regex` attribute on the viewset. For example, you can limit the lookup to valid UUIDs: class MyModelViewSet(mixins.RetrieveModelMixin, viewsets.GenericViewSet): lookup_field = 'my_model_id' From e3ae33017d86bed7fdbf6c76e0129f9361cab04d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 6 Jan 2014 15:01:45 +0000 Subject: [PATCH 0372/1652] Added "nofollow" against docs link. --- rest_framework/templates/rest_framework/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 495163b64..ba45b9bcb 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -33,7 +33,7 @@
    - {% block branding %}Django REST framework {{ version }}{% endblock %} + {% block branding %}Django REST framework {{ version }}{% endblock %}
      {% block userlinks %} From 2b033d2456d39c35c9e874ec532f75e6fa7a09c8 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 7 Jan 2014 14:57:00 +0000 Subject: [PATCH 0373/1652] New font in logo --- docs/img/logo.png | Bin 45955 -> 41532 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/img/logo.png b/docs/img/logo.png index 0f0cf800d316496efbd89f55365bacad00f0ef96..73de34f4b807ec5349a1e0850a7d44a7bf9ff96e 100644 GIT binary patch delta 40312 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

      6woy1AdS@>QJ-+f)7dC@5;uunK(MT0ab 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 K)_bO7kN-c7Fv^Jl delta 44848 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 Date: Tue, 7 Jan 2014 15:01:21 +0000 Subject: [PATCH 0374/1652] Center logo --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 403f9c0af..68414d2b2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ +

      +

      [![build-status-image]][travis] From b0ddf21bd09782c0426bb80670c6bf2d0f821255 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 7 Jan 2014 15:02:56 +0000 Subject: [PATCH 0375/1652] Drop the logo from the project README --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 68414d2b2..29591b632 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -

      - -

      +# Django REST framework [![build-status-image]][travis] From 78494401c5c45d16d632bb2fa9629678e47a98bc Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 8 Jan 2014 15:22:41 +0000 Subject: [PATCH 0376/1652] Use www.django-rest-framework.org for docs instead of django-rest-framework.org due to issues with naked domains --- docs/404.html | 104 +++++++++--------- docs/api-guide/relations.md | 2 +- docs/index.md | 2 +- docs/topics/2.2-announcement.md | 2 +- mkdocs.py | 2 +- .../templates/rest_framework/base.html | 2 +- 6 files changed, 57 insertions(+), 57 deletions(-) diff --git a/docs/404.html b/docs/404.html index 4938da6ea..864247e78 100644 --- a/docs/404.html +++ b/docs/404.html @@ -3,17 +3,17 @@ Django REST framework - 404 - Page not found - - + + - - - - + + + +
    @@ -176,9 +176,9 @@ - - - + + + diff --git a/docs/topics/2.2-announcement.md b/docs/topics/2.2-announcement.md index 0f980e1cb..a997c7829 100644 --- a/docs/topics/2.2-announcement.md +++ b/docs/topics/2.2-announcement.md @@ -151,7 +151,7 @@ From version 2.2 onwards, serializers with hyperlinked relationships *always* re [porting-python-3]: https://docs.djangoproject.com/en/dev/topics/python3/ [python-compat]: https://docs.djangoproject.com/en/dev/releases/1.5/#python-compatibility [django-deprecation-policy]: https://docs.djangoproject.com/en/dev/internals/release-process/#internal-release-deprecation-policy -[credits]: http://django-rest-framework.org/topics/credits +[credits]: http://www.django-rest-framework.org/topics/credits [mailing-list]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework [django-rest-framework-docs]: https://github.com/marcgibbons/django-rest-framework-docs [marcgibbons]: https://github.com/marcgibbons/ diff --git a/mkdocs.py b/mkdocs.py index 92679a21e..f973096f3 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -18,7 +18,7 @@ if local: suffix = '.html' index = 'index.html' else: - base_url = 'http://django-rest-framework.org' + base_url = 'http://www.django-rest-framework.org' suffix = '' index = '' diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index ba45b9bcb..d19d5a2be 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -33,7 +33,7 @@
    - {% block branding %}Django REST framework {{ version }}{% endblock %} + {% block branding %}Django REST framework {{ version }}{% endblock %}
      {% block userlinks %} From 05c396cfa15138b56bf8617f4667fc41e80be104 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 8 Jan 2014 15:49:19 +0000 Subject: [PATCH 0377/1652] Use www.django-rest-framework.org for docs instead of django-rest-framework.org due to issues with naked domains --- README.md | 32 ++++++++++++++++---------------- setup.py | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 29591b632..73e4b13fc 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ **Awesome web-browseable Web APIs.** -**Note**: Full documentation for the project is available at [http://django-rest-framework.org][docs]. +**Note**: Full documentation for the project is available at [http://www.django-rest-framework.org][docs]. # Overview @@ -99,7 +99,7 @@ That's it, we're done! # Documentation & Support -Full documentation for the project is available at [http://django-rest-framework.org][docs]. +Full documentation for the project is available at [http://www.django-rest-framework.org][docs]. For questions and support, use the [REST framework discussion group][group], or `#restframework` on freenode IRC. @@ -143,21 +143,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [0.4]: https://github.com/tomchristie/django-rest-framework/tree/0.4.X [sandbox]: http://restframework.herokuapp.com/ -[index]: http://django-rest-framework.org/ -[oauth1-section]: http://django-rest-framework.org/api-guide/authentication.html#oauthauthentication -[oauth2-section]: http://django-rest-framework.org/api-guide/authentication.html#oauth2authentication -[serializer-section]: http://django-rest-framework.org/api-guide/serializers.html#serializers -[modelserializer-section]: http://django-rest-framework.org/api-guide/serializers.html#modelserializer -[functionview-section]: http://django-rest-framework.org/api-guide/views.html#function-based-views -[generic-views]: http://django-rest-framework.org/api-guide/generic-views.html -[viewsets]: http://django-rest-framework.org/api-guide/viewsets.html -[routers]: http://django-rest-framework.org/api-guide/routers.html -[serializers]: http://django-rest-framework.org/api-guide/serializers.html -[authentication]: http://django-rest-framework.org/api-guide/authentication.html +[index]: http://www.django-rest-framework.org/ +[oauth1-section]: http://www.django-rest-framework.org/api-guide/authentication.html#oauthauthentication +[oauth2-section]: http://www.django-rest-framework.org/api-guide/authentication.html#oauth2authentication +[serializer-section]: http://www.django-rest-framework.org/api-guide/serializers.html#serializers +[modelserializer-section]: http://www.django-rest-framework.org/api-guide/serializers.html#modelserializer +[functionview-section]: http://www.django-rest-framework.org/api-guide/views.html#function-based-views +[generic-views]: http://www.django-rest-framework.org/api-guide/generic-views.html +[viewsets]: http://www.django-rest-framework.org/api-guide/viewsets.html +[routers]: http://www.django-rest-framework.org/api-guide/routers.html +[serializers]: http://www.django-rest-framework.org/api-guide/serializers.html +[authentication]: http://www.django-rest-framework.org/api-guide/authentication.html -[rest-framework-2-announcement]: http://django-rest-framework.org/topics/rest-framework-2-announcement.html +[rest-framework-2-announcement]: http://www.django-rest-framework.org/topics/rest-framework-2-announcement.html [2.1.0-notes]: https://groups.google.com/d/topic/django-rest-framework/Vv2M0CMY9bg/discussion -[image]: http://django-rest-framework.org/img/quickstart.png +[image]: http://www.django-rest-framework.org/img/quickstart.png [tox]: http://testrun.org/tox/latest/ @@ -165,7 +165,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [wlonk]: https://twitter.com/wlonk/status/261689665952833536 [laserllama]: https://twitter.com/laserllama/status/328688333750407168 -[docs]: http://django-rest-framework.org/ +[docs]: http://www.django-rest-framework.org/ [urlobject]: https://github.com/zacharyvoase/urlobject [markdown]: http://pypi.python.org/pypi/Markdown/ [pyyaml]: http://pypi.python.org/pypi/PyYAML diff --git a/setup.py b/setup.py index 969b3fc14..78cdb6289 100755 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ if sys.argv[-1] == 'publish': setup( name='djangorestframework', version=version, - url='http://django-rest-framework.org', + url='http://www.django-rest-framework.org', license='BSD', description='Web APIs for Django, made easy.', author='Tom Christie', From 52db4eadc204c3e5ec234729c24275c8ed803634 Mon Sep 17 00:00:00 2001 From: Dustin Farris Date: Wed, 8 Jan 2014 16:14:27 -0500 Subject: [PATCH 0378/1652] Testing nested serializers with models that have str foreign key references. --- rest_framework/runtests/settings.py | 3 +++ rest_framework/tests/accounts/__init__.py | 0 rest_framework/tests/accounts/models.py | 8 ++++++++ rest_framework/tests/accounts/serializers.py | 11 +++++++++++ rest_framework/tests/records/__init__.py | 0 rest_framework/tests/records/models.py | 6 ++++++ rest_framework/tests/test_serializer_nested.py | 5 +++++ rest_framework/tests/users/__init__.py | 0 rest_framework/tests/users/models.py | 6 ++++++ rest_framework/tests/users/serializers.py | 8 ++++++++ 10 files changed, 47 insertions(+) create mode 100644 rest_framework/tests/accounts/__init__.py create mode 100644 rest_framework/tests/accounts/models.py create mode 100644 rest_framework/tests/accounts/serializers.py create mode 100644 rest_framework/tests/records/__init__.py create mode 100644 rest_framework/tests/records/models.py create mode 100644 rest_framework/tests/users/__init__.py create mode 100644 rest_framework/tests/users/models.py create mode 100644 rest_framework/tests/users/serializers.py diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py index be7216580..3fc0eb2f4 100644 --- a/rest_framework/runtests/settings.py +++ b/rest_framework/runtests/settings.py @@ -100,6 +100,9 @@ INSTALLED_APPS = ( 'rest_framework', 'rest_framework.authtoken', 'rest_framework.tests', + 'rest_framework.tests.accounts', + 'rest_framework.tests.records', + 'rest_framework.tests.users', ) # OAuth is optional and won't work if there is no oauth_provider & oauth2 diff --git a/rest_framework/tests/accounts/__init__.py b/rest_framework/tests/accounts/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/rest_framework/tests/accounts/models.py b/rest_framework/tests/accounts/models.py new file mode 100644 index 000000000..525e601ba --- /dev/null +++ b/rest_framework/tests/accounts/models.py @@ -0,0 +1,8 @@ +from django.db import models + +from rest_framework.tests.users.models import User + + +class Account(models.Model): + owner = models.ForeignKey(User, related_name='accounts_owned') + admins = models.ManyToManyField(User, blank=True, null=True, related_name='accounts_administered') diff --git a/rest_framework/tests/accounts/serializers.py b/rest_framework/tests/accounts/serializers.py new file mode 100644 index 000000000..a27b9ca6f --- /dev/null +++ b/rest_framework/tests/accounts/serializers.py @@ -0,0 +1,11 @@ +from rest_framework import serializers + +from rest_framework.tests.accounts.models import Account +from rest_framework.tests.users.serializers import UserSerializer + + +class AccountSerializer(serializers.ModelSerializer): + admins = UserSerializer(many=True) + + class Meta: + model = Account diff --git a/rest_framework/tests/records/__init__.py b/rest_framework/tests/records/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/rest_framework/tests/records/models.py b/rest_framework/tests/records/models.py new file mode 100644 index 000000000..769548074 --- /dev/null +++ b/rest_framework/tests/records/models.py @@ -0,0 +1,6 @@ +from django.db import models + + +class Record(models.Model): + account = models.ForeignKey('accounts.Account', blank=True, null=True) + owner = models.ForeignKey('users.User', blank=True, null=True) diff --git a/rest_framework/tests/test_serializer_nested.py b/rest_framework/tests/test_serializer_nested.py index 7114a0603..686a1f5f4 100644 --- a/rest_framework/tests/test_serializer_nested.py +++ b/rest_framework/tests/test_serializer_nested.py @@ -346,3 +346,8 @@ class NestedModelSerializerUpdateTests(TestCase): result.save() self.assertEqual(result.id, john.id) + +class ImportingModelSerializerWithStrForeignKeys(TestCase): + def test_import_model_serializer(self): + from rest_framework.tests.accounts.serializers import AccountSerializer + self.assertIsInstance(AccountSerializer(), serializers.ModelSerializer) diff --git a/rest_framework/tests/users/__init__.py b/rest_framework/tests/users/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/rest_framework/tests/users/models.py b/rest_framework/tests/users/models.py new file mode 100644 index 000000000..128bac90b --- /dev/null +++ b/rest_framework/tests/users/models.py @@ -0,0 +1,6 @@ +from django.db import models + + +class User(models.Model): + account = models.ForeignKey('accounts.Account', blank=True, null=True, related_name='users') + active_record = models.ForeignKey('records.Record', blank=True, null=True) diff --git a/rest_framework/tests/users/serializers.py b/rest_framework/tests/users/serializers.py new file mode 100644 index 000000000..da4965540 --- /dev/null +++ b/rest_framework/tests/users/serializers.py @@ -0,0 +1,8 @@ +from rest_framework import serializers + +from rest_framework.tests.users.models import User + + +class UserSerializer(serializers.ModelSerializer): + class Meta: + model = User From 82a48ca55e9ff10db3feafc2bf0489057a9b4a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20M=C3=B6llerstrand?= Date: Thu, 9 Jan 2014 15:39:37 +0000 Subject: [PATCH 0379/1652] fix docstring typos. --- rest_framework/request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index b883d0d4f..adf637852 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -223,7 +223,7 @@ class Request(object): def user(self, value): """ Sets the user on the current request. This is necessary to maintain - compatilbility with django.contrib.auth where the user proprety is + compatibility with django.contrib.auth where the user property is set in the login and logout functions. """ self._user = value From 052e236fde3453b33a4e651293da84e7d302cefb Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Thu, 9 Jan 2014 18:12:30 +0200 Subject: [PATCH 0380/1652] Fix URL/Slug Field signatures in docs --- docs/api-guide/fields.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index e05c03061..91866664b 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -167,13 +167,13 @@ or `django.db.models.fields.TextField`. Corresponds to `django.db.models.fields.URLField`. Uses Django's `django.core.validators.URLValidator` for validation. -**Signature:** `CharField(max_length=200, min_length=None)` +**Signature:** `URLField(max_length=200, min_length=None)` ## SlugField Corresponds to `django.db.models.fields.SlugField`. -**Signature:** `CharField(max_length=50, min_length=None)` +**Signature:** `SlugField(max_length=50, min_length=None)` ## ChoiceField From bf5b77ce6d171723f2d187aadd29c8ee4cdc3870 Mon Sep 17 00:00:00 2001 From: Dustin Farris Date: Thu, 9 Jan 2014 11:42:41 -0500 Subject: [PATCH 0381/1652] Move serializer import to top-level causes test error --- rest_framework/tests/test_serializer_nested.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/tests/test_serializer_nested.py b/rest_framework/tests/test_serializer_nested.py index 686a1f5f4..d0a773feb 100644 --- a/rest_framework/tests/test_serializer_nested.py +++ b/rest_framework/tests/test_serializer_nested.py @@ -6,6 +6,7 @@ Doesn't cover model serializers. from __future__ import unicode_literals from django.test import TestCase from rest_framework import serializers +from rest_framework.tests.accounts.serializers import AccountSerializer from . import models @@ -349,5 +350,4 @@ class NestedModelSerializerUpdateTests(TestCase): class ImportingModelSerializerWithStrForeignKeys(TestCase): def test_import_model_serializer(self): - from rest_framework.tests.accounts.serializers import AccountSerializer self.assertIsInstance(AccountSerializer(), serializers.ModelSerializer) From a7072eb730813dbd93cbe33da220c067beddc6d1 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Thu, 9 Jan 2014 23:19:25 +0100 Subject: [PATCH 0382/1652] Test case for #1129 --- rest_framework/tests/test_relations.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/rest_framework/tests/test_relations.py b/rest_framework/tests/test_relations.py index d19219c90..f52e0e1e5 100644 --- a/rest_framework/tests/test_relations.py +++ b/rest_framework/tests/test_relations.py @@ -98,3 +98,23 @@ class RelatedFieldSourceTests(TestCase): obj = ClassWithQuerysetMethod() value = field.field_to_native(obj, 'field_name') self.assertEqual(value, ['BlogPost object']) + + # Regression for #1129 + def test_exception_for_incorect_fk(self): + """ + Check that the exception message are correct if the source field + doesn't exist. + """ + from rest_framework.tests.models import ManyToManySource + class Meta: + model = ManyToManySource + attrs = { + 'name': serializers.SlugRelatedField( + slug_field='name', source='banzai'), + 'Meta': Meta, + } + + TestSerializer = type(str('TestSerializer'), + (serializers.ModelSerializer,), attrs) + with self.assertRaises(AttributeError): + TestSerializer(data={'name': 'foo'}) From f217f6870dec51b70ae5afcce8cb4bff54b511d9 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Thu, 9 Jan 2014 23:32:50 +0100 Subject: [PATCH 0383/1652] Removed useless try/except --- rest_framework/relations.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 35c00bf1d..02185c2ff 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -65,16 +65,11 @@ class RelatedField(WritableField): def initialize(self, parent, field_name): super(RelatedField, self).initialize(parent, field_name) if self.queryset is None and not self.read_only: - try: - manager = getattr(self.parent.opts.model, self.source or field_name) - if hasattr(manager, 'related'): # Forward - self.queryset = manager.related.model._default_manager.all() - else: # Reverse - self.queryset = manager.field.rel.to._default_manager.all() - except Exception: - msg = ('Serializer related fields must include a `queryset`' + - ' argument or set `read_only=True') - raise Exception(msg) + manager = getattr(self.parent.opts.model, self.source or field_name) + if hasattr(manager, 'related'): # Forward + self.queryset = manager.related.model._default_manager.all() + else: # Reverse + self.queryset = manager.field.rel.to._default_manager.all() ### We need this stuff to make form choices work... From 4b8d1b66ab2184166192e0c1ffea9b5f11fff8d3 Mon Sep 17 00:00:00 2001 From: Paul Melnikow Date: Fri, 10 Jan 2014 08:22:47 -0500 Subject: [PATCH 0384/1652] serializers.md: Fix typos --- docs/api-guide/serializers.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 6fc25f57a..04439092f 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -103,11 +103,11 @@ Deserialization is similar. First we parse a stream into Python native datatype When deserializing data, we can either create a new instance, or update an existing instance. serializer = CommentSerializer(data=data) # Create new instance - serializer = CommentSerializer(comment, data=data) # Update `instance` + serializer = CommentSerializer(comment, data=data) # Update `comment` By default, serializers must be passed values for all required fields or they will throw validation errors. You can use the `partial` argument in order to allow partial updates. - serializer = CommentSerializer(comment, data={'content': u'foo bar'}, partial=True) # Update `instance` with partial data + serializer = CommentSerializer(comment, data={'content': u'foo bar'}, partial=True) # Update `comment` with partial data ## Validation @@ -208,7 +208,7 @@ Similarly if a nested representation should be a list of items, you should pass Validation of nested objects will work the same as before. Errors with nested objects will be nested under the field name of the nested object. - serializer = CommentSerializer(comment, data={'user': {'email': 'foobar', 'username': 'doe'}, 'content': 'baz'}) + serializer = CommentSerializer(data={'user': {'email': 'foobar', 'username': 'doe'}, 'content': 'baz'}) serializer.is_valid() # False serializer.errors From 46f5c62530744017f744cdcfec91774a0566c179 Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Sun, 5 Jan 2014 15:16:55 +0200 Subject: [PATCH 0385/1652] Regression test for #1330 (Coerce None to '') --- rest_framework/tests/test_serializer.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index 86f365dee..8c2c09cf8 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -1124,6 +1124,20 @@ class BlankFieldTests(TestCase): serializer = self.model_serializer_class(data={}) self.assertEqual(serializer.is_valid(), True) + def test_create_model_null_field_save(self): + """ + Regression test for #1330. + + https://github.com/tomchristie/django-rest-framework/pull/1330 + """ + serializer = self.model_serializer_class(data={'title': None}) + self.assertEqual(serializer.is_valid(), True) + + try: + serializer.save() + except Exception: + self.fail('Exception raised on save() after validation passes') + #test for issue #460 class SerializerPickleTests(TestCase): From e88e3c6ae163029f0fe564dd214235ab350dbfc9 Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Sun, 5 Jan 2014 15:25:16 +0200 Subject: [PATCH 0386/1652] Possible fix for #1330 Coerce None to '' in CharField.to_native() --- rest_framework/fields.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 5ee752351..22f0120b7 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -452,7 +452,9 @@ class CharField(WritableField): self.validators.append(validators.MaxLengthValidator(max_length)) def from_native(self, value): - if isinstance(value, six.string_types) or value is None: + if value is None: + return '' + if isinstance(value, six.string_types): return value return smart_text(value) From 6e622d644c9b55b905e24497f0fb818d557fd970 Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Sun, 5 Jan 2014 15:58:46 +0200 Subject: [PATCH 0387/1652] CharField - add allow_null argument --- docs/api-guide/fields.md | 7 ++++--- rest_framework/fields.py | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index e05c03061..83825350e 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -157,23 +157,24 @@ Corresponds to `django.db.models.fields.BooleanField`. ## CharField A text representation, optionally validates the text to be shorter than `max_length` and longer than `min_length`. +If `allow_none` is `False` (default), `None` values will be converted to an empty string. Corresponds to `django.db.models.fields.CharField` or `django.db.models.fields.TextField`. -**Signature:** `CharField(max_length=None, min_length=None)` +**Signature:** `CharField(max_length=None, min_length=None, allow_none=False)` ## URLField Corresponds to `django.db.models.fields.URLField`. Uses Django's `django.core.validators.URLValidator` for validation. -**Signature:** `CharField(max_length=200, min_length=None)` +**Signature:** `CharField(max_length=200, min_length=None, allow_none=False)` ## SlugField Corresponds to `django.db.models.fields.SlugField`. -**Signature:** `CharField(max_length=50, min_length=None)` +**Signature:** `CharField(max_length=50, min_length=None, allow_none=False)` ## ChoiceField diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 22f0120b7..16485b414 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -443,8 +443,9 @@ class CharField(WritableField): type_label = 'string' form_field_class = forms.CharField - def __init__(self, max_length=None, min_length=None, *args, **kwargs): + def __init__(self, max_length=None, min_length=None, allow_none=False, *args, **kwargs): self.max_length, self.min_length = max_length, min_length + self.allow_none = allow_none super(CharField, self).__init__(*args, **kwargs) if min_length is not None: self.validators.append(validators.MinLengthValidator(min_length)) @@ -452,7 +453,7 @@ class CharField(WritableField): self.validators.append(validators.MaxLengthValidator(max_length)) def from_native(self, value): - if value is None: + if value is None and not self.allow_none: return '' if isinstance(value, six.string_types): return value From e1bbe9d514c95aba596cff64292eb0f0bc7d99fa Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Mon, 6 Jan 2014 13:56:57 +0200 Subject: [PATCH 0388/1652] Set `allow_none = True` for CharFields with null=True --- rest_framework/serializers.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index fa9353061..0164965cd 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -821,10 +821,15 @@ class ModelSerializer(Serializer): kwargs.update({attribute: getattr(model_field, attribute)}) try: - return self.field_mapping[model_field.__class__](**kwargs) + field_class = self.field_mapping[model_field.__class__] except KeyError: return ModelField(model_field=model_field, **kwargs) + if issubclass(field_class, CharField) and model_field.null: + kwargs['allow_none'] = True + + return field_class(**kwargs) + def get_validation_exclusions(self): """ Return a list of field names to exclude from model validation. From 0fd0454a5c1ddcf8676e23b30dfaee40fa7cb0c8 Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Mon, 6 Jan 2014 14:02:00 +0200 Subject: [PATCH 0389/1652] Test for setting allow_none=True for nullable CharFields --- rest_framework/tests/test_serializer.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index 8c2c09cf8..6d9b85ee0 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -1504,6 +1504,7 @@ class AttributeMappingOnAutogeneratedFieldsTests(TestCase): image_field = models.ImageField(max_length=1024, blank=True) slug_field = models.SlugField(max_length=1024, blank=True) url_field = models.URLField(max_length=1024, blank=True) + nullable_char_field = models.CharField(max_length=1024, blank=True, null=True) class AMOAFSerializer(serializers.ModelSerializer): class Meta: @@ -1536,6 +1537,10 @@ class AttributeMappingOnAutogeneratedFieldsTests(TestCase): 'url_field': [ ('max_length', 1024), ], + 'nullable_char_field': [ + ('max_length', 1024), + ('allow_none', True), + ], } def field_test(self, field): @@ -1572,6 +1577,9 @@ class AttributeMappingOnAutogeneratedFieldsTests(TestCase): def test_url_field(self): self.field_test('url_field') + def test_nullable_char_field(self): + self.field_test('nullable_char_field') + class DefaultValuesOnAutogeneratedFieldsTests(TestCase): From cd9a4194ea4f4dc0e43a34485cd8a27eba44a39a Mon Sep 17 00:00:00 2001 From: Yuri Prezument Date: Sun, 12 Jan 2014 16:30:26 +0200 Subject: [PATCH 0390/1652] Check the modelfield's class instead --- rest_framework/serializers.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0164965cd..cbf73fc30 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -804,6 +804,10 @@ class ModelSerializer(Serializer): issubclass(model_field.__class__, models.PositiveSmallIntegerField): kwargs['min_value'] = 0 + if model_field.null and \ + issubclass(model_field.__class__, (models.CharField, models.TextField)): + kwargs['allow_none'] = True + attribute_dict = { models.CharField: ['max_length'], models.CommaSeparatedIntegerField: ['max_length'], @@ -821,15 +825,10 @@ class ModelSerializer(Serializer): kwargs.update({attribute: getattr(model_field, attribute)}) try: - field_class = self.field_mapping[model_field.__class__] + return self.field_mapping[model_field.__class__](**kwargs) except KeyError: return ModelField(model_field=model_field, **kwargs) - if issubclass(field_class, CharField) and model_field.null: - kwargs['allow_none'] = True - - return field_class(**kwargs) - def get_validation_exclusions(self): """ Return a list of field names to exclude from model validation. From 2332382b5109939238801e7d4c018455d159fe91 Mon Sep 17 00:00:00 2001 From: Dustin Farris Date: Sun, 12 Jan 2014 20:28:19 -0500 Subject: [PATCH 0391/1652] Add a sanity check to avoid running into unresolved related models. --- rest_framework/models.py | 23 ++++++++++++++++++++++- rest_framework/serializers.py | 3 ++- rest_framework/tests/test_models.py | 28 ++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 rest_framework/tests/test_models.py diff --git a/rest_framework/models.py b/rest_framework/models.py index 5b53a5264..249cdd828 100644 --- a/rest_framework/models.py +++ b/rest_framework/models.py @@ -1 +1,22 @@ -# Just to keep things like ./manage.py test happy +import inspect + +from django.db import models + + +def resolve_model(obj): + """ + Resolve supplied `obj` to a Django model class. + + `obj` must be a Django model class, or a string representation + of one. + + String representations should have the format: + 'appname.ModelName' + """ + if type(obj) == str and len(obj.split('.')) == 2: + app_name, model_name = obj.split('.') + return models.get_model(app_name, model_name) + elif inspect.isclass(obj) and issubclass(obj, models.Model): + return obj + else: + raise ValueError("{0} is not a valid Django model".format(obj)) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b22ca5783..6b31c3043 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -20,6 +20,7 @@ from django.db import models from django.forms import widgets from django.utils.datastructures import SortedDict from rest_framework.compat import get_concrete_model, six +from rest_framework.models import resolve_model # Note: We do the following so that users of the framework can use this style: # @@ -656,7 +657,7 @@ class ModelSerializer(Serializer): if model_field.rel: to_many = isinstance(model_field, models.fields.related.ManyToManyField) - related_model = model_field.rel.to + related_model = resolve_model(model_field.rel.to) if to_many and not model_field.rel.through._meta.auto_created: has_through_model = True diff --git a/rest_framework/tests/test_models.py b/rest_framework/tests/test_models.py new file mode 100644 index 000000000..5e92d48ae --- /dev/null +++ b/rest_framework/tests/test_models.py @@ -0,0 +1,28 @@ +from django.db import models +from django.test import TestCase + +from rest_framework.models import resolve_model +from rest_framework.tests.models import BasicModel + + +class ResolveModelTests(TestCase): + """ + `resolve_model` should return a Django model class given the + provided argument is a Django model class itself, or a properly + formatted string representation of one. + """ + def test_resolve_django_model(self): + resolved_model = resolve_model(BasicModel) + self.assertEqual(resolved_model, BasicModel) + + def test_resolve_string_representation(self): + resolved_model = resolve_model('tests.BasicModel') + self.assertEqual(resolved_model, BasicModel) + + def test_resolve_non_django_model(self): + with self.assertRaises(ValueError): + resolve_model(TestCase) + + def test_resolve_with_improper_string_representation(self): + with self.assertRaises(ValueError): + resolve_model('BasicModel') From a90796c0f0d9db1a7d9bfaca8fbdfed22435c628 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 13 Jan 2014 09:56:57 +0000 Subject: [PATCH 0392/1652] Track changes that need noting in 2.4 announcement --- docs/topics/2.4-accouncement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/2.4-accouncement.md b/docs/topics/2.4-accouncement.md index a5425d54e..0cf50ce90 100644 --- a/docs/topics/2.4-accouncement.md +++ b/docs/topics/2.4-accouncement.md @@ -1,4 +1,4 @@ * Writable nested serializers. * List/detail routes. * 1.3 Support dropped, install six for <=1.4.?. -* Note title ordering changed \ No newline at end of file +* `allow_none` for char fields From 65858428fd7498c1783af0ec13de51521fe29c63 Mon Sep 17 00:00:00 2001 From: "S.Prymak" Date: Mon, 13 Jan 2014 16:35:20 +0200 Subject: [PATCH 0393/1652] Make HyperlinkedModelSerializer `url` field name customizable --- rest_framework/serializers.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b22ca5783..0b5c6a05b 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -990,6 +990,7 @@ class HyperlinkedModelSerializerOptions(ModelSerializerOptions): super(HyperlinkedModelSerializerOptions, self).__init__(meta) self.view_name = getattr(meta, 'view_name', None) self.lookup_field = getattr(meta, 'lookup_field', None) + self.url_field_name = getattr(meta, 'url_field_name', 'url') class HyperlinkedModelSerializer(ModelSerializer): @@ -1008,13 +1009,13 @@ class HyperlinkedModelSerializer(ModelSerializer): if self.opts.view_name is None: self.opts.view_name = self._get_default_view_name(self.opts.model) - if 'url' not in fields: + if self.opts.url_field_name not in fields: url_field = self._hyperlink_identify_field_class( view_name=self.opts.view_name, lookup_field=self.opts.lookup_field ) ret = self._dict_class() - ret['url'] = url_field + ret[self.opts.url_field_name] = url_field ret.update(fields) fields = ret @@ -1050,7 +1051,7 @@ class HyperlinkedModelSerializer(ModelSerializer): We need to override the default, to use the url as the identity. """ try: - return data.get('url', None) + return data.get(self.opts.url_field_name, None) except AttributeError: return None From 2911cd64ad67ba193e3d37322ee71692cb482623 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 13 Jan 2014 15:37:52 +0000 Subject: [PATCH 0394/1652] Minor tweaks to 'lookup_value_regex' work --- docs/topics/2.4-accouncement.md | 1 + rest_framework/routers.py | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/topics/2.4-accouncement.md b/docs/topics/2.4-accouncement.md index 0cf50ce90..91472b9c4 100644 --- a/docs/topics/2.4-accouncement.md +++ b/docs/topics/2.4-accouncement.md @@ -2,3 +2,4 @@ * List/detail routes. * 1.3 Support dropped, install six for <=1.4.?. * `allow_none` for char fields +* `trailing_slash = True` --> `[^/]`, `trailing_slash = False` --> `[^/.]`, becomes simply `[^/]` and `lookup_value_regex` is added. diff --git a/rest_framework/routers.py b/rest_framework/routers.py index df1233fdd..406ebcf77 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -220,12 +220,10 @@ class SimpleRouter(BaseRouter): https://github.com/alanjds/drf-nested-routers """ base_regex = '(?P<{lookup_prefix}{lookup_field}>{lookup_value})' + # Use `pk` as default field, unset set. Default regex should not + # consume `.json` style suffixes and should break at '/' boundaries. lookup_field = getattr(viewset, 'lookup_field', 'pk') - try: - lookup_value = viewset.lookup_value_regex - except AttributeError: - # Don't consume `.json` style suffixes - lookup_value = '[^/.]+' + lookup_value = getattr(viewset, 'lookup_value_regex', '[^/.]+') return base_regex.format( lookup_prefix=lookup_prefix, lookup_field=lookup_field, From b1b58762a3d84ac4cdc6553e8ed06983fd3502ca Mon Sep 17 00:00:00 2001 From: Dustin Farris Date: Mon, 13 Jan 2014 11:47:44 -0500 Subject: [PATCH 0395/1652] Move models.resolve_model to serializers._resolve_model --- rest_framework/models.py | 23 +-------------- rest_framework/serializers.py | 29 +++++++++++++++++-- .../{test_models.py => test_serializers.py} | 14 ++++----- 3 files changed, 35 insertions(+), 31 deletions(-) rename rest_framework/tests/{test_models.py => test_serializers.py} (62%) diff --git a/rest_framework/models.py b/rest_framework/models.py index 249cdd828..5b53a5264 100644 --- a/rest_framework/models.py +++ b/rest_framework/models.py @@ -1,22 +1 @@ -import inspect - -from django.db import models - - -def resolve_model(obj): - """ - Resolve supplied `obj` to a Django model class. - - `obj` must be a Django model class, or a string representation - of one. - - String representations should have the format: - 'appname.ModelName' - """ - if type(obj) == str and len(obj.split('.')) == 2: - app_name, model_name = obj.split('.') - return models.get_model(app_name, model_name) - elif inspect.isclass(obj) and issubclass(obj, models.Model): - return obj - else: - raise ValueError("{0} is not a valid Django model".format(obj)) +# Just to keep things like ./manage.py test happy diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 6b31c3043..0ea2cadbf 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -13,14 +13,15 @@ response content is handled by parsers and renderers. from __future__ import unicode_literals import copy import datetime +import inspect import types from decimal import Decimal +from django.core.exceptions import ImproperlyConfigured from django.core.paginator import Page from django.db import models from django.forms import widgets from django.utils.datastructures import SortedDict from rest_framework.compat import get_concrete_model, six -from rest_framework.models import resolve_model # Note: We do the following so that users of the framework can use this style: # @@ -33,6 +34,27 @@ from rest_framework.relations import * from rest_framework.fields import * +def _resolve_model(obj): + """ + Resolve supplied `obj` to a Django model class. + + `obj` must be a Django model class itself, or a string + representation of one. Useful in situtations like GH #1225 where + Django may not have resolved a string-based reference to a model in + another model's foreign key definition. + + String representations should have the format: + 'appname.ModelName' + """ + if type(obj) == str and len(obj.split('.')) == 2: + app_name, model_name = obj.split('.') + return models.get_model(app_name, model_name) + elif inspect.isclass(obj) and issubclass(obj, models.Model): + return obj + else: + raise ValueError("{0} is not a Django model".format(obj)) + + def pretty_name(name): """Converts 'first_name' to 'First name'""" if not name: @@ -657,7 +679,10 @@ class ModelSerializer(Serializer): if model_field.rel: to_many = isinstance(model_field, models.fields.related.ManyToManyField) - related_model = resolve_model(model_field.rel.to) + try: + related_model = _resolve_model(model_field.rel.to) + except ValueError as error_message: + raise ImproperlyConfigured(error_message) if to_many and not model_field.rel.through._meta.auto_created: has_through_model = True diff --git a/rest_framework/tests/test_models.py b/rest_framework/tests/test_serializers.py similarity index 62% rename from rest_framework/tests/test_models.py rename to rest_framework/tests/test_serializers.py index 5e92d48ae..082a400ca 100644 --- a/rest_framework/tests/test_models.py +++ b/rest_framework/tests/test_serializers.py @@ -1,28 +1,28 @@ from django.db import models from django.test import TestCase -from rest_framework.models import resolve_model +from rest_framework.serializers import _resolve_model from rest_framework.tests.models import BasicModel class ResolveModelTests(TestCase): """ - `resolve_model` should return a Django model class given the + `_resolve_model` should return a Django model class given the provided argument is a Django model class itself, or a properly formatted string representation of one. """ def test_resolve_django_model(self): - resolved_model = resolve_model(BasicModel) + resolved_model = _resolve_model(BasicModel) self.assertEqual(resolved_model, BasicModel) def test_resolve_string_representation(self): - resolved_model = resolve_model('tests.BasicModel') + resolved_model = _resolve_model('tests.BasicModel') self.assertEqual(resolved_model, BasicModel) def test_resolve_non_django_model(self): with self.assertRaises(ValueError): - resolve_model(TestCase) + _resolve_model(TestCase) - def test_resolve_with_improper_string_representation(self): + def test_resolve_improper_string_representation(self): with self.assertRaises(ValueError): - resolve_model('BasicModel') + _resolve_model('BasicModel') From c4d77667cf80588a2195fdc025bda53a5b977105 Mon Sep 17 00:00:00 2001 From: Dustin Farris Date: Mon, 13 Jan 2014 12:03:13 -0500 Subject: [PATCH 0396/1652] Move ImportingModelSerializerTests and add comments. --- .../tests/test_serializer_import.py | 19 +++++++++++++++++++ .../tests/test_serializer_nested.py | 6 ------ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 rest_framework/tests/test_serializer_import.py diff --git a/rest_framework/tests/test_serializer_import.py b/rest_framework/tests/test_serializer_import.py new file mode 100644 index 000000000..9f30a7ffa --- /dev/null +++ b/rest_framework/tests/test_serializer_import.py @@ -0,0 +1,19 @@ +from django.test import TestCase + +from rest_framework import serializers +from rest_framework.tests.accounts.serializers import AccountSerializer + + +class ImportingModelSerializerTests(TestCase): + """ + In some situations like, GH #1225, it is possible, especially in + testing, to import a serializer who's related models have not yet + been resolved by Django. `AccountSerializer` is an example of such + a serializer (imported at the top of this file). + """ + def test_import_model_serializer(self): + """ + The serializer at the top of this file should have been + imported successfully, and we should be able to instantiate it. + """ + self.assertIsInstance(AccountSerializer(), serializers.ModelSerializer) diff --git a/rest_framework/tests/test_serializer_nested.py b/rest_framework/tests/test_serializer_nested.py index d0a773feb..6d69ffbd0 100644 --- a/rest_framework/tests/test_serializer_nested.py +++ b/rest_framework/tests/test_serializer_nested.py @@ -6,7 +6,6 @@ Doesn't cover model serializers. from __future__ import unicode_literals from django.test import TestCase from rest_framework import serializers -from rest_framework.tests.accounts.serializers import AccountSerializer from . import models @@ -346,8 +345,3 @@ class NestedModelSerializerUpdateTests(TestCase): result = deserialize.object result.save() self.assertEqual(result.id, john.id) - - -class ImportingModelSerializerWithStrForeignKeys(TestCase): - def test_import_model_serializer(self): - self.assertIsInstance(AccountSerializer(), serializers.ModelSerializer) From d937ce331cc6cd2df04a989b49cca030f65319da Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 13 Jan 2014 17:37:08 +0000 Subject: [PATCH 0397/1652] Minor cleanup --- rest_framework/exceptions.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 2bd21de3b..4276625af 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -6,6 +6,7 @@ In addition Django's built in 403 and 404 exceptions are handled. """ from __future__ import unicode_literals from rest_framework import status +import math class APIException(Exception): @@ -14,10 +15,9 @@ class APIException(Exception): Subclasses should provide `.status_code` and `.detail` properties. """ status_code = status.HTTP_500_INTERNAL_SERVER_ERROR - default_detail = "" + default_detail = '' - def __init__(self, detail=None, status_code=None): - self.status_code = status_code or self.status_code + def __init__(self, detail=None): self.detail = detail or self.default_detail @@ -46,7 +46,7 @@ class MethodNotAllowed(APIException): default_detail = "Method '%s' not allowed." def __init__(self, method, detail=None): - super(MethodNotAllowed, self).__init__((detail or self.default_detail) % method) + self.detail = (detail or self.default_detail) % method class NotAcceptable(APIException): @@ -54,7 +54,7 @@ class NotAcceptable(APIException): default_detail = "Could not satisfy the request's Accept header" def __init__(self, detail=None, available_renderers=None): - super(NotAcceptable, self).__init__(detail) + self.detail = detail or self.default_detail self.available_renderers = available_renderers @@ -63,7 +63,7 @@ class UnsupportedMediaType(APIException): default_detail = "Unsupported media type '%s' in request." def __init__(self, media_type, detail=None): - super(UnsupportedMediaType, self).__init__((detail or self.default_detail) % media_type) + self.detail = (detail or self.default_detail) % media_type class Throttled(APIException): @@ -72,10 +72,10 @@ class Throttled(APIException): extra_detail = "Expected available in %d second%s." def __init__(self, wait=None, detail=None): - super(Throttled, self).__init__(detail) - - import math - self.wait = wait and math.ceil(wait) or None - if wait is not None: - format = self.detail + self.extra_detail - self.detail = format % (self.wait, self.wait != 1 and 's' or '') \ No newline at end of file + if wait is None: + self.detail = detail or self.default_detail + self.wait = None + else: + format = (detail or self.default_detail) + self.extra_detail + self.detail = format % (wait, wait != 1 and 's' or '') + self.wait = math.ceil(wait) From bc6c5df109a35bf76be662a47d9c88a2a3b82351 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 13 Jan 2014 17:39:22 +0000 Subject: [PATCH 0398/1652] Minor tweaks --- rest_framework/serializers.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0ea2cadbf..b4087e541 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -16,7 +16,6 @@ import datetime import inspect import types from decimal import Decimal -from django.core.exceptions import ImproperlyConfigured from django.core.paginator import Page from django.db import models from django.forms import widgets @@ -679,10 +678,7 @@ class ModelSerializer(Serializer): if model_field.rel: to_many = isinstance(model_field, models.fields.related.ManyToManyField) - try: - related_model = _resolve_model(model_field.rel.to) - except ValueError as error_message: - raise ImproperlyConfigured(error_message) + related_model = _resolve_model(model_field.rel.to) if to_many and not model_field.rel.through._meta.auto_created: has_through_model = True From e9b0d70f5d8eb94d72da677846d5dab5b587e945 Mon Sep 17 00:00:00 2001 From: "S.Prymak" Date: Tue, 14 Jan 2014 10:38:49 +0200 Subject: [PATCH 0399/1652] Override HyperlinkedModelSerializerOptions url field name with URL_FIELD_NAME setting --- rest_framework/serializers.py | 4 +++- rest_framework/settings.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0b5c6a05b..73c407c7b 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -20,6 +20,8 @@ from django.db import models from django.forms import widgets from django.utils.datastructures import SortedDict from rest_framework.compat import get_concrete_model, six +from rest_framework.settings import api_settings + # Note: We do the following so that users of the framework can use this style: # @@ -990,7 +992,7 @@ class HyperlinkedModelSerializerOptions(ModelSerializerOptions): super(HyperlinkedModelSerializerOptions, self).__init__(meta) self.view_name = getattr(meta, 'view_name', None) self.lookup_field = getattr(meta, 'lookup_field', None) - self.url_field_name = getattr(meta, 'url_field_name', 'url') + self.url_field_name = getattr(meta, 'url_field_name', api_settings.URL_FIELD_NAME) class HyperlinkedModelSerializer(ModelSerializer): diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 8abaf1409..ce171d6d4 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -95,6 +95,7 @@ DEFAULTS = { 'URL_FORMAT_OVERRIDE': 'format', 'FORMAT_SUFFIX_KWARG': 'format', + 'URL_FIELD_NAME': 'url', # Input and output formats 'DATE_INPUT_FORMATS': ( From 85d74fc86a934309359a437dd487193013055977 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 14 Jan 2014 11:25:44 +0000 Subject: [PATCH 0400/1652] Added write_only and write_only_fields. Refs #1306 --- docs/api-guide/fields.md | 8 +++- docs/api-guide/serializers.md | 19 +++++++++ docs/topics/release-notes.md | 6 ++- rest_framework/fields.py | 16 ++++++- rest_framework/serializers.py | 39 ++++++++++++----- .../tests/test_write_only_fields.py | 42 +++++++++++++++++++ 6 files changed, 117 insertions(+), 13 deletions(-) create mode 100644 rest_framework/tests/test_write_only_fields.py diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 91866664b..c136509b3 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -28,7 +28,13 @@ Defaults to the name of the field. ### `read_only` -Set this to `True` to ensure that the field is used when serializing a representation, but is not used when updating an instance during deserialization. +Set this to `True` to ensure that the field is used when serializing a representation, but is not used when creating or updating an instance during deserialization. + +Defaults to `False` + +### `write_only` + +Set this to `True` to ensure that the field may be used when updating or creating an instance, but is not included when serializing the representation. Defaults to `False` diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 04439092f..b05acfd54 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -373,6 +373,25 @@ You may wish to specify multiple fields as read-only. Instead of adding each fi Model fields which have `editable=False` set, and `AutoField` fields will be set to read-only by default, and do not need to be added to the `read_only_fields` option. +## Specifying which fields should be write-only + +You may wish to specify multiple fields as write-only. Instead of adding each field explicitly with the `write_only=True` attribute, you may use the `write_only_fields` Meta option, like so: + + class CreateUserSerializer(serializers.ModelSerializer): + class Meta: + model = User + fields = ('email', 'username', 'password') + write_only_fields = ('password',) # Note: Password field is write-only + + def restore_object(self, attrs, instance=None): + """ + Instantiate a new User instance. + """ + assert instance is None, 'Cannot update users with CreateUserSerializer' + user = User(email=attrs['email'], username=attrs['username']) + user.set_password(attrs['password']) + return user + ## Specifying fields explicitly You can add extra fields to a `ModelSerializer` or override the default fields by declaring fields on the class, just as you would for a `Serializer` class. diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index ca966d20e..cd87c7b2d 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,8 +40,12 @@ You can determine your currently installed version using `pip freeze`: ## 2.3.x series -### Master +### 2.3.11 +**Date**: 14th January 2014 + +* Added `write_only` serializer field argument. +* Added `write_only_fields` option to `ModelSerializer` classes. * JSON renderer now deals with objects that implement a dict-like interface. * Fix compatiblity with newer versions of `django-oauth-plus`. * Bugfix: Refine behavior that calls model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unneccessary queryset re-evaluations. diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f1de447c7..258c0f6a5 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -114,6 +114,10 @@ def strip_multiple_choice_msg(help_text): return help_text.replace(multiple_choice_msg, '') +class IgnoreFieldException(Exception): + pass + + class Field(object): read_only = True creation_counter = 0 @@ -246,6 +250,7 @@ class WritableField(Field): """ Base for read/write fields. """ + write_only = False default_validators = [] default_error_messages = { 'required': _('This field is required.'), @@ -255,7 +260,7 @@ class WritableField(Field): default = None def __init__(self, source=None, label=None, help_text=None, - read_only=False, required=None, + read_only=False, write_only=False, required=None, validators=[], error_messages=None, widget=None, default=None, blank=None): @@ -269,6 +274,10 @@ class WritableField(Field): super(WritableField, self).__init__(source=source, label=label, help_text=help_text) self.read_only = read_only + self.write_only = write_only + + assert not (read_only and write_only), "Cannot set read_only=True and write_only=True" + if required is None: self.required = not(read_only) else: @@ -318,6 +327,11 @@ class WritableField(Field): if errors: raise ValidationError(errors) + def field_to_native(self, obj, field_name): + if self.write_only: + raise IgnoreFieldException() + return super(WritableField, self).field_to_native(obj, field_name) + def field_from_native(self, data, files, field_name, into): """ Given a dictionary and a field name, updates the dictionary `into`, diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b4087e541..9f047b03c 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -344,7 +344,10 @@ class BaseSerializer(WritableField): continue field.initialize(parent=self, field_name=field_name) key = self.get_field_key(field_name) - value = field.field_to_native(obj, field_name) + try: + value = field.field_to_native(obj, field_name) + except IgnoreFieldException: + continue method = getattr(self, 'transform_%s' % field_name, None) if callable(method): value = method(obj, value) @@ -383,6 +386,9 @@ class BaseSerializer(WritableField): Override default so that the serializer can be used as a nested field across relationships. """ + if self.write_only: + raise IgnoreFieldException() + if self.source == '*': return self.to_native(obj) @@ -615,6 +621,7 @@ class ModelSerializerOptions(SerializerOptions): super(ModelSerializerOptions, self).__init__(meta) self.model = getattr(meta, 'model', None) self.read_only_fields = getattr(meta, 'read_only_fields', ()) + self.write_only_fields = getattr(meta, 'write_only_fields', ()) class ModelSerializer(Serializer): @@ -754,17 +761,29 @@ class ModelSerializer(Serializer): # Add the `read_only` flag to any fields that have bee specified # in the `read_only_fields` option for field_name in self.opts.read_only_fields: - assert field_name not in self.base_fields.keys(), \ - "field '%s' on serializer '%s' specified in " \ - "`read_only_fields`, but also added " \ - "as an explicit field. Remove it from `read_only_fields`." % \ - (field_name, self.__class__.__name__) - assert field_name in ret, \ - "Non-existant field '%s' specified in `read_only_fields` " \ - "on serializer '%s'." % \ - (field_name, self.__class__.__name__) + assert field_name not in self.base_fields.keys(), ( + "field '%s' on serializer '%s' specified in " + "`read_only_fields`, but also added " + "as an explicit field. Remove it from `read_only_fields`." % + (field_name, self.__class__.__name__)) + assert field_name in ret, ( + "Non-existant field '%s' specified in `read_only_fields` " + "on serializer '%s'." % + (field_name, self.__class__.__name__)) ret[field_name].read_only = True + for field_name in self.opts.write_only_fields: + assert field_name not in self.base_fields.keys(), ( + "field '%s' on serializer '%s' specified in " + "`write_only_fields`, but also added " + "as an explicit field. Remove it from `write_only_fields`." % + (field_name, self.__class__.__name__)) + assert field_name in ret, ( + "Non-existant field '%s' specified in `write_only_fields` " + "on serializer '%s'." % + (field_name, self.__class__.__name__)) + ret[field_name].write_only = True + return ret def get_pk_field(self, model_field): diff --git a/rest_framework/tests/test_write_only_fields.py b/rest_framework/tests/test_write_only_fields.py new file mode 100644 index 000000000..aabb18d6a --- /dev/null +++ b/rest_framework/tests/test_write_only_fields.py @@ -0,0 +1,42 @@ +from django.db import models +from django.test import TestCase +from rest_framework import serializers + + +class ExampleModel(models.Model): + email = models.EmailField(max_length=100) + password = models.CharField(max_length=100) + + +class WriteOnlyFieldTests(TestCase): + def test_write_only_fields(self): + class ExampleSerializer(serializers.Serializer): + email = serializers.EmailField() + password = serializers.CharField(write_only=True) + + data = { + 'email': 'foo@example.com', + 'password': '123' + } + serializer = ExampleSerializer(data=data) + self.assertTrue(serializer.is_valid()) + self.assertEquals(serializer.object, data) + self.assertEquals(serializer.data, {'email': 'foo@example.com'}) + + def test_write_only_fields_meta(self): + class ExampleSerializer(serializers.ModelSerializer): + class Meta: + model = ExampleModel + fields = ('email', 'password') + write_only_fields = ('password',) + + data = { + 'email': 'foo@example.com', + 'password': '123' + } + serializer = ExampleSerializer(data=data) + self.assertTrue(serializer.is_valid()) + self.assertTrue(isinstance(serializer.object, ExampleModel)) + self.assertEquals(serializer.object.email, data['email']) + self.assertEquals(serializer.object.password, data['password']) + self.assertEquals(serializer.data, {'email': 'foo@example.com'}) From 97f8ede4d14017aa37ca377064215cd8a73d7e7a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 14 Jan 2014 11:26:10 +0000 Subject: [PATCH 0401/1652] Version 2.3.11 --- rest_framework/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index f5483b9d6..883f24a2e 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ _ """ __title__ = 'Django REST framework' -__version__ = '2.3.10' +__version__ = '2.3.11' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2013 Tom Christie' From ed8143b2b05cd16952262c939b15053f7b93893a Mon Sep 17 00:00:00 2001 From: "S.Prymak" Date: Tue, 14 Jan 2014 13:58:17 +0200 Subject: [PATCH 0402/1652] Test for customizable HyperlinkedModelSerializer url field name --- .../tests/test_hyperlinkedserializers.py | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/rest_framework/tests/test_hyperlinkedserializers.py b/rest_framework/tests/test_hyperlinkedserializers.py index 61e613d75..83d460435 100644 --- a/rest_framework/tests/test_hyperlinkedserializers.py +++ b/rest_framework/tests/test_hyperlinkedserializers.py @@ -3,6 +3,7 @@ import json from django.test import TestCase from rest_framework import generics, status, serializers from rest_framework.compat import patterns, url +from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory from rest_framework.tests.models import ( Anchor, BasicModel, ManyToManyModel, BlogPost, BlogPostComment, @@ -331,3 +332,48 @@ class TestOverriddenURLField(TestCase): serializer.data, {'title': 'New blog post', 'url': 'foo bar'} ) + + +class TestURLFieldNameBySettings(TestCase): + urls = 'rest_framework.tests.test_hyperlinkedserializers' + + def setUp(self): + self.saved_url_field_name = api_settings.URL_FIELD_NAME + api_settings.URL_FIELD_NAME = 'global_url_field' + + class Serializer(serializers.HyperlinkedModelSerializer): + + class Meta: + model = BlogPost + fields = ('title', api_settings.URL_FIELD_NAME) + + self.Serializer = Serializer + self.obj = BlogPost.objects.create(title="New blog post") + + def tearDown(self): + api_settings.URL_FIELD_NAME = self.saved_url_field_name + + def test_overridden_url_field_name(self): + request = factory.get('/posts/') + serializer = self.Serializer(self.obj, context={'request': request}) + self.assertIn(api_settings.URL_FIELD_NAME, serializer.data) + + +class TestURLFieldNameByOptions(TestCase): + urls = 'rest_framework.tests.test_hyperlinkedserializers' + + def setUp(self): + class Serializer(serializers.HyperlinkedModelSerializer): + + class Meta: + model = BlogPost + fields = ('title', 'serializer_url_field') + url_field_name = 'serializer_url_field' + + self.Serializer = Serializer + self.obj = BlogPost.objects.create(title="New blog post") + + def test_overridden_url_field_name(self): + request = factory.get('/posts/') + serializer = self.Serializer(self.obj, context={'request': request}) + self.assertIn(self.Serializer.Meta.url_field_name, serializer.data) From 4655d34848049a4bade12af9ca33456a50b2dabf Mon Sep 17 00:00:00 2001 From: JakeSidSmith Date: Tue, 14 Jan 2014 14:40:36 +0000 Subject: [PATCH 0403/1652] Added h1 and alt to logo to improve SEO Added title attribution to logo --- docs/index.md | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/docs/index.md b/docs/index.md index b5c3339ac..633382247 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,8 +9,10 @@ --- +

      Django REST Framework

      +

      - +Django REST Framework

    - + {% endblock %} From 544183f64ff115398ae62c916d58f8369263d47c Mon Sep 17 00:00:00 2001 From: TankorSmash Date: Mon, 16 Jun 2014 19:13:02 -0400 Subject: [PATCH 0604/1652] typo in the docs --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 86e8fd9df..d5c8134b0 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -187,7 +187,7 @@ class Field(object): def field_to_native(self, obj, field_name): """ - Given and object and a field name, returns the value that should be + Given an object and a field name, returns the value that should be serialized for that field. """ if obj is None: From f34011f8010a5a3358eead9f60be1fb4db4e834a Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Mon, 23 Jun 2014 14:52:18 +0200 Subject: [PATCH 0605/1652] Allow use of native migrations in 1.7 --- .../authtoken/migrations/0001_initial.py | 84 +++++-------------- .../south_migrations/0001_initial.py | 67 +++++++++++++++ .../authtoken/south_migrations/__init__.py | 0 rest_framework/settings.py | 7 ++ 4 files changed, 96 insertions(+), 62 deletions(-) create mode 100644 rest_framework/authtoken/south_migrations/0001_initial.py create mode 100644 rest_framework/authtoken/south_migrations/__init__.py diff --git a/rest_framework/authtoken/migrations/0001_initial.py b/rest_framework/authtoken/migrations/0001_initial.py index d5965e404..2e5d6b47e 100644 --- a/rest_framework/authtoken/migrations/0001_initial.py +++ b/rest_framework/authtoken/migrations/0001_initial.py @@ -1,67 +1,27 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models +# encoding: utf8 +from __future__ import unicode_literals -from rest_framework.settings import api_settings +from django.db import models, migrations +from django.conf import settings -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() +class Migration(migrations.Migration): + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'Token' - db.create_table('authtoken_token', ( - ('key', self.gf('django.db.models.fields.CharField')(max_length=40, primary_key=True)), - ('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='auth_token', unique=True, to=orm['%s.%s' % (User._meta.app_label, User._meta.object_name)])), - ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - )) - db.send_create_signal('authtoken', ['Token']) - - - def backwards(self, orm): - # Deleting model 'Token' - db.delete_table('authtoken_token') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - "%s.%s" % (User._meta.app_label, User._meta.module_name): { - 'Meta': {'object_name': User._meta.module_name}, - }, - 'authtoken.token': { - 'Meta': {'object_name': 'Token'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'auth_token'", 'unique': 'True', 'to': "orm['%s.%s']" % (User._meta.app_label, User._meta.object_name)}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - } - } - - complete_apps = ['authtoken'] + operations = [ + migrations.CreateModel( + name='Token', + fields=[ + ('key', models.CharField(max_length=40, serialize=False, primary_key=True)), + ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, to_field='id')), + ('created', models.DateTimeField(auto_now_add=True)), + ], + options={ + 'abstract': False, + }, + bases=(models.Model,), + ), + ] diff --git a/rest_framework/authtoken/south_migrations/0001_initial.py b/rest_framework/authtoken/south_migrations/0001_initial.py new file mode 100644 index 000000000..d5965e404 --- /dev/null +++ b/rest_framework/authtoken/south_migrations/0001_initial.py @@ -0,0 +1,67 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +from rest_framework.settings import api_settings + + +try: + from django.contrib.auth import get_user_model +except ImportError: # django < 1.5 + from django.contrib.auth.models import User +else: + User = get_user_model() + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'Token' + db.create_table('authtoken_token', ( + ('key', self.gf('django.db.models.fields.CharField')(max_length=40, primary_key=True)), + ('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='auth_token', unique=True, to=orm['%s.%s' % (User._meta.app_label, User._meta.object_name)])), + ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + )) + db.send_create_signal('authtoken', ['Token']) + + + def backwards(self, orm): + # Deleting model 'Token' + db.delete_table('authtoken_token') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + "%s.%s" % (User._meta.app_label, User._meta.module_name): { + 'Meta': {'object_name': User._meta.module_name}, + }, + 'authtoken.token': { + 'Meta': {'object_name': 'Token'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'auth_token'", 'unique': 'True', 'to': "orm['%s.%s']" % (User._meta.app_label, User._meta.object_name)}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['authtoken'] diff --git a/rest_framework/authtoken/south_migrations/__init__.py b/rest_framework/authtoken/south_migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 38753c968..332d5e4f9 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -119,6 +119,13 @@ DEFAULTS = { # Pending deprecation 'FILTER_BACKEND': None, + + + # 1.7 Migration Compatibility + + 'SOUTH_MIGRATION_MODULES': { + 'authtoken': 'rest_framework.authtoken.south_migrations', + } } From 3f727ce738776838d8420450ce28485954fbb097 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 24 Jun 2014 09:02:44 +0200 Subject: [PATCH 0606/1652] Added (first pass) notes to docs & release notes. Backed out `SOUTH_MIGRATION_MODULES` setting from `rest_framework.settings` --- docs/api-guide/authentication.md | 24 ++++++++++++++++++++++-- docs/topics/release-notes.md | 16 ++++++++++++---- rest_framework/settings.py | 6 ------ 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 88a7a0119..0bddd0d03 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -126,7 +126,13 @@ To use the `TokenAuthentication` scheme, include `rest_framework.authtoken` in y 'rest_framework.authtoken' ) -Make sure to run `manage.py syncdb` after changing your settings. The `authtoken` database tables are managed by south (see [Schema migrations](#schema-migrations) below). + +--- + +**Note:** Make sure to run `manage.py syncdb` after changing your settings. Both Django native (from v1.7) and South migrations for the `authtoken` database tables are provided. See [Schema migrations](#schema-migrations) below. + +--- + You'll also need to create tokens for your users. @@ -198,7 +204,21 @@ Note that the default `obtain_auth_token` view explicitly uses JSON requests and #### Schema migrations -The `rest_framework.authtoken` app includes a south migration that will create the authtoken table. +The `rest_framework.authtoken` app includes both a Django native migration (for Django versions >1.7) and a south migration that will create the authtoken table. + +---- + +**Note** By default both Django (>1.7) and South will look for a module named `migrations`. To avoid a collision here, in order to use South you **must** provide the `SOUTH_MIGRATION_MODULES` option in your `settings.py`: + + + SOUTH_MIGRATION_MODULES = { + 'authtoken': 'rest_framework.authtoken.south_migrations', + } + +This tells South to look in the `south_migrations` module for the `authtoken` app. + +---- + If you're using a [custom user model][custom-user-model] you'll need to make sure that any initial migration that creates the user table runs before the authtoken table is created. diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 335497eec..5722d45be 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -43,6 +43,14 @@ You can determine your currently installed version using `pip freeze`: ### 2.3.x **Date**: April 2014 +* Added compatibility with Django 1.7's native migrations. + + **IMPORTANT**: In order to continue to use south with Django <1.7 you **must** provide + the `SOUTH_MIGRATION_MODULES` option in your `settings.py`: + + SOUTH_MIGRATION_MODULES = { + 'authtoken': 'rest_framework.authtoken.south_migrations', + } * Fix nested serializers linked through a backward foreign key relation * Fix bad links for the `BrowsableAPIRenderer` with `YAMLRenderer` @@ -165,9 +173,9 @@ You can determine your currently installed version using `pip freeze`: * Added `trailing_slash` option to routers. * Include support for `HttpStreamingResponse`. * Support wider range of default serializer validation when used with custom model fields. -* UTF-8 Support for browsable API descriptions. +* UTF-8 Support for browsable API descriptions. * OAuth2 provider uses timezone aware datetimes when supported. -* Bugfix: Return error correctly when OAuth non-existent consumer occurs. +* Bugfix: Return error correctly when OAuth non-existent consumer occurs. * Bugfix: Allow `FileUploadParser` to correctly filename if provided as URL kwarg. * Bugfix: Fix `ScopedRateThrottle`. @@ -208,7 +216,7 @@ You can determine your currently installed version using `pip freeze`: * Added SearchFilter * Added OrderingFilter * Added GenericViewSet -* Bugfix: Multiple `@action` and `@link` methods now allowed on viewsets. +* Bugfix: Multiple `@action` and `@link` methods now allowed on viewsets. * Bugfix: Fix API Root view issue with DjangoModelPermissions ### 2.3.2 @@ -261,7 +269,7 @@ You can determine your currently installed version using `pip freeze`: * Long HTTP headers in browsable API are broken in multiple lines when possible. * Bugfix: Fix regression with DjangoFilterBackend not worthing correctly with single object views. * Bugfix: OAuth should fail hard when invalid token used. -* Bugfix: Fix serializer potentially returning `None` object for models that define `__bool__` or `__len__`. +* Bugfix: Fix serializer potentially returning `None` object for models that define `__bool__` or `__len__`. ### 2.2.5 diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 332d5e4f9..fbef6e021 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -120,12 +120,6 @@ DEFAULTS = { # Pending deprecation 'FILTER_BACKEND': None, - - # 1.7 Migration Compatibility - - 'SOUTH_MIGRATION_MODULES': { - 'authtoken': 'rest_framework.authtoken.south_migrations', - } } From c1426d1078a40de521aeec6c4099538efa6b24c7 Mon Sep 17 00:00:00 2001 From: Chibisov Gennady Date: Thu, 26 Jun 2014 23:29:00 +0400 Subject: [PATCH 0607/1652] Fixes #1651. Add link to drf-extensions nested routers to docs --- docs/api-guide/routers.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 7efc140a5..64f05af39 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -179,7 +179,16 @@ The [wq.db package][wq.db] provides an advanced [Router][wq.db-router] class (an app.router.register_model(MyModel) +## DRF-extensions + +The [`DRF-extensions` package][drf-extensions] provides [routers][drf-extensions-routers] for creating [nested viewsets][drf-extensions-nested-viewsets], [collection level controllers][drf-extensions-collection-level-controllers] with [customizable endpoint names][drf-extensions-customizable-endpoint-names]. + [cite]: http://guides.rubyonrails.org/routing.html [drf-nested-routers]: https://github.com/alanjds/drf-nested-routers [wq.db]: http://wq.io/wq.db [wq.db-router]: http://wq.io/docs/app.py +[drf-extensions]: http://chibisov.github.io/drf-extensions/docs/ +[drf-extensions-routers]: http://chibisov.github.io/drf-extensions/docs/#routers +[drf-extensions-nested-viewsets]: http://chibisov.github.io/drf-extensions/docs/#nested-routes +[drf-extensions-collection-level-controllers]: http://chibisov.github.io/drf-extensions/docs/#collection-level-controllers +[drf-extensions-customizable-endpoint-names]: http://chibisov.github.io/drf-extensions/docs/#controller-endpoint-name \ No newline at end of file From 91eabd54bbc42e8a2540db2ff070097db7a0f4a0 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 1 Jul 2014 14:34:23 +0100 Subject: [PATCH 0608/1652] Docs tweak --- docs/api-guide/filtering.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 6a8a267b2..ec5ab61fe 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -199,8 +199,7 @@ This enables us to make queries like: http://example.com/api/products?manufacturer__name=foo -This is nice, but it shows underlying model structure in REST API, which may -be undesired, but you can use: +This is nice, but it exposes the Django's double underscore convention as part of the API. If you instead want to explicitly name the filter argument you can instead explicitly include it on the `FilterSet` class: import django_filters from myapp.models import Product @@ -208,7 +207,6 @@ be undesired, but you can use: from rest_framework import generics class ProductFilter(django_filters.FilterSet): - manufacturer = django_filters.CharFilter(name="manufacturer__name") class Meta: From a5e628bf8b4cf26227d4ee0cbef45049aa0632d5 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 7 Jul 2014 09:42:50 +0100 Subject: [PATCH 0609/1652] Kick travis --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 73e4b13fc..da5f27aef 100644 --- a/README.md +++ b/README.md @@ -136,6 +136,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + [build-status-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master [travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master [twitter]: https://twitter.com/_tomchristie From b51901812596aa478cc8cb1046e42049214bc9ff Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 7 Jul 2014 09:51:23 +0100 Subject: [PATCH 0610/1652] Docs on object level permissions and filters. Closes #1683 --- docs/api-guide/permissions.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 50f669a2d..c44b22de8 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -36,6 +36,12 @@ For example: self.check_object_permissions(self.request, obj) return obj +#### Limitations of object level permissions + +For performance reasons the generic views will not automatically apply object level permissions to each instance in a queryset when returning a list of objects. + +Often when you're using object level permissions you'll also want to [filter the queryset][filtering] appropriately, to ensure that users only have visibility onto instances that they are permitted to view. + ## Setting the permission policy The default permission policy may be set globally, using the `DEFAULT_PERMISSION_CLASSES` setting. For example. @@ -237,6 +243,7 @@ The [REST Condition][rest-condition] package is another extension for building c [cite]: https://developer.apple.com/library/mac/#documentation/security/Conceptual/AuthenticationAndAuthorizationGuide/Authorization/Authorization.html [authentication]: authentication.md [throttling]: throttling.md +[filtering]: filtering.md [contribauth]: https://docs.djangoproject.com/en/1.0/topics/auth/#permissions [objectpermissions]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#handling-object-permissions [guardian]: https://github.com/lukaszb/django-guardian From 18eab53e892f2f579fd0bb4e1ca3cb47a074accc Mon Sep 17 00:00:00 2001 From: Emmanouil Date: Wed, 9 Jul 2014 15:53:31 +0100 Subject: [PATCH 0611/1652] Updated quick start project set up order --- docs/tutorial/quickstart.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 8bf8c7f5c..04792c692 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -6,8 +6,8 @@ We're going to create a simple API to allow admin users to view and edit the use Create a new Django project named `tutorial`, then start a new app called `quickstart`. - # Set up a new project - django-admin.py startproject tutorial + # Create the project directory + mkdir tutorial cd tutorial # Create a virtualenv to isolate our package dependencies locally @@ -18,6 +18,9 @@ Create a new Django project named `tutorial`, then start a new app called `quick pip install django pip install djangorestframework + # Set up a new project + django-admin.py startproject tutorial + # Create a new app python manage.py startapp quickstart From dd2e950cde5fc7078303925fa936e59ea4fe363b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 15 Jul 2014 15:02:09 +0100 Subject: [PATCH 0612/1652] Fusion ads --- docs/template.html | 24 +++++++++++++++++++----- mkdocs.py | 4 ++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/docs/template.html b/docs/template.html index a397d067b..6009b1510 100644 --- a/docs/template.html +++ b/docs/template.html @@ -33,6 +33,21 @@ })(); + @@ -169,11 +184,9 @@
      {{ toc }} -
      - -{{ ad_block }} - -
      +
      + {{ ad_block }} +
    @@ -199,6 +212,7 @@ + """) else: output = output.replace('{{ ad_block }}', '') From 680fabe9dd2307014862beb1c2d77625e808788d Mon Sep 17 00:00:00 2001 From: Dave King Date: Thu, 17 Jul 2014 11:46:59 +0100 Subject: [PATCH 0613/1652] Update fields.md obj.__class__ will return the actual Class object, we want to serialise a string (accessed with obj.__class__.__name__) --- docs/api-guide/fields.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 58dbf977e..6d1adcb03 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -347,7 +347,7 @@ As an example, let's create a field that can be used represent the class name of """ Serialize the object's class name. """ - return obj.__class__ + return obj.__class__.__name__ # Third party packages From 6bf0f81b0b911eb3d2bf3dd3fbaaf44570a58b28 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 17 Jul 2014 13:41:19 +0100 Subject: [PATCH 0614/1652] Kickstarter note on front page --- docs/index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/index.md b/docs/index.md index 2a4ad8859..a870a8280 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,6 +9,10 @@ --- +**Project announcement:** We are currently running a Kickstart campaign to help fund the development of Django REST framework 3. If you want to help make sustainable open source development please [check out the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3), and consider funding us! + +--- +

    2.0 Announcement
  • 2.2 Announcement
  • 2.3 Announcement
    • +
  • Kickstarter Announcement
  • Release Notes
  • Credits
    • diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md new file mode 100644 index 000000000..98cf12e3b --- /dev/null +++ b/docs/topics/kickstarter-announcement.md @@ -0,0 +1,31 @@ +# Kickstarting Django REST framework 3 + +--- + + + +--- + +In order to continue to drive the project forward, I'm launching a Kickstarter campaign to help fund the development of a major new release - Django REST framework 3. + +## Project details + +This new release will allow us to comprehensively address some of the shortcomings of the framework, and will aim to include the following: + +* Faster, simpler and easier-to-use serializers. +* An alternative admin-style interface for the browsable API. +* Search and filtering controls made accessible in the browsable API. +* Alternative API pagination styles. +* Documentation around API versioning. +* Triage of outstanding tickets. +* Improving the ongoing quality and maintainability of the project. + +Full details are available now on the [project page](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3). + +If you're interested in helping make sustainable open source development a reality please [visit the Kickstarter page](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) and consider funding the project. + +I can't wait to see where this takes us! + +Many thanks to everyone for your support so far, + + Tom Christie :) From 550243fd2649195f6433bf07354880d86bfedde9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 18 Jul 2014 11:51:48 +0100 Subject: [PATCH 0616/1652] Beef up the kickstarter announcement --- docs/index.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index c1f60097e..c07a56457 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,7 +9,11 @@ --- -**Project announcement:** We are currently running a Kickstarter campaign to help fund the development of Django REST framework 3. If you want to help make sustainable open source development please [check out the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3), and consider funding us! +#### Django REST framework 3 - Kickstarter announcement! + +We are currently running a Kickstarter campaign to help fund the development of Django REST framework 3. + +If you want to help make sustainable open source development **please [check out the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) and consider funding us.** --- From ab34ddcf2f734ca5f1a6e43ff1280283b9a171e5 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 18 Jul 2014 11:53:23 +0100 Subject: [PATCH 0617/1652] Typo --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index c07a56457..5b5a62eba 100644 --- a/docs/index.md +++ b/docs/index.md @@ -13,7 +13,7 @@ We are currently running a Kickstarter campaign to help fund the development of Django REST framework 3. -If you want to help make sustainable open source development **please [check out the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) and consider funding us.** +If you want to help make sustainable open-source development a reality **please [check out the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) and consider funding us.** --- From 4324f504375f7f118297fa9694bd6cee56bc050e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 18 Jul 2014 11:54:51 +0100 Subject: [PATCH 0618/1652] Phrasing tweak --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 5b5a62eba..d9c686c4a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -13,7 +13,7 @@ We are currently running a Kickstarter campaign to help fund the development of Django REST framework 3. -If you want to help make sustainable open-source development a reality **please [check out the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) and consider funding us.** +If you want to help drive sustainable open-source development **please [check out the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) and consider funding us.** --- From 0782640415e665caef7b76b349a7d1e59dec25df Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 18 Jul 2014 13:19:28 +0100 Subject: [PATCH 0619/1652] Kickstarter announcement --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index da5f27aef..0f81f3ae4 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,16 @@ **Note**: Full documentation for the project is available at [http://www.django-rest-framework.org][docs]. +--- + +#### Django REST framework 3 - Kickstarter announcement! + +We are currently running a Kickstarter campaign to help fund the development of Django REST framework 3. + +If you want to help drive sustainable open-source development **please [check out the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) and consider funding us.** + +--- + # Overview Django REST framework is a powerful and flexible toolkit that makes it easy to build Web APIs. From d059b6d6c391099ded2abd8fa0cf06821f971a5e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 18 Jul 2014 13:20:03 +0100 Subject: [PATCH 0620/1652] Change positioning of announcement. --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0f81f3ae4..1d7eefcff 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,3 @@ -# Django REST framework - -[![build-status-image]][travis] - -**Awesome web-browseable Web APIs.** - -**Note**: Full documentation for the project is available at [http://www.django-rest-framework.org][docs]. - --- #### Django REST framework 3 - Kickstarter announcement! @@ -16,6 +8,14 @@ If you want to help drive sustainable open-source development **please [check ou --- +# Django REST framework + +[![build-status-image]][travis] + +**Awesome web-browseable Web APIs.** + +**Note**: Full documentation for the project is available at [http://www.django-rest-framework.org][docs]. + # Overview Django REST framework is a powerful and flexible toolkit that makes it easy to build Web APIs. From 30bf55bf8da2be8ae0228c8d0dee3a523ae5eba5 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 18 Jul 2014 13:20:55 +0100 Subject: [PATCH 0621/1652] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d7eefcff..e58ec8ae5 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ We are currently running a Kickstarter campaign to help fund the development of Django REST framework 3. -If you want to help drive sustainable open-source development **please [check out the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) and consider funding us.** +If you want to help drive sustainable open-source development forward **please [cconsider funding the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3).** --- From 591e67f5405d6a8f59b2e52b1050752faa906c52 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 18 Jul 2014 13:21:03 +0100 Subject: [PATCH 0622/1652] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e58ec8ae5..a1bfa91df 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ We are currently running a Kickstarter campaign to help fund the development of Django REST framework 3. -If you want to help drive sustainable open-source development forward **please [cconsider funding the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3).** +If you want to help drive sustainable open-source development forward **please [consider funding the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3).** --- From bf7371fbc5a05b359cee03b8cbadd8229e563070 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 18 Jul 2014 13:21:19 +0100 Subject: [PATCH 0623/1652] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a1bfa91df..e0d421c00 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ We are currently running a Kickstarter campaign to help fund the development of Django REST framework 3. -If you want to help drive sustainable open-source development forward **please [consider funding the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3).** +If you want to help drive sustainable open-source development forward **please consider funding [the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3).** --- From 08772799d466907a16f02aec990396736be3c022 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 18 Jul 2014 13:22:29 +0100 Subject: [PATCH 0624/1652] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e0d421c00..eea002b4a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ We are currently running a Kickstarter campaign to help fund the development of Django REST framework 3. -If you want to help drive sustainable open-source development forward **please consider funding [the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3).** +If you want to help drive sustainable open-source development forward, then **please check out [the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) and consider funding us.** --- From 81d15aa9be72ac8b805fc728bd86f930ff1b17e7 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sun, 20 Jul 2014 15:45:45 +0100 Subject: [PATCH 0625/1652] Add link to drf-extra-fields. Closes #1698 --- docs/api-guide/fields.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 58dbf977e..cebfaac92 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -357,9 +357,16 @@ The following third party packages are also available. The [drf-compound-fields][drf-compound-fields] package provides "compound" serializer fields, such as lists of simple values, which can be described by other fields rather than serializers with the `many=True` option. Also provided are fields for typed dictionaries and values that can be either a specific type or a list of items of that type. +## DRF Extra Fields + +The [drf-extra-fields][drf-extra-fields] package provides extra serializer fields for REST framework, including `Base64ImageField` and `PointField` classes. + + + [cite]: https://docs.djangoproject.com/en/dev/ref/forms/api/#django.forms.Form.cleaned_data [FILE_UPLOAD_HANDLERS]: https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-FILE_UPLOAD_HANDLERS [ecma262]: http://ecma-international.org/ecma-262/5.1/#sec-15.9.1.15 [strftime]: http://docs.python.org/2/library/datetime.html#strftime-and-strptime-behavior [iso8601]: http://www.w3.org/TR/NOTE-datetime [drf-compound-fields]: http://drf-compound-fields.readthedocs.org +[drf-extra-fields]: https://github.com/Hipo/drf-extra-fields \ No newline at end of file From 05882cc5999088ac232788ae62717c061e74ad12 Mon Sep 17 00:00:00 2001 From: Ron Cohen Date: Fri, 25 Jul 2014 10:55:53 +0000 Subject: [PATCH 0626/1652] Sending "Bearer" and "Bearer " resulted in a 500. --- rest_framework/authentication.py | 14 +++++++------- rest_framework/tests/test_authentication.py | 9 +++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index da9ca510e..887ef5d73 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -310,6 +310,13 @@ class OAuth2Authentication(BaseAuthentication): auth = get_authorization_header(request).split() + if len(auth) == 1: + msg = 'Invalid bearer header. No credentials provided.' + raise exceptions.AuthenticationFailed(msg) + elif len(auth) > 2: + msg = 'Invalid bearer header. Token string should not contain spaces.' + raise exceptions.AuthenticationFailed(msg) + if auth and auth[0].lower() == b'bearer': access_token = auth[1] elif 'access_token' in request.POST: @@ -319,13 +326,6 @@ class OAuth2Authentication(BaseAuthentication): else: return None - if len(auth) == 1: - msg = 'Invalid bearer header. No credentials provided.' - raise exceptions.AuthenticationFailed(msg) - elif len(auth) > 2: - msg = 'Invalid bearer header. Token string should not contain spaces.' - raise exceptions.AuthenticationFailed(msg) - return self.authenticate_credentials(request, access_token) def authenticate_credentials(self, request, access_token): diff --git a/rest_framework/tests/test_authentication.py b/rest_framework/tests/test_authentication.py index a1c43d9ce..cf8415ed6 100644 --- a/rest_framework/tests/test_authentication.py +++ b/rest_framework/tests/test_authentication.py @@ -549,6 +549,15 @@ class OAuth2Tests(TestCase): response = self.csrf_client.get('/oauth2-test/', HTTP_AUTHORIZATION=auth) self.assertEqual(response.status_code, 401) + @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') + def test_get_form_with_wrong_authorization_header_token_missing(self): + """Ensure that a wrong token lead to the correct HTTP error status code""" + auth = "Bearer" + response = self.csrf_client.get('/oauth2-test/', {}, HTTP_AUTHORIZATION=auth) + self.assertEqual(response.status_code, 401) + response = self.csrf_client.get('/oauth2-test/', HTTP_AUTHORIZATION=auth) + self.assertEqual(response.status_code, 401) + @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') def test_get_form_passing_auth(self): """Ensure GETing form over OAuth with correct client credentials succeed""" From e3aff6a5678d48a2e328c9bb44b7c3de81caffd5 Mon Sep 17 00:00:00 2001 From: Ron Cohen Date: Fri, 25 Jul 2014 13:38:42 +0000 Subject: [PATCH 0627/1652] Updated test docstring related to missing bearer token. --- rest_framework/tests/test_authentication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/tests/test_authentication.py b/rest_framework/tests/test_authentication.py index cf8415ed6..34bf29101 100644 --- a/rest_framework/tests/test_authentication.py +++ b/rest_framework/tests/test_authentication.py @@ -551,7 +551,7 @@ class OAuth2Tests(TestCase): @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') def test_get_form_with_wrong_authorization_header_token_missing(self): - """Ensure that a wrong token lead to the correct HTTP error status code""" + """Ensure that a missing token lead to the correct HTTP error status code""" auth = "Bearer" response = self.csrf_client.get('/oauth2-test/', {}, HTTP_AUTHORIZATION=auth) self.assertEqual(response.status_code, 401) From 48b02f016a827bc254aba2aedb81b472189c2165 Mon Sep 17 00:00:00 2001 From: Kyle Valade Date: Sun, 27 Jul 2014 14:01:43 -0700 Subject: [PATCH 0628/1652] Issue #1707: Add documentation to api-docs.viewsets notifying users that they should use the get_queryset() method when overriding a ModelViewSet method, such as list(). Otherwise, since queryset is a static property, the value will be cached for every instance of that ViewSet. --- docs/api-guide/viewsets.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 23b16575f..774e11b76 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -70,6 +70,21 @@ There are two main advantages of using a `ViewSet` class over using a `View` cla Both of these come with a trade-off. Using regular views and URL confs is more explicit and gives you more control. ViewSets are helpful if you want to get up and running quickly, or when you have a large API and you want to enforce a consistent URL configuration throughout. +## Overriding ModelViewSet Methods + +Overriding the ModelViewSet is the same as overriding anything else, except you will need to remember to clone `self.queryset` before you use it, which you can do by using the built-in `get_queryset` method. For example: + + class UserViewSet(viewsets.ModelViewSet): + """ + A viewset for viewing and editing user instances. + """ + queryset = User.objects.all() + + def list(self, request): + queryset = self.get_queryset() + serializer = UserSerializer(queryset, many=True) + return Response(serializer.data) + ## Marking extra methods for routing The default routers included with REST framework will provide routes for a standard set of create/retrieve/update/destroy style operations, as shown below: @@ -142,7 +157,7 @@ The `@action` decorator will route `POST` requests by default, but may also acce @action(methods=['POST', 'DELETE']) def unset_password(self, request, pk=None): ... - + The two new actions will then be available at the urls `^users/{pk}/set_password/$` and `^users/{pk}/unset_password/$` From fe048dc4fbf064b11d7247061c931bb1038cc774 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 28 Jul 2014 07:37:30 +0200 Subject: [PATCH 0629/1652] Fix #1712 (issue when django-guardian is installed but not configured/used) --- rest_framework/compat.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index fdf12448a..9ad8b0d28 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -48,12 +48,15 @@ try: except ImportError: django_filters = None -# guardian is optional -try: - import guardian - import guardian.shortcuts # Fixes #1624 -except ImportError: - guardian = None +# Django-guardian is optional. Import only if guardian is in INSTALLED_APPS +# Fixes (#1712). We keep the try/except for the test suite. +guardian = None +if 'guardian' in settings.INSTALLED_APPS: + try: + import guardian + import guardian.shortcuts # Fixes #1624 + except ImportError: + pass # cStringIO only if it's available, otherwise StringIO From 5429c2800e263d27094ffa814589674b1b02d4f6 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 28 Jul 2014 08:00:50 +0200 Subject: [PATCH 0630/1652] Django-guardian version cleanup. --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2da9e816..7f1fda837 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ python: - "3.4" env: - - DJANGO="https://www.djangoproject.com/download/1.7.b4/tarball/" + - DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" - DJANGO="django==1.6.5" - DJANGO="django==1.5.8" - DJANGO="django==1.4.13" @@ -16,15 +16,13 @@ env: install: - pip install $DJANGO - - pip install defusedxml==0.3 Pillow==2.3.0 + - pip install defusedxml==0.3 Pillow==2.3.0 django-guardian==1.2.3 - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.2.4; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-guardian==1.1.1; fi" - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi" - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} == '3' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi" - - "if [[ ${DJANGO} == 'https://www.djangoproject.com/download/1.7.b4/tarball/' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi" + - "if [[ ${DJANGO} == 'https://www.djangoproject.com/download/1.7c2/tarball/' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi" - export PYTHONPATH=. script: @@ -33,7 +31,7 @@ script: matrix: exclude: - python: "2.6" - env: DJANGO="https://www.djangoproject.com/download/1.7.b4/tarball/" + env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" - python: "3.2" env: DJANGO="django==1.4.13" - python: "3.2" From 921e4ed2ee11edffd19d2ca40f10d47d2c148ea1 Mon Sep 17 00:00:00 2001 From: Paul Oswald Date: Mon, 28 Jul 2014 16:59:55 +0900 Subject: [PATCH 0631/1652] Evaluate content before passing to regex.sub Issue #1708 --- rest_framework/tests/test_description.py | 22 ++++++++++++++++++++++ rest_framework/utils/formatting.py | 4 +--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/rest_framework/tests/test_description.py b/rest_framework/tests/test_description.py index 4c03c1ded..52fa55fb8 100644 --- a/rest_framework/tests/test_description.py +++ b/rest_framework/tests/test_description.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals from django.test import TestCase +from django.utils.encoding import python_2_unicode_compatible from rest_framework.compat import apply_markdown, smart_text from rest_framework.views import APIView from rest_framework.tests.description import ViewWithNonASCIICharactersInDocstring @@ -98,6 +99,27 @@ class TestViewNamesAndDescriptions(TestCase): pass self.assertEqual(MockView().get_view_description(), '') + def test_view_description_can_be_promise(self): + """ + Ensure a view may have a docstring that is actually a lazily evaluated + class that can be converted to a string. + + See: https://github.com/tomchristie/django-rest-framework/issues/1708 + """ + # use a mock object instead of gettext_lazy to ensure that we can't end + # up with a test case string in our l10n catalog + @python_2_unicode_compatible + class MockLazyStr(object): + def __init__(self, string): + self.s = string + def __str__(self): + return self.s + + class MockView(APIView): + __doc__ = MockLazyStr("a gettext string") + + self.assertEqual(MockView().get_view_description(), 'a gettext string') + def test_markdown(self): """ Ensure markdown to HTML works as expected. diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index 4b59ba840..12b79b6cd 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -6,8 +6,6 @@ from __future__ import unicode_literals from django.utils.html import escape from django.utils.safestring import mark_safe from rest_framework.compat import apply_markdown -from rest_framework.settings import api_settings -from textwrap import dedent import re @@ -36,7 +34,7 @@ def dedent(content): # unindent the content if needed if whitespace_counts: whitespace_pattern = '^' + (' ' * min(whitespace_counts)) - content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) + content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', unicode(content)) return content.strip() From 0cbdbd24e57fbe58b90d77e454594a49a5f357b8 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Mon, 28 Jul 2014 13:54:43 +0200 Subject: [PATCH 0632/1652] Updated the tox file. --- tox.ini | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tox.ini b/tox.ini index 279f79cc4..72d156f9b 100644 --- a/tox.ini +++ b/tox.ini @@ -12,34 +12,34 @@ commands = {envpython} rest_framework/runtests/runtests.py [testenv:py3.4-django1.7] basepython = python3.4 -deps = https://www.djangoproject.com/download/1.7b2/tarball/ +deps = https://www.djangoproject.com/download/1.7c2/tarball/ django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 [testenv:py3.3-django1.7] basepython = python3.3 -deps = https://www.djangoproject.com/download/1.7b2/tarball/ +deps = https://www.djangoproject.com/download/1.7c2/tarball/ django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 [testenv:py3.2-django1.7] basepython = python3.2 -deps = https://www.djangoproject.com/download/1.7b2/tarball/ +deps = https://www.djangoproject.com/download/1.7c2/tarball/ django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 [testenv:py2.7-django1.7] basepython = python2.7 -deps = https://www.djangoproject.com/download/1.7b2/tarball/ +deps = https://www.djangoproject.com/download/1.7c2/tarball/ django-filter==0.7 defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.4 - django-guardian==1.1.1 + # django-oauth-plus==2.2.1 + # oauth2==1.5.211 + # django-oauth2-provider==0.2.4 + django-guardian==1.2.3 Pillow==2.3.0 [testenv:py3.4-django1.6] @@ -71,7 +71,7 @@ deps = Django==1.6.3 django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.4 - django-guardian==1.1.1 + django-guardian==1.2.3 Pillow==2.3.0 [testenv:py2.6-django1.6] @@ -82,7 +82,7 @@ deps = Django==1.6.3 django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.4 - django-guardian==1.1.1 + django-guardian==1.2.3 Pillow==2.3.0 [testenv:py3.4-django1.5] @@ -114,7 +114,7 @@ deps = django==1.5.6 django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 - django-guardian==1.1.1 + django-guardian==1.2.3 Pillow==2.3.0 [testenv:py2.6-django1.5] @@ -125,7 +125,7 @@ deps = django==1.5.6 django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 - django-guardian==1.1.1 + django-guardian==1.2.3 Pillow==2.3.0 [testenv:py2.7-django1.4] @@ -136,7 +136,7 @@ deps = django==1.4.11 django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 - django-guardian==1.1.1 + django-guardian==1.2.3 Pillow==2.3.0 [testenv:py2.6-django1.4] @@ -147,7 +147,7 @@ deps = django==1.4.11 django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 - django-guardian==1.1.1 + django-guardian==1.2.3 Pillow==2.3.0 [testenv:py2.7-django1.3] @@ -158,7 +158,7 @@ deps = django==1.3.5 django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 - django-guardian==1.1.1 + django-guardian==1.2.3 Pillow==2.3.0 [testenv:py2.6-django1.3] @@ -169,5 +169,5 @@ deps = django==1.3.5 django-oauth-plus==2.2.1 oauth2==1.5.211 django-oauth2-provider==0.2.3 - django-guardian==1.1.1 + django-guardian==1.2.3 Pillow==2.3.0 From e40ffd60d44d736d7e27ff454cba1905f0becc26 Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 28 Jul 2014 10:11:40 -0700 Subject: [PATCH 0633/1652] Issue #1707 - Add documentation about the caching of `GenericAPIView.queryset` to the `queryset` property, `get_queryset()`, and do generic-views.md; remove changes to the viewsets.md documentation from my last commit. --- docs/api-guide/generic-views.md | 8 +++++++- docs/api-guide/viewsets.md | 15 --------------- rest_framework/generics.py | 8 ++++++++ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 7d06f246c..b76c18cf5 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -43,6 +43,12 @@ For more complex cases you might also want to override various methods on the vi return 20 return 100 + def list(self, request): + # Note the use of `get_queryset()` instead of `self.queryset` + queryset = self.get_queryset() + serializer = UserSerializer(queryset, many=True) + return Response(serializer.data) + For very simple cases you might want to pass through any class attributes using the `.as_view()` method. For example, your URLconf might include something the following entry. url(r'^/users/', ListCreateAPIView.as_view(model=User), name='user-list') @@ -63,7 +69,7 @@ Each of the concrete generic views provided is built by combining `GenericAPIVie The following attributes control the basic view behavior. -* `queryset` - The queryset that should be used for returning objects from this view. Typically, you must either set this attribute, or override the `get_queryset()` method. +* `queryset` - The queryset that should be used for returning objects from this view. Typically, you must either set this attribute, or override the `get_queryset()` method. If you are overriding a view method, it is important that you call `get_queryset()` instead of accessing this property directly, as `queryset` will get evaluated once, and those results will be cached for all subsequent requests. * `serializer_class` - The serializer class that should be used for validating and deserializing input, and for serializing output. Typically, you must either set this attribute, or override the `get_serializer_class()` method. * `lookup_field` - The model field that should be used to for performing object lookup of individual model instances. Defaults to `'pk'`. Note that when using hyperlinked APIs you'll need to ensure that *both* the API views *and* the serializer classes set the lookup fields if you need to use a custom value. * `lookup_url_kwarg` - The URL keyword argument that should be used for object lookup. The URL conf should include a keyword argument corresponding to this value. If unset this defaults to using the same value as `lookup_field`. diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 774e11b76..4f345abba 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -70,21 +70,6 @@ There are two main advantages of using a `ViewSet` class over using a `View` cla Both of these come with a trade-off. Using regular views and URL confs is more explicit and gives you more control. ViewSets are helpful if you want to get up and running quickly, or when you have a large API and you want to enforce a consistent URL configuration throughout. -## Overriding ModelViewSet Methods - -Overriding the ModelViewSet is the same as overriding anything else, except you will need to remember to clone `self.queryset` before you use it, which you can do by using the built-in `get_queryset` method. For example: - - class UserViewSet(viewsets.ModelViewSet): - """ - A viewset for viewing and editing user instances. - """ - queryset = User.objects.all() - - def list(self, request): - queryset = self.get_queryset() - serializer = UserSerializer(queryset, many=True) - return Response(serializer.data) - ## Marking extra methods for routing The default routers included with REST framework will provide routes for a standard set of create/retrieve/update/destroy style operations, as shown below: diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 7bac510f7..65ccd9521 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -43,6 +43,10 @@ class GenericAPIView(views.APIView): # You'll need to either set these attributes, # or override `get_queryset()`/`get_serializer_class()`. + # If you are overriding a view method, it is important that you call + # `get_queryset()` instead of accessing the `queryset` property directly, + # as `queryset` will get evaluated only once, and those results are cached + # for all subsequent requests. queryset = None serializer_class = None @@ -256,6 +260,10 @@ class GenericAPIView(views.APIView): This must be an iterable, and may be a queryset. Defaults to using `self.queryset`. + This method should always be used rather than accessing `self.queryset` + directly, as `self.queryset` gets evaluated only once, and those results + are cached for all subsequent requests. + You may want to override this if you need to provide different querysets depending on the incoming request. From fc8eb76c2259ea64a19876f040db4d93e834d39d Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 28 Jul 2014 10:19:42 -0700 Subject: [PATCH 0634/1652] Issue #1707 - Add info about queryset property caching to get_queryset() docs. Add documentation to the get_queryset() method of generic-views.md regarding the caching of the queryset property. --- docs/api-guide/generic-views.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index b76c18cf5..43c5782f4 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -99,6 +99,8 @@ The following attributes are used to control pagination when used with list view Returns the queryset that should be used for list views, and that should be used as the base for lookups in detail views. Defaults to returning the queryset specified by the `queryset` attribute, or the default queryset for the model if the `model` shortcut is being used. +This method should always be used rather than accessing `self.queryset` directly, as `self.queryset` gets evaluated only once, and those results are cached for all subsequent requests. + May be overridden to provide dynamic behavior such as returning a queryset that is specific to the user making the request. For example: From 4210fedd211eaff80d139a4967577621282f520b Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 29 Jul 2014 08:35:00 +0200 Subject: [PATCH 0635/1652] Fixed the cache issue with Django 1.7 rc* --- rest_framework/response.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rest_framework/response.py b/rest_framework/response.py index 1dc6abcf6..77cbb07cd 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -15,6 +15,7 @@ class Response(SimpleTemplateResponse): An HttpResponse that allows its data to be rendered into arbitrary media types. """ + rendering_attrs = SimpleTemplateResponse.rendering_attrs + ['_closable_objects'] def __init__(self, data=None, status=200, template_name=None, headers=None, From 59d0a0387d907260ef8f91bbbca618831abd75a3 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 29 Jul 2014 10:20:10 +0200 Subject: [PATCH 0636/1652] Fixed the Django 1.3 compat --- rest_framework/response.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rest_framework/response.py b/rest_framework/response.py index 77cbb07cd..3928ca911 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -5,6 +5,7 @@ it is initialized with unrendered data, instead of a pre-rendered string. The appropriate renderer is called during Django's template response rendering. """ from __future__ import unicode_literals +import django from django.core.handlers.wsgi import STATUS_CODE_TEXT from django.template.response import SimpleTemplateResponse from rest_framework.compat import six @@ -15,7 +16,9 @@ class Response(SimpleTemplateResponse): An HttpResponse that allows its data to be rendered into arbitrary media types. """ - rendering_attrs = SimpleTemplateResponse.rendering_attrs + ['_closable_objects'] + # TODO: remove that once Django 1.3 isn't supported + if django.VERSION > (1, 3): + rendering_attrs = SimpleTemplateResponse.rendering_attrs + ['_closable_objects'] def __init__(self, data=None, status=200, template_name=None, headers=None, From 5e02f015b81bd743f6ee78f8414eca4e93eaab82 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 29 Jul 2014 10:30:08 +0200 Subject: [PATCH 0637/1652] Better fix for the Django 1.3 compat --- rest_framework/response.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/response.py b/rest_framework/response.py index 3928ca911..5c02ea508 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -17,7 +17,7 @@ class Response(SimpleTemplateResponse): arbitrary media types. """ # TODO: remove that once Django 1.3 isn't supported - if django.VERSION > (1, 3): + if django.VERSION >= (1, 4): rendering_attrs = SimpleTemplateResponse.rendering_attrs + ['_closable_objects'] def __init__(self, data=None, status=200, From 66fa40c300b4d3e768b4a7993f020056c44fdda3 Mon Sep 17 00:00:00 2001 From: Paul Oswald Date: Tue, 29 Jul 2014 22:13:11 +0900 Subject: [PATCH 0638/1652] evaluate content at function start --- rest_framework/utils/formatting.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index 12b79b6cd..2b3cbc957 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -28,13 +28,14 @@ def dedent(content): as it fails to dedent multiline docstrings that include unindented text on the initial line. """ + content = unicode(content) whitespace_counts = [len(line) - len(line.lstrip(' ')) for line in content.splitlines()[1:] if line.lstrip()] # unindent the content if needed if whitespace_counts: whitespace_pattern = '^' + (' ' * min(whitespace_counts)) - content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', unicode(content)) + content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) return content.strip() From 57d6e04ff5512f11594e29bf49c47b610594666c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 30 Jul 2014 12:50:36 +0100 Subject: [PATCH 0639/1652] Add django-rest-framework-mongoengine link. Closes #1722 Closes #1562 Closes #1545 --- docs/api-guide/serializers.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index cedf1ff7b..72568e53d 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -580,7 +580,16 @@ The following custom model serializer could be used as a base class for model se def get_pk_field(self, model_field): return None +--- +# Third party packages + +The following third party packages are also available. + +## MongoengineModelSerializer + +The [django-rest-framework-mongoengine][mongoengine] package provides a `MongoEngineModelSerializer` serializer class that supports using MongoDB as the storage layer for Django REST framework. [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion [relations]: relations.md +[mongoengine]: https://github.com/umutbozkurt/django-rest-framework-mongoengine From 80444165230f019b09d7f19d31c49fbdd68b744d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 31 Jul 2014 20:19:28 +0100 Subject: [PATCH 0640/1652] Add platinum sponsors --- docs/css/default.css | 31 ++++++++++++++++++ docs/img/sponsors/0-eventbrite.png | Bin 0 -> 22429 bytes docs/img/sponsors/1-cyan.png | Bin 0 -> 6121 bytes docs/img/sponsors/1-divio.png | Bin 0 -> 4864 bytes docs/img/sponsors/1-kuwaitnet.png | Bin 0 -> 15489 bytes docs/img/sponsors/1-lulu.png | Bin 0 -> 18013 bytes docs/img/sponsors/1-potato.png | Bin 0 -> 12190 bytes docs/img/sponsors/1-purplebit.png | Bin 0 -> 9161 bytes docs/img/sponsors/1-runscope.png | Bin 0 -> 10913 bytes docs/img/sponsors/1-simple-energy.png | Bin 0 -> 54455 bytes docs/img/sponsors/1-vokal_interactive.png | Bin 0 -> 12532 bytes docs/img/sponsors/1-wiredrive.png | Bin 0 -> 8082 bytes docs/img/sponsors/2-byte.png | Bin 0 -> 13690 bytes docs/img/sponsors/2-crate.png | Bin 0 -> 8257 bytes docs/img/sponsors/2-heroku.png | Bin 0 -> 7337 bytes docs/img/sponsors/2-hipflask.png | Bin 0 -> 6016 bytes docs/img/sponsors/2-hipo.png | Bin 0 -> 8111 bytes docs/img/sponsors/2-koordinates.png | Bin 0 -> 1934 bytes docs/img/sponsors/2-laterpay.png | Bin 0 -> 2003 bytes docs/img/sponsors/2-lightning_kite.png | Bin 0 -> 6715 bytes docs/img/sponsors/2-mirus_research.png | Bin 0 -> 12414 bytes docs/img/sponsors/2-opbeat.png | Bin 0 -> 11603 bytes docs/img/sponsors/2-schuberg_philis.png | Bin 0 -> 21870 bytes docs/img/sponsors/2-vinta.png | Bin 0 -> 9918 bytes docs/img/sponsors/3-blimp.png | Bin 0 -> 6241 bytes docs/img/sponsors/3-gizmag.png | Bin 0 -> 5370 bytes docs/img/sponsors/3-imt_computer_services.png | Bin 0 -> 70397 bytes docs/img/sponsors/3-infinite_code.png | Bin 0 -> 21786 bytes docs/img/sponsors/3-life_the_game.png | Bin 0 -> 5485 bytes docs/img/sponsors/3-pkgfarm.png | Bin 0 -> 2275 bytes docs/img/sponsors/3-providenz.png | Bin 0 -> 12580 bytes docs/img/sponsors/3-shippo.png | Bin 0 -> 7345 bytes docs/img/sponsors/3-thermondo-gmbh.png | Bin 0 -> 20046 bytes docs/img/sponsors/3-tivix.png | Bin 0 -> 4091 bytes docs/img/sponsors/3-triggered_messaging.png | Bin 0 -> 10509 bytes docs/img/sponsors/3-wildfish.png | Bin 0 -> 4137 bytes docs/topics/kickstarter-announcement.md | 29 ++++++++++++++++ 37 files changed, 60 insertions(+) create mode 100644 docs/img/sponsors/0-eventbrite.png create mode 100644 docs/img/sponsors/1-cyan.png create mode 100644 docs/img/sponsors/1-divio.png create mode 100644 docs/img/sponsors/1-kuwaitnet.png create mode 100644 docs/img/sponsors/1-lulu.png create mode 100644 docs/img/sponsors/1-potato.png create mode 100644 docs/img/sponsors/1-purplebit.png create mode 100644 docs/img/sponsors/1-runscope.png create mode 100644 docs/img/sponsors/1-simple-energy.png create mode 100644 docs/img/sponsors/1-vokal_interactive.png create mode 100644 docs/img/sponsors/1-wiredrive.png create mode 100644 docs/img/sponsors/2-byte.png create mode 100644 docs/img/sponsors/2-crate.png create mode 100644 docs/img/sponsors/2-heroku.png create mode 100644 docs/img/sponsors/2-hipflask.png create mode 100644 docs/img/sponsors/2-hipo.png create mode 100644 docs/img/sponsors/2-koordinates.png create mode 100644 docs/img/sponsors/2-laterpay.png create mode 100644 docs/img/sponsors/2-lightning_kite.png create mode 100644 docs/img/sponsors/2-mirus_research.png create mode 100644 docs/img/sponsors/2-opbeat.png create mode 100644 docs/img/sponsors/2-schuberg_philis.png create mode 100644 docs/img/sponsors/2-vinta.png create mode 100644 docs/img/sponsors/3-blimp.png create mode 100644 docs/img/sponsors/3-gizmag.png create mode 100644 docs/img/sponsors/3-imt_computer_services.png create mode 100644 docs/img/sponsors/3-infinite_code.png create mode 100644 docs/img/sponsors/3-life_the_game.png create mode 100644 docs/img/sponsors/3-pkgfarm.png create mode 100644 docs/img/sponsors/3-providenz.png create mode 100644 docs/img/sponsors/3-shippo.png create mode 100644 docs/img/sponsors/3-thermondo-gmbh.png create mode 100644 docs/img/sponsors/3-tivix.png create mode 100644 docs/img/sponsors/3-triggered_messaging.png create mode 100644 docs/img/sponsors/3-wildfish.png diff --git a/docs/css/default.css b/docs/css/default.css index af6a9cc03..090d42a62 100644 --- a/docs/css/default.css +++ b/docs/css/default.css @@ -307,3 +307,34 @@ table { .side-nav { overflow-y: scroll; } + + +ul.sponsor.diamond li a { + float: left; + width: 600px; + height: 20px; + text-align: center; + margin: 10px 40px; + padding: 300px 0 0 0; + background-position: 0 50%; + background-size: 600px auto; + background-repeat: no-repeat; + font-size: 150%; +} + +ul.sponsor.platinum li a { + float: left; + width: 300px; + height: 20px; + text-align: center; + margin: 10px 40px; + padding: 300px 0 0 0; + background-position: 0 50%; + background-size: 280px auto; + background-repeat: no-repeat; + font-size: 150%; +} + +ul.sponsor { + list-style: none; +} diff --git a/docs/img/sponsors/0-eventbrite.png b/docs/img/sponsors/0-eventbrite.png new file mode 100644 index 0000000000000000000000000000000000000000..6c7392936e88fcc292012c91bf5dccfe0cc38cdc GIT binary patch literal 22429 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/1-kuwaitnet.png b/docs/img/sponsors/1-kuwaitnet.png new file mode 100644 index 0000000000000000000000000000000000000000..8b2d0550a5cb17513986fbf424ad2542d02c04f7 GIT binary patch literal 15489 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/1-lulu.png b/docs/img/sponsors/1-lulu.png new file mode 100644 index 0000000000000000000000000000000000000000..8a28bfa9f42e452539e42d685e5867ba9e57bbd9 GIT binary patch literal 18013 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 |W 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 P2flc^`njxgN@xNA`=#+J literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/1-potato.png b/docs/img/sponsors/1-potato.png new file mode 100644 index 0000000000000000000000000000000000000000..ad38abdd2c3c56c0fc369951fcf6f7894ee0e0d0 GIT binary patch literal 12190 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/1-runscope.png b/docs/img/sponsors/1-runscope.png new file mode 100644 index 0000000000000000000000000000000000000000..d80a4b85b8d48c50f15113b5b869972e5e43bc7e GIT binary patch literal 10913 zcmeHtS5s5(7w!f`5a~#-Mg;|FDkv?829aJv30;sDnjpQZKOuAxY0?Cw1ws$KDH0Hn zNC~|O(yN4k5X#xkoXc}@KEOXSnau3mB6gv9%RAD29znt21jWww8B3gBZV7XSzW>M#`}|IDqKfK0yUS<1Wk!;;Vwqs6YpnP1 zouQnO6r^)sI!Oyqe<);Mz8%=suG}Q->wrc#ub=|viJ`5_37^Z0j{m+ScqbQ&qEHq# zXVcU|5Epi;7*yt$4hY0isuI=1O@ABWb@6|X{#S|rS5G8Pu+gk-ZCPgaEtRt-E*kla zoyX9YVFkrg`#3kFyqFWG4tm&Aq?d(&NSO%uo5cedH>xKj=z1j#Mlt?hSJka2uzNF^ zl%;w%T{m}jn3hYWoR5!>vw1IksX6#og>u@tSK6_@wkG#U@217YdB@R7G4N|f4f8o- zi>Glx%-^>2UM*p7rEuQYLJtgK_7dc4ko)S7S`G4qXyYk%%~<5L;6^rv!Bsd zfimlMXtUc?U8r4uA})=D4*UX37J#Yg1J*x+S^8dkf1A_5=-tK zM1LHqM?w=)&9E+nk6OYtlL&Ju+&+cBeE1TOeeu)fjyqb-2sq&d%LJp1SUA~;6fZ@; z!zUmhA^9>rD!Xiw=VQ%_MI3#2J4<4`@9XkpD_YF9q|2?_7gTmRfb$8js}A1}PuT%? zmc*g}D~oH6!4q-Pz&n~+wbj~oU5#jW*2EwTmff!37Z8QW!M85{WSZv&Mx&oP)@qB9vyBLTA2bRo zYF|>;e88`eW2LD8FJe`D#Mn|30&|ei+1cqg&>b3;O^0AC6QYG)1J9gQ7~RCyL4fRG zzJLGDE9)^E95yL?dU_h;f?YNS8|#&|wtf;U2tp zX91p`yCyZa^uof>k1sP# zQ*M%>jH80y&wLI+-ms83d>ypY>eqccMt%Q7rC25GTi*)Ngv(CHiHnkIqyjilpH?}& z?1$uvD7p>1YzoZ@OI`^$XPoa4R@qf!nW+C2%pCEnFvIDm3NP8&>vY6 zPm2PN>%Dm0FiQW5*KN_Ov2R~rdJCF^&yi<0?r^uR9;q}S@KUq{=6>7&yOha@B!fQI zOB%(6@V>c9H*@(PoK!I{QTkfW%PhudOVin!Bf?gXpGyNz{iV- znf={@x7`_Tb7NzNckskB&W;7&UMEZ|8i8qZ=t~i|!?=&#+@eFS`_`J?c7J;7u`umx zq7kW6n-M#MAeU(r?9IFOs_z@UqX3XwcWWj#UyatyG8w}Ciq}h=ZEsXW)>k|Jg>xLo zYZWd&W%m$FiVCE;`3W24S#=v-7ChE-9)SJR7a=J=om5+qo0}{4M(8gJ72NVeJ}+NE zLE-RmE7eMiAz`Ex0>@DNMeUF`;-p0iK7=T<1jqvyIrLxC1Gmkpf1f{5Q=0?ZJf^3b zW5WV!D3R)+i6}bE^a|6}-F}wVABFS(SxHy?)|glFXWbevI2plh4bxgI4#Mrs;3rzLn$Bj%LI1x3{;;3p7)=*JUh93BusX{te!0 z|Kqc#s7rJ4;*+96mq|le_vtilZtgYLo1JV;;fp)Z1{w<%w?;L%7@ChBgtNVql9Hz@ z)xaVw+n@KPs4a}H$@vkb7Xqv~lPobAKo_}f0SD}fCzez;-j*;aW?W*As1~PCw)Jr$B%}F#x5ZlcX;|3PP$;% z?@dugS$TzYtB#r!k)Q^|qIx{OO0|e5eLr#W^sIFD>3j+P6!P<$iA7cWd=%d^jHLu5 zJ;E-I(%%%eT{SvejJ{v%EtZ2{Nqv4NebI>Y0ItMGQaLk(^V7{Ipqo@-?lL%wId{%n z@P|_&u^*L5P~BE*u$P;gU%XU>=2$z#%CV4k$UG+{BH?g?8tk_fFgD_X6^o3FJRjHL z29LoU7B7S2D@8|YDL7u9w}p#SHhd?x9*8&O* z){s@fEb)uc}fOa!j9$Cl!XpsNvr8hNnF@nFerJ+rkC@!EyULtcjXpDiwdso{hjPzkiy-RVXWkDE4&GJ$ zP0!*Suy>TWX`kUD z9y#xrXv3_GZgY4<_3ott63mHM@l7v1xUzJH{*AVs3XVi?*l!XLh?sZ+Kfeh%H!LMU zrSIJ{a<-6N6kTuHC@+ob3B9EdbUWimsF=Ii`9zm$B>^8(@5EtC4bWlYRa!Q=#Rg{g zA{u1!_HM*q{m`^|o3ZUDN7U0v&VV6e%a;0OxD1sL@8Q_`(SWVsiw!^E0c)`}+~?&> z3o%Go5n8jbkVfOkTokhM*4E#-CS?$8lgEGs8?~+DWpcL5FAm@pD)Z8OAb6GD`DO~y z9(Ut#<@a#G2-s`m1UCK+Ar`qGT;4`QXQ0L~fR*3H1slQW+%|&}QJJd&v$}L|zZUHs z1wYIAc5!z9u#c<86rK>@yQdG#{i{Sut~IP}lYCY%=)aHx3I_+fesRd24xr?gNo<37 zeOw6`(P@caG;d>wEeNOmHlFZ% zPVUN-85~w_Oz37k{M2O2NNviDMPR~@#rx?8J6191Ch_N-&WDHM1R1TFp&w&ss=p^n zO)5eQ(Pw%vMz^Bg$8g(NIi(zYyR37T5beRG&RryAXin#i-lDV-`{-nM-k(qE-D@w+cN4cIY(#z)nA2j1sZR$7B(#=K0f~e={I?-Htd;>MZp;^I(s_cVc^vqo6x?eLZ=>n_9f$TFq z6AhgIV_KT07cQb?Oc^claHP_+0ySbJ19*Nw`QNf0FOyyl0DO^`rrJWt8hB!MV)e}9 z(Mh7}?~8b%07=n99b-JD3m>B#r=8~lX!2(tc)Cq9{_|6NijqDT->uYftgd>Ow+BL{l0(kXzT#$JYRmk=OuZDu4Btj8R4;DkUW)%SS-K>HC-5zX*YkWQC1J^wIEn@r^pY;DrLC=vliRM1?vuiE&btEdGQQgz7rQ*m5)3~~)+msaIXRRC z*a1Jvzfb)9{Knqj(2O@AI41WkjSG9>iB{qeUERx9;H{$wa@*o^Y?n~NZf~&x3?l&l|j0$db@B++o5UK z3yQodu$Itl7i-=s#Ug;Xe!d85= z5h6bwVx{rwh(fdin&2`lmJjw}q!4X6OX7Wz5dui{`&13B1h0~HyX+O2tQt_$)<`dh zvY4gs4jpKOd?cy^t7~g(o2#o2uDf^L{8Vv^BPQyUzQ{k@L~HGcI`mpi4l6#ndMVG%P60amE}s(?5eC}l@1`6q@`pf+SlAu{y(Y~C41M|XX=(m zetCKMKvh*$ZCh-CaVdonsjXO1UGRXL6sCeD;? zl{}$4Ut)}LR_g~O5{B}p4u1VhqfRoP+WM*SHf`sw6d;0LZycQ*e;3yq7|49Vghu6^ zfAjA3QDZeVKniz~fu0@Qj8s1#NeYw;ucvH~r+qEBLOlAGdk5n6P@~{1Z6%;a;9k4; z%0Lk)QCr-^nLfzk6l0H>7U&08DwgCnCvQNuf*n(|J!UeNxp8R>Kh9v+eLpbh?VQ;~ zcP&ss-UqJDR8qixJIx*1(YQlBZGQ=r9$Z^^E**mx0Ul~`@Wd-KN6YE5iFPXDgGx}f z!_xcPX6%L3XaqkG4;qYC1VKR51i^_{Uy#gE-vo>U^N~lvZ63M3`}Wcg9{lyk7?Z`| znA*Lg3%<=wN+3>@g3?ypw)LAeoaGV*>mA@=ua+c+Pw6gKy({rKPV?goCq_nm#~jWn zV%Y=ho8r!ps}Ul3whhBl3&l+))kA=tjHHygc2|;Pt*mdOy}~+a$BkK%=Iu5ueC}*s zwe%S|2m`9JBD4q6u^o|v3&`E{eUEmDljbaT*{pbW<#+~{b|`6+o_#MOGIB?skV?^@ zgIJAHQa!&{wn%K-$*F$#JUE&a>1J-dTXN`87lsbp7^!&J#~wS#xm^n)!nm-@Dc}N0 z_jB?&VMP@!V0TaSrAf}uM;If0PZ*diT8?`^!`0N(bSdABv-#D}jOy+&LH0J5-=-X7$Lr)@=1|%}Ma4_a_2gIpO_T_^hUix8SVNz~p z2!4YB#MIC|*%z_W`A$xMVh8tTRE*|o-rQYV0!>Y(>#bEKh&rpz7&gv%HgzXNk zjUsT7M<+H<_Rrkt2z0Nb>x<_!^p$18S<^!pA`~b?pS6H7Q*J@>N}}{KsMFu0uEX0L zD1uw+>-{=iS28?)4iX52y;?zu=;NQ3qr<~QQha>;O36ABPP%T_PbbtUX>kQX6JhHw z9PX!k+KzJ7Z9Fx-PD-Z?y_-=DMy~uIyj{6e<6Z31$G(JaqQ8{T7~`HhMj1PSECrwJGam+LLd9$iJ@{C)uzZUuKccNf1>CCF#U7C{CZvkP=D-I zD98`-0y$AxG_^0v#L--Gn;eSgW;!uyMoWG`Y_aPpUCC1d((8G{r>mFvTO-sQ?xYU`7V=YzFu}=kSJ|oFOw%p= zV0CI#(`yT=`HzoscPWrtVg=A&v))5cPF&g|nM~%Cq36}W{N+eop-LnC9k7tN&tnN( zXCRw-&%dIPn5lC!A70TzyUcPW$!>g!{S!>I?TTh6Q$Ef3^2~H2>9S4$Evc!IJLfSA z3vw&8CjHc>$&&pI`j}vxfyjS!n>A6g+^Tg_*W6=+lZj_0a1bpRXVJ1Ai}8cUXZ487 zUBAqC8>jH>ciwDjg2f1V(DjnB)Vx&kS`zjsD3O?f#V~24& zFl{mcHAmgae}zxLZf8UDOhw)b#0SYMC^+t4Nw@~VYa$9s6IZvhw7E0BJJjG+LUgleZFEn!Wnzu$;&ZdZLid;*h4Vi7Jh zU%~9*KBej00HH(-1TB9sgyQPpGz{hA(ACn~JSH6~R+OQua^hBNPWwTLVNxTWg!(*l zX0M1xPI_Ls@C6F!pn~vu#FqA&nwkewcM7AHJv5PPEhT>h^|4PjKj;oJ;l%QZ=}9=T zGM?}-b+T6%I}8@DM-V)2Yj-Gr8?{J2+n@-hax*fb49EI91qZim$rZ1dH(Io@b{u9H zb(}x1q4S4pmwLa#%DxctfaWNJdCJV^;vmcS>LGQJ#@#WG;B11fS0TA80nN}U&^egG zHMPq_l~eF5hDF8~!$ASr8c1575s+Yw_~lcq%yrFq&SQ0BL$h_AIk86dv!rt)dbZkm zxX_mzQ-YPnhQVLH+MWCm_+`tM3rDihZOM?v{RL(TIx4Eylkh8k8&8|eU#IjfiNQ(H z#ue4!mXc?-5HD>oc6SwKk0F3VlqK?6WSsOIz^p*2s6Ik}j1TJkAdYrX{Y~|8R_=Zg zT2Qx{x@t83I`*p;R{pr{{607sXfC|AwzCt4xL0v-Sa8;!tS;7a{F*^j!pVXKoL&6 zrX}?B*md7Cx&q>W;I$b;f=K}JDF$oe9P-oOH9+-uD@X~1uVklVGWkB(ZEvNQ=Xl6| zKb+h^m#$~m&k%P=#-P??AHh#0;ivuu2I-_$A5clDz?E-8v~!fx^x}CjSjqH+3GTh4 zqW~8j<_kGj5)TV4Z-5DrPJuxbCfpjF8AZFwlFflACfcYIjt;5y#~8*Zrz-T?MUDD| zt9Jd9Yu6}0pN(W@EM`-4TTWOaBvSFt2Eu>a!a%QB+YnN`t~5H?o^}=rmgO8~@8UEt zay@V?x<@jh zjB$?O*jF%ia>k|gedIfI9}$t|Q#oA^Y(%;05%M#Ft%Qw84WAv~gJ++EORJZaJBULc z^RpbO3MU0LATSZdesxMuVW1-wLG^f3*cu!`irJ6#W-2w zxf+^F_5pxS?cXi{F=aKBWR54zTr!BO5*`j;Mj#K=?O_Oq0qz%7)=2xKWl`K$tIDsImv&gBl3iR;tlTBIVjN$sF zgly(Sp7n~(ypl0L7ju^HAdaj4X833nH8U|0@EuHSF0up!H0QEl+O=Q>Q+5bEfQRHgGsmN29W< z&vN9|%iGA;K||4B{0>g|d3fr9dRkNB&6cVjGPw|DL^zD@+2?-P{8eh2DM;NW4s_Sz z!%dZ13ip{9NFTLB2g5+U-li0ij&=btgL-sw@y7GzL5FTse2oP>fqJ){VZ#IzgqKOV z2=(FGT9R49qs8}LjlrsYyg&Y=F?6>g!LX?0+P#Q~h)^(TK%y* z+O-1#_j)~2o2MYxDI>z)Xn47Ouy(Jv%}dS57(Ia`FR`lbtZ<;;JO^r#k)LE&>Dtg55y5+ zvYSDQsy{X`0co&52xjWZtbWt8rF-aJw3Jp37ZKp7{j zr1_3|H!3?joBQ$OJjt0k=TqqgasImq4=wndnP@VU8bAla`vWQGxz(H16=0gw>Snrj zg$gW*WC}$Iw^%_}`*mWq(uH{pNbXIwJ~3SjU`SJqHtxT@>>blAQ=zuOm2gXS+KL^LdQJBg&Bf@s`PMc%tdL%_G{(wgI zc*-4f`t9%EzvNfKx^Xu-V*JqS8_PV1%eMkmJoE{M9C`TU5kaVYeBfKBA?rS{fN=;x zN3Lc`couV_quMvxe6k&$R}$_keYkt-eKa5g`7W^Rwead21_b2nYf z~k*^L>p!IB$~T z4l`VdjugE>x!zi-px^GrtEv>fL*;3XMVuZj|HyDW4S)YA_vdAsd^FSqo^usKMz6E7 zq+h5sgoBeV0hY#)XU`VuKsSnU^h>j>I?EyN9jtTH{i29xg6_$gKu*!u3i4FiZA# zuoLY1H;g5?5H_R6s`SCAGj%0kQs-tJpDCaRV!Am}5&%c4#8!IT}5V6LdD zn=C1!U;2?c1$$8Ww&@x;MkPprTp9@~&WtjwW4~IdngY*usRxL~lHwdOoOjAl*@#JZ zR(&|Q8I($J!P)^QG~rcm>B}Rc8(82WW8l4siHwMFH>;##9kfD@CbcmzF{M&uf}&5^ zF;mnFt zCH4|@>WEhby77ZPZ;;YOj=`i@^w|)C{32UN)yBSnJEwrUst&CDk1KThm#sB~S literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/1-simple-energy.png b/docs/img/sponsors/1-simple-energy.png new file mode 100644 index 0000000000000000000000000000000000000000..f59f7374c3573d1225018d7a542df9b60752382f GIT binary patch literal 54455 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/1-vokal_interactive.png b/docs/img/sponsors/1-vokal_interactive.png new file mode 100644 index 0000000000000000000000000000000000000000..f7811ecde69cd7f5227dc9c5638292bd57e50254 GIT binary patch literal 12532 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 AI{*Lx literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/1-wiredrive.png b/docs/img/sponsors/1-wiredrive.png new file mode 100644 index 0000000000000000000000000000000000000000..c9befefe41da41783f994f772050faa394fa36d6 GIT binary patch literal 8082 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

    9}0&eyQ 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/2-crate.png b/docs/img/sponsors/2-crate.png new file mode 100644 index 0000000000000000000000000000000000000000..6ef6b5da50e83c7686a28b701764a8475b17eaec GIT binary patch literal 8257 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/2-heroku.png b/docs/img/sponsors/2-heroku.png new file mode 100644 index 0000000000000000000000000000000000000000..22447659685c2e1cbcf7ee6e716d1cb3c3b83719 GIT binary patch literal 7337 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/2-hipflask.png b/docs/img/sponsors/2-hipflask.png new file mode 100644 index 0000000000000000000000000000000000000000..c74735c34d59e987c71d2c54d5870e2dfab3d6b6 GIT binary patch literal 6016 zcmcIoc|276`~M6=i>PEv49apXV~nwjvK3iwl%?!u>@yRS!B|F#Hq^aBmT+ApTM`no zWh+rBvJNAJ>}6km2T}LF?)|;KukY{mJO7+>KIeJf&-+=<`8?0LZe*atvWsUI0D$Gx zNzF3=&_S1UfO-8y=F!N8PTWK-GompbOC;HPV8C$)yd4I9%H7rxa|UDU;B&D7qXGcE zkh6&y(M`)nArQe+ABH;svU!?cq>5w?iivi+}qs^=c(kaD!75G1YNH$BLv|a zB1BhJ!A(+T`bKaKyaxu3mO@L~OCx3B@`_SOG*VUpDFK&}MxqeXC2R#ZZw z;olEI$eM=(R_TnU_IF#*ovNS{kw{QNAV?&V6bU7T_i#iY6%`c`(lQ7c8A(V&($fb= zwDp$6c?xYIXkt9=J)8+dXFLwRj%aI#zeH3OgqUu+;7-_v#d&@Y6BICnw=DsIl#*U| zX-iOF|9=;Cci)!wB%ZGa;PGx- zQ8aSG6Y-u-cmiBQ11_p>YwwI(zZct3(AQTwh4UoZ;_NY}G*ty52q|Z02PGsDjn+aT zQQ8VxnnKqVdjcgViM3;pz>M2 z+^$>bX1nq+IH=q`pt?3$=`#i3z|1Ml<0jr6U%JUzpG=QeOnC;(JZl~=Bk`BHmFQ7- zxDAV6zN-ThyDO*bbCO+aXAm>PE#zA#!6Qe6NBFg+wZdZAOr$dq>dC2BIr5%Zh_VOM zWp_t;kxDxKyGkOKVwGo2sN5K%!xY{%32HCpLgeRUDEpKV+;6ql{dq z18@MC*I#!E_^&Si&+7kg46-h3bhBx!<)uXmunXL3y~WB5L^{U@z78o@53#0=>1B`} zgt=ycZuSvmyc%zA;thOUcE;wdmdeGubE~p}@HYD~LW63; zJ%bqBY+HN2QSc-GW0v`OPZtEqbdO@Gn$xq6%FoCg?}*}YDS--)1xha}1YoTfzucN( zg|zkLuQnfM{)TPD3AU*`=K6Ylg$~eFTr?N0?tkSh8uBGPWkuvdL`f$d$V?lTthbnu zefCy4CXLNQ<#tr%UJwH#oM4&!1cL!}0N4Py-zZF2eRm+@bfTgSc z69fBR0_nF@Da#82Tt7=u9St4O?rS#kFWZpCb zJ+5?sgaeovw-Lqjm~N|)0fl?L)GCl>bUZ+8$Z?#Vfq`;B@dox;j1`ZHnSN6_gbiT8 zrnjBGK9LFo*zd(zq5B2)shJOK6UutQr@s2-Zvu!>RZy{K9bl7)fmB?@!io;kW7ux%7a0&Ayx8Blf3ax+KmMavofK&LmvvY5BqJNg!aVOd8#dBRs`w?-sqV;Q{ z-9+z~NV&l1Dk^wfU+8eWW0@nZxjVKi4+Q$<1$t54YWplE%=iywuU=oJSRQ?!X*%(C zesvA+Hvuod5K@DiPoy6nSH(iWeE5IG&}*3a@jmkAJlc@cTxT6A8q!P8~b zSi){wOQGug2(G=Cs#X_Fazm%I-99X?rPBE8tk`^KuB74u9ilrjdTtGcU3E=!ZA;jf zd*7>pk*ocuG-hO@ z{KC{L40{kII7_-UC-Jqs7?CIyu;f!%sL)z!siq=b0>LO*|cE7?GyZRj8!3G|L<94MN(T44(gs9`s zC(~xzuo5$mWyrv1bOPr0k`IXc7m*{l_*CPyd8Y6=S!?giy+V-m6ql1a=Yk8vYh+U8 z{hzP&kd=E5Fo0kFjH{|mR#3dKTxqI=FY|0aRK+?y2N-Fm5m#-FM(`)gvvOsIwt6p5 z`geEl9{DAIEZjKX!4#E%fCHn{>vj{J0fU;QWYdM0=cCX7 zMsYzW&6T4JZ(8@9wd!_NKTrR#$)Z=?FMA9&8L1|bC(mleS^m{*;o_Az>X@(iyr77?m-8oeM6yL|xQs3pp2kG%09aE;@?h-H{mE(@q^8y}=ro zLY_7An>f062NtN`<#{7f_1<~PpG3m>)$8{&fCs;&lHxkeRtthW+Rfg| zdewlthj5zFCfGY*~e#hS8Gglle`L>;|$gjF}n_h&>H=G>k={(&K{$Xu0bu@r77YGD@436oQy*>q4K3LpkT)l-Fsy9?Jr(EVYP2`j^%%3VB8 zNgwICC@m;5i1!HNdO1KCot^%0J^>vI0|%8~JF$eWbzxXe0?G(?X5G?kdhR&7otHO? z!bt0C+|QP7mC3v`*m5}HZnXR49PKrrJUlGn(kD*NS~psjF-So9U9vWh#X(s_R~O9J zS59Vg@8Dvah2DY}Zg1uQ?GCvGk-l19rlXr2_YSpuV-(qXlG>=F}zZ z%fy(+EO0<@AsRc8G)hkEbwBDFqlPBQo4cbmGC4wBldXc^`tE7|66B3jlxz-V)hiCf+<7 zudOolWd09F|6JuVuCC>iJ}pAsokh{g*p_;uwWxb%>(%o)_*9%2rQvqEwKDdeullAB zagv%+donJ189u+ZGDKaPd&g4K>?S5<&Yv4EC2Vo8?DjYsI<=mfuPrS#)}>iKeVVgN50^Mwn96&K`$iL1JZ%@B zd=#xp!rDAs5@lAdAdf&@!g$9mPm_ZX_J*eBkS?Fa?i3Bw z!DrqZ-fwi&@JeENo&rhmm_nSzy&l0POcKO#%9*|I9ZP`^=M_O zQ1u71L zWF%e1!^cnqSkBNim72a)`Bnzw0pNayHkKHArlY>x% z?OuE>5n^qwE4PKQ(afuf?__LRX9U#<9Dw!ydhp$WwPzU);Rx!F^>|&VqaE__pm*%u z?0OX#*LRNJZhwO;Hf~HA43tVNw}4MamM|I6Uu4URbldhxE&OQGa&g9=KeJh%49eM0 z47*ghSwCNQAZWs_et}7A7aI$2X3c&!h>y`xsLyc}Yp>Wc5nj39Xf^8ymjZq0#y|nd zJlanN3!bL7+r*%GXQLgL5^45*|8oTGp$JNe$p6LrazE4kxCJF{#Q7ygqfo(L*xXgH670Sx=o~B-5((*>{_4FRKd^C z>meskUDtt15Xu$Ybk>OIOihceuSG@1YwV>x-hd zR)75b&~SaK8W+QEm(j-0ib;RDpqZgL&8=+QZpd(WIKI1iF_ompZw0eq;nnHrX0yNF zd@RJ^YJ^a?8M)xb zI{?m^mvLBm1o+#gNzho`ei@wnOk8SSi@hoC%UxwA{`~XuVsiWYHAXC&p!Z5ZmWJjm z4$uT<^gZ8R4t{=SM@=^QFpa&K2jE-u73#{09MQNhO=H$MFgHe6Qpfwd~@>DI=c5Yp;DTTuJf$YNXa?a5LX|G>Voo z!F!RTeMV>P`B$>MREU>?yP%wlE3wztaAeZXh5vN3a`}8HDNH5sX3zo98bdDcTzTWz zN$R5ByQlZf!pwE36*HnHXUMKb@>x+eEozO>((rnJ7@FZ0XJ-@EIu)Nh;$X^&TQqcj zwMZ*4l?|AQ#b(;}LdEHV6B~;eKI~j=ao&79D*0?gvz0Y_>tRz5n`2{2Mtqje=Eh3h z(j7O>w;ht(n%OtzfA!4|$&X3?-&X%)!Oejkdj0-_qz+1V|M$PXC>vkO|Lo5h!DS^8 Z(1WGe0}qsdUJZbbQ(6X^IVWr`{|^o^aD)H= literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/2-hipo.png b/docs/img/sponsors/2-hipo.png new file mode 100644 index 0000000000000000000000000000000000000000..2b854c6d4b70b3516b3b93a8153e1c72a875e8dc GIT binary patch literal 8111 zcmaKRWmH_t(l!zxXo3@TupmK(!QDNBYX~w7L(l<+!QI_mf&~d0Jh)5HU?FI*5P}7F z`#ASK=f2;M``*3Q-rZfRp6cqVXVvQN9igG7h>t^wgMxyBudF1e_1Fgf^*%*={9-`D z${w2+NO=RKwu2?o4T6B7NLx6V!vMR0KXQ2I@ohT z{?g%cw|9I*qo9aMx;sLkwlE~X9QMu{F3xb!+Q|U0wh(8~=LZA9j}ySce>x$$y2Al`BF2n!2y13}y%5a*)?r?Uqf332CyJ2U=c zK@R2&MOZr`tsUTizbrz`9bAy&43D1v&l2n%!Qg)zhCBZqsK=0TyF(ngdANYw_V$0R z>tEW=NG;g^y73>iopn4MVcc3UX9pJq^f4cnjQ@ZiWB1=D`b+WA8xc7NsEa)ej#QQt zXLyuwSy)?$2+Iib3xR+jppc9L505;bjI^Afyn?*2kb)q;uz-U6KUihBGZF%a!v4Wp z|1Xy3zhXsX5ikhS0iomIVE0e{NSaqbPC=R;qHiRFHDhWoG7{(q_dNA$>_zq?&IL!)Q7Q}gEfh4VY22%J$xHfz*GYfc%iFz--Gu?k+vWYf^GMe3| zJ|P6lF&6ma7b!1dG^S;||FP0`EqO79_NwO(PSn$zalsYulXeg1t&Wq{k`CvuA9Qr( zMQCh$L~xN5$SKGKWI{PiI!u~{29pN!{iEo=2}^S$CJh1JEzEVu41@3f7Aah>1af@J zuF6z9ehF&~c7S9PQ!G>>m^Hb=tiU2{(M-x?#}@E5f7W1~!a`6Pt9e}n=tX>)7AC=q zm^nzl8WxO)<~(yJr zw->3Rfe66ICo%|NS@Dz&s4@}_)jvC`~UE#G#0zgN&tWlLby zHdII>qwxc>u6?YAls9>l)VC_z*lD6c&}2nEywr+B8zt3c(zHmJCIM;ig&BmJzX;~p z$&89*jdTot9lw*w8v2aHvCOvTkn7bGDoq^>ig^75lrZaop`5p{mP6|4Hr)BiUQZM1 z%3tj19L8@em=Y27=+@fiD#L84DM9oGsL7LgOw)7FEj5}ggG+6=)|eAYkj~0zXGf&z zUBKbCUUQKyJsN?8KOqDi2GYWlox``m5^7Cr4o<1YlgB0@FpOJBJ`XH?4o{LV+moEb zASy;-^2f*gX#fI+hYJ*E5+^$vNNX;wOXb0*eQeK&OFr5GC2>?RSu+#JqU zs=@mrJ;!H_b8dgM?byNh%4lvw8jt{p1!9Gwp0Sn~vGrY>ytT^|+|9z3b?x`#RW;qz zuSzf^j-X(q;zcxB@4arc z5#mJv-2;%y^b}fquBTZfbsXk~3+8Bm`5nTWcV`})tf`}tdQV#g0x0vPm~C*t%v05- z%>kSAsY6yMd)DtDzrG1lyL<*QViNPuFIDC7*|Q(FT~==g*69=$(-{-B-*GMM=Wm-s z?kpLM@J?L1;(h<5%*cKX7p2rx%c~%B9R;57rx`l5c&=a%-Q-5z-NNO;wIRJyqCt%b zZ+6#2nll8pC+QV|mJ< zmRr+?>&#(LM3(80g8WbQ`)!A+l0Pq1NZN#wkC*GZkVnEEs{LTfD5iLJ(l+eNe0CKb zzutH^@eZjPjEirK#n_~uTLv0DS?Wb>R-GAZuUNhkHqQ27ukHFx`bTpXYwnXyFGi|| zIAm#PZZ)4wKNzTGr*4FGg^kB|D<(l?C!;{c@;AVDS!6&T zZJi^mXH_P>ILFrLPQaJpT=augC5^iiu35l4S@A>-_yM86+_o1t_4CFP9w0)^;luw4S_VN=|f(l9~ z^ladPCo~sa)epzNh`D>||IE>(^BJkRR5O2|Hw(sKfw_u0bdGqe1b)cTMl)uEFNT0a za6XPBhg*NrPc!ods|ySsT&r4cB3^rKuQN~vqfeVV)9kY!wjYTJZvG?&O(wTpII%S> zYDi!+$W0g{J@QY^LuL<5uUsq)QVe9qem%!RRZVsE1h0tD$r!?i-B+@r#N)&R#R>9V zlIA+19PYx|I5=;Ao)MFx7lv#+oiw&n9>^e+jibfHVrTYW_M5s=0Y=i02~#7*FGY9b zs`j~Fl@8{RyUt8W3fhZ@qW9S5l48;h(zJWtaViq3(zS#Q8o9`Y!HuHdUk=jHw zi;6U%OIW#ACGWvms@A#W6*VOAzWQnRbG{Q@a-$CCEB{u~qqTw6{_o0bWMdk<2*ogt zf!FWGfM4IkS}a~Ru`BYFBzqoSP1sB3C8Tk2vIvjiaVstWs`=D&H$9H>eQyso0)L*5 zPqfild~Y8T2@N2A7Lf4ML02>Nhye7pb;5houJ=^?x|?X(W9vN@^|~6(U<~am?>1?> zWrZPy1<0Ttmi?5UFl|d$L{p6$Qi5Pj8C)g68(RxCHIbK1T38thHur znQZCb>MvD;u@#hvCafjfP;TO1= z{75>Xgb&?V?8B3xGJ7sbuNApi!ahV&hJCH?9>HUKr+~j!rdYjEmYyIxrzzVyHL95Y zn;^%D^x0Prq1T!WB<6TYB|?8%mfe562t$`WT(Ye@XzNdYMr!2x zX3J#L%(Jj z813x4$lVhEDp^)mJ2Mr?X*nway3P^}#$UXC5_CAP=VZ(2+A^b)TBDoJm62a}Ry~B+ zhlLz;JlQcN2&KJt@A zEv%={UW{jRsA^V9>5vK99|T3bJkvEOU(08Uofe+sE+jpUCt?e)kzP4P#Z3LS;~F7| zM_)hQeSh?xU6lu94W!uYn8O@~ecvfpD#}_SocI?8lBt|QJjOQJRE+Qp4tSx{c=75( z6EtqT+m~L;#sZX>$WOV2JLwe=KqX4a`0A)?RL!Z^l{sf7WA53M8DAoiwtV??zq_B| zO}?2KOHLmFRlz_KO5V?v_csM@Mbm2uJzL=nQ?640dHLm9kFaWd>On9ScNBeJ7q-r? z5KUeV4B9$ly6|xs48Jo zEu7lmYy3=Ne@_^dy0_XsTuZz81E2e!_A?TYRjQ$d0{%7?-cv((%diHI$@yn3GU8ha zu?Ib*`Gu~2@~XUGV_eSYC-2S&)GFK2j)q8Avi$5PCLh=8wXbo|`$6MaWb7&io6g8> zK)$cD`@Oolg{GCA_QI`}t@hScnqt+%JZiunLM_B(QY1yb-AiGjRT~>TZI)9~Omlj! zEbI2uH~G$@A#9CiI>#X;L~ie^6=Wj%0DZ9bUMn~2f02iJR`f1(w^{z}no>;>DudK4KZEC1&(GW(F(+mjP2CWXqn%+45jfcI za-%Eb1VQKRDF?;TI!vTee(%4`?&j*)59JV~HNaRD#XE$qP(^i@eW9V5gG2X%7&>p| z*T=Ecq^!gHNrl0iuii2xaB-MLDIOhE{>eVC{5^(S_^Yv(l9w>uH>1g!*GRAQmz<%U z+tMBHl=XUfk5u3e_O}i{&V&#(;pbgkEKl`+R)wtDs`H5^7&Vhw6EK@o%&*Wl@Fz(% znlrgJ5vhw&Qusk`V&UC;Pctl;Y6Z9+hZK<7PUBa)=gOvWq<_KP%icZ;?U@50B+ z)AFcx)kSckB8`hpudZ#Pd0NP|>}FfiiFhCzh2rqRn7rk;=de{l1zB@t?|oF(Pe;D1 z(T()uiK70z;S>$IaZCzT9zhRkw_ys)OS9tIL=Xp&uOW7l5TEYs(Vpo3HJmlt5 zn>ojptTr}_Urp2v-Q*MtrE;++-}!0~!EV(q+0VYL_ld{hR4%@7e&O1hQ1)>o zo(xXF@)G;$%2d>F`bF^e%jatpCW_1+zF|QO)J7bJ`I^#DR*O0lujbtdFSZT(3}+#6 zUJE}~(8KJh=*SBwhViN{Odf8VtXcS5@>R@M?vJl+<3~!&#&Tamj~z+8JxV*|;Z}sU zyG7#QzG?MP2&z`$Ss)<;O_MK%ybhD+{dM|&s;yUa38f6VZ`jHm50o-coGY^6XRJRH zzp!sp*Vz|iQyjK8(_h=ZbRJbT!C0DeUr*U%;y69!)zP<6Vy={qFH{bCa?)KNR7zJmZN!t5o!P$eV{=L&kpUt`|b$y91ek9r{(0k!bSx)8DL9 z?XtTO=)Cka(m3s}mFaoSfkwQERDN3eq6I&GA7&BE`Fhl?Wp8)aebV7IEM!<%D<1LO zz9YHWrqg=(oGw7pO_`?gq14lIGW7we&PQt{u<~HA_fcP#t%)KM!kXHTA%TEo&JdTU zZ^HaaBB$83ct8QFK{2knL~LQQxP$BBT~c1ge8+(*njW;H#U}$8jf)+sX(XrK*h_5C zwQu4NsH(tE$zAo-0=#h_FVN3hbTsp$qchhshKX9*n#d=iR$4a>JdoCq$avF$#%&vF zXAQM0G319ZyWd^)nInYya-)k<(&d?rQy3Dx=?SmD0bTpdifx*f$ikQJMdQ(v$JT0P zS|%2IEvyh9(qtpcU_%_W?3QZPjI&jqHxWqA5RCaa?I{A%QfoU9=hZ8&_OHt za4H2g;g7aWeut4nqYGc~J;&Mk8~vw56LWk9i7=f`2(*^M*f3!8Wozv@>g3n;a1jql z#V!Kd3sDU$Y^rj_k0b8!Zfp~l&4`?LLwDl6slMl=IP=O-V6r$M#3Q~t48K6t8v#JG z8j9JUs={=A`>iH$E&RF~C#$h{XIwv}W<%kEK$fSg>sQ@o7n?y`JG;5cG!+RnLE_Wy z3v_F@r0PGs3v2Ri;cTC+XEWNZl)~_t3^uh3$-|#B;!DNR&`97Ryh@sU1RF(kOu8_i z3D#V=`ZqP9F!DOpcMD6eOSi&YSbFQRqd&=j3#~q@&Ru)J&lJV8vwff`*(ch1AE@zB zeSHkc^5&HW)uX%Tlpaq3suX?T#Z4vuT8eH&qH)}Zuybij93}cpfQ%5%B!MVGi96{; zsJWD7Bm-#v0;A~iLSlPJqw*>_oWRM%+y~Fp42@lj&)O0|Ei3_<>v+|fOd{MJL-Va} zV6G(DDwnEIk(6n)Ib9;1c%y<>YUL*`!86v*y8^r6yd|DS#^>O@`q2YzBM5x>vZ})? zJPExU`m}c~%c}WX?x$6Ob7{F6WV~{MHp}qv%bLX@uu$m*hU%~beisZUBl)~5 zKgb>xN&b{#dj?h;CF*8-zM@nh93n(mNTg4)N>f11EWO~OT>{AI^-vq5Xq8}_YuJ}L-FN-{6{a=X}# z26gN;(6a?aV51McCIaLiwA4|YTgR_+@Y-6AAFYhxFtmE@J~Dtz($i!gp*jiM$?=1 zz4?>W_2G+_5qgYRWA0l&Jc!V3cH$E4?~h_&LS8$MB6j6BN~1|%d{_J(Cml=qzy;n4 zwhtA|22w2X5?@`jW>IMlHL%&ApjT?MAL1PBzs+{w%N~zB+8-b+A+0ct-Jhi;s>+Y* zOncKDtYBj2m`ITCl>|3d`uXs*m>pH@s;aH9h;O&-l*6Y_X!rCnCk1MzUM0@sE*2|X z>;S_?@7(>WfQFH@fDur$-PC=?cP=A~C`FWMc|RKY$Lm16(T-d4A;7_Y2D@7kyKu?T zdfjr|@^qTQn<1>+U#4D0HrR>hyH|HZvJ8DLlu7@GY(}#S~;&?&c*#@Ij`y*(Vd|%j z>)|MFk?Lkq$E}VVy6ArBbP4$8D6Yk`qVsl2QqrXJ$L`V6QI;twIkDXj)4KDbG?O8} zKeW$Snb^S1%T>JUlKZE;YB$H7+y^u=lAfCx(*g&`q6`z6p`RCX6+TSbG@!*D{`eRP6BaW6yl7ry@G@z?(0kqr6-*M7MM?LH?Q+CVwJk%J0d?DyT`+FqhrKM{tRr=d7Zt zn#OI)<2^UQ1668#`#c!y{`h-iqd?r?`;kqx3?V1vH`c5%OvagS``4$_Un>M`*;85$ zIdY~Pe-I2hXekTpUEw ziNZMJqYe@y^5+*i$%8Mn2`7!cOd4X-eu+=#dl*(bzkhC6H;&F7Yxz5dN)Vr<=n27k z>R9ezK~3A6gKOSQWu~OnP!Qj=A_phdiT!=Uo^Ct}uq`B{aJD8tpK#!bMK{e3q&}&v zoQ43)AXX}mSfThv&)Czu7sXf2N49qWoaOX68Pt@88GCZw#usx_yV^bZ_M$tib@$@S z0{R=se(zHn8k&X%msNQ8vE=USsV#Dec#Eo`pNMl3Y81?Bp@oHo?i_TA71pgYt8NrH z!$_?M>C6}~-qSe|`yfjTjYD#!>!06BvKjtfH7pl%e7MZxfbkJX3E@C(utu3Ul2 z^6-^yqzVygesht_;c9mnC4T(w-d-UqUR2Ocs7saT8=wX6d}3l^zU(uOr>{6zQO17I zWaUuLTAj9?SnBD=q}D6EEz86TE&s@Rz(vQXfEV_AbQ@V=Sa%*htu8v_U#{P&-m+#f zB^#!~6!Koxcii?V%=UuX{*P;He}g4q0^Ea#~$!uu{kL6Gg}gf>VC);gv-)9Plr1 zBQay8KK7sZ*q5VIHyUs}55ozn<|HW>gs;d+>rCpSJEd#iBwEa>Z2 zmY4@+63OC5i|yc#?|J6Ve^@szg2OxTyY0FkEeJ7%v_eubK*7uG(0&j`0kL{=>Fi y*qhgzmqZXm5Ty24T>mbw|F=-vZ~6fjh?0cVjd*Dn?DW?!bY*!pxhfg6!2bt)W*O}O literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/2-koordinates.png b/docs/img/sponsors/2-koordinates.png new file mode 100644 index 0000000000000000000000000000000000000000..f38601b34a0c3a446d37a1e730cf07bf44d58d54 GIT binary patch literal 1934 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 h@o(7mT7-XUgL5%l}`x_x$hc^HK literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/2-lightning_kite.png b/docs/img/sponsors/2-lightning_kite.png new file mode 100644 index 0000000000000000000000000000000000000000..ffdced04ef906b7546ce8440ecc1e281f3047951 GIT binary patch literal 6715 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/2-mirus_research.png b/docs/img/sponsors/2-mirus_research.png new file mode 100644 index 0000000000000000000000000000000000000000..b154407085ed5c406daf57852f60f54cb9eeaa97 GIT binary patch literal 12414 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 RI-URk002ovPDHLkV1o5*A%Xw^ literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/2-schuberg_philis.png b/docs/img/sponsors/2-schuberg_philis.png new file mode 100644 index 0000000000000000000000000000000000000000..fd9282eeb65f8c529d842b7b17dd183830e66ffd GIT binary patch literal 21870 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/2-vinta.png b/docs/img/sponsors/2-vinta.png new file mode 100644 index 0000000000000000000000000000000000000000..7c67f6ca8f9b5fbfd91d03dc17a6815e36ace556 GIT binary patch literal 9918 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 LYBH5lX2Jghb=w#j literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-gizmag.png b/docs/img/sponsors/3-gizmag.png new file mode 100644 index 0000000000000000000000000000000000000000..a8d41bd0257fcecff56b54f17787d6d37705f429 GIT binary patch literal 5370 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-imt_computer_services.png b/docs/img/sponsors/3-imt_computer_services.png new file mode 100644 index 0000000000000000000000000000000000000000..00643c97818e01ede8b609678c6b7a75c13806ef GIT binary patch literal 70397 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-infinite_code.png b/docs/img/sponsors/3-infinite_code.png new file mode 100644 index 0000000000000000000000000000000000000000..7a8fdcf16ab81ff2b539bb396851e2b7189b0c53 GIT binary patch literal 21786 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 Qvj6}907*qoM6N<$g7qYafB*mh literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-life_the_game.png b/docs/img/sponsors/3-life_the_game.png new file mode 100644 index 0000000000000000000000000000000000000000..9292685e7c7e8daf823beaf409f9246f688b79c6 GIT binary patch literal 5485 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-pkgfarm.png b/docs/img/sponsors/3-pkgfarm.png new file mode 100644 index 0000000000000000000000000000000000000000..9224cc2eef3150ecc7f3fe3dcb2c1678cd817bb0 GIT binary patch literal 2275 zcmb7F`#+Nn8^6uUjTZN4Bx;+LoGW6X*=BZ#w2UWI&Xzp@vCr)blgxK~D68eUS`|`OYOHg zzOxf&jsBkj@NPC-0RV+U7LDQ(HTX1l%;Ph0gD@|ndb`--tU?aP?YVYD&FkaNb1SB& z)vOh^5f~ABjIoHNK@Ap_a}J_Ju7y&RH<-ua13Oo0{amG#w2lXYEWvx0No9 ze8t8D7c=p@FvcV~pXk-CC@^KX{GwUQ-zyeL=Ey&U2jI)eO=K{W2DSuku~(%Q5Zr1( zK!9achC*>*S1!slhlC8%r$^J4FCwTKia`P*X>xK!K#;=`CQj6+qLax2 z92yi5-%m_F=B%xifgSpabP>{+isDsmze>jMg52UA;KO)I8atmp$7SNt(_Iq-oD23gVKK z?4CP)ogK5X{U}^-7x-!;t;y3^6K5S#USVlDW@A0+`?M>x!^ysTD}{^&1V*p&gMfH! zF_NHoWk6p8&OF5v7{z)hBShFDq<0{Zdpj3omsvsr@bqaHfysds>;{zq5qq_@LAh{K zyojAI9O3Qb-ljv2tP;?@K3WTKL6Xth4>(BV{%L*iA?WFfKs8H{&&Ji)QPOE?1xWx+ zECE!@EK}hE?c>Sp$Q?3!CMCC36pw1BCwtL(I9P|!2hqVdm zfc691zMaf$P3+Zz-G zWt9XWmdPT6OL6Us{Kun-d11JwYqOG}sY z$!fQCLgcvWFacUosO{r`cn;-e>N{KvLxQ>yI2SXA<8o+``W+UzneD{Qh`j4I;Nt!;I2p6qmALcUhq)Ywa=D(sr80oPQ++Q-R+p-_Z-aR`2z%rPtC)zKXZE4 zJM0*Ko9Wt>H_J=#%w2l#uJ^w6g5Q<5H^vX~)w_2$0ydXj(R&)jtv6~0Ml~`Q0`C+z zs-AiE0sb#BBi@XzS=p+BkA1W}i^@OW1bLFgqOJZNniSQbn0wF^eKTC3vTaX$u5rJY z_{S|;QwMb0ab!<>_3kb&8J?2>B&a)OALM3apE6`@nEs0a$Qwo`HSPX(g4IH1bN&MZ zOqes;yE$OSIRgL|NGrVoz@-?JcDAJWpi2}UHmm8ZykN0RkOZ$$8KzWay`Ix3$g~xBzoakz^9ij zzL$6WGuy3JSWrIOZ7ICD&6EVr9JI)9xMK@|$dA(d^&>U=xef@L)YCBdrZvCQYbygv znlK$IRFl*m8v+~8rFTgLqN&No-p$pnive+6P~wtr`1o7W{391gGI8eJy-ku@Pe(!4 zhetj(%pyjVis#(T$`BJmHy$bSwt~ep4o8^ey-`3%$F8aw!S1SBi4%IOtIFXqzf7Be X%a+zbBOb~_Yrh^~**nq7sowCv^^FAq literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-providenz.png b/docs/img/sponsors/3-providenz.png new file mode 100644 index 0000000000000000000000000000000000000000..55d9c992aa6d951bb9ee4669e0f9e33ce1249f15 GIT binary patch literal 12580 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̓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

    ``=*;AGKa;;DY`R|-cX6!6?Q}7 zKqs@a_je9@>|%V*;nN`zvH}Zr_0L1V^ zRAd3t03;a>K-%dI$2xql8dJ<6o(L7nv@60f4;0=(8k){Y!_4o3RG5#%)c?Q&FJUTK zv`R;x2>g*Sk{ASh13UywOG5(mMxwyOklvB0GRz-0|6)aiWvVm|3g@B0um$NqJsD|T zn5+lXaHPSN`Ui}0PP%n&N3{ToF*c|Hod7y;r#fHZ7KmCS3Mxn zX?LZ%T?}+-)&0%N+>E3UQA@&k@)dJ*h2MfC2PHf5aDrL`Zb&I92DFvw?GwPH1j$D+$hqOjQ>D8gXgQAzWh`a(2RfND*o(^i^^0_T-p% zNOJI6Dk4-9p7ib&HY4f&7a@mjrPFPuJ#q|>7lFWQl6_`6jWXUZh{<^c8mx2um;IXjJYKON`kP8 z$sXn-C&S)na}kvwQNdvz-N#kH_o?1wr-#xDn8KDJlHxWbRcs;lS`fBSh3-TTECj;^ zkj_~Zwun%TL?u^*^PCW0sbAm@>>XtY5+`^`rHB_z&Q_}w-{v(Dj4dLpcDBYuoy1qM z--TuXa{AiQ9!UaJFG>3>4JXW-LuPv@XMItOpgbjl{IK@xm##eUnNj=-Zx+nOFoXF9J?j>IH> zbn?$`wbL(=viP6!gamIO2|H75DuktK&(GD#YU%NPRVX<>b$WrQ2RHE{k}CBw{+;L^ z1l)||4cO^ISAs+h$0Gfv{1~4q9sh-HF5(3d>X00`QMyt}bBqA1kt2s*CqW3;0%fX5 zpRN7@zfOp$(a)Lbz*_N~2q1p!S*ig)hx1cmf`(bZrKEqX;n6xV!&LnHDIu#=S)EQ? z{$WEB!7wXlBV|=jll?W6cOtcd8&Zs4UtloOfxeqAf+C;qZKFvN)OvBjsK+;0s|wKx zNTJNWSxA6YNY20v3$rka)C}}NB7=t^IRhm~;z&UT?(ch~jO{(INZyRp)Q&q&CpCv?S zr{pa~D!rm{&kb4qHAzXj&X0>neZKikNcr4S#GP6ga3VCv-8qV3?*_s zaHZPWpN4a72}8FUhr}{snfTC11ANgc#AkmT(j~kyoO?jLgcA^_)Jr%!WjCvcVE7w; zLYhJLQ=daV<5l1&;Cht;wVA$wNCOW*wc74ubU&PtX9Sp!B&v==f_Dwp{WcPS!KhPZ z=q+Fb;)t4_;{-5*bVHC}RuwLTM!7%)vog6&^@o#nuY8i!1)|x4DkLB`ND1(Qz7`9@ z%|!z^U@;YuZzC?%4!U|qBYlFh4a<;H^eJi)Y;Wk*Z-s(m2am{x!Hgj8-6Pbr8iY4B zfqt5Rb5sH>P)QdHA_0Od5fVv>m=5Yf#8ur}70kg%Ms-8FhAY%BG8@TZ_(09SKu>-) zN(9S$H$AsSLc_g*gH>8|K#EEIuyo2*)X_{6E5sF^t7}LGzL=%3TrqVA?&6qKq8_*7p(Y*<1@1Y4#Pm#0+GU)*4=dLbq z0Sh_6S?cJ!HXuBG>0$^C;CMllhbA))0BuE|)B`-!f!vn8r*{MP5P;j=xCRDv$^j5V zJ9h)1pctrZ=481CFtP#=%ac(%0lE;txn5j65IBAj;NCN1hxoWFpL0ZpMC#%_M5zR9 zcZ4IO+#v=#J9!c5W<$PR+$yL|s8ntF>Y$4P3K2>iuV)(pATy4KG}_tKz-IRR=4O?c zBKCuFV-@u4VlFOk*M?hi2-*Pf#xLyUnk@MKws3X&aG$lSJErJ74zOe%UOeM|k3+i< z$Q3tWg|GAiD{j+eJSdF1esl5#MTT8A(F?y+IXBBRUozjipS-Yck z-ED9{c7;}RKp80T)T9ZCle@Lwm3F~ciqqb&a&QpT5X$e@L)>_ri z+yR8U8^#|3fCG9G@-_|kwdxoFKrb^wra(t#lR^`gbiyRM*?pRG^ z9i;L-KZ9b8H$?vF6WzONvP=oC&+m%mvgSP9Rn51iM?5;!7Y%GgwmF7CRHZdO>QNM1wZ8+lg~+qQY|c`Rb@y!U&!r7uy$Ecu09>+@0l_sQ>R=K@&SPVhw5 zoy15Br13NGV*~>D@1&UA6lgmmP-g>Cg^s6;T;#Zjx3!lkk~zW?*T9@;lqi`fCl9TLn400@U z^v55mJ#9N=IK2NVn(o2d;8k>%pPNiCzmfqZX zQ{6<}q^_y4>1xxfi^^#l&<=%>w2`!qw1HyheS!OAi*6N_pbhU0?YrqPRaB0P+6QyE zVQ;%{|NT9A>3KU|mF1OXZOJM%OEAmHc!haV@UiGw(d}Y^g5gg3p8O)8qEHmZg%49) zoBw1g;ZZ{9!_af98VqdFUF0|gXrNqeDlV?sDAA2sJtSO%+__VM7(U6hf{Gt7Cf?Ma))9$BLPu}Xe zGo>3jLD=39hnze2ym!A8}};`-v}=1=e$2crg%N5$9O)`Qny0$JfZXfU*= zB6K1gH?1rM9}%sH(SrA&7w&aU>YU9i)#1^JJ(hQDxGGQ7qkiIip6KF8N^@K@mOaWM z?ER}345)XgGf%=;rJ|yv>`rLK5Kh`}dkIZe4tUv%Bo63((o53oPs2dXVRz(=lw~xt zC|I(}W_-80MY3 z|MOgQ)V;M@+?isqNFu{Culwh7H#^8N7wO)7Z?jLjLx$lV25skF(R8W-mXwpRt7)?F zenZcB)l1Wt*C)BEx!%MV-8f-vCns$G?oqBM>>lD!P!IE4p3S>X?4{2|l$QmuxqJAM zd5(5U_XZ9NM&lbQF7{q{a66}_)UCz6)qV6`zg&hRds24tyJU78TUYl3wt>A5Cg&G+ z_kfd|qDwe}UFI+k!RrvyXF7nCO2dmPIb zS2dqK?y;q@HEnlqN3R&J++WnnKb1YYl(gcrKhMnP&}1ELEA1+SID1h?>0j-_tr|8~ zv9ETG>$BHwf4r7H9U#Z1!e)E!($hh4f?m+j=pxg=q6izj+y87x?i+@-?f$|TVX&ue z>P+gMH0#tAM;FJ3=8c*!Uybz#f7b8W&T&Zz;SgjrYx4}-J$kGy0W;HbHa#&tG)#WE z*SY6vQOJmE^MEG@e)=J&-<#Im>t{yP%hj8mW=i~K?)40BwJWhpy#qh!Gv+sjSW9R# zuPeJ$mYQGc5=H&3LfHROIoqKt~C%BB!g0ut?kH3;@aTL+ujxCVQyr-=;Mte!UHwL zzQl!-K5rC*#Xw)G_<3oF>1;FzvNyE=A@ROwkg~k8oGU~D3Q~p1LzR_aP^c_O0RmM7 zLm^-Vm>d)eS5k#TRY2b^F->ODCxow?JKRcd&$s4CmWG&zpC17Z1_uNL$OkCO<9#t; zC=3PzLlnRY3UZ_xa>O8Q);KMgUljfQ?) z-^S%b_|XuK_>CQjA~+C507K;=;C~RAno^ee`20~x^xN%E>dCi}{jou!O%MSMwn7u} zhkaeqyZzBPKk+|x!p-$Z9KvB=?=O7ZT)}8>v=2!_By}G8$1V`Qe*^g;|E(K8-2XUw zKdk%D$@xvY;rT}yIuQF0vJKBy*_TxKIztFj{=t#HXp|q`*9MRG*8G}fKfgbbzCKCY zVR3Hw0OC#rn7sDSss0%Vt%veMYm!n?Ne-earvSBqLf{Y>TmiNVq5y|LehKomCRq$q zQrf$r{80ZU%5Qba*|5RVbE@x z;O}Ysz2M(X+SjT4eLa2O2L8VO5N@t;cf79;%1;yPgTkP}1RMqd{#p35O~jA85FCm3 z#`~J$-O!qf2=JeZ|EMDUxMuP7w>3?omA)>>a5qu~3R6*$Q;>)L8s?XJzr@+NkHJZM z3@P7HU)DBB^S3hc`t}=ph4FUmAzk03zq-k#4wR+8y2+(Km9{vnpC)O4 z|I$&i;$Ku7H`}jJtx4xXv?gh27GE`*y*5(q(OZVk$e8AbofW* zFP?A8uLf7?HP?6CinAASz$e=;grENUZUKq#A3T$K5c zd8xR_fKWE6xG3`>^HOn<0ikSCaZ%<&=B45y147xP;-bul%uB^Z286On#YLG9nU{)- z3QgKn{L*}L8A_GF%q~fB?hs;aGMFxbjNySB(51E&Wiwp>5lZuNn zA2Kf$7a0)BCKVTDK4e}hE;1mLO)4(Re8{|1Tx38fn^ats`H*?3xX6G|HmSHM^C9z6 zaghO`Y*KMi=0oPC;vxe=*`$bz`RB8qXdLMQ&j8YsoV_j0Hl(LOL9PZ?rT`GU0|3G! z0bqHZ^gapzhamtk=1h8kGz9?o@bL$0_mKW~iM^qoj!j_qM0!Ypt*vmK*2pE60|$I{ zUKpQ04Pu;OHq9!&a_y`ehlDgv&DjzQrHxUPQB-!289ocMS~ifPdG0Bre1+9m=Y)|? z4Fe&Fku8%^jLxZaI>hYg#K5cC*u%}GeA5T#R+}LK>kAGm6NMe0atEf1!&Vy4@8o7S zu-c0RG0_=<3^wU-F~)13r#mLWDG~91QnWtMAjGe#q_HMV5GKUY%y1F33btk1(X(?q zy9iIzBL~jXPrF$~t)|n+9=d!E@C=7lwzNIv313q$NKjN_WdYry#W94@2^A2vXrJC- z&vf`WbbX#twfiH=8By?L;vfK~Z4WBBA@=-1VN*dVTl12$#N305bJ{sKGuzt5`3H(( z!XXVYN4IJN1swKty-rN7+hz%P@dvuG%=|XtNek~p7Z$ZD(<@aQ*Q6kZv#+pY?76hr zO>2*XX8j{yc-LX{H1E*Azj$T&9HP9H*;XKl+j)k`Z_dh@^+nHwd}^6l`*LMa#41jo zc$~-oh%!WDX+q|;SJBPOU2)Oy_f{8SqKv@9O_^<~#3=uxU zo8O#lXHV+V3xzLzW{ZauR6OHqK%9-qoeQPssx*&C6I)DuGhwG3ke&_2#T6drraPPQ zrn0ays{EkEK9?@3{b!EWMbk0@8Q@mj5kh%aeBG{a^VG#afhE^ddhd;ly~}!D`S18} z%&UW;q_@1ypBRfYcsPbZpr_G2t^w*gxG(d!)HAh^C}*2fSlb0Joug@}@TL4}g2B{w5EF0?%U$ z0h=5nq8t0YP+q53`nPu<*TN-4uEZF!FXc>rhQ(<`Dv>OvosHaA zGg@UP@t6Fp$nYG4bGC2`i)2yC0oJ{<$jT1m2kDzHG4+0;>H8r18cF}!`*kw9yLc0Z z7QbnGaUL;5iFT>5onD1D5?-Lz!LO$H{6Xkue!C*23nz}}EnnrSjf<(_r;8Nh%$3}E zu!VMkVWh(QsCfYA1A)~J+Lp~DU^-2Fow(Ry7}rwXj_O?zOjENJv;&)`2A9Tywtmof ztzMb*`beTrUdSF$N!_QC`l#1Y{s`IDx?2C(5U1^}hE78udyK0pL#OcaW94@an1^%< zp-G8V%Xcg1d4|iYZaV}%6cE848*_TO>Q$Ovx!k;#LpMjfO@rKkdcEOE`hp_xY z@AH=>KR7!dl`!axwKuplSjo2X8N(8g=zfQz`bc)M+{IqZ!XtWr=Ha=kAntIHBAQDB z=NoN?Ki>8@YW&p7$3s6XJTJvU)FosxB#VAzU*qs)-jZ%31~XMYDL%c*^7^g-HT5Iq zwls9u>TL^{%pN8=|6OwF*GD6Wc?Eg??{&7zzKlLs$=CPbuabo_xe0a_ZGl0=hjTP^ zx04t;Sf!bD>E93e!`|j?0D@sQh-*mb5j9ZBW zl+f@N3Gj7J+lRg8IZ-dnW67xSjBt?1y^R?Hahzjolh((}9vU5tFFCg*HM*20q^Gd7 zxrn$H(w5k(Jrlpt+5x^uKVtOQU8pOjfRN9lWyD6f@qA0S zcl%av@iv_lk5kR#MJ}G*UCGRd5`jIVZ5w%_1;quxQLPCvC zlE<8b6fa%ewd{4hmuZS$CDGv&eh*ivd1v_Nj=?cV4#OO6#@+MK2ds?9^zi|UtJ@3n zZz)&v*tMyJCg)tjDc&h*;7Oh;dZE(A)6bs7pTk`fEnYc!&q7IckgZj0FaNPScfI^+ zV@tdqZxU)+XxahHHB{Y`EU?Y9m6@y_M--qM#*J4}`1`jueF0jd55b2j{ z3Yubbu08E=Klie0)9O^=(&Ns=gk*kcfgFCWQKT(k@!qn?9_mp(tkvSM^E0!fcTh1; zA9BX?lcb}x_~hfBh@)|zJ%%6El8zH|);5L}$i)A{GsJJFmQ2y_$Cur66*PeDJ5GD& UQjSd0c?>YzZKjv6>wN4#0KqDhfdBvi literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-tivix.png b/docs/img/sponsors/3-tivix.png new file mode 100644 index 0000000000000000000000000000000000000000..90d20753942f54e3ba34a163f510ce485396ae99 GIT binary patch literal 4091 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-triggered_messaging.png b/docs/img/sponsors/3-triggered_messaging.png new file mode 100644 index 0000000000000000000000000000000000000000..4f8e5063591102057aae0a3fcee34413c304bb8b GIT binary patch literal 10509 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 E0D{2m+5i9m literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-wildfish.png b/docs/img/sponsors/3-wildfish.png new file mode 100644 index 0000000000000000000000000000000000000000..fa13ea70374d1a68e14eb531a585ff45bba564c6 GIT binary patch literal 4137 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 literal 0 HcmV?d00001 diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 98cf12e3b..5f5b848e9 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -29,3 +29,32 @@ I can't wait to see where this takes us! Many thanks to everyone for your support so far, Tom Christie :) + +--- + +## Sponsors + +We've now blazed way past all our goals, with a staggering £30,000 (~$50,000), meaning I'll be in a position to work on the project significantly beyond what we'd originally planned for. I owe a huge debt of gratitude to all the wonderful companies and individuals who have been backing the project so generously, and making this possible. + +--- + +### Platinum sponsors + +Our platinum sponsors have each made a hugely substantial contribution to the future development of Django REST framework, and I simply can't thank them enough. + +

    + + From c0f002b09d07275d8dbba7266d1180623b78f6a5 Mon Sep 17 00:00:00 2001 From: Kevin London Date: Thu, 31 Jul 2014 12:41:15 -0700 Subject: [PATCH 0641/1652] Updated Permissions doc link to Django docs The previous link went to version 1 docs so it was a dead link. --- docs/api-guide/permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index c44b22de8..38ae3d0a9 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -244,7 +244,7 @@ The [REST Condition][rest-condition] package is another extension for building c [authentication]: authentication.md [throttling]: throttling.md [filtering]: filtering.md -[contribauth]: https://docs.djangoproject.com/en/1.0/topics/auth/#permissions +[contribauth]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#custom-permissions [objectpermissions]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#handling-object-permissions [guardian]: https://github.com/lukaszb/django-guardian [get_objects_for_user]: http://pythonhosted.org/django-guardian/api/guardian.shortcuts.html#get-objects-for-user From 6677374e9b7ec0d4379042cc3e2ee601bf95a9ab Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 31 Jul 2014 22:33:45 +0100 Subject: [PATCH 0642/1652] Kickstarter sponsors --- docs/css/default.css | 46 +++++++++++++- docs/img/sponsors/2-cryptico.png | Bin 0 -> 9970 bytes docs/img/sponsors/2-django.png | Bin 0 -> 5055 bytes docs/img/sponsors/2-galileo_press.png | Bin 0 -> 11451 bytes docs/img/sponsors/2-security_compass.png | Bin 0 -> 4107 bytes docs/img/sponsors/2-sirono.png | Bin 0 -> 4941 bytes docs/img/sponsors/3-brightloop.png | Bin 0 -> 6864 bytes docs/topics/kickstarter-announcement.md | 75 +++++++++++++++++++++++ 8 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 docs/img/sponsors/2-cryptico.png create mode 100644 docs/img/sponsors/2-django.png create mode 100644 docs/img/sponsors/2-galileo_press.png create mode 100644 docs/img/sponsors/2-security_compass.png create mode 100644 docs/img/sponsors/2-sirono.png create mode 100644 docs/img/sponsors/3-brightloop.png diff --git a/docs/css/default.css b/docs/css/default.css index 090d42a62..7f3acfed2 100644 --- a/docs/css/default.css +++ b/docs/css/default.css @@ -314,12 +314,27 @@ ul.sponsor.diamond li a { width: 600px; height: 20px; text-align: center; - margin: 10px 40px; + margin: 10px 70px; padding: 300px 0 0 0; background-position: 0 50%; background-size: 600px auto; background-repeat: no-repeat; - font-size: 150%; + font-size: 200%; +} + +@media (max-width: 1000px) { + ul.sponsor.diamond li a { + float: left; + width: 300px; + height: 20px; + text-align: center; + margin: 10px 40px; + padding: 300px 0 0 0; + background-position: 0 50%; + background-size: 280px auto; + background-repeat: no-repeat; + font-size: 150%; + } } ul.sponsor.platinum li a { @@ -335,6 +350,33 @@ ul.sponsor.platinum li a { font-size: 150%; } +ul.sponsor.gold li a { + float: left; + width: 130px; + height: 20px; + text-align: center; + margin: 10px 30px; + padding: 150px 0 0 0; + background-position: 0 50%; + background-size: 130px auto; + background-repeat: no-repeat; + font-size: 120%; +} + +ul.sponsor.silver li a { + float: left; + width: 130px; + height: 20px; + text-align: center; + margin: 10px 30px; + padding: 150px 0 0 0; + background-position: 0 50%; + background-size: 130px auto; + background-repeat: no-repeat; + font-size: 120%; +} + ul.sponsor { list-style: none; + display: block; } diff --git a/docs/img/sponsors/2-cryptico.png b/docs/img/sponsors/2-cryptico.png new file mode 100644 index 0000000000000000000000000000000000000000..2d86afe817a1422b183217842d6682ef8a59c757 GIT binary patch literal 9970 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 X>kQ0f{KUydC2|0;6hyL2T;KOU`3<;p literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/2-galileo_press.png b/docs/img/sponsors/2-galileo_press.png new file mode 100644 index 0000000000000000000000000000000000000000..f77e6c0a86cc502d25718545d7a19f4db8427045 GIT binary patch literal 11451 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-brightloop.png b/docs/img/sponsors/3-brightloop.png new file mode 100644 index 0000000000000000000000000000000000000000..8d5e85a66a05d1a7040c01306a50e795e4820dcf GIT binary patch literal 6864 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 Bit
  • KuwaitNET
    • + +
    + +--- + +### Gold sponsors + +Our gold sponsors include companies large and small. Many thanks for their significant funding of the project and their commitment to sustainable open-source development. + + + + + +
    + +--- + +### Silver sponsors + +The serious financial contribution that our silver sponsors have made is very much appreciated. I'd like to say a particular thank you to individuals who have choosen to privately support the project at this level. + + + +
    + +**Individual contributions**: Paul Hallet, Paul Whipp Consulting, Jannis Leidel. + From ebcc78d96cf6f4cd6e464cd6b8eccd83305900c2 Mon Sep 17 00:00:00 2001 From: Anler Hp Date: Fri, 1 Aug 2014 10:20:10 +0200 Subject: [PATCH 0643/1652] Leave status responsibility to parent class Django's `HttpResponse` class checks for the `status` param when it's initialized, if it's `None` it uses the class attribute `status_code` and thanks to that we can do things like: ``` class BadRequest(HttpResponse): status_code = 400 ``` Now, that doesn't work when inheriting from rest-framework's `Response`: ``` class BadRequest(rest_framework.response.Response): status_code = 400 # Bad, it's always ignored ``` Because a default status of `200` is being specified in `rest_framework.response.Response`. I think is more Django-friendly to just leave that status default value to `None` and leave the responsibility of choosing its value to the parent class: `HttpResponse`. --- rest_framework/response.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/response.py b/rest_framework/response.py index 5c02ea508..25b785245 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -20,7 +20,7 @@ class Response(SimpleTemplateResponse): if django.VERSION >= (1, 4): rendering_attrs = SimpleTemplateResponse.rendering_attrs + ['_closable_objects'] - def __init__(self, data=None, status=200, + def __init__(self, data=None, status=None, template_name=None, headers=None, exception=False, content_type=None): """ From f87aadb3ced996f54d26d3505ec3df76fcba23df Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 1 Aug 2014 11:35:48 +0100 Subject: [PATCH 0644/1652] Latest sponsor updates --- docs/img/sponsors/2-vinta.png | Bin 9918 -> 6844 bytes docs/img/sponsors/3-beefarm.png | Bin 0 -> 13066 bytes docs/img/sponsors/3-fluxility.png | Bin 0 -> 10064 bytes docs/img/sponsors/3-nephila.png | Bin 0 -> 5842 bytes docs/img/sponsors/3-tivix.png | Bin 4091 -> 3552 bytes docs/img/sponsors/3-trackmaven.png | Bin 0 -> 28609 bytes docs/topics/kickstarter-announcement.md | 12 +++++++++--- 7 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 docs/img/sponsors/3-beefarm.png create mode 100644 docs/img/sponsors/3-fluxility.png create mode 100644 docs/img/sponsors/3-nephila.png create mode 100644 docs/img/sponsors/3-trackmaven.png diff --git a/docs/img/sponsors/2-vinta.png b/docs/img/sponsors/2-vinta.png index 7c67f6ca8f9b5fbfd91d03dc17a6815e36ace556..4f4d75bc1256fbabd6850b4bdbaeff524d499114 100644 GIT binary patch delta 4133 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 delta 7231 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 B=DYv^ literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-nephila.png b/docs/img/sponsors/3-nephila.png new file mode 100644 index 0000000000000000000000000000000000000000..12fa46d0001b3c4137b0f814d9a169fc73ad17ed GIT binary patch literal 5842 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-tivix.png b/docs/img/sponsors/3-tivix.png index 90d20753942f54e3ba34a163f510ce485396ae99..bc2616a624fbad664d96e774e676c63061e4886e 100644 GIT binary patch literal 3552 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 literal 4091 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 diff --git a/docs/img/sponsors/3-trackmaven.png b/docs/img/sponsors/3-trackmaven.png new file mode 100644 index 0000000000000000000000000000000000000000..8d613696929eeee2610f233a96ea5c05a72e3a06 GIT binary patch literal 28609 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 X0PLwfsb;Wu{*9LslNYV}VHog#R^h`Z literal 0 HcmV?d00001 diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 24c609faa..00d4778ff 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -119,17 +119,23 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Bright Loop
    • - +
  • beefarm.ru
    • -
  • Infinate Code
    • +
  • Infinite Code
  • PkgFarm
  • Life. The Game.
  • Blimp
    • + +
  • Fluxility
    • +
  • TrackMaven
    • +
  • Nephila
    • + +
    -**Individual contributions**: Paul Hallet, Paul Whipp Consulting, Jannis Leidel. +**Individual contributions**: Paul Hallet, Paul Whipp, Jannis Leidel, Johannes Spielmann, Chris Heisel. From 27af7a3f4f9870c85d44fde37b041d51d3611473 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 1 Aug 2014 11:36:33 +0100 Subject: [PATCH 0645/1652] Latest sponsor updates --- docs/img/sponsors/3-trackmaven.png | Bin 28609 -> 5331 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/img/sponsors/3-trackmaven.png b/docs/img/sponsors/3-trackmaven.png index 8d613696929eeee2610f233a96ea5c05a72e3a06..3880e3707cec8e71b527efd346daf182453807f8 100644 GIT binary patch literal 5331 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 T>a%}eN`MwvSG`pAb;$n#s%N1M literal 28609 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 X0PLwfsb;Wu{*9LslNYV}VHog#R^h`Z From 5377bda9420b5806cfcfceddcfdfbedf5629f6ce Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 1 Aug 2014 13:42:51 +0100 Subject: [PATCH 0646/1652] Fix LaterPay link --- docs/topics/kickstarter-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 00d4778ff..93f670aaa 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -68,7 +68,7 @@ Our platinum sponsors have each made a hugely substantial contribution to the fu Our gold sponsors include companies large and small. Many thanks for their significant funding of the project and their commitment to sustainable open-source development. From d0fdcdfdadc51a16074c5ed11643ae187837a9d1 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sat, 2 Aug 2014 15:18:03 +0100 Subject: [PATCH 0650/1652] Added pathwright --- docs/img/sponsors/3-pathwright.png | Bin 0 -> 13036 bytes docs/topics/kickstarter-announcement.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 docs/img/sponsors/3-pathwright.png diff --git a/docs/img/sponsors/3-pathwright.png b/docs/img/sponsors/3-pathwright.png new file mode 100644 index 0000000000000000000000000000000000000000..71be3b28b8ef246442764b5cb261e3434dfe87f6 GIT binary patch literal 13036 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
  • Life. The Game.
  • Blimp
    • - +
  • Pathwright
  • Fluxility
  • TrackMaven
  • Nephila
    • From 7bc9954fdb195d202aa70165a60af350ffde46b2 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sat, 2 Aug 2014 15:28:34 +0100 Subject: [PATCH 0651/1652] Update sponsorships --- docs/img/sponsors/2-sga.png | Bin 0 -> 11112 bytes docs/img/sponsors/3-garfo.png | Bin 0 -> 4621 bytes docs/img/sponsors/3-safari.png | Bin 0 -> 4419 bytes docs/topics/kickstarter-announcement.md | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 docs/img/sponsors/2-sga.png create mode 100644 docs/img/sponsors/3-garfo.png create mode 100644 docs/img/sponsors/3-safari.png diff --git a/docs/img/sponsors/2-sga.png b/docs/img/sponsors/2-sga.png new file mode 100644 index 0000000000000000000000000000000000000000..2b2a3b3bbf3536a40a5159d8030a9e690fd040ca GIT binary patch literal 11112 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-safari.png b/docs/img/sponsors/3-safari.png new file mode 100644 index 0000000000000000000000000000000000000000..c03e40e841ac33d8a437bd17c1343808be98f5d8 GIT binary patch literal 4419 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
  • Schuberg Philis
  • ProReNata AB
    • - +
  • SGA Websites
  • Sirono
  • Vinta Software Studio
    • @@ -111,12 +111,12 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Triggered Messaging
    • - +
  • Garfo
  • Shippo
  • Gizmag
  • Tivix
    • - +
  • Safari
  • Bright Loop
  • ABA Systems
  • beefarm.ru
    • From 322476c3863090dc2ddbedfcb21ddab7bb64ab35 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 4 Aug 2014 09:20:27 +0100 Subject: [PATCH 0652/1652] Latest sponsor update --- docs/img/sponsors/3-garfo.png | Bin 4621 -> 3322 bytes docs/topics/kickstarter-announcement.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/img/sponsors/3-garfo.png b/docs/img/sponsors/3-garfo.png index 7c3f8e05958b7daff4201e807ec723edb2e21c96..a9bdea0a042cdd08df7a8babfbf264c83c5f2a83 100644 GIT binary patch literal 3322 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 diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index f1a1b6dd7..49757c22b 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -137,5 +137,5 @@ The serious financial contribution that our silver sponsors have made is very mu
    -**Individual contributions**: Paul Hallet, Paul Whipp, Jannis Leidel, Johannes Spielmann, Chris Heisel. +**Individual contributions**: Paul Hallet, Paul Whipp, Jannis Leidel, Johannes Spielmann, Chris Heisel, Marwan Alsabbagh. From 2d6469348de71f04507f00a5e0e608ae49829dd1 Mon Sep 17 00:00:00 2001 From: Jason Alan Palmer Date: Tue, 5 Aug 2014 10:25:48 -0400 Subject: [PATCH 0653/1652] Remove duplicate class attributes These duplicate attributes are ignored by at least Firefox and Chrome, so this change has no effect on the style --- rest_framework/templates/rest_framework/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 7067ee2f0..e96fa8ec5 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -93,7 +93,7 @@ {% endif %} {% if options_form %} -
    + {% csrf_token %} @@ -101,7 +101,7 @@ {% endif %} {% if delete_form %} - + {% csrf_token %} From 83597a4b0f80f6766d49c95d0102896af487f78c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 5 Aug 2014 15:31:39 +0100 Subject: [PATCH 0654/1652] Latest sponsor update --- docs/img/sponsors/2-rapasso.png | Bin 0 -> 13667 bytes docs/img/sponsors/3-aditium.png | Bin 0 -> 3028 bytes docs/img/sponsors/3-alwaysdata.png | Bin 0 -> 9349 bytes docs/img/sponsors/3-vzzual.png | Bin 0 -> 12008 bytes docs/topics/kickstarter-announcement.md | 10 ++++++---- 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 docs/img/sponsors/2-rapasso.png create mode 100644 docs/img/sponsors/3-aditium.png create mode 100644 docs/img/sponsors/3-alwaysdata.png create mode 100644 docs/img/sponsors/3-vzzual.png diff --git a/docs/img/sponsors/2-rapasso.png b/docs/img/sponsors/2-rapasso.png new file mode 100644 index 0000000000000000000000000000000000000000..618e294be25ad5061e11de924548e2da80d541bb GIT binary patch literal 13667 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 B8BYKJ literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-aditium.png b/docs/img/sponsors/3-aditium.png new file mode 100644 index 0000000000000000000000000000000000000000..0952b08c810dbcedc410bb63440836801714ea5f GIT binary patch literal 3028 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-vzzual.png b/docs/img/sponsors/3-vzzual.png new file mode 100644 index 0000000000000000000000000000000000000000..98edce028dfe8792911e42bb00ccdb604fc033d8 GIT binary patch literal 12008 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 X^_+;Y%S`Lf>qGL=%2JgQ#zFrJVp;ic literal 0 HcmV?d00001 diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 49757c22b..1ffa0ed35 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -74,7 +74,7 @@ Our gold sponsors include companies large and small. Many thanks for their signi
  • SGA Websites
  • Sirono
  • Vinta Software Studio
    • - +
  • Rapasso
  • Mirus Research
  • Hipo
  • Byte
    • @@ -108,7 +108,7 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Wildfish
  • Thermondo GmbH
  • Providenz
    • - +
  • alwaysdata.com
  • Triggered Messaging
  • Garfo
    • @@ -120,6 +120,7 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Bright Loop
  • ABA Systems
  • beefarm.ru
    • +
  • Vzzual.com
  • Infinite Code
    • @@ -131,8 +132,9 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Fluxility
  • TrackMaven
  • Nephila
    • - - + +
  • Aditium
    • +
    From 62d0d4e5d2f203d2c1694af363bce88cc1a5d483 Mon Sep 17 00:00:00 2001 From: nimiq Date: Wed, 6 Aug 2014 12:45:58 +0200 Subject: [PATCH 0655/1652] Fix style for some text --- docs/tutorial/5-relationships-and-hyperlinked-apis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 2cf44bf99..aef92d08a 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -29,7 +29,7 @@ Unlike all our other API endpoints, we don't want to use JSON, but instead just The other thing we need to consider when creating the code highlight view is that there's no existing concrete generic view that we can use. We're not returning an object instance, but instead a property of an object instance. -Instead of using a concrete generic view, we'll use the base class for representing instances, and create our own `.get()` method. In your snippets.views add: +Instead of using a concrete generic view, we'll use the base class for representing instances, and create our own `.get()` method. In your `snippets.views` add: from rest_framework import renderers from rest_framework.response import Response From 3217842346cebda578e9398b89fe60fed7d1b2d8 Mon Sep 17 00:00:00 2001 From: Rob Terhaar Date: Wed, 6 Aug 2014 18:55:08 -0400 Subject: [PATCH 0656/1652] minor doc fix, @api_view() needs an iterable --- docs/api-guide/throttling.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index b7c320f01..92f4c22bb 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -58,7 +58,7 @@ using the `APIView` class based views. Or, if you're using the `@api_view` decorator with function based views. - @api_view('GET') + @api_view(['GET']) @throttle_classes([UserRateThrottle]) def example_view(request, format=None): content = { From 617745eca027dc17c37718a67f82700caef5be3a Mon Sep 17 00:00:00 2001 From: Kevin London Date: Wed, 6 Aug 2014 16:26:56 -0700 Subject: [PATCH 0657/1652] Update description of OrderingFilter I added a brief description of how you could specify a different query parameter for the OrderingFilter. --- rest_framework/filters.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 96d15eb9d..c3b846aed 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -116,6 +116,10 @@ class OrderingFilter(BaseFilterBackend): def get_ordering(self, request): """ Ordering is set by a comma delimited ?ordering=... query parameter. + + The `ordering` query parameter can be overridden by setting + the `ordering_param` value on the OrderingFilter or by + specifying an `ORDERING_PARAM` value in the API settings. """ params = request.QUERY_PARAMS.get(self.ordering_param) if params: From 192201d5840f13c8b96f44fdce4645edeb653f0f Mon Sep 17 00:00:00 2001 From: Paul Oswald Date: Thu, 7 Aug 2014 15:48:29 +0900 Subject: [PATCH 0658/1652] remove dep on python_2_unicode_compatible python_2_unicode_compatible is not available in all Django versions --- rest_framework/tests/test_description.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rest_framework/tests/test_description.py b/rest_framework/tests/test_description.py index 52fa55fb8..8aa162613 100644 --- a/rest_framework/tests/test_description.py +++ b/rest_framework/tests/test_description.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from django.test import TestCase -from django.utils.encoding import python_2_unicode_compatible from rest_framework.compat import apply_markdown, smart_text from rest_framework.views import APIView from rest_framework.tests.description import ViewWithNonASCIICharactersInDocstring @@ -108,17 +107,18 @@ class TestViewNamesAndDescriptions(TestCase): """ # use a mock object instead of gettext_lazy to ensure that we can't end # up with a test case string in our l10n catalog - @python_2_unicode_compatible class MockLazyStr(object): def __init__(self, string): self.s = string def __str__(self): return self.s + def __unicode__(self): + return self.s class MockView(APIView): - __doc__ = MockLazyStr("a gettext string") + __doc__ = MockLazyStr(u"a gettext string") - self.assertEqual(MockView().get_view_description(), 'a gettext string') + self.assertEqual(MockView().get_view_description(), u'a gettext string') def test_markdown(self): """ From aac864a55f8aec80f35d43052b67c2558814df16 Mon Sep 17 00:00:00 2001 From: Kevin London Date: Thu, 7 Aug 2014 11:02:48 -0700 Subject: [PATCH 0659/1652] Updated documentation for urls.py I made a small change in the order of the documentation for urls.py. I feel it helps make it clear which lines you should add to the root settings. --- rest_framework/urls.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rest_framework/urls.py b/rest_framework/urls.py index 9c4719f1d..5d70f899a 100644 --- a/rest_framework/urls.py +++ b/rest_framework/urls.py @@ -2,15 +2,15 @@ Login and logout views for the browsable API. Add these to your root URLconf if you're using the browsable API and -your API requires authentication. - -The urls must be namespaced as 'rest_framework', and you should make sure -your authentication settings include `SessionAuthentication`. +your API requires authentication: urlpatterns = patterns('', ... url(r'^auth', include('rest_framework.urls', namespace='rest_framework')) ) + +The urls must be namespaced as 'rest_framework', and you should make sure +your authentication settings include `SessionAuthentication`. """ from __future__ import unicode_literals from rest_framework.compat import patterns, url From bc03d2b553bc2c5bc341bb6fd43f8fe382e3cd41 Mon Sep 17 00:00:00 2001 From: Kevin London Date: Thu, 7 Aug 2014 16:32:40 -0700 Subject: [PATCH 0660/1652] Updated links to Bootstrap components The previous links landed on the the main page and no longer directly linked to specific areas. --- docs/topics/browsable-api.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/topics/browsable-api.md b/docs/topics/browsable-api.md index e32db6958..96cdabe6b 100644 --- a/docs/topics/browsable-api.md +++ b/docs/topics/browsable-api.md @@ -167,10 +167,10 @@ You can now add the `autocomplete_light.ChoiceWidget` widget to the serializer f [bootstrap]: http://getbootstrap.com [cerulean]: ../img/cerulean.png [slate]: ../img/slate.png -[bcustomize]: http://twitter.github.com/bootstrap/customize.html#variables +[bcustomize]: http://getbootstrap.com/2.3.2/customize.html [bswatch]: http://bootswatch.com/ -[bcomponents]: http://twitter.github.com/bootstrap/components.html -[bcomponentsnav]: http://twitter.github.com/bootstrap/components.html#navbar +[bcomponents]: http://getbootstrap.com/2.3.2/components.html +[bcomponentsnav]: http://getbootstrap.com/2.3.2/components.html#navbar [autocomplete-packages]: https://www.djangopackages.com/grids/g/auto-complete/ [django-autocomplete-light]: https://github.com/yourlabs/django-autocomplete-light [django-autocomplete-light-install]: http://django-autocomplete-light.readthedocs.org/en/latest/#install From 5eb901cd2a7dc2e33034f49e076bf7af7656655a Mon Sep 17 00:00:00 2001 From: Federico Capoano Date: Fri, 8 Aug 2014 14:25:02 +0200 Subject: [PATCH 0661/1652] docs: added reference to DRF-gis in fields added django-rest-framework-gis to third party packages section in /docs/api-guide/fields.md --- docs/api-guide/fields.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 813fc381d..dd2795415 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -361,6 +361,9 @@ The [drf-compound-fields][drf-compound-fields] package provides "compound" seria The [drf-extra-fields][drf-extra-fields] package provides extra serializer fields for REST framework, including `Base64ImageField` and `PointField` classes. +## django-rest-framework-gis + +The [django-rest-framework-gis][django-rest-framework-gis] package provides geographic addons for django rest framework like a `GeometryField` field and a GeoJSON serializer. [cite]: https://docs.djangoproject.com/en/dev/ref/forms/api/#django.forms.Form.cleaned_data @@ -370,3 +373,4 @@ The [drf-extra-fields][drf-extra-fields] package provides extra serializer field [iso8601]: http://www.w3.org/TR/NOTE-datetime [drf-compound-fields]: http://drf-compound-fields.readthedocs.org [drf-extra-fields]: https://github.com/Hipo/drf-extra-fields +[django-rest-framework-gis]: https://github.com/djangonauts/django-rest-framework-gis From c462a43a872b45d27def08a3d17799b930950860 Mon Sep 17 00:00:00 2001 From: Federico Capoano Date: Fri, 8 Aug 2014 14:39:56 +0200 Subject: [PATCH 0662/1652] docs: added reference to gis serializer added reference to GeoFeatureModelSerializer of django-rest-framework-gis --- docs/api-guide/serializers.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 72568e53d..29b7851b6 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -590,6 +590,11 @@ The following third party packages are also available. The [django-rest-framework-mongoengine][mongoengine] package provides a `MongoEngineModelSerializer` serializer class that supports using MongoDB as the storage layer for Django REST framework. +## GeoFeatureModelSerializer + +The [django-rest-framework-gis][django-rest-framework-gis] package provides a `GeoFeatureModelSerializer` serializer class that supports GeoJSON both for read and write operations. + [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion [relations]: relations.md [mongoengine]: https://github.com/umutbozkurt/django-rest-framework-mongoengine +[django-rest-framework-gis]: https://github.com/djangonauts/django-rest-framework-gis From 09c53bbac9205b46bafd77e456b495c63c9d46ef Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 11 Aug 2014 16:20:27 +0100 Subject: [PATCH 0663/1652] Refactor JSONRenderer slightly for easier overriding --- rest_framework/renderers.py | 41 +++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 484961add..7048d87de 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -54,32 +54,37 @@ class JSONRenderer(BaseRenderer): format = 'json' encoder_class = encoders.JSONEncoder ensure_ascii = True - charset = None - # JSON is a binary encoding, that can be encoded as utf-8, utf-16 or utf-32. + + # We don't set a charset because JSON is a binary encoding, + # that can be encoded as utf-8, utf-16 or utf-32. # See: http://www.ietf.org/rfc/rfc4627.txt # Also: http://lucumr.pocoo.org/2013/7/19/application-mimetypes-and-encodings/ + charset = None - def render(self, data, accepted_media_type=None, renderer_context=None): - """ - Render `data` into JSON. - """ - if data is None: - return bytes() - - # If 'indent' is provided in the context, then pretty print the result. - # E.g. If we're being called by the BrowsableAPIRenderer. - renderer_context = renderer_context or {} - indent = renderer_context.get('indent', None) - + def get_indent(self, accepted_media_type, renderer_context): if accepted_media_type: # If the media type looks like 'application/json; indent=4', # then pretty print the result. base_media_type, params = parse_header(accepted_media_type.encode('ascii')) - indent = params.get('indent', indent) try: - indent = max(min(int(indent), 8), 0) - except (ValueError, TypeError): - indent = None + return max(min(int(params['indent']), 8), 0) + except (KeyError, ValueError, TypeError): + pass + + # If 'indent' is provided in the context, then pretty print the result. + # E.g. If we're being called by the BrowsableAPIRenderer. + return renderer_context.get('indent', None) + + + def render(self, data, accepted_media_type=None, renderer_context=None): + """ + Render `data` into JSON, returning a bytestring. + """ + if data is None: + return bytes() + + renderer_context = renderer_context or {} + indent = self.get_indent(accepted_media_type, renderer_context) ret = json.dumps(data, cls=self.encoder_class, indent=indent, ensure_ascii=self.ensure_ascii) From f46b55b75f284a2fa3b1c79300c282f6cbdfc1ee Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 12 Aug 2014 13:44:00 +0100 Subject: [PATCH 0664/1652] Added OpenEye as a silver sponsor --- docs/img/sponsors/3-openeye.png | Bin 0 -> 14155 bytes docs/topics/kickstarter-announcement.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 docs/img/sponsors/3-openeye.png diff --git a/docs/img/sponsors/3-openeye.png b/docs/img/sponsors/3-openeye.png new file mode 100644 index 0000000000000000000000000000000000000000..573140ed6b6bf34c78718b8d07e4c359c902a54c GIT binary patch literal 14155 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

    h*$d3((gICI>AV!|tP8~1&?mtj6 zeDCL1Q<70J2P;weK=&8JZ%Ml!0Q2Za_;;92FgmFdRhh!@cDEipm?RN1soYb4g2rW5PqP|BMxf$0%nJON!&S3b(ZLeHK zVD`rmd~hmltM-&Nn<_zFSC>sP&eR7QBOw`DDY-p&EhI1*7vb1#efz_aBioxmouKXN zc*l7EoDGew2`N!)M@&y0-^649n@c0~Mwz!=^Jo3WwiNAF!1q`8U)%`+gM(dfzJQr? z?V!Htjr*ds$+WERVQqFlO+Kod9?qI)F2^Y2i(-AJpv8%NE=$tzXeNi^<+v;@fCRTU zSk<+$kl`!1kFM!WhPoB?ciO?`OqTCs6)aJpppg>70RF+62=rMAWD$gk} z+{}`|v9a=X{WyTfXEv9pB?8RaY|wsIv^PMgiFad|^zLS9N?DlVPDNGcgtjbR;5s57 z511c%aw#>wfMo)Gcb;&-_dR5JO9C!i?P3U{?I67uhbK1Q zt9{u6ymaEZqTa%AGk1R>jbx9-()IuvHl?^KClVl4utZH*l>Q z6c;s{Go47+*d0jm#*;!ELoSLBFTS zC1Z&rgM)o*^fIdy(=4jg4Jnd8ak7DW6rW5YA;@tEIzRG)zTcKT+P#IcW;UQ&9yl$; z&3So!xyZJinsWtUhg4AoHv8Z6H6~;`^)2ZtwWxPshNQ1A}Z}b-K20H(l-p~ z$?3|Z)bDFNWJNNhAl(HSUDM|8j1W28rq{k|apPd1kUPFe9fnIiQy4J%J+^Q7HbX%R z8c<5cDBB-nkpz6-C4TvREm~1=S+J^Krrp6ZW;fIMoLNEm8))LG1=*J%eQR@}d>3z! zuk*+Ckl{KeA_bRewn&4agu{WETw1jgS(kgYIJ}y+=d}&#{?y9CVK#Bqs4D&{7>!mz z_0K^(yREF(q*!EelL$@i<(_cn3nG{8YQ;bsnS4%!O?~%yC^H|+c4^$rm&`Vjn}D^L zmRfifU6s!;lj;u5wZ%WLg^m*?7ZI5SCzVqhhYau$6U|-i>_O$&7aZ!T*0+txFE`;g@a4@Vvf*BJ>vLira3rjO_ph|Ryt;G zQr10~d(7N9>fFKr3QJ=(B#M0YNl?;Kf6Fs;ht-_1vFYsn^^e1Ywt6sXaQMNm(ywXO zv_w1><*5^9(;y}bp+y*I>gm`=@&@&LVr$y(Sut67jfZfz<%MYHJIe5Wv-ah^eb&6LnBVyB zRfMb8$YKuo2vNS%FDU0CSBAHIKB>IPtPqDt!2kItZXXI_^iUz&u{mRVBE8xhyFGA+ zr35jyaElNSViGqj&M)t{nQpHFI2VS8tc*iC_MeLbfLDQ`xDq5d52L`tk>%=IL&)REO0f1 z<+&3CAIE@^w#5^^Rzq9mtudk!f1Y?e-xzk1B6hye>yua|Jw3_PA9RLk_A4E!^Cp5G zSfCGJC|dn9N!uF|9>kY2be(@Y5T@ZSsK8ge+kmyfsbp5VhfPnZTQ?X0QQkb;u6A6XlsoK6qFApc9^CaCVvua}<{6D5M zRnIT14=>!bnFF$ScIJHZkm8p`r>#|}PbWoCkyqkiQ6->GmYKe!aFn<%ingk9e+ocN zLEM=)KXf2^A{ZA1GU?BeWlwI466>E>Xw)I?3{{b1b4Wv?3T%r++Mt2w|BZMZu} z zic9wyU7Fkxi1kFWIOkEweBQTsomyF`-Cz{t?MN)>bK7V5{-mYH6c`~0>B7Ehx-y;n zuq{QlJBUVWe6d9j(SY*DE7ua<6^0ODc50m4HGi=2H{)7r%MY)YPy1MM=}gs75;rN> zdOm+zI}|%W7eanw-d9$`j52+4rG*Ko+Zl)Z zjVSJ3-wY0E`FIH(<-2Q|R5N{i19SP^RFgGF4yUp;;L}N<;)bKsD}E&AY7QjQBBC0=&+x6%s#@)r#cHQ^Ayp25k4b9X1>%sn)x_?O=O}yi*W2om z%e`t#N=gdYhES0mENAv2QT`sAPQCGD-tW@|RiDuPl?$RvJ3=D}7KMff(9%lX;cvCs z5xM_}Tkj3%%@Ur>sg%KnRK|3H$l?@7W|d3E#7ebDrX6ygL0zX)uN}Tcc0BBJcIrwhJz3# zCpuyCAfJx;9>2VI<%#|}y6Y&KNyPh65WNJ!&%i+RjCQ7VNPw5f)y?NCaTt}%*hisl z*$Olm7^e05#UPA@lgiTVA2qt~r3TSm*_F(YB30qqUT_mSefKVkY&6&I&wL^iUX6x* z3;L+%F9uKG68=n)>y-H8$Y+0jeY51F=sz9OHomk=N?IFM*Iz-OSBqP{M~y<>Si+)e z?kXRHtAUNU=V%EZbyDf|1+191E%mwKS)JW(io#tm1)cr&N0as60|KVziK`PQ#a_Cy zRn5$SCdWz4DgxwL`n=S=O6Jo$d6Pj5RJ!*IyuERbfUi5{$MyC(MT5ixD`{mj7H(o6 zAl&z9>bTRcY8E4C6fU4)S$2T@-e$aTA21(kMcTYWJD*0Muc4M`;l$_ku%Z~_T?j8L zTzwW=I++Sbw||DrnvQ&yix!JJ%-;|?DbVf7SF6__Gf0t7)iq8 zCR)inPjI(uoZ;h&mClPxm720^(y@124A^G^Oi$+<> zddI?-a19k2yt7&gGM$C|H3!+3`gz%qh-q)sLJsipNephila

  • Aditium
    • - +
  • OpenEye Scientific Software
    • From 7551db23caddbe7a0e01d01fb314daeaf2a61257 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 12 Aug 2014 13:47:34 +0100 Subject: [PATCH 0665/1652] Added Rob Spectre --- docs/topics/kickstarter-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 132153375..ab12c4cfa 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -139,5 +139,5 @@ The serious financial contribution that our silver sponsors have made is very mu
    -**Individual contributions**: Paul Hallet, Paul Whipp, Jannis Leidel, Johannes Spielmann, Chris Heisel, Marwan Alsabbagh. +**Individual contributions**: Paul Hallet, Paul Whipp, Jannis Leidel, Johannes Spielmann, Rob Spectre, Chris Heisel, Marwan Alsabbagh. From c716f35825b708a01c4c1fab07860634cc0e4b9a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 12 Aug 2014 14:57:27 +0100 Subject: [PATCH 0666/1652] Added Cantemo --- docs/img/sponsors/3-cantemo.gif | Bin 0 -> 4526 bytes docs/img/sponsors/3-teonite.png | Bin 0 -> 7882 bytes docs/topics/kickstarter-announcement.md | 3 ++- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 docs/img/sponsors/3-cantemo.gif create mode 100644 docs/img/sponsors/3-teonite.png diff --git a/docs/img/sponsors/3-cantemo.gif b/docs/img/sponsors/3-cantemo.gif new file mode 100644 index 0000000000000000000000000000000000000000..17b1e8d05f7f7526e4043c181801f0f226fd7dec GIT binary patch literal 4526 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 M$5zCOk^r#y7k4IG=Kufz literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-teonite.png b/docs/img/sponsors/3-teonite.png new file mode 100644 index 0000000000000000000000000000000000000000..0c09847837b9dfcf8e79909f3a8b4b668c3491da GIT binary patch literal 7882 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 Systems
  • beefarm.ru
  • Vzzual.com
    • -
  • Infinite Code
    • @@ -130,11 +129,13 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Blimp
  • Pathwright
  • Fluxility
    • +
  • Teonite
  • TrackMaven
  • Nephila
  • Aditium
  • OpenEye Scientific Software
    • +
  • Cantemo
    • From 5d674927b8d98d6c76a97e06496f2033108689eb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 12 Aug 2014 14:59:17 +0100 Subject: [PATCH 0667/1652] Minor docs style change --- docs/topics/kickstarter-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 370d950db..7726cb83b 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -138,7 +138,7 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Cantemo
    • -
    +
    **Individual contributions**: Paul Hallet, Paul Whipp, Jannis Leidel, Johannes Spielmann, Rob Spectre, Chris Heisel, Marwan Alsabbagh. From c52075f392420356c471860dc07f9371002efe39 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 13 Aug 2014 14:02:09 +0100 Subject: [PATCH 0668/1652] Latest sponsor update --- docs/img/sponsors/2-nexthub.png | Bin 0 -> 2562 bytes docs/img/sponsors/3-crosswordtracker.png | Bin 0 -> 6715 bytes docs/img/sponsors/3-phurba.png | Bin 0 -> 3064 bytes docs/img/sponsors/3-transcode.png | Bin 0 -> 8615 bytes docs/topics/kickstarter-announcement.md | 6 ++++-- 5 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 docs/img/sponsors/2-nexthub.png create mode 100644 docs/img/sponsors/3-crosswordtracker.png create mode 100644 docs/img/sponsors/3-phurba.png create mode 100644 docs/img/sponsors/3-transcode.png diff --git a/docs/img/sponsors/2-nexthub.png b/docs/img/sponsors/2-nexthub.png new file mode 100644 index 0000000000000000000000000000000000000000..9bf76e0bf26a5cd16a916cb38d87dfa7801ceaa9 GIT binary patch literal 2562 zcmV+d3jOtoP)_I%Ai~h3 zM2$a;6&Z&?5fl^^f)Yfk1LKT^83Z8^ngOLs3HC;Gupyv`0>b((Y&3?Dd}Yho`<)-p z48xD)oZTmT_wJtEd!7*DJci*$U|0l(MPOJ2hDBgl1cpUmSOg~UB6N87rZV6fFdC$R zR4@t*0S&lw11bVKw=_rw)4^tN42UAg0Z)S3+|dCL0UenDCW8INbo{wE2>Nkndny7t zuMT(%oQhI_g3JM>xYIomK|KQGGyjMt0rE42JKX~j&{0*uCIbTGXApNhVG+NBQdA)CUog97&Kz z7mp;U3O@^_J4unM5 zLO_I>nse&miwKnoi6A$jDmZM5v6}N)>DBHd0{)7S44oXc!640f{0*AOBHTIR{BbpsI*at&7(tv3{R-=I`6 z4<$4zG&dx{Iz#cM2dSLBqJ}M3T|BBew+eE(*HEl-UQjk@2V6!I5n->ap3*468bfi) zc|k%DPddrcwQM3XBx^dkWojglJBzml`Rrp811oLOuqnnoZj9j=zqZO`-%mq7MPyV+ ziz4>(!Lu5V@@t99R}spA&x!0vc8u^sk1d8{8W&d=Wgy{1BBO#Vw;x?htku9H7E1G< zkJlShW)oUl$O89)8$eCaMx8*O3;qnkIZetUlr=c(_K8I{4&hKg>U9y=6UP!vvvp9{ zmwNzm<4gd#PH;cps#bUr$DufpKu$V)^7VS>mZ4J^mu&jZcc3L-uUEVb{R}VGxMaJ_ zOTK)(HfDgj8BJR!bYGq*Zd-Z1=%0C=7_{nYF+8iK7`>+HY2?4<|MkmkBl@gpFS;zd z(S!s`BDwE~MfgvK*3nKNyP_leX0{b~XSEP%>+6Z}*|o&e8$%H>X2TUC1(NiK97)T& z##(GTO4n{@yxz`UJ=}AGva{r0^@HmZ#DtACBJTL&kU#g%%xgvBvTl(`unJtx_blqW zs()5t4c!@?G7z2r@cO#iJN{fenO#$)u5BceS9I`V6bRghJLK_iwMlgPc|S6%c~nEb zPSV!Z6TQwBg48Gw$S=4&kliBX;rHvEn&7bW3*!L@(eu5I`zekBff8Zi-q0mr7C5;e zCv+-(dq_+qBEiH>Au(-RNX*X(9YuVzK@}E3zW}8`DmVy4e&+58iK$y03IJY$0Q2_z zKQ8bC=*J@Hlb{pWRZxI}yt*qSp5JUwfJtfun7gOwxWH0Sn?;CTfZAYjaRL-%&hC(S zajUsUhLkO1XGkoFEUsTb5{nR-0A;}#a3oR*@-r_dBwpTe=CL84-?9AV%bzi0N1?-i zB%B0e0WT<*ud|9=jD@h@yWBhhQS^~RC! zQBj3OIJX4%g5w4nzDO|37q)*V_zdu-Qvm_Wg9Q#c!!@6~l7XTGb-~U!lpz1eP&2MY zKm+tFY+Zn5h!YWzbV)ECoMH+7|sLd8v4Y?i61CN6N;1TdT*zJi3 zC&0B{i+}`LI+Eab@QNIXiixiq*yqU_Lq#t|P!b%l++cD|A{|tYAkGWHA`fK9@J<8- zeU$?VazMK%<2@f_dmuwEZ$wZNL)#Ke17%{2yB7G7xClRi>f}X0kku?N7Rl}E5gOya z-GfnK8EFwzVd-kie;w^L=TJf|@nxHnF%OS_vHUKm@shTFJEtFIkkJse_HO)t-zBL!F7Bj-S~`@>f~I;Aq?Y zK~F?j=R^ecNXW5};9sDF!y=j{o`@j#SFUs+LYk%I`V*+F+~CublII-yvj5 z1XBeksh-{JHr^8vE;1#;N@{!Pjzs9_fdqdUnIp(!*=h*a8SJYb-}p+s)cspiB6Qar z=uCM_ipSUg&Ll3vW>X@hxLoxjC_)l(5vH3G;b~2;G->$RG=luT8EYB*Fez&OkHn+q#YU?Sapq5g2DW`KN>R3 zcDUU^F#;WCSxQ7fZ8(ZnLyk)d6b>n-6TZ>$}}-+lB$ zhKA~fSKXIv%7eI7`MZz)tvXJL@k1oXRQY^o8=nK@jx#Gneef9A5=O_%N6H59oUGvl z7xU--f+fngCC7J*?A7#4wH5txYh Y2SX%gy8p5YasU7T07*qoM6N<$f{a#oIRF3v literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-crosswordtracker.png b/docs/img/sponsors/3-crosswordtracker.png new file mode 100644 index 0000000000000000000000000000000000000000..f72362ea97e1f4a627e897920a56ca4155a0a733 GIT binary patch literal 6715 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-phurba.png b/docs/img/sponsors/3-phurba.png new file mode 100644 index 0000000000000000000000000000000000000000..657d872c99df0ac4eea35032c996ac830353ff1e GIT binary patch literal 3064 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-transcode.png b/docs/img/sponsors/3-transcode.png new file mode 100644 index 0000000000000000000000000000000000000000..1faad69d946facc0a733a863204d7a0aac511d42 GIT binary patch literal 8615 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
  • Crate
  • Cryptico Corp
    • +
  • NextHub
  • Envision Linux
    • @@ -110,7 +111,7 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Providenz
  • alwaysdata.com
  • Triggered Messaging
    • - +
  • Transcode
  • Garfo
  • Shippo
    • @@ -123,7 +124,7 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Vzzual.com
  • Infinite Code
    • - +
  • Crossword Tracker
  • PkgFarm
  • Life. The Game.
  • Blimp
    • @@ -131,6 +132,7 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Fluxility
  • Teonite
  • TrackMaven
    • +
  • Phurba
  • Nephila
  • Aditium
    • From 34c1da3515dbf4e9a0d645ebf81cde6f61254e31 Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Wed, 13 Aug 2014 15:31:25 -0500 Subject: [PATCH 0669/1652] ModelSerializer.restore_object - errors as list When a ValueError is raised in ModelSerializer.restore_object, the error is set to a one-element list, rather than a bare string. --- rest_framework/serializers.py | 2 +- rest_framework/tests/test_serializer.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index c2b414d7a..43d339da0 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -977,7 +977,7 @@ class ModelSerializer(Serializer): try: setattr(instance, key, val) except ValueError: - self._errors[key] = self.error_messages['required'] + self._errors[key] = [self.error_messages['required']] # Any relations that cannot be set until we've # saved the model get hidden away on these diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py index 91248ce7c..fb2eac0ba 100644 --- a/rest_framework/tests/test_serializer.py +++ b/rest_framework/tests/test_serializer.py @@ -685,7 +685,7 @@ class ModelValidationTests(TestCase): photo_serializer = PhotoSerializer(instance=photo, data={'album': ''}, partial=True) self.assertFalse(photo_serializer.is_valid()) self.assertTrue('album' in photo_serializer.errors) - self.assertEqual(photo_serializer.errors['album'], photo_serializer.error_messages['required']) + self.assertEqual(photo_serializer.errors['album'], [photo_serializer.error_messages['required']]) def test_foreign_key_with_partial(self): """ From bdb884aceb57d8d4e17a9176d557b6ff879f5a02 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 14 Aug 2014 16:57:21 +0100 Subject: [PATCH 0670/1652] Latest sponsor update --- docs/img/sponsors/3-makespace.png | Bin 0 -> 8420 bytes docs/topics/kickstarter-announcement.md | 1 + 2 files changed, 1 insertion(+) create mode 100644 docs/img/sponsors/3-makespace.png diff --git a/docs/img/sponsors/3-makespace.png b/docs/img/sponsors/3-makespace.png new file mode 100644 index 0000000000000000000000000000000000000000..80b793619c304b4b6a09b4bac0001e0a35b54d68 GIT binary patch literal 8420 zcmbVycQjmI_qQ?_UDPnjAQ2@P6LpL-jNWV1Fc`g#QKR=rL~jwjCwhbsU6kmecY@#> zL6GSDsc-G?WG!LCAtMcj`@(JkT+mn)*w@9`)f46`#ql>T?6&@=S&#$#Hwo5B zisN5O8EI&P<=rr7u!z7Tert%35Li@HKuB0bR8;687zz=B3PNsAQGOv|n20D0DhB@d z!Eq}MV`B@`MJoPV*6ouNhdmbS4igmg@$nJxc_iS5u@e-MkdXL;0fqA4Qt*5Fxnfbi z{H~sy{~#dIp4J!#cdUb(EBFs0%F4|PE5&iE>A$+*;;y0bA7EF{e;ex7WP-jZcR?Wm zh@gwhpML#K?TOVz{~tB}E48P-pF3Jm7wzfhg|WW%hb`wn%(u4t-v#|4ywwJ#g>krb z3d$MjX6@yIcEze7r8sWi2-rB-z!c@g6orJugdt*3h^V-bkT?{IKuCxyB1PpyAwr6f ze=zQtVVJ{z(Lho0|Lr+a42lp|d?cnQtf0v8Z(f`KAFB!8DkJzOJpQk6`KReN z2LDw56a2Ri{~11L*V{3Jxg8vaUu)ZNa9F5SkO+O>`CW6O0R5h68B;w`Vt#g7TzSDz z06+(*k?^F5;m+BCJfH|@<)@W$!efPt(5Cvi^PB@-#GS7!cqdVl8&?i^e=&eLL%(KzVM|LAa{pwsazWwqTEjr&AWn&Y@>?R)qD7i!o zJTqlrg{ld5lN}m>D`Cppm00DfQ!H@G+qy^uoS+CG=+hGjYm_se{-uWZLNSO=f^5$8 zco%wTvQeGjmckD_kYR2(p)>+$@XdIzfy?N4aRF$u2$H-_OEbAei`5>#PEiH_Y#Fk$tHkB&!!v2><>S_I-uDhlsO&ar3Aawx%p1 z;L8WW8z&$7TDvCXdGsVVvYlH*f8%rt2{R8-~lQFkO8pFR+mcz7AW?_u*gBVMEd@_ku!vR`Zr8gFg{j?3C#9&fTb-@6UqOdQ;yuK6HrT4}(qfzh=@U{?}0lUg~ z4Mpv>2pjdKkppbpx30;J?QEmdUw>I7l#JrW4J=GYVxf+l8e9_}9A6E1?tLrTAAHAR z=1LB*Xi}FJy8j@M{&$9DX53V^^&~sB`dH(%9)vGIJc3Zf_wIu9C4?}W`o{k~%4c?Zi^jLI2Yi6|m?vJadY51hSfWHzw4zEaF8?nK4QRqc z?~IUo&BI5azR_k8s*P{TAi6^v!)Fs~M>==!!RZFYn5hcVY@nEV^cwYJ2ZXkK^vc!V#??kq5Ia(UbMQID7D*1j=3bHc? zRls%7N!Shf527H)@75YtN$Zv)i8mdcA3av}lx-l4FMfnEb-pg`lk=TYG~7yj20q=} z_}7`^-uJ@su_Ug9Zts~XT%3$#%5Q`C+Sirup;RMdm2EL_B=521>OC*}I%J<381DctWbdHyPoOFW4~_Wsb1LPw;*s1vt{W!t2|+AHsyL@iO|t ze%DKprM^m+(l(NuZ>&$d!nXTK>+i3wr-!?4?gCd_r*B$h9f~JX7QaXknve88VQX-H zTxtAT4QFkJj|djGaCFv&rdXT*DxV^>jUbP-MNCH{inib(Zew?^d=|Zx$I&EA1Fy0z7@L{znpLkC z&}G}TtZj>W#y30%lNo4eh zc23^LUH6F?Mt3bvex<89!XEWu+w9|egB_{^&N1LMV<`OQ*#AT6AosL)Lgx4BwTso) zo7%k72mK=3dFH=t!$e&9fz-M*sKezm2xb(1`uz#~x2{E29O7xrVNr_;VN#?G$6N&- zorYd5MVUaECbLds(l~HhJhtMH$YwcmQyfsyT)&@RTb$M*`qUya-Ez084TIyo{32B6 zmt;498T#geK%!E>Oo3B8G6||@c{8k+5aH=4xT~TIa|*R#&r}vgD5gxM_7`_mb-xt} zWx=QK7-eYarWT$Su;Vh_yoaGTey!zo^`e}f?}3P21i`NKE1xEkN6I`K-A!qHEA!DLeM* zaviOV#Q^Xmu~A5o{ilgo%mgRbwpd%N~i|$ zxM8psd1Lby^QnLplQ2aYdqe`GDwUk=YJ&KAR9msIGcN9D^*TMqvWGeOorY^RBtUJa z)y42Eh=4ykw!NNVnG8h8|JHbh8=naqRpm9GcU41>_WF4kSvY;m#z0@dd*J~4@w>;5 z{W~Rxqw`qC`brW$B>Rkz)>28j_5feS4CJNoz-4RFTO#jUhPW8j5+#px_BUsv98amr zY$Hk2nXsyZsIfMG?ib5PJVhW3s}r*c@NLmyWa?-udF319_N7D3Z{|kK?=(UgKOfw(y-&Rpe`mbPtm%6hyNAot>wtHvgp5 zdo-U7rv>&gn@ZZB>GHZVk?JNKFXqJ9{4E^G-;LF|F&R~#%B?rjB2t3|p;v}qWEVVn zhz}%2lpB`CxqOAM)OhH-@FV2#zqYfl84RL|PH+iZ7B{@P`;n21z*$C3F8pQJ zdoBi{TgwM0)YLxW^0z#J{PRCjS;&s970RJ=MxSX(F=E%!4S{yu%WXPm%=NVBWpj{y^y?ty& zuRb#&I{5T$K&QD1v8y`$1^bj`j+K9^`vRi^(;en)G7hrVh~KD*(Eoa8 zZ0%91+3h;~W3oGji79CXn}Ihfb9TZb(#_-@8T9xjZ06cXclDXmp62G>vJwnvEtk9; zAJQRr43gs8{v<+4wHRYhn14IV?8746TuSYja$I~vv}5T56GvH`KO}}KmlgwPYgN*2 zS1~V_{q)U@2mJj_N@ThBfF_kXTf)PZgO8q;eW*+M<ZZmKJRNJ^ronXYO=I@DhfQ71sR(0(zBgyW=n6w-dO1m%Aksup$R-h3fFKKEy zxB!;doCo7cpHP~Qf!+)een|DAR9ro-Z04d$s@v0IBjPO-<5i4!0a@Pa&u zW)M~%!~mSuk6JM1IaqoA5jC}WC1;*uDued}Y>0AuranvRRK-jcrpQwxET%QuH{KMV z9uH6B-Tk@JvrqfmRJpQZpl+WZ%HE&+qMi&^qbfiYw;1S6)ud{is{7`i!X3SbG$DgK z(OotIRTY~|z{oo+Ee^6yS%!Gz;yt?kbj1zpbA|=kUwYx|@|mgL%=J6Ccp33aP6iTy zsOj&3_u~mI+1Vr@fg5(_oZ?ThzmjGrlSKQpl}(XTToA}Tyf+tyVMt-%4A*Wn%}I3# ze;-x)Q!o{9dpER)r8KmfTi6-9zGv^SAJ$_R6#ksi=bo39s{D;3(}(4V-sq%g=YAQbLj5 zO5_y{zxHn7WjKH9Ru>o$ zIg%%4v1<_PjkBrZmrQm~EtNwPRa~c?S?0_dXBqkahn^hWe3>e+V*8w8x7qtH{ilk^ z?%D6E>z`5@Ldh*{PqnuVOI@C|7eiING$xE?Yt)n`bn5LUszS%@JM!~vICR6Y6^s-z z=Cc%P)`hF8)8@?aEKjXSma?b{h{IHd&%4!bljD5s&zu1{wC-Fx-#pKHu3i*jMZM|o z0KwC5dNgZ&N2Zk*6rgXZW7jp6`=yX34>oq@I9Csmx$E7xylq;ETmgfo+HdyWUuI_SM+LB#) zU_wk3ykI3WCU(qUjJW+ILMS*F^TjB8^Wy(O)bg1wFm%u_|DCVus8OPZlkb*o*Fbm< zFcX;#>ZE&%WgL=xPw(#%L^N%&c;)lSgScG5oik=v8pI(v8uE?KDfRS=<{-M@m^@I; zp&r<981x_|)rMIz(fJqVs3b(LqtLLD`Po5{nu+?^G1(7YuQ~o>8FKJUY}%QWl*XOVIXI zP?9dFuVuNTeDyL$MZqc~%e1Csb3-%K5r18By4K@9Va$i{ZqRB7I5=>Di{)Fwki$FJA=AFEEE z7G2j=h?`G&zq!+ZRf(QidHa_h&w?@9{k%0E`Ey4sTygKx{=Bjxg$GC&tW>13?puW* z<>!m;7^-0(`{;_y46*#aiC?oi2^06bA@N;T@6yS#R;ICJETnJ9J+8j<>*H&8ZwXZb zATqGw6945=oYP;G+QA_=l0!N>UyNf)THxEy(xl9ZXl=WTvm3_BH^kR&XI3%I5Ovop z#+N-~Du6C#=d7}AhPDVQ5XEUqtbDm_G}#x4jkSImFbz1TR?K|ulgMs_X$|69meWQ5 zN&q6_3;{UdW$V5ys-QIraFn`TjWV!~Ddh7;v%c~oI@8;51FqBOr4y#6KF@SjSRwc( znXsZzg|2=(ObJ59TblX@@i}Y2@v6nXQx<|wa0FAWIYR2s&5Zm|k^yv}Uk6Yfnbhur z=VkA2;x2{eUZcms=%#IC?b2Yv0$7kEYjCd#V$tlSbb({ba>YvM8mRRFIQgVNn44cU z`AZ3$`NOeBb^+&MQ5_z_7=JClL7{|{e*rbRTvobDA=#3ItY1ZzW-+U^;tBq^BJ16M zMdWc(Wt2@3D8Hh6yVcT;FL0;OIDR^yVZv|YPJe3xWx5xqvcoT-UQ1}3cDvj#?oM+> z@O|5Rk>li!zty`RJ}7ZkhLb&Y%?+(3|47I5C}E`>Sxa%#q@4Z?CNLeUi8<2oU7{qd z_y`vG(Mv5%_^3$tEGbqg4;;VjHSfAOZ@2s|S&nE(c!Mzs>haQbR8)BInG@Fff}s{f zkS=J>tob%Hp0WNEBvt6MZGPT+=Rs*Aq4I?7E7%n9BFH?R(qz<0@_OAYTtHscOR(G* zKqKa-pfd_9v_mfsXgqK73Y*&F=$6r*)r4*t6&4ajr;% z_!kG7=_wYaD0!RJClN$;<2k*hVN83$?;Ua}2_x!PwAy=?+e!Qqh*-h2a`m8X@sZK? zXG`~v5p2aXaiWMguD;TxQy$S@^X-#Rw9m(*4xyY=%K-)P=BKP=#6pq<)8-Q3A=o9e zFNP@$y!?3c%46n%iDH56qe}5cg$zZDQFX#pbrT^(@i*-P{I^;qpBQ$0+3D0jM)j!m zc9l>u7nUn!4fRerZ~B@S3sbT6JKZgG~5Cp>uatXOZ&;V%bXO-ZYT z-R%UfP84(@@fAaRx_Rc6>g⁣^Z8P_t( zRTS`p(q5J%_v0rJapZcJ#(K`I{}KSl7a8*%vJ(~gfc#+4r5n)ZOS*4+TMu1{js}*I z8%R)F=~R9(d?SFEnRE4avy)onn;3k_40zvS@0z6v|ImiJdvonefvzX__*b1~0a9!% zbOE5MxJ0&*JNt6`vGSR9f(+t`Uc+?t+&lY+#YYTku?YHLi?Z*dD`h~2rQ&PbZ$9q@U7AYH>2L1%Oug}Q`zei5}J#bUx8 zg`rLL`8TAHK7i3STYn{qUv3!})O=92cA@?YHR-pIv9AHEfQp98eH~Zr0(#4rY+xK+ z$j)8>4%6Vxm$pGSWIN5>bBBV_;Mdy}J zHjD6)NfPmrXUoJ2FIVf#R_nxtg+~~lYwGV{#c_WiP6^H)vxYmEl}2WZ`(By>V$Y4c z3Fsy$HpcsXj;>tCxhC&|KA^ZQ@4XsC)<#Sm1|AV*aK3OmI7z#E6oR+Gpv0c6QI{;z zck|PoW0~MxA|kc-X5~40fUUbN`bdlVN)fg1_U)+{!C4@r4>8~u^D0xYGW_+l2+t@} zS$a!P@Pzk?|D_-~<9=;iLasolpFsjsLRzfMW^XBB&f^fm@w(l_ON!7qO_a(OyhLa< z%A?!)>ys1Cy0D45e#B0-d=O)k2Rr)9v)xy5i$K8c1=&}0fzM~}XQ(*w@QG4ZP27gu z=gUuX(IU`}{wkA!>}{T)Ef>Ph`+G)GA1aFS4KdlOhMZ$}uh}4izrMV>c>-aJ@JJwq zwS!G*hC1`C=7*$O_})196Af zokLuSuiql;HfrgOJ9bRBA*E7bouF=HZljmIu9C4?lbs8NW6H83lA#skY{Yl z&)LMT*iccu-^h7NGo*BEbO?>(5T)Xrowgq}V;H(KPM@hl8knu+ig$MB zy5YVUm>fhSF$}BtOR#qF8cvq5i=|!6<)Dh`BzSF$^EZVO=Zy+2N3`Lq zcqebn67Tq!3YR>0AkAoOb+MY#Z2d~K=SLs@JS3%O1;i*$l9)gDBJ`egW$OS( zv)2#a-lV}@XSR$(lLCR|XCbE|@ki3|2!1<$OdKv9ILQJ|lhHeRe0kx~!1$)Nx1#S+ ziLEo4rghEkSD$6OOz2!Mn6d9!6jH?jkP5s~NNnuyL}FhoH4o3(zgYX()Lb_68QBnV zw?hWg-7=)e`9mgv?s{2BBS#qqFJ~`(m&_*}U7B^gCzJV3q0a7z3Pt;?MLp;Ihi%BI z=N0;$hAfWc@VneJGkPXWj*XaTOq&p9IcwH#JUS5AS>SyZ`{PYzMZRKPntg|fw@mu| z$BwcwTea7|Li;S6c&5FZ*s2(xIc3r{xvJG226vPOeE97>ru5Jior8TXPkApZFm`=q z6sm3LUVSfTNXq}-g-F;3o%o;H^vPPDOnzz5j2i=wZb9l)iDWy~{kq!6>F-CNdz+5q z?jC7_lBu1{9VYf7PhoLzx*tRP@KLlxpTL1zXXwR4X8M+9o6nEy4*+d#-r3?D_3|24lBPy>8PH8H2Xb;)wx$u#BQI-SM_>1G zMQu#)@rc+Zf|%bsIeatVlwwL`s%gVH;^4qtn>Urh9GD0!ewRoL&d(kNgpG}9M;C9+ o&8+6@W=i}2lWfupZx}3bKzjwvx#a1ifBrjAQP4zI$ytW|54kT#Z2$lO literal 0 HcmV?d00001 diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index aca6b327c..74b19deb4 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -138,6 +138,7 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Aditium
  • OpenEye Scientific Software
  • Cantemo
    • +
  • MakeSpace
    • From 63d5634c660d21638114ccb35b0b756aae47b713 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 14 Aug 2014 16:59:40 +0100 Subject: [PATCH 0671/1652] Minor sponsor correction --- docs/topics/kickstarter-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 74b19deb4..cb8a13070 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -138,7 +138,7 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Aditium
  • OpenEye Scientific Software
  • Cantemo
    • -
  • MakeSpace
    • +
  • MakeSpace
    • From bfd0b261dbcdab5993f83baefcd732d3d2d194e8 Mon Sep 17 00:00:00 2001 From: catherinedodge Date: Thu, 14 Aug 2014 13:39:21 -0400 Subject: [PATCH 0672/1652] Fixed small typo --- docs/topics/documenting-your-api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/documenting-your-api.md b/docs/topics/documenting-your-api.md index 6291c924a..e20f97122 100644 --- a/docs/topics/documenting-your-api.md +++ b/docs/topics/documenting-your-api.md @@ -95,7 +95,7 @@ You can modify the response behavior to `OPTIONS` requests by overriding the `me To be fully RESTful an API should present its available actions as hypermedia controls in the responses that it sends. -In this approach, rather than documenting the available API endpoints up front, the description instead concentrates on the *media types* that are used. The available actions take may be taken on any given URL are not strictly fixed, but are instead made available by the presence of link and form controls in the returned document. +In this approach, rather than documenting the available API endpoints up front, the description instead concentrates on the *media types* that are used. The available actions that may be taken on any given URL are not strictly fixed, but are instead made available by the presence of link and form controls in the returned document. To implement a hypermedia API you'll need to decide on an appropriate media type for the API, and implement a custom renderer and parser for that media type. The [REST, Hypermedia & HATEOAS][hypermedia-docs] section of the documentation includes pointers to background reading, as well as links to various hypermedia formats. From 4dd7b5f376be7d5f28ba8865cf4ede7ad553b8de Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 15 Aug 2014 12:05:19 +0100 Subject: [PATCH 0673/1652] Replace docs title. Easy is a sucky word choice. --- mkdocs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.py b/mkdocs.py index 529d2314c..adeb60538 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -142,7 +142,7 @@ for (dirpath, dirnames, filenames) in os.walk(docs_dir): toc += template + '\n' if filename == 'index.md': - main_title = 'Django REST framework - APIs made easy' + main_title = 'Django REST framework - Web APIs for Django' else: main_title = main_title + ' - Django REST framework' From a5561954d79659ef987847fc361f83e6226fc885 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 15 Aug 2014 15:36:49 +0100 Subject: [PATCH 0674/1652] Latest sponsor updates --- docs/img/sponsors/3-ax_semantics.png | Bin 0 -> 11509 bytes docs/img/sponsors/3-ipushpull.png | Bin 0 -> 10089 bytes docs/img/sponsors/3-isl.png | Bin 0 -> 19203 bytes docs/topics/kickstarter-announcement.md | 24 +++++++++++++++++++++--- 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 docs/img/sponsors/3-ax_semantics.png create mode 100644 docs/img/sponsors/3-ipushpull.png create mode 100644 docs/img/sponsors/3-isl.png diff --git a/docs/img/sponsors/3-ax_semantics.png b/docs/img/sponsors/3-ax_semantics.png new file mode 100644 index 0000000000000000000000000000000000000000..c072e028a5501bf27cecc2c9c3160c5477bd27a6 GIT binary patch literal 11509 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-ipushpull.png b/docs/img/sponsors/3-ipushpull.png new file mode 100644 index 0000000000000000000000000000000000000000..e70b8bad20c07101a2623bfdb1d6f0fff48fa113 GIT binary patch literal 10089 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 LNkvXXu0mjfSrR97 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/3-isl.png b/docs/img/sponsors/3-isl.png new file mode 100644 index 0000000000000000000000000000000000000000..0bf0cf7c91fe86be1393a066796ed19f8948ac45 GIT binary patch literal 19203 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 Linux - +
    -
    +**Individual backers**: Xitij Ritesh Patel, Howard Sandford. --- @@ -111,6 +111,7 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Providenz
  • alwaysdata.com
  • Triggered Messaging
    • +
  • PushPull Technology Ltd
  • Transcode
  • Garfo
  • Shippo
    • @@ -139,9 +140,26 @@ The serious financial contribution that our silver sponsors have made is very mu
  • OpenEye Scientific Software
  • Cantemo
  • MakeSpace
    • +
  • AX Semantics
    • +
  • ISL
    • -**Individual contributions**: Paul Hallet, Paul Whipp, Jannis Leidel, Johannes Spielmann, Rob Spectre, Chris Heisel, Marwan Alsabbagh. +**Individual backers**: Paul Hallet, Paul Whipp, Dylan Roy, Jannis Leidel, Xavier Ordoquy, Johannes Spielmann, Rob Spectre, Chris Heisel, Marwan Alsabbagh, Haris Ali, Tuomas Toivonen, Simon Haugk. +--- + +### Advocates + +The following individuals made a significant financial contribution to the development of Django REST framework 3, for which I can only offer a huge, warm and sincere thank you! + +**Individual backers**: Jure Cuhalev, Kevin Brolly, Ferenc Szalai, Dougal Matthews, Stefan Foulis, Carlos Hernando, Alen Mujezinovic, Ross Crawford-d'Heureuse, George Kappel, Alasdair Nicol, John Carr, Steve Winton, Trey, Manuel Miranda, David Horn, Vince Mi, Daniel Sears, Jamie Matthews, Ryan Currah, Marty Kemka, Scott Nixon, Moshin Elahi, Kevin Campbell, Jose Antonio Leiva Izquierdo, Kevin Stone, Andrew Godwin, Tijs Teulings, Roger Boardman, Xavier Antoviaque, Darian Moody, Lujeni, Jon Dugan, Wiley Kestner, Daniel C. Silverstein, Daniel Hahler, Subodh Nijsure, Philipp Weidenhiller, Yusuke Muraoka, Danny Roa, Reto Aebersold, Kyle Getrost, Décébal Hormuz, James Dacosta, Matt Long, Mauro Rocco, Tyrel Souza, Ryan Campbell, Ville Jyrkkä, Charalampos Papaloizou, Nikolai Røed Kristiansen, Antoni Aloy López, Celia Oakley, Michał Krawczak, Ivan VenOsdel, Tim Watts, Martin Warne. + +**Corporate backers**: Savannah Informatics, Prism Skylabs. + +--- + +### Supporters + +There were also almost 300 further individuals choosing to help fund the project at other levels or choosing to give anonymously. Again, thank you, thank you, thank you! \ No newline at end of file From e624871a687b9d723f0aa6c7d26cd25ed032a772 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 15 Aug 2014 15:46:26 +0100 Subject: [PATCH 0675/1652] Latest backer update --- docs/topics/kickstarter-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 654750738..48c4673b5 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -154,7 +154,7 @@ The serious financial contribution that our silver sponsors have made is very mu The following individuals made a significant financial contribution to the development of Django REST framework 3, for which I can only offer a huge, warm and sincere thank you! -**Individual backers**: Jure Cuhalev, Kevin Brolly, Ferenc Szalai, Dougal Matthews, Stefan Foulis, Carlos Hernando, Alen Mujezinovic, Ross Crawford-d'Heureuse, George Kappel, Alasdair Nicol, John Carr, Steve Winton, Trey, Manuel Miranda, David Horn, Vince Mi, Daniel Sears, Jamie Matthews, Ryan Currah, Marty Kemka, Scott Nixon, Moshin Elahi, Kevin Campbell, Jose Antonio Leiva Izquierdo, Kevin Stone, Andrew Godwin, Tijs Teulings, Roger Boardman, Xavier Antoviaque, Darian Moody, Lujeni, Jon Dugan, Wiley Kestner, Daniel C. Silverstein, Daniel Hahler, Subodh Nijsure, Philipp Weidenhiller, Yusuke Muraoka, Danny Roa, Reto Aebersold, Kyle Getrost, Décébal Hormuz, James Dacosta, Matt Long, Mauro Rocco, Tyrel Souza, Ryan Campbell, Ville Jyrkkä, Charalampos Papaloizou, Nikolai Røed Kristiansen, Antoni Aloy López, Celia Oakley, Michał Krawczak, Ivan VenOsdel, Tim Watts, Martin Warne. +**Individual backers**: Jure Cuhalev, Kevin Brolly, Ferenc Szalai, Dougal Matthews, Stefan Foulis, Carlos Hernando, Alen Mujezinovic, Ross Crawford-d'Heureuse, George Kappel, Alasdair Nicol, John Carr, Steve Winton, Trey, Manuel Miranda, David Horn, Vince Mi, Daniel Sears, Jamie Matthews, Ryan Currah, Marty Kemka, Scott Nixon, Moshin Elahi, Kevin Campbell, Jose Antonio Leiva Izquierdo, Kevin Stone, Andrew Godwin, Tijs Teulings, Roger Boardman, Xavier Antoviaque, Darian Moody, Lujeni, Jon Dugan, Wiley Kestner, Daniel C. Silverstein, Daniel Hahler, Subodh Nijsure, Philipp Weidenhiller, Yusuke Muraoka, Danny Roa, Reto Aebersold, Kyle Getrost, Décébal Hormuz, James Dacosta, Matt Long, Mauro Rocco, Tyrel Souza, Ryan Campbell, Ville Jyrkkä, Charalampos Papaloizou, Nikolai Røed Kristiansen, Antoni Aloy López, Celia Oakley, Michał Krawczak, Ivan VenOsdel, Tim Watts, Martin Warne, Nicola Jordan. **Corporate backers**: Savannah Informatics, Prism Skylabs. From 4c60639595db16e5b102f3dc20992ccb233b9a80 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 15 Aug 2014 16:19:13 +0100 Subject: [PATCH 0676/1652] Added Holvi --- docs/img/sponsors/3-holvi.png | Bin 0 -> 7533 bytes docs/topics/kickstarter-announcement.md | 1 + 2 files changed, 1 insertion(+) create mode 100644 docs/img/sponsors/3-holvi.png diff --git a/docs/img/sponsors/3-holvi.png b/docs/img/sponsors/3-holvi.png new file mode 100644 index 0000000000000000000000000000000000000000..255e391e09ef5574721d15dbf4559e8600149096 GIT binary patch literal 7533 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
  • Aditium
  • OpenEye Scientific Software
    • +
  • Holvi
  • Cantemo
  • MakeSpace
  • AX Semantics
    • From 967798e83296a9d80fdbd847548d090e633156de Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 15 Aug 2014 17:39:51 +0100 Subject: [PATCH 0677/1652] Added compile to the sponsors --- docs/img/sponsors/2-compile.png | Bin 0 -> 3108 bytes docs/topics/kickstarter-announcement.md | 1 + 2 files changed, 1 insertion(+) create mode 100644 docs/img/sponsors/2-compile.png diff --git a/docs/img/sponsors/2-compile.png b/docs/img/sponsors/2-compile.png new file mode 100644 index 0000000000000000000000000000000000000000..858aa09d46e2dcf750522cc182651b6843347a9a GIT binary patch literal 3108 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 GL;nYaw&I8Y literal 0 HcmV?d00001 diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index fde2a5bc0..d91d2e416 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -91,6 +91,7 @@ Our gold sponsors include companies large and small. Many thanks for their signi
  • Crate
  • Cryptico Corp
  • NextHub
    • +
  • Compile
  • Envision Linux
    • From 172b9c74f9151a826162d5de703dc3b42e8147e9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 15 Aug 2014 17:48:43 +0100 Subject: [PATCH 0678/1652] Latest sponsor update --- docs/topics/kickstarter-announcement.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index d91d2e416..71bb48a62 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -81,8 +81,6 @@ Our gold sponsors include companies large and small. Many thanks for their signi
  • Lightning Kite
  • Opbeat
  • Koordinates
    • - -
  • Heroku
  • Galileo Press
  • Security Compass
    • @@ -97,7 +95,7 @@ Our gold sponsors include companies large and small. Many thanks for their signi
    -**Individual backers**: Xitij Ritesh Patel, Howard Sandford. +**Individual backers**: Xitij Ritesh Patel, Howard Sandford, Simon Haugk. --- @@ -116,7 +114,6 @@ The serious financial contribution that our silver sponsors have made is very mu
  • Transcode
  • Garfo
  • Shippo
    • -
  • Gizmag
  • Tivix
  • Safari
    • @@ -124,7 +121,6 @@ The serious financial contribution that our silver sponsors have made is very mu
  • ABA Systems
  • beefarm.ru
  • Vzzual.com
    • -
  • Infinite Code
  • Crossword Tracker
  • PkgFarm
    • @@ -136,7 +132,6 @@ The serious financial contribution that our silver sponsors have made is very mu
  • TrackMaven
  • Phurba
  • Nephila
    • -
  • Aditium
  • OpenEye Scientific Software
  • Holvi
    • @@ -148,7 +143,7 @@ The serious financial contribution that our silver sponsors have made is very mu
    -**Individual backers**: Paul Hallet, Paul Whipp, Dylan Roy, Jannis Leidel, Xavier Ordoquy, Johannes Spielmann, Rob Spectre, Chris Heisel, Marwan Alsabbagh, Haris Ali, Tuomas Toivonen, Simon Haugk. +**Individual backers**: Paul Hallet, Paul Whipp, Dylan Roy, Jannis Leidel, Xavier Ordoquy, Johannes Spielmann, Rob Spectre, Chris Heisel, Marwan Alsabbagh, Haris Ali, Tuomas Toivonen. --- From 14867705e90b2b5f7e84dc7385d4ffba0c82b3e1 Mon Sep 17 00:00:00 2001 From: sshquack Date: Fri, 15 Aug 2014 20:41:21 -0600 Subject: [PATCH 0679/1652] Specify file names using standard format + Explicitly specify module names in the standard format similar to all the other tutorials + Remove the extra quote around module name --- docs/tutorial/4-authentication-and-permissions.md | 2 +- docs/tutorial/5-relationships-and-hyperlinked-apis.md | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 491df1608..bdbe00ab4 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -129,7 +129,7 @@ Then, add the following property to **both** the `SnippetList` and `SnippetDetai If you open a browser and navigate to the browsable API at the moment, you'll find that you're no longer able to create new code snippets. In order to do so we'd need to be able to login as a user. -We can add a login view for use with the browsable API, by editing the URLconf in our project-level urls.py file. +We can add a login view for use with the browsable API, by editing the URLconf in our project-level `urls.py` file. Add the following import at the top of the file: diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index aef92d08a..deddb13f1 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -4,7 +4,7 @@ At the moment relationships within our API are represented by using primary keys ## Creating an endpoint for the root of our API -Right now we have endpoints for 'snippets' and 'users', but we don't have a single entry point to our API. To create one, we'll use a regular function-based view and the `@api_view` decorator we introduced earlier. +Right now we have endpoints for 'snippets' and 'users', but we don't have a single entry point to our API. To create one, we'll use a regular function-based view and the `@api_view` decorator we introduced earlier. In your `snippets/views.py` add: from rest_framework import renderers from rest_framework.decorators import api_view @@ -29,7 +29,7 @@ Unlike all our other API endpoints, we don't want to use JSON, but instead just The other thing we need to consider when creating the code highlight view is that there's no existing concrete generic view that we can use. We're not returning an object instance, but instead a property of an object instance. -Instead of using a concrete generic view, we'll use the base class for representing instances, and create our own `.get()` method. In your `snippets.views` add: +Instead of using a concrete generic view, we'll use the base class for representing instances, and create our own `.get()` method. In your `snippets/views.py` add: from rest_framework import renderers from rest_framework.response import Response @@ -43,7 +43,7 @@ Instead of using a concrete generic view, we'll use the base class for represent return Response(snippet.highlighted) As usual we need to add the new views that we've created in to our URLconf. -We'll add a url pattern for our new API root: +We'll add a url pattern for our new API root in `snippets/urls.py`: url(r'^$', 'api_root'), @@ -73,7 +73,7 @@ The `HyperlinkedModelSerializer` has the following differences from `ModelSerial * Relationships use `HyperlinkedRelatedField`, instead of `PrimaryKeyRelatedField`. -We can easily re-write our existing serializers to use hyperlinking. +We can easily re-write our existing serializers to use hyperlinking. In your `snippets/serializers.py` add: class SnippetSerializer(serializers.HyperlinkedModelSerializer): owner = serializers.Field(source='owner.username') @@ -105,7 +105,7 @@ If we're going to have a hyperlinked API, we need to make sure we name our URL p * Our user serializer includes a field that refers to `'snippet-detail'`. * Our snippet and user serializers include `'url'` fields that by default will refer to `'{model_name}-detail'`, which in this case will be `'snippet-detail'` and `'user-detail'`. -After adding all those names into our URLconf, our final `'urls.py'` file should look something like this: +After adding all those names into our URLconf, our final `snippets/urls.py` file should look something like this: # API endpoints urlpatterns = format_suffix_patterns(patterns('snippets.views', From 867e441ec07fc182569c3dbe6f86fe42aa6b0cbf Mon Sep 17 00:00:00 2001 From: sshquack Date: Fri, 15 Aug 2014 20:45:28 -0600 Subject: [PATCH 0680/1652] Strip trailing spaces in tutorial --- docs/tutorial/1-serialization.md | 20 +++++----- docs/tutorial/2-requests-and-responses.md | 8 ++-- docs/tutorial/3-class-based-views.md | 4 +- .../4-authentication-and-permissions.md | 12 +++--- .../5-relationships-and-hyperlinked-apis.md | 16 ++++---- docs/tutorial/quickstart.md | 38 +++++++++---------- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 55b194576..96214f5b4 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -81,8 +81,8 @@ For the purposes of this tutorial we're going to start by creating a simple `Sni LEXERS = [item for item in get_all_lexers() if item[1]] LANGUAGE_CHOICES = sorted([(item[1][0], item[0]) for item in LEXERS]) STYLE_CHOICES = sorted((item, item) for item in get_all_styles()) - - + + class Snippet(models.Model): created = models.DateTimeField(auto_now_add=True) title = models.CharField(max_length=100, blank=True, default='') @@ -94,7 +94,7 @@ For the purposes of this tutorial we're going to start by creating a simple `Sni style = models.CharField(choices=STYLE_CHOICES, default='friendly', max_length=100) - + class Meta: ordering = ('created',) @@ -122,12 +122,12 @@ The first thing we need to get started on our Web API is to provide a way of ser default='python') style = serializers.ChoiceField(choices=STYLE_CHOICES, default='friendly') - + def restore_object(self, attrs, instance=None): """ Create or update a new snippet instance, given a dictionary of deserialized field values. - + Note that if we don't define this method, then deserializing data will simply return a dictionary of items. """ @@ -180,7 +180,7 @@ At this point we've translated the model instance into Python native datatypes. content # '{"pk": 2, "title": "", "code": "print \\"hello, world\\"\\n", "linenos": false, "language": "python", "style": "friendly"}' -Deserialization is similar. First we parse a stream into Python native datatypes... +Deserialization is similar. First we parse a stream into Python native datatypes... # This import will use either `StringIO.StringIO` or `io.BytesIO` # as appropriate, depending on if we're running Python 2 or Python 3. @@ -196,7 +196,7 @@ Deserialization is similar. First we parse a stream into Python native datatype # True serializer.object # - + Notice how similar the API is to working with forms. The similarity should become even more apparent when we start writing views that use our serializer. We can also serialize querysets instead of model instances. To do so we simply add a `many=True` flag to the serializer arguments. @@ -264,7 +264,7 @@ The root of our API is going to be a view that supports listing all the existing return JSONResponse(serializer.data, status=201) return JSONResponse(serializer.errors, status=400) -Note that because we want to be able to POST to this view from clients that won't have a CSRF token we need to mark the view as `csrf_exempt`. This isn't something that you'd normally want to do, and REST framework views actually use more sensible behavior than this, but it'll do for our purposes right now. +Note that because we want to be able to POST to this view from clients that won't have a CSRF token we need to mark the view as `csrf_exempt`. This isn't something that you'd normally want to do, and REST framework views actually use more sensible behavior than this, but it'll do for our purposes right now. We'll also need a view which corresponds to an individual snippet, and can be used to retrieve, update or delete the snippet. @@ -277,11 +277,11 @@ We'll also need a view which corresponds to an individual snippet, and can be us snippet = Snippet.objects.get(pk=pk) except Snippet.DoesNotExist: return HttpResponse(status=404) - + if request.method == 'GET': serializer = SnippetSerializer(snippet) return JSONResponse(serializer.data) - + elif request.method == 'PUT': data = JSONParser().parse(request) serializer = SnippetSerializer(snippet, data=data) diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 603edd081..e70bbbfc4 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -33,7 +33,7 @@ The wrappers also provide behaviour such as returning `405 Method Not Allowed` r ## Pulling it all together -Okay, let's go ahead and start using these new components to write a few views. +Okay, let's go ahead and start using these new components to write a few views. We don't need our `JSONResponse` class in `views.py` anymore, so go ahead and delete that. Once that's done we can start refactoring our views slightly. @@ -69,7 +69,7 @@ Here is the view for an individual snippet, in the `views.py` module. def snippet_detail(request, pk): """ Retrieve, update or delete a snippet instance. - """ + """ try: snippet = Snippet.objects.get(pk=pk) except Snippet.DoesNotExist: @@ -115,7 +115,7 @@ Now update the `urls.py` file slightly, to append a set of `format_suffix_patter url(r'^snippets/$', 'snippet_list'), url(r'^snippets/(?P[0-9]+)$', 'snippet_detail'), ) - + urlpatterns = format_suffix_patterns(urlpatterns) We don't necessarily need to add these extra url patterns in, but it gives us a simple, clean way of referring to a specific format. @@ -146,7 +146,7 @@ Similarly, we can control the format of the request that we send, using the `Con curl -X POST http://127.0.0.1:8000/snippets/ -d "code=print 123" {"id": 3, "title": "", "code": "print 123", "linenos": false, "language": "python", "style": "friendly"} - + # POST using JSON curl -X POST http://127.0.0.1:8000/snippets/ -d '{"code": "print 456"}' -H "Content-Type: application/json" diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md index b37bc31bd..e04072ca5 100644 --- a/docs/tutorial/3-class-based-views.md +++ b/docs/tutorial/3-class-based-views.md @@ -30,7 +30,7 @@ We'll start by rewriting the root view as a class based view. All this involves return Response(serializer.data, status=status.HTTP_201_CREATED) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) -So far, so good. It looks pretty similar to the previous case, but we've got better separation between the different HTTP methods. We'll also need to update the instance view in `views.py`. +So far, so good. It looks pretty similar to the previous case, but we've got better separation between the different HTTP methods. We'll also need to update the instance view in `views.py`. class SnippetDetail(APIView): """ @@ -72,7 +72,7 @@ We'll also need to refactor our `urls.py` slightly now we're using class based v url(r'^snippets/$', views.SnippetList.as_view()), url(r'^snippets/(?P[0-9]+)/$', views.SnippetDetail.as_view()), ) - + urlpatterns = format_suffix_patterns(urlpatterns) Okay, we're done. If you run the development server everything should be working just as before. diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index bdbe00ab4..74ad9a551 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -73,12 +73,12 @@ We'll also add a couple of views to `views.py`. We'd like to just use read-only class UserList(generics.ListAPIView): queryset = User.objects.all() serializer_class = UserSerializer - - + + class UserDetail(generics.RetrieveAPIView): queryset = User.objects.all() serializer_class = UserSerializer - + Make sure to also import the `UserSerializer` class from snippets.serializers import UserSerializer @@ -157,8 +157,8 @@ To do that we're going to need to create a custom permission. In the snippets app, create a new file, `permissions.py` from rest_framework import permissions - - + + class IsOwnerOrReadOnly(permissions.BasePermission): """ Custom permission to only allow owners of an object to edit it. @@ -201,7 +201,7 @@ If we try to create a snippet without authenticating, we'll get an error: We can make a successful request by including the username and password of one of the users we created earlier. curl -X POST http://127.0.0.1:8000/snippets/ -d "code=print 789" -u tom:password - + {"id": 5, "owner": "tom", "title": "foo", "code": "print 789", "linenos": false, "language": "python", "style": "friendly"} ## Summary diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index deddb13f1..9c61fe3d3 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -1,6 +1,6 @@ # Tutorial 5: Relationships & Hyperlinked APIs -At the moment relationships within our API are represented by using primary keys. In this part of the tutorial we'll improve the cohesion and discoverability of our API, by instead using hyperlinking for relationships. +At the moment relationships within our API are represented by using primary keys. In this part of the tutorial we'll improve the cohesion and discoverability of our API, by instead using hyperlinking for relationships. ## Creating an endpoint for the root of our API @@ -37,7 +37,7 @@ Instead of using a concrete generic view, we'll use the base class for represent class SnippetHighlight(generics.GenericAPIView): queryset = Snippet.objects.all() renderer_classes = (renderers.StaticHTMLRenderer,) - + def get(self, request, *args, **kwargs): snippet = self.get_object() return Response(snippet.highlighted) @@ -78,16 +78,16 @@ We can easily re-write our existing serializers to use hyperlinking. In your `sn class SnippetSerializer(serializers.HyperlinkedModelSerializer): owner = serializers.Field(source='owner.username') highlight = serializers.HyperlinkedIdentityField(view_name='snippet-highlight', format='html') - + class Meta: model = Snippet fields = ('url', 'highlight', 'owner', 'title', 'code', 'linenos', 'language', 'style') - - + + class UserSerializer(serializers.HyperlinkedModelSerializer): snippets = serializers.HyperlinkedRelatedField(many=True, view_name='snippet-detail') - + class Meta: model = User fields = ('url', 'username', 'snippets') @@ -126,9 +126,9 @@ After adding all those names into our URLconf, our final `snippets/urls.py` file views.UserDetail.as_view(), name='user-detail') )) - + # Login and logout views for the browsable API - urlpatterns += patterns('', + urlpatterns += patterns('', url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), ) diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 8bf8c7f5c..029b56a2b 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -46,14 +46,14 @@ First up we're going to define some serializers in `quickstart/serializers.py` t from django.contrib.auth.models import User, Group from rest_framework import serializers - - + + class UserSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = User fields = ('url', 'username', 'email', 'groups') - - + + class GroupSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = Group @@ -68,16 +68,16 @@ Right, we'd better write some views then. Open `quickstart/views.py` and get ty from django.contrib.auth.models import User, Group from rest_framework import viewsets from quickstart.serializers import UserSerializer, GroupSerializer - - + + class UserViewSet(viewsets.ModelViewSet): """ API endpoint that allows users to be viewed or edited. """ queryset = User.objects.all() serializer_class = UserSerializer - - + + class GroupViewSet(viewsets.ModelViewSet): """ API endpoint that allows groups to be viewed or edited. @@ -144,22 +144,22 @@ We're now ready to test the API we've built. Let's fire up the server from the We can now access our API, both from the command-line, using tools like `curl`... - bash: curl -H 'Accept: application/json; indent=4' -u admin:password http://127.0.0.1:8000/users/ + bash: curl -H 'Accept: application/json; indent=4' -u admin:password http://127.0.0.1:8000/users/ { - "count": 2, - "next": null, - "previous": null, + "count": 2, + "next": null, + "previous": null, "results": [ { - "email": "admin@example.com", - "groups": [], - "url": "http://127.0.0.1:8000/users/1/", + "email": "admin@example.com", + "groups": [], + "url": "http://127.0.0.1:8000/users/1/", "username": "admin" - }, + }, { - "email": "tom@example.com", - "groups": [ ], - "url": "http://127.0.0.1:8000/users/2/", + "email": "tom@example.com", + "groups": [ ], + "url": "http://127.0.0.1:8000/users/2/", "username": "tom" } ] From 38a0e3e6278db96660c89bfcb3e660704c068ff5 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Sat, 16 Aug 2014 14:02:44 +0100 Subject: [PATCH 0681/1652] Sponsor update --- docs/topics/kickstarter-announcement.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 71bb48a62..84dc8511f 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -151,9 +151,9 @@ The serious financial contribution that our silver sponsors have made is very mu The following individuals made a significant financial contribution to the development of Django REST framework 3, for which I can only offer a huge, warm and sincere thank you! -**Individual backers**: Jure Cuhalev, Kevin Brolly, Ferenc Szalai, Dougal Matthews, Stefan Foulis, Carlos Hernando, Alen Mujezinovic, Ross Crawford-d'Heureuse, George Kappel, Alasdair Nicol, John Carr, Steve Winton, Trey, Manuel Miranda, David Horn, Vince Mi, Daniel Sears, Jamie Matthews, Ryan Currah, Marty Kemka, Scott Nixon, Moshin Elahi, Kevin Campbell, Jose Antonio Leiva Izquierdo, Kevin Stone, Andrew Godwin, Tijs Teulings, Roger Boardman, Xavier Antoviaque, Darian Moody, Lujeni, Jon Dugan, Wiley Kestner, Daniel C. Silverstein, Daniel Hahler, Subodh Nijsure, Philipp Weidenhiller, Yusuke Muraoka, Danny Roa, Reto Aebersold, Kyle Getrost, Décébal Hormuz, James Dacosta, Matt Long, Mauro Rocco, Tyrel Souza, Ryan Campbell, Ville Jyrkkä, Charalampos Papaloizou, Nikolai Røed Kristiansen, Antoni Aloy López, Celia Oakley, Michał Krawczak, Ivan VenOsdel, Tim Watts, Martin Warne, Nicola Jordan. +**Individual backers**: Jure Cuhalev, Kevin Brolly, Ferenc Szalai, Dougal Matthews, Stefan Foulis, Carlos Hernando, Alen Mujezinovic, Ross Crawford-d'Heureuse, George Kappel, Alasdair Nicol, John Carr, Steve Winton, Trey, Manuel Miranda, David Horn, Vince Mi, Daniel Sears, Jamie Matthews, Ryan Currah, Marty Kemka, Scott Nixon, Moshin Elahi, Kevin Campbell, Jose Antonio Leiva Izquierdo, Kevin Stone, Andrew Godwin, Tijs Teulings, Roger Boardman, Xavier Antoviaque, Darian Moody, Lujeni, Jon Dugan, Wiley Kestner, Daniel C. Silverstein, Daniel Hahler, Subodh Nijsure, Philipp Weidenhiller, Yusuke Muraoka, Danny Roa, Reto Aebersold, Kyle Getrost, Décébal Hormuz, James Dacosta, Matt Long, Mauro Rocco, Tyrel Souza, Ryan Campbell, Ville Jyrkkä, Charalampos Papaloizou, Nikolai Røed Kristiansen, Antoni Aloy López, Celia Oakley, Michał Krawczak, Ivan VenOsdel, Tim Watts, Martin Warne, Nicola Jordan, Ryan Kaskel. -**Corporate backers**: Savannah Informatics, Prism Skylabs. +**Corporate backers**: Savannah Informatics, Prism Skylabs, Musical Operating Devices. --- From a6901ea36de19a35fa82783c984841b4c3ca0dad Mon Sep 17 00:00:00 2001 From: Aymeric Derbois Date: Sat, 16 Aug 2014 15:49:31 +0200 Subject: [PATCH 0682/1652] Add test for SerializerMethodField --- rest_framework/tests/test_fields.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/rest_framework/tests/test_fields.py b/rest_framework/tests/test_fields.py index b04b947f2..17d12f231 100644 --- a/rest_framework/tests/test_fields.py +++ b/rest_framework/tests/test_fields.py @@ -1002,3 +1002,21 @@ class BooleanField(TestCase): bool_field = serializers.BooleanField(required=True) self.assertFalse(BooleanRequiredSerializer(data={}).is_valid()) + + +class SerializerMethodFieldTest(TestCase): + """ + Tests for the SerializerMethodField field_to_native() behavior + """ + class SerializerTest(serializers.Serializer): + def get_my_test(self, obj): + return obj.my_test[0:5] + + class Example(): + my_test = 'Hey, this is a test !' + + def test_field_to_native(self): + s = serializers.SerializerMethodField('get_my_test') + s.initialize(self.SerializerTest(), 'name') + result = s.field_to_native(self.Example(), None) + self.assertEqual(result, 'Hey, ') From 5f63d31b002020148c526f2d5ec27f723a06f2e9 Mon Sep 17 00:00:00 2001 From: Andrew Fong Date: Sat, 16 Aug 2014 15:05:46 -0700 Subject: [PATCH 0683/1652] override_method should substitute action A view's action is dependent on the request method. When overriding the method (e.g. to generate a form for a POST request on a GET call to the browseable API), the action should be updated as well. Otherwise, viewset functions may be in a weird limbo state where a 'list' action has a POST method. --- rest_framework/request.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/request.py b/rest_framework/request.py index 40467c03d..1ea61586d 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -42,12 +42,16 @@ class override_method(object): self.view = view self.request = request self.method = method + self.action = getattr(view, 'action', None) def __enter__(self): self.view.request = clone_request(self.request, self.method) + action_map = getattr(self, 'action_map', {}) + self.view.action = action_map.get(self.method.lower()) return self.view.request def __exit__(self, *args, **kwarg): + self.view.action = self.action self.view.request = self.request From 21cbf3484e04bb015c1921307cdf0306a81e571d Mon Sep 17 00:00:00 2001 From: Andrew Fong Date: Sat, 16 Aug 2014 23:22:18 +0000 Subject: [PATCH 0684/1652] Fixed action_map being pulled from wrong object --- rest_framework/request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index 1ea61586d..735a92885 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -46,7 +46,7 @@ class override_method(object): def __enter__(self): self.view.request = clone_request(self.request, self.method) - action_map = getattr(self, 'action_map', {}) + action_map = getattr(self.view, 'action_map', {}) self.view.action = action_map.get(self.method.lower()) return self.view.request From 6edbabe0e1ffa8111284c0af94a8f878f7056413 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 18 Aug 2014 10:58:00 +0100 Subject: [PATCH 0685/1652] Link to Django docs on widgets. Closes #1760. --- docs/api-guide/fields.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index dd2795415..b41e0ebca 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -62,7 +62,7 @@ A dictionary of error codes to error messages. ### `widget` Used only if rendering the field to HTML. -This argument sets the widget that should be used to render the field. +This argument sets the widget that should be used to render the field. For more details, and a list of available widgets, see [the Django documentation on form widgets][django-widgets]. ### `label` @@ -370,6 +370,7 @@ The [django-rest-framework-gis][django-rest-framework-gis] package provides geog [FILE_UPLOAD_HANDLERS]: https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-FILE_UPLOAD_HANDLERS [ecma262]: http://ecma-international.org/ecma-262/5.1/#sec-15.9.1.15 [strftime]: http://docs.python.org/2/library/datetime.html#strftime-and-strptime-behavior +[django-widgets]: https://docs.djangoproject.com/en/dev/ref/forms/widgets/ [iso8601]: http://www.w3.org/TR/NOTE-datetime [drf-compound-fields]: http://drf-compound-fields.readthedocs.org [drf-extra-fields]: https://github.com/Hipo/drf-extra-fields From dce30207dae1725a2b08232fc4dee34e0949b14b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 18 Aug 2014 11:09:53 +0100 Subject: [PATCH 0686/1652] Remove kickstarter links from homepage and README --- README.md | 10 ---------- docs/index.md | 8 -------- 2 files changed, 18 deletions(-) diff --git a/README.md b/README.md index eea002b4a..da5f27aef 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,3 @@ ---- - -#### Django REST framework 3 - Kickstarter announcement! - -We are currently running a Kickstarter campaign to help fund the development of Django REST framework 3. - -If you want to help drive sustainable open-source development forward, then **please check out [the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) and consider funding us.** - ---- - # Django REST framework [![build-status-image]][travis] diff --git a/docs/index.md b/docs/index.md index d9c686c4a..dd407497b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,14 +9,6 @@ --- -#### Django REST framework 3 - Kickstarter announcement! - -We are currently running a Kickstarter campaign to help fund the development of Django REST framework 3. - -If you want to help drive sustainable open-source development **please [check out the Kickstarter project](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) and consider funding us.** - ---- -

    Date: Mon, 18 Aug 2014 15:34:23 +0100 Subject: [PATCH 0692/1652] Copy filter_backends class attribute before returning it. --- rest_framework/generics.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 42204841c..aea636f15 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -189,7 +189,13 @@ class GenericAPIView(views.APIView): """ Returns the list of filter backends that this view requires. """ - filter_backends = self.filter_backends or [] + if self.filter_backends is None: + filter_backends = [] + else: + # Note that we are returning a *copy* of the class attribute, + # so that it is safe for the view to mutate it if needed. + filter_backends = list(self.filter_backends) + if not filter_backends and self.filter_backend: warnings.warn( 'The `filter_backend` attribute and `FILTER_BACKEND` setting ' @@ -199,6 +205,7 @@ class GenericAPIView(views.APIView): PendingDeprecationWarning, stacklevel=2 ) filter_backends = [self.filter_backend] + return filter_backends From 1effc983b07ed7aece609f0f4b24a33164196546 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 18 Aug 2014 20:51:08 +0100 Subject: [PATCH 0693/1652] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da5f27aef..0eaf5c83c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ # Overview -Django REST framework is a powerful and flexible toolkit that makes it easy to build Web APIs. +Django REST framework is a powerful and flexible toolkit for building Web APIs. Some reasons you might want to use REST framework: From 97d8f037cc1292407eae965ceb4df34a52bd6161 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 18 Aug 2014 20:56:17 +0100 Subject: [PATCH 0694/1652] Only set .action attribute in override_method if it already existed on the view --- rest_framework/request.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index 4f9345f3e..d508f9b43 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -46,13 +46,16 @@ class override_method(object): def __enter__(self): self.view.request = clone_request(self.request, self.method) - action_map = getattr(self.view, 'action_map', {}) - self.view.action = action_map.get(self.method.lower()) + if self.action is not None: + # For viewsets we also set the `.action` attribute. + action_map = getattr(self.view, 'action_map', {}) + self.view.action = action_map.get(self.method.lower()) return self.view.request def __exit__(self, *args, **kwarg): - self.view.action = self.action self.view.request = self.request + if self.action is not None: + self.view.action = self.action class Empty(object): From 3e93c96ece8af010185e1fe1188dd2df569d4528 Mon Sep 17 00:00:00 2001 From: Paul Oswald Date: Tue, 19 Aug 2014 10:09:48 +0900 Subject: [PATCH 0695/1652] replace unicode call with force_text --- rest_framework/utils/formatting.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index 2b3cbc957..40bced5f1 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -5,6 +5,8 @@ from __future__ import unicode_literals from django.utils.html import escape from django.utils.safestring import mark_safe +from django.utils.encoding import force_text + from rest_framework.compat import apply_markdown import re @@ -28,7 +30,7 @@ def dedent(content): as it fails to dedent multiline docstrings that include unindented text on the initial line. """ - content = unicode(content) + content = force_text(content) whitespace_counts = [len(line) - len(line.lstrip(' ')) for line in content.splitlines()[1:] if line.lstrip()] From bf09c32de8f9d528f83e9cb7a2773d1f4c9ab563 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 19 Aug 2014 13:28:07 +0100 Subject: [PATCH 0696/1652] Code linting and added runtests.py --- .travis.yml | 2 +- pytest.ini | 2 - optionals.txt => requirements-test.txt | 6 ++ requirements.txt | 2 - rest_framework/__init__.py | 8 +- rest_framework/authentication.py | 2 +- rest_framework/authtoken/models.py | 1 - .../south_migrations/0001_initial.py | 9 +- rest_framework/decorators.py | 7 +- rest_framework/exceptions.py | 1 + rest_framework/filters.py | 2 +- rest_framework/generics.py | 15 ++-- rest_framework/negotiation.py | 6 +- rest_framework/permissions.py | 22 +++-- rest_framework/renderers.py | 17 ++-- rest_framework/request.py | 25 ++++-- rest_framework/response.py | 6 +- rest_framework/serializers.py | 40 +++++---- rest_framework/settings.py | 12 +-- rest_framework/status.py | 4 + rest_framework/templatetags/rest_framework.py | 6 +- rest_framework/test.py | 7 +- rest_framework/urls.py | 10 ++- rest_framework/utils/encoders.py | 31 ++++--- rest_framework/utils/formatting.py | 4 +- rest_framework/utils/mediatypes.py | 2 +- rest_framework/views.py | 2 +- rest_framework/viewsets.py | 10 +-- runtests.py | 86 +++++++++++++++++++ conftest.py => tests/conftest.py | 0 tests/serializers.py | 1 - tests/settings.py | 11 ++- tests/test_authentication.py | 73 ++++++++++------ tests/test_breadcrumbs.py | 61 +++++++++---- tests/test_fields.py | 14 +-- tests/test_files.py | 11 +-- tests/test_filters.py | 9 +- tests/test_genericrelations.py | 24 +++--- tests/test_htmlrenderer.py | 3 +- tests/test_hyperlinkedserializers.py | 3 +- tests/test_pagination.py | 12 ++- tests/test_permissions.py | 58 +++++++++---- tests/test_relations.py | 11 ++- tests/test_relations_hyperlink.py | 15 ++-- tests/test_relations_pk.py | 12 +-- tests/test_renderers.py | 59 ++++++++----- tests/test_request.py | 3 +- tests/test_response.py | 3 +- tests/test_reverse.py | 3 +- tests/test_routers.py | 9 +- tests/test_serializer.py | 30 ++++--- tests/test_serializer_bulk_update.py | 6 +- tests/test_serializer_nested.py | 2 + tests/test_serializers.py | 4 +- tests/test_status.py | 2 +- tests/test_templatetags.py | 2 +- tests/test_testing.py | 6 +- tests/test_throttling.py | 48 ++++++----- tests/test_urlizer.py | 1 - tox.ini | 10 ++- 60 files changed, 548 insertions(+), 305 deletions(-) delete mode 100644 pytest.ini rename optionals.txt => requirements-test.txt (62%) create mode 100755 runtests.py rename conftest.py => tests/conftest.py (100%) diff --git a/.travis.yml b/.travis.yml index 5a6900a5e..9894ee4ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ install: - export PYTHONPATH=. script: - - py.test + - ./runtests.py matrix: exclude: diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index bbd083ac1..000000000 --- a/pytest.ini +++ /dev/null @@ -1,2 +0,0 @@ -[pytest] -addopts = --tb=short diff --git a/optionals.txt b/requirements-test.txt similarity index 62% rename from optionals.txt rename to requirements-test.txt index 262e76443..a91dd0d4b 100644 --- a/optionals.txt +++ b/requirements-test.txt @@ -1,3 +1,9 @@ +# Test requirements +pytest-django==2.6 +pytest==2.5.2 +pytest-cov==1.6 + +# Optional packages markdown>=2.1.0 PyYAML>=3.10 defusedxml>=0.3 diff --git a/requirements.txt b/requirements.txt index 360acb14d..730c1d07a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1 @@ --e . Django>=1.3 -pytest-django==2.6 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 01036cefa..f30012b9b 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -1,9 +1,9 @@ """ -______ _____ _____ _____ __ _ -| ___ \ ___/ ___|_ _| / _| | | -| |_/ / |__ \ `--. | | | |_ _ __ __ _ _ __ ___ _____ _____ _ __| | __ +______ _____ _____ _____ __ +| ___ \ ___/ ___|_ _| / _| | | +| |_/ / |__ \ `--. | | | |_ _ __ __ _ _ __ ___ _____ _____ _ __| |__ | /| __| `--. \ | | | _| '__/ _` | '_ ` _ \ / _ \ \ /\ / / _ \| '__| |/ / -| |\ \| |___/\__/ / | | | | | | | (_| | | | | | | __/\ V V / (_) | | | < +| |\ \| |___/\__/ / | | | | | | | (_| | | | | | | __/\ V V / (_) | | | < \_| \_\____/\____/ \_/ |_| |_| \__,_|_| |_| |_|\___| \_/\_/ \___/|_| |_|\_| """ diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 82cea70fc..5721a869e 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -21,7 +21,7 @@ def get_authorization_header(request): Hide some test client ickyness where the header can be unicode. """ auth = request.META.get('HTTP_AUTHORIZATION', b'') - if type(auth) == type(''): + if isinstance(auth, type('')): # Work around django test client oddness auth = auth.encode(HTTP_HEADER_ENCODING) return auth diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index 167fa5314..db21d44c3 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -1,6 +1,5 @@ import binascii import os -from hashlib import sha1 from django.conf import settings from django.db import models diff --git a/rest_framework/authtoken/south_migrations/0001_initial.py b/rest_framework/authtoken/south_migrations/0001_initial.py index d5965e404..926de02b1 100644 --- a/rest_framework/authtoken/south_migrations/0001_initial.py +++ b/rest_framework/authtoken/south_migrations/0001_initial.py @@ -1,15 +1,10 @@ # -*- coding: utf-8 -*- -import datetime from south.db import db from south.v2 import SchemaMigration -from django.db import models - -from rest_framework.settings import api_settings - try: from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 +except ImportError: # django < 1.5 from django.contrib.auth.models import User else: User = get_user_model() @@ -26,12 +21,10 @@ class Migration(SchemaMigration): )) db.send_create_signal('authtoken', ['Token']) - def backwards(self, orm): # Deleting model 'Token' db.delete_table('authtoken_token') - models = { 'auth.group': { 'Meta': {'object_name': 'Group'}, diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index 18e41a18d..e06d6ff56 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -131,6 +131,7 @@ def list_route(methods=['get'], **kwargs): return func return decorator + # These are now pending deprecation, in favor of `detail_route` and `list_route`. def link(**kwargs): @@ -139,11 +140,13 @@ def link(**kwargs): """ msg = 'link is pending deprecation. Use detail_route instead.' warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) + def decorator(func): func.bind_to_methods = ['get'] func.detail = True func.kwargs = kwargs return func + return decorator @@ -153,9 +156,11 @@ def action(methods=['post'], **kwargs): """ msg = 'action is pending deprecation. Use detail_route instead.' warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) + def decorator(func): func.bind_to_methods = methods func.detail = True func.kwargs = kwargs return func - return decorator \ No newline at end of file + + return decorator diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 5f774a9f3..97dab77ea 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -23,6 +23,7 @@ class APIException(Exception): def __str__(self): return self.detail + class ParseError(APIException): status_code = status.HTTP_400_BAD_REQUEST default_detail = 'Malformed request.' diff --git a/rest_framework/filters.py b/rest_framework/filters.py index c3b846aed..538386cee 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -116,7 +116,7 @@ class OrderingFilter(BaseFilterBackend): def get_ordering(self, request): """ Ordering is set by a comma delimited ?ordering=... query parameter. - + The `ordering` query parameter can be overridden by setting the `ordering_param` value on the OrderingFilter or by specifying an `ORDERING_PARAM` value in the API settings. diff --git a/rest_framework/generics.py b/rest_framework/generics.py index cecb548fb..02d243654 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -25,6 +25,7 @@ def strict_positive_int(integer_string, cutoff=None): ret = min(ret, cutoff) return ret + def get_object_or_404(queryset, *filter_args, **filter_kwargs): """ Same as Django's standard shortcut, but make sure to raise 404 @@ -162,10 +163,11 @@ class GenericAPIView(views.APIView): raise Http404(_("Page is not 'last', nor can it be converted to an int.")) try: page = paginator.page(page_number) - except InvalidPage as e: - raise Http404(_('Invalid page (%(page_number)s): %(message)s') % { - 'page_number': page_number, - 'message': str(e) + except InvalidPage as exc: + error_format = _('Invalid page (%(page_number)s): %(message)s') + raise Http404(error_format % { + 'page_number': page_number, + 'message': str(exc) }) if deprecated_style: @@ -208,7 +210,6 @@ class GenericAPIView(views.APIView): return filter_backends - ######################## ### The following methods provide default implementations ### that you may want to override for more complex cases. @@ -284,8 +285,8 @@ class GenericAPIView(views.APIView): if self.model is not None: return self.model._default_manager.all() - raise ImproperlyConfigured("'%s' must define 'queryset' or 'model'" - % self.__class__.__name__) + error_format = "'%s' must define 'queryset' or 'model'" + raise ImproperlyConfigured(error_format % self.__class__.__name__) def get_object(self, queryset=None): """ diff --git a/rest_framework/negotiation.py b/rest_framework/negotiation.py index 4d205c0e8..ca7b53978 100644 --- a/rest_framework/negotiation.py +++ b/rest_framework/negotiation.py @@ -54,8 +54,10 @@ class DefaultContentNegotiation(BaseContentNegotiation): for media_type in media_type_set: if media_type_matches(renderer.media_type, media_type): # Return the most specific media type as accepted. - if (_MediaType(renderer.media_type).precedence > - _MediaType(media_type).precedence): + if ( + _MediaType(renderer.media_type).precedence > + _MediaType(media_type).precedence + ): # Eg client requests '*/*' # Accepted media type is 'application/json' return renderer, renderer.media_type diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index c95171389..6a1a00770 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -62,9 +62,11 @@ class IsAuthenticatedOrReadOnly(BasePermission): """ def has_permission(self, request, view): - return (request.method in SAFE_METHODS or - request.user and - request.user.is_authenticated()) + return ( + request.method in SAFE_METHODS or + request.user and + request.user.is_authenticated() + ) class DjangoModelPermissions(BasePermission): @@ -122,9 +124,11 @@ class DjangoModelPermissions(BasePermission): perms = self.get_required_permissions(request.method, model_cls) - return (request.user and + return ( + request.user and (request.user.is_authenticated() or not self.authenticated_users_only) and - request.user.has_perms(perms)) + request.user.has_perms(perms) + ) class DjangoModelPermissionsOrAnonReadOnly(DjangoModelPermissions): @@ -212,6 +216,8 @@ class TokenHasReadWriteScope(BasePermission): required = oauth2_constants.READ if read_only else oauth2_constants.WRITE return oauth2_provider_scope.check(required, request.auth.scope) - assert False, ('TokenHasReadWriteScope requires either the' - '`OAuthAuthentication` or `OAuth2Authentication` authentication ' - 'class to be used.') + assert False, ( + 'TokenHasReadWriteScope requires either the' + '`OAuthAuthentication` or `OAuth2Authentication` authentication ' + 'class to be used.' + ) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 7048d87de..3dabd277e 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -8,7 +8,6 @@ REST framework also provides an HTML renderer the renders the browsable API. """ from __future__ import unicode_literals -import copy import json import django from django import forms @@ -75,7 +74,6 @@ class JSONRenderer(BaseRenderer): # E.g. If we're being called by the BrowsableAPIRenderer. return renderer_context.get('indent', None) - def render(self, data, accepted_media_type=None, renderer_context=None): """ Render `data` into JSON, returning a bytestring. @@ -86,8 +84,10 @@ class JSONRenderer(BaseRenderer): renderer_context = renderer_context or {} indent = self.get_indent(accepted_media_type, renderer_context) - ret = json.dumps(data, cls=self.encoder_class, - indent=indent, ensure_ascii=self.ensure_ascii) + ret = json.dumps( + data, cls=self.encoder_class, + indent=indent, ensure_ascii=self.ensure_ascii + ) # On python 2.x json.dumps() returns bytestrings if ensure_ascii=True, # but if ensure_ascii=False, the return type is underspecified, @@ -454,8 +454,10 @@ class BrowsableAPIRenderer(BaseRenderer): if method in ('DELETE', 'OPTIONS'): return True # Don't actually need to return a form - if (not getattr(view, 'get_serializer', None) - or not any(is_form_media_type(parser.media_type) for parser in view.parser_classes)): + if ( + not getattr(view, 'get_serializer', None) + or not any(is_form_media_type(parser.media_type) for parser in view.parser_classes) + ): return serializer = view.get_serializer(instance=obj, data=data, files=files) @@ -576,7 +578,7 @@ class BrowsableAPIRenderer(BaseRenderer): 'version': VERSION, 'breadcrumblist': self.get_breadcrumbs(request), 'allowed_methods': view.allowed_methods, - 'available_formats': [renderer.format for renderer in view.renderer_classes], + 'available_formats': [renderer_cls.format for renderer_cls in view.renderer_classes], 'response_headers': response_headers, 'put_form': self.get_rendered_html_form(view, 'PUT', request), @@ -625,4 +627,3 @@ class MultiPartRenderer(BaseRenderer): def render(self, data, accepted_media_type=None, renderer_context=None): return encode_multipart(self.BOUNDARY, data) - diff --git a/rest_framework/request.py b/rest_framework/request.py index d508f9b43..620b00ada 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -295,8 +295,11 @@ class Request(object): Return the content body of the request, as a stream. """ try: - content_length = int(self.META.get('CONTENT_LENGTH', - self.META.get('HTTP_CONTENT_LENGTH'))) + content_length = int( + self.META.get( + 'CONTENT_LENGTH', self.META.get('HTTP_CONTENT_LENGTH') + ) + ) except (ValueError, TypeError): content_length = 0 @@ -320,9 +323,11 @@ class Request(object): ) # We only need to use form overloading on form POST requests. - if (not USE_FORM_OVERLOADING + if ( + not USE_FORM_OVERLOADING or self._request.method != 'POST' - or not is_form_media_type(self._content_type)): + or not is_form_media_type(self._content_type) + ): return # At this point we're committed to parsing the request as form data. @@ -330,15 +335,19 @@ class Request(object): self._files = self._request.FILES # Method overloading - change the method and remove the param from the content. - if (self._METHOD_PARAM and - self._METHOD_PARAM in self._data): + if ( + self._METHOD_PARAM and + self._METHOD_PARAM in self._data + ): self._method = self._data[self._METHOD_PARAM].upper() # Content overloading - modify the content type, and force re-parse. - if (self._CONTENT_PARAM and + if ( + self._CONTENT_PARAM and self._CONTENTTYPE_PARAM and self._CONTENT_PARAM in self._data and - self._CONTENTTYPE_PARAM in self._data): + self._CONTENTTYPE_PARAM in self._data + ): self._content_type = self._data[self._CONTENTTYPE_PARAM] self._stream = BytesIO(self._data[self._CONTENT_PARAM].encode(self.parser_context['encoding'])) self._data, self._files = (Empty, Empty) diff --git a/rest_framework/response.py b/rest_framework/response.py index 25b785245..80225cac3 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -62,8 +62,10 @@ class Response(SimpleTemplateResponse): ret = renderer.render(self.data, media_type, context) if isinstance(ret, six.text_type): - assert charset, 'renderer returned unicode, and did not specify ' \ - 'a charset value.' + assert charset, ( + 'renderer returned unicode, and did not specify ' + 'a charset value.' + ) return bytes(ret.encode(charset)) if not ret: diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 2fdc9b9da..95288671c 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -449,9 +449,11 @@ class BaseSerializer(WritableField): # If we have a model manager or similar object then we need # to iterate through each instance. - if (self.many and + if ( + self.many and not hasattr(obj, '__iter__') and - is_simple_callable(getattr(obj, 'all', None))): + is_simple_callable(getattr(obj, 'all', None)) + ): obj = obj.all() kwargs = { @@ -601,8 +603,10 @@ class BaseSerializer(WritableField): API schemas for auto-documentation. """ return SortedDict( - [(field_name, field.metadata()) - for field_name, field in six.iteritems(self.fields)] + [ + (field_name, field.metadata()) + for field_name, field in six.iteritems(self.fields) + ] ) @@ -656,8 +660,10 @@ class ModelSerializer(Serializer): """ cls = self.opts.model - assert cls is not None, \ - "Serializer class '%s' is missing 'model' Meta option" % self.__class__.__name__ + assert cls is not None, ( + "Serializer class '%s' is missing 'model' Meta option" % + self.__class__.__name__ + ) opts = cls._meta.concrete_model._meta ret = SortedDict() nested = bool(self.opts.depth) @@ -668,9 +674,9 @@ class ModelSerializer(Serializer): # If model is a child via multitable inheritance, use parent's pk pk_field = pk_field.rel.to._meta.pk - field = self.get_pk_field(pk_field) - if field: - ret[pk_field.name] = field + serializer_pk_field = self.get_pk_field(pk_field) + if serializer_pk_field: + ret[pk_field.name] = serializer_pk_field # Deal with forward relationships forward_rels = [field for field in opts.fields if field.serialize] @@ -739,9 +745,11 @@ class ModelSerializer(Serializer): is_m2m = isinstance(relation.field, models.fields.related.ManyToManyField) - if (is_m2m and + if ( + is_m2m and hasattr(relation.field.rel, 'through') and - not relation.field.rel.through._meta.auto_created): + not relation.field.rel.through._meta.auto_created + ): has_through_model = True if nested: @@ -911,10 +919,12 @@ class ModelSerializer(Serializer): for field_name, field in self.fields.items(): field_name = field.source or field_name - if field_name in exclusions \ - and not field.read_only \ - and (field.required or hasattr(instance, field_name)) \ - and not isinstance(field, Serializer): + if ( + field_name in exclusions + and not field.read_only + and (field.required or hasattr(instance, field_name)) + and not isinstance(field, Serializer) + ): exclusions.remove(field_name) return exclusions diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 2727f5960..6806a4689 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -46,16 +46,12 @@ DEFAULTS = { 'DEFAULT_PERMISSION_CLASSES': ( 'rest_framework.permissions.AllowAny', ), - 'DEFAULT_THROTTLE_CLASSES': ( - ), - 'DEFAULT_CONTENT_NEGOTIATION_CLASS': - 'rest_framework.negotiation.DefaultContentNegotiation', + 'DEFAULT_THROTTLE_CLASSES': (), + 'DEFAULT_CONTENT_NEGOTIATION_CLASS': 'rest_framework.negotiation.DefaultContentNegotiation', # Genric view behavior - 'DEFAULT_MODEL_SERIALIZER_CLASS': - 'rest_framework.serializers.ModelSerializer', - 'DEFAULT_PAGINATION_SERIALIZER_CLASS': - 'rest_framework.pagination.PaginationSerializer', + 'DEFAULT_MODEL_SERIALIZER_CLASS': 'rest_framework.serializers.ModelSerializer', + 'DEFAULT_PAGINATION_SERIALIZER_CLASS': 'rest_framework.pagination.PaginationSerializer', 'DEFAULT_FILTER_BACKENDS': (), # Throttling diff --git a/rest_framework/status.py b/rest_framework/status.py index 764353711..90a755089 100644 --- a/rest_framework/status.py +++ b/rest_framework/status.py @@ -10,15 +10,19 @@ from __future__ import unicode_literals def is_informational(code): return code >= 100 and code <= 199 + def is_success(code): return code >= 200 and code <= 299 + def is_redirect(code): return code >= 300 and code <= 399 + def is_client_error(code): return code >= 400 and code <= 499 + def is_server_error(code): return code >= 500 and code <= 599 diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 911b1b622..5b8fa3853 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -152,8 +152,10 @@ def urlize_quoted_links(text, trim_url_limit=None, nofollow=True, autoescape=Tru middle = middle[len(opening):] lead = lead + opening # Keep parentheses at the end only if they're balanced. - if (middle.endswith(closing) - and middle.count(closing) == middle.count(opening) + 1): + if ( + middle.endswith(closing) + and middle.count(closing) == middle.count(opening) + 1 + ): middle = middle[:-len(closing)] trail = closing + trail diff --git a/rest_framework/test.py b/rest_framework/test.py index d4ec50a06..9242cf7c6 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -49,9 +49,10 @@ class APIRequestFactory(DjangoRequestFactory): else: format = format or self.default_format - assert format in self.renderer_classes, ("Invalid format '{0}'. " - "Available formats are {1}. Set TEST_REQUEST_RENDERER_CLASSES " - "to enable extra request formats.".format( + assert format in self.renderer_classes, ( + "Invalid format '{0}'. Available formats are {1}. " + "Set TEST_REQUEST_RENDERER_CLASSES to enable " + "extra request formats.".format( format, ', '.join(["'" + fmt + "'" for fmt in self.renderer_classes.keys()]) ) diff --git a/rest_framework/urls.py b/rest_framework/urls.py index eed4bd140..8fa3073e8 100644 --- a/rest_framework/urls.py +++ b/rest_framework/urls.py @@ -8,17 +8,19 @@ your API requires authentication: ... url(r'^auth', include('rest_framework.urls', namespace='rest_framework')) ) - + The urls must be namespaced as 'rest_framework', and you should make sure your authentication settings include `SessionAuthentication`. """ from __future__ import unicode_literals from django.conf.urls import patterns, url +from django.contrib.auth import views template_name = {'template_name': 'rest_framework/login.html'} -urlpatterns = patterns('django.contrib.auth.views', - url(r'^login/$', 'login', template_name, name='login'), - url(r'^logout/$', 'logout', template_name, name='logout'), +urlpatterns = patterns( + '', + url(r'^login/$', views.login, template_name, name='login'), + url(r'^logout/$', views.logout, template_name, name='logout') ) diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index c125ac8a8..00ffdfbae 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -98,14 +98,23 @@ else: node.flow_style = best_style return node - SafeDumper.add_representer(decimal.Decimal, - SafeDumper.represent_decimal) - - SafeDumper.add_representer(SortedDict, - yaml.representer.SafeRepresenter.represent_dict) - SafeDumper.add_representer(DictWithMetadata, - yaml.representer.SafeRepresenter.represent_dict) - SafeDumper.add_representer(SortedDictWithMetadata, - yaml.representer.SafeRepresenter.represent_dict) - SafeDumper.add_representer(types.GeneratorType, - yaml.representer.SafeRepresenter.represent_list) + SafeDumper.add_representer( + decimal.Decimal, + SafeDumper.represent_decimal + ) + SafeDumper.add_representer( + SortedDict, + yaml.representer.SafeRepresenter.represent_dict + ) + SafeDumper.add_representer( + DictWithMetadata, + yaml.representer.SafeRepresenter.represent_dict + ) + SafeDumper.add_representer( + SortedDictWithMetadata, + yaml.representer.SafeRepresenter.represent_dict + ) + SafeDumper.add_representer( + types.GeneratorType, + yaml.representer.SafeRepresenter.represent_list + ) diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index 4b59ba840..6d53aed11 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -6,8 +6,6 @@ from __future__ import unicode_literals from django.utils.html import escape from django.utils.safestring import mark_safe from rest_framework.compat import apply_markdown -from rest_framework.settings import api_settings -from textwrap import dedent import re @@ -40,6 +38,7 @@ def dedent(content): return content.strip() + def camelcase_to_spaces(content): """ Translate 'CamelCaseNames' to 'Camel Case Names'. @@ -49,6 +48,7 @@ def camelcase_to_spaces(content): content = re.sub(camelcase_boundry, ' \\1', content).strip() return ' '.join(content.split('_')).title() + def markup_description(description): """ Apply HTML markup to the given description. diff --git a/rest_framework/utils/mediatypes.py b/rest_framework/utils/mediatypes.py index 92f99efd2..727f9c19e 100644 --- a/rest_framework/utils/mediatypes.py +++ b/rest_framework/utils/mediatypes.py @@ -57,7 +57,7 @@ class _MediaType(object): if key != 'q' and other.params.get(key, None) != self.params.get(key, None): return False - if self.sub_type != '*' and other.sub_type != '*' and other.sub_type != self.sub_type: + if self.sub_type != '*' and other.sub_type != '*' and other.sub_type != self.sub_type: return False if self.main_type != '*' and other.main_type != '*' and other.main_type != self.main_type: diff --git a/rest_framework/views.py b/rest_framework/views.py index a2668f2c0..bca0aaef1 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -31,6 +31,7 @@ def get_view_name(view_cls, suffix=None): return name + def get_view_description(view_cls, html=False): """ Given a view class, return a textual description to represent the view. @@ -119,7 +120,6 @@ class APIView(View): headers['Vary'] = 'Accept' return headers - def http_method_not_allowed(self, request, *args, **kwargs): """ If `request.method` does not correspond to a handler method, diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py index 7eb29f99b..bb5b304ee 100644 --- a/rest_framework/viewsets.py +++ b/rest_framework/viewsets.py @@ -127,11 +127,11 @@ class ReadOnlyModelViewSet(mixins.RetrieveModelMixin, class ModelViewSet(mixins.CreateModelMixin, - mixins.RetrieveModelMixin, - mixins.UpdateModelMixin, - mixins.DestroyModelMixin, - mixins.ListModelMixin, - GenericViewSet): + mixins.RetrieveModelMixin, + mixins.UpdateModelMixin, + mixins.DestroyModelMixin, + mixins.ListModelMixin, + GenericViewSet): """ A viewset that provides default `create()`, `retrieve()`, `update()`, `partial_update()`, `destroy()` and `list()` actions. diff --git a/runtests.py b/runtests.py new file mode 100755 index 000000000..4da05ac37 --- /dev/null +++ b/runtests.py @@ -0,0 +1,86 @@ +#! /usr/bin/env python +from __future__ import print_function + +import pytest +import sys +import os +import subprocess + + +PYTEST_ARGS = { + 'default': ['tests'], + 'fast': ['tests', '-q'], +} + +FLAKE8_ARGS = ['rest_framework', 'tests', '--ignore=E501'] + + +sys.path.append(os.path.dirname(__file__)) + +def exit_on_failure(ret, message=None): + if ret: + sys.exit(ret) + +def flake8_main(args): + print('Running flake8 code linting') + ret = subprocess.call(['flake8'] + args) + print('flake8 failed' if ret else 'flake8 passed') + return ret + +def split_class_and_function(string): + class_string, function_string = string.split('.', 1) + return "%s and %s" % (class_string, function_string) + +def is_function(string): + # `True` if it looks like a test function is included in the string. + return string.startswith('test_') or '.test_' in string + +def is_class(string): + # `True` if first character is uppercase - assume it's a class name. + return string[0] == string[0].upper() + + +if __name__ == "__main__": + try: + sys.argv.remove('--nolint') + except ValueError: + run_flake8 = True + else: + run_flake8 = False + + try: + sys.argv.remove('--lintonly') + except ValueError: + run_tests = True + else: + run_tests = False + + try: + sys.argv.remove('--fast') + except ValueError: + style = 'default' + else: + style = 'fast' + run_flake8 = False + + if len(sys.argv) > 1: + pytest_args = sys.argv[1:] + first_arg = pytest_args[0] + if first_arg.startswith('-'): + # `runtests.py [flags]` + pytest_args = ['tests'] + pytest_args + elif is_class(first_arg) and is_function(first_arg): + # `runtests.py TestCase.test_function [flags]` + expression = split_class_and_function(first_arg) + pytest_args = ['tests', '-k', expression] + pytest_args[1:] + elif is_class(first_arg) or is_function(first_arg): + # `runtests.py TestCase [flags]` + # `runtests.py test_function [flags]` + pytest_args = ['tests', '-k', pytest_args[0]] + pytest_args[1:] + else: + pytest_args = PYTEST_ARGS[style] + + if run_tests: + exit_on_failure(pytest.main(pytest_args)) + if run_flake8: + exit_on_failure(flake8_main(FLAKE8_ARGS)) diff --git a/conftest.py b/tests/conftest.py similarity index 100% rename from conftest.py rename to tests/conftest.py diff --git a/tests/serializers.py b/tests/serializers.py index f2f85b6ea..be7b37722 100644 --- a/tests/serializers.py +++ b/tests/serializers.py @@ -1,5 +1,4 @@ from rest_framework import serializers - from tests.models import NullableForeignKeySource diff --git a/tests/settings.py b/tests/settings.py index de41dc66a..91c9ed09e 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -68,7 +68,6 @@ SECRET_KEY = 'u@x-aj9(hoh#rb-^ymf#g2jx_hp0vj7u5#b@ag1n^seu9e!%cy' TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', ) MIDDLEWARE_CLASSES = ( @@ -104,8 +103,8 @@ INSTALLED_APPS = ( # OAuth is optional and won't work if there is no oauth_provider & oauth2 try: - import oauth_provider - import oauth2 + import oauth_provider # NOQA + import oauth2 # NOQA except ImportError: pass else: @@ -114,7 +113,7 @@ else: ) try: - import provider + import provider # NOQA except ImportError: pass else: @@ -125,13 +124,13 @@ else: # guardian is optional try: - import guardian + import guardian # NOQA except ImportError: pass else: ANONYMOUS_USER_ID = -1 AUTHENTICATION_BACKENDS = ( - 'django.contrib.auth.backends.ModelBackend', # default + 'django.contrib.auth.backends.ModelBackend', # default 'guardian.backends.ObjectPermissionBackend', ) INSTALLED_APPS += ( diff --git a/tests/test_authentication.py b/tests/test_authentication.py index f5bfc5e61..9db4f62df 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -45,26 +45,39 @@ class MockView(APIView): return HttpResponse({'a': 1, 'b': 2, 'c': 3}) -urlpatterns = patterns('', +urlpatterns = patterns( + '', (r'^session/$', MockView.as_view(authentication_classes=[SessionAuthentication])), (r'^basic/$', MockView.as_view(authentication_classes=[BasicAuthentication])), (r'^token/$', MockView.as_view(authentication_classes=[TokenAuthentication])), (r'^auth-token/$', 'rest_framework.authtoken.views.obtain_auth_token'), (r'^oauth/$', MockView.as_view(authentication_classes=[OAuthAuthentication])), - (r'^oauth-with-scope/$', MockView.as_view(authentication_classes=[OAuthAuthentication], - permission_classes=[permissions.TokenHasReadWriteScope])) + ( + r'^oauth-with-scope/$', + MockView.as_view( + authentication_classes=[OAuthAuthentication], + permission_classes=[permissions.TokenHasReadWriteScope] + ) + ) ) + class OAuth2AuthenticationDebug(OAuth2Authentication): allow_query_params_token = True if oauth2_provider is not None: - urlpatterns += patterns('', + urlpatterns += patterns( + '', url(r'^oauth2/', include('provider.oauth2.urls', namespace='oauth2')), url(r'^oauth2-test/$', MockView.as_view(authentication_classes=[OAuth2Authentication])), url(r'^oauth2-test-debug/$', MockView.as_view(authentication_classes=[OAuth2AuthenticationDebug])), - url(r'^oauth2-with-scope-test/$', MockView.as_view(authentication_classes=[OAuth2Authentication], - permission_classes=[permissions.TokenHasReadWriteScope])), + url( + r'^oauth2-with-scope-test/$', + MockView.as_view( + authentication_classes=[OAuth2Authentication], + permission_classes=[permissions.TokenHasReadWriteScope] + ) + ) ) @@ -278,12 +291,16 @@ class OAuthTests(TestCase): self.TOKEN_KEY = "token_key" self.TOKEN_SECRET = "token_secret" - self.consumer = Consumer.objects.create(key=self.CONSUMER_KEY, secret=self.CONSUMER_SECRET, - name='example', user=self.user, status=self.consts.ACCEPTED) + self.consumer = Consumer.objects.create( + key=self.CONSUMER_KEY, secret=self.CONSUMER_SECRET, + name='example', user=self.user, status=self.consts.ACCEPTED + ) self.scope = Scope.objects.create(name="resource name", url="api/") - self.token = OAuthToken.objects.create(user=self.user, consumer=self.consumer, scope=self.scope, - token_type=OAuthToken.ACCESS, key=self.TOKEN_KEY, secret=self.TOKEN_SECRET, is_approved=True + self.token = OAuthToken.objects.create( + user=self.user, consumer=self.consumer, scope=self.scope, + token_type=OAuthToken.ACCESS, key=self.TOKEN_KEY, secret=self.TOKEN_SECRET, + is_approved=True ) def _create_authorization_header(self): @@ -501,24 +518,24 @@ class OAuth2Tests(TestCase): self.REFRESH_TOKEN = "refresh_token" self.oauth2_client = oauth2_provider.oauth2.models.Client.objects.create( - client_id=self.CLIENT_ID, - client_secret=self.CLIENT_SECRET, - redirect_uri='', - client_type=0, - name='example', - user=None, - ) + client_id=self.CLIENT_ID, + client_secret=self.CLIENT_SECRET, + redirect_uri='', + client_type=0, + name='example', + user=None, + ) self.access_token = oauth2_provider.oauth2.models.AccessToken.objects.create( - token=self.ACCESS_TOKEN, - client=self.oauth2_client, - user=self.user, - ) + token=self.ACCESS_TOKEN, + client=self.oauth2_client, + user=self.user, + ) self.refresh_token = oauth2_provider.oauth2.models.RefreshToken.objects.create( - user=self.user, - access_token=self.access_token, - client=self.oauth2_client - ) + user=self.user, + access_token=self.access_token, + client=self.oauth2_client + ) def _create_authorization_header(self, token=None): return "Bearer {0}".format(token or self.access_token.token) @@ -569,8 +586,10 @@ class OAuth2Tests(TestCase): @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') def test_post_form_passing_auth_url_transport(self): """Ensure GETing form over OAuth with correct client credentials in form data succeed""" - response = self.csrf_client.post('/oauth2-test/', - data={'access_token': self.access_token.token}) + response = self.csrf_client.post( + '/oauth2-test/', + data={'access_token': self.access_token.token} + ) self.assertEqual(response.status_code, 200) @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') diff --git a/tests/test_breadcrumbs.py b/tests/test_breadcrumbs.py index f26c3eafe..780fd5c4d 100644 --- a/tests/test_breadcrumbs.py +++ b/tests/test_breadcrumbs.py @@ -24,7 +24,8 @@ class NestedResourceRoot(APIView): class NestedResourceInstance(APIView): pass -urlpatterns = patterns('', +urlpatterns = patterns( + '', url(r'^$', Root.as_view()), url(r'^resource/$', ResourceRoot.as_view()), url(r'^resource/(?P[0-9]+)$', ResourceInstance.as_view()), @@ -40,34 +41,60 @@ class BreadcrumbTests(TestCase): def test_root_breadcrumbs(self): url = '/' - self.assertEqual(get_breadcrumbs(url), [('Root', '/')]) + self.assertEqual( + get_breadcrumbs(url), + [('Root', '/')] + ) def test_resource_root_breadcrumbs(self): url = '/resource/' - self.assertEqual(get_breadcrumbs(url), [('Root', '/'), - ('Resource Root', '/resource/')]) + self.assertEqual( + get_breadcrumbs(url), + [ + ('Root', '/'), + ('Resource Root', '/resource/') + ] + ) def test_resource_instance_breadcrumbs(self): url = '/resource/123' - self.assertEqual(get_breadcrumbs(url), [('Root', '/'), - ('Resource Root', '/resource/'), - ('Resource Instance', '/resource/123')]) + self.assertEqual( + get_breadcrumbs(url), + [ + ('Root', '/'), + ('Resource Root', '/resource/'), + ('Resource Instance', '/resource/123') + ] + ) def test_nested_resource_breadcrumbs(self): url = '/resource/123/' - self.assertEqual(get_breadcrumbs(url), [('Root', '/'), - ('Resource Root', '/resource/'), - ('Resource Instance', '/resource/123'), - ('Nested Resource Root', '/resource/123/')]) + self.assertEqual( + get_breadcrumbs(url), + [ + ('Root', '/'), + ('Resource Root', '/resource/'), + ('Resource Instance', '/resource/123'), + ('Nested Resource Root', '/resource/123/') + ] + ) def test_nested_resource_instance_breadcrumbs(self): url = '/resource/123/abc' - self.assertEqual(get_breadcrumbs(url), [('Root', '/'), - ('Resource Root', '/resource/'), - ('Resource Instance', '/resource/123'), - ('Nested Resource Root', '/resource/123/'), - ('Nested Resource Instance', '/resource/123/abc')]) + self.assertEqual( + get_breadcrumbs(url), + [ + ('Root', '/'), + ('Resource Root', '/resource/'), + ('Resource Instance', '/resource/123'), + ('Nested Resource Root', '/resource/123/'), + ('Nested Resource Instance', '/resource/123/abc') + ] + ) def test_broken_url_breadcrumbs_handled_gracefully(self): url = '/foobar' - self.assertEqual(get_breadcrumbs(url), [('Root', '/')]) + self.assertEqual( + get_breadcrumbs(url), + [('Root', '/')] + ) diff --git a/tests/test_fields.py b/tests/test_fields.py index 97ef016fa..094ac1eb0 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -648,7 +648,7 @@ class DecimalFieldTest(TestCase): s = DecimalSerializer(data={'decimal_field': '123'}) self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'decimal_field': ['Ensure this value is less than or equal to 100.']}) + self.assertEqual(s.errors, {'decimal_field': ['Ensure this value is less than or equal to 100.']}) def test_raise_min_value(self): """ @@ -660,7 +660,7 @@ class DecimalFieldTest(TestCase): s = DecimalSerializer(data={'decimal_field': '99'}) self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'decimal_field': ['Ensure this value is greater than or equal to 100.']}) + self.assertEqual(s.errors, {'decimal_field': ['Ensure this value is greater than or equal to 100.']}) def test_raise_max_digits(self): """ @@ -672,7 +672,7 @@ class DecimalFieldTest(TestCase): s = DecimalSerializer(data={'decimal_field': '123.456'}) self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 5 digits in total.']}) + self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 5 digits in total.']}) def test_raise_max_decimal_places(self): """ @@ -684,7 +684,7 @@ class DecimalFieldTest(TestCase): s = DecimalSerializer(data={'decimal_field': '123.4567'}) self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 3 decimal places.']}) + self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 3 decimal places.']}) def test_raise_max_whole_digits(self): """ @@ -696,7 +696,7 @@ class DecimalFieldTest(TestCase): s = DecimalSerializer(data={'decimal_field': '12345.6'}) self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 4 digits in total.']}) + self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 4 digits in total.']}) class ChoiceFieldTests(TestCase): @@ -729,7 +729,7 @@ class ChoiceFieldTests(TestCase): def test_invalid_choice_model(self): s = ChoiceFieldModelSerializer(data={'choice': 'wrong_value'}) self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'choice': ['Select a valid choice. wrong_value is not one of the available choices.']}) + self.assertEqual(s.errors, {'choice': ['Select a valid choice. wrong_value is not one of the available choices.']}) self.assertEqual(s.data['choice'], '') def test_empty_choice_model(self): @@ -875,7 +875,7 @@ class SlugFieldTests(TestCase): s = SlugFieldSerializer(data={'slug_field': 'a b'}) self.assertEqual(s.is_valid(), False) - self.assertEqual(s.errors, {'slug_field': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."]}) + self.assertEqual(s.errors, {'slug_field': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."]}) class URLFieldTests(TestCase): diff --git a/tests/test_files.py b/tests/test_files.py index 78f4cf425..af110df91 100644 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -85,11 +85,8 @@ class FileSerializerTests(TestCase): """ Validation should still function when no data dictionary is provided. """ - now = datetime.datetime.now() - file = BytesIO(six.b('stuff')) - file.name = 'stuff.txt' - file.size = len(file.getvalue()) - uploaded_file = UploadedFile(file=file, created=now) - - serializer = UploadedFileSerializer(files={'file': file}) + uploaded_file = BytesIO(six.b('stuff')) + uploaded_file.name = 'stuff.txt' + uploaded_file.size = len(uploaded_file.getvalue()) + serializer = UploadedFileSerializer(files={'file': uploaded_file}) self.assertFalse(serializer.is_valid()) diff --git a/tests/test_filters.py b/tests/test_filters.py index 85840e018..b29760fa4 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -74,7 +74,8 @@ if django_filters: def get_queryset(self): return FilterableItem.objects.all() - urlpatterns = patterns('', + urlpatterns = patterns( + '', url(r'^(?P\d+)/$', FilterClassDetailView.as_view(), name='detail-view'), url(r'^$', FilterClassRootView.as_view(), name='root-view'), url(r'^get-queryset/$', GetQuerysetView.as_view(), @@ -653,8 +654,8 @@ class SensitiveOrderingFilterTests(TestCase): self.assertEqual( response.data, [ - {'id': 1, username_field: 'userA'}, # PassB - {'id': 2, username_field: 'userB'}, # PassC - {'id': 3, username_field: 'userC'}, # PassA + {'id': 1, username_field: 'userA'}, # PassB + {'id': 2, username_field: 'userB'}, # PassC + {'id': 3, username_field: 'userC'}, # PassA ] ) diff --git a/tests/test_genericrelations.py b/tests/test_genericrelations.py index 3a8f3c7f1..95295eaa8 100644 --- a/tests/test_genericrelations.py +++ b/tests/test_genericrelations.py @@ -117,18 +117,18 @@ class TestGenericRelations(TestCase): serializer = TagSerializer(Tag.objects.all(), many=True) expected = [ - { - 'tag': 'django', - 'tagged_item': 'Bookmark: https://www.djangoproject.com/' - }, - { - 'tag': 'python', - 'tagged_item': 'Bookmark: https://www.djangoproject.com/' - }, - { - 'tag': 'reminder', - 'tagged_item': 'Note: Remember the milk' - } + { + 'tag': 'django', + 'tagged_item': 'Bookmark: https://www.djangoproject.com/' + }, + { + 'tag': 'python', + 'tagged_item': 'Bookmark: https://www.djangoproject.com/' + }, + { + 'tag': 'reminder', + 'tagged_item': 'Note: Remember the milk' + } ] self.assertEqual(serializer.data, expected) diff --git a/tests/test_htmlrenderer.py b/tests/test_htmlrenderer.py index 88d11c46b..5a680f99b 100644 --- a/tests/test_htmlrenderer.py +++ b/tests/test_htmlrenderer.py @@ -34,7 +34,8 @@ def not_found(request): raise Http404() -urlpatterns = patterns('', +urlpatterns = patterns( + '', url(r'^$', example), url(r'^permission_denied$', permission_denied), url(r'^not_found$', not_found), diff --git a/tests/test_hyperlinkedserializers.py b/tests/test_hyperlinkedserializers.py index d478ea730..d45485391 100644 --- a/tests/test_hyperlinkedserializers.py +++ b/tests/test_hyperlinkedserializers.py @@ -94,7 +94,8 @@ class OptionalRelationDetail(generics.RetrieveUpdateDestroyAPIView): model_serializer_class = serializers.HyperlinkedModelSerializer -urlpatterns = patterns('', +urlpatterns = patterns( + '', url(r'^basic/$', BasicList.as_view(), name='basicmodel-list'), url(r'^basic/(?P\d+)/$', BasicDetail.as_view(), name='basicmodel-detail'), url(r'^anchor/(?P\d+)/$', AnchorDetail.as_view(), name='anchor-detail'), diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 293146c08..d5b9244d9 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals import datetime from decimal import Decimal -from django.db import models from django.core.paginator import Paginator from django.test import TestCase from django.utils import unittest @@ -12,6 +11,7 @@ from .models import BasicModel, FilterableItem factory = APIRequestFactory() + # Helper function to split arguments out of an url def split_arguments_from_url(url): if '?' not in url: @@ -274,8 +274,8 @@ class TestUnpaginated(TestCase): BasicModel(text=i).save() self.objects = BasicModel.objects self.data = [ - {'id': obj.id, 'text': obj.text} - for obj in self.objects.all() + {'id': obj.id, 'text': obj.text} + for obj in self.objects.all() ] self.view = DefaultPageSizeKwargView.as_view() @@ -302,8 +302,8 @@ class TestCustomPaginateByParam(TestCase): BasicModel(text=i).save() self.objects = BasicModel.objects self.data = [ - {'id': obj.id, 'text': obj.text} - for obj in self.objects.all() + {'id': obj.id, 'text': obj.text} + for obj in self.objects.all() ] self.view = PaginateByParamView.as_view() @@ -483,8 +483,6 @@ class NonIntegerPaginator(object): class TestNonIntegerPagination(TestCase): - - def test_custom_pagination_serializer(self): objects = ['john', 'paul', 'george', 'ringo'] paginator = NonIntegerPaginator(objects, 2) diff --git a/tests/test_permissions.py b/tests/test_permissions.py index a2cb0c362..93f8020f3 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -12,6 +12,7 @@ import base64 factory = APIRequestFactory() + class RootView(generics.ListCreateAPIView): model = BasicModel authentication_classes = [authentication.BasicAuthentication] @@ -101,42 +102,54 @@ class ModelPermissionsIntegrationTests(TestCase): self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) def test_options_permitted(self): - request = factory.options('/', - HTTP_AUTHORIZATION=self.permitted_credentials) + request = factory.options( + '/', + HTTP_AUTHORIZATION=self.permitted_credentials + ) response = root_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertIn('actions', response.data) self.assertEqual(list(response.data['actions'].keys()), ['POST']) - request = factory.options('/1', - HTTP_AUTHORIZATION=self.permitted_credentials) + request = factory.options( + '/1', + HTTP_AUTHORIZATION=self.permitted_credentials + ) response = instance_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertIn('actions', response.data) self.assertEqual(list(response.data['actions'].keys()), ['PUT']) def test_options_disallowed(self): - request = factory.options('/', - HTTP_AUTHORIZATION=self.disallowed_credentials) + request = factory.options( + '/', + HTTP_AUTHORIZATION=self.disallowed_credentials + ) response = root_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertNotIn('actions', response.data) - request = factory.options('/1', - HTTP_AUTHORIZATION=self.disallowed_credentials) + request = factory.options( + '/1', + HTTP_AUTHORIZATION=self.disallowed_credentials + ) response = instance_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertNotIn('actions', response.data) def test_options_updateonly(self): - request = factory.options('/', - HTTP_AUTHORIZATION=self.updateonly_credentials) + request = factory.options( + '/', + HTTP_AUTHORIZATION=self.updateonly_credentials + ) response = root_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertNotIn('actions', response.data) - request = factory.options('/1', - HTTP_AUTHORIZATION=self.updateonly_credentials) + request = factory.options( + '/1', + HTTP_AUTHORIZATION=self.updateonly_credentials + ) response = instance_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertIn('actions', response.data) @@ -153,6 +166,7 @@ class BasicPermModel(models.Model): # add, change, delete built in to django ) + # Custom object-level permission, that includes 'view' permissions class ViewObjectPermissions(permissions.DjangoObjectPermissions): perms_map = { @@ -205,7 +219,7 @@ class ObjectPermissionsIntegrationTests(TestCase): app_label = BasicPermModel._meta.app_label f = '{0}_{1}'.format perms = { - 'view': f('view', model_name), + 'view': f('view', model_name), 'change': f('change', model_name), 'delete': f('delete', model_name) } @@ -246,21 +260,27 @@ class ObjectPermissionsIntegrationTests(TestCase): # Update def test_can_update_permissions(self): - request = factory.patch('/1', {'text': 'foobar'}, format='json', - HTTP_AUTHORIZATION=self.credentials['writeonly']) + request = factory.patch( + '/1', {'text': 'foobar'}, format='json', + HTTP_AUTHORIZATION=self.credentials['writeonly'] + ) response = object_permissions_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.data.get('text'), 'foobar') def test_cannot_update_permissions(self): - request = factory.patch('/1', {'text': 'foobar'}, format='json', - HTTP_AUTHORIZATION=self.credentials['deleteonly']) + request = factory.patch( + '/1', {'text': 'foobar'}, format='json', + HTTP_AUTHORIZATION=self.credentials['deleteonly'] + ) response = object_permissions_view(request, pk='1') self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) def test_cannot_update_permissions_non_existing(self): - request = factory.patch('/999', {'text': 'foobar'}, format='json', - HTTP_AUTHORIZATION=self.credentials['deleteonly']) + request = factory.patch( + '/999', {'text': 'foobar'}, format='json', + HTTP_AUTHORIZATION=self.credentials['deleteonly'] + ) response = object_permissions_view(request, pk='999') self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) diff --git a/tests/test_relations.py b/tests/test_relations.py index cd276d30c..bc1db69fc 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -108,19 +108,25 @@ class RelatedFieldSourceTests(TestCase): doesn't exist. """ from tests.models import ManyToManySource + class Meta: model = ManyToManySource + attrs = { 'name': serializers.SlugRelatedField( slug_field='name', source='banzai'), 'Meta': Meta, } - TestSerializer = type(str('TestSerializer'), - (serializers.ModelSerializer,), attrs) + TestSerializer = type( + str('TestSerializer'), + (serializers.ModelSerializer,), + attrs + ) with self.assertRaises(AttributeError): TestSerializer(data={'name': 'foo'}) + @unittest.skipIf(get_version() < '1.6.0', 'Upstream behaviour changed in v1.6') class RelatedFieldChoicesTests(TestCase): """ @@ -141,4 +147,3 @@ class RelatedFieldChoicesTests(TestCase): widget_count = len(field.widget.choices) self.assertEqual(widget_count, choice_count + 1, 'BLANK_CHOICE_DASH option should have been added') - diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py index ab1c66646..0c8eb2544 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -16,7 +16,8 @@ request = factory.get('/') # Just to ensure we have a request in the serializer def dummy_view(request, pk): pass -urlpatterns = patterns('', +urlpatterns = patterns( + '', url(r'^dummyurl/(?P[0-9]+)/$', dummy_view, name='dummy-url'), url(r'^manytomanysource/(?P[0-9]+)/$', dummy_view, name='manytomanysource-detail'), url(r'^manytomanytarget/(?P[0-9]+)/$', dummy_view, name='manytomanytarget-detail'), @@ -86,9 +87,9 @@ class HyperlinkedManyToManyTests(TestCase): queryset = ManyToManySource.objects.all() serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) expected = [ - {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/']}, - {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, - {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} + {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/']}, + {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, + {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} ] self.assertEqual(serializer.data, expected) @@ -114,9 +115,9 @@ class HyperlinkedManyToManyTests(TestCase): queryset = ManyToManySource.objects.all() serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) expected = [ - {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']}, - {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, - {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} + {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']}, + {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, + {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} ] self.assertEqual(serializer.data, expected) diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index ff59b250a..c051b0769 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -65,9 +65,9 @@ class PKManyToManyTests(TestCase): queryset = ManyToManySource.objects.all() serializer = ManyToManySourceSerializer(queryset, many=True) expected = [ - {'id': 1, 'name': 'source-1', 'targets': [1]}, - {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, - {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} + {'id': 1, 'name': 'source-1', 'targets': [1]}, + {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, + {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} ] self.assertEqual(serializer.data, expected) @@ -93,9 +93,9 @@ class PKManyToManyTests(TestCase): queryset = ManyToManySource.objects.all() serializer = ManyToManySourceSerializer(queryset, many=True) expected = [ - {'id': 1, 'name': 'source-1', 'targets': [1, 2, 3]}, - {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, - {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} + {'id': 1, 'name': 'source-1', 'targets': [1, 2, 3]}, + {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, + {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} ] self.assertEqual(serializer.data, expected) diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 1d8adfa74..0403cde28 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -76,7 +76,6 @@ class MockGETView(APIView): return Response({'foo': ['bar', 'baz']}) - class MockPOSTView(APIView): def post(self, request, **kwargs): return Response({'foo': request.DATA}) @@ -102,7 +101,8 @@ class HTMLView1(APIView): def get(self, request, **kwargs): return Response('text') -urlpatterns = patterns('', +urlpatterns = patterns( + '', url(r'^.*\.(?P.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB])), url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB])), url(r'^cache$', MockGETView.as_view()), @@ -312,16 +312,22 @@ class JSONRendererTests(TestCase): class Dict(MutableMapping): def __init__(self): self._dict = dict() + def __getitem__(self, key): return self._dict.__getitem__(key) + def __setitem__(self, key, value): return self._dict.__setitem__(key, value) + def __delitem__(self, key): return self._dict.__delitem__(key) + def __iter__(self): return self._dict.__iter__() + def __len__(self): return self._dict.__len__() + def keys(self): return self._dict.keys() @@ -330,22 +336,24 @@ class JSONRendererTests(TestCase): x[2] = 3 ret = JSONRenderer().render(x) data = json.loads(ret.decode('utf-8')) - self.assertEquals(data, {'key': 'string value', '2': 3}) + self.assertEquals(data, {'key': 'string value', '2': 3}) def test_render_obj_with_getitem(self): class DictLike(object): def __init__(self): self._dict = {} + def set(self, value): self._dict = dict(value) + def __getitem__(self, key): return self._dict[key] - + x = DictLike() x.set({'a': 1, 'b': 'string'}) with self.assertRaises(TypeError): JSONRenderer().render(x) - + def test_without_content_type_args(self): """ Test basic JSON rendering. @@ -394,35 +402,47 @@ class JSONPRendererTests(TestCase): """ Test JSONP rendering with View JSON Renderer. """ - resp = self.client.get('/jsonp/jsonrenderer', - HTTP_ACCEPT='application/javascript') + resp = self.client.get( + '/jsonp/jsonrenderer', + HTTP_ACCEPT='application/javascript' + ) self.assertEqual(resp.status_code, status.HTTP_200_OK) self.assertEqual(resp['Content-Type'], 'application/javascript; charset=utf-8') - self.assertEqual(resp.content, - ('callback(%s);' % _flat_repr).encode('ascii')) + self.assertEqual( + resp.content, + ('callback(%s);' % _flat_repr).encode('ascii') + ) def test_without_callback_without_json_renderer(self): """ Test JSONP rendering without View JSON Renderer. """ - resp = self.client.get('/jsonp/nojsonrenderer', - HTTP_ACCEPT='application/javascript') + resp = self.client.get( + '/jsonp/nojsonrenderer', + HTTP_ACCEPT='application/javascript' + ) self.assertEqual(resp.status_code, status.HTTP_200_OK) self.assertEqual(resp['Content-Type'], 'application/javascript; charset=utf-8') - self.assertEqual(resp.content, - ('callback(%s);' % _flat_repr).encode('ascii')) + self.assertEqual( + resp.content, + ('callback(%s);' % _flat_repr).encode('ascii') + ) def test_with_callback(self): """ Test JSONP rendering with callback function name. """ callback_func = 'myjsonpcallback' - resp = self.client.get('/jsonp/nojsonrenderer?callback=' + callback_func, - HTTP_ACCEPT='application/javascript') + resp = self.client.get( + '/jsonp/nojsonrenderer?callback=' + callback_func, + HTTP_ACCEPT='application/javascript' + ) self.assertEqual(resp.status_code, status.HTTP_200_OK) self.assertEqual(resp['Content-Type'], 'application/javascript; charset=utf-8') - self.assertEqual(resp.content, - ('%s(%s);' % (callback_func, _flat_repr)).encode('ascii')) + self.assertEqual( + resp.content, + ('%s(%s);' % (callback_func, _flat_repr)).encode('ascii') + ) if yaml: @@ -467,7 +487,6 @@ if yaml: def assertYAMLContains(self, content, string): self.assertTrue(string in content, '%r not in %r' % (string, content)) - class UnicodeYAMLRendererTests(TestCase): """ Tests specific for the Unicode YAML Renderer @@ -592,13 +611,13 @@ class CacheRenderTest(TestCase): """ Return any errors that would be raised if `obj' is pickled Courtesy of koffie @ http://stackoverflow.com/a/7218986/109897 """ - if seen == None: + if seen is None: seen = [] try: state = obj.__getstate__() except AttributeError: return - if state == None: + if state is None: return if isinstance(state, tuple): if not isinstance(state[0], dict): diff --git a/tests/test_request.py b/tests/test_request.py index 0cde0fb40..8b048b5c2 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -272,7 +272,8 @@ class MockView(APIView): return Response(status=status.INTERNAL_SERVER_ERROR) -urlpatterns = patterns('', +urlpatterns = patterns( + '', (r'^$', MockView.as_view()), ) diff --git a/tests/test_response.py b/tests/test_response.py index 0551f4a80..c28f186e0 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -100,7 +100,8 @@ new_model_viewset_router = routers.DefaultRouter() new_model_viewset_router.register(r'', HTMLNewModelViewSet) -urlpatterns = patterns('', +urlpatterns = patterns( + '', url(r'^setbyview$', MockViewSettingContentType.as_view(renderer_classes=[RendererA, RendererB, RendererC])), url(r'^.*\.(?P.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])), url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])), diff --git a/tests/test_reverse.py b/tests/test_reverse.py index 0d3fddf07..675a9d5a0 100644 --- a/tests/test_reverse.py +++ b/tests/test_reverse.py @@ -10,7 +10,8 @@ factory = APIRequestFactory() def null_view(request): pass -urlpatterns = patterns('', +urlpatterns = patterns( + '', url(r'^view$', null_view, name='view'), ) diff --git a/tests/test_routers.py b/tests/test_routers.py index 381569bde..b076f134e 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -93,7 +93,8 @@ class TestCustomLookupFields(TestCase): from tests import test_routers urls = getattr(test_routers, 'urlpatterns') - urls += patterns('', + urls += patterns( + '', url(r'^', include(self.router.urls)), ) @@ -104,7 +105,8 @@ class TestCustomLookupFields(TestCase): def test_retrieve_lookup_field_list_view(self): response = self.client.get('/notes/') - self.assertEqual(response.data, + self.assertEqual( + response.data, [{ "url": "http://testserver/notes/123/", "uuid": "123", "text": "foo bar" @@ -113,7 +115,8 @@ class TestCustomLookupFields(TestCase): def test_retrieve_lookup_field_detail_view(self): response = self.client.get('/notes/123/') - self.assertEqual(response.data, + self.assertEqual( + response.data, { "url": "http://testserver/notes/123/", "uuid": "123", "text": "foo bar" diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 7d57fcf01..d27bdcf16 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -7,10 +7,12 @@ from django.utils import unittest from django.utils.datastructures import MultiValueDict from django.utils.translation import ugettext_lazy as _ from rest_framework import serializers, fields, relations -from tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel, - BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, DefaultValueModel, - ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo, RESTFrameworkModel, - ForeignKeySource, ManyToManySource) +from tests.models import ( + HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel, + BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, + DefaultValueModel, ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo, + RESTFrameworkModel, ForeignKeySource +) from tests.models import BasicModelSerializer import datetime import pickle @@ -99,6 +101,7 @@ class ActionItemSerializer(serializers.ModelSerializer): class Meta: model = ActionItem + class ActionItemSerializerOptionalFields(serializers.ModelSerializer): """ Intended to test that fields with `required=False` are excluded from validation. @@ -109,6 +112,7 @@ class ActionItemSerializerOptionalFields(serializers.ModelSerializer): model = ActionItem fields = ('title',) + class ActionItemSerializerCustomRestore(serializers.ModelSerializer): class Meta: @@ -295,8 +299,10 @@ class BasicTests(TestCase): in the Meta data """ serializer = PersonSerializer(self.person) - self.assertEqual(set(serializer.data.keys()), - set(['name', 'age', 'info'])) + self.assertEqual( + set(serializer.data.keys()), + set(['name', 'age', 'info']) + ) def test_field_with_dictionary(self): """ @@ -331,9 +337,9 @@ class BasicTests(TestCase): — id field is not populated if `data` is accessed prior to `save()` """ serializer = ActionItemSerializer(self.actionitem) - self.assertIsNone(serializer.data.get('id',None), 'New instance. `id` should not be set.') + self.assertIsNone(serializer.data.get('id', None), 'New instance. `id` should not be set.') serializer.save() - self.assertIsNotNone(serializer.data.get('id',None), 'Model is saved. `id` should be set.') + self.assertIsNotNone(serializer.data.get('id', None), 'Model is saved. `id` should be set.') def test_fields_marked_as_not_required_are_excluded_from_validation(self): """ @@ -660,10 +666,10 @@ class ModelValidationTests(TestCase): serializer.save() second_serializer = AlbumsSerializer(data={'title': 'a'}) self.assertFalse(second_serializer.is_valid()) - self.assertEqual(second_serializer.errors, {'title': ['Album with this Title already exists.'],}) + self.assertEqual(second_serializer.errors, {'title': ['Album with this Title already exists.']}) third_serializer = AlbumsSerializer(data=[{'title': 'b', 'ref': '1'}, {'title': 'c'}], many=True) self.assertFalse(third_serializer.is_valid()) - self.assertEqual(third_serializer.errors, [{'ref': ['Album with this Ref already exists.']}, {}]) + self.assertEqual(third_serializer.errors, [{'ref': ['Album with this Ref already exists.']}, {}]) def test_foreign_key_is_null_with_partial(self): """ @@ -959,7 +965,7 @@ class WritableFieldDefaultValueTests(TestCase): self.assertEqual(got, self.expected) def test_get_default_value_with_callable(self): - field = self.create_field(default=lambda : self.expected) + field = self.create_field(default=lambda: self.expected) got = field.get_default_value() self.assertEqual(got, self.expected) @@ -974,7 +980,7 @@ class WritableFieldDefaultValueTests(TestCase): self.assertIsNone(got) def test_get_default_value_returns_non_True_values(self): - values = [None, '', False, 0, [], (), {}] # values that assumed as 'False' in the 'if' clause + values = [None, '', False, 0, [], (), {}] # values that assumed as 'False' in the 'if' clause for expected in values: field = self.create_field(default=expected) got = field.get_default_value() diff --git a/tests/test_serializer_bulk_update.py b/tests/test_serializer_bulk_update.py index 8b0ded1a8..67a8ed0dc 100644 --- a/tests/test_serializer_bulk_update.py +++ b/tests/test_serializer_bulk_update.py @@ -83,9 +83,9 @@ class BulkCreateSerializerTests(TestCase): self.assertEqual(serializer.is_valid(), False) expected_errors = [ - {'non_field_errors': ['Invalid data']}, - {'non_field_errors': ['Invalid data']}, - {'non_field_errors': ['Invalid data']} + {'non_field_errors': ['Invalid data']}, + {'non_field_errors': ['Invalid data']}, + {'non_field_errors': ['Invalid data']} ] self.assertEqual(serializer.errors, expected_errors) diff --git a/tests/test_serializer_nested.py b/tests/test_serializer_nested.py index 6d69ffbd0..c09c24db2 100644 --- a/tests/test_serializer_nested.py +++ b/tests/test_serializer_nested.py @@ -328,12 +328,14 @@ class NestedModelSerializerUpdateTests(TestCase): class BlogPostSerializer(serializers.ModelSerializer): comments = BlogPostCommentSerializer(many=True, source='blogpostcomment_set') + class Meta: model = models.BlogPost fields = ('id', 'title', 'comments') class PersonSerializer(serializers.ModelSerializer): posts = BlogPostSerializer(many=True, source='blogpost_set') + class Meta: model = models.Person fields = ('id', 'name', 'age', 'posts') diff --git a/tests/test_serializers.py b/tests/test_serializers.py index 2e276f15c..09de9f4c1 100644 --- a/tests/test_serializers.py +++ b/tests/test_serializers.py @@ -1,9 +1,7 @@ -from django.db import models from django.test import TestCase - +from rest_framework.compat import six from rest_framework.serializers import _resolve_model from tests.models import BasicModel -from rest_framework.compat import six class ResolveModelTests(TestCase): diff --git a/tests/test_status.py b/tests/test_status.py index 7b1bdae31..721a6e30b 100644 --- a/tests/test_status.py +++ b/tests/test_status.py @@ -30,4 +30,4 @@ class TestStatus(TestCase): self.assertFalse(is_server_error(499)) self.assertTrue(is_server_error(500)) self.assertTrue(is_server_error(599)) - self.assertFalse(is_server_error(600)) \ No newline at end of file + self.assertFalse(is_server_error(600)) diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index d4da0c23b..b96bc0caf 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -48,4 +48,4 @@ class Issue1386Tests(TestCase): self.assertEqual(i, res) # example from issue #1386, this shouldn't raise an exception - _ = urlize_quoted_links("asdf:[/p]zxcv.com") + urlize_quoted_links("asdf:[/p]zxcv.com") diff --git a/tests/test_testing.py b/tests/test_testing.py index 1b126e002..9c472026a 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -28,7 +28,8 @@ def session_view(request): }) -urlpatterns = patterns('', +urlpatterns = patterns( + '', url(r'^view/$', view), url(r'^session-view/$', session_view), ) @@ -142,7 +143,8 @@ class TestAPIRequestFactory(TestCase): assertion error. """ factory = APIRequestFactory() - self.assertRaises(AssertionError, factory.post, + self.assertRaises( + AssertionError, factory.post, path='/view/', data={'example': 1}, format='xml' ) diff --git a/tests/test_throttling.py b/tests/test_throttling.py index 8c5eefe9c..b0cb2fe73 100644 --- a/tests/test_throttling.py +++ b/tests/test_throttling.py @@ -27,7 +27,7 @@ class NonTimeThrottle(BaseThrottle): if not hasattr(self.__class__, 'called'): self.__class__.called = True return True - return False + return False class MockView(APIView): @@ -125,36 +125,42 @@ class ThrottlingTests(TestCase): """ Ensure for second based throttles. """ - self.ensure_response_header_contains_proper_throttle_field(MockView, - ((0, None), - (0, None), - (0, None), - (0, '1') - )) + self.ensure_response_header_contains_proper_throttle_field( + MockView, ( + (0, None), + (0, None), + (0, None), + (0, '1') + ) + ) def test_minutes_fields(self): """ Ensure for minute based throttles. """ - self.ensure_response_header_contains_proper_throttle_field(MockView_MinuteThrottling, - ((0, None), - (0, None), - (0, None), - (0, '60') - )) + self.ensure_response_header_contains_proper_throttle_field( + MockView_MinuteThrottling, ( + (0, None), + (0, None), + (0, None), + (0, '60') + ) + ) def test_next_rate_remains_constant_if_followed(self): """ If a client follows the recommended next request rate, the throttling rate should stay constant. """ - self.ensure_response_header_contains_proper_throttle_field(MockView_MinuteThrottling, - ((0, None), - (20, None), - (40, None), - (60, None), - (80, None) - )) + self.ensure_response_header_contains_proper_throttle_field( + MockView_MinuteThrottling, ( + (0, None), + (20, None), + (40, None), + (60, None), + (80, None) + ) + ) def test_non_time_throttle(self): """ @@ -170,7 +176,7 @@ class ThrottlingTests(TestCase): self.assertTrue(MockView_NonTimeThrottling.throttle_classes[0].called) response = MockView_NonTimeThrottling.as_view()(request) - self.assertFalse('X-Throttle-Wait-Seconds' in response) + self.assertFalse('X-Throttle-Wait-Seconds' in response) class ScopedRateThrottleTests(TestCase): diff --git a/tests/test_urlizer.py b/tests/test_urlizer.py index 3dc8e8fe5..a77aa22ab 100644 --- a/tests/test_urlizer.py +++ b/tests/test_urlizer.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals from django.test import TestCase from rest_framework.templatetags.rest_framework import urlize_quoted_links -import sys class URLizerTests(TestCase): diff --git a/tox.ini b/tox.ini index 484053a69..200dad38d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,19 @@ [tox] downloadcache = {toxworkdir}/cache/ envlist = + flake8, py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7, py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6, py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5, - py2.7-django1.4,py2.6-django1.4, + py2.7-django1.4,py2.6-django1.4 [testenv] -commands = py.test -q +commands = ./runtests.py --fast + +[testenv:flake8] +basepython = python2.7 +deps = pytest==2.5.2 +commands = ./runtests.py --lintonly [testenv:py3.4-django1.7] basepython = python3.4 From 19f31340627c949ca07a9e7b59299734fd991f75 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 19 Aug 2014 13:42:01 +0100 Subject: [PATCH 0697/1652] Add flake8 to requirements --- .travis.yml | 1 + requirements-test.txt | 1 + tox.ini | 1 + 3 files changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9894ee4ec..ececf3e9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ install: - pip install Pillow==2.3.0 - pip install django-guardian==1.2.3 - pip install pytest-django==2.6.1 + - pip install flake8==2.2.2 - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.2.4; fi" - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi" diff --git a/requirements-test.txt b/requirements-test.txt index a91dd0d4b..411daeba2 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -2,6 +2,7 @@ pytest-django==2.6 pytest==2.5.2 pytest-cov==1.6 +flake8==2.2.2 # Optional packages markdown>=2.1.0 diff --git a/tox.ini b/tox.ini index 200dad38d..6f588de12 100644 --- a/tox.ini +++ b/tox.ini @@ -13,6 +13,7 @@ commands = ./runtests.py --fast [testenv:flake8] basepython = python2.7 deps = pytest==2.5.2 + flake8==2.2.2 commands = ./runtests.py --lintonly [testenv:py3.4-django1.7] From d2795dd26d7483ea0de119ae135eab0a94cf23d8 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 19 Aug 2014 13:54:52 +0100 Subject: [PATCH 0698/1652] Resolve linting issues --- rest_framework/fields.py | 10 ++++--- rest_framework/generics.py | 26 +++++++------------ rest_framework/relations.py | 16 +++++------- rest_framework/renderers.py | 2 +- rest_framework/request.py | 2 +- rest_framework/templatetags/rest_framework.py | 2 +- tests/conftest.py | 10 +++---- tests/test_pagination.py | 8 +++--- tests/test_serializer.py | 12 ++++----- tests/test_templatetags.py | 2 +- 10 files changed, 42 insertions(+), 48 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 43a74ae6e..85fcbd965 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -63,8 +63,10 @@ def get_component(obj, attr_name): def readable_datetime_formats(formats): - format = ', '.join(formats).replace(ISO_8601, - 'YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]') + format = ', '.join(formats).replace( + ISO_8601, + 'YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]' + ) return humanize_strptime(format) @@ -425,7 +427,7 @@ class ModelField(WritableField): } -##### Typed Fields ##### +# Typed Fields class BooleanField(WritableField): type_name = 'BooleanField' @@ -484,7 +486,7 @@ class URLField(CharField): type_label = 'url' def __init__(self, **kwargs): - if not 'validators' in kwargs: + if 'validators' not in kwargs: kwargs['validators'] = [validators.URLValidator()] super(URLField, self).__init__(**kwargs) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 02d243654..77deb8e4f 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -210,9 +210,8 @@ class GenericAPIView(views.APIView): return filter_backends - ######################## - ### The following methods provide default implementations - ### that you may want to override for more complex cases. + # The following methods provide default implementations + # that you may want to override for more complex cases. def get_paginate_by(self, queryset=None): """ @@ -340,12 +339,11 @@ class GenericAPIView(views.APIView): return obj - ######################## - ### The following are placeholder methods, - ### and are intended to be overridden. - ### - ### The are not called by GenericAPIView directly, - ### but are used by the mixin methods. + # The following are placeholder methods, + # and are intended to be overridden. + # + # The are not called by GenericAPIView directly, + # but are used by the mixin methods. def pre_save(self, obj): """ @@ -417,10 +415,8 @@ class GenericAPIView(views.APIView): return ret -########################################################## -### Concrete view classes that provide method handlers ### -### by composing the mixin classes with the base view. ### -########################################################## +# Concrete view classes that provide method handlers +# by composing the mixin classes with the base view. class CreateAPIView(mixins.CreateModelMixin, GenericAPIView): @@ -535,9 +531,7 @@ class RetrieveUpdateDestroyAPIView(mixins.RetrieveModelMixin, return self.destroy(request, *args, **kwargs) -########################## -### Deprecated classes ### -########################## +# Deprecated classes class MultipleObjectAPIView(GenericAPIView): def __init__(self, *args, **kwargs): diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 3b234dd58..1acbdce26 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -19,8 +19,7 @@ from rest_framework.compat import smart_text import warnings -##### Relational fields ##### - +# Relational fields # Not actually Writable, but subclasses may need to be. class RelatedField(WritableField): @@ -66,7 +65,7 @@ class RelatedField(WritableField): else: # Reverse self.queryset = manager.field.rel.to._default_manager.all() - ### We need this stuff to make form choices work... + # We need this stuff to make form choices work... def prepare_value(self, obj): return self.to_native(obj) @@ -113,7 +112,7 @@ class RelatedField(WritableField): choices = property(_get_choices, _set_choices) - ### Default value handling + # Default value handling def get_default_value(self): default = super(RelatedField, self).get_default_value() @@ -121,7 +120,7 @@ class RelatedField(WritableField): return [] return default - ### Regular serializer stuff... + # Regular serializer stuff... def field_to_native(self, obj, field_name): try: @@ -181,7 +180,7 @@ class RelatedField(WritableField): into[(self.source or field_name)] = self.from_native(value) -### PrimaryKey relationships +# PrimaryKey relationships class PrimaryKeyRelatedField(RelatedField): """ @@ -269,8 +268,7 @@ class PrimaryKeyRelatedField(RelatedField): return self.to_native(pk) -### Slug relationships - +# Slug relationships class SlugRelatedField(RelatedField): """ @@ -305,7 +303,7 @@ class SlugRelatedField(RelatedField): raise ValidationError(msg) -### Hyperlinked relationships +# Hyperlinked relationships class HyperlinkedRelatedField(RelatedField): """ diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 3dabd277e..ac7175a7b 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -414,7 +414,7 @@ class BrowsableAPIRenderer(BaseRenderer): """ Returns True if a form should be shown for this method. """ - if not method in view.allowed_methods: + if method not in view.allowed_methods: return # Not a valid method if not api_settings.FORM_METHOD_OVERRIDE: diff --git a/rest_framework/request.py b/rest_framework/request.py index 620b00ada..275326614 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -403,7 +403,7 @@ class Request(object): self._not_authenticated() raise - if not user_auth_tuple is None: + if user_auth_tuple is not None: self._authenticator = authenticator self._user, self._auth = user_auth_tuple return diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 5b8fa3853..9110aedb3 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -166,7 +166,7 @@ def urlize_quoted_links(text, trim_url_limit=None, nofollow=True, autoescape=Tru url = smart_urlquote_wrapper(middle) elif simple_url_2_re.match(middle): url = smart_urlquote_wrapper('http://%s' % middle) - elif not ':' in middle and simple_email_re.match(middle): + elif ':' not in middle and simple_email_re.match(middle): local, domain = middle.rsplit('@', 1) try: domain = domain.encode('idna').decode('ascii') diff --git a/tests/conftest.py b/tests/conftest.py index fa5184dd8..f3723aeae 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -47,8 +47,8 @@ def pytest_configure(): ) try: - import oauth_provider - import oauth2 + import oauth_provider # NOQA + import oauth2 # NOQA except ImportError: pass else: @@ -57,7 +57,7 @@ def pytest_configure(): ) try: - import provider + import provider # NOQA except ImportError: pass else: @@ -68,13 +68,13 @@ def pytest_configure(): # guardian is optional try: - import guardian + import guardian # NOQA except ImportError: pass else: settings.ANONYMOUS_USER_ID = -1 settings.AUTHENTICATION_BACKENDS = ( - 'django.contrib.auth.backends.ModelBackend', # default + 'django.contrib.auth.backends.ModelBackend', 'guardian.backends.ObjectPermissionBackend', ) settings.INSTALLED_APPS += ( diff --git a/tests/test_pagination.py b/tests/test_pagination.py index d5b9244d9..80c33e2eb 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -363,11 +363,11 @@ class TestMaxPaginateByParam(TestCase): self.assertEqual(response.data['results'], self.data[:3]) -### Tests for context in pagination serializers +# Tests for context in pagination serializers class CustomField(serializers.Field): def to_native(self, value): - if not 'view' in self.context: + if 'view' not in self.context: raise RuntimeError("context isn't getting passed into custom field") return "value" @@ -377,7 +377,7 @@ class BasicModelSerializer(serializers.Serializer): def __init__(self, *args, **kwargs): super(BasicModelSerializer, self).__init__(*args, **kwargs) - if not 'view' in self.context: + if 'view' not in self.context: raise RuntimeError("context isn't getting passed into serializer init") @@ -398,7 +398,7 @@ class TestContextPassedToCustomField(TestCase): self.assertEqual(response.status_code, status.HTTP_200_OK) -### Tests for custom pagination serializers +# Tests for custom pagination serializers class LinksSerializer(serializers.Serializer): next = pagination.NextPageField(source='*') diff --git a/tests/test_serializer.py b/tests/test_serializer.py index d27bdcf16..90f37cf2e 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -415,7 +415,7 @@ class ValidationTests(TestCase): mistaken for not having a default.""" data = { 'title': 'Some action item', - #No 'done' value. + # No 'done' value. } serializer = ActionItemSerializer(self.actionitem, data=data) self.assertEqual(serializer.is_valid(), True) @@ -1282,7 +1282,7 @@ class BlankFieldTests(TestCase): self.fail('Exception raised on save() after validation passes') -#test for issue #460 +# Test for issue #460 class SerializerPickleTests(TestCase): """ Test pickleability of the output of Serializers @@ -1506,7 +1506,7 @@ class NestedSerializerContextTests(TestCase): callable = serializers.SerializerMethodField('_callable') def _callable(self, instance): - if not 'context_item' in self.context: + if 'context_item' not in self.context: raise RuntimeError("context isn't getting passed into 2nd level nested serializer") return "success" @@ -1519,7 +1519,7 @@ class NestedSerializerContextTests(TestCase): callable = serializers.SerializerMethodField("_callable") def _callable(self, instance): - if not 'context_item' in self.context: + if 'context_item' not in self.context: raise RuntimeError("context isn't getting passed into 1st level nested serializer") return "success" @@ -1822,7 +1822,7 @@ class MetadataSerializerTestCase(TestCase): self.assertEqual(expected, metadata) -### Regression test for #840 +# Regression test for #840 class SimpleModel(models.Model): text = models.CharField(max_length=100) @@ -1856,7 +1856,7 @@ class FieldValidationRemovingAttr(TestCase): self.assertEqual(serializer.object.text, 'foo') -### Regression test for #878 +# Regression test for #878 class SimpleTargetModel(models.Model): text = models.CharField(max_length=100) diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index b96bc0caf..75ee0eaa8 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -11,7 +11,7 @@ class TemplateTagTests(TestCase): def test_add_query_param_with_non_latin_charactor(self): # Ensure we don't double-escape non-latin characters - # that are present in the querystring. + # that are present in the querystring. # See #1314. request = factory.get("/", {'q': '查询'}) json_url = add_query_param(request, "format", "json") From 2d2737f367c241c29c9c3913f2dba986c7c9a4a5 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 19 Aug 2014 14:11:26 +0100 Subject: [PATCH 0699/1652] Resolve python3 linting issue --- rest_framework/utils/mediatypes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/utils/mediatypes.py b/rest_framework/utils/mediatypes.py index 727f9c19e..87b3cc6a3 100644 --- a/rest_framework/utils/mediatypes.py +++ b/rest_framework/utils/mediatypes.py @@ -79,7 +79,7 @@ class _MediaType(object): return 3 def __str__(self): - return unicode(self).encode('utf-8') + return self.__unicode__().encode('utf-8') def __unicode__(self): ret = "%s/%s" % (self.main_type, self.sub_type) From 06b6b96f933088ba36d4c98e13893274f29bed6a Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 19 Aug 2014 16:32:30 +0200 Subject: [PATCH 0700/1652] Remove duplicated model declaration. --- tests/models.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/models.py b/tests/models.py index e378c1cfe..fe064b46a 100644 --- a/tests/models.py +++ b/tests/models.py @@ -184,10 +184,3 @@ class NullableOneToOneSource(RESTFrameworkModel): class BasicModelSerializer(serializers.ModelSerializer): class Meta: model = BasicModel - - -# Models to test filters -class FilterableItem(models.Model): - text = models.CharField(max_length=100) - decimal = models.DecimalField(max_digits=4, decimal_places=2) - date = models.DateField() From 00c0dfc66fd2426a63e6eec498395740b2c3e63b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 19 Aug 2014 16:29:05 +0100 Subject: [PATCH 0701/1652] Documentation on runtests.py --- docs/topics/contributing.md | 38 +++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index d33843e19..3400bc8f9 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -62,10 +62,44 @@ To run the tests, clone the repository, and then: virtualenv env source env/bin/activate pip install -r requirements.txt - pip install -r optionals.txt + pip install -r requirements-test.txt # Run the tests - py.test + ./runtests.py + +### Test options + +Run using a more concise output style. + + ./runtests -q + +Run the tests using a more concise output style, no coverage, no flake8. + + ./runtests --fast + +Don't run the flake8 code linting. + + ./runtests --nolint + +Only run the flake8 code linting, don't run the tests. + + ./runtests --lintonly + +Run the tests for a given test case. + + ./runtests MyTestCase + +Run the tests for a given test method. + + ./runtests MyTestCase.test_this_method + +Shorter form to run the tests for a given test method. + + ./runtests test_this_method + +Note: The test case and test method matching is fuzzy and will sometimes run other tests that contain a partial string match to the given command line input. + +### Running against multiple environments You can also use the excellent [tox][tox] testing tool to run the tests against all supported versions of Python and Django. Install `tox` globally, and then simply run: From 63d02dbea855a060ec4cdb194497188e2f40cb66 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 19 Aug 2014 17:06:55 +0100 Subject: [PATCH 0702/1652] Drop six from compat. 1.4.2 is now the lowest supported version. --- README.md | 2 +- docs/index.md | 2 +- docs/topics/2.4-accouncement.md | 1 - rest_framework/compat.py | 7 +------ rest_framework/decorators.py | 2 +- rest_framework/fields.py | 4 ++-- rest_framework/filters.py | 3 ++- rest_framework/parsers.py | 3 ++- rest_framework/renderers.py | 6 ++---- rest_framework/response.py | 2 +- rest_framework/serializers.py | 2 +- rest_framework/settings.py | 5 +---- rest_framework/templatetags/rest_framework.py | 3 ++- rest_framework/test.py | 3 ++- tests/test_authentication.py | 3 +-- tests/test_files.py | 2 +- tests/test_generics.py | 2 +- tests/test_htmlrenderer.py | 4 ++-- tests/test_relations_pk.py | 2 +- tests/test_renderers.py | 4 ++-- tests/test_request.py | 2 +- tests/test_response.py | 2 +- tests/test_serializers.py | 2 +- tests/utils.py | 2 +- 24 files changed, 31 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index 0eaf5c83c..7052ab638 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ There is a live example API for testing purposes, [available here][sandbox]. # Requirements * Python (2.6.5+, 2.7, 3.2, 3.3) -* Django (1.3, 1.4, 1.5, 1.6) +* Django (1.4.2+, 1.5, 1.6, 1.7) # Installation diff --git a/docs/index.md b/docs/index.md index 6abc4f040..83e30a690 100644 --- a/docs/index.md +++ b/docs/index.md @@ -50,7 +50,7 @@ Some reasons you might want to use REST framework: REST framework requires the following: * Python (2.6.5+, 2.7, 3.2, 3.3) -* Django (1.3, 1.4, 1.5, 1.6) +* Django (1.4.2+, 1.5, 1.6, 1.7) The following packages are optional: diff --git a/docs/topics/2.4-accouncement.md b/docs/topics/2.4-accouncement.md index 91472b9c4..cdc99bd5e 100644 --- a/docs/topics/2.4-accouncement.md +++ b/docs/topics/2.4-accouncement.md @@ -1,4 +1,3 @@ -* Writable nested serializers. * List/detail routes. * 1.3 Support dropped, install six for <=1.4.?. * `allow_none` for char fields diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 4b16a8ca2..fa0f0bfb1 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -9,14 +9,9 @@ import django import inspect from django.core.exceptions import ImproperlyConfigured from django.conf import settings +from django.utils import six -# Try to import six from Django, fallback to external `six` package. -try: - from django.utils import six -except ImportError: - import six - # Handle django.utils.encoding rename in 1.5 onwards. # smart_unicode -> smart_text # force_unicode -> force_text diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index e06d6ff56..449ba0a29 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -7,7 +7,7 @@ based views, as well as the `@detail_route` and `@list_route` decorators, which used to annotate methods on viewsets that should be included by routers. """ from __future__ import unicode_literals -from rest_framework.compat import six +from django.utils import six from rest_framework.views import APIView import types import warnings diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 85fcbd965..9d707c9b5 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -18,14 +18,14 @@ from django.conf import settings from django.db.models.fields import BLANK_CHOICE_DASH from django.http import QueryDict from django.forms import widgets -from django.utils import timezone +from django.utils import six, timezone from django.utils.encoding import is_protected_type from django.utils.translation import ugettext_lazy as _ from django.utils.datastructures import SortedDict from django.utils.dateparse import parse_date, parse_datetime, parse_time from rest_framework import ISO_8601 from rest_framework.compat import ( - BytesIO, six, smart_text, + BytesIO, smart_text, force_text, is_non_str_iterable ) from rest_framework.settings import api_settings diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 28927eec7..e20800130 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -5,7 +5,8 @@ returned by list views. from __future__ import unicode_literals from django.core.exceptions import ImproperlyConfigured from django.db import models -from rest_framework.compat import django_filters, six, guardian, get_model_name +from django.utils import six +from rest_framework.compat import django_filters, guardian, get_model_name from rest_framework.settings import api_settings from functools import reduce import operator diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index 4990971b8..aa4fd3f11 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -10,7 +10,8 @@ from django.core.files.uploadhandler import StopFutureHandlers from django.http import QueryDict from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter -from rest_framework.compat import etree, six, yaml, force_text +from django.utils import six +from rest_framework.compat import etree, yaml, force_text from rest_framework.exceptions import ParseError from rest_framework import renderers import json diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index ac7175a7b..748ebac94 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -15,11 +15,9 @@ from django.core.exceptions import ImproperlyConfigured from django.http.multipartparser import parse_header from django.template import RequestContext, loader, Template from django.test.client import encode_multipart +from django.utils import six from django.utils.xmlutils import SimplerXMLGenerator -from rest_framework.compat import StringIO -from rest_framework.compat import six -from rest_framework.compat import smart_text -from rest_framework.compat import yaml +from rest_framework.compat import StringIO, smart_text, yaml from rest_framework.exceptions import ParseError from rest_framework.settings import api_settings from rest_framework.request import is_form_media_type, override_method diff --git a/rest_framework/response.py b/rest_framework/response.py index 80225cac3..0a7d313f4 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -8,7 +8,7 @@ from __future__ import unicode_literals import django from django.core.handlers.wsgi import STATUS_CODE_TEXT from django.template.response import SimpleTemplateResponse -from rest_framework.compat import six +from django.utils import six class Response(SimpleTemplateResponse): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 95288671c..be8ad3f24 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -20,9 +20,9 @@ from django.contrib.contenttypes.generic import GenericForeignKey from django.core.paginator import Page from django.db import models from django.forms import widgets +from django.utils import six from django.utils.datastructures import SortedDict from django.core.exceptions import ObjectDoesNotExist -from rest_framework.compat import six from rest_framework.settings import api_settings diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 6806a4689..644751f87 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -18,12 +18,9 @@ REST framework settings, checking for user settings first, then falling back to the defaults. """ from __future__ import unicode_literals - from django.conf import settings -from django.utils import importlib - +from django.utils import importlib, six from rest_framework import ISO_8601 -from rest_framework.compat import six USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None) diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 9110aedb3..b80a7d771 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -2,11 +2,12 @@ from __future__ import unicode_literals, absolute_import from django import template from django.core.urlresolvers import reverse, NoReverseMatch from django.http import QueryDict +from django.utils import six from django.utils.encoding import iri_to_uri from django.utils.html import escape from django.utils.safestring import SafeData, mark_safe -from rest_framework.compat import urlparse, force_text, six from django.utils.html import smart_urlquote +from rest_framework.compat import urlparse, force_text import re register = template.Library() diff --git a/rest_framework/test.py b/rest_framework/test.py index 9242cf7c6..f89a6dcd0 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -8,10 +8,11 @@ from django.conf import settings from django.test.client import Client as DjangoClient from django.test.client import ClientHandler from django.test import testcases +from django.utils import six from django.utils.http import urlencode from rest_framework.settings import api_settings from rest_framework.compat import RequestFactory as DjangoRequestFactory -from rest_framework.compat import force_bytes_or_smart_bytes, six +from rest_framework.compat import force_bytes_or_smart_bytes def force_authenticate(request, user=None, token=None): diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 9db4f62df..2b9d73e4c 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -3,7 +3,7 @@ from django.conf.urls import patterns, url, include from django.contrib.auth.models import User from django.http import HttpResponse from django.test import TestCase -from django.utils import unittest +from django.utils import six, unittest from django.utils.http import urlencode from rest_framework import HTTP_HEADER_ENCODING from rest_framework import exceptions @@ -20,7 +20,6 @@ from rest_framework.authentication import ( OAuth2Authentication ) from rest_framework.authtoken.models import Token -from rest_framework.compat import six from rest_framework.compat import oauth2_provider, oauth2_provider_scope from rest_framework.compat import oauth, oauth_provider from rest_framework.test import APIRequestFactory, APIClient diff --git a/tests/test_files.py b/tests/test_files.py index af110df91..de4f71d1a 100644 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals from django.test import TestCase +from django.utils import six from rest_framework import serializers from rest_framework.compat import BytesIO -from rest_framework.compat import six import datetime diff --git a/tests/test_generics.py b/tests/test_generics.py index 36832aff2..e9f5bebdd 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -2,11 +2,11 @@ from __future__ import unicode_literals from django.db import models from django.shortcuts import get_object_or_404 from django.test import TestCase +from django.utils import six from rest_framework import generics, renderers, serializers, status from rest_framework.test import APIRequestFactory from tests.models import BasicModel, Comment, SlugBasedModel from tests.models import ForeignKeySource, ForeignKeyTarget -from rest_framework.compat import six factory = APIRequestFactory() diff --git a/tests/test_htmlrenderer.py b/tests/test_htmlrenderer.py index 5a680f99b..2edc6b4bd 100644 --- a/tests/test_htmlrenderer.py +++ b/tests/test_htmlrenderer.py @@ -4,12 +4,12 @@ from django.conf.urls import patterns, url from django.http import Http404 from django.test import TestCase from django.template import TemplateDoesNotExist, Template -import django.template.loader +from django.utils import six from rest_framework import status from rest_framework.decorators import api_view, renderer_classes from rest_framework.renderers import TemplateHTMLRenderer from rest_framework.response import Response -from rest_framework.compat import six +import django.template.loader @api_view(('GET',)) diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index c051b0769..e3f836ed6 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -1,12 +1,12 @@ from __future__ import unicode_literals from django.db import models from django.test import TestCase +from django.utils import six from rest_framework import serializers from tests.models import ( BlogPost, ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource, NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource, ) -from rest_framework.compat import six # ManyToMany diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 0403cde28..91244e261 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -6,10 +6,10 @@ from django.conf.urls import patterns, url, include from django.core.cache import cache from django.db import models from django.test import TestCase -from django.utils import unittest +from django.utils import six, unittest from django.utils.translation import ugettext_lazy as _ from rest_framework import status, permissions -from rest_framework.compat import yaml, etree, six, StringIO +from rest_framework.compat import yaml, etree, StringIO from rest_framework.response import Response from rest_framework.views import APIView from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \ diff --git a/tests/test_request.py b/tests/test_request.py index 8b048b5c2..8ddaf0a70 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -8,6 +8,7 @@ from django.contrib.auth import authenticate, login, logout from django.contrib.sessions.middleware import SessionMiddleware from django.core.handlers.wsgi import WSGIRequest from django.test import TestCase +from django.utils import six from rest_framework import status from rest_framework.authentication import SessionAuthentication from rest_framework.parsers import ( @@ -21,7 +22,6 @@ from rest_framework.response import Response from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory, APIClient from rest_framework.views import APIView -from rest_framework.compat import six from io import BytesIO import json diff --git a/tests/test_response.py b/tests/test_response.py index c28f186e0..2eff83d3d 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals from django.conf.urls import patterns, url, include from django.test import TestCase +from django.utils import six from tests.models import BasicModel, BasicModelSerializer from rest_framework.response import Response from rest_framework.views import APIView @@ -14,7 +15,6 @@ from rest_framework.renderers import ( ) from rest_framework import viewsets from rest_framework.settings import api_settings -from rest_framework.compat import six class MockPickleRenderer(BaseRenderer): diff --git a/tests/test_serializers.py b/tests/test_serializers.py index 09de9f4c1..31c417306 100644 --- a/tests/test_serializers.py +++ b/tests/test_serializers.py @@ -1,5 +1,5 @@ from django.test import TestCase -from rest_framework.compat import six +from django.utils import six from rest_framework.serializers import _resolve_model from tests.models import BasicModel diff --git a/tests/utils.py b/tests/utils.py index a8f2eb0b0..28be81bd1 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,5 +1,5 @@ from contextlib import contextmanager -from rest_framework.compat import six +from django.utils import six from rest_framework.settings import api_settings From 0c65e028b604490d498e43083fc3b46da05144fe Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 19 Aug 2014 23:25:12 +0100 Subject: [PATCH 0703/1652] Release notes --- docs/api-guide/viewsets.md | 2 +- docs/topics/2.4-accouncement.md | 111 +++++++++++++++++++++++++++++++- docs/topics/release-notes.md | 21 ++++-- 3 files changed, 125 insertions(+), 9 deletions(-) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index b32f5a805..9030e3ee0 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -146,7 +146,7 @@ The decorators can additionally take extra arguments that will be set for the ro def set_password(self, request, pk=None): ... -The `@action` decorator will route `POST` requests by default, but may also accept other HTTP methods, by using the `methods` argument. For example: +Theses decorators will route `GET` requests by default, but may also accept other HTTP methods, by using the `methods` argument. For example: @detail_route(methods=['post', 'delete']) def unset_password(self, request, pk=None): diff --git a/docs/topics/2.4-accouncement.md b/docs/topics/2.4-accouncement.md index cdc99bd5e..709a5c969 100644 --- a/docs/topics/2.4-accouncement.md +++ b/docs/topics/2.4-accouncement.md @@ -1,4 +1,111 @@ -* List/detail routes. -* 1.3 Support dropped, install six for <=1.4.?. +# REST framework 2.4 announcement + +The 2.4 release is largely an intermediate step, tying up some outstanding issues prior to the 3.x series. + +## Version requirements + +Support for Django 1.3 has been dropped. +The lowest supported version of Django is now 1.4.2. + +The current plan is for REST framework to remain in lockstep with [Django's long-term support policy][lts-releases]. + +## Django 1.7 support + +The optional authtoken application now includes support for *both* Django 1.7 schema migrations, *and* for old-style `south` migrations. + +**If you are using authtoken, and you want to continue using `south`, you must upgrade your `south` package to version 1.0.** + +## Updated test runner + +We now have a new test runner for developing against the project,, that uses the excellent [py.test](http://pytest.org) library. + +To use it make sure you have first installed the test requirements. + + pip install -r requirements-test.txt + +Then run the `runtests.py` script. + + ./runtests.py + +The new test runner also includes [flake8](https://flake8.readthedocs.org) code linting, which should help keep our coding style consistent. + +#### Test runner flags + +Run using a more concise output style. + + ./runtests -q + +Run the tests using a more concise output style, no coverage, no flake8. + + ./runtests --fast + +Don't run the flake8 code linting. + + ./runtests --nolint + +Only run the flake8 code linting, don't run the tests. + + ./runtests --lintonly + +Run the tests for a given test case. + + ./runtests MyTestCase + +Run the tests for a given test method. + + ./runtests MyTestCase.test_this_method + +Shorter form to run the tests for a given test method. + + ./runtests test_this_method + +Note: The test case and test method matching is fuzzy and will sometimes run other tests that contain a partial string match to the given command line input. + +## Improved viewset routing + +The `@action` and `@link` decorators were inflexible in that they only allowed additional routes to be added against instance style URLs, not against list style URLs. + +The `@action` and `@link` decorators have now been moved to pending deprecation, and the `@list_route` and `@detail_route` decroators have been introduced. + +Here's an example of using the new decorators. Firstly we have a detail-type route named "set_password" that acts on a single instance, and takes a `pk` argument in the URL. Secondly we have a list-type route named "recent_users" that acts on a queryset, and does not take any arguments in the URL. + + class UserViewSet(viewsets.ModelViewSet): + """ + A viewset that provides the standard actions + """ + queryset = User.objects.all() + serializer_class = UserSerializer + + @detail_route(methods=['post']) + def set_password(self, request, pk=None): + user = self.get_object() + serializer = PasswordSerializer(data=request.DATA) + if serializer.is_valid(): + user.set_password(serializer.data['password']) + user.save() + return Response({'status': 'password set'}) + else: + return Response(serializer.errors, + status=status.HTTP_400_BAD_REQUEST) + + @list_route() + def recent_users(self, request): + recent_users = User.objects.all().order('-last_login') + page = self.paginate_queryset(recent_users) + serializer = self.get_pagination_serializer(page) + return Response(serializer.data) + +For more details, see the [viewsets](../api-guide/viewsets.md) documentation. + +## Other features + +## Deprecations + +## Labels and milestones + +TODO + * `allow_none` for char fields * `trailing_slash = True` --> `[^/]`, `trailing_slash = False` --> `[^/.]`, becomes simply `[^/]` and `lookup_value_regex` is added. + +[lts-releases]: https://docs.djangoproject.com/en/dev/internals/release-process/#long-term-support-lts-releases \ No newline at end of file diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index b0e5b1982..a31be28f1 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -38,26 +38,35 @@ You can determine your currently installed version using `pip freeze`: --- +## 2.4.x series + ### 2.4.0 -* Added compatibility with Django 1.7's native migrations. +**Django version requirements**: The lowest supported version of Django is now 1.4.2. - **IMPORTANT**: In order to continue to use South with Django <1.7 you **must** upgrade to - South v1.0. +**South version requirements**: This note applies to any users using the optional `authtoken` application, which includes an associated database migration. You must now *either* upgrade your `south` package to version 1.0, *or* instead use the built-in migration support available with Django 1.7. -* Use py.test +* Added compatibility with Django 1.7's database migration support. +* New test runner, using `py.test`. * `@detail_route` and `@list_route` decorators replace `@action` and `@link`. -* `six` no longer bundled. For Django <= 1.4.1, install `six` package. * Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. * Added `NUM_PROXIES` setting for smarter client IP identification. * Added `MAX_PAGINATE_BY` setting and `max_paginate_by` generic view attribute. * Added `cache` attribute to throttles to allow overriding of default cache. +* Added `lookup_value_regex` attribute to routers, to allow the URL argument matching to be constrainted by the user. +* Added `allow_none` option to `CharField`. +* Support Django's standard `status_code` class attribute on responses. +* More intuitive behavior on the test client, as `client.logout()` now also removes any credentials that have been set. * Bugfix: `?page_size=0` query parameter now falls back to default page size for view, instead of always turning pagination off. +* Bugfix: Always uppercase `X-Http-Method-Override` methods. +* Bugfix: Copy `filter_backends` list before returning it, in order to prevent view code from mutating the class attribute itself. +* Bugfix: Set the `.action` attribute on viewsets when introspected by `OPTIONS` for testing permissions on the view. +* Bugfix: Ensure `ValueError` raised during deserialization results in a error list rather than a single error. This is now consistent with other validation errors. +--- ## 2.3.x series - ### 2.3.14 **Date**: 12th June 2014 From 874d2be83c612fb5e04aa6a28901c2afe4bf9d3b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 20 Aug 2014 00:19:03 +0100 Subject: [PATCH 0704/1652] Release notes --- docs/img/labels-and-milestones.png | Bin 0 -> 84026 bytes docs/topics/2.4-accouncement.md | 48 +++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 docs/img/labels-and-milestones.png diff --git a/docs/img/labels-and-milestones.png b/docs/img/labels-and-milestones.png new file mode 100644 index 0000000000000000000000000000000000000000..e7c829adcc8ca5b0f0b39c5830aad0fc81c4e0f2 GIT binary patch literal 84026 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⋙dIlJ^7*83kQ!uJ6J1jMQyjwvVISU~-m1SyC+dL+I8mJXph%=#>~qIXJwP<)owGcH4o7 zmGwMcf|%#*W%u)!v?=jX<;KpPIRN0G2x+hHoeN`z{30VAmRo>)D8?}{k zm@G+VDX9OcxKxDNgU)j1_>?Wx+6|PMb2JoKhiU3hmyr{?&9ri!`04k-!JPdL2A1>z^d|)j!_$A z_=>MCVQorCx_NsfDbzNx4yMvb3$c`DuJDv95Kys=ieW8$nzEo{JPSlyH}(BE1m72I zz>U35cUME;+th0b(RXa-qiL_7X1|5=k%zNh z2lmw$|H$+ui!ipjOlQLr{WgX@Z8(;|)n2?DR95}Al8q#4=1zJ-Y!2u9n7}`PJ51w; zdt7cCUBS9K(=fyL6@>-srAolVj~pw4pA|k+tbFw{F&Q5leVQIZwH_5a8~7u9Poy>@@g=w7aRs z>CrbBwdw_|-)qNP-`umZ-4maoojV56fzr%j0aaA1DUogo^1Jrpg7Pg_Fqs6SGZw_1 z+3i3{Kdo3dcMUA3#pve6|O1D>{3&2PM2RehW1YDsOv z2)Eq7swInN73F`RetDj5lDoajOk*?bU6kfFPxv?JF8u!ux+7WLX!#Sv_sv?d;H@Y@ zOy=xl@b=KKsHO)krnp((z(5CCv$w~sQqf?RdQqOWaE5|R**>)t;lbMOz54lLi|_YV z1kU>Zq21};{)cw=OZ@$pc4tC(uSm*x81)zJ?s!fOh*a?47x$=FyaFK)uT5b?JC4O!g#&(~f z25cP(_6Mv3KIV~>b^p3&;E){s6)An|i&L_%sjG0=wfKh@CH6g~pS=e&&?bxV=v*=T z$2wj?P99xj?NFSq6y6BiH}1Qk+WzCSyCGqmck6EUnsoY|qg3z$DJMZh14La1^ zJA>0Hk7gTy4p%=4b~5E>+y^-5zn_57iYD?d@VDV)2d!?oE~Uy#^@g=(9|rX$5) zuk6*gWqp12>R;qLPiVNsx%Pu-3pOxY4ZMDwDk%eT{f6I_jXWs*-|#!1z3?2Kp>m(X z$EUE7u7U43^OE-0*LKr`MHO~iD^n9;`jlz#7hWnw{I+21oz8f{*ZTy@iwA!9w5)?4 zvci&Wt)t<6!wE5(ZVZs{98uRppzC6?!hmW0u=|V|aK{PqmzL>{r)%vauOm99g)+$l z;KR9LL)qEzBhq5I9B8+7Y!4s2Wg6`sk;b{}ho5YD-jTHI{B8J|>OPRY83%r+tyhLh zZvHY*F!ur&JnHe5W%9b=)bx@QHE7B@xGgK34L+E(+MF|)sDMK8ePp?0$h+DoQ$0nm zEgy>wha;vFXo8VR^xV7)dzdqj{}=tPoCvXkF@MGjsmwB=9zIYMDwBsZ)|3v|r{QsP zxIh6|0Q;l%eF)%}O80#K9-VlAS){ac>8*;dXRzJ3MIesl=HoK=Hx7^B@)r(I@Qn|@ znwc59*7VYSy-c%>9%xiw@E7{-E4SyqIvK(lhutZWu z-~WK`BB^nYRM2)C`pPCPNNd4}Ms1pk9Pnl|5Eo=$!B2Jeo*$eDrUnaWB)+Ee zGqx=`l7@u&6FylM+U+KwLHAx7jd;Qz1913{aAwvP^>_rx-|h*lJPAyBF!SFx&gm9Q zoUW{74cO2`xiOPxo~}1ib@%ZibfePR%T#>8>u}*xDg`v9tqV zYzqWilMWoU5LjU@{yWQ%hw>`mY%SFFuX&-GpQ3B!LHvn?8VRny{%y0mTTafn1ZdIOmbBLzo_y4DI#%z1Q%cU1zdgB)^z9oD4eQ=Em?Dk9d|>s8;vJ z+mUads5~wT+x$(a`mHq9&NGM$OiUUnXB#7VlIfT3B6UFq4O6ASE9Cus8BJDKfBBO- z9z;ia{vg2EBpu;RT<=LyXW-OKKi@uOB-_8Xjx9sN5IkkYFdw6z%m?4#Rfr3HC=O<3 zqKAHYTyj?SUOX&12&jJr`>w{Q?Ed9w1>PNdW)<$#Z3-Hh5+(sdnHKUJ42C87SNgBw z*f3%YZ^T3BbKC*99y90_p6wfIVinj*mHr5{?Qiv({3kP9L?RFwlPD<{Y_56DKbpHG z9#SWM4o-5*rde26a30OP$e?=s35F1pbgp0Fw^kViKE)qVpFxl`!{Bg0F&W07P@i=X zRf8WyfxvkZFQDjNr2aO5UvtHDc9GqqaJJtY0M|%=&&EmxODhD4r05TYohuZAO?&=s z1Lwkgefy@!Na)hlZ|FXa>(J?jgxz(P>`HS^>N^JFY#UOO*yOE z>9D?W#gYcK(YM<#uZXq%@1s0i6%5oSi(ZGVkDPS&wP!CZRiZt-6^fUY{;MzuSX#vj z*vPgb11ngV+3)vM$fsNLb1XkE26r)eRTnsnCS3}E2BF0v2WO3>QRsygBH-OEeH4be z451lZwU?x6+!yA$@52}TtQ#eYfWSQaBI;{CSh*kq1j6@_&{)obW5X*hm|mUP(Uw2l z=y6((G~o5%qeX2h8!SR zg48{&4B7>Py4Lg=mDHwh<|pxQcNAUEEMy%E)^|8;<`qfNT@Io``x%xOSqO6!o?n@x zZirUvqD6E!X&8t%dL}2|Jc|EOTNcZ#pi5xuG%i#(<1el?&85I+ikAdg{SXK4gP|sl~H|CV;|ctTx4AR zBs+S^@HiK(L{kFG@u2E%s;0Yw67kl9Iy<8w4$S-Yfbm-kuTDnNBlW2hl^dw|aW^|O zBROL>wtxhu21q1@Hi;ewnqgvDUfWoiRoBnFvl$0}*9v@D;E3i91U+}e#i@Fpo2@b7 z9rf$u?^<_1XTdyoYVYT*H2J+XYrXRg^Rweea`StSpw1C#;CHNF2*~qk-)E*uQ@qNS zXs~_ZNh_uw83{U=;nQ+GOZ9sp)t0Omxrm=SRhDs;Z3hTN`Fx%zi0cpU@+Nx+gVvjv z_;aJ@PVlQ}EXz%U_d9iYz9$wqiIDEjg*T4{89Y$*++8yGDO;G+L@_$0oX^=d3vj5S zK}L)G28>df3~lUYe0jYbU);X;N+ut{RlcA1pzG^fZTbR*O=}H>U$QswtWjBB?|)VB ztMLL7aB0t3o)$HIxPv9(?qZ`dM3qJ8 zW4T2TzW!#s{1B5h*XQLbH1a({VP0@*RvGJDf#T!z8M~(?H<7*%#%eQi)k&^x26s6l zoT^mMhK_)7`4f(=?lt#EEkU`1bI3yZ-E?dBIL6w<FCXUSDv8sXQ%#;50iA){+7Vjb!V#avBT;6p>&pc_P zgLp>-1D_{eZGk%!?UF>zZG*`Lv$X1Wh=3e#Z8wr1)gfukC9EWbQ-sfVC&E%+c@=i# zGP%xatT-%TI-#C$IwE46e{P6H^3u6^BPpnc#vG&>KeTc=L zq&(PS9bR<6I?Bcm#T|Wq#H-Q$nEz``BY;7=1jVc(Swps&terGfG-kFzF^h)g41Jbrkq~u>S-vkf9H(d0t{J&-UGyRq#54BVO^K zwr=%Dal{L3i_k!QWSl!RM7V(tJ9wRJB{i%Gl#v1@MP9Xd(O}kjvb`O-FRgS<< z%QO{2tEu_ne4zAAM+un64qJF^+b;X168X9Bvz-uk$B(?m)~b*ilks-%3~{N8ekBMF zCi3W{w5-b@eIUaf*;%wQzep?Ep7cx`{qW8rX!B$Baga7~3myL%+zne39n|@!7&@|x zH7MB^W6XpEREzuLxm^H-TzPdN?FrXbEu?^c3-T0P1EhRqf4Q0QGg%nRd1J~|mx1|; zvOKHA^C_(U>(iQfP~&S}$Mkx;bJP6!;&p=)5~XLBg6zuCg~+~qQX!#pONJZ{H5)v= zug31m?Tf4~m{&U@0me9|LNPq3y?h$RETGUhgnLvnR19rN{=^X;4sT`*B`D;I^(f)(I$R-RLtK^m(BHtNV0t56{N^{xaiG;%D~ zSA?=Hp>0~FKxSi3yq>LP;j7F6#@BWf``L5xnPmeki?Ke_oey|LwqdS1V;Gay7+5jy z4q~N;t2z7Pm^B&QWQLr2@3XK=yG+DrZ(A7A0ke zfXptUKv22sxSL&aP1EAXi^dfBB|`r($IV8?*oybEj8{`DnFhW#tf3o}O&Z(?nuhXa z39&Q_tMFn>bRStL%se4Z_^302(H+<@V2!y`?C36_38yI3j)Qd?S^P8nYupman(M|F z&T%j{c`yWuiq25oYj&mlC3M;+%3YzFul<@lR*uqB*;e^P~22!VWDOs1tu$ zm!k!e?h^BApJM{uVJ*v>p<*?e%z^&O9#+iL*7t|uzQ$I|9~xl}b?Zr3!LMvQ$HI*= z99J%b&Evh@Z0S*HtDRK&oZ^Hgxly+9j25HFcm?GP@`U+f1Q`G72qEjJb7rE8%TSUU z@4eUZik;3QfoWsc!@lm=U67p5esejU(W;$zzlc80>rJ|N2yHV|emceZ&dIwa#+wY^ z&1i&MIRv|TBv%61lDqVJiK*zTcS}rRB?H%ln1h%wbZK z%4pBzP`=Q|d#mv1^{D+vO$IDC7Ben#hn`Md4W16ol#4G<>0 zH6UgW6EF_2MWxim0Mb)oYKW0WX`%eQSAu!0d3y466%xDmIMdS(;QI3NsGVwu*5{o3 zORY9zRY}J6P1j`x_^o^1wy)VtOZ#fL+mu>IJ2pFy`|{u!+JB<TbcM}Q< z-`Snhxx6EIx8~p-EA1tor(xsO^e`h?TbRY1D}x0C7y4#+>`mzD7xBudQwESAgBC0tW9j%v^mtlob^&r5feaIr{9xSq(i9WNJEaRex;QZN$Z9$-ax<6MHaX$zpuXB~uJdkMWa8u|w>M-A(3O|}8l1neU6IpsM4iK6< ziW7VVAEm>Oa)=*tdOs0M^Fcyazh7Mg*eO_oXk`x7TQ#`I=w%|*2tQuk(loTL z_+n+Z?;rw*-Shg?YN2rbsp!#h){=OJEYiRBBs{;~Ccnf9J9}?|AfEBTPz<;~#F7F$ zcnokJVj-qpG@viX_e8fW^B(&YUPgu6`5_fV2t03=2W#ovHbkyxKXn^hXQF)yH*&9s zdRxy=biiSB?RvtXOv=&nr|>lLi+J4}Q`q{xuDyqGrne-6_!~~0uhB3tGJRYsR@r+r zo+E*;D#`SM=lgRZ-j9z~1NSE?*MIDu8Mi3A@+jS98fsXYsV@|+)B6D(thqlJ5_Bz4ta9O6D9m%erIG-80wNd3uP!`ijEiO=~$GBBfdJ!Fs&$NH* zkP0KVW{W6}Wo`O}s{d{&$Z?{NK^|guG%X%rH)l7Pc(_b63Wu3gq^B8o$JU@Z)%rG| z1zy>aXB9%lJ&iFHH@XaQhKIdswp(-=IuRE;udrS}tICbhLM`5dy!RC2s(leQ{)tjV z#?o(uB5poTcltS)ZxL|W(%Mse)uD4?7U8$y(FnrYb0wU&OW}~X0;(u&^jeKPL*dUI zF5}mCf`SD(9w~jrLi#W=uhHLQ;<%M}+C+#F_qF`k)a*%TlHr4j~6j(-^dBvd)%3X)cLZuw9n?PV@(y(`bU+@;+ZMSHP@3-$=xq{+&+UT+2={1LqV9?HNY&g-Fj4EA*xmP)!+={q_hO0NT zayG(ZT%0qc{q5Z#nPyFps2<89juuNu4a3seZBJ%}E@bJ>Q3~)zfF7B#CI-X zmKN_IAf?fobwpEnEji2i{paGRM<)&(twsf-kwUC+tef{RxZ_;Db9Ci8ZIF0v)_E1~ z@={Heo-xp9S99ZaJUbpl_1-@d)=OgrW*2~UPW2i9@2htB@1ov)EUV$JMG1x-P7uhP zdap=5!i9CSi*3Y$3s%W zqcvNnBo7;qq}x)np3m&1R}DXBYCn!p*rfyBUOOw*T@57mh_`k+F512Cz4mX!3Tj&d zkuow313O$n>vhV2{ax%S3<;AgD11p53;3J@uj+m)6c)o`p92RL&$B?l^Fy9!AIYKX z@CBFW!jjKr$=AGCXXhDAM9EB{ordcJb_CnXm)xe2l=q(#`NJPFw#wyw(Jv*Z?@k;P z>kOVgxl`nM8BC{A{XA>O2PsllHS~EyJI=l9zGxuQ-`Ro~_@?`NK}`l3B+hU*ZWq!zi;Z|~OlhL=b_AAQx| z+qgBrxp7fLMHzb58v>5Z2sCH?nwqt64aW^q;`CW&vxNOvHfk)86xU*5Wr4UxqdV5j zFw^1`n>gEFknK=OzYn}~J#MnW{pCUB@*y$rGQ~;OBP{mjb|PSC!GN!oawrXjNy z$EK8Y*iLHV2{vh;SmEm9q!4iL!KTfJLb?C38$f?-#kR|2XOyDwkKrOMFEn?^zj57| zP=k{@mv*1Pj?<+ITzam$#JUvrCRz@5Xf#uv?Bgtgslk$JQrB!5sInN*z zRVvn5AucRu(8b-PW=rx&p@)+fw=OtbPlfE{Tm9eDu{>=THQONm*HMFjrOWoOSm(!y z3t=q$k5TfwbRjT9Y23g!mP$wDpLoHIUIea8R*eJ2pC=fKg9v&)cV<|4^&gY&KWE{> zF&sZh3L$*^w|DnzW#tR=`Z6`gWH9Bg8vZu+x=J8|e2W;CKm1Wpz&XWQd{UCCuXaz0 zVs0S9?Zbn{=aiZ+f7>3|ArPdaYS@tsLBBKg`#kfM?&7CQb(aloneH z?!Sjaz)DwxbD`|*p!xpKTwsUzhh>W};9{ZR7eT1xeaJ4PL7u{H^+#V*(|HubeaLQt z{_oENY8Z1*)^+zJ#k>3}Y#Qs@W>?vWPVIE{b%39K&0K%kS=a&o9qat~XW~`#xJnFA zg))8049LITlK+HGD+qNT=qvj1&eE~j8Zk^Kxm9!s?w{iW$Z^NCr8`Xzie{37cGIk{iD(q+$aBC)eB3g~}MHckb5U-6$WT7cc|MBhdzu5u@ zVWtJP$$aronRM!*>3!YtgzKTOGkOIpjklt5=ng_qAK6$l*$7eQ;;ZZlSAFaV?S`MA z6oSpU71Er`x`Soxz&CJjO`S&-?y~=^+O|aQK-kRy$@7AWLGL}_VZyCTC+(&O?w22( zQn?E0p{$tJx0JV&!2eKP$rr@=!lU_kDa_evs^d8JVj{?j0=M+=sP4_cqkwTvAD;7T z#Q3X$6~SE;+e4w##@f&Uby%kg(!QM)`^1+EPZZu&rD5dJ<&pU2meij6btV5Ykv{Gf z19(@A+}WUyyr0jiy3C0ZvgiKVH5( z`wt@S%XI>Poxx@@px!WOD>_T<%Iwe($L27Iy&5ZIahU~@t9A5V zmtgU#-Ngj@A>R5`qhoFs*~z)`5d8FyL%!$_`nLzTDokx8wlKX_If*ZNk{iP4$Ea$BzyMYf_zgQzr0=B)((tMt0SH-F zCgVB8DJOq4Boe*imT+fzIBpj&+;i+f2%vn}tC)!SdE5_&V>$_RL5=oB9vPqZx|iHt2|f7~xYtB7~LnLZ(aJ#1&R zON#;GR4QItY{V{k&2A+79d~V;y7kI>K;IPi90J5Wc88`&lg00sK8r>?-$dXd)O<6V z8}2jK`38{odlxQz_%nV85lCYV+?=8b4fkOZEjl}}v2>XkOG&5yXZQeLmQ8E{#>n?( z^>u~<=1hJ@(7u3@221X3ID3k^yKBEtPmwi{$!h{%c4FX4<>u!4=2>-$QrpnFaD4YZ zqDXqCEwE*G$XRjp73IexOwowE9IhyiBJ@a~dFbb8mt6HAO!5)j*UPbnB9$!R2#Jk(mKO!#)s9$@1Y!<$+xd-9f)?)nl)YAE#C zy~98IenEN->0iw#+hvF;(;-e-Il?LBi&&@SZQ2ruwl`RL*e0OR>WR;}rJ8PRA+N}2 zi=e2_?f-aQob%8n_^tE+-iHi2!q4gk)xB9Z1JrR|QF5hXqM$dJ7XHUDZj6+qInLx! z5AS5z<4Z^F!BUqFmYlgYAO4vQ!MaGAeV0klrl6b(JpC>}8oB<{|AqEm(O$DW6_hoX zqy8B)T{d|7jdUAcF#hK>LIFtB;E6Vn*nuPUkMcJVnRhGQfti2myJAD|JWoFlY3}@o zJ_9Skj$BY4lUCm*Ju2h%JJe)D;(y}!rEUB>ELO|p-`a`5R;HUDA)$5c{4rl`(X7QA zKy5ppz->@rF;hj(x#(%76*s|(p?9L(CYz`%KN#Qr(K*eugg`ybLr%zAZvU+SB$BEF zq)(3*9oMUj|LSD0#ai=Af-#Wt&;Anc|40)au-G^dGX9tDOfmz@3bVW2>f=9th&>J# zYX `[^/]`, `trailing_slash = False` --> `[^/.]`, becomes simply `[^/]` and `lookup_value_regex` is added. +The [labels that we use in GitHub][github-labels] have been cleaned up, and all existing tickets triaged. Any given ticket should have one and only one label, indicating its current state. -[lts-releases]: https://docs.djangoproject.com/en/dev/internals/release-process/#long-term-support-lts-releases \ No newline at end of file +We've also [started using milestones][github-milestones] in order to track tickets against particular releases. + +--- + +![Labels and milestones](../img/labels-and-milestones.png) + +**Above**: *Overview of our current use of labels and milestones in GitHub.* + +--- + +We hope both of these changes will help make the management process more clear and obvious and help keep tickets well-organised and relevant. + +## Next steps + +The next planned release will be 3.0, featuring an improved and simplified serializer implementation. + +Once again, many thanks to all the generous [backers and sponsors][kickstarter-sponsors] who've helped make this possible! + +[lts-releases]: https://docs.djangoproject.com/en/dev/internals/release-process/#long-term-support-lts-releases +[2-4-release-notes]: ./topics/release-notes/#240 +[view-name-and-description-settings]: ../api-guide/settings/#view-names-and-descriptions +[client-ip-identification]: ../api-guide/throttling/#how-clients-are-identified +[2-3-announcement]: ./topics/2.3-announcement +[github-labels]: https://github.com/tomchristie/django-rest-framework/issues +[github-milestones]: https://github.com/tomchristie/django-rest-framework/milestones +[kickstarter-sponsors]: ./topics/kickstarter-announcement/#sponsors From f7b3e1e62b8e2c8bd1d1eb79a1cb0b3f4a0559a9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 20 Aug 2014 11:09:04 +0100 Subject: [PATCH 0705/1652] Latest sponsor update --- docs/img/1-kuwaitnet.png | Bin 0 -> 12302 bytes docs/img/sponsors/1-kuwaitnet.png | Bin 15489 -> 3674 bytes docs/img/sponsors/2-pulsecode.png | Bin 0 -> 2368 bytes docs/img/sponsors/2-singing-horse.png | Bin 0 -> 20831 bytes docs/topics/kickstarter-announcement.md | 4 +++- 5 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 docs/img/1-kuwaitnet.png create mode 100644 docs/img/sponsors/2-pulsecode.png create mode 100644 docs/img/sponsors/2-singing-horse.png diff --git a/docs/img/1-kuwaitnet.png b/docs/img/1-kuwaitnet.png new file mode 100644 index 0000000000000000000000000000000000000000..c73b68154dd3768118d5f623f21a4231f78d0da3 GIT binary patch literal 12302 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
      Q9|>9VxyGV>=r#^(|L?p*IDxk9faW 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 JDrX$@e*g+EQ#b$s literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/1-kuwaitnet.png b/docs/img/sponsors/1-kuwaitnet.png index 8b2d0550a5cb17513986fbf424ad2542d02c04f7..bb779ea7707df062fa7a95bc023ebed5f6579578 100644 GIT binary patch literal 3674 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 diff --git a/docs/img/sponsors/2-pulsecode.png b/docs/img/sponsors/2-pulsecode.png new file mode 100644 index 0000000000000000000000000000000000000000..49f9532cff745e85d22809b976dd50eba8dc4b11 GIT binary patch literal 2368 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 literal 0 HcmV?d00001 diff --git a/docs/img/sponsors/2-singing-horse.png b/docs/img/sponsors/2-singing-horse.png new file mode 100644 index 0000000000000000000000000000000000000000..84142ae6cdcdee8899ee6fcce2d5afbfdb41bd49 GIT binary patch literal 20831 zcmV)pK%2jbP)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C zMvO^BK~#9!?7exsWmi!z{;gVT?|r5__S~7tKtg~Fh>Y??nFK_T!KVxg3WDfUKoQiLFg&WR=f5++yx z77A(}E&-tMzuqg_sr@$q>$mrdCS`d>F2H|wL)Z%7!2qs0yf(VB@^U{>Z9_2+Xxn)h zVn78T1(axZZ$pWo5M{8&-Od7_nFp9yG|yD-_r+ zqDx+64j_O427y3GECB>jB@hABxB-HOZ-pu;5eP)$ML4l^ts#8WdD&nB{Yi7yavH!|UpXXU4NDNeO*9%+@;8~-*e9W+{uC~k{Kb`CL zEn^6l8ASAm1H(4-@wzo4pJz`Jr9MF2Gb#` z|1O*m!D=X2O<8$tS!(||fts|yT7oh4TQ>%f5#hP(lj5nW`l!M?5D1rSUwqTI4dL#1 z046ZeeQ#YIe*dI!Pbr*xAOT1WBS~1H^FZcfL z+lFx0V}Ns4N5x~y$~|ReRDK^5kXjQQIY_`zcws29k^mrxXtSfkX+U7o6=qr`&=`aq zpppnhmQY~`uJGcE%6r4i?bI3~GF~K6AXP=`MYpzE=9(noZ-iq5P!V`PHC6ym9Tw&D zheh>RCZLsAFAC$l{iQCx+(KqJLCCw zV*7cS<&|$cuWfiauanxZ5|I{#hcyIv38^R(*2d-YMfLT=qFhXDIHo{^qN>nqr+<+e z{)hF+=>?kXJB56f4FSs6R3ez<6(+ey zuVrDP5%kB^bM~x`em7w@sp0ydQ0Ki-)s;=X_Ujdjee08N8^WD=aq#0;m(Ksp!Ey1U z)(}#|8iP6oz?D~mDh$(vi1sGN+#;f%ZKdYZndL7nwvrq6uIEq%M1j(K%(XJ4)+YN_ zMjf_jX9=e&lnhH}s>&J5L<*prSusT7op*=xvSc=SJ2R8{%#8CKx|&aLcx{4iJ8cYV zkXMh|cX;?aiD6@d5oo|Eh@Dq#o@>348UFzg41XI?x-&*FH>vznRPh^wyx0+r0TL)6 z1QtNoWg=fXf8OrH zqjwmlIcwQNL8>83^<(2!{ef`O+5++KG0RRWU zhUi^kh*qsN*DbWOKkKCY!PQB**BXKd;6>5REY?P4yFaNG=iAw3-s?j|^-=&=>{}gO zG;YE;#CTlQB$$Tj*jy&ZF)lVuwUhy-ZF5JB_|HiURqZ&t-`?>gLn zMrsWiA|WDmUTj>tJ`;Uq$3o{1<~r#I4-JX|6G_4b3*8LsqdWmH=e%Ajs*hB~W7bBK zs}yJ}V3>%A2?;nL22dF0kVb}(Q*X0>BK{cu#l#>|Qs}(%`k>P31M|v1dlj^%z>d@y z5C9QyM5`fC7|Wj_;6oxI@U0C`V=7zMGrY)2F@hEwtd1*qQf%oY7&?Du8UhhedASV0 zpA_C*Weu|>cB*2X7kI!~!`Gg**#6DK{rn?D7#e0@d5<({fpV9q>LxGxGyp%izdyMe z&=vt%4GS>^AUS3l^ck^83f+ zzImwsr>c6d#27Hai;8t3P(`t2uKkwPN%>Z5_`rqRm;COP0p@$*#|79bz)#$CaPUkK zIh%;)K(T@Vfg$z*CK3{YQrP7bu?L-=oZ%}()C74Eps4RO7AFKmj9?$o=sai&N|R9h ze*!qTWw{st_w!0P8m1v?%G`ud0hN3k4r}Y55@W%aX&+($?i|8D2eZ-K&MJA0KKBCE_5G9aA zusDzmC}f`TxeLV~2)`!&ZG0yYkTH;GI9z`S;_$`|X#pT&5(DDF#QjLGW!FXY6*~Rg z8+NFkr10@*afdy_j)aHrK0J7r7df|;S`Q*BE6-3Z&e=5o>QPyKsGHdvJQUd^z;>cw z0-pPged|9~R{nCYvc$wltWkx=C(AL(WPl}{2} zc?!+Lugj7YV{vW3%jQWllNZ(bVNw1J5q1*MivWyHd#&aS0*W56e{J&nPW&aUB=G>a ztQ@75cWv%Lv@w$JHNhfsTD86W#y^cO8y^_zOI)gpVGJ~ zohni=0D9T}mC-ZDmAlFkBef)+=r`re; z!^?*TlmA&%{sFDTiWlWc>1eK%{9%^ZmwC}owbBIp*T=zfnJ(J5HvZj7RlF)M{Z*N< zY7I+Rcjz>vqlQX^_!X@w+d>;2asAB-36*J$`9uA)(+N-L52Th3jcdxfZ$3ZR`D z5TUncb@)P6eO=|W-N~#XFw7BRz54ORQ%1_%+wNs+ECc0s_=C z@y)5>1I*?SfPpIZrb_ z!fnL^B-))o*f2>qHN1Ci^s2Tsd(N7lf9Gj2gh-w^IoN;#YvXe9GdJvW2m9mvt^fCn z^Ygvr^`d$&Cc?0Aa^aS_H*KEpyj)bVHYp;$M?2QW#Y+zj^PjiONGyAu*}>GnL<&M= zp3Ia|w2s+i79@y=K%FXtET5bgSi>-c>lO5M5UxqAxvrb=&2z2n*4(*OQ4F$#ke7}T8`b4R|KBn?Y$JbV$w%8Ky~=+AoX9zh>5aB1!Du_Q%DL5%?vF zKuyc6vBRQ#eC2i7dF)rk$S@6@^L;VN!PRlO&pX+d8U7E;7UykSz@9_H^DF1SV`V&f zNGD6av#R_BUgfMhiw(9n4IC^RuSVu>IK2AyZS(B|0R5vvpaQfK17!o}DrD9oGYr@} zw}HJE^v4yDPv1V6hx$>gt7T*7SW*CFK#FqKa2QJ&b z_;U(iQabGK=a_FL=ME;tFAwwLIjzJh6N%1%|Df1?GzD{NXdt3KJoOckq>5=Ir|Q)> zRahq9O3atM;G`Dc0w|ro;_$He-$dGi(wGQ+ zuh>n3-Gy`4f%KC_>A$(T)4pY~osGwNg}m~+QbW4{d|>BN_nh4;qwnon{x9RQx=NLH zsA8-0o|uV@F$yRdW}g9D2IKM%GLt;HRQFY15$2Z?s7X=eIl7$=ws%r+_s*T}!|?=r z4o$GoPLFK}d=hG&M3f2SJI00IGiP|^;2^iV4iA47syj-rXs5|F=Wm(&DTP*p+~Lq5 z2QzIQm+lR#VJHLD!9LZQJQ3hTjflcp+Lajl zH=F0Pw;Uc6*F}U0i8WhBdHGCL{Io)U3c$z5v3t#{KGuu0Y;dt1RqZHrd+F!_d6hqj ziGRi#`s~EHkJ*wxKB}tg*T%)*{LNj^kO0+N6nM|h#m;*Uj`GVZr~hR*DIb|y`v9l@ z99Ma341tJTVpvM&FE%89NQ9>o;g;J#@eozqE?532$Mdls@kzxIRP{Tn%J)R|dWE8> z{KJO1dsaOE_g{6vwjT%Rpcmk42L@omeC7SG?^_!^qnBA2CLbI=DYI_C{slOhc+_MFQ5U%&Zq|IMY73%hMw zb=wv#lb~%AE}VNj6M>k8nLINK6DtwGp?ux0oIK*tX!2{jR{9^Uyu1{^c}zsi3?_mJ zK?+3mD*)aO;OXaWo_}s9P5y+4c2}WQj)|bDF&LNCgGBZ12%XpWEI=t9&*x7nccs8w zqYNZj!Z#i4znDl-IzPP6j>Q)e@I^0zNhtu(c3ys|KPsNv%`6DyCGe1AgwIFRDHSsf zXmvwM%m{Ug2mu5tofuK=_gd*6>|E|WPJzF-h8iH!dAU**f4M#?pO+;D3LS2p@9f$- z--&jH`;80t;23ZbUqN03R)#e=2}wB0}3TDlf<)l|62X ze*o~4XK$JNuXF9>Q{F3!!Vr;fr3OVMPgK=kB%<`B8v+|SVOQmyb>g31cz-=J?OU2} z!;3y*T)L-Se?Oz+eyp`C*FnbXtA_$X$h-0Nt2vdF#H3_1M29nUM zub|MO0+`AP6Jhr`%X3dQOn+>casqJ9rYy!6ZUbZC0AkrJrO6`}u*CMpC zBUzu6PqxNDRVBg!fD)LE#CmqfX2PF9A%pRj4GdA&d3oYZhld{*!Lz-nO>IC{x6XGl zDjnKsit)I@%Aj~K8z!dMdjlm)?Ar+^H?0hQLqwi-Pcej@&fz(#_^@Fv4HH!Ks{QN3 zC#Gy~N{x9LfO2`RTQhf`@TFT1zOH3W+cJBdwjstaKsPj`$2%q_qe`qGuJPX3)6R{t zRL+w^zj@xKxgSWa`8!p(`<%Uut@CZ9#z0he92ks#uM*jm7~{#nt15dDB+UOloH*pA z!=$Jl=tS-le{o~&AuJWD?q){=3eZmay{no>y{Eb9-vk$@>u!i9Sumvyr z%w322uS=`}6Z!C71c8z<>=VPi-G^8ICxC~XyrY543Ax6F|HahODu91#8-xC+#J;u3 zi=nXRZ|}Xl)#k&OY+r`81^}J6cV+zBOjt}Td#zbxIt7Iqe7@fEF*m5O;pvyC25$ub zRbJQ{bKTjSx=(8*=5rEjMcvFIH3kaBEr$kgD=UBR)UecA2Z29AP}OTHClGNMP2A&{ zFa?+~EjGk*rPd{>fL+Fzg{QYofF#z6F}!J1l+XX{H}?G%0rydDBAtgF9#7r~!jb`b zMbn$96kG#RV?WqSB3%S<$_yQhd+Gp?Ti1b z-7+6EhA`hwK>+{T4F}%hMeo%~QxR2YU7RB&RicmthSD(w3~;7iBUCpsL#KHoMB%-# z6WPCGsrS5gWAqF?>U&W0F)?R*KZSv$SHL=1^(+=cVt<#7iX|u^TvICSN-GHX>HP*k*ezWv(8ZuWt^3g6gH7>NmisWpuLsQM)WZL%C|Od*dGkg_V!O3gnXUK^n( z74bZ7#XTNcs%DT)orz%e2q1grwlyd*MD`Py$+r?q0Jr z%7K)KwbQb6V35D)hQ0l7WK3@xl^&@DQj=ipDs1YsP>Mjj!mD7hWAB_Hcz^c{p#yB5*E)1)T)nrG0G+IbwLC`#gRyh)PEmP>#m?NFI~tt7 z>z4>FIXuk2XZvFNcMJ$c>5&?ydv9Mn&`p!KdN27xC#=dXhX$|A3x7pBO{6{unMjGC z%2eaQaiyrCff5}FD8&O=HS!yY=-7@3kg0>RQ7ajtg@q8Y`!@hP#nS7S6v+0l&GMeNbiy zK<6yYeeLV}*0k~-hX#tu>mzor4u4{~+tR6ERp>KO0AL9YS3)a*)?Mz(Ix9;T-d~^+ zsOO@}UNOj0`wLEFk3{Rq%M#_x&oR-}m6L}i!CPrVO^d;zgrnmdy;gc~xs`zkt!r*P zuw-v%aq8zS;@KDzl@L5Zf^Um8FT#c%DF#F#kO(RgAO;9ob7Zo`(?o@W1ZlGdQ$BTg zKLUVunrL3QbBO7UMEooOUpXyVgJoV?9~VE=Yo-4_DBOWj=`hnJqI0bjUOZL?ZvM01 zJp5~Ott1QWcFHv)u!)iDXb8>6uSq>5w_*9m?^9^t5^P&+zk8vb{2d7BWfnxhq^vM1 zd~+S>Pkxk%5~jLrRU?xCD3BJ2aMPjwq`Lf^Wn6mJQd(3#jpvl!HkQ(vogb-?GYq(z z9=S1ym<=^`hD)Uyq&%i1h3Oh-q}y#+gZMM5s#$6k&?}2dUe845-YsHEmfkg&Fv{Iy z^U5vkSnPech&nL|2Rwaslw-b~BCk9uCqH(0IDT002Jt!6QCIU+>Pm5aiV{e9h8$cM zqT{9`sE8U;+_H7P^`;2LVX>VcFFh=o*&RH0C?EfT;To|6F=(ctsZJX(oa7ES9UNl5 zlN4EETwMUCnNHOvQemEHNMfxaX96RDZS3oic=lxw}@+*t0r%mSqM5pW`Nw0un>mb!Z(-gmI4b7V}W3iJo?W9HJUR`-Pzn$1=GjZKW5F5-w8)-z>qi3CB zi!rdT(YnYzt-MfT%-^5ArT3oMvV7$QmT5!JSU)eGNFf-k58?VCZy2k@s+E_kM`iio z#F)=qyL%PP<~>f__Yo`CgxOk!t)@Z6x&UbdZiVAM_CrP6Z761qmRrrK(1u8N2WwCV zRUG0EZKMDLenCXiNsY-X|I$HT4UC~TdFbG{452?behnWl`e+Ga*1K96@2vxaje7N-)+H@7f10rU25zCF67^R-dv)+@I~Kc-TI!~TcVKnla` zT9)ihhx@NNYpJJ(==A_5ciIr{ibimMRDHKK3@5VJ`Cxh05DMRPZ`sw6`~njjX2`5< zH)(M^4{J9_x`AX)^+6kY($F-qJ1^+8lMfrlCuQc8_Fj-!zAYW+{+0I^*u=z6Bh*yo zS$KlH2og&NyyDupHf1Mcw6oUF9_|;Lyy%sVe9w>p0X~M8^}uU4MNP9{zGKfu9C6j~PsgC%01@Galubs@03nb(~ahs3xUs4nd(QI77;T znr2ET{-Pc8Z(|}%s%hKc-qp$NrFsv^tf499r&OS+1^D=gHINW%%7!(d zrbm}J((?i}B5-#F^-&9`l4bT})f^h+zp~Uz?pHc_BY+zTm=GP=Kr^MYC&$fqxD1L* zp+J_{vVORSM;m%Mf66j30bZ1tNFt47dMpPrIW=(nG;5$~Xa;3flDZw$c|o_8eAE#A zlVYalpAgi}j^yiIT9cYWl-;bb5=fjEE5QB>wkuzBI*Hy&Pp zM^X6)B?iVaNz*G|dxfbMhw4VeDHbPYQF7%Y)_{*(gJ@GqK@T)06;b&UQwXj;Zvi!i z$rB;%kEJr44{9zhH!BGxMPG1tT9RD9h{fOpWH@>VN>WpnaVy$ zgSx6Ru{4e7bu(%WzGw{U0wgOzhKNK&t*BzTm%VFP_#>WruazBfqpQQw#jy##?tZC- ztwdB!^7&6kR@ItB#~MQY3!06cY}o&D;{F#oYuYM7auz6yx}J~MpX(bU)p z8i<%8f(Rn^wZ=y5nTzWb;-_W}LUBbsf094E zD61b@>b710;Myark8<4Cc12J+ubk`lQbsRjEVc|X%k}kz_`wP_b$smm3QH~okpw&9t84J!igFGdDweTsu`sIK!w-)pe*xf%BRqmV{up7Wa{?Oz zv#p7tE~4OrpMKBhii!ahg3KI*bpj=|uT6S@p}nDc(29pt16ct!QC%z zHwE5inYT;LAE9Z9NEPfwuyelqRtqZgyaE*1+`Z#6zbX#)TFE;u*|GH5L;cCmt>^jE z4Jk~`F{|_cS{0$`)0?T9QZ$~}s!vVnJ=pzp4T7Y211{)P>8*w_YZI9ktfd((Kon}3 z1QNqaOw4)Z@9q2f?{4cRPXchrPIK?$u0Ads6ZLH%4IpUD>1w8GIL~?7>P{dP^v_!Cy-#mv_fD$Y6&{(dyk=7jds-3{ zRkDV!YgzNRq6!~7S3A~1?!?F)FIp^hTAvJQRSZ8uJd(g*L(s(>gdc#n&e2u5(PCsfp1vg;ClFiW8}2 zrlN8WIXtQ!ou&LSI}5@b=PQYE3X00lFLYby)`rlw&D&m^FkP>T%cq6286BA^@rY*1 zc+-;{G*vuMB~e9Y&8O#D=?%9R(9N}O_k3UIj|-&M%tZ4FAQYK;S^D?=vMg>7Edu~! zjvYih5s2!pc52^IRQ{Un-OgqGvfRmJj4CTZCzf75B+1^B*%u z!*OQ~RZ$6ysp;5ywJ1Ib0Bdz#^qIo@qgy)&i7|IJcDQD-on14iDmI20 z-hjxvj0wGVf_9eSz}iNym8JHYZkk-TI?A6{I(YyE9mZO0ZQ9SHw1KmuGZoMXI!vjX zQ%$JmK&1L0ZX(!bs*HDDc?u{UzZh_TTsjyitY!2k)x+jm$#2z*lE$E8InDmpATM8{ z&~~6+#nTE?iNadqu3?}wU9Ay{rjRHb=C#Fc>tp_Qbmvw_#nIaK=C}^7>jW!08WAZM zI_VdW-K+x?$1#&J-kXGG<)&K`B8uC)Z&f|K*lWFgT$W$%W%kLV(mi2P`Ae7y2E@!w zmv_xsm|`q4t%T8r%4kF6s~1^oDIc22U%d#@BwgvY(sg?`h-wF!DN?r>lhQqO>wJ5Y zXsCKEwr#Bw_|>^i_Obpre@YtKqo;Bu+(cE3nfhJ~6zH}UM+N?6p_A>ty_>n|!1_@) zwPmi~N)g*-BrMQsH%o82Q&kn5JQ;m23RV2$VkiA45Bg-5m?!3?e~_r&w{pUO!Wt8U zsHXNUb#0^3dZ{(SZbR+d$o2#jBnmN+PQQ{_?%QcC{kV^YJ*JVWfdJS(Dyknyt@%R$ z7?vKb=oPxH^bP%S`6yMI3;m4KQ8^7lTa)v2%J7-t_^_&CzMX!wbpEJqc1L}R^~p#x zf>$Bl*e8NJlsE0BDNcm~o&>q2zuMew|Md#WM~$oUfh}Vmpeh$vUN3T9veYoVC=79s zQP$b5%rnlRrpD#1MF8n7?q#eCN+Z zk(a(g)=2;&B&7ecrJMcf{$c*24jT%avMC=>qhQfAkWoy#gEXqD8ZSEDG}rn>breHr z9lcmmjfxz^22+KKkkT7Aw+!>r->FLLDHKl^Rj;al1K@8KyVs7Bi+C#E@)PQa*qJWtRt~5;dVx~QZhj(sZMsk`4DyZs;s(uu}N6%jDZMo_2;PNyz z7dx*{n3V2G6q>BH?tx(Dbr^Eq%cjI|v$1C6p(5R(ZX%#!Qu!&eI4<4sUU@rBJ`-dM zKmZ97&>t5s?WU$T*RmjEX1CHemgllpmEKoc7oVm_3x~g})eU0nSZH!#5yf0P{cPQT za@)&`HvIkDxz?N5dsav}4ER{FVG7(GUO`12r}ZVO2LXIif#2W0*!!=&Ed5|5(iBle zlmXqn(8*riPR-X#=eY){H1Z{grhJwl7$Z(ZrpV%`IDYAzp}nBM{bvIbRA)qvL@wv*&xld^nXCnFA?Ak<}ROhW6npeS3aMC3$}Cj5`% z;`ZwRB6=+0;uULoLp*{w`Bg=S#}(8~t2?Ll6|>-cp_l#Ks4TxrM7J43o(L!_zXhrO z@%Dweo3G!u@?Q4RGlpaT24uFzFCtYZO^Xc>^VYe}@iUYN|8VQd@CFgN$i%`+YK*yM zW%P>|rsl7h=mr27S79q#FgEwHm+T+Ny~kzsuy$g(;qV0lB4+3tO<vvvGyCE2&044#uyJ_<7VNtz;m6(~~#cy$yvDC zQX-uRqV~3OV{)^ifWJ(iA5?AaAfxagqs%Ion1?v4sP#C6LYLt5UE-wEK>z!Fk0lV%BHQn)8MkzddVZ`SSP zf!J!ke*bf~JgMDEzFd@!6lxeXyst#0o*6#W0|ZQT?XifMXD!Yh>)PkM+#(y4)T5si zJ?_hSnT60#?QyUnUTBJPpEpFGo2_jCxJXo=apBfQcfWHs|F|{unWFMF!8XFS1Y`Mn z5llo*fIdQE_`p&xdq?4Xq<<zWYbdQq7Y; zl80+N@zP1{C%gz$)DV$307}sxIy@M|8eaRJE6@AM!uh?<`^ctJb|Pq7^VgHoVN$xg zZwRqF=xt26){8XSA=a?BOx=U4qqi#XnEHE1rE7k!o!aYnEcTw>O6)a-^AHt7HTE2! z<$#D1ZuBBJ+I92F;Fy;+W><{*nYo_4q9CRgap3JJIVGpDSdjWE%+n+^@$L4@xo0A3Ye+pTW4JDv*9=%p}<6Jw#(XN{FakQ(G+Ux5F*9f$SI`|2|>WiGWD0UuZ$=Qs~->{}fK zDOttW+NpibwuR0&4y=!VT~tgGbW0#mw9{nwF@vYfLXZ6ct~ofI6qzxZ)*6k0P&j{g z9?r@zM|b(uDC^hL-;VMzi`1Gobz0_AMX3)iynDD)ecZu*{`3o$+OKhy7YSpJ{$yL$ z{bqku9?Gn_ZWfleC+a4lT6DAI6?x_FQ+c^>VoWo=pp_UYDu1s*S^Y*QvkR8_T>vo3 zOLzh1I~f$ZzuQXQdQLij^ZvErYbT|gbq|K;BK0Pmjv#d>fmbVi|P%rup{W z`^+lnbrXz=3a9%esu0zQDz5FelWP-5yPsDcKy3d@jvCw8Y0>8HW9d5u@; z{l>wycY)AL3`^bLnpz`e<#z)5nwt)dFR+H+PDKAIswgUlO>=E%Ae8?7re5|RNy?M) zL@u_>$3%>n2C2@oFM}e#?SrppDTykEMTMnKdPkA`KMlv#SVcN)f^J#iWZs4` zfopg5GuO|E}>+*+1{>!bfxDcaVukV3tB zVq!@xlNViH9Zg=9CH(l+QT}^|>ElGW(TQR>c41CJYEe`klgh&|V^EY>Fc}7u60M-% zj$t9lE04^Yqh%1%N$p4bdG%0MWevNzw=ybsAd+tHwnt3NNm02!6|a+8WcQ-D^sJ>< zq|9$rV8uD%(92Ux2eKL_NsQ6T>D9YeM(?Pc{OVv*J(7qP53QFlhA`Jj;8ih*aX=$# zF|+7Iz`nr*!_vbOp;8=iEp%HS5mDd3-a+m393T0FclRp2Ab0ND9^q)l0N~YgS-L(f z%Ad_ke@@F9B_>fJQVP>_Ei;S~jZ62#la=ZTy>|9?B7BgDZlKu7dq4=8Gb7l`$NUIOw@25+q#Bi@U2-_^sy=Zc{XQ(?TbCS!&D;x$~r|Cbs7_?Ha`7 zEt4|Qe1B5BLV*vL&cA$8xcd^}P9ryaSB7w20$3$7d&zt|`C})I*a9l2=f||`1YN-( ziGX|3DRHX#SMR@Q%i>cznf+{8Id#r+?9>xb9MnxD%YgXED--zGXxOfi&vh# z^aKz3kOD(5!d}%xU1db_1OX(5S*$hiUe8?}6~7JO|9H`70@zHz9fs&DgTNiQ&Bok4 z-%j4^q*mn6iw#ll4l0;;`AQQysT1^0c#Lq&Tcs0c)vADHJ_z8)E;@VpM{c-v<&7Yn z0~^DnKGNxG2?1r0uptuB#Cv(b>L~x8#?XHg#ajS;h>pQC7XYm+!Dv!$aMO$3^qs5Y z;svZ^^U9rlcGf)yGcDpL-1q?q{<8C6qZP2G)&$Y0u#C_xO#0|{x*QW62;?>7WCF#O$XLDHcm6+OP$pIxfcPzc2fDv zCow%e8P}-tm=tnb?T9neBOE#gt-B~a&R*`F3~ap0toa8b{6M#z{`_!MyjTrUn5M&F zoDZoou||G^4@%=|Ai4<9_Z;kxFJr=I0K5snKOe0YkynaNO_@{Z*7@$6zqx<)httGT ze^T8Kzz0tDVvnmqY%0++*AS{>G=dh+W6#6ol(t5Cn7)+W)diQ(F?`vg@?z*gALQ)5z*Ub&wT<= zIEQv(kyj3)s@Cu?Ij=w9Sid_<%w_&TfWr9)=gzew(S>6=h?e31#l)83!{KUY84J;BFPdXUeR0W=T8!mUs)UH z?@N>*EqD!@_OtwO`}Bc8F+O=m|S@mlMVMq&V%3Gk2-hV3@En zD!@$G)N9?Y0K^G2h}BKK_8$=WU55CXgS>opQHeiIr#Qe>sUYnPDX?i*yf-11sN>HB0g4JCvIvEbTiixn) z%}%y4KvX}m)NTFSsHm<@Q~tqmrWf-9$n;0Z)i7GGm+p{)!W3QE6 zNx)wuhCfnzU-t77=Wbg1=+4DfQVZG@-or+<-cvU z0(bHC%e~f1I%)DgRZN`ojOkcNn$C%v&25wvDv4oDt-&ZSpXEf}xi&8T2NPYoHYref zj{}2Ab@SmqzHz7z3+$68*(0jK0z=(SJV5plQ6&`gB={V|vcy(~E;yGK<2Wy^f` zntf}-SE=HM3+FCQ41t-WSeZ5&Orc+t>XL(oQG14*m(7O;lUFbGT30jC>y`AMZe1PX z(E0=;@wo5iW$YTRK&(aQ_(eqS(req&9QuQAFx#^_ zLgD-=t+Z)C1b=+7lm3PwI#5)eReaEYj+!Asj#hPcOs9x4D0l}$gad=g%S82E0M53| zr_C5@4)7HhY(*=xXlM4MAGv%I9tw7^4nxEKsYlLUf8OT#7aBGPDlb8SU8CA_;4jqT z&rwz@jQNX7q&~9-mFo8Zcz-`H?{zwfsP)lw;r2ybv~wvc$Lc-D5C}o4|L~{?q|Q?t z^awNk<>hBBKEWEk-nlS7pq7l0`VPq>3=B{-ipHvBh!iFhQRs0vJQyEK2=ipQRZR_Fv$@-P3N!Dj;w%XYVqXe?RVd)n z@!*JUu{AwP62lPaW!D`T{J9so7d1mQPW@FYh9xE#!#&CnYR}-kpmaXWm%yp>3=-PM zznU0+zId4^rh^kH%xVoYv*OH#X1JG97(GntJ6WPCdfC@+S^0fcZOsa^osKKW8lSud znv+Urue+1#mlMUo@fe$Wb0?kg9Xpgiammj4mwjdT`rEsyjpLwd9nx8)+895EAzX2| z3#64;Qb2+8AdqbTAkdp)(10e~D*j zB+f`BVZNQbtDD&GaUxH%CL9jR00}iifoG(CDRK*=pgT#HT3#LIFWxfO`mi2_0d*>0 zhUlai!zovVVj>K3ht2H_gQ~)?s4$l$$Wq(Lb>EfnY3LhI=$5n+*SqqtE^mB)nHJCV$EHfL7=cxI13{JakTMyfYgTkhagcwc~?Y8|w zH%mS~DczIV)N>!T(Si^Ep345x6pADQiDgEAQa--d=BokxJI;Vt-9U4qGD>^8KTzG` zt_n;l2?NHRV3?O6QW#^gHlD=kE7Ot^5uuY>kOJevL#ku1NH= z<78fHa&_V+yd2{2@pB4cgBq$52&K5C#2TEjfCCw{pv|7S(0F7l*1aDjxV~yB~w3r&n8W;1>m*T zs+y+n5~ejPD-fp@sxGI@cS~XAM8AqsktQe5BODFBTpw4@6_0&h<)e3mi82$~sX1wS zLbFE$KoAckmSC9Uw3yo;mt&Z~MBCTKB`h}s-Dfxq&8$4g)Iyq>5usD5i7C&hex(xy zr4u<$pL$4C=9W43cS@TuWT*OcoZ>giu0P<5a6&%l|G1GUAglx1WYP-#^@W=DP)=$Y+Go@)cLO92y;{S zw(H>FDr*@H>Jp-BG}Gr5WSGP-^Q3SOaK>D)cV+Y-0zSY*e+yvcqy{!j9U?pwz+(ov z`)*Zzpa+m8*4Ohx8+x+Vci&8g*7^%HJ@gQV(+w<>|Gz>tmO{8Dq7ZHJuia< z@It%6D9$w9<@njrZ6&bIqs5BhB)`qq@4yhY&P@TOukBg8e{A=PX95R-5}FxA9^}t_ zE45U4SzaCG&uAs~0f&b97XW;gh`vbB&lBNprJ5X0@|1|qBf@0>F50^`{EkWK?xU(# zI2XnNr%Wz#cTBVdRS+o&5lEtUqv>G!DGwo9iCV+7Ixc=JVZMHSTz+`xQm0`95#2NN z5^GE-H4HKYAe%7+hCfPSt}%pLRvWp(tpvJC8q8f4B=r>M+UP=JDayf-n&qCQC#uBJ>DY0MH{~d1W*{ zr}A=H<;!zL^dczET^ko|OJU-gWv&meaO~GJ=HsytPl5m!)_Wq(b%NH^Whf~r6RGoZ z-_>#Pdc$;~VfuX>L&xz#(RUHB4{XzdpGHz@HnYPu^40!VTg808&F}^)ifaL*{7=p&bWld({Ux6&SM9 zo)1iG_l;>`Dvw$x<+1l%K`fTQ8i#I*Vv7^m!jSHDys}TtcipLtBYaQSgEF{6$$}9|H!D|Fz z1h|;MT44>c+pr8UEI0%klqf4K%>aFYDi%GGD9u=)C{v@Nq?kfP(~gB`mNl6~XP7AU zx2r3_9t(h%aVryc(-Bt2LO|Myg}$u(nrgL#Bg_9 zxGO_|Mse6M$GE!*uQWPb)gXdN41ysNB@z%RMddpV9q9l#<{u2 z0TK>kni{rtV1rOy8?Jx1VupcS>n_qXMIZu{qu3hijt45VNrW=#dOPC)$je=2qI^_%Rv_RwB|2QvuYd zs-ZBAn>2Q#hgq9-Z674TCD$yFI({QjF%hjG5s)farP=2k1CpiZUac`$fkLC8wAShZji+TOKmz8l8NDjO*GCOOrS{rk zqt@);IxSO;BWy{7Z%}P=bOMNDzp6}q1eC&H`7rz?vZN4ndO?BNtdWcs{v5?NYx**# zYAE7^a=NHaKW8Mj7>*6ohRG0M2w=m=OaFjx9vr+sv*udo^*4y{!Fy_UafBfNxWDu6 zF_yU>-1iK62LjjrzH!1d+Yq7z0x`mYuBu#Lightning Kite
    1. Opbeat
    2. Koordinates
      3. +
    3. Pulsecode Inc.
      4. +
    4. Singing Horse Studio. Ltd.
    5. Heroku
    6. Galileo Press
    7. Security Compass
      8. @@ -95,7 +97,7 @@ Our gold sponsors include companies large and small. Many thanks for their signi
      -**Individual backers**: Xitij Ritesh Patel, Howard Sandford, Simon Haugk. +**Individual backers**: Simon Haugk. --- From 59b47eac14778767a17e56bd8adc0610417f2878 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 20 Aug 2014 12:32:24 +0100 Subject: [PATCH 0706/1652] Fix cache_throttle typo --- docs/topics/2.4-accouncement.md | 11 +++++++++++ docs/topics/release-notes.md | 1 + rest_framework/throttling.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/topics/2.4-accouncement.md b/docs/topics/2.4-accouncement.md index 504842872..e3f9d57a8 100644 --- a/docs/topics/2.4-accouncement.md +++ b/docs/topics/2.4-accouncement.md @@ -97,6 +97,17 @@ Here's an example of using the new decorators. Firstly we have a detail-type rou For more details, see the [viewsets documentation](../api-guide/viewsets.md). +## Throttle behavior + +There's one bugfix in 2.4 that's worth calling out, as it will *invalidate existing throttle caches* when you upgrade. + +We've now fixed a typo on the `cache_format` attribute. Previously this was named `"throtte_%(scope)s_%(ident)s"`, it is now `"throttle_%(scope)s_%(ident)s"`. + +If you're concerned about the invalidation you have two options. + +* Manually pre-populate your cache with the fixed version. +* Set the `cache_format` attribute on your throttle class in order to retain the previous incorrect spelling. + ## Other features There are also a number of other features and bugfixes as [listed in the release notes][2-4-release-notes]. In particular these include: diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index a31be28f1..0a74a27d3 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -62,6 +62,7 @@ You can determine your currently installed version using `pip freeze`: * Bugfix: Copy `filter_backends` list before returning it, in order to prevent view code from mutating the class attribute itself. * Bugfix: Set the `.action` attribute on viewsets when introspected by `OPTIONS` for testing permissions on the view. * Bugfix: Ensure `ValueError` raised during deserialization results in a error list rather than a single error. This is now consistent with other validation errors. +* Bugfix: Fix `cache_format` typo on throttle classes, was `"throtte_%(scope)s_%(ident)s"`. Note that this will invalidate existing throttle caches. --- diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index 7e9f9d717..361dbddf0 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -60,7 +60,7 @@ class SimpleRateThrottle(BaseThrottle): cache = default_cache timer = time.time - cache_format = 'throtte_%(scope)s_%(ident)s' + cache_format = 'throttle_%(scope)s_%(ident)s' scope = None THROTTLE_RATES = api_settings.DEFAULT_THROTTLE_RATES From 9372cc8c31fc5d7b3fb3b155ed88b0b6d3c00049 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 20 Aug 2014 16:24:52 +0100 Subject: [PATCH 0707/1652] Deprecate .model attribute on views --- README.md | 74 +++++++++++++++++++++++++++---------- docs/index.md | 36 +++++++++--------- docs/tutorial/quickstart.md | 43 +++++++++------------ rest_framework/generics.py | 11 ++++++ 4 files changed, 100 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index 7052ab638..d33177399 100644 --- a/README.md +++ b/README.md @@ -39,40 +39,51 @@ Add `'rest_framework'` to your `INSTALLED_APPS` setting. INSTALLED_APPS = ( ... - 'rest_framework', + 'rest_framework', ) # Example Let's take a look at a quick example of using REST framework to build a simple model-backed API for accessing users and groups. -Here's our project's root `urls.py` module: +Startup up a new project like so... + + pip install django + pip install djangorestframework + django-admin startproject example . + ./manage.py syncdb + +Now edit the `example/urls.py` module in your project: ```python -from django.conf.urls.defaults import url, patterns, include -from django.contrib.auth.models import User, Group -from rest_framework import viewsets, routers +from django.conf.urls import url, include +from django.contrib.auth.models import User +from rest_framework import serializers, viewsets, routers + +# Serializers define the API representation. +class UserSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = User + fields = ('url', 'username', 'email', 'is_staff') + # ViewSets define the view behavior. class UserViewSet(viewsets.ModelViewSet): - model = User - -class GroupViewSet(viewsets.ModelViewSet): - model = Group + queryset = User.objects.all() + serializer_class = UserSerializer -# Routers provide an easy way of automatically determining the URL conf +# Routers provide a way of automatically determining the URL conf. router = routers.DefaultRouter() router.register(r'users', UserViewSet) -router.register(r'groups', GroupViewSet) # Wire up our API using automatic URL routing. # Additionally, we include login URLs for the browseable API. -urlpatterns = patterns('', +urlpatterns = [ url(r'^', include(router.urls)), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) -) +] ``` We'd also like to configure a couple of settings for our API. @@ -80,12 +91,12 @@ We'd also like to configure a couple of settings for our API. Add the following to your `settings.py` module: ```python -REST_FRAMEWORK = { - # Use hyperlinked styles by default. - # Only used if the `serializer_class` attribute is not set on a view. - 'DEFAULT_MODEL_SERIALIZER_CLASS': - 'rest_framework.serializers.HyperlinkedModelSerializer', +INSTALLED_APPS = ( + ... # Make sure to include the default installed apps here. + 'rest_framework', +) +REST_FRAMEWORK = { # Use Django's standard `django.contrib.auth` permissions, # or allow read-only access for unauthenticated users. 'DEFAULT_PERMISSION_CLASSES': [ @@ -93,10 +104,35 @@ REST_FRAMEWORK = { ] } ``` -Don't forget to make sure you've also added `rest_framework` to your `INSTALLED_APPS` setting. That's it, we're done! + ./manage.py runserver + +You can now open the API in your browser at `http://127.0.0.1:8000/`, and view your new 'users' API. If you use the `Login` control in the top right corner you'll also be able to add, create and delete users from the system. + +You can also interact with the API using command line tools such as [`curl`](http://curl.haxx.se/). For example, to list the users endpoint: + + $ curl -H 'Accept: application/json; indent=4' -u admin:password http://127.0.0.1:8000/users/ + [ + { + "url": "http://127.0.0.1:8000/users/1/", + "username": "admin", + "email": "admin@example.com", + "is_staff": true, + } + ] + +Or to create a new user: + + $ curl -X POST -d username=new -d email=new@example.com -d is_staff=false -H 'Accept: application/json; indent=4' -u admin:password http://127.0.0.1:8000/users/ + { + "url": "http://127.0.0.1:8000/users/2/", + "username": "new", + "email": "new@example.com", + "is_staff": false, + } + # Documentation & Support Full documentation for the project is available at [http://www.django-rest-framework.org][docs]. diff --git a/docs/index.md b/docs/index.md index 83e30a690..3e6d23aec 100644 --- a/docs/index.md +++ b/docs/index.md @@ -96,16 +96,11 @@ Note that the URL path can be whatever you want, but you must include `'rest_fra Let's take a look at a quick example of using REST framework to build a simple model-backed API. -We'll create a read-write API for accessing users and groups. +We'll create a read-write API for accessing information on the users of our project. Any global settings for a REST framework API are kept in a single configuration dictionary named `REST_FRAMEWORK`. Start off by adding the following to your `settings.py` module: REST_FRAMEWORK = { - # Use hyperlinked styles by default. - # Only used if the `serializer_class` attribute is not set on a view. - 'DEFAULT_MODEL_SERIALIZER_CLASS': - 'rest_framework.serializers.HyperlinkedModelSerializer', - # Use Django's standard `django.contrib.auth` permissions, # or allow read-only access for unauthenticated users. 'DEFAULT_PERMISSION_CLASSES': [ @@ -118,34 +113,37 @@ Don't forget to make sure you've also added `rest_framework` to your `INSTALLED_ We're ready to create our API now. Here's our project's root `urls.py` module: - from django.conf.urls import url, patterns, include - from django.contrib.auth.models import User, Group - from rest_framework import viewsets, routers + from django.conf.urls import url, include + from django.contrib.auth.models import User + from rest_framework import routers, serializers, viewsets + + # Serializers define the API representation. + class UserSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = User + fields = ('url', 'username', 'email', 'is_staff') # ViewSets define the view behavior. class UserViewSet(viewsets.ModelViewSet): - model = User - - class GroupViewSet(viewsets.ModelViewSet): - model = Group - + queryset = User.objects.all() + serializer_class = UserSerializer # Routers provide an easy way of automatically determining the URL conf. router = routers.DefaultRouter() router.register(r'users', UserViewSet) - router.register(r'groups', GroupViewSet) - # Wire up our API using automatic URL routing. # Additionally, we include login URLs for the browseable API. - urlpatterns = patterns('', + urlpatterns = [ url(r'^', include(router.urls)), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) - ) + ] + +You can now open the API in your browser at [http://127.0.0.1:8000/](http://127.0.0.1:8000/), and view your new 'users' API. If you use the Login control in the top right corner you'll also be able to add, create and delete users from the system. ## Quickstart -Can't wait to get started? The [quickstart guide][quickstart] is the fastest way to get up and running, and building APIs with REST framework. +Can't wait to get started? The [quickstart guide][quickstart] is the fastest way to get up and running, and building APIs with REST framework. ## Tutorial diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 98e5f439f..813e9872c 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -18,34 +18,23 @@ Create a new Django project named `tutorial`, then start a new app called `quick pip install django pip install djangorestframework - # Set up a new project - django-admin.py startproject tutorial + # Set up a new project with a single application + django-admin.py startproject tutorial . + cd tutorial + django-admin.py startapp quickstart + cd .. - # Create a new app - python manage.py startapp quickstart - -Next you'll need to get a database set up and synced. If you just want to use SQLite for now, then you'll want to edit your `tutorial/settings.py` module to include something like this: - - DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': 'database.sql', - 'USER': '', - 'PASSWORD': '', - 'HOST': '', - 'PORT': '' - } - } - -The run `syncdb` like so: +Now sync your database for the first time: python manage.py syncdb +Make sure to create an initial user named `admin` with a password of `password`. We'll authenticate as that user later in our example. + Once you've set up a database and got everything synced and ready to go, open up the app's directory and we'll get coding... ## Serializers -First up we're going to define some serializers in `quickstart/serializers.py` that we'll use for our data representations. +First up we're going to define some serializers. Let's create a new module named `tutorial/quickstart/serializers.py` that we'll use for our data representations. from django.contrib.auth.models import User, Group from rest_framework import serializers @@ -66,11 +55,11 @@ Notice that we're using hyperlinked relations in this case, with `HyperlinkedMod ## Views -Right, we'd better write some views then. Open `quickstart/views.py` and get typing. +Right, we'd better write some views then. Open `tutorial/quickstart/views.py` and get typing. from django.contrib.auth.models import User, Group from rest_framework import viewsets - from quickstart.serializers import UserSerializer, GroupSerializer + from tutorial.quickstart.serializers import UserSerializer, GroupSerializer class UserViewSet(viewsets.ModelViewSet): @@ -100,9 +89,9 @@ For trivial cases you can simply set a `model` attribute on the `ViewSet` class Okay, now let's wire up the API URLs. On to `tutorial/urls.py`... - from django.conf.urls import patterns, url, include + from django.conf.urls import url, include from rest_framework import routers - from quickstart import views + from tutorial.quickstart import views router = routers.DefaultRouter() router.register(r'users', views.UserViewSet) @@ -110,10 +99,10 @@ Okay, now let's wire up the API URLs. On to `tutorial/urls.py`... # Wire up our API using automatic URL routing. # Additionally, we include login URLs for the browseable API. - urlpatterns = patterns('', + urlpatterns = [ url(r'^', include(router.urls)), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) - ) + ] Because we're using viewsets instead of views, we can automatically generate the URL conf for our API, by simply registering the viewsets with a router class. @@ -172,6 +161,8 @@ Or directly through the browser... ![Quick start image][image] +If you're working through the browser, make sure to login using the control in the top right corner. + Great, that was easy! If you want to get a more in depth understanding of how REST framework fits together head on over to [the tutorial][tutorial], or start browsing the [API guide][guide]. diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 77deb8e4f..a6f686571 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -252,6 +252,12 @@ class GenericAPIView(views.APIView): if serializer_class is not None: return serializer_class + warnings.warn( + 'The `.model` attribute on view classes is now deprecated in favor ' + 'of the more explicit `serializer_class` and `queryset` attributes.', + DeprecationWarning, stacklevel=2 + ) + assert self.model is not None, \ "'%s' should either include a 'serializer_class' attribute, " \ "or use the 'model' attribute as a shortcut for " \ @@ -282,6 +288,11 @@ class GenericAPIView(views.APIView): return self.queryset._clone() if self.model is not None: + warnings.warn( + 'The `.model` attribute on view classes is now deprecated in favor ' + 'of the more explicit `serializer_class` and `queryset` attributes.', + DeprecationWarning, stacklevel=2 + ) return self.model._default_manager.all() error_format = "'%s' must define 'queryset' or 'model'" From 4d8c63abc996bcb44d7a68dd7a7234b0d9f148a0 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 20 Aug 2014 17:15:46 +0100 Subject: [PATCH 0708/1652] Deprecate .model in related routers/permissions --- docs/api-guide/permissions.md | 10 ++++++++-- docs/api-guide/routers.md | 4 ++-- rest_framework/permissions.py | 3 +++ rest_framework/routers.py | 5 ++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 38ae3d0a9..e867a4569 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -114,7 +114,7 @@ This permission is suitable if you want to your API to allow read permissions to ## DjangoModelPermissions -This permission class ties into Django's standard `django.contrib.auth` [model permissions][contribauth]. When applied to a view that has a `.model` property, authorization will only be granted if the user *is authenticated* and has the *relevant model permissions* assigned. +This permission class ties into Django's standard `django.contrib.auth` [model permissions][contribauth]. This permission must only be applied to views that has a `.queryset` property set. Authorization will only be granted if the user *is authenticated* and has the *relevant model permissions* assigned. * `POST` requests require the user to have the `add` permission on the model. * `PUT` and `PATCH` requests require the user to have the `change` permission on the model. @@ -124,6 +124,12 @@ The default behaviour can also be overridden to support custom model permissions To use custom model permissions, override `DjangoModelPermissions` and set the `.perms_map` property. Refer to the source code for details. +#### Using with views that do not include a `queryset` attribute. + +If you're using this permission with a view that uses an overridden `get_queryset()` method there may not be a `queryset` attribute on the view. In this case we suggest also marking the view with a sential queryset, so that this class can determine the required permissions. For example: + + queryset = User.objects.none() # Required for DjangoModelPermissions + ## DjangoModelPermissionsOrAnonReadOnly Similar to `DjangoModelPermissions`, but also allows unauthenticated users to have read-only access to the API. @@ -132,7 +138,7 @@ Similar to `DjangoModelPermissions`, but also allows unauthenticated users to ha This permission class ties into Django's standard [object permissions framework][objectpermissions] that allows per-object permissions on models. In order to use this permission class, you'll also need to add a permission backend that supports object-level permissions, such as [django-guardian][guardian]. -When applied to a view that has a `.model` property, authorization will only be granted if the user *is authenticated* and has the *relevant per-object permissions* and *relevant model permissions* assigned. +As with `DjangoModelPermissions`, this permission must only be applied to views that have a `.queryset` property. Authorization will only be granted if the user *is authenticated* and has the *relevant per-object permissions* and *relevant model permissions* assigned. * `POST` requests require the user to have the `add` permission on the model instance. * `PUT` and `PATCH` requests require the user to have the `change` permission on the model instance. diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 2d760ca44..61a476b8b 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -41,9 +41,9 @@ The example above would generate the following URL patterns: **Note**: The `base_name` argument is used to specify the initial part of the view name pattern. In the example above, that's the `user` or `account` part. -Typically you won't *need* to specify the `base-name` argument, but if you have a viewset where you've defined a custom `get_queryset` method, then the viewset may not have any `.model` or `.queryset` attribute set. If you try to register that viewset you'll see an error like this: +Typically you won't *need* to specify the `base-name` argument, but if you have a viewset where you've defined a custom `get_queryset` method, then the viewset may not have a `.queryset` attribute set. If you try to register that viewset you'll see an error like this: - 'base_name' argument not specified, and could not automatically determine the name from the viewset, as it does not have a '.model' or '.queryset' attribute. + 'base_name' argument not specified, and could not automatically determine the name from the viewset, as it does not have a '.queryset' attribute. This means you'll need to explicitly set the `base_name` argument when registering the viewset, as it could not be automatically determined from the model name. diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 6a1a00770..29f60d6de 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -108,6 +108,9 @@ class DjangoModelPermissions(BasePermission): return [perm % kwargs for perm in self.perms_map[method]] def has_permission(self, request, view): + # Note that `.model` attribute on views is deprecated, although we + # enforce the deprecation on the view `get_serializer_class()` and + # `get_queryset()` methods, rather than here. model_cls = getattr(view, 'model', None) queryset = getattr(view, 'queryset', None) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 406ebcf77..ae56673d2 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -128,6 +128,9 @@ class SimpleRouter(BaseRouter): If `base_name` is not specified, attempt to automatically determine it from the viewset. """ + # Note that `.model` attribute on views is deprecated, although we + # enforce the deprecation on the view `get_serializer_class()` and + # `get_queryset()` methods, rather than here. model_cls = getattr(viewset, 'model', None) queryset = getattr(viewset, 'queryset', None) if model_cls is None and queryset is not None: @@ -135,7 +138,7 @@ class SimpleRouter(BaseRouter): assert model_cls, '`base_name` argument not specified, and could ' \ 'not automatically determine the name from the viewset, as ' \ - 'it does not have a `.model` or `.queryset` attribute.' + 'it does not have a `.queryset` attribute.' return model_cls._meta.object_name.lower() From 6953a5ecec56d5eaffceef817316a742dcc2220c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 20 Aug 2014 17:16:47 +0100 Subject: [PATCH 0709/1652] Typo --- docs/topics/2.4-accouncement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/2.4-accouncement.md b/docs/topics/2.4-accouncement.md index e3f9d57a8..64dcca610 100644 --- a/docs/topics/2.4-accouncement.md +++ b/docs/topics/2.4-accouncement.md @@ -65,7 +65,7 @@ Note: The test case and test method matching is fuzzy and will sometimes run oth The `@action` and `@link` decorators were inflexible in that they only allowed additional routes to be added against instance style URLs, not against list style URLs. -The `@action` and `@link` decorators have now been moved to pending deprecation, and the `@list_route` and `@detail_route` decroators have been introduced. +The `@action` and `@link` decorators have now been moved to pending deprecation, and the `@list_route` and `@detail_route` decorators have been introduced. Here's an example of using the new decorators. Firstly we have a detail-type route named "set_password" that acts on a single instance, and takes a `pk` argument in the URL. Secondly we have a list-type route named "recent_users" that acts on a queryset, and does not take any arguments in the URL. From 21a0a826bba3df01e72ea8b0390e05d50cf9a854 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 20 Aug 2014 17:34:51 +0100 Subject: [PATCH 0710/1652] Add Retry-After to release notes. Refs #1508. --- docs/topics/2.4-accouncement.md | 2 ++ docs/topics/release-notes.md | 1 + 2 files changed, 3 insertions(+) diff --git a/docs/topics/2.4-accouncement.md b/docs/topics/2.4-accouncement.md index 64dcca610..d8e264ff8 100644 --- a/docs/topics/2.4-accouncement.md +++ b/docs/topics/2.4-accouncement.md @@ -116,6 +116,8 @@ There are also a number of other features and bugfixes as [listed in the release Smarter [client IP identification for throttling][client-ip-identification], with the addition of the `NUM_PROXIES` setting. +Added the standardized `Retry-After` header to throttled responses, as per [RFC 6585](http://tools.ietf.org/html/rfc6585). This should now be used in preference to the custom `X-Trottle-Wait-Seconds` header which will be fully deprecated in 3.0. + ## Deprecations All API changes in 2.3 that previously raised `PendingDeprecationWarning` will now raise a `DeprecationWarning`, which is loud by default. diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 0a74a27d3..a2b4782f3 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -52,6 +52,7 @@ You can determine your currently installed version using `pip freeze`: * Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. * Added `NUM_PROXIES` setting for smarter client IP identification. * Added `MAX_PAGINATE_BY` setting and `max_paginate_by` generic view attribute. +* Added `Retry-After` header to throttled responses, as per [RFC 6585](http://tools.ietf.org/html/rfc6585). This should now be used in preference to the custom `X-Trottle-Wait-Seconds` header which will be fully deprecated in 3.0. * Added `cache` attribute to throttles to allow overriding of default cache. * Added `lookup_value_regex` attribute to routers, to allow the URL argument matching to be constrainted by the user. * Added `allow_none` option to `CharField`. From f27a28682bdb1b4eea0ec9afca2eb2835c735f55 Mon Sep 17 00:00:00 2001 From: Greg Doermann Date: Wed, 20 Aug 2014 11:00:37 -0600 Subject: [PATCH 0711/1652] Frameworks throws AssertionError saying you cannot set required=True and read_only=True on editable=False model fields. We should not make the field required if editable=False. --- rest_framework/serializers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index be8ad3f24..27af7ef33 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -831,7 +831,7 @@ class ModelSerializer(Serializer): } if model_field: - kwargs['required'] = not(model_field.null or model_field.blank) + kwargs['required'] = not(model_field.null or model_field.blank) and model_field.editable if model_field.help_text is not None: kwargs['help_text'] = model_field.help_text if model_field.verbose_name is not None: @@ -854,7 +854,7 @@ class ModelSerializer(Serializer): """ kwargs = {} - if model_field.null or model_field.blank: + if model_field.null or model_field.blank and model_field.editable: kwargs['required'] = False if isinstance(model_field, models.AutoField) or not model_field.editable: @@ -1110,7 +1110,7 @@ class HyperlinkedModelSerializer(ModelSerializer): } if model_field: - kwargs['required'] = not(model_field.null or model_field.blank) + kwargs['required'] = not(model_field.null or model_field.blank) and model_field.editable if model_field.help_text is not None: kwargs['help_text'] = model_field.help_text if model_field.verbose_name is not None: From 8b2052172cf7138203e683731c30bd279c6e722a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 21 Aug 2014 12:25:20 +0100 Subject: [PATCH 0712/1652] Add .model deprecation to release notes --- docs/api-guide/generic-views.md | 8 ++++---- docs/api-guide/settings.md | 6 ------ docs/index.md | 2 +- docs/topics/2.4-accouncement.md | 10 ++++++++++ docs/topics/release-notes.md | 1 + 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index e9efe7092..cab382fbd 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -74,10 +74,6 @@ The following attributes control the basic view behavior. * `lookup_field` - The model field that should be used to for performing object lookup of individual model instances. Defaults to `'pk'`. Note that when using hyperlinked APIs you'll need to ensure that *both* the API views *and* the serializer classes set the lookup fields if you need to use a custom value. * `lookup_url_kwarg` - The URL keyword argument that should be used for object lookup. The URL conf should include a keyword argument corresponding to this value. If unset this defaults to using the same value as `lookup_field`. -**Shortcuts**: - -* `model` - This shortcut may be used instead of setting either (or both) of the `queryset`/`serializer_class` attributes, although using the explicit style is generally preferred. If used instead of `serializer_class`, then `DEFAULT_MODEL_SERIALIZER_CLASS` setting will determine the base serializer class. Note that `model` is only ever used for generating a default queryset or serializer class - the `queryset` and `serializer_class` attributes are always preferred if provided. - **Pagination**: The following attributes are used to control pagination when used with list views. @@ -91,6 +87,10 @@ The following attributes are used to control pagination when used with list view * `filter_backends` - A list of filter backend classes that should be used for filtering the queryset. Defaults to the same value as the `DEFAULT_FILTER_BACKENDS` setting. +**Deprecated attributes**: + +* `model` - This shortcut may be used instead of setting either (or both) of the `queryset`/`serializer_class` attributes. The explicit style is preferred over the `.model` shortcut, and usage of this attribute is now deprecated. + ### Methods **Base methods**: diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 8bde4d87a..27a091633 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -100,12 +100,6 @@ Default: `'rest_framework.negotiation.DefaultContentNegotiation'` *The following settings control the behavior of the generic class based views.* -#### DEFAULT_MODEL_SERIALIZER_CLASS - -A class that determines the default type of model serializer that should be used by a generic view if `model` is specified, but `serializer_class` is not provided. - -Default: `'rest_framework.serializers.ModelSerializer'` - #### DEFAULT_PAGINATION_SERIALIZER_CLASS A class the determines the default serialization style for paginated responses. diff --git a/docs/index.md b/docs/index.md index 3e6d23aec..60219c95e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -139,7 +139,7 @@ Here's our project's root `urls.py` module: url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) ] -You can now open the API in your browser at [http://127.0.0.1:8000/](http://127.0.0.1:8000/), and view your new 'users' API. If you use the Login control in the top right corner you'll also be able to add, create and delete users from the system. +You can now open the API in your browser at [http://127.0.0.1:8000/](http://127.0.0.1:8000/), and view your new 'users' API. If you use the login control in the top right corner you'll also be able to add, create and delete users from the system. ## Quickstart diff --git a/docs/topics/2.4-accouncement.md b/docs/topics/2.4-accouncement.md index e3f9d57a8..a68f25ed7 100644 --- a/docs/topics/2.4-accouncement.md +++ b/docs/topics/2.4-accouncement.md @@ -15,6 +15,16 @@ The optional authtoken application now includes support for *both* Django 1.7 sc **If you are using authtoken, and you want to continue using `south`, you must upgrade your `south` package to version 1.0.** +## Deprecation of `.model` view attribute + +The `.model` attribute on view classes is an optional shortcut for either or both of `.serializer_class` and `.queryset`. It's usage results in more implicit, less obvious behavior. + +The documentation has previously stated that usage of the more explict style is prefered, and we're now taking that one step further and deprecating the usage of the `.model` shortcut. + +Doing so will mean that there are cases of API code where you'll now need to include a serializer class where you previously were just using the `.model` shortcut. However we firmly believe that it is the right trade-off to make. Removing the shortcut takes away an unneccessary layer of abstraction, and makes your codebase more explict without any significant extra complexity. + +The `DEFAULT_MODEL_SERIALIZER_CLASS` API setting is now also deprecated. + ## Updated test runner We now have a new test runner for developing against the project,, that uses the excellent [py.test](http://pytest.org) library. diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 0a74a27d3..badc28e90 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -48,6 +48,7 @@ You can determine your currently installed version using `pip freeze`: * Added compatibility with Django 1.7's database migration support. * New test runner, using `py.test`. +* Deprecated `.model` view attribute in favor of explict `.queryset` and `.serializer_class` attributes. The `DEFAULT_MODEL_SERIALIZER_CLASS` setting is also deprecated. * `@detail_route` and `@list_route` decorators replace `@action` and `@link`. * Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. * Added `NUM_PROXIES` setting for smarter client IP identification. From 1e2bd1294e6a9ec877f624922b49368a18c228d0 Mon Sep 17 00:00:00 2001 From: Cezar Pendarovski Date: Fri, 22 Aug 2014 09:53:03 +0200 Subject: [PATCH 0713/1652] Fixed the issue with the non-draggable horizontal scrollbar --- .../rest_framework/css/bootstrap-tweaks.css | 119 ++--- .../static/rest_framework/css/default.css | 40 +- .../templates/rest_framework/base.html | 474 ++++++++++-------- 3 files changed, 343 insertions(+), 290 deletions(-) diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css index 6bfb778cc..e5cc65ab7 100644 --- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css @@ -6,30 +6,30 @@ a single block in the template. */ - .form-actions { - background: transparent; - border-top-color: transparent; - padding-top: 0; + background: transparent; + border-top-color: transparent; + padding-top: 0; } .navbar-inverse .brand a { - color: #999; + color: #999999; } .navbar-inverse .brand:hover a { - color: white; - text-decoration: none; + color: white; + text-decoration: none; } /* custom navigation styles */ -.wrapper .navbar{ +.navbar { width: 100%; - position: absolute; + position: fixed; left: 0; top: 0; + z-index: 3; } -.navbar .navbar-inner{ +.navbar .navbar-inner { background: #2C2C2C; color: white; border: none; @@ -37,7 +37,7 @@ a single block in the template. border-radius: 0px; } -.navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand:hover{ +.navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand:hover { color: white; } @@ -45,17 +45,18 @@ a single block in the template. background: #2c2c2c; } -.navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li{ - color: #A30000; +.navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li { + color: #A30000; } -.navbar .navbar-inner .dropdown-menu li a:hover{ + +.navbar .navbar-inner .dropdown-menu li a:hover { background: #eeeeee; color: #c20000; } /*=== dabapps bootstrap styles ====*/ -html{ +html { width:100%; background: none; } @@ -65,121 +66,127 @@ body, .navbar .navbar-inner .container-fluid { margin: 0 auto; } -body{ +body { background: url("../img/grid.png") repeat-x; background-attachment: fixed; } -#content{ - margin: 0; +#content { + margin: 0; + padding-bottom: 60px; } /* sticky footer and footer */ html, body { height: 100%; } + .wrapper { + position: relative; + top: 0; + left: 0; + padding-top: 60px; + margin: -60px 0; min-height: 100%; - height: auto !important; - height: 100%; - margin: 0 auto -60px; } .form-switcher { - margin-bottom: 0; + margin-bottom: 0; } .well { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } .well .form-actions { - padding-bottom: 0; - margin-bottom: 0; + padding-bottom: 0; + margin-bottom: 0; } .well form { - margin-bottom: 0; + margin-bottom: 0; } .well form .help-block { - color: #999; + color: #999999; } .nav-tabs { - border: 0; + border: 0; } .nav-tabs > li { - float: right; + float: right; } .nav-tabs li a { - margin-right: 0; + margin-right: 0; } .nav-tabs > .active > a { - background: #f5f5f5; + background: #F5F5F5; } .nav-tabs > .active > a:hover { - background: #f5f5f5; + background: #F5F5F5; } -.tabbable.first-tab-active .tab-content -{ - border-top-right-radius: 0; +.tabbable.first-tab-active .tab-content { + border-top-right-radius: 0; } -#footer, #push { - height: 60px; /* .push must be the same height as .footer */ +footer { + position: absolute; + bottom: 0; + left: 0; + clear: both; + z-index: 10; + height: 60px; + width: 95%; + margin: 0 2.5%; } -#footer{ - text-align: right; -} - -#footer p { +footer p { text-align: center; color: gray; border-top: 1px solid #DDD; padding-top: 10px; } -#footer a { - color: gray; +footer a { + color: gray !important; font-weight: bold; } -#footer a:hover { +footer a:hover { color: gray; } .page-header { - border-bottom: none; - padding-bottom: 0px; - margin-bottom: 20px; + border-bottom: none; + padding-bottom: 0px; + margin-bottom: 20px; } /* custom general page styles */ -.hero-unit h2, .hero-unit h1{ +.hero-unit h1, .hero-unit h2 { color: #A30000; } -body a, body a{ +body a { color: #A30000; } -body a:hover{ +body a:hover { color: #c20000; } -#content a span{ - text-decoration: underline; +#content a span { + text-decoration: underline; } .request-info { - clear:both; + clear:both; } diff --git a/rest_framework/static/rest_framework/css/default.css b/rest_framework/static/rest_framework/css/default.css index 0261a3038..461cdfe5c 100644 --- a/rest_framework/static/rest_framework/css/default.css +++ b/rest_framework/static/rest_framework/css/default.css @@ -3,20 +3,20 @@ content running up underneath it. */ h1 { - font-weight: 500; + font-weight: 500; } h2, h3 { - font-weight: 300; + font-weight: 300; } .resource-description, .response-info { - margin-bottom: 2em; + margin-bottom: 2em; } .version:before { - content: "v"; - opacity: 0.6; - padding-right: 0.25em; + content: "v"; + opacity: 0.6; + padding-right: 0.25em; } .version { @@ -24,16 +24,16 @@ h2, h3 { } .format-option { - font-family: Menlo, Consolas, "Andale Mono", "Lucida Console", monospace; + font-family: Menlo, Consolas, "Andale Mono", "Lucida Console", monospace; } .button-form { - float: right; - margin-right: 1em; + float: right; + margin-right: 1em; } ul.breadcrumb { - margin: 58px 0 0 0; + margin: 80px 0 0 0; } form select, form input, form textarea { @@ -43,17 +43,18 @@ form select, form input, form textarea { form select[multiple] { height: 150px; } + /* To allow tooltips to work on disabled elements */ .disabled-tooltip-shield { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; } .errorlist { - margin-top: 0.5em; + margin-top: 0.5em; } pre { @@ -64,8 +65,7 @@ pre { } .page-header { - border-bottom: none; - padding-bottom: 0px; - margin-bottom: 20px; + border-bottom: none; + padding-bottom: 0px; + margin-bottom: 20px; } - diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index e96fa8ec5..2f4e060b0 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -3,231 +3,277 @@ - {% block head %} - - {% block meta %} - - + {% block head %} + + {% block meta %} + + + {% endblock %} + + {% block title %}Django REST framework{% endblock %} + + {% block style %} + {% block bootstrap_theme %} + + + {% endblock %} + + + {% endblock %} + {% endblock %} - - {% block title %}Django REST framework{% endblock %} - - {% block style %} - {% block bootstrap_theme %} - - - {% endblock %} - - - {% endblock %} - - {% endblock %} - + -
      +
      - {% block navbar %} -
      -
      -
      - - {% block branding %}Django REST framework {{ version }}{% endblock %} - -
        - {% block userlinks %} - {% if user.is_authenticated %} -
      • - - {{ user }} - - -
          -
        • {% optional_logout request %}
          • -
        -
        • - {% else %} -
      • {% optional_login request %}
        • - {% endif %} - {% endblock %} -
      -
      -
      -
      - {% endblock %} - - {% block breadcrumbs %} -
        - {% for breadcrumb_name, breadcrumb_url in breadcrumblist %} -
      • - {{ breadcrumb_name }} {% if not forloop.last %}›{% endif %} -
        • - {% endfor %} -
      - {% endblock %} - - -
      - - {% if 'GET' in allowed_methods %} - -
      -
      - GET - - -
        - {% for format in available_formats %} -
      • - {{ format }} -
        • - {% endfor %} -
      + {% block navbar %} +
      +
      +
      + + {% block branding %} + + Django REST framework {{ version }} + + {% endblock %} + +
        + {% block userlinks %} + {% if user.is_authenticated %} +
      • + + {{ user }} + + +
          +
        • {% optional_logout request %}
          • +
        +
        • + {% else %} +
      • {% optional_login request %}
        • + {% endif %} + {% endblock %} +
      +
      - -
      - - {% endif %} - - {% if options_form %} -
      - {% csrf_token %} - - -
      - {% endif %} - - {% if delete_form %} -
      - {% csrf_token %} - - -
      - {% endif %} - -
      -

      {{ name }}

      - {% block description %} - {{ description }} +
      {% endblock %} -
      - 
      {{ request.method }} {{ request.get_full_path }}
      -
      -
      - 
      HTTP {{ response.status_code }} {{ response.status_text }}{% autoescape off %}
+
+            {% block breadcrumbs %}
+                
        
+                    {% for breadcrumb_name, breadcrumb_url in breadcrumblist %}
+                        
      • 
+                            
+                                {{ breadcrumb_name }}
+                            
+                            {% if not forloop.last %}›{% endif %}
+                        
        • 
+                    {% endfor %}
+                
      
+            {% endblock %}
+
+            
+            
      
+
+                {% if 'GET' in allowed_methods %}
+                    
      
+                        
      
+                            
      
+                                
+                                    GET
+                                
+        
+                                
+                                
+                            
      
+                        
      
+                    
      
+                {% endif %}
+
+                {% if options_form %}
+                    
      
+                        {% csrf_token %}
+                        
+                        
+                    
      
+                {% endif %}
+
+                {% if delete_form %}
+                    
      
+                        {% csrf_token %}
+                        
+                        
+                    
      
+                {% endif %}
+
+                
      
+                    
      
+                        
      {{ name }}
      
+                    
      
+                    {% block description %}
+                        {{ description }}
+                    {% endblock %}
+                    
      
+                        
      {{ request.method }} {{ request.get_full_path }}
      
+                    
      
+                    
      
+                        
      HTTP {{ response.status_code }} {{ response.status_text }}{% autoescape off %}
 {% for key, val in response_headers.items %}{{ key }}: {{ val|break_long_headers|urlize_quoted_links }}
 {% endfor %}
 
      {{ content|urlize_quoted_links }}
      {% endautoescape %}
+                    
      
+                
      
+
+                {% if display_edit_forms %}
+    
+                    {% if post_form or raw_data_post_form %}
+                        
      
+                            {% if post_form %}
+                                
+                            {% endif %}
+                            
      
+                                {% if post_form %}
+                                    
      
+                                        {% with form=post_form %}
+                                            
      
+                                                
      
+                                                    {{ post_form }}
+                                                    
      
+                                                        
+                                                    
      
+                                                
      
+                                            
      
+                                        {% endwith %}
+                                    
      
+                                {% endif %}
+                                
      
+                                    {% with form=raw_data_post_form %}
+                                        
      
+                                            
      
+                                                {% include "rest_framework/raw_data_form.html" %}
+                                                
      
+                                                    
+                                                
      
+                                            
      
+                                        
      
+                                    {% endwith %}
+                                
      
+                            
      
+                        
      
+                    {% endif %}
+    
+                    {% if put_form or raw_data_put_form or raw_data_patch_form %}
+                        
      
+                            {% if put_form %}
+                                
+                            {% endif %}
+                            
      
+                                {% if put_form %}
+                                    
      
+                                        
      
+                                            
      
+                                                {{ put_form }}
+                                                
      
+                                                    
+                                                
      
+                                            
      
+                                        
      
+                                    
      
+                                {% endif %}
+                                
      
+                                    {% with form=raw_data_put_or_patch_form %}
+                                        
      
+                                            
      
+                                                {% include "rest_framework/raw_data_form.html" %}
+                                                
      
+                                                    {% if raw_data_put_form %}
+                                                        
+                                                    {% endif %}
+                                                    {% if raw_data_patch_form %}
+                                                        
+                                                    {% endif %}
+                                                
      
+                                            
      
+                                        
      
+                                    {% endwith %}
+                                
      
+                            
      
+                        
      
+                    {% endif %}
+                {% endif %}
             
      
-        
      
+            
+            
+            
      
+                {% block footer %}
+                    
      Sponsored by DabApps.
      
+                {% endblock %}
+            
      
 
-            {% if display_edit_forms %}
+
      - {% if post_form or raw_data_post_form %} -
      - {% if post_form %} - - {% endif %} -
      - {% if post_form %} -
      - {% with form=post_form %} -
      -
      - {{ post_form }} -
      - -
      -
      -
      - {% endwith %} -
      - {% endif %} -
      - {% with form=raw_data_post_form %} -
      -
      - {% include "rest_framework/raw_data_form.html" %} -
      - -
      -
      -
      - {% endwith %} -
      -
      -
      - {% endif %} - - {% if put_form or raw_data_put_form or raw_data_patch_form %} -
      - {% if put_form %} - - {% endif %} -
      - {% if put_form %} -
      -
      -
      - {{ put_form }} -
      - -
      -
      -
      -
      - {% endif %} -
      - {% with form=raw_data_put_or_patch_form %} -
      -
      - {% include "rest_framework/raw_data_form.html" %} -
      - {% if raw_data_put_form %} - - {% endif %} - {% if raw_data_patch_form %} - - {% endif %} -
      -
      -
      - {% endwith %} -
      -
      -
      - {% endif %} - {% endif %} - -
      - - -
      - - -
      - -
      - -

    - - {% block footer %} - {% endblock %} - - {% block script %} - - - - - {% endblock %} - + {% block script %} + + + + + {% endblock %} + From 4d582fd9ffcb6ec28247e95b63134c00cc131780 Mon Sep 17 00:00:00 2001 From: Cezar Pendarovski Date: Fri, 22 Aug 2014 10:12:52 +0200 Subject: [PATCH 0714/1652] Made all color declarations in bootstrap-tweaks.css consistent --- .../static/rest_framework/css/bootstrap-tweaks.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css index e5cc65ab7..6fa1e6cb5 100644 --- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css @@ -42,7 +42,7 @@ a single block in the template. } .nav-list > .active > a, .nav-list > .active > a:hover { - background: #2c2c2c; + background: #2C2C2C; } .navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li { @@ -50,8 +50,8 @@ a single block in the template. } .navbar .navbar-inner .dropdown-menu li a:hover { - background: #eeeeee; - color: #c20000; + background: #EEEEEE; + color: #C20000; } /*=== dabapps bootstrap styles ====*/ @@ -151,7 +151,7 @@ footer { footer p { text-align: center; color: gray; - border-top: 1px solid #DDD; + border-top: 1px solid #DDDDDD; padding-top: 10px; } From 8e3f7700f6ed6fbe1338afc68e27c06d702fac8d Mon Sep 17 00:00:00 2001 From: Federico Capoano Date: Mon, 25 Aug 2014 12:29:10 +0200 Subject: [PATCH 0715/1652] docs: added drf-hstore to third party fields added a reference to django-rest-framework-hstore in docs/api-guide/fields.md --- docs/api-guide/fields.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 95d9fad33..bfbff2adb 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -366,6 +366,9 @@ The [drf-extra-fields][drf-extra-fields] package provides extra serializer field The [django-rest-framework-gis][django-rest-framework-gis] package provides geographic addons for django rest framework like a `GeometryField` field and a GeoJSON serializer. +## django-rest-framework-hstore + +The [django-rest-framework-hstore][django-rest-framework-hstore] package provides an `HStoreField` to support [django-hstore][django-hstore] `DictionaryField` model field. [cite]: https://docs.djangoproject.com/en/dev/ref/forms/api/#django.forms.Form.cleaned_data [FILE_UPLOAD_HANDLERS]: https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-FILE_UPLOAD_HANDLERS @@ -376,3 +379,5 @@ The [django-rest-framework-gis][django-rest-framework-gis] package provides geog [drf-compound-fields]: http://drf-compound-fields.readthedocs.org [drf-extra-fields]: https://github.com/Hipo/drf-extra-fields [django-rest-framework-gis]: https://github.com/djangonauts/django-rest-framework-gis +[django-rest-framework-hstore]: https://github.com/djangonauts/django-rest-framework-hstore +[django-hstore]: https://github.com/djangonauts/django-hstore From eb81c55d16435537ff7801839cc4d2704526914f Mon Sep 17 00:00:00 2001 From: Federico Capoano Date: Mon, 25 Aug 2014 12:32:44 +0200 Subject: [PATCH 0716/1652] docs: added HStoreSerializer to third party serializers added a reference to django-rest-framework-hstore in docs/api-guide/serializers.md --- docs/api-guide/serializers.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 29b7851b6..a3694510e 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -594,7 +594,13 @@ The [django-rest-framework-mongoengine][mongoengine] package provides a `MongoEn The [django-rest-framework-gis][django-rest-framework-gis] package provides a `GeoFeatureModelSerializer` serializer class that supports GeoJSON both for read and write operations. +## HStoreSerializer + +The [django-rest-framework-hstore][django-rest-framework-hstore] package provides an `HStoreSerializer` to support [django-hstore][django-hstore] `DictionaryField` model field and its `schema-mode` feature. + [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion [relations]: relations.md [mongoengine]: https://github.com/umutbozkurt/django-rest-framework-mongoengine [django-rest-framework-gis]: https://github.com/djangonauts/django-rest-framework-gis +[django-rest-framework-hstore]: https://github.com/djangonauts/django-rest-framework-hstore +[django-hstore]: https://github.com/djangonauts/django-hstore From 19076510f4039aa6886854679e21352fffb5354f Mon Sep 17 00:00:00 2001 From: Nathan Hubbell Date: Tue, 26 Aug 2014 17:31:08 -0700 Subject: [PATCH 0717/1652] Update generic-views.md --- docs/api-guide/generic-views.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index e9efe7092..48b77a6e3 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -49,7 +49,7 @@ For more complex cases you might also want to override various methods on the vi serializer = UserSerializer(queryset, many=True) return Response(serializer.data) -For very simple cases you might want to pass through any class attributes using the `.as_view()` method. For example, your URLconf might include something the following entry. +For very simple cases you might want to pass through any class attributes using the `.as_view()` method. For example, your URLconf might include something like the following entry: url(r'^/users/', ListCreateAPIView.as_view(model=User), name='user-list') From e5d88a80a97e6575c8b2a2ac40cffca6abdf1227 Mon Sep 17 00:00:00 2001 From: Cezar Pendarovski Date: Wed, 27 Aug 2014 09:41:33 +0200 Subject: [PATCH 0718/1652] Put all TextNodes (method names) back to same line with parent element --- .../templates/rest_framework/base.html | 32 +++++-------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index a19101e39..980cee0c5 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -83,9 +83,7 @@
    - GET - + rel="nofollow" title="Make a GET request on the {{ name }} resource">GET + title="Make an OPTIONS request on the {{ name }} resource">OPTIONS {% endif %} @@ -124,9 +120,7 @@ {% csrf_token %} + title="Make a DELETE request on the {{ name }} resource">DELETE {% endif %} @@ -172,9 +166,7 @@ {{ post_form }}
    + title="Make a POST request on the {{ name }} resource">POST
    @@ -188,9 +180,7 @@ {% include "rest_framework/raw_data_form.html" %}
    + title="Make a POST request on the {{ name }} resource">POST
    @@ -222,9 +212,7 @@
    + value="PUT" title="Make a PUT request on the {{ name }} resource">PUT
    @@ -239,16 +227,12 @@ {% if raw_data_put_form %} + value="PUT" title="Make a PUT request on the {{ name }} resource">PUT {% endif %} {% if raw_data_patch_form %} + value="PATCH" title="Make a PATCH request on the {{ name }} resource">PATCH {% endif %}
    From be21cafd2bbca36bcf9e55b1565ba57c9e3f76d6 Mon Sep 17 00:00:00 2001 From: Nathan Hubbell Date: Wed, 27 Aug 2014 17:57:40 -0700 Subject: [PATCH 0719/1652] Update generic-views.md Small grammar changes. --- docs/api-guide/generic-views.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 48b77a6e3..2ceb2d573 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -101,7 +101,7 @@ Returns the queryset that should be used for list views, and that should be used This method should always be used rather than accessing `self.queryset` directly, as `self.queryset` gets evaluated only once, and those results are cached for all subsequent requests. -May be overridden to provide dynamic behavior such as returning a queryset that is specific to the user making the request. +May be overridden to provide dynamic behavior, such as returning a queryset, that is specific to the user making the request. For example: @@ -113,7 +113,7 @@ For example: Returns an object instance that should be used for detail views. Defaults to using the `lookup_field` parameter to filter the base queryset. -May be overridden to provide more complex behavior such as object lookups based on more than one URL kwarg. +May be overridden to provide more complex behavior, such as object lookups based on more than one URL kwarg. For example: @@ -133,7 +133,7 @@ Note that if your API doesn't include any object level permissions, you may opti Returns the classes that should be used to filter the queryset. Defaults to returning the `filter_backends` attribute. -May be override to provide more complex behavior with filters, as using different (or even exlusive) lists of filter_backends depending on different criteria. +May be overridden to provide more complex behavior with filters, such as using different (or even exlusive) lists of filter_backends depending on different criteria. For example: @@ -149,7 +149,7 @@ For example: Returns the class that should be used for the serializer. Defaults to returning the `serializer_class` attribute, or dynamically generating a serializer class if the `model` shortcut is being used. -May be override to provide dynamic behavior such as using different serializers for read and write operations, or providing different serializers to different types of users. +May be overridden to provide dynamic behavior, such as using different serializers for read and write operations, or providing different serializers to different types of users. For example: @@ -162,7 +162,7 @@ For example: Returns the page size to use with pagination. By default this uses the `paginate_by` attribute, and may be overridden by the client if the `paginate_by_param` attribute is set. -You may want to override this method to provide more complex behavior such as modifying page sizes based on the media type of the response. +You may want to override this method to provide more complex behavior, such as modifying page sizes based on the media type of the response. For example: @@ -204,7 +204,7 @@ You won't typically need to override the following methods, although you might n # Mixins -The mixin classes provide the actions that are used to provide the basic view behavior. Note that the mixin classes provide action methods rather than defining the handler methods such as `.get()` and `.post()` directly. This allows for more flexible composition of behavior. +The mixin classes provide the actions that are used to provide the basic view behavior. Note that the mixin classes provide action methods rather than defining the handler methods, such as `.get()` and `.post()`, directly. This allows for more flexible composition of behavior. ## ListModelMixin From 53808892752f7bc0ff4735a8160e9975baf2a56c Mon Sep 17 00:00:00 2001 From: Cezar Pendarovski Date: Thu, 28 Aug 2014 10:39:01 +0200 Subject: [PATCH 0720/1652] Validation errors in the rendered HTML fixed --- rest_framework/templates/rest_framework/base.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 980cee0c5..cee9724d5 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -33,7 +33,7 @@
    - + {% block branding %} Django REST framework {{ version }} @@ -135,10 +135,10 @@ 
    {{ request.method }} {{ request.get_full_path }}
    - 
    HTTP {{ response.status_code }} {{ response.status_text }}{% autoescape off %}
+                        
    HTTP {{ response.status_code }} {{ response.status_text }}{% autoescape off %}
 {% for key, val in response_headers.items %}{{ key }}: {{ val|break_long_headers|urlize_quoted_links }}
 {% endfor %}
-
    {{ content|urlize_quoted_links }}
    {% endautoescape %} +{{ content|urlize_quoted_links }}{% endautoescape %}
    From 73bd408f7844efe921f82f73392d88638610a887 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 28 Aug 2014 17:01:58 +0100 Subject: [PATCH 0721/1652] Latest sponsor update --- docs/img/sponsors/2-wusawork.png | Bin 0 -> 12067 bytes docs/topics/kickstarter-announcement.md | 9 +++------ 2 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 docs/img/sponsors/2-wusawork.png diff --git a/docs/img/sponsors/2-wusawork.png b/docs/img/sponsors/2-wusawork.png new file mode 100644 index 0000000000000000000000000000000000000000..5834729b95889107382e5f1c0bbd3c1fda48f842 GIT binary patch literal 12067 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 O>vA$m(p8ei!T$#{f=Utq literal 0 HcmV?d00001 diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 6d0910649..5fe6d6089 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -82,7 +82,7 @@ Our gold sponsors include companies large and small. Many thanks for their signi
  • Koordinates
  • Pulsecode Inc.
    • -
  • Singing Horse Studio. Ltd.
    • +
  • Singing Horse Studio Ltd.
  • Heroku
  • Galileo Press
  • Security Compass
    • @@ -92,13 +92,10 @@ Our gold sponsors include companies large and small. Many thanks for their signi
  • Cryptico Corp
  • NextHub
  • Compile
    • +
  • Envision Linux
    • -
    - -**Individual backers**: Simon Haugk. - --- ### Silver sponsors @@ -145,7 +142,7 @@ The serious financial contribution that our silver sponsors have made is very mu
    -**Individual backers**: Paul Hallet, Paul Whipp, Dylan Roy, Jannis Leidel, Xavier Ordoquy, Johannes Spielmann, Rob Spectre, Chris Heisel, Marwan Alsabbagh, Haris Ali, Tuomas Toivonen. +**Individual backers**: Paul Hallett, Paul Whipp, Dylan Roy, Jannis Leidel, Xavier Ordoquy, Johannes Spielmann, Rob Spectre, Chris Heisel, Marwan Alsabbagh, Haris Ali, Tuomas Toivonen. --- From e7e3d29de4e9b6b8860e4bdef17c026c299d889d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 28 Aug 2014 17:35:45 +0100 Subject: [PATCH 0722/1652] Sponsor fix --- docs/topics/kickstarter-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 5fe6d6089..4f9fea9fd 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -92,7 +92,7 @@ Our gold sponsors include companies large and small. Many thanks for their signi
  • Cryptico Corp
  • NextHub
  • Compile
    • -
  • WusaWork
  • Envision Linux
    • From bb1604674f05c0fa5c62e7bb3e7b9d12fd9bf648 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 09:21:10 +0100 Subject: [PATCH 0723/1652] Minor docs update --- docs/topics/kickstarter-announcement.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 4f9fea9fd..7d1f6d0eb 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -96,6 +96,8 @@ Our gold sponsors include companies large and small. Many thanks for their signi
  • Envision Linux
    • +
    + --- ### Silver sponsors From 2a61ed8bac8f2cd661f8537fde290bb92d150e8b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 10:10:17 +0100 Subject: [PATCH 0724/1652] 2.4 Release notes --- docs/index.md | 2 ++ docs/template.html | 1 + docs/topics/2.4-accouncement.md | 6 ++++-- docs/topics/release-notes.md | 4 +++- mkdocs.py | 1 + rest_framework/__init__.py | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docs/index.md b/docs/index.md index 60219c95e..1888bfe4b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -199,6 +199,7 @@ General guides to using REST framework. * [2.0 Announcement][rest-framework-2-announcement] * [2.2 Announcement][2.2-announcement] * [2.3 Announcement][2.3-announcement] +* [2.4 Announcement][2.4-announcement] * [Kickstarter Announcement][kickstarter-announcement] * [Release Notes][release-notes] * [Credits][credits] @@ -314,6 +315,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [rest-framework-2-announcement]: topics/rest-framework-2-announcement.md [2.2-announcement]: topics/2.2-announcement.md [2.3-announcement]: topics/2.3-announcement.md +[2.4-announcement]: topics/2.4-announcement.md [kickstarter-announcement]: topics/kickstarter-announcement.md [release-notes]: topics/release-notes.md [credits]: topics/credits.md diff --git a/docs/template.html b/docs/template.html index ac2256798..19542bfe6 100644 --- a/docs/template.html +++ b/docs/template.html @@ -121,6 +121,7 @@ a.fusion-poweredby {
  • 2.0 Announcement
  • 2.2 Announcement
  • 2.3 Announcement
    • +
  • 2.4 Announcement
  • Kickstarter Announcement
  • Release Notes
  • Credits
    • diff --git a/docs/topics/2.4-accouncement.md b/docs/topics/2.4-accouncement.md index b6936d2a5..5f90319ab 100644 --- a/docs/topics/2.4-accouncement.md +++ b/docs/topics/2.4-accouncement.md @@ -19,9 +19,11 @@ The optional authtoken application now includes support for *both* Django 1.7 sc The `.model` attribute on view classes is an optional shortcut for either or both of `.serializer_class` and `.queryset`. It's usage results in more implicit, less obvious behavior. -The documentation has previously stated that usage of the more explict style is prefered, and we're now taking that one step further and deprecating the usage of the `.model` shortcut. +The documentation has previously stated that usage of the more explicit style is prefered, and we're now taking that one step further and deprecating the usage of the `.model` shortcut. -Doing so will mean that there are cases of API code where you'll now need to include a serializer class where you previously were just using the `.model` shortcut. However we firmly believe that it is the right trade-off to make. Removing the shortcut takes away an unneccessary layer of abstraction, and makes your codebase more explict without any significant extra complexity. +Doing so will mean that there are cases of API code where you'll now need to include a serializer class where you previously were just using the `.model` shortcut. However we firmly believe that it is the right trade-off to make. + +Removing the shortcut takes away an unneccessary layer of abstraction, and makes your codebase more explicit without any significant extra complexity. It also results in better consistency, as there's now only one way to set the serializer class and queryset attributes for the view, instead of two. The `DEFAULT_MODEL_SERIALIZER_CLASS` API setting is now also deprecated. diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index c158c47bf..29a0afcd3 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,13 +42,15 @@ You can determine your currently installed version using `pip freeze`: ### 2.4.0 +**Date**: 29th August 2014 + **Django version requirements**: The lowest supported version of Django is now 1.4.2. **South version requirements**: This note applies to any users using the optional `authtoken` application, which includes an associated database migration. You must now *either* upgrade your `south` package to version 1.0, *or* instead use the built-in migration support available with Django 1.7. * Added compatibility with Django 1.7's database migration support. * New test runner, using `py.test`. -* Deprecated `.model` view attribute in favor of explict `.queryset` and `.serializer_class` attributes. The `DEFAULT_MODEL_SERIALIZER_CLASS` setting is also deprecated. +* Deprecated `.model` view attribute in favor of explicit `.queryset` and `.serializer_class` attributes. The `DEFAULT_MODEL_SERIALIZER_CLASS` setting is also deprecated. * `@detail_route` and `@list_route` decorators replace `@action` and `@link`. * Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. * Added `NUM_PROXIES` setting for smarter client IP identification. diff --git a/mkdocs.py b/mkdocs.py index adeb60538..b4c414080 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -80,6 +80,7 @@ path_list = [ 'topics/rest-framework-2-announcement.md', 'topics/2.2-announcement.md', 'topics/2.3-announcement.md', + 'topics/2.4-announcement.md', 'topics/release-notes.md', 'topics/credits.md', ] diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index f30012b9b..f95bdc22e 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '2.3.14' +__version__ = '2.4.0' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2014 Tom Christie' From 572107281ff86bd4b01e0cfb01f4a5adc5dda97c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 10:15:55 +0100 Subject: [PATCH 0725/1652] Typo in 2.4 announcement name --- docs/topics/{2.4-accouncement.md => 2.4-announcement.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/topics/{2.4-accouncement.md => 2.4-announcement.md} (100%) diff --git a/docs/topics/2.4-accouncement.md b/docs/topics/2.4-announcement.md similarity index 100% rename from docs/topics/2.4-accouncement.md rename to docs/topics/2.4-announcement.md From d8eb9e6d45c227582559ec4318b1f92562c718da Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 10:48:16 +0100 Subject: [PATCH 0726/1652] Docs whitespace fix. --- docs/api-guide/generic-views.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index b1c4e65ad..d30b7f9bf 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -19,8 +19,8 @@ Typically when using the generic views, you'll override the view, and set severa from django.contrib.auth.models import User from myapp.serializers import UserSerializer - from rest_framework import generics - from rest_framework.permissions import IsAdminUser + from rest_framework import generics + from rest_framework.permissions import IsAdminUser class UserList(generics.ListCreateAPIView): queryset = User.objects.all() From f62c874ea9621ae67fb56e7e453dca8fd5039051 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 10:48:40 +0100 Subject: [PATCH 0727/1652] Remove `filter_backend`. Closes #1775. --- rest_framework/generics.py | 20 +------------------- rest_framework/settings.py | 10 ---------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index a6f686571..8bacf470b 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -83,7 +83,6 @@ class GenericAPIView(views.APIView): slug_url_kwarg = 'slug' slug_field = 'slug' allow_empty = True - filter_backend = api_settings.FILTER_BACKEND def get_serializer_context(self): """ @@ -191,24 +190,7 @@ class GenericAPIView(views.APIView): """ Returns the list of filter backends that this view requires. """ - if self.filter_backends is None: - filter_backends = [] - else: - # Note that we are returning a *copy* of the class attribute, - # so that it is safe for the view to mutate it if needed. - filter_backends = list(self.filter_backends) - - if not filter_backends and self.filter_backend: - warnings.warn( - 'The `filter_backend` attribute and `FILTER_BACKEND` setting ' - 'are deprecated in favor of a `filter_backends` ' - 'attribute and `DEFAULT_FILTER_BACKENDS` setting, that take ' - 'a *list* of filter backend classes.', - DeprecationWarning, stacklevel=2 - ) - filter_backends = [self.filter_backend] - - return filter_backends + return list(self.filter_backends) # The following methods provide default implementations # that you may want to override for more complex cases. diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 644751f87..bbe7a56ad 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -111,9 +111,6 @@ DEFAULTS = { ), 'TIME_FORMAT': None, - # Pending deprecation - 'FILTER_BACKEND': None, - } @@ -129,7 +126,6 @@ IMPORT_STRINGS = ( 'DEFAULT_PAGINATION_SERIALIZER_CLASS', 'DEFAULT_FILTER_BACKENDS', 'EXCEPTION_HANDLER', - 'FILTER_BACKEND', 'TEST_REQUEST_RENDERER_CLASSES', 'UNAUTHENTICATED_USER', 'UNAUTHENTICATED_TOKEN', @@ -196,15 +192,9 @@ class APISettings(object): if val and attr in self.import_strings: val = perform_import(val, attr) - self.validate_setting(attr, val) - # Cache the result setattr(self, attr, val) return val - def validate_setting(self, attr, val): - if attr == 'FILTER_BACKEND' and val is not None: - # Make sure we can initialize the class - val() api_settings = APISettings(USER_SETTINGS, DEFAULTS, IMPORT_STRINGS) From 0f8fdf4e72b67ff46474c13c8b532bf319a58099 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 10:57:24 +0100 Subject: [PATCH 0728/1652] Remove `allow_empty`. Closes #1774. --- docs/api-guide/generic-views.md | 2 -- rest_framework/generics.py | 12 +----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index d30b7f9bf..49be0cae8 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -212,8 +212,6 @@ Provides a `.list(request, *args, **kwargs)` method, that implements listing a q If the queryset is populated, this returns a `200 OK` response, with a serialized representation of the queryset as the body of the response. The response data may optionally be paginated. -If the queryset is empty this returns a `200 OK` response, unless the `.allow_empty` attribute on the view is set to `False`, in which case it will return a `404 Not Found`. - ## CreateModelMixin Provides a `.create(request, *args, **kwargs)` method, that implements creating and saving a new model instance. diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 8bacf470b..cb8061b75 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -82,7 +82,6 @@ class GenericAPIView(views.APIView): pk_url_kwarg = 'pk' slug_url_kwarg = 'slug' slug_field = 'slug' - allow_empty = True def get_serializer_context(self): """ @@ -140,16 +139,7 @@ class GenericAPIView(views.APIView): if not page_size: return None - if not self.allow_empty: - warnings.warn( - 'The `allow_empty` parameter is deprecated. ' - 'To use `allow_empty=False` style behavior, You should override ' - '`get_queryset()` and explicitly raise a 404 on empty querysets.', - DeprecationWarning, stacklevel=2 - ) - - paginator = self.paginator_class(queryset, page_size, - allow_empty_first_page=self.allow_empty) + paginator = self.paginator_class(queryset, page_size) page_kwarg = self.kwargs.get(self.page_kwarg) page_query_param = self.request.QUERY_PARAMS.get(self.page_kwarg) page = page_kwarg or page_query_param or 1 From b3bbf416707cf8c71861b0fd6e966a557acef412 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 11:09:35 +0100 Subject: [PATCH 0729/1652] Remove `allow_empty` --- rest_framework/mixins.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 2cc87eef1..dc4c9f353 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -70,24 +70,9 @@ class ListModelMixin(object): """ List a queryset. """ - empty_error = "Empty list and '%(class_name)s.allow_empty' is False." - def list(self, request, *args, **kwargs): self.object_list = self.filter_queryset(self.get_queryset()) - # Default is to allow empty querysets. This can be altered by setting - # `.allow_empty = False`, to raise 404 errors on empty querysets. - if not self.allow_empty and not self.object_list: - warnings.warn( - 'The `allow_empty` parameter is deprecated. ' - 'To use `allow_empty=False` style behavior, You should override ' - '`get_queryset()` and explicitly raise a 404 on empty querysets.', - DeprecationWarning - ) - class_name = self.__class__.__name__ - error_msg = self.empty_error % {'class_name': class_name} - raise Http404(error_msg) - # Switch between paginated or standard style responses page = self.paginate_queryset(self.object_list) if page is not None: From baceb528cb80584285592aa0160b33101cb0ca37 Mon Sep 17 00:00:00 2001 From: Jamie Matthews Date: Fri, 29 Aug 2014 11:11:18 +0100 Subject: [PATCH 0730/1652] Fix typos in 2.4 release notes --- docs/topics/2.4-announcement.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/2.4-announcement.md b/docs/topics/2.4-announcement.md index 5f90319ab..ab11360f2 100644 --- a/docs/topics/2.4-announcement.md +++ b/docs/topics/2.4-announcement.md @@ -17,7 +17,7 @@ The optional authtoken application now includes support for *both* Django 1.7 sc ## Deprecation of `.model` view attribute -The `.model` attribute on view classes is an optional shortcut for either or both of `.serializer_class` and `.queryset`. It's usage results in more implicit, less obvious behavior. +The `.model` attribute on view classes is an optional shortcut for either or both of `.serializer_class` and `.queryset`. Its usage results in more implicit, less obvious behavior. The documentation has previously stated that usage of the more explicit style is prefered, and we're now taking that one step further and deprecating the usage of the `.model` shortcut. @@ -128,7 +128,7 @@ There are also a number of other features and bugfixes as [listed in the release Smarter [client IP identification for throttling][client-ip-identification], with the addition of the `NUM_PROXIES` setting. -Added the standardized `Retry-After` header to throttled responses, as per [RFC 6585](http://tools.ietf.org/html/rfc6585). This should now be used in preference to the custom `X-Trottle-Wait-Seconds` header which will be fully deprecated in 3.0. +Added the standardized `Retry-After` header to throttled responses, as per [RFC 6585](http://tools.ietf.org/html/rfc6585). This should now be used in preference to the custom `X-Throttle-Wait-Seconds` header which will be fully deprecated in 3.0. ## Deprecations From e5e6329a222def3b0745f90fc55ee36de95ada83 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 11:29:26 +0100 Subject: [PATCH 0731/1652] Remove `pk_url_field`, `slug_url_field`, `slug_field`. Closes #1773. --- rest_framework/generics.py | 36 ++--------- rest_framework/mixins.py | 36 +++-------- rest_framework/relations.py | 117 ++---------------------------------- 3 files changed, 15 insertions(+), 174 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index cb8061b75..e21dc5c7b 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -76,13 +76,6 @@ class GenericAPIView(views.APIView): model_serializer_class = api_settings.DEFAULT_MODEL_SERIALIZER_CLASS paginator_class = Paginator - ###################################### - # These are pending deprecation... - - pk_url_kwarg = 'pk' - slug_url_kwarg = 'slug' - slug_field = 'slug' - def get_serializer_context(self): """ Extra context provided to the serializer class. @@ -270,7 +263,7 @@ class GenericAPIView(views.APIView): error_format = "'%s' must define 'queryset' or 'model'" raise ImproperlyConfigured(error_format % self.__class__.__name__) - def get_object(self, queryset=None): + def get_object(self): """ Returns the object the view is displaying. @@ -278,36 +271,14 @@ class GenericAPIView(views.APIView): queryset lookups. Eg if objects are referenced using multiple keyword arguments in the url conf. """ - # Determine the base queryset to use. - if queryset is None: - queryset = self.filter_queryset(self.get_queryset()) - else: - pass # Deprecation warning + queryset = self.filter_queryset(self.get_queryset()) # Perform the lookup filtering. # Note that `pk` and `slug` are deprecated styles of lookup filtering. lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field lookup = self.kwargs.get(lookup_url_kwarg, None) - pk = self.kwargs.get(self.pk_url_kwarg, None) - slug = self.kwargs.get(self.slug_url_kwarg, None) - if lookup is not None: - filter_kwargs = {self.lookup_field: lookup} - elif pk is not None and self.lookup_field == 'pk': - warnings.warn( - 'The `pk_url_kwarg` attribute is deprecated. ' - 'Use the `lookup_field` attribute instead', - DeprecationWarning - ) - filter_kwargs = {'pk': pk} - elif slug is not None and self.lookup_field == 'pk': - warnings.warn( - 'The `slug_url_kwarg` attribute is deprecated. ' - 'Use the `lookup_field` attribute instead', - DeprecationWarning - ) - filter_kwargs = {self.slug_field: slug} - else: + if lookup is None: raise ImproperlyConfigured( 'Expected view %s to be called with a URL keyword argument ' 'named "%s". Fix your URL conf, or set the `.lookup_field` ' @@ -315,6 +286,7 @@ class GenericAPIView(views.APIView): (self.__class__.__name__, self.lookup_field) ) + filter_kwargs = {self.lookup_field: lookup} obj = get_object_or_404(queryset, **filter_kwargs) # May raise a permission denied diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index dc4c9f353..ac59d9795 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -12,10 +12,9 @@ from rest_framework import status from rest_framework.response import Response from rest_framework.request import clone_request from rest_framework.settings import api_settings -import warnings -def _get_validation_exclusions(obj, pk=None, slug_field=None, lookup_field=None): +def _get_validation_exclusions(obj, lookup_field=None): """ Given a model instance, and an optional pk and slug field, return the full list of all other field names on that model. @@ -23,23 +22,13 @@ def _get_validation_exclusions(obj, pk=None, slug_field=None, lookup_field=None) For use when performing full_clean on a model instance, so we only clean the required fields. """ - include = [] - - if pk: - # Deprecated + if lookup_field == 'pk': pk_field = obj._meta.pk while pk_field.rel: pk_field = pk_field.rel.to._meta.pk - include.append(pk_field.name) + lookup_field = pk_field.name - if slug_field: - # Deprecated - include.append(slug_field) - - if lookup_field and lookup_field != 'pk': - include.append(lookup_field) - - return [field.name for field in obj._meta.fields if field.name not in include] + return [field.name for field in obj._meta.fields if field.name != lookup_field] class CreateModelMixin(object): @@ -146,26 +135,15 @@ class UpdateModelMixin(object): """ Set any attributes on the object that are implicit in the request. """ - # pk and/or slug attributes are implicit in the URL. lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field - lookup = self.kwargs.get(lookup_url_kwarg, None) - pk = self.kwargs.get(self.pk_url_kwarg, None) - slug = self.kwargs.get(self.slug_url_kwarg, None) - slug_field = slug and self.slug_field or None + lookup_value = self.kwargs[lookup_url_kwarg] - if lookup: - setattr(obj, self.lookup_field, lookup) - - if pk: - setattr(obj, 'pk', pk) - - if slug: - setattr(obj, slug_field, slug) + setattr(obj, self.lookup_field, lookup_value) # Ensure we clean the attributes so that we don't eg return integer # pk using a string representation, as provided by the url conf kwarg. if hasattr(obj, 'full_clean'): - exclude = _get_validation_exclusions(obj, pk, slug_field, self.lookup_field) + exclude = _get_validation_exclusions(obj, self.lookup_field) obj.full_clean(exclude) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 1acbdce26..56870b408 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -16,7 +16,6 @@ from rest_framework.fields import Field, WritableField, get_component, is_simple from rest_framework.reverse import reverse from rest_framework.compat import urlparse from rest_framework.compat import smart_text -import warnings # Relational fields @@ -320,11 +319,6 @@ class HyperlinkedRelatedField(RelatedField): 'incorrect_type': _('Incorrect type. Expected url string, received %s.'), } - # These are all deprecated - pk_url_kwarg = 'pk' - slug_field = 'slug' - slug_url_kwarg = None # Defaults to same as `slug_field` unless overridden - def __init__(self, *args, **kwargs): try: self.view_name = kwargs.pop('view_name') @@ -334,22 +328,6 @@ class HyperlinkedRelatedField(RelatedField): self.lookup_field = kwargs.pop('lookup_field', self.lookup_field) self.format = kwargs.pop('format', None) - # These are deprecated - if 'pk_url_kwarg' in kwargs: - msg = 'pk_url_kwarg is deprecated. Use lookup_field instead.' - warnings.warn(msg, DeprecationWarning, stacklevel=2) - if 'slug_url_kwarg' in kwargs: - msg = 'slug_url_kwarg is deprecated. Use lookup_field instead.' - warnings.warn(msg, DeprecationWarning, stacklevel=2) - if 'slug_field' in kwargs: - msg = 'slug_field is deprecated. Use lookup_field instead.' - warnings.warn(msg, DeprecationWarning, stacklevel=2) - - self.pk_url_kwarg = kwargs.pop('pk_url_kwarg', self.pk_url_kwarg) - self.slug_field = kwargs.pop('slug_field', self.slug_field) - default_slug_kwarg = self.slug_url_kwarg or self.slug_field - self.slug_url_kwarg = kwargs.pop('slug_url_kwarg', default_slug_kwarg) - super(HyperlinkedRelatedField, self).__init__(*args, **kwargs) def get_url(self, obj, view_name, request, format): @@ -361,39 +339,7 @@ class HyperlinkedRelatedField(RelatedField): """ lookup_field = getattr(obj, self.lookup_field) kwargs = {self.lookup_field: lookup_field} - try: - return reverse(view_name, kwargs=kwargs, request=request, format=format) - except NoReverseMatch: - pass - - if self.pk_url_kwarg != 'pk': - # Only try pk if it has been explicitly set. - # Otherwise, the default `lookup_field = 'pk'` has us covered. - pk = obj.pk - kwargs = {self.pk_url_kwarg: pk} - try: - return reverse(view_name, kwargs=kwargs, request=request, format=format) - except NoReverseMatch: - pass - - slug = getattr(obj, self.slug_field, None) - if slug is not None: - # Only try slug if it corresponds to an attribute on the object. - kwargs = {self.slug_url_kwarg: slug} - try: - ret = reverse(view_name, kwargs=kwargs, request=request, format=format) - if self.slug_field == 'slug' and self.slug_url_kwarg == 'slug': - # If the lookup succeeds using the default slug params, - # then `slug_field` is being used implicitly, and we - # we need to warn about the pending deprecation. - msg = 'Implicit slug field hyperlinked fields are deprecated.' \ - 'You should set `lookup_field=slug` on the HyperlinkedRelatedField.' - warnings.warn(msg, DeprecationWarning, stacklevel=2) - return ret - except NoReverseMatch: - pass - - raise NoReverseMatch() + return reverse(view_name, kwargs=kwargs, request=request, format=format) def get_object(self, queryset, view_name, view_args, view_kwargs): """ @@ -402,19 +348,8 @@ class HyperlinkedRelatedField(RelatedField): Takes the matched URL conf arguments, and the queryset, and should return an object instance, or raise an `ObjectDoesNotExist` exception. """ - lookup = view_kwargs.get(self.lookup_field, None) - pk = view_kwargs.get(self.pk_url_kwarg, None) - slug = view_kwargs.get(self.slug_url_kwarg, None) - - if lookup is not None: - filter_kwargs = {self.lookup_field: lookup} - elif pk is not None: - filter_kwargs = {'pk': pk} - elif slug is not None: - filter_kwargs = {self.slug_field: slug} - else: - raise ObjectDoesNotExist() - + lookup_value = view_kwargs[self.lookup_field] + filter_kwargs = {self.lookup_field: lookup_value} return queryset.get(**filter_kwargs) def to_native(self, obj): @@ -486,11 +421,6 @@ class HyperlinkedIdentityField(Field): lookup_field = 'pk' read_only = True - # These are all deprecated - pk_url_kwarg = 'pk' - slug_field = 'slug' - slug_url_kwarg = None # Defaults to same as `slug_field` unless overridden - def __init__(self, *args, **kwargs): try: self.view_name = kwargs.pop('view_name') @@ -502,22 +432,6 @@ class HyperlinkedIdentityField(Field): lookup_field = kwargs.pop('lookup_field', None) self.lookup_field = lookup_field or self.lookup_field - # These are deprecated - if 'pk_url_kwarg' in kwargs: - msg = 'pk_url_kwarg is deprecated. Use lookup_field instead.' - warnings.warn(msg, DeprecationWarning, stacklevel=2) - if 'slug_url_kwarg' in kwargs: - msg = 'slug_url_kwarg is deprecated. Use lookup_field instead.' - warnings.warn(msg, DeprecationWarning, stacklevel=2) - if 'slug_field' in kwargs: - msg = 'slug_field is deprecated. Use lookup_field instead.' - warnings.warn(msg, DeprecationWarning, stacklevel=2) - - self.slug_field = kwargs.pop('slug_field', self.slug_field) - default_slug_kwarg = self.slug_url_kwarg or self.slug_field - self.pk_url_kwarg = kwargs.pop('pk_url_kwarg', self.pk_url_kwarg) - self.slug_url_kwarg = kwargs.pop('slug_url_kwarg', default_slug_kwarg) - super(HyperlinkedIdentityField, self).__init__(*args, **kwargs) def field_to_native(self, obj, field_name): @@ -569,27 +483,4 @@ class HyperlinkedIdentityField(Field): if lookup_field is None: return None - try: - return reverse(view_name, kwargs=kwargs, request=request, format=format) - except NoReverseMatch: - pass - - if self.pk_url_kwarg != 'pk': - # Only try pk lookup if it has been explicitly set. - # Otherwise, the default `lookup_field = 'pk'` has us covered. - kwargs = {self.pk_url_kwarg: obj.pk} - try: - return reverse(view_name, kwargs=kwargs, request=request, format=format) - except NoReverseMatch: - pass - - slug = getattr(obj, self.slug_field, None) - if slug: - # Only use slug lookup if a slug field exists on the model - kwargs = {self.slug_url_kwarg: slug} - try: - return reverse(view_name, kwargs=kwargs, request=request, format=format) - except NoReverseMatch: - pass - - raise NoReverseMatch() + return reverse(view_name, kwargs=kwargs, request=request, format=format) From b8c8d10a18741b76355ed7035655d0101c1d778a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 11:38:54 +0100 Subject: [PATCH 0732/1652] Remove `page_size` argument. `paginate_queryset` no longer takes an optional `page_size` argument. --- rest_framework/generics.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index e21dc5c7b..09035303f 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -111,26 +111,14 @@ class GenericAPIView(views.APIView): context = self.get_serializer_context() return pagination_serializer_class(instance=page, context=context) - def paginate_queryset(self, queryset, page_size=None): + def paginate_queryset(self, queryset): """ Paginate a queryset if required, either returning a page object, or `None` if pagination is not configured for this view. """ - deprecated_style = False - if page_size is not None: - warnings.warn('The `page_size` parameter to `paginate_queryset()` ' - 'is deprecated. ' - 'Note that the return style of this method is also ' - 'changed, and will simply return a page object ' - 'when called without a `page_size` argument.', - DeprecationWarning, stacklevel=2) - deprecated_style = True - else: - # Determine the required page size. - # If pagination is not configured, simply return None. - page_size = self.get_paginate_by() - if not page_size: - return None + page_size = self.get_paginate_by() + if not page_size: + return None paginator = self.paginator_class(queryset, page_size) page_kwarg = self.kwargs.get(self.page_kwarg) @@ -152,8 +140,6 @@ class GenericAPIView(views.APIView): 'message': str(exc) }) - if deprecated_style: - return (paginator, page, page.object_list, page.has_other_pages()) return page def filter_queryset(self, queryset): From b3253b42836acd123224e88c0927f1ee6a031d94 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 12:35:53 +0100 Subject: [PATCH 0733/1652] Remove `.model` usage in tests. Remove the shortcut `.model` view attribute usage from test cases. --- rest_framework/generics.py | 49 +++++---------------- tests/serializers.py | 7 --- tests/test_filters.py | 65 +++++++++++++++++++--------- tests/test_generics.py | 34 +++++++++++---- tests/test_hyperlinkedserializers.py | 62 ++++++++++++++++++-------- tests/test_nullable_fields.py | 13 +++++- tests/test_pagination.py | 32 ++++++++++---- tests/test_permissions.py | 24 +++++++--- tests/test_response.py | 5 ++- tests/test_validation.py | 4 +- tests/views.py | 8 ---- 11 files changed, 185 insertions(+), 118 deletions(-) delete mode 100644 tests/serializers.py delete mode 100644 tests/views.py diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 09035303f..68222864f 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -51,11 +51,6 @@ class GenericAPIView(views.APIView): queryset = None serializer_class = None - # This shortcut may be used instead of setting either or both - # of the `queryset`/`serializer_class` attributes, although using - # the explicit style is generally preferred. - model = None - # If you want to use object lookups other than pk, set this attribute. # For more complex lookup requirements override `get_object()`. lookup_field = 'pk' @@ -71,9 +66,8 @@ class GenericAPIView(views.APIView): # The filter backend classes to use for queryset filtering filter_backends = api_settings.DEFAULT_FILTER_BACKENDS - # The following attributes may be subject to change, + # The following attribute may be subject to change, # and should be considered private API. - model_serializer_class = api_settings.DEFAULT_MODEL_SERIALIZER_CLASS paginator_class = Paginator def get_serializer_context(self): @@ -199,26 +193,13 @@ class GenericAPIView(views.APIView): (Eg. admins get full serialization, others get basic serialization) """ - serializer_class = self.serializer_class - if serializer_class is not None: - return serializer_class - - warnings.warn( - 'The `.model` attribute on view classes is now deprecated in favor ' - 'of the more explicit `serializer_class` and `queryset` attributes.', - DeprecationWarning, stacklevel=2 + assert self.serializer_class is not None, ( + "'%s' should either include a `serializer_class` attribute, " + "or override the `get_serializer_class()` method." + % self.__class__.__name__ ) - assert self.model is not None, \ - "'%s' should either include a 'serializer_class' attribute, " \ - "or use the 'model' attribute as a shortcut for " \ - "automatically generating a serializer class." \ - % self.__class__.__name__ - - class DefaultSerializer(self.model_serializer_class): - class Meta: - model = self.model - return DefaultSerializer + return self.serializer_class def get_queryset(self): """ @@ -235,19 +216,13 @@ class GenericAPIView(views.APIView): (Eg. return a list of items that is specific to the user) """ - if self.queryset is not None: - return self.queryset._clone() + assert self.queryset is not None, ( + "'%s' should either include a `queryset` attribute, " + "or override the `get_queryset()` method." + % self.__class__.__name__ + ) - if self.model is not None: - warnings.warn( - 'The `.model` attribute on view classes is now deprecated in favor ' - 'of the more explicit `serializer_class` and `queryset` attributes.', - DeprecationWarning, stacklevel=2 - ) - return self.model._default_manager.all() - - error_format = "'%s' must define 'queryset' or 'model'" - raise ImproperlyConfigured(error_format % self.__class__.__name__) + return self.queryset._clone() def get_object(self): """ diff --git a/tests/serializers.py b/tests/serializers.py deleted file mode 100644 index be7b37722..000000000 --- a/tests/serializers.py +++ /dev/null @@ -1,7 +0,0 @@ -from rest_framework import serializers -from tests.models import NullableForeignKeySource - - -class NullableFKSourceSerializer(serializers.ModelSerializer): - class Meta: - model = NullableForeignKeySource diff --git a/tests/test_filters.py b/tests/test_filters.py index 47bffd436..6f24b1abb 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -16,9 +16,14 @@ factory = APIRequestFactory() if django_filters: + class FilterableItemSerializer(serializers.ModelSerializer): + class Meta: + model = FilterableItem + # Basic filter on a list view. class FilterFieldsRootView(generics.ListCreateAPIView): - model = FilterableItem + queryset = FilterableItem.objects.all() + serializer_class = FilterableItemSerializer filter_fields = ['decimal', 'date'] filter_backends = (filters.DjangoFilterBackend,) @@ -33,7 +38,8 @@ if django_filters: fields = ['text', 'decimal', 'date'] class FilterClassRootView(generics.ListCreateAPIView): - model = FilterableItem + queryset = FilterableItem.objects.all() + serializer_class = FilterableItemSerializer filter_class = SeveralFieldsFilter filter_backends = (filters.DjangoFilterBackend,) @@ -46,12 +52,14 @@ if django_filters: fields = ['text'] class IncorrectlyConfiguredRootView(generics.ListCreateAPIView): - model = FilterableItem + queryset = FilterableItem.objects.all() + serializer_class = FilterableItemSerializer filter_class = MisconfiguredFilter filter_backends = (filters.DjangoFilterBackend,) class FilterClassDetailView(generics.RetrieveAPIView): - model = FilterableItem + queryset = FilterableItem.objects.all() + serializer_class = FilterableItemSerializer filter_class = SeveralFieldsFilter filter_backends = (filters.DjangoFilterBackend,) @@ -63,15 +71,12 @@ if django_filters: model = BaseFilterableItem class BaseFilterableItemFilterRootView(generics.ListCreateAPIView): - model = FilterableItem + queryset = FilterableItem.objects.all() + serializer_class = FilterableItemSerializer filter_class = BaseFilterableItemFilter filter_backends = (filters.DjangoFilterBackend,) # Regression test for #814 - class FilterableItemSerializer(serializers.ModelSerializer): - class Meta: - model = FilterableItem - class FilterFieldsQuerysetView(generics.ListCreateAPIView): queryset = FilterableItem.objects.all() serializer_class = FilterableItemSerializer @@ -323,6 +328,11 @@ class SearchFilterModel(models.Model): text = models.CharField(max_length=100) +class SearchFilterSerializer(serializers.ModelSerializer): + class Meta: + model = SearchFilterModel + + class SearchFilterTests(TestCase): def setUp(self): # Sequence of title/text is: @@ -342,7 +352,8 @@ class SearchFilterTests(TestCase): def test_search(self): class SearchListView(generics.ListAPIView): - model = SearchFilterModel + queryset = SearchFilterModel.objects.all() + serializer_class = SearchFilterSerializer filter_backends = (filters.SearchFilter,) search_fields = ('title', 'text') @@ -359,7 +370,8 @@ class SearchFilterTests(TestCase): def test_exact_search(self): class SearchListView(generics.ListAPIView): - model = SearchFilterModel + queryset = SearchFilterModel.objects.all() + serializer_class = SearchFilterSerializer filter_backends = (filters.SearchFilter,) search_fields = ('=title', 'text') @@ -375,7 +387,8 @@ class SearchFilterTests(TestCase): def test_startswith_search(self): class SearchListView(generics.ListAPIView): - model = SearchFilterModel + queryset = SearchFilterModel.objects.all() + serializer_class = SearchFilterSerializer filter_backends = (filters.SearchFilter,) search_fields = ('title', '^text') @@ -392,7 +405,8 @@ class SearchFilterTests(TestCase): def test_search_with_nonstandard_search_param(self): with temporary_setting('SEARCH_PARAM', 'query', module=filters): class SearchListView(generics.ListAPIView): - model = SearchFilterModel + queryset = SearchFilterModel.objects.all() + serializer_class = SearchFilterSerializer filter_backends = (filters.SearchFilter,) search_fields = ('title', 'text') @@ -418,6 +432,11 @@ class OrderingFilterRelatedModel(models.Model): related_name="relateds") +class OrderingFilterSerializer(serializers.ModelSerializer): + class Meta: + model = OrdringFilterModel + + class OrderingFilterTests(TestCase): def setUp(self): # Sequence of title/text is: @@ -440,7 +459,8 @@ class OrderingFilterTests(TestCase): def test_ordering(self): class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + queryset = OrdringFilterModel.objects.all() + serializer_class = OrderingFilterSerializer filter_backends = (filters.OrderingFilter,) ordering = ('title',) ordering_fields = ('text',) @@ -459,7 +479,8 @@ class OrderingFilterTests(TestCase): def test_reverse_ordering(self): class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + queryset = OrdringFilterModel.objects.all() + serializer_class = OrderingFilterSerializer filter_backends = (filters.OrderingFilter,) ordering = ('title',) ordering_fields = ('text',) @@ -478,7 +499,8 @@ class OrderingFilterTests(TestCase): def test_incorrectfield_ordering(self): class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + queryset = OrdringFilterModel.objects.all() + serializer_class = OrderingFilterSerializer filter_backends = (filters.OrderingFilter,) ordering = ('title',) ordering_fields = ('text',) @@ -497,7 +519,8 @@ class OrderingFilterTests(TestCase): def test_default_ordering(self): class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + queryset = OrdringFilterModel.objects.all() + serializer_class = OrderingFilterSerializer filter_backends = (filters.OrderingFilter,) ordering = ('title',) oredering_fields = ('text',) @@ -516,7 +539,8 @@ class OrderingFilterTests(TestCase): def test_default_ordering_using_string(self): class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + queryset = OrdringFilterModel.objects.all() + serializer_class = OrderingFilterSerializer filter_backends = (filters.OrderingFilter,) ordering = 'title' ordering_fields = ('text',) @@ -545,7 +569,7 @@ class OrderingFilterTests(TestCase): new_related.save() class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + serializer_class = OrderingFilterSerializer filter_backends = (filters.OrderingFilter,) ordering = 'title' ordering_fields = '__all__' @@ -567,7 +591,8 @@ class OrderingFilterTests(TestCase): def test_ordering_with_nonstandard_ordering_param(self): with temporary_setting('ORDERING_PARAM', 'order', filters): class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + queryset = OrdringFilterModel.objects.all() + serializer_class = OrderingFilterSerializer filter_backends = (filters.OrderingFilter,) ordering = ('title',) ordering_fields = ('text',) diff --git a/tests/test_generics.py b/tests/test_generics.py index e9f5bebdd..f50d53e99 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -11,18 +11,30 @@ from tests.models import ForeignKeySource, ForeignKeyTarget factory = APIRequestFactory() +class BasicSerializer(serializers.ModelSerializer): + class Meta: + model = BasicModel + + +class ForeignKeySerializer(serializers.ModelSerializer): + class Meta: + model = ForeignKeySource + + class RootView(generics.ListCreateAPIView): """ Example description for OPTIONS. """ - model = BasicModel + queryset = BasicModel.objects.all() + serializer_class = BasicSerializer class InstanceView(generics.RetrieveUpdateDestroyAPIView): """ Example description for OPTIONS. """ - model = BasicModel + queryset = BasicModel.objects.all() + serializer_class = BasicSerializer def get_queryset(self): queryset = super(InstanceView, self).get_queryset() @@ -33,7 +45,8 @@ class FKInstanceView(generics.RetrieveUpdateDestroyAPIView): """ FK: example description for OPTIONS. """ - model = ForeignKeySource + queryset = ForeignKeySource.objects.all() + serializer_class = ForeignKeySerializer class SlugSerializer(serializers.ModelSerializer): @@ -48,7 +61,7 @@ class SlugBasedInstanceView(InstanceView): """ A model with a slug-field. """ - model = SlugBasedModel + queryset = SlugBasedModel.objects.all() serializer_class = SlugSerializer lookup_field = 'slug' @@ -503,7 +516,7 @@ class TestOverriddenGetObject(TestCase): """ Example detail view for override of get_object(). """ - model = BasicModel + serializer_class = BasicSerializer def get_object(self): pk = int(self.kwargs['pk']) @@ -573,7 +586,7 @@ class ClassASerializer(serializers.ModelSerializer): class ExampleView(generics.ListCreateAPIView): serializer_class = ClassASerializer - model = ClassA + queryset = ClassA.objects.all() class TestM2MBrowseableAPI(TestCase): @@ -603,7 +616,7 @@ class TwoFieldModel(models.Model): class DynamicSerializerView(generics.ListCreateAPIView): - model = TwoFieldModel + queryset = TwoFieldModel.objects.all() renderer_classes = (renderers.BrowsableAPIRenderer, renderers.JSONRenderer) def get_serializer_class(self): @@ -612,8 +625,11 @@ class DynamicSerializerView(generics.ListCreateAPIView): class Meta: model = TwoFieldModel fields = ('field_b',) - return DynamicSerializer - return super(DynamicSerializerView, self).get_serializer_class() + else: + class DynamicSerializer(serializers.ModelSerializer): + class Meta: + model = TwoFieldModel + return DynamicSerializer class TestFilterBackendAppliedToViews(TestCase): diff --git a/tests/test_hyperlinkedserializers.py b/tests/test_hyperlinkedserializers.py index d45485391..0e8c1ed46 100644 --- a/tests/test_hyperlinkedserializers.py +++ b/tests/test_hyperlinkedserializers.py @@ -39,59 +39,85 @@ class AlbumSerializer(serializers.ModelSerializer): fields = ('title', 'url') +class BasicSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = BasicModel + + +class AnchorSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = Anchor + + +class ManyToManySerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = ManyToManyModel + + +class BlogPostSerializer(serializers.ModelSerializer): + class Meta: + model = BlogPost + + +class OptionalRelationSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = OptionalRelationModel + + class BasicList(generics.ListCreateAPIView): - model = BasicModel - model_serializer_class = serializers.HyperlinkedModelSerializer + queryset = BasicModel.objects.all() + serializer_class = BasicSerializer class BasicDetail(generics.RetrieveUpdateDestroyAPIView): - model = BasicModel - model_serializer_class = serializers.HyperlinkedModelSerializer + queryset = BasicModel.objects.all() + serializer_class = BasicSerializer class AnchorDetail(generics.RetrieveAPIView): - model = Anchor - model_serializer_class = serializers.HyperlinkedModelSerializer + queryset = Anchor.objects.all() + serializer_class = AnchorSerializer class ManyToManyList(generics.ListAPIView): - model = ManyToManyModel - model_serializer_class = serializers.HyperlinkedModelSerializer + queryset = ManyToManyModel.objects.all() + serializer_class = ManyToManySerializer class ManyToManyDetail(generics.RetrieveAPIView): - model = ManyToManyModel - model_serializer_class = serializers.HyperlinkedModelSerializer + queryset = ManyToManyModel.objects.all() + serializer_class = ManyToManySerializer class BlogPostCommentListCreate(generics.ListCreateAPIView): - model = BlogPostComment + queryset = BlogPostComment.objects.all() serializer_class = BlogPostCommentSerializer class BlogPostCommentDetail(generics.RetrieveAPIView): - model = BlogPostComment + queryset = BlogPostComment.objects.all() serializer_class = BlogPostCommentSerializer class BlogPostDetail(generics.RetrieveAPIView): - model = BlogPost + queryset = BlogPost.objects.all() + serializer_class = BlogPostSerializer class PhotoListCreate(generics.ListCreateAPIView): - model = Photo - model_serializer_class = PhotoSerializer + queryset = Photo.objects.all() + serializer_class = PhotoSerializer class AlbumDetail(generics.RetrieveAPIView): - model = Album + queryset = Album.objects.all() serializer_class = AlbumSerializer lookup_field = 'title' class OptionalRelationDetail(generics.RetrieveUpdateDestroyAPIView): - model = OptionalRelationModel - model_serializer_class = serializers.HyperlinkedModelSerializer + queryset = OptionalRelationModel.objects.all() + serializer_class = OptionalRelationSerializer urlpatterns = patterns( diff --git a/tests/test_nullable_fields.py b/tests/test_nullable_fields.py index 0c133fc2c..8d0c84bb0 100644 --- a/tests/test_nullable_fields.py +++ b/tests/test_nullable_fields.py @@ -1,10 +1,19 @@ from django.core.urlresolvers import reverse from django.conf.urls import patterns, url +from rest_framework import serializers, generics from rest_framework.test import APITestCase from tests.models import NullableForeignKeySource -from tests.serializers import NullableFKSourceSerializer -from tests.views import NullableFKSourceDetail + + +class NullableFKSourceSerializer(serializers.ModelSerializer): + class Meta: + model = NullableForeignKeySource + + +class NullableFKSourceDetail(generics.RetrieveUpdateDestroyAPIView): + queryset = NullableForeignKeySource.objects.all() + serializer_class = NullableFKSourceSerializer urlpatterns = patterns( diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 80c33e2eb..8f9e0005e 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -4,7 +4,7 @@ from decimal import Decimal from django.core.paginator import Paginator from django.test import TestCase from django.utils import unittest -from rest_framework import generics, status, pagination, filters, serializers +from rest_framework import generics, serializers, status, pagination, filters from rest_framework.compat import django_filters from rest_framework.test import APIRequestFactory from .models import BasicModel, FilterableItem @@ -22,11 +22,22 @@ def split_arguments_from_url(url): return path, args +class BasicSerializer(serializers.ModelSerializer): + class Meta: + model = BasicModel + + +class FilterableItemSerializer(serializers.ModelSerializer): + class Meta: + model = FilterableItem + + class RootView(generics.ListCreateAPIView): """ Example description for OPTIONS. """ - model = BasicModel + queryset = BasicModel.objects.all() + serializer_class = BasicSerializer paginate_by = 10 @@ -34,14 +45,16 @@ class DefaultPageSizeKwargView(generics.ListAPIView): """ View for testing default paginate_by_param usage """ - model = BasicModel + queryset = BasicModel.objects.all() + serializer_class = BasicSerializer class PaginateByParamView(generics.ListAPIView): """ View for testing custom paginate_by_param usage """ - model = BasicModel + queryset = BasicModel.objects.all() + serializer_class = BasicSerializer paginate_by_param = 'page_size' @@ -49,7 +62,8 @@ class MaxPaginateByView(generics.ListAPIView): """ View for testing custom max_paginate_by usage """ - model = BasicModel + queryset = BasicModel.objects.all() + serializer_class = BasicSerializer paginate_by = 3 max_paginate_by = 5 paginate_by_param = 'page_size' @@ -140,7 +154,8 @@ class IntegrationTestPaginationAndFiltering(TestCase): fields = ['text', 'decimal', 'date'] class FilterFieldsRootView(generics.ListCreateAPIView): - model = FilterableItem + queryset = FilterableItem.objects.all() + serializer_class = FilterableItemSerializer paginate_by = 10 filter_class = DecimalFilter filter_backends = (filters.DjangoFilterBackend,) @@ -188,7 +203,8 @@ class IntegrationTestPaginationAndFiltering(TestCase): return queryset.filter(decimal__lt=Decimal(request.GET['decimal'])) class BasicFilterFieldsRootView(generics.ListCreateAPIView): - model = FilterableItem + queryset = FilterableItem.objects.all() + serializer_class = FilterableItemSerializer paginate_by = 10 filter_backends = (DecimalFilterBackend,) @@ -387,7 +403,7 @@ class TestContextPassedToCustomField(TestCase): def test_with_pagination(self): class ListView(generics.ListCreateAPIView): - model = BasicModel + queryset = BasicModel.objects.all() serializer_class = BasicModelSerializer paginate_by = 1 diff --git a/tests/test_permissions.py b/tests/test_permissions.py index 93f8020f3..b90ba4f19 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -3,7 +3,7 @@ from django.contrib.auth.models import User, Permission, Group from django.db import models from django.test import TestCase from django.utils import unittest -from rest_framework import generics, status, permissions, authentication, HTTP_HEADER_ENCODING +from rest_framework import generics, serializers, status, permissions, authentication, HTTP_HEADER_ENCODING from rest_framework.compat import guardian, get_model_name from rest_framework.filters import DjangoObjectPermissionsFilter from rest_framework.test import APIRequestFactory @@ -13,14 +13,21 @@ import base64 factory = APIRequestFactory() +class BasicSerializer(serializers.ModelSerializer): + class Meta: + model = BasicModel + + class RootView(generics.ListCreateAPIView): - model = BasicModel + queryset = BasicModel.objects.all() + serializer_class = BasicSerializer authentication_classes = [authentication.BasicAuthentication] permission_classes = [permissions.DjangoModelPermissions] class InstanceView(generics.RetrieveUpdateDestroyAPIView): - model = BasicModel + queryset = BasicModel.objects.all() + serializer_class = BasicSerializer authentication_classes = [authentication.BasicAuthentication] permission_classes = [permissions.DjangoModelPermissions] @@ -167,6 +174,11 @@ class BasicPermModel(models.Model): ) +class BasicPermSerializer(serializers.ModelSerializer): + class Meta: + model = BasicPermModel + + # Custom object-level permission, that includes 'view' permissions class ViewObjectPermissions(permissions.DjangoObjectPermissions): perms_map = { @@ -181,7 +193,8 @@ class ViewObjectPermissions(permissions.DjangoObjectPermissions): class ObjectPermissionInstanceView(generics.RetrieveUpdateDestroyAPIView): - model = BasicPermModel + queryset = BasicPermModel.objects.all() + serializer_class = BasicPermSerializer authentication_classes = [authentication.BasicAuthentication] permission_classes = [ViewObjectPermissions] @@ -189,7 +202,8 @@ object_permissions_view = ObjectPermissionInstanceView.as_view() class ObjectPermissionListView(generics.ListAPIView): - model = BasicPermModel + queryset = BasicPermModel.objects.all() + serializer_class = BasicPermSerializer authentication_classes = [authentication.BasicAuthentication] permission_classes = [ViewObjectPermissions] diff --git a/tests/test_response.py b/tests/test_response.py index 2eff83d3d..004c565c9 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -86,14 +86,15 @@ class HTMLView1(APIView): class HTMLNewModelViewSet(viewsets.ModelViewSet): - model = BasicModel + serializer_class = BasicModelSerializer + queryset = BasicModel.objects.all() class HTMLNewModelView(generics.ListCreateAPIView): renderer_classes = (BrowsableAPIRenderer,) permission_classes = [] serializer_class = BasicModelSerializer - model = BasicModel + queryset = BasicModel.objects.all() new_model_viewset_router = routers.DefaultRouter() diff --git a/tests/test_validation.py b/tests/test_validation.py index e13e4078c..f62d9068b 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -22,7 +22,7 @@ class ValidationModelSerializer(serializers.ModelSerializer): class UpdateValidationModel(generics.RetrieveUpdateDestroyAPIView): - model = ValidationModel + queryset = ValidationModel.objects.all() serializer_class = ValidationModelSerializer @@ -117,7 +117,7 @@ class ValidationMaxValueValidatorModelSerializer(serializers.ModelSerializer): class UpdateMaxValueValidationModel(generics.RetrieveUpdateDestroyAPIView): - model = ValidationMaxValueValidatorModel + queryset = ValidationMaxValueValidatorModel.objects.all() serializer_class = ValidationMaxValueValidatorModelSerializer diff --git a/tests/views.py b/tests/views.py deleted file mode 100644 index 55935e924..000000000 --- a/tests/views.py +++ /dev/null @@ -1,8 +0,0 @@ -from rest_framework import generics -from .models import NullableForeignKeySource -from .serializers import NullableFKSourceSerializer - - -class NullableFKSourceDetail(generics.RetrieveUpdateDestroyAPIView): - model = NullableForeignKeySource - model_serializer_class = NullableFKSourceSerializer From 72c0811576feb89decf6fc6dc4ee5e25eca0aece Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 12:48:04 +0100 Subject: [PATCH 0734/1652] Minor tidy up. --- rest_framework/generics.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 68222864f..d0adeaec0 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -3,7 +3,7 @@ Generic views that provide commonly needed behaviour. """ from __future__ import unicode_literals -from django.core.exceptions import ImproperlyConfigured, PermissionDenied +from django.core.exceptions import PermissionDenied from django.core.paginator import Paginator, InvalidPage from django.http import Http404 from django.shortcuts import get_object_or_404 as _get_object_or_404 @@ -235,19 +235,16 @@ class GenericAPIView(views.APIView): queryset = self.filter_queryset(self.get_queryset()) # Perform the lookup filtering. - # Note that `pk` and `slug` are deprecated styles of lookup filtering. lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field - lookup = self.kwargs.get(lookup_url_kwarg, None) - if lookup is None: - raise ImproperlyConfigured( - 'Expected view %s to be called with a URL keyword argument ' - 'named "%s". Fix your URL conf, or set the `.lookup_field` ' - 'attribute on the view correctly.' % - (self.__class__.__name__, self.lookup_field) - ) + assert lookup_url_kwarg in self.kwargs, ( + 'Expected view %s to be called with a URL keyword argument ' + 'named "%s". Fix your URL conf, or set the `.lookup_field` ' + 'attribute on the view correctly.' % + (self.__class__.__name__, lookup_url_kwarg) + ) - filter_kwargs = {self.lookup_field: lookup} + filter_kwargs = {self.lookup_field: self.kwargs[lookup_url_kwarg]} obj = get_object_or_404(queryset, **filter_kwargs) # May raise a permission denied From ce7b2cded94abc12ae1be076642de96684d0927b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 12:48:49 +0100 Subject: [PATCH 0735/1652] Remove deprecated generic views. `MultipleObjectAPIView` and `SingleObjectAPIView` are no longer required. --- rest_framework/generics.py | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index d0adeaec0..e6cbfca90 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -442,25 +442,3 @@ class RetrieveUpdateDestroyAPIView(mixins.RetrieveModelMixin, def delete(self, request, *args, **kwargs): return self.destroy(request, *args, **kwargs) - - -# Deprecated classes - -class MultipleObjectAPIView(GenericAPIView): - def __init__(self, *args, **kwargs): - warnings.warn( - 'Subclassing `MultipleObjectAPIView` is deprecated. ' - 'You should simply subclass `GenericAPIView` instead.', - DeprecationWarning, stacklevel=2 - ) - super(MultipleObjectAPIView, self).__init__(*args, **kwargs) - - -class SingleObjectAPIView(GenericAPIView): - def __init__(self, *args, **kwargs): - warnings.warn( - 'Subclassing `SingleObjectAPIView` is deprecated. ' - 'You should simply subclass `GenericAPIView` instead.', - DeprecationWarning, stacklevel=2 - ) - super(SingleObjectAPIView, self).__init__(*args, **kwargs) From f87d32558eb3b36f14a798ec48e4943d25380b92 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 12:53:45 +0100 Subject: [PATCH 0736/1652] Remove `.link()` and `.action()` decorators. --- rest_framework/decorators.py | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index 449ba0a29..cc5d92c2e 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -130,37 +130,3 @@ def list_route(methods=['get'], **kwargs): func.kwargs = kwargs return func return decorator - - -# These are now pending deprecation, in favor of `detail_route` and `list_route`. - -def link(**kwargs): - """ - Used to mark a method on a ViewSet that should be routed for detail GET requests. - """ - msg = 'link is pending deprecation. Use detail_route instead.' - warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) - - def decorator(func): - func.bind_to_methods = ['get'] - func.detail = True - func.kwargs = kwargs - return func - - return decorator - - -def action(methods=['post'], **kwargs): - """ - Used to mark a method on a ViewSet that should be routed for detail POST requests. - """ - msg = 'action is pending deprecation. Use detail_route instead.' - warnings.warn(msg, PendingDeprecationWarning, stacklevel=2) - - def decorator(func): - func.bind_to_methods = methods - func.detail = True - func.kwargs = kwargs - return func - - return decorator From b552b62540e5144272c9c13c28f120ffe5fcbe45 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 12:54:03 +0100 Subject: [PATCH 0737/1652] `get_paginate_by` no longer takes optional `.queryset` --- rest_framework/generics.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index e6cbfca90..40c498440 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -158,7 +158,7 @@ class GenericAPIView(views.APIView): # The following methods provide default implementations # that you may want to override for more complex cases. - def get_paginate_by(self, queryset=None): + def get_paginate_by(self): """ Return the size of pages to use with pagination. @@ -167,11 +167,6 @@ class GenericAPIView(views.APIView): Otherwise defaults to using `self.paginate_by`. """ - if queryset is not None: - warnings.warn('The `queryset` parameter to `get_paginate_by()` ' - 'is deprecated.', - DeprecationWarning, stacklevel=2) - if self.paginate_by_param: try: return strict_positive_int( From 371d30aa8737c4b3aaf28ee10cc2b77a9c4d1fd9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 12:54:52 +0100 Subject: [PATCH 0738/1652] Remove unused imports. --- rest_framework/decorators.py | 1 - rest_framework/generics.py | 1 - 2 files changed, 2 deletions(-) diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index cc5d92c2e..d28d6e22a 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -10,7 +10,6 @@ from __future__ import unicode_literals from django.utils import six from rest_framework.views import APIView import types -import warnings def api_view(http_method_names): diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 40c498440..b3bd6ce92 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -11,7 +11,6 @@ from django.utils.translation import ugettext as _ from rest_framework import views, mixins, exceptions from rest_framework.request import clone_request from rest_framework.settings import api_settings -import warnings def strict_positive_int(integer_string, cutoff=None): From 5490fc2700e4ca459583a3a00f253c1d85a7a189 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 13:29:51 +0100 Subject: [PATCH 0739/1652] Fix links in 2.4 release --- docs/topics/2.4-announcement.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/topics/2.4-announcement.md b/docs/topics/2.4-announcement.md index ab11360f2..09294b910 100644 --- a/docs/topics/2.4-announcement.md +++ b/docs/topics/2.4-announcement.md @@ -163,10 +163,10 @@ The next planned release will be 3.0, featuring an improved and simplified seria Once again, many thanks to all the generous [backers and sponsors][kickstarter-sponsors] who've helped make this possible! [lts-releases]: https://docs.djangoproject.com/en/dev/internals/release-process/#long-term-support-lts-releases -[2-4-release-notes]: ./topics/release-notes/#240 +[2-4-release-notes]: release-notes#240 [view-name-and-description-settings]: ../api-guide/settings/#view-names-and-descriptions [client-ip-identification]: ../api-guide/throttling/#how-clients-are-identified -[2-3-announcement]: ./topics/2.3-announcement +[2-3-announcement]: 2.3-announcement [github-labels]: https://github.com/tomchristie/django-rest-framework/issues [github-milestones]: https://github.com/tomchristie/django-rest-framework/milestones -[kickstarter-sponsors]: ./topics/kickstarter-announcement/#sponsors +[kickstarter-sponsors]: kickstarter-announcement#sponsors From efaa37376ca0bb6f2442b633665ff8d3264e89d6 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 14:01:54 +0100 Subject: [PATCH 0740/1652] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d33177399..63513f758 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Startup up a new project like so... pip install django pip install djangorestframework - django-admin startproject example . + django-admin.py startproject example . ./manage.py syncdb Now edit the `example/urls.py` module in your project: From 4ac4676a40b121d27cfd1173ff548d96b8d3de2f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 29 Aug 2014 16:46:26 +0100 Subject: [PATCH 0741/1652] First pass --- rest_framework/fields.py | 1226 ++++++------------------------ rest_framework/generics.py | 10 +- rest_framework/mixins.py | 24 +- rest_framework/pagination.py | 22 +- rest_framework/relations.py | 486 ------------ rest_framework/renderers.py | 10 +- rest_framework/serializers.py | 1200 +++++++++-------------------- rest_framework/utils/encoders.py | 18 +- rest_framework/utils/html.py | 86 +++ 9 files changed, 714 insertions(+), 2368 deletions(-) create mode 100644 rest_framework/utils/html.py diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 9d707c9b5..a83bf94c4 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1,1038 +1,308 @@ -""" -Serializer fields perform validation on incoming data. - -They are very similar to Django's form fields. -""" -from __future__ import unicode_literals - -import copy -import datetime -import inspect -import re -import warnings -from decimal import Decimal, DecimalException -from django import forms -from django.core import validators -from django.core.exceptions import ValidationError -from django.conf import settings -from django.db.models.fields import BLANK_CHOICE_DASH -from django.http import QueryDict -from django.forms import widgets -from django.utils import six, timezone -from django.utils.encoding import is_protected_type -from django.utils.translation import ugettext_lazy as _ -from django.utils.datastructures import SortedDict -from django.utils.dateparse import parse_date, parse_datetime, parse_time -from rest_framework import ISO_8601 -from rest_framework.compat import ( - BytesIO, smart_text, - force_text, is_non_str_iterable -) -from rest_framework.settings import api_settings +from rest_framework.utils import html -def is_simple_callable(obj): +class empty: """ - True if the object is a callable that takes no arguments. + This class is used to represent no data being provided for a given input + or output value. + + It is required because `None` may be a valid input or output value. """ - function = inspect.isfunction(obj) - method = inspect.ismethod(obj) - - if not (function or method): - return False - - args, _, _, defaults = inspect.getargspec(obj) - len_args = len(args) if function else len(args) - 1 - len_defaults = len(defaults) if defaults else 0 - return len_args <= len_defaults + pass -def get_component(obj, attr_name): +def get_attribute(instance, attrs): """ - Given an object, and an attribute name, - return that attribute on the object. + Similar to Python's built in `getattr(instance, attr)`, + but takes a list of nested attributes, instead of a single attribute. """ - if isinstance(obj, dict): - val = obj.get(attr_name) - else: - val = getattr(obj, attr_name) - - if is_simple_callable(val): - return val() - return val + for attr in attrs: + instance = getattr(instance, attr) + return instance -def readable_datetime_formats(formats): - format = ', '.join(formats).replace( - ISO_8601, - 'YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]' - ) - return humanize_strptime(format) - - -def readable_date_formats(formats): - format = ', '.join(formats).replace(ISO_8601, 'YYYY[-MM[-DD]]') - return humanize_strptime(format) - - -def readable_time_formats(formats): - format = ', '.join(formats).replace(ISO_8601, 'hh:mm[:ss[.uuuuuu]]') - return humanize_strptime(format) - - -def humanize_strptime(format_string): - # Note that we're missing some of the locale specific mappings that - # don't really make sense. - mapping = { - "%Y": "YYYY", - "%y": "YY", - "%m": "MM", - "%b": "[Jan-Dec]", - "%B": "[January-December]", - "%d": "DD", - "%H": "hh", - "%I": "hh", # Requires '%p' to differentiate from '%H'. - "%M": "mm", - "%S": "ss", - "%f": "uuuuuu", - "%a": "[Mon-Sun]", - "%A": "[Monday-Sunday]", - "%p": "[AM|PM]", - "%z": "[+HHMM|-HHMM]" - } - for key, val in mapping.items(): - format_string = format_string.replace(key, val) - return format_string - - -def strip_multiple_choice_msg(help_text): +def set_value(dictionary, keys, value): """ - Remove the 'Hold down "control" ...' message that is Django enforces in - select multiple fields on ModelForms. (Required for 1.5 and earlier) + Similar to Python's built in `dictionary[key] = value`, + but takes a list of nested keys instead of a single key. - See https://code.djangoproject.com/ticket/9321 + set_value({'a': 1}, [], {'b': 2}) -> {'a': 1, 'b': 2} + set_value({'a': 1}, ['x'], 2) -> {'a': 1, 'x': 2} + set_value({'a': 1}, ['x', 'y'], 2) -> {'a': 1, 'x': {'y': 2}} """ - multiple_choice_msg = _(' Hold down "Control", or "Command" on a Mac, to select more than one.') - multiple_choice_msg = force_text(multiple_choice_msg) + if not keys: + dictionary.update(value) + return - return help_text.replace(multiple_choice_msg, '') + for key in keys[:-1]: + if key not in dictionary: + dictionary[key] = {} + dictionary = dictionary[key] + + dictionary[keys[-1]] = value + + +class ValidationError(Exception): + pass + + +class SkipField(Exception): + pass class Field(object): - read_only = True - creation_counter = 0 - empty = '' - type_name = None - partial = False - use_files = False - form_field_class = forms.CharField - type_label = 'field' - widget = None + _creation_counter = 0 - def __init__(self, source=None, label=None, help_text=None): - self.parent = None - - self.creation_counter = Field.creation_counter - Field.creation_counter += 1 - - self.source = source - - if label is not None: - self.label = smart_text(label) - else: - self.label = None - - if help_text is not None: - self.help_text = strip_multiple_choice_msg(smart_text(help_text)) - else: - self.help_text = None - - self._errors = [] - self._value = None - self._name = None - - @property - def errors(self): - return self._errors - - def widget_html(self): - if not self.widget: - return '' - - attrs = {} - if 'id' not in self.widget.attrs: - attrs['id'] = self._name - - return self.widget.render(self._name, self._value, attrs=attrs) - - def label_tag(self): - return '' % (self._name, self.label) - - def initialize(self, parent, field_name): - """ - Called to set up a field prior to field_to_native or field_from_native. - - parent - The parent serializer. - field_name - The name of the field being initialized. - """ - self.parent = parent - self.root = parent.root or parent - self.context = self.root.context - self.partial = self.root.partial - if self.partial: - self.required = False - - def field_from_native(self, data, files, field_name, into): - """ - Given a dictionary and a field name, updates the dictionary `into`, - with the field and it's deserialized value. - """ - return - - def field_to_native(self, obj, field_name): - """ - Given an object and a field name, returns the value that should be - serialized for that field. - """ - if obj is None: - return self.empty - - if self.source == '*': - return self.to_native(obj) - - source = self.source or field_name - value = obj - - for component in source.split('.'): - value = get_component(value, component) - if value is None: - break - - return self.to_native(value) - - def to_native(self, value): - """ - Converts the field's value into it's simple representation. - """ - if is_simple_callable(value): - value = value() - - if is_protected_type(value): - return value - elif (is_non_str_iterable(value) and - not isinstance(value, (dict, six.string_types))): - return [self.to_native(item) for item in value] - elif isinstance(value, dict): - # Make sure we preserve field ordering, if it exists - ret = SortedDict() - for key, val in value.items(): - ret[key] = self.to_native(val) - return ret - return force_text(value) - - def attributes(self): - """ - Returns a dictionary of attributes to be used when serializing to xml. - """ - if self.type_name: - return {'type': self.type_name} - return {} - - def metadata(self): - metadata = SortedDict() - metadata['type'] = self.type_label - metadata['required'] = getattr(self, 'required', False) - optional_attrs = ['read_only', 'label', 'help_text', - 'min_length', 'max_length'] - for attr in optional_attrs: - value = getattr(self, attr, None) - if value is not None and value != '': - metadata[attr] = force_text(value, strings_only=True) - return metadata - - -class WritableField(Field): - """ - Base for read/write fields. - """ - write_only = False - default_validators = [] - default_error_messages = { - 'required': _('This field is required.'), - 'invalid': _('Invalid value.'), + MESSAGES = { + 'required': 'This field is required.' } - widget = widgets.TextInput - default = None - def __init__(self, source=None, label=None, help_text=None, - read_only=False, write_only=False, required=None, - validators=[], error_messages=None, widget=None, - default=None, blank=None): + _NOT_READ_ONLY_WRITE_ONLY = 'May not set both `read_only` and `write_only`' + _NOT_READ_ONLY_REQUIRED = 'May not set both `read_only` and `required`' + _NOT_READ_ONLY_DEFAULT = 'May not set both `read_only` and `default`' + _NOT_REQUIRED_DEFAULT = 'May not set both `required` and `default`' + _MISSING_ERROR_MESSAGE = ( + 'ValidationError raised by `{class_name}`, but error key `{key}` does ' + 'not exist in the `MESSAGES` dictionary.' + ) - super(WritableField, self).__init__(source=source, label=label, help_text=help_text) + def __init__(self, read_only=False, write_only=False, + required=None, default=empty, initial=None, source=None, + label=None, style=None): + self._creation_counter = Field._creation_counter + Field._creation_counter += 1 + + # If `required` is unset, then use `True` unless a default is provided. + if required is None: + required = default is empty and not read_only + + # Some combinations of keyword arguments do not make sense. + assert not (read_only and write_only), self._NOT_READ_ONLY_WRITE_ONLY + assert not (read_only and required), self._NOT_READ_ONLY_REQUIRED + assert not (read_only and default is not empty), self._NOT_READ_ONLY_DEFAULT + assert not (required and default is not empty), self._NOT_REQUIRED_DEFAULT self.read_only = read_only self.write_only = write_only + self.required = required + self.default = default + self.source = source + self.initial = initial + self.label = label + self.style = {} if style is None else style - assert not (read_only and write_only), "Cannot set read_only=True and write_only=True" + def bind(self, field_name, parent, root): + """ + Setup the context for the field instance. + """ + self.field_name = field_name + self.parent = parent + self.root = root - if required is None: - self.required = not(read_only) + # `self.label` should deafult to being based on the field name. + if self.label is None: + self.label = self.field_name.replace('_', ' ').capitalize() + + # self.source should default to being the same as the field name. + if self.source is None: + self.source = field_name + + # self.source_attrs is a list of attributes that need to be looked up + # when serializing the instance, or populating the validated data. + if self.source == '*': + self.source_attrs = [] else: - assert not (read_only and required), "Cannot set required=True and read_only=True" - self.required = required + self.source_attrs = self.source.split('.') - messages = {} - for c in reversed(self.__class__.__mro__): - messages.update(getattr(c, 'default_error_messages', {})) - messages.update(error_messages or {}) - self.error_messages = messages + def get_initial(self): + """ + Return a value to use when the field is being returned as a primative + value, without any object instance. + """ + return self.initial - self.validators = self.default_validators + validators - self.default = default if default is not None else self.default + def get_value(self, dictionary): + """ + Given the *incoming* primative data, return the value for this field + that should be validated and transformed to a native value. + """ + return dictionary.get(self.field_name, empty) - # Widgets are only used for HTML forms. - widget = widget or self.widget - if isinstance(widget, type): - widget = widget() - self.widget = widget + def get_attribute(self, instance): + """ + Given the *outgoing* object instance, return the value for this field + that should be returned as a primative value. + """ + return get_attribute(instance, self.source_attrs) - def __deepcopy__(self, memo): - result = copy.copy(self) - memo[id(self)] = result - result.validators = self.validators[:] - return result + def get_default(self): + """ + Return the default value to use when validating data if no input + is provided for this field. - def get_default_value(self): - if is_simple_callable(self.default): - return self.default() + If a default has not been set for this field then this will simply + return `empty`, indicating that no value should be set in the + validated data for this field. + """ + if self.default is empty: + raise SkipField() return self.default - def validate(self, value): - if value in validators.EMPTY_VALUES and self.required: - raise ValidationError(self.error_messages['required']) - - def run_validators(self, value): - if value in validators.EMPTY_VALUES: - return - errors = [] - for v in self.validators: - try: - v(value) - except ValidationError as e: - if hasattr(e, 'code') and e.code in self.error_messages: - message = self.error_messages[e.code] - if e.params: - message = message % e.params - errors.append(message) - else: - errors.extend(e.messages) - if errors: - raise ValidationError(errors) - - def field_to_native(self, obj, field_name): - if self.write_only: - return None - return super(WritableField, self).field_to_native(obj, field_name) - - def field_from_native(self, data, files, field_name, into): + def validate(self, data=empty): """ - Given a dictionary and a field name, updates the dictionary `into`, - with the field and it's deserialized value. + Validate a simple representation and return the internal value. + + The provided data may be `empty` if no representation was included. + May return `empty` if the field should not be included in the + validated data. """ - if self.read_only: - return + if data is empty: + if self.required: + self.fail('required') + return self.get_default() - try: - data = data or {} - if self.use_files: - files = files or {} - try: - native = files[field_name] - except KeyError: - native = data[field_name] - else: - native = data[field_name] - except KeyError: - if self.default is not None and not self.partial: - # Note: partial updates shouldn't set defaults - native = self.get_default_value() - else: - if self.required: - raise ValidationError(self.error_messages['required']) - return + return self.to_native(data) - value = self.from_native(native) - if self.source == '*': - if value: - into.update(value) - else: - self.validate(value) - self.run_validators(value) - into[self.source or field_name] = value - - def from_native(self, value): + def to_native(self, data): """ - Reverts a simple representation back to the field's value. + Transform the *incoming* primative data into a native value. + """ + return data + + def to_primative(self, value): + """ + Transform the *outgoing* native value into primative data. """ return value - -class ModelField(WritableField): - """ - A generic field that can be used against an arbitrary model field. - """ - def __init__(self, *args, **kwargs): + def fail(self, key, **kwargs): + """ + A helper method that simply raises a validation error. + """ try: - self.model_field = kwargs.pop('model_field') + raise ValidationError(self.MESSAGES[key].format(**kwargs)) except KeyError: - raise ValueError("ModelField requires 'model_field' kwarg") + class_name = self.__class__.__name__ + msg = self._MISSING_ERROR_MESSAGE.format(class_name=class_name, key=key) + raise AssertionError(msg) - self.min_length = kwargs.pop('min_length', - getattr(self.model_field, 'min_length', None)) - self.max_length = kwargs.pop('max_length', - getattr(self.model_field, 'max_length', None)) - self.min_value = kwargs.pop('min_value', - getattr(self.model_field, 'min_value', None)) - self.max_value = kwargs.pop('max_value', - getattr(self.model_field, 'max_value', None)) - super(ModelField, self).__init__(*args, **kwargs) +class BooleanField(Field): + MESSAGES = { + 'required': 'This field is required.', + 'invalid_value': '`{input}` is not a valid boolean.' + } + TRUE_VALUES = {'t', 'T', 'true', 'True', 'TRUE', '1', 1, True} + FALSE_VALUES = {'f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False} - if self.min_length is not None: - self.validators.append(validators.MinLengthValidator(self.min_length)) - if self.max_length is not None: - self.validators.append(validators.MaxLengthValidator(self.max_length)) - if self.min_value is not None: - self.validators.append(validators.MinValueValidator(self.min_value)) - if self.max_value is not None: - self.validators.append(validators.MaxValueValidator(self.max_value)) + def get_value(self, dictionary): + if html.is_html_input(dictionary): + # HTML forms do not send a `False` value on an empty checkbox, + # so we override the default empty value to be False. + return dictionary.get(self.field_name, False) + return dictionary.get(self.field_name, empty) - def from_native(self, value): - rel = getattr(self.model_field, "rel", None) - if rel is not None: - return rel.to._meta.get_field(rel.field_name).to_python(value) + def to_native(self, data): + if data in self.TRUE_VALUES: + return True + elif data in self.FALSE_VALUES: + return False + self.fail('invalid_value', input=data) + + +class CharField(Field): + MESSAGES = { + 'required': 'This field is required.', + 'blank': 'This field may not be blank.' + } + + def __init__(self, *args, **kwargs): + self.allow_blank = kwargs.pop('allow_blank', False) + super(CharField, self).__init__(*args, **kwargs) + + def to_native(self, data): + if data == '' and not self.allow_blank: + self.fail('blank') + return str(data) + + +class ChoiceField(Field): + MESSAGES = { + 'required': 'This field is required.', + 'invalid_choice': '`{input}` is not a valid choice.' + } + coerce_to_type = str + + def __init__(self, *args, **kwargs): + choices = kwargs.pop('choices') + + assert choices, '`choices` argument is required and may not be empty' + + # Allow either single or paired choices style: + # choices = [1, 2, 3] + # choices = [(1, 'First'), (2, 'Second'), (3, 'Third')] + pairs = [ + isinstance(item, (list, tuple)) and len(item) == 2 + for item in choices + ] + if all(pairs): + self.choices = {key: val for key, val in choices} else: - return self.model_field.to_python(value) + self.choices = {item: item for item in choices} - def field_to_native(self, obj, field_name): - value = self.model_field._get_val_from_obj(obj) - if is_protected_type(value): - return value - return self.model_field.value_to_string(obj) - - def attributes(self): - return { - "type": self.model_field.get_internal_type() + # Map the string representation of choices to the underlying value. + # Allows us to deal with eg. integer choices while supporting either + # integer or string input, but still get the correct datatype out. + self.choice_strings_to_values = { + str(key): key for key in self.choices.keys() } - -# Typed Fields - -class BooleanField(WritableField): - type_name = 'BooleanField' - type_label = 'boolean' - form_field_class = forms.BooleanField - widget = widgets.CheckboxInput - default_error_messages = { - 'invalid': _("'%s' value must be either True or False."), - } - empty = False - - def field_from_native(self, data, files, field_name, into): - # HTML checkboxes do not explicitly represent unchecked as `False` - # we deal with that here... - if isinstance(data, QueryDict) and self.default is None: - self.default = False - - return super(BooleanField, self).field_from_native( - data, files, field_name, into - ) - - def from_native(self, value): - if value in ('true', 't', 'True', '1'): - return True - if value in ('false', 'f', 'False', '0'): - return False - return bool(value) - - -class CharField(WritableField): - type_name = 'CharField' - type_label = 'string' - form_field_class = forms.CharField - - def __init__(self, max_length=None, min_length=None, allow_none=False, *args, **kwargs): - self.max_length, self.min_length = max_length, min_length - self.allow_none = allow_none - super(CharField, self).__init__(*args, **kwargs) - if min_length is not None: - self.validators.append(validators.MinLengthValidator(min_length)) - if max_length is not None: - self.validators.append(validators.MaxLengthValidator(max_length)) - - def from_native(self, value): - if isinstance(value, six.string_types): - return value - - if value is None and not self.allow_none: - return '' - - return smart_text(value) - - -class URLField(CharField): - type_name = 'URLField' - type_label = 'url' - - def __init__(self, **kwargs): - if 'validators' not in kwargs: - kwargs['validators'] = [validators.URLValidator()] - super(URLField, self).__init__(**kwargs) - - -class SlugField(CharField): - type_name = 'SlugField' - type_label = 'slug' - form_field_class = forms.SlugField - - default_error_messages = { - 'invalid': _("Enter a valid 'slug' consisting of letters, numbers," - " underscores or hyphens."), - } - default_validators = [validators.validate_slug] - - def __init__(self, *args, **kwargs): - super(SlugField, self).__init__(*args, **kwargs) - - -class ChoiceField(WritableField): - type_name = 'ChoiceField' - type_label = 'choice' - form_field_class = forms.ChoiceField - widget = widgets.Select - default_error_messages = { - 'invalid_choice': _('Select a valid choice. %(value)s is not one of ' - 'the available choices.'), - } - - def __init__(self, choices=(), blank_display_value=None, *args, **kwargs): - self.empty = kwargs.pop('empty', '') super(ChoiceField, self).__init__(*args, **kwargs) - self.choices = choices - if not self.required: - if blank_display_value is None: - blank_choice = BLANK_CHOICE_DASH - else: - blank_choice = [('', blank_display_value)] - self.choices = blank_choice + self.choices - - def _get_choices(self): - return self._choices - - def _set_choices(self, value): - # Setting choices also sets the choices on the widget. - # choices can be any iterable, but we call list() on it because - # it will be consumed more than once. - self._choices = self.widget.choices = list(value) - - choices = property(_get_choices, _set_choices) - - def metadata(self): - data = super(ChoiceField, self).metadata() - data['choices'] = [{'value': v, 'display_name': n} for v, n in self.choices] - return data - - def validate(self, value): - """ - Validates that the input is in self.choices. - """ - super(ChoiceField, self).validate(value) - if value and not self.valid_value(value): - raise ValidationError(self.error_messages['invalid_choice'] % {'value': value}) - - def valid_value(self, value): - """ - Check to see if the provided value is a valid choice. - """ - for k, v in self.choices: - if isinstance(v, (list, tuple)): - # This is an optgroup, so look inside the group for options - for k2, v2 in v: - if value == smart_text(k2): - return True - else: - if value == smart_text(k) or value == k: - return True - return False - - def from_native(self, value): - value = super(ChoiceField, self).from_native(value) - if value == self.empty or value in validators.EMPTY_VALUES: - return self.empty - return value - - -class EmailField(CharField): - type_name = 'EmailField' - type_label = 'email' - form_field_class = forms.EmailField - - default_error_messages = { - 'invalid': _('Enter a valid email address.'), - } - default_validators = [validators.validate_email] - - def from_native(self, value): - ret = super(EmailField, self).from_native(value) - if ret is None: - return None - return ret.strip() - - -class RegexField(CharField): - type_name = 'RegexField' - type_label = 'regex' - form_field_class = forms.RegexField - - def __init__(self, regex, max_length=None, min_length=None, *args, **kwargs): - super(RegexField, self).__init__(max_length, min_length, *args, **kwargs) - self.regex = regex - - def _get_regex(self): - return self._regex - - def _set_regex(self, regex): - if isinstance(regex, six.string_types): - regex = re.compile(regex) - self._regex = regex - if hasattr(self, '_regex_validator') and self._regex_validator in self.validators: - self.validators.remove(self._regex_validator) - self._regex_validator = validators.RegexValidator(regex=regex) - self.validators.append(self._regex_validator) - - regex = property(_get_regex, _set_regex) - - -class DateField(WritableField): - type_name = 'DateField' - type_label = 'date' - widget = widgets.DateInput - form_field_class = forms.DateField - - default_error_messages = { - 'invalid': _("Date has wrong format. Use one of these formats instead: %s"), - } - empty = None - input_formats = api_settings.DATE_INPUT_FORMATS - format = api_settings.DATE_FORMAT - - def __init__(self, input_formats=None, format=None, *args, **kwargs): - self.input_formats = input_formats if input_formats is not None else self.input_formats - self.format = format if format is not None else self.format - super(DateField, self).__init__(*args, **kwargs) - - def from_native(self, value): - if value in validators.EMPTY_VALUES: - return None - - if isinstance(value, datetime.datetime): - if timezone and settings.USE_TZ and timezone.is_aware(value): - # Convert aware datetimes to the default time zone - # before casting them to dates (#17742). - default_timezone = timezone.get_default_timezone() - value = timezone.make_naive(value, default_timezone) - return value.date() - if isinstance(value, datetime.date): - return value - - for format in self.input_formats: - if format.lower() == ISO_8601: - try: - parsed = parse_date(value) - except (ValueError, TypeError): - pass - else: - if parsed is not None: - return parsed - else: - try: - parsed = datetime.datetime.strptime(value, format) - except (ValueError, TypeError): - pass - else: - return parsed.date() - - msg = self.error_messages['invalid'] % readable_date_formats(self.input_formats) - raise ValidationError(msg) - - def to_native(self, value): - if value is None or self.format is None: - return value - - if isinstance(value, datetime.datetime): - value = value.date() - - if self.format.lower() == ISO_8601: - return value.isoformat() - return value.strftime(self.format) - - -class DateTimeField(WritableField): - type_name = 'DateTimeField' - type_label = 'datetime' - widget = widgets.DateTimeInput - form_field_class = forms.DateTimeField - - default_error_messages = { - 'invalid': _("Datetime has wrong format. Use one of these formats instead: %s"), - } - empty = None - input_formats = api_settings.DATETIME_INPUT_FORMATS - format = api_settings.DATETIME_FORMAT - - def __init__(self, input_formats=None, format=None, *args, **kwargs): - self.input_formats = input_formats if input_formats is not None else self.input_formats - self.format = format if format is not None else self.format - super(DateTimeField, self).__init__(*args, **kwargs) - - def from_native(self, value): - if value in validators.EMPTY_VALUES: - return None - - if isinstance(value, datetime.datetime): - return value - if isinstance(value, datetime.date): - value = datetime.datetime(value.year, value.month, value.day) - if settings.USE_TZ: - # For backwards compatibility, interpret naive datetimes in - # local time. This won't work during DST change, but we can't - # do much about it, so we let the exceptions percolate up the - # call stack. - warnings.warn("DateTimeField received a naive datetime (%s)" - " while time zone support is active." % value, - RuntimeWarning) - default_timezone = timezone.get_default_timezone() - value = timezone.make_aware(value, default_timezone) - return value - - for format in self.input_formats: - if format.lower() == ISO_8601: - try: - parsed = parse_datetime(value) - except (ValueError, TypeError): - pass - else: - if parsed is not None: - return parsed - else: - try: - parsed = datetime.datetime.strptime(value, format) - except (ValueError, TypeError): - pass - else: - return parsed - - msg = self.error_messages['invalid'] % readable_datetime_formats(self.input_formats) - raise ValidationError(msg) - - def to_native(self, value): - if value is None or self.format is None: - return value - - if self.format.lower() == ISO_8601: - ret = value.isoformat() - if ret.endswith('+00:00'): - ret = ret[:-6] + 'Z' - return ret - return value.strftime(self.format) - - -class TimeField(WritableField): - type_name = 'TimeField' - type_label = 'time' - widget = widgets.TimeInput - form_field_class = forms.TimeField - - default_error_messages = { - 'invalid': _("Time has wrong format. Use one of these formats instead: %s"), - } - empty = None - input_formats = api_settings.TIME_INPUT_FORMATS - format = api_settings.TIME_FORMAT - - def __init__(self, input_formats=None, format=None, *args, **kwargs): - self.input_formats = input_formats if input_formats is not None else self.input_formats - self.format = format if format is not None else self.format - super(TimeField, self).__init__(*args, **kwargs) - - def from_native(self, value): - if value in validators.EMPTY_VALUES: - return None - - if isinstance(value, datetime.time): - return value - - for format in self.input_formats: - if format.lower() == ISO_8601: - try: - parsed = parse_time(value) - except (ValueError, TypeError): - pass - else: - if parsed is not None: - return parsed - else: - try: - parsed = datetime.datetime.strptime(value, format) - except (ValueError, TypeError): - pass - else: - return parsed.time() - - msg = self.error_messages['invalid'] % readable_time_formats(self.input_formats) - raise ValidationError(msg) - - def to_native(self, value): - if value is None or self.format is None: - return value - - if isinstance(value, datetime.datetime): - value = value.time() - - if self.format.lower() == ISO_8601: - return value.isoformat() - return value.strftime(self.format) - - -class IntegerField(WritableField): - type_name = 'IntegerField' - type_label = 'integer' - form_field_class = forms.IntegerField - empty = 0 - - default_error_messages = { - 'invalid': _('Enter a whole number.'), - 'max_value': _('Ensure this value is less than or equal to %(limit_value)s.'), - 'min_value': _('Ensure this value is greater than or equal to %(limit_value)s.'), - } - - def __init__(self, max_value=None, min_value=None, *args, **kwargs): - self.max_value, self.min_value = max_value, min_value - super(IntegerField, self).__init__(*args, **kwargs) - - if max_value is not None: - self.validators.append(validators.MaxValueValidator(max_value)) - if min_value is not None: - self.validators.append(validators.MinValueValidator(min_value)) - - def from_native(self, value): - if value in validators.EMPTY_VALUES: - return None + def to_native(self, data): try: - value = int(str(value)) + return self.choice_strings_to_values[str(data)] + except KeyError: + self.fail('invalid_choice', input=data) + + +class MultipleChoiceField(ChoiceField): + MESSAGES = { + 'required': 'This field is required.', + 'invalid_choice': '`{input}` is not a valid choice.', + 'not_a_list': 'Expected a list of items but got type `{input_type}`' + } + + def to_native(self, data): + if not hasattr(data, '__iter__'): + self.fail('not_a_list', input_type=type(data).__name__) + return set([ + super(MultipleChoiceField, self).to_native(item) + for item in data + ]) + + +class IntegerField(Field): + MESSAGES = { + 'required': 'This field is required.', + 'invalid_integer': 'A valid integer is required.' + } + + def to_native(self, data): + try: + data = int(str(data)) except (ValueError, TypeError): - raise ValidationError(self.error_messages['invalid']) - return value - - -class FloatField(WritableField): - type_name = 'FloatField' - type_label = 'float' - form_field_class = forms.FloatField - empty = 0 - - default_error_messages = { - 'invalid': _("'%s' value must be a float."), - } - - def from_native(self, value): - if value in validators.EMPTY_VALUES: - return None - - try: - return float(value) - except (TypeError, ValueError): - msg = self.error_messages['invalid'] % value - raise ValidationError(msg) - - -class DecimalField(WritableField): - type_name = 'DecimalField' - type_label = 'decimal' - form_field_class = forms.DecimalField - empty = Decimal('0') - - default_error_messages = { - 'invalid': _('Enter a number.'), - 'max_value': _('Ensure this value is less than or equal to %(limit_value)s.'), - 'min_value': _('Ensure this value is greater than or equal to %(limit_value)s.'), - 'max_digits': _('Ensure that there are no more than %s digits in total.'), - 'max_decimal_places': _('Ensure that there are no more than %s decimal places.'), - 'max_whole_digits': _('Ensure that there are no more than %s digits before the decimal point.') - } - - def __init__(self, max_value=None, min_value=None, max_digits=None, decimal_places=None, *args, **kwargs): - self.max_value, self.min_value = max_value, min_value - self.max_digits, self.decimal_places = max_digits, decimal_places - super(DecimalField, self).__init__(*args, **kwargs) - - if max_value is not None: - self.validators.append(validators.MaxValueValidator(max_value)) - if min_value is not None: - self.validators.append(validators.MinValueValidator(min_value)) - - def from_native(self, value): - """ - Validates that the input is a decimal number. Returns a Decimal - instance. Returns None for empty values. Ensures that there are no more - than max_digits in the number, and no more than decimal_places digits - after the decimal point. - """ - if value in validators.EMPTY_VALUES: - return None - value = smart_text(value).strip() - try: - value = Decimal(value) - except DecimalException: - raise ValidationError(self.error_messages['invalid']) - return value - - def validate(self, value): - super(DecimalField, self).validate(value) - if value in validators.EMPTY_VALUES: - return - # Check for NaN, Inf and -Inf values. We can't compare directly for NaN, - # since it is never equal to itself. However, NaN is the only value that - # isn't equal to itself, so we can use this to identify NaN - if value != value or value == Decimal("Inf") or value == Decimal("-Inf"): - raise ValidationError(self.error_messages['invalid']) - sign, digittuple, exponent = value.as_tuple() - decimals = abs(exponent) - # digittuple doesn't include any leading zeros. - digits = len(digittuple) - if decimals > digits: - # We have leading zeros up to or past the decimal point. Count - # everything past the decimal point as a digit. We do not count - # 0 before the decimal point as a digit since that would mean - # we would not allow max_digits = decimal_places. - digits = decimals - whole_digits = digits - decimals - - if self.max_digits is not None and digits > self.max_digits: - raise ValidationError(self.error_messages['max_digits'] % self.max_digits) - if self.decimal_places is not None and decimals > self.decimal_places: - raise ValidationError(self.error_messages['max_decimal_places'] % self.decimal_places) - if self.max_digits is not None and self.decimal_places is not None and whole_digits > (self.max_digits - self.decimal_places): - raise ValidationError(self.error_messages['max_whole_digits'] % (self.max_digits - self.decimal_places)) - return value - - -class FileField(WritableField): - use_files = True - type_name = 'FileField' - type_label = 'file upload' - form_field_class = forms.FileField - widget = widgets.FileInput - - default_error_messages = { - 'invalid': _("No file was submitted. Check the encoding type on the form."), - 'missing': _("No file was submitted."), - 'empty': _("The submitted file is empty."), - 'max_length': _('Ensure this filename has at most %(max)d characters (it has %(length)d).'), - 'contradiction': _('Please either submit a file or check the clear checkbox, not both.') - } - - def __init__(self, *args, **kwargs): - self.max_length = kwargs.pop('max_length', None) - self.allow_empty_file = kwargs.pop('allow_empty_file', False) - super(FileField, self).__init__(*args, **kwargs) - - def from_native(self, data): - if data in validators.EMPTY_VALUES: - return None - - # UploadedFile objects should have name and size attributes. - try: - file_name = data.name - file_size = data.size - except AttributeError: - raise ValidationError(self.error_messages['invalid']) - - if self.max_length is not None and len(file_name) > self.max_length: - error_values = {'max': self.max_length, 'length': len(file_name)} - raise ValidationError(self.error_messages['max_length'] % error_values) - if not file_name: - raise ValidationError(self.error_messages['invalid']) - if not self.allow_empty_file and not file_size: - raise ValidationError(self.error_messages['empty']) - + self.fail('invalid_integer') return data - def to_native(self, value): - return value.name +class MethodField(Field): + def __init__(self, **kwargs): + kwargs['source'] = '*' + kwargs['read_only'] = True + super(MethodField, self).__init__(**kwargs) -class ImageField(FileField): - use_files = True - type_name = 'ImageField' - type_label = 'image upload' - form_field_class = forms.ImageField - - default_error_messages = { - 'invalid_image': _("Upload a valid image. The file you uploaded was " - "either not an image or a corrupted image."), - } - - def from_native(self, data): - """ - Checks that the file-upload field data contains a valid image (GIF, JPG, - PNG, possibly others -- whatever the Python Imaging Library supports). - """ - f = super(ImageField, self).from_native(data) - if f is None: - return None - - from rest_framework.compat import Image - assert Image is not None, 'Either Pillow or PIL must be installed for ImageField support.' - - # We need to get a file object for PIL. We might have a path or we might - # have to read the data into memory. - if hasattr(data, 'temporary_file_path'): - file = data.temporary_file_path() - else: - if hasattr(data, 'read'): - file = BytesIO(data.read()) - else: - file = BytesIO(data['content']) - - try: - # load() could spot a truncated JPEG, but it loads the entire - # image in memory, which is a DoS vector. See #3848 and #18520. - # verify() must be called immediately after the constructor. - Image.open(file).verify() - except ImportError: - # Under PyPy, it is possible to import PIL. However, the underlying - # _imaging C module isn't available, so an ImportError will be - # raised. Catch and re-raise. - raise - except Exception: # Python Imaging Library doesn't recognize it as an image - raise ValidationError(self.error_messages['invalid_image']) - if hasattr(f, 'seek') and callable(f.seek): - f.seek(0) - return f - - -class SerializerMethodField(Field): - """ - A field that gets its value by calling a method on the serializer it's attached to. - """ - - def __init__(self, method_name, *args, **kwargs): - self.method_name = method_name - super(SerializerMethodField, self).__init__(*args, **kwargs) - - def field_to_native(self, obj, field_name): - value = getattr(self.parent, self.method_name)(obj) - return self.to_native(value) + def to_primative(self, value): + attr = 'get_{field_name}'.format(field_name=self.field_name) + method = getattr(self.parent, attr) + return method(value) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index b3bd6ce92..6705cbb2f 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -79,18 +79,16 @@ class GenericAPIView(views.APIView): 'view': self } - def get_serializer(self, instance=None, data=None, files=None, many=False, - partial=False, allow_add_remove=False): + def get_serializer(self, instance=None, data=None, many=False, partial=False): """ Return the serializer instance that should be used for validating and deserializing input, and for serializing output. """ serializer_class = self.get_serializer_class() context = self.get_serializer_context() - return serializer_class(instance, data=data, files=files, - many=many, partial=partial, - allow_add_remove=allow_add_remove, - context=context) + return serializer_class( + instance, data=data, many=many, partial=partial, context=context + ) def get_pagination_serializer(self, page): """ diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index ac59d9795..ee01cabc7 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -36,12 +36,10 @@ class CreateModelMixin(object): Create a model instance. """ def create(self, request, *args, **kwargs): - serializer = self.get_serializer(data=request.DATA, files=request.FILES) + serializer = self.get_serializer(data=request.DATA) if serializer.is_valid(): - self.pre_save(serializer.object) - self.object = serializer.save(force_insert=True) - self.post_save(self.object, created=True) + self.object = serializer.save() headers = self.get_success_headers(serializer.data) return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) @@ -90,26 +88,20 @@ class UpdateModelMixin(object): partial = kwargs.pop('partial', False) self.object = self.get_object_or_none() - serializer = self.get_serializer(self.object, data=request.DATA, - files=request.FILES, partial=partial) + serializer = self.get_serializer(self.object, data=request.DATA, partial=partial) if not serializer.is_valid(): return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - try: - self.pre_save(serializer.object) - except ValidationError as err: - # full_clean on model instance may be called in pre_save, - # so we have to handle eventual errors. - return Response(err.message_dict, status=status.HTTP_400_BAD_REQUEST) + lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field + lookup_value = self.kwargs[lookup_url_kwarg] + extras = {self.lookup_field: lookup_value} if self.object is None: - self.object = serializer.save(force_insert=True) - self.post_save(self.object, created=True) + self.object = serializer.save(extras=extras) return Response(serializer.data, status=status.HTTP_201_CREATED) - self.object = serializer.save(force_update=True) - self.post_save(self.object, created=False) + self.object = serializer.save(extras=extras) return Response(serializer.data, status=status.HTTP_200_OK) def partial_update(self, request, *args, **kwargs): diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index d51ea929b..83ef97c5c 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -48,17 +48,17 @@ class DefaultObjectSerializer(serializers.Field): super(DefaultObjectSerializer, self).__init__(source=source) -class PaginationSerializerOptions(serializers.SerializerOptions): - """ - An object that stores the options that may be provided to a - pagination serializer by using the inner `Meta` class. +# class PaginationSerializerOptions(serializers.SerializerOptions): +# """ +# An object that stores the options that may be provided to a +# pagination serializer by using the inner `Meta` class. - Accessible on the instance as `serializer.opts`. - """ - def __init__(self, meta): - super(PaginationSerializerOptions, self).__init__(meta) - self.object_serializer_class = getattr(meta, 'object_serializer_class', - DefaultObjectSerializer) +# Accessible on the instance as `serializer.opts`. +# """ +# def __init__(self, meta): +# super(PaginationSerializerOptions, self).__init__(meta) +# self.object_serializer_class = getattr(meta, 'object_serializer_class', +# DefaultObjectSerializer) class BasePaginationSerializer(serializers.Serializer): @@ -66,7 +66,7 @@ class BasePaginationSerializer(serializers.Serializer): A base class for pagination serializers to inherit from, to make implementing custom serializers more easy. """ - _options_class = PaginationSerializerOptions + # _options_class = PaginationSerializerOptions results_field = 'results' def __init__(self, *args, **kwargs): diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 56870b408..e69de29bb 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -1,486 +0,0 @@ -""" -Serializer fields that deal with relationships. - -These fields allow you to specify the style that should be used to represent -model relationships, including hyperlinks, primary keys, or slugs. -""" -from __future__ import unicode_literals -from django.core.exceptions import ObjectDoesNotExist, ValidationError -from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch -from django import forms -from django.db.models.fields import BLANK_CHOICE_DASH -from django.forms import widgets -from django.forms.models import ModelChoiceIterator -from django.utils.translation import ugettext_lazy as _ -from rest_framework.fields import Field, WritableField, get_component, is_simple_callable -from rest_framework.reverse import reverse -from rest_framework.compat import urlparse -from rest_framework.compat import smart_text - - -# Relational fields - -# Not actually Writable, but subclasses may need to be. -class RelatedField(WritableField): - """ - Base class for related model fields. - - This represents a relationship using the unicode representation of the target. - """ - widget = widgets.Select - many_widget = widgets.SelectMultiple - form_field_class = forms.ChoiceField - many_form_field_class = forms.MultipleChoiceField - null_values = (None, '', 'None') - - cache_choices = False - empty_label = None - read_only = True - many = False - - def __init__(self, *args, **kwargs): - queryset = kwargs.pop('queryset', None) - self.many = kwargs.pop('many', self.many) - if self.many: - self.widget = self.many_widget - self.form_field_class = self.many_form_field_class - - kwargs['read_only'] = kwargs.pop('read_only', self.read_only) - super(RelatedField, self).__init__(*args, **kwargs) - - if not self.required: - # Accessed in ModelChoiceIterator django/forms/models.py:1034 - # If set adds empty choice. - self.empty_label = BLANK_CHOICE_DASH[0][1] - - self.queryset = queryset - - def initialize(self, parent, field_name): - super(RelatedField, self).initialize(parent, field_name) - if self.queryset is None and not self.read_only: - manager = getattr(self.parent.opts.model, self.source or field_name) - if hasattr(manager, 'related'): # Forward - self.queryset = manager.related.model._default_manager.all() - else: # Reverse - self.queryset = manager.field.rel.to._default_manager.all() - - # We need this stuff to make form choices work... - - def prepare_value(self, obj): - return self.to_native(obj) - - def label_from_instance(self, obj): - """ - Return a readable representation for use with eg. select widgets. - """ - desc = smart_text(obj) - ident = smart_text(self.to_native(obj)) - if desc == ident: - return desc - return "%s - %s" % (desc, ident) - - def _get_queryset(self): - return self._queryset - - def _set_queryset(self, queryset): - self._queryset = queryset - self.widget.choices = self.choices - - queryset = property(_get_queryset, _set_queryset) - - def _get_choices(self): - # If self._choices is set, then somebody must have manually set - # the property self.choices. In this case, just return self._choices. - if hasattr(self, '_choices'): - return self._choices - - # Otherwise, execute the QuerySet in self.queryset to determine the - # choices dynamically. Return a fresh ModelChoiceIterator that has not been - # consumed. Note that we're instantiating a new ModelChoiceIterator *each* - # time _get_choices() is called (and, thus, each time self.choices is - # accessed) so that we can ensure the QuerySet has not been consumed. This - # construct might look complicated but it allows for lazy evaluation of - # the queryset. - return ModelChoiceIterator(self) - - def _set_choices(self, value): - # Setting choices also sets the choices on the widget. - # choices can be any iterable, but we call list() on it because - # it will be consumed more than once. - self._choices = self.widget.choices = list(value) - - choices = property(_get_choices, _set_choices) - - # Default value handling - - def get_default_value(self): - default = super(RelatedField, self).get_default_value() - if self.many and default is None: - return [] - return default - - # Regular serializer stuff... - - def field_to_native(self, obj, field_name): - try: - if self.source == '*': - return self.to_native(obj) - - source = self.source or field_name - value = obj - - for component in source.split('.'): - if value is None: - break - value = get_component(value, component) - except ObjectDoesNotExist: - return None - - if value is None: - return None - - if self.many: - if is_simple_callable(getattr(value, 'all', None)): - return [self.to_native(item) for item in value.all()] - else: - # Also support non-queryset iterables. - # This allows us to also support plain lists of related items. - return [self.to_native(item) for item in value] - return self.to_native(value) - - def field_from_native(self, data, files, field_name, into): - if self.read_only: - return - - try: - if self.many: - try: - # Form data - value = data.getlist(field_name) - if value == [''] or value == []: - raise KeyError - except AttributeError: - # Non-form data - value = data[field_name] - else: - value = data[field_name] - except KeyError: - if self.partial: - return - value = self.get_default_value() - - if value in self.null_values: - if self.required: - raise ValidationError(self.error_messages['required']) - into[(self.source or field_name)] = None - elif self.many: - into[(self.source or field_name)] = [self.from_native(item) for item in value] - else: - into[(self.source or field_name)] = self.from_native(value) - - -# PrimaryKey relationships - -class PrimaryKeyRelatedField(RelatedField): - """ - Represents a relationship as a pk value. - """ - read_only = False - - default_error_messages = { - 'does_not_exist': _("Invalid pk '%s' - object does not exist."), - 'incorrect_type': _('Incorrect type. Expected pk value, received %s.'), - } - - # TODO: Remove these field hacks... - def prepare_value(self, obj): - return self.to_native(obj.pk) - - def label_from_instance(self, obj): - """ - Return a readable representation for use with eg. select widgets. - """ - desc = smart_text(obj) - ident = smart_text(self.to_native(obj.pk)) - if desc == ident: - return desc - return "%s - %s" % (desc, ident) - - # TODO: Possibly change this to just take `obj`, through prob less performant - def to_native(self, pk): - return pk - - def from_native(self, data): - if self.queryset is None: - raise Exception('Writable related fields must include a `queryset` argument') - - try: - return self.queryset.get(pk=data) - except ObjectDoesNotExist: - msg = self.error_messages['does_not_exist'] % smart_text(data) - raise ValidationError(msg) - except (TypeError, ValueError): - received = type(data).__name__ - msg = self.error_messages['incorrect_type'] % received - raise ValidationError(msg) - - def field_to_native(self, obj, field_name): - if self.many: - # To-many relationship - - queryset = None - if not self.source: - # Prefer obj.serializable_value for performance reasons - try: - queryset = obj.serializable_value(field_name) - except AttributeError: - pass - if queryset is None: - # RelatedManager (reverse relationship) - source = self.source or field_name - queryset = obj - for component in source.split('.'): - if queryset is None: - return [] - queryset = get_component(queryset, component) - - # Forward relationship - if is_simple_callable(getattr(queryset, 'all', None)): - return [self.to_native(item.pk) for item in queryset.all()] - else: - # Also support non-queryset iterables. - # This allows us to also support plain lists of related items. - return [self.to_native(item.pk) for item in queryset] - - # To-one relationship - try: - # Prefer obj.serializable_value for performance reasons - pk = obj.serializable_value(self.source or field_name) - except AttributeError: - # RelatedObject (reverse relationship) - try: - pk = getattr(obj, self.source or field_name).pk - except (ObjectDoesNotExist, AttributeError): - return None - - # Forward relationship - return self.to_native(pk) - - -# Slug relationships - -class SlugRelatedField(RelatedField): - """ - Represents a relationship using a unique field on the target. - """ - read_only = False - - default_error_messages = { - 'does_not_exist': _("Object with %s=%s does not exist."), - 'invalid': _('Invalid value.'), - } - - def __init__(self, *args, **kwargs): - self.slug_field = kwargs.pop('slug_field', None) - assert self.slug_field, 'slug_field is required' - super(SlugRelatedField, self).__init__(*args, **kwargs) - - def to_native(self, obj): - return getattr(obj, self.slug_field) - - def from_native(self, data): - if self.queryset is None: - raise Exception('Writable related fields must include a `queryset` argument') - - try: - return self.queryset.get(**{self.slug_field: data}) - except ObjectDoesNotExist: - raise ValidationError(self.error_messages['does_not_exist'] % - (self.slug_field, smart_text(data))) - except (TypeError, ValueError): - msg = self.error_messages['invalid'] - raise ValidationError(msg) - - -# Hyperlinked relationships - -class HyperlinkedRelatedField(RelatedField): - """ - Represents a relationship using hyperlinking. - """ - read_only = False - lookup_field = 'pk' - - default_error_messages = { - 'no_match': _('Invalid hyperlink - No URL match'), - 'incorrect_match': _('Invalid hyperlink - Incorrect URL match'), - 'configuration_error': _('Invalid hyperlink due to configuration error'), - 'does_not_exist': _("Invalid hyperlink - object does not exist."), - 'incorrect_type': _('Incorrect type. Expected url string, received %s.'), - } - - def __init__(self, *args, **kwargs): - try: - self.view_name = kwargs.pop('view_name') - except KeyError: - raise ValueError("Hyperlinked field requires 'view_name' kwarg") - - self.lookup_field = kwargs.pop('lookup_field', self.lookup_field) - self.format = kwargs.pop('format', None) - - super(HyperlinkedRelatedField, self).__init__(*args, **kwargs) - - def get_url(self, obj, view_name, request, format): - """ - Given an object, return the URL that hyperlinks to the object. - - May raise a `NoReverseMatch` if the `view_name` and `lookup_field` - attributes are not configured to correctly match the URL conf. - """ - lookup_field = getattr(obj, self.lookup_field) - kwargs = {self.lookup_field: lookup_field} - return reverse(view_name, kwargs=kwargs, request=request, format=format) - - def get_object(self, queryset, view_name, view_args, view_kwargs): - """ - Return the object corresponding to a matched URL. - - Takes the matched URL conf arguments, and the queryset, and should - return an object instance, or raise an `ObjectDoesNotExist` exception. - """ - lookup_value = view_kwargs[self.lookup_field] - filter_kwargs = {self.lookup_field: lookup_value} - return queryset.get(**filter_kwargs) - - def to_native(self, obj): - view_name = self.view_name - request = self.context.get('request', None) - format = self.format or self.context.get('format', None) - - assert request is not None, ( - "`HyperlinkedRelatedField` requires the request in the serializer " - "context. Add `context={'request': request}` when instantiating " - "the serializer." - ) - - # If the object has not yet been saved then we cannot hyperlink to it. - if getattr(obj, 'pk', None) is None: - return - - # Return the hyperlink, or error if incorrectly configured. - try: - return self.get_url(obj, view_name, request, format) - except NoReverseMatch: - msg = ( - 'Could not resolve URL for hyperlinked relationship using ' - 'view name "%s". You may have failed to include the related ' - 'model in your API, or incorrectly configured the ' - '`lookup_field` attribute on this field.' - ) - raise Exception(msg % view_name) - - def from_native(self, value): - # Convert URL -> model instance pk - # TODO: Use values_list - queryset = self.queryset - if queryset is None: - raise Exception('Writable related fields must include a `queryset` argument') - - try: - http_prefix = value.startswith(('http:', 'https:')) - except AttributeError: - msg = self.error_messages['incorrect_type'] - raise ValidationError(msg % type(value).__name__) - - if http_prefix: - # If needed convert absolute URLs to relative path - value = urlparse.urlparse(value).path - prefix = get_script_prefix() - if value.startswith(prefix): - value = '/' + value[len(prefix):] - - try: - match = resolve(value) - except Exception: - raise ValidationError(self.error_messages['no_match']) - - if match.view_name != self.view_name: - raise ValidationError(self.error_messages['incorrect_match']) - - try: - return self.get_object(queryset, match.view_name, - match.args, match.kwargs) - except (ObjectDoesNotExist, TypeError, ValueError): - raise ValidationError(self.error_messages['does_not_exist']) - - -class HyperlinkedIdentityField(Field): - """ - Represents the instance, or a property on the instance, using hyperlinking. - """ - lookup_field = 'pk' - read_only = True - - def __init__(self, *args, **kwargs): - try: - self.view_name = kwargs.pop('view_name') - except KeyError: - msg = "HyperlinkedIdentityField requires 'view_name' argument" - raise ValueError(msg) - - self.format = kwargs.pop('format', None) - lookup_field = kwargs.pop('lookup_field', None) - self.lookup_field = lookup_field or self.lookup_field - - super(HyperlinkedIdentityField, self).__init__(*args, **kwargs) - - def field_to_native(self, obj, field_name): - request = self.context.get('request', None) - format = self.context.get('format', None) - view_name = self.view_name - - assert request is not None, ( - "`HyperlinkedIdentityField` requires the request in the serializer" - " context. Add `context={'request': request}` when instantiating " - "the serializer." - ) - - # By default use whatever format is given for the current context - # unless the target is a different type to the source. - # - # Eg. Consider a HyperlinkedIdentityField pointing from a json - # representation to an html property of that representation... - # - # '/snippets/1/' should link to '/snippets/1/highlight/' - # ...but... - # '/snippets/1/.json' should link to '/snippets/1/highlight/.html' - if format and self.format and self.format != format: - format = self.format - - # Return the hyperlink, or error if incorrectly configured. - try: - return self.get_url(obj, view_name, request, format) - except NoReverseMatch: - msg = ( - 'Could not resolve URL for hyperlinked relationship using ' - 'view name "%s". You may have failed to include the related ' - 'model in your API, or incorrectly configured the ' - '`lookup_field` attribute on this field.' - ) - raise Exception(msg % view_name) - - def get_url(self, obj, view_name, request, format): - """ - Given an object, return the URL that hyperlinks to the object. - - May raise a `NoReverseMatch` if the `view_name` and `lookup_field` - attributes are not configured to correctly match the URL conf. - """ - lookup_field = getattr(obj, self.lookup_field, None) - kwargs = {self.lookup_field: lookup_field} - - # Handle unsaved object case - if lookup_field is None: - return None - - return reverse(view_name, kwargs=kwargs, request=request, format=format) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 748ebac94..e8935b012 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -458,7 +458,7 @@ class BrowsableAPIRenderer(BaseRenderer): ): return - serializer = view.get_serializer(instance=obj, data=data, files=files) + serializer = view.get_serializer(instance=obj, data=data) serializer.is_valid() data = serializer.data @@ -579,10 +579,10 @@ class BrowsableAPIRenderer(BaseRenderer): 'available_formats': [renderer_cls.format for renderer_cls in view.renderer_classes], 'response_headers': response_headers, - 'put_form': self.get_rendered_html_form(view, 'PUT', request), - 'post_form': self.get_rendered_html_form(view, 'POST', request), - 'delete_form': self.get_rendered_html_form(view, 'DELETE', request), - 'options_form': self.get_rendered_html_form(view, 'OPTIONS', request), + #'put_form': self.get_rendered_html_form(view, 'PUT', request), + #'post_form': self.get_rendered_html_form(view, 'POST', request), + #'delete_form': self.get_rendered_html_form(view, 'DELETE', request), + #'options_form': self.get_rendered_html_form(view, 'OPTIONS', request), 'raw_data_put_form': raw_data_put_form, 'raw_data_post_form': raw_data_post_form, diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index be8ad3f24..d121812d6 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -10,21 +10,14 @@ python primitives. 2. The process of marshalling between python primitives and request and response content is handled by parsers and renderers. """ -from __future__ import unicode_literals -import copy -import datetime -import inspect -import types -from decimal import Decimal -from django.contrib.contenttypes.generic import GenericForeignKey -from django.core.paginator import Page from django.db import models -from django.forms import widgets from django.utils import six -from django.utils.datastructures import SortedDict -from django.core.exceptions import ObjectDoesNotExist +from collections import namedtuple, OrderedDict +from rest_framework.fields import empty, set_value, Field, SkipField, ValidationError from rest_framework.settings import api_settings - +from rest_framework.utils import html +import copy +import inspect # Note: We do the following so that users of the framework can use this style: # @@ -37,6 +30,253 @@ from rest_framework.relations import * # NOQA from rest_framework.fields import * # NOQA +FieldResult = namedtuple('FieldResult', ['field', 'value', 'error']) + + +class BaseSerializer(Field): + def __init__(self, instance=None, data=None, **kwargs): + super(BaseSerializer, self).__init__(**kwargs) + self.instance = instance + self._initial_data = data + + def to_native(self, data): + raise NotImplementedError() + + def to_primative(self, instance): + raise NotImplementedError() + + def update(self, instance): + raise NotImplementedError() + + def create(self): + raise NotImplementedError() + + def save(self, extras=None): + if extras is not None: + self._validated_data.update(extras) + + if self.instance is not None: + self.update(self.instance) + else: + self.instance = self.create() + + return self.instance + + def is_valid(self): + try: + self._validated_data = self.to_native(self._initial_data) + except ValidationError as exc: + self._validated_data = {} + self._errors = exc.args[0] + return False + self._errors = {} + return True + + @property + def data(self): + if not hasattr(self, '_data'): + if self.instance is not None: + self._data = self.to_primative(self.instance) + elif self._initial_data is not None: + self._data = { + field_name: field.get_value(self._initial_data) + for field_name, field in self.fields.items() + } + else: + self._data = self.get_initial() + return self._data + + @property + def errors(self): + if not hasattr(self, '_errors'): + msg = 'You must call `.is_valid()` before accessing `.errors`.' + raise AssertionError(msg) + return self._errors + + @property + def validated_data(self): + if not hasattr(self, '_validated_data'): + msg = 'You must call `.is_valid()` before accessing `.validated_data`.' + raise AssertionError(msg) + return self._validated_data + + +class SerializerMetaclass(type): + """ + This metaclass sets a dictionary named `base_fields` on the class. + + Any fields included as attributes on either the class or it's superclasses + will be include in the `base_fields` dictionary. + """ + + @classmethod + def _get_fields(cls, bases, attrs): + fields = [(field_name, attrs.pop(field_name)) + for field_name, obj in list(attrs.items()) + if isinstance(obj, Field)] + fields.sort(key=lambda x: x[1]._creation_counter) + + # If this class is subclassing another Serializer, add that Serializer's + # fields. Note that we loop over the bases in *reverse*. This is necessary + # in order to maintain the correct order of fields. + for base in bases[::-1]: + if hasattr(base, 'base_fields'): + fields = list(base.base_fields.items()) + fields + + return OrderedDict(fields) + + def __new__(cls, name, bases, attrs): + attrs['base_fields'] = cls._get_fields(bases, attrs) + return super(SerializerMetaclass, cls).__new__(cls, name, bases, attrs) + + +@six.add_metaclass(SerializerMetaclass) +class Serializer(BaseSerializer): + + def __new__(cls, *args, **kwargs): + many = kwargs.pop('many', False) + if many: + class DynamicListSerializer(ListSerializer): + child = cls() + return DynamicListSerializer(*args, **kwargs) + return super(Serializer, cls).__new__(cls) + + def __init__(self, *args, **kwargs): + kwargs.pop('context', None) + kwargs.pop('partial', None) + kwargs.pop('many', False) + + super(Serializer, self).__init__(*args, **kwargs) + + # Every new serializer is created with a clone of the field instances. + # This allows users to dynamically modify the fields on a serializer + # instance without affecting every other serializer class. + self.fields = self.get_fields() + + # Setup all the child fields, to provide them with the current context. + for field_name, field in self.fields.items(): + field.bind(field_name, self, self) + + def get_fields(self): + return copy.deepcopy(self.base_fields) + + def bind(self, field_name, parent, root): + # If the serializer is used as a field then when it becomes bound + # it also needs to bind all its child fields. + super(Serializer, self).bind(field_name, parent, root) + for field_name, field in self.fields.items(): + field.bind(field_name, self, root) + + def get_initial(self): + return { + field.field_name: field.get_initial() + for field in self.fields.values() + } + + def get_value(self, dictionary): + # We override the default field access in order to support + # nested HTML forms. + if html.is_html_input(dictionary): + return html.parse_html_dict(dictionary, prefix=self.field_name) + return dictionary.get(self.field_name, empty) + + def to_native(self, data): + """ + Dict of native values <- Dict of primitive datatypes. + """ + ret = {} + errors = {} + fields = [field for field in self.fields.values() if not field.read_only] + + for field in fields: + primitive_value = field.get_value(data) + try: + validated_value = field.validate(primitive_value) + except ValidationError as exc: + errors[field.field_name] = str(exc) + except SkipField: + pass + else: + set_value(ret, field.source_attrs, validated_value) + + if errors: + raise ValidationError(errors) + + return ret + + def to_primative(self, instance): + """ + Object instance -> Dict of primitive datatypes. + """ + ret = OrderedDict() + fields = [field for field in self.fields.values() if not field.write_only] + + for field in fields: + native_value = field.get_attribute(instance) + ret[field.field_name] = field.to_primative(native_value) + + return ret + + def __iter__(self): + errors = self.errors if hasattr(self, '_errors') else {} + for field in self.fields.values(): + value = self.data.get(field.field_name) if self.data else None + error = errors.get(field.field_name) + yield FieldResult(field, value, error) + + +class ListSerializer(BaseSerializer): + child = None + initial = [] + + def __init__(self, *args, **kwargs): + self.child = kwargs.pop('child', copy.deepcopy(self.child)) + assert self.child is not None, '`child` is a required argument.' + + kwargs.pop('context', None) + kwargs.pop('partial', None) + + super(ListSerializer, self).__init__(*args, **kwargs) + self.child.bind('', self, self) + + def bind(self, field_name, parent, root): + # If the list is used as a field then it needs to provide + # the current context to the child serializer. + super(ListSerializer, self).bind(field_name, parent, root) + self.child.bind(field_name, self, root) + + def get_value(self, dictionary): + # We override the default field access in order to support + # lists in HTML forms. + if is_html_input(dictionary): + return html.parse_html_list(dictionary, prefix=self.field_name) + return dictionary.get(self.field_name, empty) + + def to_native(self, data): + """ + List of dicts of native values <- List of dicts of primitive datatypes. + """ + if html.is_html_input(data): + data = html.parse_html_list(data) + + return [self.child.validate(item) for item in data] + + def to_primative(self, data): + """ + List of object instances -> List of dicts of primitive datatypes. + """ + return [self.child.to_primative(item) for item in data] + + def create(self, attrs_list): + return [self.child.create(attrs) for attrs in attrs_list] + + def save(self): + if self.instance is not None: + self.update(self.instance, self.validated_data) + self.instance = self.create(self.validated_data) + return self.instance + + def _resolve_model(obj): """ Resolve supplied `obj` to a Django model class. @@ -58,614 +298,71 @@ def _resolve_model(obj): raise ValueError("{0} is not a Django model".format(obj)) -def pretty_name(name): - """Converts 'first_name' to 'First name'""" - if not name: - return '' - return name.replace('_', ' ').capitalize() - - -class RelationsList(list): - _deleted = [] - - -class NestedValidationError(ValidationError): - """ - The default ValidationError behavior is to stringify each item in the list - if the messages are a list of error messages. - - In the case of nested serializers, where the parent has many children, - then the child's `serializer.errors` will be a list of dicts. In the case - of a single child, the `serializer.errors` will be a dict. - - We need to override the default behavior to get properly nested error dicts. - """ - - def __init__(self, message): - if isinstance(message, dict): - self._messages = [message] - else: - self._messages = message - - @property - def messages(self): - return self._messages - - -class DictWithMetadata(dict): - """ - A dict-like object, that can have additional properties attached. - """ - def __getstate__(self): - """ - Used by pickle (e.g., caching). - Overridden to remove the metadata from the dict, since it shouldn't be - pickled and may in some instances be unpickleable. - """ - return dict(self) - - -class SortedDictWithMetadata(SortedDict): - """ - A sorted dict-like object, that can have additional properties attached. - """ - def __getstate__(self): - """ - Used by pickle (e.g., caching). - Overriden to remove the metadata from the dict, since it shouldn't be - pickle and may in some instances be unpickleable. - """ - return SortedDict(self).__dict__ - - -def _is_protected_type(obj): - """ - True if the object is a native datatype that does not need to - be serialized further. - """ - return isinstance(obj, ( - types.NoneType, - int, long, - datetime.datetime, datetime.date, datetime.time, - float, Decimal, - basestring) - ) - - -def _get_declared_fields(bases, attrs): - """ - Create a list of serializer field instances from the passed in 'attrs', - plus any fields on the base classes (in 'bases'). - - Note that all fields from the base classes are used. - """ - fields = [(field_name, attrs.pop(field_name)) - for field_name, obj in list(six.iteritems(attrs)) - if isinstance(obj, Field)] - fields.sort(key=lambda x: x[1].creation_counter) - - # If this class is subclassing another Serializer, add that Serializer's - # fields. Note that we loop over the bases in *reverse*. This is necessary - # in order to maintain the correct order of fields. - for base in bases[::-1]: - if hasattr(base, 'base_fields'): - fields = list(base.base_fields.items()) + fields - - return SortedDict(fields) - - -class SerializerMetaclass(type): - def __new__(cls, name, bases, attrs): - attrs['base_fields'] = _get_declared_fields(bases, attrs) - return super(SerializerMetaclass, cls).__new__(cls, name, bases, attrs) - - -class SerializerOptions(object): - """ - Meta class options for Serializer - """ - def __init__(self, meta): - self.depth = getattr(meta, 'depth', 0) - self.fields = getattr(meta, 'fields', ()) - self.exclude = getattr(meta, 'exclude', ()) - - -class BaseSerializer(WritableField): - """ - This is the Serializer implementation. - We need to implement it as `BaseSerializer` due to metaclass magicks. - """ - class Meta(object): - pass - - _options_class = SerializerOptions - _dict_class = SortedDictWithMetadata - - def __init__(self, instance=None, data=None, files=None, - context=None, partial=False, many=False, - allow_add_remove=False, **kwargs): - super(BaseSerializer, self).__init__(**kwargs) - self.opts = self._options_class(self.Meta) - self.parent = None - self.root = None - self.partial = partial - self.many = many - self.allow_add_remove = allow_add_remove - - self.context = context or {} - - self.init_data = data - self.init_files = files - self.object = instance - self.fields = self.get_fields() - - self._data = None - self._files = None - self._errors = None - - if many and instance is not None and not hasattr(instance, '__iter__'): - raise ValueError('instance should be a queryset or other iterable with many=True') - - if allow_add_remove and not many: - raise ValueError('allow_add_remove should only be used for bulk updates, but you have not set many=True') - - ##### - # Methods to determine which fields to use when (de)serializing objects. - - def get_default_fields(self): - """ - Return the complete set of default fields for the object, as a dict. - """ - return {} - - def get_fields(self): - """ - Returns the complete set of fields for the object as a dict. - - This will be the set of any explicitly declared fields, - plus the set of fields returned by get_default_fields(). - """ - ret = SortedDict() - - # Get the explicitly declared fields - base_fields = copy.deepcopy(self.base_fields) - for key, field in base_fields.items(): - ret[key] = field - - # Add in the default fields - default_fields = self.get_default_fields() - for key, val in default_fields.items(): - if key not in ret: - ret[key] = val - - # If 'fields' is specified, use those fields, in that order. - if self.opts.fields: - assert isinstance(self.opts.fields, (list, tuple)), '`fields` must be a list or tuple' - new = SortedDict() - for key in self.opts.fields: - new[key] = ret[key] - ret = new - - # Remove anything in 'exclude' - if self.opts.exclude: - assert isinstance(self.opts.exclude, (list, tuple)), '`exclude` must be a list or tuple' - for key in self.opts.exclude: - ret.pop(key, None) - - for key, field in ret.items(): - field.initialize(parent=self, field_name=key) - - return ret - - ##### - # Methods to convert or revert from objects <--> primitive representations. - - def get_field_key(self, field_name): - """ - Return the key that should be used for a given field. - """ - return field_name - - def restore_fields(self, data, files): - """ - Core of deserialization, together with `restore_object`. - Converts a dictionary of data into a dictionary of deserialized fields. - """ - reverted_data = {} - - if data is not None and not isinstance(data, dict): - self._errors['non_field_errors'] = ['Invalid data'] - return None - - for field_name, field in self.fields.items(): - field.initialize(parent=self, field_name=field_name) - try: - field.field_from_native(data, files, field_name, reverted_data) - except ValidationError as err: - self._errors[field_name] = list(err.messages) - - return reverted_data - - def perform_validation(self, attrs): - """ - Run `validate_()` and `validate()` methods on the serializer - """ - for field_name, field in self.fields.items(): - if field_name in self._errors: - continue - - source = field.source or field_name - if self.partial and source not in attrs: - continue - try: - validate_method = getattr(self, 'validate_%s' % field_name, None) - if validate_method: - attrs = validate_method(attrs, source) - except ValidationError as err: - self._errors[field_name] = self._errors.get(field_name, []) + list(err.messages) - - # If there are already errors, we don't run .validate() because - # field-validation failed and thus `attrs` may not be complete. - # which in turn can cause inconsistent validation errors. - if not self._errors: - try: - attrs = self.validate(attrs) - except ValidationError as err: - if hasattr(err, 'message_dict'): - for field_name, error_messages in err.message_dict.items(): - self._errors[field_name] = self._errors.get(field_name, []) + list(error_messages) - elif hasattr(err, 'messages'): - self._errors['non_field_errors'] = err.messages - - return attrs - - def validate(self, attrs): - """ - Stub method, to be overridden in Serializer subclasses - """ - return attrs - - def restore_object(self, attrs, instance=None): - """ - Deserialize a dictionary of attributes into an object instance. - You should override this method to control how deserialized objects - are instantiated. - """ - if instance is not None: - instance.update(attrs) - return instance - return attrs - - def to_native(self, obj): - """ - Serialize objects -> primitives. - """ - ret = self._dict_class() - ret.fields = self._dict_class() - - for field_name, field in self.fields.items(): - if field.read_only and obj is None: - continue - field.initialize(parent=self, field_name=field_name) - key = self.get_field_key(field_name) - value = field.field_to_native(obj, field_name) - method = getattr(self, 'transform_%s' % field_name, None) - if callable(method): - value = method(obj, value) - if not getattr(field, 'write_only', False): - ret[key] = value - ret.fields[key] = self.augment_field(field, field_name, key, value) - - return ret - - def from_native(self, data, files=None): - """ - Deserialize primitives -> objects. - """ - self._errors = {} - - if data is not None or files is not None: - attrs = self.restore_fields(data, files) - if attrs is not None: - attrs = self.perform_validation(attrs) - else: - self._errors['non_field_errors'] = ['No input provided'] - - if not self._errors: - return self.restore_object(attrs, instance=getattr(self, 'object', None)) - - def augment_field(self, field, field_name, key, value): - # This horrible stuff is to manage serializers rendering to HTML - field._errors = self._errors.get(key) if self._errors else None - field._name = field_name - field._value = self.init_data.get(key) if self._errors and self.init_data else value - if not field.label: - field.label = pretty_name(key) - return field - - def field_to_native(self, obj, field_name): - """ - Override default so that the serializer can be used as a nested field - across relationships. - """ - if self.write_only: - return None - - if self.source == '*': - return self.to_native(obj) - - # Get the raw field value - try: - source = self.source or field_name - value = obj - - for component in source.split('.'): - if value is None: - break - value = get_component(value, component) - except ObjectDoesNotExist: - return None - - if is_simple_callable(getattr(value, 'all', None)): - return [self.to_native(item) for item in value.all()] - - if value is None: - return None - - if self.many: - return [self.to_native(item) for item in value] - return self.to_native(value) - - def field_from_native(self, data, files, field_name, into): - """ - Override default so that the serializer can be used as a writable - nested field across relationships. - """ - if self.read_only: - return - - try: - value = data[field_name] - except KeyError: - if self.default is not None and not self.partial: - # Note: partial updates shouldn't set defaults - value = copy.deepcopy(self.default) - else: - if self.required: - raise ValidationError(self.error_messages['required']) - return - - if self.source == '*': - if value: - reverted_data = self.restore_fields(value, {}) - if not self._errors: - into.update(reverted_data) - else: - if value in (None, ''): - into[(self.source or field_name)] = None - else: - # Set the serializer object if it exists - obj = get_component(self.parent.object, self.source or field_name) if self.parent.object else None - - # If we have a model manager or similar object then we need - # to iterate through each instance. - if ( - self.many and - not hasattr(obj, '__iter__') and - is_simple_callable(getattr(obj, 'all', None)) - ): - obj = obj.all() - - kwargs = { - 'instance': obj, - 'data': value, - 'context': self.context, - 'partial': self.partial, - 'many': self.many, - 'allow_add_remove': self.allow_add_remove - } - serializer = self.__class__(**kwargs) - - if serializer.is_valid(): - into[self.source or field_name] = serializer.object - else: - # Propagate errors up to our parent - raise NestedValidationError(serializer.errors) - - def get_identity(self, data): - """ - This hook is required for bulk update. - It is used to determine the canonical identity of a given object. - - Note that the data has not been validated at this point, so we need - to make sure that we catch any cases of incorrect datatypes being - passed to this method. - """ - try: - return data.get('id', None) - except AttributeError: - return None - - @property - def errors(self): - """ - Run deserialization and return error data, - setting self.object if no errors occurred. - """ - if self._errors is None: - data, files = self.init_data, self.init_files - - if self.many is not None: - many = self.many - else: - many = hasattr(data, '__iter__') and not isinstance(data, (Page, dict, six.text_type)) - if many: - warnings.warn('Implicit list/queryset serialization is deprecated. ' - 'Use the `many=True` flag when instantiating the serializer.', - DeprecationWarning, stacklevel=3) - - if many: - ret = RelationsList() - errors = [] - update = self.object is not None - - if update: - # If this is a bulk update we need to map all the objects - # to a canonical identity so we can determine which - # individual object is being updated for each item in the - # incoming data - objects = self.object - identities = [self.get_identity(self.to_native(obj)) for obj in objects] - identity_to_objects = dict(zip(identities, objects)) - - if hasattr(data, '__iter__') and not isinstance(data, (dict, six.text_type)): - for item in data: - if update: - # Determine which object we're updating - identity = self.get_identity(item) - self.object = identity_to_objects.pop(identity, None) - if self.object is None and not self.allow_add_remove: - ret.append(None) - errors.append({'non_field_errors': ['Cannot create a new item, only existing items may be updated.']}) - continue - - ret.append(self.from_native(item, None)) - errors.append(self._errors) - - if update and self.allow_add_remove: - ret._deleted = identity_to_objects.values() - - self._errors = any(errors) and errors or [] - else: - self._errors = {'non_field_errors': ['Expected a list of items.']} - else: - ret = self.from_native(data, files) - - if not self._errors: - self.object = ret - - return self._errors - - def is_valid(self): - return not self.errors - - @property - def data(self): - """ - Returns the serialized data on the serializer. - """ - if self._data is None: - obj = self.object - - if self.many is not None: - many = self.many - else: - many = hasattr(obj, '__iter__') and not isinstance(obj, (Page, dict)) - if many: - warnings.warn('Implicit list/queryset serialization is deprecated. ' - 'Use the `many=True` flag when instantiating the serializer.', - DeprecationWarning, stacklevel=2) - - if many: - self._data = [self.to_native(item) for item in obj] - else: - self._data = self.to_native(obj) - - return self._data - - def save_object(self, obj, **kwargs): - obj.save(**kwargs) - - def delete_object(self, obj): - obj.delete() - - def save(self, **kwargs): - """ - Save the deserialized object and return it. - """ - # Clear cached _data, which may be invalidated by `save()` - self._data = None - - if isinstance(self.object, list): - [self.save_object(item, **kwargs) for item in self.object] - - if self.object._deleted: - [self.delete_object(item) for item in self.object._deleted] - else: - self.save_object(self.object, **kwargs) - - return self.object - - def metadata(self): - """ - Return a dictionary of metadata about the fields on the serializer. - Useful for things like responding to OPTIONS requests, or generating - API schemas for auto-documentation. - """ - return SortedDict( - [ - (field_name, field.metadata()) - for field_name, field in six.iteritems(self.fields) - ] - ) - - -class Serializer(six.with_metaclass(SerializerMetaclass, BaseSerializer)): - pass - - -class ModelSerializerOptions(SerializerOptions): +class ModelSerializerOptions(object): """ Meta class options for ModelSerializer """ def __init__(self, meta): - super(ModelSerializerOptions, self).__init__(meta) - self.model = getattr(meta, 'model', None) - self.read_only_fields = getattr(meta, 'read_only_fields', ()) - self.write_only_fields = getattr(meta, 'write_only_fields', ()) + self.model = getattr(meta, 'model') + self.fields = getattr(meta, 'fields', ()) + self.depth = getattr(meta, 'depth', 0) class ModelSerializer(Serializer): - """ - A serializer that deals with model instances and querysets. - """ - _options_class = ModelSerializerOptions - field_mapping = { models.AutoField: IntegerField, - models.FloatField: FloatField, + # models.FloatField: FloatField, models.IntegerField: IntegerField, models.PositiveIntegerField: IntegerField, models.SmallIntegerField: IntegerField, models.PositiveSmallIntegerField: IntegerField, - models.DateTimeField: DateTimeField, - models.DateField: DateField, - models.TimeField: TimeField, - models.DecimalField: DecimalField, - models.EmailField: EmailField, + # models.DateTimeField: DateTimeField, + # models.DateField: DateField, + # models.TimeField: TimeField, + # models.DecimalField: DecimalField, + # models.EmailField: EmailField, models.CharField: CharField, - models.URLField: URLField, - models.SlugField: SlugField, + # models.URLField: URLField, + # models.SlugField: SlugField, models.TextField: CharField, models.CommaSeparatedIntegerField: CharField, models.BooleanField: BooleanField, models.NullBooleanField: BooleanField, - models.FileField: FileField, - models.ImageField: ImageField, + # models.FileField: FileField, + # models.ImageField: ImageField, } + _options_class = ModelSerializerOptions + + def __init__(self, *args, **kwargs): + self.opts = self._options_class(self.Meta) + super(ModelSerializer, self).__init__(*args, **kwargs) + + def get_fields(self): + # Get the explicitly declared fields. + fields = copy.deepcopy(self.base_fields) + + # Add in the default fields. + for key, val in self.get_default_fields().items(): + if key not in fields: + fields[key] = val + + # If `fields` is set on the `Meta` class, + # then use only those fields, and in that order. + if self.opts.fields: + fields = OrderedDict([ + (key, fields[key]) for key in self.opts.fields + ]) + + return fields + def get_default_fields(self): """ Return all the fields that should be serialized for the model. """ - cls = self.opts.model - assert cls is not None, ( - "Serializer class '%s' is missing 'model' Meta option" % - self.__class__.__name__ - ) opts = cls._meta.concrete_model._meta - ret = SortedDict() + ret = OrderedDict() nested = bool(self.opts.depth) # Deal with adding the primary key field @@ -694,29 +391,9 @@ class ModelSerializer(Serializer): has_through_model = True if model_field.rel and nested: - if len(inspect.getargspec(self.get_nested_field).args) == 2: - warnings.warn( - 'The `get_nested_field(model_field)` call signature ' - 'is deprecated. ' - 'Use `get_nested_field(model_field, related_model, ' - 'to_many) instead', - DeprecationWarning - ) - field = self.get_nested_field(model_field) - else: - field = self.get_nested_field(model_field, related_model, to_many) + field = self.get_nested_field(model_field, related_model, to_many) elif model_field.rel: - if len(inspect.getargspec(self.get_nested_field).args) == 3: - warnings.warn( - 'The `get_related_field(model_field, to_many)` call ' - 'signature is deprecated. ' - 'Use `get_related_field(model_field, related_model, ' - 'to_many) instead', - DeprecationWarning - ) - field = self.get_related_field(model_field, to_many=to_many) - else: - field = self.get_related_field(model_field, related_model, to_many) + field = self.get_related_field(model_field, related_model, to_many) else: field = self.get_field(model_field) @@ -763,38 +440,6 @@ class ModelSerializer(Serializer): ret[accessor_name] = field - # Ensure that 'read_only_fields' is an iterable - assert isinstance(self.opts.read_only_fields, (list, tuple)), '`read_only_fields` must be a list or tuple' - - # Add the `read_only` flag to any fields that have been specified - # in the `read_only_fields` option - for field_name in self.opts.read_only_fields: - assert field_name not in self.base_fields.keys(), ( - "field '%s' on serializer '%s' specified in " - "`read_only_fields`, but also added " - "as an explicit field. Remove it from `read_only_fields`." % - (field_name, self.__class__.__name__)) - assert field_name in ret, ( - "Non-existant field '%s' specified in `read_only_fields` " - "on serializer '%s'." % - (field_name, self.__class__.__name__)) - ret[field_name].read_only = True - - # Ensure that 'write_only_fields' is an iterable - assert isinstance(self.opts.write_only_fields, (list, tuple)), '`write_only_fields` must be a list or tuple' - - for field_name in self.opts.write_only_fields: - assert field_name not in self.base_fields.keys(), ( - "field '%s' on serializer '%s' specified in " - "`write_only_fields`, but also added " - "as an explicit field. Remove it from `write_only_fields`." % - (field_name, self.__class__.__name__)) - assert field_name in ret, ( - "Non-existant field '%s' specified in `write_only_fields` " - "on serializer '%s'." % - (field_name, self.__class__.__name__)) - ret[field_name].write_only = True - return ret def get_pk_field(self, model_field): @@ -825,28 +470,24 @@ class ModelSerializer(Serializer): # TODO: filter queryset using: # .using(db).complex_filter(self.rel.limit_choices_to) - kwargs = { - 'queryset': related_model._default_manager, - 'many': to_many - } + kwargs = {} + # 'queryset': related_model._default_manager, + # 'many': to_many + # } if model_field: kwargs['required'] = not(model_field.null or model_field.blank) - if model_field.help_text is not None: - kwargs['help_text'] = model_field.help_text + # if model_field.help_text is not None: + # kwargs['help_text'] = model_field.help_text if model_field.verbose_name is not None: kwargs['label'] = model_field.verbose_name - if not model_field.editable: kwargs['read_only'] = True - if model_field.verbose_name is not None: kwargs['label'] = model_field.verbose_name - if model_field.help_text is not None: - kwargs['help_text'] = model_field.help_text - - return PrimaryKeyRelatedField(**kwargs) + return IntegerField(**kwargs) + # TODO: return PrimaryKeyRelatedField(**kwargs) def get_field(self, model_field): """ @@ -869,8 +510,8 @@ class ModelSerializer(Serializer): if model_field.verbose_name is not None: kwargs['label'] = model_field.verbose_name - if model_field.help_text is not None: - kwargs['help_text'] = model_field.help_text + # if model_field.help_text is not None: + # kwargs['help_text'] = model_field.help_text # TODO: TypedChoiceField? if model_field.flatchoices: # This ModelField contains choices @@ -880,7 +521,7 @@ class ModelSerializer(Serializer): return ChoiceField(**kwargs) # put this below the ChoiceField because min_value isn't a valid initializer - if issubclass(model_field.__class__, models.PositiveIntegerField) or\ + if issubclass(model_field.__class__, models.PositiveIntegerField) or \ issubclass(model_field.__class__, models.PositiveSmallIntegerField): kwargs['min_value'] = 0 @@ -888,170 +529,27 @@ class ModelSerializer(Serializer): issubclass(model_field.__class__, (models.CharField, models.TextField)): kwargs['allow_none'] = True - attribute_dict = { - models.CharField: ['max_length'], - models.CommaSeparatedIntegerField: ['max_length'], - models.DecimalField: ['max_digits', 'decimal_places'], - models.EmailField: ['max_length'], - models.FileField: ['max_length'], - models.ImageField: ['max_length'], - models.SlugField: ['max_length'], - models.URLField: ['max_length'], - } + # attribute_dict = { + # models.CharField: ['max_length'], + # models.CommaSeparatedIntegerField: ['max_length'], + # models.DecimalField: ['max_digits', 'decimal_places'], + # models.EmailField: ['max_length'], + # models.FileField: ['max_length'], + # models.ImageField: ['max_length'], + # models.SlugField: ['max_length'], + # models.URLField: ['max_length'], + # } - if model_field.__class__ in attribute_dict: - attributes = attribute_dict[model_field.__class__] - for attribute in attributes: - kwargs.update({attribute: getattr(model_field, attribute)}) + # if model_field.__class__ in attribute_dict: + # attributes = attribute_dict[model_field.__class__] + # for attribute in attributes: + # kwargs.update({attribute: getattr(model_field, attribute)}) try: return self.field_mapping[model_field.__class__](**kwargs) except KeyError: - return ModelField(model_field=model_field, **kwargs) - - def get_validation_exclusions(self, instance=None): - """ - Return a list of field names to exclude from model validation. - """ - cls = self.opts.model - opts = cls._meta.concrete_model._meta - exclusions = [field.name for field in opts.fields + opts.many_to_many] - - for field_name, field in self.fields.items(): - field_name = field.source or field_name - if ( - field_name in exclusions - and not field.read_only - and (field.required or hasattr(instance, field_name)) - and not isinstance(field, Serializer) - ): - exclusions.remove(field_name) - return exclusions - - def full_clean(self, instance): - """ - Perform Django's full_clean, and populate the `errors` dictionary - if any validation errors occur. - - Note that we don't perform this inside the `.restore_object()` method, - so that subclasses can override `.restore_object()`, and still get - the full_clean validation checking. - """ - try: - instance.full_clean(exclude=self.get_validation_exclusions(instance)) - except ValidationError as err: - self._errors = err.message_dict - return None - return instance - - def restore_object(self, attrs, instance=None): - """ - Restore the model instance. - """ - m2m_data = {} - related_data = {} - nested_forward_relations = {} - meta = self.opts.model._meta - - # Reverse fk or one-to-one relations - for (obj, model) in meta.get_all_related_objects_with_model(): - field_name = obj.get_accessor_name() - if field_name in attrs: - related_data[field_name] = attrs.pop(field_name) - - # Reverse m2m relations - for (obj, model) in meta.get_all_related_m2m_objects_with_model(): - field_name = obj.get_accessor_name() - if field_name in attrs: - m2m_data[field_name] = attrs.pop(field_name) - - # Forward m2m relations - for field in meta.many_to_many + meta.virtual_fields: - if isinstance(field, GenericForeignKey): - continue - if field.name in attrs: - m2m_data[field.name] = attrs.pop(field.name) - - # Nested forward relations - These need to be marked so we can save - # them before saving the parent model instance. - for field_name in attrs.keys(): - if isinstance(self.fields.get(field_name, None), Serializer): - nested_forward_relations[field_name] = attrs[field_name] - - # Create an empty instance of the model - if instance is None: - instance = self.opts.model() - - for key, val in attrs.items(): - try: - setattr(instance, key, val) - except ValueError: - self._errors[key] = [self.error_messages['required']] - - # Any relations that cannot be set until we've - # saved the model get hidden away on these - # private attributes, so we can deal with them - # at the point of save. - instance._related_data = related_data - instance._m2m_data = m2m_data - instance._nested_forward_relations = nested_forward_relations - - return instance - - def from_native(self, data, files): - """ - Override the default method to also include model field validation. - """ - instance = super(ModelSerializer, self).from_native(data, files) - if not self._errors: - return self.full_clean(instance) - - def save_object(self, obj, **kwargs): - """ - Save the deserialized object. - """ - if getattr(obj, '_nested_forward_relations', None): - # Nested relationships need to be saved before we can save the - # parent instance. - for field_name, sub_object in obj._nested_forward_relations.items(): - if sub_object: - self.save_object(sub_object) - setattr(obj, field_name, sub_object) - - obj.save(**kwargs) - - if getattr(obj, '_m2m_data', None): - for accessor_name, object_list in obj._m2m_data.items(): - setattr(obj, accessor_name, object_list) - del(obj._m2m_data) - - if getattr(obj, '_related_data', None): - related_fields = dict([ - (field.get_accessor_name(), field) - for field, model - in obj._meta.get_all_related_objects_with_model() - ]) - for accessor_name, related in obj._related_data.items(): - if isinstance(related, RelationsList): - # Nested reverse fk relationship - for related_item in related: - fk_field = related_fields[accessor_name].field.name - setattr(related_item, fk_field, obj) - self.save_object(related_item) - - # Delete any removed objects - if related._deleted: - [self.delete_object(item) for item in related._deleted] - - elif isinstance(related, models.Model): - # Nested reverse one-one relationship - fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name - setattr(related, fk_field, obj) - self.save_object(related) - else: - # Reverse FK or reverse one-one - setattr(obj, accessor_name, related) - del(obj._related_data) + # TODO: Change this to `return ModelField(model_field=model_field, **kwargs)` + return CharField(**kwargs) class HyperlinkedModelSerializerOptions(ModelSerializerOptions): @@ -1066,14 +564,10 @@ class HyperlinkedModelSerializerOptions(ModelSerializerOptions): class HyperlinkedModelSerializer(ModelSerializer): - """ - A subclass of ModelSerializer that uses hyperlinked relationships, - instead of primary key relationships. - """ _options_class = HyperlinkedModelSerializerOptions _default_view_name = '%(model_name)s-detail' - _hyperlink_field_class = HyperlinkedRelatedField - _hyperlink_identify_field_class = HyperlinkedIdentityField + #_hyperlink_field_class = HyperlinkedRelatedField + #_hyperlink_identify_field_class = HyperlinkedIdentityField def get_default_fields(self): fields = super(HyperlinkedModelSerializer, self).get_default_fields() @@ -1081,15 +575,15 @@ class HyperlinkedModelSerializer(ModelSerializer): if self.opts.view_name is None: self.opts.view_name = self._get_default_view_name(self.opts.model) - if self.opts.url_field_name not in fields: - url_field = self._hyperlink_identify_field_class( - view_name=self.opts.view_name, - lookup_field=self.opts.lookup_field - ) - ret = self._dict_class() - ret[self.opts.url_field_name] = url_field - ret.update(fields) - fields = ret + # if self.opts.url_field_name not in fields: + # url_field = self._hyperlink_identify_field_class( + # view_name=self.opts.view_name, + # lookup_field=self.opts.lookup_field + # ) + # ret = self._dict_class() + # ret[self.opts.url_field_name] = url_field + # ret.update(fields) + # fields = ret return fields @@ -1103,33 +597,25 @@ class HyperlinkedModelSerializer(ModelSerializer): """ # TODO: filter queryset using: # .using(db).complex_filter(self.rel.limit_choices_to) - kwargs = { - 'queryset': related_model._default_manager, - 'view_name': self._get_default_view_name(related_model), - 'many': to_many - } + # kwargs = { + # 'queryset': related_model._default_manager, + # 'view_name': self._get_default_view_name(related_model), + # 'many': to_many + # } + kwargs = {} if model_field: kwargs['required'] = not(model_field.null or model_field.blank) - if model_field.help_text is not None: - kwargs['help_text'] = model_field.help_text + # if model_field.help_text is not None: + # kwargs['help_text'] = model_field.help_text if model_field.verbose_name is not None: kwargs['label'] = model_field.verbose_name - if self.opts.lookup_field: - kwargs['lookup_field'] = self.opts.lookup_field + return IntegerField(**kwargs) + # if self.opts.lookup_field: + # kwargs['lookup_field'] = self.opts.lookup_field - return self._hyperlink_field_class(**kwargs) - - def get_identity(self, data): - """ - This hook is required for bulk update. - We need to override the default, to use the url as the identity. - """ - try: - return data.get(self.opts.url_field_name, None) - except AttributeError: - return None + # return self._hyperlink_field_class(**kwargs) def _get_default_view_name(self, model): """ diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 00ffdfbae..6a2f61266 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -7,7 +7,7 @@ from django.db.models.query import QuerySet from django.utils.datastructures import SortedDict from django.utils.functional import Promise from rest_framework.compat import force_text -from rest_framework.serializers import DictWithMetadata, SortedDictWithMetadata +# from rest_framework.serializers import DictWithMetadata, SortedDictWithMetadata import datetime import decimal import types @@ -106,14 +106,14 @@ else: SortedDict, yaml.representer.SafeRepresenter.represent_dict ) - SafeDumper.add_representer( - DictWithMetadata, - yaml.representer.SafeRepresenter.represent_dict - ) - SafeDumper.add_representer( - SortedDictWithMetadata, - yaml.representer.SafeRepresenter.represent_dict - ) + # SafeDumper.add_representer( + # DictWithMetadata, + # yaml.representer.SafeRepresenter.represent_dict + # ) + # SafeDumper.add_representer( + # SortedDictWithMetadata, + # yaml.representer.SafeRepresenter.represent_dict + # ) SafeDumper.add_representer( types.GeneratorType, yaml.representer.SafeRepresenter.represent_list diff --git a/rest_framework/utils/html.py b/rest_framework/utils/html.py new file mode 100644 index 000000000..bf17050df --- /dev/null +++ b/rest_framework/utils/html.py @@ -0,0 +1,86 @@ +""" +Helpers for dealing with HTML input. +""" + +def is_html_input(dictionary): + # MultiDict type datastructures are used to represent HTML form input, + # which may have more than one value for each key. + return hasattr(dictionary, 'getlist') + + +def parse_html_list(dictionary, prefix=''): + """ + Used to suport list values in HTML forms. + Supports lists of primitives and/or dictionaries. + + * List of primitives. + + { + '[0]': 'abc', + '[1]': 'def', + '[2]': 'hij' + } + --> + [ + 'abc', + 'def', + 'hij' + ] + + * List of dictionaries. + + { + '[0]foo': 'abc', + '[0]bar': 'def', + '[1]foo': 'hij', + '[2]bar': 'klm', + } + --> + [ + {'foo': 'abc', 'bar': 'def'}, + {'foo': 'hij', 'bar': 'klm'} + ] + """ + Dict = type(dictionary) + ret = {} + regex = re.compile(r'^%s\[([0-9]+)\](.*)$' % re.escape(prefix)) + for field, value in dictionary.items(): + match = regex.match(field) + if not match: + continue + index, key = match.groups() + index = int(index) + if not key: + ret[index] = value + elif isinstance(ret.get(index), dict): + ret[index][key] = value + else: + ret[index] = Dict({key: value}) + return [ret[item] for item in sorted(ret.keys())] + + +def parse_html_dict(dictionary, prefix): + """ + Used to support dictionary values in HTML forms. + + { + 'profile.username': 'example', + 'profile.email': 'example@example.com', + } + --> + { + 'profile': { + 'username': 'example, + 'email': 'example@example.com' + } + } + """ + ret = {} + regex = re.compile(r'^%s\.(.+)$' % re.escape(prefix)) + for field, value in dictionary.items(): + match = regex.match(field) + if not match: + continue + key = match.groups()[0] + ret[key] = value + return ret From b554c67d14fb0464106a247e5da96af80b819be9 Mon Sep 17 00:00:00 2001 From: Daniel Roseman Date: Sat, 30 Aug 2014 13:28:12 +0100 Subject: [PATCH 0742/1652] Restore body block to base template. --- rest_framework/templates/rest_framework/base.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index cee9724d5..e54e38148 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -25,6 +25,7 @@ {% endblock %} + {% block body %}
    @@ -261,4 +262,5 @@ {% endblock %} + {% endblock %} From 4dd4538069bb0cdf27db09799bc99933dd2972e1 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Sun, 31 Aug 2014 03:39:34 +0200 Subject: [PATCH 0743/1652] Exclude the pyc, pyo files and __pycache__ directories from packaging (thanks to Kevin Brown). --- MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 15c4d0b08..d407865fb 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,4 @@ recursive-include rest_framework/static *.js *.css *.png recursive-include rest_framework/templates *.html +recursive-exclude * __pycache__ +recursive-exclude * *.py[co] From 1c9c5d5c32656231acf5f14b5231f9274a2eb254 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Mon, 1 Sep 2014 10:07:05 +0200 Subject: [PATCH 0744/1652] Regression for #1810: Test login view renders --- rest_framework/urls.py | 2 +- tests/conftest.py | 1 + tests/test_authentication.py | 13 ++++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rest_framework/urls.py b/rest_framework/urls.py index 8fa3073e8..cfcee534b 100644 --- a/rest_framework/urls.py +++ b/rest_framework/urls.py @@ -6,7 +6,7 @@ your API requires authentication: urlpatterns = patterns('', ... - url(r'^auth', include('rest_framework.urls', namespace='rest_framework')) + url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')) ) The urls must be namespaced as 'rest_framework', and you should make sure diff --git a/tests/conftest.py b/tests/conftest.py index f3723aeae..4b33e19c1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,6 +5,7 @@ def pytest_configure(): DEBUG_PROPAGATE_EXCEPTIONS=True, DATABASES={'default': {'ENGINE': 'django.db.backends.sqlite3', 'NAME': ':memory:'}}, + SITE_ID=1, SECRET_KEY='not very secret in tests', USE_I18N=True, USE_L10N=True, diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 2b9d73e4c..8294189e0 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -57,7 +57,8 @@ urlpatterns = patterns( authentication_classes=[OAuthAuthentication], permission_classes=[permissions.TokenHasReadWriteScope] ) - ) + ), + url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')) ) @@ -134,6 +135,16 @@ class SessionAuthTests(TestCase): def tearDown(self): self.csrf_client.logout() + def test_login_view_renders_on_get(self): + """ + Ensure the login template renders for a basic GET. + + cf. [#1810](https://github.com/tomchristie/django-rest-framework/pull/1810) + """ + response = self.csrf_client.get('/auth/login/') + self.assertContains(response, '') + + def test_post_form_session_auth_failing_csrf(self): """ Ensure POSTing form over session authentication without CSRF token fails. From 55e779c856347094e3240bc7bf83927acf0bd442 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 1 Sep 2014 09:07:55 +0100 Subject: [PATCH 0745/1652] Version 2.4.1 --- docs/topics/release-notes.md | 6 ++++++ rest_framework/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 29a0afcd3..f0e9f2101 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,12 @@ You can determine your currently installed version using `pip freeze`: ## 2.4.x series +### 2.4.1 + +**Date**: 1st September 2014 + +* Bugfix: Fix broken login template for browsable API. + ### 2.4.0 **Date**: 29th August 2014 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index f95bdc22e..7c187639c 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '2.4.0' +__version__ = '2.4.1' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2014 Tom Christie' From 0e51dab8f4cdfeb05b7c70a0ca74ffa90d01f512 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Mon, 1 Sep 2014 10:09:46 +0200 Subject: [PATCH 0746/1652] Comform to flake8 --- tests/test_authentication.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 8294189e0..32041f9c1 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -144,7 +144,6 @@ class SessionAuthTests(TestCase): response = self.csrf_client.get('/auth/login/') self.assertContains(response, '') - def test_post_form_session_auth_failing_csrf(self): """ Ensure POSTing form over session authentication without CSRF token fails. From 278df84a7ceca29b0f3ffa6f3c87b4babe70fad0 Mon Sep 17 00:00:00 2001 From: Timo Tuominen Date: Mon, 1 Sep 2014 12:14:26 +0300 Subject: [PATCH 0747/1652] Correct testing documentation details. --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff6018b82..a6dd05a0e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,10 +62,10 @@ To run the tests, clone the repository, and then: virtualenv env env/bin/activate pip install -r requirements.txt - pip install -r optionals.txt + pip install -r requirements-test.txt # Run the tests - py.test + ./runtests.py You can also use the excellent [`tox`][tox] testing tool to run the tests against all supported versions of Python and Django. Install `tox` globally, and then simply run: From 82d4b2083292659358d5df4d03d2115576e8ae4e Mon Sep 17 00:00:00 2001 From: Timo Tuominen Date: Mon, 1 Sep 2014 12:17:36 +0300 Subject: [PATCH 0748/1652] Add subclass matching to serializer field mapping. --- rest_framework/serializers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index be8ad3f24..6d25161e2 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -907,6 +907,9 @@ class ModelSerializer(Serializer): try: return self.field_mapping[model_field.__class__](**kwargs) except KeyError: + for model_field_class, serializer_field_class in self.field_mapping.items(): + if isinstance(model_field, model_field_class): + return serializer_field_class(**kwargs) return ModelField(model_field=model_field, **kwargs) def get_validation_exclusions(self, instance=None): From ae84b8b0e8a99261ea2436f77ab5238f21603c0c Mon Sep 17 00:00:00 2001 From: Timo Tuominen Date: Mon, 1 Sep 2014 15:03:39 +0300 Subject: [PATCH 0749/1652] Traverse the method resolution order when mapping serializer fields. --- rest_framework/serializers.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 6d25161e2..f37fbf980 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -904,13 +904,11 @@ class ModelSerializer(Serializer): for attribute in attributes: kwargs.update({attribute: getattr(model_field, attribute)}) - try: - return self.field_mapping[model_field.__class__](**kwargs) - except KeyError: - for model_field_class, serializer_field_class in self.field_mapping.items(): - if isinstance(model_field, model_field_class): - return serializer_field_class(**kwargs) - return ModelField(model_field=model_field, **kwargs) + for model_field_baseclass in inspect.getmro(model_field.__class__): + serializer_field_class = self.field_mapping.get(model_field_baseclass) + if serializer_field_class: + return serializer_field_class(**kwargs) + return ModelField(model_field=model_field, **kwargs) def get_validation_exclusions(self, instance=None): """ From 582f6fdd4b0fb12a7c0d1fefe265499a284c9b79 Mon Sep 17 00:00:00 2001 From: Timo Tuominen Date: Mon, 1 Sep 2014 15:54:33 +0300 Subject: [PATCH 0750/1652] Add utility function to match classes in dictionary. --- rest_framework/serializers.py | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index f37fbf980..5c33300c4 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -625,6 +625,21 @@ class ModelSerializerOptions(SerializerOptions): self.write_only_fields = getattr(meta, 'write_only_fields', ()) +def _get_class_mapping(mapping, obj): + """ + Takes a dictionary with classes as keys, and an object. + Traverses the object's inheritance hierarchy in method + resolution order, and returns the first matching value + from the dictionary or None. + + """ + for baseclass in inspect.getmro(obj.__class__): + val = mapping.get(baseclass) + if val: + return val + return None + + class ModelSerializer(Serializer): """ A serializer that deals with model instances and querysets. @@ -899,15 +914,16 @@ class ModelSerializer(Serializer): models.URLField: ['max_length'], } - if model_field.__class__ in attribute_dict: - attributes = attribute_dict[model_field.__class__] + attributes = _get_class_mapping(attribute_dict, model_field) + if attributes: for attribute in attributes: kwargs.update({attribute: getattr(model_field, attribute)}) - for model_field_baseclass in inspect.getmro(model_field.__class__): - serializer_field_class = self.field_mapping.get(model_field_baseclass) - if serializer_field_class: - return serializer_field_class(**kwargs) + serializer_field_class = _get_class_mapping( + self.field_mapping, model_field) + + if serializer_field_class: + return serializer_field_class(**kwargs) return ModelField(model_field=model_field, **kwargs) def get_validation_exclusions(self, instance=None): From e437520217e20d500d641b95482d49484b1f24a7 Mon Sep 17 00:00:00 2001 From: Timo Tuominen Date: Mon, 1 Sep 2014 17:02:48 +0300 Subject: [PATCH 0751/1652] Generator implementation of class mapping. --- rest_framework/serializers.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 5c33300c4..b3db35823 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -633,11 +633,10 @@ def _get_class_mapping(mapping, obj): from the dictionary or None. """ - for baseclass in inspect.getmro(obj.__class__): - val = mapping.get(baseclass) - if val: - return val - return None + return next( + (mapping[cls] for cls in inspect.getmro(obj.__class__) if cls in mapping), + None + ) class ModelSerializer(Serializer): From fa0ef1773773c58b5708abad0e90a44fc9a308f8 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 2 Sep 2014 14:53:37 +0200 Subject: [PATCH 0752/1652] Remove Login Dropdown when Auth Views are not registered. Fixes #1738 --- .../templates/rest_framework/base.html | 26 +++----- rest_framework/templatetags/rest_framework.py | 17 +++-- tests/browsable_api/__init__.py | 0 tests/browsable_api/auth_urls.py | 10 +++ tests/browsable_api/no_auth_urls.py | 9 +++ tests/browsable_api/test_browsable_api.py | 65 +++++++++++++++++++ tests/browsable_api/views.py | 15 +++++ 7 files changed, 121 insertions(+), 21 deletions(-) create mode 100644 tests/browsable_api/__init__.py create mode 100644 tests/browsable_api/auth_urls.py create mode 100644 tests/browsable_api/no_auth_urls.py create mode 100644 tests/browsable_api/test_browsable_api.py create mode 100644 tests/browsable_api/views.py diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index e54e38148..5a12277bc 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -5,14 +5,14 @@ {% block head %} - + {% block meta %} {% endblock %} - + {% block title %}Django REST framework{% endblock %} - + {% block style %} {% block bootstrap_theme %} @@ -21,7 +21,7 @@ {% endblock %} - + {% endblock %} @@ -44,15 +44,7 @@
      {% block userlinks %} {% if user.is_authenticated %} -
    • - - {{ user }} - - -
        -
      • {% optional_logout request %}
        • -
      -
      • + {% optional_logout request user %} {% else %}
    • {% optional_login request %}
      • {% endif %} @@ -85,7 +77,7 @@
      GET - +
      {% if display_edit_forms %} - + {% if post_form or raw_data_post_form %}
      {% if post_form %} @@ -190,7 +182,7 @@
    {% endif %} - + {% if put_form or raw_data_put_form or raw_data_patch_form %}
    {% if put_form %} @@ -246,7 +238,7 @@ {% endif %}
    - +
    {% block footer %}

    Sponsored by DabApps.

    diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index b80a7d771..f7332c3b5 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -46,17 +46,26 @@ def optional_login(request): @register.simple_tag -def optional_logout(request): +def optional_logout(request, user): """ Include a logout snippet if REST framework's logout view is in the URLconf. """ try: logout_url = reverse('rest_framework:logout') except NoReverseMatch: - return '' + return '
  • {0}
    • '.format(user) - snippet = "Log out" % (logout_url, escape(request.path)) - return snippet + snippet = """
  • + + {0} + + + +
    • """ + + return snippet.format(user, logout_url, escape(request.path)) @register.simple_tag diff --git a/tests/browsable_api/__init__.py b/tests/browsable_api/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/browsable_api/auth_urls.py b/tests/browsable_api/auth_urls.py new file mode 100644 index 000000000..3cb2d8daf --- /dev/null +++ b/tests/browsable_api/auth_urls.py @@ -0,0 +1,10 @@ +from __future__ import unicode_literals +from django.conf.urls import patterns, url, include + +from views import MockView + +urlpatterns = patterns( + '', + (r'^$', MockView.as_view()), + url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')), +) diff --git a/tests/browsable_api/no_auth_urls.py b/tests/browsable_api/no_auth_urls.py new file mode 100644 index 000000000..d9b9bc43d --- /dev/null +++ b/tests/browsable_api/no_auth_urls.py @@ -0,0 +1,9 @@ +from __future__ import unicode_literals +from django.conf.urls import patterns + +from views import MockView + +urlpatterns = patterns( + '', + (r'^$', MockView.as_view()), +) diff --git a/tests/browsable_api/test_browsable_api.py b/tests/browsable_api/test_browsable_api.py new file mode 100644 index 000000000..61c76b4f7 --- /dev/null +++ b/tests/browsable_api/test_browsable_api.py @@ -0,0 +1,65 @@ +from __future__ import unicode_literals +from django.contrib.auth.models import User +from django.test import TestCase + +from rest_framework.test import APIClient + + +class DropdownWithAuthTests(TestCase): + """Tests correct dropdown behaviour with Auth views enabled.""" + + urls = 'tests.browsable_api.auth_urls' + + def setUp(self): + self.client = APIClient(enforce_csrf_checks=True) + self.username = 'john' + self.email = 'lennon@thebeatles.com' + self.password = 'password' + self.user = User.objects.create_user(self.username, self.email, self.password) + + def tearDown(self): + self.client.logout() + + def test_name_shown_when_logged_in(self): + self.client.login(username=self.username, password=self.password) + response = self.client.get('/') + self.assertContains(response, 'john') + + def test_logout_shown_when_logged_in(self): + self.client.login(username=self.username, password=self.password) + response = self.client.get('/') + self.assertContains(response, '>Log out<') + + def test_login_shown_when_logged_out(self): + response = self.client.get('/') + self.assertContains(response, '>Log in<') + + +class NoDropdownWithoutAuthTests(TestCase): + """Tests correct dropdown behaviour with Auth views enabled.""" + + urls = 'tests.browsable_api.no_auth_urls' + + def setUp(self): + self.client = APIClient(enforce_csrf_checks=True) + self.username = 'john' + self.email = 'lennon@thebeatles.com' + self.password = 'password' + self.user = User.objects.create_user(self.username, self.email, self.password) + + def tearDown(self): + self.client.logout() + + def test_name_shown_when_logged_in(self): + self.client.login(username=self.username, password=self.password) + response = self.client.get('/') + self.assertContains(response, 'john') + + def test_dropdown_not_shown_when_logged_in(self): + self.client.login(username=self.username, password=self.password) + response = self.client.get('/') + self.assertNotContains(response, '
  • ') + + def test_dropdown_not_shown_when_logged_out(self): + response = self.client.get('/') + self.assertNotContains(response, '
  • ') diff --git a/tests/browsable_api/views.py b/tests/browsable_api/views.py new file mode 100644 index 000000000..000f4e804 --- /dev/null +++ b/tests/browsable_api/views.py @@ -0,0 +1,15 @@ +from __future__ import unicode_literals + +from rest_framework.views import APIView +from rest_framework import authentication +from rest_framework import renderers +from rest_framework.response import Response + + +class MockView(APIView): + + authentication_classes = (authentication.SessionAuthentication,) + renderer_classes = (renderers.BrowsableAPIRenderer,) + + def get(self, request): + return Response({'a': 1, 'b': 2, 'c': 3}) From 4836afa89f045263ded91946d43403e807880181 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 2 Sep 2014 15:11:23 +0200 Subject: [PATCH 0753/1652] Fix docstring --- tests/browsable_api/test_browsable_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/browsable_api/test_browsable_api.py b/tests/browsable_api/test_browsable_api.py index 61c76b4f7..5f2647838 100644 --- a/tests/browsable_api/test_browsable_api.py +++ b/tests/browsable_api/test_browsable_api.py @@ -36,7 +36,7 @@ class DropdownWithAuthTests(TestCase): class NoDropdownWithoutAuthTests(TestCase): - """Tests correct dropdown behaviour with Auth views enabled.""" + """Tests correct dropdown behaviour with Auth views NOT enabled.""" urls = 'tests.browsable_api.no_auth_urls' From 1e491c82e6ddf2941d1f8639920c6b5dfd9378f8 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 2 Sep 2014 15:29:21 +0200 Subject: [PATCH 0754/1652] Fix imports --- tests/browsable_api/auth_urls.py | 2 +- tests/browsable_api/no_auth_urls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/browsable_api/auth_urls.py b/tests/browsable_api/auth_urls.py index 3cb2d8daf..bce7dcf91 100644 --- a/tests/browsable_api/auth_urls.py +++ b/tests/browsable_api/auth_urls.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from django.conf.urls import patterns, url, include -from views import MockView +from .views import MockView urlpatterns = patterns( '', diff --git a/tests/browsable_api/no_auth_urls.py b/tests/browsable_api/no_auth_urls.py index d9b9bc43d..5e3604a66 100644 --- a/tests/browsable_api/no_auth_urls.py +++ b/tests/browsable_api/no_auth_urls.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from django.conf.urls import patterns -from views import MockView +from .views import MockView urlpatterns = patterns( '', From ec096a1caceff6a4f5c75a152dd1c7bea9ed281d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 2 Sep 2014 15:07:56 +0100 Subject: [PATCH 0755/1652] Add relations and get tests running --- rest_framework/fields.py | 30 +++++++-- rest_framework/mixins.py | 1 - rest_framework/relations.py | 111 ++++++++++++++++++++++++++++++++++ rest_framework/renderers.py | 14 ++--- rest_framework/serializers.py | 8 +-- rest_framework/utils/html.py | 2 + tests/test_serializer.py | 4 +- 7 files changed, 151 insertions(+), 19 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index a83bf94c4..3e0f7ca47 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -68,7 +68,7 @@ class Field(object): def __init__(self, read_only=False, write_only=False, required=None, default=empty, initial=None, source=None, - label=None, style=None): + label=None, style=None, error_messages=None): self._creation_counter = Field._creation_counter Field._creation_counter += 1 @@ -216,9 +216,11 @@ class CharField(Field): 'blank': 'This field may not be blank.' } - def __init__(self, *args, **kwargs): + def __init__(self, **kwargs): self.allow_blank = kwargs.pop('allow_blank', False) - super(CharField, self).__init__(*args, **kwargs) + self.max_length = kwargs.pop('max_length', None) + self.min_length = kwargs.pop('min_length', None) + super(CharField, self).__init__(**kwargs) def to_native(self, data): if data == '' and not self.allow_blank: @@ -233,7 +235,7 @@ class ChoiceField(Field): } coerce_to_type = str - def __init__(self, *args, **kwargs): + def __init__(self, **kwargs): choices = kwargs.pop('choices') assert choices, '`choices` argument is required and may not be empty' @@ -257,7 +259,7 @@ class ChoiceField(Field): str(key): key for key in self.choices.keys() } - super(ChoiceField, self).__init__(*args, **kwargs) + super(ChoiceField, self).__init__(**kwargs) def to_native(self, data): try: @@ -296,6 +298,24 @@ class IntegerField(Field): return data +class EmailField(CharField): + pass # TODO + + +class RegexField(CharField): + def __init__(self, **kwargs): + self.regex = kwargs.pop('regex') + super(CharField, self).__init__(**kwargs) + + +class DateTimeField(CharField): + pass # TODO + + +class FileField(Field): + pass # TODO + + class MethodField(Field): def __init__(self, **kwargs): kwargs['source'] = '*' diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index ee01cabc7..3e9c9bb33 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -6,7 +6,6 @@ which allows mixin classes to be composed in interesting ways. """ from __future__ import unicode_literals -from django.core.exceptions import ValidationError from django.http import Http404 from rest_framework import status from rest_framework.response import Response diff --git a/rest_framework/relations.py b/rest_framework/relations.py index e69de29bb..42d2c121a 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -0,0 +1,111 @@ +from rest_framework.fields import Field +from django.core.exceptions import ObjectDoesNotExist +from django.core.urlresolvers import resolve, get_script_prefix +from rest_framework.compat import urlparse + + +def get_default_queryset(serializer_class, field_name): + manager = getattr(serializer_class.opts.model, field_name) + if hasattr(manager, 'related'): + # Forward relationships + return manager.related.model._default_manager.all() + # Reverse relationships + return manager.field.rel.to._default_manager.all() + + +class RelatedField(Field): + def __init__(self, **kwargs): + self.queryset = kwargs.pop('queryset', None) + self.many = kwargs.pop('many', False) + super(RelatedField, self).__init__(**kwargs) + + def bind(self, field_name, parent, root): + super(RelatedField, self).bind(field_name, parent, root) + if self.queryset is None and not self.read_only: + self.queryset = get_default_queryset(parent, self.source) + + +class PrimaryKeyRelatedField(RelatedField): + MESSAGES = { + 'required': 'This field is required.', + 'does_not_exist': "Invalid pk '{pk_value}' - object does not exist.", + 'incorrect_type': 'Incorrect type. Expected pk value, received {data_type}.', + } + + def from_native(self, data): + try: + return self.queryset.get(pk=data) + except ObjectDoesNotExist: + self.fail('does_not_exist', pk_value=data) + except (TypeError, ValueError): + self.fail('incorrect_type', data_type=type(data).__name__) + + +class HyperlinkedRelatedField(RelatedField): + lookup_field = 'pk' + + MESSAGES = { + 'required': 'This field is required.', + 'no_match': 'Invalid hyperlink - No URL match', + 'incorrect_match': 'Invalid hyperlink - Incorrect URL match.', + 'does_not_exist': "Invalid hyperlink - Object does not exist.", + 'incorrect_type': 'Incorrect type. Expected URL string, received {data_type}.', + } + + def __init__(self, **kwargs): + self.view_name = kwargs.pop('view_name') + self.lookup_field = kwargs.pop('lookup_field', self.lookup_field) + self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field) + super(HyperlinkedRelatedField, self).__init__(**kwargs) + + def get_object(self, view_name, view_args, view_kwargs): + """ + Return the object corresponding to a matched URL. + + Takes the matched URL conf arguments, and should return an + object instance, or raise an `ObjectDoesNotExist` exception. + """ + lookup_value = view_kwargs[self.lookup_url_kwarg] + lookup_kwargs = {self.lookup_field: lookup_value} + return self.queryset.get(**lookup_kwargs) + + def from_native(self, value): + try: + http_prefix = value.startswith(('http:', 'https:')) + except AttributeError: + self.fail('incorrect_type', type(value).__name__) + + if http_prefix: + # If needed convert absolute URLs to relative path + value = urlparse.urlparse(value).path + prefix = get_script_prefix() + if value.startswith(prefix): + value = '/' + value[len(prefix):] + + try: + match = resolve(value) + except Exception: + self.fail('no_match') + + if match.view_name != self.view_name: + self.fail('incorrect_match') + + try: + return self.get_object(match.view_name, match.args, match.kwargs) + except (ObjectDoesNotExist, TypeError, ValueError): + self.fail('does_not_exist') + + +class HyperlinkedIdentityField(RelatedField): + lookup_field = 'pk' + + def __init__(self, **kwargs): + self.view_name = kwargs.pop('view_name') + self.lookup_field = kwargs.pop('lookup_field', self.lookup_field) + self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field) + super(HyperlinkedIdentityField, self).__init__(**kwargs) + + +class SlugRelatedField(RelatedField): + def __init__(self, **kwargs): + self.slug_field = kwargs.pop('slug_field', None) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index e8935b012..dfc5a39f6 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -436,13 +436,13 @@ class BrowsableAPIRenderer(BaseRenderer): if request.method == method: try: data = request.DATA - files = request.FILES + # files = request.FILES except ParseError: data = None - files = None + # files = None else: data = None - files = None + # files = None with override_method(view, request, method) as request: obj = getattr(view, 'object', None) @@ -579,10 +579,10 @@ class BrowsableAPIRenderer(BaseRenderer): 'available_formats': [renderer_cls.format for renderer_cls in view.renderer_classes], 'response_headers': response_headers, - #'put_form': self.get_rendered_html_form(view, 'PUT', request), - #'post_form': self.get_rendered_html_form(view, 'POST', request), - #'delete_form': self.get_rendered_html_form(view, 'DELETE', request), - #'options_form': self.get_rendered_html_form(view, 'OPTIONS', request), + # 'put_form': self.get_rendered_html_form(view, 'PUT', request), + # 'post_form': self.get_rendered_html_form(view, 'POST', request), + # 'delete_form': self.get_rendered_html_form(view, 'DELETE', request), + # 'options_form': self.get_rendered_html_form(view, 'OPTIONS', request), 'raw_data_put_form': raw_data_put_form, 'raw_data_post_form': raw_data_post_form, diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index d121812d6..2f23b4d9a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -477,8 +477,8 @@ class ModelSerializer(Serializer): if model_field: kwargs['required'] = not(model_field.null or model_field.blank) - # if model_field.help_text is not None: - # kwargs['help_text'] = model_field.help_text + # if model_field.help_text is not None: + # kwargs['help_text'] = model_field.help_text if model_field.verbose_name is not None: kwargs['label'] = model_field.verbose_name if not model_field.editable: @@ -566,8 +566,8 @@ class HyperlinkedModelSerializerOptions(ModelSerializerOptions): class HyperlinkedModelSerializer(ModelSerializer): _options_class = HyperlinkedModelSerializerOptions _default_view_name = '%(model_name)s-detail' - #_hyperlink_field_class = HyperlinkedRelatedField - #_hyperlink_identify_field_class = HyperlinkedIdentityField + # _hyperlink_field_class = HyperlinkedRelatedField + # _hyperlink_identify_field_class = HyperlinkedIdentityField def get_default_fields(self): fields = super(HyperlinkedModelSerializer, self).get_default_fields() diff --git a/rest_framework/utils/html.py b/rest_framework/utils/html.py index bf17050df..edc591e9c 100644 --- a/rest_framework/utils/html.py +++ b/rest_framework/utils/html.py @@ -1,6 +1,8 @@ """ Helpers for dealing with HTML input. """ +import re + def is_html_input(dictionary): # MultiDict type datastructures are used to represent HTML form input, diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 90f37cf2e..fa5cafcfb 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -1795,8 +1795,8 @@ class DefaultValuesOnAutogeneratedFieldsTests(TestCase): class MetadataSerializer(serializers.Serializer): - field1 = serializers.CharField(3, required=True) - field2 = serializers.CharField(10, required=False) + field1 = serializers.CharField(max_length=3, required=True) + field2 = serializers.CharField(max_length=10, required=False) class MetadataSerializerTestCase(TestCase): From f2852811f93863f2eed04d51eeb7ef27716b2409 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 2 Sep 2014 17:41:23 +0100 Subject: [PATCH 0756/1652] Getting tests passing --- rest_framework/authtoken/serializers.py | 5 +- rest_framework/authtoken/views.py | 3 +- rest_framework/fields.py | 50 +- rest_framework/mixins.py | 41 +- rest_framework/pagination.py | 34 +- rest_framework/relations.py | 2 +- rest_framework/serializers.py | 53 +- tests/test_fields.py | 1920 +++++++++++------------ tests/test_files.py | 150 +- tests/test_genericrelations.py | 244 +-- tests/test_generics.py | 356 +++-- tests/test_hyperlinkedserializers.py | 724 ++++----- tests/test_nullable_fields.py | 54 +- tests/test_pagination.py | 8 +- tests/test_permissions.py | 96 +- tests/test_relations.py | 234 +-- tests/test_relations_hyperlink.py | 1050 ++++++------- tests/test_relations_nested.py | 548 +++---- tests/test_relations_pk.py | 1102 ++++++------- tests/test_relations_slug.py | 444 +++--- 20 files changed, 3565 insertions(+), 3553 deletions(-) diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py index 99e99ae3d..edeae857b 100644 --- a/rest_framework/authtoken/serializers.py +++ b/rest_framework/authtoken/serializers.py @@ -19,11 +19,12 @@ class AuthTokenSerializer(serializers.Serializer): if not user.is_active: msg = _('User account is disabled.') raise serializers.ValidationError(msg) - attrs['user'] = user - return attrs else: msg = _('Unable to login with provided credentials.') raise serializers.ValidationError(msg) else: msg = _('Must include "username" and "password"') raise serializers.ValidationError(msg) + + attrs['user'] = user + return attrs diff --git a/rest_framework/authtoken/views.py b/rest_framework/authtoken/views.py index 7c03cb766..94e6f061f 100644 --- a/rest_framework/authtoken/views.py +++ b/rest_framework/authtoken/views.py @@ -18,7 +18,8 @@ class ObtainAuthToken(APIView): def post(self, request): serializer = self.serializer_class(data=request.DATA) if serializer.is_valid(): - token, created = Token.objects.get_or_create(user=serializer.object['user']) + user = serializer.validated_data['user'] + token, created = Token.objects.get_or_create(user=user) return Response({'token': token.key}) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 3e0f7ca47..838aa3b0c 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1,4 +1,5 @@ from rest_framework.utils import html +import inspect class empty: @@ -11,6 +12,22 @@ class empty: pass +def is_simple_callable(obj): + """ + True if the object is a callable that takes no arguments. + """ + function = inspect.isfunction(obj) + method = inspect.ismethod(obj) + + if not (function or method): + return False + + args, _, _, defaults = inspect.getargspec(obj) + len_args = len(args) if function else len(args) - 1 + len_defaults = len(defaults) if defaults else 0 + return len_args <= len_defaults + + def get_attribute(instance, attrs): """ Similar to Python's built in `getattr(instance, attr)`, @@ -98,6 +115,7 @@ class Field(object): self.field_name = field_name self.parent = parent self.root = root + self.context = parent.context # `self.label` should deafult to being based on the field name. if self.label is None: @@ -297,25 +315,55 @@ class IntegerField(Field): self.fail('invalid_integer') return data + def to_primative(self, value): + if value is None: + return None + return int(value) + class EmailField(CharField): pass # TODO +class URLField(CharField): + pass # TODO + + class RegexField(CharField): def __init__(self, **kwargs): self.regex = kwargs.pop('regex') super(CharField, self).__init__(**kwargs) +class DateField(CharField): + def __init__(self, **kwargs): + self.input_formats = kwargs.pop('input_formats', None) + super(DateField, self).__init__(**kwargs) + + +class TimeField(CharField): + def __init__(self, **kwargs): + self.input_formats = kwargs.pop('input_formats', None) + super(TimeField, self).__init__(**kwargs) + + class DateTimeField(CharField): - pass # TODO + def __init__(self, **kwargs): + self.input_formats = kwargs.pop('input_formats', None) + super(DateTimeField, self).__init__(**kwargs) class FileField(Field): pass # TODO +class ReadOnlyField(Field): + def to_primative(self, value): + if is_simple_callable(value): + return value() + return value + + class MethodField(Field): def __init__(self, **kwargs): kwargs['source'] = '*' diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 3e9c9bb33..359740cee 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -13,23 +13,6 @@ from rest_framework.request import clone_request from rest_framework.settings import api_settings -def _get_validation_exclusions(obj, lookup_field=None): - """ - Given a model instance, and an optional pk and slug field, - return the full list of all other field names on that model. - - For use when performing full_clean on a model instance, - so we only clean the required fields. - """ - if lookup_field == 'pk': - pk_field = obj._meta.pk - while pk_field.rel: - pk_field = pk_field.rel.to._meta.pk - lookup_field = pk_field.name - - return [field.name for field in obj._meta.fields if field.name != lookup_field] - - class CreateModelMixin(object): """ Create a model instance. @@ -92,15 +75,14 @@ class UpdateModelMixin(object): if not serializer.is_valid(): return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field - lookup_value = self.kwargs[lookup_url_kwarg] - extras = {self.lookup_field: lookup_value} - if self.object is None: + lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field + lookup_value = self.kwargs[lookup_url_kwarg] + extras = {self.lookup_field: lookup_value} self.object = serializer.save(extras=extras) return Response(serializer.data, status=status.HTTP_201_CREATED) - self.object = serializer.save(extras=extras) + self.object = serializer.save() return Response(serializer.data, status=status.HTTP_200_OK) def partial_update(self, request, *args, **kwargs): @@ -122,21 +104,6 @@ class UpdateModelMixin(object): # return a 404 response. raise - def pre_save(self, obj): - """ - Set any attributes on the object that are implicit in the request. - """ - lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field - lookup_value = self.kwargs[lookup_url_kwarg] - - setattr(obj, self.lookup_field, lookup_value) - - # Ensure we clean the attributes so that we don't eg return integer - # pk using a string representation, as provided by the url conf kwarg. - if hasattr(obj, 'full_clean'): - exclude = _get_validation_exclusions(obj, self.lookup_field) - obj.full_clean(exclude) - class DestroyModelMixin(object): """ diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 83ef97c5c..478d32b49 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -13,7 +13,7 @@ class NextPageField(serializers.Field): """ page_field = 'page' - def to_native(self, value): + def to_primative(self, value): if not value.has_next(): return None page = value.next_page_number() @@ -28,7 +28,7 @@ class PreviousPageField(serializers.Field): """ page_field = 'page' - def to_native(self, value): + def to_primative(self, value): if not value.has_previous(): return None page = value.previous_page_number() @@ -48,25 +48,11 @@ class DefaultObjectSerializer(serializers.Field): super(DefaultObjectSerializer, self).__init__(source=source) -# class PaginationSerializerOptions(serializers.SerializerOptions): -# """ -# An object that stores the options that may be provided to a -# pagination serializer by using the inner `Meta` class. - -# Accessible on the instance as `serializer.opts`. -# """ -# def __init__(self, meta): -# super(PaginationSerializerOptions, self).__init__(meta) -# self.object_serializer_class = getattr(meta, 'object_serializer_class', -# DefaultObjectSerializer) - - class BasePaginationSerializer(serializers.Serializer): """ A base class for pagination serializers to inherit from, to make implementing custom serializers more easy. """ - # _options_class = PaginationSerializerOptions results_field = 'results' def __init__(self, *args, **kwargs): @@ -75,14 +61,16 @@ class BasePaginationSerializer(serializers.Serializer): """ super(BasePaginationSerializer, self).__init__(*args, **kwargs) results_field = self.results_field - object_serializer = self.opts.object_serializer_class + try: + object_serializer = self.Meta.object_serializer_class + except AttributeError: + object_serializer = DefaultObjectSerializer - if 'context' in kwargs: - context_kwarg = {'context': kwargs['context']} - else: - context_kwarg = {} - - self.fields[results_field] = object_serializer(source='object_list', **context_kwarg) + self.fields[results_field] = serializers.ListSerializer( + child=object_serializer(), + source='object_list' + ) + self.fields[results_field].bind(results_field, self, self) # TODO: Support automatic binding class PaginationSerializer(BasePaginationSerializer): diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 42d2c121a..0b01394a8 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -73,7 +73,7 @@ class HyperlinkedRelatedField(RelatedField): try: http_prefix = value.startswith(('http:', 'https:')) except AttributeError: - self.fail('incorrect_type', type(value).__name__) + self.fail('incorrect_type', data_type=type(value).__name__) if http_prefix: # If needed convert absolute URLs to relative path diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 2f23b4d9a..c38d89682 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -142,7 +142,7 @@ class Serializer(BaseSerializer): return super(Serializer, cls).__new__(cls) def __init__(self, *args, **kwargs): - kwargs.pop('context', None) + self.context = kwargs.pop('context', {}) kwargs.pop('partial', None) kwargs.pop('many', False) @@ -202,7 +202,7 @@ class Serializer(BaseSerializer): if errors: raise ValidationError(errors) - return ret + return self.validate(ret) def to_primative(self, instance): """ @@ -217,6 +217,9 @@ class Serializer(BaseSerializer): return ret + def validate(self, attrs): + return attrs + def __iter__(self): errors = self.errors if hasattr(self, '_errors') else {} for field in self.fields.values(): @@ -232,8 +235,7 @@ class ListSerializer(BaseSerializer): def __init__(self, *args, **kwargs): self.child = kwargs.pop('child', copy.deepcopy(self.child)) assert self.child is not None, '`child` is a required argument.' - - kwargs.pop('context', None) + self.context = kwargs.pop('context', {}) kwargs.pop('partial', None) super(ListSerializer, self).__init__(*args, **kwargs) @@ -316,19 +318,19 @@ class ModelSerializer(Serializer): models.PositiveIntegerField: IntegerField, models.SmallIntegerField: IntegerField, models.PositiveSmallIntegerField: IntegerField, - # models.DateTimeField: DateTimeField, - # models.DateField: DateField, - # models.TimeField: TimeField, + models.DateTimeField: DateTimeField, + models.DateField: DateField, + models.TimeField: TimeField, # models.DecimalField: DecimalField, - # models.EmailField: EmailField, + models.EmailField: EmailField, models.CharField: CharField, - # models.URLField: URLField, + models.URLField: URLField, # models.SlugField: SlugField, models.TextField: CharField, models.CommaSeparatedIntegerField: CharField, models.BooleanField: BooleanField, models.NullBooleanField: BooleanField, - # models.FileField: FileField, + models.FileField: FileField, # models.ImageField: ImageField, } @@ -338,6 +340,15 @@ class ModelSerializer(Serializer): self.opts = self._options_class(self.Meta) super(ModelSerializer, self).__init__(*args, **kwargs) + def create(self): + ModelClass = self.opts.model + return ModelClass.objects.create(**self.validated_data) + + def update(self, obj): + for attr, value in self.validated_data.items(): + setattr(obj, attr, value) + obj.save() + def get_fields(self): # Get the explicitly declared fields. fields = copy.deepcopy(self.base_fields) @@ -566,8 +577,8 @@ class HyperlinkedModelSerializerOptions(ModelSerializerOptions): class HyperlinkedModelSerializer(ModelSerializer): _options_class = HyperlinkedModelSerializerOptions _default_view_name = '%(model_name)s-detail' - # _hyperlink_field_class = HyperlinkedRelatedField - # _hyperlink_identify_field_class = HyperlinkedIdentityField + _hyperlink_field_class = HyperlinkedRelatedField + _hyperlink_identify_field_class = HyperlinkedIdentityField def get_default_fields(self): fields = super(HyperlinkedModelSerializer, self).get_default_fields() @@ -575,15 +586,15 @@ class HyperlinkedModelSerializer(ModelSerializer): if self.opts.view_name is None: self.opts.view_name = self._get_default_view_name(self.opts.model) - # if self.opts.url_field_name not in fields: - # url_field = self._hyperlink_identify_field_class( - # view_name=self.opts.view_name, - # lookup_field=self.opts.lookup_field - # ) - # ret = self._dict_class() - # ret[self.opts.url_field_name] = url_field - # ret.update(fields) - # fields = ret + if self.opts.url_field_name not in fields: + url_field = self._hyperlink_identify_field_class( + view_name=self.opts.view_name, + lookup_field=self.opts.lookup_field + ) + ret = fields.__class__() + ret[self.opts.url_field_name] = url_field + ret.update(fields) + fields = ret return fields diff --git a/tests/test_fields.py b/tests/test_fields.py index 094ac1eb0..53c605382 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1,1022 +1,1022 @@ -""" -General serializer field tests. -""" -from __future__ import unicode_literals +# """ +# General serializer field tests. +# """ +# from __future__ import unicode_literals -import datetime -import re -from decimal import Decimal -from uuid import uuid4 -from django.core import validators -from django.db import models -from django.test import TestCase -from django.utils.datastructures import SortedDict -from rest_framework import serializers -from tests.models import RESTFrameworkModel +# import datetime +# import re +# from decimal import Decimal +# from uuid import uuid4 +# from django.core import validators +# from django.db import models +# from django.test import TestCase +# from django.utils.datastructures import SortedDict +# from rest_framework import serializers +# from tests.models import RESTFrameworkModel -class TimestampedModel(models.Model): - added = models.DateTimeField(auto_now_add=True) - updated = models.DateTimeField(auto_now=True) +# class TimestampedModel(models.Model): +# added = models.DateTimeField(auto_now_add=True) +# updated = models.DateTimeField(auto_now=True) -class CharPrimaryKeyModel(models.Model): - id = models.CharField(max_length=20, primary_key=True) +# class CharPrimaryKeyModel(models.Model): +# id = models.CharField(max_length=20, primary_key=True) -class TimestampedModelSerializer(serializers.ModelSerializer): - class Meta: - model = TimestampedModel +# class TimestampedModelSerializer(serializers.ModelSerializer): +# class Meta: +# model = TimestampedModel -class CharPrimaryKeyModelSerializer(serializers.ModelSerializer): - class Meta: - model = CharPrimaryKeyModel +# class CharPrimaryKeyModelSerializer(serializers.ModelSerializer): +# class Meta: +# model = CharPrimaryKeyModel -class TimeFieldModel(models.Model): - clock = models.TimeField() +# class TimeFieldModel(models.Model): +# clock = models.TimeField() -class TimeFieldModelSerializer(serializers.ModelSerializer): - class Meta: - model = TimeFieldModel +# class TimeFieldModelSerializer(serializers.ModelSerializer): +# class Meta: +# model = TimeFieldModel -SAMPLE_CHOICES = [ - ('red', 'Red'), - ('green', 'Green'), - ('blue', 'Blue'), -] +# SAMPLE_CHOICES = [ +# ('red', 'Red'), +# ('green', 'Green'), +# ('blue', 'Blue'), +# ] -class ChoiceFieldModel(models.Model): - choice = models.CharField(choices=SAMPLE_CHOICES, blank=True, max_length=255) +# class ChoiceFieldModel(models.Model): +# choice = models.CharField(choices=SAMPLE_CHOICES, blank=True, max_length=255) -class ChoiceFieldModelSerializer(serializers.ModelSerializer): - class Meta: - model = ChoiceFieldModel - - -class ChoiceFieldModelWithNull(models.Model): - choice = models.CharField(choices=SAMPLE_CHOICES, blank=True, null=True, max_length=255) - - -class ChoiceFieldModelWithNullSerializer(serializers.ModelSerializer): - class Meta: - model = ChoiceFieldModelWithNull - - -class BasicFieldTests(TestCase): - def test_auto_now_fields_read_only(self): - """ - auto_now and auto_now_add fields should be read_only by default. - """ - serializer = TimestampedModelSerializer() - self.assertEqual(serializer.fields['added'].read_only, True) - - def test_auto_pk_fields_read_only(self): - """ - AutoField fields should be read_only by default. - """ - serializer = TimestampedModelSerializer() - self.assertEqual(serializer.fields['id'].read_only, True) - - def test_non_auto_pk_fields_not_read_only(self): - """ - PK fields other than AutoField fields should not be read_only by default. - """ - serializer = CharPrimaryKeyModelSerializer() - self.assertEqual(serializer.fields['id'].read_only, False) - - def test_dict_field_ordering(self): - """ - Field should preserve dictionary ordering, if it exists. - See: https://github.com/tomchristie/django-rest-framework/issues/832 - """ - ret = SortedDict() - ret['c'] = 1 - ret['b'] = 1 - ret['a'] = 1 - ret['z'] = 1 - field = serializers.Field() - keys = list(field.to_native(ret).keys()) - self.assertEqual(keys, ['c', 'b', 'a', 'z']) - - def test_widget_html_attributes(self): - """ - Make sure widget_html() renders the correct attributes - """ - r = re.compile('(\S+)=["\']?((?:.(?!["\']?\s+(?:\S+)=|[>"\']))+.)["\']?') - form = TimeFieldModelSerializer().data - attributes = r.findall(form.fields['clock'].widget_html()) - self.assertIn(('name', 'clock'), attributes) - self.assertIn(('id', 'clock'), attributes) +# class ChoiceFieldModelSerializer(serializers.ModelSerializer): +# class Meta: +# model = ChoiceFieldModel + + +# class ChoiceFieldModelWithNull(models.Model): +# choice = models.CharField(choices=SAMPLE_CHOICES, blank=True, null=True, max_length=255) + + +# class ChoiceFieldModelWithNullSerializer(serializers.ModelSerializer): +# class Meta: +# model = ChoiceFieldModelWithNull + + +# class BasicFieldTests(TestCase): +# def test_auto_now_fields_read_only(self): +# """ +# auto_now and auto_now_add fields should be read_only by default. +# """ +# serializer = TimestampedModelSerializer() +# self.assertEqual(serializer.fields['added'].read_only, True) + +# def test_auto_pk_fields_read_only(self): +# """ +# AutoField fields should be read_only by default. +# """ +# serializer = TimestampedModelSerializer() +# self.assertEqual(serializer.fields['id'].read_only, True) + +# def test_non_auto_pk_fields_not_read_only(self): +# """ +# PK fields other than AutoField fields should not be read_only by default. +# """ +# serializer = CharPrimaryKeyModelSerializer() +# self.assertEqual(serializer.fields['id'].read_only, False) + +# def test_dict_field_ordering(self): +# """ +# Field should preserve dictionary ordering, if it exists. +# See: https://github.com/tomchristie/django-rest-framework/issues/832 +# """ +# ret = SortedDict() +# ret['c'] = 1 +# ret['b'] = 1 +# ret['a'] = 1 +# ret['z'] = 1 +# field = serializers.Field() +# keys = list(field.to_native(ret).keys()) +# self.assertEqual(keys, ['c', 'b', 'a', 'z']) + +# def test_widget_html_attributes(self): +# """ +# Make sure widget_html() renders the correct attributes +# """ +# r = re.compile('(\S+)=["\']?((?:.(?!["\']?\s+(?:\S+)=|[>"\']))+.)["\']?') +# form = TimeFieldModelSerializer().data +# attributes = r.findall(form.fields['clock'].widget_html()) +# self.assertIn(('name', 'clock'), attributes) +# self.assertIn(('id', 'clock'), attributes) -class DateFieldTest(TestCase): - """ - Tests for the DateFieldTest from_native() and to_native() behavior - """ - - def test_from_native_string(self): - """ - Make sure from_native() accepts default iso input formats. - """ - f = serializers.DateField() - result_1 = f.from_native('1984-07-31') - - self.assertEqual(datetime.date(1984, 7, 31), result_1) - - def test_from_native_datetime_date(self): - """ - Make sure from_native() accepts a datetime.date instance. - """ - f = serializers.DateField() - result_1 = f.from_native(datetime.date(1984, 7, 31)) - - self.assertEqual(result_1, datetime.date(1984, 7, 31)) - - def test_from_native_custom_format(self): - """ - Make sure from_native() accepts custom input formats. - """ - f = serializers.DateField(input_formats=['%Y -- %d']) - result = f.from_native('1984 -- 31') - - self.assertEqual(datetime.date(1984, 1, 31), result) - - def test_from_native_invalid_default_on_custom_format(self): - """ - Make sure from_native() don't accept default formats if custom format is preset - """ - f = serializers.DateField(input_formats=['%Y -- %d']) - - try: - f.from_native('1984-07-31') - except validators.ValidationError as e: - self.assertEqual(e.messages, ["Date has wrong format. Use one of these formats instead: YYYY -- DD"]) - else: - self.fail("ValidationError was not properly raised") - - def test_from_native_empty(self): - """ - Make sure from_native() returns None on empty param. - """ - f = serializers.DateField() - result = f.from_native('') - - self.assertEqual(result, None) - - def test_from_native_none(self): - """ - Make sure from_native() returns None on None param. - """ - f = serializers.DateField() - result = f.from_native(None) - - self.assertEqual(result, None) - - def test_from_native_invalid_date(self): - """ - Make sure from_native() raises a ValidationError on passing an invalid date. - """ - f = serializers.DateField() - - try: - f.from_native('1984-13-31') - except validators.ValidationError as e: - self.assertEqual(e.messages, ["Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]"]) - else: - self.fail("ValidationError was not properly raised") - - def test_from_native_invalid_format(self): - """ - Make sure from_native() raises a ValidationError on passing an invalid format. - """ - f = serializers.DateField() - - try: - f.from_native('1984 -- 31') - except validators.ValidationError as e: - self.assertEqual(e.messages, ["Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]"]) - else: - self.fail("ValidationError was not properly raised") - - def test_to_native(self): - """ - Make sure to_native() returns datetime as default. - """ - f = serializers.DateField() - - result_1 = f.to_native(datetime.date(1984, 7, 31)) - - self.assertEqual(datetime.date(1984, 7, 31), result_1) - - def test_to_native_iso(self): - """ - Make sure to_native() with 'iso-8601' returns iso formated date. - """ - f = serializers.DateField(format='iso-8601') - - result_1 = f.to_native(datetime.date(1984, 7, 31)) - - self.assertEqual('1984-07-31', result_1) - - def test_to_native_custom_format(self): - """ - Make sure to_native() returns correct custom format. - """ - f = serializers.DateField(format="%Y - %m.%d") - - result_1 = f.to_native(datetime.date(1984, 7, 31)) - - self.assertEqual('1984 - 07.31', result_1) - - def test_to_native_none(self): - """ - Make sure from_native() returns None on None param. - """ - f = serializers.DateField(required=False) - self.assertEqual(None, f.to_native(None)) - - -class DateTimeFieldTest(TestCase): - """ - Tests for the DateTimeField from_native() and to_native() behavior - """ - - def test_from_native_string(self): - """ - Make sure from_native() accepts default iso input formats. - """ - f = serializers.DateTimeField() - result_1 = f.from_native('1984-07-31 04:31') - result_2 = f.from_native('1984-07-31 04:31:59') - result_3 = f.from_native('1984-07-31 04:31:59.000200') - - self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31), result_1) - self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31, 59), result_2) - self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31, 59, 200), result_3) - - def test_from_native_datetime_datetime(self): - """ - Make sure from_native() accepts a datetime.datetime instance. - """ - f = serializers.DateTimeField() - result_1 = f.from_native(datetime.datetime(1984, 7, 31, 4, 31)) - result_2 = f.from_native(datetime.datetime(1984, 7, 31, 4, 31, 59)) - result_3 = f.from_native(datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) - - self.assertEqual(result_1, datetime.datetime(1984, 7, 31, 4, 31)) - self.assertEqual(result_2, datetime.datetime(1984, 7, 31, 4, 31, 59)) - self.assertEqual(result_3, datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) - - def test_from_native_custom_format(self): - """ - Make sure from_native() accepts custom input formats. - """ - f = serializers.DateTimeField(input_formats=['%Y -- %H:%M']) - result = f.from_native('1984 -- 04:59') - - self.assertEqual(datetime.datetime(1984, 1, 1, 4, 59), result) - - def test_from_native_invalid_default_on_custom_format(self): - """ - Make sure from_native() don't accept default formats if custom format is preset - """ - f = serializers.DateTimeField(input_formats=['%Y -- %H:%M']) - - try: - f.from_native('1984-07-31 04:31:59') - except validators.ValidationError as e: - self.assertEqual(e.messages, ["Datetime has wrong format. Use one of these formats instead: YYYY -- hh:mm"]) - else: - self.fail("ValidationError was not properly raised") - - def test_from_native_empty(self): - """ - Make sure from_native() returns None on empty param. - """ - f = serializers.DateTimeField() - result = f.from_native('') - - self.assertEqual(result, None) - - def test_from_native_none(self): - """ - Make sure from_native() returns None on None param. - """ - f = serializers.DateTimeField() - result = f.from_native(None) - - self.assertEqual(result, None) - - def test_from_native_invalid_datetime(self): - """ - Make sure from_native() raises a ValidationError on passing an invalid datetime. - """ - f = serializers.DateTimeField() - - try: - f.from_native('04:61:59') - except validators.ValidationError as e: - self.assertEqual(e.messages, ["Datetime has wrong format. Use one of these formats instead: " - "YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]"]) - else: - self.fail("ValidationError was not properly raised") - - def test_from_native_invalid_format(self): - """ - Make sure from_native() raises a ValidationError on passing an invalid format. - """ - f = serializers.DateTimeField() - - try: - f.from_native('04 -- 31') - except validators.ValidationError as e: - self.assertEqual(e.messages, ["Datetime has wrong format. Use one of these formats instead: " - "YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]"]) - else: - self.fail("ValidationError was not properly raised") - - def test_to_native(self): - """ - Make sure to_native() returns isoformat as default. - """ - f = serializers.DateTimeField() - - result_1 = f.to_native(datetime.datetime(1984, 7, 31)) - result_2 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31)) - result_3 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59)) - result_4 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) - - self.assertEqual(datetime.datetime(1984, 7, 31), result_1) - self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31), result_2) - self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31, 59), result_3) - self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31, 59, 200), result_4) - - def test_to_native_iso(self): - """ - Make sure to_native() with format=iso-8601 returns iso formatted datetime. - """ - f = serializers.DateTimeField(format='iso-8601') - - result_1 = f.to_native(datetime.datetime(1984, 7, 31)) - result_2 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31)) - result_3 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59)) - result_4 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) - - self.assertEqual('1984-07-31T00:00:00', result_1) - self.assertEqual('1984-07-31T04:31:00', result_2) - self.assertEqual('1984-07-31T04:31:59', result_3) - self.assertEqual('1984-07-31T04:31:59.000200', result_4) - - def test_to_native_custom_format(self): - """ - Make sure to_native() returns correct custom format. - """ - f = serializers.DateTimeField(format="%Y - %H:%M") - - result_1 = f.to_native(datetime.datetime(1984, 7, 31)) - result_2 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31)) - result_3 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59)) - result_4 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) - - self.assertEqual('1984 - 00:00', result_1) - self.assertEqual('1984 - 04:31', result_2) - self.assertEqual('1984 - 04:31', result_3) - self.assertEqual('1984 - 04:31', result_4) - - def test_to_native_none(self): - """ - Make sure from_native() returns None on None param. - """ - f = serializers.DateTimeField(required=False) - self.assertEqual(None, f.to_native(None)) - - -class TimeFieldTest(TestCase): - """ - Tests for the TimeField from_native() and to_native() behavior - """ - - def test_from_native_string(self): - """ - Make sure from_native() accepts default iso input formats. - """ - f = serializers.TimeField() - result_1 = f.from_native('04:31') - result_2 = f.from_native('04:31:59') - result_3 = f.from_native('04:31:59.000200') - - self.assertEqual(datetime.time(4, 31), result_1) - self.assertEqual(datetime.time(4, 31, 59), result_2) - self.assertEqual(datetime.time(4, 31, 59, 200), result_3) - - def test_from_native_datetime_time(self): - """ - Make sure from_native() accepts a datetime.time instance. - """ - f = serializers.TimeField() - result_1 = f.from_native(datetime.time(4, 31)) - result_2 = f.from_native(datetime.time(4, 31, 59)) - result_3 = f.from_native(datetime.time(4, 31, 59, 200)) - - self.assertEqual(result_1, datetime.time(4, 31)) - self.assertEqual(result_2, datetime.time(4, 31, 59)) - self.assertEqual(result_3, datetime.time(4, 31, 59, 200)) - - def test_from_native_custom_format(self): - """ - Make sure from_native() accepts custom input formats. - """ - f = serializers.TimeField(input_formats=['%H -- %M']) - result = f.from_native('04 -- 31') - - self.assertEqual(datetime.time(4, 31), result) - - def test_from_native_invalid_default_on_custom_format(self): - """ - Make sure from_native() don't accept default formats if custom format is preset - """ - f = serializers.TimeField(input_formats=['%H -- %M']) - - try: - f.from_native('04:31:59') - except validators.ValidationError as e: - self.assertEqual(e.messages, ["Time has wrong format. Use one of these formats instead: hh -- mm"]) - else: - self.fail("ValidationError was not properly raised") - - def test_from_native_empty(self): - """ - Make sure from_native() returns None on empty param. - """ - f = serializers.TimeField() - result = f.from_native('') - - self.assertEqual(result, None) - - def test_from_native_none(self): - """ - Make sure from_native() returns None on None param. - """ - f = serializers.TimeField() - result = f.from_native(None) - - self.assertEqual(result, None) - - def test_from_native_invalid_time(self): - """ - Make sure from_native() raises a ValidationError on passing an invalid time. - """ - f = serializers.TimeField() - - try: - f.from_native('04:61:59') - except validators.ValidationError as e: - self.assertEqual(e.messages, ["Time has wrong format. Use one of these formats instead: " - "hh:mm[:ss[.uuuuuu]]"]) - else: - self.fail("ValidationError was not properly raised") - - def test_from_native_invalid_format(self): - """ - Make sure from_native() raises a ValidationError on passing an invalid format. - """ - f = serializers.TimeField() - - try: - f.from_native('04 -- 31') - except validators.ValidationError as e: - self.assertEqual(e.messages, ["Time has wrong format. Use one of these formats instead: " - "hh:mm[:ss[.uuuuuu]]"]) - else: - self.fail("ValidationError was not properly raised") - - def test_to_native(self): - """ - Make sure to_native() returns time object as default. - """ - f = serializers.TimeField() - result_1 = f.to_native(datetime.time(4, 31)) - result_2 = f.to_native(datetime.time(4, 31, 59)) - result_3 = f.to_native(datetime.time(4, 31, 59, 200)) - - self.assertEqual(datetime.time(4, 31), result_1) - self.assertEqual(datetime.time(4, 31, 59), result_2) - self.assertEqual(datetime.time(4, 31, 59, 200), result_3) - - def test_to_native_iso(self): - """ - Make sure to_native() with format='iso-8601' returns iso formatted time. - """ - f = serializers.TimeField(format='iso-8601') - result_1 = f.to_native(datetime.time(4, 31)) - result_2 = f.to_native(datetime.time(4, 31, 59)) - result_3 = f.to_native(datetime.time(4, 31, 59, 200)) - - self.assertEqual('04:31:00', result_1) - self.assertEqual('04:31:59', result_2) - self.assertEqual('04:31:59.000200', result_3) - - def test_to_native_custom_format(self): - """ - Make sure to_native() returns correct custom format. - """ - f = serializers.TimeField(format="%H - %S [%f]") - result_1 = f.to_native(datetime.time(4, 31)) - result_2 = f.to_native(datetime.time(4, 31, 59)) - result_3 = f.to_native(datetime.time(4, 31, 59, 200)) - - self.assertEqual('04 - 00 [000000]', result_1) - self.assertEqual('04 - 59 [000000]', result_2) - self.assertEqual('04 - 59 [000200]', result_3) - - -class DecimalFieldTest(TestCase): - """ - Tests for the DecimalField from_native() and to_native() behavior - """ - - def test_from_native_string(self): - """ - Make sure from_native() accepts string values - """ - f = serializers.DecimalField() - result_1 = f.from_native('9000') - result_2 = f.from_native('1.00000001') - - self.assertEqual(Decimal('9000'), result_1) - self.assertEqual(Decimal('1.00000001'), result_2) - - def test_from_native_invalid_string(self): - """ - Make sure from_native() raises ValidationError on passing invalid string - """ - f = serializers.DecimalField() - - try: - f.from_native('123.45.6') - except validators.ValidationError as e: - self.assertEqual(e.messages, ["Enter a number."]) - else: - self.fail("ValidationError was not properly raised") - - def test_from_native_integer(self): - """ - Make sure from_native() accepts integer values - """ - f = serializers.DecimalField() - result = f.from_native(9000) - - self.assertEqual(Decimal('9000'), result) - - def test_from_native_float(self): - """ - Make sure from_native() accepts float values - """ - f = serializers.DecimalField() - result = f.from_native(1.00000001) - - self.assertEqual(Decimal('1.00000001'), result) - - def test_from_native_empty(self): - """ - Make sure from_native() returns None on empty param. - """ - f = serializers.DecimalField() - result = f.from_native('') - - self.assertEqual(result, None) - - def test_from_native_none(self): - """ - Make sure from_native() returns None on None param. - """ - f = serializers.DecimalField() - result = f.from_native(None) - - self.assertEqual(result, None) - - def test_to_native(self): - """ - Make sure to_native() returns Decimal as string. - """ - f = serializers.DecimalField() - - result_1 = f.to_native(Decimal('9000')) - result_2 = f.to_native(Decimal('1.00000001')) - - self.assertEqual(Decimal('9000'), result_1) - self.assertEqual(Decimal('1.00000001'), result_2) - - def test_to_native_none(self): - """ - Make sure from_native() returns None on None param. - """ - f = serializers.DecimalField(required=False) - self.assertEqual(None, f.to_native(None)) - - def test_valid_serialization(self): - """ - Make sure the serializer works correctly - """ - class DecimalSerializer(serializers.Serializer): - decimal_field = serializers.DecimalField(max_value=9010, - min_value=9000, - max_digits=6, - decimal_places=2) - - self.assertTrue(DecimalSerializer(data={'decimal_field': '9001'}).is_valid()) - self.assertTrue(DecimalSerializer(data={'decimal_field': '9001.2'}).is_valid()) - self.assertTrue(DecimalSerializer(data={'decimal_field': '9001.23'}).is_valid()) - - self.assertFalse(DecimalSerializer(data={'decimal_field': '8000'}).is_valid()) - self.assertFalse(DecimalSerializer(data={'decimal_field': '9900'}).is_valid()) - self.assertFalse(DecimalSerializer(data={'decimal_field': '9001.234'}).is_valid()) - - def test_raise_max_value(self): - """ - Make sure max_value violations raises ValidationError - """ - class DecimalSerializer(serializers.Serializer): - decimal_field = serializers.DecimalField(max_value=100) - - s = DecimalSerializer(data={'decimal_field': '123'}) - - self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'decimal_field': ['Ensure this value is less than or equal to 100.']}) - - def test_raise_min_value(self): - """ - Make sure min_value violations raises ValidationError - """ - class DecimalSerializer(serializers.Serializer): - decimal_field = serializers.DecimalField(min_value=100) - - s = DecimalSerializer(data={'decimal_field': '99'}) - - self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'decimal_field': ['Ensure this value is greater than or equal to 100.']}) - - def test_raise_max_digits(self): - """ - Make sure max_digits violations raises ValidationError - """ - class DecimalSerializer(serializers.Serializer): - decimal_field = serializers.DecimalField(max_digits=5) - - s = DecimalSerializer(data={'decimal_field': '123.456'}) - - self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 5 digits in total.']}) - - def test_raise_max_decimal_places(self): - """ - Make sure max_decimal_places violations raises ValidationError - """ - class DecimalSerializer(serializers.Serializer): - decimal_field = serializers.DecimalField(decimal_places=3) - - s = DecimalSerializer(data={'decimal_field': '123.4567'}) - - self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 3 decimal places.']}) - - def test_raise_max_whole_digits(self): - """ - Make sure max_whole_digits violations raises ValidationError - """ - class DecimalSerializer(serializers.Serializer): - decimal_field = serializers.DecimalField(max_digits=4, decimal_places=3) - - s = DecimalSerializer(data={'decimal_field': '12345.6'}) - - self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 4 digits in total.']}) - - -class ChoiceFieldTests(TestCase): - """ - Tests for the ChoiceField options generator - """ - def test_choices_required(self): - """ - Make sure proper choices are rendered if field is required - """ - f = serializers.ChoiceField(required=True, choices=SAMPLE_CHOICES) - self.assertEqual(f.choices, SAMPLE_CHOICES) - - def test_choices_not_required(self): - """ - Make sure proper choices (plus blank) are rendered if the field isn't required - """ - f = serializers.ChoiceField(required=False, choices=SAMPLE_CHOICES) - self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + SAMPLE_CHOICES) - - def test_blank_choice_display(self): - blank = 'No Preference' - f = serializers.ChoiceField( - required=False, - choices=SAMPLE_CHOICES, - blank_display_value=blank, - ) - self.assertEqual(f.choices, [('', blank)] + SAMPLE_CHOICES) - - def test_invalid_choice_model(self): - s = ChoiceFieldModelSerializer(data={'choice': 'wrong_value'}) - self.assertFalse(s.is_valid()) - self.assertEqual(s.errors, {'choice': ['Select a valid choice. wrong_value is not one of the available choices.']}) - self.assertEqual(s.data['choice'], '') - - def test_empty_choice_model(self): - """ - Test that the 'empty' value is correctly passed and used depending on - the 'null' property on the model field. - """ - s = ChoiceFieldModelSerializer(data={'choice': ''}) - self.assertTrue(s.is_valid()) - self.assertEqual(s.data['choice'], '') - - s = ChoiceFieldModelWithNullSerializer(data={'choice': ''}) - self.assertTrue(s.is_valid()) - self.assertEqual(s.data['choice'], None) - - def test_from_native_empty(self): - """ - Make sure from_native() returns an empty string on empty param by default. - """ - f = serializers.ChoiceField(choices=SAMPLE_CHOICES) - self.assertEqual(f.from_native(''), '') - self.assertEqual(f.from_native(None), '') - - def test_from_native_empty_override(self): - """ - Make sure you can override from_native() behavior regarding empty values. - """ - f = serializers.ChoiceField(choices=SAMPLE_CHOICES, empty=None) - self.assertEqual(f.from_native(''), None) - self.assertEqual(f.from_native(None), None) - - def test_metadata_choices(self): - """ - Make sure proper choices are included in the field's metadata. - """ - choices = [{'value': v, 'display_name': n} for v, n in SAMPLE_CHOICES] - f = serializers.ChoiceField(choices=SAMPLE_CHOICES) - self.assertEqual(f.metadata()['choices'], choices) - - def test_metadata_choices_not_required(self): - """ - Make sure proper choices are included in the field's metadata. - """ - choices = [{'value': v, 'display_name': n} - for v, n in models.fields.BLANK_CHOICE_DASH + SAMPLE_CHOICES] - f = serializers.ChoiceField(required=False, choices=SAMPLE_CHOICES) - self.assertEqual(f.metadata()['choices'], choices) - - -class EmailFieldTests(TestCase): - """ - Tests for EmailField attribute values - """ - - class EmailFieldModel(RESTFrameworkModel): - email_field = models.EmailField(blank=True) - - class EmailFieldWithGivenMaxLengthModel(RESTFrameworkModel): - email_field = models.EmailField(max_length=150, blank=True) - - def test_default_model_value(self): - class EmailFieldSerializer(serializers.ModelSerializer): - class Meta: - model = self.EmailFieldModel - - serializer = EmailFieldSerializer(data={}) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(getattr(serializer.fields['email_field'], 'max_length'), 75) - - def test_given_model_value(self): - class EmailFieldSerializer(serializers.ModelSerializer): - class Meta: - model = self.EmailFieldWithGivenMaxLengthModel - - serializer = EmailFieldSerializer(data={}) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(getattr(serializer.fields['email_field'], 'max_length'), 150) - - def test_given_serializer_value(self): - class EmailFieldSerializer(serializers.ModelSerializer): - email_field = serializers.EmailField(source='email_field', max_length=20, required=False) - - class Meta: - model = self.EmailFieldModel - - serializer = EmailFieldSerializer(data={}) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(getattr(serializer.fields['email_field'], 'max_length'), 20) - - -class SlugFieldTests(TestCase): - """ - Tests for SlugField attribute values - """ - - class SlugFieldModel(RESTFrameworkModel): - slug_field = models.SlugField(blank=True) - - class SlugFieldWithGivenMaxLengthModel(RESTFrameworkModel): - slug_field = models.SlugField(max_length=84, blank=True) - - def test_default_model_value(self): - class SlugFieldSerializer(serializers.ModelSerializer): - class Meta: - model = self.SlugFieldModel - - serializer = SlugFieldSerializer(data={}) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 50) - - def test_given_model_value(self): - class SlugFieldSerializer(serializers.ModelSerializer): - class Meta: - model = self.SlugFieldWithGivenMaxLengthModel - - serializer = SlugFieldSerializer(data={}) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 84) - - def test_given_serializer_value(self): - class SlugFieldSerializer(serializers.ModelSerializer): - slug_field = serializers.SlugField(source='slug_field', - max_length=20, required=False) - - class Meta: - model = self.SlugFieldModel - - serializer = SlugFieldSerializer(data={}) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(getattr(serializer.fields['slug_field'], - 'max_length'), 20) - - def test_invalid_slug(self): - """ - Make sure an invalid slug raises ValidationError - """ - class SlugFieldSerializer(serializers.ModelSerializer): - slug_field = serializers.SlugField(source='slug_field', max_length=20, required=True) +# class DateFieldTest(TestCase): +# """ +# Tests for the DateFieldTest from_native() and to_native() behavior +# """ + +# def test_from_native_string(self): +# """ +# Make sure from_native() accepts default iso input formats. +# """ +# f = serializers.DateField() +# result_1 = f.from_native('1984-07-31') + +# self.assertEqual(datetime.date(1984, 7, 31), result_1) + +# def test_from_native_datetime_date(self): +# """ +# Make sure from_native() accepts a datetime.date instance. +# """ +# f = serializers.DateField() +# result_1 = f.from_native(datetime.date(1984, 7, 31)) + +# self.assertEqual(result_1, datetime.date(1984, 7, 31)) + +# def test_from_native_custom_format(self): +# """ +# Make sure from_native() accepts custom input formats. +# """ +# f = serializers.DateField(input_formats=['%Y -- %d']) +# result = f.from_native('1984 -- 31') + +# self.assertEqual(datetime.date(1984, 1, 31), result) + +# def test_from_native_invalid_default_on_custom_format(self): +# """ +# Make sure from_native() don't accept default formats if custom format is preset +# """ +# f = serializers.DateField(input_formats=['%Y -- %d']) + +# try: +# f.from_native('1984-07-31') +# except validators.ValidationError as e: +# self.assertEqual(e.messages, ["Date has wrong format. Use one of these formats instead: YYYY -- DD"]) +# else: +# self.fail("ValidationError was not properly raised") + +# def test_from_native_empty(self): +# """ +# Make sure from_native() returns None on empty param. +# """ +# f = serializers.DateField() +# result = f.from_native('') + +# self.assertEqual(result, None) + +# def test_from_native_none(self): +# """ +# Make sure from_native() returns None on None param. +# """ +# f = serializers.DateField() +# result = f.from_native(None) + +# self.assertEqual(result, None) + +# def test_from_native_invalid_date(self): +# """ +# Make sure from_native() raises a ValidationError on passing an invalid date. +# """ +# f = serializers.DateField() + +# try: +# f.from_native('1984-13-31') +# except validators.ValidationError as e: +# self.assertEqual(e.messages, ["Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]"]) +# else: +# self.fail("ValidationError was not properly raised") + +# def test_from_native_invalid_format(self): +# """ +# Make sure from_native() raises a ValidationError on passing an invalid format. +# """ +# f = serializers.DateField() + +# try: +# f.from_native('1984 -- 31') +# except validators.ValidationError as e: +# self.assertEqual(e.messages, ["Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]"]) +# else: +# self.fail("ValidationError was not properly raised") + +# def test_to_native(self): +# """ +# Make sure to_native() returns datetime as default. +# """ +# f = serializers.DateField() + +# result_1 = f.to_native(datetime.date(1984, 7, 31)) + +# self.assertEqual(datetime.date(1984, 7, 31), result_1) + +# def test_to_native_iso(self): +# """ +# Make sure to_native() with 'iso-8601' returns iso formated date. +# """ +# f = serializers.DateField(format='iso-8601') + +# result_1 = f.to_native(datetime.date(1984, 7, 31)) + +# self.assertEqual('1984-07-31', result_1) + +# def test_to_native_custom_format(self): +# """ +# Make sure to_native() returns correct custom format. +# """ +# f = serializers.DateField(format="%Y - %m.%d") + +# result_1 = f.to_native(datetime.date(1984, 7, 31)) + +# self.assertEqual('1984 - 07.31', result_1) + +# def test_to_native_none(self): +# """ +# Make sure from_native() returns None on None param. +# """ +# f = serializers.DateField(required=False) +# self.assertEqual(None, f.to_native(None)) + + +# class DateTimeFieldTest(TestCase): +# """ +# Tests for the DateTimeField from_native() and to_native() behavior +# """ + +# def test_from_native_string(self): +# """ +# Make sure from_native() accepts default iso input formats. +# """ +# f = serializers.DateTimeField() +# result_1 = f.from_native('1984-07-31 04:31') +# result_2 = f.from_native('1984-07-31 04:31:59') +# result_3 = f.from_native('1984-07-31 04:31:59.000200') + +# self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31), result_1) +# self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31, 59), result_2) +# self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31, 59, 200), result_3) + +# def test_from_native_datetime_datetime(self): +# """ +# Make sure from_native() accepts a datetime.datetime instance. +# """ +# f = serializers.DateTimeField() +# result_1 = f.from_native(datetime.datetime(1984, 7, 31, 4, 31)) +# result_2 = f.from_native(datetime.datetime(1984, 7, 31, 4, 31, 59)) +# result_3 = f.from_native(datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) + +# self.assertEqual(result_1, datetime.datetime(1984, 7, 31, 4, 31)) +# self.assertEqual(result_2, datetime.datetime(1984, 7, 31, 4, 31, 59)) +# self.assertEqual(result_3, datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) + +# def test_from_native_custom_format(self): +# """ +# Make sure from_native() accepts custom input formats. +# """ +# f = serializers.DateTimeField(input_formats=['%Y -- %H:%M']) +# result = f.from_native('1984 -- 04:59') + +# self.assertEqual(datetime.datetime(1984, 1, 1, 4, 59), result) + +# def test_from_native_invalid_default_on_custom_format(self): +# """ +# Make sure from_native() don't accept default formats if custom format is preset +# """ +# f = serializers.DateTimeField(input_formats=['%Y -- %H:%M']) + +# try: +# f.from_native('1984-07-31 04:31:59') +# except validators.ValidationError as e: +# self.assertEqual(e.messages, ["Datetime has wrong format. Use one of these formats instead: YYYY -- hh:mm"]) +# else: +# self.fail("ValidationError was not properly raised") + +# def test_from_native_empty(self): +# """ +# Make sure from_native() returns None on empty param. +# """ +# f = serializers.DateTimeField() +# result = f.from_native('') + +# self.assertEqual(result, None) + +# def test_from_native_none(self): +# """ +# Make sure from_native() returns None on None param. +# """ +# f = serializers.DateTimeField() +# result = f.from_native(None) + +# self.assertEqual(result, None) + +# def test_from_native_invalid_datetime(self): +# """ +# Make sure from_native() raises a ValidationError on passing an invalid datetime. +# """ +# f = serializers.DateTimeField() + +# try: +# f.from_native('04:61:59') +# except validators.ValidationError as e: +# self.assertEqual(e.messages, ["Datetime has wrong format. Use one of these formats instead: " +# "YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]"]) +# else: +# self.fail("ValidationError was not properly raised") + +# def test_from_native_invalid_format(self): +# """ +# Make sure from_native() raises a ValidationError on passing an invalid format. +# """ +# f = serializers.DateTimeField() + +# try: +# f.from_native('04 -- 31') +# except validators.ValidationError as e: +# self.assertEqual(e.messages, ["Datetime has wrong format. Use one of these formats instead: " +# "YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]"]) +# else: +# self.fail("ValidationError was not properly raised") + +# def test_to_native(self): +# """ +# Make sure to_native() returns isoformat as default. +# """ +# f = serializers.DateTimeField() + +# result_1 = f.to_native(datetime.datetime(1984, 7, 31)) +# result_2 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31)) +# result_3 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59)) +# result_4 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) + +# self.assertEqual(datetime.datetime(1984, 7, 31), result_1) +# self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31), result_2) +# self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31, 59), result_3) +# self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31, 59, 200), result_4) + +# def test_to_native_iso(self): +# """ +# Make sure to_native() with format=iso-8601 returns iso formatted datetime. +# """ +# f = serializers.DateTimeField(format='iso-8601') + +# result_1 = f.to_native(datetime.datetime(1984, 7, 31)) +# result_2 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31)) +# result_3 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59)) +# result_4 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) + +# self.assertEqual('1984-07-31T00:00:00', result_1) +# self.assertEqual('1984-07-31T04:31:00', result_2) +# self.assertEqual('1984-07-31T04:31:59', result_3) +# self.assertEqual('1984-07-31T04:31:59.000200', result_4) + +# def test_to_native_custom_format(self): +# """ +# Make sure to_native() returns correct custom format. +# """ +# f = serializers.DateTimeField(format="%Y - %H:%M") + +# result_1 = f.to_native(datetime.datetime(1984, 7, 31)) +# result_2 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31)) +# result_3 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59)) +# result_4 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) + +# self.assertEqual('1984 - 00:00', result_1) +# self.assertEqual('1984 - 04:31', result_2) +# self.assertEqual('1984 - 04:31', result_3) +# self.assertEqual('1984 - 04:31', result_4) + +# def test_to_native_none(self): +# """ +# Make sure from_native() returns None on None param. +# """ +# f = serializers.DateTimeField(required=False) +# self.assertEqual(None, f.to_native(None)) + + +# class TimeFieldTest(TestCase): +# """ +# Tests for the TimeField from_native() and to_native() behavior +# """ + +# def test_from_native_string(self): +# """ +# Make sure from_native() accepts default iso input formats. +# """ +# f = serializers.TimeField() +# result_1 = f.from_native('04:31') +# result_2 = f.from_native('04:31:59') +# result_3 = f.from_native('04:31:59.000200') + +# self.assertEqual(datetime.time(4, 31), result_1) +# self.assertEqual(datetime.time(4, 31, 59), result_2) +# self.assertEqual(datetime.time(4, 31, 59, 200), result_3) + +# def test_from_native_datetime_time(self): +# """ +# Make sure from_native() accepts a datetime.time instance. +# """ +# f = serializers.TimeField() +# result_1 = f.from_native(datetime.time(4, 31)) +# result_2 = f.from_native(datetime.time(4, 31, 59)) +# result_3 = f.from_native(datetime.time(4, 31, 59, 200)) + +# self.assertEqual(result_1, datetime.time(4, 31)) +# self.assertEqual(result_2, datetime.time(4, 31, 59)) +# self.assertEqual(result_3, datetime.time(4, 31, 59, 200)) + +# def test_from_native_custom_format(self): +# """ +# Make sure from_native() accepts custom input formats. +# """ +# f = serializers.TimeField(input_formats=['%H -- %M']) +# result = f.from_native('04 -- 31') + +# self.assertEqual(datetime.time(4, 31), result) + +# def test_from_native_invalid_default_on_custom_format(self): +# """ +# Make sure from_native() don't accept default formats if custom format is preset +# """ +# f = serializers.TimeField(input_formats=['%H -- %M']) + +# try: +# f.from_native('04:31:59') +# except validators.ValidationError as e: +# self.assertEqual(e.messages, ["Time has wrong format. Use one of these formats instead: hh -- mm"]) +# else: +# self.fail("ValidationError was not properly raised") + +# def test_from_native_empty(self): +# """ +# Make sure from_native() returns None on empty param. +# """ +# f = serializers.TimeField() +# result = f.from_native('') + +# self.assertEqual(result, None) + +# def test_from_native_none(self): +# """ +# Make sure from_native() returns None on None param. +# """ +# f = serializers.TimeField() +# result = f.from_native(None) + +# self.assertEqual(result, None) + +# def test_from_native_invalid_time(self): +# """ +# Make sure from_native() raises a ValidationError on passing an invalid time. +# """ +# f = serializers.TimeField() + +# try: +# f.from_native('04:61:59') +# except validators.ValidationError as e: +# self.assertEqual(e.messages, ["Time has wrong format. Use one of these formats instead: " +# "hh:mm[:ss[.uuuuuu]]"]) +# else: +# self.fail("ValidationError was not properly raised") + +# def test_from_native_invalid_format(self): +# """ +# Make sure from_native() raises a ValidationError on passing an invalid format. +# """ +# f = serializers.TimeField() + +# try: +# f.from_native('04 -- 31') +# except validators.ValidationError as e: +# self.assertEqual(e.messages, ["Time has wrong format. Use one of these formats instead: " +# "hh:mm[:ss[.uuuuuu]]"]) +# else: +# self.fail("ValidationError was not properly raised") + +# def test_to_native(self): +# """ +# Make sure to_native() returns time object as default. +# """ +# f = serializers.TimeField() +# result_1 = f.to_native(datetime.time(4, 31)) +# result_2 = f.to_native(datetime.time(4, 31, 59)) +# result_3 = f.to_native(datetime.time(4, 31, 59, 200)) + +# self.assertEqual(datetime.time(4, 31), result_1) +# self.assertEqual(datetime.time(4, 31, 59), result_2) +# self.assertEqual(datetime.time(4, 31, 59, 200), result_3) + +# def test_to_native_iso(self): +# """ +# Make sure to_native() with format='iso-8601' returns iso formatted time. +# """ +# f = serializers.TimeField(format='iso-8601') +# result_1 = f.to_native(datetime.time(4, 31)) +# result_2 = f.to_native(datetime.time(4, 31, 59)) +# result_3 = f.to_native(datetime.time(4, 31, 59, 200)) + +# self.assertEqual('04:31:00', result_1) +# self.assertEqual('04:31:59', result_2) +# self.assertEqual('04:31:59.000200', result_3) + +# def test_to_native_custom_format(self): +# """ +# Make sure to_native() returns correct custom format. +# """ +# f = serializers.TimeField(format="%H - %S [%f]") +# result_1 = f.to_native(datetime.time(4, 31)) +# result_2 = f.to_native(datetime.time(4, 31, 59)) +# result_3 = f.to_native(datetime.time(4, 31, 59, 200)) + +# self.assertEqual('04 - 00 [000000]', result_1) +# self.assertEqual('04 - 59 [000000]', result_2) +# self.assertEqual('04 - 59 [000200]', result_3) + + +# class DecimalFieldTest(TestCase): +# """ +# Tests for the DecimalField from_native() and to_native() behavior +# """ + +# def test_from_native_string(self): +# """ +# Make sure from_native() accepts string values +# """ +# f = serializers.DecimalField() +# result_1 = f.from_native('9000') +# result_2 = f.from_native('1.00000001') + +# self.assertEqual(Decimal('9000'), result_1) +# self.assertEqual(Decimal('1.00000001'), result_2) + +# def test_from_native_invalid_string(self): +# """ +# Make sure from_native() raises ValidationError on passing invalid string +# """ +# f = serializers.DecimalField() + +# try: +# f.from_native('123.45.6') +# except validators.ValidationError as e: +# self.assertEqual(e.messages, ["Enter a number."]) +# else: +# self.fail("ValidationError was not properly raised") + +# def test_from_native_integer(self): +# """ +# Make sure from_native() accepts integer values +# """ +# f = serializers.DecimalField() +# result = f.from_native(9000) + +# self.assertEqual(Decimal('9000'), result) + +# def test_from_native_float(self): +# """ +# Make sure from_native() accepts float values +# """ +# f = serializers.DecimalField() +# result = f.from_native(1.00000001) + +# self.assertEqual(Decimal('1.00000001'), result) + +# def test_from_native_empty(self): +# """ +# Make sure from_native() returns None on empty param. +# """ +# f = serializers.DecimalField() +# result = f.from_native('') + +# self.assertEqual(result, None) + +# def test_from_native_none(self): +# """ +# Make sure from_native() returns None on None param. +# """ +# f = serializers.DecimalField() +# result = f.from_native(None) + +# self.assertEqual(result, None) + +# def test_to_native(self): +# """ +# Make sure to_native() returns Decimal as string. +# """ +# f = serializers.DecimalField() + +# result_1 = f.to_native(Decimal('9000')) +# result_2 = f.to_native(Decimal('1.00000001')) + +# self.assertEqual(Decimal('9000'), result_1) +# self.assertEqual(Decimal('1.00000001'), result_2) + +# def test_to_native_none(self): +# """ +# Make sure from_native() returns None on None param. +# """ +# f = serializers.DecimalField(required=False) +# self.assertEqual(None, f.to_native(None)) + +# def test_valid_serialization(self): +# """ +# Make sure the serializer works correctly +# """ +# class DecimalSerializer(serializers.Serializer): +# decimal_field = serializers.DecimalField(max_value=9010, +# min_value=9000, +# max_digits=6, +# decimal_places=2) + +# self.assertTrue(DecimalSerializer(data={'decimal_field': '9001'}).is_valid()) +# self.assertTrue(DecimalSerializer(data={'decimal_field': '9001.2'}).is_valid()) +# self.assertTrue(DecimalSerializer(data={'decimal_field': '9001.23'}).is_valid()) + +# self.assertFalse(DecimalSerializer(data={'decimal_field': '8000'}).is_valid()) +# self.assertFalse(DecimalSerializer(data={'decimal_field': '9900'}).is_valid()) +# self.assertFalse(DecimalSerializer(data={'decimal_field': '9001.234'}).is_valid()) + +# def test_raise_max_value(self): +# """ +# Make sure max_value violations raises ValidationError +# """ +# class DecimalSerializer(serializers.Serializer): +# decimal_field = serializers.DecimalField(max_value=100) + +# s = DecimalSerializer(data={'decimal_field': '123'}) + +# self.assertFalse(s.is_valid()) +# self.assertEqual(s.errors, {'decimal_field': ['Ensure this value is less than or equal to 100.']}) + +# def test_raise_min_value(self): +# """ +# Make sure min_value violations raises ValidationError +# """ +# class DecimalSerializer(serializers.Serializer): +# decimal_field = serializers.DecimalField(min_value=100) + +# s = DecimalSerializer(data={'decimal_field': '99'}) + +# self.assertFalse(s.is_valid()) +# self.assertEqual(s.errors, {'decimal_field': ['Ensure this value is greater than or equal to 100.']}) + +# def test_raise_max_digits(self): +# """ +# Make sure max_digits violations raises ValidationError +# """ +# class DecimalSerializer(serializers.Serializer): +# decimal_field = serializers.DecimalField(max_digits=5) + +# s = DecimalSerializer(data={'decimal_field': '123.456'}) + +# self.assertFalse(s.is_valid()) +# self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 5 digits in total.']}) + +# def test_raise_max_decimal_places(self): +# """ +# Make sure max_decimal_places violations raises ValidationError +# """ +# class DecimalSerializer(serializers.Serializer): +# decimal_field = serializers.DecimalField(decimal_places=3) + +# s = DecimalSerializer(data={'decimal_field': '123.4567'}) + +# self.assertFalse(s.is_valid()) +# self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 3 decimal places.']}) + +# def test_raise_max_whole_digits(self): +# """ +# Make sure max_whole_digits violations raises ValidationError +# """ +# class DecimalSerializer(serializers.Serializer): +# decimal_field = serializers.DecimalField(max_digits=4, decimal_places=3) + +# s = DecimalSerializer(data={'decimal_field': '12345.6'}) + +# self.assertFalse(s.is_valid()) +# self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 4 digits in total.']}) + + +# class ChoiceFieldTests(TestCase): +# """ +# Tests for the ChoiceField options generator +# """ +# def test_choices_required(self): +# """ +# Make sure proper choices are rendered if field is required +# """ +# f = serializers.ChoiceField(required=True, choices=SAMPLE_CHOICES) +# self.assertEqual(f.choices, SAMPLE_CHOICES) + +# def test_choices_not_required(self): +# """ +# Make sure proper choices (plus blank) are rendered if the field isn't required +# """ +# f = serializers.ChoiceField(required=False, choices=SAMPLE_CHOICES) +# self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + SAMPLE_CHOICES) + +# def test_blank_choice_display(self): +# blank = 'No Preference' +# f = serializers.ChoiceField( +# required=False, +# choices=SAMPLE_CHOICES, +# blank_display_value=blank, +# ) +# self.assertEqual(f.choices, [('', blank)] + SAMPLE_CHOICES) + +# def test_invalid_choice_model(self): +# s = ChoiceFieldModelSerializer(data={'choice': 'wrong_value'}) +# self.assertFalse(s.is_valid()) +# self.assertEqual(s.errors, {'choice': ['Select a valid choice. wrong_value is not one of the available choices.']}) +# self.assertEqual(s.data['choice'], '') + +# def test_empty_choice_model(self): +# """ +# Test that the 'empty' value is correctly passed and used depending on +# the 'null' property on the model field. +# """ +# s = ChoiceFieldModelSerializer(data={'choice': ''}) +# self.assertTrue(s.is_valid()) +# self.assertEqual(s.data['choice'], '') + +# s = ChoiceFieldModelWithNullSerializer(data={'choice': ''}) +# self.assertTrue(s.is_valid()) +# self.assertEqual(s.data['choice'], None) + +# def test_from_native_empty(self): +# """ +# Make sure from_native() returns an empty string on empty param by default. +# """ +# f = serializers.ChoiceField(choices=SAMPLE_CHOICES) +# self.assertEqual(f.from_native(''), '') +# self.assertEqual(f.from_native(None), '') + +# def test_from_native_empty_override(self): +# """ +# Make sure you can override from_native() behavior regarding empty values. +# """ +# f = serializers.ChoiceField(choices=SAMPLE_CHOICES, empty=None) +# self.assertEqual(f.from_native(''), None) +# self.assertEqual(f.from_native(None), None) + +# def test_metadata_choices(self): +# """ +# Make sure proper choices are included in the field's metadata. +# """ +# choices = [{'value': v, 'display_name': n} for v, n in SAMPLE_CHOICES] +# f = serializers.ChoiceField(choices=SAMPLE_CHOICES) +# self.assertEqual(f.metadata()['choices'], choices) + +# def test_metadata_choices_not_required(self): +# """ +# Make sure proper choices are included in the field's metadata. +# """ +# choices = [{'value': v, 'display_name': n} +# for v, n in models.fields.BLANK_CHOICE_DASH + SAMPLE_CHOICES] +# f = serializers.ChoiceField(required=False, choices=SAMPLE_CHOICES) +# self.assertEqual(f.metadata()['choices'], choices) + + +# class EmailFieldTests(TestCase): +# """ +# Tests for EmailField attribute values +# """ + +# class EmailFieldModel(RESTFrameworkModel): +# email_field = models.EmailField(blank=True) + +# class EmailFieldWithGivenMaxLengthModel(RESTFrameworkModel): +# email_field = models.EmailField(max_length=150, blank=True) + +# def test_default_model_value(self): +# class EmailFieldSerializer(serializers.ModelSerializer): +# class Meta: +# model = self.EmailFieldModel + +# serializer = EmailFieldSerializer(data={}) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(getattr(serializer.fields['email_field'], 'max_length'), 75) + +# def test_given_model_value(self): +# class EmailFieldSerializer(serializers.ModelSerializer): +# class Meta: +# model = self.EmailFieldWithGivenMaxLengthModel + +# serializer = EmailFieldSerializer(data={}) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(getattr(serializer.fields['email_field'], 'max_length'), 150) + +# def test_given_serializer_value(self): +# class EmailFieldSerializer(serializers.ModelSerializer): +# email_field = serializers.EmailField(source='email_field', max_length=20, required=False) + +# class Meta: +# model = self.EmailFieldModel + +# serializer = EmailFieldSerializer(data={}) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(getattr(serializer.fields['email_field'], 'max_length'), 20) + + +# class SlugFieldTests(TestCase): +# """ +# Tests for SlugField attribute values +# """ + +# class SlugFieldModel(RESTFrameworkModel): +# slug_field = models.SlugField(blank=True) + +# class SlugFieldWithGivenMaxLengthModel(RESTFrameworkModel): +# slug_field = models.SlugField(max_length=84, blank=True) + +# def test_default_model_value(self): +# class SlugFieldSerializer(serializers.ModelSerializer): +# class Meta: +# model = self.SlugFieldModel + +# serializer = SlugFieldSerializer(data={}) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 50) + +# def test_given_model_value(self): +# class SlugFieldSerializer(serializers.ModelSerializer): +# class Meta: +# model = self.SlugFieldWithGivenMaxLengthModel + +# serializer = SlugFieldSerializer(data={}) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 84) + +# def test_given_serializer_value(self): +# class SlugFieldSerializer(serializers.ModelSerializer): +# slug_field = serializers.SlugField(source='slug_field', +# max_length=20, required=False) + +# class Meta: +# model = self.SlugFieldModel + +# serializer = SlugFieldSerializer(data={}) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(getattr(serializer.fields['slug_field'], +# 'max_length'), 20) + +# def test_invalid_slug(self): +# """ +# Make sure an invalid slug raises ValidationError +# """ +# class SlugFieldSerializer(serializers.ModelSerializer): +# slug_field = serializers.SlugField(source='slug_field', max_length=20, required=True) - class Meta: - model = self.SlugFieldModel +# class Meta: +# model = self.SlugFieldModel - s = SlugFieldSerializer(data={'slug_field': 'a b'}) +# s = SlugFieldSerializer(data={'slug_field': 'a b'}) - self.assertEqual(s.is_valid(), False) - self.assertEqual(s.errors, {'slug_field': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."]}) +# self.assertEqual(s.is_valid(), False) +# self.assertEqual(s.errors, {'slug_field': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."]}) -class URLFieldTests(TestCase): - """ - Tests for URLField attribute values. +# class URLFieldTests(TestCase): +# """ +# Tests for URLField attribute values. - (Includes test for #1210, checking that validators can be overridden.) - """ +# (Includes test for #1210, checking that validators can be overridden.) +# """ - class URLFieldModel(RESTFrameworkModel): - url_field = models.URLField(blank=True) +# class URLFieldModel(RESTFrameworkModel): +# url_field = models.URLField(blank=True) - class URLFieldWithGivenMaxLengthModel(RESTFrameworkModel): - url_field = models.URLField(max_length=128, blank=True) +# class URLFieldWithGivenMaxLengthModel(RESTFrameworkModel): +# url_field = models.URLField(max_length=128, blank=True) - def test_default_model_value(self): - class URLFieldSerializer(serializers.ModelSerializer): - class Meta: - model = self.URLFieldModel +# def test_default_model_value(self): +# class URLFieldSerializer(serializers.ModelSerializer): +# class Meta: +# model = self.URLFieldModel - serializer = URLFieldSerializer(data={}) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(getattr(serializer.fields['url_field'], - 'max_length'), 200) +# serializer = URLFieldSerializer(data={}) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(getattr(serializer.fields['url_field'], +# 'max_length'), 200) - def test_given_model_value(self): - class URLFieldSerializer(serializers.ModelSerializer): - class Meta: - model = self.URLFieldWithGivenMaxLengthModel +# def test_given_model_value(self): +# class URLFieldSerializer(serializers.ModelSerializer): +# class Meta: +# model = self.URLFieldWithGivenMaxLengthModel - serializer = URLFieldSerializer(data={}) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(getattr(serializer.fields['url_field'], - 'max_length'), 128) +# serializer = URLFieldSerializer(data={}) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(getattr(serializer.fields['url_field'], +# 'max_length'), 128) - def test_given_serializer_value(self): - class URLFieldSerializer(serializers.ModelSerializer): - url_field = serializers.URLField(source='url_field', - max_length=20, required=False) +# def test_given_serializer_value(self): +# class URLFieldSerializer(serializers.ModelSerializer): +# url_field = serializers.URLField(source='url_field', +# max_length=20, required=False) - class Meta: - model = self.URLFieldWithGivenMaxLengthModel +# class Meta: +# model = self.URLFieldWithGivenMaxLengthModel - serializer = URLFieldSerializer(data={}) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(getattr(serializer.fields['url_field'], - 'max_length'), 20) +# serializer = URLFieldSerializer(data={}) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(getattr(serializer.fields['url_field'], +# 'max_length'), 20) - def test_validators_can_be_overridden(self): - url_field = serializers.URLField(validators=[]) - validators = url_field.validators - self.assertEqual([], validators, 'Passing `validators` kwarg should have overridden default validators') +# def test_validators_can_be_overridden(self): +# url_field = serializers.URLField(validators=[]) +# validators = url_field.validators +# self.assertEqual([], validators, 'Passing `validators` kwarg should have overridden default validators') -class FieldMetadata(TestCase): - def setUp(self): - self.required_field = serializers.Field() - self.required_field.label = uuid4().hex - self.required_field.required = True +# class FieldMetadata(TestCase): +# def setUp(self): +# self.required_field = serializers.Field() +# self.required_field.label = uuid4().hex +# self.required_field.required = True - self.optional_field = serializers.Field() - self.optional_field.label = uuid4().hex - self.optional_field.required = False +# self.optional_field = serializers.Field() +# self.optional_field.label = uuid4().hex +# self.optional_field.required = False - def test_required(self): - self.assertEqual(self.required_field.metadata()['required'], True) +# def test_required(self): +# self.assertEqual(self.required_field.metadata()['required'], True) - def test_optional(self): - self.assertEqual(self.optional_field.metadata()['required'], False) +# def test_optional(self): +# self.assertEqual(self.optional_field.metadata()['required'], False) - def test_label(self): - for field in (self.required_field, self.optional_field): - self.assertEqual(field.metadata()['label'], field.label) +# def test_label(self): +# for field in (self.required_field, self.optional_field): +# self.assertEqual(field.metadata()['label'], field.label) -class FieldCallableDefault(TestCase): - def setUp(self): - self.simple_callable = lambda: 'foo bar' +# class FieldCallableDefault(TestCase): +# def setUp(self): +# self.simple_callable = lambda: 'foo bar' - def test_default_can_be_simple_callable(self): - """ - Ensure that the 'default' argument can also be a simple callable. - """ - field = serializers.WritableField(default=self.simple_callable) - into = {} - field.field_from_native({}, {}, 'field', into) - self.assertEqual(into, {'field': 'foo bar'}) +# def test_default_can_be_simple_callable(self): +# """ +# Ensure that the 'default' argument can also be a simple callable. +# """ +# field = serializers.WritableField(default=self.simple_callable) +# into = {} +# field.field_from_native({}, {}, 'field', into) +# self.assertEqual(into, {'field': 'foo bar'}) -class CustomIntegerField(TestCase): - """ - Test that custom fields apply min_value and max_value constraints - """ - def test_custom_fields_can_be_validated_for_value(self): +# class CustomIntegerField(TestCase): +# """ +# Test that custom fields apply min_value and max_value constraints +# """ +# def test_custom_fields_can_be_validated_for_value(self): - class MoneyField(models.PositiveIntegerField): - pass +# class MoneyField(models.PositiveIntegerField): +# pass - class EntryModel(models.Model): - bank = MoneyField(validators=[validators.MaxValueValidator(100)]) +# class EntryModel(models.Model): +# bank = MoneyField(validators=[validators.MaxValueValidator(100)]) - class EntrySerializer(serializers.ModelSerializer): - class Meta: - model = EntryModel +# class EntrySerializer(serializers.ModelSerializer): +# class Meta: +# model = EntryModel - entry = EntryModel(bank=1) +# entry = EntryModel(bank=1) - serializer = EntrySerializer(entry, data={"bank": 11}) - self.assertTrue(serializer.is_valid()) +# serializer = EntrySerializer(entry, data={"bank": 11}) +# self.assertTrue(serializer.is_valid()) - serializer = EntrySerializer(entry, data={"bank": -1}) - self.assertFalse(serializer.is_valid()) +# serializer = EntrySerializer(entry, data={"bank": -1}) +# self.assertFalse(serializer.is_valid()) - serializer = EntrySerializer(entry, data={"bank": 101}) - self.assertFalse(serializer.is_valid()) +# serializer = EntrySerializer(entry, data={"bank": 101}) +# self.assertFalse(serializer.is_valid()) -class BooleanField(TestCase): - """ - Tests for BooleanField - """ - def test_boolean_required(self): - class BooleanRequiredSerializer(serializers.Serializer): - bool_field = serializers.BooleanField(required=True) +# class BooleanField(TestCase): +# """ +# Tests for BooleanField +# """ +# def test_boolean_required(self): +# class BooleanRequiredSerializer(serializers.Serializer): +# bool_field = serializers.BooleanField(required=True) - self.assertFalse(BooleanRequiredSerializer(data={}).is_valid()) +# self.assertFalse(BooleanRequiredSerializer(data={}).is_valid()) -class SerializerMethodFieldTest(TestCase): - """ - Tests for the SerializerMethodField field_to_native() behavior - """ - class SerializerTest(serializers.Serializer): - def get_my_test(self, obj): - return obj.my_test[0:5] +# class SerializerMethodFieldTest(TestCase): +# """ +# Tests for the SerializerMethodField field_to_native() behavior +# """ +# class SerializerTest(serializers.Serializer): +# def get_my_test(self, obj): +# return obj.my_test[0:5] - class Example(): - my_test = 'Hey, this is a test !' +# class Example(): +# my_test = 'Hey, this is a test !' - def test_field_to_native(self): - s = serializers.SerializerMethodField('get_my_test') - s.initialize(self.SerializerTest(), 'name') - result = s.field_to_native(self.Example(), None) - self.assertEqual(result, 'Hey, ') +# def test_field_to_native(self): +# s = serializers.SerializerMethodField('get_my_test') +# s.initialize(self.SerializerTest(), 'name') +# result = s.field_to_native(self.Example(), None) +# self.assertEqual(result, 'Hey, ') diff --git a/tests/test_files.py b/tests/test_files.py index de4f71d1a..a5613fcbe 100644 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -1,92 +1,92 @@ -from __future__ import unicode_literals -from django.test import TestCase -from django.utils import six -from rest_framework import serializers -from rest_framework.compat import BytesIO -import datetime +# from __future__ import unicode_literals +# from django.test import TestCase +# from django.utils import six +# from rest_framework import serializers +# from rest_framework.compat import BytesIO +# import datetime -class UploadedFile(object): - def __init__(self, file=None, created=None): - self.file = file - self.created = created or datetime.datetime.now() +# class UploadedFile(object): +# def __init__(self, file=None, created=None): +# self.file = file +# self.created = created or datetime.datetime.now() -class UploadedFileSerializer(serializers.Serializer): - file = serializers.FileField(required=False) - created = serializers.DateTimeField() +# class UploadedFileSerializer(serializers.Serializer): +# file = serializers.FileField(required=False) +# created = serializers.DateTimeField() - def restore_object(self, attrs, instance=None): - if instance: - instance.file = attrs['file'] - instance.created = attrs['created'] - return instance - return UploadedFile(**attrs) +# def restore_object(self, attrs, instance=None): +# if instance: +# instance.file = attrs['file'] +# instance.created = attrs['created'] +# return instance +# return UploadedFile(**attrs) -class FileSerializerTests(TestCase): - def test_create(self): - now = datetime.datetime.now() - file = BytesIO(six.b('stuff')) - file.name = 'stuff.txt' - file.size = len(file.getvalue()) - serializer = UploadedFileSerializer(data={'created': now}, files={'file': file}) - uploaded_file = UploadedFile(file=file, created=now) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.object.created, uploaded_file.created) - self.assertEqual(serializer.object.file, uploaded_file.file) - self.assertFalse(serializer.object is uploaded_file) +# class FileSerializerTests(TestCase): +# def test_create(self): +# now = datetime.datetime.now() +# file = BytesIO(six.b('stuff')) +# file.name = 'stuff.txt' +# file.size = len(file.getvalue()) +# serializer = UploadedFileSerializer(data={'created': now}, files={'file': file}) +# uploaded_file = UploadedFile(file=file, created=now) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.object.created, uploaded_file.created) +# self.assertEqual(serializer.object.file, uploaded_file.file) +# self.assertFalse(serializer.object is uploaded_file) - def test_creation_failure(self): - """ - Passing files=None should result in an ValidationError +# def test_creation_failure(self): +# """ +# Passing files=None should result in an ValidationError - Regression test for: - https://github.com/tomchristie/django-rest-framework/issues/542 - """ - now = datetime.datetime.now() +# Regression test for: +# https://github.com/tomchristie/django-rest-framework/issues/542 +# """ +# now = datetime.datetime.now() - serializer = UploadedFileSerializer(data={'created': now}) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.object.created, now) - self.assertIsNone(serializer.object.file) +# serializer = UploadedFileSerializer(data={'created': now}) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.object.created, now) +# self.assertIsNone(serializer.object.file) - def test_remove_with_empty_string(self): - """ - Passing empty string as data should cause file to be removed +# def test_remove_with_empty_string(self): +# """ +# Passing empty string as data should cause file to be removed - Test for: - https://github.com/tomchristie/django-rest-framework/issues/937 - """ - now = datetime.datetime.now() - file = BytesIO(six.b('stuff')) - file.name = 'stuff.txt' - file.size = len(file.getvalue()) +# Test for: +# https://github.com/tomchristie/django-rest-framework/issues/937 +# """ +# now = datetime.datetime.now() +# file = BytesIO(six.b('stuff')) +# file.name = 'stuff.txt' +# file.size = len(file.getvalue()) - uploaded_file = UploadedFile(file=file, created=now) +# uploaded_file = UploadedFile(file=file, created=now) - serializer = UploadedFileSerializer(instance=uploaded_file, data={'created': now, 'file': ''}) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.object.created, uploaded_file.created) - self.assertIsNone(serializer.object.file) +# serializer = UploadedFileSerializer(instance=uploaded_file, data={'created': now, 'file': ''}) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.object.created, uploaded_file.created) +# self.assertIsNone(serializer.object.file) - def test_validation_error_with_non_file(self): - """ - Passing non-files should raise a validation error. - """ - now = datetime.datetime.now() - errmsg = 'No file was submitted. Check the encoding type on the form.' +# def test_validation_error_with_non_file(self): +# """ +# Passing non-files should raise a validation error. +# """ +# now = datetime.datetime.now() +# errmsg = 'No file was submitted. Check the encoding type on the form.' - serializer = UploadedFileSerializer(data={'created': now, 'file': 'abc'}) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'file': [errmsg]}) +# serializer = UploadedFileSerializer(data={'created': now, 'file': 'abc'}) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'file': [errmsg]}) - def test_validation_with_no_data(self): - """ - Validation should still function when no data dictionary is provided. - """ - uploaded_file = BytesIO(six.b('stuff')) - uploaded_file.name = 'stuff.txt' - uploaded_file.size = len(uploaded_file.getvalue()) - serializer = UploadedFileSerializer(files={'file': uploaded_file}) - self.assertFalse(serializer.is_valid()) +# def test_validation_with_no_data(self): +# """ +# Validation should still function when no data dictionary is provided. +# """ +# uploaded_file = BytesIO(six.b('stuff')) +# uploaded_file.name = 'stuff.txt' +# uploaded_file.size = len(uploaded_file.getvalue()) +# serializer = UploadedFileSerializer(files={'file': uploaded_file}) +# self.assertFalse(serializer.is_valid()) diff --git a/tests/test_genericrelations.py b/tests/test_genericrelations.py index 95295eaa8..a87ea3fdd 100644 --- a/tests/test_genericrelations.py +++ b/tests/test_genericrelations.py @@ -1,151 +1,151 @@ -from __future__ import unicode_literals -from django.contrib.contenttypes.models import ContentType -from django.contrib.contenttypes.generic import GenericRelation, GenericForeignKey -from django.db import models -from django.test import TestCase -from rest_framework import serializers -from rest_framework.compat import python_2_unicode_compatible +# from __future__ import unicode_literals +# from django.contrib.contenttypes.models import ContentType +# from django.contrib.contenttypes.generic import GenericRelation, GenericForeignKey +# from django.db import models +# from django.test import TestCase +# from rest_framework import serializers +# from rest_framework.compat import python_2_unicode_compatible -@python_2_unicode_compatible -class Tag(models.Model): - """ - Tags have a descriptive slug, and are attached to an arbitrary object. - """ - tag = models.SlugField() - content_type = models.ForeignKey(ContentType) - object_id = models.PositiveIntegerField() - tagged_item = GenericForeignKey('content_type', 'object_id') +# @python_2_unicode_compatible +# class Tag(models.Model): +# """ +# Tags have a descriptive slug, and are attached to an arbitrary object. +# """ +# tag = models.SlugField() +# content_type = models.ForeignKey(ContentType) +# object_id = models.PositiveIntegerField() +# tagged_item = GenericForeignKey('content_type', 'object_id') - def __str__(self): - return self.tag +# def __str__(self): +# return self.tag -@python_2_unicode_compatible -class Bookmark(models.Model): - """ - A URL bookmark that may have multiple tags attached. - """ - url = models.URLField() - tags = GenericRelation(Tag) +# @python_2_unicode_compatible +# class Bookmark(models.Model): +# """ +# A URL bookmark that may have multiple tags attached. +# """ +# url = models.URLField() +# tags = GenericRelation(Tag) - def __str__(self): - return 'Bookmark: %s' % self.url +# def __str__(self): +# return 'Bookmark: %s' % self.url -@python_2_unicode_compatible -class Note(models.Model): - """ - A textual note that may have multiple tags attached. - """ - text = models.TextField() - tags = GenericRelation(Tag) +# @python_2_unicode_compatible +# class Note(models.Model): +# """ +# A textual note that may have multiple tags attached. +# """ +# text = models.TextField() +# tags = GenericRelation(Tag) - def __str__(self): - return 'Note: %s' % self.text +# def __str__(self): +# return 'Note: %s' % self.text -class TestGenericRelations(TestCase): - def setUp(self): - self.bookmark = Bookmark.objects.create(url='https://www.djangoproject.com/') - Tag.objects.create(tagged_item=self.bookmark, tag='django') - Tag.objects.create(tagged_item=self.bookmark, tag='python') - self.note = Note.objects.create(text='Remember the milk') - Tag.objects.create(tagged_item=self.note, tag='reminder') +# class TestGenericRelations(TestCase): +# def setUp(self): +# self.bookmark = Bookmark.objects.create(url='https://www.djangoproject.com/') +# Tag.objects.create(tagged_item=self.bookmark, tag='django') +# Tag.objects.create(tagged_item=self.bookmark, tag='python') +# self.note = Note.objects.create(text='Remember the milk') +# Tag.objects.create(tagged_item=self.note, tag='reminder') - def test_generic_relation(self): - """ - Test a relationship that spans a GenericRelation field. - IE. A reverse generic relationship. - """ +# def test_generic_relation(self): +# """ +# Test a relationship that spans a GenericRelation field. +# IE. A reverse generic relationship. +# """ - class BookmarkSerializer(serializers.ModelSerializer): - tags = serializers.RelatedField(many=True) +# class BookmarkSerializer(serializers.ModelSerializer): +# tags = serializers.RelatedField(many=True) - class Meta: - model = Bookmark - exclude = ('id',) +# class Meta: +# model = Bookmark +# exclude = ('id',) - serializer = BookmarkSerializer(self.bookmark) - expected = { - 'tags': ['django', 'python'], - 'url': 'https://www.djangoproject.com/' - } - self.assertEqual(serializer.data, expected) +# serializer = BookmarkSerializer(self.bookmark) +# expected = { +# 'tags': ['django', 'python'], +# 'url': 'https://www.djangoproject.com/' +# } +# self.assertEqual(serializer.data, expected) - def test_generic_nested_relation(self): - """ - Test saving a GenericRelation field via a nested serializer. - """ +# def test_generic_nested_relation(self): +# """ +# Test saving a GenericRelation field via a nested serializer. +# """ - class TagSerializer(serializers.ModelSerializer): - class Meta: - model = Tag - exclude = ('content_type', 'object_id') +# class TagSerializer(serializers.ModelSerializer): +# class Meta: +# model = Tag +# exclude = ('content_type', 'object_id') - class BookmarkSerializer(serializers.ModelSerializer): - tags = TagSerializer(many=True) +# class BookmarkSerializer(serializers.ModelSerializer): +# tags = TagSerializer(many=True) - class Meta: - model = Bookmark - exclude = ('id',) +# class Meta: +# model = Bookmark +# exclude = ('id',) - data = { - 'url': 'https://docs.djangoproject.com/', - 'tags': [ - {'tag': 'contenttypes'}, - {'tag': 'genericrelations'}, - ] - } - serializer = BookmarkSerializer(data=data) - self.assertTrue(serializer.is_valid()) - serializer.save() - self.assertEqual(serializer.object.tags.count(), 2) +# data = { +# 'url': 'https://docs.djangoproject.com/', +# 'tags': [ +# {'tag': 'contenttypes'}, +# {'tag': 'genericrelations'}, +# ] +# } +# serializer = BookmarkSerializer(data=data) +# self.assertTrue(serializer.is_valid()) +# serializer.save() +# self.assertEqual(serializer.object.tags.count(), 2) - def test_generic_fk(self): - """ - Test a relationship that spans a GenericForeignKey field. - IE. A forward generic relationship. - """ +# def test_generic_fk(self): +# """ +# Test a relationship that spans a GenericForeignKey field. +# IE. A forward generic relationship. +# """ - class TagSerializer(serializers.ModelSerializer): - tagged_item = serializers.RelatedField() +# class TagSerializer(serializers.ModelSerializer): +# tagged_item = serializers.RelatedField() - class Meta: - model = Tag - exclude = ('id', 'content_type', 'object_id') +# class Meta: +# model = Tag +# exclude = ('id', 'content_type', 'object_id') - serializer = TagSerializer(Tag.objects.all(), many=True) - expected = [ - { - 'tag': 'django', - 'tagged_item': 'Bookmark: https://www.djangoproject.com/' - }, - { - 'tag': 'python', - 'tagged_item': 'Bookmark: https://www.djangoproject.com/' - }, - { - 'tag': 'reminder', - 'tagged_item': 'Note: Remember the milk' - } - ] - self.assertEqual(serializer.data, expected) +# serializer = TagSerializer(Tag.objects.all(), many=True) +# expected = [ +# { +# 'tag': 'django', +# 'tagged_item': 'Bookmark: https://www.djangoproject.com/' +# }, +# { +# 'tag': 'python', +# 'tagged_item': 'Bookmark: https://www.djangoproject.com/' +# }, +# { +# 'tag': 'reminder', +# 'tagged_item': 'Note: Remember the milk' +# } +# ] +# self.assertEqual(serializer.data, expected) - def test_restore_object_generic_fk(self): - """ - Ensure an object with a generic foreign key can be restored. - """ +# def test_restore_object_generic_fk(self): +# """ +# Ensure an object with a generic foreign key can be restored. +# """ - class TagSerializer(serializers.ModelSerializer): - class Meta: - model = Tag - exclude = ('content_type', 'object_id') +# class TagSerializer(serializers.ModelSerializer): +# class Meta: +# model = Tag +# exclude = ('content_type', 'object_id') - serializer = TagSerializer() +# serializer = TagSerializer() - bookmark = Bookmark(url='http://example.com') - attrs = {'tagged_item': bookmark, 'tag': 'example'} +# bookmark = Bookmark(url='http://example.com') +# attrs = {'tagged_item': bookmark, 'tag': 'example'} - tag = serializer.restore_object(attrs) - self.assertEqual(tag.tagged_item, bookmark) +# tag = serializer.restore_object(attrs) +# self.assertEqual(tag.tagged_item, bookmark) diff --git a/tests/test_generics.py b/tests/test_generics.py index f50d53e99..55f361b24 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -33,13 +33,9 @@ class InstanceView(generics.RetrieveUpdateDestroyAPIView): """ Example description for OPTIONS. """ - queryset = BasicModel.objects.all() + queryset = BasicModel.objects.exclude(text='filtered out') serializer_class = BasicSerializer - def get_queryset(self): - queryset = super(InstanceView, self).get_queryset() - return queryset.exclude(text='filtered out') - class FKInstanceView(generics.RetrieveUpdateDestroyAPIView): """ @@ -50,11 +46,11 @@ class FKInstanceView(generics.RetrieveUpdateDestroyAPIView): class SlugSerializer(serializers.ModelSerializer): - slug = serializers.Field() # read only + slug = serializers.Field(read_only=True) class Meta: model = SlugBasedModel - exclude = ('id',) + fields = ('text', 'slug') class SlugBasedInstanceView(InstanceView): @@ -125,46 +121,46 @@ class TestRootView(TestCase): self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) self.assertEqual(response.data, {"detail": "Method 'DELETE' not allowed."}) - def test_options_root_view(self): - """ - OPTIONS requests to ListCreateAPIView should return metadata - """ - request = factory.options('/') - with self.assertNumQueries(0): - response = self.view(request).render() - expected = { - 'parses': [ - 'application/json', - 'application/x-www-form-urlencoded', - 'multipart/form-data' - ], - 'renders': [ - 'application/json', - 'text/html' - ], - 'name': 'Root', - 'description': 'Example description for OPTIONS.', - 'actions': { - 'POST': { - 'text': { - 'max_length': 100, - 'read_only': False, - 'required': True, - 'type': 'string', - "label": "Text comes here", - "help_text": "Text description." - }, - 'id': { - 'read_only': True, - 'required': False, - 'type': 'integer', - 'label': 'ID', - }, - } - } - } - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, expected) + # def test_options_root_view(self): + # """ + # OPTIONS requests to ListCreateAPIView should return metadata + # """ + # request = factory.options('/') + # with self.assertNumQueries(0): + # response = self.view(request).render() + # expected = { + # 'parses': [ + # 'application/json', + # 'application/x-www-form-urlencoded', + # 'multipart/form-data' + # ], + # 'renders': [ + # 'application/json', + # 'text/html' + # ], + # 'name': 'Root', + # 'description': 'Example description for OPTIONS.', + # 'actions': { + # 'POST': { + # 'text': { + # 'max_length': 100, + # 'read_only': False, + # 'required': True, + # 'type': 'string', + # "label": "Text comes here", + # "help_text": "Text description." + # }, + # 'id': { + # 'read_only': True, + # 'required': False, + # 'type': 'integer', + # 'label': 'ID', + # }, + # } + # } + # } + # self.assertEqual(response.status_code, status.HTTP_200_OK) + # self.assertEqual(response.data, expected) def test_post_cannot_set_id(self): """ @@ -223,10 +219,10 @@ class TestInstanceView(TestCase): """ data = {'text': 'foobar'} request = factory.put('/1', data, format='json') - with self.assertNumQueries(2): + with self.assertNumQueries(3): response = self.view(request, pk='1').render() self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, {'id': 1, 'text': 'foobar'}) + self.assertEqual(dict(response.data), {'id': 1, 'text': 'foobar'}) updated = self.objects.get(id=1) self.assertEqual(updated.text, 'foobar') @@ -237,7 +233,7 @@ class TestInstanceView(TestCase): data = {'text': 'foobar'} request = factory.patch('/1', data, format='json') - with self.assertNumQueries(2): + with self.assertNumQueries(3): response = self.view(request, pk=1).render() self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.data, {'id': 1, 'text': 'foobar'}) @@ -256,88 +252,88 @@ class TestInstanceView(TestCase): ids = [obj.id for obj in self.objects.all()] self.assertEqual(ids, [2, 3]) - def test_options_instance_view(self): - """ - OPTIONS requests to RetrieveUpdateDestroyAPIView should return metadata - """ - request = factory.options('/1') - with self.assertNumQueries(1): - response = self.view(request, pk=1).render() - expected = { - 'parses': [ - 'application/json', - 'application/x-www-form-urlencoded', - 'multipart/form-data' - ], - 'renders': [ - 'application/json', - 'text/html' - ], - 'name': 'Instance', - 'description': 'Example description for OPTIONS.', - 'actions': { - 'PUT': { - 'text': { - 'max_length': 100, - 'read_only': False, - 'required': True, - 'type': 'string', - 'label': 'Text comes here', - 'help_text': 'Text description.' - }, - 'id': { - 'read_only': True, - 'required': False, - 'type': 'integer', - 'label': 'ID', - }, - } - } - } - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, expected) + # def test_options_instance_view(self): + # """ + # OPTIONS requests to RetrieveUpdateDestroyAPIView should return metadata + # """ + # request = factory.options('/1') + # with self.assertNumQueries(1): + # response = self.view(request, pk=1).render() + # expected = { + # 'parses': [ + # 'application/json', + # 'application/x-www-form-urlencoded', + # 'multipart/form-data' + # ], + # 'renders': [ + # 'application/json', + # 'text/html' + # ], + # 'name': 'Instance', + # 'description': 'Example description for OPTIONS.', + # 'actions': { + # 'PUT': { + # 'text': { + # 'max_length': 100, + # 'read_only': False, + # 'required': True, + # 'type': 'string', + # 'label': 'Text comes here', + # 'help_text': 'Text description.' + # }, + # 'id': { + # 'read_only': True, + # 'required': False, + # 'type': 'integer', + # 'label': 'ID', + # }, + # } + # } + # } + # self.assertEqual(response.status_code, status.HTTP_200_OK) + # self.assertEqual(response.data, expected) - def test_options_before_instance_create(self): - """ - OPTIONS requests to RetrieveUpdateDestroyAPIView should return metadata - before the instance has been created - """ - request = factory.options('/999') - with self.assertNumQueries(1): - response = self.view(request, pk=999).render() - expected = { - 'parses': [ - 'application/json', - 'application/x-www-form-urlencoded', - 'multipart/form-data' - ], - 'renders': [ - 'application/json', - 'text/html' - ], - 'name': 'Instance', - 'description': 'Example description for OPTIONS.', - 'actions': { - 'PUT': { - 'text': { - 'max_length': 100, - 'read_only': False, - 'required': True, - 'type': 'string', - 'label': 'Text comes here', - 'help_text': 'Text description.' - }, - 'id': { - 'read_only': True, - 'required': False, - 'type': 'integer', - 'label': 'ID', - }, - } - } - } - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, expected) + # def test_options_before_instance_create(self): + # """ + # OPTIONS requests to RetrieveUpdateDestroyAPIView should return metadata + # before the instance has been created + # """ + # request = factory.options('/999') + # with self.assertNumQueries(1): + # response = self.view(request, pk=999).render() + # expected = { + # 'parses': [ + # 'application/json', + # 'application/x-www-form-urlencoded', + # 'multipart/form-data' + # ], + # 'renders': [ + # 'application/json', + # 'text/html' + # ], + # 'name': 'Instance', + # 'description': 'Example description for OPTIONS.', + # 'actions': { + # 'PUT': { + # 'text': { + # 'max_length': 100, + # 'read_only': False, + # 'required': True, + # 'type': 'string', + # 'label': 'Text comes here', + # 'help_text': 'Text description.' + # }, + # 'id': { + # 'read_only': True, + # 'required': False, + # 'type': 'integer', + # 'label': 'ID', + # }, + # } + # } + # } + # self.assertEqual(response.status_code, status.HTTP_200_OK) + # self.assertEqual(response.data, expected) def test_get_instance_view_incorrect_arg(self): """ @@ -355,7 +351,7 @@ class TestInstanceView(TestCase): """ data = {'id': 999, 'text': 'foobar'} request = factory.put('/1', data, format='json') - with self.assertNumQueries(2): + with self.assertNumQueries(3): response = self.view(request, pk=1).render() self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.data, {'id': 1, 'text': 'foobar'}) @@ -370,7 +366,7 @@ class TestInstanceView(TestCase): self.objects.get(id=1).delete() data = {'text': 'foobar'} request = factory.put('/1', data, format='json') - with self.assertNumQueries(3): + with self.assertNumQueries(2): response = self.view(request, pk=1).render() self.assertEqual(response.status_code, status.HTTP_201_CREATED) self.assertEqual(response.data, {'id': 1, 'text': 'foobar'}) @@ -396,7 +392,7 @@ class TestInstanceView(TestCase): data = {'text': 'foobar'} # pk fields can not be created on demand, only the database can set the pk for a new object request = factory.put('/5', data, format='json') - with self.assertNumQueries(3): + with self.assertNumQueries(2): response = self.view(request, pk=5).render() self.assertEqual(response.status_code, status.HTTP_201_CREATED) new_obj = self.objects.get(pk=5) @@ -446,52 +442,52 @@ class TestFKInstanceView(TestCase): ] self.view = FKInstanceView.as_view() - def test_options_root_view(self): - """ - OPTIONS requests to ListCreateAPIView should return metadata - """ - request = factory.options('/999') - with self.assertNumQueries(1): - response = self.view(request, pk=999).render() - expected = { - 'name': 'Fk Instance', - 'description': 'FK: example description for OPTIONS.', - 'renders': [ - 'application/json', - 'text/html' - ], - 'parses': [ - 'application/json', - 'application/x-www-form-urlencoded', - 'multipart/form-data' - ], - 'actions': { - 'PUT': { - 'id': { - 'type': 'integer', - 'required': False, - 'read_only': True, - 'label': 'ID' - }, - 'name': { - 'type': 'string', - 'required': True, - 'read_only': False, - 'label': 'name', - 'max_length': 100 - }, - 'target': { - 'type': 'field', - 'required': True, - 'read_only': False, - 'label': 'Target', - 'help_text': 'Target' - } - } - } - } - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, expected) + # def test_options_root_view(self): + # """ + # OPTIONS requests to ListCreateAPIView should return metadata + # """ + # request = factory.options('/999') + # with self.assertNumQueries(1): + # response = self.view(request, pk=999).render() + # expected = { + # 'name': 'Fk Instance', + # 'description': 'FK: example description for OPTIONS.', + # 'renders': [ + # 'application/json', + # 'text/html' + # ], + # 'parses': [ + # 'application/json', + # 'application/x-www-form-urlencoded', + # 'multipart/form-data' + # ], + # 'actions': { + # 'PUT': { + # 'id': { + # 'type': 'integer', + # 'required': False, + # 'read_only': True, + # 'label': 'ID' + # }, + # 'name': { + # 'type': 'string', + # 'required': True, + # 'read_only': False, + # 'label': 'name', + # 'max_length': 100 + # }, + # 'target': { + # 'type': 'field', + # 'required': True, + # 'read_only': False, + # 'label': 'Target', + # 'help_text': 'Target' + # } + # } + # } + # } + # self.assertEqual(response.status_code, status.HTTP_200_OK) + # self.assertEqual(response.data, expected) class TestOverriddenGetObject(TestCase): diff --git a/tests/test_hyperlinkedserializers.py b/tests/test_hyperlinkedserializers.py index 0e8c1ed46..ff3663dd3 100644 --- a/tests/test_hyperlinkedserializers.py +++ b/tests/test_hyperlinkedserializers.py @@ -1,406 +1,406 @@ -from __future__ import unicode_literals -import json -from django.test import TestCase -from rest_framework import generics, status, serializers -from django.conf.urls import patterns, url -from rest_framework.settings import api_settings -from rest_framework.test import APIRequestFactory -from tests.models import ( - Anchor, BasicModel, ManyToManyModel, BlogPost, BlogPostComment, - Album, Photo, OptionalRelationModel -) +# from __future__ import unicode_literals +# import json +# from django.test import TestCase +# from rest_framework import generics, status, serializers +# from django.conf.urls import patterns, url +# from rest_framework.settings import api_settings +# from rest_framework.test import APIRequestFactory +# from tests.models import ( +# Anchor, BasicModel, ManyToManyModel, BlogPost, BlogPostComment, +# Album, Photo, OptionalRelationModel +# ) -factory = APIRequestFactory() +# factory = APIRequestFactory() -class BlogPostCommentSerializer(serializers.ModelSerializer): - url = serializers.HyperlinkedIdentityField(view_name='blogpostcomment-detail') - text = serializers.CharField() - blog_post_url = serializers.HyperlinkedRelatedField(source='blog_post', view_name='blogpost-detail') +# class BlogPostCommentSerializer(serializers.ModelSerializer): +# url = serializers.HyperlinkedIdentityField(view_name='blogpostcomment-detail') +# text = serializers.CharField() +# blog_post_url = serializers.HyperlinkedRelatedField(source='blog_post', view_name='blogpost-detail') - class Meta: - model = BlogPostComment - fields = ('text', 'blog_post_url', 'url') +# class Meta: +# model = BlogPostComment +# fields = ('text', 'blog_post_url', 'url') -class PhotoSerializer(serializers.Serializer): - description = serializers.CharField() - album_url = serializers.HyperlinkedRelatedField(source='album', view_name='album-detail', queryset=Album.objects.all(), lookup_field='title') +# class PhotoSerializer(serializers.Serializer): +# description = serializers.CharField() +# album_url = serializers.HyperlinkedRelatedField(source='album', view_name='album-detail', queryset=Album.objects.all(), lookup_field='title') - def restore_object(self, attrs, instance=None): - return Photo(**attrs) +# def restore_object(self, attrs, instance=None): +# return Photo(**attrs) -class AlbumSerializer(serializers.ModelSerializer): - url = serializers.HyperlinkedIdentityField(view_name='album-detail', lookup_field='title') +# class AlbumSerializer(serializers.ModelSerializer): +# url = serializers.HyperlinkedIdentityField(view_name='album-detail', lookup_field='title') - class Meta: - model = Album - fields = ('title', 'url') +# class Meta: +# model = Album +# fields = ('title', 'url') -class BasicSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = BasicModel +# class BasicSerializer(serializers.HyperlinkedModelSerializer): +# class Meta: +# model = BasicModel -class AnchorSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = Anchor +# class AnchorSerializer(serializers.HyperlinkedModelSerializer): +# class Meta: +# model = Anchor -class ManyToManySerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = ManyToManyModel +# class ManyToManySerializer(serializers.HyperlinkedModelSerializer): +# class Meta: +# model = ManyToManyModel -class BlogPostSerializer(serializers.ModelSerializer): - class Meta: - model = BlogPost +# class BlogPostSerializer(serializers.ModelSerializer): +# class Meta: +# model = BlogPost -class OptionalRelationSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = OptionalRelationModel +# class OptionalRelationSerializer(serializers.HyperlinkedModelSerializer): +# class Meta: +# model = OptionalRelationModel -class BasicList(generics.ListCreateAPIView): - queryset = BasicModel.objects.all() - serializer_class = BasicSerializer +# class BasicList(generics.ListCreateAPIView): +# queryset = BasicModel.objects.all() +# serializer_class = BasicSerializer -class BasicDetail(generics.RetrieveUpdateDestroyAPIView): - queryset = BasicModel.objects.all() - serializer_class = BasicSerializer +# class BasicDetail(generics.RetrieveUpdateDestroyAPIView): +# queryset = BasicModel.objects.all() +# serializer_class = BasicSerializer -class AnchorDetail(generics.RetrieveAPIView): - queryset = Anchor.objects.all() - serializer_class = AnchorSerializer +# class AnchorDetail(generics.RetrieveAPIView): +# queryset = Anchor.objects.all() +# serializer_class = AnchorSerializer -class ManyToManyList(generics.ListAPIView): - queryset = ManyToManyModel.objects.all() - serializer_class = ManyToManySerializer +# class ManyToManyList(generics.ListAPIView): +# queryset = ManyToManyModel.objects.all() +# serializer_class = ManyToManySerializer -class ManyToManyDetail(generics.RetrieveAPIView): - queryset = ManyToManyModel.objects.all() - serializer_class = ManyToManySerializer +# class ManyToManyDetail(generics.RetrieveAPIView): +# queryset = ManyToManyModel.objects.all() +# serializer_class = ManyToManySerializer -class BlogPostCommentListCreate(generics.ListCreateAPIView): - queryset = BlogPostComment.objects.all() - serializer_class = BlogPostCommentSerializer +# class BlogPostCommentListCreate(generics.ListCreateAPIView): +# queryset = BlogPostComment.objects.all() +# serializer_class = BlogPostCommentSerializer -class BlogPostCommentDetail(generics.RetrieveAPIView): - queryset = BlogPostComment.objects.all() - serializer_class = BlogPostCommentSerializer +# class BlogPostCommentDetail(generics.RetrieveAPIView): +# queryset = BlogPostComment.objects.all() +# serializer_class = BlogPostCommentSerializer -class BlogPostDetail(generics.RetrieveAPIView): - queryset = BlogPost.objects.all() - serializer_class = BlogPostSerializer +# class BlogPostDetail(generics.RetrieveAPIView): +# queryset = BlogPost.objects.all() +# serializer_class = BlogPostSerializer -class PhotoListCreate(generics.ListCreateAPIView): - queryset = Photo.objects.all() - serializer_class = PhotoSerializer +# class PhotoListCreate(generics.ListCreateAPIView): +# queryset = Photo.objects.all() +# serializer_class = PhotoSerializer -class AlbumDetail(generics.RetrieveAPIView): - queryset = Album.objects.all() - serializer_class = AlbumSerializer - lookup_field = 'title' +# class AlbumDetail(generics.RetrieveAPIView): +# queryset = Album.objects.all() +# serializer_class = AlbumSerializer +# lookup_field = 'title' -class OptionalRelationDetail(generics.RetrieveUpdateDestroyAPIView): - queryset = OptionalRelationModel.objects.all() - serializer_class = OptionalRelationSerializer +# class OptionalRelationDetail(generics.RetrieveUpdateDestroyAPIView): +# queryset = OptionalRelationModel.objects.all() +# serializer_class = OptionalRelationSerializer -urlpatterns = patterns( - '', - url(r'^basic/$', BasicList.as_view(), name='basicmodel-list'), - url(r'^basic/(?P\d+)/$', BasicDetail.as_view(), name='basicmodel-detail'), - url(r'^anchor/(?P\d+)/$', AnchorDetail.as_view(), name='anchor-detail'), - url(r'^manytomany/$', ManyToManyList.as_view(), name='manytomanymodel-list'), - url(r'^manytomany/(?P\d+)/$', ManyToManyDetail.as_view(), name='manytomanymodel-detail'), - url(r'^posts/(?P\d+)/$', BlogPostDetail.as_view(), name='blogpost-detail'), - url(r'^comments/$', BlogPostCommentListCreate.as_view(), name='blogpostcomment-list'), - url(r'^comments/(?P\d+)/$', BlogPostCommentDetail.as_view(), name='blogpostcomment-detail'), - url(r'^albums/(?P\w[\w-]*)/$', AlbumDetail.as_view(), name='album-detail'), - url(r'^photos/$', PhotoListCreate.as_view(), name='photo-list'), - url(r'^optionalrelation/(?P<pk>\d+)/$', OptionalRelationDetail.as_view(), name='optionalrelationmodel-detail'), -) - - -class TestBasicHyperlinkedView(TestCase): - urls = 'tests.test_hyperlinkedserializers' - - def setUp(self): - """ - Create 3 BasicModel instances. - """ - items = ['foo', 'bar', 'baz'] - for item in items: - BasicModel(text=item).save() - self.objects = BasicModel.objects - self.data = [ - {'url': 'http://testserver/basic/%d/' % obj.id, 'text': obj.text} - for obj in self.objects.all() - ] - self.list_view = BasicList.as_view() - self.detail_view = BasicDetail.as_view() - - def test_get_list_view(self): - """ - GET requests to ListCreateAPIView should return list of objects. - """ - request = factory.get('/basic/') - response = self.list_view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) - - def test_get_detail_view(self): - """ - GET requests to ListCreateAPIView should return list of objects. - """ - request = factory.get('/basic/1') - response = self.detail_view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data[0]) - - -class TestManyToManyHyperlinkedView(TestCase): - urls = 'tests.test_hyperlinkedserializers' - - def setUp(self): - """ - Create 3 BasicModel instances. - """ - items = ['foo', 'bar', 'baz'] - anchors = [] - for item in items: - anchor = Anchor(text=item) - anchor.save() - anchors.append(anchor) - - manytomany = ManyToManyModel() - manytomany.save() - manytomany.rel.add(*anchors) - - self.data = [{ - 'url': 'http://testserver/manytomany/1/', - 'rel': [ - 'http://testserver/anchor/1/', - 'http://testserver/anchor/2/', - 'http://testserver/anchor/3/', - ] - }] - self.list_view = ManyToManyList.as_view() - self.detail_view = ManyToManyDetail.as_view() - - def test_get_list_view(self): - """ - GET requests to ListCreateAPIView should return list of objects. - """ - request = factory.get('/manytomany/') - response = self.list_view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) - - def test_get_detail_view(self): - """ - GET requests to ListCreateAPIView should return list of objects. - """ - request = factory.get('/manytomany/1/') - response = self.detail_view(request, pk=1) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data[0]) - - -class TestHyperlinkedIdentityFieldLookup(TestCase): - urls = 'tests.test_hyperlinkedserializers' - - def setUp(self): - """ - Create 3 Album instances. - """ - titles = ['foo', 'bar', 'baz'] - for title in titles: - album = Album(title=title) - album.save() - self.detail_view = AlbumDetail.as_view() - self.data = { - 'foo': {'title': 'foo', 'url': 'http://testserver/albums/foo/'}, - 'bar': {'title': 'bar', 'url': 'http://testserver/albums/bar/'}, - 'baz': {'title': 'baz', 'url': 'http://testserver/albums/baz/'} - } - - def test_lookup_field(self): - """ - GET requests to AlbumDetail view should return serialized Albums - with a url field keyed by `title`. - """ - for album in Album.objects.all(): - request = factory.get('/albums/{0}/'.format(album.title)) - response = self.detail_view(request, title=album.title) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data[album.title]) - - -class TestCreateWithForeignKeys(TestCase): - urls = 'tests.test_hyperlinkedserializers' - - def setUp(self): - """ - Create a blog post - """ - self.post = BlogPost.objects.create(title="Test post") - self.create_view = BlogPostCommentListCreate.as_view() - - def test_create_comment(self): - - data = { - 'text': 'A test comment', - 'blog_post_url': 'http://testserver/posts/1/' - } - - request = factory.post('/comments/', data=data) - response = self.create_view(request) - self.assertEqual(response.status_code, status.HTTP_201_CREATED) - self.assertEqual(response['Location'], 'http://testserver/comments/1/') - self.assertEqual(self.post.blogpostcomment_set.count(), 1) - self.assertEqual(self.post.blogpostcomment_set.all()[0].text, 'A test comment') - - -class TestCreateWithForeignKeysAndCustomSlug(TestCase): - urls = 'tests.test_hyperlinkedserializers' - - def setUp(self): - """ - Create an Album - """ - self.post = Album.objects.create(title='test-album') - self.list_create_view = PhotoListCreate.as_view() - - def test_create_photo(self): - - data = { - 'description': 'A test photo', - 'album_url': 'http://testserver/albums/test-album/' - } - - request = factory.post('/photos/', data=data) - response = self.list_create_view(request) - self.assertEqual(response.status_code, status.HTTP_201_CREATED) - self.assertNotIn('Location', response, msg='Location should only be included if there is a "url" field on the serializer') - self.assertEqual(self.post.photo_set.count(), 1) - self.assertEqual(self.post.photo_set.all()[0].description, 'A test photo') - - -class TestOptionalRelationHyperlinkedView(TestCase): - urls = 'tests.test_hyperlinkedserializers' - - def setUp(self): - """ - Create 1 OptionalRelationModel instances. - """ - OptionalRelationModel().save() - self.objects = OptionalRelationModel.objects - self.detail_view = OptionalRelationDetail.as_view() - self.data = {"url": "http://testserver/optionalrelation/1/", "other": None} - - def test_get_detail_view(self): - """ - GET requests to RetrieveAPIView with optional relations should return None - for non existing relations. - """ - request = factory.get('/optionalrelationmodel-detail/1') - response = self.detail_view(request, pk=1) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) - - def test_put_detail_view(self): - """ - PUT requests to RetrieveUpdateDestroyAPIView with optional relations - should accept None for non existing relations. - """ - response = self.client.put('/optionalrelation/1/', - data=json.dumps(self.data), - content_type='application/json') - self.assertEqual(response.status_code, status.HTTP_200_OK) - - -class TestOverriddenURLField(TestCase): - def setUp(self): - class OverriddenURLSerializer(serializers.HyperlinkedModelSerializer): - url = serializers.SerializerMethodField('get_url') - - class Meta: - model = BlogPost - fields = ('title', 'url') - - def get_url(self, obj): - return 'foo bar' - - self.Serializer = OverriddenURLSerializer - self.obj = BlogPost.objects.create(title='New blog post') - - def test_overridden_url_field(self): - """ - The 'url' field should respect overriding. - Regression test for #936. - """ - serializer = self.Serializer(self.obj) - self.assertEqual( - serializer.data, - {'title': 'New blog post', 'url': 'foo bar'} - ) - - -class TestURLFieldNameBySettings(TestCase): - urls = 'tests.test_hyperlinkedserializers' - - def setUp(self): - self.saved_url_field_name = api_settings.URL_FIELD_NAME - api_settings.URL_FIELD_NAME = 'global_url_field' - - class Serializer(serializers.HyperlinkedModelSerializer): - - class Meta: - model = BlogPost - fields = ('title', api_settings.URL_FIELD_NAME) - - self.Serializer = Serializer - self.obj = BlogPost.objects.create(title="New blog post") - - def tearDown(self): - api_settings.URL_FIELD_NAME = self.saved_url_field_name - - def test_overridden_url_field_name(self): - request = factory.get('/posts/') - serializer = self.Serializer(self.obj, context={'request': request}) - self.assertIn(api_settings.URL_FIELD_NAME, serializer.data) - - -class TestURLFieldNameByOptions(TestCase): - urls = 'tests.test_hyperlinkedserializers' - - def setUp(self): - class Serializer(serializers.HyperlinkedModelSerializer): - - class Meta: - model = BlogPost - fields = ('title', 'serializer_url_field') - url_field_name = 'serializer_url_field' - - self.Serializer = Serializer - self.obj = BlogPost.objects.create(title="New blog post") - - def test_overridden_url_field_name(self): - request = factory.get('/posts/') - serializer = self.Serializer(self.obj, context={'request': request}) - self.assertIn(self.Serializer.Meta.url_field_name, serializer.data) +# urlpatterns = patterns( +# '', +# url(r'^basic/$', BasicList.as_view(), name='basicmodel-list'), +# url(r'^basic/(?P<pk>\d+)/$', BasicDetail.as_view(), name='basicmodel-detail'), +# url(r'^anchor/(?P<pk>\d+)/$', AnchorDetail.as_view(), name='anchor-detail'), +# url(r'^manytomany/$', ManyToManyList.as_view(), name='manytomanymodel-list'), +# url(r'^manytomany/(?P<pk>\d+)/$', ManyToManyDetail.as_view(), name='manytomanymodel-detail'), +# url(r'^posts/(?P<pk>\d+)/$', BlogPostDetail.as_view(), name='blogpost-detail'), +# url(r'^comments/$', BlogPostCommentListCreate.as_view(), name='blogpostcomment-list'), +# url(r'^comments/(?P<pk>\d+)/$', BlogPostCommentDetail.as_view(), name='blogpostcomment-detail'), +# url(r'^albums/(?P<title>\w[\w-]*)/$', AlbumDetail.as_view(), name='album-detail'), +# url(r'^photos/$', PhotoListCreate.as_view(), name='photo-list'), +# url(r'^optionalrelation/(?P<pk>\d+)/$', OptionalRelationDetail.as_view(), name='optionalrelationmodel-detail'), +# ) + + +# class TestBasicHyperlinkedView(TestCase): +# urls = 'tests.test_hyperlinkedserializers' + +# def setUp(self): +# """ +# Create 3 BasicModel instances. +# """ +# items = ['foo', 'bar', 'baz'] +# for item in items: +# BasicModel(text=item).save() +# self.objects = BasicModel.objects +# self.data = [ +# {'url': 'http://testserver/basic/%d/' % obj.id, 'text': obj.text} +# for obj in self.objects.all() +# ] +# self.list_view = BasicList.as_view() +# self.detail_view = BasicDetail.as_view() + +# def test_get_list_view(self): +# """ +# GET requests to ListCreateAPIView should return list of objects. +# """ +# request = factory.get('/basic/') +# response = self.list_view(request).render() +# self.assertEqual(response.status_code, status.HTTP_200_OK) +# self.assertEqual(response.data, self.data) + +# def test_get_detail_view(self): +# """ +# GET requests to ListCreateAPIView should return list of objects. +# """ +# request = factory.get('/basic/1') +# response = self.detail_view(request, pk=1).render() +# self.assertEqual(response.status_code, status.HTTP_200_OK) +# self.assertEqual(response.data, self.data[0]) + + +# class TestManyToManyHyperlinkedView(TestCase): +# urls = 'tests.test_hyperlinkedserializers' + +# def setUp(self): +# """ +# Create 3 BasicModel instances. +# """ +# items = ['foo', 'bar', 'baz'] +# anchors = [] +# for item in items: +# anchor = Anchor(text=item) +# anchor.save() +# anchors.append(anchor) + +# manytomany = ManyToManyModel() +# manytomany.save() +# manytomany.rel.add(*anchors) + +# self.data = [{ +# 'url': 'http://testserver/manytomany/1/', +# 'rel': [ +# 'http://testserver/anchor/1/', +# 'http://testserver/anchor/2/', +# 'http://testserver/anchor/3/', +# ] +# }] +# self.list_view = ManyToManyList.as_view() +# self.detail_view = ManyToManyDetail.as_view() + +# def test_get_list_view(self): +# """ +# GET requests to ListCreateAPIView should return list of objects. +# """ +# request = factory.get('/manytomany/') +# response = self.list_view(request) +# self.assertEqual(response.status_code, status.HTTP_200_OK) +# self.assertEqual(response.data, self.data) + +# def test_get_detail_view(self): +# """ +# GET requests to ListCreateAPIView should return list of objects. +# """ +# request = factory.get('/manytomany/1/') +# response = self.detail_view(request, pk=1) +# self.assertEqual(response.status_code, status.HTTP_200_OK) +# self.assertEqual(response.data, self.data[0]) + + +# class TestHyperlinkedIdentityFieldLookup(TestCase): +# urls = 'tests.test_hyperlinkedserializers' + +# def setUp(self): +# """ +# Create 3 Album instances. +# """ +# titles = ['foo', 'bar', 'baz'] +# for title in titles: +# album = Album(title=title) +# album.save() +# self.detail_view = AlbumDetail.as_view() +# self.data = { +# 'foo': {'title': 'foo', 'url': 'http://testserver/albums/foo/'}, +# 'bar': {'title': 'bar', 'url': 'http://testserver/albums/bar/'}, +# 'baz': {'title': 'baz', 'url': 'http://testserver/albums/baz/'} +# } + +# def test_lookup_field(self): +# """ +# GET requests to AlbumDetail view should return serialized Albums +# with a url field keyed by `title`. +# """ +# for album in Album.objects.all(): +# request = factory.get('/albums/{0}/'.format(album.title)) +# response = self.detail_view(request, title=album.title) +# self.assertEqual(response.status_code, status.HTTP_200_OK) +# self.assertEqual(response.data, self.data[album.title]) + + +# class TestCreateWithForeignKeys(TestCase): +# urls = 'tests.test_hyperlinkedserializers' + +# def setUp(self): +# """ +# Create a blog post +# """ +# self.post = BlogPost.objects.create(title="Test post") +# self.create_view = BlogPostCommentListCreate.as_view() + +# def test_create_comment(self): + +# data = { +# 'text': 'A test comment', +# 'blog_post_url': 'http://testserver/posts/1/' +# } + +# request = factory.post('/comments/', data=data) +# response = self.create_view(request) +# self.assertEqual(response.status_code, status.HTTP_201_CREATED) +# self.assertEqual(response['Location'], 'http://testserver/comments/1/') +# self.assertEqual(self.post.blogpostcomment_set.count(), 1) +# self.assertEqual(self.post.blogpostcomment_set.all()[0].text, 'A test comment') + + +# class TestCreateWithForeignKeysAndCustomSlug(TestCase): +# urls = 'tests.test_hyperlinkedserializers' + +# def setUp(self): +# """ +# Create an Album +# """ +# self.post = Album.objects.create(title='test-album') +# self.list_create_view = PhotoListCreate.as_view() + +# def test_create_photo(self): + +# data = { +# 'description': 'A test photo', +# 'album_url': 'http://testserver/albums/test-album/' +# } + +# request = factory.post('/photos/', data=data) +# response = self.list_create_view(request) +# self.assertEqual(response.status_code, status.HTTP_201_CREATED) +# self.assertNotIn('Location', response, msg='Location should only be included if there is a "url" field on the serializer') +# self.assertEqual(self.post.photo_set.count(), 1) +# self.assertEqual(self.post.photo_set.all()[0].description, 'A test photo') + + +# class TestOptionalRelationHyperlinkedView(TestCase): +# urls = 'tests.test_hyperlinkedserializers' + +# def setUp(self): +# """ +# Create 1 OptionalRelationModel instances. +# """ +# OptionalRelationModel().save() +# self.objects = OptionalRelationModel.objects +# self.detail_view = OptionalRelationDetail.as_view() +# self.data = {"url": "http://testserver/optionalrelation/1/", "other": None} + +# def test_get_detail_view(self): +# """ +# GET requests to RetrieveAPIView with optional relations should return None +# for non existing relations. +# """ +# request = factory.get('/optionalrelationmodel-detail/1') +# response = self.detail_view(request, pk=1) +# self.assertEqual(response.status_code, status.HTTP_200_OK) +# self.assertEqual(response.data, self.data) + +# def test_put_detail_view(self): +# """ +# PUT requests to RetrieveUpdateDestroyAPIView with optional relations +# should accept None for non existing relations. +# """ +# response = self.client.put('/optionalrelation/1/', +# data=json.dumps(self.data), +# content_type='application/json') +# self.assertEqual(response.status_code, status.HTTP_200_OK) + + +# class TestOverriddenURLField(TestCase): +# def setUp(self): +# class OverriddenURLSerializer(serializers.HyperlinkedModelSerializer): +# url = serializers.SerializerMethodField('get_url') + +# class Meta: +# model = BlogPost +# fields = ('title', 'url') + +# def get_url(self, obj): +# return 'foo bar' + +# self.Serializer = OverriddenURLSerializer +# self.obj = BlogPost.objects.create(title='New blog post') + +# def test_overridden_url_field(self): +# """ +# The 'url' field should respect overriding. +# Regression test for #936. +# """ +# serializer = self.Serializer(self.obj) +# self.assertEqual( +# serializer.data, +# {'title': 'New blog post', 'url': 'foo bar'} +# ) + + +# class TestURLFieldNameBySettings(TestCase): +# urls = 'tests.test_hyperlinkedserializers' + +# def setUp(self): +# self.saved_url_field_name = api_settings.URL_FIELD_NAME +# api_settings.URL_FIELD_NAME = 'global_url_field' + +# class Serializer(serializers.HyperlinkedModelSerializer): + +# class Meta: +# model = BlogPost +# fields = ('title', api_settings.URL_FIELD_NAME) + +# self.Serializer = Serializer +# self.obj = BlogPost.objects.create(title="New blog post") + +# def tearDown(self): +# api_settings.URL_FIELD_NAME = self.saved_url_field_name + +# def test_overridden_url_field_name(self): +# request = factory.get('/posts/') +# serializer = self.Serializer(self.obj, context={'request': request}) +# self.assertIn(api_settings.URL_FIELD_NAME, serializer.data) + + +# class TestURLFieldNameByOptions(TestCase): +# urls = 'tests.test_hyperlinkedserializers' + +# def setUp(self): +# class Serializer(serializers.HyperlinkedModelSerializer): + +# class Meta: +# model = BlogPost +# fields = ('title', 'serializer_url_field') +# url_field_name = 'serializer_url_field' + +# self.Serializer = Serializer +# self.obj = BlogPost.objects.create(title="New blog post") + +# def test_overridden_url_field_name(self): +# request = factory.get('/posts/') +# serializer = self.Serializer(self.obj, context={'request': request}) +# self.assertIn(self.Serializer.Meta.url_field_name, serializer.data) diff --git a/tests/test_nullable_fields.py b/tests/test_nullable_fields.py index 8d0c84bb0..9843182ad 100644 --- a/tests/test_nullable_fields.py +++ b/tests/test_nullable_fields.py @@ -1,39 +1,39 @@ -from django.core.urlresolvers import reverse +# from django.core.urlresolvers import reverse -from django.conf.urls import patterns, url -from rest_framework import serializers, generics -from rest_framework.test import APITestCase -from tests.models import NullableForeignKeySource +# from django.conf.urls import patterns, url +# from rest_framework import serializers, generics +# from rest_framework.test import APITestCase +# from tests.models import NullableForeignKeySource -class NullableFKSourceSerializer(serializers.ModelSerializer): - class Meta: - model = NullableForeignKeySource +# class NullableFKSourceSerializer(serializers.ModelSerializer): +# class Meta: +# model = NullableForeignKeySource -class NullableFKSourceDetail(generics.RetrieveUpdateDestroyAPIView): - queryset = NullableForeignKeySource.objects.all() - serializer_class = NullableFKSourceSerializer +# class NullableFKSourceDetail(generics.RetrieveUpdateDestroyAPIView): +# queryset = NullableForeignKeySource.objects.all() +# serializer_class = NullableFKSourceSerializer -urlpatterns = patterns( - '', - url(r'^objects/(?P<pk>\d+)/$', NullableFKSourceDetail.as_view(), name='object-detail'), -) +# urlpatterns = patterns( +# '', +# url(r'^objects/(?P<pk>\d+)/$', NullableFKSourceDetail.as_view(), name='object-detail'), +# ) -class NullableForeignKeyTests(APITestCase): - """ - DRF should be able to handle nullable foreign keys when a test - Client POST/PUT request is made with its own serialized object. - """ - urls = 'tests.test_nullable_fields' +# class NullableForeignKeyTests(APITestCase): +# """ +# DRF should be able to handle nullable foreign keys when a test +# Client POST/PUT request is made with its own serialized object. +# """ +# urls = 'tests.test_nullable_fields' - def test_updating_object_with_null_fk(self): - obj = NullableForeignKeySource(name='example', target=None) - obj.save() - serialized_data = NullableFKSourceSerializer(obj).data +# def test_updating_object_with_null_fk(self): +# obj = NullableForeignKeySource(name='example', target=None) +# obj.save() +# serialized_data = NullableFKSourceSerializer(obj).data - response = self.client.put(reverse('object-detail', args=[obj.pk]), serialized_data) +# response = self.client.put(reverse('object-detail', args=[obj.pk]), serialized_data) - self.assertEqual(response.data, serialized_data) +# self.assertEqual(response.data, serialized_data) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 8f9e0005e..2e56d9709 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -391,10 +391,10 @@ class CustomField(serializers.Field): class BasicModelSerializer(serializers.Serializer): text = CustomField() - def __init__(self, *args, **kwargs): - super(BasicModelSerializer, self).__init__(*args, **kwargs) + def to_native(self, value): if 'view' not in self.context: - raise RuntimeError("context isn't getting passed into serializer init") + raise RuntimeError("context isn't getting passed into serializer") + return super(BasicSerializer, self).to_native(value) class TestContextPassedToCustomField(TestCase): @@ -423,7 +423,7 @@ class LinksSerializer(serializers.Serializer): class CustomPaginationSerializer(pagination.BasePaginationSerializer): links = LinksSerializer(source='*') # Takes the page object as the source - total_results = serializers.Field(source='paginator.count') + total_results = serializers.ReadOnlyField(source='paginator.count') results_field = 'objects' diff --git a/tests/test_permissions.py b/tests/test_permissions.py index b90ba4f19..d5568c551 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -108,59 +108,59 @@ class ModelPermissionsIntegrationTests(TestCase): response = instance_view(request, pk='2') self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - def test_options_permitted(self): - request = factory.options( - '/', - HTTP_AUTHORIZATION=self.permitted_credentials - ) - response = root_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertIn('actions', response.data) - self.assertEqual(list(response.data['actions'].keys()), ['POST']) + # def test_options_permitted(self): + # request = factory.options( + # '/', + # HTTP_AUTHORIZATION=self.permitted_credentials + # ) + # response = root_view(request, pk='1') + # self.assertEqual(response.status_code, status.HTTP_200_OK) + # self.assertIn('actions', response.data) + # self.assertEqual(list(response.data['actions'].keys()), ['POST']) - request = factory.options( - '/1', - HTTP_AUTHORIZATION=self.permitted_credentials - ) - response = instance_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertIn('actions', response.data) - self.assertEqual(list(response.data['actions'].keys()), ['PUT']) + # request = factory.options( + # '/1', + # HTTP_AUTHORIZATION=self.permitted_credentials + # ) + # response = instance_view(request, pk='1') + # self.assertEqual(response.status_code, status.HTTP_200_OK) + # self.assertIn('actions', response.data) + # self.assertEqual(list(response.data['actions'].keys()), ['PUT']) - def test_options_disallowed(self): - request = factory.options( - '/', - HTTP_AUTHORIZATION=self.disallowed_credentials - ) - response = root_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertNotIn('actions', response.data) + # def test_options_disallowed(self): + # request = factory.options( + # '/', + # HTTP_AUTHORIZATION=self.disallowed_credentials + # ) + # response = root_view(request, pk='1') + # self.assertEqual(response.status_code, status.HTTP_200_OK) + # self.assertNotIn('actions', response.data) - request = factory.options( - '/1', - HTTP_AUTHORIZATION=self.disallowed_credentials - ) - response = instance_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertNotIn('actions', response.data) + # request = factory.options( + # '/1', + # HTTP_AUTHORIZATION=self.disallowed_credentials + # ) + # response = instance_view(request, pk='1') + # self.assertEqual(response.status_code, status.HTTP_200_OK) + # self.assertNotIn('actions', response.data) - def test_options_updateonly(self): - request = factory.options( - '/', - HTTP_AUTHORIZATION=self.updateonly_credentials - ) - response = root_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertNotIn('actions', response.data) + # def test_options_updateonly(self): + # request = factory.options( + # '/', + # HTTP_AUTHORIZATION=self.updateonly_credentials + # ) + # response = root_view(request, pk='1') + # self.assertEqual(response.status_code, status.HTTP_200_OK) + # self.assertNotIn('actions', response.data) - request = factory.options( - '/1', - HTTP_AUTHORIZATION=self.updateonly_credentials - ) - response = instance_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertIn('actions', response.data) - self.assertEqual(list(response.data['actions'].keys()), ['PUT']) + # request = factory.options( + # '/1', + # HTTP_AUTHORIZATION=self.updateonly_credentials + # ) + # response = instance_view(request, pk='1') + # self.assertEqual(response.status_code, status.HTTP_200_OK) + # self.assertIn('actions', response.data) + # self.assertEqual(list(response.data['actions'].keys()), ['PUT']) class BasicPermModel(models.Model): diff --git a/tests/test_relations.py b/tests/test_relations.py index bc1db69fc..a30b12e68 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -1,149 +1,149 @@ -""" -General tests for relational fields. -""" -from __future__ import unicode_literals -from django import get_version -from django.db import models -from django.test import TestCase -from django.utils import unittest -from rest_framework import serializers -from tests.models import BlogPost +# """ +# General tests for relational fields. +# """ +# from __future__ import unicode_literals +# from django import get_version +# from django.db import models +# from django.test import TestCase +# from django.utils import unittest +# from rest_framework import serializers +# from tests.models import BlogPost -class NullModel(models.Model): - pass +# class NullModel(models.Model): +# pass -class FieldTests(TestCase): - def test_pk_related_field_with_empty_string(self): - """ - Regression test for #446 +# class FieldTests(TestCase): +# def test_pk_related_field_with_empty_string(self): +# """ +# Regression test for #446 - https://github.com/tomchristie/django-rest-framework/issues/446 - """ - field = serializers.PrimaryKeyRelatedField(queryset=NullModel.objects.all()) - self.assertRaises(serializers.ValidationError, field.from_native, '') - self.assertRaises(serializers.ValidationError, field.from_native, []) +# https://github.com/tomchristie/django-rest-framework/issues/446 +# """ +# field = serializers.PrimaryKeyRelatedField(queryset=NullModel.objects.all()) +# self.assertRaises(serializers.ValidationError, field.from_native, '') +# self.assertRaises(serializers.ValidationError, field.from_native, []) - def test_hyperlinked_related_field_with_empty_string(self): - field = serializers.HyperlinkedRelatedField(queryset=NullModel.objects.all(), view_name='') - self.assertRaises(serializers.ValidationError, field.from_native, '') - self.assertRaises(serializers.ValidationError, field.from_native, []) +# def test_hyperlinked_related_field_with_empty_string(self): +# field = serializers.HyperlinkedRelatedField(queryset=NullModel.objects.all(), view_name='') +# self.assertRaises(serializers.ValidationError, field.from_native, '') +# self.assertRaises(serializers.ValidationError, field.from_native, []) - def test_slug_related_field_with_empty_string(self): - field = serializers.SlugRelatedField(queryset=NullModel.objects.all(), slug_field='pk') - self.assertRaises(serializers.ValidationError, field.from_native, '') - self.assertRaises(serializers.ValidationError, field.from_native, []) +# def test_slug_related_field_with_empty_string(self): +# field = serializers.SlugRelatedField(queryset=NullModel.objects.all(), slug_field='pk') +# self.assertRaises(serializers.ValidationError, field.from_native, '') +# self.assertRaises(serializers.ValidationError, field.from_native, []) -class TestManyRelatedMixin(TestCase): - def test_missing_many_to_many_related_field(self): - ''' - Regression test for #632 +# class TestManyRelatedMixin(TestCase): +# def test_missing_many_to_many_related_field(self): +# ''' +# Regression test for #632 - https://github.com/tomchristie/django-rest-framework/pull/632 - ''' - field = serializers.RelatedField(many=True, read_only=False) +# https://github.com/tomchristie/django-rest-framework/pull/632 +# ''' +# field = serializers.RelatedField(many=True, read_only=False) - into = {} - field.field_from_native({}, None, 'field_name', into) - self.assertEqual(into['field_name'], []) +# into = {} +# field.field_from_native({}, None, 'field_name', into) +# self.assertEqual(into['field_name'], []) -# Regression tests for #694 (`source` attribute on related fields) +# # Regression tests for #694 (`source` attribute on related fields) -class RelatedFieldSourceTests(TestCase): - def test_related_manager_source(self): - """ - Relational fields should be able to use manager-returning methods as their source. - """ - BlogPost.objects.create(title='blah') - field = serializers.RelatedField(many=True, source='get_blogposts_manager') +# class RelatedFieldSourceTests(TestCase): +# def test_related_manager_source(self): +# """ +# Relational fields should be able to use manager-returning methods as their source. +# """ +# BlogPost.objects.create(title='blah') +# field = serializers.RelatedField(many=True, source='get_blogposts_manager') - class ClassWithManagerMethod(object): - def get_blogposts_manager(self): - return BlogPost.objects +# class ClassWithManagerMethod(object): +# def get_blogposts_manager(self): +# return BlogPost.objects - obj = ClassWithManagerMethod() - value = field.field_to_native(obj, 'field_name') - self.assertEqual(value, ['BlogPost object']) +# obj = ClassWithManagerMethod() +# value = field.field_to_native(obj, 'field_name') +# self.assertEqual(value, ['BlogPost object']) - def test_related_queryset_source(self): - """ - Relational fields should be able to use queryset-returning methods as their source. - """ - BlogPost.objects.create(title='blah') - field = serializers.RelatedField(many=True, source='get_blogposts_queryset') +# def test_related_queryset_source(self): +# """ +# Relational fields should be able to use queryset-returning methods as their source. +# """ +# BlogPost.objects.create(title='blah') +# field = serializers.RelatedField(many=True, source='get_blogposts_queryset') - class ClassWithQuerysetMethod(object): - def get_blogposts_queryset(self): - return BlogPost.objects.all() +# class ClassWithQuerysetMethod(object): +# def get_blogposts_queryset(self): +# return BlogPost.objects.all() - obj = ClassWithQuerysetMethod() - value = field.field_to_native(obj, 'field_name') - self.assertEqual(value, ['BlogPost object']) +# obj = ClassWithQuerysetMethod() +# value = field.field_to_native(obj, 'field_name') +# self.assertEqual(value, ['BlogPost object']) - def test_dotted_source(self): - """ - Source argument should support dotted.source notation. - """ - BlogPost.objects.create(title='blah') - field = serializers.RelatedField(many=True, source='a.b.c') +# def test_dotted_source(self): +# """ +# Source argument should support dotted.source notation. +# """ +# BlogPost.objects.create(title='blah') +# field = serializers.RelatedField(many=True, source='a.b.c') - class ClassWithQuerysetMethod(object): - a = { - 'b': { - 'c': BlogPost.objects.all() - } - } +# class ClassWithQuerysetMethod(object): +# a = { +# 'b': { +# 'c': BlogPost.objects.all() +# } +# } - obj = ClassWithQuerysetMethod() - value = field.field_to_native(obj, 'field_name') - self.assertEqual(value, ['BlogPost object']) +# obj = ClassWithQuerysetMethod() +# value = field.field_to_native(obj, 'field_name') +# self.assertEqual(value, ['BlogPost object']) - # Regression for #1129 - def test_exception_for_incorect_fk(self): - """ - Check that the exception message are correct if the source field - doesn't exist. - """ - from tests.models import ManyToManySource +# # Regression for #1129 +# def test_exception_for_incorect_fk(self): +# """ +# Check that the exception message are correct if the source field +# doesn't exist. +# """ +# from tests.models import ManyToManySource - class Meta: - model = ManyToManySource +# class Meta: +# model = ManyToManySource - attrs = { - 'name': serializers.SlugRelatedField( - slug_field='name', source='banzai'), - 'Meta': Meta, - } +# attrs = { +# 'name': serializers.SlugRelatedField( +# slug_field='name', source='banzai'), +# 'Meta': Meta, +# } - TestSerializer = type( - str('TestSerializer'), - (serializers.ModelSerializer,), - attrs - ) - with self.assertRaises(AttributeError): - TestSerializer(data={'name': 'foo'}) +# TestSerializer = type( +# str('TestSerializer'), +# (serializers.ModelSerializer,), +# attrs +# ) +# with self.assertRaises(AttributeError): +# TestSerializer(data={'name': 'foo'}) -@unittest.skipIf(get_version() < '1.6.0', 'Upstream behaviour changed in v1.6') -class RelatedFieldChoicesTests(TestCase): - """ - Tests for #1408 "Web browseable API doesn't have blank option on drop down list box" - https://github.com/tomchristie/django-rest-framework/issues/1408 - """ - def test_blank_option_is_added_to_choice_if_required_equals_false(self): - """ +# @unittest.skipIf(get_version() < '1.6.0', 'Upstream behaviour changed in v1.6') +# class RelatedFieldChoicesTests(TestCase): +# """ +# Tests for #1408 "Web browseable API doesn't have blank option on drop down list box" +# https://github.com/tomchristie/django-rest-framework/issues/1408 +# """ +# def test_blank_option_is_added_to_choice_if_required_equals_false(self): +# """ - """ - post = BlogPost(title="Checking blank option is added") - post.save() +# """ +# post = BlogPost(title="Checking blank option is added") +# post.save() - queryset = BlogPost.objects.all() - field = serializers.RelatedField(required=False, queryset=queryset) +# queryset = BlogPost.objects.all() +# field = serializers.RelatedField(required=False, queryset=queryset) - choice_count = BlogPost.objects.count() - widget_count = len(field.widget.choices) +# choice_count = BlogPost.objects.count() +# widget_count = len(field.widget.choices) - self.assertEqual(widget_count, choice_count + 1, 'BLANK_CHOICE_DASH option should have been added') +# self.assertEqual(widget_count, choice_count + 1, 'BLANK_CHOICE_DASH option should have been added') diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py index 0c8eb2544..315d1abf8 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -1,525 +1,525 @@ -from __future__ import unicode_literals -from django.conf.urls import patterns, url -from django.test import TestCase -from rest_framework import serializers -from rest_framework.test import APIRequestFactory -from tests.models import ( - BlogPost, - ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource, - NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource -) - -factory = APIRequestFactory() -request = factory.get('/') # Just to ensure we have a request in the serializer context - - -def dummy_view(request, pk): - pass - -urlpatterns = patterns( - '', - url(r'^dummyurl/(?P<pk>[0-9]+)/$', dummy_view, name='dummy-url'), - url(r'^manytomanysource/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanysource-detail'), - url(r'^manytomanytarget/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanytarget-detail'), - url(r'^foreignkeysource/(?P<pk>[0-9]+)/$', dummy_view, name='foreignkeysource-detail'), - url(r'^foreignkeytarget/(?P<pk>[0-9]+)/$', dummy_view, name='foreignkeytarget-detail'), - url(r'^nullableforeignkeysource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableforeignkeysource-detail'), - url(r'^onetoonetarget/(?P<pk>[0-9]+)/$', dummy_view, name='onetoonetarget-detail'), - url(r'^nullableonetoonesource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableonetoonesource-detail'), -) - - -# ManyToMany -class ManyToManyTargetSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = ManyToManyTarget - fields = ('url', 'name', 'sources') - - -class ManyToManySourceSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = ManyToManySource - fields = ('url', 'name', 'targets') - - -# ForeignKey -class ForeignKeyTargetSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = ForeignKeyTarget - fields = ('url', 'name', 'sources') - - -class ForeignKeySourceSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = ForeignKeySource - fields = ('url', 'name', 'target') - - -# Nullable ForeignKey -class NullableForeignKeySourceSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = NullableForeignKeySource - fields = ('url', 'name', 'target') - - -# Nullable OneToOne -class NullableOneToOneTargetSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = OneToOneTarget - fields = ('url', 'name', 'nullable_source') - - -# TODO: Add test that .data cannot be accessed prior to .is_valid - -class HyperlinkedManyToManyTests(TestCase): - urls = 'tests.test_relations_hyperlink' - - def setUp(self): - for idx in range(1, 4): - target = ManyToManyTarget(name='target-%d' % idx) - target.save() - source = ManyToManySource(name='source-%d' % idx) - source.save() - for target in ManyToManyTarget.objects.all(): - source.targets.add(target) - - def test_many_to_many_retrieve(self): - queryset = ManyToManySource.objects.all() - serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/']}, - {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, - {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} - ] - self.assertEqual(serializer.data, expected) - - def test_reverse_many_to_many_retrieve(self): - queryset = ManyToManyTarget.objects.all() - serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, - {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, - {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']} - ] - self.assertEqual(serializer.data, expected) - - def test_many_to_many_update(self): - data = {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} - instance = ManyToManySource.objects.get(pk=1) - serializer = ManyToManySourceSerializer(instance, data=data, context={'request': request}) - self.assertTrue(serializer.is_valid()) - serializer.save() - self.assertEqual(serializer.data, data) - - # Ensure source 1 is updated, and everything else is as expected - queryset = ManyToManySource.objects.all() - serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']}, - {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, - {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} - ] - self.assertEqual(serializer.data, expected) - - def test_reverse_many_to_many_update(self): - data = {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/']} - instance = ManyToManyTarget.objects.get(pk=1) - serializer = ManyToManyTargetSerializer(instance, data=data, context={'request': request}) - self.assertTrue(serializer.is_valid()) - serializer.save() - self.assertEqual(serializer.data, data) - - # Ensure target 1 is updated, and everything else is as expected - queryset = ManyToManyTarget.objects.all() - serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/']}, - {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, - {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']} - - ] - self.assertEqual(serializer.data, expected) - - def test_many_to_many_create(self): - data = {'url': 'http://testserver/manytomanysource/4/', 'name': 'source-4', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/3/']} - serializer = ManyToManySourceSerializer(data=data, context={'request': request}) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') - - # Ensure source 4 is added, and everything else is as expected - queryset = ManyToManySource.objects.all() - serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/']}, - {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, - {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']}, - {'url': 'http://testserver/manytomanysource/4/', 'name': 'source-4', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/3/']} - ] - self.assertEqual(serializer.data, expected) - - def test_reverse_many_to_many_create(self): - data = {'url': 'http://testserver/manytomanytarget/4/', 'name': 'target-4', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/3/']} - serializer = ManyToManyTargetSerializer(data=data, context={'request': request}) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-4') - - # Ensure target 4 is added, and everything else is as expected - queryset = ManyToManyTarget.objects.all() - serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, - {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, - {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']}, - {'url': 'http://testserver/manytomanytarget/4/', 'name': 'target-4', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/3/']} - ] - self.assertEqual(serializer.data, expected) - - -class HyperlinkedForeignKeyTests(TestCase): - urls = 'tests.test_relations_hyperlink' - - def setUp(self): - target = ForeignKeyTarget(name='target-1') - target.save() - new_target = ForeignKeyTarget(name='target-2') - new_target.save() - for idx in range(1, 4): - source = ForeignKeySource(name='source-%d' % idx, target=target) - source.save() - - def test_foreign_key_retrieve(self): - queryset = ForeignKeySource.objects.all() - serializer = ForeignKeySourceSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'} - ] - self.assertEqual(serializer.data, expected) - - def test_reverse_foreign_key_retrieve(self): - queryset = ForeignKeyTarget.objects.all() - serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/2/', 'http://testserver/foreignkeysource/3/']}, - {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_update(self): - data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/2/'} - instance = ForeignKeySource.objects.get(pk=1) - serializer = ForeignKeySourceSerializer(instance, data=data, context={'request': request}) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.data, data) - serializer.save() - - # Ensure source 1 is updated, and everything else is as expected - queryset = ForeignKeySource.objects.all() - serializer = ForeignKeySourceSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/2/'}, - {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'} - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_update_incorrect_type(self): - data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 2} - instance = ForeignKeySource.objects.get(pk=1) - serializer = ForeignKeySourceSerializer(instance, data=data, context={'request': request}) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'target': ['Incorrect type. Expected url string, received int.']}) - - def test_reverse_foreign_key_update(self): - data = {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']} - instance = ForeignKeyTarget.objects.get(pk=2) - serializer = ForeignKeyTargetSerializer(instance, data=data, context={'request': request}) - self.assertTrue(serializer.is_valid()) - # We shouldn't have saved anything to the db yet since save - # hasn't been called. - queryset = ForeignKeyTarget.objects.all() - new_serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/2/', 'http://testserver/foreignkeysource/3/']}, - {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, - ] - self.assertEqual(new_serializer.data, expected) - - serializer.save() - self.assertEqual(serializer.data, data) - - # Ensure target 2 is update, and everything else is as expected - queryset = ForeignKeyTarget.objects.all() - serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/2/']}, - {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']}, - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_create(self): - data = {'url': 'http://testserver/foreignkeysource/4/', 'name': 'source-4', 'target': 'http://testserver/foreignkeytarget/2/'} - serializer = ForeignKeySourceSerializer(data=data, context={'request': request}) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') - - # Ensure source 1 is updated, and everything else is as expected - queryset = ForeignKeySource.objects.all() - serializer = ForeignKeySourceSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/foreignkeysource/4/', 'name': 'source-4', 'target': 'http://testserver/foreignkeytarget/2/'}, - ] - self.assertEqual(serializer.data, expected) - - def test_reverse_foreign_key_create(self): - data = {'url': 'http://testserver/foreignkeytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']} - serializer = ForeignKeyTargetSerializer(data=data, context={'request': request}) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-3') - - # Ensure target 4 is added, and everything else is as expected - queryset = ForeignKeyTarget.objects.all() - serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/2/']}, - {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, - {'url': 'http://testserver/foreignkeytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']}, - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_update_with_invalid_null(self): - data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': None} - instance = ForeignKeySource.objects.get(pk=1) - serializer = ForeignKeySourceSerializer(instance, data=data, context={'request': request}) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'target': ['This field is required.']}) - - -class HyperlinkedNullableForeignKeyTests(TestCase): - urls = 'tests.test_relations_hyperlink' - - def setUp(self): - target = ForeignKeyTarget(name='target-1') - target.save() - for idx in range(1, 4): - if idx == 3: - target = None - source = NullableForeignKeySource(name='source-%d' % idx, target=target) - source.save() - - def test_foreign_key_retrieve_with_null(self): - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_create_with_valid_null(self): - data = {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} - serializer = NullableForeignKeySourceSerializer(data=data, context={'request': request}) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') - - # Ensure source 4 is created, and everything else is as expected - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, - {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_create_with_valid_emptystring(self): - """ - The emptystring should be interpreted as null in the context - of relationships. - """ - data = {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': ''} - expected_data = {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} - serializer = NullableForeignKeySourceSerializer(data=data, context={'request': request}) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, expected_data) - self.assertEqual(obj.name, 'source-4') - - # Ensure source 4 is created, and everything else is as expected - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, - {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_update_with_valid_null(self): - data = {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None} - instance = NullableForeignKeySource.objects.get(pk=1) - serializer = NullableForeignKeySourceSerializer(instance, data=data, context={'request': request}) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.data, data) - serializer.save() - - # Ensure source 1 is updated, and everything else is as expected - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None}, - {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_update_with_valid_emptystring(self): - """ - The emptystring should be interpreted as null in the context - of relationships. - """ - data = {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': ''} - expected_data = {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None} - instance = NullableForeignKeySource.objects.get(pk=1) - serializer = NullableForeignKeySourceSerializer(instance, data=data, context={'request': request}) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.data, expected_data) - serializer.save() - - # Ensure source 1 is updated, and everything else is as expected - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None}, - {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, - {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, - ] - self.assertEqual(serializer.data, expected) - - # reverse foreign keys MUST be read_only - # In the general case they do not provide .remove() or .clear() - # and cannot be arbitrarily set. - - # def test_reverse_foreign_key_update(self): - # data = {'id': 1, 'name': 'target-1', 'sources': [1]} - # instance = ForeignKeyTarget.objects.get(pk=1) - # serializer = ForeignKeyTargetSerializer(instance, data=data) - # self.assertTrue(serializer.is_valid()) - # self.assertEqual(serializer.data, data) - # serializer.save() - - # # Ensure target 1 is updated, and everything else is as expected - # queryset = ForeignKeyTarget.objects.all() - # serializer = ForeignKeyTargetSerializer(queryset, many=True) - # expected = [ - # {'id': 1, 'name': 'target-1', 'sources': [1]}, - # {'id': 2, 'name': 'target-2', 'sources': []}, - # ] - # self.assertEqual(serializer.data, expected) - - -class HyperlinkedNullableOneToOneTests(TestCase): - urls = 'tests.test_relations_hyperlink' - - def setUp(self): - target = OneToOneTarget(name='target-1') - target.save() - new_target = OneToOneTarget(name='target-2') - new_target.save() - source = NullableOneToOneSource(name='source-1', target=target) - source.save() - - def test_reverse_foreign_key_retrieve_with_null(self): - queryset = OneToOneTarget.objects.all() - serializer = NullableOneToOneTargetSerializer(queryset, many=True, context={'request': request}) - expected = [ - {'url': 'http://testserver/onetoonetarget/1/', 'name': 'target-1', 'nullable_source': 'http://testserver/nullableonetoonesource/1/'}, - {'url': 'http://testserver/onetoonetarget/2/', 'name': 'target-2', 'nullable_source': None}, - ] - self.assertEqual(serializer.data, expected) - - -# Regression tests for #694 (`source` attribute on related fields) - -class HyperlinkedRelatedFieldSourceTests(TestCase): - urls = 'tests.test_relations_hyperlink' - - def test_related_manager_source(self): - """ - Relational fields should be able to use manager-returning methods as their source. - """ - BlogPost.objects.create(title='blah') - field = serializers.HyperlinkedRelatedField( - many=True, - source='get_blogposts_manager', - view_name='dummy-url', - ) - field.context = {'request': request} - - class ClassWithManagerMethod(object): - def get_blogposts_manager(self): - return BlogPost.objects - - obj = ClassWithManagerMethod() - value = field.field_to_native(obj, 'field_name') - self.assertEqual(value, ['http://testserver/dummyurl/1/']) - - def test_related_queryset_source(self): - """ - Relational fields should be able to use queryset-returning methods as their source. - """ - BlogPost.objects.create(title='blah') - field = serializers.HyperlinkedRelatedField( - many=True, - source='get_blogposts_queryset', - view_name='dummy-url', - ) - field.context = {'request': request} - - class ClassWithQuerysetMethod(object): - def get_blogposts_queryset(self): - return BlogPost.objects.all() - - obj = ClassWithQuerysetMethod() - value = field.field_to_native(obj, 'field_name') - self.assertEqual(value, ['http://testserver/dummyurl/1/']) - - def test_dotted_source(self): - """ - Source argument should support dotted.source notation. - """ - BlogPost.objects.create(title='blah') - field = serializers.HyperlinkedRelatedField( - many=True, - source='a.b.c', - view_name='dummy-url', - ) - field.context = {'request': request} - - class ClassWithQuerysetMethod(object): - a = { - 'b': { - 'c': BlogPost.objects.all() - } - } - - obj = ClassWithQuerysetMethod() - value = field.field_to_native(obj, 'field_name') - self.assertEqual(value, ['http://testserver/dummyurl/1/']) +# from __future__ import unicode_literals +# from django.conf.urls import patterns, url +# from django.test import TestCase +# from rest_framework import serializers +# from rest_framework.test import APIRequestFactory +# from tests.models import ( +# BlogPost, +# ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource, +# NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource +# ) + +# factory = APIRequestFactory() +# request = factory.get('/') # Just to ensure we have a request in the serializer context + + +# def dummy_view(request, pk): +# pass + +# urlpatterns = patterns( +# '', +# url(r'^dummyurl/(?P<pk>[0-9]+)/$', dummy_view, name='dummy-url'), +# url(r'^manytomanysource/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanysource-detail'), +# url(r'^manytomanytarget/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanytarget-detail'), +# url(r'^foreignkeysource/(?P<pk>[0-9]+)/$', dummy_view, name='foreignkeysource-detail'), +# url(r'^foreignkeytarget/(?P<pk>[0-9]+)/$', dummy_view, name='foreignkeytarget-detail'), +# url(r'^nullableforeignkeysource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableforeignkeysource-detail'), +# url(r'^onetoonetarget/(?P<pk>[0-9]+)/$', dummy_view, name='onetoonetarget-detail'), +# url(r'^nullableonetoonesource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableonetoonesource-detail'), +# ) + + +# # ManyToMany +# class ManyToManyTargetSerializer(serializers.HyperlinkedModelSerializer): +# class Meta: +# model = ManyToManyTarget +# fields = ('url', 'name', 'sources') + + +# class ManyToManySourceSerializer(serializers.HyperlinkedModelSerializer): +# class Meta: +# model = ManyToManySource +# fields = ('url', 'name', 'targets') + + +# # ForeignKey +# class ForeignKeyTargetSerializer(serializers.HyperlinkedModelSerializer): +# class Meta: +# model = ForeignKeyTarget +# fields = ('url', 'name', 'sources') + + +# class ForeignKeySourceSerializer(serializers.HyperlinkedModelSerializer): +# class Meta: +# model = ForeignKeySource +# fields = ('url', 'name', 'target') + + +# # Nullable ForeignKey +# class NullableForeignKeySourceSerializer(serializers.HyperlinkedModelSerializer): +# class Meta: +# model = NullableForeignKeySource +# fields = ('url', 'name', 'target') + + +# # Nullable OneToOne +# class NullableOneToOneTargetSerializer(serializers.HyperlinkedModelSerializer): +# class Meta: +# model = OneToOneTarget +# fields = ('url', 'name', 'nullable_source') + + +# # TODO: Add test that .data cannot be accessed prior to .is_valid + +# class HyperlinkedManyToManyTests(TestCase): +# urls = 'tests.test_relations_hyperlink' + +# def setUp(self): +# for idx in range(1, 4): +# target = ManyToManyTarget(name='target-%d' % idx) +# target.save() +# source = ManyToManySource(name='source-%d' % idx) +# source.save() +# for target in ManyToManyTarget.objects.all(): +# source.targets.add(target) + +# def test_many_to_many_retrieve(self): +# queryset = ManyToManySource.objects.all() +# serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/']}, +# {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, +# {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_reverse_many_to_many_retrieve(self): +# queryset = ManyToManyTarget.objects.all() +# serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, +# {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, +# {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_many_to_many_update(self): +# data = {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} +# instance = ManyToManySource.objects.get(pk=1) +# serializer = ManyToManySourceSerializer(instance, data=data, context={'request': request}) +# self.assertTrue(serializer.is_valid()) +# serializer.save() +# self.assertEqual(serializer.data, data) + +# # Ensure source 1 is updated, and everything else is as expected +# queryset = ManyToManySource.objects.all() +# serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']}, +# {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, +# {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_reverse_many_to_many_update(self): +# data = {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/']} +# instance = ManyToManyTarget.objects.get(pk=1) +# serializer = ManyToManyTargetSerializer(instance, data=data, context={'request': request}) +# self.assertTrue(serializer.is_valid()) +# serializer.save() +# self.assertEqual(serializer.data, data) + +# # Ensure target 1 is updated, and everything else is as expected +# queryset = ManyToManyTarget.objects.all() +# serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/']}, +# {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, +# {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']} + +# ] +# self.assertEqual(serializer.data, expected) + +# def test_many_to_many_create(self): +# data = {'url': 'http://testserver/manytomanysource/4/', 'name': 'source-4', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/3/']} +# serializer = ManyToManySourceSerializer(data=data, context={'request': request}) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'source-4') + +# # Ensure source 4 is added, and everything else is as expected +# queryset = ManyToManySource.objects.all() +# serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/']}, +# {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, +# {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']}, +# {'url': 'http://testserver/manytomanysource/4/', 'name': 'source-4', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/3/']} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_reverse_many_to_many_create(self): +# data = {'url': 'http://testserver/manytomanytarget/4/', 'name': 'target-4', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/3/']} +# serializer = ManyToManyTargetSerializer(data=data, context={'request': request}) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'target-4') + +# # Ensure target 4 is added, and everything else is as expected +# queryset = ManyToManyTarget.objects.all() +# serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, +# {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, +# {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']}, +# {'url': 'http://testserver/manytomanytarget/4/', 'name': 'target-4', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/3/']} +# ] +# self.assertEqual(serializer.data, expected) + + +# class HyperlinkedForeignKeyTests(TestCase): +# urls = 'tests.test_relations_hyperlink' + +# def setUp(self): +# target = ForeignKeyTarget(name='target-1') +# target.save() +# new_target = ForeignKeyTarget(name='target-2') +# new_target.save() +# for idx in range(1, 4): +# source = ForeignKeySource(name='source-%d' % idx, target=target) +# source.save() + +# def test_foreign_key_retrieve(self): +# queryset = ForeignKeySource.objects.all() +# serializer = ForeignKeySourceSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_reverse_foreign_key_retrieve(self): +# queryset = ForeignKeyTarget.objects.all() +# serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/2/', 'http://testserver/foreignkeysource/3/']}, +# {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_update(self): +# data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/2/'} +# instance = ForeignKeySource.objects.get(pk=1) +# serializer = ForeignKeySourceSerializer(instance, data=data, context={'request': request}) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.data, data) +# serializer.save() + +# # Ensure source 1 is updated, and everything else is as expected +# queryset = ForeignKeySource.objects.all() +# serializer = ForeignKeySourceSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/2/'}, +# {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_update_incorrect_type(self): +# data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 2} +# instance = ForeignKeySource.objects.get(pk=1) +# serializer = ForeignKeySourceSerializer(instance, data=data, context={'request': request}) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'target': ['Incorrect type. Expected url string, received int.']}) + +# def test_reverse_foreign_key_update(self): +# data = {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']} +# instance = ForeignKeyTarget.objects.get(pk=2) +# serializer = ForeignKeyTargetSerializer(instance, data=data, context={'request': request}) +# self.assertTrue(serializer.is_valid()) +# # We shouldn't have saved anything to the db yet since save +# # hasn't been called. +# queryset = ForeignKeyTarget.objects.all() +# new_serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/2/', 'http://testserver/foreignkeysource/3/']}, +# {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, +# ] +# self.assertEqual(new_serializer.data, expected) + +# serializer.save() +# self.assertEqual(serializer.data, data) + +# # Ensure target 2 is update, and everything else is as expected +# queryset = ForeignKeyTarget.objects.all() +# serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/2/']}, +# {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']}, +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_create(self): +# data = {'url': 'http://testserver/foreignkeysource/4/', 'name': 'source-4', 'target': 'http://testserver/foreignkeytarget/2/'} +# serializer = ForeignKeySourceSerializer(data=data, context={'request': request}) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'source-4') + +# # Ensure source 1 is updated, and everything else is as expected +# queryset = ForeignKeySource.objects.all() +# serializer = ForeignKeySourceSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/foreignkeysource/4/', 'name': 'source-4', 'target': 'http://testserver/foreignkeytarget/2/'}, +# ] +# self.assertEqual(serializer.data, expected) + +# def test_reverse_foreign_key_create(self): +# data = {'url': 'http://testserver/foreignkeytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']} +# serializer = ForeignKeyTargetSerializer(data=data, context={'request': request}) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'target-3') + +# # Ensure target 4 is added, and everything else is as expected +# queryset = ForeignKeyTarget.objects.all() +# serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/2/']}, +# {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, +# {'url': 'http://testserver/foreignkeytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']}, +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_update_with_invalid_null(self): +# data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': None} +# instance = ForeignKeySource.objects.get(pk=1) +# serializer = ForeignKeySourceSerializer(instance, data=data, context={'request': request}) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'target': ['This field is required.']}) + + +# class HyperlinkedNullableForeignKeyTests(TestCase): +# urls = 'tests.test_relations_hyperlink' + +# def setUp(self): +# target = ForeignKeyTarget(name='target-1') +# target.save() +# for idx in range(1, 4): +# if idx == 3: +# target = None +# source = NullableForeignKeySource(name='source-%d' % idx, target=target) +# source.save() + +# def test_foreign_key_retrieve_with_null(self): +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_create_with_valid_null(self): +# data = {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} +# serializer = NullableForeignKeySourceSerializer(data=data, context={'request': request}) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'source-4') + +# # Ensure source 4 is created, and everything else is as expected +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, +# {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_create_with_valid_emptystring(self): +# """ +# The emptystring should be interpreted as null in the context +# of relationships. +# """ +# data = {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': ''} +# expected_data = {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} +# serializer = NullableForeignKeySourceSerializer(data=data, context={'request': request}) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, expected_data) +# self.assertEqual(obj.name, 'source-4') + +# # Ensure source 4 is created, and everything else is as expected +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, +# {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_update_with_valid_null(self): +# data = {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None} +# instance = NullableForeignKeySource.objects.get(pk=1) +# serializer = NullableForeignKeySourceSerializer(instance, data=data, context={'request': request}) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.data, data) +# serializer.save() + +# # Ensure source 1 is updated, and everything else is as expected +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None}, +# {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_update_with_valid_emptystring(self): +# """ +# The emptystring should be interpreted as null in the context +# of relationships. +# """ +# data = {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': ''} +# expected_data = {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None} +# instance = NullableForeignKeySource.objects.get(pk=1) +# serializer = NullableForeignKeySourceSerializer(instance, data=data, context={'request': request}) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.data, expected_data) +# serializer.save() + +# # Ensure source 1 is updated, and everything else is as expected +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None}, +# {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, +# {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, +# ] +# self.assertEqual(serializer.data, expected) + +# # reverse foreign keys MUST be read_only +# # In the general case they do not provide .remove() or .clear() +# # and cannot be arbitrarily set. + +# # def test_reverse_foreign_key_update(self): +# # data = {'id': 1, 'name': 'target-1', 'sources': [1]} +# # instance = ForeignKeyTarget.objects.get(pk=1) +# # serializer = ForeignKeyTargetSerializer(instance, data=data) +# # self.assertTrue(serializer.is_valid()) +# # self.assertEqual(serializer.data, data) +# # serializer.save() + +# # # Ensure target 1 is updated, and everything else is as expected +# # queryset = ForeignKeyTarget.objects.all() +# # serializer = ForeignKeyTargetSerializer(queryset, many=True) +# # expected = [ +# # {'id': 1, 'name': 'target-1', 'sources': [1]}, +# # {'id': 2, 'name': 'target-2', 'sources': []}, +# # ] +# # self.assertEqual(serializer.data, expected) + + +# class HyperlinkedNullableOneToOneTests(TestCase): +# urls = 'tests.test_relations_hyperlink' + +# def setUp(self): +# target = OneToOneTarget(name='target-1') +# target.save() +# new_target = OneToOneTarget(name='target-2') +# new_target.save() +# source = NullableOneToOneSource(name='source-1', target=target) +# source.save() + +# def test_reverse_foreign_key_retrieve_with_null(self): +# queryset = OneToOneTarget.objects.all() +# serializer = NullableOneToOneTargetSerializer(queryset, many=True, context={'request': request}) +# expected = [ +# {'url': 'http://testserver/onetoonetarget/1/', 'name': 'target-1', 'nullable_source': 'http://testserver/nullableonetoonesource/1/'}, +# {'url': 'http://testserver/onetoonetarget/2/', 'name': 'target-2', 'nullable_source': None}, +# ] +# self.assertEqual(serializer.data, expected) + + +# # Regression tests for #694 (`source` attribute on related fields) + +# class HyperlinkedRelatedFieldSourceTests(TestCase): +# urls = 'tests.test_relations_hyperlink' + +# def test_related_manager_source(self): +# """ +# Relational fields should be able to use manager-returning methods as their source. +# """ +# BlogPost.objects.create(title='blah') +# field = serializers.HyperlinkedRelatedField( +# many=True, +# source='get_blogposts_manager', +# view_name='dummy-url', +# ) +# field.context = {'request': request} + +# class ClassWithManagerMethod(object): +# def get_blogposts_manager(self): +# return BlogPost.objects + +# obj = ClassWithManagerMethod() +# value = field.field_to_native(obj, 'field_name') +# self.assertEqual(value, ['http://testserver/dummyurl/1/']) + +# def test_related_queryset_source(self): +# """ +# Relational fields should be able to use queryset-returning methods as their source. +# """ +# BlogPost.objects.create(title='blah') +# field = serializers.HyperlinkedRelatedField( +# many=True, +# source='get_blogposts_queryset', +# view_name='dummy-url', +# ) +# field.context = {'request': request} + +# class ClassWithQuerysetMethod(object): +# def get_blogposts_queryset(self): +# return BlogPost.objects.all() + +# obj = ClassWithQuerysetMethod() +# value = field.field_to_native(obj, 'field_name') +# self.assertEqual(value, ['http://testserver/dummyurl/1/']) + +# def test_dotted_source(self): +# """ +# Source argument should support dotted.source notation. +# """ +# BlogPost.objects.create(title='blah') +# field = serializers.HyperlinkedRelatedField( +# many=True, +# source='a.b.c', +# view_name='dummy-url', +# ) +# field.context = {'request': request} + +# class ClassWithQuerysetMethod(object): +# a = { +# 'b': { +# 'c': BlogPost.objects.all() +# } +# } + +# obj = ClassWithQuerysetMethod() +# value = field.field_to_native(obj, 'field_name') +# self.assertEqual(value, ['http://testserver/dummyurl/1/']) diff --git a/tests/test_relations_nested.py b/tests/test_relations_nested.py index 4d9da4896..4a99fee99 100644 --- a/tests/test_relations_nested.py +++ b/tests/test_relations_nested.py @@ -1,326 +1,326 @@ -from __future__ import unicode_literals -from django.db import models -from django.test import TestCase -from rest_framework import serializers +# from __future__ import unicode_literals +# from django.db import models +# from django.test import TestCase +# from rest_framework import serializers -from .models import OneToOneTarget +# from .models import OneToOneTarget -class OneToOneSource(models.Model): - name = models.CharField(max_length=100) - target = models.OneToOneField(OneToOneTarget, related_name='source', - null=True, blank=True) +# class OneToOneSource(models.Model): +# name = models.CharField(max_length=100) +# target = models.OneToOneField(OneToOneTarget, related_name='source', +# null=True, blank=True) -class OneToManyTarget(models.Model): - name = models.CharField(max_length=100) +# class OneToManyTarget(models.Model): +# name = models.CharField(max_length=100) -class OneToManySource(models.Model): - name = models.CharField(max_length=100) - target = models.ForeignKey(OneToManyTarget, related_name='sources') +# class OneToManySource(models.Model): +# name = models.CharField(max_length=100) +# target = models.ForeignKey(OneToManyTarget, related_name='sources') -class ReverseNestedOneToOneTests(TestCase): - def setUp(self): - class OneToOneSourceSerializer(serializers.ModelSerializer): - class Meta: - model = OneToOneSource - fields = ('id', 'name') +# class ReverseNestedOneToOneTests(TestCase): +# def setUp(self): +# class OneToOneSourceSerializer(serializers.ModelSerializer): +# class Meta: +# model = OneToOneSource +# fields = ('id', 'name') - class OneToOneTargetSerializer(serializers.ModelSerializer): - source = OneToOneSourceSerializer() +# class OneToOneTargetSerializer(serializers.ModelSerializer): +# source = OneToOneSourceSerializer() - class Meta: - model = OneToOneTarget - fields = ('id', 'name', 'source') +# class Meta: +# model = OneToOneTarget +# fields = ('id', 'name', 'source') - self.Serializer = OneToOneTargetSerializer +# self.Serializer = OneToOneTargetSerializer - for idx in range(1, 4): - target = OneToOneTarget(name='target-%d' % idx) - target.save() - source = OneToOneSource(name='source-%d' % idx, target=target) - source.save() +# for idx in range(1, 4): +# target = OneToOneTarget(name='target-%d' % idx) +# target.save() +# source = OneToOneSource(name='source-%d' % idx, target=target) +# source.save() - def test_one_to_one_retrieve(self): - queryset = OneToOneTarget.objects.all() - serializer = self.Serializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, - {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, - {'id': 3, 'name': 'target-3', 'source': {'id': 3, 'name': 'source-3'}} - ] - self.assertEqual(serializer.data, expected) +# def test_one_to_one_retrieve(self): +# queryset = OneToOneTarget.objects.all() +# serializer = self.Serializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, +# {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, +# {'id': 3, 'name': 'target-3', 'source': {'id': 3, 'name': 'source-3'}} +# ] +# self.assertEqual(serializer.data, expected) - def test_one_to_one_create(self): - data = {'id': 4, 'name': 'target-4', 'source': {'id': 4, 'name': 'source-4'}} - serializer = self.Serializer(data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-4') +# def test_one_to_one_create(self): +# data = {'id': 4, 'name': 'target-4', 'source': {'id': 4, 'name': 'source-4'}} +# serializer = self.Serializer(data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'target-4') - # Ensure (target 4, target_source 4, source 4) are added, and - # everything else is as expected. - queryset = OneToOneTarget.objects.all() - serializer = self.Serializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, - {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, - {'id': 3, 'name': 'target-3', 'source': {'id': 3, 'name': 'source-3'}}, - {'id': 4, 'name': 'target-4', 'source': {'id': 4, 'name': 'source-4'}} - ] - self.assertEqual(serializer.data, expected) +# # Ensure (target 4, target_source 4, source 4) are added, and +# # everything else is as expected. +# queryset = OneToOneTarget.objects.all() +# serializer = self.Serializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, +# {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, +# {'id': 3, 'name': 'target-3', 'source': {'id': 3, 'name': 'source-3'}}, +# {'id': 4, 'name': 'target-4', 'source': {'id': 4, 'name': 'source-4'}} +# ] +# self.assertEqual(serializer.data, expected) - def test_one_to_one_create_with_invalid_data(self): - data = {'id': 4, 'name': 'target-4', 'source': {'id': 4}} - serializer = self.Serializer(data=data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'source': [{'name': ['This field is required.']}]}) +# def test_one_to_one_create_with_invalid_data(self): +# data = {'id': 4, 'name': 'target-4', 'source': {'id': 4}} +# serializer = self.Serializer(data=data) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'source': [{'name': ['This field is required.']}]}) - def test_one_to_one_update(self): - data = {'id': 3, 'name': 'target-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}} - instance = OneToOneTarget.objects.get(pk=3) - serializer = self.Serializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-3-updated') +# def test_one_to_one_update(self): +# data = {'id': 3, 'name': 'target-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}} +# instance = OneToOneTarget.objects.get(pk=3) +# serializer = self.Serializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'target-3-updated') - # Ensure (target 3, target_source 3, source 3) are updated, - # and everything else is as expected. - queryset = OneToOneTarget.objects.all() - serializer = self.Serializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, - {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, - {'id': 3, 'name': 'target-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}} - ] - self.assertEqual(serializer.data, expected) +# # Ensure (target 3, target_source 3, source 3) are updated, +# # and everything else is as expected. +# queryset = OneToOneTarget.objects.all() +# serializer = self.Serializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, +# {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, +# {'id': 3, 'name': 'target-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}} +# ] +# self.assertEqual(serializer.data, expected) -class ForwardNestedOneToOneTests(TestCase): - def setUp(self): - class OneToOneTargetSerializer(serializers.ModelSerializer): - class Meta: - model = OneToOneTarget - fields = ('id', 'name') +# class ForwardNestedOneToOneTests(TestCase): +# def setUp(self): +# class OneToOneTargetSerializer(serializers.ModelSerializer): +# class Meta: +# model = OneToOneTarget +# fields = ('id', 'name') - class OneToOneSourceSerializer(serializers.ModelSerializer): - target = OneToOneTargetSerializer() +# class OneToOneSourceSerializer(serializers.ModelSerializer): +# target = OneToOneTargetSerializer() - class Meta: - model = OneToOneSource - fields = ('id', 'name', 'target') +# class Meta: +# model = OneToOneSource +# fields = ('id', 'name', 'target') - self.Serializer = OneToOneSourceSerializer +# self.Serializer = OneToOneSourceSerializer - for idx in range(1, 4): - target = OneToOneTarget(name='target-%d' % idx) - target.save() - source = OneToOneSource(name='source-%d' % idx, target=target) - source.save() +# for idx in range(1, 4): +# target = OneToOneTarget(name='target-%d' % idx) +# target.save() +# source = OneToOneSource(name='source-%d' % idx, target=target) +# source.save() - def test_one_to_one_retrieve(self): - queryset = OneToOneSource.objects.all() - serializer = self.Serializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, - {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, - {'id': 3, 'name': 'source-3', 'target': {'id': 3, 'name': 'target-3'}} - ] - self.assertEqual(serializer.data, expected) +# def test_one_to_one_retrieve(self): +# queryset = OneToOneSource.objects.all() +# serializer = self.Serializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, +# {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, +# {'id': 3, 'name': 'source-3', 'target': {'id': 3, 'name': 'target-3'}} +# ] +# self.assertEqual(serializer.data, expected) - def test_one_to_one_create(self): - data = {'id': 4, 'name': 'source-4', 'target': {'id': 4, 'name': 'target-4'}} - serializer = self.Serializer(data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') +# def test_one_to_one_create(self): +# data = {'id': 4, 'name': 'source-4', 'target': {'id': 4, 'name': 'target-4'}} +# serializer = self.Serializer(data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'source-4') - # Ensure (target 4, target_source 4, source 4) are added, and - # everything else is as expected. - queryset = OneToOneSource.objects.all() - serializer = self.Serializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, - {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, - {'id': 3, 'name': 'source-3', 'target': {'id': 3, 'name': 'target-3'}}, - {'id': 4, 'name': 'source-4', 'target': {'id': 4, 'name': 'target-4'}} - ] - self.assertEqual(serializer.data, expected) +# # Ensure (target 4, target_source 4, source 4) are added, and +# # everything else is as expected. +# queryset = OneToOneSource.objects.all() +# serializer = self.Serializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, +# {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, +# {'id': 3, 'name': 'source-3', 'target': {'id': 3, 'name': 'target-3'}}, +# {'id': 4, 'name': 'source-4', 'target': {'id': 4, 'name': 'target-4'}} +# ] +# self.assertEqual(serializer.data, expected) - def test_one_to_one_create_with_invalid_data(self): - data = {'id': 4, 'name': 'source-4', 'target': {'id': 4}} - serializer = self.Serializer(data=data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'target': [{'name': ['This field is required.']}]}) +# def test_one_to_one_create_with_invalid_data(self): +# data = {'id': 4, 'name': 'source-4', 'target': {'id': 4}} +# serializer = self.Serializer(data=data) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'target': [{'name': ['This field is required.']}]}) - def test_one_to_one_update(self): - data = {'id': 3, 'name': 'source-3-updated', 'target': {'id': 3, 'name': 'target-3-updated'}} - instance = OneToOneSource.objects.get(pk=3) - serializer = self.Serializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-3-updated') +# def test_one_to_one_update(self): +# data = {'id': 3, 'name': 'source-3-updated', 'target': {'id': 3, 'name': 'target-3-updated'}} +# instance = OneToOneSource.objects.get(pk=3) +# serializer = self.Serializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'source-3-updated') - # Ensure (target 3, target_source 3, source 3) are updated, - # and everything else is as expected. - queryset = OneToOneSource.objects.all() - serializer = self.Serializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, - {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, - {'id': 3, 'name': 'source-3-updated', 'target': {'id': 3, 'name': 'target-3-updated'}} - ] - self.assertEqual(serializer.data, expected) +# # Ensure (target 3, target_source 3, source 3) are updated, +# # and everything else is as expected. +# queryset = OneToOneSource.objects.all() +# serializer = self.Serializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, +# {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, +# {'id': 3, 'name': 'source-3-updated', 'target': {'id': 3, 'name': 'target-3-updated'}} +# ] +# self.assertEqual(serializer.data, expected) - def test_one_to_one_update_to_null(self): - data = {'id': 3, 'name': 'source-3-updated', 'target': None} - instance = OneToOneSource.objects.get(pk=3) - serializer = self.Serializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() +# def test_one_to_one_update_to_null(self): +# data = {'id': 3, 'name': 'source-3-updated', 'target': None} +# instance = OneToOneSource.objects.get(pk=3) +# serializer = self.Serializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-3-updated') - self.assertEqual(obj.target, None) +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'source-3-updated') +# self.assertEqual(obj.target, None) - queryset = OneToOneSource.objects.all() - serializer = self.Serializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, - {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, - {'id': 3, 'name': 'source-3-updated', 'target': None} - ] - self.assertEqual(serializer.data, expected) +# queryset = OneToOneSource.objects.all() +# serializer = self.Serializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, +# {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, +# {'id': 3, 'name': 'source-3-updated', 'target': None} +# ] +# self.assertEqual(serializer.data, expected) - # TODO: Nullable 1-1 tests - # def test_one_to_one_delete(self): - # data = {'id': 3, 'name': 'target-3', 'target_source': None} - # instance = OneToOneTarget.objects.get(pk=3) - # serializer = self.Serializer(instance, data=data) - # self.assertTrue(serializer.is_valid()) - # serializer.save() +# # TODO: Nullable 1-1 tests +# # def test_one_to_one_delete(self): +# # data = {'id': 3, 'name': 'target-3', 'target_source': None} +# # instance = OneToOneTarget.objects.get(pk=3) +# # serializer = self.Serializer(instance, data=data) +# # self.assertTrue(serializer.is_valid()) +# # serializer.save() - # # Ensure (target_source 3, source 3) are deleted, - # # and everything else is as expected. - # queryset = OneToOneTarget.objects.all() - # serializer = self.Serializer(queryset) - # expected = [ - # {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, - # {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, - # {'id': 3, 'name': 'target-3', 'source': None} - # ] - # self.assertEqual(serializer.data, expected) +# # # Ensure (target_source 3, source 3) are deleted, +# # # and everything else is as expected. +# # queryset = OneToOneTarget.objects.all() +# # serializer = self.Serializer(queryset) +# # expected = [ +# # {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, +# # {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, +# # {'id': 3, 'name': 'target-3', 'source': None} +# # ] +# # self.assertEqual(serializer.data, expected) -class ReverseNestedOneToManyTests(TestCase): - def setUp(self): - class OneToManySourceSerializer(serializers.ModelSerializer): - class Meta: - model = OneToManySource - fields = ('id', 'name') +# class ReverseNestedOneToManyTests(TestCase): +# def setUp(self): +# class OneToManySourceSerializer(serializers.ModelSerializer): +# class Meta: +# model = OneToManySource +# fields = ('id', 'name') - class OneToManyTargetSerializer(serializers.ModelSerializer): - sources = OneToManySourceSerializer(many=True, allow_add_remove=True) +# class OneToManyTargetSerializer(serializers.ModelSerializer): +# sources = OneToManySourceSerializer(many=True, allow_add_remove=True) - class Meta: - model = OneToManyTarget - fields = ('id', 'name', 'sources') +# class Meta: +# model = OneToManyTarget +# fields = ('id', 'name', 'sources') - self.Serializer = OneToManyTargetSerializer +# self.Serializer = OneToManyTargetSerializer - target = OneToManyTarget(name='target-1') - target.save() - for idx in range(1, 4): - source = OneToManySource(name='source-%d' % idx, target=target) - source.save() +# target = OneToManyTarget(name='target-1') +# target.save() +# for idx in range(1, 4): +# source = OneToManySource(name='source-%d' % idx, target=target) +# source.save() - def test_one_to_many_retrieve(self): - queryset = OneToManyTarget.objects.all() - serializer = self.Serializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, - {'id': 2, 'name': 'source-2'}, - {'id': 3, 'name': 'source-3'}]}, - ] - self.assertEqual(serializer.data, expected) +# def test_one_to_many_retrieve(self): +# queryset = OneToManyTarget.objects.all() +# serializer = self.Serializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, +# {'id': 2, 'name': 'source-2'}, +# {'id': 3, 'name': 'source-3'}]}, +# ] +# self.assertEqual(serializer.data, expected) - def test_one_to_many_create(self): - data = {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, - {'id': 2, 'name': 'source-2'}, - {'id': 3, 'name': 'source-3'}, - {'id': 4, 'name': 'source-4'}]} - instance = OneToManyTarget.objects.get(pk=1) - serializer = self.Serializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-1') +# def test_one_to_many_create(self): +# data = {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, +# {'id': 2, 'name': 'source-2'}, +# {'id': 3, 'name': 'source-3'}, +# {'id': 4, 'name': 'source-4'}]} +# instance = OneToManyTarget.objects.get(pk=1) +# serializer = self.Serializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'target-1') - # Ensure source 4 is added, and everything else is as - # expected. - queryset = OneToManyTarget.objects.all() - serializer = self.Serializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, - {'id': 2, 'name': 'source-2'}, - {'id': 3, 'name': 'source-3'}, - {'id': 4, 'name': 'source-4'}]} - ] - self.assertEqual(serializer.data, expected) +# # Ensure source 4 is added, and everything else is as +# # expected. +# queryset = OneToManyTarget.objects.all() +# serializer = self.Serializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, +# {'id': 2, 'name': 'source-2'}, +# {'id': 3, 'name': 'source-3'}, +# {'id': 4, 'name': 'source-4'}]} +# ] +# self.assertEqual(serializer.data, expected) - def test_one_to_many_create_with_invalid_data(self): - data = {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, - {'id': 2, 'name': 'source-2'}, - {'id': 3, 'name': 'source-3'}, - {'id': 4}]} - serializer = self.Serializer(data=data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'sources': [{}, {}, {}, {'name': ['This field is required.']}]}) +# def test_one_to_many_create_with_invalid_data(self): +# data = {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, +# {'id': 2, 'name': 'source-2'}, +# {'id': 3, 'name': 'source-3'}, +# {'id': 4}]} +# serializer = self.Serializer(data=data) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'sources': [{}, {}, {}, {'name': ['This field is required.']}]}) - def test_one_to_many_update(self): - data = {'id': 1, 'name': 'target-1-updated', 'sources': [{'id': 1, 'name': 'source-1-updated'}, - {'id': 2, 'name': 'source-2'}, - {'id': 3, 'name': 'source-3'}]} - instance = OneToManyTarget.objects.get(pk=1) - serializer = self.Serializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-1-updated') +# def test_one_to_many_update(self): +# data = {'id': 1, 'name': 'target-1-updated', 'sources': [{'id': 1, 'name': 'source-1-updated'}, +# {'id': 2, 'name': 'source-2'}, +# {'id': 3, 'name': 'source-3'}]} +# instance = OneToManyTarget.objects.get(pk=1) +# serializer = self.Serializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'target-1-updated') - # Ensure (target 1, source 1) are updated, - # and everything else is as expected. - queryset = OneToManyTarget.objects.all() - serializer = self.Serializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1-updated', 'sources': [{'id': 1, 'name': 'source-1-updated'}, - {'id': 2, 'name': 'source-2'}, - {'id': 3, 'name': 'source-3'}]} +# # Ensure (target 1, source 1) are updated, +# # and everything else is as expected. +# queryset = OneToManyTarget.objects.all() +# serializer = self.Serializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1-updated', 'sources': [{'id': 1, 'name': 'source-1-updated'}, +# {'id': 2, 'name': 'source-2'}, +# {'id': 3, 'name': 'source-3'}]} - ] - self.assertEqual(serializer.data, expected) +# ] +# self.assertEqual(serializer.data, expected) - def test_one_to_many_delete(self): - data = {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, - {'id': 3, 'name': 'source-3'}]} - instance = OneToManyTarget.objects.get(pk=1) - serializer = self.Serializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - serializer.save() +# def test_one_to_many_delete(self): +# data = {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, +# {'id': 3, 'name': 'source-3'}]} +# instance = OneToManyTarget.objects.get(pk=1) +# serializer = self.Serializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# serializer.save() - # Ensure source 2 is deleted, and everything else is as - # expected. - queryset = OneToManyTarget.objects.all() - serializer = self.Serializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, - {'id': 3, 'name': 'source-3'}]} +# # Ensure source 2 is deleted, and everything else is as +# # expected. +# queryset = OneToManyTarget.objects.all() +# serializer = self.Serializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, +# {'id': 3, 'name': 'source-3'}]} - ] - self.assertEqual(serializer.data, expected) +# ] +# self.assertEqual(serializer.data, expected) diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index e3f836ed6..031a79b32 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -1,551 +1,551 @@ -from __future__ import unicode_literals -from django.db import models -from django.test import TestCase -from django.utils import six -from rest_framework import serializers -from tests.models import ( - BlogPost, ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource, - NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource, -) - - -# ManyToMany -class ManyToManyTargetSerializer(serializers.ModelSerializer): - class Meta: - model = ManyToManyTarget - fields = ('id', 'name', 'sources') - - -class ManyToManySourceSerializer(serializers.ModelSerializer): - class Meta: - model = ManyToManySource - fields = ('id', 'name', 'targets') - - -# ForeignKey -class ForeignKeyTargetSerializer(serializers.ModelSerializer): - class Meta: - model = ForeignKeyTarget - fields = ('id', 'name', 'sources') - - -class ForeignKeySourceSerializer(serializers.ModelSerializer): - class Meta: - model = ForeignKeySource - fields = ('id', 'name', 'target') - - -# Nullable ForeignKey -class NullableForeignKeySourceSerializer(serializers.ModelSerializer): - class Meta: - model = NullableForeignKeySource - fields = ('id', 'name', 'target') - - -# Nullable OneToOne -class NullableOneToOneTargetSerializer(serializers.ModelSerializer): - class Meta: - model = OneToOneTarget - fields = ('id', 'name', 'nullable_source') - - -# TODO: Add test that .data cannot be accessed prior to .is_valid - -class PKManyToManyTests(TestCase): - def setUp(self): - for idx in range(1, 4): - target = ManyToManyTarget(name='target-%d' % idx) - target.save() - source = ManyToManySource(name='source-%d' % idx) - source.save() - for target in ManyToManyTarget.objects.all(): - source.targets.add(target) - - def test_many_to_many_retrieve(self): - queryset = ManyToManySource.objects.all() - serializer = ManyToManySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'targets': [1]}, - {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, - {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} - ] - self.assertEqual(serializer.data, expected) - - def test_reverse_many_to_many_retrieve(self): - queryset = ManyToManyTarget.objects.all() - serializer = ManyToManyTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, - {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, - {'id': 3, 'name': 'target-3', 'sources': [3]} - ] - self.assertEqual(serializer.data, expected) - - def test_many_to_many_update(self): - data = {'id': 1, 'name': 'source-1', 'targets': [1, 2, 3]} - instance = ManyToManySource.objects.get(pk=1) - serializer = ManyToManySourceSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - serializer.save() - self.assertEqual(serializer.data, data) - - # Ensure source 1 is updated, and everything else is as expected - queryset = ManyToManySource.objects.all() - serializer = ManyToManySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'targets': [1, 2, 3]}, - {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, - {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} - ] - self.assertEqual(serializer.data, expected) - - def test_reverse_many_to_many_update(self): - data = {'id': 1, 'name': 'target-1', 'sources': [1]} - instance = ManyToManyTarget.objects.get(pk=1) - serializer = ManyToManyTargetSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - serializer.save() - self.assertEqual(serializer.data, data) - - # Ensure target 1 is updated, and everything else is as expected - queryset = ManyToManyTarget.objects.all() - serializer = ManyToManyTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': [1]}, - {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, - {'id': 3, 'name': 'target-3', 'sources': [3]} - ] - self.assertEqual(serializer.data, expected) - - def test_many_to_many_create(self): - data = {'id': 4, 'name': 'source-4', 'targets': [1, 3]} - serializer = ManyToManySourceSerializer(data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') - - # Ensure source 4 is added, and everything else is as expected - queryset = ManyToManySource.objects.all() - serializer = ManyToManySourceSerializer(queryset, many=True) - self.assertFalse(serializer.fields['targets'].read_only) - expected = [ - {'id': 1, 'name': 'source-1', 'targets': [1]}, - {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, - {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]}, - {'id': 4, 'name': 'source-4', 'targets': [1, 3]}, - ] - self.assertEqual(serializer.data, expected) - - def test_reverse_many_to_many_create(self): - data = {'id': 4, 'name': 'target-4', 'sources': [1, 3]} - serializer = ManyToManyTargetSerializer(data=data) - self.assertFalse(serializer.fields['sources'].read_only) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-4') - - # Ensure target 4 is added, and everything else is as expected - queryset = ManyToManyTarget.objects.all() - serializer = ManyToManyTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, - {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, - {'id': 3, 'name': 'target-3', 'sources': [3]}, - {'id': 4, 'name': 'target-4', 'sources': [1, 3]} - ] - self.assertEqual(serializer.data, expected) - - -class PKForeignKeyTests(TestCase): - def setUp(self): - target = ForeignKeyTarget(name='target-1') - target.save() - new_target = ForeignKeyTarget(name='target-2') - new_target.save() - for idx in range(1, 4): - source = ForeignKeySource(name='source-%d' % idx, target=target) - source.save() - - def test_foreign_key_retrieve(self): - queryset = ForeignKeySource.objects.all() - serializer = ForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': 1}, - {'id': 2, 'name': 'source-2', 'target': 1}, - {'id': 3, 'name': 'source-3', 'target': 1} - ] - self.assertEqual(serializer.data, expected) - - def test_reverse_foreign_key_retrieve(self): - queryset = ForeignKeyTarget.objects.all() - serializer = ForeignKeyTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, - {'id': 2, 'name': 'target-2', 'sources': []}, - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_update(self): - data = {'id': 1, 'name': 'source-1', 'target': 2} - instance = ForeignKeySource.objects.get(pk=1) - serializer = ForeignKeySourceSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.data, data) - serializer.save() - - # Ensure source 1 is updated, and everything else is as expected - queryset = ForeignKeySource.objects.all() - serializer = ForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': 2}, - {'id': 2, 'name': 'source-2', 'target': 1}, - {'id': 3, 'name': 'source-3', 'target': 1} - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_update_incorrect_type(self): - data = {'id': 1, 'name': 'source-1', 'target': 'foo'} - instance = ForeignKeySource.objects.get(pk=1) - serializer = ForeignKeySourceSerializer(instance, data=data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'target': ['Incorrect type. Expected pk value, received %s.' % six.text_type.__name__]}) - - def test_reverse_foreign_key_update(self): - data = {'id': 2, 'name': 'target-2', 'sources': [1, 3]} - instance = ForeignKeyTarget.objects.get(pk=2) - serializer = ForeignKeyTargetSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - # We shouldn't have saved anything to the db yet since save - # hasn't been called. - queryset = ForeignKeyTarget.objects.all() - new_serializer = ForeignKeyTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, - {'id': 2, 'name': 'target-2', 'sources': []}, - ] - self.assertEqual(new_serializer.data, expected) - - serializer.save() - self.assertEqual(serializer.data, data) - - # Ensure target 2 is update, and everything else is as expected - queryset = ForeignKeyTarget.objects.all() - serializer = ForeignKeyTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': [2]}, - {'id': 2, 'name': 'target-2', 'sources': [1, 3]}, - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_create(self): - data = {'id': 4, 'name': 'source-4', 'target': 2} - serializer = ForeignKeySourceSerializer(data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') - - # Ensure source 4 is added, and everything else is as expected - queryset = ForeignKeySource.objects.all() - serializer = ForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': 1}, - {'id': 2, 'name': 'source-2', 'target': 1}, - {'id': 3, 'name': 'source-3', 'target': 1}, - {'id': 4, 'name': 'source-4', 'target': 2}, - ] - self.assertEqual(serializer.data, expected) - - def test_reverse_foreign_key_create(self): - data = {'id': 3, 'name': 'target-3', 'sources': [1, 3]} - serializer = ForeignKeyTargetSerializer(data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-3') - - # Ensure target 3 is added, and everything else is as expected - queryset = ForeignKeyTarget.objects.all() - serializer = ForeignKeyTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': [2]}, - {'id': 2, 'name': 'target-2', 'sources': []}, - {'id': 3, 'name': 'target-3', 'sources': [1, 3]}, - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_update_with_invalid_null(self): - data = {'id': 1, 'name': 'source-1', 'target': None} - instance = ForeignKeySource.objects.get(pk=1) - serializer = ForeignKeySourceSerializer(instance, data=data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'target': ['This field is required.']}) - - def test_foreign_key_with_empty(self): - """ - Regression test for #1072 - - https://github.com/tomchristie/django-rest-framework/issues/1072 - """ - serializer = NullableForeignKeySourceSerializer() - self.assertEqual(serializer.data['target'], None) - - -class PKNullableForeignKeyTests(TestCase): - def setUp(self): - target = ForeignKeyTarget(name='target-1') - target.save() - for idx in range(1, 4): - if idx == 3: - target = None - source = NullableForeignKeySource(name='source-%d' % idx, target=target) - source.save() - - def test_foreign_key_retrieve_with_null(self): - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': 1}, - {'id': 2, 'name': 'source-2', 'target': 1}, - {'id': 3, 'name': 'source-3', 'target': None}, - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_create_with_valid_null(self): - data = {'id': 4, 'name': 'source-4', 'target': None} - serializer = NullableForeignKeySourceSerializer(data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') - - # Ensure source 4 is created, and everything else is as expected - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': 1}, - {'id': 2, 'name': 'source-2', 'target': 1}, - {'id': 3, 'name': 'source-3', 'target': None}, - {'id': 4, 'name': 'source-4', 'target': None} - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_create_with_valid_emptystring(self): - """ - The emptystring should be interpreted as null in the context - of relationships. - """ - data = {'id': 4, 'name': 'source-4', 'target': ''} - expected_data = {'id': 4, 'name': 'source-4', 'target': None} - serializer = NullableForeignKeySourceSerializer(data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, expected_data) - self.assertEqual(obj.name, 'source-4') - - # Ensure source 4 is created, and everything else is as expected - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': 1}, - {'id': 2, 'name': 'source-2', 'target': 1}, - {'id': 3, 'name': 'source-3', 'target': None}, - {'id': 4, 'name': 'source-4', 'target': None} - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_update_with_valid_null(self): - data = {'id': 1, 'name': 'source-1', 'target': None} - instance = NullableForeignKeySource.objects.get(pk=1) - serializer = NullableForeignKeySourceSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.data, data) - serializer.save() - - # Ensure source 1 is updated, and everything else is as expected - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': None}, - {'id': 2, 'name': 'source-2', 'target': 1}, - {'id': 3, 'name': 'source-3', 'target': None} - ] - self.assertEqual(serializer.data, expected) - - def test_foreign_key_update_with_valid_emptystring(self): - """ - The emptystring should be interpreted as null in the context - of relationships. - """ - data = {'id': 1, 'name': 'source-1', 'target': ''} - expected_data = {'id': 1, 'name': 'source-1', 'target': None} - instance = NullableForeignKeySource.objects.get(pk=1) - serializer = NullableForeignKeySourceSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.data, expected_data) - serializer.save() - - # Ensure source 1 is updated, and everything else is as expected - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': None}, - {'id': 2, 'name': 'source-2', 'target': 1}, - {'id': 3, 'name': 'source-3', 'target': None} - ] - self.assertEqual(serializer.data, expected) - - # reverse foreign keys MUST be read_only - # In the general case they do not provide .remove() or .clear() - # and cannot be arbitrarily set. - - # def test_reverse_foreign_key_update(self): - # data = {'id': 1, 'name': 'target-1', 'sources': [1]} - # instance = ForeignKeyTarget.objects.get(pk=1) - # serializer = ForeignKeyTargetSerializer(instance, data=data) - # self.assertTrue(serializer.is_valid()) - # self.assertEqual(serializer.data, data) - # serializer.save() - - # # Ensure target 1 is updated, and everything else is as expected - # queryset = ForeignKeyTarget.objects.all() - # serializer = ForeignKeyTargetSerializer(queryset, many=True) - # expected = [ - # {'id': 1, 'name': 'target-1', 'sources': [1]}, - # {'id': 2, 'name': 'target-2', 'sources': []}, - # ] - # self.assertEqual(serializer.data, expected) - - -class PKNullableOneToOneTests(TestCase): - def setUp(self): - target = OneToOneTarget(name='target-1') - target.save() - new_target = OneToOneTarget(name='target-2') - new_target.save() - source = NullableOneToOneSource(name='source-1', target=new_target) - source.save() - - def test_reverse_foreign_key_retrieve_with_null(self): - queryset = OneToOneTarget.objects.all() - serializer = NullableOneToOneTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'nullable_source': None}, - {'id': 2, 'name': 'target-2', 'nullable_source': 1}, - ] - self.assertEqual(serializer.data, expected) - - -# The below models and tests ensure that serializer fields corresponding -# to a ManyToManyField field with a user-specified ``through`` model are -# set to read only - - -class ManyToManyThroughTarget(models.Model): - name = models.CharField(max_length=100) - - -class ManyToManyThrough(models.Model): - source = models.ForeignKey('ManyToManyThroughSource') - target = models.ForeignKey(ManyToManyThroughTarget) - - -class ManyToManyThroughSource(models.Model): - name = models.CharField(max_length=100) - targets = models.ManyToManyField(ManyToManyThroughTarget, - related_name='sources', - through='ManyToManyThrough') - - -class ManyToManyThroughTargetSerializer(serializers.ModelSerializer): - class Meta: - model = ManyToManyThroughTarget - fields = ('id', 'name', 'sources') - - -class ManyToManyThroughSourceSerializer(serializers.ModelSerializer): - class Meta: - model = ManyToManyThroughSource - fields = ('id', 'name', 'targets') - - -class PKManyToManyThroughTests(TestCase): - def setUp(self): - self.source = ManyToManyThroughSource.objects.create( - name='through-source-1') - self.target = ManyToManyThroughTarget.objects.create( - name='through-target-1') - - def test_many_to_many_create(self): - data = {'id': 2, 'name': 'source-2', 'targets': [self.target.pk]} - serializer = ManyToManyThroughSourceSerializer(data=data) - self.assertTrue(serializer.fields['targets'].read_only) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(obj.name, 'source-2') - self.assertEqual(obj.targets.count(), 0) - - def test_many_to_many_reverse_create(self): - data = {'id': 2, 'name': 'target-2', 'sources': [self.source.pk]} - serializer = ManyToManyThroughTargetSerializer(data=data) - self.assertTrue(serializer.fields['sources'].read_only) - self.assertTrue(serializer.is_valid()) - serializer.save() - obj = serializer.save() - self.assertEqual(obj.name, 'target-2') - self.assertEqual(obj.sources.count(), 0) - - -# Regression tests for #694 (`source` attribute on related fields) - - -class PrimaryKeyRelatedFieldSourceTests(TestCase): - def test_related_manager_source(self): - """ - Relational fields should be able to use manager-returning methods as their source. - """ - BlogPost.objects.create(title='blah') - field = serializers.PrimaryKeyRelatedField(many=True, source='get_blogposts_manager') - - class ClassWithManagerMethod(object): - def get_blogposts_manager(self): - return BlogPost.objects - - obj = ClassWithManagerMethod() - value = field.field_to_native(obj, 'field_name') - self.assertEqual(value, [1]) - - def test_related_queryset_source(self): - """ - Relational fields should be able to use queryset-returning methods as their source. - """ - BlogPost.objects.create(title='blah') - field = serializers.PrimaryKeyRelatedField(many=True, source='get_blogposts_queryset') - - class ClassWithQuerysetMethod(object): - def get_blogposts_queryset(self): - return BlogPost.objects.all() - - obj = ClassWithQuerysetMethod() - value = field.field_to_native(obj, 'field_name') - self.assertEqual(value, [1]) - - def test_dotted_source(self): - """ - Source argument should support dotted.source notation. - """ - BlogPost.objects.create(title='blah') - field = serializers.PrimaryKeyRelatedField(many=True, source='a.b.c') - - class ClassWithQuerysetMethod(object): - a = { - 'b': { - 'c': BlogPost.objects.all() - } - } - - obj = ClassWithQuerysetMethod() - value = field.field_to_native(obj, 'field_name') - self.assertEqual(value, [1]) +# from __future__ import unicode_literals +# from django.db import models +# from django.test import TestCase +# from django.utils import six +# from rest_framework import serializers +# from tests.models import ( +# BlogPost, ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource, +# NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource, +# ) + + +# # ManyToMany +# class ManyToManyTargetSerializer(serializers.ModelSerializer): +# class Meta: +# model = ManyToManyTarget +# fields = ('id', 'name', 'sources') + + +# class ManyToManySourceSerializer(serializers.ModelSerializer): +# class Meta: +# model = ManyToManySource +# fields = ('id', 'name', 'targets') + + +# # ForeignKey +# class ForeignKeyTargetSerializer(serializers.ModelSerializer): +# class Meta: +# model = ForeignKeyTarget +# fields = ('id', 'name', 'sources') + + +# class ForeignKeySourceSerializer(serializers.ModelSerializer): +# class Meta: +# model = ForeignKeySource +# fields = ('id', 'name', 'target') + + +# # Nullable ForeignKey +# class NullableForeignKeySourceSerializer(serializers.ModelSerializer): +# class Meta: +# model = NullableForeignKeySource +# fields = ('id', 'name', 'target') + + +# # Nullable OneToOne +# class NullableOneToOneTargetSerializer(serializers.ModelSerializer): +# class Meta: +# model = OneToOneTarget +# fields = ('id', 'name', 'nullable_source') + + +# # TODO: Add test that .data cannot be accessed prior to .is_valid + +# class PKManyToManyTests(TestCase): +# def setUp(self): +# for idx in range(1, 4): +# target = ManyToManyTarget(name='target-%d' % idx) +# target.save() +# source = ManyToManySource(name='source-%d' % idx) +# source.save() +# for target in ManyToManyTarget.objects.all(): +# source.targets.add(target) + +# def test_many_to_many_retrieve(self): +# queryset = ManyToManySource.objects.all() +# serializer = ManyToManySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'targets': [1]}, +# {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, +# {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_reverse_many_to_many_retrieve(self): +# queryset = ManyToManyTarget.objects.all() +# serializer = ManyToManyTargetSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, +# {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, +# {'id': 3, 'name': 'target-3', 'sources': [3]} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_many_to_many_update(self): +# data = {'id': 1, 'name': 'source-1', 'targets': [1, 2, 3]} +# instance = ManyToManySource.objects.get(pk=1) +# serializer = ManyToManySourceSerializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# serializer.save() +# self.assertEqual(serializer.data, data) + +# # Ensure source 1 is updated, and everything else is as expected +# queryset = ManyToManySource.objects.all() +# serializer = ManyToManySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'targets': [1, 2, 3]}, +# {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, +# {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_reverse_many_to_many_update(self): +# data = {'id': 1, 'name': 'target-1', 'sources': [1]} +# instance = ManyToManyTarget.objects.get(pk=1) +# serializer = ManyToManyTargetSerializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# serializer.save() +# self.assertEqual(serializer.data, data) + +# # Ensure target 1 is updated, and everything else is as expected +# queryset = ManyToManyTarget.objects.all() +# serializer = ManyToManyTargetSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': [1]}, +# {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, +# {'id': 3, 'name': 'target-3', 'sources': [3]} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_many_to_many_create(self): +# data = {'id': 4, 'name': 'source-4', 'targets': [1, 3]} +# serializer = ManyToManySourceSerializer(data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'source-4') + +# # Ensure source 4 is added, and everything else is as expected +# queryset = ManyToManySource.objects.all() +# serializer = ManyToManySourceSerializer(queryset, many=True) +# self.assertFalse(serializer.fields['targets'].read_only) +# expected = [ +# {'id': 1, 'name': 'source-1', 'targets': [1]}, +# {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, +# {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]}, +# {'id': 4, 'name': 'source-4', 'targets': [1, 3]}, +# ] +# self.assertEqual(serializer.data, expected) + +# def test_reverse_many_to_many_create(self): +# data = {'id': 4, 'name': 'target-4', 'sources': [1, 3]} +# serializer = ManyToManyTargetSerializer(data=data) +# self.assertFalse(serializer.fields['sources'].read_only) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'target-4') + +# # Ensure target 4 is added, and everything else is as expected +# queryset = ManyToManyTarget.objects.all() +# serializer = ManyToManyTargetSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, +# {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, +# {'id': 3, 'name': 'target-3', 'sources': [3]}, +# {'id': 4, 'name': 'target-4', 'sources': [1, 3]} +# ] +# self.assertEqual(serializer.data, expected) + + +# class PKForeignKeyTests(TestCase): +# def setUp(self): +# target = ForeignKeyTarget(name='target-1') +# target.save() +# new_target = ForeignKeyTarget(name='target-2') +# new_target.save() +# for idx in range(1, 4): +# source = ForeignKeySource(name='source-%d' % idx, target=target) +# source.save() + +# def test_foreign_key_retrieve(self): +# queryset = ForeignKeySource.objects.all() +# serializer = ForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': 1}, +# {'id': 2, 'name': 'source-2', 'target': 1}, +# {'id': 3, 'name': 'source-3', 'target': 1} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_reverse_foreign_key_retrieve(self): +# queryset = ForeignKeyTarget.objects.all() +# serializer = ForeignKeyTargetSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, +# {'id': 2, 'name': 'target-2', 'sources': []}, +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_update(self): +# data = {'id': 1, 'name': 'source-1', 'target': 2} +# instance = ForeignKeySource.objects.get(pk=1) +# serializer = ForeignKeySourceSerializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.data, data) +# serializer.save() + +# # Ensure source 1 is updated, and everything else is as expected +# queryset = ForeignKeySource.objects.all() +# serializer = ForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': 2}, +# {'id': 2, 'name': 'source-2', 'target': 1}, +# {'id': 3, 'name': 'source-3', 'target': 1} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_update_incorrect_type(self): +# data = {'id': 1, 'name': 'source-1', 'target': 'foo'} +# instance = ForeignKeySource.objects.get(pk=1) +# serializer = ForeignKeySourceSerializer(instance, data=data) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'target': ['Incorrect type. Expected pk value, received %s.' % six.text_type.__name__]}) + +# def test_reverse_foreign_key_update(self): +# data = {'id': 2, 'name': 'target-2', 'sources': [1, 3]} +# instance = ForeignKeyTarget.objects.get(pk=2) +# serializer = ForeignKeyTargetSerializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# # We shouldn't have saved anything to the db yet since save +# # hasn't been called. +# queryset = ForeignKeyTarget.objects.all() +# new_serializer = ForeignKeyTargetSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, +# {'id': 2, 'name': 'target-2', 'sources': []}, +# ] +# self.assertEqual(new_serializer.data, expected) + +# serializer.save() +# self.assertEqual(serializer.data, data) + +# # Ensure target 2 is update, and everything else is as expected +# queryset = ForeignKeyTarget.objects.all() +# serializer = ForeignKeyTargetSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': [2]}, +# {'id': 2, 'name': 'target-2', 'sources': [1, 3]}, +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_create(self): +# data = {'id': 4, 'name': 'source-4', 'target': 2} +# serializer = ForeignKeySourceSerializer(data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'source-4') + +# # Ensure source 4 is added, and everything else is as expected +# queryset = ForeignKeySource.objects.all() +# serializer = ForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': 1}, +# {'id': 2, 'name': 'source-2', 'target': 1}, +# {'id': 3, 'name': 'source-3', 'target': 1}, +# {'id': 4, 'name': 'source-4', 'target': 2}, +# ] +# self.assertEqual(serializer.data, expected) + +# def test_reverse_foreign_key_create(self): +# data = {'id': 3, 'name': 'target-3', 'sources': [1, 3]} +# serializer = ForeignKeyTargetSerializer(data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'target-3') + +# # Ensure target 3 is added, and everything else is as expected +# queryset = ForeignKeyTarget.objects.all() +# serializer = ForeignKeyTargetSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': [2]}, +# {'id': 2, 'name': 'target-2', 'sources': []}, +# {'id': 3, 'name': 'target-3', 'sources': [1, 3]}, +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_update_with_invalid_null(self): +# data = {'id': 1, 'name': 'source-1', 'target': None} +# instance = ForeignKeySource.objects.get(pk=1) +# serializer = ForeignKeySourceSerializer(instance, data=data) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'target': ['This field is required.']}) + +# def test_foreign_key_with_empty(self): +# """ +# Regression test for #1072 + +# https://github.com/tomchristie/django-rest-framework/issues/1072 +# """ +# serializer = NullableForeignKeySourceSerializer() +# self.assertEqual(serializer.data['target'], None) + + +# class PKNullableForeignKeyTests(TestCase): +# def setUp(self): +# target = ForeignKeyTarget(name='target-1') +# target.save() +# for idx in range(1, 4): +# if idx == 3: +# target = None +# source = NullableForeignKeySource(name='source-%d' % idx, target=target) +# source.save() + +# def test_foreign_key_retrieve_with_null(self): +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': 1}, +# {'id': 2, 'name': 'source-2', 'target': 1}, +# {'id': 3, 'name': 'source-3', 'target': None}, +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_create_with_valid_null(self): +# data = {'id': 4, 'name': 'source-4', 'target': None} +# serializer = NullableForeignKeySourceSerializer(data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'source-4') + +# # Ensure source 4 is created, and everything else is as expected +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': 1}, +# {'id': 2, 'name': 'source-2', 'target': 1}, +# {'id': 3, 'name': 'source-3', 'target': None}, +# {'id': 4, 'name': 'source-4', 'target': None} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_create_with_valid_emptystring(self): +# """ +# The emptystring should be interpreted as null in the context +# of relationships. +# """ +# data = {'id': 4, 'name': 'source-4', 'target': ''} +# expected_data = {'id': 4, 'name': 'source-4', 'target': None} +# serializer = NullableForeignKeySourceSerializer(data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, expected_data) +# self.assertEqual(obj.name, 'source-4') + +# # Ensure source 4 is created, and everything else is as expected +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': 1}, +# {'id': 2, 'name': 'source-2', 'target': 1}, +# {'id': 3, 'name': 'source-3', 'target': None}, +# {'id': 4, 'name': 'source-4', 'target': None} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_update_with_valid_null(self): +# data = {'id': 1, 'name': 'source-1', 'target': None} +# instance = NullableForeignKeySource.objects.get(pk=1) +# serializer = NullableForeignKeySourceSerializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.data, data) +# serializer.save() + +# # Ensure source 1 is updated, and everything else is as expected +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': None}, +# {'id': 2, 'name': 'source-2', 'target': 1}, +# {'id': 3, 'name': 'source-3', 'target': None} +# ] +# self.assertEqual(serializer.data, expected) + +# def test_foreign_key_update_with_valid_emptystring(self): +# """ +# The emptystring should be interpreted as null in the context +# of relationships. +# """ +# data = {'id': 1, 'name': 'source-1', 'target': ''} +# expected_data = {'id': 1, 'name': 'source-1', 'target': None} +# instance = NullableForeignKeySource.objects.get(pk=1) +# serializer = NullableForeignKeySourceSerializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.data, expected_data) +# serializer.save() + +# # Ensure source 1 is updated, and everything else is as expected +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': None}, +# {'id': 2, 'name': 'source-2', 'target': 1}, +# {'id': 3, 'name': 'source-3', 'target': None} +# ] +# self.assertEqual(serializer.data, expected) + +# # reverse foreign keys MUST be read_only +# # In the general case they do not provide .remove() or .clear() +# # and cannot be arbitrarily set. + +# # def test_reverse_foreign_key_update(self): +# # data = {'id': 1, 'name': 'target-1', 'sources': [1]} +# # instance = ForeignKeyTarget.objects.get(pk=1) +# # serializer = ForeignKeyTargetSerializer(instance, data=data) +# # self.assertTrue(serializer.is_valid()) +# # self.assertEqual(serializer.data, data) +# # serializer.save() + +# # # Ensure target 1 is updated, and everything else is as expected +# # queryset = ForeignKeyTarget.objects.all() +# # serializer = ForeignKeyTargetSerializer(queryset, many=True) +# # expected = [ +# # {'id': 1, 'name': 'target-1', 'sources': [1]}, +# # {'id': 2, 'name': 'target-2', 'sources': []}, +# # ] +# # self.assertEqual(serializer.data, expected) + + +# class PKNullableOneToOneTests(TestCase): +# def setUp(self): +# target = OneToOneTarget(name='target-1') +# target.save() +# new_target = OneToOneTarget(name='target-2') +# new_target.save() +# source = NullableOneToOneSource(name='source-1', target=new_target) +# source.save() + +# def test_reverse_foreign_key_retrieve_with_null(self): +# queryset = OneToOneTarget.objects.all() +# serializer = NullableOneToOneTargetSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'nullable_source': None}, +# {'id': 2, 'name': 'target-2', 'nullable_source': 1}, +# ] +# self.assertEqual(serializer.data, expected) + + +# # The below models and tests ensure that serializer fields corresponding +# # to a ManyToManyField field with a user-specified ``through`` model are +# # set to read only + + +# class ManyToManyThroughTarget(models.Model): +# name = models.CharField(max_length=100) + + +# class ManyToManyThrough(models.Model): +# source = models.ForeignKey('ManyToManyThroughSource') +# target = models.ForeignKey(ManyToManyThroughTarget) + + +# class ManyToManyThroughSource(models.Model): +# name = models.CharField(max_length=100) +# targets = models.ManyToManyField(ManyToManyThroughTarget, +# related_name='sources', +# through='ManyToManyThrough') + + +# class ManyToManyThroughTargetSerializer(serializers.ModelSerializer): +# class Meta: +# model = ManyToManyThroughTarget +# fields = ('id', 'name', 'sources') + + +# class ManyToManyThroughSourceSerializer(serializers.ModelSerializer): +# class Meta: +# model = ManyToManyThroughSource +# fields = ('id', 'name', 'targets') + + +# class PKManyToManyThroughTests(TestCase): +# def setUp(self): +# self.source = ManyToManyThroughSource.objects.create( +# name='through-source-1') +# self.target = ManyToManyThroughTarget.objects.create( +# name='through-target-1') + +# def test_many_to_many_create(self): +# data = {'id': 2, 'name': 'source-2', 'targets': [self.target.pk]} +# serializer = ManyToManyThroughSourceSerializer(data=data) +# self.assertTrue(serializer.fields['targets'].read_only) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(obj.name, 'source-2') +# self.assertEqual(obj.targets.count(), 0) + +# def test_many_to_many_reverse_create(self): +# data = {'id': 2, 'name': 'target-2', 'sources': [self.source.pk]} +# serializer = ManyToManyThroughTargetSerializer(data=data) +# self.assertTrue(serializer.fields['sources'].read_only) +# self.assertTrue(serializer.is_valid()) +# serializer.save() +# obj = serializer.save() +# self.assertEqual(obj.name, 'target-2') +# self.assertEqual(obj.sources.count(), 0) + + +# # Regression tests for #694 (`source` attribute on related fields) + + +# class PrimaryKeyRelatedFieldSourceTests(TestCase): +# def test_related_manager_source(self): +# """ +# Relational fields should be able to use manager-returning methods as their source. +# """ +# BlogPost.objects.create(title='blah') +# field = serializers.PrimaryKeyRelatedField(many=True, source='get_blogposts_manager') + +# class ClassWithManagerMethod(object): +# def get_blogposts_manager(self): +# return BlogPost.objects + +# obj = ClassWithManagerMethod() +# value = field.field_to_native(obj, 'field_name') +# self.assertEqual(value, [1]) + +# def test_related_queryset_source(self): +# """ +# Relational fields should be able to use queryset-returning methods as their source. +# """ +# BlogPost.objects.create(title='blah') +# field = serializers.PrimaryKeyRelatedField(many=True, source='get_blogposts_queryset') + +# class ClassWithQuerysetMethod(object): +# def get_blogposts_queryset(self): +# return BlogPost.objects.all() + +# obj = ClassWithQuerysetMethod() +# value = field.field_to_native(obj, 'field_name') +# self.assertEqual(value, [1]) + +# def test_dotted_source(self): +# """ +# Source argument should support dotted.source notation. +# """ +# BlogPost.objects.create(title='blah') +# field = serializers.PrimaryKeyRelatedField(many=True, source='a.b.c') + +# class ClassWithQuerysetMethod(object): +# a = { +# 'b': { +# 'c': BlogPost.objects.all() +# } +# } + +# obj = ClassWithQuerysetMethod() +# value = field.field_to_native(obj, 'field_name') +# self.assertEqual(value, [1]) diff --git a/tests/test_relations_slug.py b/tests/test_relations_slug.py index 97ebf23a1..f7a59a957 100644 --- a/tests/test_relations_slug.py +++ b/tests/test_relations_slug.py @@ -1,257 +1,257 @@ -from django.test import TestCase -from rest_framework import serializers -from tests.models import NullableForeignKeySource, ForeignKeySource, ForeignKeyTarget +# from django.test import TestCase +# from rest_framework import serializers +# from tests.models import NullableForeignKeySource, ForeignKeySource, ForeignKeyTarget -class ForeignKeyTargetSerializer(serializers.ModelSerializer): - sources = serializers.SlugRelatedField(many=True, slug_field='name') +# class ForeignKeyTargetSerializer(serializers.ModelSerializer): +# sources = serializers.SlugRelatedField(many=True, slug_field='name') - class Meta: - model = ForeignKeyTarget +# class Meta: +# model = ForeignKeyTarget -class ForeignKeySourceSerializer(serializers.ModelSerializer): - target = serializers.SlugRelatedField(slug_field='name') +# class ForeignKeySourceSerializer(serializers.ModelSerializer): +# target = serializers.SlugRelatedField(slug_field='name') - class Meta: - model = ForeignKeySource +# class Meta: +# model = ForeignKeySource -class NullableForeignKeySourceSerializer(serializers.ModelSerializer): - target = serializers.SlugRelatedField(slug_field='name', required=False) +# class NullableForeignKeySourceSerializer(serializers.ModelSerializer): +# target = serializers.SlugRelatedField(slug_field='name', required=False) - class Meta: - model = NullableForeignKeySource +# class Meta: +# model = NullableForeignKeySource -# TODO: M2M Tests, FKTests (Non-nullable), One2One -class SlugForeignKeyTests(TestCase): - def setUp(self): - target = ForeignKeyTarget(name='target-1') - target.save() - new_target = ForeignKeyTarget(name='target-2') - new_target.save() - for idx in range(1, 4): - source = ForeignKeySource(name='source-%d' % idx, target=target) - source.save() +# # TODO: M2M Tests, FKTests (Non-nullable), One2One +# class SlugForeignKeyTests(TestCase): +# def setUp(self): +# target = ForeignKeyTarget(name='target-1') +# target.save() +# new_target = ForeignKeyTarget(name='target-2') +# new_target.save() +# for idx in range(1, 4): +# source = ForeignKeySource(name='source-%d' % idx, target=target) +# source.save() - def test_foreign_key_retrieve(self): - queryset = ForeignKeySource.objects.all() - serializer = ForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': 'target-1'}, - {'id': 2, 'name': 'source-2', 'target': 'target-1'}, - {'id': 3, 'name': 'source-3', 'target': 'target-1'} - ] - self.assertEqual(serializer.data, expected) +# def test_foreign_key_retrieve(self): +# queryset = ForeignKeySource.objects.all() +# serializer = ForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': 'target-1'}, +# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, +# {'id': 3, 'name': 'source-3', 'target': 'target-1'} +# ] +# self.assertEqual(serializer.data, expected) - def test_reverse_foreign_key_retrieve(self): - queryset = ForeignKeyTarget.objects.all() - serializer = ForeignKeyTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': ['source-1', 'source-2', 'source-3']}, - {'id': 2, 'name': 'target-2', 'sources': []}, - ] - self.assertEqual(serializer.data, expected) +# def test_reverse_foreign_key_retrieve(self): +# queryset = ForeignKeyTarget.objects.all() +# serializer = ForeignKeyTargetSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': ['source-1', 'source-2', 'source-3']}, +# {'id': 2, 'name': 'target-2', 'sources': []}, +# ] +# self.assertEqual(serializer.data, expected) - def test_foreign_key_update(self): - data = {'id': 1, 'name': 'source-1', 'target': 'target-2'} - instance = ForeignKeySource.objects.get(pk=1) - serializer = ForeignKeySourceSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.data, data) - serializer.save() +# def test_foreign_key_update(self): +# data = {'id': 1, 'name': 'source-1', 'target': 'target-2'} +# instance = ForeignKeySource.objects.get(pk=1) +# serializer = ForeignKeySourceSerializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.data, data) +# serializer.save() - # Ensure source 1 is updated, and everything else is as expected - queryset = ForeignKeySource.objects.all() - serializer = ForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': 'target-2'}, - {'id': 2, 'name': 'source-2', 'target': 'target-1'}, - {'id': 3, 'name': 'source-3', 'target': 'target-1'} - ] - self.assertEqual(serializer.data, expected) +# # Ensure source 1 is updated, and everything else is as expected +# queryset = ForeignKeySource.objects.all() +# serializer = ForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': 'target-2'}, +# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, +# {'id': 3, 'name': 'source-3', 'target': 'target-1'} +# ] +# self.assertEqual(serializer.data, expected) - def test_foreign_key_update_incorrect_type(self): - data = {'id': 1, 'name': 'source-1', 'target': 123} - instance = ForeignKeySource.objects.get(pk=1) - serializer = ForeignKeySourceSerializer(instance, data=data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'target': ['Object with name=123 does not exist.']}) +# def test_foreign_key_update_incorrect_type(self): +# data = {'id': 1, 'name': 'source-1', 'target': 123} +# instance = ForeignKeySource.objects.get(pk=1) +# serializer = ForeignKeySourceSerializer(instance, data=data) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'target': ['Object with name=123 does not exist.']}) - def test_reverse_foreign_key_update(self): - data = {'id': 2, 'name': 'target-2', 'sources': ['source-1', 'source-3']} - instance = ForeignKeyTarget.objects.get(pk=2) - serializer = ForeignKeyTargetSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - # We shouldn't have saved anything to the db yet since save - # hasn't been called. - queryset = ForeignKeyTarget.objects.all() - new_serializer = ForeignKeyTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': ['source-1', 'source-2', 'source-3']}, - {'id': 2, 'name': 'target-2', 'sources': []}, - ] - self.assertEqual(new_serializer.data, expected) +# def test_reverse_foreign_key_update(self): +# data = {'id': 2, 'name': 'target-2', 'sources': ['source-1', 'source-3']} +# instance = ForeignKeyTarget.objects.get(pk=2) +# serializer = ForeignKeyTargetSerializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# # We shouldn't have saved anything to the db yet since save +# # hasn't been called. +# queryset = ForeignKeyTarget.objects.all() +# new_serializer = ForeignKeyTargetSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': ['source-1', 'source-2', 'source-3']}, +# {'id': 2, 'name': 'target-2', 'sources': []}, +# ] +# self.assertEqual(new_serializer.data, expected) - serializer.save() - self.assertEqual(serializer.data, data) +# serializer.save() +# self.assertEqual(serializer.data, data) - # Ensure target 2 is update, and everything else is as expected - queryset = ForeignKeyTarget.objects.all() - serializer = ForeignKeyTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': ['source-2']}, - {'id': 2, 'name': 'target-2', 'sources': ['source-1', 'source-3']}, - ] - self.assertEqual(serializer.data, expected) +# # Ensure target 2 is update, and everything else is as expected +# queryset = ForeignKeyTarget.objects.all() +# serializer = ForeignKeyTargetSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': ['source-2']}, +# {'id': 2, 'name': 'target-2', 'sources': ['source-1', 'source-3']}, +# ] +# self.assertEqual(serializer.data, expected) - def test_foreign_key_create(self): - data = {'id': 4, 'name': 'source-4', 'target': 'target-2'} - serializer = ForeignKeySourceSerializer(data=data) - serializer.is_valid() - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') +# def test_foreign_key_create(self): +# data = {'id': 4, 'name': 'source-4', 'target': 'target-2'} +# serializer = ForeignKeySourceSerializer(data=data) +# serializer.is_valid() +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'source-4') - # Ensure source 4 is added, and everything else is as expected - queryset = ForeignKeySource.objects.all() - serializer = ForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': 'target-1'}, - {'id': 2, 'name': 'source-2', 'target': 'target-1'}, - {'id': 3, 'name': 'source-3', 'target': 'target-1'}, - {'id': 4, 'name': 'source-4', 'target': 'target-2'}, - ] - self.assertEqual(serializer.data, expected) +# # Ensure source 4 is added, and everything else is as expected +# queryset = ForeignKeySource.objects.all() +# serializer = ForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': 'target-1'}, +# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, +# {'id': 3, 'name': 'source-3', 'target': 'target-1'}, +# {'id': 4, 'name': 'source-4', 'target': 'target-2'}, +# ] +# self.assertEqual(serializer.data, expected) - def test_reverse_foreign_key_create(self): - data = {'id': 3, 'name': 'target-3', 'sources': ['source-1', 'source-3']} - serializer = ForeignKeyTargetSerializer(data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-3') +# def test_reverse_foreign_key_create(self): +# data = {'id': 3, 'name': 'target-3', 'sources': ['source-1', 'source-3']} +# serializer = ForeignKeyTargetSerializer(data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'target-3') - # Ensure target 3 is added, and everything else is as expected - queryset = ForeignKeyTarget.objects.all() - serializer = ForeignKeyTargetSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'target-1', 'sources': ['source-2']}, - {'id': 2, 'name': 'target-2', 'sources': []}, - {'id': 3, 'name': 'target-3', 'sources': ['source-1', 'source-3']}, - ] - self.assertEqual(serializer.data, expected) +# # Ensure target 3 is added, and everything else is as expected +# queryset = ForeignKeyTarget.objects.all() +# serializer = ForeignKeyTargetSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'target-1', 'sources': ['source-2']}, +# {'id': 2, 'name': 'target-2', 'sources': []}, +# {'id': 3, 'name': 'target-3', 'sources': ['source-1', 'source-3']}, +# ] +# self.assertEqual(serializer.data, expected) - def test_foreign_key_update_with_invalid_null(self): - data = {'id': 1, 'name': 'source-1', 'target': None} - instance = ForeignKeySource.objects.get(pk=1) - serializer = ForeignKeySourceSerializer(instance, data=data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'target': ['This field is required.']}) +# def test_foreign_key_update_with_invalid_null(self): +# data = {'id': 1, 'name': 'source-1', 'target': None} +# instance = ForeignKeySource.objects.get(pk=1) +# serializer = ForeignKeySourceSerializer(instance, data=data) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'target': ['This field is required.']}) -class SlugNullableForeignKeyTests(TestCase): - def setUp(self): - target = ForeignKeyTarget(name='target-1') - target.save() - for idx in range(1, 4): - if idx == 3: - target = None - source = NullableForeignKeySource(name='source-%d' % idx, target=target) - source.save() +# class SlugNullableForeignKeyTests(TestCase): +# def setUp(self): +# target = ForeignKeyTarget(name='target-1') +# target.save() +# for idx in range(1, 4): +# if idx == 3: +# target = None +# source = NullableForeignKeySource(name='source-%d' % idx, target=target) +# source.save() - def test_foreign_key_retrieve_with_null(self): - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': 'target-1'}, - {'id': 2, 'name': 'source-2', 'target': 'target-1'}, - {'id': 3, 'name': 'source-3', 'target': None}, - ] - self.assertEqual(serializer.data, expected) +# def test_foreign_key_retrieve_with_null(self): +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': 'target-1'}, +# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, +# {'id': 3, 'name': 'source-3', 'target': None}, +# ] +# self.assertEqual(serializer.data, expected) - def test_foreign_key_create_with_valid_null(self): - data = {'id': 4, 'name': 'source-4', 'target': None} - serializer = NullableForeignKeySourceSerializer(data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') +# def test_foreign_key_create_with_valid_null(self): +# data = {'id': 4, 'name': 'source-4', 'target': None} +# serializer = NullableForeignKeySourceSerializer(data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, data) +# self.assertEqual(obj.name, 'source-4') - # Ensure source 4 is created, and everything else is as expected - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': 'target-1'}, - {'id': 2, 'name': 'source-2', 'target': 'target-1'}, - {'id': 3, 'name': 'source-3', 'target': None}, - {'id': 4, 'name': 'source-4', 'target': None} - ] - self.assertEqual(serializer.data, expected) +# # Ensure source 4 is created, and everything else is as expected +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': 'target-1'}, +# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, +# {'id': 3, 'name': 'source-3', 'target': None}, +# {'id': 4, 'name': 'source-4', 'target': None} +# ] +# self.assertEqual(serializer.data, expected) - def test_foreign_key_create_with_valid_emptystring(self): - """ - The emptystring should be interpreted as null in the context - of relationships. - """ - data = {'id': 4, 'name': 'source-4', 'target': ''} - expected_data = {'id': 4, 'name': 'source-4', 'target': None} - serializer = NullableForeignKeySourceSerializer(data=data) - self.assertTrue(serializer.is_valid()) - obj = serializer.save() - self.assertEqual(serializer.data, expected_data) - self.assertEqual(obj.name, 'source-4') +# def test_foreign_key_create_with_valid_emptystring(self): +# """ +# The emptystring should be interpreted as null in the context +# of relationships. +# """ +# data = {'id': 4, 'name': 'source-4', 'target': ''} +# expected_data = {'id': 4, 'name': 'source-4', 'target': None} +# serializer = NullableForeignKeySourceSerializer(data=data) +# self.assertTrue(serializer.is_valid()) +# obj = serializer.save() +# self.assertEqual(serializer.data, expected_data) +# self.assertEqual(obj.name, 'source-4') - # Ensure source 4 is created, and everything else is as expected - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': 'target-1'}, - {'id': 2, 'name': 'source-2', 'target': 'target-1'}, - {'id': 3, 'name': 'source-3', 'target': None}, - {'id': 4, 'name': 'source-4', 'target': None} - ] - self.assertEqual(serializer.data, expected) +# # Ensure source 4 is created, and everything else is as expected +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': 'target-1'}, +# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, +# {'id': 3, 'name': 'source-3', 'target': None}, +# {'id': 4, 'name': 'source-4', 'target': None} +# ] +# self.assertEqual(serializer.data, expected) - def test_foreign_key_update_with_valid_null(self): - data = {'id': 1, 'name': 'source-1', 'target': None} - instance = NullableForeignKeySource.objects.get(pk=1) - serializer = NullableForeignKeySourceSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.data, data) - serializer.save() +# def test_foreign_key_update_with_valid_null(self): +# data = {'id': 1, 'name': 'source-1', 'target': None} +# instance = NullableForeignKeySource.objects.get(pk=1) +# serializer = NullableForeignKeySourceSerializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.data, data) +# serializer.save() - # Ensure source 1 is updated, and everything else is as expected - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': None}, - {'id': 2, 'name': 'source-2', 'target': 'target-1'}, - {'id': 3, 'name': 'source-3', 'target': None} - ] - self.assertEqual(serializer.data, expected) +# # Ensure source 1 is updated, and everything else is as expected +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': None}, +# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, +# {'id': 3, 'name': 'source-3', 'target': None} +# ] +# self.assertEqual(serializer.data, expected) - def test_foreign_key_update_with_valid_emptystring(self): - """ - The emptystring should be interpreted as null in the context - of relationships. - """ - data = {'id': 1, 'name': 'source-1', 'target': ''} - expected_data = {'id': 1, 'name': 'source-1', 'target': None} - instance = NullableForeignKeySource.objects.get(pk=1) - serializer = NullableForeignKeySourceSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.data, expected_data) - serializer.save() +# def test_foreign_key_update_with_valid_emptystring(self): +# """ +# The emptystring should be interpreted as null in the context +# of relationships. +# """ +# data = {'id': 1, 'name': 'source-1', 'target': ''} +# expected_data = {'id': 1, 'name': 'source-1', 'target': None} +# instance = NullableForeignKeySource.objects.get(pk=1) +# serializer = NullableForeignKeySourceSerializer(instance, data=data) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.data, expected_data) +# serializer.save() - # Ensure source 1 is updated, and everything else is as expected - queryset = NullableForeignKeySource.objects.all() - serializer = NullableForeignKeySourceSerializer(queryset, many=True) - expected = [ - {'id': 1, 'name': 'source-1', 'target': None}, - {'id': 2, 'name': 'source-2', 'target': 'target-1'}, - {'id': 3, 'name': 'source-3', 'target': None} - ] - self.assertEqual(serializer.data, expected) +# # Ensure source 1 is updated, and everything else is as expected +# queryset = NullableForeignKeySource.objects.all() +# serializer = NullableForeignKeySourceSerializer(queryset, many=True) +# expected = [ +# {'id': 1, 'name': 'source-1', 'target': None}, +# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, +# {'id': 3, 'name': 'source-3', 'target': None} +# ] +# self.assertEqual(serializer.data, expected) From 4947303f20fa1229cdbe4fddc811e3117f4ce276 Mon Sep 17 00:00:00 2001 From: Carlton Gibson <carlton.gibson@noumenal.co.uk> Date: Wed, 3 Sep 2014 09:54:36 +0200 Subject: [PATCH 0757/1652] Moved li tags inside `optional_login` as per https://github.com/tomchristie/django-rest-framework/pull/1820#discussion_r16987993 --- rest_framework/templates/rest_framework/base.html | 2 +- rest_framework/templatetags/rest_framework.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 5a12277bc..a84ccf269 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -46,7 +46,7 @@ {% if user.is_authenticated %} {% optional_logout request user %} {% else %} - <li>{% optional_login request %}</li> + {% optional_login request %} {% endif %} {% endblock %} </ul> diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index f7332c3b5..c228d5c3d 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -41,7 +41,7 @@ def optional_login(request): except NoReverseMatch: return '' - snippet = "<a href='%s?next=%s'>Log in</a>" % (login_url, escape(request.path)) + snippet = "<li><a href='%s?next=%s'>Log in</a></li>" % (login_url, escape(request.path)) return snippet From deb19272b72f46c31f09651470a91ca46bb7dd2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Jaworski?= <swistakm@gmail.com> Date: Wed, 3 Sep 2014 16:49:32 +0200 Subject: [PATCH 0758/1652] Add custom pagination test that covers case with custom object serializer class --- tests/test_pagination.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 80c33e2eb..e1c2528b2 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -412,6 +412,15 @@ class CustomPaginationSerializer(pagination.BasePaginationSerializer): results_field = 'objects' +class CustomFooSerializer(serializers.Serializer): + foo = serializers.CharField() + + +class CustomFooPaginationSerializer(pagination.PaginationSerializer): + class Meta: + object_serializer_class = CustomFooSerializer + + class TestCustomPaginationSerializer(TestCase): def setUp(self): objects = ['john', 'paul', 'george', 'ringo'] @@ -434,6 +443,16 @@ class TestCustomPaginationSerializer(TestCase): } self.assertEqual(serializer.data, expected) + def test_custom_pagination_serializer_with_custom_object_serializer(self): + objects = [ + {'foo': 'bar'}, + {'foo': 'spam'} + ] + paginator = Paginator(objects, 1) + page = paginator.page(1) + serializer = CustomFooPaginationSerializer(page) + serializer.data + class NonIntegerPage(object): From 9195ccb97f608a48e39a277705fb197fe8c0d50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Jaworski?= <swistakm@gmail.com> Date: Wed, 3 Sep 2014 16:52:41 +0200 Subject: [PATCH 0759/1652] Use explicit many=True for object_serializer instantiation in PaginationSerializer and add catch dummy 'many' kwarg on DefaultObjectSerializer --- rest_framework/pagination.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index d51ea929b..9dce05b11 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -43,8 +43,9 @@ class DefaultObjectSerializer(serializers.Field): as the default. """ - def __init__(self, source=None, context=None): - # Note: Swallow context kwarg - only required for eg. ModelSerializer. + def __init__(self, source=None, many=None, context=None): + # Note: Swallow context and many kwargs - only required for + # eg. ModelSerializer. super(DefaultObjectSerializer, self).__init__(source=source) @@ -82,7 +83,10 @@ class BasePaginationSerializer(serializers.Serializer): else: context_kwarg = {} - self.fields[results_field] = object_serializer(source='object_list', **context_kwarg) + print object_serializer + self.fields[results_field] = object_serializer(source='object_list', + many=True, + **context_kwarg) class PaginationSerializer(BasePaginationSerializer): From afe9b37f600ba7dad9de249f56ea1e7c539939f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Jaworski?= <swistakm@gmail.com> Date: Wed, 3 Sep 2014 17:21:56 +0200 Subject: [PATCH 0760/1652] remove rogue print --- rest_framework/pagination.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 9dce05b11..1f5749f1a 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -83,7 +83,6 @@ class BasePaginationSerializer(serializers.Serializer): else: context_kwarg = {} - print object_serializer self.fields[results_field] = object_serializer(source='object_list', many=True, **context_kwarg) From c1036c17533a3091401ff90f825571f0e6125eca Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 3 Sep 2014 16:34:09 +0100 Subject: [PATCH 0761/1652] More test passing --- rest_framework/relations.py | 56 +- tests/test_serializer.py | 3748 +++++++++++++------------- tests/test_serializer_bulk_update.py | 484 ++-- tests/test_serializer_empty.py | 22 +- tests/test_serializer_import.py | 32 +- tests/test_serializer_nested.py | 586 ++-- tests/test_serializers.py | 50 +- 7 files changed, 2516 insertions(+), 2462 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 0b01394a8..661a1249a 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -1,6 +1,7 @@ from rest_framework.fields import Field +from rest_framework.reverse import reverse from django.core.exceptions import ObjectDoesNotExist -from django.core.urlresolvers import resolve, get_script_prefix +from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch from rest_framework.compat import urlparse @@ -100,11 +101,64 @@ class HyperlinkedIdentityField(RelatedField): lookup_field = 'pk' def __init__(self, **kwargs): + kwargs['read_only'] = True self.view_name = kwargs.pop('view_name') self.lookup_field = kwargs.pop('lookup_field', self.lookup_field) self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field) super(HyperlinkedIdentityField, self).__init__(**kwargs) + def get_attribute(self, instance): + return instance + + def to_primative(self, value): + request = self.context.get('request', None) + format = self.context.get('format', None) + + assert request is not None, ( + "`HyperlinkedIdentityField` requires the request in the serializer" + " context. Add `context={'request': request}` when instantiating " + "the serializer." + ) + + # By default use whatever format is given for the current context + # unless the target is a different type to the source. + # + # Eg. Consider a HyperlinkedIdentityField pointing from a json + # representation to an html property of that representation... + # + # '/snippets/1/' should link to '/snippets/1/highlight/' + # ...but... + # '/snippets/1/.json' should link to '/snippets/1/highlight/.html' + if format and self.format and self.format != format: + format = self.format + + # Return the hyperlink, or error if incorrectly configured. + try: + return self.get_url(value, self.view_name, request, format) + except NoReverseMatch: + msg = ( + 'Could not resolve URL for hyperlinked relationship using ' + 'view name "%s". You may have failed to include the related ' + 'model in your API, or incorrectly configured the ' + '`lookup_field` attribute on this field.' + ) + raise Exception(msg % self.view_name) + + def get_url(self, obj, view_name, request, format): + """ + Given an object, return the URL that hyperlinks to the object. + + May raise a `NoReverseMatch` if the `view_name` and `lookup_field` + attributes are not configured to correctly match the URL conf. + """ + # Unsaved objects will not yet have a valid URL. + if obj.pk is None: + return None + + lookup_value = getattr(obj, self.lookup_field) + kwargs = {self.lookup_url_kwarg: lookup_value} + return reverse(view_name, kwargs=kwargs, request=request, format=format) + class SlugRelatedField(RelatedField): def __init__(self, **kwargs): diff --git a/tests/test_serializer.py b/tests/test_serializer.py index fa5cafcfb..b0eb4e270 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -1,2004 +1,2004 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals -from django.db import models -from django.db.models.fields import BLANK_CHOICE_DASH -from django.test import TestCase -from django.utils import unittest -from django.utils.datastructures import MultiValueDict -from django.utils.translation import ugettext_lazy as _ -from rest_framework import serializers, fields, relations -from tests.models import ( - HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel, - BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, - DefaultValueModel, ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo, - RESTFrameworkModel, ForeignKeySource -) -from tests.models import BasicModelSerializer -import datetime -import pickle -try: - import PIL -except: - PIL = None - - -if PIL is not None: - class AMOAFModel(RESTFrameworkModel): - char_field = models.CharField(max_length=1024, blank=True) - comma_separated_integer_field = models.CommaSeparatedIntegerField(max_length=1024, blank=True) - decimal_field = models.DecimalField(max_digits=64, decimal_places=32, blank=True) - email_field = models.EmailField(max_length=1024, blank=True) - file_field = models.FileField(upload_to='test', max_length=1024, blank=True) - image_field = models.ImageField(upload_to='test', max_length=1024, blank=True) - slug_field = models.SlugField(max_length=1024, blank=True) - url_field = models.URLField(max_length=1024, blank=True) - nullable_char_field = models.CharField(max_length=1024, blank=True, null=True) - - class DVOAFModel(RESTFrameworkModel): - positive_integer_field = models.PositiveIntegerField(blank=True) - positive_small_integer_field = models.PositiveSmallIntegerField(blank=True) - email_field = models.EmailField(blank=True) - file_field = models.FileField(upload_to='test', blank=True) - image_field = models.ImageField(upload_to='test', blank=True) - slug_field = models.SlugField(blank=True) - url_field = models.URLField(blank=True) +# # -*- coding: utf-8 -*- +# from __future__ import unicode_literals +# from django.db import models +# from django.db.models.fields import BLANK_CHOICE_DASH +# from django.test import TestCase +# from django.utils import unittest +# from django.utils.datastructures import MultiValueDict +# from django.utils.translation import ugettext_lazy as _ +# from rest_framework import serializers, fields, relations +# from tests.models import ( +# HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel, +# BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, +# DefaultValueModel, ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo, +# RESTFrameworkModel, ForeignKeySource +# ) +# from tests.models import BasicModelSerializer +# import datetime +# import pickle +# try: +# import PIL +# except: +# PIL = None + + +# if PIL is not None: +# class AMOAFModel(RESTFrameworkModel): +# char_field = models.CharField(max_length=1024, blank=True) +# comma_separated_integer_field = models.CommaSeparatedIntegerField(max_length=1024, blank=True) +# decimal_field = models.DecimalField(max_digits=64, decimal_places=32, blank=True) +# email_field = models.EmailField(max_length=1024, blank=True) +# file_field = models.FileField(upload_to='test', max_length=1024, blank=True) +# image_field = models.ImageField(upload_to='test', max_length=1024, blank=True) +# slug_field = models.SlugField(max_length=1024, blank=True) +# url_field = models.URLField(max_length=1024, blank=True) +# nullable_char_field = models.CharField(max_length=1024, blank=True, null=True) + +# class DVOAFModel(RESTFrameworkModel): +# positive_integer_field = models.PositiveIntegerField(blank=True) +# positive_small_integer_field = models.PositiveSmallIntegerField(blank=True) +# email_field = models.EmailField(blank=True) +# file_field = models.FileField(upload_to='test', blank=True) +# image_field = models.ImageField(upload_to='test', blank=True) +# slug_field = models.SlugField(blank=True) +# url_field = models.URLField(blank=True) -class SubComment(object): - def __init__(self, sub_comment): - self.sub_comment = sub_comment +# class SubComment(object): +# def __init__(self, sub_comment): +# self.sub_comment = sub_comment -class Comment(object): - def __init__(self, email, content, created): - self.email = email - self.content = content - self.created = created or datetime.datetime.now() +# class Comment(object): +# def __init__(self, email, content, created): +# self.email = email +# self.content = content +# self.created = created or datetime.datetime.now() - def __eq__(self, other): - return all([getattr(self, attr) == getattr(other, attr) - for attr in ('email', 'content', 'created')]) +# def __eq__(self, other): +# return all([getattr(self, attr) == getattr(other, attr) +# for attr in ('email', 'content', 'created')]) - def get_sub_comment(self): - sub_comment = SubComment('And Merry Christmas!') - return sub_comment +# def get_sub_comment(self): +# sub_comment = SubComment('And Merry Christmas!') +# return sub_comment -class CommentSerializer(serializers.Serializer): - email = serializers.EmailField() - content = serializers.CharField(max_length=1000) - created = serializers.DateTimeField() - sub_comment = serializers.Field(source='get_sub_comment.sub_comment') +# class CommentSerializer(serializers.Serializer): +# email = serializers.EmailField() +# content = serializers.CharField(max_length=1000) +# created = serializers.DateTimeField() +# sub_comment = serializers.Field(source='get_sub_comment.sub_comment') - def restore_object(self, data, instance=None): - if instance is None: - return Comment(**data) - for key, val in data.items(): - setattr(instance, key, val) - return instance +# def restore_object(self, data, instance=None): +# if instance is None: +# return Comment(**data) +# for key, val in data.items(): +# setattr(instance, key, val) +# return instance -class NamesSerializer(serializers.Serializer): - first = serializers.CharField() - last = serializers.CharField(required=False, default='') - initials = serializers.CharField(required=False, default='') +# class NamesSerializer(serializers.Serializer): +# first = serializers.CharField() +# last = serializers.CharField(required=False, default='') +# initials = serializers.CharField(required=False, default='') -class PersonIdentifierSerializer(serializers.Serializer): - ssn = serializers.CharField() - names = NamesSerializer(source='names', required=False) +# class PersonIdentifierSerializer(serializers.Serializer): +# ssn = serializers.CharField() +# names = NamesSerializer(source='names', required=False) -class BookSerializer(serializers.ModelSerializer): - isbn = serializers.RegexField(regex=r'^[0-9]{13}$', error_messages={'invalid': 'isbn has to be exact 13 numbers'}) +# class BookSerializer(serializers.ModelSerializer): +# isbn = serializers.RegexField(regex=r'^[0-9]{13}$', error_messages={'invalid': 'isbn has to be exact 13 numbers'}) - class Meta: - model = Book +# class Meta: +# model = Book -class ActionItemSerializer(serializers.ModelSerializer): +# class ActionItemSerializer(serializers.ModelSerializer): - class Meta: - model = ActionItem +# class Meta: +# model = ActionItem -class ActionItemSerializerOptionalFields(serializers.ModelSerializer): - """ - Intended to test that fields with `required=False` are excluded from validation. - """ - title = serializers.CharField(required=False) +# class ActionItemSerializerOptionalFields(serializers.ModelSerializer): +# """ +# Intended to test that fields with `required=False` are excluded from validation. +# """ +# title = serializers.CharField(required=False) - class Meta: - model = ActionItem - fields = ('title',) +# class Meta: +# model = ActionItem +# fields = ('title',) -class ActionItemSerializerCustomRestore(serializers.ModelSerializer): +# class ActionItemSerializerCustomRestore(serializers.ModelSerializer): - class Meta: - model = ActionItem +# class Meta: +# model = ActionItem - def restore_object(self, data, instance=None): - if instance is None: - return ActionItem(**data) - for key, val in data.items(): - setattr(instance, key, val) - return instance +# def restore_object(self, data, instance=None): +# if instance is None: +# return ActionItem(**data) +# for key, val in data.items(): +# setattr(instance, key, val) +# return instance -class PersonSerializer(serializers.ModelSerializer): - info = serializers.Field(source='info') +# class PersonSerializer(serializers.ModelSerializer): +# info = serializers.Field(source='info') - class Meta: - model = Person - fields = ('name', 'age', 'info') - read_only_fields = ('age',) +# class Meta: +# model = Person +# fields = ('name', 'age', 'info') +# read_only_fields = ('age',) -class NestedSerializer(serializers.Serializer): - info = serializers.Field() +# class NestedSerializer(serializers.Serializer): +# info = serializers.Field() -class ModelSerializerWithNestedSerializer(serializers.ModelSerializer): - nested = NestedSerializer(source='*') +# class ModelSerializerWithNestedSerializer(serializers.ModelSerializer): +# nested = NestedSerializer(source='*') - class Meta: - model = Person +# class Meta: +# model = Person -class NestedSerializerWithRenamedField(serializers.Serializer): - renamed_info = serializers.Field(source='info') +# class NestedSerializerWithRenamedField(serializers.Serializer): +# renamed_info = serializers.Field(source='info') -class ModelSerializerWithNestedSerializerWithRenamedField(serializers.ModelSerializer): - nested = NestedSerializerWithRenamedField(source='*') +# class ModelSerializerWithNestedSerializerWithRenamedField(serializers.ModelSerializer): +# nested = NestedSerializerWithRenamedField(source='*') - class Meta: - model = Person +# class Meta: +# model = Person -class PersonSerializerInvalidReadOnly(serializers.ModelSerializer): - """ - Testing for #652. - """ - info = serializers.Field(source='info') +# class PersonSerializerInvalidReadOnly(serializers.ModelSerializer): +# """ +# Testing for #652. +# """ +# info = serializers.Field(source='info') - class Meta: - model = Person - fields = ('name', 'age', 'info') - read_only_fields = ('age', 'info') +# class Meta: +# model = Person +# fields = ('name', 'age', 'info') +# read_only_fields = ('age', 'info') -class AlbumsSerializer(serializers.ModelSerializer): +# class AlbumsSerializer(serializers.ModelSerializer): - class Meta: - model = Album - fields = ['title', 'ref'] # lists are also valid options +# class Meta: +# model = Album +# fields = ['title', 'ref'] # lists are also valid options -class PositiveIntegerAsChoiceSerializer(serializers.ModelSerializer): - class Meta: - model = HasPositiveIntegerAsChoice - fields = ['some_integer'] +# class PositiveIntegerAsChoiceSerializer(serializers.ModelSerializer): +# class Meta: +# model = HasPositiveIntegerAsChoice +# fields = ['some_integer'] -class ForeignKeySourceSerializer(serializers.ModelSerializer): - class Meta: - model = ForeignKeySource +# class ForeignKeySourceSerializer(serializers.ModelSerializer): +# class Meta: +# model = ForeignKeySource -class HyperlinkedForeignKeySourceSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = ForeignKeySource +# class HyperlinkedForeignKeySourceSerializer(serializers.HyperlinkedModelSerializer): +# class Meta: +# model = ForeignKeySource -class BasicTests(TestCase): - def setUp(self): - self.comment = Comment( - 'tom@example.com', - 'Happy new year!', - datetime.datetime(2012, 1, 1) - ) - self.actionitem = ActionItem(title='Some to do item',) - self.data = { - 'email': 'tom@example.com', - 'content': 'Happy new year!', - 'created': datetime.datetime(2012, 1, 1), - 'sub_comment': 'This wont change' - } - self.expected = { - 'email': 'tom@example.com', - 'content': 'Happy new year!', - 'created': datetime.datetime(2012, 1, 1), - 'sub_comment': 'And Merry Christmas!' - } - self.person_data = {'name': 'dwight', 'age': 35} - self.person = Person(**self.person_data) - self.person.save() - - def test_empty(self): - serializer = CommentSerializer() - expected = { - 'email': '', - 'content': '', - 'created': None - } - self.assertEqual(serializer.data, expected) - - def test_retrieve(self): - serializer = CommentSerializer(self.comment) - self.assertEqual(serializer.data, self.expected) - - def test_create(self): - serializer = CommentSerializer(data=self.data) - expected = self.comment - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.object, expected) - self.assertFalse(serializer.object is expected) - self.assertEqual(serializer.data['sub_comment'], 'And Merry Christmas!') - - def test_create_nested(self): - """Test a serializer with nested data.""" - names = {'first': 'John', 'last': 'Doe', 'initials': 'jd'} - data = {'ssn': '1234567890', 'names': names} - serializer = PersonIdentifierSerializer(data=data) - - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.object, data) - self.assertFalse(serializer.object is data) - self.assertEqual(serializer.data['names'], names) - - def test_create_partial_nested(self): - """Test a serializer with nested data which has missing fields.""" - names = {'first': 'John'} - data = {'ssn': '1234567890', 'names': names} - serializer = PersonIdentifierSerializer(data=data) - - expected_names = {'first': 'John', 'last': '', 'initials': ''} - data['names'] = expected_names - - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.object, data) - self.assertFalse(serializer.object is expected_names) - self.assertEqual(serializer.data['names'], expected_names) - - def test_null_nested(self): - """Test a serializer with a nonexistent nested field""" - data = {'ssn': '1234567890'} - serializer = PersonIdentifierSerializer(data=data) - - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.object, data) - self.assertFalse(serializer.object is data) - expected = {'ssn': '1234567890', 'names': None} - self.assertEqual(serializer.data, expected) - - def test_update(self): - serializer = CommentSerializer(self.comment, data=self.data) - expected = self.comment - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.object, expected) - self.assertTrue(serializer.object is expected) - self.assertEqual(serializer.data['sub_comment'], 'And Merry Christmas!') - - def test_partial_update(self): - msg = 'Merry New Year!' - partial_data = {'content': msg} - serializer = CommentSerializer(self.comment, data=partial_data) - self.assertEqual(serializer.is_valid(), False) - serializer = CommentSerializer(self.comment, data=partial_data, partial=True) - expected = self.comment - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.object, expected) - self.assertTrue(serializer.object is expected) - self.assertEqual(serializer.data['content'], msg) - - def test_model_fields_as_expected(self): - """ - Make sure that the fields returned are the same as defined - in the Meta data - """ - serializer = PersonSerializer(self.person) - self.assertEqual( - set(serializer.data.keys()), - set(['name', 'age', 'info']) - ) - - def test_field_with_dictionary(self): - """ - Make sure that dictionaries from fields are left intact - """ - serializer = PersonSerializer(self.person) - expected = self.person_data - self.assertEqual(serializer.data['info'], expected) - - def test_read_only_fields(self): - """ - Attempting to update fields set as read_only should have no effect. - """ - serializer = PersonSerializer(self.person, data={'name': 'dwight', 'age': 99}) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - self.assertEqual(serializer.errors, {}) - # Assert age is unchanged (35) - self.assertEqual(instance.age, self.person_data['age']) - - def test_invalid_read_only_fields(self): - """ - Regression test for #652. - """ - self.assertRaises(AssertionError, PersonSerializerInvalidReadOnly, []) - - def test_serializer_data_is_cleared_on_save(self): - """ - Check _data attribute is cleared on `save()` - - Regression test for #1116 - — id field is not populated if `data` is accessed prior to `save()` - """ - serializer = ActionItemSerializer(self.actionitem) - self.assertIsNone(serializer.data.get('id', None), 'New instance. `id` should not be set.') - serializer.save() - self.assertIsNotNone(serializer.data.get('id', None), 'Model is saved. `id` should be set.') - - def test_fields_marked_as_not_required_are_excluded_from_validation(self): - """ - Check that fields with `required=False` are included in list of exclusions. - """ - serializer = ActionItemSerializerOptionalFields(self.actionitem) - exclusions = serializer.get_validation_exclusions() - self.assertTrue('title' in exclusions, '`title` field was marked `required=False` and should be excluded') - - -class DictStyleSerializer(serializers.Serializer): - """ - Note that we don't have any `restore_object` method, so the default - case of simply returning a dict will apply. - """ - email = serializers.EmailField() - - -class DictStyleSerializerTests(TestCase): - def test_dict_style_deserialize(self): - """ - Ensure serializers can deserialize into a dict. - """ - data = {'email': 'foo@example.com'} - serializer = DictStyleSerializer(data=data) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.data, data) - - def test_dict_style_serialize(self): - """ - Ensure serializers can serialize dict objects. - """ - data = {'email': 'foo@example.com'} - serializer = DictStyleSerializer(data) - self.assertEqual(serializer.data, data) - - -class ValidationTests(TestCase): - def setUp(self): - self.comment = Comment( - 'tom@example.com', - 'Happy new year!', - datetime.datetime(2012, 1, 1) - ) - self.data = { - 'email': 'tom@example.com', - 'content': 'x' * 1001, - 'created': datetime.datetime(2012, 1, 1) - } - self.actionitem = ActionItem(title='Some to do item',) - - def test_create(self): - serializer = CommentSerializer(data=self.data) - self.assertEqual(serializer.is_valid(), False) - self.assertEqual(serializer.errors, {'content': ['Ensure this value has at most 1000 characters (it has 1001).']}) - - def test_update(self): - serializer = CommentSerializer(self.comment, data=self.data) - self.assertEqual(serializer.is_valid(), False) - self.assertEqual(serializer.errors, {'content': ['Ensure this value has at most 1000 characters (it has 1001).']}) - - def test_update_missing_field(self): - data = { - 'content': 'xxx', - 'created': datetime.datetime(2012, 1, 1) - } - serializer = CommentSerializer(self.comment, data=data) - self.assertEqual(serializer.is_valid(), False) - self.assertEqual(serializer.errors, {'email': ['This field is required.']}) - - def test_missing_bool_with_default(self): - """Make sure that a boolean value with a 'False' value is not - mistaken for not having a default.""" - data = { - 'title': 'Some action item', - # No 'done' value. - } - serializer = ActionItemSerializer(self.actionitem, data=data) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.errors, {}) - - def test_cross_field_validation(self): - - class CommentSerializerWithCrossFieldValidator(CommentSerializer): - - def validate(self, attrs): - if attrs["email"] not in attrs["content"]: - raise serializers.ValidationError("Email address not in content") - return attrs - - data = { - 'email': 'tom@example.com', - 'content': 'A comment from tom@example.com', - 'created': datetime.datetime(2012, 1, 1) - } - - serializer = CommentSerializerWithCrossFieldValidator(data=data) - self.assertTrue(serializer.is_valid()) - - data['content'] = 'A comment from foo@bar.com' - - serializer = CommentSerializerWithCrossFieldValidator(data=data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'non_field_errors': ['Email address not in content']}) - - def test_null_is_true_fields(self): - """ - Omitting a value for null-field should validate. - """ - serializer = PersonSerializer(data={'name': 'marko'}) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.errors, {}) - - def test_modelserializer_max_length_exceeded(self): - data = { - 'title': 'x' * 201, - } - serializer = ActionItemSerializer(data=data) - self.assertEqual(serializer.is_valid(), False) - self.assertEqual(serializer.errors, {'title': ['Ensure this value has at most 200 characters (it has 201).']}) - - def test_modelserializer_max_length_exceeded_with_custom_restore(self): - """ - When overriding ModelSerializer.restore_object, validation tests should still apply. - Regression test for #623. - - https://github.com/tomchristie/django-rest-framework/pull/623 - """ - data = { - 'title': 'x' * 201, - } - serializer = ActionItemSerializerCustomRestore(data=data) - self.assertEqual(serializer.is_valid(), False) - self.assertEqual(serializer.errors, {'title': ['Ensure this value has at most 200 characters (it has 201).']}) - - def test_default_modelfield_max_length_exceeded(self): - data = { - 'title': 'Testing "info" field...', - 'info': 'x' * 13, - } - serializer = ActionItemSerializer(data=data) - self.assertEqual(serializer.is_valid(), False) - self.assertEqual(serializer.errors, {'info': ['Ensure this value has at most 12 characters (it has 13).']}) - - def test_datetime_validation_failure(self): - """ - Test DateTimeField validation errors on non-str values. - Regression test for #669. - - https://github.com/tomchristie/django-rest-framework/issues/669 - """ - data = self.data - data['created'] = 0 - - serializer = CommentSerializer(data=data) - self.assertEqual(serializer.is_valid(), False) - - self.assertIn('created', serializer.errors) - - def test_missing_model_field_exception_msg(self): - """ - Assert that a meaningful exception message is outputted when the model - field is missing (e.g. when mistyping ``model``). - """ - class BrokenModelSerializer(serializers.ModelSerializer): - class Meta: - fields = ['some_field'] - - try: - BrokenModelSerializer() - except AssertionError as e: - self.assertEqual(e.args[0], "Serializer class 'BrokenModelSerializer' is missing 'model' Meta option") - except: - self.fail('Wrong exception type thrown.') - - def test_writable_star_source_on_nested_serializer(self): - """ - Assert that a nested serializer instantiated with source='*' correctly - expands the data into the outer serializer. - """ - serializer = ModelSerializerWithNestedSerializer(data={ - 'name': 'marko', - 'nested': {'info': 'hi'}}, - ) - self.assertEqual(serializer.is_valid(), True) - - def test_writable_star_source_on_nested_serializer_with_parent_object(self): - class TitleSerializer(serializers.Serializer): - title = serializers.WritableField(source='title') - - class AlbumSerializer(serializers.ModelSerializer): - nested = TitleSerializer(source='*') - - class Meta: - model = Album - fields = ('nested',) - - class PhotoSerializer(serializers.ModelSerializer): - album = AlbumSerializer(source='album') - - class Meta: - model = Photo - fields = ('album', ) - - photo = Photo(album=Album()) - - data = {'album': {'nested': {'title': 'test'}}} - - serializer = PhotoSerializer(photo, data=data) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.data, data) - - def test_writable_star_source_with_inner_source_fields(self): - """ - Tests that a serializer with source="*" correctly expands the - it's fields into the outer serializer even if they have their - own 'source' parameters. - """ - - serializer = ModelSerializerWithNestedSerializerWithRenamedField(data={ - 'name': 'marko', - 'nested': {'renamed_info': 'hi'}}, - ) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.errors, {}) - - -class CustomValidationTests(TestCase): - class CommentSerializerWithFieldValidator(CommentSerializer): - - def validate_email(self, attrs, source): - attrs[source] - return attrs - - def validate_content(self, attrs, source): - value = attrs[source] - if "test" not in value: - raise serializers.ValidationError("Test not in value") - return attrs - - def test_field_validation(self): - data = { - 'email': 'tom@example.com', - 'content': 'A test comment', - 'created': datetime.datetime(2012, 1, 1) - } - - serializer = self.CommentSerializerWithFieldValidator(data=data) - self.assertTrue(serializer.is_valid()) - - data['content'] = 'This should not validate' - - serializer = self.CommentSerializerWithFieldValidator(data=data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'content': ['Test not in value']}) - - def test_missing_data(self): - """ - Make sure that validate_content isn't called if the field is missing - """ - incomplete_data = { - 'email': 'tom@example.com', - 'created': datetime.datetime(2012, 1, 1) - } - serializer = self.CommentSerializerWithFieldValidator(data=incomplete_data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'content': ['This field is required.']}) - - def test_wrong_data(self): - """ - Make sure that validate_content isn't called if the field input is wrong - """ - wrong_data = { - 'email': 'not an email', - 'content': 'A test comment', - 'created': datetime.datetime(2012, 1, 1) - } - serializer = self.CommentSerializerWithFieldValidator(data=wrong_data) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'email': ['Enter a valid email address.']}) - - def test_partial_update(self): - """ - Make sure that validate_email isn't called when partial=True and email - isn't found in data. - """ - initial_data = { - 'email': 'tom@example.com', - 'content': 'A test comment', - 'created': datetime.datetime(2012, 1, 1) - } - - serializer = self.CommentSerializerWithFieldValidator(data=initial_data) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.object - - new_content = 'An *updated* test comment' - partial_data = { - 'content': new_content - } - - serializer = self.CommentSerializerWithFieldValidator(instance=instance, - data=partial_data, - partial=True) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.object - self.assertEqual(instance.content, new_content) - - -class PositiveIntegerAsChoiceTests(TestCase): - def test_positive_integer_in_json_is_correctly_parsed(self): - data = {'some_integer': 1} - serializer = PositiveIntegerAsChoiceSerializer(data=data) - self.assertEqual(serializer.is_valid(), True) - - -class ModelValidationTests(TestCase): - def test_validate_unique(self): - """ - Just check if serializers.ModelSerializer handles unique checks via .full_clean() - """ - serializer = AlbumsSerializer(data={'title': 'a', 'ref': '1'}) - serializer.is_valid() - serializer.save() - second_serializer = AlbumsSerializer(data={'title': 'a'}) - self.assertFalse(second_serializer.is_valid()) - self.assertEqual(second_serializer.errors, {'title': ['Album with this Title already exists.']}) - third_serializer = AlbumsSerializer(data=[{'title': 'b', 'ref': '1'}, {'title': 'c'}], many=True) - self.assertFalse(third_serializer.is_valid()) - self.assertEqual(third_serializer.errors, [{'ref': ['Album with this Ref already exists.']}, {}]) - - def test_foreign_key_is_null_with_partial(self): - """ - Test ModelSerializer validation with partial=True - - Specifically test that a null foreign key does not pass validation - """ - album = Album(title='test') - album.save() - - class PhotoSerializer(serializers.ModelSerializer): - class Meta: - model = Photo - - photo_serializer = PhotoSerializer(data={'description': 'test', 'album': album.pk}) - self.assertTrue(photo_serializer.is_valid()) - photo = photo_serializer.save() - - # Updating only the album (foreign key) - photo_serializer = PhotoSerializer(instance=photo, data={'album': ''}, partial=True) - self.assertFalse(photo_serializer.is_valid()) - self.assertTrue('album' in photo_serializer.errors) - self.assertEqual(photo_serializer.errors['album'], [photo_serializer.error_messages['required']]) - - def test_foreign_key_with_partial(self): - """ - Test ModelSerializer validation with partial=True - - Specifically test foreign key validation. - """ - - album = Album(title='test') - album.save() - - class PhotoSerializer(serializers.ModelSerializer): - class Meta: - model = Photo - - photo_serializer = PhotoSerializer(data={'description': 'test', 'album': album.pk}) - self.assertTrue(photo_serializer.is_valid()) - photo = photo_serializer.save() - - # Updating only the album (foreign key) - photo_serializer = PhotoSerializer(instance=photo, data={'album': album.pk}, partial=True) - self.assertTrue(photo_serializer.is_valid()) - self.assertTrue(photo_serializer.save()) - - # Updating only the description - photo_serializer = PhotoSerializer(instance=photo, - data={'description': 'new'}, - partial=True) - - self.assertTrue(photo_serializer.is_valid()) - self.assertTrue(photo_serializer.save()) - - -class RegexValidationTest(TestCase): - def test_create_failed(self): - serializer = BookSerializer(data={'isbn': '1234567890'}) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'isbn': ['isbn has to be exact 13 numbers']}) - - serializer = BookSerializer(data={'isbn': '12345678901234'}) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'isbn': ['isbn has to be exact 13 numbers']}) - - serializer = BookSerializer(data={'isbn': 'abcdefghijklm'}) - self.assertFalse(serializer.is_valid()) - self.assertEqual(serializer.errors, {'isbn': ['isbn has to be exact 13 numbers']}) - - def test_create_success(self): - serializer = BookSerializer(data={'isbn': '1234567890123'}) - self.assertTrue(serializer.is_valid()) - - -class MetadataTests(TestCase): - def test_empty(self): - serializer = CommentSerializer() - expected = { - 'email': serializers.CharField, - 'content': serializers.CharField, - 'created': serializers.DateTimeField - } - for field_name, field in expected.items(): - self.assertTrue(isinstance(serializer.data.fields[field_name], field)) - - -class ManyToManyTests(TestCase): - def setUp(self): - class ManyToManySerializer(serializers.ModelSerializer): - class Meta: - model = ManyToManyModel - - self.serializer_class = ManyToManySerializer - - # An anchor instance to use for the relationship - self.anchor = Anchor() - self.anchor.save() - - # A model instance with a many to many relationship to the anchor - self.instance = ManyToManyModel() - self.instance.save() - self.instance.rel.add(self.anchor) - - # A serialized representation of the model instance - self.data = {'id': 1, 'rel': [self.anchor.id]} - - def test_retrieve(self): - """ - Serialize an instance of a model with a ManyToMany relationship. - """ - serializer = self.serializer_class(instance=self.instance) - expected = self.data - self.assertEqual(serializer.data, expected) - - def test_create(self): - """ - Create an instance of a model with a ManyToMany relationship. - """ - data = {'rel': [self.anchor.id]} - serializer = self.serializer_class(data=data) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - self.assertEqual(len(ManyToManyModel.objects.all()), 2) - self.assertEqual(instance.pk, 2) - self.assertEqual(list(instance.rel.all()), [self.anchor]) - - def test_update(self): - """ - Update an instance of a model with a ManyToMany relationship. - """ - new_anchor = Anchor() - new_anchor.save() - data = {'rel': [self.anchor.id, new_anchor.id]} - serializer = self.serializer_class(self.instance, data=data) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - self.assertEqual(len(ManyToManyModel.objects.all()), 1) - self.assertEqual(instance.pk, 1) - self.assertEqual(list(instance.rel.all()), [self.anchor, new_anchor]) - - def test_create_empty_relationship(self): - """ - Create an instance of a model with a ManyToMany relationship, - containing no items. - """ - data = {'rel': []} - serializer = self.serializer_class(data=data) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - self.assertEqual(len(ManyToManyModel.objects.all()), 2) - self.assertEqual(instance.pk, 2) - self.assertEqual(list(instance.rel.all()), []) - - def test_update_empty_relationship(self): - """ - Update an instance of a model with a ManyToMany relationship, - containing no items. - """ - new_anchor = Anchor() - new_anchor.save() - data = {'rel': []} - serializer = self.serializer_class(self.instance, data=data) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - self.assertEqual(len(ManyToManyModel.objects.all()), 1) - self.assertEqual(instance.pk, 1) - self.assertEqual(list(instance.rel.all()), []) - - def test_create_empty_relationship_flat_data(self): - """ - Create an instance of a model with a ManyToMany relationship, - containing no items, using a representation that does not support - lists (eg form data). - """ - data = MultiValueDict() - data.setlist('rel', ['']) - serializer = self.serializer_class(data=data) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - self.assertEqual(len(ManyToManyModel.objects.all()), 2) - self.assertEqual(instance.pk, 2) - self.assertEqual(list(instance.rel.all()), []) - - -class ReadOnlyManyToManyTests(TestCase): - def setUp(self): - class ReadOnlyManyToManySerializer(serializers.ModelSerializer): - rel = serializers.RelatedField(many=True, read_only=True) - - class Meta: - model = ReadOnlyManyToManyModel - - self.serializer_class = ReadOnlyManyToManySerializer - - # An anchor instance to use for the relationship - self.anchor = Anchor() - self.anchor.save() - - # A model instance with a many to many relationship to the anchor - self.instance = ReadOnlyManyToManyModel() - self.instance.save() - self.instance.rel.add(self.anchor) - - # A serialized representation of the model instance - self.data = {'rel': [self.anchor.id], 'id': 1, 'text': 'anchor'} - - def test_update(self): - """ - Attempt to update an instance of a model with a ManyToMany - relationship. Not updated due to read_only=True - """ - new_anchor = Anchor() - new_anchor.save() - data = {'rel': [self.anchor.id, new_anchor.id]} - serializer = self.serializer_class(self.instance, data=data) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - self.assertEqual(len(ReadOnlyManyToManyModel.objects.all()), 1) - self.assertEqual(instance.pk, 1) - # rel is still as original (1 entry) - self.assertEqual(list(instance.rel.all()), [self.anchor]) - - def test_update_without_relationship(self): - """ - Attempt to update an instance of a model where many to ManyToMany - relationship is not supplied. Not updated due to read_only=True - """ - new_anchor = Anchor() - new_anchor.save() - data = {} - serializer = self.serializer_class(self.instance, data=data) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - self.assertEqual(len(ReadOnlyManyToManyModel.objects.all()), 1) - self.assertEqual(instance.pk, 1) - # rel is still as original (1 entry) - self.assertEqual(list(instance.rel.all()), [self.anchor]) - - -class DefaultValueTests(TestCase): - def setUp(self): - class DefaultValueSerializer(serializers.ModelSerializer): - class Meta: - model = DefaultValueModel - - self.serializer_class = DefaultValueSerializer - self.objects = DefaultValueModel.objects - - def test_create_using_default(self): - data = {} - serializer = self.serializer_class(data=data) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - self.assertEqual(len(self.objects.all()), 1) - self.assertEqual(instance.pk, 1) - self.assertEqual(instance.text, 'foobar') - - def test_create_overriding_default(self): - data = {'text': 'overridden'} - serializer = self.serializer_class(data=data) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - self.assertEqual(len(self.objects.all()), 1) - self.assertEqual(instance.pk, 1) - self.assertEqual(instance.text, 'overridden') - - def test_partial_update_default(self): - """ Regression test for issue #532 """ - data = {'text': 'overridden'} - serializer = self.serializer_class(data=data, partial=True) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - - data = {'extra': 'extra_value'} - serializer = self.serializer_class(instance=instance, data=data, partial=True) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - - self.assertEqual(instance.extra, 'extra_value') - self.assertEqual(instance.text, 'overridden') - - -class WritableFieldDefaultValueTests(TestCase): - - def setUp(self): - self.expected = {'default': 'value'} - self.create_field = fields.WritableField - - def test_get_default_value_with_noncallable(self): - field = self.create_field(default=self.expected) - got = field.get_default_value() - self.assertEqual(got, self.expected) - - def test_get_default_value_with_callable(self): - field = self.create_field(default=lambda: self.expected) - got = field.get_default_value() - self.assertEqual(got, self.expected) - - def test_get_default_value_when_not_required(self): - field = self.create_field(default=self.expected, required=False) - got = field.get_default_value() - self.assertEqual(got, self.expected) - - def test_get_default_value_returns_None(self): - field = self.create_field() - got = field.get_default_value() - self.assertIsNone(got) - - def test_get_default_value_returns_non_True_values(self): - values = [None, '', False, 0, [], (), {}] # values that assumed as 'False' in the 'if' clause - for expected in values: - field = self.create_field(default=expected) - got = field.get_default_value() - self.assertEqual(got, expected) - - -class RelatedFieldDefaultValueTests(WritableFieldDefaultValueTests): - - def setUp(self): - self.expected = {'foo': 'bar'} - self.create_field = relations.RelatedField - - def test_get_default_value_returns_empty_list(self): - field = self.create_field(many=True) - got = field.get_default_value() - self.assertListEqual(got, []) - - def test_get_default_value_returns_expected(self): - expected = [1, 2, 3] - field = self.create_field(many=True, default=expected) - got = field.get_default_value() - self.assertListEqual(got, expected) - - -class CallableDefaultValueTests(TestCase): - def setUp(self): - class CallableDefaultValueSerializer(serializers.ModelSerializer): - class Meta: - model = CallableDefaultValueModel - - self.serializer_class = CallableDefaultValueSerializer - self.objects = CallableDefaultValueModel.objects - - def test_create_using_default(self): - data = {} - serializer = self.serializer_class(data=data) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - self.assertEqual(len(self.objects.all()), 1) - self.assertEqual(instance.pk, 1) - self.assertEqual(instance.text, 'foobar') - - def test_create_overriding_default(self): - data = {'text': 'overridden'} - serializer = self.serializer_class(data=data) - self.assertEqual(serializer.is_valid(), True) - instance = serializer.save() - self.assertEqual(len(self.objects.all()), 1) - self.assertEqual(instance.pk, 1) - self.assertEqual(instance.text, 'overridden') - - -class ManyRelatedTests(TestCase): - def test_reverse_relations(self): - post = BlogPost.objects.create(title="Test blog post") - post.blogpostcomment_set.create(text="I hate this blog post") - post.blogpostcomment_set.create(text="I love this blog post") - - class BlogPostCommentSerializer(serializers.Serializer): - text = serializers.CharField() - - class BlogPostSerializer(serializers.Serializer): - title = serializers.CharField() - comments = BlogPostCommentSerializer(source='blogpostcomment_set') - - serializer = BlogPostSerializer(instance=post) - expected = { - 'title': 'Test blog post', - 'comments': [ - {'text': 'I hate this blog post'}, - {'text': 'I love this blog post'} - ] - } - - self.assertEqual(serializer.data, expected) - - def test_include_reverse_relations(self): - post = BlogPost.objects.create(title="Test blog post") - post.blogpostcomment_set.create(text="I hate this blog post") - post.blogpostcomment_set.create(text="I love this blog post") - - class BlogPostSerializer(serializers.ModelSerializer): - class Meta: - model = BlogPost - fields = ('id', 'title', 'blogpostcomment_set') - - serializer = BlogPostSerializer(instance=post) - expected = { - 'id': 1, 'title': 'Test blog post', 'blogpostcomment_set': [1, 2] - } - self.assertEqual(serializer.data, expected) - - def test_depth_include_reverse_relations(self): - post = BlogPost.objects.create(title="Test blog post") - post.blogpostcomment_set.create(text="I hate this blog post") - post.blogpostcomment_set.create(text="I love this blog post") - - class BlogPostSerializer(serializers.ModelSerializer): - class Meta: - model = BlogPost - fields = ('id', 'title', 'blogpostcomment_set') - depth = 1 - - serializer = BlogPostSerializer(instance=post) - expected = { - 'id': 1, 'title': 'Test blog post', - 'blogpostcomment_set': [ - {'id': 1, 'text': 'I hate this blog post', 'blog_post': 1}, - {'id': 2, 'text': 'I love this blog post', 'blog_post': 1} - ] - } - self.assertEqual(serializer.data, expected) - - def test_callable_source(self): - post = BlogPost.objects.create(title="Test blog post") - post.blogpostcomment_set.create(text="I love this blog post") - - class BlogPostCommentSerializer(serializers.Serializer): - text = serializers.CharField() - - class BlogPostSerializer(serializers.Serializer): - title = serializers.CharField() - first_comment = BlogPostCommentSerializer(source='get_first_comment') - - serializer = BlogPostSerializer(post) - - expected = { - 'title': 'Test blog post', - 'first_comment': {'text': 'I love this blog post'} - } - self.assertEqual(serializer.data, expected) - - -class RelatedTraversalTest(TestCase): - def test_nested_traversal(self): - """ - Source argument should support dotted.source notation. - """ - user = Person.objects.create(name="django") - post = BlogPost.objects.create(title="Test blog post", writer=user) - post.blogpostcomment_set.create(text="I love this blog post") +# class BasicTests(TestCase): +# def setUp(self): +# self.comment = Comment( +# 'tom@example.com', +# 'Happy new year!', +# datetime.datetime(2012, 1, 1) +# ) +# self.actionitem = ActionItem(title='Some to do item',) +# self.data = { +# 'email': 'tom@example.com', +# 'content': 'Happy new year!', +# 'created': datetime.datetime(2012, 1, 1), +# 'sub_comment': 'This wont change' +# } +# self.expected = { +# 'email': 'tom@example.com', +# 'content': 'Happy new year!', +# 'created': datetime.datetime(2012, 1, 1), +# 'sub_comment': 'And Merry Christmas!' +# } +# self.person_data = {'name': 'dwight', 'age': 35} +# self.person = Person(**self.person_data) +# self.person.save() + +# def test_empty(self): +# serializer = CommentSerializer() +# expected = { +# 'email': '', +# 'content': '', +# 'created': None +# } +# self.assertEqual(serializer.data, expected) + +# def test_retrieve(self): +# serializer = CommentSerializer(self.comment) +# self.assertEqual(serializer.data, self.expected) + +# def test_create(self): +# serializer = CommentSerializer(data=self.data) +# expected = self.comment +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.object, expected) +# self.assertFalse(serializer.object is expected) +# self.assertEqual(serializer.data['sub_comment'], 'And Merry Christmas!') + +# def test_create_nested(self): +# """Test a serializer with nested data.""" +# names = {'first': 'John', 'last': 'Doe', 'initials': 'jd'} +# data = {'ssn': '1234567890', 'names': names} +# serializer = PersonIdentifierSerializer(data=data) + +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.object, data) +# self.assertFalse(serializer.object is data) +# self.assertEqual(serializer.data['names'], names) + +# def test_create_partial_nested(self): +# """Test a serializer with nested data which has missing fields.""" +# names = {'first': 'John'} +# data = {'ssn': '1234567890', 'names': names} +# serializer = PersonIdentifierSerializer(data=data) + +# expected_names = {'first': 'John', 'last': '', 'initials': ''} +# data['names'] = expected_names + +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.object, data) +# self.assertFalse(serializer.object is expected_names) +# self.assertEqual(serializer.data['names'], expected_names) + +# def test_null_nested(self): +# """Test a serializer with a nonexistent nested field""" +# data = {'ssn': '1234567890'} +# serializer = PersonIdentifierSerializer(data=data) + +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.object, data) +# self.assertFalse(serializer.object is data) +# expected = {'ssn': '1234567890', 'names': None} +# self.assertEqual(serializer.data, expected) + +# def test_update(self): +# serializer = CommentSerializer(self.comment, data=self.data) +# expected = self.comment +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.object, expected) +# self.assertTrue(serializer.object is expected) +# self.assertEqual(serializer.data['sub_comment'], 'And Merry Christmas!') + +# def test_partial_update(self): +# msg = 'Merry New Year!' +# partial_data = {'content': msg} +# serializer = CommentSerializer(self.comment, data=partial_data) +# self.assertEqual(serializer.is_valid(), False) +# serializer = CommentSerializer(self.comment, data=partial_data, partial=True) +# expected = self.comment +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.object, expected) +# self.assertTrue(serializer.object is expected) +# self.assertEqual(serializer.data['content'], msg) + +# def test_model_fields_as_expected(self): +# """ +# Make sure that the fields returned are the same as defined +# in the Meta data +# """ +# serializer = PersonSerializer(self.person) +# self.assertEqual( +# set(serializer.data.keys()), +# set(['name', 'age', 'info']) +# ) + +# def test_field_with_dictionary(self): +# """ +# Make sure that dictionaries from fields are left intact +# """ +# serializer = PersonSerializer(self.person) +# expected = self.person_data +# self.assertEqual(serializer.data['info'], expected) + +# def test_read_only_fields(self): +# """ +# Attempting to update fields set as read_only should have no effect. +# """ +# serializer = PersonSerializer(self.person, data={'name': 'dwight', 'age': 99}) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() +# self.assertEqual(serializer.errors, {}) +# # Assert age is unchanged (35) +# self.assertEqual(instance.age, self.person_data['age']) + +# def test_invalid_read_only_fields(self): +# """ +# Regression test for #652. +# """ +# self.assertRaises(AssertionError, PersonSerializerInvalidReadOnly, []) + +# def test_serializer_data_is_cleared_on_save(self): +# """ +# Check _data attribute is cleared on `save()` + +# Regression test for #1116 +# — id field is not populated if `data` is accessed prior to `save()` +# """ +# serializer = ActionItemSerializer(self.actionitem) +# self.assertIsNone(serializer.data.get('id', None), 'New instance. `id` should not be set.') +# serializer.save() +# self.assertIsNotNone(serializer.data.get('id', None), 'Model is saved. `id` should be set.') + +# def test_fields_marked_as_not_required_are_excluded_from_validation(self): +# """ +# Check that fields with `required=False` are included in list of exclusions. +# """ +# serializer = ActionItemSerializerOptionalFields(self.actionitem) +# exclusions = serializer.get_validation_exclusions() +# self.assertTrue('title' in exclusions, '`title` field was marked `required=False` and should be excluded') + + +# class DictStyleSerializer(serializers.Serializer): +# """ +# Note that we don't have any `restore_object` method, so the default +# case of simply returning a dict will apply. +# """ +# email = serializers.EmailField() + + +# class DictStyleSerializerTests(TestCase): +# def test_dict_style_deserialize(self): +# """ +# Ensure serializers can deserialize into a dict. +# """ +# data = {'email': 'foo@example.com'} +# serializer = DictStyleSerializer(data=data) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.data, data) + +# def test_dict_style_serialize(self): +# """ +# Ensure serializers can serialize dict objects. +# """ +# data = {'email': 'foo@example.com'} +# serializer = DictStyleSerializer(data) +# self.assertEqual(serializer.data, data) + + +# class ValidationTests(TestCase): +# def setUp(self): +# self.comment = Comment( +# 'tom@example.com', +# 'Happy new year!', +# datetime.datetime(2012, 1, 1) +# ) +# self.data = { +# 'email': 'tom@example.com', +# 'content': 'x' * 1001, +# 'created': datetime.datetime(2012, 1, 1) +# } +# self.actionitem = ActionItem(title='Some to do item',) + +# def test_create(self): +# serializer = CommentSerializer(data=self.data) +# self.assertEqual(serializer.is_valid(), False) +# self.assertEqual(serializer.errors, {'content': ['Ensure this value has at most 1000 characters (it has 1001).']}) + +# def test_update(self): +# serializer = CommentSerializer(self.comment, data=self.data) +# self.assertEqual(serializer.is_valid(), False) +# self.assertEqual(serializer.errors, {'content': ['Ensure this value has at most 1000 characters (it has 1001).']}) + +# def test_update_missing_field(self): +# data = { +# 'content': 'xxx', +# 'created': datetime.datetime(2012, 1, 1) +# } +# serializer = CommentSerializer(self.comment, data=data) +# self.assertEqual(serializer.is_valid(), False) +# self.assertEqual(serializer.errors, {'email': ['This field is required.']}) + +# def test_missing_bool_with_default(self): +# """Make sure that a boolean value with a 'False' value is not +# mistaken for not having a default.""" +# data = { +# 'title': 'Some action item', +# # No 'done' value. +# } +# serializer = ActionItemSerializer(self.actionitem, data=data) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.errors, {}) + +# def test_cross_field_validation(self): + +# class CommentSerializerWithCrossFieldValidator(CommentSerializer): + +# def validate(self, attrs): +# if attrs["email"] not in attrs["content"]: +# raise serializers.ValidationError("Email address not in content") +# return attrs + +# data = { +# 'email': 'tom@example.com', +# 'content': 'A comment from tom@example.com', +# 'created': datetime.datetime(2012, 1, 1) +# } + +# serializer = CommentSerializerWithCrossFieldValidator(data=data) +# self.assertTrue(serializer.is_valid()) + +# data['content'] = 'A comment from foo@bar.com' + +# serializer = CommentSerializerWithCrossFieldValidator(data=data) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'non_field_errors': ['Email address not in content']}) + +# def test_null_is_true_fields(self): +# """ +# Omitting a value for null-field should validate. +# """ +# serializer = PersonSerializer(data={'name': 'marko'}) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.errors, {}) + +# def test_modelserializer_max_length_exceeded(self): +# data = { +# 'title': 'x' * 201, +# } +# serializer = ActionItemSerializer(data=data) +# self.assertEqual(serializer.is_valid(), False) +# self.assertEqual(serializer.errors, {'title': ['Ensure this value has at most 200 characters (it has 201).']}) + +# def test_modelserializer_max_length_exceeded_with_custom_restore(self): +# """ +# When overriding ModelSerializer.restore_object, validation tests should still apply. +# Regression test for #623. + +# https://github.com/tomchristie/django-rest-framework/pull/623 +# """ +# data = { +# 'title': 'x' * 201, +# } +# serializer = ActionItemSerializerCustomRestore(data=data) +# self.assertEqual(serializer.is_valid(), False) +# self.assertEqual(serializer.errors, {'title': ['Ensure this value has at most 200 characters (it has 201).']}) + +# def test_default_modelfield_max_length_exceeded(self): +# data = { +# 'title': 'Testing "info" field...', +# 'info': 'x' * 13, +# } +# serializer = ActionItemSerializer(data=data) +# self.assertEqual(serializer.is_valid(), False) +# self.assertEqual(serializer.errors, {'info': ['Ensure this value has at most 12 characters (it has 13).']}) + +# def test_datetime_validation_failure(self): +# """ +# Test DateTimeField validation errors on non-str values. +# Regression test for #669. + +# https://github.com/tomchristie/django-rest-framework/issues/669 +# """ +# data = self.data +# data['created'] = 0 + +# serializer = CommentSerializer(data=data) +# self.assertEqual(serializer.is_valid(), False) + +# self.assertIn('created', serializer.errors) + +# def test_missing_model_field_exception_msg(self): +# """ +# Assert that a meaningful exception message is outputted when the model +# field is missing (e.g. when mistyping ``model``). +# """ +# class BrokenModelSerializer(serializers.ModelSerializer): +# class Meta: +# fields = ['some_field'] + +# try: +# BrokenModelSerializer() +# except AssertionError as e: +# self.assertEqual(e.args[0], "Serializer class 'BrokenModelSerializer' is missing 'model' Meta option") +# except: +# self.fail('Wrong exception type thrown.') + +# def test_writable_star_source_on_nested_serializer(self): +# """ +# Assert that a nested serializer instantiated with source='*' correctly +# expands the data into the outer serializer. +# """ +# serializer = ModelSerializerWithNestedSerializer(data={ +# 'name': 'marko', +# 'nested': {'info': 'hi'}}, +# ) +# self.assertEqual(serializer.is_valid(), True) + +# def test_writable_star_source_on_nested_serializer_with_parent_object(self): +# class TitleSerializer(serializers.Serializer): +# title = serializers.WritableField(source='title') + +# class AlbumSerializer(serializers.ModelSerializer): +# nested = TitleSerializer(source='*') + +# class Meta: +# model = Album +# fields = ('nested',) + +# class PhotoSerializer(serializers.ModelSerializer): +# album = AlbumSerializer(source='album') + +# class Meta: +# model = Photo +# fields = ('album', ) + +# photo = Photo(album=Album()) + +# data = {'album': {'nested': {'title': 'test'}}} + +# serializer = PhotoSerializer(photo, data=data) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.data, data) + +# def test_writable_star_source_with_inner_source_fields(self): +# """ +# Tests that a serializer with source="*" correctly expands the +# it's fields into the outer serializer even if they have their +# own 'source' parameters. +# """ + +# serializer = ModelSerializerWithNestedSerializerWithRenamedField(data={ +# 'name': 'marko', +# 'nested': {'renamed_info': 'hi'}}, +# ) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.errors, {}) + + +# class CustomValidationTests(TestCase): +# class CommentSerializerWithFieldValidator(CommentSerializer): + +# def validate_email(self, attrs, source): +# attrs[source] +# return attrs + +# def validate_content(self, attrs, source): +# value = attrs[source] +# if "test" not in value: +# raise serializers.ValidationError("Test not in value") +# return attrs + +# def test_field_validation(self): +# data = { +# 'email': 'tom@example.com', +# 'content': 'A test comment', +# 'created': datetime.datetime(2012, 1, 1) +# } + +# serializer = self.CommentSerializerWithFieldValidator(data=data) +# self.assertTrue(serializer.is_valid()) + +# data['content'] = 'This should not validate' + +# serializer = self.CommentSerializerWithFieldValidator(data=data) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'content': ['Test not in value']}) + +# def test_missing_data(self): +# """ +# Make sure that validate_content isn't called if the field is missing +# """ +# incomplete_data = { +# 'email': 'tom@example.com', +# 'created': datetime.datetime(2012, 1, 1) +# } +# serializer = self.CommentSerializerWithFieldValidator(data=incomplete_data) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'content': ['This field is required.']}) + +# def test_wrong_data(self): +# """ +# Make sure that validate_content isn't called if the field input is wrong +# """ +# wrong_data = { +# 'email': 'not an email', +# 'content': 'A test comment', +# 'created': datetime.datetime(2012, 1, 1) +# } +# serializer = self.CommentSerializerWithFieldValidator(data=wrong_data) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'email': ['Enter a valid email address.']}) + +# def test_partial_update(self): +# """ +# Make sure that validate_email isn't called when partial=True and email +# isn't found in data. +# """ +# initial_data = { +# 'email': 'tom@example.com', +# 'content': 'A test comment', +# 'created': datetime.datetime(2012, 1, 1) +# } + +# serializer = self.CommentSerializerWithFieldValidator(data=initial_data) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.object + +# new_content = 'An *updated* test comment' +# partial_data = { +# 'content': new_content +# } + +# serializer = self.CommentSerializerWithFieldValidator(instance=instance, +# data=partial_data, +# partial=True) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.object +# self.assertEqual(instance.content, new_content) + + +# class PositiveIntegerAsChoiceTests(TestCase): +# def test_positive_integer_in_json_is_correctly_parsed(self): +# data = {'some_integer': 1} +# serializer = PositiveIntegerAsChoiceSerializer(data=data) +# self.assertEqual(serializer.is_valid(), True) + + +# class ModelValidationTests(TestCase): +# def test_validate_unique(self): +# """ +# Just check if serializers.ModelSerializer handles unique checks via .full_clean() +# """ +# serializer = AlbumsSerializer(data={'title': 'a', 'ref': '1'}) +# serializer.is_valid() +# serializer.save() +# second_serializer = AlbumsSerializer(data={'title': 'a'}) +# self.assertFalse(second_serializer.is_valid()) +# self.assertEqual(second_serializer.errors, {'title': ['Album with this Title already exists.']}) +# third_serializer = AlbumsSerializer(data=[{'title': 'b', 'ref': '1'}, {'title': 'c'}], many=True) +# self.assertFalse(third_serializer.is_valid()) +# self.assertEqual(third_serializer.errors, [{'ref': ['Album with this Ref already exists.']}, {}]) + +# def test_foreign_key_is_null_with_partial(self): +# """ +# Test ModelSerializer validation with partial=True + +# Specifically test that a null foreign key does not pass validation +# """ +# album = Album(title='test') +# album.save() + +# class PhotoSerializer(serializers.ModelSerializer): +# class Meta: +# model = Photo + +# photo_serializer = PhotoSerializer(data={'description': 'test', 'album': album.pk}) +# self.assertTrue(photo_serializer.is_valid()) +# photo = photo_serializer.save() + +# # Updating only the album (foreign key) +# photo_serializer = PhotoSerializer(instance=photo, data={'album': ''}, partial=True) +# self.assertFalse(photo_serializer.is_valid()) +# self.assertTrue('album' in photo_serializer.errors) +# self.assertEqual(photo_serializer.errors['album'], [photo_serializer.error_messages['required']]) + +# def test_foreign_key_with_partial(self): +# """ +# Test ModelSerializer validation with partial=True + +# Specifically test foreign key validation. +# """ + +# album = Album(title='test') +# album.save() + +# class PhotoSerializer(serializers.ModelSerializer): +# class Meta: +# model = Photo + +# photo_serializer = PhotoSerializer(data={'description': 'test', 'album': album.pk}) +# self.assertTrue(photo_serializer.is_valid()) +# photo = photo_serializer.save() + +# # Updating only the album (foreign key) +# photo_serializer = PhotoSerializer(instance=photo, data={'album': album.pk}, partial=True) +# self.assertTrue(photo_serializer.is_valid()) +# self.assertTrue(photo_serializer.save()) + +# # Updating only the description +# photo_serializer = PhotoSerializer(instance=photo, +# data={'description': 'new'}, +# partial=True) + +# self.assertTrue(photo_serializer.is_valid()) +# self.assertTrue(photo_serializer.save()) + + +# class RegexValidationTest(TestCase): +# def test_create_failed(self): +# serializer = BookSerializer(data={'isbn': '1234567890'}) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'isbn': ['isbn has to be exact 13 numbers']}) + +# serializer = BookSerializer(data={'isbn': '12345678901234'}) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'isbn': ['isbn has to be exact 13 numbers']}) + +# serializer = BookSerializer(data={'isbn': 'abcdefghijklm'}) +# self.assertFalse(serializer.is_valid()) +# self.assertEqual(serializer.errors, {'isbn': ['isbn has to be exact 13 numbers']}) + +# def test_create_success(self): +# serializer = BookSerializer(data={'isbn': '1234567890123'}) +# self.assertTrue(serializer.is_valid()) + + +# class MetadataTests(TestCase): +# def test_empty(self): +# serializer = CommentSerializer() +# expected = { +# 'email': serializers.CharField, +# 'content': serializers.CharField, +# 'created': serializers.DateTimeField +# } +# for field_name, field in expected.items(): +# self.assertTrue(isinstance(serializer.data.fields[field_name], field)) + + +# class ManyToManyTests(TestCase): +# def setUp(self): +# class ManyToManySerializer(serializers.ModelSerializer): +# class Meta: +# model = ManyToManyModel + +# self.serializer_class = ManyToManySerializer + +# # An anchor instance to use for the relationship +# self.anchor = Anchor() +# self.anchor.save() + +# # A model instance with a many to many relationship to the anchor +# self.instance = ManyToManyModel() +# self.instance.save() +# self.instance.rel.add(self.anchor) + +# # A serialized representation of the model instance +# self.data = {'id': 1, 'rel': [self.anchor.id]} + +# def test_retrieve(self): +# """ +# Serialize an instance of a model with a ManyToMany relationship. +# """ +# serializer = self.serializer_class(instance=self.instance) +# expected = self.data +# self.assertEqual(serializer.data, expected) + +# def test_create(self): +# """ +# Create an instance of a model with a ManyToMany relationship. +# """ +# data = {'rel': [self.anchor.id]} +# serializer = self.serializer_class(data=data) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() +# self.assertEqual(len(ManyToManyModel.objects.all()), 2) +# self.assertEqual(instance.pk, 2) +# self.assertEqual(list(instance.rel.all()), [self.anchor]) + +# def test_update(self): +# """ +# Update an instance of a model with a ManyToMany relationship. +# """ +# new_anchor = Anchor() +# new_anchor.save() +# data = {'rel': [self.anchor.id, new_anchor.id]} +# serializer = self.serializer_class(self.instance, data=data) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() +# self.assertEqual(len(ManyToManyModel.objects.all()), 1) +# self.assertEqual(instance.pk, 1) +# self.assertEqual(list(instance.rel.all()), [self.anchor, new_anchor]) + +# def test_create_empty_relationship(self): +# """ +# Create an instance of a model with a ManyToMany relationship, +# containing no items. +# """ +# data = {'rel': []} +# serializer = self.serializer_class(data=data) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() +# self.assertEqual(len(ManyToManyModel.objects.all()), 2) +# self.assertEqual(instance.pk, 2) +# self.assertEqual(list(instance.rel.all()), []) + +# def test_update_empty_relationship(self): +# """ +# Update an instance of a model with a ManyToMany relationship, +# containing no items. +# """ +# new_anchor = Anchor() +# new_anchor.save() +# data = {'rel': []} +# serializer = self.serializer_class(self.instance, data=data) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() +# self.assertEqual(len(ManyToManyModel.objects.all()), 1) +# self.assertEqual(instance.pk, 1) +# self.assertEqual(list(instance.rel.all()), []) + +# def test_create_empty_relationship_flat_data(self): +# """ +# Create an instance of a model with a ManyToMany relationship, +# containing no items, using a representation that does not support +# lists (eg form data). +# """ +# data = MultiValueDict() +# data.setlist('rel', ['']) +# serializer = self.serializer_class(data=data) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() +# self.assertEqual(len(ManyToManyModel.objects.all()), 2) +# self.assertEqual(instance.pk, 2) +# self.assertEqual(list(instance.rel.all()), []) + + +# class ReadOnlyManyToManyTests(TestCase): +# def setUp(self): +# class ReadOnlyManyToManySerializer(serializers.ModelSerializer): +# rel = serializers.RelatedField(many=True, read_only=True) + +# class Meta: +# model = ReadOnlyManyToManyModel + +# self.serializer_class = ReadOnlyManyToManySerializer + +# # An anchor instance to use for the relationship +# self.anchor = Anchor() +# self.anchor.save() + +# # A model instance with a many to many relationship to the anchor +# self.instance = ReadOnlyManyToManyModel() +# self.instance.save() +# self.instance.rel.add(self.anchor) + +# # A serialized representation of the model instance +# self.data = {'rel': [self.anchor.id], 'id': 1, 'text': 'anchor'} + +# def test_update(self): +# """ +# Attempt to update an instance of a model with a ManyToMany +# relationship. Not updated due to read_only=True +# """ +# new_anchor = Anchor() +# new_anchor.save() +# data = {'rel': [self.anchor.id, new_anchor.id]} +# serializer = self.serializer_class(self.instance, data=data) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() +# self.assertEqual(len(ReadOnlyManyToManyModel.objects.all()), 1) +# self.assertEqual(instance.pk, 1) +# # rel is still as original (1 entry) +# self.assertEqual(list(instance.rel.all()), [self.anchor]) + +# def test_update_without_relationship(self): +# """ +# Attempt to update an instance of a model where many to ManyToMany +# relationship is not supplied. Not updated due to read_only=True +# """ +# new_anchor = Anchor() +# new_anchor.save() +# data = {} +# serializer = self.serializer_class(self.instance, data=data) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() +# self.assertEqual(len(ReadOnlyManyToManyModel.objects.all()), 1) +# self.assertEqual(instance.pk, 1) +# # rel is still as original (1 entry) +# self.assertEqual(list(instance.rel.all()), [self.anchor]) + + +# class DefaultValueTests(TestCase): +# def setUp(self): +# class DefaultValueSerializer(serializers.ModelSerializer): +# class Meta: +# model = DefaultValueModel + +# self.serializer_class = DefaultValueSerializer +# self.objects = DefaultValueModel.objects + +# def test_create_using_default(self): +# data = {} +# serializer = self.serializer_class(data=data) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() +# self.assertEqual(len(self.objects.all()), 1) +# self.assertEqual(instance.pk, 1) +# self.assertEqual(instance.text, 'foobar') + +# def test_create_overriding_default(self): +# data = {'text': 'overridden'} +# serializer = self.serializer_class(data=data) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() +# self.assertEqual(len(self.objects.all()), 1) +# self.assertEqual(instance.pk, 1) +# self.assertEqual(instance.text, 'overridden') + +# def test_partial_update_default(self): +# """ Regression test for issue #532 """ +# data = {'text': 'overridden'} +# serializer = self.serializer_class(data=data, partial=True) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() + +# data = {'extra': 'extra_value'} +# serializer = self.serializer_class(instance=instance, data=data, partial=True) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() + +# self.assertEqual(instance.extra, 'extra_value') +# self.assertEqual(instance.text, 'overridden') + + +# class WritableFieldDefaultValueTests(TestCase): + +# def setUp(self): +# self.expected = {'default': 'value'} +# self.create_field = fields.WritableField + +# def test_get_default_value_with_noncallable(self): +# field = self.create_field(default=self.expected) +# got = field.get_default_value() +# self.assertEqual(got, self.expected) + +# def test_get_default_value_with_callable(self): +# field = self.create_field(default=lambda: self.expected) +# got = field.get_default_value() +# self.assertEqual(got, self.expected) + +# def test_get_default_value_when_not_required(self): +# field = self.create_field(default=self.expected, required=False) +# got = field.get_default_value() +# self.assertEqual(got, self.expected) + +# def test_get_default_value_returns_None(self): +# field = self.create_field() +# got = field.get_default_value() +# self.assertIsNone(got) + +# def test_get_default_value_returns_non_True_values(self): +# values = [None, '', False, 0, [], (), {}] # values that assumed as 'False' in the 'if' clause +# for expected in values: +# field = self.create_field(default=expected) +# got = field.get_default_value() +# self.assertEqual(got, expected) + + +# class RelatedFieldDefaultValueTests(WritableFieldDefaultValueTests): + +# def setUp(self): +# self.expected = {'foo': 'bar'} +# self.create_field = relations.RelatedField + +# def test_get_default_value_returns_empty_list(self): +# field = self.create_field(many=True) +# got = field.get_default_value() +# self.assertListEqual(got, []) + +# def test_get_default_value_returns_expected(self): +# expected = [1, 2, 3] +# field = self.create_field(many=True, default=expected) +# got = field.get_default_value() +# self.assertListEqual(got, expected) + + +# class CallableDefaultValueTests(TestCase): +# def setUp(self): +# class CallableDefaultValueSerializer(serializers.ModelSerializer): +# class Meta: +# model = CallableDefaultValueModel + +# self.serializer_class = CallableDefaultValueSerializer +# self.objects = CallableDefaultValueModel.objects + +# def test_create_using_default(self): +# data = {} +# serializer = self.serializer_class(data=data) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() +# self.assertEqual(len(self.objects.all()), 1) +# self.assertEqual(instance.pk, 1) +# self.assertEqual(instance.text, 'foobar') + +# def test_create_overriding_default(self): +# data = {'text': 'overridden'} +# serializer = self.serializer_class(data=data) +# self.assertEqual(serializer.is_valid(), True) +# instance = serializer.save() +# self.assertEqual(len(self.objects.all()), 1) +# self.assertEqual(instance.pk, 1) +# self.assertEqual(instance.text, 'overridden') + + +# class ManyRelatedTests(TestCase): +# def test_reverse_relations(self): +# post = BlogPost.objects.create(title="Test blog post") +# post.blogpostcomment_set.create(text="I hate this blog post") +# post.blogpostcomment_set.create(text="I love this blog post") + +# class BlogPostCommentSerializer(serializers.Serializer): +# text = serializers.CharField() + +# class BlogPostSerializer(serializers.Serializer): +# title = serializers.CharField() +# comments = BlogPostCommentSerializer(source='blogpostcomment_set') + +# serializer = BlogPostSerializer(instance=post) +# expected = { +# 'title': 'Test blog post', +# 'comments': [ +# {'text': 'I hate this blog post'}, +# {'text': 'I love this blog post'} +# ] +# } + +# self.assertEqual(serializer.data, expected) + +# def test_include_reverse_relations(self): +# post = BlogPost.objects.create(title="Test blog post") +# post.blogpostcomment_set.create(text="I hate this blog post") +# post.blogpostcomment_set.create(text="I love this blog post") + +# class BlogPostSerializer(serializers.ModelSerializer): +# class Meta: +# model = BlogPost +# fields = ('id', 'title', 'blogpostcomment_set') + +# serializer = BlogPostSerializer(instance=post) +# expected = { +# 'id': 1, 'title': 'Test blog post', 'blogpostcomment_set': [1, 2] +# } +# self.assertEqual(serializer.data, expected) + +# def test_depth_include_reverse_relations(self): +# post = BlogPost.objects.create(title="Test blog post") +# post.blogpostcomment_set.create(text="I hate this blog post") +# post.blogpostcomment_set.create(text="I love this blog post") + +# class BlogPostSerializer(serializers.ModelSerializer): +# class Meta: +# model = BlogPost +# fields = ('id', 'title', 'blogpostcomment_set') +# depth = 1 + +# serializer = BlogPostSerializer(instance=post) +# expected = { +# 'id': 1, 'title': 'Test blog post', +# 'blogpostcomment_set': [ +# {'id': 1, 'text': 'I hate this blog post', 'blog_post': 1}, +# {'id': 2, 'text': 'I love this blog post', 'blog_post': 1} +# ] +# } +# self.assertEqual(serializer.data, expected) + +# def test_callable_source(self): +# post = BlogPost.objects.create(title="Test blog post") +# post.blogpostcomment_set.create(text="I love this blog post") + +# class BlogPostCommentSerializer(serializers.Serializer): +# text = serializers.CharField() + +# class BlogPostSerializer(serializers.Serializer): +# title = serializers.CharField() +# first_comment = BlogPostCommentSerializer(source='get_first_comment') + +# serializer = BlogPostSerializer(post) + +# expected = { +# 'title': 'Test blog post', +# 'first_comment': {'text': 'I love this blog post'} +# } +# self.assertEqual(serializer.data, expected) + + +# class RelatedTraversalTest(TestCase): +# def test_nested_traversal(self): +# """ +# Source argument should support dotted.source notation. +# """ +# user = Person.objects.create(name="django") +# post = BlogPost.objects.create(title="Test blog post", writer=user) +# post.blogpostcomment_set.create(text="I love this blog post") - class PersonSerializer(serializers.ModelSerializer): - class Meta: - model = Person - fields = ("name", "age") +# class PersonSerializer(serializers.ModelSerializer): +# class Meta: +# model = Person +# fields = ("name", "age") - class BlogPostCommentSerializer(serializers.ModelSerializer): - class Meta: - model = BlogPostComment - fields = ("text", "post_owner") +# class BlogPostCommentSerializer(serializers.ModelSerializer): +# class Meta: +# model = BlogPostComment +# fields = ("text", "post_owner") - text = serializers.CharField() - post_owner = PersonSerializer(source='blog_post.writer') +# text = serializers.CharField() +# post_owner = PersonSerializer(source='blog_post.writer') - class BlogPostSerializer(serializers.Serializer): - title = serializers.CharField() - comments = BlogPostCommentSerializer(source='blogpostcomment_set') +# class BlogPostSerializer(serializers.Serializer): +# title = serializers.CharField() +# comments = BlogPostCommentSerializer(source='blogpostcomment_set') - serializer = BlogPostSerializer(instance=post) +# serializer = BlogPostSerializer(instance=post) - expected = { - 'title': 'Test blog post', - 'comments': [{ - 'text': 'I love this blog post', - 'post_owner': { - "name": "django", - "age": None - } - }] - } - - self.assertEqual(serializer.data, expected) +# expected = { +# 'title': 'Test blog post', +# 'comments': [{ +# 'text': 'I love this blog post', +# 'post_owner': { +# "name": "django", +# "age": None +# } +# }] +# } + +# self.assertEqual(serializer.data, expected) - def test_nested_traversal_with_none(self): - """ - If a component of the dotted.source is None, return None for the field. - """ - from tests.models import NullableForeignKeySource - instance = NullableForeignKeySource.objects.create(name='Source with null FK') - - class NullableSourceSerializer(serializers.Serializer): - target_name = serializers.Field(source='target.name') - - serializer = NullableSourceSerializer(instance=instance) - - expected = { - 'target_name': None, - } - - self.assertEqual(serializer.data, expected) - - -class SerializerMethodFieldTests(TestCase): - def setUp(self): - - class BoopSerializer(serializers.Serializer): - beep = serializers.SerializerMethodField('get_beep') - boop = serializers.Field() - boop_count = serializers.SerializerMethodField('get_boop_count') - - def get_beep(self, obj): - return 'hello!' - - def get_boop_count(self, obj): - return len(obj.boop) - - self.serializer_class = BoopSerializer - - def test_serializer_method_field(self): - - class MyModel(object): - boop = ['a', 'b', 'c'] - - source_data = MyModel() - - serializer = self.serializer_class(source_data) - - expected = { - 'beep': 'hello!', - 'boop': ['a', 'b', 'c'], - 'boop_count': 3, - } - - self.assertEqual(serializer.data, expected) - - -# Test for issue #324 -class BlankFieldTests(TestCase): - def setUp(self): - - class BlankFieldModelSerializer(serializers.ModelSerializer): - class Meta: - model = BlankFieldModel - - class BlankFieldSerializer(serializers.Serializer): - title = serializers.CharField(required=False) - - class NotBlankFieldModelSerializer(serializers.ModelSerializer): - class Meta: - model = BasicModel - - class NotBlankFieldSerializer(serializers.Serializer): - title = serializers.CharField() - - self.model_serializer_class = BlankFieldModelSerializer - self.serializer_class = BlankFieldSerializer - self.not_blank_model_serializer_class = NotBlankFieldModelSerializer - self.not_blank_serializer_class = NotBlankFieldSerializer - self.data = {'title': ''} - - def test_create_blank_field(self): - serializer = self.serializer_class(data=self.data) - self.assertEqual(serializer.is_valid(), True) - - def test_create_model_blank_field(self): - serializer = self.model_serializer_class(data=self.data) - self.assertEqual(serializer.is_valid(), True) - - def test_create_model_null_field(self): - serializer = self.model_serializer_class(data={'title': None}) - self.assertEqual(serializer.is_valid(), True) - serializer.save() - self.assertIsNot(serializer.object.pk, None) - self.assertEqual(serializer.object.title, '') - - def test_create_not_blank_field(self): - """ - Test to ensure blank data in a field not marked as blank=True - is considered invalid in a non-model serializer - """ - serializer = self.not_blank_serializer_class(data=self.data) - self.assertEqual(serializer.is_valid(), False) - - def test_create_model_not_blank_field(self): - """ - Test to ensure blank data in a field not marked as blank=True - is considered invalid in a model serializer - """ - serializer = self.not_blank_model_serializer_class(data=self.data) - self.assertEqual(serializer.is_valid(), False) - - def test_create_model_empty_field(self): - serializer = self.model_serializer_class(data={}) - self.assertEqual(serializer.is_valid(), True) - - def test_create_model_null_field_save(self): - """ - Regression test for #1330. - - https://github.com/tomchristie/django-rest-framework/pull/1330 - """ - serializer = self.model_serializer_class(data={'title': None}) - self.assertEqual(serializer.is_valid(), True) - - try: - serializer.save() - except Exception: - self.fail('Exception raised on save() after validation passes') - - -# Test for issue #460 -class SerializerPickleTests(TestCase): - """ - Test pickleability of the output of Serializers - """ - def test_pickle_simple_model_serializer_data(self): - """ - Test simple serializer - """ - pickle.dumps(PersonSerializer(Person(name="Methusela", age=969)).data) - - def test_pickle_inner_serializer(self): - """ - Test pickling a serializer whose resulting .data (a SortedDictWithMetadata) will - have unpickleable meta data--in order to make sure metadata doesn't get pulled into the pickle. - See DictWithMetadata.__getstate__ - """ - class InnerPersonSerializer(serializers.ModelSerializer): - class Meta: - model = Person - fields = ('name', 'age') - pickle.dumps(InnerPersonSerializer(Person(name="Noah", age=950)).data, 0) - - def test_getstate_method_should_not_return_none(self): - """ - Regression test for #645. - """ - data = serializers.DictWithMetadata({1: 1}) - self.assertEqual(data.__getstate__(), serializers.SortedDict({1: 1})) - - def test_serializer_data_is_pickleable(self): - """ - Another regression test for #645. - """ - data = serializers.SortedDictWithMetadata({1: 1}) - repr(pickle.loads(pickle.dumps(data, 0))) - - -# test for issue #725 -class SeveralChoicesModel(models.Model): - color = models.CharField( - max_length=10, - choices=[('red', 'Red'), ('green', 'Green'), ('blue', 'Blue')], - blank=False - ) - drink = models.CharField( - max_length=10, - choices=[('beer', 'Beer'), ('wine', 'Wine'), ('cider', 'Cider')], - blank=False, - default='beer' - ) - os = models.CharField( - max_length=10, - choices=[('linux', 'Linux'), ('osx', 'OSX'), ('windows', 'Windows')], - blank=True - ) - music_genre = models.CharField( - max_length=10, - choices=[('rock', 'Rock'), ('metal', 'Metal'), ('grunge', 'Grunge')], - blank=True, - default='metal' - ) - - -class SerializerChoiceFields(TestCase): - - def setUp(self): - super(SerializerChoiceFields, self).setUp() - - class SeveralChoicesSerializer(serializers.ModelSerializer): - class Meta: - model = SeveralChoicesModel - fields = ('color', 'drink', 'os', 'music_genre') - - self.several_choices_serializer = SeveralChoicesSerializer - - def test_choices_blank_false_not_default(self): - serializer = self.several_choices_serializer() - self.assertEqual( - serializer.fields['color'].choices, - [('red', 'Red'), ('green', 'Green'), ('blue', 'Blue')] - ) - - def test_choices_blank_false_with_default(self): - serializer = self.several_choices_serializer() - self.assertEqual( - serializer.fields['drink'].choices, - [('beer', 'Beer'), ('wine', 'Wine'), ('cider', 'Cider')] - ) - - def test_choices_blank_true_not_default(self): - serializer = self.several_choices_serializer() - self.assertEqual( - serializer.fields['os'].choices, - BLANK_CHOICE_DASH + [('linux', 'Linux'), ('osx', 'OSX'), ('windows', 'Windows')] - ) - - def test_choices_blank_true_with_default(self): - serializer = self.several_choices_serializer() - self.assertEqual( - serializer.fields['music_genre'].choices, - BLANK_CHOICE_DASH + [('rock', 'Rock'), ('metal', 'Metal'), ('grunge', 'Grunge')] - ) - - -# Regression tests for #675 -class Ticket(models.Model): - assigned = models.ForeignKey( - Person, related_name='assigned_tickets') - reviewer = models.ForeignKey( - Person, blank=True, null=True, related_name='reviewed_tickets') - - -class SerializerRelatedChoicesTest(TestCase): - - def setUp(self): - super(SerializerRelatedChoicesTest, self).setUp() - - class RelatedChoicesSerializer(serializers.ModelSerializer): - class Meta: - model = Ticket - fields = ('assigned', 'reviewer') - - self.related_fields_serializer = RelatedChoicesSerializer - - def test_empty_queryset_required(self): - serializer = self.related_fields_serializer() - self.assertEqual(serializer.fields['assigned'].queryset.count(), 0) - self.assertEqual( - [x for x in serializer.fields['assigned'].widget.choices], - [] - ) - - def test_empty_queryset_not_required(self): - serializer = self.related_fields_serializer() - self.assertEqual(serializer.fields['reviewer'].queryset.count(), 0) - self.assertEqual( - [x for x in serializer.fields['reviewer'].widget.choices], - [('', '---------')] - ) - - def test_with_some_persons_required(self): - Person.objects.create(name="Lionel Messi") - Person.objects.create(name="Xavi Hernandez") - serializer = self.related_fields_serializer() - self.assertEqual(serializer.fields['assigned'].queryset.count(), 2) - self.assertEqual( - [x for x in serializer.fields['assigned'].widget.choices], - [(1, 'Person object - 1'), (2, 'Person object - 2')] - ) - - def test_with_some_persons_not_required(self): - Person.objects.create(name="Lionel Messi") - Person.objects.create(name="Xavi Hernandez") - serializer = self.related_fields_serializer() - self.assertEqual(serializer.fields['reviewer'].queryset.count(), 2) - self.assertEqual( - [x for x in serializer.fields['reviewer'].widget.choices], - [('', '---------'), (1, 'Person object - 1'), (2, 'Person object - 2')] - ) +# def test_nested_traversal_with_none(self): +# """ +# If a component of the dotted.source is None, return None for the field. +# """ +# from tests.models import NullableForeignKeySource +# instance = NullableForeignKeySource.objects.create(name='Source with null FK') + +# class NullableSourceSerializer(serializers.Serializer): +# target_name = serializers.Field(source='target.name') + +# serializer = NullableSourceSerializer(instance=instance) + +# expected = { +# 'target_name': None, +# } + +# self.assertEqual(serializer.data, expected) + + +# class SerializerMethodFieldTests(TestCase): +# def setUp(self): + +# class BoopSerializer(serializers.Serializer): +# beep = serializers.SerializerMethodField('get_beep') +# boop = serializers.Field() +# boop_count = serializers.SerializerMethodField('get_boop_count') + +# def get_beep(self, obj): +# return 'hello!' + +# def get_boop_count(self, obj): +# return len(obj.boop) + +# self.serializer_class = BoopSerializer + +# def test_serializer_method_field(self): + +# class MyModel(object): +# boop = ['a', 'b', 'c'] + +# source_data = MyModel() + +# serializer = self.serializer_class(source_data) + +# expected = { +# 'beep': 'hello!', +# 'boop': ['a', 'b', 'c'], +# 'boop_count': 3, +# } + +# self.assertEqual(serializer.data, expected) + + +# # Test for issue #324 +# class BlankFieldTests(TestCase): +# def setUp(self): + +# class BlankFieldModelSerializer(serializers.ModelSerializer): +# class Meta: +# model = BlankFieldModel + +# class BlankFieldSerializer(serializers.Serializer): +# title = serializers.CharField(required=False) + +# class NotBlankFieldModelSerializer(serializers.ModelSerializer): +# class Meta: +# model = BasicModel + +# class NotBlankFieldSerializer(serializers.Serializer): +# title = serializers.CharField() + +# self.model_serializer_class = BlankFieldModelSerializer +# self.serializer_class = BlankFieldSerializer +# self.not_blank_model_serializer_class = NotBlankFieldModelSerializer +# self.not_blank_serializer_class = NotBlankFieldSerializer +# self.data = {'title': ''} + +# def test_create_blank_field(self): +# serializer = self.serializer_class(data=self.data) +# self.assertEqual(serializer.is_valid(), True) + +# def test_create_model_blank_field(self): +# serializer = self.model_serializer_class(data=self.data) +# self.assertEqual(serializer.is_valid(), True) + +# def test_create_model_null_field(self): +# serializer = self.model_serializer_class(data={'title': None}) +# self.assertEqual(serializer.is_valid(), True) +# serializer.save() +# self.assertIsNot(serializer.object.pk, None) +# self.assertEqual(serializer.object.title, '') + +# def test_create_not_blank_field(self): +# """ +# Test to ensure blank data in a field not marked as blank=True +# is considered invalid in a non-model serializer +# """ +# serializer = self.not_blank_serializer_class(data=self.data) +# self.assertEqual(serializer.is_valid(), False) + +# def test_create_model_not_blank_field(self): +# """ +# Test to ensure blank data in a field not marked as blank=True +# is considered invalid in a model serializer +# """ +# serializer = self.not_blank_model_serializer_class(data=self.data) +# self.assertEqual(serializer.is_valid(), False) + +# def test_create_model_empty_field(self): +# serializer = self.model_serializer_class(data={}) +# self.assertEqual(serializer.is_valid(), True) + +# def test_create_model_null_field_save(self): +# """ +# Regression test for #1330. + +# https://github.com/tomchristie/django-rest-framework/pull/1330 +# """ +# serializer = self.model_serializer_class(data={'title': None}) +# self.assertEqual(serializer.is_valid(), True) + +# try: +# serializer.save() +# except Exception: +# self.fail('Exception raised on save() after validation passes') + + +# # Test for issue #460 +# class SerializerPickleTests(TestCase): +# """ +# Test pickleability of the output of Serializers +# """ +# def test_pickle_simple_model_serializer_data(self): +# """ +# Test simple serializer +# """ +# pickle.dumps(PersonSerializer(Person(name="Methusela", age=969)).data) + +# def test_pickle_inner_serializer(self): +# """ +# Test pickling a serializer whose resulting .data (a SortedDictWithMetadata) will +# have unpickleable meta data--in order to make sure metadata doesn't get pulled into the pickle. +# See DictWithMetadata.__getstate__ +# """ +# class InnerPersonSerializer(serializers.ModelSerializer): +# class Meta: +# model = Person +# fields = ('name', 'age') +# pickle.dumps(InnerPersonSerializer(Person(name="Noah", age=950)).data, 0) + +# def test_getstate_method_should_not_return_none(self): +# """ +# Regression test for #645. +# """ +# data = serializers.DictWithMetadata({1: 1}) +# self.assertEqual(data.__getstate__(), serializers.SortedDict({1: 1})) + +# def test_serializer_data_is_pickleable(self): +# """ +# Another regression test for #645. +# """ +# data = serializers.SortedDictWithMetadata({1: 1}) +# repr(pickle.loads(pickle.dumps(data, 0))) + + +# # test for issue #725 +# class SeveralChoicesModel(models.Model): +# color = models.CharField( +# max_length=10, +# choices=[('red', 'Red'), ('green', 'Green'), ('blue', 'Blue')], +# blank=False +# ) +# drink = models.CharField( +# max_length=10, +# choices=[('beer', 'Beer'), ('wine', 'Wine'), ('cider', 'Cider')], +# blank=False, +# default='beer' +# ) +# os = models.CharField( +# max_length=10, +# choices=[('linux', 'Linux'), ('osx', 'OSX'), ('windows', 'Windows')], +# blank=True +# ) +# music_genre = models.CharField( +# max_length=10, +# choices=[('rock', 'Rock'), ('metal', 'Metal'), ('grunge', 'Grunge')], +# blank=True, +# default='metal' +# ) + + +# class SerializerChoiceFields(TestCase): + +# def setUp(self): +# super(SerializerChoiceFields, self).setUp() + +# class SeveralChoicesSerializer(serializers.ModelSerializer): +# class Meta: +# model = SeveralChoicesModel +# fields = ('color', 'drink', 'os', 'music_genre') + +# self.several_choices_serializer = SeveralChoicesSerializer + +# def test_choices_blank_false_not_default(self): +# serializer = self.several_choices_serializer() +# self.assertEqual( +# serializer.fields['color'].choices, +# [('red', 'Red'), ('green', 'Green'), ('blue', 'Blue')] +# ) + +# def test_choices_blank_false_with_default(self): +# serializer = self.several_choices_serializer() +# self.assertEqual( +# serializer.fields['drink'].choices, +# [('beer', 'Beer'), ('wine', 'Wine'), ('cider', 'Cider')] +# ) + +# def test_choices_blank_true_not_default(self): +# serializer = self.several_choices_serializer() +# self.assertEqual( +# serializer.fields['os'].choices, +# BLANK_CHOICE_DASH + [('linux', 'Linux'), ('osx', 'OSX'), ('windows', 'Windows')] +# ) + +# def test_choices_blank_true_with_default(self): +# serializer = self.several_choices_serializer() +# self.assertEqual( +# serializer.fields['music_genre'].choices, +# BLANK_CHOICE_DASH + [('rock', 'Rock'), ('metal', 'Metal'), ('grunge', 'Grunge')] +# ) + + +# # Regression tests for #675 +# class Ticket(models.Model): +# assigned = models.ForeignKey( +# Person, related_name='assigned_tickets') +# reviewer = models.ForeignKey( +# Person, blank=True, null=True, related_name='reviewed_tickets') + + +# class SerializerRelatedChoicesTest(TestCase): + +# def setUp(self): +# super(SerializerRelatedChoicesTest, self).setUp() + +# class RelatedChoicesSerializer(serializers.ModelSerializer): +# class Meta: +# model = Ticket +# fields = ('assigned', 'reviewer') + +# self.related_fields_serializer = RelatedChoicesSerializer + +# def test_empty_queryset_required(self): +# serializer = self.related_fields_serializer() +# self.assertEqual(serializer.fields['assigned'].queryset.count(), 0) +# self.assertEqual( +# [x for x in serializer.fields['assigned'].widget.choices], +# [] +# ) + +# def test_empty_queryset_not_required(self): +# serializer = self.related_fields_serializer() +# self.assertEqual(serializer.fields['reviewer'].queryset.count(), 0) +# self.assertEqual( +# [x for x in serializer.fields['reviewer'].widget.choices], +# [('', '---------')] +# ) + +# def test_with_some_persons_required(self): +# Person.objects.create(name="Lionel Messi") +# Person.objects.create(name="Xavi Hernandez") +# serializer = self.related_fields_serializer() +# self.assertEqual(serializer.fields['assigned'].queryset.count(), 2) +# self.assertEqual( +# [x for x in serializer.fields['assigned'].widget.choices], +# [(1, 'Person object - 1'), (2, 'Person object - 2')] +# ) + +# def test_with_some_persons_not_required(self): +# Person.objects.create(name="Lionel Messi") +# Person.objects.create(name="Xavi Hernandez") +# serializer = self.related_fields_serializer() +# self.assertEqual(serializer.fields['reviewer'].queryset.count(), 2) +# self.assertEqual( +# [x for x in serializer.fields['reviewer'].widget.choices], +# [('', '---------'), (1, 'Person object - 1'), (2, 'Person object - 2')] +# ) -class DepthTest(TestCase): - def test_implicit_nesting(self): - - writer = Person.objects.create(name="django", age=1) - post = BlogPost.objects.create(title="Test blog post", writer=writer) - comment = BlogPostComment.objects.create(text="Test blog post comment", blog_post=post) - - class BlogPostCommentSerializer(serializers.ModelSerializer): - class Meta: - model = BlogPostComment - depth = 2 - - serializer = BlogPostCommentSerializer(instance=comment) - expected = {'id': 1, 'text': 'Test blog post comment', 'blog_post': {'id': 1, 'title': 'Test blog post', - 'writer': {'id': 1, 'name': 'django', 'age': 1}}} - - self.assertEqual(serializer.data, expected) - - def test_explicit_nesting(self): - writer = Person.objects.create(name="django", age=1) - post = BlogPost.objects.create(title="Test blog post", writer=writer) - comment = BlogPostComment.objects.create(text="Test blog post comment", blog_post=post) - - class PersonSerializer(serializers.ModelSerializer): - class Meta: - model = Person - - class BlogPostSerializer(serializers.ModelSerializer): - writer = PersonSerializer() - - class Meta: - model = BlogPost - - class BlogPostCommentSerializer(serializers.ModelSerializer): - blog_post = BlogPostSerializer() - - class Meta: - model = BlogPostComment +# class DepthTest(TestCase): +# def test_implicit_nesting(self): + +# writer = Person.objects.create(name="django", age=1) +# post = BlogPost.objects.create(title="Test blog post", writer=writer) +# comment = BlogPostComment.objects.create(text="Test blog post comment", blog_post=post) + +# class BlogPostCommentSerializer(serializers.ModelSerializer): +# class Meta: +# model = BlogPostComment +# depth = 2 + +# serializer = BlogPostCommentSerializer(instance=comment) +# expected = {'id': 1, 'text': 'Test blog post comment', 'blog_post': {'id': 1, 'title': 'Test blog post', +# 'writer': {'id': 1, 'name': 'django', 'age': 1}}} + +# self.assertEqual(serializer.data, expected) + +# def test_explicit_nesting(self): +# writer = Person.objects.create(name="django", age=1) +# post = BlogPost.objects.create(title="Test blog post", writer=writer) +# comment = BlogPostComment.objects.create(text="Test blog post comment", blog_post=post) + +# class PersonSerializer(serializers.ModelSerializer): +# class Meta: +# model = Person + +# class BlogPostSerializer(serializers.ModelSerializer): +# writer = PersonSerializer() + +# class Meta: +# model = BlogPost + +# class BlogPostCommentSerializer(serializers.ModelSerializer): +# blog_post = BlogPostSerializer() + +# class Meta: +# model = BlogPostComment - serializer = BlogPostCommentSerializer(instance=comment) - expected = {'id': 1, 'text': 'Test blog post comment', 'blog_post': {'id': 1, 'title': 'Test blog post', - 'writer': {'id': 1, 'name': 'django', 'age': 1}}} +# serializer = BlogPostCommentSerializer(instance=comment) +# expected = {'id': 1, 'text': 'Test blog post comment', 'blog_post': {'id': 1, 'title': 'Test blog post', +# 'writer': {'id': 1, 'name': 'django', 'age': 1}}} - self.assertEqual(serializer.data, expected) +# self.assertEqual(serializer.data, expected) -class NestedSerializerContextTests(TestCase): +# class NestedSerializerContextTests(TestCase): - def test_nested_serializer_context(self): - """ - Regression for #497 - - https://github.com/tomchristie/django-rest-framework/issues/497 - """ - class PhotoSerializer(serializers.ModelSerializer): - class Meta: - model = Photo - fields = ("description", "callable") +# def test_nested_serializer_context(self): +# """ +# Regression for #497 + +# https://github.com/tomchristie/django-rest-framework/issues/497 +# """ +# class PhotoSerializer(serializers.ModelSerializer): +# class Meta: +# model = Photo +# fields = ("description", "callable") - callable = serializers.SerializerMethodField('_callable') +# callable = serializers.SerializerMethodField('_callable') - def _callable(self, instance): - if 'context_item' not in self.context: - raise RuntimeError("context isn't getting passed into 2nd level nested serializer") - return "success" - - class AlbumSerializer(serializers.ModelSerializer): - class Meta: - model = Album - fields = ("photo_set", "callable") +# def _callable(self, instance): +# if 'context_item' not in self.context: +# raise RuntimeError("context isn't getting passed into 2nd level nested serializer") +# return "success" + +# class AlbumSerializer(serializers.ModelSerializer): +# class Meta: +# model = Album +# fields = ("photo_set", "callable") - photo_set = PhotoSerializer(source="photo_set", many=True) - callable = serializers.SerializerMethodField("_callable") +# photo_set = PhotoSerializer(source="photo_set", many=True) +# callable = serializers.SerializerMethodField("_callable") - def _callable(self, instance): - if 'context_item' not in self.context: - raise RuntimeError("context isn't getting passed into 1st level nested serializer") - return "success" +# def _callable(self, instance): +# if 'context_item' not in self.context: +# raise RuntimeError("context isn't getting passed into 1st level nested serializer") +# return "success" - class AlbumCollection(object): - albums = None +# class AlbumCollection(object): +# albums = None - class AlbumCollectionSerializer(serializers.Serializer): - albums = AlbumSerializer(source="albums", many=True) +# class AlbumCollectionSerializer(serializers.Serializer): +# albums = AlbumSerializer(source="albums", many=True) - album1 = Album.objects.create(title="album 1") - album2 = Album.objects.create(title="album 2") - Photo.objects.create(description="Bigfoot", album=album1) - Photo.objects.create(description="Unicorn", album=album1) - Photo.objects.create(description="Yeti", album=album2) - Photo.objects.create(description="Sasquatch", album=album2) - album_collection = AlbumCollection() - album_collection.albums = [album1, album2] +# album1 = Album.objects.create(title="album 1") +# album2 = Album.objects.create(title="album 2") +# Photo.objects.create(description="Bigfoot", album=album1) +# Photo.objects.create(description="Unicorn", album=album1) +# Photo.objects.create(description="Yeti", album=album2) +# Photo.objects.create(description="Sasquatch", album=album2) +# album_collection = AlbumCollection() +# album_collection.albums = [album1, album2] - # This will raise RuntimeError if context doesn't get passed correctly to the nested Serializers - AlbumCollectionSerializer(album_collection, context={'context_item': 'album context'}).data +# # This will raise RuntimeError if context doesn't get passed correctly to the nested Serializers +# AlbumCollectionSerializer(album_collection, context={'context_item': 'album context'}).data -class DeserializeListTestCase(TestCase): +# class DeserializeListTestCase(TestCase): - def setUp(self): - self.data = { - 'email': 'nobody@nowhere.com', - 'content': 'This is some test content', - 'created': datetime.datetime(2013, 3, 7), - } +# def setUp(self): +# self.data = { +# 'email': 'nobody@nowhere.com', +# 'content': 'This is some test content', +# 'created': datetime.datetime(2013, 3, 7), +# } - def test_no_errors(self): - data = [self.data.copy() for x in range(0, 3)] - serializer = CommentSerializer(data=data, many=True) - self.assertTrue(serializer.is_valid()) - self.assertTrue(isinstance(serializer.object, list)) - self.assertTrue( - all((isinstance(item, Comment) for item in serializer.object)) - ) +# def test_no_errors(self): +# data = [self.data.copy() for x in range(0, 3)] +# serializer = CommentSerializer(data=data, many=True) +# self.assertTrue(serializer.is_valid()) +# self.assertTrue(isinstance(serializer.object, list)) +# self.assertTrue( +# all((isinstance(item, Comment) for item in serializer.object)) +# ) - def test_errors_return_as_list(self): - invalid_item = self.data.copy() - invalid_item['email'] = '' - data = [self.data.copy(), invalid_item, self.data.copy()] +# def test_errors_return_as_list(self): +# invalid_item = self.data.copy() +# invalid_item['email'] = '' +# data = [self.data.copy(), invalid_item, self.data.copy()] - serializer = CommentSerializer(data=data, many=True) - self.assertFalse(serializer.is_valid()) - expected = [{}, {'email': ['This field is required.']}, {}] - self.assertEqual(serializer.errors, expected) +# serializer = CommentSerializer(data=data, many=True) +# self.assertFalse(serializer.is_valid()) +# expected = [{}, {'email': ['This field is required.']}, {}] +# self.assertEqual(serializer.errors, expected) -# Test for issue 747 +# # Test for issue 747 -class LazyStringModel(object): - def __init__(self, lazystring): - self.lazystring = lazystring +# class LazyStringModel(object): +# def __init__(self, lazystring): +# self.lazystring = lazystring -class LazyStringSerializer(serializers.Serializer): - lazystring = serializers.Field() - - def restore_object(self, attrs, instance=None): - if instance is not None: - instance.lazystring = attrs.get('lazystring', instance.lazystring) - return instance - return LazyStringModel(**attrs) - - -class LazyStringsTestCase(TestCase): - def setUp(self): - self.model = LazyStringModel(lazystring=_('lazystring')) - - def test_lazy_strings_are_translated(self): - serializer = LazyStringSerializer(self.model) - self.assertEqual(type(serializer.data['lazystring']), - type('lazystring')) - - -# Test for issue #467 - -class FieldLabelTest(TestCase): - def setUp(self): - self.serializer_class = BasicModelSerializer - - def test_label_from_model(self): - """ - Validates that label and help_text are correctly copied from the model class. - """ - serializer = self.serializer_class() - text_field = serializer.fields['text'] - - self.assertEqual('Text comes here', text_field.label) - self.assertEqual('Text description.', text_field.help_text) - - def test_field_ctor(self): - """ - This is check that ctor supports both label and help_text. - """ - self.assertEqual('Label', fields.Field(label='Label', help_text='Help').label) - self.assertEqual('Help', fields.CharField(label='Label', help_text='Help').help_text) - self.assertEqual('Label', relations.HyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help', many=True).label) - - -# Test for issue #961 - -class ManyFieldHelpTextTest(TestCase): - def test_help_text_no_hold_down_control_msg(self): - """ - Validate that help_text doesn't contain the 'Hold down "Control" ...' - message that Django appends to choice fields. - """ - rel_field = fields.Field(help_text=ManyToManyModel._meta.get_field('rel').help_text) - self.assertEqual('Some help text.', rel_field.help_text) - - -class AttributeMappingOnAutogeneratedRelatedFields(TestCase): - - def test_primary_key_related_field(self): - serializer = ForeignKeySourceSerializer() - self.assertEqual(serializer.fields['target'].help_text, 'Target') - self.assertEqual(serializer.fields['target'].label, 'Target') - - def test_hyperlinked_related_field(self): - serializer = HyperlinkedForeignKeySourceSerializer() - self.assertEqual(serializer.fields['target'].help_text, 'Target') - self.assertEqual(serializer.fields['target'].label, 'Target') - - -@unittest.skipUnless(PIL is not None, 'PIL is not installed') -class AttributeMappingOnAutogeneratedFieldsTests(TestCase): - - def setUp(self): - - class AMOAFSerializer(serializers.ModelSerializer): - class Meta: - model = AMOAFModel - - self.serializer_class = AMOAFSerializer - self.fields_attributes = { - 'char_field': [ - ('max_length', 1024), - ], - 'comma_separated_integer_field': [ - ('max_length', 1024), - ], - 'decimal_field': [ - ('max_digits', 64), - ('decimal_places', 32), - ], - 'email_field': [ - ('max_length', 1024), - ], - 'file_field': [ - ('max_length', 1024), - ], - 'image_field': [ - ('max_length', 1024), - ], - 'slug_field': [ - ('max_length', 1024), - ], - 'url_field': [ - ('max_length', 1024), - ], - 'nullable_char_field': [ - ('max_length', 1024), - ('allow_none', True), - ], - } - - def field_test(self, field): - serializer = self.serializer_class(data={}) - self.assertEqual(serializer.is_valid(), True) - - for attribute in self.fields_attributes[field]: - self.assertEqual( - getattr(serializer.fields[field], attribute[0]), - attribute[1] - ) - - def test_char_field(self): - self.field_test('char_field') - - def test_comma_separated_integer_field(self): - self.field_test('comma_separated_integer_field') - - def test_decimal_field(self): - self.field_test('decimal_field') - - def test_email_field(self): - self.field_test('email_field') - - def test_file_field(self): - self.field_test('file_field') - - def test_image_field(self): - self.field_test('image_field') - - def test_slug_field(self): - self.field_test('slug_field') - - def test_url_field(self): - self.field_test('url_field') - - def test_nullable_char_field(self): - self.field_test('nullable_char_field') - - -@unittest.skipUnless(PIL is not None, 'PIL is not installed') -class DefaultValuesOnAutogeneratedFieldsTests(TestCase): - - def setUp(self): - - class DVOAFSerializer(serializers.ModelSerializer): - class Meta: - model = DVOAFModel - - self.serializer_class = DVOAFSerializer - self.fields_attributes = { - 'positive_integer_field': [ - ('min_value', 0), - ], - 'positive_small_integer_field': [ - ('min_value', 0), - ], - 'email_field': [ - ('max_length', 75), - ], - 'file_field': [ - ('max_length', 100), - ], - 'image_field': [ - ('max_length', 100), - ], - 'slug_field': [ - ('max_length', 50), - ], - 'url_field': [ - ('max_length', 200), - ], - } - - def field_test(self, field): - serializer = self.serializer_class(data={}) - self.assertEqual(serializer.is_valid(), True) - - for attribute in self.fields_attributes[field]: - self.assertEqual( - getattr(serializer.fields[field], attribute[0]), - attribute[1] - ) +# class LazyStringSerializer(serializers.Serializer): +# lazystring = serializers.Field() + +# def restore_object(self, attrs, instance=None): +# if instance is not None: +# instance.lazystring = attrs.get('lazystring', instance.lazystring) +# return instance +# return LazyStringModel(**attrs) + + +# class LazyStringsTestCase(TestCase): +# def setUp(self): +# self.model = LazyStringModel(lazystring=_('lazystring')) + +# def test_lazy_strings_are_translated(self): +# serializer = LazyStringSerializer(self.model) +# self.assertEqual(type(serializer.data['lazystring']), +# type('lazystring')) + + +# # Test for issue #467 + +# class FieldLabelTest(TestCase): +# def setUp(self): +# self.serializer_class = BasicModelSerializer + +# def test_label_from_model(self): +# """ +# Validates that label and help_text are correctly copied from the model class. +# """ +# serializer = self.serializer_class() +# text_field = serializer.fields['text'] + +# self.assertEqual('Text comes here', text_field.label) +# self.assertEqual('Text description.', text_field.help_text) + +# def test_field_ctor(self): +# """ +# This is check that ctor supports both label and help_text. +# """ +# self.assertEqual('Label', fields.Field(label='Label', help_text='Help').label) +# self.assertEqual('Help', fields.CharField(label='Label', help_text='Help').help_text) +# self.assertEqual('Label', relations.HyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help', many=True).label) + + +# # Test for issue #961 + +# class ManyFieldHelpTextTest(TestCase): +# def test_help_text_no_hold_down_control_msg(self): +# """ +# Validate that help_text doesn't contain the 'Hold down "Control" ...' +# message that Django appends to choice fields. +# """ +# rel_field = fields.Field(help_text=ManyToManyModel._meta.get_field('rel').help_text) +# self.assertEqual('Some help text.', rel_field.help_text) + + +# class AttributeMappingOnAutogeneratedRelatedFields(TestCase): + +# def test_primary_key_related_field(self): +# serializer = ForeignKeySourceSerializer() +# self.assertEqual(serializer.fields['target'].help_text, 'Target') +# self.assertEqual(serializer.fields['target'].label, 'Target') + +# def test_hyperlinked_related_field(self): +# serializer = HyperlinkedForeignKeySourceSerializer() +# self.assertEqual(serializer.fields['target'].help_text, 'Target') +# self.assertEqual(serializer.fields['target'].label, 'Target') + + +# @unittest.skipUnless(PIL is not None, 'PIL is not installed') +# class AttributeMappingOnAutogeneratedFieldsTests(TestCase): + +# def setUp(self): + +# class AMOAFSerializer(serializers.ModelSerializer): +# class Meta: +# model = AMOAFModel + +# self.serializer_class = AMOAFSerializer +# self.fields_attributes = { +# 'char_field': [ +# ('max_length', 1024), +# ], +# 'comma_separated_integer_field': [ +# ('max_length', 1024), +# ], +# 'decimal_field': [ +# ('max_digits', 64), +# ('decimal_places', 32), +# ], +# 'email_field': [ +# ('max_length', 1024), +# ], +# 'file_field': [ +# ('max_length', 1024), +# ], +# 'image_field': [ +# ('max_length', 1024), +# ], +# 'slug_field': [ +# ('max_length', 1024), +# ], +# 'url_field': [ +# ('max_length', 1024), +# ], +# 'nullable_char_field': [ +# ('max_length', 1024), +# ('allow_none', True), +# ], +# } + +# def field_test(self, field): +# serializer = self.serializer_class(data={}) +# self.assertEqual(serializer.is_valid(), True) + +# for attribute in self.fields_attributes[field]: +# self.assertEqual( +# getattr(serializer.fields[field], attribute[0]), +# attribute[1] +# ) + +# def test_char_field(self): +# self.field_test('char_field') + +# def test_comma_separated_integer_field(self): +# self.field_test('comma_separated_integer_field') + +# def test_decimal_field(self): +# self.field_test('decimal_field') + +# def test_email_field(self): +# self.field_test('email_field') + +# def test_file_field(self): +# self.field_test('file_field') + +# def test_image_field(self): +# self.field_test('image_field') + +# def test_slug_field(self): +# self.field_test('slug_field') + +# def test_url_field(self): +# self.field_test('url_field') + +# def test_nullable_char_field(self): +# self.field_test('nullable_char_field') + + +# @unittest.skipUnless(PIL is not None, 'PIL is not installed') +# class DefaultValuesOnAutogeneratedFieldsTests(TestCase): + +# def setUp(self): + +# class DVOAFSerializer(serializers.ModelSerializer): +# class Meta: +# model = DVOAFModel + +# self.serializer_class = DVOAFSerializer +# self.fields_attributes = { +# 'positive_integer_field': [ +# ('min_value', 0), +# ], +# 'positive_small_integer_field': [ +# ('min_value', 0), +# ], +# 'email_field': [ +# ('max_length', 75), +# ], +# 'file_field': [ +# ('max_length', 100), +# ], +# 'image_field': [ +# ('max_length', 100), +# ], +# 'slug_field': [ +# ('max_length', 50), +# ], +# 'url_field': [ +# ('max_length', 200), +# ], +# } + +# def field_test(self, field): +# serializer = self.serializer_class(data={}) +# self.assertEqual(serializer.is_valid(), True) + +# for attribute in self.fields_attributes[field]: +# self.assertEqual( +# getattr(serializer.fields[field], attribute[0]), +# attribute[1] +# ) - def test_positive_integer_field(self): - self.field_test('positive_integer_field') +# def test_positive_integer_field(self): +# self.field_test('positive_integer_field') - def test_positive_small_integer_field(self): - self.field_test('positive_small_integer_field') +# def test_positive_small_integer_field(self): +# self.field_test('positive_small_integer_field') - def test_email_field(self): - self.field_test('email_field') +# def test_email_field(self): +# self.field_test('email_field') - def test_file_field(self): - self.field_test('file_field') +# def test_file_field(self): +# self.field_test('file_field') - def test_image_field(self): - self.field_test('image_field') +# def test_image_field(self): +# self.field_test('image_field') - def test_slug_field(self): - self.field_test('slug_field') +# def test_slug_field(self): +# self.field_test('slug_field') - def test_url_field(self): - self.field_test('url_field') +# def test_url_field(self): +# self.field_test('url_field') -class MetadataSerializer(serializers.Serializer): - field1 = serializers.CharField(max_length=3, required=True) - field2 = serializers.CharField(max_length=10, required=False) +# class MetadataSerializer(serializers.Serializer): +# field1 = serializers.CharField(max_length=3, required=True) +# field2 = serializers.CharField(max_length=10, required=False) -class MetadataSerializerTestCase(TestCase): - def setUp(self): - self.serializer = MetadataSerializer() +# class MetadataSerializerTestCase(TestCase): +# def setUp(self): +# self.serializer = MetadataSerializer() - def test_serializer_metadata(self): - metadata = self.serializer.metadata() - expected = { - 'field1': { - 'required': True, - 'max_length': 3, - 'type': 'string', - 'read_only': False - }, - 'field2': { - 'required': False, - 'max_length': 10, - 'type': 'string', - 'read_only': False - } - } - self.assertEqual(expected, metadata) +# def test_serializer_metadata(self): +# metadata = self.serializer.metadata() +# expected = { +# 'field1': { +# 'required': True, +# 'max_length': 3, +# 'type': 'string', +# 'read_only': False +# }, +# 'field2': { +# 'required': False, +# 'max_length': 10, +# 'type': 'string', +# 'read_only': False +# } +# } +# self.assertEqual(expected, metadata) -# Regression test for #840 +# # Regression test for #840 -class SimpleModel(models.Model): - text = models.CharField(max_length=100) +# class SimpleModel(models.Model): +# text = models.CharField(max_length=100) - -class SimpleModelSerializer(serializers.ModelSerializer): - text = serializers.CharField() - other = serializers.CharField() - - class Meta: - model = SimpleModel - - def validate_other(self, attrs, source): - del attrs['other'] - return attrs + +# class SimpleModelSerializer(serializers.ModelSerializer): +# text = serializers.CharField() +# other = serializers.CharField() + +# class Meta: +# model = SimpleModel + +# def validate_other(self, attrs, source): +# del attrs['other'] +# return attrs -class FieldValidationRemovingAttr(TestCase): - def test_removing_non_model_field_in_validation(self): - """ - Removing an attr during field valiation should ensure that it is not - passed through when restoring the object. +# class FieldValidationRemovingAttr(TestCase): +# def test_removing_non_model_field_in_validation(self): +# """ +# Removing an attr during field valiation should ensure that it is not +# passed through when restoring the object. - This allows additional non-model fields to be supported. +# This allows additional non-model fields to be supported. - Regression test for #840. - """ - serializer = SimpleModelSerializer(data={'text': 'foo', 'other': 'bar'}) - self.assertTrue(serializer.is_valid()) - serializer.save() - self.assertEqual(serializer.object.text, 'foo') +# Regression test for #840. +# """ +# serializer = SimpleModelSerializer(data={'text': 'foo', 'other': 'bar'}) +# self.assertTrue(serializer.is_valid()) +# serializer.save() +# self.assertEqual(serializer.object.text, 'foo') -# Regression test for #878 +# # Regression test for #878 -class SimpleTargetModel(models.Model): - text = models.CharField(max_length=100) +# class SimpleTargetModel(models.Model): +# text = models.CharField(max_length=100) -class SimplePKSourceModelSerializer(serializers.Serializer): - targets = serializers.PrimaryKeyRelatedField(queryset=SimpleTargetModel.objects.all(), many=True) - text = serializers.CharField() +# class SimplePKSourceModelSerializer(serializers.Serializer): +# targets = serializers.PrimaryKeyRelatedField(queryset=SimpleTargetModel.objects.all(), many=True) +# text = serializers.CharField() -class SimpleSlugSourceModelSerializer(serializers.Serializer): - targets = serializers.SlugRelatedField(queryset=SimpleTargetModel.objects.all(), many=True, slug_field='pk') - text = serializers.CharField() +# class SimpleSlugSourceModelSerializer(serializers.Serializer): +# targets = serializers.SlugRelatedField(queryset=SimpleTargetModel.objects.all(), many=True, slug_field='pk') +# text = serializers.CharField() -class SerializerSupportsManyRelationships(TestCase): - def setUp(self): - SimpleTargetModel.objects.create(text='foo') - SimpleTargetModel.objects.create(text='bar') +# class SerializerSupportsManyRelationships(TestCase): +# def setUp(self): +# SimpleTargetModel.objects.create(text='foo') +# SimpleTargetModel.objects.create(text='bar') - def test_serializer_supports_pk_many_relationships(self): - """ - Regression test for #878. +# def test_serializer_supports_pk_many_relationships(self): +# """ +# Regression test for #878. - Note that pk behavior has a different code path to usual cases, - for performance reasons. - """ - serializer = SimplePKSourceModelSerializer(data={'text': 'foo', 'targets': [1, 2]}) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.data, {'text': 'foo', 'targets': [1, 2]}) +# Note that pk behavior has a different code path to usual cases, +# for performance reasons. +# """ +# serializer = SimplePKSourceModelSerializer(data={'text': 'foo', 'targets': [1, 2]}) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.data, {'text': 'foo', 'targets': [1, 2]}) - def test_serializer_supports_slug_many_relationships(self): - """ - Regression test for #878. - """ - serializer = SimpleSlugSourceModelSerializer(data={'text': 'foo', 'targets': [1, 2]}) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.data, {'text': 'foo', 'targets': [1, 2]}) +# def test_serializer_supports_slug_many_relationships(self): +# """ +# Regression test for #878. +# """ +# serializer = SimpleSlugSourceModelSerializer(data={'text': 'foo', 'targets': [1, 2]}) +# self.assertTrue(serializer.is_valid()) +# self.assertEqual(serializer.data, {'text': 'foo', 'targets': [1, 2]}) -class TransformMethodsSerializer(serializers.Serializer): - a = serializers.CharField() - b_renamed = serializers.CharField(source='b') - - def transform_a(self, obj, value): - return value.lower() - - def transform_b_renamed(self, obj, value): - if value is not None: - return 'and ' + value +# class TransformMethodsSerializer(serializers.Serializer): +# a = serializers.CharField() +# b_renamed = serializers.CharField(source='b') + +# def transform_a(self, obj, value): +# return value.lower() + +# def transform_b_renamed(self, obj, value): +# if value is not None: +# return 'and ' + value -class TestSerializerTransformMethods(TestCase): - def setUp(self): - self.s = TransformMethodsSerializer() +# class TestSerializerTransformMethods(TestCase): +# def setUp(self): +# self.s = TransformMethodsSerializer() - def test_transform_methods(self): - self.assertEqual( - self.s.to_native({'a': 'GREEN EGGS', 'b': 'HAM'}), - { - 'a': 'green eggs', - 'b_renamed': 'and HAM', - } - ) +# def test_transform_methods(self): +# self.assertEqual( +# self.s.to_native({'a': 'GREEN EGGS', 'b': 'HAM'}), +# { +# 'a': 'green eggs', +# 'b_renamed': 'and HAM', +# } +# ) - def test_missing_fields(self): - self.assertEqual( - self.s.to_native({'a': 'GREEN EGGS'}), - { - 'a': 'green eggs', - 'b_renamed': None, - } - ) +# def test_missing_fields(self): +# self.assertEqual( +# self.s.to_native({'a': 'GREEN EGGS'}), +# { +# 'a': 'green eggs', +# 'b_renamed': None, +# } +# ) -class DefaultTrueBooleanModel(models.Model): - cat = models.BooleanField(default=True) - dog = models.BooleanField(default=False) +# class DefaultTrueBooleanModel(models.Model): +# cat = models.BooleanField(default=True) +# dog = models.BooleanField(default=False) -class SerializerDefaultTrueBoolean(TestCase): +# class SerializerDefaultTrueBoolean(TestCase): - def setUp(self): - super(SerializerDefaultTrueBoolean, self).setUp() - - class DefaultTrueBooleanSerializer(serializers.ModelSerializer): - class Meta: - model = DefaultTrueBooleanModel - fields = ('cat', 'dog') - - self.default_true_boolean_serializer = DefaultTrueBooleanSerializer - - def test_enabled_as_false(self): - serializer = self.default_true_boolean_serializer(data={'cat': False, - 'dog': False}) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.data['cat'], False) - self.assertEqual(serializer.data['dog'], False) +# def setUp(self): +# super(SerializerDefaultTrueBoolean, self).setUp() + +# class DefaultTrueBooleanSerializer(serializers.ModelSerializer): +# class Meta: +# model = DefaultTrueBooleanModel +# fields = ('cat', 'dog') + +# self.default_true_boolean_serializer = DefaultTrueBooleanSerializer + +# def test_enabled_as_false(self): +# serializer = self.default_true_boolean_serializer(data={'cat': False, +# 'dog': False}) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.data['cat'], False) +# self.assertEqual(serializer.data['dog'], False) - def test_enabled_as_true(self): - serializer = self.default_true_boolean_serializer(data={'cat': True, - 'dog': True}) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.data['cat'], True) - self.assertEqual(serializer.data['dog'], True) - - def test_enabled_partial(self): - serializer = self.default_true_boolean_serializer(data={'cat': False}, - partial=True) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.data['cat'], False) - self.assertEqual(serializer.data['dog'], False) - - -class BoolenFieldTypeTest(TestCase): - ''' - Ensure the various Boolean based model fields are rendered as the proper - field type - - ''' - - def setUp(self): - ''' - Setup an ActionItemSerializer for BooleanTesting - ''' - data = { - 'title': 'b' * 201, - } - self.serializer = ActionItemSerializer(data=data) - - def test_booleanfield_type(self): - ''' - Test that BooleanField is infered from models.BooleanField - ''' - bfield = self.serializer.get_fields()['done'] - self.assertEqual(type(bfield), fields.BooleanField) - - def test_nullbooleanfield_type(self): - ''' - Test that BooleanField is infered from models.NullBooleanField - - https://groups.google.com/forum/#!topic/django-rest-framework/D9mXEftpuQ8 - ''' - bfield = self.serializer.get_fields()['started'] - self.assertEqual(type(bfield), fields.BooleanField) +# def test_enabled_as_true(self): +# serializer = self.default_true_boolean_serializer(data={'cat': True, +# 'dog': True}) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.data['cat'], True) +# self.assertEqual(serializer.data['dog'], True) + +# def test_enabled_partial(self): +# serializer = self.default_true_boolean_serializer(data={'cat': False}, +# partial=True) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.data['cat'], False) +# self.assertEqual(serializer.data['dog'], False) + + +# class BoolenFieldTypeTest(TestCase): +# ''' +# Ensure the various Boolean based model fields are rendered as the proper +# field type + +# ''' + +# def setUp(self): +# ''' +# Setup an ActionItemSerializer for BooleanTesting +# ''' +# data = { +# 'title': 'b' * 201, +# } +# self.serializer = ActionItemSerializer(data=data) + +# def test_booleanfield_type(self): +# ''' +# Test that BooleanField is infered from models.BooleanField +# ''' +# bfield = self.serializer.get_fields()['done'] +# self.assertEqual(type(bfield), fields.BooleanField) + +# def test_nullbooleanfield_type(self): +# ''' +# Test that BooleanField is infered from models.NullBooleanField + +# https://groups.google.com/forum/#!topic/django-rest-framework/D9mXEftpuQ8 +# ''' +# bfield = self.serializer.get_fields()['started'] +# self.assertEqual(type(bfield), fields.BooleanField) diff --git a/tests/test_serializer_bulk_update.py b/tests/test_serializer_bulk_update.py index 67a8ed0dc..3341ce590 100644 --- a/tests/test_serializer_bulk_update.py +++ b/tests/test_serializer_bulk_update.py @@ -1,278 +1,278 @@ -""" -Tests to cover bulk create and update using serializers. -""" -from __future__ import unicode_literals -from django.test import TestCase -from rest_framework import serializers +# """ +# Tests to cover bulk create and update using serializers. +# """ +# from __future__ import unicode_literals +# from django.test import TestCase +# from rest_framework import serializers -class BulkCreateSerializerTests(TestCase): - """ - Creating multiple instances using serializers. - """ +# class BulkCreateSerializerTests(TestCase): +# """ +# Creating multiple instances using serializers. +# """ - def setUp(self): - class BookSerializer(serializers.Serializer): - id = serializers.IntegerField() - title = serializers.CharField(max_length=100) - author = serializers.CharField(max_length=100) +# def setUp(self): +# class BookSerializer(serializers.Serializer): +# id = serializers.IntegerField() +# title = serializers.CharField(max_length=100) +# author = serializers.CharField(max_length=100) - self.BookSerializer = BookSerializer +# self.BookSerializer = BookSerializer - def test_bulk_create_success(self): - """ - Correct bulk update serialization should return the input data. - """ +# def test_bulk_create_success(self): +# """ +# Correct bulk update serialization should return the input data. +# """ - data = [ - { - 'id': 0, - 'title': 'The electric kool-aid acid test', - 'author': 'Tom Wolfe' - }, { - 'id': 1, - 'title': 'If this is a man', - 'author': 'Primo Levi' - }, { - 'id': 2, - 'title': 'The wind-up bird chronicle', - 'author': 'Haruki Murakami' - } - ] +# data = [ +# { +# 'id': 0, +# 'title': 'The electric kool-aid acid test', +# 'author': 'Tom Wolfe' +# }, { +# 'id': 1, +# 'title': 'If this is a man', +# 'author': 'Primo Levi' +# }, { +# 'id': 2, +# 'title': 'The wind-up bird chronicle', +# 'author': 'Haruki Murakami' +# } +# ] - serializer = self.BookSerializer(data=data, many=True) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.object, data) +# serializer = self.BookSerializer(data=data, many=True) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.object, data) - def test_bulk_create_errors(self): - """ - Correct bulk update serialization should return the input data. - """ +# def test_bulk_create_errors(self): +# """ +# Correct bulk update serialization should return the input data. +# """ - data = [ - { - 'id': 0, - 'title': 'The electric kool-aid acid test', - 'author': 'Tom Wolfe' - }, { - 'id': 1, - 'title': 'If this is a man', - 'author': 'Primo Levi' - }, { - 'id': 'foo', - 'title': 'The wind-up bird chronicle', - 'author': 'Haruki Murakami' - } - ] - expected_errors = [ - {}, - {}, - {'id': ['Enter a whole number.']} - ] +# data = [ +# { +# 'id': 0, +# 'title': 'The electric kool-aid acid test', +# 'author': 'Tom Wolfe' +# }, { +# 'id': 1, +# 'title': 'If this is a man', +# 'author': 'Primo Levi' +# }, { +# 'id': 'foo', +# 'title': 'The wind-up bird chronicle', +# 'author': 'Haruki Murakami' +# } +# ] +# expected_errors = [ +# {}, +# {}, +# {'id': ['Enter a whole number.']} +# ] - serializer = self.BookSerializer(data=data, many=True) - self.assertEqual(serializer.is_valid(), False) - self.assertEqual(serializer.errors, expected_errors) +# serializer = self.BookSerializer(data=data, many=True) +# self.assertEqual(serializer.is_valid(), False) +# self.assertEqual(serializer.errors, expected_errors) - def test_invalid_list_datatype(self): - """ - Data containing list of incorrect data type should return errors. - """ - data = ['foo', 'bar', 'baz'] - serializer = self.BookSerializer(data=data, many=True) - self.assertEqual(serializer.is_valid(), False) +# def test_invalid_list_datatype(self): +# """ +# Data containing list of incorrect data type should return errors. +# """ +# data = ['foo', 'bar', 'baz'] +# serializer = self.BookSerializer(data=data, many=True) +# self.assertEqual(serializer.is_valid(), False) - expected_errors = [ - {'non_field_errors': ['Invalid data']}, - {'non_field_errors': ['Invalid data']}, - {'non_field_errors': ['Invalid data']} - ] +# expected_errors = [ +# {'non_field_errors': ['Invalid data']}, +# {'non_field_errors': ['Invalid data']}, +# {'non_field_errors': ['Invalid data']} +# ] - self.assertEqual(serializer.errors, expected_errors) +# self.assertEqual(serializer.errors, expected_errors) - def test_invalid_single_datatype(self): - """ - Data containing a single incorrect data type should return errors. - """ - data = 123 - serializer = self.BookSerializer(data=data, many=True) - self.assertEqual(serializer.is_valid(), False) +# def test_invalid_single_datatype(self): +# """ +# Data containing a single incorrect data type should return errors. +# """ +# data = 123 +# serializer = self.BookSerializer(data=data, many=True) +# self.assertEqual(serializer.is_valid(), False) - expected_errors = {'non_field_errors': ['Expected a list of items.']} +# expected_errors = {'non_field_errors': ['Expected a list of items.']} - self.assertEqual(serializer.errors, expected_errors) +# self.assertEqual(serializer.errors, expected_errors) - def test_invalid_single_object(self): - """ - Data containing only a single object, instead of a list of objects - should return errors. - """ - data = { - 'id': 0, - 'title': 'The electric kool-aid acid test', - 'author': 'Tom Wolfe' - } - serializer = self.BookSerializer(data=data, many=True) - self.assertEqual(serializer.is_valid(), False) +# def test_invalid_single_object(self): +# """ +# Data containing only a single object, instead of a list of objects +# should return errors. +# """ +# data = { +# 'id': 0, +# 'title': 'The electric kool-aid acid test', +# 'author': 'Tom Wolfe' +# } +# serializer = self.BookSerializer(data=data, many=True) +# self.assertEqual(serializer.is_valid(), False) - expected_errors = {'non_field_errors': ['Expected a list of items.']} +# expected_errors = {'non_field_errors': ['Expected a list of items.']} - self.assertEqual(serializer.errors, expected_errors) +# self.assertEqual(serializer.errors, expected_errors) -class BulkUpdateSerializerTests(TestCase): - """ - Updating multiple instances using serializers. - """ +# class BulkUpdateSerializerTests(TestCase): +# """ +# Updating multiple instances using serializers. +# """ - def setUp(self): - class Book(object): - """ - A data type that can be persisted to a mock storage backend - with `.save()` and `.delete()`. - """ - object_map = {} +# def setUp(self): +# class Book(object): +# """ +# A data type that can be persisted to a mock storage backend +# with `.save()` and `.delete()`. +# """ +# object_map = {} - def __init__(self, id, title, author): - self.id = id - self.title = title - self.author = author +# def __init__(self, id, title, author): +# self.id = id +# self.title = title +# self.author = author - def save(self): - Book.object_map[self.id] = self +# def save(self): +# Book.object_map[self.id] = self - def delete(self): - del Book.object_map[self.id] +# def delete(self): +# del Book.object_map[self.id] - class BookSerializer(serializers.Serializer): - id = serializers.IntegerField() - title = serializers.CharField(max_length=100) - author = serializers.CharField(max_length=100) +# class BookSerializer(serializers.Serializer): +# id = serializers.IntegerField() +# title = serializers.CharField(max_length=100) +# author = serializers.CharField(max_length=100) - def restore_object(self, attrs, instance=None): - if instance: - instance.id = attrs['id'] - instance.title = attrs['title'] - instance.author = attrs['author'] - return instance - return Book(**attrs) +# def restore_object(self, attrs, instance=None): +# if instance: +# instance.id = attrs['id'] +# instance.title = attrs['title'] +# instance.author = attrs['author'] +# return instance +# return Book(**attrs) - self.Book = Book - self.BookSerializer = BookSerializer +# self.Book = Book +# self.BookSerializer = BookSerializer - data = [ - { - 'id': 0, - 'title': 'The electric kool-aid acid test', - 'author': 'Tom Wolfe' - }, { - 'id': 1, - 'title': 'If this is a man', - 'author': 'Primo Levi' - }, { - 'id': 2, - 'title': 'The wind-up bird chronicle', - 'author': 'Haruki Murakami' - } - ] +# data = [ +# { +# 'id': 0, +# 'title': 'The electric kool-aid acid test', +# 'author': 'Tom Wolfe' +# }, { +# 'id': 1, +# 'title': 'If this is a man', +# 'author': 'Primo Levi' +# }, { +# 'id': 2, +# 'title': 'The wind-up bird chronicle', +# 'author': 'Haruki Murakami' +# } +# ] - for item in data: - book = Book(item['id'], item['title'], item['author']) - book.save() +# for item in data: +# book = Book(item['id'], item['title'], item['author']) +# book.save() - def books(self): - """ - Return all the objects in the mock storage backend. - """ - return self.Book.object_map.values() +# def books(self): +# """ +# Return all the objects in the mock storage backend. +# """ +# return self.Book.object_map.values() - def test_bulk_update_success(self): - """ - Correct bulk update serialization should return the input data. - """ - data = [ - { - 'id': 0, - 'title': 'The electric kool-aid acid test', - 'author': 'Tom Wolfe' - }, { - 'id': 2, - 'title': 'Kafka on the shore', - 'author': 'Haruki Murakami' - } - ] - serializer = self.BookSerializer(self.books(), data=data, many=True, allow_add_remove=True) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.data, data) - serializer.save() - new_data = self.BookSerializer(self.books(), many=True).data +# def test_bulk_update_success(self): +# """ +# Correct bulk update serialization should return the input data. +# """ +# data = [ +# { +# 'id': 0, +# 'title': 'The electric kool-aid acid test', +# 'author': 'Tom Wolfe' +# }, { +# 'id': 2, +# 'title': 'Kafka on the shore', +# 'author': 'Haruki Murakami' +# } +# ] +# serializer = self.BookSerializer(self.books(), data=data, many=True, allow_add_remove=True) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.data, data) +# serializer.save() +# new_data = self.BookSerializer(self.books(), many=True).data - self.assertEqual(data, new_data) +# self.assertEqual(data, new_data) - def test_bulk_update_and_create(self): - """ - Bulk update serialization may also include created items. - """ - data = [ - { - 'id': 0, - 'title': 'The electric kool-aid acid test', - 'author': 'Tom Wolfe' - }, { - 'id': 3, - 'title': 'Kafka on the shore', - 'author': 'Haruki Murakami' - } - ] - serializer = self.BookSerializer(self.books(), data=data, many=True, allow_add_remove=True) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.data, data) - serializer.save() - new_data = self.BookSerializer(self.books(), many=True).data - self.assertEqual(data, new_data) +# def test_bulk_update_and_create(self): +# """ +# Bulk update serialization may also include created items. +# """ +# data = [ +# { +# 'id': 0, +# 'title': 'The electric kool-aid acid test', +# 'author': 'Tom Wolfe' +# }, { +# 'id': 3, +# 'title': 'Kafka on the shore', +# 'author': 'Haruki Murakami' +# } +# ] +# serializer = self.BookSerializer(self.books(), data=data, many=True, allow_add_remove=True) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.data, data) +# serializer.save() +# new_data = self.BookSerializer(self.books(), many=True).data +# self.assertEqual(data, new_data) - def test_bulk_update_invalid_create(self): - """ - Bulk update serialization without allow_add_remove may not create items. - """ - data = [ - { - 'id': 0, - 'title': 'The electric kool-aid acid test', - 'author': 'Tom Wolfe' - }, { - 'id': 3, - 'title': 'Kafka on the shore', - 'author': 'Haruki Murakami' - } - ] - expected_errors = [ - {}, - {'non_field_errors': ['Cannot create a new item, only existing items may be updated.']} - ] - serializer = self.BookSerializer(self.books(), data=data, many=True) - self.assertEqual(serializer.is_valid(), False) - self.assertEqual(serializer.errors, expected_errors) +# def test_bulk_update_invalid_create(self): +# """ +# Bulk update serialization without allow_add_remove may not create items. +# """ +# data = [ +# { +# 'id': 0, +# 'title': 'The electric kool-aid acid test', +# 'author': 'Tom Wolfe' +# }, { +# 'id': 3, +# 'title': 'Kafka on the shore', +# 'author': 'Haruki Murakami' +# } +# ] +# expected_errors = [ +# {}, +# {'non_field_errors': ['Cannot create a new item, only existing items may be updated.']} +# ] +# serializer = self.BookSerializer(self.books(), data=data, many=True) +# self.assertEqual(serializer.is_valid(), False) +# self.assertEqual(serializer.errors, expected_errors) - def test_bulk_update_error(self): - """ - Incorrect bulk update serialization should return error data. - """ - data = [ - { - 'id': 0, - 'title': 'The electric kool-aid acid test', - 'author': 'Tom Wolfe' - }, { - 'id': 'foo', - 'title': 'Kafka on the shore', - 'author': 'Haruki Murakami' - } - ] - expected_errors = [ - {}, - {'id': ['Enter a whole number.']} - ] - serializer = self.BookSerializer(self.books(), data=data, many=True, allow_add_remove=True) - self.assertEqual(serializer.is_valid(), False) - self.assertEqual(serializer.errors, expected_errors) +# def test_bulk_update_error(self): +# """ +# Incorrect bulk update serialization should return error data. +# """ +# data = [ +# { +# 'id': 0, +# 'title': 'The electric kool-aid acid test', +# 'author': 'Tom Wolfe' +# }, { +# 'id': 'foo', +# 'title': 'Kafka on the shore', +# 'author': 'Haruki Murakami' +# } +# ] +# expected_errors = [ +# {}, +# {'id': ['Enter a whole number.']} +# ] +# serializer = self.BookSerializer(self.books(), data=data, many=True, allow_add_remove=True) +# self.assertEqual(serializer.is_valid(), False) +# self.assertEqual(serializer.errors, expected_errors) diff --git a/tests/test_serializer_empty.py b/tests/test_serializer_empty.py index 30cff3615..d0006ad38 100644 --- a/tests/test_serializer_empty.py +++ b/tests/test_serializer_empty.py @@ -1,15 +1,15 @@ -from django.test import TestCase -from rest_framework import serializers +# from django.test import TestCase +# from rest_framework import serializers -class EmptySerializerTestCase(TestCase): - def test_empty_serializer(self): - class FooBarSerializer(serializers.Serializer): - foo = serializers.IntegerField() - bar = serializers.SerializerMethodField('get_bar') +# class EmptySerializerTestCase(TestCase): +# def test_empty_serializer(self): +# class FooBarSerializer(serializers.Serializer): +# foo = serializers.IntegerField() +# bar = serializers.SerializerMethodField('get_bar') - def get_bar(self, obj): - return 'bar' +# def get_bar(self, obj): +# return 'bar' - serializer = FooBarSerializer() - self.assertEquals(serializer.data, {'foo': 0}) +# serializer = FooBarSerializer() +# self.assertEquals(serializer.data, {'foo': 0}) diff --git a/tests/test_serializer_import.py b/tests/test_serializer_import.py index 3b8ff4b3c..d029c3c55 100644 --- a/tests/test_serializer_import.py +++ b/tests/test_serializer_import.py @@ -1,19 +1,19 @@ -from django.test import TestCase +# from django.test import TestCase -from rest_framework import serializers -from tests.accounts.serializers import AccountSerializer +# from rest_framework import serializers +# from tests.accounts.serializers import AccountSerializer -class ImportingModelSerializerTests(TestCase): - """ - In some situations like, GH #1225, it is possible, especially in - testing, to import a serializer who's related models have not yet - been resolved by Django. `AccountSerializer` is an example of such - a serializer (imported at the top of this file). - """ - def test_import_model_serializer(self): - """ - The serializer at the top of this file should have been - imported successfully, and we should be able to instantiate it. - """ - self.assertIsInstance(AccountSerializer(), serializers.ModelSerializer) +# class ImportingModelSerializerTests(TestCase): +# """ +# In some situations like, GH #1225, it is possible, especially in +# testing, to import a serializer who's related models have not yet +# been resolved by Django. `AccountSerializer` is an example of such +# a serializer (imported at the top of this file). +# """ +# def test_import_model_serializer(self): +# """ +# The serializer at the top of this file should have been +# imported successfully, and we should be able to instantiate it. +# """ +# self.assertIsInstance(AccountSerializer(), serializers.ModelSerializer) diff --git a/tests/test_serializer_nested.py b/tests/test_serializer_nested.py index c09c24db2..b0f64ca77 100644 --- a/tests/test_serializer_nested.py +++ b/tests/test_serializer_nested.py @@ -1,349 +1,349 @@ -""" -Tests to cover nested serializers. +# """ +# Tests to cover nested serializers. -Doesn't cover model serializers. -""" -from __future__ import unicode_literals -from django.test import TestCase -from rest_framework import serializers -from . import models +# Doesn't cover model serializers. +# """ +# from __future__ import unicode_literals +# from django.test import TestCase +# from rest_framework import serializers +# from . import models -class WritableNestedSerializerBasicTests(TestCase): - """ - Tests for deserializing nested entities. - Basic tests that use serializers that simply restore to dicts. - """ +# class WritableNestedSerializerBasicTests(TestCase): +# """ +# Tests for deserializing nested entities. +# Basic tests that use serializers that simply restore to dicts. +# """ - def setUp(self): - class TrackSerializer(serializers.Serializer): - order = serializers.IntegerField() - title = serializers.CharField(max_length=100) - duration = serializers.IntegerField() +# def setUp(self): +# class TrackSerializer(serializers.Serializer): +# order = serializers.IntegerField() +# title = serializers.CharField(max_length=100) +# duration = serializers.IntegerField() - class AlbumSerializer(serializers.Serializer): - album_name = serializers.CharField(max_length=100) - artist = serializers.CharField(max_length=100) - tracks = TrackSerializer(many=True) +# class AlbumSerializer(serializers.Serializer): +# album_name = serializers.CharField(max_length=100) +# artist = serializers.CharField(max_length=100) +# tracks = TrackSerializer(many=True) - self.AlbumSerializer = AlbumSerializer +# self.AlbumSerializer = AlbumSerializer - def test_nested_validation_success(self): - """ - Correct nested serialization should return the input data. - """ +# def test_nested_validation_success(self): +# """ +# Correct nested serialization should return the input data. +# """ - data = { - 'album_name': 'Discovery', - 'artist': 'Daft Punk', - 'tracks': [ - {'order': 1, 'title': 'One More Time', 'duration': 235}, - {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, - {'order': 3, 'title': 'Digital Love', 'duration': 239} - ] - } +# data = { +# 'album_name': 'Discovery', +# 'artist': 'Daft Punk', +# 'tracks': [ +# {'order': 1, 'title': 'One More Time', 'duration': 235}, +# {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, +# {'order': 3, 'title': 'Digital Love', 'duration': 239} +# ] +# } - serializer = self.AlbumSerializer(data=data) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.object, data) +# serializer = self.AlbumSerializer(data=data) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.object, data) - def test_nested_validation_error(self): - """ - Incorrect nested serialization should return appropriate error data. - """ +# def test_nested_validation_error(self): +# """ +# Incorrect nested serialization should return appropriate error data. +# """ - data = { - 'album_name': 'Discovery', - 'artist': 'Daft Punk', - 'tracks': [ - {'order': 1, 'title': 'One More Time', 'duration': 235}, - {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, - {'order': 3, 'title': 'Digital Love', 'duration': 'foobar'} - ] - } - expected_errors = { - 'tracks': [ - {}, - {}, - {'duration': ['Enter a whole number.']} - ] - } +# data = { +# 'album_name': 'Discovery', +# 'artist': 'Daft Punk', +# 'tracks': [ +# {'order': 1, 'title': 'One More Time', 'duration': 235}, +# {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, +# {'order': 3, 'title': 'Digital Love', 'duration': 'foobar'} +# ] +# } +# expected_errors = { +# 'tracks': [ +# {}, +# {}, +# {'duration': ['Enter a whole number.']} +# ] +# } - serializer = self.AlbumSerializer(data=data) - self.assertEqual(serializer.is_valid(), False) - self.assertEqual(serializer.errors, expected_errors) +# serializer = self.AlbumSerializer(data=data) +# self.assertEqual(serializer.is_valid(), False) +# self.assertEqual(serializer.errors, expected_errors) - def test_many_nested_validation_error(self): - """ - Incorrect nested serialization should return appropriate error data - when multiple entities are being deserialized. - """ +# def test_many_nested_validation_error(self): +# """ +# Incorrect nested serialization should return appropriate error data +# when multiple entities are being deserialized. +# """ - data = [ - { - 'album_name': 'Russian Red', - 'artist': 'I Love Your Glasses', - 'tracks': [ - {'order': 1, 'title': 'Cigarettes', 'duration': 121}, - {'order': 2, 'title': 'No Past Land', 'duration': 198}, - {'order': 3, 'title': 'They Don\'t Believe', 'duration': 191} - ] - }, - { - 'album_name': 'Discovery', - 'artist': 'Daft Punk', - 'tracks': [ - {'order': 1, 'title': 'One More Time', 'duration': 235}, - {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, - {'order': 3, 'title': 'Digital Love', 'duration': 'foobar'} - ] - } - ] - expected_errors = [ - {}, - { - 'tracks': [ - {}, - {}, - {'duration': ['Enter a whole number.']} - ] - } - ] +# data = [ +# { +# 'album_name': 'Russian Red', +# 'artist': 'I Love Your Glasses', +# 'tracks': [ +# {'order': 1, 'title': 'Cigarettes', 'duration': 121}, +# {'order': 2, 'title': 'No Past Land', 'duration': 198}, +# {'order': 3, 'title': 'They Don\'t Believe', 'duration': 191} +# ] +# }, +# { +# 'album_name': 'Discovery', +# 'artist': 'Daft Punk', +# 'tracks': [ +# {'order': 1, 'title': 'One More Time', 'duration': 235}, +# {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, +# {'order': 3, 'title': 'Digital Love', 'duration': 'foobar'} +# ] +# } +# ] +# expected_errors = [ +# {}, +# { +# 'tracks': [ +# {}, +# {}, +# {'duration': ['Enter a whole number.']} +# ] +# } +# ] - serializer = self.AlbumSerializer(data=data, many=True) - self.assertEqual(serializer.is_valid(), False) - self.assertEqual(serializer.errors, expected_errors) +# serializer = self.AlbumSerializer(data=data, many=True) +# self.assertEqual(serializer.is_valid(), False) +# self.assertEqual(serializer.errors, expected_errors) -class WritableNestedSerializerObjectTests(TestCase): - """ - Tests for deserializing nested entities. - These tests use serializers that restore to concrete objects. - """ +# class WritableNestedSerializerObjectTests(TestCase): +# """ +# Tests for deserializing nested entities. +# These tests use serializers that restore to concrete objects. +# """ - def setUp(self): - # Couple of concrete objects that we're going to deserialize into - class Track(object): - def __init__(self, order, title, duration): - self.order, self.title, self.duration = order, title, duration +# def setUp(self): +# # Couple of concrete objects that we're going to deserialize into +# class Track(object): +# def __init__(self, order, title, duration): +# self.order, self.title, self.duration = order, title, duration - def __eq__(self, other): - return ( - self.order == other.order and - self.title == other.title and - self.duration == other.duration - ) +# def __eq__(self, other): +# return ( +# self.order == other.order and +# self.title == other.title and +# self.duration == other.duration +# ) - class Album(object): - def __init__(self, album_name, artist, tracks): - self.album_name, self.artist, self.tracks = album_name, artist, tracks +# class Album(object): +# def __init__(self, album_name, artist, tracks): +# self.album_name, self.artist, self.tracks = album_name, artist, tracks - def __eq__(self, other): - return ( - self.album_name == other.album_name and - self.artist == other.artist and - self.tracks == other.tracks - ) +# def __eq__(self, other): +# return ( +# self.album_name == other.album_name and +# self.artist == other.artist and +# self.tracks == other.tracks +# ) - # And their corresponding serializers - class TrackSerializer(serializers.Serializer): - order = serializers.IntegerField() - title = serializers.CharField(max_length=100) - duration = serializers.IntegerField() +# # And their corresponding serializers +# class TrackSerializer(serializers.Serializer): +# order = serializers.IntegerField() +# title = serializers.CharField(max_length=100) +# duration = serializers.IntegerField() - def restore_object(self, attrs, instance=None): - return Track(attrs['order'], attrs['title'], attrs['duration']) +# def restore_object(self, attrs, instance=None): +# return Track(attrs['order'], attrs['title'], attrs['duration']) - class AlbumSerializer(serializers.Serializer): - album_name = serializers.CharField(max_length=100) - artist = serializers.CharField(max_length=100) - tracks = TrackSerializer(many=True) +# class AlbumSerializer(serializers.Serializer): +# album_name = serializers.CharField(max_length=100) +# artist = serializers.CharField(max_length=100) +# tracks = TrackSerializer(many=True) - def restore_object(self, attrs, instance=None): - return Album(attrs['album_name'], attrs['artist'], attrs['tracks']) +# def restore_object(self, attrs, instance=None): +# return Album(attrs['album_name'], attrs['artist'], attrs['tracks']) - self.Album, self.Track = Album, Track - self.AlbumSerializer = AlbumSerializer +# self.Album, self.Track = Album, Track +# self.AlbumSerializer = AlbumSerializer - def test_nested_validation_success(self): - """ - Correct nested serialization should return a restored object - that corresponds to the input data. - """ +# def test_nested_validation_success(self): +# """ +# Correct nested serialization should return a restored object +# that corresponds to the input data. +# """ - data = { - 'album_name': 'Discovery', - 'artist': 'Daft Punk', - 'tracks': [ - {'order': 1, 'title': 'One More Time', 'duration': 235}, - {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, - {'order': 3, 'title': 'Digital Love', 'duration': 239} - ] - } - expected_object = self.Album( - album_name='Discovery', - artist='Daft Punk', - tracks=[ - self.Track(order=1, title='One More Time', duration=235), - self.Track(order=2, title='Aerodynamic', duration=184), - self.Track(order=3, title='Digital Love', duration=239), - ] - ) +# data = { +# 'album_name': 'Discovery', +# 'artist': 'Daft Punk', +# 'tracks': [ +# {'order': 1, 'title': 'One More Time', 'duration': 235}, +# {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, +# {'order': 3, 'title': 'Digital Love', 'duration': 239} +# ] +# } +# expected_object = self.Album( +# album_name='Discovery', +# artist='Daft Punk', +# tracks=[ +# self.Track(order=1, title='One More Time', duration=235), +# self.Track(order=2, title='Aerodynamic', duration=184), +# self.Track(order=3, title='Digital Love', duration=239), +# ] +# ) - serializer = self.AlbumSerializer(data=data) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.object, expected_object) +# serializer = self.AlbumSerializer(data=data) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.object, expected_object) - def test_many_nested_validation_success(self): - """ - Correct nested serialization should return multiple restored objects - that corresponds to the input data when multiple objects are - being deserialized. - """ +# def test_many_nested_validation_success(self): +# """ +# Correct nested serialization should return multiple restored objects +# that corresponds to the input data when multiple objects are +# being deserialized. +# """ - data = [ - { - 'album_name': 'Russian Red', - 'artist': 'I Love Your Glasses', - 'tracks': [ - {'order': 1, 'title': 'Cigarettes', 'duration': 121}, - {'order': 2, 'title': 'No Past Land', 'duration': 198}, - {'order': 3, 'title': 'They Don\'t Believe', 'duration': 191} - ] - }, - { - 'album_name': 'Discovery', - 'artist': 'Daft Punk', - 'tracks': [ - {'order': 1, 'title': 'One More Time', 'duration': 235}, - {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, - {'order': 3, 'title': 'Digital Love', 'duration': 239} - ] - } - ] - expected_object = [ - self.Album( - album_name='Russian Red', - artist='I Love Your Glasses', - tracks=[ - self.Track(order=1, title='Cigarettes', duration=121), - self.Track(order=2, title='No Past Land', duration=198), - self.Track(order=3, title='They Don\'t Believe', duration=191), - ] - ), - self.Album( - album_name='Discovery', - artist='Daft Punk', - tracks=[ - self.Track(order=1, title='One More Time', duration=235), - self.Track(order=2, title='Aerodynamic', duration=184), - self.Track(order=3, title='Digital Love', duration=239), - ] - ) - ] +# data = [ +# { +# 'album_name': 'Russian Red', +# 'artist': 'I Love Your Glasses', +# 'tracks': [ +# {'order': 1, 'title': 'Cigarettes', 'duration': 121}, +# {'order': 2, 'title': 'No Past Land', 'duration': 198}, +# {'order': 3, 'title': 'They Don\'t Believe', 'duration': 191} +# ] +# }, +# { +# 'album_name': 'Discovery', +# 'artist': 'Daft Punk', +# 'tracks': [ +# {'order': 1, 'title': 'One More Time', 'duration': 235}, +# {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, +# {'order': 3, 'title': 'Digital Love', 'duration': 239} +# ] +# } +# ] +# expected_object = [ +# self.Album( +# album_name='Russian Red', +# artist='I Love Your Glasses', +# tracks=[ +# self.Track(order=1, title='Cigarettes', duration=121), +# self.Track(order=2, title='No Past Land', duration=198), +# self.Track(order=3, title='They Don\'t Believe', duration=191), +# ] +# ), +# self.Album( +# album_name='Discovery', +# artist='Daft Punk', +# tracks=[ +# self.Track(order=1, title='One More Time', duration=235), +# self.Track(order=2, title='Aerodynamic', duration=184), +# self.Track(order=3, title='Digital Love', duration=239), +# ] +# ) +# ] - serializer = self.AlbumSerializer(data=data, many=True) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.object, expected_object) +# serializer = self.AlbumSerializer(data=data, many=True) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.object, expected_object) -class ForeignKeyNestedSerializerUpdateTests(TestCase): - def setUp(self): - class Artist(object): - def __init__(self, name): - self.name = name +# class ForeignKeyNestedSerializerUpdateTests(TestCase): +# def setUp(self): +# class Artist(object): +# def __init__(self, name): +# self.name = name - def __eq__(self, other): - return self.name == other.name +# def __eq__(self, other): +# return self.name == other.name - class Album(object): - def __init__(self, name, artist): - self.name, self.artist = name, artist +# class Album(object): +# def __init__(self, name, artist): +# self.name, self.artist = name, artist - def __eq__(self, other): - return self.name == other.name and self.artist == other.artist +# def __eq__(self, other): +# return self.name == other.name and self.artist == other.artist - class ArtistSerializer(serializers.Serializer): - name = serializers.CharField() +# class ArtistSerializer(serializers.Serializer): +# name = serializers.CharField() - def restore_object(self, attrs, instance=None): - if instance: - instance.name = attrs['name'] - else: - instance = Artist(attrs['name']) - return instance +# def restore_object(self, attrs, instance=None): +# if instance: +# instance.name = attrs['name'] +# else: +# instance = Artist(attrs['name']) +# return instance - class AlbumSerializer(serializers.Serializer): - name = serializers.CharField() - by = ArtistSerializer(source='artist') +# class AlbumSerializer(serializers.Serializer): +# name = serializers.CharField() +# by = ArtistSerializer(source='artist') - def restore_object(self, attrs, instance=None): - if instance: - instance.name = attrs['name'] - instance.artist = attrs['artist'] - else: - instance = Album(attrs['name'], attrs['artist']) - return instance +# def restore_object(self, attrs, instance=None): +# if instance: +# instance.name = attrs['name'] +# instance.artist = attrs['artist'] +# else: +# instance = Album(attrs['name'], attrs['artist']) +# return instance - self.Artist = Artist - self.Album = Album - self.AlbumSerializer = AlbumSerializer +# self.Artist = Artist +# self.Album = Album +# self.AlbumSerializer = AlbumSerializer - def test_create_via_foreign_key_with_source(self): - """ - Check that we can both *create* and *update* into objects across - ForeignKeys that have a `source` specified. - Regression test for #1170 - """ - data = { - 'name': 'Discovery', - 'by': {'name': 'Daft Punk'}, - } +# def test_create_via_foreign_key_with_source(self): +# """ +# Check that we can both *create* and *update* into objects across +# ForeignKeys that have a `source` specified. +# Regression test for #1170 +# """ +# data = { +# 'name': 'Discovery', +# 'by': {'name': 'Daft Punk'}, +# } - expected = self.Album(artist=self.Artist('Daft Punk'), name='Discovery') +# expected = self.Album(artist=self.Artist('Daft Punk'), name='Discovery') - # create - serializer = self.AlbumSerializer(data=data) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.object, expected) +# # create +# serializer = self.AlbumSerializer(data=data) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.object, expected) - # update - original = self.Album(artist=self.Artist('The Bats'), name='Free All the Monsters') - serializer = self.AlbumSerializer(instance=original, data=data) - self.assertEqual(serializer.is_valid(), True) - self.assertEqual(serializer.object, expected) +# # update +# original = self.Album(artist=self.Artist('The Bats'), name='Free All the Monsters') +# serializer = self.AlbumSerializer(instance=original, data=data) +# self.assertEqual(serializer.is_valid(), True) +# self.assertEqual(serializer.object, expected) -class NestedModelSerializerUpdateTests(TestCase): - def test_second_nested_level(self): - john = models.Person.objects.create(name="john") +# class NestedModelSerializerUpdateTests(TestCase): +# def test_second_nested_level(self): +# john = models.Person.objects.create(name="john") - post = john.blogpost_set.create(title="Test blog post") - post.blogpostcomment_set.create(text="I hate this blog post") - post.blogpostcomment_set.create(text="I love this blog post") +# post = john.blogpost_set.create(title="Test blog post") +# post.blogpostcomment_set.create(text="I hate this blog post") +# post.blogpostcomment_set.create(text="I love this blog post") - class BlogPostCommentSerializer(serializers.ModelSerializer): - class Meta: - model = models.BlogPostComment +# class BlogPostCommentSerializer(serializers.ModelSerializer): +# class Meta: +# model = models.BlogPostComment - class BlogPostSerializer(serializers.ModelSerializer): - comments = BlogPostCommentSerializer(many=True, source='blogpostcomment_set') +# class BlogPostSerializer(serializers.ModelSerializer): +# comments = BlogPostCommentSerializer(many=True, source='blogpostcomment_set') - class Meta: - model = models.BlogPost - fields = ('id', 'title', 'comments') +# class Meta: +# model = models.BlogPost +# fields = ('id', 'title', 'comments') - class PersonSerializer(serializers.ModelSerializer): - posts = BlogPostSerializer(many=True, source='blogpost_set') +# class PersonSerializer(serializers.ModelSerializer): +# posts = BlogPostSerializer(many=True, source='blogpost_set') - class Meta: - model = models.Person - fields = ('id', 'name', 'age', 'posts') +# class Meta: +# model = models.Person +# fields = ('id', 'name', 'age', 'posts') - serialize = PersonSerializer(instance=john) - deserialize = PersonSerializer(data=serialize.data, instance=john) - self.assertTrue(deserialize.is_valid()) +# serialize = PersonSerializer(instance=john) +# deserialize = PersonSerializer(data=serialize.data, instance=john) +# self.assertTrue(deserialize.is_valid()) - result = deserialize.object - result.save() - self.assertEqual(result.id, john.id) +# result = deserialize.object +# result.save() +# self.assertEqual(result.id, john.id) diff --git a/tests/test_serializers.py b/tests/test_serializers.py index 31c417306..0a105e8e8 100644 --- a/tests/test_serializers.py +++ b/tests/test_serializers.py @@ -1,31 +1,31 @@ -from django.test import TestCase -from django.utils import six -from rest_framework.serializers import _resolve_model -from tests.models import BasicModel +# from django.test import TestCase +# from django.utils import six +# from rest_framework.serializers import _resolve_model +# from tests.models import BasicModel -class ResolveModelTests(TestCase): - """ - `_resolve_model` should return a Django model class given the - provided argument is a Django model class itself, or a properly - formatted string representation of one. - """ - def test_resolve_django_model(self): - resolved_model = _resolve_model(BasicModel) - self.assertEqual(resolved_model, BasicModel) +# class ResolveModelTests(TestCase): +# """ +# `_resolve_model` should return a Django model class given the +# provided argument is a Django model class itself, or a properly +# formatted string representation of one. +# """ +# def test_resolve_django_model(self): +# resolved_model = _resolve_model(BasicModel) +# self.assertEqual(resolved_model, BasicModel) - def test_resolve_string_representation(self): - resolved_model = _resolve_model('tests.BasicModel') - self.assertEqual(resolved_model, BasicModel) +# def test_resolve_string_representation(self): +# resolved_model = _resolve_model('tests.BasicModel') +# self.assertEqual(resolved_model, BasicModel) - def test_resolve_unicode_representation(self): - resolved_model = _resolve_model(six.text_type('tests.BasicModel')) - self.assertEqual(resolved_model, BasicModel) +# def test_resolve_unicode_representation(self): +# resolved_model = _resolve_model(six.text_type('tests.BasicModel')) +# self.assertEqual(resolved_model, BasicModel) - def test_resolve_non_django_model(self): - with self.assertRaises(ValueError): - _resolve_model(TestCase) +# def test_resolve_non_django_model(self): +# with self.assertRaises(ValueError): +# _resolve_model(TestCase) - def test_resolve_improper_string_representation(self): - with self.assertRaises(ValueError): - _resolve_model('BasicModel') +# def test_resolve_improper_string_representation(self): +# with self.assertRaises(ValueError): +# _resolve_model('BasicModel') From f08afe162cb1d0a589674ca26dc6184c7b3d185c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 3 Sep 2014 16:35:17 +0100 Subject: [PATCH 0762/1652] Version 2.4.2 --- docs/topics/release-notes.md | 6 ++++++ rest_framework/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index f0e9f2101..d758ae6af 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,12 @@ You can determine your currently installed version using `pip freeze`: ## 2.4.x series +### 2.4.2 + +**Date**: 3rd September 2014 + +* Bugfix: Fix broken pagination for 2.4.x series. + ### 2.4.1 **Date**: 1st September 2014 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 7c187639c..8d82a4b90 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '2.4.1' +__version__ = '2.4.2' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2014 Tom Christie' From fc9be55d436dbdd4a667d331348cfb5f421c4c91 Mon Sep 17 00:00:00 2001 From: Piper Merriam <piper@simpleenergy.com> Date: Fri, 25 Jul 2014 12:09:07 -0600 Subject: [PATCH 0763/1652] Alter CSRF exemption implementation The previous implementation of decorating `APIView.dispach` with the `csrf_exempt` decorator allowed for an easy-to-make mistake where someone could override the `dispatch` method on a view and inadvertantly remove the csrf exemption of their api view. By moving the decoration of the view into the `as_view` logic, it becomes much more difficult to make this mistake. --- rest_framework/views.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index 23df3443f..38346ab79 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -103,7 +103,9 @@ class APIView(View): """ view = super(APIView, cls).as_view(**initkwargs) view.cls = cls - return view + # Note: session based authentication is explicitly CSRF validated, + # all other authentication is CSRF exempt. + return csrf_exempt(view) @property def allowed_methods(self): @@ -371,9 +373,9 @@ class APIView(View): response.exception = True return response - # Note: session based authentication is explicitly CSRF validated, - # all other authentication is CSRF exempt. - @csrf_exempt + # Note: Views are made CSRF exempt from within `as_view` as to prevent + # accidental removal of this exemption in cases where `dispatch` needs to + # be overridden. def dispatch(self, request, *args, **kwargs): """ `.dispatch()` is pretty much the same as Django's regular dispatch, From fc250bf74bf3d88376bd1d41eab7c1ff6f4f8e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Wed, 3 Sep 2014 09:58:21 -0700 Subject: [PATCH 0764/1652] Test with released Django 1.7 --- .travis.yml | 6 +++--- tox.ini | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index ececf3e9d..e768e1468 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ python: - "3.4" env: - - DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" + - DJANGO="django==1.7" - DJANGO="django==1.6.5" - DJANGO="django==1.5.8" - DJANGO="django==1.4.13" @@ -25,7 +25,7 @@ install: - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi" - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi" - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; fi" - - "if [[ ${DJANGO} == 'https://www.djangoproject.com/download/1.7c2/tarball/' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi" + - "if [[ ${DJANGO} == 'django==1.7' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi" - export PYTHONPATH=. script: @@ -34,7 +34,7 @@ script: matrix: exclude: - python: "2.6" - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" + env: DJANGO="django==1.7" - python: "3.2" env: DJANGO="django==1.4.13" - python: "3.3" diff --git a/tox.ini b/tox.ini index 6f588de12..d40a70799 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ commands = ./runtests.py --lintonly [testenv:py3.4-django1.7] basepython = python3.4 -deps = https://www.djangoproject.com/download/1.7c2/tarball/ +deps = Django==1.7 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -26,7 +26,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/ [testenv:py3.3-django1.7] basepython = python3.3 -deps = https://www.djangoproject.com/download/1.7c2/tarball/ +deps = Django==1.7 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -34,7 +34,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/ [testenv:py3.2-django1.7] basepython = python3.2 -deps = https://www.djangoproject.com/download/1.7c2/tarball/ +deps = Django==1.7 django-filter==0.7 defusedxml==0.3 Pillow==2.3.0 @@ -42,7 +42,7 @@ deps = https://www.djangoproject.com/download/1.7c2/tarball/ [testenv:py2.7-django1.7] basepython = python2.7 -deps = https://www.djangoproject.com/download/1.7c2/tarball/ +deps = Django==1.7 django-filter==0.7 defusedxml==0.3 # django-oauth-plus==2.2.1 From 1ab782a430afe479535ee5bded81806dee189b69 Mon Sep 17 00:00:00 2001 From: dpanesso <dpanesso@serempre.com> Date: Wed, 3 Sep 2014 23:38:03 -0500 Subject: [PATCH 0765/1652] Using user.get_username() instead of user.username. This solves an error when using a auth model that does not have a username field. --- rest_framework/authentication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 5721a869e..f3fec05ec 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -344,7 +344,7 @@ class OAuth2Authentication(BaseAuthentication): user = token.user if not user.is_active: - msg = 'User inactive or deleted: %s' % user.username + msg = 'User inactive or deleted: %s' % user.get_username() raise exceptions.AuthenticationFailed(msg) return (user, token) From ef1fb3d8df8227961e3b24d1955af93be13519ea Mon Sep 17 00:00:00 2001 From: Carlton Gibson <carlton.gibson@noumenal.co.uk> Date: Thu, 4 Sep 2014 08:54:50 +0200 Subject: [PATCH 0766/1652] Prefer `format` and use named blocks --- rest_framework/templatetags/rest_framework.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index c228d5c3d..864d64dd0 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -41,7 +41,7 @@ def optional_login(request): except NoReverseMatch: return '' - snippet = "<li><a href='%s?next=%s'>Log in</a></li>" % (login_url, escape(request.path)) + snippet = "<li><a href='{href}?next={next}'>Log in</a></li>".format(href=login_url, next=escape(request.path)) return snippet @@ -53,19 +53,19 @@ def optional_logout(request, user): try: logout_url = reverse('rest_framework:logout') except NoReverseMatch: - return '<li class="navbar-text">{0}</li>'.format(user) + return '<li class="navbar-text">{user}</li>'.format(user=user) snippet = """<li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - {0} + {user} <b class="caret"></b> </a> <ul class="dropdown-menu"> - <li><a href='{1}?next={2}'>Log out</a></li> + <li><a href='{href}?next={next}'>Log out</a></li> </ul> </li>""" - return snippet.format(user, logout_url, escape(request.path)) + return snippet.format(user=user, href=logout_url, next=escape(request.path)) @register.simple_tag From d56efb8f8290f2e88e5a584b8ae6806023035003 Mon Sep 17 00:00:00 2001 From: Cezar Pendarovski <cezar.pendarovski@dsmz.de> Date: Thu, 4 Sep 2014 15:26:00 +0200 Subject: [PATCH 0767/1652] Display validation errors on login form --- .../templates/rest_framework/login_base.html | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html index 43860e53e..75e6d4727 100644 --- a/rest_framework/templates/rest_framework/login_base.html +++ b/rest_framework/templates/rest_framework/login_base.html @@ -18,17 +18,32 @@ <div class="row-fluid"> <div> <form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post"> + {% if form.non_field_errors %} + {% for error in form.non_field_errors %} + <p class="alert">{{ error }}</p> + {% endfor %} + {% endif %} {% csrf_token %} <div id="div_id_username" class="clearfix control-group"> <div class="controls"> + {% if form.username.errors %} + <p class="alert"> + {{ form.username.errors|striptags }} + </p> + {% endif %} <Label class="span4">Username:</label> - <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username"> + <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username" required> </div> </div> <div id="div_id_password" class="clearfix control-group"> - <div class="controls"> + <div class="controls"> + {% if form.password.errors %} + <p class="alert"> + {{ form.password.errors|striptags }} + </p> + {% endif %} <Label class="span4">Password:</label> - <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password"> + <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password" required> </div> </div> <input type="hidden" name="next" value="{{ next }}" /> From ea259e8bde2d4ea6b018f28900288a71ab2db05a Mon Sep 17 00:00:00 2001 From: Cezar Pendarovski <cezar.pendarovski@dsmz.de> Date: Thu, 4 Sep 2014 16:01:27 +0200 Subject: [PATCH 0768/1652] Error messages are displayed below the input fields --- .../templates/rest_framework/login_base.html | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html index 75e6d4727..3a75e8b35 100644 --- a/rest_framework/templates/rest_framework/login_base.html +++ b/rest_framework/templates/rest_framework/login_base.html @@ -18,38 +18,38 @@ <div class="row-fluid"> <div> <form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post"> - {% if form.non_field_errors %} - {% for error in form.non_field_errors %} - <p class="alert">{{ error }}</p> - {% endfor %} - {% endif %} {% csrf_token %} <div id="div_id_username" class="clearfix control-group"> <div class="controls"> + <Label class="span4">Username:</label> + <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username" required> {% if form.username.errors %} - <p class="alert"> + <p class="alert" style="margin-top: 10px"> {{ form.username.errors|striptags }} </p> {% endif %} - <Label class="span4">Username:</label> - <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username" required> </div> </div> <div id="div_id_password" class="clearfix control-group"> <div class="controls"> + <Label class="span4">Password:</label> + <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password" required> {% if form.password.errors %} - <p class="alert"> + <p class="alert" style="margin-top: 10px"> {{ form.password.errors|striptags }} </p> {% endif %} - <Label class="span4">Password:</label> - <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password" required> </div> </div> <input type="hidden" name="next" value="{{ next }}" /> <div class="form-actions-no-box"> <input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit"> </div> + {% if form.non_field_errors %} + {% for error in form.non_field_errors %} + <div class="alert" style="margin-top: 10px">{{ error }}</div> + {% endfor %} + {% endif %} </form> </div> </div><!-- /.row-fluid --> From 3bc858c30b04a1c042d1b0d5196994a2e1e3fe64 Mon Sep 17 00:00:00 2001 From: Cezar Pendarovski <cezar.pendarovski@dsmz.de> Date: Thu, 4 Sep 2014 17:51:45 +0200 Subject: [PATCH 0769/1652] General message error goes above submit button --- rest_framework/templates/rest_framework/login_base.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html index 3a75e8b35..49dad3aeb 100644 --- a/rest_framework/templates/rest_framework/login_base.html +++ b/rest_framework/templates/rest_framework/login_base.html @@ -42,14 +42,14 @@ </div> </div> <input type="hidden" name="next" value="{{ next }}" /> - <div class="form-actions-no-box"> - <input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit"> - </div> {% if form.non_field_errors %} {% for error in form.non_field_errors %} <div class="alert" style="margin-top: 10px">{{ error }}</div> {% endfor %} {% endif %} + <div class="form-actions-no-box"> + <input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit"> + </div> </form> </div> </div><!-- /.row-fluid --> From 6106701c063ea2efab7dbe82bbdfc02f9eb40421 Mon Sep 17 00:00:00 2001 From: Cezar Pendarovski <cezar.pendarovski@dsmz.de> Date: Fri, 5 Sep 2014 09:38:54 +0200 Subject: [PATCH 0770/1652] Input fields get hightlighted if login fails and username is persisted --- .../templates/rest_framework/login_base.html | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html index 49dad3aeb..7569c77ad 100644 --- a/rest_framework/templates/rest_framework/login_base.html +++ b/rest_framework/templates/rest_framework/login_base.html @@ -17,25 +17,32 @@ <div class="row-fluid"> <div> - <form action="{% url 'rest_framework:login' %}" class=" form-inline" method="post"> + <form action="{% url 'rest_framework:login' %}" role="form" method="post"> {% csrf_token %} - <div id="div_id_username" class="clearfix control-group"> + <div id="div_id_username" + class="clearfix control-group {% if form.username.errors %}warning{% endif %}"> <div class="controls"> <Label class="span4">Username:</label> - <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_username" required> + <input style="height: 25px" type="text" name="username" maxlength="100" + autocapitalize="off" autocorrect="off" class="textinput textInput" + id="id_username" + {% if form.username.value %}value="{{ form.username.value }}"{% endif %}> {% if form.username.errors %} - <p class="alert" style="margin-top: 10px"> + <p class="text-warning" style="margin-top: 10px"> {{ form.username.errors|striptags }} </p> {% endif %} </div> </div> - <div id="div_id_password" class="clearfix control-group"> + <div id="div_id_password" + class="clearfix control-group {% if form.password.errors %}warning{% endif %}"> <div class="controls"> <Label class="span4">Password:</label> - <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password" required> + <input style="height: 25px" type="password" name="password" maxlength="100" + autocapitalize="off" autocorrect="off" class="textinput textInput" + id="id_password"> {% if form.password.errors %} - <p class="alert" style="margin-top: 10px"> + <p class="text-warning" style="margin-top: 10px"> {{ form.password.errors|striptags }} </p> {% endif %} @@ -44,7 +51,7 @@ <input type="hidden" name="next" value="{{ next }}" /> {% if form.non_field_errors %} {% for error in form.non_field_errors %} - <div class="alert" style="margin-top: 10px">{{ error }}</div> + <div class="text-warning" style="margin: 10px 0">{{ error }}</div> {% endfor %} {% endif %} <div class="form-actions-no-box"> From d3ee26ba9972619bdbe191b7d90d4dd60fb65983 Mon Sep 17 00:00:00 2001 From: Cezar Pendarovski <cezar.pendarovski@dsmz.de> Date: Fri, 5 Sep 2014 10:55:49 +0200 Subject: [PATCH 0771/1652] Change bootstrap class warning to error --- .../templates/rest_framework/login_base.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html index 7569c77ad..fb355d528 100644 --- a/rest_framework/templates/rest_framework/login_base.html +++ b/rest_framework/templates/rest_framework/login_base.html @@ -20,7 +20,7 @@ <form action="{% url 'rest_framework:login' %}" role="form" method="post"> {% csrf_token %} <div id="div_id_username" - class="clearfix control-group {% if form.username.errors %}warning{% endif %}"> + class="clearfix control-group {% if form.username.errors %}error{% endif %}"> <div class="controls"> <Label class="span4">Username:</label> <input style="height: 25px" type="text" name="username" maxlength="100" @@ -28,21 +28,21 @@ id="id_username" {% if form.username.value %}value="{{ form.username.value }}"{% endif %}> {% if form.username.errors %} - <p class="text-warning" style="margin-top: 10px"> + <p class="text-error"> {{ form.username.errors|striptags }} </p> {% endif %} </div> </div> <div id="div_id_password" - class="clearfix control-group {% if form.password.errors %}warning{% endif %}"> + class="clearfix control-group {% if form.password.errors %}error{% endif %}"> <div class="controls"> <Label class="span4">Password:</label> <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="textinput textInput" id="id_password"> {% if form.password.errors %} - <p class="text-warning" style="margin-top: 10px"> + <p class="text-error"> {{ form.password.errors|striptags }} </p> {% endif %} @@ -51,7 +51,7 @@ <input type="hidden" name="next" value="{{ next }}" /> {% if form.non_field_errors %} {% for error in form.non_field_errors %} - <div class="text-warning" style="margin: 10px 0">{{ error }}</div> + <div class="text-error" style="margin: 10px 0">{{ error }}</div> {% endfor %} {% endif %} <div class="form-actions-no-box"> From 34b3ee9ea1d9c6f389424186c446dbfa8b9a58c6 Mon Sep 17 00:00:00 2001 From: Cezar Pendarovski <cezar.pendarovski@dsmz.de> Date: Fri, 5 Sep 2014 11:06:30 +0200 Subject: [PATCH 0772/1652] Place general error message in well --- .../templates/rest_framework/login_base.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html index fb355d528..582a7f273 100644 --- a/rest_framework/templates/rest_framework/login_base.html +++ b/rest_framework/templates/rest_framework/login_base.html @@ -24,8 +24,9 @@ <div class="controls"> <Label class="span4">Username:</label> <input style="height: 25px" type="text" name="username" maxlength="100" - autocapitalize="off" autocorrect="off" class="textinput textInput" - id="id_username" + autocapitalize="off" + autocorrect="off" class="span12 textinput textInput" + id="id_username" required {% if form.username.value %}value="{{ form.username.value }}"{% endif %}> {% if form.username.errors %} <p class="text-error"> @@ -39,8 +40,8 @@ <div class="controls"> <Label class="span4">Password:</label> <input style="height: 25px" type="password" name="password" maxlength="100" - autocapitalize="off" autocorrect="off" class="textinput textInput" - id="id_password"> + autocapitalize="off" autocorrect="off" class="span12 textinput textInput" + id="id_password" required> {% if form.password.errors %} <p class="text-error"> {{ form.password.errors|striptags }} @@ -51,7 +52,7 @@ <input type="hidden" name="next" value="{{ next }}" /> {% if form.non_field_errors %} {% for error in form.non_field_errors %} - <div class="text-error" style="margin: 10px 0">{{ error }}</div> + <div class="well well-small text-error">{{ error }}</div> {% endfor %} {% endif %} <div class="form-actions-no-box"> From d9633c6817e4c4a3085398c8a52293011670ef46 Mon Sep 17 00:00:00 2001 From: Piotr Jakimiak <piotr.jakimiak@gmail.com> Date: Fri, 5 Sep 2014 11:08:34 +0200 Subject: [PATCH 0773/1652] Fix returning None when allow_none is True in CharField --- rest_framework/fields.py | 8 ++++++-- tests/test_fields.py | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 9d707c9b5..5955fa3f1 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -475,8 +475,12 @@ class CharField(WritableField): if isinstance(value, six.string_types): return value - if value is None and not self.allow_none: - return '' + if value is None: + if not self.allow_none: + return '' + else: + # return None implicity because smart_text(None) == 'None' + return None return smart_text(value) diff --git a/tests/test_fields.py b/tests/test_fields.py index 094ac1eb0..b8c9954ea 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -54,6 +54,10 @@ class ChoiceFieldModel(models.Model): choice = models.CharField(choices=SAMPLE_CHOICES, blank=True, max_length=255) +class NullableCharFieldModel(models.Model): + char = models.CharField(null=True, blank=True, max_length=4) + + class ChoiceFieldModelSerializer(serializers.ModelSerializer): class Meta: model = ChoiceFieldModel @@ -1004,6 +1008,20 @@ class BooleanField(TestCase): self.assertFalse(BooleanRequiredSerializer(data={}).is_valid()) +class ModelCharField(TestCase): + """ + Tests for CharField + """ + def test_none_serializing(self): + class CharFieldSerializer(serializers.ModelSerializer): + class Meta: + model = NullableCharFieldModel + serializer = CharFieldSerializer(data={'char': None}) + self.assertTrue(serializer.fields['char'].allow_none) + self.assertTrue(serializer.is_valid()) + self.assertIsNone(serializer.data['char']) + + class SerializerMethodFieldTest(TestCase): """ Tests for the SerializerMethodField field_to_native() behavior From e39422e35fa81c79c149570e3d7e5cf9e0a0909b Mon Sep 17 00:00:00 2001 From: Piotr Jakimiak <piotr.jakimiak@gmail.com> Date: Fri, 5 Sep 2014 11:27:36 +0200 Subject: [PATCH 0774/1652] Check object in tests --- tests/test_fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_fields.py b/tests/test_fields.py index b8c9954ea..20d5a97a1 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1019,7 +1019,7 @@ class ModelCharField(TestCase): serializer = CharFieldSerializer(data={'char': None}) self.assertTrue(serializer.fields['char'].allow_none) self.assertTrue(serializer.is_valid()) - self.assertIsNone(serializer.data['char']) + self.assertIsNone(serializer.object.char) class SerializerMethodFieldTest(TestCase): From 6022b9ddd44fff08435fa2dbe50d165100ed61c1 Mon Sep 17 00:00:00 2001 From: Piotr Jakimiak <piotr.jakimiak@gmail.com> Date: Fri, 5 Sep 2014 11:56:44 +0200 Subject: [PATCH 0775/1652] Fix comment --- rest_framework/fields.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 5955fa3f1..e744b1738 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -479,7 +479,8 @@ class CharField(WritableField): if not self.allow_none: return '' else: - # return None implicity because smart_text(None) == 'None' + # return None explicitly because smart_text(None) == 'None' + # see #1834 for details return None return smart_text(value) From 2531b5cd864bd5138fe9456d069400363337f206 Mon Sep 17 00:00:00 2001 From: Cezar Pendarovski <cezar.pendarovski@dsmz.de> Date: Fri, 5 Sep 2014 13:28:47 +0200 Subject: [PATCH 0776/1652] Remove light gray bordering from the well with general message error --- rest_framework/templates/rest_framework/login_base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html index 582a7f273..8ab682ac8 100644 --- a/rest_framework/templates/rest_framework/login_base.html +++ b/rest_framework/templates/rest_framework/login_base.html @@ -52,7 +52,7 @@ <input type="hidden" name="next" value="{{ next }}" /> {% if form.non_field_errors %} {% for error in form.non_field_errors %} - <div class="well well-small text-error">{{ error }}</div> + <div class="well well-small text-error" style="border: none">{{ error }}</div> {% endfor %} {% endif %} <div class="form-actions-no-box"> From c3b841ae449c66102be7305416eca8acb22c8c42 Mon Sep 17 00:00:00 2001 From: Piotr Jakimiak <piotr.jakimiak@gmail.com> Date: Fri, 5 Sep 2014 14:08:11 +0200 Subject: [PATCH 0777/1652] Use Serializer instead of ModelSerializer --- rest_framework/fields.py | 3 +-- tests/test_fields.py | 11 +++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index e744b1738..8e15345da 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -479,8 +479,7 @@ class CharField(WritableField): if not self.allow_none: return '' else: - # return None explicitly because smart_text(None) == 'None' - # see #1834 for details + # Return None explicitly because smart_text(None) == 'None'. See #1834 for details return None return smart_text(value) diff --git a/tests/test_fields.py b/tests/test_fields.py index 20d5a97a1..8bf9c56a4 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -54,10 +54,6 @@ class ChoiceFieldModel(models.Model): choice = models.CharField(choices=SAMPLE_CHOICES, blank=True, max_length=255) -class NullableCharFieldModel(models.Model): - char = models.CharField(null=True, blank=True, max_length=4) - - class ChoiceFieldModelSerializer(serializers.ModelSerializer): class Meta: model = ChoiceFieldModel @@ -1013,13 +1009,12 @@ class ModelCharField(TestCase): Tests for CharField """ def test_none_serializing(self): - class CharFieldSerializer(serializers.ModelSerializer): - class Meta: - model = NullableCharFieldModel + class CharFieldSerializer(serializers.Serializer): + char = serializers.CharField(allow_none=True, required=False) serializer = CharFieldSerializer(data={'char': None}) self.assertTrue(serializer.fields['char'].allow_none) self.assertTrue(serializer.is_valid()) - self.assertIsNone(serializer.object.char) + self.assertIsNone(serializer.object['char']) class SerializerMethodFieldTest(TestCase): From 4207d4453155105e69264d6e1b8cc7a3340d5e9d Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 5 Sep 2014 13:19:47 +0100 Subject: [PATCH 0778/1652] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 730c1d07a..8a6982305 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -Django>=1.3 +Django>=1.4.2 From cb3cc00edd4a7a7e8b583a9ba3a823fb6ca76346 Mon Sep 17 00:00:00 2001 From: Piotr Jakimiak <piotr.jakimiak@gmail.com> Date: Fri, 5 Sep 2014 14:36:35 +0200 Subject: [PATCH 0779/1652] Delete useless assert --- tests/test_fields.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_fields.py b/tests/test_fields.py index 8bf9c56a4..0ddbe48b5 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1012,7 +1012,6 @@ class ModelCharField(TestCase): class CharFieldSerializer(serializers.Serializer): char = serializers.CharField(allow_none=True, required=False) serializer = CharFieldSerializer(data={'char': None}) - self.assertTrue(serializer.fields['char'].allow_none) self.assertTrue(serializer.is_valid()) self.assertIsNone(serializer.object['char']) From d934824bff21e4a11226af61efba319be227f4f0 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 5 Sep 2014 16:29:46 +0100 Subject: [PATCH 0780/1652] Workin on --- rest_framework/exceptions.py | 9 +++- rest_framework/fields.py | 26 +++++++++-- rest_framework/generics.py | 30 +----------- rest_framework/mixins.py | 83 +++++++++++++++++++-------------- rest_framework/serializers.py | 64 ++++++++++++++++--------- tests/test_generics.py | 41 ++-------------- tests/test_validation.py | 5 +- tests/test_write_only_fields.py | 69 ++++++++++++++------------- 8 files changed, 159 insertions(+), 168 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index ad52d1726..852a08b1a 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -15,7 +15,7 @@ class APIException(Exception): Subclasses should provide `.status_code` and `.default_detail` properties. """ status_code = status.HTTP_500_INTERNAL_SERVER_ERROR - default_detail = '' + default_detail = 'A server error occured' def __init__(self, detail=None): self.detail = detail or self.default_detail @@ -29,6 +29,11 @@ class ParseError(APIException): default_detail = 'Malformed request.' +class ValidationError(APIException): + status_code = status.HTTP_400_BAD_REQUEST + default_detail = 'Invalid data in request.' + + class AuthenticationFailed(APIException): status_code = status.HTTP_401_UNAUTHORIZED default_detail = 'Incorrect authentication credentials.' @@ -54,7 +59,7 @@ class MethodNotAllowed(APIException): class NotAcceptable(APIException): status_code = status.HTTP_406_NOT_ACCEPTABLE - default_detail = "Could not satisfy the request's Accept header" + default_detail = "Could not satisfy the request Accept header" def __init__(self, detail=None, available_renderers=None): self.detail = detail or self.default_detail diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 838aa3b0c..d18551b37 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1,3 +1,4 @@ +from rest_framework.exceptions import ValidationError from rest_framework.utils import html import inspect @@ -59,10 +60,6 @@ def set_value(dictionary, keys, value): dictionary[keys[-1]] = value -class ValidationError(Exception): - pass - - class SkipField(Exception): pass @@ -204,6 +201,22 @@ class Field(object): msg = self._MISSING_ERROR_MESSAGE.format(class_name=class_name, key=key) raise AssertionError(msg) + def __new__(cls, *args, **kwargs): + instance = super(Field, cls).__new__(cls) + instance._args = args + instance._kwargs = kwargs + return instance + + def __repr__(self): + arg_string = ', '.join([repr(val) for val in self._args]) + kwarg_string = ', '.join([ + '%s=%s' % (key, repr(val)) for key, val in self._kwargs.items() + ]) + if arg_string and kwarg_string: + arg_string += ', ' + class_name = self.__class__.__name__ + return "%s(%s%s)" % (class_name, arg_string, kwarg_string) + class BooleanField(Field): MESSAGES = { @@ -308,6 +321,11 @@ class IntegerField(Field): 'invalid_integer': 'A valid integer is required.' } + def __init__(self, **kwargs): + self.max_value = kwargs.pop('max_value') + self.min_value = kwargs.pop('min_value') + super(CharField, self).__init__(**kwargs) + def to_native(self, data): try: data = int(str(data)) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 6705cbb2f..c2c59154a 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -27,7 +27,7 @@ def strict_positive_int(integer_string, cutoff=None): def get_object_or_404(queryset, *filter_args, **filter_kwargs): """ - Same as Django's standard shortcut, but make sure to raise 404 + Same as Django's standard shortcut, but make sure to also raise 404 if the filter_kwargs don't match the required types. """ try: @@ -249,34 +249,6 @@ class GenericAPIView(views.APIView): # # The are not called by GenericAPIView directly, # but are used by the mixin methods. - - def pre_save(self, obj): - """ - Placeholder method for calling before saving an object. - - May be used to set attributes on the object that are implicit - in either the request, or the url. - """ - pass - - def post_save(self, obj, created=False): - """ - Placeholder method for calling after saving an object. - """ - pass - - def pre_delete(self, obj): - """ - Placeholder method for calling before deleting an object. - """ - pass - - def post_delete(self, obj): - """ - Placeholder method for calling after deleting an object. - """ - pass - def metadata(self, request): """ Return a dictionary of metadata about the view. diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 359740cee..14a6b44b1 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -19,14 +19,10 @@ class CreateModelMixin(object): """ def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.DATA) - - if serializer.is_valid(): - self.object = serializer.save() - headers = self.get_success_headers(serializer.data) - return Response(serializer.data, status=status.HTTP_201_CREATED, - headers=headers) - - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + serializer.is_valid(raise_exception=True) + serializer.save() + headers = self.get_success_headers(serializer.data) + return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) def get_success_headers(self, data): try: @@ -40,15 +36,12 @@ class ListModelMixin(object): List a queryset. """ def list(self, request, *args, **kwargs): - self.object_list = self.filter_queryset(self.get_queryset()) - - # Switch between paginated or standard style responses - page = self.paginate_queryset(self.object_list) + instance = self.filter_queryset(self.get_queryset()) + page = self.paginate_queryset(instance) if page is not None: serializer = self.get_pagination_serializer(page) else: - serializer = self.get_serializer(self.object_list, many=True) - + serializer = self.get_serializer(instance, many=True) return Response(serializer.data) @@ -57,8 +50,8 @@ class RetrieveModelMixin(object): Retrieve a model instance. """ def retrieve(self, request, *args, **kwargs): - self.object = self.get_object() - serializer = self.get_serializer(self.object) + instance = self.get_object() + serializer = self.get_serializer(instance) return Response(serializer.data) @@ -68,22 +61,52 @@ class UpdateModelMixin(object): """ def update(self, request, *args, **kwargs): partial = kwargs.pop('partial', False) - self.object = self.get_object_or_none() + instance = self.get_object() + serializer = self.get_serializer(instance, data=request.DATA, partial=partial) + serializer.is_valid(raise_exception=True) + serializer.save() + return Response(serializer.data) - serializer = self.get_serializer(self.object, data=request.DATA, partial=partial) + def partial_update(self, request, *args, **kwargs): + kwargs['partial'] = True + return self.update(request, *args, **kwargs) - if not serializer.is_valid(): - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - if self.object is None: +class DestroyModelMixin(object): + """ + Destroy a model instance. + """ + def destroy(self, request, *args, **kwargs): + instance = self.get_object() + instance.delete() + return Response(status=status.HTTP_204_NO_CONTENT) + + +# The AllowPUTAsCreateMixin was previously the default behaviour +# for PUT requests. This has now been removed and must be *explictly* +# included if it is the behavior that you want. +# For more info see: ... + +class AllowPUTAsCreateMixin(object): + """ + The following mixin class may be used in order to support PUT-as-create + behavior for incoming requests. + """ + def update(self, request, *args, **kwargs): + partial = kwargs.pop('partial', False) + instance = self.get_object_or_none() + serializer = self.get_serializer(instance, data=request.DATA, partial=partial) + serializer.is_valid(raise_exception=True) + + if instance is None: lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field lookup_value = self.kwargs[lookup_url_kwarg] extras = {self.lookup_field: lookup_value} - self.object = serializer.save(extras=extras) + serializer.save(extras=extras) return Response(serializer.data, status=status.HTTP_201_CREATED) - self.object = serializer.save() - return Response(serializer.data, status=status.HTTP_200_OK) + serializer.save() + return Response(serializer.data) def partial_update(self, request, *args, **kwargs): kwargs['partial'] = True @@ -103,15 +126,3 @@ class UpdateModelMixin(object): # PATCH requests where the object does not exist should still # return a 404 response. raise - - -class DestroyModelMixin(object): - """ - Destroy a model instance. - """ - def destroy(self, request, *args, **kwargs): - obj = self.get_object() - self.pre_delete(obj) - obj.delete() - self.post_delete(obj) - return Response(status=status.HTTP_204_NO_CONTENT) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index c38d89682..49eb6ce91 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -13,7 +13,8 @@ response content is handled by parsers and renderers. from django.db import models from django.utils import six from collections import namedtuple, OrderedDict -from rest_framework.fields import empty, set_value, Field, SkipField, ValidationError +from rest_framework.exceptions import ValidationError +from rest_framework.fields import empty, set_value, Field, SkipField from rest_framework.settings import api_settings from rest_framework.utils import html import copy @@ -34,43 +35,53 @@ FieldResult = namedtuple('FieldResult', ['field', 'value', 'error']) class BaseSerializer(Field): + """ + The BaseSerializer class provides a minimal class which may be used + for writing custom serializer implementations. + """ + def __init__(self, instance=None, data=None, **kwargs): super(BaseSerializer, self).__init__(**kwargs) self.instance = instance self._initial_data = data def to_native(self, data): - raise NotImplementedError() + raise NotImplementedError('`to_native()` must be implemented.') def to_primative(self, instance): - raise NotImplementedError() + raise NotImplementedError('`to_primative()` must be implemented.') - def update(self, instance): - raise NotImplementedError() + def update(self, instance, attrs): + raise NotImplementedError('`update()` must be implemented.') - def create(self): - raise NotImplementedError() + def create(self, attrs): + raise NotImplementedError('`create()` must be implemented.') def save(self, extras=None): if extras is not None: - self._validated_data.update(extras) + self.validated_data.update(extras) if self.instance is not None: - self.update(self.instance) + self.update(self.instance, self._validated_data) else: - self.instance = self.create() + self.instance = self.create(self._validated_data) return self.instance - def is_valid(self): - try: - self._validated_data = self.to_native(self._initial_data) - except ValidationError as exc: - self._validated_data = {} - self._errors = exc.args[0] - return False - self._errors = {} - return True + def is_valid(self, raise_exception=False): + if not hasattr(self, '_validated_data'): + try: + self._validated_data = self.to_native(self._initial_data) + except ValidationError as exc: + self._validated_data = {} + self._errors = exc.detail + else: + self._errors = {} + + if self._errors and raise_exception: + raise ValidationError(self._errors) + + return not bool(self._errors) @property def data(self): @@ -184,14 +195,20 @@ class Serializer(BaseSerializer): """ Dict of native values <- Dict of primitive datatypes. """ + if not isinstance(data, dict): + raise ValidationError({'non_field_errors': ['Invalid data']}) + ret = {} errors = {} fields = [field for field in self.fields.values() if not field.read_only] for field in fields: + validate_method = getattr(self, 'validate_' + field.field_name, None) primitive_value = field.get_value(data) try: validated_value = field.validate(primitive_value) + if validate_method is not None: + validated_value = validate_method(validated_value) except ValidationError as exc: errors[field.field_name] = str(exc) except SkipField: @@ -202,6 +219,7 @@ class Serializer(BaseSerializer): if errors: raise ValidationError(errors) + # TODO: 'Non field errors' return self.validate(ret) def to_primative(self, instance): @@ -340,12 +358,12 @@ class ModelSerializer(Serializer): self.opts = self._options_class(self.Meta) super(ModelSerializer, self).__init__(*args, **kwargs) - def create(self): + def create(self, attrs): ModelClass = self.opts.model - return ModelClass.objects.create(**self.validated_data) + return ModelClass.objects.create(**attrs) - def update(self, obj): - for attr, value in self.validated_data.items(): + def update(self, obj, attrs): + for attr, value in attrs.items(): setattr(obj, attr, value) obj.save() diff --git a/tests/test_generics.py b/tests/test_generics.py index 55f361b24..1b00c351a 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -360,18 +360,15 @@ class TestInstanceView(TestCase): def test_put_to_deleted_instance(self): """ - PUT requests to RetrieveUpdateDestroyAPIView should create an object - if it does not currently exist. + PUT requests to RetrieveUpdateDestroyAPIView should return 404 if + an object does not currently exist. """ self.objects.get(id=1).delete() data = {'text': 'foobar'} request = factory.put('/1', data, format='json') - with self.assertNumQueries(2): + with self.assertNumQueries(1): response = self.view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_201_CREATED) - self.assertEqual(response.data, {'id': 1, 'text': 'foobar'}) - updated = self.objects.get(id=1) - self.assertEqual(updated.text, 'foobar') + self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) def test_put_to_filtered_out_instance(self): """ @@ -382,35 +379,7 @@ class TestInstanceView(TestCase): filtered_out_pk = BasicModel.objects.filter(text='filtered out')[0].pk request = factory.put('/{0}'.format(filtered_out_pk), data, format='json') response = self.view(request, pk=filtered_out_pk).render() - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - - def test_put_as_create_on_id_based_url(self): - """ - PUT requests to RetrieveUpdateDestroyAPIView should create an object - at the requested url if it doesn't exist. - """ - data = {'text': 'foobar'} - # pk fields can not be created on demand, only the database can set the pk for a new object - request = factory.put('/5', data, format='json') - with self.assertNumQueries(2): - response = self.view(request, pk=5).render() - self.assertEqual(response.status_code, status.HTTP_201_CREATED) - new_obj = self.objects.get(pk=5) - self.assertEqual(new_obj.text, 'foobar') - - def test_put_as_create_on_slug_based_url(self): - """ - PUT requests to RetrieveUpdateDestroyAPIView should create an object - at the requested url if possible, else return HTTP_403_FORBIDDEN error-response. - """ - data = {'text': 'foobar'} - request = factory.put('/test_slug', data, format='json') - with self.assertNumQueries(2): - response = self.slug_based_view(request, slug='test_slug').render() - self.assertEqual(response.status_code, status.HTTP_201_CREATED) - self.assertEqual(response.data, {'slug': 'test_slug', 'text': 'foobar'}) - new_obj = SlugBasedModel.objects.get(slug='test_slug') - self.assertEqual(new_obj.text, 'foobar') + self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) def test_patch_cannot_create_an_object(self): """ diff --git a/tests/test_validation.py b/tests/test_validation.py index f62d9068b..fcfc853dc 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -48,11 +48,10 @@ class ShouldValidateModel(models.Model): class ShouldValidateModelSerializer(serializers.ModelSerializer): renamed = serializers.CharField(source='should_validate_field', required=False) - def validate_renamed(self, attrs, source): - value = attrs[source] + def validate_renamed(self, value): if len(value) < 3: raise serializers.ValidationError('Minimum 3 characters.') - return attrs + return value class Meta: model = ShouldValidateModel diff --git a/tests/test_write_only_fields.py b/tests/test_write_only_fields.py index aabb18d6a..367048ace 100644 --- a/tests/test_write_only_fields.py +++ b/tests/test_write_only_fields.py @@ -1,42 +1,41 @@ -from django.db import models -from django.test import TestCase -from rest_framework import serializers +# from django.db import models +# from django.test import TestCase +# from rest_framework import serializers -class ExampleModel(models.Model): - email = models.EmailField(max_length=100) - password = models.CharField(max_length=100) +# class ExampleModel(models.Model): +# email = models.EmailField(max_length=100) +# password = models.CharField(max_length=100) -class WriteOnlyFieldTests(TestCase): - def test_write_only_fields(self): - class ExampleSerializer(serializers.Serializer): - email = serializers.EmailField() - password = serializers.CharField(write_only=True) +# class WriteOnlyFieldTests(TestCase): +# def test_write_only_fields(self): +# class ExampleSerializer(serializers.Serializer): +# email = serializers.EmailField() +# password = serializers.CharField(write_only=True) - data = { - 'email': 'foo@example.com', - 'password': '123' - } - serializer = ExampleSerializer(data=data) - self.assertTrue(serializer.is_valid()) - self.assertEquals(serializer.object, data) - self.assertEquals(serializer.data, {'email': 'foo@example.com'}) +# data = { +# 'email': 'foo@example.com', +# 'password': '123' +# } +# serializer = ExampleSerializer(data=data) +# self.assertTrue(serializer.is_valid()) +# self.assertEquals(serializer.validated_data, data) +# self.assertEquals(serializer.data, {'email': 'foo@example.com'}) - def test_write_only_fields_meta(self): - class ExampleSerializer(serializers.ModelSerializer): - class Meta: - model = ExampleModel - fields = ('email', 'password') - write_only_fields = ('password',) +# def test_write_only_fields_meta(self): +# class ExampleSerializer(serializers.ModelSerializer): +# class Meta: +# model = ExampleModel +# fields = ('email', 'password') +# write_only_fields = ('password',) - data = { - 'email': 'foo@example.com', - 'password': '123' - } - serializer = ExampleSerializer(data=data) - self.assertTrue(serializer.is_valid()) - self.assertTrue(isinstance(serializer.object, ExampleModel)) - self.assertEquals(serializer.object.email, data['email']) - self.assertEquals(serializer.object.password, data['password']) - self.assertEquals(serializer.data, {'email': 'foo@example.com'}) +# data = { +# 'email': 'foo@example.com', +# 'password': '123' +# } +# serializer = ExampleSerializer(data=data) +# self.assertTrue(serializer.is_valid()) +# self.assertTrue(isinstance(serializer.object, ExampleModel)) +# self.assertEquals(serializer.validated_data, data) +# self.assertEquals(serializer.data, {'email': 'foo@example.com'}) From 5add55abc8282d9a466a3c30e7b67217eb8f3bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 5 Sep 2014 11:33:54 -0700 Subject: [PATCH 0781/1652] Failing test case for #1432 --- tests/test_filters.py | 69 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 12 deletions(-) diff --git a/tests/test_filters.py b/tests/test_filters.py index 47bffd436..5722fd7c5 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -408,16 +408,61 @@ class SearchFilterTests(TestCase): ) -class OrdringFilterModel(models.Model): +class OrderingFilterModel(models.Model): title = models.CharField(max_length=20) text = models.CharField(max_length=100) class OrderingFilterRelatedModel(models.Model): - related_object = models.ForeignKey(OrdringFilterModel, + related_object = models.ForeignKey(OrderingFilterModel, related_name="relateds") +class DjangoFilterOrderingModel(models.Model): + date = models.DateField() + text = models.CharField(max_length=10) + + class Meta: + ordering = ['-date'] + + +class DjangoFilterOrderingTests(TestCase): + def setUp(self): + data = [{ + 'date': datetime.date(2012, 10, 8), + 'text': 'abc' + }, { + 'date': datetime.date(2013, 10, 8), + 'text': 'bcd' + }, { + 'date': datetime.date(2014, 10, 8), + 'text': 'cde' + }] + + for d in data: + DjangoFilterOrderingModel.objects.create(**d) + + def test_default_ordering(self): + class DjangoFilterOrderingView(generics.ListAPIView): + model = DjangoFilterOrderingModel + filter_backends = (filters.DjangoFilterBackend,) + filter_fields = ['text'] + ordering = ('-date',) + + view = DjangoFilterOrderingView.as_view() + request = factory.get('/') + response = view(request) + + self.assertEqual( + response.data, + [ + {'id': 3, 'date': datetime.date(2014, 10, 8), 'text': 'cde'}, + {'id': 2, 'date': datetime.date(2013, 10, 8), 'text': 'bcd'}, + {'id': 1, 'date': datetime.date(2012, 10, 8), 'text': 'abc'} + ] + ) + + class OrderingFilterTests(TestCase): def setUp(self): # Sequence of title/text is: @@ -436,11 +481,11 @@ class OrderingFilterTests(TestCase): chr(idx + ord('b')) + chr(idx + ord('c')) ) - OrdringFilterModel(title=title, text=text).save() + OrderingFilterModel(title=title, text=text).save() def test_ordering(self): class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + model = OrderingFilterModel filter_backends = (filters.OrderingFilter,) ordering = ('title',) ordering_fields = ('text',) @@ -459,7 +504,7 @@ class OrderingFilterTests(TestCase): def test_reverse_ordering(self): class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + model = OrderingFilterModel filter_backends = (filters.OrderingFilter,) ordering = ('title',) ordering_fields = ('text',) @@ -478,7 +523,7 @@ class OrderingFilterTests(TestCase): def test_incorrectfield_ordering(self): class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + model = OrderingFilterModel filter_backends = (filters.OrderingFilter,) ordering = ('title',) ordering_fields = ('text',) @@ -497,7 +542,7 @@ class OrderingFilterTests(TestCase): def test_default_ordering(self): class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + model = OrderingFilterModel filter_backends = (filters.OrderingFilter,) ordering = ('title',) oredering_fields = ('text',) @@ -516,7 +561,7 @@ class OrderingFilterTests(TestCase): def test_default_ordering_using_string(self): class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + model = OrderingFilterModel filter_backends = (filters.OrderingFilter,) ordering = 'title' ordering_fields = ('text',) @@ -536,7 +581,7 @@ class OrderingFilterTests(TestCase): def test_ordering_by_aggregate_field(self): # create some related models to aggregate order by num_objs = [2, 5, 3] - for obj, num_relateds in zip(OrdringFilterModel.objects.all(), + for obj, num_relateds in zip(OrderingFilterModel.objects.all(), num_objs): for _ in range(num_relateds): new_related = OrderingFilterRelatedModel( @@ -545,11 +590,11 @@ class OrderingFilterTests(TestCase): new_related.save() class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + model = OrderingFilterModel filter_backends = (filters.OrderingFilter,) ordering = 'title' ordering_fields = '__all__' - queryset = OrdringFilterModel.objects.all().annotate( + queryset = OrderingFilterModel.objects.all().annotate( models.Count("relateds")) view = OrderingListView.as_view() @@ -567,7 +612,7 @@ class OrderingFilterTests(TestCase): def test_ordering_with_nonstandard_ordering_param(self): with temporary_setting('ORDERING_PARAM', 'order', filters): class OrderingListView(generics.ListAPIView): - model = OrdringFilterModel + model = OrderingFilterModel filter_backends = (filters.OrderingFilter,) ordering = ('title',) ordering_fields = ('text',) From ab213cbc41114ec9417630d5298546102a706b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 5 Sep 2014 11:43:49 -0700 Subject: [PATCH 0782/1652] Remove order_by from AutoFilterSet --- rest_framework/filters.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index e20800130..c580f9351 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -56,7 +56,6 @@ class DjangoFilterBackend(BaseFilterBackend): class Meta: model = queryset.model fields = filter_fields - order_by = True return AutoFilterSet return None From 8a9f34b838adc285f2d877846fda19349e28ab30 Mon Sep 17 00:00:00 2001 From: Vladislav Vlastovskiy <me@vlastv.ru> Date: Mon, 14 Apr 2014 14:18:10 +0400 Subject: [PATCH 0783/1652] Added get filename as encoded This filename described in RFC 6266 --- rest_framework/parsers.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index aa4fd3f11..f285ac975 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -11,7 +11,7 @@ from django.http import QueryDict from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter from django.utils import six -from rest_framework.compat import etree, yaml, force_text +from rest_framework.compat import etree, yaml, force_text, urlparse from rest_framework.exceptions import ParseError from rest_framework import renderers import json @@ -290,6 +290,17 @@ class FileUploadParser(BaseParser): try: meta = parser_context['request'].META disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8')) - return force_text(disposition[1]['filename']) + + filename = force_text(disposition[1]['filename']) + + if 'filename*' in disposition[1]: + filename_encoded = force_text(disposition[1]['filename*']) + try: + charset, filename_encoded = filename_encoded.split('\'\'', 1) + filename = urlparse.unquote(filename_encoded, charset) + except (ValueError, LookupError): + pass + + return filename except (AttributeError, KeyError): pass From 6e90dad8e3155deb8bc27c4b9e764b90fde24e4a Mon Sep 17 00:00:00 2001 From: Vladislav Vlastovskiy <me@vlastv.ru> Date: Mon, 14 Apr 2014 14:25:30 +0400 Subject: [PATCH 0784/1652] Added test for encoded filename --- tests/test_parsers.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/test_parsers.py b/tests/test_parsers.py index 8af906772..aafb431a2 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -113,3 +113,27 @@ class TestFileUploadParser(TestCase): parser = FileUploadParser() filename = parser.get_filename(self.stream, None, self.parser_context) self.assertEqual(filename, 'file.txt') + + def test_get_encoded_filename(self): + parser = FileUploadParser() + + self.__replace_content_disposition('inline; filename*=utf-8\'\'ÀĥƦ.txt') + filename = parser.get_filename(self.stream, None, self.parser_context) + self.assertEqual(filename, 'ÀĥƦ.txt') + + self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8\'\'ÀĥƦ.txt') + filename = parser.get_filename(self.stream, None, self.parser_context) + self.assertEqual(filename, 'ÀĥƦ.txt') + + self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8--ÀĥƦ.txt') + filename = parser.get_filename(self.stream, None, self.parser_context) + self.assertEqual(filename, 'fallback.txt') + + self.__replace_content_disposition('inline; filename=fallback.txt; filename*=WRONG\'\'ÀĥƦ.txt') + filename = parser.get_filename(self.stream, None, self.parser_context) + self.assertEqual(filename, 'fallback.txt') + + def __replace_content_disposition(self, disposition): + self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition + + From 644f9b54219c884b59793eafbbdafa0d1175f1ab Mon Sep 17 00:00:00 2001 From: Vladislav Vlastovskiy <me@vlastv.ru> Date: Mon, 14 Apr 2014 15:02:52 +0400 Subject: [PATCH 0785/1652] Removed assert for wrong charset --- tests/test_parsers.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/test_parsers.py b/tests/test_parsers.py index aafb431a2..d19b46519 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -1,3 +1,5 @@ +#-*- coding: utf-8 -*- + from __future__ import unicode_literals from rest_framework.compat import StringIO from django import forms @@ -129,10 +131,6 @@ class TestFileUploadParser(TestCase): filename = parser.get_filename(self.stream, None, self.parser_context) self.assertEqual(filename, 'fallback.txt') - self.__replace_content_disposition('inline; filename=fallback.txt; filename*=WRONG\'\'ÀĥƦ.txt') - filename = parser.get_filename(self.stream, None, self.parser_context) - self.assertEqual(filename, 'fallback.txt') - def __replace_content_disposition(self, disposition): self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition From bcca9ed0fd0af251e5a64be0ab7865b396d6b4b8 Mon Sep 17 00:00:00 2001 From: Vladislav Vlastovskiy <me@vlastv.ru> Date: Mon, 14 Apr 2014 15:03:50 +0400 Subject: [PATCH 0786/1652] Removed use encoding available only in py3 --- rest_framework/parsers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index f285ac975..c67f0088c 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -291,15 +291,15 @@ class FileUploadParser(BaseParser): meta = parser_context['request'].META disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8')) - filename = force_text(disposition[1]['filename']) - if 'filename*' in disposition[1]: filename_encoded = force_text(disposition[1]['filename*']) try: charset, filename_encoded = filename_encoded.split('\'\'', 1) - filename = urlparse.unquote(filename_encoded, charset) + filename = urlparse.unquote(filename_encoded) except (ValueError, LookupError): - pass + filename = force_text(disposition[1]['filename']) + else: + filename = force_text(disposition[1]['filename']) return filename except (AttributeError, KeyError): From bcd8a24db1d7022cac3d11641c563f0bfdbb8e97 Mon Sep 17 00:00:00 2001 From: Jason Bittel <jason.bittel@gmail.com> Date: Fri, 5 Sep 2014 14:56:54 -0700 Subject: [PATCH 0787/1652] Refactor encoded filename feature per #1531 --- rest_framework/parsers.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index c67f0088c..82caa6f6d 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -289,18 +289,22 @@ class FileUploadParser(BaseParser): try: meta = parser_context['request'].META - disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8')) - - if 'filename*' in disposition[1]: - filename_encoded = force_text(disposition[1]['filename*']) - try: - charset, filename_encoded = filename_encoded.split('\'\'', 1) - filename = urlparse.unquote(filename_encoded) - except (ValueError, LookupError): - filename = force_text(disposition[1]['filename']) - else: - filename = force_text(disposition[1]['filename']) - - return filename + disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))[1] + if 'filename*' in disposition: + return self.get_encoded_filename(disposition) + return force_text(disposition['filename']) except (AttributeError, KeyError): pass + + def get_encoded_filename(self, disposition): + """ + Handle encoded filenames per RFC6266. See also: + http://tools.ietf.org/html/rfc2231#section-4 + """ + encoded_filename = force_text(disposition['filename*']) + try: + charset, filename = encoded_filename.split('\'\'', 1) + filename = urlparse.unquote(filename) + except (ValueError, LookupError): + filename = force_text(disposition['filename']) + return filename From c8e475023c527f3ad22258c4ae0e0b5d992cb98b Mon Sep 17 00:00:00 2001 From: Jason Bittel <jason.bittel@gmail.com> Date: Fri, 5 Sep 2014 15:22:43 -0700 Subject: [PATCH 0788/1652] Fix encoded filename parsing to allow for lang --- rest_framework/parsers.py | 2 +- tests/test_parsers.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index 82caa6f6d..161bc8090 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -303,7 +303,7 @@ class FileUploadParser(BaseParser): """ encoded_filename = force_text(disposition['filename*']) try: - charset, filename = encoded_filename.split('\'\'', 1) + charset, lang, filename = encoded_filename.split('\'', 2) filename = urlparse.unquote(filename) except (ValueError, LookupError): filename = force_text(disposition['filename']) diff --git a/tests/test_parsers.py b/tests/test_parsers.py index d19b46519..bc84f1c71 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -127,6 +127,10 @@ class TestFileUploadParser(TestCase): filename = parser.get_filename(self.stream, None, self.parser_context) self.assertEqual(filename, 'ÀĥƦ.txt') + self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8\'en-us\'ÀĥƦ.txt') + filename = parser.get_filename(self.stream, None, self.parser_context) + self.assertEqual(filename, 'ÀĥƦ.txt') + self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8--ÀĥƦ.txt') filename = parser.get_filename(self.stream, None, self.parser_context) self.assertEqual(filename, 'fallback.txt') From baa518cd890103173dd18857c609432bd47c6be4 Mon Sep 17 00:00:00 2001 From: Jharrod LaFon <jlafon@eyesopen.com> Date: Fri, 5 Sep 2014 15:30:01 -0700 Subject: [PATCH 0789/1652] Moved OAuth support out of DRF and into a separate package, per #1767 --- .travis.yml | 3 - README.md | 2 +- docs/api-guide/authentication.md | 99 ------- docs/api-guide/permissions.md | 17 -- docs/index.md | 11 +- requirements-test.txt | 3 - rest_framework/authentication.py | 183 ------------- rest_framework/compat.py | 51 ---- rest_framework/permissions.py | 28 +- tests/conftest.py | 20 -- tests/settings.py | 21 -- tests/test_authentication.py | 430 +------------------------------ 12 files changed, 6 insertions(+), 862 deletions(-) diff --git a/.travis.yml b/.travis.yml index e768e1468..017e72363 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,6 @@ install: - pip install django-guardian==1.2.3 - pip install pytest-django==2.6.1 - pip install flake8==2.2.2 - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.2.4; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi" - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi" - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; fi" - "if [[ ${DJANGO} == 'django==1.7' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi" diff --git a/README.md b/README.md index 63513f758..ebc83bf5c 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Django REST framework is a powerful and flexible toolkit for building Web APIs. Some reasons you might want to use REST framework: * The [Web browseable API][sandbox] is a huge useability win for your developers. -* [Authentication policies][authentication] including [OAuth1a][oauth1-section] and [OAuth2][oauth2-section] out of the box. +* [Authentication policies][authentication] including [OAuth1a][oauth1-section] and [OAuth2][oauth2-section] through the rest-framework-oauth package. * [Serialization][serializers] that supports both [ORM][modelserializer-section] and [non-ORM][serializer-section] data sources. * Customizable all the way down - just use [regular function-based views][functionview-section] if you don't need the [more][generic-views] [powerful][viewsets] [features][routers]. * [Extensive documentation][index], and [great community support][group]. diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 343466eee..3d4e0f722 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -247,105 +247,6 @@ Unauthenticated responses that are denied permission will result in an `HTTP 403 If you're using an AJAX style API with SessionAuthentication, you'll need to make sure you include a valid CSRF token for any "unsafe" HTTP method calls, such as `PUT`, `PATCH`, `POST` or `DELETE` requests. See the [Django CSRF documentation][csrf-ajax] for more details. -## OAuthAuthentication - -This authentication uses [OAuth 1.0a][oauth-1.0a] authentication scheme. OAuth 1.0a provides signature validation which provides a reasonable level of security over plain non-HTTPS connections. However, it may also be considered more complicated than OAuth2, as it requires clients to sign their requests. - -This authentication class depends on the optional `django-oauth-plus` and `oauth2` packages. In order to make it work you must install these packages and add `oauth_provider` to your `INSTALLED_APPS`: - - INSTALLED_APPS = ( - ... - `oauth_provider`, - ) - -Don't forget to run `syncdb` once you've added the package. - - python manage.py syncdb - -#### Getting started with django-oauth-plus - -The OAuthAuthentication class only provides token verification and signature validation for requests. It doesn't provide authorization flow for your clients. You still need to implement your own views for accessing and authorizing tokens. - -The `django-oauth-plus` package provides simple foundation for classic 'three-legged' oauth flow. Please refer to [the documentation][django-oauth-plus] for more details. - -## OAuth2Authentication - -This authentication uses [OAuth 2.0][rfc6749] authentication scheme. OAuth2 is more simple to work with than OAuth1, and provides much better security than simple token authentication. It is an unauthenticated scheme, and requires you to use an HTTPS connection. - -This authentication class depends on the optional [django-oauth2-provider][django-oauth2-provider] project. In order to make it work you must install this package and add `provider` and `provider.oauth2` to your `INSTALLED_APPS`: - - INSTALLED_APPS = ( - ... - 'provider', - 'provider.oauth2', - ) - -Then add `OAuth2Authentication` to your global `DEFAULT_AUTHENTICATION` setting: - - 'DEFAULT_AUTHENTICATION_CLASSES': ( - 'rest_framework.authentication.OAuth2Authentication', - ), - -You must also include the following in your root `urls.py` module: - - url(r'^oauth2/', include('provider.oauth2.urls', namespace='oauth2')), - -Note that the `namespace='oauth2'` argument is required. - -Finally, sync your database. - - python manage.py syncdb - python manage.py migrate - ---- - -**Note:** If you use `OAuth2Authentication` in production you must ensure that your API is only available over `https`. - ---- - -#### Getting started with django-oauth2-provider - -The `OAuth2Authentication` class only provides token verification for requests. It doesn't provide authorization flow for your clients. - -The OAuth 2 authorization flow is taken care by the [django-oauth2-provider][django-oauth2-provider] dependency. A walkthrough is given here, but for more details you should refer to [the documentation][django-oauth2-provider-docs]. - -To get started: - -##### 1. Create a client - -You can create a client, either through the shell, or by using the Django admin. - -Go to the admin panel and create a new `Provider.Client` entry. It will create the `client_id` and `client_secret` properties for you. - -##### 2. Request an access token - -To request an access token, submit a `POST` request to the url `/oauth2/access_token` with the following fields: - -* `client_id` the client id you've just configured at the previous step. -* `client_secret` again configured at the previous step. -* `username` the username with which you want to log in. -* `password` well, that speaks for itself. - -You can use the command line to test that your local configuration is working: - - curl -X POST -d "client_id=YOUR_CLIENT_ID&client_secret=YOUR_CLIENT_SECRET&grant_type=password&username=YOUR_USERNAME&password=YOUR_PASSWORD" http://localhost:8000/oauth2/access_token/ - -You should get a response that looks something like this: - - {"access_token": "<your-access-token>", "scope": "read", "expires_in": 86399, "refresh_token": "<your-refresh-token>"} - -##### 3. Access the API - -The only thing needed to make the `OAuth2Authentication` class work is to insert the `access_token` you've received in the `Authorization` request header. - -The command line to test the authentication looks like: - - curl -H "Authorization: Bearer <your-access-token>" http://localhost:8000/api/ - -### Alternative OAuth 2 implementations - -Note that [Django OAuth Toolkit][django-oauth-toolkit] is an alternative external package that also includes OAuth 2.0 support for REST framework. - --- # Custom authentication diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index e867a4569..a32db4a2d 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -148,21 +148,6 @@ Note that `DjangoObjectPermissions` **does not** require the `django-guardian` p As with `DjangoModelPermissions` you can use custom model permissions by overriding `DjangoModelPermissions` and setting the `.perms_map` property. Refer to the source code for details. Note that if you add a custom `view` permission for `GET`, `HEAD` and `OPTIONS` requests, you'll probably also want to consider adding the `DjangoObjectPermissionsFilter` class to ensure that list endpoints only return results including objects for which the user has appropriate view permissions. -## TokenHasReadWriteScope - -This permission class is intended for use with either of the `OAuthAuthentication` and `OAuth2Authentication` classes, and ties into the scoping that their backends provide. - -Requests with a safe methods of `GET`, `OPTIONS` or `HEAD` will be allowed if the authenticated token has read permission. - -Requests for `POST`, `PUT`, `PATCH` and `DELETE` will be allowed if the authenticated token has write permission. - -This permission class relies on the implementations of the [django-oauth-plus][django-oauth-plus] and [django-oauth2-provider][django-oauth2-provider] libraries, which both provide limited support for controlling the scope of access tokens: - -* `django-oauth-plus`: Tokens are associated with a `Resource` class which has a `name`, `url` and `is_readonly` properties. -* `django-oauth2-provider`: Tokens are associated with a bitwise `scope` attribute, that defaults to providing bitwise values for `read` and/or `write`. - -If you require more advanced scoping for your API, such as restricting tokens to accessing a subset of functionality of your API then you will need to provide a custom permission class. See the source of the `django-oauth-plus` or `django-oauth2-provider` package for more details on scoping token access. - --- # Custom permissions @@ -254,8 +239,6 @@ The [REST Condition][rest-condition] package is another extension for building c [objectpermissions]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#handling-object-permissions [guardian]: https://github.com/lukaszb/django-guardian [get_objects_for_user]: http://pythonhosted.org/django-guardian/api/guardian.shortcuts.html#get-objects-for-user -[django-oauth-plus]: http://code.larlet.fr/django-oauth-plus -[django-oauth2-provider]: https://github.com/caffeinehit/django-oauth2-provider [2.2-announcement]: ../topics/2.2-announcement.md [filtering]: filtering.md [drf-any-permissions]: https://github.com/kevin-brown/drf-any-permissions diff --git a/docs/index.md b/docs/index.md index 1888bfe4b..7dd35feab 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ Django REST framework is a powerful and flexible toolkit that makes it easy to b Some reasons you might want to use REST framework: * The [Web browseable API][sandbox] is a huge usability win for your developers. -* [Authentication policies][authentication] including [OAuth1a][oauth1-section] and [OAuth2][oauth2-section] out of the box. +* [Authentication policies][authentication] including [OAuth1a][oauth1-section] and [OAuth2][oauth2-section] through the rest-framework-oauth package. * [Serialization][serializers] that supports both [ORM][modelserializer-section] and [non-ORM][serializer-section] data sources. * Customizable all the way down - just use [regular function-based views][functionview-section] if you don't need the [more][generic-views] [powerful][viewsets] [features][routers]. * [Extensive documentation][index], and [great community support][group]. @@ -58,12 +58,9 @@ The following packages are optional: * [PyYAML][yaml] (3.10+) - YAML content-type support. * [defusedxml][defusedxml] (0.3+) - XML content-type support. * [django-filter][django-filter] (0.5.4+) - Filtering support. -* [django-oauth-plus][django-oauth-plus] (2.0+) and [oauth2][oauth2] (1.5.211+) - OAuth 1.0a support. -* [django-oauth2-provider][django-oauth2-provider] (0.2.3+) - OAuth 2.0 support. +* [django-restframework-oauth][django-restframework-oauth] package for OAuth 1.0a and 2.0 support. * [django-guardian][django-guardian] (1.1.1+) - Object level permissions support. -**Note**: The `oauth2` Python package is badly misnamed, and actually provides OAuth 1.0a support. Also note that packages required for both OAuth 1.0a, and OAuth 2.0 are not yet Python 3 compatible. - ## Installation Install using `pip`, including any optional packages you want... @@ -260,9 +257,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [yaml]: http://pypi.python.org/pypi/PyYAML [defusedxml]: https://pypi.python.org/pypi/defusedxml [django-filter]: http://pypi.python.org/pypi/django-filter -[oauth2]: https://github.com/simplegeo/python-oauth2 -[django-oauth-plus]: https://bitbucket.org/david/django-oauth-plus/wiki/Home -[django-oauth2-provider]: https://github.com/caffeinehit/django-oauth2-provider +[django-restframework-oauth]: https://github.com/jlafon/django-rest-framework-oauth [django-guardian]: https://github.com/lukaszb/django-guardian [0.4]: https://github.com/tomchristie/django-rest-framework/tree/0.4.X [image]: img/quickstart.png diff --git a/requirements-test.txt b/requirements-test.txt index 411daeba2..a90a1361a 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -9,7 +9,4 @@ markdown>=2.1.0 PyYAML>=3.10 defusedxml>=0.3 django-filter>=0.5.4 -django-oauth-plus>=2.2.1 -oauth2>=1.5.211 -django-oauth2-provider>=0.2.4 Pillow==2.3.0 diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index f3fec05ec..ff1c44e0b 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -3,14 +3,9 @@ Provides various authentication policies. """ from __future__ import unicode_literals import base64 - from django.contrib.auth import authenticate -from django.core.exceptions import ImproperlyConfigured from django.middleware.csrf import CsrfViewMiddleware -from django.conf import settings from rest_framework import exceptions, HTTP_HEADER_ENCODING -from rest_framework.compat import oauth, oauth_provider, oauth_provider_store -from rest_framework.compat import oauth2_provider, provider_now, check_nonce from rest_framework.authtoken.models import Token @@ -178,181 +173,3 @@ class TokenAuthentication(BaseAuthentication): def authenticate_header(self, request): return 'Token' - - -class OAuthAuthentication(BaseAuthentication): - """ - OAuth 1.0a authentication backend using `django-oauth-plus` and `oauth2`. - - Note: The `oauth2` package actually provides oauth1.0a support. Urg. - We import it from the `compat` module as `oauth`. - """ - www_authenticate_realm = 'api' - - def __init__(self, *args, **kwargs): - super(OAuthAuthentication, self).__init__(*args, **kwargs) - - if oauth is None: - raise ImproperlyConfigured( - "The 'oauth2' package could not be imported." - "It is required for use with the 'OAuthAuthentication' class.") - - if oauth_provider is None: - raise ImproperlyConfigured( - "The 'django-oauth-plus' package could not be imported." - "It is required for use with the 'OAuthAuthentication' class.") - - def authenticate(self, request): - """ - Returns two-tuple of (user, token) if authentication succeeds, - or None otherwise. - """ - try: - oauth_request = oauth_provider.utils.get_oauth_request(request) - except oauth.Error as err: - raise exceptions.AuthenticationFailed(err.message) - - if not oauth_request: - return None - - oauth_params = oauth_provider.consts.OAUTH_PARAMETERS_NAMES - - found = any(param for param in oauth_params if param in oauth_request) - missing = list(param for param in oauth_params if param not in oauth_request) - - if not found: - # OAuth authentication was not attempted. - return None - - if missing: - # OAuth was attempted but missing parameters. - msg = 'Missing parameters: %s' % (', '.join(missing)) - raise exceptions.AuthenticationFailed(msg) - - if not self.check_nonce(request, oauth_request): - msg = 'Nonce check failed' - raise exceptions.AuthenticationFailed(msg) - - try: - consumer_key = oauth_request.get_parameter('oauth_consumer_key') - consumer = oauth_provider_store.get_consumer(request, oauth_request, consumer_key) - except oauth_provider.store.InvalidConsumerError: - msg = 'Invalid consumer token: %s' % oauth_request.get_parameter('oauth_consumer_key') - raise exceptions.AuthenticationFailed(msg) - - if consumer.status != oauth_provider.consts.ACCEPTED: - msg = 'Invalid consumer key status: %s' % consumer.get_status_display() - raise exceptions.AuthenticationFailed(msg) - - try: - token_param = oauth_request.get_parameter('oauth_token') - token = oauth_provider_store.get_access_token(request, oauth_request, consumer, token_param) - except oauth_provider.store.InvalidTokenError: - msg = 'Invalid access token: %s' % oauth_request.get_parameter('oauth_token') - raise exceptions.AuthenticationFailed(msg) - - try: - self.validate_token(request, consumer, token) - except oauth.Error as err: - raise exceptions.AuthenticationFailed(err.message) - - user = token.user - - if not user.is_active: - msg = 'User inactive or deleted: %s' % user.username - raise exceptions.AuthenticationFailed(msg) - - return (token.user, token) - - def authenticate_header(self, request): - """ - If permission is denied, return a '401 Unauthorized' response, - with an appropraite 'WWW-Authenticate' header. - """ - return 'OAuth realm="%s"' % self.www_authenticate_realm - - def validate_token(self, request, consumer, token): - """ - Check the token and raise an `oauth.Error` exception if invalid. - """ - oauth_server, oauth_request = oauth_provider.utils.initialize_server_request(request) - oauth_server.verify_request(oauth_request, consumer, token) - - def check_nonce(self, request, oauth_request): - """ - Checks nonce of request, and return True if valid. - """ - oauth_nonce = oauth_request['oauth_nonce'] - oauth_timestamp = oauth_request['oauth_timestamp'] - return check_nonce(request, oauth_request, oauth_nonce, oauth_timestamp) - - -class OAuth2Authentication(BaseAuthentication): - """ - OAuth 2 authentication backend using `django-oauth2-provider` - """ - www_authenticate_realm = 'api' - allow_query_params_token = settings.DEBUG - - def __init__(self, *args, **kwargs): - super(OAuth2Authentication, self).__init__(*args, **kwargs) - - if oauth2_provider is None: - raise ImproperlyConfigured( - "The 'django-oauth2-provider' package could not be imported. " - "It is required for use with the 'OAuth2Authentication' class.") - - def authenticate(self, request): - """ - Returns two-tuple of (user, token) if authentication succeeds, - or None otherwise. - """ - - auth = get_authorization_header(request).split() - - if len(auth) == 1: - msg = 'Invalid bearer header. No credentials provided.' - raise exceptions.AuthenticationFailed(msg) - elif len(auth) > 2: - msg = 'Invalid bearer header. Token string should not contain spaces.' - raise exceptions.AuthenticationFailed(msg) - - if auth and auth[0].lower() == b'bearer': - access_token = auth[1] - elif 'access_token' in request.POST: - access_token = request.POST['access_token'] - elif 'access_token' in request.GET and self.allow_query_params_token: - access_token = request.GET['access_token'] - else: - return None - - return self.authenticate_credentials(request, access_token) - - def authenticate_credentials(self, request, access_token): - """ - Authenticate the request, given the access token. - """ - - try: - token = oauth2_provider.oauth2.models.AccessToken.objects.select_related('user') - # provider_now switches to timezone aware datetime when - # the oauth2_provider version supports to it. - token = token.get(token=access_token, expires__gt=provider_now()) - except oauth2_provider.oauth2.models.AccessToken.DoesNotExist: - raise exceptions.AuthenticationFailed('Invalid token') - - user = token.user - - if not user.is_active: - msg = 'User inactive or deleted: %s' % user.get_username() - raise exceptions.AuthenticationFailed(msg) - - return (user, token) - - def authenticate_header(self, request): - """ - Bearer is the only finalized type currently - - Check details on the `OAuth2Authentication.authenticate` method - """ - return 'Bearer realm="%s"' % self.www_authenticate_realm diff --git a/rest_framework/compat.py b/rest_framework/compat.py index fa0f0bfb1..bc5719ef8 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -182,57 +182,6 @@ except ImportError: etree = None -# OAuth2 is optional -try: - # Note: The `oauth2` package actually provides oauth1.0a support. Urg. - import oauth2 as oauth -except ImportError: - oauth = None - - -# OAuthProvider is optional -try: - import oauth_provider - from oauth_provider.store import store as oauth_provider_store - - # check_nonce's calling signature in django-oauth-plus changes sometime - # between versions 2.0 and 2.2.1 - def check_nonce(request, oauth_request, oauth_nonce, oauth_timestamp): - check_nonce_args = inspect.getargspec(oauth_provider_store.check_nonce).args - if 'timestamp' in check_nonce_args: - return oauth_provider_store.check_nonce( - request, oauth_request, oauth_nonce, oauth_timestamp - ) - return oauth_provider_store.check_nonce( - request, oauth_request, oauth_nonce - ) - -except (ImportError, ImproperlyConfigured): - oauth_provider = None - oauth_provider_store = None - check_nonce = None - - -# OAuth 2 support is optional -try: - import provider as oauth2_provider - from provider import scope as oauth2_provider_scope - from provider import constants as oauth2_constants - if oauth2_provider.__version__ in ('0.2.3', '0.2.4'): - # 0.2.3 and 0.2.4 are supported version that do not support - # timezone aware datetimes - import datetime - provider_now = datetime.datetime.now - else: - # Any other supported version does use timezone aware datetimes - from django.utils.timezone import now as provider_now -except ImportError: - oauth2_provider = None - oauth2_provider_scope = None - oauth2_constants = None - provider_now = None - - # Handle lazy strings across Py2/Py3 from django.utils.functional import Promise diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 29f60d6de..7c4986451 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -3,8 +3,7 @@ Provides a set of pluggable permission policies. """ from __future__ import unicode_literals from django.http import Http404 -from rest_framework.compat import (get_model_name, oauth2_provider_scope, - oauth2_constants) +from rest_framework.compat import get_model_name SAFE_METHODS = ['GET', 'HEAD', 'OPTIONS'] @@ -199,28 +198,3 @@ class DjangoObjectPermissions(DjangoModelPermissions): return False return True - - -class TokenHasReadWriteScope(BasePermission): - """ - The request is authenticated as a user and the token used has the right scope - """ - - def has_permission(self, request, view): - token = request.auth - read_only = request.method in SAFE_METHODS - - if not token: - return False - - if hasattr(token, 'resource'): # OAuth 1 - return read_only or not request.auth.resource.is_readonly - elif hasattr(token, 'scope'): # OAuth 2 - required = oauth2_constants.READ if read_only else oauth2_constants.WRITE - return oauth2_provider_scope.check(required, request.auth.scope) - - assert False, ( - 'TokenHasReadWriteScope requires either the' - '`OAuthAuthentication` or `OAuth2Authentication` authentication ' - 'class to be used.' - ) diff --git a/tests/conftest.py b/tests/conftest.py index 4b33e19c1..679866215 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -47,26 +47,6 @@ def pytest_configure(): ), ) - try: - import oauth_provider # NOQA - import oauth2 # NOQA - except ImportError: - pass - else: - settings.INSTALLED_APPS += ( - 'oauth_provider', - ) - - try: - import provider # NOQA - except ImportError: - pass - else: - settings.INSTALLED_APPS += ( - 'provider', - 'provider.oauth2', - ) - # guardian is optional try: import guardian # NOQA diff --git a/tests/settings.py b/tests/settings.py index 91c9ed09e..6a01669c3 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -101,27 +101,6 @@ INSTALLED_APPS = ( 'tests.users', ) -# OAuth is optional and won't work if there is no oauth_provider & oauth2 -try: - import oauth_provider # NOQA - import oauth2 # NOQA -except ImportError: - pass -else: - INSTALLED_APPS += ( - 'oauth_provider', - ) - -try: - import provider # NOQA -except ImportError: - pass -else: - INSTALLED_APPS += ( - 'provider', - 'provider.oauth2', - ) - # guardian is optional try: import guardian # NOQA diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 32041f9c1..ece6eff5f 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -3,8 +3,7 @@ from django.conf.urls import patterns, url, include from django.contrib.auth.models import User from django.http import HttpResponse from django.test import TestCase -from django.utils import six, unittest -from django.utils.http import urlencode +from django.utils import six from rest_framework import HTTP_HEADER_ENCODING from rest_framework import exceptions from rest_framework import permissions @@ -16,17 +15,11 @@ from rest_framework.authentication import ( TokenAuthentication, BasicAuthentication, SessionAuthentication, - OAuthAuthentication, - OAuth2Authentication ) from rest_framework.authtoken.models import Token -from rest_framework.compat import oauth2_provider, oauth2_provider_scope -from rest_framework.compat import oauth, oauth_provider from rest_framework.test import APIRequestFactory, APIClient from rest_framework.views import APIView import base64 -import time -import datetime factory = APIRequestFactory() @@ -50,37 +43,10 @@ urlpatterns = patterns( (r'^basic/$', MockView.as_view(authentication_classes=[BasicAuthentication])), (r'^token/$', MockView.as_view(authentication_classes=[TokenAuthentication])), (r'^auth-token/$', 'rest_framework.authtoken.views.obtain_auth_token'), - (r'^oauth/$', MockView.as_view(authentication_classes=[OAuthAuthentication])), - ( - r'^oauth-with-scope/$', - MockView.as_view( - authentication_classes=[OAuthAuthentication], - permission_classes=[permissions.TokenHasReadWriteScope] - ) - ), url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')) ) -class OAuth2AuthenticationDebug(OAuth2Authentication): - allow_query_params_token = True - -if oauth2_provider is not None: - urlpatterns += patterns( - '', - url(r'^oauth2/', include('provider.oauth2.urls', namespace='oauth2')), - url(r'^oauth2-test/$', MockView.as_view(authentication_classes=[OAuth2Authentication])), - url(r'^oauth2-test-debug/$', MockView.as_view(authentication_classes=[OAuth2AuthenticationDebug])), - url( - r'^oauth2-with-scope-test/$', - MockView.as_view( - authentication_classes=[OAuth2Authentication], - permission_classes=[permissions.TokenHasReadWriteScope] - ) - ) - ) - - class BasicAuthTests(TestCase): """Basic authentication""" urls = 'tests.test_authentication' @@ -276,400 +242,6 @@ class IncorrectCredentialsTests(TestCase): self.assertEqual(response.data, {'detail': 'Bad credentials'}) -class OAuthTests(TestCase): - """OAuth 1.0a authentication""" - urls = 'tests.test_authentication' - - def setUp(self): - # these imports are here because oauth is optional and hiding them in try..except block or compat - # could obscure problems if something breaks - from oauth_provider.models import Consumer, Scope - from oauth_provider.models import Token as OAuthToken - from oauth_provider import consts - - self.consts = consts - - self.csrf_client = APIClient(enforce_csrf_checks=True) - self.username = 'john' - self.email = 'lennon@thebeatles.com' - self.password = 'password' - self.user = User.objects.create_user(self.username, self.email, self.password) - - self.CONSUMER_KEY = 'consumer_key' - self.CONSUMER_SECRET = 'consumer_secret' - self.TOKEN_KEY = "token_key" - self.TOKEN_SECRET = "token_secret" - - self.consumer = Consumer.objects.create( - key=self.CONSUMER_KEY, secret=self.CONSUMER_SECRET, - name='example', user=self.user, status=self.consts.ACCEPTED - ) - - self.scope = Scope.objects.create(name="resource name", url="api/") - self.token = OAuthToken.objects.create( - user=self.user, consumer=self.consumer, scope=self.scope, - token_type=OAuthToken.ACCESS, key=self.TOKEN_KEY, secret=self.TOKEN_SECRET, - is_approved=True - ) - - def _create_authorization_header(self): - params = { - 'oauth_version': "1.0", - 'oauth_nonce': oauth.generate_nonce(), - 'oauth_timestamp': int(time.time()), - 'oauth_token': self.token.key, - 'oauth_consumer_key': self.consumer.key - } - - req = oauth.Request(method="GET", url="http://example.com", parameters=params) - - signature_method = oauth.SignatureMethod_PLAINTEXT() - req.sign_request(signature_method, self.consumer, self.token) - - return req.to_header()["Authorization"] - - def _create_authorization_url_parameters(self): - params = { - 'oauth_version': "1.0", - 'oauth_nonce': oauth.generate_nonce(), - 'oauth_timestamp': int(time.time()), - 'oauth_token': self.token.key, - 'oauth_consumer_key': self.consumer.key - } - - req = oauth.Request(method="GET", url="http://example.com", parameters=params) - - signature_method = oauth.SignatureMethod_PLAINTEXT() - req.sign_request(signature_method, self.consumer, self.token) - return dict(req) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_post_form_passing_oauth(self): - """Ensure POSTing form over OAuth with correct credentials passes and does not require CSRF""" - auth = self._create_authorization_header() - response = self.csrf_client.post('/oauth/', {'example': 'example'}, HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 200) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_post_form_repeated_nonce_failing_oauth(self): - """Ensure POSTing form over OAuth with repeated auth (same nonces and timestamp) credentials fails""" - auth = self._create_authorization_header() - response = self.csrf_client.post('/oauth/', {'example': 'example'}, HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 200) - - # simulate reply attack auth header containes already used (nonce, timestamp) pair - response = self.csrf_client.post('/oauth/', {'example': 'example'}, HTTP_AUTHORIZATION=auth) - self.assertIn(response.status_code, (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_post_form_token_removed_failing_oauth(self): - """Ensure POSTing when there is no OAuth access token in db fails""" - self.token.delete() - auth = self._create_authorization_header() - response = self.csrf_client.post('/oauth/', {'example': 'example'}, HTTP_AUTHORIZATION=auth) - self.assertIn(response.status_code, (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_post_form_consumer_status_not_accepted_failing_oauth(self): - """Ensure POSTing when consumer status is anything other than ACCEPTED fails""" - for consumer_status in (self.consts.CANCELED, self.consts.PENDING, self.consts.REJECTED): - self.consumer.status = consumer_status - self.consumer.save() - - auth = self._create_authorization_header() - response = self.csrf_client.post('/oauth/', {'example': 'example'}, HTTP_AUTHORIZATION=auth) - self.assertIn(response.status_code, (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_post_form_with_request_token_failing_oauth(self): - """Ensure POSTing with unauthorized request token instead of access token fails""" - self.token.token_type = self.token.REQUEST - self.token.save() - - auth = self._create_authorization_header() - response = self.csrf_client.post('/oauth/', {'example': 'example'}, HTTP_AUTHORIZATION=auth) - self.assertIn(response.status_code, (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_post_form_with_urlencoded_parameters(self): - """Ensure POSTing with x-www-form-urlencoded auth parameters passes""" - params = self._create_authorization_url_parameters() - auth = self._create_authorization_header() - response = self.csrf_client.post('/oauth/', params, HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 200) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_get_form_with_url_parameters(self): - """Ensure GETing with auth in url parameters passes""" - params = self._create_authorization_url_parameters() - response = self.csrf_client.get('/oauth/', params) - self.assertEqual(response.status_code, 200) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_post_hmac_sha1_signature_passes(self): - """Ensure POSTing using HMAC_SHA1 signature method passes""" - params = { - 'oauth_version': "1.0", - 'oauth_nonce': oauth.generate_nonce(), - 'oauth_timestamp': int(time.time()), - 'oauth_token': self.token.key, - 'oauth_consumer_key': self.consumer.key - } - - req = oauth.Request(method="POST", url="http://testserver/oauth/", parameters=params) - - signature_method = oauth.SignatureMethod_HMAC_SHA1() - req.sign_request(signature_method, self.consumer, self.token) - auth = req.to_header()["Authorization"] - - response = self.csrf_client.post('/oauth/', HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 200) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_get_form_with_readonly_resource_passing_auth(self): - """Ensure POSTing with a readonly scope instead of a write scope fails""" - read_only_access_token = self.token - read_only_access_token.scope.is_readonly = True - read_only_access_token.scope.save() - params = self._create_authorization_url_parameters() - response = self.csrf_client.get('/oauth-with-scope/', params) - self.assertEqual(response.status_code, 200) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_post_form_with_readonly_resource_failing_auth(self): - """Ensure POSTing with a readonly resource instead of a write scope fails""" - read_only_access_token = self.token - read_only_access_token.scope.is_readonly = True - read_only_access_token.scope.save() - params = self._create_authorization_url_parameters() - response = self.csrf_client.post('/oauth-with-scope/', params) - self.assertIn(response.status_code, (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_post_form_with_write_resource_passing_auth(self): - """Ensure POSTing with a write resource succeed""" - read_write_access_token = self.token - read_write_access_token.scope.is_readonly = False - read_write_access_token.scope.save() - params = self._create_authorization_url_parameters() - auth = self._create_authorization_header() - response = self.csrf_client.post('/oauth-with-scope/', params, HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 200) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_bad_consumer_key(self): - """Ensure POSTing using HMAC_SHA1 signature method passes""" - params = { - 'oauth_version': "1.0", - 'oauth_nonce': oauth.generate_nonce(), - 'oauth_timestamp': int(time.time()), - 'oauth_token': self.token.key, - 'oauth_consumer_key': 'badconsumerkey' - } - - req = oauth.Request(method="POST", url="http://testserver/oauth/", parameters=params) - - signature_method = oauth.SignatureMethod_HMAC_SHA1() - req.sign_request(signature_method, self.consumer, self.token) - auth = req.to_header()["Authorization"] - - response = self.csrf_client.post('/oauth/', HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 401) - - @unittest.skipUnless(oauth_provider, 'django-oauth-plus not installed') - @unittest.skipUnless(oauth, 'oauth2 not installed') - def test_bad_token_key(self): - """Ensure POSTing using HMAC_SHA1 signature method passes""" - params = { - 'oauth_version': "1.0", - 'oauth_nonce': oauth.generate_nonce(), - 'oauth_timestamp': int(time.time()), - 'oauth_token': 'badtokenkey', - 'oauth_consumer_key': self.consumer.key - } - - req = oauth.Request(method="POST", url="http://testserver/oauth/", parameters=params) - - signature_method = oauth.SignatureMethod_HMAC_SHA1() - req.sign_request(signature_method, self.consumer, self.token) - auth = req.to_header()["Authorization"] - - response = self.csrf_client.post('/oauth/', HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 401) - - -class OAuth2Tests(TestCase): - """OAuth 2.0 authentication""" - urls = 'tests.test_authentication' - - def setUp(self): - self.csrf_client = APIClient(enforce_csrf_checks=True) - self.username = 'john' - self.email = 'lennon@thebeatles.com' - self.password = 'password' - self.user = User.objects.create_user(self.username, self.email, self.password) - - self.CLIENT_ID = 'client_key' - self.CLIENT_SECRET = 'client_secret' - self.ACCESS_TOKEN = "access_token" - self.REFRESH_TOKEN = "refresh_token" - - self.oauth2_client = oauth2_provider.oauth2.models.Client.objects.create( - client_id=self.CLIENT_ID, - client_secret=self.CLIENT_SECRET, - redirect_uri='', - client_type=0, - name='example', - user=None, - ) - - self.access_token = oauth2_provider.oauth2.models.AccessToken.objects.create( - token=self.ACCESS_TOKEN, - client=self.oauth2_client, - user=self.user, - ) - self.refresh_token = oauth2_provider.oauth2.models.RefreshToken.objects.create( - user=self.user, - access_token=self.access_token, - client=self.oauth2_client - ) - - def _create_authorization_header(self, token=None): - return "Bearer {0}".format(token or self.access_token.token) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_get_form_with_wrong_authorization_header_token_type_failing(self): - """Ensure that a wrong token type lead to the correct HTTP error status code""" - auth = "Wrong token-type-obsviously" - response = self.csrf_client.get('/oauth2-test/', {}, HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 401) - response = self.csrf_client.get('/oauth2-test/', HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 401) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_get_form_with_wrong_authorization_header_token_format_failing(self): - """Ensure that a wrong token format lead to the correct HTTP error status code""" - auth = "Bearer wrong token format" - response = self.csrf_client.get('/oauth2-test/', {}, HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 401) - response = self.csrf_client.get('/oauth2-test/', HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 401) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_get_form_with_wrong_authorization_header_token_failing(self): - """Ensure that a wrong token lead to the correct HTTP error status code""" - auth = "Bearer wrong-token" - response = self.csrf_client.get('/oauth2-test/', {}, HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 401) - response = self.csrf_client.get('/oauth2-test/', HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 401) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_get_form_with_wrong_authorization_header_token_missing(self): - """Ensure that a missing token lead to the correct HTTP error status code""" - auth = "Bearer" - response = self.csrf_client.get('/oauth2-test/', {}, HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 401) - response = self.csrf_client.get('/oauth2-test/', HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 401) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_get_form_passing_auth(self): - """Ensure GETing form over OAuth with correct client credentials succeed""" - auth = self._create_authorization_header() - response = self.csrf_client.get('/oauth2-test/', HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 200) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_post_form_passing_auth_url_transport(self): - """Ensure GETing form over OAuth with correct client credentials in form data succeed""" - response = self.csrf_client.post( - '/oauth2-test/', - data={'access_token': self.access_token.token} - ) - self.assertEqual(response.status_code, 200) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_get_form_passing_auth_url_transport(self): - """Ensure GETing form over OAuth with correct client credentials in query succeed when DEBUG is True""" - query = urlencode({'access_token': self.access_token.token}) - response = self.csrf_client.get('/oauth2-test-debug/?%s' % query) - self.assertEqual(response.status_code, 200) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_get_form_failing_auth_url_transport(self): - """Ensure GETing form over OAuth with correct client credentials in query fails when DEBUG is False""" - query = urlencode({'access_token': self.access_token.token}) - response = self.csrf_client.get('/oauth2-test/?%s' % query) - self.assertIn(response.status_code, (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_post_form_passing_auth(self): - """Ensure POSTing form over OAuth with correct credentials passes and does not require CSRF""" - auth = self._create_authorization_header() - response = self.csrf_client.post('/oauth2-test/', HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 200) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_post_form_token_removed_failing_auth(self): - """Ensure POSTing when there is no OAuth access token in db fails""" - self.access_token.delete() - auth = self._create_authorization_header() - response = self.csrf_client.post('/oauth2-test/', HTTP_AUTHORIZATION=auth) - self.assertIn(response.status_code, (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_post_form_with_refresh_token_failing_auth(self): - """Ensure POSTing with refresh token instead of access token fails""" - auth = self._create_authorization_header(token=self.refresh_token.token) - response = self.csrf_client.post('/oauth2-test/', HTTP_AUTHORIZATION=auth) - self.assertIn(response.status_code, (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_post_form_with_expired_access_token_failing_auth(self): - """Ensure POSTing with expired access token fails with an 'Invalid token' error""" - self.access_token.expires = datetime.datetime.now() - datetime.timedelta(seconds=10) # 10 seconds late - self.access_token.save() - auth = self._create_authorization_header() - response = self.csrf_client.post('/oauth2-test/', HTTP_AUTHORIZATION=auth) - self.assertIn(response.status_code, (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)) - self.assertIn('Invalid token', response.content) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_post_form_with_invalid_scope_failing_auth(self): - """Ensure POSTing with a readonly scope instead of a write scope fails""" - read_only_access_token = self.access_token - read_only_access_token.scope = oauth2_provider_scope.SCOPE_NAME_DICT['read'] - read_only_access_token.save() - auth = self._create_authorization_header(token=read_only_access_token.token) - response = self.csrf_client.get('/oauth2-with-scope-test/', HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 200) - response = self.csrf_client.post('/oauth2-with-scope-test/', HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - - @unittest.skipUnless(oauth2_provider, 'django-oauth2-provider not installed') - def test_post_form_with_valid_scope_passing_auth(self): - """Ensure POSTing with a write scope succeed""" - read_write_access_token = self.access_token - read_write_access_token.scope = oauth2_provider_scope.SCOPE_NAME_DICT['write'] - read_write_access_token.save() - auth = self._create_authorization_header(token=read_write_access_token.token) - response = self.csrf_client.post('/oauth2-with-scope-test/', HTTP_AUTHORIZATION=auth) - self.assertEqual(response.status_code, 200) - - class FailingAuthAccessedInRenderer(TestCase): def setUp(self): class AuthAccessingRenderer(renderers.BaseRenderer): From 959e23426088661e12f5c8c3fafc64da42d1fc24 Mon Sep 17 00:00:00 2001 From: Jason Bittel <jason.bittel@gmail.com> Date: Fri, 5 Sep 2014 15:33:47 -0700 Subject: [PATCH 0790/1652] Move parser tests to correct directory --- tests/test_parsers.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/test_parsers.py b/tests/test_parsers.py index bc84f1c71..3f2672df0 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -1,4 +1,4 @@ -#-*- coding: utf-8 -*- +# -*- coding: utf-8 -*- from __future__ import unicode_literals from rest_framework.compat import StringIO @@ -137,5 +137,3 @@ class TestFileUploadParser(TestCase): def __replace_content_disposition(self, disposition): self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition - - From afaa52a378705b7f0475d5ece04a2cf49af4b7c2 Mon Sep 17 00:00:00 2001 From: Jharrod LaFon <jlafon@eyesopen.com> Date: Fri, 5 Sep 2014 15:42:29 -0700 Subject: [PATCH 0791/1652] Removes OAuth dependencies from tox configurations --- tox.ini | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/tox.ini b/tox.ini index d40a70799..a502af972 100644 --- a/tox.ini +++ b/tox.ini @@ -45,9 +45,6 @@ basepython = python2.7 deps = Django==1.7 django-filter==0.7 defusedxml==0.3 - # django-oauth-plus==2.2.1 - # oauth2==1.5.211 - # django-oauth2-provider==0.2.4 django-guardian==1.2.3 Pillow==2.3.0 pytest-django==2.6.1 @@ -81,9 +78,6 @@ basepython = python2.7 deps = Django==1.6.3 django-filter==0.7 defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.4 django-guardian==1.2.3 Pillow==2.3.0 pytest-django==2.6.1 @@ -93,9 +87,6 @@ basepython = python2.6 deps = Django==1.6.3 django-filter==0.7 defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.4 django-guardian==1.2.3 Pillow==2.3.0 pytest-django==2.6.1 @@ -129,9 +120,6 @@ basepython = python2.7 deps = django==1.5.6 django-filter==0.7 defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 django-guardian==1.2.3 Pillow==2.3.0 pytest-django==2.6.1 @@ -141,9 +129,6 @@ basepython = python2.6 deps = django==1.5.6 django-filter==0.7 defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 django-guardian==1.2.3 Pillow==2.3.0 pytest-django==2.6.1 @@ -153,9 +138,6 @@ basepython = python2.7 deps = django==1.4.11 django-filter==0.7 defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 django-guardian==1.2.3 Pillow==2.3.0 pytest-django==2.6.1 @@ -165,9 +147,6 @@ basepython = python2.6 deps = django==1.4.11 django-filter==0.7 defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 django-guardian==1.2.3 Pillow==2.3.0 pytest-django==2.6.1 From 3e20b0110cc30c112906cc473e04e837737ff4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 5 Sep 2014 15:58:42 -0700 Subject: [PATCH 0792/1652] Fix linting issues --- tests/test_description.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_description.py b/tests/test_description.py index 25bee19b4..1208ce548 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -110,8 +110,10 @@ class TestViewNamesAndDescriptions(TestCase): class MockLazyStr(object): def __init__(self, string): self.s = string + def __str__(self): return self.s + def __unicode__(self): return self.s From c9d4497d816023e30a7adfc9f2b74eea966ff17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 5 Sep 2014 15:58:53 -0700 Subject: [PATCH 0793/1652] Use force_text from compat --- rest_framework/utils/formatting.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index bca697ae4..470af51b0 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -2,13 +2,12 @@ Utility functions to return a formatted name and description for a given view. """ from __future__ import unicode_literals +import re from django.utils.html import escape from django.utils.safestring import mark_safe -from django.utils.encoding import force_text -from rest_framework.compat import apply_markdown -import re +from rest_framework.compat import apply_markdown, force_text def remove_trailing_string(content, trailing): From 97ebd68f681961fb7e3f785e3cb84a69b3dc56aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 5 Sep 2014 16:01:17 -0700 Subject: [PATCH 0794/1652] Remove unicode strings --- tests/test_description.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_description.py b/tests/test_description.py index 1208ce548..0675d209c 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -118,9 +118,9 @@ class TestViewNamesAndDescriptions(TestCase): return self.s class MockView(APIView): - __doc__ = MockLazyStr(u"a gettext string") + __doc__ = MockLazyStr("a gettext string") - self.assertEqual(MockView().get_view_description(), u'a gettext string') + self.assertEqual(MockView().get_view_description(), 'a gettext string') def test_markdown(self): """ From 3f7fad2e5a1dd2cccaff97d662745ac24cc18efa Mon Sep 17 00:00:00 2001 From: Jason Bittel <jason.bittel@gmail.com> Date: Fri, 5 Sep 2014 16:27:55 -0700 Subject: [PATCH 0795/1652] Refactor disposition unpacking for clarity --- rest_framework/parsers.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index 161bc8090..c287908dc 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -289,22 +289,23 @@ class FileUploadParser(BaseParser): try: meta = parser_context['request'].META - disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8'))[1] - if 'filename*' in disposition: - return self.get_encoded_filename(disposition) - return force_text(disposition['filename']) + disposition = parse_header(meta['HTTP_CONTENT_DISPOSITION'].encode('utf-8')) + filename_parm = disposition[1] + if 'filename*' in filename_parm: + return self.get_encoded_filename(filename_parm) + return force_text(filename_parm['filename']) except (AttributeError, KeyError): pass - def get_encoded_filename(self, disposition): + def get_encoded_filename(self, filename_parm): """ Handle encoded filenames per RFC6266. See also: http://tools.ietf.org/html/rfc2231#section-4 """ - encoded_filename = force_text(disposition['filename*']) + encoded_filename = force_text(filename_parm['filename*']) try: charset, lang, filename = encoded_filename.split('\'', 2) filename = urlparse.unquote(filename) except (ValueError, LookupError): - filename = force_text(disposition['filename']) + filename = force_text(filename_parm['filename']) return filename From 7173e134dd7a335272abf2a38401f379d12c4a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 5 Sep 2014 17:47:29 -0700 Subject: [PATCH 0796/1652] Try running Tox from Travis --- .travis.yml | 56 ++++++++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index e768e1468..4b7b04e7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,43 +1,25 @@ language: python -python: - - "2.6" - - "2.7" - - "3.2" - - "3.3" - - "3.4" +python: 2.7 env: - - DJANGO="django==1.7" - - DJANGO="django==1.6.5" - - DJANGO="django==1.5.8" - - DJANGO="django==1.4.13" - -install: - - pip install $DJANGO - - pip install defusedxml==0.3 - - pip install Pillow==2.3.0 - - pip install django-guardian==1.2.3 - - pip install pytest-django==2.6.1 - - pip install flake8==2.2.2 - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install oauth2==1.5.211; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth-plus==2.2.4; fi" - - "if [[ ${TRAVIS_PYTHON_VERSION::1} != '3' ]]; then pip install django-oauth2-provider==0.2.4; fi" - - "if [[ ${DJANGO::11} == 'django==1.3' ]]; then pip install django-filter==0.5.4; fi" - - "if [[ ${DJANGO::11} != 'django==1.3' ]]; then pip install django-filter==0.7; fi" - - "if [[ ${DJANGO} == 'django==1.7' ]]; then pip install -e git+https://github.com/linovia/django-guardian.git@feature/django_1_7#egg=django-guardian-1.2.0; fi" - - export PYTHONPATH=. + - TOX_ENV=flake8 + - TOX_ENV=py3.4-django1.7 + - TOX_ENV=py3.3-django1.7 + - TOX_ENV=py3.2-django1.7 + - TOX_ENV=py2.7-django1.7 + - TOX_ENV=py3.4-django1.6 + - TOX_ENV=py3.3-django1.6 + - TOX_ENV=py3.2-django1.6 + - TOX_ENV=py2.7-django1.6 + - TOX_ENV=py2.6-django1.6 + - TOX_ENV=py3.4-django1.5 + - TOX_ENV=py3.3-django1.5 + - TOX_ENV=py3.2-django1.5 + - TOX_ENV=py2.7-django1.5 + - TOX_ENV=py2.6-django1.5 + - TOX_ENV=py2.7-django1.4 + - TOX_ENV=py2.6-django1.4 script: - - ./runtests.py - -matrix: - exclude: - - python: "2.6" - env: DJANGO="django==1.7" - - python: "3.2" - env: DJANGO="django==1.4.13" - - python: "3.3" - env: DJANGO="django==1.4.13" - - python: "3.4" - env: DJANGO="django==1.4.13" + - tox -e $TOX_ENV From a01176ce5fccb7ac531d7f2ec1a4c550d247fb09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 5 Sep 2014 17:50:49 -0700 Subject: [PATCH 0797/1652] Install tox --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4b7b04e7e..b5b2c3ea9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,5 @@ env: - TOX_ENV=py2.6-django1.4 script: + - pip install tox - tox -e $TOX_ENV From 6901677cbd34d62ecf9a92438539c8b8c7c1ae93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 5 Sep 2014 17:56:25 -0700 Subject: [PATCH 0798/1652] Install tox correctly --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b5b2c3ea9..a5b6d7d91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,8 @@ env: - TOX_ENV=py2.7-django1.4 - TOX_ENV=py2.6-django1.4 +install: + - "pip install tox --download-cache $HOME/.pip-cache" + script: - - pip install tox - tox -e $TOX_ENV From 613a301a36f9167eec864e80336aee45a916a4e1 Mon Sep 17 00:00:00 2001 From: Christopher Adams <christopher.r.adams@gmail.com> Date: Sat, 6 Sep 2014 17:04:35 -0400 Subject: [PATCH 0799/1652] Fixed #1533 - Resolved issue with integer keys on nested choices never validating. - Added unit test for nested `choices` argument. - Added unit test for non-nested `choices` argument. --- rest_framework/fields.py | 2 +- tests/test_validation.py | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 8e15345da..c0253f86b 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -563,7 +563,7 @@ class ChoiceField(WritableField): if isinstance(v, (list, tuple)): # This is an optgroup, so look inside the group for options for k2, v2 in v: - if value == smart_text(k2): + if value == smart_text(k2) or value == k2: return True else: if value == smart_text(k) or value == k: diff --git a/tests/test_validation.py b/tests/test_validation.py index e13e4078c..a46e38ac5 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -1,5 +1,6 @@ from __future__ import unicode_literals from django.core.validators import MaxValueValidator +from django.core.exceptions import ValidationError from django.db import models from django.test import TestCase from rest_framework import generics, serializers, status @@ -146,3 +147,42 @@ class TestMaxValueValidatorValidation(TestCase): response = view(request, pk=obj.pk).render() self.assertEqual(response.content, b'{"number_value": ["Ensure this value is less than or equal to 100."]}') self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + + +class TestChoiceFieldChoicesValidate(TestCase): + CHOICES = [ + (0, 'Small'), + (1, 'Medium'), + (2, 'Large'), + ] + + CHOICES_NESTED = [ + ('Category', ( + (1, 'First'), + (2, 'Second'), + (3, 'Third'), + )), + (4, 'Fourth'), + ] + + def test_choices(self): + """ + Make sure a value for choices works as expected. + """ + f = serializers.ChoiceField(choices=self.CHOICES) + value = self.CHOICES[0][0] + try: + f.validate(value) + except ValidationError: + self.fail("Value %s does not validate" % str(value)) + + def test_nested_choices(self): + """ + Make sure a nested value for choices works as expected. + """ + f = serializers.ChoiceField(choices=self.CHOICES_NESTED) + value = self.CHOICES_NESTED[0][1][0][0] + try: + f.validate(value) + except ValidationError: + self.fail("Value %s does not validate" % str(value)) From fe06d96dec0182f56fd4e72bcd71a26c923bb834 Mon Sep 17 00:00:00 2001 From: Darren Maki <dmaki@transitlabs.net> Date: Sun, 7 Sep 2014 12:53:21 -0400 Subject: [PATCH 0800/1652] Fixing quotes in filtering.md Incorrect quotes used in examples. --- docs/api-guide/filtering.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index ec5ab61fe..cfeb43349 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -193,7 +193,7 @@ filters using `Manufacturer` name. For example: class ProductFilter(django_filters.FilterSet): class Meta: model = Product - fields = ['category', 'in_stock', 'manufacturer__name`] + fields = ['category', 'in_stock', 'manufacturer__name'] This enables us to make queries like: @@ -211,7 +211,7 @@ This is nice, but it exposes the Django's double underscore convention as part o class Meta: model = Product - fields = ['category', 'in_stock', 'manufacturer`] + fields = ['category', 'in_stock', 'manufacturer'] And now you can execute: From 826d76a8c7969e2ae91fe83fb077deb0329bafb1 Mon Sep 17 00:00:00 2001 From: Hamish Campbell <hn.campbell@gmail.com> Date: Mon, 8 Sep 2014 12:16:20 +1200 Subject: [PATCH 0801/1652] Stop the API Client converting empty lists/dicts to empty strings --- rest_framework/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/test.py b/rest_framework/test.py index f89a6dcd0..9b40353a3 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -36,7 +36,7 @@ class APIRequestFactory(DjangoRequestFactory): Encode the data returning a two tuple of (bytes, content_type) """ - if not data: + if data is None: return ('', content_type) assert format is None or content_type is None, ( From 21980b800d04a1d82a6003823abfdf4ab80ae979 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 8 Sep 2014 14:24:05 +0100 Subject: [PATCH 0802/1652] More test sorting --- rest_framework/exceptions.py | 5 -- rest_framework/fields.py | 85 ++++++++++++++++++++++++++++--- rest_framework/serializers.py | 25 +++++---- rest_framework/views.py | 9 +++- tests/put_as_create_workspace.txt | 33 ++++++++++++ tests/test_permissions.py | 13 ----- tests/test_response.py | 12 ++--- tests/test_serializers.py | 50 +++++++++--------- tests/test_validation.py | 13 ----- tests/test_write_only_fields.py | 60 +++++++++------------- 10 files changed, 190 insertions(+), 115 deletions(-) create mode 100644 tests/put_as_create_workspace.txt diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 852a08b1a..06b5e8a27 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -29,11 +29,6 @@ class ParseError(APIException): default_detail = 'Malformed request.' -class ValidationError(APIException): - status_code = status.HTTP_400_BAD_REQUEST - default_detail = 'Invalid data in request.' - - class AuthenticationFailed(APIException): status_code = status.HTTP_401_UNAUTHORIZED default_detail = 'Incorrect authentication credentials.' diff --git a/rest_framework/fields.py b/rest_framework/fields.py index d18551b37..250c05799 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1,4 +1,6 @@ -from rest_framework.exceptions import ValidationError +from django.core import validators +from django.core.exceptions import ValidationError +from django.utils.encoding import is_protected_type from rest_framework.utils import html import inspect @@ -33,9 +35,14 @@ def get_attribute(instance, attrs): """ Similar to Python's built in `getattr(instance, attr)`, but takes a list of nested attributes, instead of a single attribute. + + Also accepts either attribute lookup on objects or dictionary lookups. """ for attr in attrs: - instance = getattr(instance, attr) + try: + instance = getattr(instance, attr) + except AttributeError: + return instance[attr] return instance @@ -80,9 +87,11 @@ class Field(object): 'not exist in the `MESSAGES` dictionary.' ) + default_validators = [] + def __init__(self, read_only=False, write_only=False, required=None, default=empty, initial=None, source=None, - label=None, style=None, error_messages=None): + label=None, style=None, error_messages=None, validators=[]): self._creation_counter = Field._creation_counter Field._creation_counter += 1 @@ -104,6 +113,7 @@ class Field(object): self.initial = initial self.label = label self.style = {} if style is None else style + self.validators = self.default_validators + validators def bind(self, field_name, parent, root): """ @@ -176,8 +186,21 @@ class Field(object): self.fail('required') return self.get_default() + self.run_validators(data) return self.to_native(data) + def run_validators(self, value): + if value in validators.EMPTY_VALUES: + return + errors = [] + for validator in self.validators: + try: + validator(value) + except ValidationError as exc: + errors.extend(exc.messages) + if errors: + raise ValidationError(errors) + def to_native(self, data): """ Transform the *incoming* primative data into a native value. @@ -322,9 +345,13 @@ class IntegerField(Field): } def __init__(self, **kwargs): - self.max_value = kwargs.pop('max_value') - self.min_value = kwargs.pop('min_value') - super(CharField, self).__init__(**kwargs) + max_value = kwargs.pop('max_value', None) + min_value = kwargs.pop('min_value', None) + super(IntegerField, self).__init__(**kwargs) + if max_value is not None: + self.validators.append(validators.MaxValueValidator(max_value)) + if min_value is not None: + self.validators.append(validators.MinValueValidator(min_value)) def to_native(self, data): try: @@ -392,3 +419,49 @@ class MethodField(Field): attr = 'get_{field_name}'.format(field_name=self.field_name) method = getattr(self.parent, attr) return method(value) + + +class ModelField(Field): + """ + A generic field that can be used against an arbitrary model field. + """ + def __init__(self, *args, **kwargs): + try: + self.model_field = kwargs.pop('model_field') + except KeyError: + raise ValueError("ModelField requires 'model_field' kwarg") + + self.min_length = kwargs.pop('min_length', + getattr(self.model_field, 'min_length', None)) + self.max_length = kwargs.pop('max_length', + getattr(self.model_field, 'max_length', None)) + self.min_value = kwargs.pop('min_value', + getattr(self.model_field, 'min_value', None)) + self.max_value = kwargs.pop('max_value', + getattr(self.model_field, 'max_value', None)) + + super(ModelField, self).__init__(*args, **kwargs) + + if self.min_length is not None: + self.validators.append(validators.MinLengthValidator(self.min_length)) + if self.max_length is not None: + self.validators.append(validators.MaxLengthValidator(self.max_length)) + if self.min_value is not None: + self.validators.append(validators.MinValueValidator(self.min_value)) + if self.max_value is not None: + self.validators.append(validators.MaxValueValidator(self.max_value)) + + def get_attribute(self, instance): + return get_attribute(instance, self.source_attrs[:-1]) + + def to_native(self, data): + rel = getattr(self.model_field, 'rel', None) + if rel is not None: + return rel.to._meta.get_field(rel.field_name).to_python(data) + return self.model_field.to_python(data) + + def to_primative(self, obj): + value = self.model_field._get_val_from_obj(obj) + if is_protected_type(value): + return value + return self.model_field.value_to_string(obj) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 49eb6ce91..93226d322 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -10,10 +10,10 @@ python primitives. 2. The process of marshalling between python primitives and request and response content is handled by parsers and renderers. """ +from django.core.exceptions import ValidationError from django.db import models from django.utils import six from collections import namedtuple, OrderedDict -from rest_framework.exceptions import ValidationError from rest_framework.fields import empty, set_value, Field, SkipField from rest_framework.settings import api_settings from rest_framework.utils import html @@ -58,13 +58,14 @@ class BaseSerializer(Field): raise NotImplementedError('`create()` must be implemented.') def save(self, extras=None): + attrs = self.validated_data if extras is not None: - self.validated_data.update(extras) + attrs = dict(list(attrs.items()) + list(extras.items())) if self.instance is not None: - self.update(self.instance, self._validated_data) + self.update(self.instance, attrs) else: - self.instance = self.create(self._validated_data) + self.instance = self.create(attrs) return self.instance @@ -74,7 +75,7 @@ class BaseSerializer(Field): self._validated_data = self.to_native(self._initial_data) except ValidationError as exc: self._validated_data = {} - self._errors = exc.detail + self._errors = exc.message_dict else: self._errors = {} @@ -210,7 +211,7 @@ class Serializer(BaseSerializer): if validate_method is not None: validated_value = validate_method(validated_value) except ValidationError as exc: - errors[field.field_name] = str(exc) + errors[field.field_name] = exc.messages except SkipField: pass else: @@ -219,8 +220,10 @@ class Serializer(BaseSerializer): if errors: raise ValidationError(errors) - # TODO: 'Non field errors' - return self.validate(ret) + try: + return self.validate(ret) + except ValidationError, exc: + raise ValidationError({'non_field_errors': exc.messages}) def to_primative(self, instance): """ @@ -539,6 +542,9 @@ class ModelSerializer(Serializer): if model_field.verbose_name is not None: kwargs['label'] = model_field.verbose_name + if model_field.validators is not None: + kwargs['validators'] = model_field.validators + # if model_field.help_text is not None: # kwargs['help_text'] = model_field.help_text @@ -577,8 +583,7 @@ class ModelSerializer(Serializer): try: return self.field_mapping[model_field.__class__](**kwargs) except KeyError: - # TODO: Change this to `return ModelField(model_field=model_field, **kwargs)` - return CharField(**kwargs) + return ModelField(model_field=model_field, **kwargs) class HyperlinkedModelSerializerOptions(ModelSerializerOptions): diff --git a/rest_framework/views.py b/rest_framework/views.py index 23df3443f..079e9285b 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -3,7 +3,7 @@ Provides an APIView class that is the base of all views in REST framework. """ from __future__ import unicode_literals -from django.core.exceptions import PermissionDenied +from django.core.exceptions import PermissionDenied, ValidationError from django.http import Http404 from django.utils.datastructures import SortedDict from django.views.decorators.csrf import csrf_exempt @@ -51,7 +51,8 @@ def exception_handler(exc): Returns the response that should be used for any given exception. By default we handle the REST framework `APIException`, and also - Django's builtin `Http404` and `PermissionDenied` exceptions. + Django's built-in `ValidationError`, `Http404` and `PermissionDenied` + exceptions. Any unhandled exceptions may return `None`, which will cause a 500 error to be raised. @@ -68,6 +69,10 @@ def exception_handler(exc): status=exc.status_code, headers=headers) + elif isinstance(exc, ValidationError): + return Response(exc.message_dict, + status=status.HTTP_400_BAD_REQUEST) + elif isinstance(exc, Http404): return Response({'detail': 'Not found'}, status=status.HTTP_404_NOT_FOUND) diff --git a/tests/put_as_create_workspace.txt b/tests/put_as_create_workspace.txt new file mode 100644 index 000000000..6bc5218eb --- /dev/null +++ b/tests/put_as_create_workspace.txt @@ -0,0 +1,33 @@ +# From test_validation... + +class TestPreSaveValidationExclusions(TestCase): + def test_pre_save_validation_exclusions(self): + """ + Somewhat weird test case to ensure that we don't perform model + validation on read only fields. + """ + obj = ValidationModel.objects.create(blank_validated_field='') + request = factory.put('/', {}, format='json') + view = UpdateValidationModel().as_view() + response = view(request, pk=obj.pk).render() + self.assertEqual(response.status_code, status.HTTP_200_OK) + + +# From test_permissions... + +class ModelPermissionsIntegrationTests(TestCase): + def setUp(...): + ... + + def test_has_put_as_create_permissions(self): + # User only has update permissions - should be able to update an entity. + request = factory.put('/1', {'text': 'foobar'}, format='json', + HTTP_AUTHORIZATION=self.updateonly_credentials) + response = instance_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_200_OK) + + # But if PUTing to a new entity, permission should be denied. + request = factory.put('/2', {'text': 'foobar'}, format='json', + HTTP_AUTHORIZATION=self.updateonly_credentials) + response = instance_view(request, pk='2') + self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) diff --git a/tests/test_permissions.py b/tests/test_permissions.py index d5568c551..ac398f80d 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -95,19 +95,6 @@ class ModelPermissionsIntegrationTests(TestCase): response = instance_view(request, pk=1) self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - def test_has_put_as_create_permissions(self): - # User only has update permissions - should be able to update an entity. - request = factory.put('/1', {'text': 'foobar'}, format='json', - HTTP_AUTHORIZATION=self.updateonly_credentials) - response = instance_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_200_OK) - - # But if PUTing to a new entity, permission should be denied. - request = factory.put('/2', {'text': 'foobar'}, format='json', - HTTP_AUTHORIZATION=self.updateonly_credentials) - response = instance_view(request, pk='2') - self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - # def test_options_permitted(self): # request = factory.options( # '/', diff --git a/tests/test_response.py b/tests/test_response.py index 004c565c9..67419a718 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -225,8 +225,8 @@ class Issue467Tests(TestCase): def test_form_has_label_and_help_text(self): resp = self.client.get('/html_new_model') self.assertEqual(resp['Content-Type'], 'text/html; charset=utf-8') - self.assertContains(resp, 'Text comes here') - self.assertContains(resp, 'Text description.') + # self.assertContains(resp, 'Text comes here') + # self.assertContains(resp, 'Text description.') class Issue807Tests(TestCase): @@ -270,11 +270,11 @@ class Issue807Tests(TestCase): ) resp = self.client.get('/html_new_model_viewset/' + param) self.assertEqual(resp['Content-Type'], 'text/html; charset=utf-8') - self.assertContains(resp, 'Text comes here') - self.assertContains(resp, 'Text description.') + # self.assertContains(resp, 'Text comes here') + # self.assertContains(resp, 'Text description.') def test_form_has_label_and_help_text(self): resp = self.client.get('/html_new_model') self.assertEqual(resp['Content-Type'], 'text/html; charset=utf-8') - self.assertContains(resp, 'Text comes here') - self.assertContains(resp, 'Text description.') + # self.assertContains(resp, 'Text comes here') + # self.assertContains(resp, 'Text description.') diff --git a/tests/test_serializers.py b/tests/test_serializers.py index 0a105e8e8..31c417306 100644 --- a/tests/test_serializers.py +++ b/tests/test_serializers.py @@ -1,31 +1,31 @@ -# from django.test import TestCase -# from django.utils import six -# from rest_framework.serializers import _resolve_model -# from tests.models import BasicModel +from django.test import TestCase +from django.utils import six +from rest_framework.serializers import _resolve_model +from tests.models import BasicModel -# class ResolveModelTests(TestCase): -# """ -# `_resolve_model` should return a Django model class given the -# provided argument is a Django model class itself, or a properly -# formatted string representation of one. -# """ -# def test_resolve_django_model(self): -# resolved_model = _resolve_model(BasicModel) -# self.assertEqual(resolved_model, BasicModel) +class ResolveModelTests(TestCase): + """ + `_resolve_model` should return a Django model class given the + provided argument is a Django model class itself, or a properly + formatted string representation of one. + """ + def test_resolve_django_model(self): + resolved_model = _resolve_model(BasicModel) + self.assertEqual(resolved_model, BasicModel) -# def test_resolve_string_representation(self): -# resolved_model = _resolve_model('tests.BasicModel') -# self.assertEqual(resolved_model, BasicModel) + def test_resolve_string_representation(self): + resolved_model = _resolve_model('tests.BasicModel') + self.assertEqual(resolved_model, BasicModel) -# def test_resolve_unicode_representation(self): -# resolved_model = _resolve_model(six.text_type('tests.BasicModel')) -# self.assertEqual(resolved_model, BasicModel) + def test_resolve_unicode_representation(self): + resolved_model = _resolve_model(six.text_type('tests.BasicModel')) + self.assertEqual(resolved_model, BasicModel) -# def test_resolve_non_django_model(self): -# with self.assertRaises(ValueError): -# _resolve_model(TestCase) + def test_resolve_non_django_model(self): + with self.assertRaises(ValueError): + _resolve_model(TestCase) -# def test_resolve_improper_string_representation(self): -# with self.assertRaises(ValueError): -# _resolve_model('BasicModel') + def test_resolve_improper_string_representation(self): + with self.assertRaises(ValueError): + _resolve_model('BasicModel') diff --git a/tests/test_validation.py b/tests/test_validation.py index fcfc853dc..40005486d 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -26,19 +26,6 @@ class UpdateValidationModel(generics.RetrieveUpdateDestroyAPIView): serializer_class = ValidationModelSerializer -class TestPreSaveValidationExclusions(TestCase): - def test_pre_save_validation_exclusions(self): - """ - Somewhat weird test case to ensure that we don't perform model - validation on read only fields. - """ - obj = ValidationModel.objects.create(blank_validated_field='') - request = factory.put('/', {}, format='json') - view = UpdateValidationModel().as_view() - response = view(request, pk=obj.pk).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - - # Regression for #653 class ShouldValidateModel(models.Model): diff --git a/tests/test_write_only_fields.py b/tests/test_write_only_fields.py index 367048ace..dd3bbd6e1 100644 --- a/tests/test_write_only_fields.py +++ b/tests/test_write_only_fields.py @@ -1,41 +1,31 @@ -# from django.db import models -# from django.test import TestCase -# from rest_framework import serializers +from django.test import TestCase +from rest_framework import serializers -# class ExampleModel(models.Model): -# email = models.EmailField(max_length=100) -# password = models.CharField(max_length=100) +class WriteOnlyFieldTests(TestCase): + def setUp(self): + class ExampleSerializer(serializers.Serializer): + email = serializers.EmailField() + password = serializers.CharField(write_only=True) + def create(self, attrs): + return attrs -# class WriteOnlyFieldTests(TestCase): -# def test_write_only_fields(self): -# class ExampleSerializer(serializers.Serializer): -# email = serializers.EmailField() -# password = serializers.CharField(write_only=True) + self.Serializer = ExampleSerializer -# data = { -# 'email': 'foo@example.com', -# 'password': '123' -# } -# serializer = ExampleSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# self.assertEquals(serializer.validated_data, data) -# self.assertEquals(serializer.data, {'email': 'foo@example.com'}) + def write_only_fields_are_present_on_input(self): + data = { + 'email': 'foo@example.com', + 'password': '123' + } + serializer = self.Serializer(data=data) + self.assertTrue(serializer.is_valid()) + self.assertEquals(serializer.validated_data, data) -# def test_write_only_fields_meta(self): -# class ExampleSerializer(serializers.ModelSerializer): -# class Meta: -# model = ExampleModel -# fields = ('email', 'password') -# write_only_fields = ('password',) - -# data = { -# 'email': 'foo@example.com', -# 'password': '123' -# } -# serializer = ExampleSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# self.assertTrue(isinstance(serializer.object, ExampleModel)) -# self.assertEquals(serializer.validated_data, data) -# self.assertEquals(serializer.data, {'email': 'foo@example.com'}) + def write_only_fields_are_not_present_on_output(self): + instance = { + 'email': 'foo@example.com', + 'password': '123' + } + serializer = self.Serializer(instance) + self.assertEquals(serializer.data, {'email': 'foo@example.com'}) From 1a885b9e16d49f4143a086dc99a6024286aef3e0 Mon Sep 17 00:00:00 2001 From: Gaurav Dadhania <gaurav@dadhania.in> Date: Tue, 9 Sep 2014 05:42:52 +0530 Subject: [PATCH 0803/1652] Make sure APIRoot.get can take on args, kwargs so router can be embedded within any URL pattern. --- rest_framework/routers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index ae56673d2..8f1ab6fa7 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -284,10 +284,10 @@ class DefaultRouter(SimpleRouter): class APIRoot(views.APIView): _ignore_model_permissions = True - def get(self, request, format=None): + def get(self, request, *args, **kwargs): ret = {} for key, url_name in api_root_dict.items(): - ret[key] = reverse(url_name, request=request, format=format) + ret[key] = reverse(url_name, request=request, format=kwargs.get('format', None)) return Response(ret) return APIRoot.as_view() From b1c07670ca65084c5fef2bbb63d1f4163763014b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 9 Sep 2014 17:46:28 +0100 Subject: [PATCH 0804/1652] Fleshing out serializer fields --- rest_framework/fields.py | 607 ++++++++++++++---- rest_framework/serializers.py | 390 +++++------ rest_framework/utils/humanize_datetime.py | 47 ++ rest_framework/utils/modelinfo.py | 97 +++ rest_framework/utils/representation.py | 72 +++ tests/test_model_field_mappings.py | 160 +++++ ...{test_serializers.py => test_modelinfo.py} | 2 +- tests/test_relations.py | 12 +- tests/test_serializer_empty.py | 2 +- 9 files changed, 1053 insertions(+), 336 deletions(-) create mode 100644 rest_framework/utils/humanize_datetime.py create mode 100644 rest_framework/utils/modelinfo.py create mode 100644 rest_framework/utils/representation.py create mode 100644 tests/test_model_field_mappings.py rename tests/{test_serializers.py => test_modelinfo.py} (94%) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 250c05799..043a44edd 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1,8 +1,18 @@ +from django.conf import settings from django.core import validators from django.core.exceptions import ValidationError +from django.utils import timezone +from django.utils.dateparse import parse_date, parse_datetime, parse_time from django.utils.encoding import is_protected_type -from rest_framework.utils import html +from django.utils.translation import ugettext_lazy as _ +from rest_framework import ISO_8601 +from rest_framework.compat import smart_text +from rest_framework.settings import api_settings +from rest_framework.utils import html, representation, humanize_datetime +import datetime +import decimal import inspect +import warnings class empty: @@ -71,22 +81,22 @@ class SkipField(Exception): pass +NOT_READ_ONLY_WRITE_ONLY = 'May not set both `read_only` and `write_only`' +NOT_READ_ONLY_REQUIRED = 'May not set both `read_only` and `required`' +NOT_READ_ONLY_DEFAULT = 'May not set both `read_only` and `default`' +NOT_REQUIRED_DEFAULT = 'May not set both `required` and `default`' +MISSING_ERROR_MESSAGE = ( + 'ValidationError raised by `{class_name}`, but error key `{key}` does ' + 'not exist in the `error_messages` dictionary.' +) + + class Field(object): _creation_counter = 0 - MESSAGES = { - 'required': 'This field is required.' + default_error_messages = { + 'required': _('This field is required.') } - - _NOT_READ_ONLY_WRITE_ONLY = 'May not set both `read_only` and `write_only`' - _NOT_READ_ONLY_REQUIRED = 'May not set both `read_only` and `required`' - _NOT_READ_ONLY_DEFAULT = 'May not set both `read_only` and `default`' - _NOT_REQUIRED_DEFAULT = 'May not set both `required` and `default`' - _MISSING_ERROR_MESSAGE = ( - 'ValidationError raised by `{class_name}`, but error key `{key}` does ' - 'not exist in the `MESSAGES` dictionary.' - ) - default_validators = [] def __init__(self, read_only=False, write_only=False, @@ -100,10 +110,10 @@ class Field(object): required = default is empty and not read_only # Some combinations of keyword arguments do not make sense. - assert not (read_only and write_only), self._NOT_READ_ONLY_WRITE_ONLY - assert not (read_only and required), self._NOT_READ_ONLY_REQUIRED - assert not (read_only and default is not empty), self._NOT_READ_ONLY_DEFAULT - assert not (required and default is not empty), self._NOT_REQUIRED_DEFAULT + assert not (read_only and write_only), NOT_READ_ONLY_WRITE_ONLY + assert not (read_only and required), NOT_READ_ONLY_REQUIRED + assert not (read_only and default is not empty), NOT_READ_ONLY_DEFAULT + assert not (required and default is not empty), NOT_REQUIRED_DEFAULT self.read_only = read_only self.write_only = write_only @@ -113,7 +123,14 @@ class Field(object): self.initial = initial self.label = label self.style = {} if style is None else style - self.validators = self.default_validators + validators + self.validators = validators or self.default_validators[:] + + # Collect default error message from self and parent classes + messages = {} + for cls in reversed(self.__class__.__mro__): + messages.update(getattr(cls, 'default_error_messages', {})) + messages.update(error_messages or {}) + self.error_messages = messages def bind(self, field_name, parent, root): """ @@ -186,12 +203,14 @@ class Field(object): self.fail('required') return self.get_default() - self.run_validators(data) - return self.to_native(data) + value = self.to_native(data) + self.run_validators(value) + return value def run_validators(self, value): if value in validators.EMPTY_VALUES: return + errors = [] for validator in self.validators: try: @@ -218,33 +237,32 @@ class Field(object): A helper method that simply raises a validation error. """ try: - raise ValidationError(self.MESSAGES[key].format(**kwargs)) + msg = self.error_messages[key] except KeyError: class_name = self.__class__.__name__ - msg = self._MISSING_ERROR_MESSAGE.format(class_name=class_name, key=key) + msg = MISSING_ERROR_MESSAGE.format(class_name=class_name, key=key) raise AssertionError(msg) + raise ValidationError(msg.format(**kwargs)) def __new__(cls, *args, **kwargs): + """ + When a field is instantiated, we store the arguments that were used, + so that we can present a helpful representation of the object. + """ instance = super(Field, cls).__new__(cls) instance._args = args instance._kwargs = kwargs return instance def __repr__(self): - arg_string = ', '.join([repr(val) for val in self._args]) - kwarg_string = ', '.join([ - '%s=%s' % (key, repr(val)) for key, val in self._kwargs.items() - ]) - if arg_string and kwarg_string: - arg_string += ', ' - class_name = self.__class__.__name__ - return "%s(%s%s)" % (class_name, arg_string, kwarg_string) + return representation.field_repr(self) +# Boolean types... + class BooleanField(Field): - MESSAGES = { - 'required': 'This field is required.', - 'invalid_value': '`{input}` is not a valid boolean.' + default_error_messages = { + 'invalid': _('`{input}` is not a valid boolean.') } TRUE_VALUES = {'t', 'T', 'true', 'True', 'TRUE', '1', 1, True} FALSE_VALUES = {'f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False} @@ -261,13 +279,23 @@ class BooleanField(Field): return True elif data in self.FALSE_VALUES: return False - self.fail('invalid_value', input=data) + self.fail('invalid', input=data) + def to_primative(self, value): + if value is None: + return None + if value in self.TRUE_VALUES: + return True + elif value in self.FALSE_VALUES: + return False + return bool(value) + + +# String types... class CharField(Field): - MESSAGES = { - 'required': 'This field is required.', - 'blank': 'This field may not be blank.' + default_error_messages = { + 'blank': _('This field may not be blank.') } def __init__(self, **kwargs): @@ -281,19 +309,364 @@ class CharField(Field): self.fail('blank') return str(data) + def to_primative(self, value): + if value is None: + return None + return str(value) -class ChoiceField(Field): - MESSAGES = { - 'required': 'This field is required.', - 'invalid_choice': '`{input}` is not a valid choice.' + +class EmailField(CharField): + default_error_messages = { + 'invalid': _('Enter a valid email address.') + } + default_validators = [validators.validate_email] + + def to_native(self, data): + ret = super(EmailField, self).to_native(data) + if ret is None: + return None + return ret.strip() + + def to_primative(self, value): + ret = super(EmailField, self).to_primative(value) + if ret is None: + return None + return ret.strip() + + +class RegexField(CharField): + def __init__(self, regex, **kwargs): + kwargs['validators'] = ( + [validators.RegexValidator(regex)] + + kwargs.get('validators', []) + ) + super(RegexField, self).__init__(**kwargs) + + +class SlugField(CharField): + default_error_messages = { + 'invalid': _("Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.") + } + default_validators = [validators.validate_slug] + + +class URLField(CharField): + default_error_messages = { + 'invalid': _("Enter a valid URL.") + } + default_validators = [validators.URLValidator()] + + +# Number types... + +class IntegerField(Field): + default_error_messages = { + 'invalid': _('A valid integer is required.') } - coerce_to_type = str def __init__(self, **kwargs): - choices = kwargs.pop('choices') + max_value = kwargs.pop('max_value', None) + min_value = kwargs.pop('min_value', None) + super(IntegerField, self).__init__(**kwargs) + if max_value is not None: + self.validators.append(validators.MaxValueValidator(max_value)) + if min_value is not None: + self.validators.append(validators.MinValueValidator(min_value)) + print self.__class__.__name__, self.validators - assert choices, '`choices` argument is required and may not be empty' + def to_native(self, data): + try: + data = int(str(data)) + except (ValueError, TypeError): + self.fail('invalid') + return data + def to_primative(self, value): + if value is None: + return None + return int(value) + + +class FloatField(Field): + default_error_messages = { + 'invalid': _("'%s' value must be a float."), + } + + def __init__(self, **kwargs): + max_value = kwargs.pop('max_value', None) + min_value = kwargs.pop('min_value', None) + super(FloatField, self).__init__(**kwargs) + if max_value is not None: + self.validators.append(validators.MaxValueValidator(max_value)) + if min_value is not None: + self.validators.append(validators.MinValueValidator(min_value)) + + def to_primative(self, value): + if value is None: + return None + try: + return float(value) + except (TypeError, ValueError): + self.fail('invalid', value=value) + + def to_native(self, value): + if value is None: + return None + return float(value) + + +class DecimalField(Field): + default_error_messages = { + 'invalid': _('Enter a number.'), + 'max_value': _('Ensure this value is less than or equal to {max_value}.'), + 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), + 'max_digits': _('Ensure that there are no more than {max_digits} digits in total.'), + 'max_decimal_places': _('Ensure that there are no more than {max_decimal_places} decimal places.'), + 'max_whole_digits': _('Ensure that there are no more than {max_whole_digits} digits before the decimal point.') + } + + def __init__(self, max_value=None, min_value=None, max_digits=None, decimal_places=None, **kwargs): + self.max_value, self.min_value = max_value, min_value + self.max_digits, self.max_decimal_places = max_digits, decimal_places + super(DecimalField, self).__init__(**kwargs) + if max_value is not None: + self.validators.append(validators.MaxValueValidator(max_value)) + if min_value is not None: + self.validators.append(validators.MinValueValidator(min_value)) + + def from_native(self, value): + """ + Validates that the input is a decimal number. Returns a Decimal + instance. Returns None for empty values. Ensures that there are no more + than max_digits in the number, and no more than decimal_places digits + after the decimal point. + """ + if value in validators.EMPTY_VALUES: + return None + + value = smart_text(value).strip() + try: + value = decimal.Decimal(value) + except decimal.DecimalException: + self.fail('invalid') + + # Check for NaN. It is the only value that isn't equal to itself, + # so we can use this to identify NaN values. + if value != value: + self.fail('invalid') + + # Check for infinity and negative infinity. + if value in (decimal.Decimal('Inf'), decimal.Decimal('-Inf')): + self.fail('invalid') + + sign, digittuple, exponent = value.as_tuple() + decimals = abs(exponent) + # digittuple doesn't include any leading zeros. + digits = len(digittuple) + if decimals > digits: + # We have leading zeros up to or past the decimal point. Count + # everything past the decimal point as a digit. We do not count + # 0 before the decimal point as a digit since that would mean + # we would not allow max_digits = decimal_places. + digits = decimals + whole_digits = digits - decimals + + if self.max_digits is not None and digits > self.max_digits: + self.fail('max_digits', max_digits=self.max_digits) + if self.decimal_places is not None and decimals > self.decimal_places: + self.fail('max_decimal_places', max_decimal_places=self.max_decimal_places) + if self.max_digits is not None and self.decimal_places is not None and whole_digits > (self.max_digits - self.decimal_places): + self.fail('max_whole_digits', max_while_digits=self.max_digits - self.decimal_places) + + return value + + +# Date & time fields... + +class DateField(Field): + default_error_messages = { + 'invalid': _("Date has wrong format. Use one of these formats instead: %s"), + } + input_formats = api_settings.DATE_INPUT_FORMATS + format = api_settings.DATE_FORMAT + + def __init__(self, input_formats=None, format=None, *args, **kwargs): + self.input_formats = input_formats if input_formats is not None else self.input_formats + self.format = format if format is not None else self.format + super(DateField, self).__init__(*args, **kwargs) + + def from_native(self, value): + if value in validators.EMPTY_VALUES: + return None + + if isinstance(value, datetime.datetime): + if timezone and settings.USE_TZ and timezone.is_aware(value): + # Convert aware datetimes to the default time zone + # before casting them to dates (#17742). + default_timezone = timezone.get_default_timezone() + value = timezone.make_naive(value, default_timezone) + return value.date() + if isinstance(value, datetime.date): + return value + + for format in self.input_formats: + if format.lower() == ISO_8601: + try: + parsed = parse_date(value) + except (ValueError, TypeError): + pass + else: + if parsed is not None: + return parsed + else: + try: + parsed = datetime.datetime.strptime(value, format) + except (ValueError, TypeError): + pass + else: + return parsed.date() + + humanized_format = humanize_datetime.date_formats(self.input_formats) + msg = self.error_messages['invalid'] % humanized_format + raise ValidationError(msg) + + def to_primative(self, value): + if value is None or self.format is None: + return value + + if isinstance(value, datetime.datetime): + value = value.date() + + if self.format.lower() == ISO_8601: + return value.isoformat() + return value.strftime(self.format) + + +class DateTimeField(Field): + default_error_messages = { + 'invalid': _("Datetime has wrong format. Use one of these formats instead: %s"), + } + input_formats = api_settings.DATETIME_INPUT_FORMATS + format = api_settings.DATETIME_FORMAT + + def __init__(self, input_formats=None, format=None, *args, **kwargs): + self.input_formats = input_formats if input_formats is not None else self.input_formats + self.format = format if format is not None else self.format + super(DateTimeField, self).__init__(*args, **kwargs) + + def from_native(self, value): + if value in validators.EMPTY_VALUES: + return None + + if isinstance(value, datetime.datetime): + return value + if isinstance(value, datetime.date): + value = datetime.datetime(value.year, value.month, value.day) + if settings.USE_TZ: + # For backwards compatibility, interpret naive datetimes in + # local time. This won't work during DST change, but we can't + # do much about it, so we let the exceptions percolate up the + # call stack. + warnings.warn("DateTimeField received a naive datetime (%s)" + " while time zone support is active." % value, + RuntimeWarning) + default_timezone = timezone.get_default_timezone() + value = timezone.make_aware(value, default_timezone) + return value + + for format in self.input_formats: + if format.lower() == ISO_8601: + try: + parsed = parse_datetime(value) + except (ValueError, TypeError): + pass + else: + if parsed is not None: + return parsed + else: + try: + parsed = datetime.datetime.strptime(value, format) + except (ValueError, TypeError): + pass + else: + return parsed + + humanized_format = humanize_datetime.datetime_formats(self.input_formats) + msg = self.error_messages['invalid'] % humanized_format + raise ValidationError(msg) + + def to_primative(self, value): + if value is None or self.format is None: + return value + + if self.format.lower() == ISO_8601: + ret = value.isoformat() + if ret.endswith('+00:00'): + ret = ret[:-6] + 'Z' + return ret + return value.strftime(self.format) + + +class TimeField(Field): + default_error_messages = { + 'invalid': _("Time has wrong format. Use one of these formats instead: %s"), + } + input_formats = api_settings.TIME_INPUT_FORMATS + format = api_settings.TIME_FORMAT + + def __init__(self, input_formats=None, format=None, *args, **kwargs): + self.input_formats = input_formats if input_formats is not None else self.input_formats + self.format = format if format is not None else self.format + super(TimeField, self).__init__(*args, **kwargs) + + def from_native(self, value): + if value in validators.EMPTY_VALUES: + return None + + if isinstance(value, datetime.time): + return value + + for format in self.input_formats: + if format.lower() == ISO_8601: + try: + parsed = parse_time(value) + except (ValueError, TypeError): + pass + else: + if parsed is not None: + return parsed + else: + try: + parsed = datetime.datetime.strptime(value, format) + except (ValueError, TypeError): + pass + else: + return parsed.time() + + humanized_format = humanize_datetime.time_formats(self.input_formats) + msg = self.error_messages['invalid'] % humanized_format + raise ValidationError(msg) + + def to_primative(self, value): + if value is None or self.format is None: + return value + + if isinstance(value, datetime.datetime): + value = value.time() + + if self.format.lower() == ISO_8601: + return value.isoformat() + return value.strftime(self.format) + + +# Choice types... + +class ChoiceField(Field): + default_error_messages = { + 'invalid_choice': _('`{input}` is not a valid choice.') + } + + def __init__(self, choices, **kwargs): # Allow either single or paired choices style: # choices = [1, 2, 3] # choices = [(1, 'First'), (2, 'Second'), (3, 'Third')] @@ -321,12 +694,14 @@ class ChoiceField(Field): except KeyError: self.fail('invalid_choice', input=data) + def to_primative(self, value): + return value + class MultipleChoiceField(ChoiceField): - MESSAGES = { - 'required': 'This field is required.', - 'invalid_choice': '`{input}` is not a valid choice.', - 'not_a_list': 'Expected a list of items but got type `{input_type}`' + default_error_messages = { + 'invalid_choice': _('`{input}` is not a valid choice.'), + 'not_a_list': _('Expected a list of items but got type `{input_type}`') } def to_native(self, data): @@ -337,72 +712,42 @@ class MultipleChoiceField(ChoiceField): for item in data ]) - -class IntegerField(Field): - MESSAGES = { - 'required': 'This field is required.', - 'invalid_integer': 'A valid integer is required.' - } - - def __init__(self, **kwargs): - max_value = kwargs.pop('max_value', None) - min_value = kwargs.pop('min_value', None) - super(IntegerField, self).__init__(**kwargs) - if max_value is not None: - self.validators.append(validators.MaxValueValidator(max_value)) - if min_value is not None: - self.validators.append(validators.MinValueValidator(min_value)) - - def to_native(self, data): - try: - data = int(str(data)) - except (ValueError, TypeError): - self.fail('invalid_integer') - return data - def to_primative(self, value): - if value is None: - return None - return int(value) + return value -class EmailField(CharField): - pass # TODO - - -class URLField(CharField): - pass # TODO - - -class RegexField(CharField): - def __init__(self, **kwargs): - self.regex = kwargs.pop('regex') - super(CharField, self).__init__(**kwargs) - - -class DateField(CharField): - def __init__(self, **kwargs): - self.input_formats = kwargs.pop('input_formats', None) - super(DateField, self).__init__(**kwargs) - - -class TimeField(CharField): - def __init__(self, **kwargs): - self.input_formats = kwargs.pop('input_formats', None) - super(TimeField, self).__init__(**kwargs) - - -class DateTimeField(CharField): - def __init__(self, **kwargs): - self.input_formats = kwargs.pop('input_formats', None) - super(DateTimeField, self).__init__(**kwargs) - +# File types... class FileField(Field): pass # TODO +class ImageField(Field): + pass # TODO + + +# Advanced field types... + class ReadOnlyField(Field): + """ + A read-only field that simply returns the field value. + + If the field is a method with no parameters, the method will be called + and it's return value used as the representation. + + For example, the following would call `get_expiry_date()` on the object: + + class ExampleSerializer(self): + expiry_date = ReadOnlyField(source='get_expiry_date') + """ + + def __init__(self, **kwargs): + kwargs['read_only'] = True + super(ReadOnlyField, self).__init__(**kwargs) + + def to_native(self, data): + raise NotImplemented('.to_native() not supported.') + def to_primative(self, value): if is_simple_callable(value): return value() @@ -410,11 +755,28 @@ class ReadOnlyField(Field): class MethodField(Field): + """ + A read-only field that get its representation from calling a method on the + parent serializer class. The method called will be of the form + "get_{field_name}", and should take a single argument, which is the + object being serialized. + + For example: + + class ExampleSerializer(self): + extra_info = MethodField() + + def get_extra_info(self, obj): + return ... # Calculate some data to return. + """ def __init__(self, **kwargs): kwargs['source'] = '*' kwargs['read_only'] = True super(MethodField, self).__init__(**kwargs) + def to_native(self, data): + raise NotImplemented('.to_native() not supported.') + def to_primative(self, value): attr = 'get_{field_name}'.format(field_name=self.field_name) method = getattr(self.parent, attr) @@ -424,35 +786,14 @@ class MethodField(Field): class ModelField(Field): """ A generic field that can be used against an arbitrary model field. + + This is used by `ModelSerializer` when dealing with custom model fields, + that do not have a serializer field to be mapped to. """ - def __init__(self, *args, **kwargs): - try: - self.model_field = kwargs.pop('model_field') - except KeyError: - raise ValueError("ModelField requires 'model_field' kwarg") - - self.min_length = kwargs.pop('min_length', - getattr(self.model_field, 'min_length', None)) - self.max_length = kwargs.pop('max_length', - getattr(self.model_field, 'max_length', None)) - self.min_value = kwargs.pop('min_value', - getattr(self.model_field, 'min_value', None)) - self.max_value = kwargs.pop('max_value', - getattr(self.model_field, 'max_value', None)) - - super(ModelField, self).__init__(*args, **kwargs) - - if self.min_length is not None: - self.validators.append(validators.MinLengthValidator(self.min_length)) - if self.max_length is not None: - self.validators.append(validators.MaxLengthValidator(self.max_length)) - if self.min_value is not None: - self.validators.append(validators.MinValueValidator(self.min_value)) - if self.max_value is not None: - self.validators.append(validators.MaxValueValidator(self.max_value)) - - def get_attribute(self, instance): - return get_attribute(instance, self.source_attrs[:-1]) + def __init__(self, model_field, **kwargs): + self.model_field = model_field + kwargs['source'] = '*' + super(ModelField, self).__init__(**kwargs) def to_native(self, data): rel = getattr(self.model_field, 'rel', None) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 93226d322..8ca283876 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -10,15 +10,15 @@ python primitives. 2. The process of marshalling between python primitives and request and response content is handled by parsers and renderers. """ +from django.core import validators from django.core.exceptions import ValidationError from django.db import models from django.utils import six from collections import namedtuple, OrderedDict from rest_framework.fields import empty, set_value, Field, SkipField from rest_framework.settings import api_settings -from rest_framework.utils import html +from rest_framework.utils import html, modelinfo, representation import copy -import inspect # Note: We do the following so that users of the framework can use this style: # @@ -146,12 +146,10 @@ class SerializerMetaclass(type): class Serializer(BaseSerializer): def __new__(cls, *args, **kwargs): - many = kwargs.pop('many', False) - if many: - class DynamicListSerializer(ListSerializer): - child = cls() - return DynamicListSerializer(*args, **kwargs) - return super(Serializer, cls).__new__(cls) + if kwargs.pop('many', False): + kwargs['child'] = cls() + return ListSerializer(*args, **kwargs) + return super(Serializer, cls).__new__(cls, *args, **kwargs) def __init__(self, *args, **kwargs): self.context = kwargs.pop('context', {}) @@ -248,6 +246,9 @@ class Serializer(BaseSerializer): error = errors.get(field.field_name) yield FieldResult(field, value, error) + def __repr__(self): + return representation.serializer_repr(self, indent=1) + class ListSerializer(BaseSerializer): child = None @@ -299,26 +300,8 @@ class ListSerializer(BaseSerializer): self.instance = self.create(self.validated_data) return self.instance - -def _resolve_model(obj): - """ - Resolve supplied `obj` to a Django model class. - - `obj` must be a Django model class itself, or a string - representation of one. Useful in situtations like GH #1225 where - Django may not have resolved a string-based reference to a model in - another model's foreign key definition. - - String representations should have the format: - 'appname.ModelName' - """ - if isinstance(obj, six.string_types) and len(obj.split('.')) == 2: - app_name, model_name = obj.split('.') - return models.get_model(app_name, model_name) - elif inspect.isclass(obj) and issubclass(obj, models.Model): - return obj - else: - raise ValueError("{0} is not a Django model".format(obj)) + def __repr__(self): + return representation.list_repr(self, indent=1) class ModelSerializerOptions(object): @@ -334,24 +317,25 @@ class ModelSerializerOptions(object): class ModelSerializer(Serializer): field_mapping = { models.AutoField: IntegerField, - # models.FloatField: FloatField, - models.IntegerField: IntegerField, - models.PositiveIntegerField: IntegerField, - models.SmallIntegerField: IntegerField, - models.PositiveSmallIntegerField: IntegerField, - models.DateTimeField: DateTimeField, - models.DateField: DateField, - models.TimeField: TimeField, - # models.DecimalField: DecimalField, - models.EmailField: EmailField, - models.CharField: CharField, - models.URLField: URLField, - # models.SlugField: SlugField, - models.TextField: CharField, - models.CommaSeparatedIntegerField: CharField, + models.BigIntegerField: IntegerField, models.BooleanField: BooleanField, - models.NullBooleanField: BooleanField, + models.CharField: CharField, + models.CommaSeparatedIntegerField: CharField, + models.DateField: DateField, + models.DateTimeField: DateTimeField, + models.DecimalField: DecimalField, + models.EmailField: EmailField, models.FileField: FileField, + models.FloatField: FloatField, + models.IntegerField: IntegerField, + models.NullBooleanField: BooleanField, + models.PositiveIntegerField: IntegerField, + models.PositiveSmallIntegerField: IntegerField, + models.SlugField: SlugField, + models.SmallIntegerField: IntegerField, + models.TextField: CharField, + models.TimeField: TimeField, + models.URLField: URLField, # models.ImageField: ImageField, } @@ -392,85 +376,31 @@ class ModelSerializer(Serializer): """ Return all the fields that should be serialized for the model. """ - cls = self.opts.model - opts = cls._meta.concrete_model._meta + info = modelinfo.get_field_info(self.opts.model) ret = OrderedDict() - nested = bool(self.opts.depth) - # Deal with adding the primary key field - pk_field = opts.pk - while pk_field.rel and pk_field.rel.parent_link: - # If model is a child via multitable inheritance, use parent's pk - pk_field = pk_field.rel.to._meta.pk - - serializer_pk_field = self.get_pk_field(pk_field) + serializer_pk_field = self.get_pk_field(info.pk) if serializer_pk_field: - ret[pk_field.name] = serializer_pk_field + ret[info.pk.name] = serializer_pk_field - # Deal with forward relationships - forward_rels = [field for field in opts.fields if field.serialize] - forward_rels += [field for field in opts.many_to_many if field.serialize] + # Regular fields + for field_name, field in info.fields.items(): + ret[field_name] = self.get_field(field) - for model_field in forward_rels: - has_through_model = False - - if model_field.rel: - to_many = isinstance(model_field, - models.fields.related.ManyToManyField) - related_model = _resolve_model(model_field.rel.to) - - if to_many and not model_field.rel.through._meta.auto_created: - has_through_model = True - - if model_field.rel and nested: - field = self.get_nested_field(model_field, related_model, to_many) - elif model_field.rel: - field = self.get_related_field(model_field, related_model, to_many) + # Forward relations + for field_name, relation_info in info.forward_relations.items(): + if self.opts.depth: + ret[field_name] = self.get_nested_field(*relation_info) else: - field = self.get_field(model_field) + ret[field_name] = self.get_related_field(*relation_info) - if field: - if has_through_model: - field.read_only = True - - ret[model_field.name] = field - - # Deal with reverse relationships - if not self.opts.fields: - reverse_rels = [] - else: - # Reverse relationships are only included if they are explicitly - # present in the `fields` option on the serializer - reverse_rels = opts.get_all_related_objects() - reverse_rels += opts.get_all_related_many_to_many_objects() - - for relation in reverse_rels: - accessor_name = relation.get_accessor_name() - if not self.opts.fields or accessor_name not in self.opts.fields: - continue - related_model = relation.model - to_many = relation.field.rel.multiple - has_through_model = False - is_m2m = isinstance(relation.field, - models.fields.related.ManyToManyField) - - if ( - is_m2m and - hasattr(relation.field.rel, 'through') and - not relation.field.rel.through._meta.auto_created - ): - has_through_model = True - - if nested: - field = self.get_nested_field(None, related_model, to_many) - else: - field = self.get_related_field(None, related_model, to_many) - - if field: - if has_through_model: - field.read_only = True - - ret[accessor_name] = field + # Reverse relations + for accessor_name, relation_info in info.reverse_relations.items(): + if accessor_name in self.opts.fields: + if self.opts.depth: + ret[field_name] = self.get_nested_field(*relation_info) + else: + ret[field_name] = self.get_related_field(*relation_info) return ret @@ -480,7 +410,7 @@ class ModelSerializer(Serializer): """ return self.get_field(model_field) - def get_nested_field(self, model_field, related_model, to_many): + def get_nested_field(self, model_field, related_model, to_many, has_through_model): """ Creates a default instance of a nested relational field. @@ -491,59 +421,148 @@ class ModelSerializer(Serializer): model = related_model depth = self.opts.depth - 1 - return NestedModelSerializer(many=to_many) + kwargs = {'read_only': True} + if to_many: + kwargs['many'] = True + return NestedModelSerializer(**kwargs) - def get_related_field(self, model_field, related_model, to_many): + def get_related_field(self, model_field, related_model, to_many, has_through_model): """ Creates a default instance of a flat relational field. Note that model_field will be `None` for reverse relationships. """ - # TODO: filter queryset using: - # .using(db).complex_filter(self.rel.limit_choices_to) + kwargs = { + 'queryset': related_model._default_manager, + } - kwargs = {} - # 'queryset': related_model._default_manager, - # 'many': to_many - # } + if to_many: + kwargs['many'] = True + + if has_through_model: + kwargs['read_only'] = True + kwargs.pop('queryset', None) if model_field: - kwargs['required'] = not(model_field.null or model_field.blank) + if model_field.null or model_field.blank: + kwargs['required'] = False # if model_field.help_text is not None: # kwargs['help_text'] = model_field.help_text if model_field.verbose_name is not None: kwargs['label'] = model_field.verbose_name if not model_field.editable: kwargs['read_only'] = True - if model_field.verbose_name is not None: - kwargs['label'] = model_field.verbose_name + kwargs.pop('queryset', None) - return IntegerField(**kwargs) - # TODO: return PrimaryKeyRelatedField(**kwargs) + return PrimaryKeyRelatedField(**kwargs) def get_field(self, model_field): """ Creates a default instance of a basic non-relational field. """ kwargs = {} + validator_kwarg = model_field.validators if model_field.null or model_field.blank: kwargs['required'] = False - if isinstance(model_field, models.AutoField) or not model_field.editable: - kwargs['read_only'] = True - - if model_field.has_default(): - kwargs['default'] = model_field.get_default() - - if issubclass(model_field.__class__, models.TextField): - kwargs['widget'] = widgets.Textarea - if model_field.verbose_name is not None: kwargs['label'] = model_field.verbose_name - if model_field.validators is not None: - kwargs['validators'] = model_field.validators + if isinstance(model_field, models.AutoField) or not model_field.editable: + kwargs['read_only'] = True + # Read only implies that the field is not required. + # We have a cleaner repr on the instance if we don't set it. + kwargs.pop('required', None) + + if model_field.has_default(): + kwargs['default'] = model_field.get_default() + # Having a default implies that the field is not required. + # We have a cleaner repr on the instance if we don't set it. + kwargs.pop('required', None) + + # Ensure that max_length is passed explicitly as a keyword arg, + # rather than as a validator. + max_length = getattr(model_field, 'max_length', None) + if max_length is not None: + kwargs['max_length'] = max_length + validator_kwarg = [ + validator for validator in validator_kwarg + if not isinstance(validator, validators.MaxLengthValidator) + ] + + # Ensure that min_length is passed explicitly as a keyword arg, + # rather than as a validator. + min_length = getattr(model_field, 'min_length', None) + if min_length is not None: + kwargs['min_length'] = min_length + validator_kwarg = [ + validator for validator in validator_kwarg + if not isinstance(validator, validators.MinLengthValidator) + ] + + # Ensure that max_value is passed explicitly as a keyword arg, + # rather than as a validator. + max_value = next(( + validator.limit_value for validator in validator_kwarg + if isinstance(validator, validators.MaxValueValidator) + ), None) + if max_value is not None: + kwargs['max_value'] = max_value + validator_kwarg = [ + validator for validator in validator_kwarg + if not isinstance(validator, validators.MaxValueValidator) + ] + + # Ensure that max_value is passed explicitly as a keyword arg, + # rather than as a validator. + min_value = next(( + validator.limit_value for validator in validator_kwarg + if isinstance(validator, validators.MinValueValidator) + ), None) + if min_value is not None: + kwargs['min_value'] = min_value + validator_kwarg = [ + validator for validator in validator_kwarg + if not isinstance(validator, validators.MinValueValidator) + ] + + # URLField does not need to include the URLValidator argument, + # as it is explicitly added in. + if isinstance(model_field, models.URLField): + validator_kwarg = [ + validator for validator in validator_kwarg + if not isinstance(validator, validators.URLValidator) + ] + + # EmailField does not need to include the validate_email argument, + # as it is explicitly added in. + if isinstance(model_field, models.EmailField): + validator_kwarg = [ + validator for validator in validator_kwarg + if validator is not validators.validate_email + ] + + # SlugField do not need to include the 'validate_slug' argument, + if isinstance(model_field, models.SlugField): + validator_kwarg = [ + validator for validator in validator_kwarg + if validator is not validators.validate_slug + ] + + max_digits = getattr(model_field, 'max_digits', None) + if max_digits is not None: + kwargs['max_digits'] = max_digits + + decimal_places = getattr(model_field, 'decimal_places', None) + if decimal_places is not None: + kwargs['decimal_places'] = decimal_places + + if validator_kwarg: + kwargs['validators'] = validator_kwarg + + # if issubclass(model_field.__class__, models.TextField): + # kwargs['widget'] = widgets.Textarea # if model_field.help_text is not None: # kwargs['help_text'] = model_field.help_text @@ -555,31 +574,10 @@ class ModelSerializer(Serializer): kwargs['empty'] = None return ChoiceField(**kwargs) - # put this below the ChoiceField because min_value isn't a valid initializer - if issubclass(model_field.__class__, models.PositiveIntegerField) or \ - issubclass(model_field.__class__, models.PositiveSmallIntegerField): - kwargs['min_value'] = 0 - if model_field.null and \ issubclass(model_field.__class__, (models.CharField, models.TextField)): kwargs['allow_none'] = True - # attribute_dict = { - # models.CharField: ['max_length'], - # models.CommaSeparatedIntegerField: ['max_length'], - # models.DecimalField: ['max_digits', 'decimal_places'], - # models.EmailField: ['max_length'], - # models.FileField: ['max_length'], - # models.ImageField: ['max_length'], - # models.SlugField: ['max_length'], - # models.URLField: ['max_length'], - # } - - # if model_field.__class__ in attribute_dict: - # attributes = attribute_dict[model_field.__class__] - # for attribute in attributes: - # kwargs.update({attribute: getattr(model_field, attribute)}) - try: return self.field_mapping[model_field.__class__](**kwargs) except KeyError: @@ -594,28 +592,21 @@ class HyperlinkedModelSerializerOptions(ModelSerializerOptions): super(HyperlinkedModelSerializerOptions, self).__init__(meta) self.view_name = getattr(meta, 'view_name', None) self.lookup_field = getattr(meta, 'lookup_field', None) - self.url_field_name = getattr(meta, 'url_field_name', api_settings.URL_FIELD_NAME) class HyperlinkedModelSerializer(ModelSerializer): _options_class = HyperlinkedModelSerializerOptions - _default_view_name = '%(model_name)s-detail' - _hyperlink_field_class = HyperlinkedRelatedField - _hyperlink_identify_field_class = HyperlinkedIdentityField def get_default_fields(self): fields = super(HyperlinkedModelSerializer, self).get_default_fields() if self.opts.view_name is None: - self.opts.view_name = self._get_default_view_name(self.opts.model) + self.opts.view_name = self.get_default_view_name(self.opts.model) - if self.opts.url_field_name not in fields: - url_field = self._hyperlink_identify_field_class( - view_name=self.opts.view_name, - lookup_field=self.opts.lookup_field - ) + url_field_name = api_settings.URL_FIELD_NAME + if url_field_name not in fields: ret = fields.__class__() - ret[self.opts.url_field_name] = url_field + ret[url_field_name] = self.get_url_field() ret.update(fields) fields = ret @@ -625,39 +616,48 @@ class HyperlinkedModelSerializer(ModelSerializer): if self.opts.fields and model_field.name in self.opts.fields: return self.get_field(model_field) - def get_related_field(self, model_field, related_model, to_many): + def get_url_field(self): + kwargs = { + 'view_name': self.get_default_view_name(self.opts.model) + } + if self.opts.lookup_field: + kwargs['lookup_field'] = self.opts.lookup_field + return HyperlinkedIdentityField(**kwargs) + + def get_related_field(self, model_field, related_model, to_many, has_through_model): """ Creates a default instance of a flat relational field. """ - # TODO: filter queryset using: - # .using(db).complex_filter(self.rel.limit_choices_to) - # kwargs = { - # 'queryset': related_model._default_manager, - # 'view_name': self._get_default_view_name(related_model), - # 'many': to_many - # } - kwargs = {} + kwargs = { + 'queryset': related_model._default_manager, + 'view_name': self.get_default_view_name(related_model), + } + + if to_many: + kwargs['many'] = True + + if has_through_model: + kwargs['read_only'] = True + kwargs.pop('queryset', None) if model_field: - kwargs['required'] = not(model_field.null or model_field.blank) + if model_field.null or model_field.blank: + kwargs['required'] = False # if model_field.help_text is not None: # kwargs['help_text'] = model_field.help_text if model_field.verbose_name is not None: kwargs['label'] = model_field.verbose_name + if not model_field.editable: + kwargs['read_only'] = True + kwargs.pop('queryset', None) - return IntegerField(**kwargs) - # if self.opts.lookup_field: - # kwargs['lookup_field'] = self.opts.lookup_field + return HyperlinkedRelatedField(**kwargs) - # return self._hyperlink_field_class(**kwargs) - - def _get_default_view_name(self, model): + def get_default_view_name(self, model): """ - Return the view name to use if 'view_name' is not specified in 'Meta' + Return the view name to use for related models. """ - model_meta = model._meta - format_kwargs = { - 'app_label': model_meta.app_label, - 'model_name': model_meta.object_name.lower() + return '%(model_name)s-detail' % { + 'app_label': model._meta.app_label, + 'model_name': model._meta.object_name.lower() } - return self._default_view_name % format_kwargs diff --git a/rest_framework/utils/humanize_datetime.py b/rest_framework/utils/humanize_datetime.py new file mode 100644 index 000000000..649f2abc6 --- /dev/null +++ b/rest_framework/utils/humanize_datetime.py @@ -0,0 +1,47 @@ +""" +Helper functions that convert strftime formats into more readable representations. +""" +from rest_framework import ISO_8601 + + +def datetime_formats(formats): + format = ', '.join(formats).replace( + ISO_8601, + 'YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]' + ) + return humanize_strptime(format) + + +def date_formats(formats): + format = ', '.join(formats).replace(ISO_8601, 'YYYY[-MM[-DD]]') + return humanize_strptime(format) + + +def time_formats(formats): + format = ', '.join(formats).replace(ISO_8601, 'hh:mm[:ss[.uuuuuu]]') + return humanize_strptime(format) + + +def humanize_strptime(format_string): + # Note that we're missing some of the locale specific mappings that + # don't really make sense. + mapping = { + "%Y": "YYYY", + "%y": "YY", + "%m": "MM", + "%b": "[Jan-Dec]", + "%B": "[January-December]", + "%d": "DD", + "%H": "hh", + "%I": "hh", # Requires '%p' to differentiate from '%H'. + "%M": "mm", + "%S": "ss", + "%f": "uuuuuu", + "%a": "[Mon-Sun]", + "%A": "[Monday-Sunday]", + "%p": "[AM|PM]", + "%z": "[+HHMM|-HHMM]" + } + for key, val in mapping.items(): + format_string = format_string.replace(key, val) + return format_string diff --git a/rest_framework/utils/modelinfo.py b/rest_framework/utils/modelinfo.py new file mode 100644 index 000000000..c0513886c --- /dev/null +++ b/rest_framework/utils/modelinfo.py @@ -0,0 +1,97 @@ +""" +Helper functions for returning the field information that is associated +with a model class. +""" +from collections import namedtuple, OrderedDict +from django.db import models +from django.utils import six +import inspect + +FieldInfo = namedtuple('FieldResult', ['pk', 'fields', 'forward_relations', 'reverse_relations']) +RelationInfo = namedtuple('RelationInfo', ['field', 'related', 'to_many', 'has_through_model']) + + +def _resolve_model(obj): + """ + Resolve supplied `obj` to a Django model class. + + `obj` must be a Django model class itself, or a string + representation of one. Useful in situtations like GH #1225 where + Django may not have resolved a string-based reference to a model in + another model's foreign key definition. + + String representations should have the format: + 'appname.ModelName' + """ + if isinstance(obj, six.string_types) and len(obj.split('.')) == 2: + app_name, model_name = obj.split('.') + return models.get_model(app_name, model_name) + elif inspect.isclass(obj) and issubclass(obj, models.Model): + return obj + raise ValueError("{0} is not a Django model".format(obj)) + + +def get_field_info(model): + """ + Given a model class, returns a `FieldInfo` instance containing metadata + about the various field types on the model. + """ + opts = model._meta.concrete_model._meta + + # Deal with the primary key. + pk = opts.pk + while pk.rel and pk.rel.parent_link: + # If model is a child via multitable inheritance, use parent's pk. + pk = pk.rel.to._meta.pk + + # Deal with regular fields. + fields = OrderedDict() + for field in [field for field in opts.fields if field.serialize and not field.rel]: + fields[field.name] = field + + # Deal with forward relationships. + forward_relations = OrderedDict() + for field in [field for field in opts.fields if field.serialize and field.rel]: + forward_relations[field.name] = RelationInfo( + field=field, + related=_resolve_model(field.rel.to), + to_many=False, + has_through_model=False + ) + + # Deal with forward many-to-many relationships. + for field in [field for field in opts.many_to_many if field.serialize]: + forward_relations[field.name] = RelationInfo( + field=field, + related=_resolve_model(field.rel.to), + to_many=True, + has_through_model=( + not field.rel.through._meta.auto_created + ) + ) + + # Deal with reverse relationships. + reverse_relations = OrderedDict() + for relation in opts.get_all_related_objects(): + accessor_name = relation.get_accessor_name() + reverse_relations[accessor_name] = RelationInfo( + field=None, + related=relation.model, + to_many=relation.field.rel.multiple, + has_through_model=False + ) + + # Deal with reverse many-to-many relationships. + for relation in opts.get_all_related_many_to_many_objects(): + accessor_name = relation.get_accessor_name() + reverse_relations[accessor_name] = RelationInfo( + field=None, + related=relation.model, + to_many=True, + has_through_model=( + hasattr(relation.field.rel, 'through') and + not relation.field.rel.through._meta.auto_created + ) + ) + + return FieldInfo(pk, fields, forward_relations, reverse_relations) diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py new file mode 100644 index 000000000..1de21597d --- /dev/null +++ b/rest_framework/utils/representation.py @@ -0,0 +1,72 @@ +""" +Helper functions for creating user-friendly representations +of serializer classes and serializer fields. +""" +import re + + +def smart_repr(value): + value = repr(value) + + # Representations like u'help text' + # should simply be presented as 'help text' + if value.startswith("u'") and value.endswith("'"): + return value[1:] + + # Representations like + # <django.core.validators.RegexValidator object at 0x1047af050> + # Should be presented as + # <django.core.validators.RegexValidator object> + value = re.sub(' at 0x[0-9a-f]{8,10}>', '>', value) + + return value + + +def field_repr(field, force_many=False): + kwargs = field._kwargs + if force_many: + kwargs = kwargs.copy() + kwargs['many'] = True + kwargs.pop('child', None) + + arg_string = ', '.join([smart_repr(val) for val in field._args]) + kwarg_string = ', '.join([ + '%s=%s' % (key, smart_repr(val)) + for key, val in sorted(kwargs.items()) + ]) + if arg_string and kwarg_string: + arg_string += ', ' + + if force_many: + class_name = force_many.__class__.__name__ + else: + class_name = field.__class__.__name__ + + return "%s(%s%s)" % (class_name, arg_string, kwarg_string) + + +def serializer_repr(serializer, indent, force_many=None): + ret = field_repr(serializer, force_many) + ':' + indent_str = ' ' * indent + + if force_many: + fields = force_many.fields + else: + fields = serializer.fields + + for field_name, field in fields.items(): + ret += '\n' + indent_str + field_name + ' = ' + if hasattr(field, 'fields'): + ret += serializer_repr(field, indent + 1) + elif hasattr(field, 'child'): + ret += list_repr(field, indent + 1) + else: + ret += field_repr(field) + return ret + + +def list_repr(serializer, indent): + child = serializer.child + if hasattr(child, 'fields'): + return serializer_repr(serializer, indent, force_many=child) + return field_repr(serializer) diff --git a/tests/test_model_field_mappings.py b/tests/test_model_field_mappings.py new file mode 100644 index 000000000..dc254da45 --- /dev/null +++ b/tests/test_model_field_mappings.py @@ -0,0 +1,160 @@ +""" +The `ModelSerializer` and `HyperlinkedModelSerializer` classes are essentially +shortcuts for automatically creating serializers based on a given model class. + +These tests deal with ensuring that we correctly map the model fields onto +an appropriate set of serializer fields for each case. +""" +from django.db import models +from django.test import TestCase +from rest_framework import serializers + + +# Models for testing regular field mapping + +class RegularFieldsModel(models.Model): + auto_field = models.AutoField(primary_key=True) + big_integer_field = models.BigIntegerField() + boolean_field = models.BooleanField() + char_field = models.CharField(max_length=100) + comma_seperated_integer_field = models.CommaSeparatedIntegerField(max_length=100) + date_field = models.DateField() + datetime_field = models.DateTimeField() + decimal_field = models.DecimalField(max_digits=3, decimal_places=1) + email_field = models.EmailField(max_length=100) + float_field = models.FloatField() + integer_field = models.IntegerField() + null_boolean_field = models.NullBooleanField() + positive_integer_field = models.PositiveIntegerField() + positive_small_integer_field = models.PositiveSmallIntegerField() + slug_field = models.SlugField(max_length=100) + small_integer_field = models.SmallIntegerField() + text_field = models.TextField() + time_field = models.TimeField() + url_field = models.URLField(max_length=100) + + +REGULAR_FIELDS_REPR = """ +TestSerializer(): + auto_field = IntegerField(label='auto field', read_only=True) + big_integer_field = IntegerField(label='big integer field') + boolean_field = BooleanField(default=False, label='boolean field') + char_field = CharField(label='char field', max_length=100) + comma_seperated_integer_field = CharField(label='comma seperated integer field', max_length=100, validators=[<django.core.validators.RegexValidator object>]) + date_field = DateField(label='date field') + datetime_field = DateTimeField(label='datetime field') + decimal_field = DecimalField(decimal_places=1, label='decimal field', max_digits=3) + email_field = EmailField(label='email field', max_length=100) + float_field = FloatField(label='float field') + integer_field = IntegerField(label='integer field') + null_boolean_field = BooleanField(label='null boolean field', required=False) + positive_integer_field = IntegerField(label='positive integer field') + positive_small_integer_field = IntegerField(label='positive small integer field') + slug_field = SlugField(label='slug field', max_length=100) + small_integer_field = IntegerField(label='small integer field') + text_field = CharField(label='text field') + time_field = TimeField(label='time field') + url_field = URLField(label='url field', max_length=100) +""".strip() + + +# Model for testing relational field mapping + +class ForeignKeyTarget(models.Model): + char_field = models.CharField(max_length=100) + + +class ManyToManyTarget(models.Model): + char_field = models.CharField(max_length=100) + + +class OneToOneTarget(models.Model): + char_field = models.CharField(max_length=100) + + +class RelationalModel(models.Model): + foreign_key = models.ForeignKey(ForeignKeyTarget) + many_to_many = models.ManyToManyField(ManyToManyTarget) + one_to_one = models.OneToOneField(OneToOneTarget) + + +RELATIONAL_FLAT_REPR = """ +TestSerializer(): + id = IntegerField(label='ID', read_only=True) + foreign_key = PrimaryKeyRelatedField(label='foreign key', queryset=<django.db.models.manager.Manager object>) + one_to_one = PrimaryKeyRelatedField(label='one to one', queryset=<django.db.models.manager.Manager object>) + many_to_many = PrimaryKeyRelatedField(label='many to many', many=True, queryset=<django.db.models.manager.Manager object>) +""".strip() + + +RELATIONAL_NESTED_REPR = """ +TestSerializer(): + id = IntegerField(label='ID', read_only=True) + foreign_key = NestedModelSerializer(read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(label='name', max_length=100) + one_to_one = NestedModelSerializer(read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(label='name', max_length=100) + many_to_many = NestedModelSerializer(many=True, read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(label='name', max_length=100) +""".strip() + + +HYPERLINKED_FLAT_REPR = """ +TestSerializer(): + url = HyperlinkedIdentityField(view_name='relationalmodel-detail') + foreign_key = HyperlinkedRelatedField(label='foreign key', queryset=<django.db.models.manager.Manager object>, view_name='foreignkeytarget-detail') + one_to_one = HyperlinkedRelatedField(label='one to one', queryset=<django.db.models.manager.Manager object>, view_name='onetoonetarget-detail') + many_to_many = HyperlinkedRelatedField(label='many to many', many=True, queryset=<django.db.models.manager.Manager object>, view_name='manytomanytarget-detail') +""".strip() + + +HYPERLINKED_NESTED_REPR = """ +TestSerializer(): + url = HyperlinkedIdentityField(view_name='relationalmodel-detail') + foreign_key = NestedModelSerializer(read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(label='name', max_length=100) + one_to_one = NestedModelSerializer(read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(label='name', max_length=100) + many_to_many = NestedModelSerializer(many=True, read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(label='name', max_length=100) +""".strip() + + +class TestSerializerMappings(TestCase): + def test_regular_fields(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = RegularFieldsModel + self.assertEqual(repr(TestSerializer()), REGULAR_FIELDS_REPR) + + def test_flat_relational_fields(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = RelationalModel + self.assertEqual(repr(TestSerializer()), RELATIONAL_FLAT_REPR) + + def test_nested_relational_fields(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = RelationalModel + depth = 1 + self.assertEqual(repr(TestSerializer()), RELATIONAL_NESTED_REPR) + + def test_flat_hyperlinked_fields(self): + class TestSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = RelationalModel + self.assertEqual(repr(TestSerializer()), HYPERLINKED_FLAT_REPR) + + def test_nested_hyperlinked_fields(self): + class TestSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = RelationalModel + depth = 1 + self.assertEqual(repr(TestSerializer()), HYPERLINKED_NESTED_REPR) diff --git a/tests/test_serializers.py b/tests/test_modelinfo.py similarity index 94% rename from tests/test_serializers.py rename to tests/test_modelinfo.py index 31c417306..254a33c9c 100644 --- a/tests/test_serializers.py +++ b/tests/test_modelinfo.py @@ -1,6 +1,6 @@ from django.test import TestCase from django.utils import six -from rest_framework.serializers import _resolve_model +from rest_framework.utils.modelinfo import _resolve_model from tests.models import BasicModel diff --git a/tests/test_relations.py b/tests/test_relations.py index a30b12e68..b1bc66b62 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -22,18 +22,18 @@ # https://github.com/tomchristie/django-rest-framework/issues/446 # """ # field = serializers.PrimaryKeyRelatedField(queryset=NullModel.objects.all()) -# self.assertRaises(serializers.ValidationError, field.from_native, '') -# self.assertRaises(serializers.ValidationError, field.from_native, []) +# self.assertRaises(serializers.ValidationError, field.to_primative, '') +# self.assertRaises(serializers.ValidationError, field.to_primative, []) # def test_hyperlinked_related_field_with_empty_string(self): # field = serializers.HyperlinkedRelatedField(queryset=NullModel.objects.all(), view_name='') -# self.assertRaises(serializers.ValidationError, field.from_native, '') -# self.assertRaises(serializers.ValidationError, field.from_native, []) +# self.assertRaises(serializers.ValidationError, field.to_primative, '') +# self.assertRaises(serializers.ValidationError, field.to_primative, []) # def test_slug_related_field_with_empty_string(self): # field = serializers.SlugRelatedField(queryset=NullModel.objects.all(), slug_field='pk') -# self.assertRaises(serializers.ValidationError, field.from_native, '') -# self.assertRaises(serializers.ValidationError, field.from_native, []) +# self.assertRaises(serializers.ValidationError, field.to_primative, '') +# self.assertRaises(serializers.ValidationError, field.to_primative, []) # class TestManyRelatedMixin(TestCase): diff --git a/tests/test_serializer_empty.py b/tests/test_serializer_empty.py index d0006ad38..4e4a7b423 100644 --- a/tests/test_serializer_empty.py +++ b/tests/test_serializer_empty.py @@ -6,7 +6,7 @@ # def test_empty_serializer(self): # class FooBarSerializer(serializers.Serializer): # foo = serializers.IntegerField() -# bar = serializers.SerializerMethodField('get_bar') +# bar = serializers.MethodField() # def get_bar(self, obj): # return 'bar' From 234369aefdf08d7d0161d851866990754c00d31f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 10 Sep 2014 08:53:33 +0100 Subject: [PATCH 0805/1652] Tweaks --- rest_framework/fields.py | 6 ++++-- rest_framework/serializers.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 043a44edd..e2bd57000 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -190,7 +190,7 @@ class Field(object): raise SkipField() return self.default - def validate(self, data=empty): + def validate_value(self, data=empty): """ Validate a simple representation and return the internal value. @@ -506,6 +506,7 @@ class DateField(Field): default_timezone = timezone.get_default_timezone() value = timezone.make_naive(value, default_timezone) return value.date() + if isinstance(value, datetime.date): return value @@ -560,6 +561,7 @@ class DateTimeField(Field): if isinstance(value, datetime.datetime): return value + if isinstance(value, datetime.date): value = datetime.datetime(value.year, value.month, value.day) if settings.USE_TZ: @@ -675,7 +677,7 @@ class ChoiceField(Field): for item in choices ] if all(pairs): - self.choices = {key: val for key, val in choices} + self.choices = {key: display_value for key, display_value in choices} else: self.choices = {item: item for item in choices} diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 8ca283876..0727b8cdf 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -205,7 +205,7 @@ class Serializer(BaseSerializer): validate_method = getattr(self, 'validate_' + field.field_name, None) primitive_value = field.get_value(data) try: - validated_value = field.validate(primitive_value) + validated_value = field.validate_value(primitive_value) if validate_method is not None: validated_value = validate_method(validated_value) except ValidationError as exc: @@ -327,6 +327,7 @@ class ModelSerializer(Serializer): models.EmailField: EmailField, models.FileField: FileField, models.FloatField: FloatField, + models.ImageField: ImageField, models.IntegerField: IntegerField, models.NullBooleanField: BooleanField, models.PositiveIntegerField: IntegerField, @@ -336,7 +337,6 @@ class ModelSerializer(Serializer): models.TextField: CharField, models.TimeField: TimeField, models.URLField: URLField, - # models.ImageField: ImageField, } _options_class = ModelSerializerOptions From 01c8c0cad977fc0787dbfc78bd34f4fd37e613f4 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 10 Sep 2014 13:52:16 +0100 Subject: [PATCH 0806/1652] Added help_text argument to fields --- rest_framework/compat.py | 23 +++++----- rest_framework/fields.py | 5 +- rest_framework/serializers.py | 86 +++++++++++++++++------------------ 3 files changed, 56 insertions(+), 58 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index fa0f0bfb1..70b38df98 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -39,6 +39,17 @@ except ImportError: django_filters = None +if django.VERSION >= (1, 6): + def clean_manytomany_helptext(text): + return text +else: + # Up to version 1.5 many to many fields automatically suffix + # the `help_text` attribute with hardcoded text. + def clean_manytomany_helptext(text): + if text.endswith(' Hold down "Control", or "Command" on a Mac, to select more than one.'): + text = text[:-69] + return text + # Django-guardian is optional. Import only if guardian is in INSTALLED_APPS # Fixes (#1712). We keep the try/except for the test suite. guardian = None @@ -99,18 +110,8 @@ def get_concrete_model(model_cls): return model_cls -# View._allowed_methods only present from 1.5 onwards -if django.VERSION >= (1, 5): - from django.views.generic import View -else: - from django.views.generic import View as DjangoView - - class View(DjangoView): - def _allowed_methods(self): - return [m.upper() for m in self.http_method_names if hasattr(self, m)] - - # PATCH method is not implemented by Django +from django.views.generic import View if 'patch' not in View.http_method_names: View.http_method_names = View.http_method_names + ['patch'] diff --git a/rest_framework/fields.py b/rest_framework/fields.py index e2bd57000..e71dce1df 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -101,7 +101,8 @@ class Field(object): def __init__(self, read_only=False, write_only=False, required=None, default=empty, initial=None, source=None, - label=None, style=None, error_messages=None, validators=[]): + label=None, help_text=None, style=None, + error_messages=None, validators=[]): self._creation_counter = Field._creation_counter Field._creation_counter += 1 @@ -122,6 +123,7 @@ class Field(object): self.source = source self.initial = initial self.label = label + self.help_text = help_text self.style = {} if style is None else style self.validators = validators or self.default_validators[:] @@ -372,7 +374,6 @@ class IntegerField(Field): self.validators.append(validators.MaxValueValidator(max_value)) if min_value is not None: self.validators.append(validators.MinValueValidator(min_value)) - print self.__class__.__name__, self.validators def to_native(self, data): try: diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0727b8cdf..459f8a8ce 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -15,6 +15,7 @@ from django.core.exceptions import ValidationError from django.db import models from django.utils import six from collections import namedtuple, OrderedDict +from rest_framework.compat import clean_manytomany_helptext from rest_framework.fields import empty, set_value, Field, SkipField from rest_framework.settings import api_settings from rest_framework.utils import html, modelinfo, representation @@ -117,8 +118,9 @@ class SerializerMetaclass(type): """ This metaclass sets a dictionary named `base_fields` on the class. - Any fields included as attributes on either the class or it's superclasses - will be include in the `base_fields` dictionary. + Any instances of `Field` included as attributes on either the class + or on any of its superclasses will be include in the + `base_fields` dictionary. """ @classmethod @@ -379,6 +381,10 @@ class ModelSerializer(Serializer): info = modelinfo.get_field_info(self.opts.model) ret = OrderedDict() + serializer_url_field = self.get_url_field() + if serializer_url_field: + ret[api_settings.URL_FIELD_NAME] = serializer_url_field + serializer_pk_field = self.get_pk_field(info.pk) if serializer_pk_field: ret[info.pk.name] = serializer_pk_field @@ -404,6 +410,9 @@ class ModelSerializer(Serializer): return ret + def get_url_field(self): + return None + def get_pk_field(self, model_field): """ Returns a default instance of the pk field. @@ -446,13 +455,14 @@ class ModelSerializer(Serializer): if model_field: if model_field.null or model_field.blank: kwargs['required'] = False - # if model_field.help_text is not None: - # kwargs['help_text'] = model_field.help_text - if model_field.verbose_name is not None: + if model_field.verbose_name: kwargs['label'] = model_field.verbose_name if not model_field.editable: kwargs['read_only'] = True kwargs.pop('queryset', None) + help_text = clean_manytomany_helptext(model_field.help_text) + if help_text: + kwargs['help_text'] = help_text return PrimaryKeyRelatedField(**kwargs) @@ -469,6 +479,9 @@ class ModelSerializer(Serializer): if model_field.verbose_name is not None: kwargs['label'] = model_field.verbose_name + if model_field.help_text: + kwargs['help_text'] = model_field.help_text + if isinstance(model_field, models.AutoField) or not model_field.editable: kwargs['read_only'] = True # Read only implies that the field is not required. @@ -481,6 +494,14 @@ class ModelSerializer(Serializer): # We have a cleaner repr on the instance if we don't set it. kwargs.pop('required', None) + if model_field.flatchoices: + # If this model field contains choices, then use a ChoiceField, + # rather than the standard serializer field for this type. + # Note that we return this prior to setting any validation type + # keyword arguments, as those are not valid initializers. + kwargs['choices'] = model_field.flatchoices + return ChoiceField(**kwargs) + # Ensure that max_length is passed explicitly as a keyword arg, # rather than as a validator. max_length = getattr(model_field, 'max_length', None) @@ -561,23 +582,6 @@ class ModelSerializer(Serializer): if validator_kwarg: kwargs['validators'] = validator_kwarg - # if issubclass(model_field.__class__, models.TextField): - # kwargs['widget'] = widgets.Textarea - - # if model_field.help_text is not None: - # kwargs['help_text'] = model_field.help_text - - # TODO: TypedChoiceField? - if model_field.flatchoices: # This ModelField contains choices - kwargs['choices'] = model_field.flatchoices - if model_field.null: - kwargs['empty'] = None - return ChoiceField(**kwargs) - - if model_field.null and \ - issubclass(model_field.__class__, (models.CharField, models.TextField)): - kwargs['allow_none'] = True - try: return self.field_mapping[model_field.__class__](**kwargs) except KeyError: @@ -597,33 +601,24 @@ class HyperlinkedModelSerializerOptions(ModelSerializerOptions): class HyperlinkedModelSerializer(ModelSerializer): _options_class = HyperlinkedModelSerializerOptions - def get_default_fields(self): - fields = super(HyperlinkedModelSerializer, self).get_default_fields() + def get_url_field(self): + if self.opts.view_name is not None: + view_name = self.opts.view_name + else: + view_name = self.get_default_view_name(self.opts.model) - if self.opts.view_name is None: - self.opts.view_name = self.get_default_view_name(self.opts.model) + kwargs = { + 'view_name': view_name + } + if self.opts.lookup_field: + kwargs['lookup_field'] = self.opts.lookup_field - url_field_name = api_settings.URL_FIELD_NAME - if url_field_name not in fields: - ret = fields.__class__() - ret[url_field_name] = self.get_url_field() - ret.update(fields) - fields = ret - - return fields + return HyperlinkedIdentityField(**kwargs) def get_pk_field(self, model_field): if self.opts.fields and model_field.name in self.opts.fields: return self.get_field(model_field) - def get_url_field(self): - kwargs = { - 'view_name': self.get_default_view_name(self.opts.model) - } - if self.opts.lookup_field: - kwargs['lookup_field'] = self.opts.lookup_field - return HyperlinkedIdentityField(**kwargs) - def get_related_field(self, model_field, related_model, to_many, has_through_model): """ Creates a default instance of a flat relational field. @@ -643,13 +638,14 @@ class HyperlinkedModelSerializer(ModelSerializer): if model_field: if model_field.null or model_field.blank: kwargs['required'] = False - # if model_field.help_text is not None: - # kwargs['help_text'] = model_field.help_text - if model_field.verbose_name is not None: + if model_field.verbose_name: kwargs['label'] = model_field.verbose_name if not model_field.editable: kwargs['read_only'] = True kwargs.pop('queryset', None) + help_text = clean_manytomany_helptext(model_field.help_text) + if help_text: + kwargs['help_text'] = help_text return HyperlinkedRelatedField(**kwargs) From 80ba0473473501968154c5cc5dd5922e53d96a70 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 10 Sep 2014 16:57:22 +0100 Subject: [PATCH 0807/1652] Compat fixes --- rest_framework/compat.py | 12 +++++++++++- rest_framework/fields.py | 14 +++++++------- rest_framework/serializers.py | 25 +++++++++++++------------ rest_framework/utils/modelinfo.py | 9 +++++---- 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 70b38df98..7c05bed9c 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -110,8 +110,18 @@ def get_concrete_model(model_cls): return model_cls +# View._allowed_methods only present from 1.5 onwards +if django.VERSION >= (1, 5): + from django.views.generic import View +else: + from django.views.generic import View as DjangoView + + class View(DjangoView): + def _allowed_methods(self): + return [m.upper() for m in self.http_method_names if hasattr(self, m)] + + # PATCH method is not implemented by Django -from django.views.generic import View if 'patch' not in View.http_method_names: View.http_method_names = View.http_method_names + ['patch'] diff --git a/rest_framework/fields.py b/rest_framework/fields.py index e71dce1df..3ec28908d 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -266,8 +266,8 @@ class BooleanField(Field): default_error_messages = { 'invalid': _('`{input}` is not a valid boolean.') } - TRUE_VALUES = {'t', 'T', 'true', 'True', 'TRUE', '1', 1, True} - FALSE_VALUES = {'f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False} + TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True)) + FALSE_VALUES = set(('f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False)) def get_value(self, dictionary): if html.is_html_input(dictionary): @@ -678,16 +678,16 @@ class ChoiceField(Field): for item in choices ] if all(pairs): - self.choices = {key: display_value for key, display_value in choices} + self.choices = dict([(key, display_value) for key, display_value in choices]) else: - self.choices = {item: item for item in choices} + self.choices = dict([(item, item) for item in choices]) # Map the string representation of choices to the underlying value. # Allows us to deal with eg. integer choices while supporting either # integer or string input, but still get the correct datatype out. - self.choice_strings_to_values = { - str(key): key for key in self.choices.keys() - } + self.choice_strings_to_values = dict([ + (str(key), key) for key in self.choices.keys() + ]) super(ChoiceField, self).__init__(**kwargs) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 459f8a8ce..13e579398 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -14,7 +14,8 @@ from django.core import validators from django.core.exceptions import ValidationError from django.db import models from django.utils import six -from collections import namedtuple, OrderedDict +from django.utils.datastructures import SortedDict +from collections import namedtuple from rest_framework.compat import clean_manytomany_helptext from rest_framework.fields import empty, set_value, Field, SkipField from rest_framework.settings import api_settings @@ -91,10 +92,10 @@ class BaseSerializer(Field): if self.instance is not None: self._data = self.to_primative(self.instance) elif self._initial_data is not None: - self._data = { - field_name: field.get_value(self._initial_data) + self._data = dict([ + (field_name, field.get_value(self._initial_data)) for field_name, field in self.fields.items() - } + ]) else: self._data = self.get_initial() return self._data @@ -137,7 +138,7 @@ class SerializerMetaclass(type): if hasattr(base, 'base_fields'): fields = list(base.base_fields.items()) + fields - return OrderedDict(fields) + return SortedDict(fields) def __new__(cls, name, bases, attrs): attrs['base_fields'] = cls._get_fields(bases, attrs) @@ -180,10 +181,10 @@ class Serializer(BaseSerializer): field.bind(field_name, self, root) def get_initial(self): - return { - field.field_name: field.get_initial() + return dict([ + (field.field_name, field.get_initial()) for field in self.fields.values() - } + ]) def get_value(self, dictionary): # We override the default field access in order to support @@ -222,14 +223,14 @@ class Serializer(BaseSerializer): try: return self.validate(ret) - except ValidationError, exc: + except ValidationError as exc: raise ValidationError({'non_field_errors': exc.messages}) def to_primative(self, instance): """ Object instance -> Dict of primitive datatypes. """ - ret = OrderedDict() + ret = SortedDict() fields = [field for field in self.fields.values() if not field.write_only] for field in fields: @@ -368,7 +369,7 @@ class ModelSerializer(Serializer): # If `fields` is set on the `Meta` class, # then use only those fields, and in that order. if self.opts.fields: - fields = OrderedDict([ + fields = SortedDict([ (key, fields[key]) for key in self.opts.fields ]) @@ -379,7 +380,7 @@ class ModelSerializer(Serializer): Return all the fields that should be serialized for the model. """ info = modelinfo.get_field_info(self.opts.model) - ret = OrderedDict() + ret = SortedDict() serializer_url_field = self.get_url_field() if serializer_url_field: diff --git a/rest_framework/utils/modelinfo.py b/rest_framework/utils/modelinfo.py index c0513886c..a7a0346c2 100644 --- a/rest_framework/utils/modelinfo.py +++ b/rest_framework/utils/modelinfo.py @@ -2,9 +2,10 @@ Helper functions for returning the field information that is associated with a model class. """ -from collections import namedtuple, OrderedDict +from collections import namedtuple from django.db import models from django.utils import six +from django.utils.datastructures import SortedDict import inspect FieldInfo = namedtuple('FieldResult', ['pk', 'fields', 'forward_relations', 'reverse_relations']) @@ -45,12 +46,12 @@ def get_field_info(model): pk = pk.rel.to._meta.pk # Deal with regular fields. - fields = OrderedDict() + fields = SortedDict() for field in [field for field in opts.fields if field.serialize and not field.rel]: fields[field.name] = field # Deal with forward relationships. - forward_relations = OrderedDict() + forward_relations = SortedDict() for field in [field for field in opts.fields if field.serialize and field.rel]: forward_relations[field.name] = RelationInfo( field=field, @@ -71,7 +72,7 @@ def get_field_info(model): ) # Deal with reverse relationships. - reverse_relations = OrderedDict() + reverse_relations = SortedDict() for relation in opts.get_all_related_objects(): accessor_name = relation.get_accessor_name() reverse_relations[accessor_name] = RelationInfo( From e76f56a3d687159327b8bef5bf9bc2ad28c99ea3 Mon Sep 17 00:00:00 2001 From: "S. Andrew Sheppard" <andrew@wq.io> Date: Wed, 10 Sep 2014 11:55:43 -0500 Subject: [PATCH 0808/1652] add django rest pandas --- docs/api-guide/renderers.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 7a3429bfd..20eed70d6 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -444,6 +444,11 @@ Comma-separated values are a plain-text tabular data format, that can be easily [djangorestframework-camel-case] provides camel case JSON renderers and parsers for REST framework. This allows serializers to use Python-style underscored field names, but be exposed in the API as Javascript-style camel case field names. It is maintained by [Vitaly Babiy][vbabiy]. +## Pandas (CSV, Excel, PNG) + +[Django REST Pandas] provides a serializer and renderers that support additional data processing and output via the [Pandas] DataFrame API. Django REST Pandas includes renderers for Pandas-style CSV files, Excel workbooks (both `.xls` and `.xlsx`), and a number of [other formats]. It is maintained by [S. Andrew Sheppard][sheppard] as part of the [wq Project][wq]. + + [cite]: https://docs.djangoproject.com/en/dev/ref/template-response/#the-rendering-process [conneg]: content-negotiation.md [browser-accept-headers]: http://www.gethifi.com/blog/browser-rest-http-accept-headers @@ -466,4 +471,9 @@ Comma-separated values are a plain-text tabular data format, that can be easily [ultrajson]: https://github.com/esnme/ultrajson [hzy]: https://github.com/hzy [drf-ujson-renderer]: https://github.com/gizmag/drf-ujson-renderer -[djangorestframework-camel-case]: https://github.com/vbabiy/djangorestframework-camel-case \ No newline at end of file +[djangorestframework-camel-case]: https://github.com/vbabiy/djangorestframework-camel-case +[Django REST Pandas]: https://github.com/wq/django-rest-pandas +[Pandas]: http://pandas.pydata.org/ +[other formats]: https://github.com/wq/django-rest-pandas#supported-formats +[sheppard]: https://github.com/sheppard +[wq]: https://github.com/wq From 37d01f6088b1cf5673f66f4532dd51c73a0156f1 Mon Sep 17 00:00:00 2001 From: Joe Binney <joe@robinhood.com> Date: Wed, 10 Sep 2014 20:27:52 -0700 Subject: [PATCH 0809/1652] Fix grammar in login error message --- rest_framework/authtoken/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py index 99e99ae3d..472e59ee3 100644 --- a/rest_framework/authtoken/serializers.py +++ b/rest_framework/authtoken/serializers.py @@ -22,7 +22,7 @@ class AuthTokenSerializer(serializers.Serializer): attrs['user'] = user return attrs else: - msg = _('Unable to login with provided credentials.') + msg = _('Unable to log in with provided credentials.') raise serializers.ValidationError(msg) else: msg = _('Must include "username" and "password"') From ae8443853054635326598f6b06fb49429884d558 Mon Sep 17 00:00:00 2001 From: Marek Skrajnowski <marek.skrajnowski@10clouds.com> Date: Thu, 11 Sep 2014 12:42:36 +0200 Subject: [PATCH 0810/1652] Added DefaultRouter support (and test) for viewsets without the default action implemented, which is usually the list action. --- rest_framework/routers.py | 11 ++++++++++- tests/test_routers.py | 18 +++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 8f1ab6fa7..01fd4b91a 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -19,6 +19,7 @@ import itertools from collections import namedtuple from django.conf.urls import patterns, url from django.core.exceptions import ImproperlyConfigured +from django.core.urlresolvers import NoReverseMatch from rest_framework import views from rest_framework.response import Response from rest_framework.reverse import reverse @@ -287,7 +288,15 @@ class DefaultRouter(SimpleRouter): def get(self, request, *args, **kwargs): ret = {} for key, url_name in api_root_dict.items(): - ret[key] = reverse(url_name, request=request, format=kwargs.get('format', None)) + try: + ret[key] = reverse( + url_name, + request=request, + format=kwargs.get('format', None) + ) + except NoReverseMatch: + continue + return Response(ret) return APIRoot.as_view() diff --git a/tests/test_routers.py b/tests/test_routers.py index b076f134e..f6f5a977a 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -3,7 +3,7 @@ from django.conf.urls import patterns, url, include from django.db import models from django.test import TestCase from django.core.exceptions import ImproperlyConfigured -from rest_framework import serializers, viewsets, permissions +from rest_framework import serializers, viewsets, mixins, permissions from rest_framework.decorators import detail_route, list_route from rest_framework.response import Response from rest_framework.routers import SimpleRouter, DefaultRouter @@ -284,3 +284,19 @@ class TestDynamicListAndDetailRouter(TestCase): else: method_map = 'get' self.assertEqual(route.mapping[method_map], endpoint) + + +class TestRootWithAListlessViewset(TestCase): + def setUp(self): + class NoteViewSet(mixins.RetrieveModelMixin, + viewsets.GenericViewSet): + model = RouterTestModel + + self.router = DefaultRouter() + self.router.register(r'notes', NoteViewSet) + self.view = self.router.urls[0].callback + + def test_api_root(self): + request = factory.get('/') + response = self.view(request) + self.assertEqual(response.data, {}) From 54ccf7230d0fcdabe8c2457539e314893915a34b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 11 Sep 2014 13:43:46 +0100 Subject: [PATCH 0811/1652] Improve memory address removal for serializer representations --- rest_framework/utils/representation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py index 1de21597d..e2a374979 100644 --- a/rest_framework/utils/representation.py +++ b/rest_framework/utils/representation.py @@ -17,7 +17,7 @@ def smart_repr(value): # <django.core.validators.RegexValidator object at 0x1047af050> # Should be presented as # <django.core.validators.RegexValidator object> - value = re.sub(' at 0x[0-9a-f]{8,10}>', '>', value) + value = re.sub(' at 0x[0-9a-f]{8,32}>', '>', value) return value From 3318f75a7166cbac76a40d0461ca7b3e4640d3a2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 11 Sep 2014 13:50:53 +0100 Subject: [PATCH 0812/1652] Improve memory address removal for serializer representations --- rest_framework/utils/representation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py index e2a374979..1a4d1a62c 100644 --- a/rest_framework/utils/representation.py +++ b/rest_framework/utils/representation.py @@ -17,7 +17,7 @@ def smart_repr(value): # <django.core.validators.RegexValidator object at 0x1047af050> # Should be presented as # <django.core.validators.RegexValidator object> - value = re.sub(' at 0x[0-9a-f]{8,32}>', '>', value) + value = re.sub(' at 0x[0-9a-f]{4,32}>', '>', value) return value From ab40780dc2f341a271c2f489659dcd48eb47c07d Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 11 Sep 2014 20:22:32 +0100 Subject: [PATCH 0813/1652] Tidy up lookup_class --- rest_framework/serializers.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 8fe999aec..4322f2134 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -317,17 +317,17 @@ class ModelSerializerOptions(object): self.depth = getattr(meta, 'depth', 0) -def lookup_class(mapping, obj): +def lookup_class(mapping, instance): """ Takes a dictionary with classes as keys, and an object. Traverses the object's inheritance hierarchy in method resolution order, and returns the first matching value - from the dictionary or None. + from the dictionary or raises a KeyError if nothing matches. """ - return next( - (mapping[cls] for cls in inspect.getmro(obj.__class__) if cls in mapping), - None - ) + for cls in inspect.getmro(instance.__class__): + if cls in mapping: + return mapping[cls] + raise KeyError('Class %s not found in lookup.', cls.__name__) class ModelSerializer(Serializer): @@ -341,6 +341,7 @@ class ModelSerializer(Serializer): models.DateTimeField: DateTimeField, models.DecimalField: DecimalField, models.EmailField: EmailField, + models.Field: ModelField, models.FileField: FileField, models.FloatField: FloatField, models.ImageField: ImageField, @@ -484,6 +485,7 @@ class ModelSerializer(Serializer): """ Creates a default instance of a basic non-relational field. """ + serializer_cls = lookup_class(self.field_mapping, model_field) kwargs = {} validator_kwarg = model_field.validators @@ -602,11 +604,10 @@ class ModelSerializer(Serializer): if validator_kwarg: kwargs['validators'] = validator_kwarg - cls = lookup_class(self.field_mapping, model_field) - if cls is None: - cls = ModelField + if issubclass(serializer_cls, ModelField): kwargs['model_field'] = model_field - return cls(**kwargs) + + return serializer_cls(**kwargs) class HyperlinkedModelSerializerOptions(ModelSerializerOptions): From bf52d04f4c370d6917599d26c84b73124d5ef366 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 11 Sep 2014 20:37:27 +0100 Subject: [PATCH 0814/1652] Nice manager representations on serializer classes --- rest_framework/utils/representation.py | 13 +++++++++++++ tests/test_model_field_mappings.py | 12 ++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py index 1a4d1a62c..71db18863 100644 --- a/rest_framework/utils/representation.py +++ b/rest_framework/utils/representation.py @@ -2,10 +2,23 @@ Helper functions for creating user-friendly representations of serializer classes and serializer fields. """ +from django.db import models import re +def manager_repr(value): + model = value.model + opts = model._meta + for _, name, manager in opts.concrete_managers + opts.abstract_managers: + if manager == value: + return '%s.%s.all()' % (model._meta.object_name, name) + return repr(value) + + def smart_repr(value): + if isinstance(value, models.Manager): + return manager_repr(value) + value = repr(value) # Representations like u'help text' diff --git a/tests/test_model_field_mappings.py b/tests/test_model_field_mappings.py index 57c97cb7d..6e9aaba6c 100644 --- a/tests/test_model_field_mappings.py +++ b/tests/test_model_field_mappings.py @@ -81,9 +81,9 @@ class RelationalModel(models.Model): RELATIONAL_FLAT_REPR = """ TestSerializer(): id = IntegerField(label='ID', read_only=True) - foreign_key = PrimaryKeyRelatedField(label='foreign key', queryset=<django.db.models.manager.Manager object>) - one_to_one = PrimaryKeyRelatedField(label='one to one', queryset=<django.db.models.manager.Manager object>) - many_to_many = PrimaryKeyRelatedField(label='many to many', many=True, queryset=<django.db.models.manager.Manager object>) + foreign_key = PrimaryKeyRelatedField(label='foreign key', queryset=ForeignKeyTargetModel.objects.all()) + one_to_one = PrimaryKeyRelatedField(label='one to one', queryset=OneToOneTargetModel.objects.all()) + many_to_many = PrimaryKeyRelatedField(label='many to many', many=True, queryset=ManyToManyTargetModel.objects.all()) """.strip() @@ -105,9 +105,9 @@ TestSerializer(): HYPERLINKED_FLAT_REPR = """ TestSerializer(): url = HyperlinkedIdentityField(view_name='relationalmodel-detail') - foreign_key = HyperlinkedRelatedField(label='foreign key', queryset=<django.db.models.manager.Manager object>, view_name='foreignkeytargetmodel-detail') - one_to_one = HyperlinkedRelatedField(label='one to one', queryset=<django.db.models.manager.Manager object>, view_name='onetoonetargetmodel-detail') - many_to_many = HyperlinkedRelatedField(label='many to many', many=True, queryset=<django.db.models.manager.Manager object>, view_name='manytomanytargetmodel-detail') + foreign_key = HyperlinkedRelatedField(label='foreign key', queryset=ForeignKeyTargetModel.objects.all(), view_name='foreignkeytargetmodel-detail') + one_to_one = HyperlinkedRelatedField(label='one to one', queryset=OneToOneTargetModel.objects.all(), view_name='onetoonetargetmodel-detail') + many_to_many = HyperlinkedRelatedField(label='many to many', many=True, queryset=ManyToManyTargetModel.objects.all(), view_name='manytomanytargetmodel-detail') """.strip() From 19b8f779de82fa4737b37fb4359145af0b07a56c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 11 Sep 2014 20:43:44 +0100 Subject: [PATCH 0815/1652] Throttles now use Retry-After header and no longer support the custom style --- docs/api-guide/throttling.md | 2 ++ rest_framework/views.py | 1 - tests/test_throttling.py | 6 +----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index 832304f15..16a7457b0 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -178,6 +178,8 @@ To create a custom throttle, override `BaseThrottle` and implement `.allow_reque Optionally you may also override the `.wait()` method. If implemented, `.wait()` should return a recommended number of seconds to wait before attempting the next request, or `None`. The `.wait()` method will only be called if `.allow_request()` has previously returned `False`. +If the `.wait()` method is implemented and the request is throttled, then a `Retry-After` header will be included in the response. + ## Example The following is an example of a rate throttle, that will randomly throttle 1 in every 10 requests. diff --git a/rest_framework/views.py b/rest_framework/views.py index 3b7b1c16c..cd394b2d9 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -62,7 +62,6 @@ def exception_handler(exc): if getattr(exc, 'auth_header', None): headers['WWW-Authenticate'] = exc.auth_header if getattr(exc, 'wait', None): - headers['X-Throttle-Wait-Seconds'] = '%d' % exc.wait headers['Retry-After'] = '%d' % exc.wait return Response({'detail': exc.detail}, diff --git a/tests/test_throttling.py b/tests/test_throttling.py index 7b696f070..cc36a004c 100644 --- a/tests/test_throttling.py +++ b/tests/test_throttling.py @@ -109,7 +109,7 @@ class ThrottlingTests(TestCase): def ensure_response_header_contains_proper_throttle_field(self, view, expected_headers): """ - Ensure the response returns an X-Throttle field with status and next attributes + Ensure the response returns an Retry-After field with status and next attributes set properly. """ request = self.factory.get('/') @@ -117,10 +117,8 @@ class ThrottlingTests(TestCase): self.set_throttle_timer(view, timer) response = view.as_view()(request) if expect is not None: - self.assertEqual(response['X-Throttle-Wait-Seconds'], expect) self.assertEqual(response['Retry-After'], expect) else: - self.assertFalse('X-Throttle-Wait-Seconds' in response) self.assertFalse('Retry-After' in response) def test_seconds_fields(self): @@ -173,13 +171,11 @@ class ThrottlingTests(TestCase): self.assertFalse(hasattr(MockView_NonTimeThrottling.throttle_classes[0], 'called')) response = MockView_NonTimeThrottling.as_view()(request) - self.assertFalse('X-Throttle-Wait-Seconds' in response) self.assertFalse('Retry-After' in response) self.assertTrue(MockView_NonTimeThrottling.throttle_classes[0].called) response = MockView_NonTimeThrottling.as_view()(request) - self.assertFalse('X-Throttle-Wait-Seconds' in response) self.assertFalse('Retry-After' in response) From 55650a743d579e0bc1643c8812428746b0271984 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 11 Sep 2014 20:49:10 +0100 Subject: [PATCH 0816/1652] no longer tightly coupled to private queryset API --- rest_framework/generics.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index c2c59154a..408b12464 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -3,6 +3,7 @@ Generic views that provide commonly needed behaviour. """ from __future__ import unicode_literals +from django.db.models.query import QuerySet from django.core.exceptions import PermissionDenied from django.core.paginator import Paginator, InvalidPage from django.http import Http404 @@ -214,7 +215,9 @@ class GenericAPIView(views.APIView): % self.__class__.__name__ ) - return self.queryset._clone() + if isinstance(self.queryset, QuerySet): + return self.queryset.all() + return self.queryset def get_object(self): """ From a7518719917c7ad8e699119b442cfeb568ba1dde Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 11 Sep 2014 20:50:26 +0100 Subject: [PATCH 0817/1652] no longer tightly coupled to private queryset API --- rest_framework/generics.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 408b12464..338d56a6a 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -215,9 +215,11 @@ class GenericAPIView(views.APIView): % self.__class__.__name__ ) + queryset = self.queryset if isinstance(self.queryset, QuerySet): - return self.queryset.all() - return self.queryset + # Ensure queryset is re-evaluated on each request. + queryset = queryset.all() + return queryset def get_object(self): """ From 040bfcc09c851bb3dadd60558c78a1f7937e9fbd Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 11 Sep 2014 21:48:54 +0100 Subject: [PATCH 0818/1652] NotImplemented stubs for Field, and DecimalField improvements --- rest_framework/fields.py | 27 +++++++++++++++++++++------ rest_framework/pagination.py | 4 ++-- rest_framework/utils/encoders.py | 2 +- tests/test_filters.py | 10 +++++----- tests/test_pagination.py | 4 ++-- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 7496a629e..20b8ffbff 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -229,13 +229,13 @@ class Field(object): """ Transform the *incoming* primative data into a native value. """ - return data + raise NotImplementedError('to_native() must be implemented.') def to_primative(self, value): """ Transform the *outgoing* native value into primative data. """ - return value + raise NotImplementedError('to_primative() must be implemented.') def fail(self, key, **kwargs): """ @@ -429,9 +429,10 @@ class DecimalField(Field): 'max_whole_digits': _('Ensure that there are no more than {max_whole_digits} digits before the decimal point.') } - def __init__(self, max_value=None, min_value=None, max_digits=None, decimal_places=None, **kwargs): - self.max_value, self.min_value = max_value, min_value - self.max_digits, self.max_decimal_places = max_digits, decimal_places + def __init__(self, max_digits, decimal_places, coerce_to_string=True, max_value=None, min_value=None, **kwargs): + self.max_digits = max_digits + self.decimal_places = decimal_places + self.coerce_to_string = coerce_to_string super(DecimalField, self).__init__(**kwargs) if max_value is not None: self.validators.append(validators.MaxValueValidator(max_value)) @@ -478,12 +479,26 @@ class DecimalField(Field): if self.max_digits is not None and digits > self.max_digits: self.fail('max_digits', max_digits=self.max_digits) if self.decimal_places is not None and decimals > self.decimal_places: - self.fail('max_decimal_places', max_decimal_places=self.max_decimal_places) + self.fail('max_decimal_places', max_decimal_places=self.decimal_places) if self.max_digits is not None and self.decimal_places is not None and whole_digits > (self.max_digits - self.decimal_places): self.fail('max_whole_digits', max_while_digits=self.max_digits - self.decimal_places) return value + def to_primative(self, value): + if not self.coerce_to_string: + return value + + if isinstance(value, decimal.Decimal): + context = decimal.getcontext().copy() + context.prec = self.max_digits + quantized = value.quantize( + decimal.Decimal('.1') ** self.decimal_places, + context=context + ) + return '{0:f}'.format(quantized) + return '%.*f' % (self.max_decimal_places, value) + # Date & time fields... diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 9cf31629f..d82d2d3b3 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -37,7 +37,7 @@ class PreviousPageField(serializers.Field): return replace_query_param(url, self.page_field, page) -class DefaultObjectSerializer(serializers.Field): +class DefaultObjectSerializer(serializers.ReadOnlyField): """ If no object serializer is specified, then this serializer will be applied as the default. @@ -79,6 +79,6 @@ class PaginationSerializer(BasePaginationSerializer): """ A default implementation of a pagination serializer. """ - count = serializers.Field(source='paginator.count') + count = serializers.ReadOnlyField(source='paginator.count') next = NextPageField(source='*') previous = PreviousPageField(source='*') diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 6a2f61266..7992b6b1c 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -43,7 +43,7 @@ class JSONEncoder(json.JSONEncoder): elif isinstance(o, datetime.timedelta): return str(o.total_seconds()) elif isinstance(o, decimal.Decimal): - return str(o) + return float(o) elif isinstance(o, QuerySet): return list(o) elif hasattr(o, 'tolist'): diff --git a/tests/test_filters.py b/tests/test_filters.py index 300e47e45..01668114b 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -102,7 +102,7 @@ if django_filters: class CommonFilteringTestCase(TestCase): def _serialize_object(self, obj): - return {'id': obj.id, 'text': obj.text, 'decimal': obj.decimal, 'date': obj.date} + return {'id': obj.id, 'text': obj.text, 'decimal': str(obj.decimal), 'date': obj.date} def setUp(self): """ @@ -145,7 +145,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/', {'decimal': '%s' % search_decimal}) response = view(request).render() self.assertEqual(response.status_code, status.HTTP_200_OK) - expected_data = [f for f in self.data if f['decimal'] == search_decimal] + expected_data = [f for f in self.data if Decimal(f['decimal']) == search_decimal] self.assertEqual(response.data, expected_data) # Tests that the date filter works. @@ -168,7 +168,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/', {'decimal': '%s' % search_decimal}) response = view(request).render() self.assertEqual(response.status_code, status.HTTP_200_OK) - expected_data = [f for f in self.data if f['decimal'] == search_decimal] + expected_data = [f for f in self.data if Decimal(f['decimal']) == search_decimal] self.assertEqual(response.data, expected_data) @unittest.skipUnless(django_filters, 'django-filter not installed') @@ -201,7 +201,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/', {'decimal': '%s' % search_decimal}) response = view(request).render() self.assertEqual(response.status_code, status.HTTP_200_OK) - expected_data = [f for f in self.data if f['decimal'] < search_decimal] + expected_data = [f for f in self.data if Decimal(f['decimal']) < search_decimal] self.assertEqual(response.data, expected_data) # Tests that the date filter set with 'gt' in the filter class works. @@ -230,7 +230,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): response = view(request).render() self.assertEqual(response.status_code, status.HTTP_200_OK) expected_data = [f for f in self.data if f['date'] > search_date and - f['decimal'] < search_decimal] + Decimal(f['decimal']) < search_decimal] self.assertEqual(response.data, expected_data) @unittest.skipUnless(django_filters, 'django-filter not installed') diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 68983ba20..a7f8e691f 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -135,7 +135,7 @@ class IntegrationTestPaginationAndFiltering(TestCase): self.objects = FilterableItem.objects self.data = [ - {'id': obj.id, 'text': obj.text, 'decimal': obj.decimal, 'date': obj.date} + {'id': obj.id, 'text': obj.text, 'decimal': str(obj.decimal), 'date': obj.date} for obj in self.objects.all() ] @@ -381,7 +381,7 @@ class TestMaxPaginateByParam(TestCase): # Tests for context in pagination serializers -class CustomField(serializers.Field): +class CustomField(serializers.ReadOnlyField): def to_native(self, value): if 'view' not in self.context: raise RuntimeError("context isn't getting passed into custom field") From 1e53eb0aa2998385e26aa0a4d8542013bc7b575b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 11 Sep 2014 21:57:32 +0100 Subject: [PATCH 0819/1652] DecimalFields should still be quantized even without coerce_to_string --- rest_framework/fields.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 20b8ffbff..a56ea96b0 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -486,9 +486,6 @@ class DecimalField(Field): return value def to_primative(self, value): - if not self.coerce_to_string: - return value - if isinstance(value, decimal.Decimal): context = decimal.getcontext().copy() context.prec = self.max_digits @@ -496,7 +493,12 @@ class DecimalField(Field): decimal.Decimal('.1') ** self.decimal_places, context=context ) + if not self.coerce_to_string: + return quantized return '{0:f}'.format(quantized) + + if not self.coerce_to_string: + return value return '%.*f' % (self.max_decimal_places, value) From adcb64ab4198f35c61d5be68956d201685ed3538 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 09:12:56 +0100 Subject: [PATCH 0820/1652] MethodField -> SerializerMethodField --- rest_framework/fields.py | 21 +++++++++------------ rest_framework/serializers.py | 3 ++- rest_framework/utils/modelinfo.py | 3 ++- tests/test_serializer_empty.py | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index a56ea96b0..5f198767c 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -768,16 +768,13 @@ class ReadOnlyField(Field): kwargs['read_only'] = True super(ReadOnlyField, self).__init__(**kwargs) - def to_native(self, data): - raise NotImplemented('.to_native() not supported.') - def to_primative(self, value): if is_simple_callable(value): return value() return value -class MethodField(Field): +class SerializerMethodField(Field): """ A read-only field that get its representation from calling a method on the parent serializer class. The method called will be of the form @@ -787,22 +784,22 @@ class MethodField(Field): For example: class ExampleSerializer(self): - extra_info = MethodField() + extra_info = SerializerMethodField() def get_extra_info(self, obj): return ... # Calculate some data to return. """ - def __init__(self, **kwargs): + def __init__(self, method_attr=None, **kwargs): + self.method_attr = method_attr kwargs['source'] = '*' kwargs['read_only'] = True - super(MethodField, self).__init__(**kwargs) - - def to_native(self, data): - raise NotImplemented('.to_native() not supported.') + super(SerializerMethodField, self).__init__(**kwargs) def to_primative(self, value): - attr = 'get_{field_name}'.format(field_name=self.field_name) - method = getattr(self.parent, attr) + method_attr = self.method_attr + if method_attr is None: + method_attr = 'get_{field_name}'.format(field_name=self.field_name) + method = getattr(self.parent, method_attr) return method(value) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 4322f2134..388fe29f0 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -598,7 +598,8 @@ class ModelSerializer(Serializer): if isinstance(model_field, models.BooleanField): # models.BooleanField has `blank=True`, but *is* actually # required *unless* a default is provided. - # Also note that <1.6 `default=False`, >=1.6 `default=None`. + # Also note that Django<1.6 uses `default=False` for + # models.BooleanField, but Django>=1.6 uses `default=None`. kwargs.pop('required', None) if validator_kwarg: diff --git a/rest_framework/utils/modelinfo.py b/rest_framework/utils/modelinfo.py index a7a0346c2..960fa4d0f 100644 --- a/rest_framework/utils/modelinfo.py +++ b/rest_framework/utils/modelinfo.py @@ -1,6 +1,7 @@ """ Helper functions for returning the field information that is associated -with a model class. +with a model class. This includes returning all the forward and reverse +relationships and their associated metadata. """ from collections import namedtuple from django.db import models diff --git a/tests/test_serializer_empty.py b/tests/test_serializer_empty.py index 4e4a7b423..805ac7d46 100644 --- a/tests/test_serializer_empty.py +++ b/tests/test_serializer_empty.py @@ -6,7 +6,7 @@ # def test_empty_serializer(self): # class FooBarSerializer(serializers.Serializer): # foo = serializers.IntegerField() -# bar = serializers.MethodField() +# bar = serializers.SerializerMethodField() # def get_bar(self, obj): # return 'bar' From 0d354e8f92c7daaf8dac3b80f0fd64f983f21e0b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 09:49:35 +0100 Subject: [PATCH 0821/1652] to_internal_value() and to_representation() --- rest_framework/fields.py | 86 ++++++++++++++++++----------------- rest_framework/pagination.py | 4 +- rest_framework/relations.py | 2 +- rest_framework/serializers.py | 28 ++++++------ tests/test_validation.py | 2 +- 5 files changed, 62 insertions(+), 60 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 5f198767c..a96f9ba89 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -195,7 +195,7 @@ class Field(object): raise SkipField() return self.default - def validate_value(self, data=empty): + def run_validation(self, data=empty): """ Validate a simple representation and return the internal value. @@ -208,7 +208,7 @@ class Field(object): self.fail('required') return self.get_default() - value = self.to_native(data) + value = self.to_internal_value(data) self.run_validators(value) return value @@ -225,17 +225,17 @@ class Field(object): if errors: raise ValidationError(errors) - def to_native(self, data): + def to_internal_value(self, data): """ Transform the *incoming* primative data into a native value. """ - raise NotImplementedError('to_native() must be implemented.') + raise NotImplementedError('to_internal_value() must be implemented.') - def to_primative(self, value): + def to_representation(self, value): """ Transform the *outgoing* native value into primative data. """ - raise NotImplementedError('to_primative() must be implemented.') + raise NotImplementedError('to_representation() must be implemented.') def fail(self, key, **kwargs): """ @@ -279,14 +279,14 @@ class BooleanField(Field): return dictionary.get(self.field_name, False) return dictionary.get(self.field_name, empty) - def to_native(self, data): + def to_internal_value(self, data): if data in self.TRUE_VALUES: return True elif data in self.FALSE_VALUES: return False self.fail('invalid', input=data) - def to_primative(self, value): + def to_representation(self, value): if value is None: return None if value in self.TRUE_VALUES: @@ -309,12 +309,14 @@ class CharField(Field): self.min_length = kwargs.pop('min_length', None) super(CharField, self).__init__(**kwargs) - def to_native(self, data): + def to_internal_value(self, data): if data == '' and not self.allow_blank: self.fail('blank') + if data is None: + return None return str(data) - def to_primative(self, value): + def to_representation(self, value): if value is None: return None return str(value) @@ -326,17 +328,17 @@ class EmailField(CharField): } default_validators = [validators.validate_email] - def to_native(self, data): - ret = super(EmailField, self).to_native(data) - if ret is None: + def to_internal_value(self, data): + if data == '' and not self.allow_blank: + self.fail('blank') + if data is None: return None - return ret.strip() + return str(data).strip() - def to_primative(self, value): - ret = super(EmailField, self).to_primative(value) - if ret is None: + def to_representation(self, value): + if value is None: return None - return ret.strip() + return str(value).strip() class RegexField(CharField): @@ -378,14 +380,14 @@ class IntegerField(Field): if min_value is not None: self.validators.append(validators.MinValueValidator(min_value)) - def to_native(self, data): + def to_internal_value(self, data): try: data = int(str(data)) except (ValueError, TypeError): self.fail('invalid') return data - def to_primative(self, value): + def to_representation(self, value): if value is None: return None return int(value) @@ -405,7 +407,12 @@ class FloatField(Field): if min_value is not None: self.validators.append(validators.MinValueValidator(min_value)) - def to_primative(self, value): + def to_internal_value(self, value): + if value is None: + return None + return float(value) + + def to_representation(self, value): if value is None: return None try: @@ -413,11 +420,6 @@ class FloatField(Field): except (TypeError, ValueError): self.fail('invalid', value=value) - def to_native(self, value): - if value is None: - return None - return float(value) - class DecimalField(Field): default_error_messages = { @@ -439,7 +441,7 @@ class DecimalField(Field): if min_value is not None: self.validators.append(validators.MinValueValidator(min_value)) - def from_native(self, value): + def to_internal_value(self, value): """ Validates that the input is a decimal number. Returns a Decimal instance. Returns None for empty values. Ensures that there are no more @@ -485,7 +487,7 @@ class DecimalField(Field): return value - def to_primative(self, value): + def to_representation(self, value): if isinstance(value, decimal.Decimal): context = decimal.getcontext().copy() context.prec = self.max_digits @@ -516,7 +518,7 @@ class DateField(Field): self.format = format if format is not None else self.format super(DateField, self).__init__(*args, **kwargs) - def from_native(self, value): + def to_internal_value(self, value): if value in validators.EMPTY_VALUES: return None @@ -552,7 +554,7 @@ class DateField(Field): msg = self.error_messages['invalid'] % humanized_format raise ValidationError(msg) - def to_primative(self, value): + def to_representation(self, value): if value is None or self.format is None: return value @@ -576,7 +578,7 @@ class DateTimeField(Field): self.format = format if format is not None else self.format super(DateTimeField, self).__init__(*args, **kwargs) - def from_native(self, value): + def to_internal_value(self, value): if value in validators.EMPTY_VALUES: return None @@ -618,7 +620,7 @@ class DateTimeField(Field): msg = self.error_messages['invalid'] % humanized_format raise ValidationError(msg) - def to_primative(self, value): + def to_representation(self, value): if value is None or self.format is None: return value @@ -670,7 +672,7 @@ class TimeField(Field): msg = self.error_messages['invalid'] % humanized_format raise ValidationError(msg) - def to_primative(self, value): + def to_representation(self, value): if value is None or self.format is None: return value @@ -711,13 +713,13 @@ class ChoiceField(Field): super(ChoiceField, self).__init__(**kwargs) - def to_native(self, data): + def to_internal_value(self, data): try: return self.choice_strings_to_values[str(data)] except KeyError: self.fail('invalid_choice', input=data) - def to_primative(self, value): + def to_representation(self, value): return value @@ -727,15 +729,15 @@ class MultipleChoiceField(ChoiceField): 'not_a_list': _('Expected a list of items but got type `{input_type}`') } - def to_native(self, data): + def to_internal_value(self, data): if not hasattr(data, '__iter__'): self.fail('not_a_list', input_type=type(data).__name__) return set([ - super(MultipleChoiceField, self).to_native(item) + super(MultipleChoiceField, self).to_internal_value(item) for item in data ]) - def to_primative(self, value): + def to_representation(self, value): return value @@ -768,7 +770,7 @@ class ReadOnlyField(Field): kwargs['read_only'] = True super(ReadOnlyField, self).__init__(**kwargs) - def to_primative(self, value): + def to_representation(self, value): if is_simple_callable(value): return value() return value @@ -795,7 +797,7 @@ class SerializerMethodField(Field): kwargs['read_only'] = True super(SerializerMethodField, self).__init__(**kwargs) - def to_primative(self, value): + def to_representation(self, value): method_attr = self.method_attr if method_attr is None: method_attr = 'get_{field_name}'.format(field_name=self.field_name) @@ -815,13 +817,13 @@ class ModelField(Field): kwargs['source'] = '*' super(ModelField, self).__init__(**kwargs) - def to_native(self, data): + def to_internal_value(self, data): rel = getattr(self.model_field, 'rel', None) if rel is not None: return rel.to._meta.get_field(rel.field_name).to_python(data) return self.model_field.to_python(data) - def to_primative(self, obj): + def to_representation(self, obj): value = self.model_field._get_val_from_obj(obj) if is_protected_type(value): return value diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index d82d2d3b3..c5a9270a4 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -13,7 +13,7 @@ class NextPageField(serializers.Field): """ page_field = 'page' - def to_primative(self, value): + def to_representation(self, value): if not value.has_next(): return None page = value.next_page_number() @@ -28,7 +28,7 @@ class PreviousPageField(serializers.Field): """ page_field = 'page' - def to_primative(self, value): + def to_representation(self, value): if not value.has_previous(): return None page = value.previous_page_number() diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 661a1249a..30a252db9 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -110,7 +110,7 @@ class HyperlinkedIdentityField(RelatedField): def get_attribute(self, instance): return instance - def to_primative(self, value): + def to_representation(self, value): request = self.context.get('request', None) format = self.context.get('format', None) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 388fe29f0..502b1e190 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -47,11 +47,11 @@ class BaseSerializer(Field): self.instance = instance self._initial_data = data - def to_native(self, data): - raise NotImplementedError('`to_native()` must be implemented.') + def to_internal_value(self, data): + raise NotImplementedError('`to_internal_value()` must be implemented.') - def to_primative(self, instance): - raise NotImplementedError('`to_primative()` must be implemented.') + def to_representation(self, instance): + raise NotImplementedError('`to_representation()` must be implemented.') def update(self, instance, attrs): raise NotImplementedError('`update()` must be implemented.') @@ -74,7 +74,7 @@ class BaseSerializer(Field): def is_valid(self, raise_exception=False): if not hasattr(self, '_validated_data'): try: - self._validated_data = self.to_native(self._initial_data) + self._validated_data = self.to_internal_value(self._initial_data) except ValidationError as exc: self._validated_data = {} self._errors = exc.message_dict @@ -90,7 +90,7 @@ class BaseSerializer(Field): def data(self): if not hasattr(self, '_data'): if self.instance is not None: - self._data = self.to_primative(self.instance) + self._data = self.to_representation(self.instance) elif self._initial_data is not None: self._data = dict([ (field_name, field.get_value(self._initial_data)) @@ -193,7 +193,7 @@ class Serializer(BaseSerializer): return html.parse_html_dict(dictionary, prefix=self.field_name) return dictionary.get(self.field_name, empty) - def to_native(self, data): + def to_internal_value(self, data): """ Dict of native values <- Dict of primitive datatypes. """ @@ -208,7 +208,7 @@ class Serializer(BaseSerializer): validate_method = getattr(self, 'validate_' + field.field_name, None) primitive_value = field.get_value(data) try: - validated_value = field.validate_value(primitive_value) + validated_value = field.run_validation(primitive_value) if validate_method is not None: validated_value = validate_method(validated_value) except ValidationError as exc: @@ -226,7 +226,7 @@ class Serializer(BaseSerializer): except ValidationError as exc: raise ValidationError({'non_field_errors': exc.messages}) - def to_primative(self, instance): + def to_representation(self, instance): """ Object instance -> Dict of primitive datatypes. """ @@ -235,7 +235,7 @@ class Serializer(BaseSerializer): for field in fields: native_value = field.get_attribute(instance) - ret[field.field_name] = field.to_primative(native_value) + ret[field.field_name] = field.to_representation(native_value) return ret @@ -279,20 +279,20 @@ class ListSerializer(BaseSerializer): return html.parse_html_list(dictionary, prefix=self.field_name) return dictionary.get(self.field_name, empty) - def to_native(self, data): + def to_internal_value(self, data): """ List of dicts of native values <- List of dicts of primitive datatypes. """ if html.is_html_input(data): data = html.parse_html_list(data) - return [self.child.validate(item) for item in data] + return [self.child.run_validation(item) for item in data] - def to_primative(self, data): + def to_representation(self, data): """ List of object instances -> List of dicts of primitive datatypes. """ - return [self.child.to_primative(item) for item in data] + return [self.child.to_representation(item) for item in data] def create(self, attrs_list): return [self.child.create(attrs) for attrs in attrs_list] diff --git a/tests/test_validation.py b/tests/test_validation.py index c4506e7e9..7543d849b 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -158,7 +158,7 @@ class TestChoiceFieldChoicesValidate(TestCase): f = serializers.ChoiceField(choices=self.CHOICES) value = self.CHOICES[0][0] try: - f.to_native(value) + f.to_internal_value(value) except ValidationError: self.fail("Value %s does not validate" % str(value)) From 6db3356c4d1aa4f9a042b0ec67d47238abc16dd7 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 10:21:35 +0100 Subject: [PATCH 0822/1652] NON_FIELD_ERRORS_KEY setting --- rest_framework/serializers.py | 8 ++++++-- rest_framework/settings.py | 1 + rest_framework/views.py | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 502b1e190..0c2aedfa0 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -198,7 +198,9 @@ class Serializer(BaseSerializer): Dict of native values <- Dict of primitive datatypes. """ if not isinstance(data, dict): - raise ValidationError({'non_field_errors': ['Invalid data']}) + raise ValidationError({ + api_settings.NON_FIELD_ERRORS_KEY: ['Invalid data'] + }) ret = {} errors = {} @@ -224,7 +226,9 @@ class Serializer(BaseSerializer): try: return self.validate(ret) except ValidationError as exc: - raise ValidationError({'non_field_errors': exc.messages}) + raise ValidationError({ + api_settings.NON_FIELD_ERRORS_KEY: exc.messages + }) def to_representation(self, instance): """ diff --git a/rest_framework/settings.py b/rest_framework/settings.py index bbe7a56ad..f48643b5d 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -77,6 +77,7 @@ DEFAULTS = { # Exception handling 'EXCEPTION_HANDLER': 'rest_framework.views.exception_handler', + 'NON_FIELD_ERRORS_KEY': 'non_field_errors', # Testing 'TEST_REQUEST_RENDERER_CLASSES': ( diff --git a/rest_framework/views.py b/rest_framework/views.py index cd394b2d9..9f08a4ad5 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -3,7 +3,7 @@ Provides an APIView class that is the base of all views in REST framework. """ from __future__ import unicode_literals -from django.core.exceptions import PermissionDenied, ValidationError +from django.core.exceptions import PermissionDenied, ValidationError, NON_FIELD_ERRORS from django.http import Http404 from django.utils.datastructures import SortedDict from django.views.decorators.csrf import csrf_exempt @@ -69,6 +69,12 @@ def exception_handler(exc): headers=headers) elif isinstance(exc, ValidationError): + # ValidationErrors may include the non-field key named '__all__'. + # When returning a response we map this to a key name that can be + # modified in settings. + if NON_FIELD_ERRORS in exc.message_dict: + errors = exc.message_dict.pop(NON_FIELD_ERRORS) + exc.message_dict[api_settings.NON_FIELD_ERRORS_KEY] = errors return Response(exc.message_dict, status=status.HTTP_400_BAD_REQUEST) From 250755def707e1397876614fa0c08130d9fcc449 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 10:59:51 +0100 Subject: [PATCH 0823/1652] Clean up relational fields queryset usage --- rest_framework/fields.py | 15 +++----- rest_framework/generics.py | 2 +- rest_framework/relations.py | 73 ++++++++++++++++++++----------------- tests/test_generics.py | 4 +- 4 files changed, 49 insertions(+), 45 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index a96f9ba89..4f06d1868 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -508,7 +508,7 @@ class DecimalField(Field): class DateField(Field): default_error_messages = { - 'invalid': _("Date has wrong format. Use one of these formats instead: %s"), + 'invalid': _('Date has wrong format. Use one of these formats instead: {format}'), } input_formats = api_settings.DATE_INPUT_FORMATS format = api_settings.DATE_FORMAT @@ -551,8 +551,7 @@ class DateField(Field): return parsed.date() humanized_format = humanize_datetime.date_formats(self.input_formats) - msg = self.error_messages['invalid'] % humanized_format - raise ValidationError(msg) + self.fail('invalid', format=humanized_format) def to_representation(self, value): if value is None or self.format is None: @@ -568,7 +567,7 @@ class DateField(Field): class DateTimeField(Field): default_error_messages = { - 'invalid': _("Datetime has wrong format. Use one of these formats instead: %s"), + 'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}'), } input_formats = api_settings.DATETIME_INPUT_FORMATS format = api_settings.DATETIME_FORMAT @@ -617,8 +616,7 @@ class DateTimeField(Field): return parsed humanized_format = humanize_datetime.datetime_formats(self.input_formats) - msg = self.error_messages['invalid'] % humanized_format - raise ValidationError(msg) + self.fail('invalid', format=humanized_format) def to_representation(self, value): if value is None or self.format is None: @@ -634,7 +632,7 @@ class DateTimeField(Field): class TimeField(Field): default_error_messages = { - 'invalid': _("Time has wrong format. Use one of these formats instead: %s"), + 'invalid': _('Time has wrong format. Use one of these formats instead: {format}'), } input_formats = api_settings.TIME_INPUT_FORMATS format = api_settings.TIME_FORMAT @@ -669,8 +667,7 @@ class TimeField(Field): return parsed.time() humanized_format = humanize_datetime.time_formats(self.input_formats) - msg = self.error_messages['invalid'] % humanized_format - raise ValidationError(msg) + self.fail('invalid', format=humanized_format) def to_representation(self, value): if value is None or self.format is None: diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 338d56a6a..eb6b64efa 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -216,7 +216,7 @@ class GenericAPIView(views.APIView): ) queryset = self.queryset - if isinstance(self.queryset, QuerySet): + if isinstance(queryset, QuerySet): # Ensure queryset is re-evaluated on each request. queryset = queryset.all() return queryset diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 30a252db9..e23a41526 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -2,28 +2,35 @@ from rest_framework.fields import Field from rest_framework.reverse import reverse from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch +from django.db.models.query import QuerySet from rest_framework.compat import urlparse -def get_default_queryset(serializer_class, field_name): - manager = getattr(serializer_class.opts.model, field_name) - if hasattr(manager, 'related'): - # Forward relationships - return manager.related.model._default_manager.all() - # Reverse relationships - return manager.field.rel.to._default_manager.all() - - class RelatedField(Field): def __init__(self, **kwargs): self.queryset = kwargs.pop('queryset', None) self.many = kwargs.pop('many', False) + assert self.queryset is not None or kwargs.get('read_only', False), ( + 'Relational field must provide a `queryset` argument, ' + 'or set read_only=`True`.' + ) super(RelatedField, self).__init__(**kwargs) - def bind(self, field_name, parent, root): - super(RelatedField, self).bind(field_name, parent, root) - if self.queryset is None and not self.read_only: - self.queryset = get_default_queryset(parent, self.source) + def get_queryset(self): + queryset = self.queryset + if isinstance(queryset, QuerySet): + # Ensure queryset is re-evaluated whenever used. + queryset = queryset.all() + return queryset + + +class StringRelatedField(Field): + def __init__(self, **kwargs): + kwargs['read_only'] = True + super(StringRelatedField, self).__init__(**kwargs) + + def to_representation(self, value): + return str(value) class PrimaryKeyRelatedField(RelatedField): @@ -33,9 +40,9 @@ class PrimaryKeyRelatedField(RelatedField): 'incorrect_type': 'Incorrect type. Expected pk value, received {data_type}.', } - def from_native(self, data): + def to_internal_value(self, data): try: - return self.queryset.get(pk=data) + return self.get_queryset().get(pk=data) except ObjectDoesNotExist: self.fail('does_not_exist', pk_value=data) except (TypeError, ValueError): @@ -68,9 +75,9 @@ class HyperlinkedRelatedField(RelatedField): """ lookup_value = view_kwargs[self.lookup_url_kwarg] lookup_kwargs = {self.lookup_field: lookup_value} - return self.queryset.get(**lookup_kwargs) + return self.get_queryset().get(**lookup_kwargs) - def from_native(self, value): + def to_internal_value(self, value): try: http_prefix = value.startswith(('http:', 'https:')) except AttributeError: @@ -102,13 +109,26 @@ class HyperlinkedIdentityField(RelatedField): def __init__(self, **kwargs): kwargs['read_only'] = True + kwargs['source'] = '*' self.view_name = kwargs.pop('view_name') self.lookup_field = kwargs.pop('lookup_field', self.lookup_field) self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field) super(HyperlinkedIdentityField, self).__init__(**kwargs) - def get_attribute(self, instance): - return instance + def get_url(self, obj, view_name, request, format): + """ + Given an object, return the URL that hyperlinks to the object. + + May raise a `NoReverseMatch` if the `view_name` and `lookup_field` + attributes are not configured to correctly match the URL conf. + """ + # Unsaved objects will not yet have a valid URL. + if obj.pk is None: + return None + + lookup_value = getattr(obj, self.lookup_field) + kwargs = {self.lookup_url_kwarg: lookup_value} + return reverse(view_name, kwargs=kwargs, request=request, format=format) def to_representation(self, value): request = self.context.get('request', None) @@ -144,21 +164,6 @@ class HyperlinkedIdentityField(RelatedField): ) raise Exception(msg % self.view_name) - def get_url(self, obj, view_name, request, format): - """ - Given an object, return the URL that hyperlinks to the object. - - May raise a `NoReverseMatch` if the `view_name` and `lookup_field` - attributes are not configured to correctly match the URL conf. - """ - # Unsaved objects will not yet have a valid URL. - if obj.pk is None: - return None - - lookup_value = getattr(obj, self.lookup_field) - kwargs = {self.lookup_url_kwarg: lookup_value} - return reverse(view_name, kwargs=kwargs, request=request, format=format) - class SlugRelatedField(RelatedField): def __init__(self, **kwargs): diff --git a/tests/test_generics.py b/tests/test_generics.py index 17bfca2ff..51004edfe 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -547,7 +547,9 @@ class ClassA(models.Model): class ClassASerializer(serializers.ModelSerializer): - childs = serializers.PrimaryKeyRelatedField(many=True, source='childs') + childs = serializers.PrimaryKeyRelatedField( + many=True, queryset=ClassB.objects.all() + ) class Meta: model = ClassA From 5e39e159ee6aee90755709cfecec7d22c7ea3049 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 11:38:22 +0100 Subject: [PATCH 0824/1652] UNICODE_JSON and COMPACT_JSON settings --- rest_framework/fields.py | 20 ++++++++++---------- rest_framework/parsers.py | 2 +- rest_framework/renderers.py | 33 ++++++++++++--------------------- rest_framework/settings.py | 3 +++ tests/test_renderers.py | 35 +++++++++++++++++++---------------- tests/test_validation.py | 2 +- 6 files changed, 46 insertions(+), 49 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 4f06d1868..9d96cf5cc 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -137,6 +137,16 @@ class Field(object): messages.update(error_messages or {}) self.error_messages = messages + def __new__(cls, *args, **kwargs): + """ + When a field is instantiated, we store the arguments that were used, + so that we can present a helpful representation of the object. + """ + instance = super(Field, cls).__new__(cls) + instance._args = args + instance._kwargs = kwargs + return instance + def bind(self, field_name, parent, root): """ Setup the context for the field instance. @@ -249,16 +259,6 @@ class Field(object): raise AssertionError(msg) raise ValidationError(msg.format(**kwargs)) - def __new__(cls, *args, **kwargs): - """ - When a field is instantiated, we store the arguments that were used, - so that we can present a helpful representation of the object. - """ - instance = super(Field, cls).__new__(cls) - instance._args = args - instance._kwargs = kwargs - return instance - def __repr__(self): return representation.field_repr(self) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index c287908dc..fa02ecf1e 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -48,7 +48,7 @@ class JSONParser(BaseParser): """ media_type = 'application/json' - renderer_class = renderers.UnicodeJSONRenderer + renderer_class = renderers.JSONRenderer def parse(self, stream, media_type=None, parser_context=None): """ diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index dfc5a39f6..3bf03e62c 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -26,6 +26,10 @@ from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework import exceptions, status, VERSION +def zero_as_none(value): + return None if value == 0 else value + + class BaseRenderer(object): """ All renderers should extend this class, setting the `media_type` @@ -44,13 +48,13 @@ class BaseRenderer(object): class JSONRenderer(BaseRenderer): """ Renderer which serializes to JSON. - Applies JSON's backslash-u character escaping for non-ascii characters. """ media_type = 'application/json' format = 'json' encoder_class = encoders.JSONEncoder - ensure_ascii = True + ensure_ascii = not api_settings.UNICODE_JSON + compact = api_settings.COMPACT_JSON # We don't set a charset because JSON is a binary encoding, # that can be encoded as utf-8, utf-16 or utf-32. @@ -62,9 +66,10 @@ class JSONRenderer(BaseRenderer): if accepted_media_type: # If the media type looks like 'application/json; indent=4', # then pretty print the result. + # Note that we coerce `indent=0` into `indent=None`. base_media_type, params = parse_header(accepted_media_type.encode('ascii')) try: - return max(min(int(params['indent']), 8), 0) + return zero_as_none(max(min(int(params['indent']), 8), 0)) except (KeyError, ValueError, TypeError): pass @@ -81,10 +86,12 @@ class JSONRenderer(BaseRenderer): renderer_context = renderer_context or {} indent = self.get_indent(accepted_media_type, renderer_context) + separators = (',', ':') if (indent is None and self.compact) else (', ', ': ') ret = json.dumps( data, cls=self.encoder_class, - indent=indent, ensure_ascii=self.ensure_ascii + indent=indent, ensure_ascii=self.ensure_ascii, + separators=separators ) # On python 2.x json.dumps() returns bytestrings if ensure_ascii=True, @@ -96,14 +103,6 @@ class JSONRenderer(BaseRenderer): return ret -class UnicodeJSONRenderer(JSONRenderer): - ensure_ascii = False - """ - Renderer which serializes to JSON. - Does *not* apply JSON's character escaping for non-ascii characters. - """ - - class JSONPRenderer(JSONRenderer): """ Renderer which serializes to json, @@ -196,7 +195,7 @@ class YAMLRenderer(BaseRenderer): format = 'yaml' encoder = encoders.SafeDumper charset = 'utf-8' - ensure_ascii = True + ensure_ascii = False def render(self, data, accepted_media_type=None, renderer_context=None): """ @@ -210,14 +209,6 @@ class YAMLRenderer(BaseRenderer): return yaml.dump(data, stream=None, encoding=self.charset, Dumper=self.encoder, allow_unicode=not self.ensure_ascii) -class UnicodeYAMLRenderer(YAMLRenderer): - """ - Renderer which serializes to YAML. - Does *not* apply character escaping for non-ascii characters. - """ - ensure_ascii = False - - class TemplateHTMLRenderer(BaseRenderer): """ An HTML renderer for use with templates. diff --git a/rest_framework/settings.py b/rest_framework/settings.py index f48643b5d..e55610bbc 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -112,6 +112,9 @@ DEFAULTS = { ), 'TIME_FORMAT': None, + # Encoding + 'UNICODE_JSON': True, + 'COMPACT_JSON': True } diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 91244e261..a8fd5f460 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -13,7 +13,7 @@ from rest_framework.compat import yaml, etree, StringIO from rest_framework.response import Response from rest_framework.views import APIView from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \ - XMLRenderer, JSONPRenderer, BrowsableAPIRenderer, UnicodeJSONRenderer, UnicodeYAMLRenderer + XMLRenderer, JSONPRenderer, BrowsableAPIRenderer from rest_framework.parsers import YAMLParser, XMLParser from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory @@ -32,7 +32,7 @@ RENDERER_B_SERIALIZER = lambda x: ('Renderer B: %s' % x).encode('ascii') expected_results = [ - ((elem for elem in [1, 2, 3]), JSONRenderer, b'[1, 2, 3]') # Generator + ((elem for elem in [1, 2, 3]), JSONRenderer, b'[1,2,3]') # Generator ] @@ -270,7 +270,7 @@ class RendererEndToEndTests(TestCase): self.assertNotContains(resp, '>text/html; charset=utf-8<') -_flat_repr = '{"foo": ["bar", "baz"]}' +_flat_repr = '{"foo":["bar","baz"]}' _indented_repr = '{\n "foo": [\n "bar",\n "baz"\n ]\n}' @@ -373,12 +373,6 @@ class JSONRendererTests(TestCase): content = renderer.render(obj, 'application/json; indent=2') self.assertEqual(strip_trailing_whitespace(content.decode('utf-8')), _indented_repr) - def test_check_ascii(self): - obj = {'countries': ['United Kingdom', 'France', 'España']} - renderer = JSONRenderer() - content = renderer.render(obj, 'application/json') - self.assertEqual(content, '{"countries": ["United Kingdom", "France", "Espa\\u00f1a"]}'.encode('utf-8')) - class UnicodeJSONRendererTests(TestCase): """ @@ -386,9 +380,22 @@ class UnicodeJSONRendererTests(TestCase): """ def test_proper_encoding(self): obj = {'countries': ['United Kingdom', 'France', 'España']} - renderer = UnicodeJSONRenderer() + renderer = JSONRenderer() content = renderer.render(obj, 'application/json') - self.assertEqual(content, '{"countries": ["United Kingdom", "France", "España"]}'.encode('utf-8')) + self.assertEqual(content, '{"countries":["United Kingdom","France","España"]}'.encode('utf-8')) + + +class AsciiJSONRendererTests(TestCase): + """ + Tests specific for the Unicode JSON Renderer + """ + def test_proper_encoding(self): + class AsciiJSONRenderer(JSONRenderer): + ensure_ascii = True + obj = {'countries': ['United Kingdom', 'France', 'España']} + renderer = AsciiJSONRenderer() + content = renderer.render(obj, 'application/json') + self.assertEqual(content, '{"countries":["United Kingdom","France","Espa\\u00f1a"]}'.encode('utf-8')) class JSONPRendererTests(TestCase): @@ -487,13 +494,9 @@ if yaml: def assertYAMLContains(self, content, string): self.assertTrue(string in content, '%r not in %r' % (string, content)) - class UnicodeYAMLRendererTests(TestCase): - """ - Tests specific for the Unicode YAML Renderer - """ def test_proper_encoding(self): obj = {'countries': ['United Kingdom', 'France', 'España']} - renderer = UnicodeYAMLRenderer() + renderer = YAMLRenderer() content = renderer.render(obj, 'application/yaml') self.assertEqual(content.strip(), 'countries: [United Kingdom, France, España]'.encode('utf-8')) diff --git a/tests/test_validation.py b/tests/test_validation.py index 7543d849b..ce39714d1 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -131,7 +131,7 @@ class TestMaxValueValidatorValidation(TestCase): request = factory.patch('/{0}'.format(obj.pk), {'number_value': 101}, format='json') view = UpdateMaxValueValidationModel().as_view() response = view(request, pk=obj.pk).render() - self.assertEqual(response.content, b'{"number_value": ["Ensure this value is less than or equal to 100."]}') + self.assertEqual(response.content, b'{"number_value":["Ensure this value is less than or equal to 100."]}') self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) From 22af49bf8ffc73afc9b638f1b9cd2e909c6c89a8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 11:50:20 +0100 Subject: [PATCH 0825/1652] Tidy up JSONEncoder --- rest_framework/utils/encoders.py | 67 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 7992b6b1c..174b08b8b 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -7,7 +7,6 @@ from django.db.models.query import QuerySet from django.utils.datastructures import SortedDict from django.utils.functional import Promise from rest_framework.compat import force_text -# from rest_framework.serializers import DictWithMetadata, SortedDictWithMetadata import datetime import decimal import types @@ -17,45 +16,47 @@ import json class JSONEncoder(json.JSONEncoder): """ JSONEncoder subclass that knows how to encode date/time/timedelta, - decimal types, and generators. + decimal types, generators and other basic python objects. """ - def default(self, o): + def default(self, obj): # For Date Time string spec, see ECMA 262 # http://ecma-international.org/ecma-262/5.1/#sec-15.9.1.15 - if isinstance(o, Promise): - return force_text(o) - elif isinstance(o, datetime.datetime): - r = o.isoformat() - if o.microsecond: - r = r[:23] + r[26:] - if r.endswith('+00:00'): - r = r[:-6] + 'Z' - return r - elif isinstance(o, datetime.date): - return o.isoformat() - elif isinstance(o, datetime.time): - if timezone and timezone.is_aware(o): + if isinstance(obj, Promise): + return force_text(obj) + elif isinstance(obj, datetime.datetime): + representation = obj.isoformat() + if obj.microsecond: + representation = representation[:23] + representation[26:] + if representation.endswith('+00:00'): + representation = representation[:-6] + 'Z' + return representation + elif isinstance(obj, datetime.date): + return obj.isoformat() + elif isinstance(obj, datetime.time): + if timezone and timezone.is_aware(obj): raise ValueError("JSON can't represent timezone-aware times.") - r = o.isoformat() - if o.microsecond: - r = r[:12] - return r - elif isinstance(o, datetime.timedelta): - return str(o.total_seconds()) - elif isinstance(o, decimal.Decimal): - return float(o) - elif isinstance(o, QuerySet): - return list(o) - elif hasattr(o, 'tolist'): - return o.tolist() - elif hasattr(o, '__getitem__'): + representation = obj.isoformat() + if obj.microsecond: + representation = representation[:12] + return representation + elif isinstance(obj, datetime.timedelta): + return str(obj.total_seconds()) + elif isinstance(obj, decimal.Decimal): + # Serializers will coerce decimals to strings by default. + return float(obj) + elif isinstance(obj, QuerySet): + return list(obj) + elif hasattr(obj, 'tolist'): + # Numpy arrays and array scalars. + return obj.tolist() + elif hasattr(obj, '__getitem__'): try: - return dict(o) + return dict(obj) except: pass - elif hasattr(o, '__iter__'): - return [i for i in o] - return super(JSONEncoder, self).default(o) + elif hasattr(obj, '__iter__'): + return [item for item in obj] + return super(JSONEncoder, self).default(obj) try: From 79715f01f8c34fdd55c2291b6b21d09fa3a8153e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 12:10:22 +0100 Subject: [PATCH 0826/1652] Coerce dates etc to ISO_8601 in seralizer, by default. --- rest_framework/fields.py | 24 +++++++++++++----------- rest_framework/settings.py | 21 ++++++++------------- tests/test_filters.py | 17 +++++++++-------- tests/test_pagination.py | 2 +- 4 files changed, 31 insertions(+), 33 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 9d96cf5cc..e1855ff74 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -431,10 +431,12 @@ class DecimalField(Field): 'max_whole_digits': _('Ensure that there are no more than {max_whole_digits} digits before the decimal point.') } - def __init__(self, max_digits, decimal_places, coerce_to_string=True, max_value=None, min_value=None, **kwargs): + coerce_to_string = api_settings.COERCE_DECIMAL_TO_STRING + + def __init__(self, max_digits, decimal_places, coerce_to_string=None, max_value=None, min_value=None, **kwargs): self.max_digits = max_digits self.decimal_places = decimal_places - self.coerce_to_string = coerce_to_string + self.coerce_to_string = coerce_to_string if (coerce_to_string is not None) else self.coerce_to_string super(DecimalField, self).__init__(**kwargs) if max_value is not None: self.validators.append(validators.MaxValueValidator(max_value)) @@ -510,12 +512,12 @@ class DateField(Field): default_error_messages = { 'invalid': _('Date has wrong format. Use one of these formats instead: {format}'), } - input_formats = api_settings.DATE_INPUT_FORMATS format = api_settings.DATE_FORMAT + input_formats = api_settings.DATE_INPUT_FORMATS - def __init__(self, input_formats=None, format=None, *args, **kwargs): - self.input_formats = input_formats if input_formats is not None else self.input_formats + def __init__(self, format=None, input_formats=None, *args, **kwargs): self.format = format if format is not None else self.format + self.input_formats = input_formats if input_formats is not None else self.input_formats super(DateField, self).__init__(*args, **kwargs) def to_internal_value(self, value): @@ -569,12 +571,12 @@ class DateTimeField(Field): default_error_messages = { 'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}'), } - input_formats = api_settings.DATETIME_INPUT_FORMATS format = api_settings.DATETIME_FORMAT + input_formats = api_settings.DATETIME_INPUT_FORMATS - def __init__(self, input_formats=None, format=None, *args, **kwargs): - self.input_formats = input_formats if input_formats is not None else self.input_formats + def __init__(self, format=None, input_formats=None, *args, **kwargs): self.format = format if format is not None else self.format + self.input_formats = input_formats if input_formats is not None else self.input_formats super(DateTimeField, self).__init__(*args, **kwargs) def to_internal_value(self, value): @@ -634,12 +636,12 @@ class TimeField(Field): default_error_messages = { 'invalid': _('Time has wrong format. Use one of these formats instead: {format}'), } - input_formats = api_settings.TIME_INPUT_FORMATS format = api_settings.TIME_FORMAT + input_formats = api_settings.TIME_INPUT_FORMATS - def __init__(self, input_formats=None, format=None, *args, **kwargs): - self.input_formats = input_formats if input_formats is not None else self.input_formats + def __init__(self, format=None, input_formats=None, *args, **kwargs): self.format = format if format is not None else self.format + self.input_formats = input_formats if input_formats is not None else self.input_formats super(TimeField, self).__init__(*args, **kwargs) def from_native(self, value): diff --git a/rest_framework/settings.py b/rest_framework/settings.py index e55610bbc..421e146c8 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -97,24 +97,19 @@ DEFAULTS = { 'URL_FIELD_NAME': 'url', # Input and output formats - 'DATE_INPUT_FORMATS': ( - ISO_8601, - ), - 'DATE_FORMAT': None, + 'DATE_FORMAT': ISO_8601, + 'DATE_INPUT_FORMATS': (ISO_8601,), - 'DATETIME_INPUT_FORMATS': ( - ISO_8601, - ), - 'DATETIME_FORMAT': None, + 'DATETIME_FORMAT': ISO_8601, + 'DATETIME_INPUT_FORMATS': (ISO_8601,), - 'TIME_INPUT_FORMATS': ( - ISO_8601, - ), - 'TIME_FORMAT': None, + 'TIME_FORMAT': ISO_8601, + 'TIME_INPUT_FORMATS': (ISO_8601,), # Encoding 'UNICODE_JSON': True, - 'COMPACT_JSON': True + 'COMPACT_JSON': True, + 'COERCE_DECIMAL_TO_STRING': True } diff --git a/tests/test_filters.py b/tests/test_filters.py index 01668114b..dc84dcbd0 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -2,10 +2,11 @@ from __future__ import unicode_literals import datetime from decimal import Decimal from django.db import models +from django.conf.urls import patterns, url from django.core.urlresolvers import reverse from django.test import TestCase from django.utils import unittest -from django.conf.urls import patterns, url +from django.utils.dateparse import parse_date from rest_framework import generics, serializers, status, filters from rest_framework.compat import django_filters from rest_framework.test import APIRequestFactory @@ -102,7 +103,7 @@ if django_filters: class CommonFilteringTestCase(TestCase): def _serialize_object(self, obj): - return {'id': obj.id, 'text': obj.text, 'decimal': str(obj.decimal), 'date': obj.date} + return {'id': obj.id, 'text': obj.text, 'decimal': str(obj.decimal), 'date': obj.date.isoformat()} def setUp(self): """ @@ -153,7 +154,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/', {'date': '%s' % search_date}) # search_date str: '2012-09-22' response = view(request).render() self.assertEqual(response.status_code, status.HTTP_200_OK) - expected_data = [f for f in self.data if f['date'] == search_date] + expected_data = [f for f in self.data if parse_date(f['date']) == search_date] self.assertEqual(response.data, expected_data) @unittest.skipUnless(django_filters, 'django-filter not installed') @@ -209,7 +210,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/', {'date': '%s' % search_date}) # search_date str: '2012-10-02' response = view(request).render() self.assertEqual(response.status_code, status.HTTP_200_OK) - expected_data = [f for f in self.data if f['date'] > search_date] + expected_data = [f for f in self.data if parse_date(f['date']) > search_date] self.assertEqual(response.data, expected_data) # Tests that the text filter set with 'icontains' in the filter class works. @@ -229,7 +230,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): }) response = view(request).render() self.assertEqual(response.status_code, status.HTTP_200_OK) - expected_data = [f for f in self.data if f['date'] > search_date and + expected_data = [f for f in self.data if parse_date(f['date']) > search_date and Decimal(f['decimal']) < search_decimal] self.assertEqual(response.data, expected_data) @@ -481,9 +482,9 @@ class DjangoFilterOrderingTests(TestCase): self.assertEqual( response.data, [ - {'id': 3, 'date': datetime.date(2014, 10, 8), 'text': 'cde'}, - {'id': 2, 'date': datetime.date(2013, 10, 8), 'text': 'bcd'}, - {'id': 1, 'date': datetime.date(2012, 10, 8), 'text': 'abc'} + {'id': 3, 'date': '2014-10-08', 'text': 'cde'}, + {'id': 2, 'date': '2013-10-08', 'text': 'bcd'}, + {'id': 1, 'date': '2012-10-08', 'text': 'abc'} ] ) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index a7f8e691f..1fd9cf9c4 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -135,7 +135,7 @@ class IntegrationTestPaginationAndFiltering(TestCase): self.objects = FilterableItem.objects self.data = [ - {'id': obj.id, 'text': obj.text, 'decimal': str(obj.decimal), 'date': obj.date} + {'id': obj.id, 'text': obj.text, 'decimal': str(obj.decimal), 'date': obj.date.isoformat()} for obj in self.objects.all() ] From f95e7fae38968f58e742b93842bda9110a61b9f7 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 12:40:53 +0100 Subject: [PATCH 0827/1652] Updating docs --- docs/api-guide/renderers.md | 29 ++++------------------ docs/api-guide/settings.md | 48 ++++++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 27 deletions(-) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 7a3429bfd..b1adf31f8 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -74,37 +74,18 @@ If your API includes views that can serve both regular webpages and API response Renders the request data into `JSON`, using utf-8 encoding. -Note that non-ascii characters will be rendered using JSON's `\uXXXX` character escape. For example: +Note that the default style is to include unicode characters, and render the response using a compact style with no uneccessary whitespace: - {"unicode black star": "\u2605"} + {"unicode black star":"★","value":999} The client may additionally include an `'indent'` media type parameter, in which case the returned `JSON` will be indented. For example `Accept: application/json; indent=4`. { - "unicode black star": "\u2605" + "unicode black star": "★", + "value": 999 } -**.media_type**: `application/json` - -**.format**: `'.json'` - -**.charset**: `None` - -## UnicodeJSONRenderer - -Renders the request data into `JSON`, using utf-8 encoding. - -Note that non-ascii characters will not be character escaped. For example: - - {"unicode black star": "★"} - -The client may additionally include an `'indent'` media type parameter, in which case the returned `JSON` will be indented. For example `Accept: application/json; indent=4`. - - { - "unicode black star": "★" - } - -Both the `JSONRenderer` and `UnicodeJSONRenderer` styles conform to [RFC 4627][rfc4627], and are syntactically valid JSON. +The default JSON encoding style can be altered using the `UNICODE_JSON` and `COMPACT_JSON` settings keys. **.media_type**: `application/json` diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 27a091633..6a855c929 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -265,7 +265,7 @@ A format string that should be used by default for rendering the output of `Date May be any of `None`, `'iso-8601'` or a Python [strftime format][strftime] string. -Default: `None` +Default: `'iso-8601'` #### DATETIME_INPUT_FORMATS @@ -281,7 +281,7 @@ A format string that should be used by default for rendering the output of `Date May be any of `None`, `'iso-8601'` or a Python [strftime format][strftime] string. -Default: `None` +Default: `'iso-8601'` #### DATE_INPUT_FORMATS @@ -297,7 +297,7 @@ A format string that should be used by default for rendering the output of `Time May be any of `None`, `'iso-8601'` or a Python [strftime format][strftime] string. -Default: `None` +Default: `'iso-8601'` #### TIME_INPUT_FORMATS @@ -309,6 +309,46 @@ Default: `['iso-8601']` --- +## Encodings + +#### UNICODE_JSON + +When set to `True`, JSON responses will allow unicode characters in responses. For example: + + {"unicode black star":"★"} + +When set to `False`, JSON responses will escape non-ascii characters, like so: + + {"unicode black star":"\u2605"} + +Both styles conform to [RFC 4627][rfc4627], and are syntactically valid JSON. The unicode style is prefered as being more user-friendly when inspecting API responses. + +Default: `True` + +#### COMPACT_JSON + +When set to `True`, JSON responses will return compact representations, with no spacing after `':'` and `','` characters. For example: + + {"is_admin":false,"email":"jane@example"} + +When set to `False`, JSON responses will return slightly more verbose representations, like so: + + {"is_admin": false, "email": "jane@example"} + +The default style is to return minified responses, in line with [Heroku's API design guidelines][heroku-minified-json]. + +Default: `True` + +#### COERCE_DECIMAL_TO_STRING + +When returning decimal objects in API representations that do not support a native decimal type, it is normally best to return the value as a string. This avoids the loss of precision that occurs with binary floating point implementations. + +When set to `True`, the serializer `DecimalField` class will return strings instead of `Decimal` objects. When set to `False`, serializers will return `Decimal` objects, which the default JSON encoder will return as floats. + +Default: `True` + +--- + ## View names and descriptions **The following settings are used to generate the view names and descriptions, as used in responses to `OPTIONS` requests, and as used in the browsable API.** @@ -378,4 +418,6 @@ An integer of 0 or more, that may be used to specify the number of application p Default: `None` [cite]: http://www.python.org/dev/peps/pep-0020/ +[rfc4627]: http://www.ietf.org/rfc/rfc4627.txt +[heroku-minified-json]: https://github.com/interagent/http-api-design#keep-json-minified-in-all-responses [strftime]: http://docs.python.org/2/library/time.html#time.strftime From b73a205cc021983d9a508b447f30e144a1ce4129 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 17:03:42 +0100 Subject: [PATCH 0828/1652] Tests for relational fields (not including many=True) --- rest_framework/relations.py | 153 +++++++++++++++++++++++------------- tests/test_relations.py | 139 ++++++++++++++++++++++++++++++++ tests/utils.py | 53 +++++++++++++ 3 files changed, 291 insertions(+), 54 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index e23a41526..75ec89a86 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -1,19 +1,24 @@ +from rest_framework.compat import smart_text, urlparse from rest_framework.fields import Field from rest_framework.reverse import reverse -from django.core.exceptions import ObjectDoesNotExist +from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch from django.db.models.query import QuerySet -from rest_framework.compat import urlparse +from django.utils.translation import ugettext_lazy as _ class RelatedField(Field): def __init__(self, **kwargs): self.queryset = kwargs.pop('queryset', None) self.many = kwargs.pop('many', False) - assert self.queryset is not None or kwargs.get('read_only', False), ( + assert self.queryset is not None or kwargs.get('read_only', None), ( 'Relational field must provide a `queryset` argument, ' 'or set read_only=`True`.' ) + assert not (self.queryset is not None and kwargs.get('read_only', None)), ( + 'Relational fields should not provide a `queryset` argument, ' + 'when setting read_only=`True`.' + ) super(RelatedField, self).__init__(**kwargs) def get_queryset(self): @@ -25,6 +30,11 @@ class RelatedField(Field): class StringRelatedField(Field): + """ + A read only field that represents its targets using their + plain string representation. + """ + def __init__(self, **kwargs): kwargs['read_only'] = True super(StringRelatedField, self).__init__(**kwargs) @@ -34,10 +44,10 @@ class StringRelatedField(Field): class PrimaryKeyRelatedField(RelatedField): - MESSAGES = { + default_error_messages = { 'required': 'This field is required.', 'does_not_exist': "Invalid pk '{pk_value}' - object does not exist.", - 'incorrect_type': 'Incorrect type. Expected pk value, received {data_type}.', + 'incorrect_type': 'Incorrect type. Expected pk value, received {data_type}.', } def to_internal_value(self, data): @@ -48,22 +58,33 @@ class PrimaryKeyRelatedField(RelatedField): except (TypeError, ValueError): self.fail('incorrect_type', data_type=type(data).__name__) + def to_representation(self, value): + return value.pk + class HyperlinkedRelatedField(RelatedField): lookup_field = 'pk' - MESSAGES = { + default_error_messages = { 'required': 'This field is required.', 'no_match': 'Invalid hyperlink - No URL match', 'incorrect_match': 'Invalid hyperlink - Incorrect URL match.', - 'does_not_exist': "Invalid hyperlink - Object does not exist.", - 'incorrect_type': 'Incorrect type. Expected URL string, received {data_type}.', + 'does_not_exist': 'Invalid hyperlink - Object does not exist.', + 'incorrect_type': 'Incorrect type. Expected URL string, received {data_type}.', } - def __init__(self, **kwargs): - self.view_name = kwargs.pop('view_name') + def __init__(self, view_name, **kwargs): + self.view_name = view_name self.lookup_field = kwargs.pop('lookup_field', self.lookup_field) self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field) + self.format = kwargs.pop('format', None) + + # We include these simply for dependancy injection in tests. + # We can't add them as class attributes or they would expect an + # implict `self` argument to be passed. + self.reverse = reverse + self.resolve = resolve + super(HyperlinkedRelatedField, self).__init__(**kwargs) def get_object(self, view_name, view_args, view_kwargs): @@ -77,44 +98,6 @@ class HyperlinkedRelatedField(RelatedField): lookup_kwargs = {self.lookup_field: lookup_value} return self.get_queryset().get(**lookup_kwargs) - def to_internal_value(self, value): - try: - http_prefix = value.startswith(('http:', 'https:')) - except AttributeError: - self.fail('incorrect_type', data_type=type(value).__name__) - - if http_prefix: - # If needed convert absolute URLs to relative path - value = urlparse.urlparse(value).path - prefix = get_script_prefix() - if value.startswith(prefix): - value = '/' + value[len(prefix):] - - try: - match = resolve(value) - except Exception: - self.fail('no_match') - - if match.view_name != self.view_name: - self.fail('incorrect_match') - - try: - return self.get_object(match.view_name, match.args, match.kwargs) - except (ObjectDoesNotExist, TypeError, ValueError): - self.fail('does_not_exist') - - -class HyperlinkedIdentityField(RelatedField): - lookup_field = 'pk' - - def __init__(self, **kwargs): - kwargs['read_only'] = True - kwargs['source'] = '*' - self.view_name = kwargs.pop('view_name') - self.lookup_field = kwargs.pop('lookup_field', self.lookup_field) - self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field) - super(HyperlinkedIdentityField, self).__init__(**kwargs) - def get_url(self, obj, view_name, request, format): """ Given an object, return the URL that hyperlinks to the object. @@ -128,16 +111,42 @@ class HyperlinkedIdentityField(RelatedField): lookup_value = getattr(obj, self.lookup_field) kwargs = {self.lookup_url_kwarg: lookup_value} - return reverse(view_name, kwargs=kwargs, request=request, format=format) + return self.reverse(view_name, kwargs=kwargs, request=request, format=format) + + def to_internal_value(self, data): + try: + http_prefix = data.startswith(('http:', 'https:')) + except AttributeError: + self.fail('incorrect_type', data_type=type(data).__name__) + + if http_prefix: + # If needed convert absolute URLs to relative path + data = urlparse.urlparse(data).path + prefix = get_script_prefix() + if data.startswith(prefix): + data = '/' + data[len(prefix):] + + try: + match = self.resolve(data) + except Exception: + self.fail('no_match') + + if match.view_name != self.view_name: + self.fail('incorrect_match') + + try: + return self.get_object(match.view_name, match.args, match.kwargs) + except (ObjectDoesNotExist, TypeError, ValueError): + self.fail('does_not_exist') def to_representation(self, value): request = self.context.get('request', None) format = self.context.get('format', None) assert request is not None, ( - "`HyperlinkedIdentityField` requires the request in the serializer" + "`%s` requires the request in the serializer" " context. Add `context={'request': request}` when instantiating " - "the serializer." + "the serializer." % self.__class__.__name__ ) # By default use whatever format is given for the current context @@ -162,9 +171,45 @@ class HyperlinkedIdentityField(RelatedField): 'model in your API, or incorrectly configured the ' '`lookup_field` attribute on this field.' ) - raise Exception(msg % self.view_name) + raise ImproperlyConfigured(msg % self.view_name) + + +class HyperlinkedIdentityField(HyperlinkedRelatedField): + """ + A read-only field that represents the identity URL for an object, itself. + + This is in contrast to `HyperlinkedRelatedField` which represents the + URL of relationships to other objects. + """ + + def __init__(self, view_name, **kwargs): + kwargs['read_only'] = True + kwargs['source'] = '*' + super(HyperlinkedIdentityField, self).__init__(view_name, **kwargs) class SlugRelatedField(RelatedField): - def __init__(self, **kwargs): - self.slug_field = kwargs.pop('slug_field', None) + """ + A read-write field the represents the target of the relationship + by a unique 'slug' attribute. + """ + + default_error_messages = { + 'does_not_exist': _("Object with {slug_name}={value} does not exist."), + 'invalid': _('Invalid value.'), + } + + def __init__(self, slug_field, **kwargs): + self.slug_field = slug_field + super(SlugRelatedField, self).__init__(**kwargs) + + def to_internal_value(self, data): + try: + return self.get_queryset().get(**{self.slug_field: data}) + except ObjectDoesNotExist: + self.fail('does_not_exist', slug_name=self.slug_field, value=smart_text(data)) + except (TypeError, ValueError): + self.fail('invalid') + + def to_representation(self, obj): + return getattr(obj, self.slug_field) diff --git a/tests/test_relations.py b/tests/test_relations.py index b1bc66b62..a36721175 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -1,3 +1,142 @@ +from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset +from django.core.exceptions import ImproperlyConfigured, ValidationError +from rest_framework import serializers +from rest_framework.test import APISimpleTestCase +import pytest + + +class TestStringRelatedField(APISimpleTestCase): + def setUp(self): + self.instance = MockObject(pk=1, name='foo') + self.field = serializers.StringRelatedField() + + def test_string_related_representation(self): + representation = self.field.to_representation(self.instance) + assert representation == '<MockObject name=foo, pk=1>' + + +class TestPrimaryKeyRelatedField(APISimpleTestCase): + def setUp(self): + self.queryset = MockQueryset([ + MockObject(pk=1, name='foo'), + MockObject(pk=2, name='bar'), + MockObject(pk=3, name='baz') + ]) + self.instance = self.queryset.items[2] + self.field = serializers.PrimaryKeyRelatedField(queryset=self.queryset) + + def test_pk_related_lookup_exists(self): + instance = self.field.to_internal_value(self.instance.pk) + assert instance is self.instance + + def test_pk_related_lookup_does_not_exist(self): + with pytest.raises(ValidationError) as excinfo: + self.field.to_internal_value(4) + msg = excinfo.value.message + assert msg == "Invalid pk '4' - object does not exist." + + def test_pk_related_lookup_invalid_type(self): + with pytest.raises(ValidationError) as excinfo: + self.field.to_internal_value(BadType()) + msg = excinfo.value.message + assert msg == 'Incorrect type. Expected pk value, received BadType.' + + def test_pk_representation(self): + representation = self.field.to_representation(self.instance) + assert representation == self.instance.pk + + +class TestHyperlinkedIdentityField(APISimpleTestCase): + def setUp(self): + self.instance = MockObject(pk=1, name='foo') + self.field = serializers.HyperlinkedIdentityField(view_name='example') + self.field.reverse = mock_reverse + self.field.context = {'request': True} + + def test_representation(self): + representation = self.field.to_representation(self.instance) + assert representation == 'http://example.org/example/1/' + + def test_representation_unsaved_object(self): + representation = self.field.to_representation(MockObject(pk=None)) + assert representation is None + + def test_representation_with_format(self): + self.field.context['format'] = 'xml' + representation = self.field.to_representation(self.instance) + assert representation == 'http://example.org/example/1.xml/' + + def test_improperly_configured(self): + """ + If a matching view cannot be reversed with the given instance, + the the user has misconfigured something, as the URL conf and the + hyperlinked field do not match. + """ + self.field.reverse = fail_reverse + with pytest.raises(ImproperlyConfigured): + self.field.to_representation(self.instance) + + +class TestHyperlinkedIdentityFieldWithFormat(APISimpleTestCase): + """ + Tests for a hyperlinked identity field that has a `format` set, + which enforces that alternate formats are never linked too. + + Eg. If your API includes some endpoints that accept both `.xml` and `.json`, + but other endpoints that only accept `.json`, we allow for hyperlinked + relationships that enforce only a single suffix type. + """ + + def setUp(self): + self.instance = MockObject(pk=1, name='foo') + self.field = serializers.HyperlinkedIdentityField(view_name='example', format='json') + self.field.reverse = mock_reverse + self.field.context = {'request': True} + + def test_representation(self): + representation = self.field.to_representation(self.instance) + assert representation == 'http://example.org/example/1/' + + def test_representation_with_format(self): + self.field.context['format'] = 'xml' + representation = self.field.to_representation(self.instance) + assert representation == 'http://example.org/example/1.json/' + + +class TestSlugRelatedField(APISimpleTestCase): + def setUp(self): + self.queryset = MockQueryset([ + MockObject(pk=1, name='foo'), + MockObject(pk=2, name='bar'), + MockObject(pk=3, name='baz') + ]) + self.instance = self.queryset.items[2] + self.field = serializers.SlugRelatedField( + slug_field='name', queryset=self.queryset + ) + + def test_slug_related_lookup_exists(self): + instance = self.field.to_internal_value(self.instance.name) + assert instance is self.instance + + def test_slug_related_lookup_does_not_exist(self): + with pytest.raises(ValidationError) as excinfo: + self.field.to_internal_value('doesnotexist') + msg = excinfo.value.message + assert msg == 'Object with name=doesnotexist does not exist.' + + def test_slug_related_lookup_invalid_type(self): + with pytest.raises(ValidationError) as excinfo: + self.field.to_internal_value(BadType()) + msg = excinfo.value.message + assert msg == 'Invalid value.' + + def test_representation(self): + representation = self.field.to_representation(self.instance) + assert representation == self.instance.name + +# Older tests, for review... + # """ # General tests for relational fields. # """ diff --git a/tests/utils.py b/tests/utils.py index 28be81bd1..5e902ba94 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,4 +1,6 @@ from contextlib import contextmanager +from django.core.exceptions import ObjectDoesNotExist +from django.core.urlresolvers import NoReverseMatch from django.utils import six from rest_framework.settings import api_settings @@ -23,3 +25,54 @@ def temporary_setting(setting, value, module=None): if module is not None: six.moves.reload_module(module) + + +class MockObject(object): + def __init__(self, **kwargs): + self._kwargs = kwargs + for key, val in kwargs.items(): + setattr(self, key, val) + + def __str__(self): + kwargs_str = ', '.join([ + '%s=%s' % (key, value) + for key, value in sorted(self._kwargs.items()) + ]) + return '<MockObject %s>' % kwargs_str + + +class MockQueryset(object): + def __init__(self, iterable): + self.items = iterable + + def get(self, **lookup): + for item in self.items: + if all([ + getattr(item, key, None) == value + for key, value in lookup.items() + ]): + return item + raise ObjectDoesNotExist() + + +class BadType(object): + """ + When used as a lookup with a `MockQueryset`, these objects + will raise a `TypeError`, as occurs in Django when making + queryset lookups with an incorrect type for the lookup value. + """ + def __eq__(self): + raise TypeError() + + +def mock_reverse(view_name, args=None, kwargs=None, request=None, format=None): + args = args or [] + kwargs = kwargs or {} + value = (args + list(kwargs.values()) + ['-'])[0] + prefix = 'http://example.org' if request else '' + suffix = ('.' + format) if (format is not None) else '' + return '%s/%s/%s%s/' % (prefix, view_name, value, suffix) + + +def fail_reverse(view_name, args=None, kwargs=None, request=None, format=None): + raise NoReverseMatch() From 0ac52e0808288892717c017e57c57aa8ad81e6d3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 17:06:37 +0100 Subject: [PATCH 0829/1652] Use Resolver404 instead of base Exception --- rest_framework/relations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 75ec89a86..46fe55ef9 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -2,7 +2,7 @@ from rest_framework.compat import smart_text, urlparse from rest_framework.fields import Field from rest_framework.reverse import reverse from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured -from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch +from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch, Resolver404 from django.db.models.query import QuerySet from django.utils.translation import ugettext_lazy as _ @@ -128,7 +128,7 @@ class HyperlinkedRelatedField(RelatedField): try: match = self.resolve(data) - except Exception: + except Resolver404: self.fail('no_match') if match.view_name != self.view_name: From 1f75ffc7912725e771a67bf3e6c3c6362dc3199a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 19:50:30 +0100 Subject: [PATCH 0830/1652] Access validation messages in a way thats compatible with 1.4, 1.5 --- tests/test_relations.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_relations.py b/tests/test_relations.py index a36721175..c29618ce2 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -32,13 +32,13 @@ class TestPrimaryKeyRelatedField(APISimpleTestCase): def test_pk_related_lookup_does_not_exist(self): with pytest.raises(ValidationError) as excinfo: self.field.to_internal_value(4) - msg = excinfo.value.message + msg = excinfo.value.messages[0] assert msg == "Invalid pk '4' - object does not exist." def test_pk_related_lookup_invalid_type(self): with pytest.raises(ValidationError) as excinfo: self.field.to_internal_value(BadType()) - msg = excinfo.value.message + msg = excinfo.value.messages[0] assert msg == 'Incorrect type. Expected pk value, received BadType.' def test_pk_representation(self): @@ -122,13 +122,13 @@ class TestSlugRelatedField(APISimpleTestCase): def test_slug_related_lookup_does_not_exist(self): with pytest.raises(ValidationError) as excinfo: self.field.to_internal_value('doesnotexist') - msg = excinfo.value.message + msg = excinfo.value.messages[0] assert msg == 'Object with name=doesnotexist does not exist.' def test_slug_related_lookup_invalid_type(self): with pytest.raises(ValidationError) as excinfo: self.field.to_internal_value(BadType()) - msg = excinfo.value.message + msg = excinfo.value.messages[0] assert msg == 'Invalid value.' def test_representation(self): From e6c88a423361b084ba171af7a74a183bd557e73e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 19:54:27 +0100 Subject: [PATCH 0831/1652] Drop usage of validatiors.EMPTY_VALUES --- rest_framework/fields.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index e1855ff74..33ab0682c 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -223,7 +223,7 @@ class Field(object): return value def run_validators(self, value): - if value in validators.EMPTY_VALUES: + if value in (None, '', [], (), {}): return errors = [] @@ -450,7 +450,7 @@ class DecimalField(Field): than max_digits in the number, and no more than decimal_places digits after the decimal point. """ - if value in validators.EMPTY_VALUES: + if value in (None, ''): return None value = smart_text(value).strip() @@ -521,7 +521,7 @@ class DateField(Field): super(DateField, self).__init__(*args, **kwargs) def to_internal_value(self, value): - if value in validators.EMPTY_VALUES: + if value in (None, ''): return None if isinstance(value, datetime.datetime): @@ -580,7 +580,7 @@ class DateTimeField(Field): super(DateTimeField, self).__init__(*args, **kwargs) def to_internal_value(self, value): - if value in validators.EMPTY_VALUES: + if value in (None, ''): return None if isinstance(value, datetime.datetime): @@ -645,7 +645,7 @@ class TimeField(Field): super(TimeField, self).__init__(*args, **kwargs) def from_native(self, value): - if value in validators.EMPTY_VALUES: + if value in (None, ''): return None if isinstance(value, datetime.time): From 4fceceae7d1abf4d841677daee2636273ff09de8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 20:09:08 +0100 Subject: [PATCH 0832/1652] DecimalField documentation --- docs/api-guide/fields.md | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index bfbff2adb..f07783186 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -274,7 +274,27 @@ Corresponds to `django.db.models.fields.FloatField`. ## DecimalField -A decimal representation. +A decimal representation, represented in Python by a Decimal instance. + +Has two required arguments: + +- `max_digits` The maximum number of digits allowed in the number. Note that this number must be greater than or equal to decimal_places. + +- `decimal_places` The number of decimal places to store with the number. + +For example, to validate numbers up to 999 with a resolution of 2 decimal places, you would use: + + serializers.DecimalField(max_digits=5, decimal_places=2) + +And to validate numbers up to anything lesss than one billion with a resolution of 10 decimal places: + + serializers.DecimalField(max_digits=19, decimal_places=10) + +This field also takes an optional argument, `coerce_to_string`. If set to `True` the representation will be output as a string. If set to `False` the representation will be left as a `Decimal` instance and the final representation will be determined by the renderer. + +If unset, this will default to the same value as the `COERCE_DECIMAL_TO_STRING` setting, which is `True` unless set otherwise. + +**Signature:** `DecimalField(max_digits, decimal_places, coerce_to_string=None)` Corresponds to `django.db.models.fields.DecimalField`. From afb28a44ad1737cd6fcd6da50ba9552f38293368 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Sep 2014 21:32:20 +0100 Subject: [PATCH 0833/1652] Dealing with reverse relationships --- rest_framework/serializers.py | 8 ++++---- tests/test_model_field_mappings.py | 27 ++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0c2aedfa0..ecb2829b6 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -157,7 +157,7 @@ class Serializer(BaseSerializer): def __init__(self, *args, **kwargs): self.context = kwargs.pop('context', {}) kwargs.pop('partial', None) - kwargs.pop('many', False) + kwargs.pop('many', None) super(Serializer, self).__init__(*args, **kwargs) @@ -423,9 +423,9 @@ class ModelSerializer(Serializer): for accessor_name, relation_info in info.reverse_relations.items(): if accessor_name in self.opts.fields: if self.opts.depth: - ret[field_name] = self.get_nested_field(*relation_info) + ret[accessor_name] = self.get_nested_field(*relation_info) else: - ret[field_name] = self.get_related_field(*relation_info) + ret[accessor_name] = self.get_related_field(*relation_info) return ret @@ -444,7 +444,7 @@ class ModelSerializer(Serializer): Note that model_field will be `None` for reverse relationships. """ - class NestedModelSerializer(ModelSerializer): + class NestedModelSerializer(ModelSerializer): # Not right! class Meta: model = related_model depth = self.opts.depth - 1 diff --git a/tests/test_model_field_mappings.py b/tests/test_model_field_mappings.py index 6e9aaba6c..d5750f9e3 100644 --- a/tests/test_model_field_mappings.py +++ b/tests/test_model_field_mappings.py @@ -73,9 +73,9 @@ class OneToOneTargetModel(models.Model): class RelationalModel(models.Model): - foreign_key = models.ForeignKey(ForeignKeyTargetModel) - many_to_many = models.ManyToManyField(ManyToManyTargetModel) - one_to_one = models.OneToOneField(OneToOneTargetModel) + foreign_key = models.ForeignKey(ForeignKeyTargetModel, related_name='reverse_foreign_key') + many_to_many = models.ManyToManyField(ManyToManyTargetModel, related_name='reverse_many_to_many') + one_to_one = models.OneToOneField(OneToOneTargetModel, related_name='reverse_one_to_one') RELATIONAL_FLAT_REPR = """ @@ -160,3 +160,24 @@ class TestSerializerMappings(TestCase): model = RelationalModel depth = 1 self.assertEqual(repr(TestSerializer()), HYPERLINKED_NESTED_REPR) + + # def test_flat_reverse_foreign_key(self): + # class TestSerializer(serializers.ModelSerializer): + # class Meta: + # model = ForeignKeyTargetModel + # fields = ('id', 'name', 'reverse_foreign_key') + # print repr(TestSerializer()) + + # def test_flat_reverse_one_to_one(self): + # class TestSerializer(serializers.ModelSerializer): + # class Meta: + # model = OneToOneTargetModel + # fields = ('id', 'name', 'reverse_one_to_one') + # print repr(TestSerializer()) + + # def test_flat_reverse_many_to_many(self): + # class TestSerializer(serializers.ModelSerializer): + # class Meta: + # model = ManyToManyTargetModel + # fields = ('id', 'name', 'reverse_many_to_many') + # print repr(TestSerializer()) \ No newline at end of file From 96c21b81f5031a81b42b89371af48677081a6323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sat, 13 Sep 2014 13:53:40 -0400 Subject: [PATCH 0834/1652] Add Third Party Resources Topic section --- docs/index.md | 4 +- docs/template.html | 1 + docs/topics/third-party-resources.md | 87 ++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 docs/topics/third-party-resources.md diff --git a/docs/index.md b/docs/index.md index 1888bfe4b..6dcb962f5 100644 --- a/docs/index.md +++ b/docs/index.md @@ -195,6 +195,7 @@ General guides to using REST framework. * [Browser enhancements][browser-enhancements] * [The Browsable API][browsableapi] * [REST, Hypermedia & HATEOAS][rest-hypermedia-hateoas] +* [Third Party Resources][third-party-resources] * [Contributing to REST framework][contributing] * [2.0 Announcement][rest-framework-2-announcement] * [2.2 Announcement][2.2-announcement] @@ -312,11 +313,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [browsableapi]: topics/browsable-api.md [rest-hypermedia-hateoas]: topics/rest-hypermedia-hateoas.md [contributing]: topics/contributing.md +[third-party-resources]: topics/third-party-resources.md [rest-framework-2-announcement]: topics/rest-framework-2-announcement.md [2.2-announcement]: topics/2.2-announcement.md [2.3-announcement]: topics/2.3-announcement.md [2.4-announcement]: topics/2.4-announcement.md -[kickstarter-announcement]: topics/kickstarter-announcement.md +[kickstarter-announcement]: topics/kickstarter-announcement.md [release-notes]: topics/release-notes.md [credits]: topics/credits.md diff --git a/docs/template.html b/docs/template.html index 19542bfe6..bb3ae221a 100644 --- a/docs/template.html +++ b/docs/template.html @@ -117,6 +117,7 @@ a.fusion-poweredby { <li><a href="{{ base_url }}/topics/browser-enhancements{{ suffix }}">Browser enhancements</a></li> <li><a href="{{ base_url }}/topics/browsable-api{{ suffix }}">The Browsable API</a></li> <li><a href="{{ base_url }}/topics/rest-hypermedia-hateoas{{ suffix }}">REST, Hypermedia & HATEOAS</a></li> + <li><a href="{{ base_url }}/topics/third-party-resources{{ suffix }}">Third Party Resources</a></li> <li><a href="{{ base_url }}/topics/contributing{{ suffix }}">Contributing to REST framework</a></li> <li><a href="{{ base_url }}/topics/rest-framework-2-announcement{{ suffix }}">2.0 Announcement</a></li> <li><a href="{{ base_url }}/topics/2.2-announcement{{ suffix }}">2.2 Announcement</a></li> diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md new file mode 100644 index 000000000..da92eb33a --- /dev/null +++ b/docs/topics/third-party-resources.md @@ -0,0 +1,87 @@ +# Third Party Resources + +Django REST Framework has a growing community of developers, packages, and resources. + +Check out a grid detailing all the packages and ecosystem around Django REST Framework at [Django Packages](https://www.djangopackages.com/grids/g/django-rest-framework/). + +## Libraries and Extensions + +### Authentication + +* [djangorestframework-digestauth](https://github.com/juanriaza/django-rest-framework-digestauth) - Provides Digest Access Authentication support. +* [django-oauth-toolkit](https://github.com/evonove/django-oauth-toolkit) - Provides OAuth 2.0 support. +* [doac](https://github.com/Rediker-Software/doac) - Provides OAuth 2.0 support. +* [djangorestframework-jwt](https://github.com/GetBlimp/django-rest-framework-jwt) - Provides JSON Web Token Authentication support. +* [hawkrest](https://github.com/kumar303/hawkrest) - Provides Hawk HTTP Authorization. +* [djangorestframework-httpsignature](https://github.com/etoccalino/django-rest-framework-httpsignature) - Provides an easy to use HTTP Signature Authentication mechanism. + +### Permissions + +* [drf-any-permissions](https://github.com/kevin-brown/drf-any-permissions) - Provides alternative permission handling. +* [djangorestframework-composed-permissions](https://github.com/niwibe/djangorestframework-composed-permissions) - Provides a simple way to define complex permissions. +* [rest_condition](https://github.com/caxap/rest_condition) - Another extension for building complex permissions in a simple and convenient way. + +### Serializers + +* [django-rest-framework-mongoengine](https://github.com/umutbozkurt/django-rest-framework-mongoengine) - Serializer class that supports using MongoDB as the storage layer for Django REST framework. +* [djangorestframework-gis](https://github.com/djangonauts/django-rest-framework-gis) - Geographic add-ons +* [djangorestframework-hstore](https://github.com/djangonauts/django-rest-framework-hstore) - Serializer class to support django-hstore DictionaryField model field and its schema-mode feature. + +### Serializer fields + +* [drf-compound-fields](https://github.com/estebistec/drf-compound-fields) - Provides "compound" serializer fields, such as lists of simple values. +* [django-extra-fields](https://github.com/Hipo/drf-extra-fields) - Provides extra serializer fields. + +### Views + +* [djangorestframework-bulk](https://github.com/miki725/django-rest-framework-bulk) - Implements generic view mixins as well as some common concrete generic views to allow to apply bulk operations via API requests. + +### Routers + +* [drf-nested-routers](https://github.com/alanjds/drf-nested-routers) - Provides routers and relationship fields for working with nested resources. + +### Parsers + +* [djangorestframework-msgpack](https://github.com/juanriaza/django-rest-framework-msgpack) - Provides MessagePack renderer and parser support. +* [djangorestframework-camel-case](https://github.com/vbabiy/djangorestframework-camel-case) - Provides camel case JSON renderers and parsers. + +### Renderers + +* [djangorestframework-csv](https://github.com/mjumbewu/django-rest-framework-csv) - Provides CSV renderer support. +* [drf_ujson](https://github.com/gizmag/drf-ujson-renderer) - Implements JSON rendering using the UJSON package. + +### Filtering + +* [djangorestframework-chain](https://github.com/philipn/django-rest-framework-chain) - Allows arbitrary chaining of both relations and lookup filters. + +### Misc + +* [djangorestrelationalhyperlink](https://github.com/fredkingham/django_rest_model_hyperlink_serializers_project) - A hyperlinked serialiser that can can be used to alter relationships via hyperlinks, but otherwise like a hyperlink model serializer. +* [django-rest-swagger](https://github.com/marcgibbons/django-rest-swagger) - An API documentation generator for Swagger UI. +* [django-rest-framework-proxy ](https://github.com/eofs/django-rest-framework-proxy) - Proxy to redirect incoming request to another API server. +* [gaiarestframework](https://github.com/AppsFuel/gaiarestframework) - Utils for django-rest-framewok +* [drf-extensions](https://github.com/chibisov/drf-extensions) - A collection of custom extensions +* [ember-data-django-rest-adapter](https://github.com/toranb/ember-data-django-rest-adapter) - An ember-data adapter + +## Tutorials + +* [Beginner's Guide to the Django Rest Framework](http://code.tutsplus.com/tutorials/beginners-guide-to-the-django-rest-framework--cms-19786) +* [Getting Started with Django Rest Framework and AngularJS](http://blog.kevinastone.com/getting-started-with-django-rest-framework-and-angularjs.html) +* [End to end web app with Django-Rest-Framework & AngularJS](http://blog.mourafiq.com/post/55034504632/end-to-end-web-app-with-django-rest-framework) +* [Start Your API - django-rest-framework part 1](https://godjango.com/41-start-your-api-django-rest-framework-part-1/) +* [Permissions & Authentication - django-rest-framework part 2](https://godjango.com/43-permissions-authentication-django-rest-framework-part-2/) +* [ViewSets and Routers - django-rest-framework part 3](https://godjango.com/45-viewsets-and-routers-django-rest-framework-part-3/) +* [Django Rest Framework User Endpoint](http://richardtier.com/2014/02/25/django-rest-framework-user-endpoint/) +* [Check credentials using Django Rest Framework](http://richardtier.com/2014/03/06/110/) + +## Videos + +* [Ember and Django Part 1 (Video)](http://www.neckbeardrepublic.com/screencasts/ember-and-django-part-1) +* [Django Rest Framework Part 1 (Video)](http://www.neckbeardrepublic.com/screencasts/django-rest-framework-part-1) +* [Pyowa July 2013 - Django Rest Framework (Video)](http://www.youtube.com/watch?v=E1ZrehVxpBo) +* [django-rest-framework and angularjs (Video)](http://www.youtube.com/watch?v=Q8FRBGTJ020) + +## Articles + +* [Web API performance: profiling Django REST framework](http://dabapps.com/blog/api-performance-profiling-django-rest-framework/) +* [API Development with Django and Django REST Framework](https://bnotions.com/api-development-with-django-and-django-rest-framework/) From 1390b6801e45c38db474e77daefd867e7ea7f825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sat, 13 Sep 2014 16:20:16 -0400 Subject: [PATCH 0835/1652] Include third party resources link in home page --- mkdocs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mkdocs.py b/mkdocs.py index b4c414080..25cb55e21 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -76,6 +76,7 @@ path_list = [ 'topics/browser-enhancements.md', 'topics/browsable-api.md', 'topics/rest-hypermedia-hateoas.md', + 'topics/third-party-resources.md', 'topics/contributing.md', 'topics/rest-framework-2-announcement.md', 'topics/2.2-announcement.md', From 4871dbdc73632be4fb00befbc816bc670bb609cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sat, 13 Sep 2014 16:20:37 -0400 Subject: [PATCH 0836/1652] Add invitation to add new content --- docs/topics/third-party-resources.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index da92eb33a..2df13ef8a 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -4,6 +4,8 @@ Django REST Framework has a growing community of developers, packages, and resou Check out a grid detailing all the packages and ecosystem around Django REST Framework at [Django Packages](https://www.djangopackages.com/grids/g/django-rest-framework/). +To submit new content, [open an issue](https://github.com/tomchristie/django-rest-framework/issues/new) or [create a pull request](https://github.com/tomchristie/django-rest-framework/). Pull requests will be given higher priority since they are easier to include. + ## Libraries and Extensions ### Authentication From 915dfb9b3d6c235437a6459493cf26d248022e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sun, 14 Sep 2014 10:19:54 -0400 Subject: [PATCH 0837/1652] Update third-party-resources.md --- docs/topics/third-party-resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 2df13ef8a..e337cbd54 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -4,7 +4,7 @@ Django REST Framework has a growing community of developers, packages, and resou Check out a grid detailing all the packages and ecosystem around Django REST Framework at [Django Packages](https://www.djangopackages.com/grids/g/django-rest-framework/). -To submit new content, [open an issue](https://github.com/tomchristie/django-rest-framework/issues/new) or [create a pull request](https://github.com/tomchristie/django-rest-framework/). Pull requests will be given higher priority since they are easier to include. +To submit new content, [open an issue](https://github.com/tomchristie/django-rest-framework/issues/new) or [create a pull request](https://github.com/tomchristie/django-rest-framework/). ## Libraries and Extensions From 40dc588a372375608701f7e521dea6d860a49eb2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 15 Sep 2014 09:50:51 +0100 Subject: [PATCH 0838/1652] Drop label from serializer fields when not needed --- rest_framework/fields.py | 6 +- rest_framework/serializers.py | 56 +++++++++------- .../utils/{modelinfo.py => model_meta.py} | 0 tests/test_model_field_mappings.py | 64 +++++++++---------- 4 files changed, 70 insertions(+), 56 deletions(-) rename rest_framework/utils/{modelinfo.py => model_meta.py} (100%) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 33ab0682c..1818e705e 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -80,6 +80,10 @@ def set_value(dictionary, keys, value): dictionary[keys[-1]] = value +def field_name_to_label(field_name): + return field_name.replace('_', ' ').capitalize() + + class SkipField(Exception): pass @@ -158,7 +162,7 @@ class Field(object): # `self.label` should deafult to being based on the field name. if self.label is None: - self.label = self.field_name.replace('_', ' ').capitalize() + self.label = field_name_to_label(self.field_name) # self.source should default to being the same as the field name. if self.source is None: diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index ecb2829b6..ba8d475f8 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -15,11 +15,12 @@ from django.core.exceptions import ValidationError from django.db import models from django.utils import six from django.utils.datastructures import SortedDict +from django.utils.text import capfirst from collections import namedtuple from rest_framework.compat import clean_manytomany_helptext from rest_framework.fields import empty, set_value, Field, SkipField from rest_framework.settings import api_settings -from rest_framework.utils import html, modelinfo, representation +from rest_framework.utils import html, model_meta, representation import copy # Note: We do the following so that users of the framework can use this style: @@ -334,6 +335,14 @@ def lookup_class(mapping, instance): raise KeyError('Class %s not found in lookup.', cls.__name__) +def needs_label(model_field, field_name): + """ + Returns `True` if the label based on the model's verbose name + is not equal to the default label it would have based on it's field name. + """ + return capfirst(model_field.verbose_name) != field_name_to_label(field_name) + + class ModelSerializer(Serializer): field_mapping = { models.AutoField: IntegerField, @@ -397,54 +406,55 @@ class ModelSerializer(Serializer): """ Return all the fields that should be serialized for the model. """ - info = modelinfo.get_field_info(self.opts.model) + info = model_meta.get_field_info(self.opts.model) ret = SortedDict() serializer_url_field = self.get_url_field() if serializer_url_field: ret[api_settings.URL_FIELD_NAME] = serializer_url_field - serializer_pk_field = self.get_pk_field(info.pk) + field_name = info.pk.name + serializer_pk_field = self.get_pk_field(field_name, info.pk) if serializer_pk_field: - ret[info.pk.name] = serializer_pk_field + ret[field_name] = serializer_pk_field # Regular fields for field_name, field in info.fields.items(): - ret[field_name] = self.get_field(field) + ret[field_name] = self.get_field(field_name, field) # Forward relations for field_name, relation_info in info.forward_relations.items(): if self.opts.depth: - ret[field_name] = self.get_nested_field(*relation_info) + ret[field_name] = self.get_nested_field(field_name, *relation_info) else: - ret[field_name] = self.get_related_field(*relation_info) + ret[field_name] = self.get_related_field(field_name, *relation_info) # Reverse relations for accessor_name, relation_info in info.reverse_relations.items(): if accessor_name in self.opts.fields: if self.opts.depth: - ret[accessor_name] = self.get_nested_field(*relation_info) + ret[accessor_name] = self.get_nested_field(accessor_name, *relation_info) else: - ret[accessor_name] = self.get_related_field(*relation_info) + ret[accessor_name] = self.get_related_field(accessor_name, *relation_info) return ret def get_url_field(self): return None - def get_pk_field(self, model_field): + def get_pk_field(self, field_name, model_field): """ Returns a default instance of the pk field. """ - return self.get_field(model_field) + return self.get_field(field_name, model_field) - def get_nested_field(self, model_field, related_model, to_many, has_through_model): + def get_nested_field(self, field_name, model_field, related_model, to_many, has_through_model): """ Creates a default instance of a nested relational field. Note that model_field will be `None` for reverse relationships. """ - class NestedModelSerializer(ModelSerializer): # Not right! + class NestedModelSerializer(ModelSerializer): class Meta: model = related_model depth = self.opts.depth - 1 @@ -454,7 +464,7 @@ class ModelSerializer(Serializer): kwargs['many'] = True return NestedModelSerializer(**kwargs) - def get_related_field(self, model_field, related_model, to_many, has_through_model): + def get_related_field(self, field_name, model_field, related_model, to_many, has_through_model): """ Creates a default instance of a flat relational field. @@ -474,8 +484,8 @@ class ModelSerializer(Serializer): if model_field: if model_field.null or model_field.blank: kwargs['required'] = False - if model_field.verbose_name: - kwargs['label'] = model_field.verbose_name + if model_field.verbose_name and needs_label(model_field, field_name): + kwargs['label'] = capfirst(model_field.verbose_name) if not model_field.editable: kwargs['read_only'] = True kwargs.pop('queryset', None) @@ -485,7 +495,7 @@ class ModelSerializer(Serializer): return PrimaryKeyRelatedField(**kwargs) - def get_field(self, model_field): + def get_field(self, field_name, model_field): """ Creates a default instance of a basic non-relational field. """ @@ -496,8 +506,8 @@ class ModelSerializer(Serializer): if model_field.null or model_field.blank: kwargs['required'] = False - if model_field.verbose_name is not None: - kwargs['label'] = model_field.verbose_name + if model_field.verbose_name and needs_label(model_field, field_name): + kwargs['label'] = capfirst(model_field.verbose_name) if model_field.help_text: kwargs['help_text'] = model_field.help_text @@ -642,11 +652,11 @@ class HyperlinkedModelSerializer(ModelSerializer): return HyperlinkedIdentityField(**kwargs) - def get_pk_field(self, model_field): + def get_pk_field(self, field_name, model_field): if self.opts.fields and model_field.name in self.opts.fields: return self.get_field(model_field) - def get_related_field(self, model_field, related_model, to_many, has_through_model): + def get_related_field(self, field_name, model_field, related_model, to_many, has_through_model): """ Creates a default instance of a flat relational field. """ @@ -665,8 +675,8 @@ class HyperlinkedModelSerializer(ModelSerializer): if model_field: if model_field.null or model_field.blank: kwargs['required'] = False - if model_field.verbose_name: - kwargs['label'] = model_field.verbose_name + if model_field.verbose_name and needs_label(model_field, field_name): + kwargs['label'] = capfirst(model_field.verbose_name) if not model_field.editable: kwargs['read_only'] = True kwargs.pop('queryset', None) diff --git a/rest_framework/utils/modelinfo.py b/rest_framework/utils/model_meta.py similarity index 100% rename from rest_framework/utils/modelinfo.py rename to rest_framework/utils/model_meta.py diff --git a/tests/test_model_field_mappings.py b/tests/test_model_field_mappings.py index d5750f9e3..b04ad5f2f 100644 --- a/tests/test_model_field_mappings.py +++ b/tests/test_model_field_mappings.py @@ -36,25 +36,25 @@ class RegularFieldsModel(models.Model): REGULAR_FIELDS_REPR = """ TestSerializer(): - auto_field = IntegerField(label='auto field', read_only=True) - big_integer_field = IntegerField(label='big integer field') - boolean_field = BooleanField(default=False, label='boolean field') - char_field = CharField(label='char field', max_length=100) - comma_seperated_integer_field = CharField(label='comma seperated integer field', max_length=100, validators=[<django.core.validators.RegexValidator object>]) - date_field = DateField(label='date field') - datetime_field = DateTimeField(label='datetime field') - decimal_field = DecimalField(decimal_places=1, label='decimal field', max_digits=3) - email_field = EmailField(label='email field', max_length=100) - float_field = FloatField(label='float field') - integer_field = IntegerField(label='integer field') - null_boolean_field = BooleanField(label='null boolean field', required=False) - positive_integer_field = IntegerField(label='positive integer field') - positive_small_integer_field = IntegerField(label='positive small integer field') - slug_field = SlugField(label='slug field', max_length=100) - small_integer_field = IntegerField(label='small integer field') - text_field = CharField(label='text field') - time_field = TimeField(label='time field') - url_field = URLField(label='url field', max_length=100) + auto_field = IntegerField(read_only=True) + big_integer_field = IntegerField() + boolean_field = BooleanField(default=False) + char_field = CharField(max_length=100) + comma_seperated_integer_field = CharField(max_length=100, validators=[<django.core.validators.RegexValidator object>]) + date_field = DateField() + datetime_field = DateTimeField() + decimal_field = DecimalField(decimal_places=1, max_digits=3) + email_field = EmailField(max_length=100) + float_field = FloatField() + integer_field = IntegerField() + null_boolean_field = BooleanField(required=False) + positive_integer_field = IntegerField() + positive_small_integer_field = IntegerField() + slug_field = SlugField(max_length=100) + small_integer_field = IntegerField() + text_field = CharField() + time_field = TimeField() + url_field = URLField(max_length=100) """.strip() @@ -81,9 +81,9 @@ class RelationalModel(models.Model): RELATIONAL_FLAT_REPR = """ TestSerializer(): id = IntegerField(label='ID', read_only=True) - foreign_key = PrimaryKeyRelatedField(label='foreign key', queryset=ForeignKeyTargetModel.objects.all()) - one_to_one = PrimaryKeyRelatedField(label='one to one', queryset=OneToOneTargetModel.objects.all()) - many_to_many = PrimaryKeyRelatedField(label='many to many', many=True, queryset=ManyToManyTargetModel.objects.all()) + foreign_key = PrimaryKeyRelatedField(queryset=ForeignKeyTargetModel.objects.all()) + one_to_one = PrimaryKeyRelatedField(queryset=OneToOneTargetModel.objects.all()) + many_to_many = PrimaryKeyRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all()) """.strip() @@ -92,22 +92,22 @@ TestSerializer(): id = IntegerField(label='ID', read_only=True) foreign_key = NestedModelSerializer(read_only=True): id = IntegerField(label='ID', read_only=True) - name = CharField(label='name', max_length=100) + name = CharField(max_length=100) one_to_one = NestedModelSerializer(read_only=True): id = IntegerField(label='ID', read_only=True) - name = CharField(label='name', max_length=100) + name = CharField(max_length=100) many_to_many = NestedModelSerializer(many=True, read_only=True): id = IntegerField(label='ID', read_only=True) - name = CharField(label='name', max_length=100) + name = CharField(max_length=100) """.strip() HYPERLINKED_FLAT_REPR = """ TestSerializer(): url = HyperlinkedIdentityField(view_name='relationalmodel-detail') - foreign_key = HyperlinkedRelatedField(label='foreign key', queryset=ForeignKeyTargetModel.objects.all(), view_name='foreignkeytargetmodel-detail') - one_to_one = HyperlinkedRelatedField(label='one to one', queryset=OneToOneTargetModel.objects.all(), view_name='onetoonetargetmodel-detail') - many_to_many = HyperlinkedRelatedField(label='many to many', many=True, queryset=ManyToManyTargetModel.objects.all(), view_name='manytomanytargetmodel-detail') + foreign_key = HyperlinkedRelatedField(queryset=ForeignKeyTargetModel.objects.all(), view_name='foreignkeytargetmodel-detail') + one_to_one = HyperlinkedRelatedField(queryset=OneToOneTargetModel.objects.all(), view_name='onetoonetargetmodel-detail') + many_to_many = HyperlinkedRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all(), view_name='manytomanytargetmodel-detail') """.strip() @@ -116,13 +116,13 @@ TestSerializer(): url = HyperlinkedIdentityField(view_name='relationalmodel-detail') foreign_key = NestedModelSerializer(read_only=True): id = IntegerField(label='ID', read_only=True) - name = CharField(label='name', max_length=100) + name = CharField(max_length=100) one_to_one = NestedModelSerializer(read_only=True): id = IntegerField(label='ID', read_only=True) - name = CharField(label='name', max_length=100) + name = CharField(max_length=100) many_to_many = NestedModelSerializer(many=True, read_only=True): id = IntegerField(label='ID', read_only=True) - name = CharField(label='name', max_length=100) + name = CharField(max_length=100) """.strip() @@ -180,4 +180,4 @@ class TestSerializerMappings(TestCase): # class Meta: # model = ManyToManyTargetModel # fields = ('id', 'name', 'reverse_many_to_many') - # print repr(TestSerializer()) \ No newline at end of file + # print repr(TestSerializer()) From 3cf7ed10d23300104a4613bd6cf3333fd05556ab Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 15 Sep 2014 13:10:58 +0100 Subject: [PATCH 0839/1652] Fix erronous import --- tests/test_modelinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_modelinfo.py b/tests/test_modelinfo.py index 254a33c9c..04b67f041 100644 --- a/tests/test_modelinfo.py +++ b/tests/test_modelinfo.py @@ -1,6 +1,6 @@ from django.test import TestCase from django.utils import six -from rest_framework.utils.modelinfo import _resolve_model +from rest_framework.utils.model_meta import _resolve_model from tests.models import BasicModel From c1e2a9cba6b4b69281ad47b64132bf5ac5691875 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 15 Sep 2014 13:38:28 +0100 Subject: [PATCH 0840/1652] Clean up field mapping tests --- tests/test_model_field_mappings.py | 166 ++++++++++++++--------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/tests/test_model_field_mappings.py b/tests/test_model_field_mappings.py index b04ad5f2f..8d59e9853 100644 --- a/tests/test_model_field_mappings.py +++ b/tests/test_model_field_mappings.py @@ -10,6 +10,10 @@ from django.test import TestCase from rest_framework import serializers +def dedent(blocktext): + return '\n'.join([line[12:] for line in blocktext.splitlines()[1:-1]]) + + # Models for testing regular field mapping class RegularFieldsModel(models.Model): @@ -34,28 +38,36 @@ class RegularFieldsModel(models.Model): url_field = models.URLField(max_length=100) -REGULAR_FIELDS_REPR = """ -TestSerializer(): - auto_field = IntegerField(read_only=True) - big_integer_field = IntegerField() - boolean_field = BooleanField(default=False) - char_field = CharField(max_length=100) - comma_seperated_integer_field = CharField(max_length=100, validators=[<django.core.validators.RegexValidator object>]) - date_field = DateField() - datetime_field = DateTimeField() - decimal_field = DecimalField(decimal_places=1, max_digits=3) - email_field = EmailField(max_length=100) - float_field = FloatField() - integer_field = IntegerField() - null_boolean_field = BooleanField(required=False) - positive_integer_field = IntegerField() - positive_small_integer_field = IntegerField() - slug_field = SlugField(max_length=100) - small_integer_field = IntegerField() - text_field = CharField() - time_field = TimeField() - url_field = URLField(max_length=100) -""".strip() +class TestRegularFieldMappings(TestCase): + def test_regular_fields(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = RegularFieldsModel + + expected = dedent(""" + TestSerializer(): + auto_field = IntegerField(read_only=True) + big_integer_field = IntegerField() + boolean_field = BooleanField(default=False) + char_field = CharField(max_length=100) + comma_seperated_integer_field = CharField(max_length=100, validators=[<django.core.validators.RegexValidator object>]) + date_field = DateField() + datetime_field = DateTimeField() + decimal_field = DecimalField(decimal_places=1, max_digits=3) + email_field = EmailField(max_length=100) + float_field = FloatField() + integer_field = IntegerField() + null_boolean_field = BooleanField(required=False) + positive_integer_field = IntegerField() + positive_small_integer_field = IntegerField() + slug_field = SlugField(max_length=100) + small_integer_field = IntegerField() + text_field = CharField() + time_field = TimeField() + url_field = URLField(max_length=100) + """) + + self.assertEqual(repr(TestSerializer()), expected) # Model for testing relational field mapping @@ -78,88 +90,76 @@ class RelationalModel(models.Model): one_to_one = models.OneToOneField(OneToOneTargetModel, related_name='reverse_one_to_one') -RELATIONAL_FLAT_REPR = """ -TestSerializer(): - id = IntegerField(label='ID', read_only=True) - foreign_key = PrimaryKeyRelatedField(queryset=ForeignKeyTargetModel.objects.all()) - one_to_one = PrimaryKeyRelatedField(queryset=OneToOneTargetModel.objects.all()) - many_to_many = PrimaryKeyRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all()) -""".strip() - - -RELATIONAL_NESTED_REPR = """ -TestSerializer(): - id = IntegerField(label='ID', read_only=True) - foreign_key = NestedModelSerializer(read_only=True): - id = IntegerField(label='ID', read_only=True) - name = CharField(max_length=100) - one_to_one = NestedModelSerializer(read_only=True): - id = IntegerField(label='ID', read_only=True) - name = CharField(max_length=100) - many_to_many = NestedModelSerializer(many=True, read_only=True): - id = IntegerField(label='ID', read_only=True) - name = CharField(max_length=100) -""".strip() - - -HYPERLINKED_FLAT_REPR = """ -TestSerializer(): - url = HyperlinkedIdentityField(view_name='relationalmodel-detail') - foreign_key = HyperlinkedRelatedField(queryset=ForeignKeyTargetModel.objects.all(), view_name='foreignkeytargetmodel-detail') - one_to_one = HyperlinkedRelatedField(queryset=OneToOneTargetModel.objects.all(), view_name='onetoonetargetmodel-detail') - many_to_many = HyperlinkedRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all(), view_name='manytomanytargetmodel-detail') -""".strip() - - -HYPERLINKED_NESTED_REPR = """ -TestSerializer(): - url = HyperlinkedIdentityField(view_name='relationalmodel-detail') - foreign_key = NestedModelSerializer(read_only=True): - id = IntegerField(label='ID', read_only=True) - name = CharField(max_length=100) - one_to_one = NestedModelSerializer(read_only=True): - id = IntegerField(label='ID', read_only=True) - name = CharField(max_length=100) - many_to_many = NestedModelSerializer(many=True, read_only=True): - id = IntegerField(label='ID', read_only=True) - name = CharField(max_length=100) -""".strip() - - -class TestSerializerMappings(TestCase): - maxDiff = 10000 - - def test_regular_fields(self): - class TestSerializer(serializers.ModelSerializer): - class Meta: - model = RegularFieldsModel - self.assertEqual(repr(TestSerializer()), REGULAR_FIELDS_REPR) - +class TestRelationalFieldMappings(TestCase): def test_flat_relational_fields(self): class TestSerializer(serializers.ModelSerializer): class Meta: model = RelationalModel - self.assertEqual(repr(TestSerializer()), RELATIONAL_FLAT_REPR) + + expected = dedent(""" + TestSerializer(): + id = IntegerField(label='ID', read_only=True) + foreign_key = PrimaryKeyRelatedField(queryset=ForeignKeyTargetModel.objects.all()) + one_to_one = PrimaryKeyRelatedField(queryset=OneToOneTargetModel.objects.all()) + many_to_many = PrimaryKeyRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all()) + """) + self.assertEqual(repr(TestSerializer()), expected) def test_nested_relational_fields(self): class TestSerializer(serializers.ModelSerializer): class Meta: model = RelationalModel depth = 1 - self.assertEqual(repr(TestSerializer()), RELATIONAL_NESTED_REPR) + + expected = dedent(""" + TestSerializer(): + id = IntegerField(label='ID', read_only=True) + foreign_key = NestedModelSerializer(read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(max_length=100) + one_to_one = NestedModelSerializer(read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(max_length=100) + many_to_many = NestedModelSerializer(many=True, read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(max_length=100) + """) + self.assertEqual(repr(TestSerializer()), expected) def test_flat_hyperlinked_fields(self): class TestSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = RelationalModel - self.assertEqual(repr(TestSerializer()), HYPERLINKED_FLAT_REPR) + + expected = dedent(""" + TestSerializer(): + url = HyperlinkedIdentityField(view_name='relationalmodel-detail') + foreign_key = HyperlinkedRelatedField(queryset=ForeignKeyTargetModel.objects.all(), view_name='foreignkeytargetmodel-detail') + one_to_one = HyperlinkedRelatedField(queryset=OneToOneTargetModel.objects.all(), view_name='onetoonetargetmodel-detail') + many_to_many = HyperlinkedRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all(), view_name='manytomanytargetmodel-detail') + """) + self.assertEqual(repr(TestSerializer()), expected) def test_nested_hyperlinked_fields(self): class TestSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = RelationalModel depth = 1 - self.assertEqual(repr(TestSerializer()), HYPERLINKED_NESTED_REPR) + + expected = dedent(""" + TestSerializer(): + url = HyperlinkedIdentityField(view_name='relationalmodel-detail') + foreign_key = NestedModelSerializer(read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(max_length=100) + one_to_one = NestedModelSerializer(read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(max_length=100) + many_to_many = NestedModelSerializer(many=True, read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(max_length=100) + """) + self.assertEqual(repr(TestSerializer()), expected) # def test_flat_reverse_foreign_key(self): # class TestSerializer(serializers.ModelSerializer): From 0c15b97b331f7937cbc5d85f660c07b3c92917a0 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 15 Sep 2014 13:48:03 +0100 Subject: [PATCH 0841/1652] Tests for reverse relationships --- tests/test_model_field_mappings.py | 59 ++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/tests/test_model_field_mappings.py b/tests/test_model_field_mappings.py index 8d59e9853..a32345b31 100644 --- a/tests/test_model_field_mappings.py +++ b/tests/test_model_field_mappings.py @@ -158,26 +158,47 @@ class TestRelationalFieldMappings(TestCase): many_to_many = NestedModelSerializer(many=True, read_only=True): id = IntegerField(label='ID', read_only=True) name = CharField(max_length=100) - """) + """) self.assertEqual(repr(TestSerializer()), expected) - # def test_flat_reverse_foreign_key(self): - # class TestSerializer(serializers.ModelSerializer): - # class Meta: - # model = ForeignKeyTargetModel - # fields = ('id', 'name', 'reverse_foreign_key') - # print repr(TestSerializer()) + def test_flat_reverse_foreign_key(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = ForeignKeyTargetModel + fields = ('id', 'name', 'reverse_foreign_key') - # def test_flat_reverse_one_to_one(self): - # class TestSerializer(serializers.ModelSerializer): - # class Meta: - # model = OneToOneTargetModel - # fields = ('id', 'name', 'reverse_one_to_one') - # print repr(TestSerializer()) + expected = dedent(""" + TestSerializer(): + id = IntegerField(label='ID', read_only=True) + name = CharField(max_length=100) + reverse_foreign_key = PrimaryKeyRelatedField(many=True, queryset=RelationalModel.objects.all()) + """) + self.assertEqual(repr(TestSerializer()), expected) - # def test_flat_reverse_many_to_many(self): - # class TestSerializer(serializers.ModelSerializer): - # class Meta: - # model = ManyToManyTargetModel - # fields = ('id', 'name', 'reverse_many_to_many') - # print repr(TestSerializer()) + def test_flat_reverse_one_to_one(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = OneToOneTargetModel + fields = ('id', 'name', 'reverse_one_to_one') + + expected = dedent(""" + TestSerializer(): + id = IntegerField(label='ID', read_only=True) + name = CharField(max_length=100) + reverse_one_to_one = PrimaryKeyRelatedField(queryset=RelationalModel.objects.all()) + """) + self.assertEqual(repr(TestSerializer()), expected) + + def test_flat_reverse_many_to_many(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = ManyToManyTargetModel + fields = ('id', 'name', 'reverse_many_to_many') + + expected = dedent(""" + TestSerializer(): + id = IntegerField(label='ID', read_only=True) + name = CharField(max_length=100) + reverse_many_to_many = PrimaryKeyRelatedField(many=True, queryset=RelationalModel.objects.all()) + """) + self.assertEqual(repr(TestSerializer()), expected) From d196608d5af912057baba79ab13d05d876368ad2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 15 Sep 2014 13:55:09 +0100 Subject: [PATCH 0842/1652] Fix nested model serializer base class --- rest_framework/serializers.py | 7 ++++++- tests/test_model_field_mappings.py | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index ba8d475f8..40d768975 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -368,6 +368,7 @@ class ModelSerializer(Serializer): models.TimeField: TimeField, models.URLField: URLField, } + nested_class = None # We fill this in at the end of this module. _options_class = ModelSerializerOptions @@ -454,7 +455,7 @@ class ModelSerializer(Serializer): Note that model_field will be `None` for reverse relationships. """ - class NestedModelSerializer(ModelSerializer): + class NestedModelSerializer(self.nested_class): class Meta: model = related_model depth = self.opts.depth - 1 @@ -694,3 +695,7 @@ class HyperlinkedModelSerializer(ModelSerializer): 'app_label': model._meta.app_label, 'model_name': model._meta.object_name.lower() } + + +ModelSerializer.nested_class = ModelSerializer +HyperlinkedModelSerializer.nested_class = HyperlinkedModelSerializer diff --git a/tests/test_model_field_mappings.py b/tests/test_model_field_mappings.py index a32345b31..d946172e4 100644 --- a/tests/test_model_field_mappings.py +++ b/tests/test_model_field_mappings.py @@ -150,13 +150,13 @@ class TestRelationalFieldMappings(TestCase): TestSerializer(): url = HyperlinkedIdentityField(view_name='relationalmodel-detail') foreign_key = NestedModelSerializer(read_only=True): - id = IntegerField(label='ID', read_only=True) + url = HyperlinkedIdentityField(view_name='foreignkeytargetmodel-detail') name = CharField(max_length=100) one_to_one = NestedModelSerializer(read_only=True): - id = IntegerField(label='ID', read_only=True) + url = HyperlinkedIdentityField(view_name='onetoonetargetmodel-detail') name = CharField(max_length=100) many_to_many = NestedModelSerializer(many=True, read_only=True): - id = IntegerField(label='ID', read_only=True) + url = HyperlinkedIdentityField(view_name='manytomanytargetmodel-detail') name = CharField(max_length=100) """) self.assertEqual(repr(TestSerializer()), expected) From 4ddc661b01410d0073d463ae729f152cabf2ef4d Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 15 Sep 2014 14:05:58 +0100 Subject: [PATCH 0843/1652] Tests for through relationships --- tests/test_model_field_mappings.py | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tests/test_model_field_mappings.py b/tests/test_model_field_mappings.py index d946172e4..957bf6613 100644 --- a/tests/test_model_field_mappings.py +++ b/tests/test_model_field_mappings.py @@ -84,10 +84,21 @@ class OneToOneTargetModel(models.Model): name = models.CharField(max_length=100) +class ThroughTargetModel(models.Model): + name = models.CharField(max_length=100) + + +class Supplementary(models.Model): + extra = models.IntegerField() + forwards = models.ForeignKey('ThroughTargetModel') + backwards = models.ForeignKey('RelationalModel') + + class RelationalModel(models.Model): foreign_key = models.ForeignKey(ForeignKeyTargetModel, related_name='reverse_foreign_key') many_to_many = models.ManyToManyField(ManyToManyTargetModel, related_name='reverse_many_to_many') one_to_one = models.OneToOneField(OneToOneTargetModel, related_name='reverse_one_to_one') + through = models.ManyToManyField(ThroughTargetModel, through=Supplementary, related_name='reverse_through') class TestRelationalFieldMappings(TestCase): @@ -102,6 +113,7 @@ class TestRelationalFieldMappings(TestCase): foreign_key = PrimaryKeyRelatedField(queryset=ForeignKeyTargetModel.objects.all()) one_to_one = PrimaryKeyRelatedField(queryset=OneToOneTargetModel.objects.all()) many_to_many = PrimaryKeyRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all()) + through = PrimaryKeyRelatedField(many=True, read_only=True) """) self.assertEqual(repr(TestSerializer()), expected) @@ -123,6 +135,9 @@ class TestRelationalFieldMappings(TestCase): many_to_many = NestedModelSerializer(many=True, read_only=True): id = IntegerField(label='ID', read_only=True) name = CharField(max_length=100) + through = NestedModelSerializer(many=True, read_only=True): + id = IntegerField(label='ID', read_only=True) + name = CharField(max_length=100) """) self.assertEqual(repr(TestSerializer()), expected) @@ -137,6 +152,7 @@ class TestRelationalFieldMappings(TestCase): foreign_key = HyperlinkedRelatedField(queryset=ForeignKeyTargetModel.objects.all(), view_name='foreignkeytargetmodel-detail') one_to_one = HyperlinkedRelatedField(queryset=OneToOneTargetModel.objects.all(), view_name='onetoonetargetmodel-detail') many_to_many = HyperlinkedRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all(), view_name='manytomanytargetmodel-detail') + through = HyperlinkedRelatedField(many=True, read_only=True, view_name='throughtargetmodel-detail') """) self.assertEqual(repr(TestSerializer()), expected) @@ -158,6 +174,9 @@ class TestRelationalFieldMappings(TestCase): many_to_many = NestedModelSerializer(many=True, read_only=True): url = HyperlinkedIdentityField(view_name='manytomanytargetmodel-detail') name = CharField(max_length=100) + through = NestedModelSerializer(many=True, read_only=True): + url = HyperlinkedIdentityField(view_name='throughtargetmodel-detail') + name = CharField(max_length=100) """) self.assertEqual(repr(TestSerializer()), expected) @@ -202,3 +221,17 @@ class TestRelationalFieldMappings(TestCase): reverse_many_to_many = PrimaryKeyRelatedField(many=True, queryset=RelationalModel.objects.all()) """) self.assertEqual(repr(TestSerializer()), expected) + + def test_flat_reverse_through(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = ThroughTargetModel + fields = ('id', 'name', 'reverse_through') + + expected = dedent(""" + TestSerializer(): + id = IntegerField(label='ID', read_only=True) + name = CharField(max_length=100) + reverse_through = PrimaryKeyRelatedField(many=True, read_only=True) + """) + self.assertEqual(repr(TestSerializer()), expected) From 3725a1e77dafef4c6bdb7847bace92ff61f7f4e5 Mon Sep 17 00:00:00 2001 From: "S. Andrew Sheppard" <andrew@wq.io> Date: Mon, 15 Sep 2014 14:46:09 -0500 Subject: [PATCH 0844/1652] add wq.db router and django-rest-pandas renderers --- docs/topics/third-party-resources.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index e337cbd54..1ca917427 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -41,6 +41,7 @@ To submit new content, [open an issue](https://github.com/tomchristie/django-res ### Routers * [drf-nested-routers](https://github.com/alanjds/drf-nested-routers) - Provides routers and relationship fields for working with nested resources. +* [wq.db.rest](http://wq.io/docs/about-rest) - Provides an admin-style model registration API with reasonable default URLs and viewsets. ### Parsers @@ -51,6 +52,7 @@ To submit new content, [open an issue](https://github.com/tomchristie/django-res * [djangorestframework-csv](https://github.com/mjumbewu/django-rest-framework-csv) - Provides CSV renderer support. * [drf_ujson](https://github.com/gizmag/drf-ujson-renderer) - Implements JSON rendering using the UJSON package. +* [Django REST Pandas](https://github.com/wq/django-rest-pandas) - Pandas DataFrame-powered renderers including Excel, CSV, and SVG formats. ### Filtering From e5af0bbb353e772473b1d9fcfc896bfd7365db2a Mon Sep 17 00:00:00 2001 From: Matthew J Morrison <mattjmorrison@mattjmorrison.com> Date: Wed, 17 Sep 2014 07:49:54 -0500 Subject: [PATCH 0845/1652] Clarify "raised inside REST framework" I ran into an issue today where I was not seeing the rest_framework.views.exception_handler do what I thought it should be doing. It turned out that I had imported View from rest_framework.views rather than importing APIView from rest_framework.views. The phrase "raised inside REST framework" was confusing as I was debugging this issue. I was unsure if that meant that I could raise those exceptions in my code or if it had to originate from within framework code. I'm not sure if the proposed wording is ideal, I just wanted to point out what I found to be confusing. --- docs/api-guide/exceptions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index 66e181737..33c4dc910 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -84,7 +84,7 @@ Note that the exception handler will only be called for responses generated by r **Signature:** `APIException()` -The **base class** for all exceptions raised inside REST framework. +The **base class** for all exceptions raised inside an APIView class or @api_view. To provide a custom exception, subclass `APIException` and set the `.status_code` and `.default_detail` properties on the class. From a37db382c69293953c709365cd2c64c4a99f419e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Wed, 17 Sep 2014 09:01:49 -0400 Subject: [PATCH 0846/1652] Update authtoken latest Django 1.7 migration --- rest_framework/authtoken/migrations/0001_initial.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rest_framework/authtoken/migrations/0001_initial.py b/rest_framework/authtoken/migrations/0001_initial.py index 2e5d6b47e..6ea761822 100644 --- a/rest_framework/authtoken/migrations/0001_initial.py +++ b/rest_framework/authtoken/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# encoding: utf8 + from __future__ import unicode_literals from django.db import models, migrations @@ -16,11 +16,10 @@ class Migration(migrations.Migration): name='Token', fields=[ ('key', models.CharField(max_length=40, serialize=False, primary_key=True)), - ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, to_field='id')), ('created', models.DateTimeField(auto_now_add=True)), + ('user', models.OneToOneField(related_name=b'auth_token', to=settings.AUTH_USER_MODEL)), ], options={ - 'abstract': False, }, bases=(models.Model,), ), From c0155fd9dc654dc5932effd46a00f66495ce700b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Sep 2014 14:11:53 +0100 Subject: [PATCH 0847/1652] Update comments --- rest_framework/serializers.py | 2 ++ tests/test_model_field_mappings.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 40d768975..1fea13802 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -410,10 +410,12 @@ class ModelSerializer(Serializer): info = model_meta.get_field_info(self.opts.model) ret = SortedDict() + # URL field serializer_url_field = self.get_url_field() if serializer_url_field: ret[api_settings.URL_FIELD_NAME] = serializer_url_field + # Primary key field field_name = info.pk.name serializer_pk_field = self.get_pk_field(field_name, info.pk) if serializer_pk_field: diff --git a/tests/test_model_field_mappings.py b/tests/test_model_field_mappings.py index 957bf6613..bae63e5a7 100644 --- a/tests/test_model_field_mappings.py +++ b/tests/test_model_field_mappings.py @@ -14,7 +14,7 @@ def dedent(blocktext): return '\n'.join([line[12:] for line in blocktext.splitlines()[1:-1]]) -# Models for testing regular field mapping +# Testing regular field mappings class RegularFieldsModel(models.Model): auto_field = models.AutoField(primary_key=True) @@ -70,7 +70,7 @@ class TestRegularFieldMappings(TestCase): self.assertEqual(repr(TestSerializer()), expected) -# Model for testing relational field mapping +# Testing relational field mappings class ForeignKeyTargetModel(models.Model): name = models.CharField(max_length=100) From de5fbf7d63245e9d14844e66fdf16f88dbfae2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Wed, 17 Sep 2014 10:23:53 -0400 Subject: [PATCH 0848/1652] Update initial migration to work on Python 3 --- rest_framework/authtoken/migrations/0001_initial.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/authtoken/migrations/0001_initial.py b/rest_framework/authtoken/migrations/0001_initial.py index 6ea761822..769f62029 100644 --- a/rest_framework/authtoken/migrations/0001_initial.py +++ b/rest_framework/authtoken/migrations/0001_initial.py @@ -1,4 +1,4 @@ - +# -*- coding: utf-8 -*- from __future__ import unicode_literals from django.db import models, migrations @@ -15,9 +15,9 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Token', fields=[ - ('key', models.CharField(max_length=40, serialize=False, primary_key=True)), + ('key', models.CharField(primary_key=True, serialize=False, max_length=40)), ('created', models.DateTimeField(auto_now_add=True)), - ('user', models.OneToOneField(related_name=b'auth_token', to=settings.AUTH_USER_MODEL)), + ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, related_name='auth_token')), ], options={ }, From 8c8d355e761a67fffd334dc15bc7bb74238300bc Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Sep 2014 15:51:17 +0100 Subject: [PATCH 0849/1652] Update routers.py --- rest_framework/routers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 01fd4b91a..f2d062118 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -295,6 +295,7 @@ class DefaultRouter(SimpleRouter): format=kwargs.get('format', None) ) except NoReverseMatch: + # Don't bail out if eg. no list routes exist, only detail routes. continue return Response(ret) From 764366b2e11ad9ad85dd34500e95721011cae7d4 Mon Sep 17 00:00:00 2001 From: Matthew J Morrison <mattjmorrison@mattjmorrison.com> Date: Wed, 17 Sep 2014 11:29:15 -0500 Subject: [PATCH 0850/1652] Fixed code formatting --- docs/api-guide/exceptions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index 33c4dc910..e61dcfa90 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -84,7 +84,7 @@ Note that the exception handler will only be called for responses generated by r **Signature:** `APIException()` -The **base class** for all exceptions raised inside an APIView class or @api_view. +The **base class** for all exceptions raised inside an `APIView` class or `@api_view`. To provide a custom exception, subclass `APIException` and set the `.status_code` and `.default_detail` properties on the class. From 5b7e4af0d657a575cb15eea85a63a7100c636085 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Sep 2014 11:20:56 +0100 Subject: [PATCH 0851/1652] get_base_field() refactor --- rest_framework/fields.py | 6 +- rest_framework/relations.py | 9 +- rest_framework/serializers.py | 454 ++++++-------------------- rest_framework/utils/field_mapping.py | 215 ++++++++++++ rest_framework/utils/model_meta.py | 46 ++- tests/models.py | 7 - tests/test_model_field_mappings.py | 16 +- tests/test_response.py | 9 +- tests/test_routers.py | 7 +- 9 files changed, 379 insertions(+), 390 deletions(-) create mode 100644 rest_framework/utils/field_mapping.py diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 1818e705e..0c78b3fbb 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -80,10 +80,6 @@ def set_value(dictionary, keys, value): dictionary[keys[-1]] = value -def field_name_to_label(field_name): - return field_name.replace('_', ' ').capitalize() - - class SkipField(Exception): pass @@ -162,7 +158,7 @@ class Field(object): # `self.label` should deafult to being based on the field name. if self.label is None: - self.label = field_name_to_label(self.field_name) + self.label = field_name.replace('_', ' ').capitalize() # self.source should default to being the same as the field name. if self.source is None: diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 46fe55ef9..9f44ab633 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -73,7 +73,8 @@ class HyperlinkedRelatedField(RelatedField): 'incorrect_type': 'Incorrect type. Expected URL string, received {data_type}.', } - def __init__(self, view_name, **kwargs): + def __init__(self, view_name=None, **kwargs): + assert view_name is not None, 'The `view_name` argument is required.' self.view_name = view_name self.lookup_field = kwargs.pop('lookup_field', self.lookup_field) self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field) @@ -182,7 +183,8 @@ class HyperlinkedIdentityField(HyperlinkedRelatedField): URL of relationships to other objects. """ - def __init__(self, view_name, **kwargs): + def __init__(self, view_name=None, **kwargs): + assert view_name is not None, 'The `view_name` argument is required.' kwargs['read_only'] = True kwargs['source'] = '*' super(HyperlinkedIdentityField, self).__init__(view_name, **kwargs) @@ -199,7 +201,8 @@ class SlugRelatedField(RelatedField): 'invalid': _('Invalid value.'), } - def __init__(self, slug_field, **kwargs): + def __init__(self, slug_field=None, **kwargs): + assert slug_field is not None, 'The `slug_field` argument is required.' self.slug_field = slug_field super(SlugRelatedField, self).__init__(**kwargs) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 1fea13802..99dcc349f 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -10,17 +10,19 @@ python primitives. 2. The process of marshalling between python primitives and request and response content is handled by parsers and renderers. """ -from django.core import validators from django.core.exceptions import ValidationError from django.db import models from django.utils import six from django.utils.datastructures import SortedDict -from django.utils.text import capfirst from collections import namedtuple -from rest_framework.compat import clean_manytomany_helptext from rest_framework.fields import empty, set_value, Field, SkipField from rest_framework.settings import api_settings from rest_framework.utils import html, model_meta, representation +from rest_framework.utils.field_mapping import ( + get_url_kwargs, get_field_kwargs, + get_relation_kwargs, get_nested_relation_kwargs, + lookup_class +) import copy # Note: We do the following so that users of the framework can use this style: @@ -126,7 +128,7 @@ class SerializerMetaclass(type): """ @classmethod - def _get_fields(cls, bases, attrs): + def _get_declared_fields(cls, bases, attrs): fields = [(field_name, attrs.pop(field_name)) for field_name, obj in list(attrs.items()) if isinstance(obj, Field)] @@ -136,25 +138,18 @@ class SerializerMetaclass(type): # fields. Note that we loop over the bases in *reverse*. This is necessary # in order to maintain the correct order of fields. for base in bases[::-1]: - if hasattr(base, 'base_fields'): - fields = list(base.base_fields.items()) + fields + if hasattr(base, '_declared_fields'): + fields = list(base._declared_fields.items()) + fields return SortedDict(fields) def __new__(cls, name, bases, attrs): - attrs['base_fields'] = cls._get_fields(bases, attrs) + attrs['_declared_fields'] = cls._get_declared_fields(bases, attrs) return super(SerializerMetaclass, cls).__new__(cls, name, bases, attrs) @six.add_metaclass(SerializerMetaclass) class Serializer(BaseSerializer): - - def __new__(cls, *args, **kwargs): - if kwargs.pop('many', False): - kwargs['child'] = cls() - return ListSerializer(*args, **kwargs) - return super(Serializer, cls).__new__(cls, *args, **kwargs) - def __init__(self, *args, **kwargs): self.context = kwargs.pop('context', {}) kwargs.pop('partial', None) @@ -165,14 +160,22 @@ class Serializer(BaseSerializer): # Every new serializer is created with a clone of the field instances. # This allows users to dynamically modify the fields on a serializer # instance without affecting every other serializer class. - self.fields = self.get_fields() + self.fields = self._get_base_fields() # Setup all the child fields, to provide them with the current context. for field_name, field in self.fields.items(): field.bind(field_name, self, self) - def get_fields(self): - return copy.deepcopy(self.base_fields) + def __new__(cls, *args, **kwargs): + # We override this method in order to automagically create + # `ListSerializer` classes instead when `many=True` is set. + if kwargs.pop('many', False): + kwargs['child'] = cls() + return ListSerializer(*args, **kwargs) + return super(Serializer, cls).__new__(cls, *args, **kwargs) + + def _get_base_fields(self): + return copy.deepcopy(self._declared_fields) def bind(self, field_name, parent, root): # If the serializer is used as a field then when it becomes bound @@ -312,39 +315,8 @@ class ListSerializer(BaseSerializer): return representation.list_repr(self, indent=1) -class ModelSerializerOptions(object): - """ - Meta class options for ModelSerializer - """ - def __init__(self, meta): - self.model = getattr(meta, 'model') - self.fields = getattr(meta, 'fields', ()) - self.depth = getattr(meta, 'depth', 0) - - -def lookup_class(mapping, instance): - """ - Takes a dictionary with classes as keys, and an object. - Traverses the object's inheritance hierarchy in method - resolution order, and returns the first matching value - from the dictionary or raises a KeyError if nothing matches. - """ - for cls in inspect.getmro(instance.__class__): - if cls in mapping: - return mapping[cls] - raise KeyError('Class %s not found in lookup.', cls.__name__) - - -def needs_label(model_field, field_name): - """ - Returns `True` if the label based on the model's verbose name - is not equal to the default label it would have based on it's field name. - """ - return capfirst(model_field.verbose_name) != field_name_to_label(field_name) - - class ModelSerializer(Serializer): - field_mapping = { + _field_mapping = { models.AutoField: IntegerField, models.BigIntegerField: IntegerField, models.BooleanField: BooleanField, @@ -368,16 +340,10 @@ class ModelSerializer(Serializer): models.TimeField: TimeField, models.URLField: URLField, } - nested_class = None # We fill this in at the end of this module. - - _options_class = ModelSerializerOptions - - def __init__(self, *args, **kwargs): - self.opts = self._options_class(self.Meta) - super(ModelSerializer, self).__init__(*args, **kwargs) + _related_class = PrimaryKeyRelatedField def create(self, attrs): - ModelClass = self.opts.model + ModelClass = self.Meta.model return ModelClass.objects.create(**attrs) def update(self, obj, attrs): @@ -385,319 +351,97 @@ class ModelSerializer(Serializer): setattr(obj, attr, value) obj.save() - def get_fields(self): - # Get the explicitly declared fields. - fields = copy.deepcopy(self.base_fields) + def _get_base_fields(self): + declared_fields = copy.deepcopy(self._declared_fields) - # Add in the default fields. - for key, val in self.get_default_fields().items(): - if key not in fields: - fields[key] = val - - # If `fields` is set on the `Meta` class, - # then use only those fields, and in that order. - if self.opts.fields: - fields = SortedDict([ - (key, fields[key]) for key in self.opts.fields - ]) - - return fields - - def get_default_fields(self): - """ - Return all the fields that should be serialized for the model. - """ - info = model_meta.get_field_info(self.opts.model) ret = SortedDict() + model = getattr(self.Meta, 'model') + fields = getattr(self.Meta, 'fields', None) + depth = getattr(self.Meta, 'depth', 0) - # URL field - serializer_url_field = self.get_url_field() - if serializer_url_field: - ret[api_settings.URL_FIELD_NAME] = serializer_url_field + # Retrieve metadata about fields & relationships on the model class. + info = model_meta.get_field_info(model) - # Primary key field - field_name = info.pk.name - serializer_pk_field = self.get_pk_field(field_name, info.pk) - if serializer_pk_field: - ret[field_name] = serializer_pk_field + # Use the default set of fields if none is supplied explicitly. + if fields is None: + fields = self._get_default_field_names(declared_fields, info) - # Regular fields - for field_name, field in info.fields.items(): - ret[field_name] = self.get_field(field_name, field) + for field_name in fields: + if field_name in declared_fields: + # Field is explicitly declared on the class, use that. + ret[field_name] = declared_fields[field_name] + continue - # Forward relations - for field_name, relation_info in info.forward_relations.items(): - if self.opts.depth: - ret[field_name] = self.get_nested_field(field_name, *relation_info) - else: - ret[field_name] = self.get_related_field(field_name, *relation_info) + elif field_name == api_settings.URL_FIELD_NAME: + # Create the URL field. + field_cls = HyperlinkedIdentityField + kwargs = get_url_kwargs(model) - # Reverse relations - for accessor_name, relation_info in info.reverse_relations.items(): - if accessor_name in self.opts.fields: - if self.opts.depth: - ret[accessor_name] = self.get_nested_field(accessor_name, *relation_info) + elif field_name in info.fields_and_pk: + # Create regular model fields. + model_field = info.fields_and_pk[field_name] + field_cls = lookup_class(self._field_mapping, model_field) + kwargs = get_field_kwargs(field_name, model_field) + if 'choices' in kwargs: + # Fields with choices get coerced into `ChoiceField` + # instead of using their regular typed field. + field_cls = ChoiceField + if not issubclass(field_cls, ModelField): + # `model_field` is only valid for the fallback case of + # `ModelField`, which is used when no other typed field + # matched to the model field. + kwargs.pop('model_field', None) + + elif field_name in info.relations: + # Create forward and reverse relationships. + relation_info = info.relations[field_name] + if depth: + field_cls = self._get_nested_class(depth, relation_info) + kwargs = get_nested_relation_kwargs(relation_info) else: - ret[accessor_name] = self.get_related_field(accessor_name, *relation_info) + field_cls = self._related_class + kwargs = get_relation_kwargs(field_name, relation_info) + # `view_name` is only valid for hyperlinked relationships. + if not issubclass(field_cls, HyperlinkedRelatedField): + kwargs.pop('view_name', None) + + else: + assert False, 'Field name `%s` is not valid.' % field_name + + ret[field_name] = field_cls(**kwargs) return ret - def get_url_field(self): - return None + def _get_default_field_names(self, declared_fields, model_info): + return ( + [model_info.pk.name] + + list(declared_fields.keys()) + + list(model_info.fields.keys()) + + list(model_info.forward_relations.keys()) + ) - def get_pk_field(self, field_name, model_field): - """ - Returns a default instance of the pk field. - """ - return self.get_field(field_name, model_field) - - def get_nested_field(self, field_name, model_field, related_model, to_many, has_through_model): - """ - Creates a default instance of a nested relational field. - - Note that model_field will be `None` for reverse relationships. - """ - class NestedModelSerializer(self.nested_class): + def _get_nested_class(self, nested_depth, relation_info): + class NestedSerializer(ModelSerializer): class Meta: - model = related_model - depth = self.opts.depth - 1 - - kwargs = {'read_only': True} - if to_many: - kwargs['many'] = True - return NestedModelSerializer(**kwargs) - - def get_related_field(self, field_name, model_field, related_model, to_many, has_through_model): - """ - Creates a default instance of a flat relational field. - - Note that model_field will be `None` for reverse relationships. - """ - kwargs = { - 'queryset': related_model._default_manager, - } - - if to_many: - kwargs['many'] = True - - if has_through_model: - kwargs['read_only'] = True - kwargs.pop('queryset', None) - - if model_field: - if model_field.null or model_field.blank: - kwargs['required'] = False - if model_field.verbose_name and needs_label(model_field, field_name): - kwargs['label'] = capfirst(model_field.verbose_name) - if not model_field.editable: - kwargs['read_only'] = True - kwargs.pop('queryset', None) - help_text = clean_manytomany_helptext(model_field.help_text) - if help_text: - kwargs['help_text'] = help_text - - return PrimaryKeyRelatedField(**kwargs) - - def get_field(self, field_name, model_field): - """ - Creates a default instance of a basic non-relational field. - """ - serializer_cls = lookup_class(self.field_mapping, model_field) - kwargs = {} - validator_kwarg = model_field.validators - - if model_field.null or model_field.blank: - kwargs['required'] = False - - if model_field.verbose_name and needs_label(model_field, field_name): - kwargs['label'] = capfirst(model_field.verbose_name) - - if model_field.help_text: - kwargs['help_text'] = model_field.help_text - - if isinstance(model_field, models.AutoField) or not model_field.editable: - kwargs['read_only'] = True - # Read only implies that the field is not required. - # We have a cleaner repr on the instance if we don't set it. - kwargs.pop('required', None) - - if model_field.has_default(): - kwargs['default'] = model_field.get_default() - # Having a default implies that the field is not required. - # We have a cleaner repr on the instance if we don't set it. - kwargs.pop('required', None) - - if model_field.flatchoices: - # If this model field contains choices, then use a ChoiceField, - # rather than the standard serializer field for this type. - # Note that we return this prior to setting any validation type - # keyword arguments, as those are not valid initializers. - kwargs['choices'] = model_field.flatchoices - return ChoiceField(**kwargs) - - # Ensure that max_length is passed explicitly as a keyword arg, - # rather than as a validator. - max_length = getattr(model_field, 'max_length', None) - if max_length is not None: - kwargs['max_length'] = max_length - validator_kwarg = [ - validator for validator in validator_kwarg - if not isinstance(validator, validators.MaxLengthValidator) - ] - - # Ensure that min_length is passed explicitly as a keyword arg, - # rather than as a validator. - min_length = getattr(model_field, 'min_length', None) - if min_length is not None: - kwargs['min_length'] = min_length - validator_kwarg = [ - validator for validator in validator_kwarg - if not isinstance(validator, validators.MinLengthValidator) - ] - - # Ensure that max_value is passed explicitly as a keyword arg, - # rather than as a validator. - max_value = next(( - validator.limit_value for validator in validator_kwarg - if isinstance(validator, validators.MaxValueValidator) - ), None) - if max_value is not None: - kwargs['max_value'] = max_value - validator_kwarg = [ - validator for validator in validator_kwarg - if not isinstance(validator, validators.MaxValueValidator) - ] - - # Ensure that max_value is passed explicitly as a keyword arg, - # rather than as a validator. - min_value = next(( - validator.limit_value for validator in validator_kwarg - if isinstance(validator, validators.MinValueValidator) - ), None) - if min_value is not None: - kwargs['min_value'] = min_value - validator_kwarg = [ - validator for validator in validator_kwarg - if not isinstance(validator, validators.MinValueValidator) - ] - - # URLField does not need to include the URLValidator argument, - # as it is explicitly added in. - if isinstance(model_field, models.URLField): - validator_kwarg = [ - validator for validator in validator_kwarg - if not isinstance(validator, validators.URLValidator) - ] - - # EmailField does not need to include the validate_email argument, - # as it is explicitly added in. - if isinstance(model_field, models.EmailField): - validator_kwarg = [ - validator for validator in validator_kwarg - if validator is not validators.validate_email - ] - - # SlugField do not need to include the 'validate_slug' argument, - if isinstance(model_field, models.SlugField): - validator_kwarg = [ - validator for validator in validator_kwarg - if validator is not validators.validate_slug - ] - - max_digits = getattr(model_field, 'max_digits', None) - if max_digits is not None: - kwargs['max_digits'] = max_digits - - decimal_places = getattr(model_field, 'decimal_places', None) - if decimal_places is not None: - kwargs['decimal_places'] = decimal_places - - if isinstance(model_field, models.BooleanField): - # models.BooleanField has `blank=True`, but *is* actually - # required *unless* a default is provided. - # Also note that Django<1.6 uses `default=False` for - # models.BooleanField, but Django>=1.6 uses `default=None`. - kwargs.pop('required', None) - - if validator_kwarg: - kwargs['validators'] = validator_kwarg - - if issubclass(serializer_cls, ModelField): - kwargs['model_field'] = model_field - - return serializer_cls(**kwargs) - - -class HyperlinkedModelSerializerOptions(ModelSerializerOptions): - """ - Options for HyperlinkedModelSerializer - """ - def __init__(self, meta): - super(HyperlinkedModelSerializerOptions, self).__init__(meta) - self.view_name = getattr(meta, 'view_name', None) - self.lookup_field = getattr(meta, 'lookup_field', None) + model = relation_info.related + depth = nested_depth + return NestedSerializer class HyperlinkedModelSerializer(ModelSerializer): - _options_class = HyperlinkedModelSerializerOptions + _related_class = HyperlinkedRelatedField - def get_url_field(self): - if self.opts.view_name is not None: - view_name = self.opts.view_name - else: - view_name = self.get_default_view_name(self.opts.model) + def _get_default_field_names(self, declared_fields, model_info): + return ( + [api_settings.URL_FIELD_NAME] + + list(declared_fields.keys()) + + list(model_info.fields.keys()) + + list(model_info.forward_relations.keys()) + ) - kwargs = { - 'view_name': view_name - } - if self.opts.lookup_field: - kwargs['lookup_field'] = self.opts.lookup_field - - return HyperlinkedIdentityField(**kwargs) - - def get_pk_field(self, field_name, model_field): - if self.opts.fields and model_field.name in self.opts.fields: - return self.get_field(model_field) - - def get_related_field(self, field_name, model_field, related_model, to_many, has_through_model): - """ - Creates a default instance of a flat relational field. - """ - kwargs = { - 'queryset': related_model._default_manager, - 'view_name': self.get_default_view_name(related_model), - } - - if to_many: - kwargs['many'] = True - - if has_through_model: - kwargs['read_only'] = True - kwargs.pop('queryset', None) - - if model_field: - if model_field.null or model_field.blank: - kwargs['required'] = False - if model_field.verbose_name and needs_label(model_field, field_name): - kwargs['label'] = capfirst(model_field.verbose_name) - if not model_field.editable: - kwargs['read_only'] = True - kwargs.pop('queryset', None) - help_text = clean_manytomany_helptext(model_field.help_text) - if help_text: - kwargs['help_text'] = help_text - - return HyperlinkedRelatedField(**kwargs) - - def get_default_view_name(self, model): - """ - Return the view name to use for related models. - """ - return '%(model_name)s-detail' % { - 'app_label': model._meta.app_label, - 'model_name': model._meta.object_name.lower() - } - - -ModelSerializer.nested_class = ModelSerializer -HyperlinkedModelSerializer.nested_class = HyperlinkedModelSerializer + def _get_nested_class(self, nested_depth, relation_info): + class NestedSerializer(HyperlinkedModelSerializer): + class Meta: + model = relation_info.related + depth = nested_depth + return NestedSerializer diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py new file mode 100644 index 000000000..be72e444e --- /dev/null +++ b/rest_framework/utils/field_mapping.py @@ -0,0 +1,215 @@ +""" +Helper functions for mapping model fields to a dictionary of default +keyword arguments that should be used for their equivelent serializer fields. +""" +from django.core import validators +from django.db import models +from django.utils.text import capfirst +from rest_framework.compat import clean_manytomany_helptext +import inspect + + +def lookup_class(mapping, instance): + """ + Takes a dictionary with classes as keys, and an object. + Traverses the object's inheritance hierarchy in method + resolution order, and returns the first matching value + from the dictionary or raises a KeyError if nothing matches. + """ + for cls in inspect.getmro(instance.__class__): + if cls in mapping: + return mapping[cls] + raise KeyError('Class %s not found in lookup.', cls.__name__) + + +def needs_label(model_field, field_name): + """ + Returns `True` if the label based on the model's verbose name + is not equal to the default label it would have based on it's field name. + """ + default_label = field_name.replace('_', ' ').capitalize() + return capfirst(model_field.verbose_name) != default_label + + +def get_detail_view_name(model): + """ + Given a model class, return the view name to use for URL relationships + that refer to instances of the model. + """ + return '%(model_name)s-detail' % { + 'app_label': model._meta.app_label, + 'model_name': model._meta.object_name.lower() + } + + +def get_field_kwargs(field_name, model_field): + """ + Creates a default instance of a basic non-relational field. + """ + kwargs = {} + validator_kwarg = model_field.validators + + if model_field.null or model_field.blank: + kwargs['required'] = False + + if model_field.verbose_name and needs_label(model_field, field_name): + kwargs['label'] = capfirst(model_field.verbose_name) + + if model_field.help_text: + kwargs['help_text'] = model_field.help_text + + if isinstance(model_field, models.AutoField) or not model_field.editable: + kwargs['read_only'] = True + # Read only implies that the field is not required. + # We have a cleaner repr on the instance if we don't set it. + kwargs.pop('required', None) + + if model_field.has_default(): + kwargs['default'] = model_field.get_default() + # Having a default implies that the field is not required. + # We have a cleaner repr on the instance if we don't set it. + kwargs.pop('required', None) + + if model_field.flatchoices: + # If this model field contains choices, then return now, + # any further keyword arguments are not valid. + kwargs['choices'] = model_field.flatchoices + return kwargs + + # Ensure that max_length is passed explicitly as a keyword arg, + # rather than as a validator. + max_length = getattr(model_field, 'max_length', None) + if max_length is not None: + kwargs['max_length'] = max_length + validator_kwarg = [ + validator for validator in validator_kwarg + if not isinstance(validator, validators.MaxLengthValidator) + ] + + # Ensure that min_length is passed explicitly as a keyword arg, + # rather than as a validator. + min_length = getattr(model_field, 'min_length', None) + if min_length is not None: + kwargs['min_length'] = min_length + validator_kwarg = [ + validator for validator in validator_kwarg + if not isinstance(validator, validators.MinLengthValidator) + ] + + # Ensure that max_value is passed explicitly as a keyword arg, + # rather than as a validator. + max_value = next(( + validator.limit_value for validator in validator_kwarg + if isinstance(validator, validators.MaxValueValidator) + ), None) + if max_value is not None: + kwargs['max_value'] = max_value + validator_kwarg = [ + validator for validator in validator_kwarg + if not isinstance(validator, validators.MaxValueValidator) + ] + + # Ensure that max_value is passed explicitly as a keyword arg, + # rather than as a validator. + min_value = next(( + validator.limit_value for validator in validator_kwarg + if isinstance(validator, validators.MinValueValidator) + ), None) + if min_value is not None: + kwargs['min_value'] = min_value + validator_kwarg = [ + validator for validator in validator_kwarg + if not isinstance(validator, validators.MinValueValidator) + ] + + # URLField does not need to include the URLValidator argument, + # as it is explicitly added in. + if isinstance(model_field, models.URLField): + validator_kwarg = [ + validator for validator in validator_kwarg + if not isinstance(validator, validators.URLValidator) + ] + + # EmailField does not need to include the validate_email argument, + # as it is explicitly added in. + if isinstance(model_field, models.EmailField): + validator_kwarg = [ + validator for validator in validator_kwarg + if validator is not validators.validate_email + ] + + # SlugField do not need to include the 'validate_slug' argument, + if isinstance(model_field, models.SlugField): + validator_kwarg = [ + validator for validator in validator_kwarg + if validator is not validators.validate_slug + ] + + max_digits = getattr(model_field, 'max_digits', None) + if max_digits is not None: + kwargs['max_digits'] = max_digits + + decimal_places = getattr(model_field, 'decimal_places', None) + if decimal_places is not None: + kwargs['decimal_places'] = decimal_places + + if isinstance(model_field, models.BooleanField): + # models.BooleanField has `blank=True`, but *is* actually + # required *unless* a default is provided. + # Also note that Django<1.6 uses `default=False` for + # models.BooleanField, but Django>=1.6 uses `default=None`. + kwargs.pop('required', None) + + if validator_kwarg: + kwargs['validators'] = validator_kwarg + + # The following will only be used by ModelField classes. + # Gets removed for everything else. + kwargs['model_field'] = model_field + + return kwargs + + +def get_relation_kwargs(field_name, relation_info): + """ + Creates a default instance of a flat relational field. + """ + model_field, related_model, to_many, has_through_model = relation_info + kwargs = { + 'queryset': related_model._default_manager, + 'view_name': get_detail_view_name(related_model) + } + + if to_many: + kwargs['many'] = True + + if has_through_model: + kwargs['read_only'] = True + kwargs.pop('queryset', None) + + if model_field: + if model_field.null or model_field.blank: + kwargs['required'] = False + if model_field.verbose_name and needs_label(model_field, field_name): + kwargs['label'] = capfirst(model_field.verbose_name) + if not model_field.editable: + kwargs['read_only'] = True + kwargs.pop('queryset', None) + help_text = clean_manytomany_helptext(model_field.help_text) + if help_text: + kwargs['help_text'] = help_text + + return kwargs + + +def get_nested_relation_kwargs(relation_info): + kwargs = {'read_only': True} + if relation_info.to_many: + kwargs['many'] = True + return kwargs + + +def get_url_kwargs(model_field): + return { + 'view_name': get_detail_view_name(model_field) + } diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py index 960fa4d0f..b6c41174e 100644 --- a/rest_framework/utils/model_meta.py +++ b/rest_framework/utils/model_meta.py @@ -1,7 +1,9 @@ """ -Helper functions for returning the field information that is associated +Helper function for returning the field information that is associated with a model class. This includes returning all the forward and reverse relationships and their associated metadata. + +Usage: `get_field_info(model)` returns a `FieldInfo` instance. """ from collections import namedtuple from django.db import models @@ -9,8 +11,22 @@ from django.utils import six from django.utils.datastructures import SortedDict import inspect -FieldInfo = namedtuple('FieldResult', ['pk', 'fields', 'forward_relations', 'reverse_relations']) -RelationInfo = namedtuple('RelationInfo', ['field', 'related', 'to_many', 'has_through_model']) + +FieldInfo = namedtuple('FieldResult', [ + 'pk', # Model field instance + 'fields', # Dict of field name -> model field instance + 'forward_relations', # Dict of field name -> RelationInfo + 'reverse_relations', # Dict of field name -> RelationInfo + 'fields_and_pk', # Shortcut for 'pk' + 'fields' + 'relations' # Shortcut for 'forward_relations' + 'reverse_relations' +]) + +RelationInfo = namedtuple('RelationInfo', [ + 'model_field', + 'related', + 'to_many', + 'has_through_model' +]) def _resolve_model(obj): @@ -55,7 +71,7 @@ def get_field_info(model): forward_relations = SortedDict() for field in [field for field in opts.fields if field.serialize and field.rel]: forward_relations[field.name] = RelationInfo( - field=field, + model_field=field, related=_resolve_model(field.rel.to), to_many=False, has_through_model=False @@ -64,7 +80,7 @@ def get_field_info(model): # Deal with forward many-to-many relationships. for field in [field for field in opts.many_to_many if field.serialize]: forward_relations[field.name] = RelationInfo( - field=field, + model_field=field, related=_resolve_model(field.rel.to), to_many=True, has_through_model=( @@ -77,7 +93,7 @@ def get_field_info(model): for relation in opts.get_all_related_objects(): accessor_name = relation.get_accessor_name() reverse_relations[accessor_name] = RelationInfo( - field=None, + model_field=None, related=relation.model, to_many=relation.field.rel.multiple, has_through_model=False @@ -87,7 +103,7 @@ def get_field_info(model): for relation in opts.get_all_related_many_to_many_objects(): accessor_name = relation.get_accessor_name() reverse_relations[accessor_name] = RelationInfo( - field=None, + model_field=None, related=relation.model, to_many=True, has_through_model=( @@ -96,4 +112,18 @@ def get_field_info(model): ) ) - return FieldInfo(pk, fields, forward_relations, reverse_relations) + # Shortcut that merges both regular fields and the pk, + # for simplifying regular field lookup. + fields_and_pk = SortedDict() + fields_and_pk['pk'] = pk + fields_and_pk[pk.name] = pk + fields_and_pk.update(fields) + + # Shortcut that merges both forward and reverse relationships + + relations = SortedDict( + list(forward_relations.items()) + + list(reverse_relations.items()) + ) + + return FieldInfo(pk, fields, forward_relations, reverse_relations, fields_and_pk, relations) diff --git a/tests/models.py b/tests/models.py index fe064b46a..06ec5a221 100644 --- a/tests/models.py +++ b/tests/models.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals from django.db import models from django.utils.translation import ugettext_lazy as _ -from rest_framework import serializers def foobar(): @@ -178,9 +177,3 @@ class NullableOneToOneSource(RESTFrameworkModel): name = models.CharField(max_length=100) target = models.OneToOneField(OneToOneTarget, null=True, blank=True, related_name='nullable_source') - - -# Serializer used to test BasicModel -class BasicModelSerializer(serializers.ModelSerializer): - class Meta: - model = BasicModel diff --git a/tests/test_model_field_mappings.py b/tests/test_model_field_mappings.py index bae63e5a7..6daa574e5 100644 --- a/tests/test_model_field_mappings.py +++ b/tests/test_model_field_mappings.py @@ -126,16 +126,16 @@ class TestRelationalFieldMappings(TestCase): expected = dedent(""" TestSerializer(): id = IntegerField(label='ID', read_only=True) - foreign_key = NestedModelSerializer(read_only=True): + foreign_key = NestedSerializer(read_only=True): id = IntegerField(label='ID', read_only=True) name = CharField(max_length=100) - one_to_one = NestedModelSerializer(read_only=True): + one_to_one = NestedSerializer(read_only=True): id = IntegerField(label='ID', read_only=True) name = CharField(max_length=100) - many_to_many = NestedModelSerializer(many=True, read_only=True): + many_to_many = NestedSerializer(many=True, read_only=True): id = IntegerField(label='ID', read_only=True) name = CharField(max_length=100) - through = NestedModelSerializer(many=True, read_only=True): + through = NestedSerializer(many=True, read_only=True): id = IntegerField(label='ID', read_only=True) name = CharField(max_length=100) """) @@ -165,16 +165,16 @@ class TestRelationalFieldMappings(TestCase): expected = dedent(""" TestSerializer(): url = HyperlinkedIdentityField(view_name='relationalmodel-detail') - foreign_key = NestedModelSerializer(read_only=True): + foreign_key = NestedSerializer(read_only=True): url = HyperlinkedIdentityField(view_name='foreignkeytargetmodel-detail') name = CharField(max_length=100) - one_to_one = NestedModelSerializer(read_only=True): + one_to_one = NestedSerializer(read_only=True): url = HyperlinkedIdentityField(view_name='onetoonetargetmodel-detail') name = CharField(max_length=100) - many_to_many = NestedModelSerializer(many=True, read_only=True): + many_to_many = NestedSerializer(many=True, read_only=True): url = HyperlinkedIdentityField(view_name='manytomanytargetmodel-detail') name = CharField(max_length=100) - through = NestedModelSerializer(many=True, read_only=True): + through = NestedSerializer(many=True, read_only=True): url = HyperlinkedIdentityField(view_name='throughtargetmodel-detail') name = CharField(max_length=100) """) diff --git a/tests/test_response.py b/tests/test_response.py index 67419a718..84c39c1a6 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -2,11 +2,12 @@ from __future__ import unicode_literals from django.conf.urls import patterns, url, include from django.test import TestCase from django.utils import six -from tests.models import BasicModel, BasicModelSerializer +from tests.models import BasicModel from rest_framework.response import Response from rest_framework.views import APIView from rest_framework import generics from rest_framework import routers +from rest_framework import serializers from rest_framework import status from rest_framework.renderers import ( BaseRenderer, @@ -17,6 +18,12 @@ from rest_framework import viewsets from rest_framework.settings import api_settings +# Serializer used to test BasicModel +class BasicModelSerializer(serializers.ModelSerializer): + class Meta: + model = BasicModel + + class MockPickleRenderer(BaseRenderer): media_type = 'application/pickle' diff --git a/tests/test_routers.py b/tests/test_routers.py index b076f134e..c2d595f7f 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -76,9 +76,10 @@ class TestCustomLookupFields(TestCase): def setUp(self): class NoteSerializer(serializers.HyperlinkedModelSerializer): + url = serializers.HyperlinkedIdentityField(view_name='routertestmodel-detail', lookup_field='uuid') + class Meta: model = RouterTestModel - lookup_field = 'uuid' fields = ('url', 'uuid', 'text') class NoteViewSet(viewsets.ModelViewSet): @@ -86,8 +87,6 @@ class TestCustomLookupFields(TestCase): serializer_class = NoteSerializer lookup_field = 'uuid' - RouterTestModel.objects.create(uuid='123', text='foo bar') - self.router = SimpleRouter() self.router.register(r'notes', NoteViewSet) @@ -98,6 +97,8 @@ class TestCustomLookupFields(TestCase): url(r'^', include(self.router.urls)), ) + RouterTestModel.objects.create(uuid='123', text='foo bar') + def test_custom_lookup_field_route(self): detail_route = self.router.urls[-1] detail_url_pattern = detail_route.regex.pattern From 87734be5f41de921ac32ad1f6664db243aab6d07 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Sep 2014 12:17:21 +0100 Subject: [PATCH 0852/1652] Configuration correctness tests on ModelSerializer --- rest_framework/serializers.py | 30 ++++++- ...d_mappings.py => test_model_serializer.py} | 85 +++++++++++++++++++ 2 files changed, 112 insertions(+), 3 deletions(-) rename tests/{test_model_field_mappings.py => test_model_serializer.py} (77%) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 99dcc349f..9f3e53fd0 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -10,7 +10,7 @@ python primitives. 2. The process of marshalling between python primitives and request and response content is handled by parsers and renderers. """ -from django.core.exceptions import ValidationError +from django.core.exceptions import ImproperlyConfigured, ValidationError from django.db import models from django.utils import six from django.utils.datastructures import SortedDict @@ -358,6 +358,7 @@ class ModelSerializer(Serializer): model = getattr(self.Meta, 'model') fields = getattr(self.Meta, 'fields', None) depth = getattr(self.Meta, 'depth', 0) + extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) # Retrieve metadata about fields & relationships on the model class. info = model_meta.get_field_info(model) @@ -405,9 +406,32 @@ class ModelSerializer(Serializer): if not issubclass(field_cls, HyperlinkedRelatedField): kwargs.pop('view_name', None) - else: - assert False, 'Field name `%s` is not valid.' % field_name + elif hasattr(model, field_name): + # Create a read only field for model methods and properties. + field_cls = ReadOnlyField + kwargs = {} + else: + raise ImproperlyConfigured( + 'Field name `%s` is not valid for model `%s`.' % + (field_name, model.__class__.__name__) + ) + + # Check that any fields declared on the class are + # also explicity included in `Meta.fields`. + missing_fields = set(declared_fields.keys()) - set(fields) + if missing_fields: + missing_field = list(missing_fields)[0] + raise ImproperlyConfigured( + 'Field `%s` has been declared on serializer `%s`, but ' + 'is missing from `Meta.fields`.' % + (missing_field, self.__class__.__name__) + ) + + # Populate any kwargs defined in `Meta.extra_kwargs` + kwargs.update(extra_kwargs.get(field_name, {})) + + # Create the serializer field. ret[field_name] = field_cls(**kwargs) return ret diff --git a/tests/test_model_field_mappings.py b/tests/test_model_serializer.py similarity index 77% rename from tests/test_model_field_mappings.py rename to tests/test_model_serializer.py index 6daa574e5..63e364528 100644 --- a/tests/test_model_field_mappings.py +++ b/tests/test_model_serializer.py @@ -5,6 +5,7 @@ shortcuts for automatically creating serializers based on a given model class. These tests deal with ensuring that we correctly map the model fields onto an appropriate set of serializer fields for each case. """ +from django.core.exceptions import ImproperlyConfigured from django.db import models from django.test import TestCase from rest_framework import serializers @@ -37,6 +38,9 @@ class RegularFieldsModel(models.Model): time_field = models.TimeField() url_field = models.URLField(max_length=100) + def method(self): + return 'method' + class TestRegularFieldMappings(TestCase): def test_regular_fields(self): @@ -69,6 +73,87 @@ class TestRegularFieldMappings(TestCase): self.assertEqual(repr(TestSerializer()), expected) + def test_method_field(self): + """ + Properties and methods on the model should be allowed as `Meta.fields` + values, and should map to `ReadOnlyField`. + """ + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = RegularFieldsModel + fields = ('auto_field', 'method') + + expected = dedent(""" + TestSerializer(): + auto_field = IntegerField(read_only=True) + method = ReadOnlyField() + """) + self.assertEqual(repr(TestSerializer()), expected) + + def test_pk_fields(self): + """ + Both `pk` and the actual primary key name are valid in `Meta.fields`. + """ + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = RegularFieldsModel + fields = ('pk', 'auto_field') + + expected = dedent(""" + TestSerializer(): + pk = IntegerField(label='Auto field', read_only=True) + auto_field = IntegerField(read_only=True) + """) + self.assertEqual(repr(TestSerializer()), expected) + + def test_extra_field_kwargs(self): + """ + Ensure `extra_kwargs` are passed to generated fields. + """ + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = RegularFieldsModel + fields = ('pk', 'char_field') + extra_kwargs = {'char_field': {'default': 'extra'}} + + expected = dedent(""" + TestSerializer(): + pk = IntegerField(label='Auto field', read_only=True) + char_field = CharField(default='extra', max_length=100) + """) + self.assertEqual(repr(TestSerializer()), expected) + + def test_invalid_field(self): + """ + Field names that do not map to a model field or relationship should + raise a configuration errror. + """ + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = RegularFieldsModel + fields = ('auto_field', 'invalid') + + with self.assertRaises(ImproperlyConfigured) as excinfo: + TestSerializer() + expected = 'Field name `invalid` is not valid for model `ModelBase`.' + assert str(excinfo.exception) == expected + + def test_missing_field(self): + class TestSerializer(serializers.ModelSerializer): + missing = serializers.ReadOnlyField() + + class Meta: + model = RegularFieldsModel + fields = ('auto_field',) + + with self.assertRaises(ImproperlyConfigured) as excinfo: + TestSerializer() + expected = ( + 'Field `missing` has been declared on serializer ' + '`TestSerializer`, but is missing from `Meta.fields`.' + ) + assert str(excinfo.exception) == expected + # Testing relational field mappings From 3bc628edc01a6bd4feeceaefa45168549b79a31a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Sep 2014 13:07:38 +0100 Subject: [PATCH 0853/1652] Test for custom fields --- tests/test_model_serializer.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 63e364528..3ee91126f 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -17,6 +17,10 @@ def dedent(blocktext): # Testing regular field mappings +class CustomField(models.Field): + pass + + class RegularFieldsModel(models.Model): auto_field = models.AutoField(primary_key=True) big_integer_field = models.BigIntegerField() @@ -37,6 +41,7 @@ class RegularFieldsModel(models.Model): text_field = models.TextField() time_field = models.TimeField() url_field = models.URLField(max_length=100) + custom_field = CustomField() def method(self): return 'method' @@ -44,6 +49,9 @@ class RegularFieldsModel(models.Model): class TestRegularFieldMappings(TestCase): def test_regular_fields(self): + """ + Model fields should map to their equivelent serializer fields. + """ class TestSerializer(serializers.ModelSerializer): class Meta: model = RegularFieldsModel @@ -69,8 +77,8 @@ class TestRegularFieldMappings(TestCase): text_field = CharField() time_field = TimeField() url_field = URLField(max_length=100) + custom_field = ModelField(model_field=<tests.test_model_serializer.CustomField: custom_field>) """) - self.assertEqual(repr(TestSerializer()), expected) def test_method_field(self): @@ -139,6 +147,10 @@ class TestRegularFieldMappings(TestCase): assert str(excinfo.exception) == expected def test_missing_field(self): + """ + Fields that have been declared on the serializer class must be included + in the `Meta.fields` if it exists. + """ class TestSerializer(serializers.ModelSerializer): missing = serializers.ReadOnlyField() From 9fdb2280d11db126771686d626aa8a0247b8a46c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Sep 2014 14:23:00 +0100 Subject: [PATCH 0854/1652] First pass on ManyRelation --- rest_framework/relations.py | 42 +++++++++++++++++++- rest_framework/utils/representation.py | 2 + tests/test_model_serializer.py | 54 ++++++++++++++++++++++---- 3 files changed, 89 insertions(+), 9 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 9f44ab633..474d3e757 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -10,7 +10,6 @@ from django.utils.translation import ugettext_lazy as _ class RelatedField(Field): def __init__(self, **kwargs): self.queryset = kwargs.pop('queryset', None) - self.many = kwargs.pop('many', False) assert self.queryset is not None or kwargs.get('read_only', None), ( 'Relational field must provide a `queryset` argument, ' 'or set read_only=`True`.' @@ -21,6 +20,13 @@ class RelatedField(Field): ) super(RelatedField, self).__init__(**kwargs) + def __new__(cls, *args, **kwargs): + # We override this method in order to automagically create + # `ManyRelation` classes instead when `many=True` is set. + if kwargs.pop('many', False): + return ManyRelation(child_relation=cls(*args, **kwargs)) + return super(RelatedField, cls).__new__(cls, *args, **kwargs) + def get_queryset(self): queryset = self.queryset if isinstance(queryset, QuerySet): @@ -216,3 +222,37 @@ class SlugRelatedField(RelatedField): def to_representation(self, obj): return getattr(obj, self.slug_field) + + +class ManyRelation(Field): + """ + Relationships with `many=True` transparently get coerced into instead being + a ManyRelation with a child relationship. + + The `ManyRelation` class is responsible for handling iterating through + the values and passing each one to the child relationship. + + You shouldn't need to be using this class directly yourself. + """ + + def __init__(self, child_relation=None, *args, **kwargs): + self.child_relation = child_relation + assert child_relation is not None, '`child_relation` is a required argument.' + super(ManyRelation, self).__init__(*args, **kwargs) + + def bind(self, field_name, parent, root): + # ManyRelation needs to provide the current context to the child relation. + super(ManyRelation, self).bind(field_name, parent, root) + self.child_relation.bind(field_name, parent, root) + + def to_internal_value(self, data): + return [ + self.child_relation.to_internal_value(item) + for item in data + ] + + def to_representation(self, obj): + return [ + self.child_relation.to_representation(value) + for value in obj.all() + ] diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py index 71db18863..e64fdd223 100644 --- a/rest_framework/utils/representation.py +++ b/rest_framework/utils/representation.py @@ -73,6 +73,8 @@ def serializer_repr(serializer, indent, force_many=None): ret += serializer_repr(field, indent + 1) elif hasattr(field, 'child'): ret += list_repr(field, indent + 1) + elif hasattr(field, 'child_relation'): + ret += field_repr(field.child_relation, force_many=field.child_relation) else: ret += field_repr(field) return ret diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 3ee91126f..b3dae7134 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -199,7 +199,7 @@ class RelationalModel(models.Model): class TestRelationalFieldMappings(TestCase): - def test_flat_relational_fields(self): + def test_pk_relations(self): class TestSerializer(serializers.ModelSerializer): class Meta: model = RelationalModel @@ -214,7 +214,7 @@ class TestRelationalFieldMappings(TestCase): """) self.assertEqual(repr(TestSerializer()), expected) - def test_nested_relational_fields(self): + def test_nested_relations(self): class TestSerializer(serializers.ModelSerializer): class Meta: model = RelationalModel @@ -238,7 +238,7 @@ class TestRelationalFieldMappings(TestCase): """) self.assertEqual(repr(TestSerializer()), expected) - def test_flat_hyperlinked_fields(self): + def test_hyperlinked_relations(self): class TestSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = RelationalModel @@ -253,7 +253,7 @@ class TestRelationalFieldMappings(TestCase): """) self.assertEqual(repr(TestSerializer()), expected) - def test_nested_hyperlinked_fields(self): + def test_nested_hyperlinked_relations(self): class TestSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = RelationalModel @@ -277,7 +277,7 @@ class TestRelationalFieldMappings(TestCase): """) self.assertEqual(repr(TestSerializer()), expected) - def test_flat_reverse_foreign_key(self): + def test_pk_reverse_foreign_key(self): class TestSerializer(serializers.ModelSerializer): class Meta: model = ForeignKeyTargetModel @@ -291,7 +291,7 @@ class TestRelationalFieldMappings(TestCase): """) self.assertEqual(repr(TestSerializer()), expected) - def test_flat_reverse_one_to_one(self): + def test_pk_reverse_one_to_one(self): class TestSerializer(serializers.ModelSerializer): class Meta: model = OneToOneTargetModel @@ -305,7 +305,7 @@ class TestRelationalFieldMappings(TestCase): """) self.assertEqual(repr(TestSerializer()), expected) - def test_flat_reverse_many_to_many(self): + def test_pk_reverse_many_to_many(self): class TestSerializer(serializers.ModelSerializer): class Meta: model = ManyToManyTargetModel @@ -319,7 +319,7 @@ class TestRelationalFieldMappings(TestCase): """) self.assertEqual(repr(TestSerializer()), expected) - def test_flat_reverse_through(self): + def test_pk_reverse_through(self): class TestSerializer(serializers.ModelSerializer): class Meta: model = ThroughTargetModel @@ -332,3 +332,41 @@ class TestRelationalFieldMappings(TestCase): reverse_through = PrimaryKeyRelatedField(many=True, read_only=True) """) self.assertEqual(repr(TestSerializer()), expected) + + +class TestIntegration(TestCase): + def setUp(self): + self.foreign_key_target = ForeignKeyTargetModel.objects.create( + name='foreign_key' + ) + self.one_to_one_target = OneToOneTargetModel.objects.create( + name='one_to_one' + ) + self.many_to_many_targets = [ + ManyToManyTargetModel.objects.create( + name='many_to_many (%d)' % idx + ) for idx in range(3) + ] + self.instance = RelationalModel.objects.create( + foreign_key=self.foreign_key_target, + one_to_one=self.one_to_one_target, + ) + self.instance.many_to_many = self.many_to_many_targets + self.instance.save() + + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = RelationalModel + + self.serializer_cls = TestSerializer + + def test_pk_relationship_representations(self): + serializer = self.serializer_cls(self.instance) + expected = { + 'id': self.instance.pk, + 'foreign_key': self.foreign_key_target.pk, + 'one_to_one': self.one_to_one_target.pk, + 'many_to_many': [item.pk for item in self.many_to_many_targets], + 'through': [] + } + self.assertEqual(serializer.data, expected) From 106362b437f45e04faaea759df57a66a8a2d7cfd Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Sep 2014 14:58:08 +0100 Subject: [PATCH 0855/1652] ModelSerializer.create() to handle many to many by default --- rest_framework/relations.py | 5 +++- rest_framework/serializers.py | 20 ++++++++++++++- tests/test_model_serializer.py | 45 +++++++++++++++++++++++++++++++++- 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 474d3e757..5aa1f8bd8 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -24,7 +24,10 @@ class RelatedField(Field): # We override this method in order to automagically create # `ManyRelation` classes instead when `many=True` is set. if kwargs.pop('many', False): - return ManyRelation(child_relation=cls(*args, **kwargs)) + return ManyRelation( + child_relation=cls(*args, **kwargs), + read_only=kwargs.get('read_only', False) + ) return super(RelatedField, cls).__new__(cls, *args, **kwargs) def get_queryset(self): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 9f3e53fd0..03e20df8a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -344,7 +344,25 @@ class ModelSerializer(Serializer): def create(self, attrs): ModelClass = self.Meta.model - return ModelClass.objects.create(**attrs) + + # Remove many-to-many relationships from attrs. + # They are not valid arguments to the default `.create()` method, + # as they require that the instance has already been saved. + info = model_meta.get_field_info(ModelClass) + many_to_many = {} + for key, relation_info in info.relations.items(): + if relation_info.to_many and (key in attrs): + many_to_many[key] = attrs.pop(key) + + instance = ModelClass.objects.create(**attrs) + + # Save many to many relationships after the instance is created. + if many_to_many: + for key, value in many_to_many.items(): + setattr(instance, key, value) + instance.save() + + return instance def update(self, obj, attrs): for attr, value in attrs.items(): diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index b3dae7134..6f207e02c 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -360,7 +360,7 @@ class TestIntegration(TestCase): self.serializer_cls = TestSerializer - def test_pk_relationship_representations(self): + def test_pk_retrival(self): serializer = self.serializer_cls(self.instance) expected = { 'id': self.instance.pk, @@ -370,3 +370,46 @@ class TestIntegration(TestCase): 'through': [] } self.assertEqual(serializer.data, expected) + + def test_pk_create(self): + new_foreign_key = ForeignKeyTargetModel.objects.create( + name='foreign_key' + ) + new_one_to_one = OneToOneTargetModel.objects.create( + name='one_to_one' + ) + new_many_to_many = [ + ManyToManyTargetModel.objects.create( + name='new many_to_many (%d)' % idx + ) for idx in range(3) + ] + data = { + 'foreign_key': new_foreign_key.pk, + 'one_to_one': new_one_to_one.pk, + 'many_to_many': [item.pk for item in new_many_to_many], + } + + # Serializer should validate okay. + serializer = self.serializer_cls(data=data) + assert serializer.is_valid() + + # Creating the instance, relationship attributes should be set. + instance = serializer.save() + assert instance.foreign_key.pk == new_foreign_key.pk + assert instance.one_to_one.pk == new_one_to_one.pk + assert [ + item.pk for item in instance.many_to_many.all() + ] == [ + item.pk for item in new_many_to_many + ] + assert list(instance.through.all()) == [] + + # Representation should be correct. + expected = { + 'id': instance.pk, + 'foreign_key': new_foreign_key.pk, + 'one_to_one': new_one_to_one.pk, + 'many_to_many': [item.pk for item in new_many_to_many], + 'through': [] + } + self.assertEqual(serializer.data, expected) From f90049316a3ecca6c92e10b57bfa5becbceff386 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Sep 2014 15:47:27 +0100 Subject: [PATCH 0856/1652] Added a model update integration test --- rest_framework/serializers.py | 13 +++++----- tests/test_model_serializer.py | 43 ++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 03e20df8a..d2740fc2a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -350,17 +350,16 @@ class ModelSerializer(Serializer): # as they require that the instance has already been saved. info = model_meta.get_field_info(ModelClass) many_to_many = {} - for key, relation_info in info.relations.items(): - if relation_info.to_many and (key in attrs): - many_to_many[key] = attrs.pop(key) + for field_name, relation_info in info.relations.items(): + if relation_info.to_many and (field_name in attrs): + many_to_many[field_name] = attrs.pop(field_name) instance = ModelClass.objects.create(**attrs) - # Save many to many relationships after the instance is created. + # Save many-to-many relationships after the instance is created. if many_to_many: - for key, value in many_to_many.items(): - setattr(instance, key, value) - instance.save() + for field_name, value in many_to_many.items(): + setattr(instance, field_name, value) return instance diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 6f207e02c..e0120c313 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -413,3 +413,46 @@ class TestIntegration(TestCase): 'through': [] } self.assertEqual(serializer.data, expected) + + def test_pk_update(self): + new_foreign_key = ForeignKeyTargetModel.objects.create( + name='foreign_key' + ) + new_one_to_one = OneToOneTargetModel.objects.create( + name='one_to_one' + ) + new_many_to_many = [ + ManyToManyTargetModel.objects.create( + name='new many_to_many (%d)' % idx + ) for idx in range(3) + ] + data = { + 'foreign_key': new_foreign_key.pk, + 'one_to_one': new_one_to_one.pk, + 'many_to_many': [item.pk for item in new_many_to_many], + } + + # Serializer should validate okay. + serializer = self.serializer_cls(self.instance, data=data) + assert serializer.is_valid() + + # Creating the instance, relationship attributes should be set. + instance = serializer.save() + assert instance.foreign_key.pk == new_foreign_key.pk + assert instance.one_to_one.pk == new_one_to_one.pk + assert [ + item.pk for item in instance.many_to_many.all() + ] == [ + item.pk for item in new_many_to_many + ] + assert list(instance.through.all()) == [] + + # Representation should be correct. + expected = { + 'id': self.instance.pk, + 'foreign_key': new_foreign_key.pk, + 'one_to_one': new_one_to_one.pk, + 'many_to_many': [item.pk for item in new_many_to_many], + 'through': [] + } + self.assertEqual(serializer.data, expected) From 7f758d1cf694c9227a1f55df400ff81e4bce2956 Mon Sep 17 00:00:00 2001 From: Piper Merriam <piper@simpleenergy.com> Date: Thu, 18 Sep 2014 10:30:13 -0600 Subject: [PATCH 0857/1652] Fix missing CSRF exemption on viewsets --- rest_framework/viewsets.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py index bb5b304ee..84b4bd8dd 100644 --- a/rest_framework/viewsets.py +++ b/rest_framework/viewsets.py @@ -20,6 +20,7 @@ from __future__ import unicode_literals from functools import update_wrapper from django.utils.decorators import classonlymethod +from django.views.decorators.csrf import csrf_exempt from rest_framework import views, generics, mixins @@ -89,7 +90,7 @@ class ViewSetMixin(object): # resolved URL. view.cls = cls view.suffix = initkwargs.get('suffix', None) - return view + return csrf_exempt(view) def initialize_request(self, request, *args, **kargs): """ From 12ccb0fe8a7dfbefa3687d07ff59a456fbda9ee6 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Sep 2014 09:09:26 +0100 Subject: [PATCH 0858/1652] Test tweaking --- tests/test_model_serializer.py | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index e0120c313..ec922b6d5 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -18,10 +18,16 @@ def dedent(blocktext): # Testing regular field mappings class CustomField(models.Field): + """ + A custom model field simply for testing purposes. + """ pass class RegularFieldsModel(models.Model): + """ + A model class for testing regular flat fields. + """ auto_field = models.AutoField(primary_key=True) big_integer_field = models.BigIntegerField() boolean_field = models.BooleanField(default=False) @@ -121,12 +127,12 @@ class TestRegularFieldMappings(TestCase): class TestSerializer(serializers.ModelSerializer): class Meta: model = RegularFieldsModel - fields = ('pk', 'char_field') + fields = ('auto_field', 'char_field') extra_kwargs = {'char_field': {'default': 'extra'}} expected = dedent(""" TestSerializer(): - pk = IntegerField(label='Auto field', read_only=True) + auto_field = IntegerField(read_only=True) char_field = CharField(default='extra', max_length=100) """) self.assertEqual(repr(TestSerializer()), expected) @@ -354,14 +360,12 @@ class TestIntegration(TestCase): self.instance.many_to_many = self.many_to_many_targets self.instance.save() + def test_pk_retrival(self): class TestSerializer(serializers.ModelSerializer): class Meta: model = RelationalModel - self.serializer_cls = TestSerializer - - def test_pk_retrival(self): - serializer = self.serializer_cls(self.instance) + serializer = TestSerializer(self.instance) expected = { 'id': self.instance.pk, 'foreign_key': self.foreign_key_target.pk, @@ -372,6 +376,10 @@ class TestIntegration(TestCase): self.assertEqual(serializer.data, expected) def test_pk_create(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = RelationalModel + new_foreign_key = ForeignKeyTargetModel.objects.create( name='foreign_key' ) @@ -390,7 +398,7 @@ class TestIntegration(TestCase): } # Serializer should validate okay. - serializer = self.serializer_cls(data=data) + serializer = TestSerializer(data=data) assert serializer.is_valid() # Creating the instance, relationship attributes should be set. @@ -415,6 +423,10 @@ class TestIntegration(TestCase): self.assertEqual(serializer.data, expected) def test_pk_update(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = RelationalModel + new_foreign_key = ForeignKeyTargetModel.objects.create( name='foreign_key' ) @@ -433,7 +445,7 @@ class TestIntegration(TestCase): } # Serializer should validate okay. - serializer = self.serializer_cls(self.instance, data=data) + serializer = TestSerializer(self.instance, data=data) assert serializer.is_valid() # Creating the instance, relationship attributes should be set. From 6d73b5969a9d415a6d43175e77bc10ba76151e97 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Sep 2014 14:02:17 +0100 Subject: [PATCH 0859/1652] Initial release notes --- docs/topics/3.0-announcement.md | 239 ++++++++++++++++++++++++++++++++ 1 file changed, 239 insertions(+) create mode 100644 docs/topics/3.0-announcement.md diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md new file mode 100644 index 000000000..029d98960 --- /dev/null +++ b/docs/topics/3.0-announcement.md @@ -0,0 +1,239 @@ +**THIS DOCUMENT IS CURRENTLY A WORK IN PROGRESS** + +See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-framework/pull/1800) for more details. + +# REST framework 3.0 + +**Note incremental nature, discuss upgrading.** + +## Motivation + +**TODO** + +--- + +## Request objects + +#### The `request.data` property. + +**TODO** + +#### The parser API. + +**TODO** + +## Serializers + +#### Single-step object creation. + +**TODO**: Drop `.restore_object()`, use `.create()` and `.update()` which should save the instance. + +**TODO**: Drop`.object`, use `.validated_data` or get the instance with `.save()`. + +#### Always use `fields`, not `exclude`. + +The `exclude` option is no longer available. You should use the more explicit `fields` option instead. + +#### The `extra_kwargs` option. + +The `read_only_fields` and `write_only_fields` options have been removed and replaced with a more generic `extra_kwargs`. + + class MySerializer(serializer.ModelSerializer): + class Meta: + model = MyModel + fields = ('id', 'email', 'notes', 'is_admin') + extra_kwargs = { + 'is_admin': {'read_only': True} + } + +Alternatively, specify the field explicitly on the serializer class: + + class MySerializer(serializer.ModelSerializer): + is_admin = serializers.BooleanField(read_only=True) + + class Meta: + model = MyModel + fields = ('id', 'email', 'notes', 'is_admin') + +#### Changes to `HyperlinkedModelSerializer`. + +The `view_name` and `lookup_field` options have been removed. They are no longer required, as you can use the `extra_kwargs` argument instead: + + class MySerializer(serializer.HyperlinkedModelSerializer): + class Meta: + model = MyModel + fields = ('url', 'email', 'notes', 'is_admin') + extra_kwargs = { + 'url': {'lookup_field': 'uuid'} + } + +Alternatively, specify the field explicitly on the serializer class: + + class MySerializer(serializer.HyperlinkedModelSerializer): + url = serializers.HyperlinkedIdentityField( + view_name='mymodel-detail', + lookup_field='uuid' + ) + + class Meta: + model = MyModel + fields = ('url', 'email', 'notes', 'is_admin') + +#### Fields for model methods and properties. + +You can now specify field names in the `fields` option that refer to model methods or properties. For example, suppose you have the following model: + + class Invitation(models.Model): + created = models.DateTimeField() + to_email = models.EmailField() + message = models.CharField(max_length=1000) + + def expiry_date(self): + return self.created + datetime.timedelta(days=30) + +You can include `expiry_date` as a field option on a `ModelSerializer` class. + + class InvitationSerializer(serializers.ModelSerializer): + class Meta: + model = Invitation + fields = ('to_email', 'message', 'expiry_date') + +These fields will be mapped to `serializers.ReadOnlyField()` instances. + + >>> serializer = InvitationSerializer() + >>> print repr(serializer) + InvitationSerializer(): + to_email = EmailField(max_length=75) + message = CharField(max_length=1000) + expiry_date = ReadOnlyField() + + +## Serializer fields + +#### The `Field` and `ReadOnly` field classes. + +**TODO** + +#### Coercing output types. + +**TODO** + +#### The `ListSerializer` class. + +**TODO** + +#### The `MultipleChoiceField` class. + +**TODO** + +#### Changes to the custom field API. + +**TODO** `to_representation`, `to_internal_value`. + +#### Explicit `querysets` required on relational fields. + +**TODO** + +#### Optional argument to `SerializerMethodField`. + +**TODO** + +## Generic views + +#### Simplification of view logic. + +**TODO** + +#### Removal of pre/post save hooks. + +The following method hooks no longer exist on the new, simplified, generic views: `pre_save`, `post_save`, `pre_delete`, `post_delete`. + +If you do need custom behavior, you might choose to instead override the `.save()` method on your serializer class. For example: + + def save(self, *args, **kwargs): + instance = super(MySerializer).save(*args, **kwarg) + send_email(instance.to_email, instance.message) + return instance + +Alternatively write your view logic exlpicitly, or tie your pre/post save behavior into the model class or model manager. + +#### Removal of view attributes. + +The `.object` and `.object_list` attributes are no longer set on the view instance. Treating views as mutable object instances that store state during the processing of the view tends to be poor design, and can lead to obscure flow logic. + +I would personally recommend that developers treat view instances as immutable objects in their application code. + +#### PUT as create. + +**TODO** + +## API style + +There are some improvements in the default style we use in our API responses. + +#### Unicode JSON by default. + +Unicode JSON is now the default. The `UnicodeJSONRenderer` class no longer exists, and the `UNICODE_JSON` setting has been added. To revert this behavior use the new setting: + + REST_FRAMEWORK = { + 'UNICODE_JSON': False + } + +#### Compact JSON by default. + +We now output compact JSON in responses by default. For example, we return: + + {"email":"amy@example.com","is_admin":true} + +Instead of the following: + + {"email": "amy@example.com", "is_admin": true} + +The `COMPACT_JSON` setting has been added, and can be used to revert this behavior if needed: + + REST_FRAMEWORK = { + 'COMPACT_JSON': False + } + +#### Throttle headers using `Retry-After`. + +The custom `X-Throttle-Wait-Second` header has now been dropped in favor of the standard `Retry-After` header. You can revert this behavior if needed by writing a custom exception handler for your application. + +#### Date and time objects as ISO-8859-1 strings in serializer data. + +Date and Time objects are now coerced to strings by default in the serializer output. Previously they were returned as `Date`, `Time` and `DateTime` objects, and later coerced to strings by the renderer. + +You can modify this behavior globally by settings the existing `DATE_FORMAT`, `DATETIME_FORMAT` and `TIME_FORMAT` settings keys. Setting these values to `None` instead of their default value of `'iso-8859-1'` will result in native objects being returned in serializer data. + + REST_FRAMEWORK = { + # Return native `Date` and `Time` objects in `serializer.data` + 'DATETIME_FORMAT': None + 'DATE_FORMAT': None + 'TIME_FORMAT': None + } + +You can also modify serializer fields individually, using the `date_format`, `time_format` and `datetime_format` arguments: + + # Return `DateTime` instances in `serializer.data`, not strings. + created = serializers.DateTimeField(format=None) + +#### Decimals as strings in serializer data. + +Decimals are now coerced to strings by default in the serializer output. Previously they were returned as `Decimal` objects, and later coerced to strings by the renderer. + +You can modify this behavior globally by using the `COERCE_DECIMAL_TO_STRING` settings key. + + REST_FRAMEWORK = { + 'COERCE_DECIMAL_TO_STRING': False + } + +Or modify it on an individual serializer field, using the `corece_to_string` keyword argument. + + # Return `Decimal` instances in `serializer.data`, not strings. + amount = serializers.DecimalField( + max_digits=10, + decimal_places=2, + coerce_to_string=False + ) + +The default JSON renderer will return float objects for uncoerced `Decimal` instances. This allows you to easily switch between string or float representations for decimals depending on your API design needs. From 20424251a3da82681fee04c66b7be0c7d3a40fec Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Sep 2014 14:26:28 +0100 Subject: [PATCH 0860/1652] Version 2.4.3 --- docs/topics/release-notes.md | 23 ++++++++++++++++++++--- rest_framework/__init__.py | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index d758ae6af..2174cddaa 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,21 +40,37 @@ You can determine your currently installed version using `pip freeze`: ## 2.4.x series +### 2.4.3 + +**Date**: [19th September 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.3+Release%22+). + +* Support translatable view docstrings being displayed in the browsable API. +* Support [encoded `filename*`][rfc-6266] in raw file uploads with `FileUploadParser`. +* Allow routers to support viewsets that don't include any list routes or that don't include any detail routes. +* Don't render an empty login control in browsable API if `login` view is not included. +* CSRF exemption performed in `.as_view()` to prevent accidental omission if overriding `.dispatch()`. +* Login on browsable API now displays validation errors. +* Bugfix: Fix migration in `authtoken` application. +* Bugfix: Allow selection of integer keys in nested choices. +* Bugfix: Return `None` instead of `'None'` in `CharField` with `allow_none=True`. +* Bugfix: Ensure custom model fields map to equivelent serializer fields more reliably. +* Bugfix: `DjangoFilterBackend` no longer quietly changes queryset ordering. + ### 2.4.2 -**Date**: 3rd September 2014 +**Date**: [3rd September 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.2+Release%22+). * Bugfix: Fix broken pagination for 2.4.x series. ### 2.4.1 -**Date**: 1st September 2014 +**Date**: [1st September 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.1+Release%22+). * Bugfix: Fix broken login template for browsable API. ### 2.4.0 -**Date**: 29th August 2014 +**Date**: [29th August 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.0+Release%22+). **Django version requirements**: The lowest supported version of Django is now 1.4.2. @@ -717,3 +733,4 @@ This change will not affect user code, so long as it's following the recommended [2.1.0-notes]: https://groups.google.com/d/topic/django-rest-framework/Vv2M0CMY9bg/discussion [announcement]: rest-framework-2-announcement.md [#582]: https://github.com/tomchristie/django-rest-framework/issues/582 +[rfc-6266]: http://tools.ietf.org/html/rfc6266#section-4.3 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 8d82a4b90..7f724c185 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '2.4.2' +__version__ = '2.4.3' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2014 Tom Christie' From 8495cd898a5d34f00858a379b54e39cd19ded215 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Sep 2014 14:31:28 +0100 Subject: [PATCH 0861/1652] Drop 'No major point releases are currently planned.', cos they are. --- docs/topics/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 2174cddaa..16589f3b9 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -10,7 +10,7 @@ Minor version numbers (0.0.x) are used for changes that are API compatible. You Medium version numbers (0.x.0) may include API changes, in line with the [deprecation policy][deprecation-policy]. You should read the release notes carefully before upgrading between medium point releases. -Major version numbers (x.0.0) are reserved for substantial project milestones. No major point releases are currently planned. +Major version numbers (x.0.0) are reserved for substantial project milestones. ## Deprecation policy From c0150e619ca02a69d87c335a70c47644e9b2e509 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Sep 2014 14:59:59 +0100 Subject: [PATCH 0862/1652] Add BaseSerializer heading --- docs/topics/3.0-announcement.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 029d98960..cd883cdd8 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -30,6 +30,10 @@ See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-fr **TODO**: Drop`.object`, use `.validated_data` or get the instance with `.save()`. +#### The `BaseSerializer` class. + +**TODO** + #### Always use `fields`, not `exclude`. The `exclude` option is no longer available. You should use the more explicit `fields` option instead. From b361c54c5c198583e5085cf49ef44291ec09d2e8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Sep 2014 15:46:32 +0100 Subject: [PATCH 0863/1652] Test rejigging --- tests/test_model_serializer.py | 5 +++ tests/test_modelinfo.py | 31 ---------------- tests/test_templatetags.py | 35 ++++++++++++++++++ tests/test_urlizer.py | 37 ------------------- tests/{test_breadcrumbs.py => test_utils.py} | 38 ++++++++++++++++++-- 5 files changed, 75 insertions(+), 71 deletions(-) delete mode 100644 tests/test_modelinfo.py delete mode 100644 tests/test_urlizer.py rename tests/{test_breadcrumbs.py => test_utils.py} (67%) diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index ec922b6d5..d518dd581 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -24,6 +24,9 @@ class CustomField(models.Field): pass +COLOR_CHOICES = (('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')) + + class RegularFieldsModel(models.Model): """ A model class for testing regular flat fields. @@ -32,6 +35,7 @@ class RegularFieldsModel(models.Model): big_integer_field = models.BigIntegerField() boolean_field = models.BooleanField(default=False) char_field = models.CharField(max_length=100) + choices_field = models.CharField(max_length=100, choices=COLOR_CHOICES) comma_seperated_integer_field = models.CommaSeparatedIntegerField(max_length=100) date_field = models.DateField() datetime_field = models.DateTimeField() @@ -68,6 +72,7 @@ class TestRegularFieldMappings(TestCase): big_integer_field = IntegerField() boolean_field = BooleanField(default=False) char_field = CharField(max_length=100) + choices_field = ChoiceField(choices=[('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')]) comma_seperated_integer_field = CharField(max_length=100, validators=[<django.core.validators.RegexValidator object>]) date_field = DateField() datetime_field = DateTimeField() diff --git a/tests/test_modelinfo.py b/tests/test_modelinfo.py deleted file mode 100644 index 04b67f041..000000000 --- a/tests/test_modelinfo.py +++ /dev/null @@ -1,31 +0,0 @@ -from django.test import TestCase -from django.utils import six -from rest_framework.utils.model_meta import _resolve_model -from tests.models import BasicModel - - -class ResolveModelTests(TestCase): - """ - `_resolve_model` should return a Django model class given the - provided argument is a Django model class itself, or a properly - formatted string representation of one. - """ - def test_resolve_django_model(self): - resolved_model = _resolve_model(BasicModel) - self.assertEqual(resolved_model, BasicModel) - - def test_resolve_string_representation(self): - resolved_model = _resolve_model('tests.BasicModel') - self.assertEqual(resolved_model, BasicModel) - - def test_resolve_unicode_representation(self): - resolved_model = _resolve_model(six.text_type('tests.BasicModel')) - self.assertEqual(resolved_model, BasicModel) - - def test_resolve_non_django_model(self): - with self.assertRaises(ValueError): - _resolve_model(TestCase) - - def test_resolve_improper_string_representation(self): - with self.assertRaises(ValueError): - _resolve_model('BasicModel') diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index 75ee0eaa8..b04a937e0 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -4,6 +4,7 @@ from django.test import TestCase from rest_framework.test import APIRequestFactory from rest_framework.templatetags.rest_framework import add_query_param, urlize_quoted_links + factory = APIRequestFactory() @@ -49,3 +50,37 @@ class Issue1386Tests(TestCase): # example from issue #1386, this shouldn't raise an exception urlize_quoted_links("asdf:[/p]zxcv.com") + + +class URLizerTests(TestCase): + """ + Test if both JSON and YAML URLs are transformed into links well + """ + def _urlize_dict_check(self, data): + """ + For all items in dict test assert that the value is urlized key + """ + for original, urlized in data.items(): + assert urlize_quoted_links(original, nofollow=False) == urlized + + def test_json_with_url(self): + """ + Test if JSON URLs are transformed into links well + """ + data = {} + data['"url": "http://api/users/1/", '] = \ + '"url": "<a href="http://api/users/1/">http://api/users/1/</a>", ' + data['"foo_set": [\n "http://api/foos/1/"\n], '] = \ + '"foo_set": [\n "<a href="http://api/foos/1/">http://api/foos/1/</a>"\n], ' + self._urlize_dict_check(data) + + def test_yaml_with_url(self): + """ + Test if YAML URLs are transformed into links well + """ + data = {} + data['''{users: 'http://api/users/'}'''] = \ + '''{users: '<a href="http://api/users/">http://api/users/</a>'}''' + data['''foo_set: ['http://api/foos/1/']'''] = \ + '''foo_set: ['<a href="http://api/foos/1/">http://api/foos/1/</a>']''' + self._urlize_dict_check(data) diff --git a/tests/test_urlizer.py b/tests/test_urlizer.py deleted file mode 100644 index a77aa22ab..000000000 --- a/tests/test_urlizer.py +++ /dev/null @@ -1,37 +0,0 @@ -from __future__ import unicode_literals -from django.test import TestCase -from rest_framework.templatetags.rest_framework import urlize_quoted_links - - -class URLizerTests(TestCase): - """ - Test if both JSON and YAML URLs are transformed into links well - """ - def _urlize_dict_check(self, data): - """ - For all items in dict test assert that the value is urlized key - """ - for original, urlized in data.items(): - assert urlize_quoted_links(original, nofollow=False) == urlized - - def test_json_with_url(self): - """ - Test if JSON URLs are transformed into links well - """ - data = {} - data['"url": "http://api/users/1/", '] = \ - '"url": "<a href="http://api/users/1/">http://api/users/1/</a>", ' - data['"foo_set": [\n "http://api/foos/1/"\n], '] = \ - '"foo_set": [\n "<a href="http://api/foos/1/">http://api/foos/1/</a>"\n], ' - self._urlize_dict_check(data) - - def test_yaml_with_url(self): - """ - Test if YAML URLs are transformed into links well - """ - data = {} - data['''{users: 'http://api/users/'}'''] = \ - '''{users: '<a href="http://api/users/">http://api/users/</a>'}''' - data['''foo_set: ['http://api/foos/1/']'''] = \ - '''foo_set: ['<a href="http://api/foos/1/">http://api/foos/1/</a>']''' - self._urlize_dict_check(data) diff --git a/tests/test_breadcrumbs.py b/tests/test_utils.py similarity index 67% rename from tests/test_breadcrumbs.py rename to tests/test_utils.py index 780fd5c4d..96c5f997e 100644 --- a/tests/test_breadcrumbs.py +++ b/tests/test_utils.py @@ -1,8 +1,11 @@ from __future__ import unicode_literals from django.conf.urls import patterns, url from django.test import TestCase +from django.utils import six +from rest_framework.utils.model_meta import _resolve_model from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework.views import APIView +from tests.models import BasicModel class Root(APIView): @@ -24,6 +27,7 @@ class NestedResourceRoot(APIView): class NestedResourceInstance(APIView): pass + urlpatterns = patterns( '', url(r'^$', Root.as_view()), @@ -35,9 +39,10 @@ urlpatterns = patterns( class BreadcrumbTests(TestCase): - """Tests the breadcrumb functionality used by the HTML renderer.""" - - urls = 'tests.test_breadcrumbs' + """ + Tests the breadcrumb functionality used by the HTML renderer. + """ + urls = 'tests.test_utils' def test_root_breadcrumbs(self): url = '/' @@ -98,3 +103,30 @@ class BreadcrumbTests(TestCase): get_breadcrumbs(url), [('Root', '/')] ) + + +class ResolveModelTests(TestCase): + """ + `_resolve_model` should return a Django model class given the + provided argument is a Django model class itself, or a properly + formatted string representation of one. + """ + def test_resolve_django_model(self): + resolved_model = _resolve_model(BasicModel) + self.assertEqual(resolved_model, BasicModel) + + def test_resolve_string_representation(self): + resolved_model = _resolve_model('tests.BasicModel') + self.assertEqual(resolved_model, BasicModel) + + def test_resolve_unicode_representation(self): + resolved_model = _resolve_model(six.text_type('tests.BasicModel')) + self.assertEqual(resolved_model, BasicModel) + + def test_resolve_non_django_model(self): + with self.assertRaises(ValueError): + _resolve_model(TestCase) + + def test_resolve_improper_string_representation(self): + with self.assertRaises(ValueError): + _resolve_model('BasicModel') From cf72b9a8b755652cec4ad19a27488e3a79c2e401 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Sep 2014 16:43:13 +0100 Subject: [PATCH 0864/1652] Moar tests --- rest_framework/serializers.py | 2 ++ tests/test_model_serializer.py | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index d2740fc2a..d9f9c8cbc 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -24,6 +24,7 @@ from rest_framework.utils.field_mapping import ( lookup_class ) import copy +import inspect # Note: We do the following so that users of the framework can use this style: # @@ -268,6 +269,7 @@ class ListSerializer(BaseSerializer): def __init__(self, *args, **kwargs): self.child = kwargs.pop('child', copy.deepcopy(self.child)) assert self.child is not None, '`child` is a required argument.' + assert not inspect.isclass(self.child), '`child` has not been instantiated.' self.context = kwargs.pop('context', {}) kwargs.pop('partial', None) diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index d518dd581..d9f9efbe7 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -473,3 +473,36 @@ class TestIntegration(TestCase): 'through': [] } self.assertEqual(serializer.data, expected) + + +# Tests for bulk create using `ListSerializer`. + +class BulkCreateModel(models.Model): + name = models.CharField(max_length=10) + + +class TestBulkCreate(TestCase): + def test_bulk_create(self): + class BasicModelSerializer(serializers.ModelSerializer): + class Meta: + model = BulkCreateModel + fields = ('name',) + + class BulkCreateSerializer(serializers.ListSerializer): + child = BasicModelSerializer() + + data = [{'name': 'a'}, {'name': 'b'}, {'name': 'c'}] + serializer = BulkCreateSerializer(data=data) + assert serializer.is_valid() + + # Objects are returned by save(). + instances = serializer.save() + assert len(instances) == 3 + assert [item.name for item in instances] == ['a', 'b', 'c'] + + # Objects have been created in the database. + assert BulkCreateModel.objects.count() == 3 + assert list(BulkCreateModel.objects.values_list('name', flat=True)) == ['a', 'b', 'c'] + + # Serializer returns correct data. + assert serializer.data == data From af46fd6b00f1d7f018049c19094af58acb1415fb Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 22 Sep 2014 12:25:57 +0100 Subject: [PATCH 0865/1652] Field tests and associated cleanup --- rest_framework/fields.py | 64 ++++---- tests/test_fields.py | 334 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 365 insertions(+), 33 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 0c78b3fbb..db75ddf91 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -12,7 +12,6 @@ from rest_framework.utils import html, representation, humanize_datetime import datetime import decimal import inspect -import warnings class empty: @@ -395,7 +394,7 @@ class IntegerField(Field): class FloatField(Field): default_error_messages = { - 'invalid': _("'%s' value must be a float."), + 'invalid': _("A valid number is required."), } def __init__(self, **kwargs): @@ -410,20 +409,20 @@ class FloatField(Field): def to_internal_value(self, value): if value is None: return None - return float(value) + try: + return float(value) + except (TypeError, ValueError): + self.fail('invalid') def to_representation(self, value): if value is None: return None - try: - return float(value) - except (TypeError, ValueError): - self.fail('invalid', value=value) + return float(value) class DecimalField(Field): default_error_messages = { - 'invalid': _('Enter a number.'), + 'invalid': _('A valid number is required.'), 'max_value': _('Ensure this value is less than or equal to {max_value}.'), 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), 'max_digits': _('Ensure that there are no more than {max_digits} digits in total.'), @@ -485,7 +484,7 @@ class DecimalField(Field): if self.decimal_places is not None and decimals > self.decimal_places: self.fail('max_decimal_places', max_decimal_places=self.decimal_places) if self.max_digits is not None and self.decimal_places is not None and whole_digits > (self.max_digits - self.decimal_places): - self.fail('max_whole_digits', max_while_digits=self.max_digits - self.decimal_places) + self.fail('max_whole_digits', max_whole_digits=self.max_digits - self.decimal_places) return value @@ -511,6 +510,7 @@ class DecimalField(Field): class DateField(Field): default_error_messages = { 'invalid': _('Date has wrong format. Use one of these formats instead: {format}'), + 'datetime': _('Expected a date but got a datetime.'), } format = api_settings.DATE_FORMAT input_formats = api_settings.DATE_INPUT_FORMATS @@ -525,12 +525,7 @@ class DateField(Field): return None if isinstance(value, datetime.datetime): - if timezone and settings.USE_TZ and timezone.is_aware(value): - # Convert aware datetimes to the default time zone - # before casting them to dates (#17742). - default_timezone = timezone.get_default_timezone() - value = timezone.make_naive(value, default_timezone) - return value.date() + self.fail('datetime') if isinstance(value, datetime.date): return value @@ -570,35 +565,38 @@ class DateField(Field): class DateTimeField(Field): default_error_messages = { 'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}'), + 'date': _('Expected a datetime but got a date.'), } format = api_settings.DATETIME_FORMAT input_formats = api_settings.DATETIME_INPUT_FORMATS + default_timezone = timezone.get_default_timezone() if settings.USE_TZ else None - def __init__(self, format=None, input_formats=None, *args, **kwargs): + def __init__(self, format=None, input_formats=None, default_timezone=None, *args, **kwargs): self.format = format if format is not None else self.format self.input_formats = input_formats if input_formats is not None else self.input_formats + self.default_timezone = default_timezone if default_timezone is not None else self.default_timezone super(DateTimeField, self).__init__(*args, **kwargs) + def enforce_timezone(self, value): + """ + When `self.default_timezone` is `None`, always return naive datetimes. + When `self.default_timezone` is not `None`, always return aware datetimes. + """ + if (self.default_timezone is not None) and not timezone.is_aware(value): + return timezone.make_aware(value, self.default_timezone) + elif (self.default_timezone is None) and timezone.is_aware(value): + return timezone.make_naive(value, timezone.UTC()) + return value + def to_internal_value(self, value): if value in (None, ''): return None - if isinstance(value, datetime.datetime): - return value + if isinstance(value, datetime.date) and not isinstance(value, datetime.datetime): + self.fail('date') - if isinstance(value, datetime.date): - value = datetime.datetime(value.year, value.month, value.day) - if settings.USE_TZ: - # For backwards compatibility, interpret naive datetimes in - # local time. This won't work during DST change, but we can't - # do much about it, so we let the exceptions percolate up the - # call stack. - warnings.warn("DateTimeField received a naive datetime (%s)" - " while time zone support is active." % value, - RuntimeWarning) - default_timezone = timezone.get_default_timezone() - value = timezone.make_aware(value, default_timezone) - return value + if isinstance(value, datetime.datetime): + return self.enforce_timezone(value) for format in self.input_formats: if format.lower() == ISO_8601: @@ -608,14 +606,14 @@ class DateTimeField(Field): pass else: if parsed is not None: - return parsed + return self.enforce_timezone(parsed) else: try: parsed = datetime.datetime.strptime(value, format) except (ValueError, TypeError): pass else: - return parsed + return self.enforce_timezone(parsed) humanized_format = humanize_datetime.datetime_formats(self.input_formats) self.fail('invalid', format=humanized_format) diff --git a/tests/test_fields.py b/tests/test_fields.py index a92fafbcb..6ec18041c 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1,3 +1,337 @@ +from decimal import Decimal +from django.utils import timezone +from rest_framework import fields +import datetime +import pytest + + +class ValidAndInvalidValues: + """ + Base class for testing valid and invalid field values. + """ + def test_valid_values(self): + """ + Ensure that valid values return the expected validated data. + """ + for input_value, expected_output in self.valid_mappings.items(): + assert self.field.run_validation(input_value) == expected_output + + def test_invalid_values(self): + """ + Ensure that invalid values raise the expected validation error. + """ + for input_value, expected_failure in self.invalid_mappings.items(): + with pytest.raises(fields.ValidationError) as exc_info: + self.field.run_validation(input_value) + assert exc_info.value.messages == expected_failure + + +class TestCharField(ValidAndInvalidValues): + valid_mappings = { + 1: '1', + 'abc': 'abc' + } + invalid_mappings = { + '': ['This field may not be blank.'] + } + field = fields.CharField() + + +class TestBooleanField(ValidAndInvalidValues): + valid_mappings = { + 'true': True, + 'false': False, + '1': True, + '0': False, + 1: True, + 0: False, + True: True, + False: False, + } + invalid_mappings = { + 'foo': ['`foo` is not a valid boolean.'] + } + field = fields.BooleanField() + + +# Number types... + +class TestIntegerField(ValidAndInvalidValues): + """ + Valid and invalid values for `IntegerField`. + """ + valid_mappings = { + '1': 1, + '0': 0, + 1: 1, + 0: 0, + 1.0: 1, + 0.0: 0 + } + invalid_mappings = { + 'abc': ['A valid integer is required.'] + } + field = fields.IntegerField() + + +class TestMinMaxIntegerField(ValidAndInvalidValues): + """ + Valid and invalid values for `IntegerField` with min and max limits. + """ + valid_mappings = { + '1': 1, + '3': 3, + 1: 1, + 3: 3, + } + invalid_mappings = { + 0: ['Ensure this value is greater than or equal to 1.'], + 4: ['Ensure this value is less than or equal to 3.'], + '0': ['Ensure this value is greater than or equal to 1.'], + '4': ['Ensure this value is less than or equal to 3.'], + } + field = fields.IntegerField(min_value=1, max_value=3) + + +class TestFloatField(ValidAndInvalidValues): + """ + Valid and invalid values for `FloatField`. + """ + valid_mappings = { + '1': 1.0, + '0': 0.0, + 1: 1.0, + 0: 0.0, + 1.0: 1.0, + 0.0: 0.0, + } + invalid_mappings = { + 'abc': ["A valid number is required."] + } + field = fields.FloatField() + + +class TestMinMaxFloatField(ValidAndInvalidValues): + """ + Valid and invalid values for `FloatField` with min and max limits. + """ + valid_mappings = { + '1': 1, + '3': 3, + 1: 1, + 3: 3, + 1.0: 1.0, + 3.0: 3.0, + } + invalid_mappings = { + 0.9: ['Ensure this value is greater than or equal to 1.'], + 3.1: ['Ensure this value is less than or equal to 3.'], + '0.0': ['Ensure this value is greater than or equal to 1.'], + '3.1': ['Ensure this value is less than or equal to 3.'], + } + field = fields.FloatField(min_value=1, max_value=3) + + +class TestDecimalField(ValidAndInvalidValues): + """ + Valid and invalid values for `DecimalField`. + """ + valid_mappings = { + '12.3': Decimal('12.3'), + '0.1': Decimal('0.1'), + 10: Decimal('10'), + 0: Decimal('0'), + 12.3: Decimal('12.3'), + 0.1: Decimal('0.1'), + } + invalid_mappings = { + 'abc': ["A valid number is required."], + Decimal('Nan'): ["A valid number is required."], + Decimal('Inf'): ["A valid number is required."], + '12.345': ["Ensure that there are no more than 3 digits in total."], + '0.01': ["Ensure that there are no more than 1 decimal places."], + 123: ["Ensure that there are no more than 2 digits before the decimal point."] + } + field = fields.DecimalField(max_digits=3, decimal_places=1) + + +class TestMinMaxDecimalField(ValidAndInvalidValues): + """ + Valid and invalid values for `DecimalField` with min and max limits. + """ + valid_mappings = { + '10.0': 10.0, + '20.0': 20.0, + } + invalid_mappings = { + '9.9': ['Ensure this value is greater than or equal to 10.'], + '20.1': ['Ensure this value is less than or equal to 20.'], + } + field = fields.DecimalField( + max_digits=3, decimal_places=1, + min_value=10, max_value=20 + ) + + +# Date & time fields... + +class TestDateField(ValidAndInvalidValues): + """ + Valid and invalid values for `DateField`. + """ + valid_mappings = { + '2001-01-01': datetime.date(2001, 1, 1), + datetime.date(2001, 1, 1): datetime.date(2001, 1, 1), + } + invalid_mappings = { + 'abc': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]'], + '2001-99-99': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]'], + datetime.datetime(2001, 1, 1, 12, 00): ['Expected a date but got a datetime.'], + } + field = fields.DateField() + + +class TestCustomInputFormatDateField(ValidAndInvalidValues): + """ + Valid and invalid values for `DateField` with a cutom input format. + """ + valid_mappings = { + '1 Jan 2001': datetime.date(2001, 1, 1), + } + invalid_mappings = { + '2001-01-01': ['Date has wrong format. Use one of these formats instead: DD [Jan-Dec] YYYY'] + } + field = fields.DateField(input_formats=['%d %b %Y']) + + +class TestDateTimeField(ValidAndInvalidValues): + """ + Valid and invalid values for `DateTimeField`. + """ + valid_mappings = { + '2001-01-01 13:00': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), + '2001-01-01T13:00': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), + '2001-01-01T13:00Z': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), + '2001-01-01T14:00+0100': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), + datetime.datetime(2001, 1, 1, 13, 00): datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), + datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), + } + invalid_mappings = { + 'abc': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]'], + '2001-99-99T99:00': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]'], + datetime.date(2001, 1, 1): ['Expected a datetime but got a date.'], + } + field = fields.DateTimeField(default_timezone=timezone.UTC()) + + +class TestCustomInputFormatDateTimeField(ValidAndInvalidValues): + """ + Valid and invalid values for `DateTimeField` with a cutom input format. + """ + valid_mappings = { + '1:35pm, 1 Jan 2001': datetime.datetime(2001, 1, 1, 13, 35, tzinfo=timezone.UTC()), + } + invalid_mappings = { + '2001-01-01T20:50': ['Datetime has wrong format. Use one of these formats instead: hh:mm[AM|PM], DD [Jan-Dec] YYYY'] + } + field = fields.DateTimeField(default_timezone=timezone.UTC(), input_formats=['%I:%M%p, %d %b %Y']) + + +class TestNaiveDateTimeField(ValidAndInvalidValues): + """ + Valid and invalid values for `DateTimeField` with naive datetimes. + """ + valid_mappings = { + datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): datetime.datetime(2001, 1, 1, 13, 00), + '2001-01-01 13:00': datetime.datetime(2001, 1, 1, 13, 00), + } + invalid_mappings = {} + field = fields.DateTimeField(default_timezone=None) + + +# Choice types... + +class TestChoiceField(ValidAndInvalidValues): + """ + Valid and invalid values for `ChoiceField`. + """ + valid_mappings = { + 'poor': 'poor', + 'medium': 'medium', + 'good': 'good', + } + invalid_mappings = { + 'awful': ['`awful` is not a valid choice.'] + } + field = fields.ChoiceField( + choices=[ + ('poor', 'Poor quality'), + ('medium', 'Medium quality'), + ('good', 'Good quality'), + ] + ) + + +class TestChoiceFieldWithType(ValidAndInvalidValues): + """ + Valid and invalid values for a `Choice` field that uses an integer type, + instead of a char type. + """ + valid_mappings = { + '1': 1, + 3: 3, + } + invalid_mappings = { + 5: ['`5` is not a valid choice.'], + 'abc': ['`abc` is not a valid choice.'] + } + field = fields.ChoiceField( + choices=[ + (1, 'Poor quality'), + (2, 'Medium quality'), + (3, 'Good quality'), + ] + ) + + +class TestChoiceFieldWithListChoices(ValidAndInvalidValues): + """ + Valid and invalid values for a `Choice` field that uses a flat list for the + choices, rather than a list of pairs of (`value`, `description`). + """ + valid_mappings = { + 'poor': 'poor', + 'medium': 'medium', + 'good': 'good', + } + invalid_mappings = { + 'awful': ['`awful` is not a valid choice.'] + } + field = fields.ChoiceField(choices=('poor', 'medium', 'good')) + + +class TestMultipleChoiceField(ValidAndInvalidValues): + """ + Valid and invalid values for `MultipleChoiceField`. + """ + valid_mappings = { + (): set(), + ('aircon',): set(['aircon']), + ('aircon', 'manual'): set(['aircon', 'manual']), + } + invalid_mappings = { + 'abc': ['Expected a list of items but got type `str`'], + ('aircon', 'incorrect'): ['`incorrect` is not a valid choice.'] + } + field = fields.MultipleChoiceField( + choices=[ + ('aircon', 'AirCon'), + ('manual', 'Manual drive'), + ('diesel', 'Diesel'), + ] + ) + + # """ # General serializer field tests. # """ From afb3f8ab0ad6c33b147292e9777ba0ddf3871d14 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 22 Sep 2014 13:26:47 +0100 Subject: [PATCH 0866/1652] Tests and tweaks for text fields --- rest_framework/fields.py | 32 ++++++++++---- tests/test_fields.py | 93 +++++++++++++++++++++++++++++++++++----- 2 files changed, 107 insertions(+), 18 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index db75ddf91..35bd5c4b4 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -12,6 +12,7 @@ from rest_framework.utils import html, representation, humanize_datetime import datetime import decimal import inspect +import re class empty: @@ -325,7 +326,11 @@ class EmailField(CharField): default_error_messages = { 'invalid': _('Enter a valid email address.') } - default_validators = [validators.validate_email] + + def __init__(self, **kwargs): + super(EmailField, self).__init__(**kwargs) + validator = validators.EmailValidator(message=self.error_messages['invalid']) + self.validators = [validator] + self.validators def to_internal_value(self, data): if data == '' and not self.allow_blank: @@ -341,26 +346,37 @@ class EmailField(CharField): class RegexField(CharField): + default_error_messages = { + 'invalid': _('This value does not match the required pattern.') + } + def __init__(self, regex, **kwargs): - kwargs['validators'] = ( - [validators.RegexValidator(regex)] + - kwargs.get('validators', []) - ) super(RegexField, self).__init__(**kwargs) + validator = validators.RegexValidator(regex, message=self.error_messages['invalid']) + self.validators = [validator] + self.validators class SlugField(CharField): default_error_messages = { 'invalid': _("Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.") } - default_validators = [validators.validate_slug] + + def __init__(self, **kwargs): + super(SlugField, self).__init__(**kwargs) + slug_regex = re.compile(r'^[-a-zA-Z0-9_]+$') + validator = validators.RegexValidator(slug_regex, message=self.error_messages['invalid']) + self.validators = [validator] + self.validators class URLField(CharField): default_error_messages = { 'invalid': _("Enter a valid URL.") } - default_validators = [validators.URLValidator()] + + def __init__(self, **kwargs): + super(URLField, self).__init__(**kwargs) + validator = validators.URLValidator(message=self.error_messages['invalid']) + self.validators = [validator] + self.validators # Number types... @@ -642,7 +658,7 @@ class TimeField(Field): self.input_formats = input_formats if input_formats is not None else self.input_formats super(TimeField, self).__init__(*args, **kwargs) - def from_native(self, value): + def to_internal_value(self, value): if value in (None, ''): return None diff --git a/tests/test_fields.py b/tests/test_fields.py index 6ec18041c..ae7f19193 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -26,16 +26,7 @@ class ValidAndInvalidValues: assert exc_info.value.messages == expected_failure -class TestCharField(ValidAndInvalidValues): - valid_mappings = { - 1: '1', - 'abc': 'abc' - } - invalid_mappings = { - '': ['This field may not be blank.'] - } - field = fields.CharField() - +# Boolean types... class TestBooleanField(ValidAndInvalidValues): valid_mappings = { @@ -54,6 +45,60 @@ class TestBooleanField(ValidAndInvalidValues): field = fields.BooleanField() +# String types... + +class TestCharField(ValidAndInvalidValues): + valid_mappings = { + 1: '1', + 'abc': 'abc' + } + invalid_mappings = { + '': ['This field may not be blank.'] + } + field = fields.CharField() + + +class TestEmailField(ValidAndInvalidValues): + valid_mappings = { + 'example@example.com': 'example@example.com', + ' example@example.com ': 'example@example.com', + } + invalid_mappings = { + 'example.com': ['Enter a valid email address.'] + } + field = fields.EmailField() + + +class TestRegexField(ValidAndInvalidValues): + valid_mappings = { + 'a9': 'a9', + } + invalid_mappings = { + 'A9': ["This value does not match the required pattern."] + } + field = fields.RegexField(regex='[a-z][0-9]') + + +class TestSlugField(ValidAndInvalidValues): + valid_mappings = { + 'slug-99': 'slug-99', + } + invalid_mappings = { + 'slug 99': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."] + } + field = fields.SlugField() + + +class TestURLField(ValidAndInvalidValues): + valid_mappings = { + 'http://example.com': 'http://example.com', + } + invalid_mappings = { + 'example.com': ['Enter a valid URL.'] + } + field = fields.URLField() + + # Number types... class TestIntegerField(ValidAndInvalidValues): @@ -249,6 +294,34 @@ class TestNaiveDateTimeField(ValidAndInvalidValues): field = fields.DateTimeField(default_timezone=None) +class TestTimeField(ValidAndInvalidValues): + """ + Valid and invalid values for `TimeField`. + """ + valid_mappings = { + '13:00': datetime.time(13, 00), + datetime.time(13, 00): datetime.time(13, 00), + } + invalid_mappings = { + 'abc': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]]'], + '99:99': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]]'], + } + field = fields.TimeField() + + +class TestCustomInputFormatTimeField(ValidAndInvalidValues): + """ + Valid and invalid values for `TimeField` with a custom input format. + """ + valid_mappings = { + '1:00pm': datetime.time(13, 00), + } + invalid_mappings = { + '13:00': ['Time has wrong format. Use one of these formats instead: hh:mm[AM|PM]'], + } + field = fields.TimeField(input_formats=['%I:%M%p']) + + # Choice types... class TestChoiceField(ValidAndInvalidValues): From c54f394904c3f93211b8aa073de4e9e50110f831 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 22 Sep 2014 13:57:45 +0100 Subject: [PATCH 0867/1652] Ensure 'messages' in fields are respected in preference to default validator messages --- rest_framework/compat.py | 19 +++++++++++++++++++ rest_framework/fields.py | 34 ++++++++++++++++++++++------------ 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 7c05bed9c..2b4ddb021 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -121,6 +121,25 @@ else: return [m.upper() for m in self.http_method_names if hasattr(self, m)] + +# MinValueValidator and MaxValueValidator only accept `message` in 1.8+ +if django.VERSION >= (1, 8): + from django.core.validators import MinValueValidator, MaxValueValidator +else: + from django.core.validators import MinValueValidator as DjangoMinValueValidator + from django.core.validators import MaxValueValidator as DjangoMaxValueValidator + + class MinValueValidator(DjangoMinValueValidator): + def __init__(self, *args, **kwargs): + self.message = kwargs.pop('message', self.message) + super(MinValueValidator, self).__init__(*args, **kwargs) + + class MaxValueValidator(DjangoMaxValueValidator): + def __init__(self, *args, **kwargs): + self.message = kwargs.pop('message', self.message) + super(MaxValueValidator, self).__init__(*args, **kwargs) + + # PATCH method is not implemented by Django if 'patch' not in View.http_method_names: View.http_method_names = View.http_method_names + ['patch'] diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 35bd5c4b4..5105dfcb4 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -6,7 +6,7 @@ from django.utils.dateparse import parse_date, parse_datetime, parse_time from django.utils.encoding import is_protected_type from django.utils.translation import ugettext_lazy as _ from rest_framework import ISO_8601 -from rest_framework.compat import smart_text +from rest_framework.compat import smart_text, MinValueValidator, MaxValueValidator from rest_framework.settings import api_settings from rest_framework.utils import html, representation, humanize_datetime import datetime @@ -330,7 +330,7 @@ class EmailField(CharField): def __init__(self, **kwargs): super(EmailField, self).__init__(**kwargs) validator = validators.EmailValidator(message=self.error_messages['invalid']) - self.validators = [validator] + self.validators + self.validators.append(validator) def to_internal_value(self, data): if data == '' and not self.allow_blank: @@ -353,7 +353,7 @@ class RegexField(CharField): def __init__(self, regex, **kwargs): super(RegexField, self).__init__(**kwargs) validator = validators.RegexValidator(regex, message=self.error_messages['invalid']) - self.validators = [validator] + self.validators + self.validators.append(validator) class SlugField(CharField): @@ -365,7 +365,7 @@ class SlugField(CharField): super(SlugField, self).__init__(**kwargs) slug_regex = re.compile(r'^[-a-zA-Z0-9_]+$') validator = validators.RegexValidator(slug_regex, message=self.error_messages['invalid']) - self.validators = [validator] + self.validators + self.validators.append(validator) class URLField(CharField): @@ -376,14 +376,16 @@ class URLField(CharField): def __init__(self, **kwargs): super(URLField, self).__init__(**kwargs) validator = validators.URLValidator(message=self.error_messages['invalid']) - self.validators = [validator] + self.validators + self.validators.append(validator) # Number types... class IntegerField(Field): default_error_messages = { - 'invalid': _('A valid integer is required.') + 'invalid': _('A valid integer is required.'), + 'max_value': _('Ensure this value is less than or equal to {max_value}.'), + 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), } def __init__(self, **kwargs): @@ -391,9 +393,11 @@ class IntegerField(Field): min_value = kwargs.pop('min_value', None) super(IntegerField, self).__init__(**kwargs) if max_value is not None: - self.validators.append(validators.MaxValueValidator(max_value)) + message = self.error_messages['max_value'].format(max_value=max_value) + self.validators.append(MaxValueValidator(max_value, message=message)) if min_value is not None: - self.validators.append(validators.MinValueValidator(min_value)) + message = self.error_messages['min_value'].format(min_value=min_value) + self.validators.append(MinValueValidator(min_value, message=message)) def to_internal_value(self, data): try: @@ -411,6 +415,8 @@ class IntegerField(Field): class FloatField(Field): default_error_messages = { 'invalid': _("A valid number is required."), + 'max_value': _('Ensure this value is less than or equal to {max_value}.'), + 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), } def __init__(self, **kwargs): @@ -418,9 +424,11 @@ class FloatField(Field): min_value = kwargs.pop('min_value', None) super(FloatField, self).__init__(**kwargs) if max_value is not None: - self.validators.append(validators.MaxValueValidator(max_value)) + message = self.error_messages['max_value'].format(max_value=max_value) + self.validators.append(MaxValueValidator(max_value, message=message)) if min_value is not None: - self.validators.append(validators.MinValueValidator(min_value)) + message = self.error_messages['min_value'].format(min_value=min_value) + self.validators.append(MinValueValidator(min_value, message=message)) def to_internal_value(self, value): if value is None: @@ -454,9 +462,11 @@ class DecimalField(Field): self.coerce_to_string = coerce_to_string if (coerce_to_string is not None) else self.coerce_to_string super(DecimalField, self).__init__(**kwargs) if max_value is not None: - self.validators.append(validators.MaxValueValidator(max_value)) + message = self.error_messages['max_value'].format(max_value=max_value) + self.validators.append(MaxValueValidator(max_value, message=message)) if min_value is not None: - self.validators.append(validators.MinValueValidator(min_value)) + message = self.error_messages['min_value'].format(min_value=min_value) + self.validators.append(MinValueValidator(min_value, message=message)) def to_internal_value(self, value): """ From 249253a144ba4381581809fb3f27959c7bd6e577 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 22 Sep 2014 14:54:33 +0100 Subject: [PATCH 0868/1652] Fix compat issues --- rest_framework/fields.py | 13 ++++++++++--- tests/test_fields.py | 31 ++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 5105dfcb4..5fb99a42f 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -209,8 +209,10 @@ class Field(object): """ Validate a simple representation and return the internal value. - The provided data may be `empty` if no representation was included. - May return `empty` if the field should not be included in the + The provided data may be `empty` if no representation was included + in the input. + + May raise `SkipField` if the field should not be included in the validated data. """ if data is empty: @@ -223,6 +225,10 @@ class Field(object): return value def run_validators(self, value): + """ + Test the given value against all the validators on the field, + and either raise a `ValidationError` or simply return. + """ if value in (None, '', [], (), {}): return @@ -753,8 +759,9 @@ class MultipleChoiceField(ChoiceField): } def to_internal_value(self, data): - if not hasattr(data, '__iter__'): + if isinstance(data, type('')) or not hasattr(data, '__iter__'): self.fail('not_a_list', input_type=type(data).__name__) + return set([ super(MultipleChoiceField, self).to_internal_value(item) for item in data diff --git a/tests/test_fields.py b/tests/test_fields.py index ae7f19193..e03ece544 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -5,22 +5,31 @@ import datetime import pytest +def get_items(mapping_or_list_of_two_tuples): + # Tests accept either lists of two tuples, or dictionaries. + if isinstance(mapping_or_list_of_two_tuples, dict): + # {value: expected} + return mapping_or_list_of_two_tuples.items() + # [(value, expected), ...] + return mapping_or_list_of_two_tuples + + class ValidAndInvalidValues: """ - Base class for testing valid and invalid field values. + Base class for testing valid and invalid input values. """ def test_valid_values(self): """ Ensure that valid values return the expected validated data. """ - for input_value, expected_output in self.valid_mappings.items(): + for input_value, expected_output in get_items(self.valid_mappings): assert self.field.run_validation(input_value) == expected_output def test_invalid_values(self): """ Ensure that invalid values raise the expected validation error. """ - for input_value, expected_failure in self.invalid_mappings.items(): + for input_value, expected_failure in get_items(self.invalid_mappings): with pytest.raises(fields.ValidationError) as exc_info: self.field.run_validation(input_value) assert exc_info.value.messages == expected_failure @@ -189,14 +198,14 @@ class TestDecimalField(ValidAndInvalidValues): 12.3: Decimal('12.3'), 0.1: Decimal('0.1'), } - invalid_mappings = { - 'abc': ["A valid number is required."], - Decimal('Nan'): ["A valid number is required."], - Decimal('Inf'): ["A valid number is required."], - '12.345': ["Ensure that there are no more than 3 digits in total."], - '0.01': ["Ensure that there are no more than 1 decimal places."], - 123: ["Ensure that there are no more than 2 digits before the decimal point."] - } + invalid_mappings = ( + ('abc', ["A valid number is required."]), + (Decimal('Nan'), ["A valid number is required."]), + (Decimal('Inf'), ["A valid number is required."]), + ('12.345', ["Ensure that there are no more than 3 digits in total."]), + ('0.01', ["Ensure that there are no more than 1 decimal places."]), + (123, ["Ensure that there are no more than 2 digits before the decimal point."]) + ) field = fields.DecimalField(max_digits=3, decimal_places=1) From 4db23cae213decc3e8a8613ad5c76a545f8cfb1a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 22 Sep 2014 15:34:06 +0100 Subject: [PATCH 0869/1652] Tweaks to DecimalField --- rest_framework/fields.py | 25 +++-- tests/test_fields.py | 233 ++++++++++++++++++++++++++------------- 2 files changed, 172 insertions(+), 86 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 5fb99a42f..db7ceabb1 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -521,20 +521,21 @@ class DecimalField(Field): return value def to_representation(self, value): - if isinstance(value, decimal.Decimal): - context = decimal.getcontext().copy() - context.prec = self.max_digits - quantized = value.quantize( - decimal.Decimal('.1') ** self.decimal_places, - context=context - ) - if not self.coerce_to_string: - return quantized - return '{0:f}'.format(quantized) + if value in (None, ''): + return None + if not isinstance(value, decimal.Decimal): + value = decimal.Decimal(value) + + context = decimal.getcontext().copy() + context.prec = self.max_digits + quantized = value.quantize( + decimal.Decimal('.1') ** self.decimal_places, + context=context + ) if not self.coerce_to_string: - return value - return '%.*f' % (self.max_decimal_places, value) + return quantized + return '{0:f}'.format(quantized) # Date & time fields... diff --git a/tests/test_fields.py b/tests/test_fields.py index e03ece544..0f445d415 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -14,31 +14,35 @@ def get_items(mapping_or_list_of_two_tuples): return mapping_or_list_of_two_tuples -class ValidAndInvalidValues: +class FieldValues: """ Base class for testing valid and invalid input values. """ - def test_valid_values(self): + def test_valid_inputs(self): """ Ensure that valid values return the expected validated data. """ - for input_value, expected_output in get_items(self.valid_mappings): + for input_value, expected_output in get_items(self.valid_inputs): assert self.field.run_validation(input_value) == expected_output - def test_invalid_values(self): + def test_invalid_inputs(self): """ Ensure that invalid values raise the expected validation error. """ - for input_value, expected_failure in get_items(self.invalid_mappings): + for input_value, expected_failure in get_items(self.invalid_inputs): with pytest.raises(fields.ValidationError) as exc_info: self.field.run_validation(input_value) assert exc_info.value.messages == expected_failure + def test_outputs(self): + for output_value, expected_output in get_items(self.outputs): + assert self.field.to_representation(output_value) == expected_output + # Boolean types... -class TestBooleanField(ValidAndInvalidValues): - valid_mappings = { +class TestBooleanField(FieldValues): + valid_inputs = { 'true': True, 'false': False, '1': True, @@ -48,73 +52,92 @@ class TestBooleanField(ValidAndInvalidValues): True: True, False: False, } - invalid_mappings = { + invalid_inputs = { 'foo': ['`foo` is not a valid boolean.'] } + outputs = { + 'true': True, + 'false': False, + '1': True, + '0': False, + 1: True, + 0: False, + True: True, + False: False, + 'other': True + } field = fields.BooleanField() # String types... -class TestCharField(ValidAndInvalidValues): - valid_mappings = { +class TestCharField(FieldValues): + valid_inputs = { 1: '1', 'abc': 'abc' } - invalid_mappings = { + invalid_inputs = { '': ['This field may not be blank.'] } + outputs = { + 1: '1', + 'abc': 'abc' + } field = fields.CharField() -class TestEmailField(ValidAndInvalidValues): - valid_mappings = { +class TestEmailField(FieldValues): + valid_inputs = { 'example@example.com': 'example@example.com', ' example@example.com ': 'example@example.com', } - invalid_mappings = { + invalid_inputs = { 'example.com': ['Enter a valid email address.'] } + outputs = {} field = fields.EmailField() -class TestRegexField(ValidAndInvalidValues): - valid_mappings = { +class TestRegexField(FieldValues): + valid_inputs = { 'a9': 'a9', } - invalid_mappings = { + invalid_inputs = { 'A9': ["This value does not match the required pattern."] } + outputs = {} field = fields.RegexField(regex='[a-z][0-9]') -class TestSlugField(ValidAndInvalidValues): - valid_mappings = { +class TestSlugField(FieldValues): + valid_inputs = { 'slug-99': 'slug-99', } - invalid_mappings = { + invalid_inputs = { 'slug 99': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."] } + outputs = {} field = fields.SlugField() -class TestURLField(ValidAndInvalidValues): - valid_mappings = { +class TestURLField(FieldValues): + valid_inputs = { 'http://example.com': 'http://example.com', } - invalid_mappings = { + invalid_inputs = { 'example.com': ['Enter a valid URL.'] } + outputs = {} field = fields.URLField() # Number types... -class TestIntegerField(ValidAndInvalidValues): +class TestIntegerField(FieldValues): """ Valid and invalid values for `IntegerField`. """ - valid_mappings = { + valid_inputs = { '1': 1, '0': 0, 1: 1, @@ -122,36 +145,45 @@ class TestIntegerField(ValidAndInvalidValues): 1.0: 1, 0.0: 0 } - invalid_mappings = { + invalid_inputs = { 'abc': ['A valid integer is required.'] } + outputs = { + '1': 1, + '0': 0, + 1: 1, + 0: 0, + 1.0: 1, + 0.0: 0 + } field = fields.IntegerField() -class TestMinMaxIntegerField(ValidAndInvalidValues): +class TestMinMaxIntegerField(FieldValues): """ Valid and invalid values for `IntegerField` with min and max limits. """ - valid_mappings = { + valid_inputs = { '1': 1, '3': 3, 1: 1, 3: 3, } - invalid_mappings = { + invalid_inputs = { 0: ['Ensure this value is greater than or equal to 1.'], 4: ['Ensure this value is less than or equal to 3.'], '0': ['Ensure this value is greater than or equal to 1.'], '4': ['Ensure this value is less than or equal to 3.'], } + outputs = {} field = fields.IntegerField(min_value=1, max_value=3) -class TestFloatField(ValidAndInvalidValues): +class TestFloatField(FieldValues): """ Valid and invalid values for `FloatField`. """ - valid_mappings = { + valid_inputs = { '1': 1.0, '0': 0.0, 1: 1.0, @@ -159,17 +191,25 @@ class TestFloatField(ValidAndInvalidValues): 1.0: 1.0, 0.0: 0.0, } - invalid_mappings = { + invalid_inputs = { 'abc': ["A valid number is required."] } + outputs = { + '1': 1.0, + '0': 0.0, + 1: 1.0, + 0: 0.0, + 1.0: 1.0, + 0.0: 0.0, + } field = fields.FloatField() -class TestMinMaxFloatField(ValidAndInvalidValues): +class TestMinMaxFloatField(FieldValues): """ Valid and invalid values for `FloatField` with min and max limits. """ - valid_mappings = { + valid_inputs = { '1': 1, '3': 3, 1: 1, @@ -177,20 +217,21 @@ class TestMinMaxFloatField(ValidAndInvalidValues): 1.0: 1.0, 3.0: 3.0, } - invalid_mappings = { + invalid_inputs = { 0.9: ['Ensure this value is greater than or equal to 1.'], 3.1: ['Ensure this value is less than or equal to 3.'], '0.0': ['Ensure this value is greater than or equal to 1.'], '3.1': ['Ensure this value is less than or equal to 3.'], } + outputs = {} field = fields.FloatField(min_value=1, max_value=3) -class TestDecimalField(ValidAndInvalidValues): +class TestDecimalField(FieldValues): """ Valid and invalid values for `DecimalField`. """ - valid_mappings = { + valid_inputs = { '12.3': Decimal('12.3'), '0.1': Decimal('0.1'), 10: Decimal('10'), @@ -198,7 +239,7 @@ class TestDecimalField(ValidAndInvalidValues): 12.3: Decimal('12.3'), 0.1: Decimal('0.1'), } - invalid_mappings = ( + invalid_inputs = ( ('abc', ["A valid number is required."]), (Decimal('Nan'), ["A valid number is required."]), (Decimal('Inf'), ["A valid number is required."]), @@ -206,63 +247,98 @@ class TestDecimalField(ValidAndInvalidValues): ('0.01', ["Ensure that there are no more than 1 decimal places."]), (123, ["Ensure that there are no more than 2 digits before the decimal point."]) ) + outputs = { + '1': '1.0', + '0': '0.0', + '1.09': '1.1', + '0.04': '0.0', + 1: '1.0', + 0: '0.0', + Decimal('1.0'): '1.0', + Decimal('0.0'): '0.0', + Decimal('1.09'): '1.1', + Decimal('0.04'): '0.0', + } field = fields.DecimalField(max_digits=3, decimal_places=1) -class TestMinMaxDecimalField(ValidAndInvalidValues): +class TestMinMaxDecimalField(FieldValues): """ Valid and invalid values for `DecimalField` with min and max limits. """ - valid_mappings = { + valid_inputs = { '10.0': 10.0, '20.0': 20.0, } - invalid_mappings = { + invalid_inputs = { '9.9': ['Ensure this value is greater than or equal to 10.'], '20.1': ['Ensure this value is less than or equal to 20.'], } + outputs = {} field = fields.DecimalField( max_digits=3, decimal_places=1, min_value=10, max_value=20 ) +class TestNoStringCoercionDecimalField(FieldValues): + """ + Output values for `DecimalField` with `coerce_to_string=False`. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + 1.09: Decimal('1.1'), + 0.04: Decimal('0.0'), + '1.09': Decimal('1.1'), + '0.04': Decimal('0.0'), + Decimal('1.09'): Decimal('1.1'), + Decimal('0.04'): Decimal('0.0'), + } + field = fields.DecimalField( + max_digits=3, decimal_places=1, + coerce_to_string=False + ) + + # Date & time fields... -class TestDateField(ValidAndInvalidValues): +class TestDateField(FieldValues): """ Valid and invalid values for `DateField`. """ - valid_mappings = { + valid_inputs = { '2001-01-01': datetime.date(2001, 1, 1), datetime.date(2001, 1, 1): datetime.date(2001, 1, 1), } - invalid_mappings = { + invalid_inputs = { 'abc': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]'], '2001-99-99': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]'], datetime.datetime(2001, 1, 1, 12, 00): ['Expected a date but got a datetime.'], } + outputs = {} field = fields.DateField() -class TestCustomInputFormatDateField(ValidAndInvalidValues): +class TestCustomInputFormatDateField(FieldValues): """ Valid and invalid values for `DateField` with a cutom input format. """ - valid_mappings = { + valid_inputs = { '1 Jan 2001': datetime.date(2001, 1, 1), } - invalid_mappings = { + invalid_inputs = { '2001-01-01': ['Date has wrong format. Use one of these formats instead: DD [Jan-Dec] YYYY'] } + outputs = {} field = fields.DateField(input_formats=['%d %b %Y']) -class TestDateTimeField(ValidAndInvalidValues): +class TestDateTimeField(FieldValues): """ Valid and invalid values for `DateTimeField`. """ - valid_mappings = { + valid_inputs = { '2001-01-01 13:00': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), '2001-01-01T13:00': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), '2001-01-01T13:00Z': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), @@ -270,81 +346,87 @@ class TestDateTimeField(ValidAndInvalidValues): datetime.datetime(2001, 1, 1, 13, 00): datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), } - invalid_mappings = { + invalid_inputs = { 'abc': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]'], '2001-99-99T99:00': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]'], datetime.date(2001, 1, 1): ['Expected a datetime but got a date.'], } + outputs = {} field = fields.DateTimeField(default_timezone=timezone.UTC()) -class TestCustomInputFormatDateTimeField(ValidAndInvalidValues): +class TestCustomInputFormatDateTimeField(FieldValues): """ Valid and invalid values for `DateTimeField` with a cutom input format. """ - valid_mappings = { + valid_inputs = { '1:35pm, 1 Jan 2001': datetime.datetime(2001, 1, 1, 13, 35, tzinfo=timezone.UTC()), } - invalid_mappings = { + invalid_inputs = { '2001-01-01T20:50': ['Datetime has wrong format. Use one of these formats instead: hh:mm[AM|PM], DD [Jan-Dec] YYYY'] } + outputs = {} field = fields.DateTimeField(default_timezone=timezone.UTC(), input_formats=['%I:%M%p, %d %b %Y']) -class TestNaiveDateTimeField(ValidAndInvalidValues): +class TestNaiveDateTimeField(FieldValues): """ Valid and invalid values for `DateTimeField` with naive datetimes. """ - valid_mappings = { + valid_inputs = { datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): datetime.datetime(2001, 1, 1, 13, 00), '2001-01-01 13:00': datetime.datetime(2001, 1, 1, 13, 00), } - invalid_mappings = {} + invalid_inputs = {} + outputs = {} field = fields.DateTimeField(default_timezone=None) -class TestTimeField(ValidAndInvalidValues): +class TestTimeField(FieldValues): """ Valid and invalid values for `TimeField`. """ - valid_mappings = { + valid_inputs = { '13:00': datetime.time(13, 00), datetime.time(13, 00): datetime.time(13, 00), } - invalid_mappings = { + invalid_inputs = { 'abc': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]]'], '99:99': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]]'], } + outputs = {} field = fields.TimeField() -class TestCustomInputFormatTimeField(ValidAndInvalidValues): +class TestCustomInputFormatTimeField(FieldValues): """ Valid and invalid values for `TimeField` with a custom input format. """ - valid_mappings = { + valid_inputs = { '1:00pm': datetime.time(13, 00), } - invalid_mappings = { + invalid_inputs = { '13:00': ['Time has wrong format. Use one of these formats instead: hh:mm[AM|PM]'], } + outputs = {} field = fields.TimeField(input_formats=['%I:%M%p']) # Choice types... -class TestChoiceField(ValidAndInvalidValues): +class TestChoiceField(FieldValues): """ Valid and invalid values for `ChoiceField`. """ - valid_mappings = { + valid_inputs = { 'poor': 'poor', 'medium': 'medium', 'good': 'good', } - invalid_mappings = { + invalid_inputs = { 'awful': ['`awful` is not a valid choice.'] } + outputs = {} field = fields.ChoiceField( choices=[ ('poor', 'Poor quality'), @@ -354,19 +436,20 @@ class TestChoiceField(ValidAndInvalidValues): ) -class TestChoiceFieldWithType(ValidAndInvalidValues): +class TestChoiceFieldWithType(FieldValues): """ Valid and invalid values for a `Choice` field that uses an integer type, instead of a char type. """ - valid_mappings = { + valid_inputs = { '1': 1, 3: 3, } - invalid_mappings = { + invalid_inputs = { 5: ['`5` is not a valid choice.'], 'abc': ['`abc` is not a valid choice.'] } + outputs = {} field = fields.ChoiceField( choices=[ (1, 'Poor quality'), @@ -376,35 +459,37 @@ class TestChoiceFieldWithType(ValidAndInvalidValues): ) -class TestChoiceFieldWithListChoices(ValidAndInvalidValues): +class TestChoiceFieldWithListChoices(FieldValues): """ Valid and invalid values for a `Choice` field that uses a flat list for the choices, rather than a list of pairs of (`value`, `description`). """ - valid_mappings = { + valid_inputs = { 'poor': 'poor', 'medium': 'medium', 'good': 'good', } - invalid_mappings = { + invalid_inputs = { 'awful': ['`awful` is not a valid choice.'] } + outputs = {} field = fields.ChoiceField(choices=('poor', 'medium', 'good')) -class TestMultipleChoiceField(ValidAndInvalidValues): +class TestMultipleChoiceField(FieldValues): """ Valid and invalid values for `MultipleChoiceField`. """ - valid_mappings = { + valid_inputs = { (): set(), ('aircon',): set(['aircon']), ('aircon', 'manual'): set(['aircon', 'manual']), } - invalid_mappings = { + invalid_inputs = { 'abc': ['Expected a list of items but got type `str`'], ('aircon', 'incorrect'): ['`incorrect` is not a valid choice.'] } + outputs = {} field = fields.MultipleChoiceField( choices=[ ('aircon', 'AirCon'), From 5586b6581d9d8db05276c08f2c6deffec04ade4f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 22 Sep 2014 16:02:59 +0100 Subject: [PATCH 0870/1652] Support format=None for date/time fields --- rest_framework/fields.py | 12 +++--- tests/test_fields.py | 85 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 88 insertions(+), 9 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index db7ceabb1..cbd3334a3 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -548,8 +548,8 @@ class DateField(Field): format = api_settings.DATE_FORMAT input_formats = api_settings.DATE_INPUT_FORMATS - def __init__(self, format=None, input_formats=None, *args, **kwargs): - self.format = format if format is not None else self.format + def __init__(self, format=empty, input_formats=None, *args, **kwargs): + self.format = format if format is not empty else self.format self.input_formats = input_formats if input_formats is not None else self.input_formats super(DateField, self).__init__(*args, **kwargs) @@ -604,8 +604,8 @@ class DateTimeField(Field): input_formats = api_settings.DATETIME_INPUT_FORMATS default_timezone = timezone.get_default_timezone() if settings.USE_TZ else None - def __init__(self, format=None, input_formats=None, default_timezone=None, *args, **kwargs): - self.format = format if format is not None else self.format + def __init__(self, format=empty, input_formats=None, default_timezone=None, *args, **kwargs): + self.format = format if format is not empty else self.format self.input_formats = input_formats if input_formats is not None else self.input_formats self.default_timezone = default_timezone if default_timezone is not None else self.default_timezone super(DateTimeField, self).__init__(*args, **kwargs) @@ -670,8 +670,8 @@ class TimeField(Field): format = api_settings.TIME_FORMAT input_formats = api_settings.TIME_INPUT_FORMATS - def __init__(self, format=None, input_formats=None, *args, **kwargs): - self.format = format if format is not None else self.format + def __init__(self, format=empty, input_formats=None, *args, **kwargs): + self.format = format if format is not empty else self.format self.input_formats = input_formats if input_formats is not None else self.input_formats super(TimeField, self).__init__(*args, **kwargs) diff --git a/tests/test_fields.py b/tests/test_fields.py index 0f445d415..b221089ce 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -316,7 +316,9 @@ class TestDateField(FieldValues): '2001-99-99': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]'], datetime.datetime(2001, 1, 1, 12, 00): ['Expected a date but got a datetime.'], } - outputs = {} + outputs = { + datetime.date(2001, 1, 1): '2001-01-01', + } field = fields.DateField() @@ -334,6 +336,30 @@ class TestCustomInputFormatDateField(FieldValues): field = fields.DateField(input_formats=['%d %b %Y']) +class TestCustomOutputFormatDateField(FieldValues): + """ + Values for `DateField` with a custom output format. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + datetime.date(2001, 1, 1): '01 Jan 2001' + } + field = fields.DateField(format='%d %b %Y') + + +class TestNoOutputFormatDateField(FieldValues): + """ + Values for `DateField` with no output format. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + datetime.date(2001, 1, 1): datetime.date(2001, 1, 1) + } + field = fields.DateField(format=None) + + class TestDateTimeField(FieldValues): """ Valid and invalid values for `DateTimeField`. @@ -351,7 +377,10 @@ class TestDateTimeField(FieldValues): '2001-99-99T99:00': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]'], datetime.date(2001, 1, 1): ['Expected a datetime but got a date.'], } - outputs = {} + outputs = { + datetime.datetime(2001, 1, 1, 13, 00): '2001-01-01T13:00:00', + datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z', + } field = fields.DateTimeField(default_timezone=timezone.UTC()) @@ -369,6 +398,30 @@ class TestCustomInputFormatDateTimeField(FieldValues): field = fields.DateTimeField(default_timezone=timezone.UTC(), input_formats=['%I:%M%p, %d %b %Y']) +class TestCustomOutputFormatDateTimeField(FieldValues): + """ + Values for `DateTimeField` with a custom output format. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + datetime.datetime(2001, 1, 1, 13, 00): '01:00PM, 01 Jan 2001', + } + field = fields.DateTimeField(format='%I:%M%p, %d %b %Y') + + +class TestNoOutputFormatDateTimeField(FieldValues): + """ + Values for `DateTimeField` with no output format. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + datetime.datetime(2001, 1, 1, 13, 00): datetime.datetime(2001, 1, 1, 13, 00), + } + field = fields.DateTimeField(format=None) + + class TestNaiveDateTimeField(FieldValues): """ Valid and invalid values for `DateTimeField` with naive datetimes. @@ -394,7 +447,9 @@ class TestTimeField(FieldValues): 'abc': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]]'], '99:99': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]]'], } - outputs = {} + outputs = { + datetime.time(13, 00): '13:00:00' + } field = fields.TimeField() @@ -412,6 +467,30 @@ class TestCustomInputFormatTimeField(FieldValues): field = fields.TimeField(input_formats=['%I:%M%p']) +class TestCustomOutputFormatTimeField(FieldValues): + """ + Values for `TimeField` with a custom output format. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + datetime.time(13, 00): '01:00PM' + } + field = fields.TimeField(format='%I:%M%p') + + +class TestNoOutputFormatTimeField(FieldValues): + """ + Values for `TimeField` with a no output format. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + datetime.time(13, 00): datetime.time(13, 00) + } + field = fields.TimeField(format=None) + + # Choice types... class TestChoiceField(FieldValues): From e5f0a97595ff9280c7876fc917f6feb27b5ea95d Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 22 Sep 2014 16:45:06 +0100 Subject: [PATCH 0871/1652] More compat fixes --- rest_framework/compat.py | 23 +++++++++++++++++++++++ rest_framework/fields.py | 8 ++++---- tests/test_fields.py | 10 ++++++---- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 2b4ddb021..7303c32a6 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -139,6 +139,29 @@ else: self.message = kwargs.pop('message', self.message) super(MaxValueValidator, self).__init__(*args, **kwargs) +# URLValidator only accept `message` in 1.6+ +if django.VERSION >= (1, 6): + from django.core.validators import URLValidator +else: + from django.core.validators import URLValidator as DjangoURLValidator + + class URLValidator(DjangoURLValidator): + def __init__(self, *args, **kwargs): + self.message = kwargs.pop('message', self.message) + super(URLValidator, self).__init__(*args, **kwargs) + + +# EmailValidator requires explicit regex prior to 1.6+ +if django.VERSION >= (1, 6): + from django.core.validators import EmailValidator +else: + from django.core.validators import EmailValidator as DjangoEmailValidator + from django.core.validators import email_re + + class EmailValidator(DjangoEmailValidator): + def __init__(self, *args, **kwargs): + super(EmailValidator, self).__init__(email_re, *args, **kwargs) + # PATCH method is not implemented by Django if 'patch' not in View.http_method_names: diff --git a/rest_framework/fields.py b/rest_framework/fields.py index cbd3334a3..12975ae49 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -6,7 +6,7 @@ from django.utils.dateparse import parse_date, parse_datetime, parse_time from django.utils.encoding import is_protected_type from django.utils.translation import ugettext_lazy as _ from rest_framework import ISO_8601 -from rest_framework.compat import smart_text, MinValueValidator, MaxValueValidator +from rest_framework.compat import smart_text, EmailValidator, MinValueValidator, MaxValueValidator, URLValidator from rest_framework.settings import api_settings from rest_framework.utils import html, representation, humanize_datetime import datetime @@ -335,7 +335,7 @@ class EmailField(CharField): def __init__(self, **kwargs): super(EmailField, self).__init__(**kwargs) - validator = validators.EmailValidator(message=self.error_messages['invalid']) + validator = EmailValidator(message=self.error_messages['invalid']) self.validators.append(validator) def to_internal_value(self, data): @@ -381,7 +381,7 @@ class URLField(CharField): def __init__(self, **kwargs): super(URLField, self).__init__(**kwargs) - validator = validators.URLValidator(message=self.error_messages['invalid']) + validator = URLValidator(message=self.error_messages['invalid']) self.validators.append(validator) @@ -525,7 +525,7 @@ class DecimalField(Field): return None if not isinstance(value, decimal.Decimal): - value = decimal.Decimal(value) + value = decimal.Decimal(str(value).strip()) context = decimal.getcontext().copy() context.prec = self.max_digits diff --git a/tests/test_fields.py b/tests/test_fields.py index b221089ce..8c50aaba6 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -2,6 +2,7 @@ from decimal import Decimal from django.utils import timezone from rest_framework import fields import datetime +import django import pytest @@ -92,7 +93,7 @@ class TestEmailField(FieldValues): ' example@example.com ': 'example@example.com', } invalid_inputs = { - 'example.com': ['Enter a valid email address.'] + 'examplecom': ['Enter a valid email address.'] } outputs = {} field = fields.EmailField() @@ -267,8 +268,8 @@ class TestMinMaxDecimalField(FieldValues): Valid and invalid values for `DecimalField` with min and max limits. """ valid_inputs = { - '10.0': 10.0, - '20.0': 20.0, + '10.0': Decimal('10.0'), + '20.0': Decimal('20.0'), } invalid_inputs = { '9.9': ['Ensure this value is greater than or equal to 10.'], @@ -368,9 +369,10 @@ class TestDateTimeField(FieldValues): '2001-01-01 13:00': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), '2001-01-01T13:00': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), '2001-01-01T13:00Z': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), - '2001-01-01T14:00+0100': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), datetime.datetime(2001, 1, 1, 13, 00): datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), + # Note that 1.4 does not support timezone string parsing. + '2001-01-01T14:00+01:00' if (django.VERSION > (1, 4)) else '2001-01-01T13:00Z': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()) } invalid_inputs = { 'abc': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]'], From b5454dd02290130a7fb0a0e375f3efecc58edc6d Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 22 Sep 2014 16:50:04 +0100 Subject: [PATCH 0872/1652] Tests and tweaks for choice fields --- rest_framework/fields.py | 4 ++-- tests/test_fields.py | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 12975ae49..500018f3d 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -750,7 +750,7 @@ class ChoiceField(Field): self.fail('invalid_choice', input=data) def to_representation(self, value): - return value + return self.choice_strings_to_values[str(value)] class MultipleChoiceField(ChoiceField): @@ -769,7 +769,7 @@ class MultipleChoiceField(ChoiceField): ]) def to_representation(self, value): - return value + return [self.choice_strings_to_values[str(item)] for item in value] # File types... diff --git a/tests/test_fields.py b/tests/test_fields.py index 8c50aaba6..3343123f4 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -505,9 +505,11 @@ class TestChoiceField(FieldValues): 'good': 'good', } invalid_inputs = { - 'awful': ['`awful` is not a valid choice.'] + 'amazing': ['`amazing` is not a valid choice.'] + } + outputs = { + 'good': 'good' } - outputs = {} field = fields.ChoiceField( choices=[ ('poor', 'Poor quality'), @@ -530,7 +532,10 @@ class TestChoiceFieldWithType(FieldValues): 5: ['`5` is not a valid choice.'], 'abc': ['`abc` is not a valid choice.'] } - outputs = {} + outputs = { + '1': 1, + 1: 1 + } field = fields.ChoiceField( choices=[ (1, 'Poor quality'), @@ -553,7 +558,9 @@ class TestChoiceFieldWithListChoices(FieldValues): invalid_inputs = { 'awful': ['`awful` is not a valid choice.'] } - outputs = {} + outputs = { + 'good': 'good' + } field = fields.ChoiceField(choices=('poor', 'medium', 'good')) From 5a95baf2a2258fb5297062ac18582129c05fb320 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 22 Sep 2014 16:52:57 +0100 Subject: [PATCH 0873/1652] Tests & tweaks for ChoiceField --- rest_framework/fields.py | 4 +++- tests/test_fields.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 500018f3d..80eadf1e8 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -769,7 +769,9 @@ class MultipleChoiceField(ChoiceField): ]) def to_representation(self, value): - return [self.choice_strings_to_values[str(item)] for item in value] + return set([ + self.choice_strings_to_values[str(item)] for item in value + ]) # File types... diff --git a/tests/test_fields.py b/tests/test_fields.py index 3343123f4..3cfc1b88f 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -577,7 +577,9 @@ class TestMultipleChoiceField(FieldValues): 'abc': ['Expected a list of items but got type `str`'], ('aircon', 'incorrect'): ['`incorrect` is not a valid choice.'] } - outputs = {} + outputs = [ + (['aircon', 'manual'], set(['aircon', 'manual'])) + ] field = fields.MultipleChoiceField( choices=[ ('aircon', 'AirCon'), From 5d80f7f932bfcc0630ac0fdbf07072a53197b98f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 22 Sep 2014 17:46:02 +0100 Subject: [PATCH 0874/1652] allow_blank, allow_null --- rest_framework/fields.py | 40 +- tests/test_field_options.py | 55 ++ tests/test_field_values.py | 607 +++++++++++++ tests/test_fields.py | 1633 ----------------------------------- 4 files changed, 678 insertions(+), 1657 deletions(-) create mode 100644 tests/test_field_options.py create mode 100644 tests/test_field_values.py delete mode 100644 tests/test_fields.py diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 80eadf1e8..48a3e1ab9 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -98,14 +98,15 @@ class Field(object): _creation_counter = 0 default_error_messages = { - 'required': _('This field is required.') + 'required': _('This field is required.'), + 'null': _('This field may not be null.') } default_validators = [] def __init__(self, read_only=False, write_only=False, required=None, default=empty, initial=None, source=None, label=None, help_text=None, style=None, - error_messages=None, validators=[]): + error_messages=None, validators=[], allow_null=False): self._creation_counter = Field._creation_counter Field._creation_counter += 1 @@ -129,6 +130,7 @@ class Field(object): self.help_text = help_text self.style = {} if style is None else style self.validators = validators or self.default_validators[:] + self.allow_null = allow_null # Collect default error message from self and parent classes messages = {} @@ -220,6 +222,11 @@ class Field(object): self.fail('required') return self.get_default() + if data is None: + if not self.allow_null: + self.fail('null') + return None + value = self.to_internal_value(data) self.run_validators(value) return value @@ -315,11 +322,14 @@ class CharField(Field): self.min_length = kwargs.pop('min_length', None) super(CharField, self).__init__(**kwargs) + def run_validation(self, data=empty): + if data == '': + if not self.allow_blank: + self.fail('blank') + return '' + return super(CharField, self).run_validation(data) + def to_internal_value(self, data): - if data == '' and not self.allow_blank: - self.fail('blank') - if data is None: - return None return str(data) def to_representation(self, value): @@ -339,10 +349,6 @@ class EmailField(CharField): self.validators.append(validator) def to_internal_value(self, data): - if data == '' and not self.allow_blank: - self.fail('blank') - if data is None: - return None return str(data).strip() def to_representation(self, value): @@ -437,8 +443,6 @@ class FloatField(Field): self.validators.append(MinValueValidator(min_value, message=message)) def to_internal_value(self, value): - if value is None: - return None try: return float(value) except (TypeError, ValueError): @@ -481,9 +485,6 @@ class DecimalField(Field): than max_digits in the number, and no more than decimal_places digits after the decimal point. """ - if value in (None, ''): - return None - value = smart_text(value).strip() try: value = decimal.Decimal(value) @@ -554,9 +555,6 @@ class DateField(Field): super(DateField, self).__init__(*args, **kwargs) def to_internal_value(self, value): - if value in (None, ''): - return None - if isinstance(value, datetime.datetime): self.fail('datetime') @@ -622,9 +620,6 @@ class DateTimeField(Field): return value def to_internal_value(self, value): - if value in (None, ''): - return None - if isinstance(value, datetime.date) and not isinstance(value, datetime.datetime): self.fail('date') @@ -676,9 +671,6 @@ class TimeField(Field): super(TimeField, self).__init__(*args, **kwargs) def to_internal_value(self, value): - if value in (None, ''): - return None - if isinstance(value, datetime.time): return value diff --git a/tests/test_field_options.py b/tests/test_field_options.py new file mode 100644 index 000000000..444bd4248 --- /dev/null +++ b/tests/test_field_options.py @@ -0,0 +1,55 @@ +from rest_framework import fields +import pytest + + +class TestFieldOptions: + def test_required(self): + """ + By default a field must be included in the input. + """ + field = fields.IntegerField() + with pytest.raises(fields.ValidationError) as exc_info: + field.run_validation() + assert exc_info.value.messages == ['This field is required.'] + + def test_not_required(self): + """ + If `required=False` then a field may be omitted from the input. + """ + field = fields.IntegerField(required=False) + with pytest.raises(fields.SkipField): + field.run_validation() + + def test_disallow_null(self): + """ + By default `None` is not a valid input. + """ + field = fields.IntegerField() + with pytest.raises(fields.ValidationError) as exc_info: + field.run_validation(None) + assert exc_info.value.messages == ['This field may not be null.'] + + def test_allow_null(self): + """ + If `allow_null=True` then `None` is a valid input. + """ + field = fields.IntegerField(allow_null=True) + output = field.run_validation(None) + assert output is None + + def test_disallow_blank(self): + """ + By default '' is not a valid input. + """ + field = fields.CharField() + with pytest.raises(fields.ValidationError) as exc_info: + field.run_validation('') + assert exc_info.value.messages == ['This field may not be blank.'] + + def test_allow_blank(self): + """ + If `allow_blank=True` then '' is a valid input. + """ + field = fields.CharField(allow_blank=True) + output = field.run_validation('') + assert output is '' diff --git a/tests/test_field_values.py b/tests/test_field_values.py new file mode 100644 index 000000000..bac50f0bc --- /dev/null +++ b/tests/test_field_values.py @@ -0,0 +1,607 @@ +from decimal import Decimal +from django.utils import timezone +from rest_framework import fields +import datetime +import django +import pytest + + +def get_items(mapping_or_list_of_two_tuples): + # Tests accept either lists of two tuples, or dictionaries. + if isinstance(mapping_or_list_of_two_tuples, dict): + # {value: expected} + return mapping_or_list_of_two_tuples.items() + # [(value, expected), ...] + return mapping_or_list_of_two_tuples + + +class FieldValues: + """ + Base class for testing valid and invalid input values. + """ + def test_valid_inputs(self): + """ + Ensure that valid values return the expected validated data. + """ + for input_value, expected_output in get_items(self.valid_inputs): + assert self.field.run_validation(input_value) == expected_output + + def test_invalid_inputs(self): + """ + Ensure that invalid values raise the expected validation error. + """ + for input_value, expected_failure in get_items(self.invalid_inputs): + with pytest.raises(fields.ValidationError) as exc_info: + self.field.run_validation(input_value) + assert exc_info.value.messages == expected_failure + + def test_outputs(self): + for output_value, expected_output in get_items(self.outputs): + assert self.field.to_representation(output_value) == expected_output + + +# Boolean types... + +class TestBooleanField(FieldValues): + """ + Valid and invalid values for `BooleanField`. + """ + valid_inputs = { + 'true': True, + 'false': False, + '1': True, + '0': False, + 1: True, + 0: False, + True: True, + False: False, + } + invalid_inputs = { + 'foo': ['`foo` is not a valid boolean.'] + } + outputs = { + 'true': True, + 'false': False, + '1': True, + '0': False, + 1: True, + 0: False, + True: True, + False: False, + 'other': True + } + field = fields.BooleanField() + + +# String types... + +class TestCharField(FieldValues): + """ + Valid and invalid values for `CharField`. + """ + valid_inputs = { + 1: '1', + 'abc': 'abc' + } + invalid_inputs = { + '': ['This field may not be blank.'] + } + outputs = { + 1: '1', + 'abc': 'abc' + } + field = fields.CharField() + + +class TestEmailField(FieldValues): + """ + Valid and invalid values for `EmailField`. + """ + valid_inputs = { + 'example@example.com': 'example@example.com', + ' example@example.com ': 'example@example.com', + } + invalid_inputs = { + 'examplecom': ['Enter a valid email address.'] + } + outputs = {} + field = fields.EmailField() + + +class TestRegexField(FieldValues): + """ + Valid and invalid values for `RegexField`. + """ + valid_inputs = { + 'a9': 'a9', + } + invalid_inputs = { + 'A9': ["This value does not match the required pattern."] + } + outputs = {} + field = fields.RegexField(regex='[a-z][0-9]') + + +class TestSlugField(FieldValues): + """ + Valid and invalid values for `SlugField`. + """ + valid_inputs = { + 'slug-99': 'slug-99', + } + invalid_inputs = { + 'slug 99': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."] + } + outputs = {} + field = fields.SlugField() + + +class TestURLField(FieldValues): + """ + Valid and invalid values for `URLField`. + """ + valid_inputs = { + 'http://example.com': 'http://example.com', + } + invalid_inputs = { + 'example.com': ['Enter a valid URL.'] + } + outputs = {} + field = fields.URLField() + + +# Number types... + +class TestIntegerField(FieldValues): + """ + Valid and invalid values for `IntegerField`. + """ + valid_inputs = { + '1': 1, + '0': 0, + 1: 1, + 0: 0, + 1.0: 1, + 0.0: 0 + } + invalid_inputs = { + 'abc': ['A valid integer is required.'] + } + outputs = { + '1': 1, + '0': 0, + 1: 1, + 0: 0, + 1.0: 1, + 0.0: 0 + } + field = fields.IntegerField() + + +class TestMinMaxIntegerField(FieldValues): + """ + Valid and invalid values for `IntegerField` with min and max limits. + """ + valid_inputs = { + '1': 1, + '3': 3, + 1: 1, + 3: 3, + } + invalid_inputs = { + 0: ['Ensure this value is greater than or equal to 1.'], + 4: ['Ensure this value is less than or equal to 3.'], + '0': ['Ensure this value is greater than or equal to 1.'], + '4': ['Ensure this value is less than or equal to 3.'], + } + outputs = {} + field = fields.IntegerField(min_value=1, max_value=3) + + +class TestFloatField(FieldValues): + """ + Valid and invalid values for `FloatField`. + """ + valid_inputs = { + '1': 1.0, + '0': 0.0, + 1: 1.0, + 0: 0.0, + 1.0: 1.0, + 0.0: 0.0, + } + invalid_inputs = { + 'abc': ["A valid number is required."] + } + outputs = { + '1': 1.0, + '0': 0.0, + 1: 1.0, + 0: 0.0, + 1.0: 1.0, + 0.0: 0.0, + } + field = fields.FloatField() + + +class TestMinMaxFloatField(FieldValues): + """ + Valid and invalid values for `FloatField` with min and max limits. + """ + valid_inputs = { + '1': 1, + '3': 3, + 1: 1, + 3: 3, + 1.0: 1.0, + 3.0: 3.0, + } + invalid_inputs = { + 0.9: ['Ensure this value is greater than or equal to 1.'], + 3.1: ['Ensure this value is less than or equal to 3.'], + '0.0': ['Ensure this value is greater than or equal to 1.'], + '3.1': ['Ensure this value is less than or equal to 3.'], + } + outputs = {} + field = fields.FloatField(min_value=1, max_value=3) + + +class TestDecimalField(FieldValues): + """ + Valid and invalid values for `DecimalField`. + """ + valid_inputs = { + '12.3': Decimal('12.3'), + '0.1': Decimal('0.1'), + 10: Decimal('10'), + 0: Decimal('0'), + 12.3: Decimal('12.3'), + 0.1: Decimal('0.1'), + } + invalid_inputs = ( + ('abc', ["A valid number is required."]), + (Decimal('Nan'), ["A valid number is required."]), + (Decimal('Inf'), ["A valid number is required."]), + ('12.345', ["Ensure that there are no more than 3 digits in total."]), + ('0.01', ["Ensure that there are no more than 1 decimal places."]), + (123, ["Ensure that there are no more than 2 digits before the decimal point."]) + ) + outputs = { + '1': '1.0', + '0': '0.0', + '1.09': '1.1', + '0.04': '0.0', + 1: '1.0', + 0: '0.0', + Decimal('1.0'): '1.0', + Decimal('0.0'): '0.0', + Decimal('1.09'): '1.1', + Decimal('0.04'): '0.0', + } + field = fields.DecimalField(max_digits=3, decimal_places=1) + + +class TestMinMaxDecimalField(FieldValues): + """ + Valid and invalid values for `DecimalField` with min and max limits. + """ + valid_inputs = { + '10.0': Decimal('10.0'), + '20.0': Decimal('20.0'), + } + invalid_inputs = { + '9.9': ['Ensure this value is greater than or equal to 10.'], + '20.1': ['Ensure this value is less than or equal to 20.'], + } + outputs = {} + field = fields.DecimalField( + max_digits=3, decimal_places=1, + min_value=10, max_value=20 + ) + + +class TestNoStringCoercionDecimalField(FieldValues): + """ + Output values for `DecimalField` with `coerce_to_string=False`. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + 1.09: Decimal('1.1'), + 0.04: Decimal('0.0'), + '1.09': Decimal('1.1'), + '0.04': Decimal('0.0'), + Decimal('1.09'): Decimal('1.1'), + Decimal('0.04'): Decimal('0.0'), + } + field = fields.DecimalField( + max_digits=3, decimal_places=1, + coerce_to_string=False + ) + + +# Date & time fields... + +class TestDateField(FieldValues): + """ + Valid and invalid values for `DateField`. + """ + valid_inputs = { + '2001-01-01': datetime.date(2001, 1, 1), + datetime.date(2001, 1, 1): datetime.date(2001, 1, 1), + } + invalid_inputs = { + 'abc': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]'], + '2001-99-99': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]'], + datetime.datetime(2001, 1, 1, 12, 00): ['Expected a date but got a datetime.'], + } + outputs = { + datetime.date(2001, 1, 1): '2001-01-01', + } + field = fields.DateField() + + +class TestCustomInputFormatDateField(FieldValues): + """ + Valid and invalid values for `DateField` with a cutom input format. + """ + valid_inputs = { + '1 Jan 2001': datetime.date(2001, 1, 1), + } + invalid_inputs = { + '2001-01-01': ['Date has wrong format. Use one of these formats instead: DD [Jan-Dec] YYYY'] + } + outputs = {} + field = fields.DateField(input_formats=['%d %b %Y']) + + +class TestCustomOutputFormatDateField(FieldValues): + """ + Values for `DateField` with a custom output format. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + datetime.date(2001, 1, 1): '01 Jan 2001' + } + field = fields.DateField(format='%d %b %Y') + + +class TestNoOutputFormatDateField(FieldValues): + """ + Values for `DateField` with no output format. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + datetime.date(2001, 1, 1): datetime.date(2001, 1, 1) + } + field = fields.DateField(format=None) + + +class TestDateTimeField(FieldValues): + """ + Valid and invalid values for `DateTimeField`. + """ + valid_inputs = { + '2001-01-01 13:00': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), + '2001-01-01T13:00': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), + '2001-01-01T13:00Z': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), + datetime.datetime(2001, 1, 1, 13, 00): datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), + datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), + # Note that 1.4 does not support timezone string parsing. + '2001-01-01T14:00+01:00' if (django.VERSION > (1, 4)) else '2001-01-01T13:00Z': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()) + } + invalid_inputs = { + 'abc': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]'], + '2001-99-99T99:00': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]'], + datetime.date(2001, 1, 1): ['Expected a datetime but got a date.'], + } + outputs = { + datetime.datetime(2001, 1, 1, 13, 00): '2001-01-01T13:00:00', + datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z', + } + field = fields.DateTimeField(default_timezone=timezone.UTC()) + + +class TestCustomInputFormatDateTimeField(FieldValues): + """ + Valid and invalid values for `DateTimeField` with a cutom input format. + """ + valid_inputs = { + '1:35pm, 1 Jan 2001': datetime.datetime(2001, 1, 1, 13, 35, tzinfo=timezone.UTC()), + } + invalid_inputs = { + '2001-01-01T20:50': ['Datetime has wrong format. Use one of these formats instead: hh:mm[AM|PM], DD [Jan-Dec] YYYY'] + } + outputs = {} + field = fields.DateTimeField(default_timezone=timezone.UTC(), input_formats=['%I:%M%p, %d %b %Y']) + + +class TestCustomOutputFormatDateTimeField(FieldValues): + """ + Values for `DateTimeField` with a custom output format. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + datetime.datetime(2001, 1, 1, 13, 00): '01:00PM, 01 Jan 2001', + } + field = fields.DateTimeField(format='%I:%M%p, %d %b %Y') + + +class TestNoOutputFormatDateTimeField(FieldValues): + """ + Values for `DateTimeField` with no output format. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + datetime.datetime(2001, 1, 1, 13, 00): datetime.datetime(2001, 1, 1, 13, 00), + } + field = fields.DateTimeField(format=None) + + +class TestNaiveDateTimeField(FieldValues): + """ + Valid and invalid values for `DateTimeField` with naive datetimes. + """ + valid_inputs = { + datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): datetime.datetime(2001, 1, 1, 13, 00), + '2001-01-01 13:00': datetime.datetime(2001, 1, 1, 13, 00), + } + invalid_inputs = {} + outputs = {} + field = fields.DateTimeField(default_timezone=None) + + +class TestTimeField(FieldValues): + """ + Valid and invalid values for `TimeField`. + """ + valid_inputs = { + '13:00': datetime.time(13, 00), + datetime.time(13, 00): datetime.time(13, 00), + } + invalid_inputs = { + 'abc': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]]'], + '99:99': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]]'], + } + outputs = { + datetime.time(13, 00): '13:00:00' + } + field = fields.TimeField() + + +class TestCustomInputFormatTimeField(FieldValues): + """ + Valid and invalid values for `TimeField` with a custom input format. + """ + valid_inputs = { + '1:00pm': datetime.time(13, 00), + } + invalid_inputs = { + '13:00': ['Time has wrong format. Use one of these formats instead: hh:mm[AM|PM]'], + } + outputs = {} + field = fields.TimeField(input_formats=['%I:%M%p']) + + +class TestCustomOutputFormatTimeField(FieldValues): + """ + Values for `TimeField` with a custom output format. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + datetime.time(13, 00): '01:00PM' + } + field = fields.TimeField(format='%I:%M%p') + + +class TestNoOutputFormatTimeField(FieldValues): + """ + Values for `TimeField` with a no output format. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = { + datetime.time(13, 00): datetime.time(13, 00) + } + field = fields.TimeField(format=None) + + +# Choice types... + +class TestChoiceField(FieldValues): + """ + Valid and invalid values for `ChoiceField`. + """ + valid_inputs = { + 'poor': 'poor', + 'medium': 'medium', + 'good': 'good', + } + invalid_inputs = { + 'amazing': ['`amazing` is not a valid choice.'] + } + outputs = { + 'good': 'good' + } + field = fields.ChoiceField( + choices=[ + ('poor', 'Poor quality'), + ('medium', 'Medium quality'), + ('good', 'Good quality'), + ] + ) + + +class TestChoiceFieldWithType(FieldValues): + """ + Valid and invalid values for a `Choice` field that uses an integer type, + instead of a char type. + """ + valid_inputs = { + '1': 1, + 3: 3, + } + invalid_inputs = { + 5: ['`5` is not a valid choice.'], + 'abc': ['`abc` is not a valid choice.'] + } + outputs = { + '1': 1, + 1: 1 + } + field = fields.ChoiceField( + choices=[ + (1, 'Poor quality'), + (2, 'Medium quality'), + (3, 'Good quality'), + ] + ) + + +class TestChoiceFieldWithListChoices(FieldValues): + """ + Valid and invalid values for a `Choice` field that uses a flat list for the + choices, rather than a list of pairs of (`value`, `description`). + """ + valid_inputs = { + 'poor': 'poor', + 'medium': 'medium', + 'good': 'good', + } + invalid_inputs = { + 'awful': ['`awful` is not a valid choice.'] + } + outputs = { + 'good': 'good' + } + field = fields.ChoiceField(choices=('poor', 'medium', 'good')) + + +class TestMultipleChoiceField(FieldValues): + """ + Valid and invalid values for `MultipleChoiceField`. + """ + valid_inputs = { + (): set(), + ('aircon',): set(['aircon']), + ('aircon', 'manual'): set(['aircon', 'manual']), + } + invalid_inputs = { + 'abc': ['Expected a list of items but got type `str`'], + ('aircon', 'incorrect'): ['`incorrect` is not a valid choice.'] + } + outputs = [ + (['aircon', 'manual'], set(['aircon', 'manual'])) + ] + field = fields.MultipleChoiceField( + choices=[ + ('aircon', 'AirCon'), + ('manual', 'Manual drive'), + ('diesel', 'Diesel'), + ] + ) diff --git a/tests/test_fields.py b/tests/test_fields.py deleted file mode 100644 index 3cfc1b88f..000000000 --- a/tests/test_fields.py +++ /dev/null @@ -1,1633 +0,0 @@ -from decimal import Decimal -from django.utils import timezone -from rest_framework import fields -import datetime -import django -import pytest - - -def get_items(mapping_or_list_of_two_tuples): - # Tests accept either lists of two tuples, or dictionaries. - if isinstance(mapping_or_list_of_two_tuples, dict): - # {value: expected} - return mapping_or_list_of_two_tuples.items() - # [(value, expected), ...] - return mapping_or_list_of_two_tuples - - -class FieldValues: - """ - Base class for testing valid and invalid input values. - """ - def test_valid_inputs(self): - """ - Ensure that valid values return the expected validated data. - """ - for input_value, expected_output in get_items(self.valid_inputs): - assert self.field.run_validation(input_value) == expected_output - - def test_invalid_inputs(self): - """ - Ensure that invalid values raise the expected validation error. - """ - for input_value, expected_failure in get_items(self.invalid_inputs): - with pytest.raises(fields.ValidationError) as exc_info: - self.field.run_validation(input_value) - assert exc_info.value.messages == expected_failure - - def test_outputs(self): - for output_value, expected_output in get_items(self.outputs): - assert self.field.to_representation(output_value) == expected_output - - -# Boolean types... - -class TestBooleanField(FieldValues): - valid_inputs = { - 'true': True, - 'false': False, - '1': True, - '0': False, - 1: True, - 0: False, - True: True, - False: False, - } - invalid_inputs = { - 'foo': ['`foo` is not a valid boolean.'] - } - outputs = { - 'true': True, - 'false': False, - '1': True, - '0': False, - 1: True, - 0: False, - True: True, - False: False, - 'other': True - } - field = fields.BooleanField() - - -# String types... - -class TestCharField(FieldValues): - valid_inputs = { - 1: '1', - 'abc': 'abc' - } - invalid_inputs = { - '': ['This field may not be blank.'] - } - outputs = { - 1: '1', - 'abc': 'abc' - } - field = fields.CharField() - - -class TestEmailField(FieldValues): - valid_inputs = { - 'example@example.com': 'example@example.com', - ' example@example.com ': 'example@example.com', - } - invalid_inputs = { - 'examplecom': ['Enter a valid email address.'] - } - outputs = {} - field = fields.EmailField() - - -class TestRegexField(FieldValues): - valid_inputs = { - 'a9': 'a9', - } - invalid_inputs = { - 'A9': ["This value does not match the required pattern."] - } - outputs = {} - field = fields.RegexField(regex='[a-z][0-9]') - - -class TestSlugField(FieldValues): - valid_inputs = { - 'slug-99': 'slug-99', - } - invalid_inputs = { - 'slug 99': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."] - } - outputs = {} - field = fields.SlugField() - - -class TestURLField(FieldValues): - valid_inputs = { - 'http://example.com': 'http://example.com', - } - invalid_inputs = { - 'example.com': ['Enter a valid URL.'] - } - outputs = {} - field = fields.URLField() - - -# Number types... - -class TestIntegerField(FieldValues): - """ - Valid and invalid values for `IntegerField`. - """ - valid_inputs = { - '1': 1, - '0': 0, - 1: 1, - 0: 0, - 1.0: 1, - 0.0: 0 - } - invalid_inputs = { - 'abc': ['A valid integer is required.'] - } - outputs = { - '1': 1, - '0': 0, - 1: 1, - 0: 0, - 1.0: 1, - 0.0: 0 - } - field = fields.IntegerField() - - -class TestMinMaxIntegerField(FieldValues): - """ - Valid and invalid values for `IntegerField` with min and max limits. - """ - valid_inputs = { - '1': 1, - '3': 3, - 1: 1, - 3: 3, - } - invalid_inputs = { - 0: ['Ensure this value is greater than or equal to 1.'], - 4: ['Ensure this value is less than or equal to 3.'], - '0': ['Ensure this value is greater than or equal to 1.'], - '4': ['Ensure this value is less than or equal to 3.'], - } - outputs = {} - field = fields.IntegerField(min_value=1, max_value=3) - - -class TestFloatField(FieldValues): - """ - Valid and invalid values for `FloatField`. - """ - valid_inputs = { - '1': 1.0, - '0': 0.0, - 1: 1.0, - 0: 0.0, - 1.0: 1.0, - 0.0: 0.0, - } - invalid_inputs = { - 'abc': ["A valid number is required."] - } - outputs = { - '1': 1.0, - '0': 0.0, - 1: 1.0, - 0: 0.0, - 1.0: 1.0, - 0.0: 0.0, - } - field = fields.FloatField() - - -class TestMinMaxFloatField(FieldValues): - """ - Valid and invalid values for `FloatField` with min and max limits. - """ - valid_inputs = { - '1': 1, - '3': 3, - 1: 1, - 3: 3, - 1.0: 1.0, - 3.0: 3.0, - } - invalid_inputs = { - 0.9: ['Ensure this value is greater than or equal to 1.'], - 3.1: ['Ensure this value is less than or equal to 3.'], - '0.0': ['Ensure this value is greater than or equal to 1.'], - '3.1': ['Ensure this value is less than or equal to 3.'], - } - outputs = {} - field = fields.FloatField(min_value=1, max_value=3) - - -class TestDecimalField(FieldValues): - """ - Valid and invalid values for `DecimalField`. - """ - valid_inputs = { - '12.3': Decimal('12.3'), - '0.1': Decimal('0.1'), - 10: Decimal('10'), - 0: Decimal('0'), - 12.3: Decimal('12.3'), - 0.1: Decimal('0.1'), - } - invalid_inputs = ( - ('abc', ["A valid number is required."]), - (Decimal('Nan'), ["A valid number is required."]), - (Decimal('Inf'), ["A valid number is required."]), - ('12.345', ["Ensure that there are no more than 3 digits in total."]), - ('0.01', ["Ensure that there are no more than 1 decimal places."]), - (123, ["Ensure that there are no more than 2 digits before the decimal point."]) - ) - outputs = { - '1': '1.0', - '0': '0.0', - '1.09': '1.1', - '0.04': '0.0', - 1: '1.0', - 0: '0.0', - Decimal('1.0'): '1.0', - Decimal('0.0'): '0.0', - Decimal('1.09'): '1.1', - Decimal('0.04'): '0.0', - } - field = fields.DecimalField(max_digits=3, decimal_places=1) - - -class TestMinMaxDecimalField(FieldValues): - """ - Valid and invalid values for `DecimalField` with min and max limits. - """ - valid_inputs = { - '10.0': Decimal('10.0'), - '20.0': Decimal('20.0'), - } - invalid_inputs = { - '9.9': ['Ensure this value is greater than or equal to 10.'], - '20.1': ['Ensure this value is less than or equal to 20.'], - } - outputs = {} - field = fields.DecimalField( - max_digits=3, decimal_places=1, - min_value=10, max_value=20 - ) - - -class TestNoStringCoercionDecimalField(FieldValues): - """ - Output values for `DecimalField` with `coerce_to_string=False`. - """ - valid_inputs = {} - invalid_inputs = {} - outputs = { - 1.09: Decimal('1.1'), - 0.04: Decimal('0.0'), - '1.09': Decimal('1.1'), - '0.04': Decimal('0.0'), - Decimal('1.09'): Decimal('1.1'), - Decimal('0.04'): Decimal('0.0'), - } - field = fields.DecimalField( - max_digits=3, decimal_places=1, - coerce_to_string=False - ) - - -# Date & time fields... - -class TestDateField(FieldValues): - """ - Valid and invalid values for `DateField`. - """ - valid_inputs = { - '2001-01-01': datetime.date(2001, 1, 1), - datetime.date(2001, 1, 1): datetime.date(2001, 1, 1), - } - invalid_inputs = { - 'abc': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]'], - '2001-99-99': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]'], - datetime.datetime(2001, 1, 1, 12, 00): ['Expected a date but got a datetime.'], - } - outputs = { - datetime.date(2001, 1, 1): '2001-01-01', - } - field = fields.DateField() - - -class TestCustomInputFormatDateField(FieldValues): - """ - Valid and invalid values for `DateField` with a cutom input format. - """ - valid_inputs = { - '1 Jan 2001': datetime.date(2001, 1, 1), - } - invalid_inputs = { - '2001-01-01': ['Date has wrong format. Use one of these formats instead: DD [Jan-Dec] YYYY'] - } - outputs = {} - field = fields.DateField(input_formats=['%d %b %Y']) - - -class TestCustomOutputFormatDateField(FieldValues): - """ - Values for `DateField` with a custom output format. - """ - valid_inputs = {} - invalid_inputs = {} - outputs = { - datetime.date(2001, 1, 1): '01 Jan 2001' - } - field = fields.DateField(format='%d %b %Y') - - -class TestNoOutputFormatDateField(FieldValues): - """ - Values for `DateField` with no output format. - """ - valid_inputs = {} - invalid_inputs = {} - outputs = { - datetime.date(2001, 1, 1): datetime.date(2001, 1, 1) - } - field = fields.DateField(format=None) - - -class TestDateTimeField(FieldValues): - """ - Valid and invalid values for `DateTimeField`. - """ - valid_inputs = { - '2001-01-01 13:00': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), - '2001-01-01T13:00': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), - '2001-01-01T13:00Z': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), - datetime.datetime(2001, 1, 1, 13, 00): datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), - datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), - # Note that 1.4 does not support timezone string parsing. - '2001-01-01T14:00+01:00' if (django.VERSION > (1, 4)) else '2001-01-01T13:00Z': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()) - } - invalid_inputs = { - 'abc': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]'], - '2001-99-99T99:00': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]'], - datetime.date(2001, 1, 1): ['Expected a datetime but got a date.'], - } - outputs = { - datetime.datetime(2001, 1, 1, 13, 00): '2001-01-01T13:00:00', - datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z', - } - field = fields.DateTimeField(default_timezone=timezone.UTC()) - - -class TestCustomInputFormatDateTimeField(FieldValues): - """ - Valid and invalid values for `DateTimeField` with a cutom input format. - """ - valid_inputs = { - '1:35pm, 1 Jan 2001': datetime.datetime(2001, 1, 1, 13, 35, tzinfo=timezone.UTC()), - } - invalid_inputs = { - '2001-01-01T20:50': ['Datetime has wrong format. Use one of these formats instead: hh:mm[AM|PM], DD [Jan-Dec] YYYY'] - } - outputs = {} - field = fields.DateTimeField(default_timezone=timezone.UTC(), input_formats=['%I:%M%p, %d %b %Y']) - - -class TestCustomOutputFormatDateTimeField(FieldValues): - """ - Values for `DateTimeField` with a custom output format. - """ - valid_inputs = {} - invalid_inputs = {} - outputs = { - datetime.datetime(2001, 1, 1, 13, 00): '01:00PM, 01 Jan 2001', - } - field = fields.DateTimeField(format='%I:%M%p, %d %b %Y') - - -class TestNoOutputFormatDateTimeField(FieldValues): - """ - Values for `DateTimeField` with no output format. - """ - valid_inputs = {} - invalid_inputs = {} - outputs = { - datetime.datetime(2001, 1, 1, 13, 00): datetime.datetime(2001, 1, 1, 13, 00), - } - field = fields.DateTimeField(format=None) - - -class TestNaiveDateTimeField(FieldValues): - """ - Valid and invalid values for `DateTimeField` with naive datetimes. - """ - valid_inputs = { - datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): datetime.datetime(2001, 1, 1, 13, 00), - '2001-01-01 13:00': datetime.datetime(2001, 1, 1, 13, 00), - } - invalid_inputs = {} - outputs = {} - field = fields.DateTimeField(default_timezone=None) - - -class TestTimeField(FieldValues): - """ - Valid and invalid values for `TimeField`. - """ - valid_inputs = { - '13:00': datetime.time(13, 00), - datetime.time(13, 00): datetime.time(13, 00), - } - invalid_inputs = { - 'abc': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]]'], - '99:99': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]]'], - } - outputs = { - datetime.time(13, 00): '13:00:00' - } - field = fields.TimeField() - - -class TestCustomInputFormatTimeField(FieldValues): - """ - Valid and invalid values for `TimeField` with a custom input format. - """ - valid_inputs = { - '1:00pm': datetime.time(13, 00), - } - invalid_inputs = { - '13:00': ['Time has wrong format. Use one of these formats instead: hh:mm[AM|PM]'], - } - outputs = {} - field = fields.TimeField(input_formats=['%I:%M%p']) - - -class TestCustomOutputFormatTimeField(FieldValues): - """ - Values for `TimeField` with a custom output format. - """ - valid_inputs = {} - invalid_inputs = {} - outputs = { - datetime.time(13, 00): '01:00PM' - } - field = fields.TimeField(format='%I:%M%p') - - -class TestNoOutputFormatTimeField(FieldValues): - """ - Values for `TimeField` with a no output format. - """ - valid_inputs = {} - invalid_inputs = {} - outputs = { - datetime.time(13, 00): datetime.time(13, 00) - } - field = fields.TimeField(format=None) - - -# Choice types... - -class TestChoiceField(FieldValues): - """ - Valid and invalid values for `ChoiceField`. - """ - valid_inputs = { - 'poor': 'poor', - 'medium': 'medium', - 'good': 'good', - } - invalid_inputs = { - 'amazing': ['`amazing` is not a valid choice.'] - } - outputs = { - 'good': 'good' - } - field = fields.ChoiceField( - choices=[ - ('poor', 'Poor quality'), - ('medium', 'Medium quality'), - ('good', 'Good quality'), - ] - ) - - -class TestChoiceFieldWithType(FieldValues): - """ - Valid and invalid values for a `Choice` field that uses an integer type, - instead of a char type. - """ - valid_inputs = { - '1': 1, - 3: 3, - } - invalid_inputs = { - 5: ['`5` is not a valid choice.'], - 'abc': ['`abc` is not a valid choice.'] - } - outputs = { - '1': 1, - 1: 1 - } - field = fields.ChoiceField( - choices=[ - (1, 'Poor quality'), - (2, 'Medium quality'), - (3, 'Good quality'), - ] - ) - - -class TestChoiceFieldWithListChoices(FieldValues): - """ - Valid and invalid values for a `Choice` field that uses a flat list for the - choices, rather than a list of pairs of (`value`, `description`). - """ - valid_inputs = { - 'poor': 'poor', - 'medium': 'medium', - 'good': 'good', - } - invalid_inputs = { - 'awful': ['`awful` is not a valid choice.'] - } - outputs = { - 'good': 'good' - } - field = fields.ChoiceField(choices=('poor', 'medium', 'good')) - - -class TestMultipleChoiceField(FieldValues): - """ - Valid and invalid values for `MultipleChoiceField`. - """ - valid_inputs = { - (): set(), - ('aircon',): set(['aircon']), - ('aircon', 'manual'): set(['aircon', 'manual']), - } - invalid_inputs = { - 'abc': ['Expected a list of items but got type `str`'], - ('aircon', 'incorrect'): ['`incorrect` is not a valid choice.'] - } - outputs = [ - (['aircon', 'manual'], set(['aircon', 'manual'])) - ] - field = fields.MultipleChoiceField( - choices=[ - ('aircon', 'AirCon'), - ('manual', 'Manual drive'), - ('diesel', 'Diesel'), - ] - ) - - -# """ -# General serializer field tests. -# """ -# from __future__ import unicode_literals - -# import datetime -# import re -# from decimal import Decimal -# from uuid import uuid4 -# from django.core import validators -# from django.db import models -# from django.test import TestCase -# from django.utils.datastructures import SortedDict -# from rest_framework import serializers -# from tests.models import RESTFrameworkModel - - -# class TimestampedModel(models.Model): -# added = models.DateTimeField(auto_now_add=True) -# updated = models.DateTimeField(auto_now=True) - - -# class CharPrimaryKeyModel(models.Model): -# id = models.CharField(max_length=20, primary_key=True) - - -# class TimestampedModelSerializer(serializers.ModelSerializer): -# class Meta: -# model = TimestampedModel - - -# class CharPrimaryKeyModelSerializer(serializers.ModelSerializer): -# class Meta: -# model = CharPrimaryKeyModel - - -# class TimeFieldModel(models.Model): -# clock = models.TimeField() - - -# class TimeFieldModelSerializer(serializers.ModelSerializer): -# class Meta: -# model = TimeFieldModel - - -# SAMPLE_CHOICES = [ -# ('red', 'Red'), -# ('green', 'Green'), -# ('blue', 'Blue'), -# ] - - -# class ChoiceFieldModel(models.Model): -# choice = models.CharField(choices=SAMPLE_CHOICES, blank=True, max_length=255) - - -# class ChoiceFieldModelSerializer(serializers.ModelSerializer): -# class Meta: -# model = ChoiceFieldModel - - -# class ChoiceFieldModelWithNull(models.Model): -# choice = models.CharField(choices=SAMPLE_CHOICES, blank=True, null=True, max_length=255) - - -# class ChoiceFieldModelWithNullSerializer(serializers.ModelSerializer): -# class Meta: -# model = ChoiceFieldModelWithNull - - -# class BasicFieldTests(TestCase): -# def test_auto_now_fields_read_only(self): -# """ -# auto_now and auto_now_add fields should be read_only by default. -# """ -# serializer = TimestampedModelSerializer() -# self.assertEqual(serializer.fields['added'].read_only, True) - -# def test_auto_pk_fields_read_only(self): -# """ -# AutoField fields should be read_only by default. -# """ -# serializer = TimestampedModelSerializer() -# self.assertEqual(serializer.fields['id'].read_only, True) - -# def test_non_auto_pk_fields_not_read_only(self): -# """ -# PK fields other than AutoField fields should not be read_only by default. -# """ -# serializer = CharPrimaryKeyModelSerializer() -# self.assertEqual(serializer.fields['id'].read_only, False) - -# def test_dict_field_ordering(self): -# """ -# Field should preserve dictionary ordering, if it exists. -# See: https://github.com/tomchristie/django-rest-framework/issues/832 -# """ -# ret = SortedDict() -# ret['c'] = 1 -# ret['b'] = 1 -# ret['a'] = 1 -# ret['z'] = 1 -# field = serializers.Field() -# keys = list(field.to_native(ret).keys()) -# self.assertEqual(keys, ['c', 'b', 'a', 'z']) - -# def test_widget_html_attributes(self): -# """ -# Make sure widget_html() renders the correct attributes -# """ -# r = re.compile('(\S+)=["\']?((?:.(?!["\']?\s+(?:\S+)=|[>"\']))+.)["\']?') -# form = TimeFieldModelSerializer().data -# attributes = r.findall(form.fields['clock'].widget_html()) -# self.assertIn(('name', 'clock'), attributes) -# self.assertIn(('id', 'clock'), attributes) - - -# class DateFieldTest(TestCase): -# """ -# Tests for the DateFieldTest from_native() and to_native() behavior -# """ - -# def test_from_native_string(self): -# """ -# Make sure from_native() accepts default iso input formats. -# """ -# f = serializers.DateField() -# result_1 = f.from_native('1984-07-31') - -# self.assertEqual(datetime.date(1984, 7, 31), result_1) - -# def test_from_native_datetime_date(self): -# """ -# Make sure from_native() accepts a datetime.date instance. -# """ -# f = serializers.DateField() -# result_1 = f.from_native(datetime.date(1984, 7, 31)) - -# self.assertEqual(result_1, datetime.date(1984, 7, 31)) - -# def test_from_native_custom_format(self): -# """ -# Make sure from_native() accepts custom input formats. -# """ -# f = serializers.DateField(input_formats=['%Y -- %d']) -# result = f.from_native('1984 -- 31') - -# self.assertEqual(datetime.date(1984, 1, 31), result) - -# def test_from_native_invalid_default_on_custom_format(self): -# """ -# Make sure from_native() don't accept default formats if custom format is preset -# """ -# f = serializers.DateField(input_formats=['%Y -- %d']) - -# try: -# f.from_native('1984-07-31') -# except validators.ValidationError as e: -# self.assertEqual(e.messages, ["Date has wrong format. Use one of these formats instead: YYYY -- DD"]) -# else: -# self.fail("ValidationError was not properly raised") - -# def test_from_native_empty(self): -# """ -# Make sure from_native() returns None on empty param. -# """ -# f = serializers.DateField() -# result = f.from_native('') - -# self.assertEqual(result, None) - -# def test_from_native_none(self): -# """ -# Make sure from_native() returns None on None param. -# """ -# f = serializers.DateField() -# result = f.from_native(None) - -# self.assertEqual(result, None) - -# def test_from_native_invalid_date(self): -# """ -# Make sure from_native() raises a ValidationError on passing an invalid date. -# """ -# f = serializers.DateField() - -# try: -# f.from_native('1984-13-31') -# except validators.ValidationError as e: -# self.assertEqual(e.messages, ["Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]"]) -# else: -# self.fail("ValidationError was not properly raised") - -# def test_from_native_invalid_format(self): -# """ -# Make sure from_native() raises a ValidationError on passing an invalid format. -# """ -# f = serializers.DateField() - -# try: -# f.from_native('1984 -- 31') -# except validators.ValidationError as e: -# self.assertEqual(e.messages, ["Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]"]) -# else: -# self.fail("ValidationError was not properly raised") - -# def test_to_native(self): -# """ -# Make sure to_native() returns datetime as default. -# """ -# f = serializers.DateField() - -# result_1 = f.to_native(datetime.date(1984, 7, 31)) - -# self.assertEqual(datetime.date(1984, 7, 31), result_1) - -# def test_to_native_iso(self): -# """ -# Make sure to_native() with 'iso-8601' returns iso formated date. -# """ -# f = serializers.DateField(format='iso-8601') - -# result_1 = f.to_native(datetime.date(1984, 7, 31)) - -# self.assertEqual('1984-07-31', result_1) - -# def test_to_native_custom_format(self): -# """ -# Make sure to_native() returns correct custom format. -# """ -# f = serializers.DateField(format="%Y - %m.%d") - -# result_1 = f.to_native(datetime.date(1984, 7, 31)) - -# self.assertEqual('1984 - 07.31', result_1) - -# def test_to_native_none(self): -# """ -# Make sure from_native() returns None on None param. -# """ -# f = serializers.DateField(required=False) -# self.assertEqual(None, f.to_native(None)) - - -# class DateTimeFieldTest(TestCase): -# """ -# Tests for the DateTimeField from_native() and to_native() behavior -# """ - -# def test_from_native_string(self): -# """ -# Make sure from_native() accepts default iso input formats. -# """ -# f = serializers.DateTimeField() -# result_1 = f.from_native('1984-07-31 04:31') -# result_2 = f.from_native('1984-07-31 04:31:59') -# result_3 = f.from_native('1984-07-31 04:31:59.000200') - -# self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31), result_1) -# self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31, 59), result_2) -# self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31, 59, 200), result_3) - -# def test_from_native_datetime_datetime(self): -# """ -# Make sure from_native() accepts a datetime.datetime instance. -# """ -# f = serializers.DateTimeField() -# result_1 = f.from_native(datetime.datetime(1984, 7, 31, 4, 31)) -# result_2 = f.from_native(datetime.datetime(1984, 7, 31, 4, 31, 59)) -# result_3 = f.from_native(datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) - -# self.assertEqual(result_1, datetime.datetime(1984, 7, 31, 4, 31)) -# self.assertEqual(result_2, datetime.datetime(1984, 7, 31, 4, 31, 59)) -# self.assertEqual(result_3, datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) - -# def test_from_native_custom_format(self): -# """ -# Make sure from_native() accepts custom input formats. -# """ -# f = serializers.DateTimeField(input_formats=['%Y -- %H:%M']) -# result = f.from_native('1984 -- 04:59') - -# self.assertEqual(datetime.datetime(1984, 1, 1, 4, 59), result) - -# def test_from_native_invalid_default_on_custom_format(self): -# """ -# Make sure from_native() don't accept default formats if custom format is preset -# """ -# f = serializers.DateTimeField(input_formats=['%Y -- %H:%M']) - -# try: -# f.from_native('1984-07-31 04:31:59') -# except validators.ValidationError as e: -# self.assertEqual(e.messages, ["Datetime has wrong format. Use one of these formats instead: YYYY -- hh:mm"]) -# else: -# self.fail("ValidationError was not properly raised") - -# def test_from_native_empty(self): -# """ -# Make sure from_native() returns None on empty param. -# """ -# f = serializers.DateTimeField() -# result = f.from_native('') - -# self.assertEqual(result, None) - -# def test_from_native_none(self): -# """ -# Make sure from_native() returns None on None param. -# """ -# f = serializers.DateTimeField() -# result = f.from_native(None) - -# self.assertEqual(result, None) - -# def test_from_native_invalid_datetime(self): -# """ -# Make sure from_native() raises a ValidationError on passing an invalid datetime. -# """ -# f = serializers.DateTimeField() - -# try: -# f.from_native('04:61:59') -# except validators.ValidationError as e: -# self.assertEqual(e.messages, ["Datetime has wrong format. Use one of these formats instead: " -# "YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]"]) -# else: -# self.fail("ValidationError was not properly raised") - -# def test_from_native_invalid_format(self): -# """ -# Make sure from_native() raises a ValidationError on passing an invalid format. -# """ -# f = serializers.DateTimeField() - -# try: -# f.from_native('04 -- 31') -# except validators.ValidationError as e: -# self.assertEqual(e.messages, ["Datetime has wrong format. Use one of these formats instead: " -# "YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]"]) -# else: -# self.fail("ValidationError was not properly raised") - -# def test_to_native(self): -# """ -# Make sure to_native() returns isoformat as default. -# """ -# f = serializers.DateTimeField() - -# result_1 = f.to_native(datetime.datetime(1984, 7, 31)) -# result_2 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31)) -# result_3 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59)) -# result_4 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) - -# self.assertEqual(datetime.datetime(1984, 7, 31), result_1) -# self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31), result_2) -# self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31, 59), result_3) -# self.assertEqual(datetime.datetime(1984, 7, 31, 4, 31, 59, 200), result_4) - -# def test_to_native_iso(self): -# """ -# Make sure to_native() with format=iso-8601 returns iso formatted datetime. -# """ -# f = serializers.DateTimeField(format='iso-8601') - -# result_1 = f.to_native(datetime.datetime(1984, 7, 31)) -# result_2 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31)) -# result_3 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59)) -# result_4 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) - -# self.assertEqual('1984-07-31T00:00:00', result_1) -# self.assertEqual('1984-07-31T04:31:00', result_2) -# self.assertEqual('1984-07-31T04:31:59', result_3) -# self.assertEqual('1984-07-31T04:31:59.000200', result_4) - -# def test_to_native_custom_format(self): -# """ -# Make sure to_native() returns correct custom format. -# """ -# f = serializers.DateTimeField(format="%Y - %H:%M") - -# result_1 = f.to_native(datetime.datetime(1984, 7, 31)) -# result_2 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31)) -# result_3 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59)) -# result_4 = f.to_native(datetime.datetime(1984, 7, 31, 4, 31, 59, 200)) - -# self.assertEqual('1984 - 00:00', result_1) -# self.assertEqual('1984 - 04:31', result_2) -# self.assertEqual('1984 - 04:31', result_3) -# self.assertEqual('1984 - 04:31', result_4) - -# def test_to_native_none(self): -# """ -# Make sure from_native() returns None on None param. -# """ -# f = serializers.DateTimeField(required=False) -# self.assertEqual(None, f.to_native(None)) - - -# class TimeFieldTest(TestCase): -# """ -# Tests for the TimeField from_native() and to_native() behavior -# """ - -# def test_from_native_string(self): -# """ -# Make sure from_native() accepts default iso input formats. -# """ -# f = serializers.TimeField() -# result_1 = f.from_native('04:31') -# result_2 = f.from_native('04:31:59') -# result_3 = f.from_native('04:31:59.000200') - -# self.assertEqual(datetime.time(4, 31), result_1) -# self.assertEqual(datetime.time(4, 31, 59), result_2) -# self.assertEqual(datetime.time(4, 31, 59, 200), result_3) - -# def test_from_native_datetime_time(self): -# """ -# Make sure from_native() accepts a datetime.time instance. -# """ -# f = serializers.TimeField() -# result_1 = f.from_native(datetime.time(4, 31)) -# result_2 = f.from_native(datetime.time(4, 31, 59)) -# result_3 = f.from_native(datetime.time(4, 31, 59, 200)) - -# self.assertEqual(result_1, datetime.time(4, 31)) -# self.assertEqual(result_2, datetime.time(4, 31, 59)) -# self.assertEqual(result_3, datetime.time(4, 31, 59, 200)) - -# def test_from_native_custom_format(self): -# """ -# Make sure from_native() accepts custom input formats. -# """ -# f = serializers.TimeField(input_formats=['%H -- %M']) -# result = f.from_native('04 -- 31') - -# self.assertEqual(datetime.time(4, 31), result) - -# def test_from_native_invalid_default_on_custom_format(self): -# """ -# Make sure from_native() don't accept default formats if custom format is preset -# """ -# f = serializers.TimeField(input_formats=['%H -- %M']) - -# try: -# f.from_native('04:31:59') -# except validators.ValidationError as e: -# self.assertEqual(e.messages, ["Time has wrong format. Use one of these formats instead: hh -- mm"]) -# else: -# self.fail("ValidationError was not properly raised") - -# def test_from_native_empty(self): -# """ -# Make sure from_native() returns None on empty param. -# """ -# f = serializers.TimeField() -# result = f.from_native('') - -# self.assertEqual(result, None) - -# def test_from_native_none(self): -# """ -# Make sure from_native() returns None on None param. -# """ -# f = serializers.TimeField() -# result = f.from_native(None) - -# self.assertEqual(result, None) - -# def test_from_native_invalid_time(self): -# """ -# Make sure from_native() raises a ValidationError on passing an invalid time. -# """ -# f = serializers.TimeField() - -# try: -# f.from_native('04:61:59') -# except validators.ValidationError as e: -# self.assertEqual(e.messages, ["Time has wrong format. Use one of these formats instead: " -# "hh:mm[:ss[.uuuuuu]]"]) -# else: -# self.fail("ValidationError was not properly raised") - -# def test_from_native_invalid_format(self): -# """ -# Make sure from_native() raises a ValidationError on passing an invalid format. -# """ -# f = serializers.TimeField() - -# try: -# f.from_native('04 -- 31') -# except validators.ValidationError as e: -# self.assertEqual(e.messages, ["Time has wrong format. Use one of these formats instead: " -# "hh:mm[:ss[.uuuuuu]]"]) -# else: -# self.fail("ValidationError was not properly raised") - -# def test_to_native(self): -# """ -# Make sure to_native() returns time object as default. -# """ -# f = serializers.TimeField() -# result_1 = f.to_native(datetime.time(4, 31)) -# result_2 = f.to_native(datetime.time(4, 31, 59)) -# result_3 = f.to_native(datetime.time(4, 31, 59, 200)) - -# self.assertEqual(datetime.time(4, 31), result_1) -# self.assertEqual(datetime.time(4, 31, 59), result_2) -# self.assertEqual(datetime.time(4, 31, 59, 200), result_3) - -# def test_to_native_iso(self): -# """ -# Make sure to_native() with format='iso-8601' returns iso formatted time. -# """ -# f = serializers.TimeField(format='iso-8601') -# result_1 = f.to_native(datetime.time(4, 31)) -# result_2 = f.to_native(datetime.time(4, 31, 59)) -# result_3 = f.to_native(datetime.time(4, 31, 59, 200)) - -# self.assertEqual('04:31:00', result_1) -# self.assertEqual('04:31:59', result_2) -# self.assertEqual('04:31:59.000200', result_3) - -# def test_to_native_custom_format(self): -# """ -# Make sure to_native() returns correct custom format. -# """ -# f = serializers.TimeField(format="%H - %S [%f]") -# result_1 = f.to_native(datetime.time(4, 31)) -# result_2 = f.to_native(datetime.time(4, 31, 59)) -# result_3 = f.to_native(datetime.time(4, 31, 59, 200)) - -# self.assertEqual('04 - 00 [000000]', result_1) -# self.assertEqual('04 - 59 [000000]', result_2) -# self.assertEqual('04 - 59 [000200]', result_3) - - -# class DecimalFieldTest(TestCase): -# """ -# Tests for the DecimalField from_native() and to_native() behavior -# """ - -# def test_from_native_string(self): -# """ -# Make sure from_native() accepts string values -# """ -# f = serializers.DecimalField() -# result_1 = f.from_native('9000') -# result_2 = f.from_native('1.00000001') - -# self.assertEqual(Decimal('9000'), result_1) -# self.assertEqual(Decimal('1.00000001'), result_2) - -# def test_from_native_invalid_string(self): -# """ -# Make sure from_native() raises ValidationError on passing invalid string -# """ -# f = serializers.DecimalField() - -# try: -# f.from_native('123.45.6') -# except validators.ValidationError as e: -# self.assertEqual(e.messages, ["Enter a number."]) -# else: -# self.fail("ValidationError was not properly raised") - -# def test_from_native_integer(self): -# """ -# Make sure from_native() accepts integer values -# """ -# f = serializers.DecimalField() -# result = f.from_native(9000) - -# self.assertEqual(Decimal('9000'), result) - -# def test_from_native_float(self): -# """ -# Make sure from_native() accepts float values -# """ -# f = serializers.DecimalField() -# result = f.from_native(1.00000001) - -# self.assertEqual(Decimal('1.00000001'), result) - -# def test_from_native_empty(self): -# """ -# Make sure from_native() returns None on empty param. -# """ -# f = serializers.DecimalField() -# result = f.from_native('') - -# self.assertEqual(result, None) - -# def test_from_native_none(self): -# """ -# Make sure from_native() returns None on None param. -# """ -# f = serializers.DecimalField() -# result = f.from_native(None) - -# self.assertEqual(result, None) - -# def test_to_native(self): -# """ -# Make sure to_native() returns Decimal as string. -# """ -# f = serializers.DecimalField() - -# result_1 = f.to_native(Decimal('9000')) -# result_2 = f.to_native(Decimal('1.00000001')) - -# self.assertEqual(Decimal('9000'), result_1) -# self.assertEqual(Decimal('1.00000001'), result_2) - -# def test_to_native_none(self): -# """ -# Make sure from_native() returns None on None param. -# """ -# f = serializers.DecimalField(required=False) -# self.assertEqual(None, f.to_native(None)) - -# def test_valid_serialization(self): -# """ -# Make sure the serializer works correctly -# """ -# class DecimalSerializer(serializers.Serializer): -# decimal_field = serializers.DecimalField(max_value=9010, -# min_value=9000, -# max_digits=6, -# decimal_places=2) - -# self.assertTrue(DecimalSerializer(data={'decimal_field': '9001'}).is_valid()) -# self.assertTrue(DecimalSerializer(data={'decimal_field': '9001.2'}).is_valid()) -# self.assertTrue(DecimalSerializer(data={'decimal_field': '9001.23'}).is_valid()) - -# self.assertFalse(DecimalSerializer(data={'decimal_field': '8000'}).is_valid()) -# self.assertFalse(DecimalSerializer(data={'decimal_field': '9900'}).is_valid()) -# self.assertFalse(DecimalSerializer(data={'decimal_field': '9001.234'}).is_valid()) - -# def test_raise_max_value(self): -# """ -# Make sure max_value violations raises ValidationError -# """ -# class DecimalSerializer(serializers.Serializer): -# decimal_field = serializers.DecimalField(max_value=100) - -# s = DecimalSerializer(data={'decimal_field': '123'}) - -# self.assertFalse(s.is_valid()) -# self.assertEqual(s.errors, {'decimal_field': ['Ensure this value is less than or equal to 100.']}) - -# def test_raise_min_value(self): -# """ -# Make sure min_value violations raises ValidationError -# """ -# class DecimalSerializer(serializers.Serializer): -# decimal_field = serializers.DecimalField(min_value=100) - -# s = DecimalSerializer(data={'decimal_field': '99'}) - -# self.assertFalse(s.is_valid()) -# self.assertEqual(s.errors, {'decimal_field': ['Ensure this value is greater than or equal to 100.']}) - -# def test_raise_max_digits(self): -# """ -# Make sure max_digits violations raises ValidationError -# """ -# class DecimalSerializer(serializers.Serializer): -# decimal_field = serializers.DecimalField(max_digits=5) - -# s = DecimalSerializer(data={'decimal_field': '123.456'}) - -# self.assertFalse(s.is_valid()) -# self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 5 digits in total.']}) - -# def test_raise_max_decimal_places(self): -# """ -# Make sure max_decimal_places violations raises ValidationError -# """ -# class DecimalSerializer(serializers.Serializer): -# decimal_field = serializers.DecimalField(decimal_places=3) - -# s = DecimalSerializer(data={'decimal_field': '123.4567'}) - -# self.assertFalse(s.is_valid()) -# self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 3 decimal places.']}) - -# def test_raise_max_whole_digits(self): -# """ -# Make sure max_whole_digits violations raises ValidationError -# """ -# class DecimalSerializer(serializers.Serializer): -# decimal_field = serializers.DecimalField(max_digits=4, decimal_places=3) - -# s = DecimalSerializer(data={'decimal_field': '12345.6'}) - -# self.assertFalse(s.is_valid()) -# self.assertEqual(s.errors, {'decimal_field': ['Ensure that there are no more than 4 digits in total.']}) - - -# class ChoiceFieldTests(TestCase): -# """ -# Tests for the ChoiceField options generator -# """ -# def test_choices_required(self): -# """ -# Make sure proper choices are rendered if field is required -# """ -# f = serializers.ChoiceField(required=True, choices=SAMPLE_CHOICES) -# self.assertEqual(f.choices, SAMPLE_CHOICES) - -# def test_choices_not_required(self): -# """ -# Make sure proper choices (plus blank) are rendered if the field isn't required -# """ -# f = serializers.ChoiceField(required=False, choices=SAMPLE_CHOICES) -# self.assertEqual(f.choices, models.fields.BLANK_CHOICE_DASH + SAMPLE_CHOICES) - -# def test_blank_choice_display(self): -# blank = 'No Preference' -# f = serializers.ChoiceField( -# required=False, -# choices=SAMPLE_CHOICES, -# blank_display_value=blank, -# ) -# self.assertEqual(f.choices, [('', blank)] + SAMPLE_CHOICES) - -# def test_invalid_choice_model(self): -# s = ChoiceFieldModelSerializer(data={'choice': 'wrong_value'}) -# self.assertFalse(s.is_valid()) -# self.assertEqual(s.errors, {'choice': ['Select a valid choice. wrong_value is not one of the available choices.']}) -# self.assertEqual(s.data['choice'], '') - -# def test_empty_choice_model(self): -# """ -# Test that the 'empty' value is correctly passed and used depending on -# the 'null' property on the model field. -# """ -# s = ChoiceFieldModelSerializer(data={'choice': ''}) -# self.assertTrue(s.is_valid()) -# self.assertEqual(s.data['choice'], '') - -# s = ChoiceFieldModelWithNullSerializer(data={'choice': ''}) -# self.assertTrue(s.is_valid()) -# self.assertEqual(s.data['choice'], None) - -# def test_from_native_empty(self): -# """ -# Make sure from_native() returns an empty string on empty param by default. -# """ -# f = serializers.ChoiceField(choices=SAMPLE_CHOICES) -# self.assertEqual(f.from_native(''), '') -# self.assertEqual(f.from_native(None), '') - -# def test_from_native_empty_override(self): -# """ -# Make sure you can override from_native() behavior regarding empty values. -# """ -# f = serializers.ChoiceField(choices=SAMPLE_CHOICES, empty=None) -# self.assertEqual(f.from_native(''), None) -# self.assertEqual(f.from_native(None), None) - -# def test_metadata_choices(self): -# """ -# Make sure proper choices are included in the field's metadata. -# """ -# choices = [{'value': v, 'display_name': n} for v, n in SAMPLE_CHOICES] -# f = serializers.ChoiceField(choices=SAMPLE_CHOICES) -# self.assertEqual(f.metadata()['choices'], choices) - -# def test_metadata_choices_not_required(self): -# """ -# Make sure proper choices are included in the field's metadata. -# """ -# choices = [{'value': v, 'display_name': n} -# for v, n in models.fields.BLANK_CHOICE_DASH + SAMPLE_CHOICES] -# f = serializers.ChoiceField(required=False, choices=SAMPLE_CHOICES) -# self.assertEqual(f.metadata()['choices'], choices) - - -# class EmailFieldTests(TestCase): -# """ -# Tests for EmailField attribute values -# """ - -# class EmailFieldModel(RESTFrameworkModel): -# email_field = models.EmailField(blank=True) - -# class EmailFieldWithGivenMaxLengthModel(RESTFrameworkModel): -# email_field = models.EmailField(max_length=150, blank=True) - -# def test_default_model_value(self): -# class EmailFieldSerializer(serializers.ModelSerializer): -# class Meta: -# model = self.EmailFieldModel - -# serializer = EmailFieldSerializer(data={}) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(getattr(serializer.fields['email_field'], 'max_length'), 75) - -# def test_given_model_value(self): -# class EmailFieldSerializer(serializers.ModelSerializer): -# class Meta: -# model = self.EmailFieldWithGivenMaxLengthModel - -# serializer = EmailFieldSerializer(data={}) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(getattr(serializer.fields['email_field'], 'max_length'), 150) - -# def test_given_serializer_value(self): -# class EmailFieldSerializer(serializers.ModelSerializer): -# email_field = serializers.EmailField(source='email_field', max_length=20, required=False) - -# class Meta: -# model = self.EmailFieldModel - -# serializer = EmailFieldSerializer(data={}) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(getattr(serializer.fields['email_field'], 'max_length'), 20) - - -# class SlugFieldTests(TestCase): -# """ -# Tests for SlugField attribute values -# """ - -# class SlugFieldModel(RESTFrameworkModel): -# slug_field = models.SlugField(blank=True) - -# class SlugFieldWithGivenMaxLengthModel(RESTFrameworkModel): -# slug_field = models.SlugField(max_length=84, blank=True) - -# def test_default_model_value(self): -# class SlugFieldSerializer(serializers.ModelSerializer): -# class Meta: -# model = self.SlugFieldModel - -# serializer = SlugFieldSerializer(data={}) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 50) - -# def test_given_model_value(self): -# class SlugFieldSerializer(serializers.ModelSerializer): -# class Meta: -# model = self.SlugFieldWithGivenMaxLengthModel - -# serializer = SlugFieldSerializer(data={}) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(getattr(serializer.fields['slug_field'], 'max_length'), 84) - -# def test_given_serializer_value(self): -# class SlugFieldSerializer(serializers.ModelSerializer): -# slug_field = serializers.SlugField(source='slug_field', -# max_length=20, required=False) - -# class Meta: -# model = self.SlugFieldModel - -# serializer = SlugFieldSerializer(data={}) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(getattr(serializer.fields['slug_field'], -# 'max_length'), 20) - -# def test_invalid_slug(self): -# """ -# Make sure an invalid slug raises ValidationError -# """ -# class SlugFieldSerializer(serializers.ModelSerializer): -# slug_field = serializers.SlugField(source='slug_field', max_length=20, required=True) - -# class Meta: -# model = self.SlugFieldModel - -# s = SlugFieldSerializer(data={'slug_field': 'a b'}) - -# self.assertEqual(s.is_valid(), False) -# self.assertEqual(s.errors, {'slug_field': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."]}) - - -# class URLFieldTests(TestCase): -# """ -# Tests for URLField attribute values. - -# (Includes test for #1210, checking that validators can be overridden.) -# """ - -# class URLFieldModel(RESTFrameworkModel): -# url_field = models.URLField(blank=True) - -# class URLFieldWithGivenMaxLengthModel(RESTFrameworkModel): -# url_field = models.URLField(max_length=128, blank=True) - -# def test_default_model_value(self): -# class URLFieldSerializer(serializers.ModelSerializer): -# class Meta: -# model = self.URLFieldModel - -# serializer = URLFieldSerializer(data={}) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(getattr(serializer.fields['url_field'], -# 'max_length'), 200) - -# def test_given_model_value(self): -# class URLFieldSerializer(serializers.ModelSerializer): -# class Meta: -# model = self.URLFieldWithGivenMaxLengthModel - -# serializer = URLFieldSerializer(data={}) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(getattr(serializer.fields['url_field'], -# 'max_length'), 128) - -# def test_given_serializer_value(self): -# class URLFieldSerializer(serializers.ModelSerializer): -# url_field = serializers.URLField(source='url_field', -# max_length=20, required=False) - -# class Meta: -# model = self.URLFieldWithGivenMaxLengthModel - -# serializer = URLFieldSerializer(data={}) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(getattr(serializer.fields['url_field'], -# 'max_length'), 20) - -# def test_validators_can_be_overridden(self): -# url_field = serializers.URLField(validators=[]) -# validators = url_field.validators -# self.assertEqual([], validators, 'Passing `validators` kwarg should have overridden default validators') - - -# class FieldMetadata(TestCase): -# def setUp(self): -# self.required_field = serializers.Field() -# self.required_field.label = uuid4().hex -# self.required_field.required = True - -# self.optional_field = serializers.Field() -# self.optional_field.label = uuid4().hex -# self.optional_field.required = False - -# def test_required(self): -# self.assertEqual(self.required_field.metadata()['required'], True) - -# def test_optional(self): -# self.assertEqual(self.optional_field.metadata()['required'], False) - -# def test_label(self): -# for field in (self.required_field, self.optional_field): -# self.assertEqual(field.metadata()['label'], field.label) - - -# class FieldCallableDefault(TestCase): -# def setUp(self): -# self.simple_callable = lambda: 'foo bar' - -# def test_default_can_be_simple_callable(self): -# """ -# Ensure that the 'default' argument can also be a simple callable. -# """ -# field = serializers.WritableField(default=self.simple_callable) -# into = {} -# field.field_from_native({}, {}, 'field', into) -# self.assertEqual(into, {'field': 'foo bar'}) - - -# class CustomIntegerField(TestCase): -# """ -# Test that custom fields apply min_value and max_value constraints -# """ -# def test_custom_fields_can_be_validated_for_value(self): - -# class MoneyField(models.PositiveIntegerField): -# pass - -# class EntryModel(models.Model): -# bank = MoneyField(validators=[validators.MaxValueValidator(100)]) - -# class EntrySerializer(serializers.ModelSerializer): -# class Meta: -# model = EntryModel - -# entry = EntryModel(bank=1) - -# serializer = EntrySerializer(entry, data={"bank": 11}) -# self.assertTrue(serializer.is_valid()) - -# serializer = EntrySerializer(entry, data={"bank": -1}) -# self.assertFalse(serializer.is_valid()) - -# serializer = EntrySerializer(entry, data={"bank": 101}) -# self.assertFalse(serializer.is_valid()) - - -# class BooleanField(TestCase): -# """ -# Tests for BooleanField -# """ -# def test_boolean_required(self): -# class BooleanRequiredSerializer(serializers.Serializer): -# bool_field = serializers.BooleanField(required=True) - -# self.assertFalse(BooleanRequiredSerializer(data={}).is_valid()) - - -# class SerializerMethodFieldTest(TestCase): -# """ -# Tests for the SerializerMethodField field_to_native() behavior -# """ -# class SerializerTest(serializers.Serializer): -# def get_my_test(self, obj): -# return obj.my_test[0:5] - -# class ModelCharField(TestCase): -# """ -# Tests for CharField -# """ -# def test_none_serializing(self): -# class CharFieldSerializer(serializers.Serializer): -# char = serializers.CharField(allow_none=True, required=False) -# serializer = CharFieldSerializer(data={'char': None}) -# self.assertTrue(serializer.is_valid()) -# self.assertIsNone(serializer.object['char']) - - -# class SerializerMethodFieldTest(TestCase): -# """ -# Tests for the SerializerMethodField field_to_native() behavior -# """ -# class SerializerTest(serializers.Serializer): -# def get_my_test(self, obj): -# return obj.my_test[0:5] - -# class Example(): -# my_test = 'Hey, this is a test !' - -# def test_field_to_native(self): -# s = serializers.SerializerMethodField('get_my_test') -# s.initialize(self.SerializerTest(), 'name') -# result = s.field_to_native(self.Example(), None) -# self.assertEqual(result, 'Hey, ') From b187f53453d3885cd918f5f9f4490bcc8e3e2410 Mon Sep 17 00:00:00 2001 From: Danilo Bargen <mail@dbrgn.ch> Date: Mon, 2 Jun 2014 00:41:58 +0200 Subject: [PATCH 0875/1652] Changed return status for CSRF failures to HTTP 403 By default, Django returns "HTTP 403 Forbidden" responses when CSRF validation failed[1]. CSRF is a case of authorization, not of authentication. Therefore `PermissionDenied` should be raised instead of `AuthenticationFailed`. [1] https://docs.djangoproject.com/en/dev/ref/contrib/csrf/#rejected-requests --- rest_framework/authentication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index f3fec05ec..36d74dd9b 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -129,7 +129,7 @@ class SessionAuthentication(BaseAuthentication): reason = CSRFCheck().process_view(request, None, (), {}) if reason: # CSRF failed, bail with explicit error message - raise exceptions.AuthenticationFailed('CSRF Failed: %s' % reason) + raise exceptions.PermissionDenied('CSRF Failed: %s' % reason) class TokenAuthentication(BaseAuthentication): From f22d0afc3dfc7478e084d1d6ed6b53f71641dec6 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 23 Sep 2014 14:15:00 +0100 Subject: [PATCH 0876/1652] Tests for field choices --- rest_framework/fields.py | 21 +++--- rest_framework/serializers.py | 3 + rest_framework/utils/field_mapping.py | 58 ++++++++-------- tests/test_field_options.py | 55 --------------- .../{test_field_values.py => test_fields.py} | 67 +++++++++++++++++++ tests/test_model_serializer.py | 47 ++++++++++--- 6 files changed, 149 insertions(+), 102 deletions(-) delete mode 100644 tests/test_field_options.py rename tests/{test_field_values.py => test_fields.py} (88%) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 48a3e1ab9..f5bae7347 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -102,6 +102,7 @@ class Field(object): 'null': _('This field may not be null.') } default_validators = [] + default_empty_html = None def __init__(self, read_only=False, write_only=False, required=None, default=empty, initial=None, source=None, @@ -185,6 +186,11 @@ class Field(object): Given the *incoming* primative data, return the value for this field that should be validated and transformed to a native value. """ + if html.is_html_input(dictionary): + # HTML forms will represent empty fields as '', and cannot + # represent None or False values directly. + ret = dictionary.get(self.field_name, '') + return self.default_empty_html if (ret == '') else ret return dictionary.get(self.field_name, empty) def get_attribute(self, instance): @@ -236,9 +242,6 @@ class Field(object): Test the given value against all the validators on the field, and either raise a `ValidationError` or simply return. """ - if value in (None, '', [], (), {}): - return - errors = [] for validator in self.validators: try: @@ -282,16 +285,10 @@ class BooleanField(Field): default_error_messages = { 'invalid': _('`{input}` is not a valid boolean.') } + default_empty_html = False TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True)) FALSE_VALUES = set(('f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False)) - def get_value(self, dictionary): - if html.is_html_input(dictionary): - # HTML forms do not send a `False` value on an empty checkbox, - # so we override the default empty value to be False. - return dictionary.get(self.field_name, False) - return dictionary.get(self.field_name, empty) - def to_internal_value(self, data): if data in self.TRUE_VALUES: return True @@ -315,6 +312,7 @@ class CharField(Field): default_error_messages = { 'blank': _('This field may not be blank.') } + default_empty_html = '' def __init__(self, **kwargs): self.allow_blank = kwargs.pop('allow_blank', False) @@ -323,6 +321,9 @@ class CharField(Field): super(CharField, self).__init__(**kwargs) def run_validation(self, data=empty): + # Test for the empty string here so that it does not get validated, + # and so that subclasses do not need to handle it explicitly + # inside the `to_internal_value()` method. if data == '': if not self.allow_blank: self.fail('blank') diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index d9f9c8cbc..949f59157 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -411,6 +411,9 @@ class ModelSerializer(Serializer): # `ModelField`, which is used when no other typed field # matched to the model field. kwargs.pop('model_field', None) + if not issubclass(field_cls, CharField): + # `allow_blank` is only valid for textual fields. + kwargs.pop('allow_blank', None) elif field_name in info.relations: # Create forward and reverse relationships. diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index be72e444e..1c718ccba 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -49,8 +49,9 @@ def get_field_kwargs(field_name, model_field): kwargs = {} validator_kwarg = model_field.validators - if model_field.null or model_field.blank: - kwargs['required'] = False + # The following will only be used by ModelField classes. + # Gets removed for everything else. + kwargs['model_field'] = model_field if model_field.verbose_name and needs_label(model_field, field_name): kwargs['label'] = capfirst(model_field.verbose_name) @@ -59,23 +60,26 @@ def get_field_kwargs(field_name, model_field): kwargs['help_text'] = model_field.help_text if isinstance(model_field, models.AutoField) or not model_field.editable: + # If this field is read-only, then return early. + # Further keyword arguments are not valid. kwargs['read_only'] = True - # Read only implies that the field is not required. - # We have a cleaner repr on the instance if we don't set it. - kwargs.pop('required', None) + return kwargs if model_field.has_default(): - kwargs['default'] = model_field.get_default() - # Having a default implies that the field is not required. - # We have a cleaner repr on the instance if we don't set it. - kwargs.pop('required', None) + kwargs['required'] = False if model_field.flatchoices: - # If this model field contains choices, then return now, - # any further keyword arguments are not valid. + # If this model field contains choices, then return early. + # Further keyword arguments are not valid. kwargs['choices'] = model_field.flatchoices return kwargs + if model_field.null: + kwargs['allow_null'] = True + + if model_field.blank: + kwargs['allow_blank'] = True + # Ensure that max_length is passed explicitly as a keyword arg, # rather than as a validator. max_length = getattr(model_field, 'max_length', None) @@ -88,7 +92,10 @@ def get_field_kwargs(field_name, model_field): # Ensure that min_length is passed explicitly as a keyword arg, # rather than as a validator. - min_length = getattr(model_field, 'min_length', None) + min_length = next(( + validator.limit_value for validator in validator_kwarg + if isinstance(validator, validators.MinLengthValidator) + ), None) if min_length is not None: kwargs['min_length'] = min_length validator_kwarg = [ @@ -153,20 +160,9 @@ def get_field_kwargs(field_name, model_field): if decimal_places is not None: kwargs['decimal_places'] = decimal_places - if isinstance(model_field, models.BooleanField): - # models.BooleanField has `blank=True`, but *is* actually - # required *unless* a default is provided. - # Also note that Django<1.6 uses `default=False` for - # models.BooleanField, but Django>=1.6 uses `default=None`. - kwargs.pop('required', None) - if validator_kwarg: kwargs['validators'] = validator_kwarg - # The following will only be used by ModelField classes. - # Gets removed for everything else. - kwargs['model_field'] = model_field - return kwargs @@ -188,16 +184,22 @@ def get_relation_kwargs(field_name, relation_info): kwargs.pop('queryset', None) if model_field: - if model_field.null or model_field.blank: - kwargs['required'] = False if model_field.verbose_name and needs_label(model_field, field_name): kwargs['label'] = capfirst(model_field.verbose_name) - if not model_field.editable: - kwargs['read_only'] = True - kwargs.pop('queryset', None) help_text = clean_manytomany_helptext(model_field.help_text) if help_text: kwargs['help_text'] = help_text + if not model_field.editable: + kwargs['read_only'] = True + kwargs.pop('queryset', None) + if kwargs.get('read_only', False): + # If this field is read-only, then return early. + # No further keyword arguments are valid. + return kwargs + if model_field.has_default(): + kwargs['required'] = False + if model_field.null: + kwargs['allow_null'] = True return kwargs diff --git a/tests/test_field_options.py b/tests/test_field_options.py deleted file mode 100644 index 444bd4248..000000000 --- a/tests/test_field_options.py +++ /dev/null @@ -1,55 +0,0 @@ -from rest_framework import fields -import pytest - - -class TestFieldOptions: - def test_required(self): - """ - By default a field must be included in the input. - """ - field = fields.IntegerField() - with pytest.raises(fields.ValidationError) as exc_info: - field.run_validation() - assert exc_info.value.messages == ['This field is required.'] - - def test_not_required(self): - """ - If `required=False` then a field may be omitted from the input. - """ - field = fields.IntegerField(required=False) - with pytest.raises(fields.SkipField): - field.run_validation() - - def test_disallow_null(self): - """ - By default `None` is not a valid input. - """ - field = fields.IntegerField() - with pytest.raises(fields.ValidationError) as exc_info: - field.run_validation(None) - assert exc_info.value.messages == ['This field may not be null.'] - - def test_allow_null(self): - """ - If `allow_null=True` then `None` is a valid input. - """ - field = fields.IntegerField(allow_null=True) - output = field.run_validation(None) - assert output is None - - def test_disallow_blank(self): - """ - By default '' is not a valid input. - """ - field = fields.CharField() - with pytest.raises(fields.ValidationError) as exc_info: - field.run_validation('') - assert exc_info.value.messages == ['This field may not be blank.'] - - def test_allow_blank(self): - """ - If `allow_blank=True` then '' is a valid input. - """ - field = fields.CharField(allow_blank=True) - output = field.run_validation('') - assert output is '' diff --git a/tests/test_field_values.py b/tests/test_fields.py similarity index 88% rename from tests/test_field_values.py rename to tests/test_fields.py index bac50f0bc..6bf9aed4a 100644 --- a/tests/test_field_values.py +++ b/tests/test_fields.py @@ -6,6 +6,73 @@ import django import pytest +# Tests for field keyword arguments and core functionality. +# --------------------------------------------------------- + +class TestFieldOptions: + def test_required(self): + """ + By default a field must be included in the input. + """ + field = fields.IntegerField() + with pytest.raises(fields.ValidationError) as exc_info: + field.run_validation() + assert exc_info.value.messages == ['This field is required.'] + + def test_not_required(self): + """ + If `required=False` then a field may be omitted from the input. + """ + field = fields.IntegerField(required=False) + with pytest.raises(fields.SkipField): + field.run_validation() + + def test_disallow_null(self): + """ + By default `None` is not a valid input. + """ + field = fields.IntegerField() + with pytest.raises(fields.ValidationError) as exc_info: + field.run_validation(None) + assert exc_info.value.messages == ['This field may not be null.'] + + def test_allow_null(self): + """ + If `allow_null=True` then `None` is a valid input. + """ + field = fields.IntegerField(allow_null=True) + output = field.run_validation(None) + assert output is None + + def test_disallow_blank(self): + """ + By default '' is not a valid input. + """ + field = fields.CharField() + with pytest.raises(fields.ValidationError) as exc_info: + field.run_validation('') + assert exc_info.value.messages == ['This field may not be blank.'] + + def test_allow_blank(self): + """ + If `allow_blank=True` then '' is a valid input. + """ + field = fields.CharField(allow_blank=True) + output = field.run_validation('') + assert output is '' + + def test_default(self): + """ + If `default` is set, then omitted values get the default input. + """ + field = fields.IntegerField(default=123) + output = field.run_validation() + assert output is 123 + + +# Tests for field input and output values. +# ---------------------------------------- + def get_items(mapping_or_list_of_two_tuples): # Tests accept either lists of two tuples, or dictionaries. if isinstance(mapping_or_list_of_two_tuples, dict): diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index d9f9efbe7..731ed2fbd 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -6,6 +6,7 @@ These tests deal with ensuring that we correctly map the model fields onto an appropriate set of serializer fields for each case. """ from django.core.exceptions import ImproperlyConfigured +from django.core.validators import MaxValueValidator, MinValueValidator, MinLengthValidator from django.db import models from django.test import TestCase from rest_framework import serializers @@ -15,7 +16,8 @@ def dedent(blocktext): return '\n'.join([line[12:] for line in blocktext.splitlines()[1:-1]]) -# Testing regular field mappings +# Tests for regular field mappings. +# --------------------------------- class CustomField(models.Field): """ @@ -24,9 +26,6 @@ class CustomField(models.Field): pass -COLOR_CHOICES = (('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')) - - class RegularFieldsModel(models.Model): """ A model class for testing regular flat fields. @@ -35,7 +34,6 @@ class RegularFieldsModel(models.Model): big_integer_field = models.BigIntegerField() boolean_field = models.BooleanField(default=False) char_field = models.CharField(max_length=100) - choices_field = models.CharField(max_length=100, choices=COLOR_CHOICES) comma_seperated_integer_field = models.CommaSeparatedIntegerField(max_length=100) date_field = models.DateField() datetime_field = models.DateTimeField() @@ -57,6 +55,19 @@ class RegularFieldsModel(models.Model): return 'method' +COLOR_CHOICES = (('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')) + + +class FieldOptionsModel(models.Model): + value_limit_field = models.IntegerField(validators=[MinValueValidator(1), MaxValueValidator(10)]) + length_limit_field = models.CharField(validators=[MinLengthValidator(3)], max_length=12) + blank_field = models.CharField(blank=True, max_length=10) + null_field = models.IntegerField(null=True) + default_field = models.IntegerField(default=0) + descriptive_field = models.IntegerField(help_text='Some help text', verbose_name='A label') + choices_field = models.CharField(max_length=100, choices=COLOR_CHOICES) + + class TestRegularFieldMappings(TestCase): def test_regular_fields(self): """ @@ -70,9 +81,8 @@ class TestRegularFieldMappings(TestCase): TestSerializer(): auto_field = IntegerField(read_only=True) big_integer_field = IntegerField() - boolean_field = BooleanField(default=False) + boolean_field = BooleanField(required=False) char_field = CharField(max_length=100) - choices_field = ChoiceField(choices=[('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')]) comma_seperated_integer_field = CharField(max_length=100, validators=[<django.core.validators.RegexValidator object>]) date_field = DateField() datetime_field = DateTimeField() @@ -80,7 +90,7 @@ class TestRegularFieldMappings(TestCase): email_field = EmailField(max_length=100) float_field = FloatField() integer_field = IntegerField() - null_boolean_field = BooleanField(required=False) + null_boolean_field = BooleanField(allow_null=True) positive_integer_field = IntegerField() positive_small_integer_field = IntegerField() slug_field = SlugField(max_length=100) @@ -92,6 +102,24 @@ class TestRegularFieldMappings(TestCase): """) self.assertEqual(repr(TestSerializer()), expected) + def test_field_options(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = FieldOptionsModel + + expected = dedent(""" + TestSerializer(): + id = IntegerField(label='ID', read_only=True) + value_limit_field = IntegerField(max_value=10, min_value=1) + length_limit_field = CharField(max_length=12, min_length=3) + blank_field = CharField(allow_blank=True, max_length=10) + null_field = IntegerField(allow_null=True) + default_field = IntegerField(required=False) + descriptive_field = IntegerField(help_text='Some help text', label='A label') + choices_field = ChoiceField(choices=[('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')]) + """) + self.assertEqual(repr(TestSerializer()), expected) + def test_method_field(self): """ Properties and methods on the model should be allowed as `Meta.fields` @@ -178,7 +206,8 @@ class TestRegularFieldMappings(TestCase): assert str(excinfo.exception) == expected -# Testing relational field mappings +# Tests for relational field mappings. +# ------------------------------------ class ForeignKeyTargetModel(models.Model): name = models.CharField(max_length=100) From 0404f09a7e69f533038d47ca25caad90c0c2659f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 23 Sep 2014 14:30:17 +0100 Subject: [PATCH 0877/1652] NullBooleanField --- rest_framework/fields.py | 37 ++++++++++++++++++++++++++- rest_framework/serializers.py | 2 +- rest_framework/utils/field_mapping.py | 2 +- tests/test_fields.py | 29 ++++++++++++++++++++- tests/test_model_serializer.py | 2 +- 5 files changed, 67 insertions(+), 5 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f5bae7347..f859658a1 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -289,6 +289,10 @@ class BooleanField(Field): TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True)) FALSE_VALUES = set(('f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False)) + def __init__(self, **kwargs): + assert 'allow_null' not in kwargs, '`allow_null` is not a valid option. Use `NullBooleanField` instead.' + super(BooleanField, self).__init__(**kwargs) + def to_internal_value(self, data): if data in self.TRUE_VALUES: return True @@ -297,7 +301,38 @@ class BooleanField(Field): self.fail('invalid', input=data) def to_representation(self, value): - if value is None: + if value in self.TRUE_VALUES: + return True + elif value in self.FALSE_VALUES: + return False + return bool(value) + + +class NullBooleanField(Field): + default_error_messages = { + 'invalid': _('`{input}` is not a valid boolean.') + } + default_empty_html = None + TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True)) + FALSE_VALUES = set(('f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False)) + NULL_VALUES = set(('n', 'N', 'null', 'Null', 'NULL', '', None)) + + def __init__(self, **kwargs): + assert 'allow_null' not in kwargs, '`allow_null` is not a valid option.' + kwargs['allow_null'] = True + super(NullBooleanField, self).__init__(**kwargs) + + def to_internal_value(self, data): + if data in self.TRUE_VALUES: + return True + elif data in self.FALSE_VALUES: + return False + elif data in self.NULL_VALUES: + return None + self.fail('invalid', input=data) + + def to_representation(self, value): + if value in self.NULL_VALUES: return None if value in self.TRUE_VALUES: return True diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 949f59157..d8d72a4c6 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -333,7 +333,7 @@ class ModelSerializer(Serializer): models.FloatField: FloatField, models.ImageField: ImageField, models.IntegerField: IntegerField, - models.NullBooleanField: BooleanField, + models.NullBooleanField: NullBooleanField, models.PositiveIntegerField: IntegerField, models.PositiveSmallIntegerField: IntegerField, models.SlugField: SlugField, diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index 1c718ccba..c208afdc5 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -74,7 +74,7 @@ def get_field_kwargs(field_name, model_field): kwargs['choices'] = model_field.flatchoices return kwargs - if model_field.null: + if model_field.null and not isinstance(model_field, models.NullBooleanField): kwargs['allow_null'] = True if model_field.blank: diff --git a/tests/test_fields.py b/tests/test_fields.py index 6bf9aed4a..91f3f5db7 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -124,7 +124,8 @@ class TestBooleanField(FieldValues): False: False, } invalid_inputs = { - 'foo': ['`foo` is not a valid boolean.'] + 'foo': ['`foo` is not a valid boolean.'], + None: ['This field may not be null.'] } outputs = { 'true': True, @@ -140,6 +141,32 @@ class TestBooleanField(FieldValues): field = fields.BooleanField() +class TestNullBooleanField(FieldValues): + """ + Valid and invalid values for `BooleanField`. + """ + valid_inputs = { + 'true': True, + 'false': False, + 'null': None, + True: True, + False: False, + None: None + } + invalid_inputs = { + 'foo': ['`foo` is not a valid boolean.'], + } + outputs = { + 'true': True, + 'false': False, + 'null': None, + True: True, + False: False, + None: None + } + field = fields.NullBooleanField() + + # String types... class TestCharField(FieldValues): diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 731ed2fbd..f74750247 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -90,7 +90,7 @@ class TestRegularFieldMappings(TestCase): email_field = EmailField(max_length=100) float_field = FloatField() integer_field = IntegerField() - null_boolean_field = BooleanField(allow_null=True) + null_boolean_field = NullBooleanField() positive_integer_field = IntegerField() positive_small_integer_field = IntegerField() slug_field = SlugField(max_length=100) From da385c9c1f9deeeefd705154a6e6612d6d62f41b Mon Sep 17 00:00:00 2001 From: Collin Anderson <cmawebsite@gmail.com> Date: Tue, 23 Sep 2014 17:08:38 -0400 Subject: [PATCH 0878/1652] remove patterns and strings from urls #1898 --- docs/api-guide/authentication.md | 7 ++++--- docs/api-guide/format-suffixes.md | 13 +++++++------ docs/index.md | 4 ++-- docs/topics/2.3-announcement.md | 6 +++--- docs/tutorial/1-serialization.md | 13 +++++++------ docs/tutorial/2-requests-and-responses.md | 9 +++++---- docs/tutorial/3-class-based-views.md | 4 ++-- docs/tutorial/4-authentication-and-permissions.md | 4 ++-- .../5-relationships-and-hyperlinked-apis.md | 10 +++++----- docs/tutorial/6-viewsets-and-routers.md | 12 ++++++------ 10 files changed, 43 insertions(+), 39 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 343466eee..0ec5bad10 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -190,9 +190,10 @@ If you've already created some users, you can generate tokens for all existing u When using `TokenAuthentication`, you may want to provide a mechanism for clients to obtain a token given the username and password. REST framework provides a built-in view to provide this behavior. To use it, add the `obtain_auth_token` view to your URLconf: - urlpatterns += patterns('', - url(r'^api-token-auth/', 'rest_framework.authtoken.views.obtain_auth_token') - ) + from rest_framework.authtoken import views + urlpatterns += [ + url(r'^api-token-auth/', views.obtain_auth_token) + ] Note that the URL part of the pattern can be whatever you want to use. diff --git a/docs/api-guide/format-suffixes.md b/docs/api-guide/format-suffixes.md index 529738e3b..76a3367b0 100644 --- a/docs/api-guide/format-suffixes.md +++ b/docs/api-guide/format-suffixes.md @@ -26,12 +26,13 @@ Arguments: Example: from rest_framework.urlpatterns import format_suffix_patterns - - urlpatterns = patterns('blog.views', - url(r'^/$', 'api_root'), - url(r'^comments/$', 'comment_list'), - url(r'^comments/(?P<pk>[0-9]+)/$', 'comment_detail') - ) + from blog import views + + urlpatterns = [ + url(r'^/$', views.apt_root), + url(r'^comments/$', views.comment_list), + url(r'^comments/(?P<pk>[0-9]+)/$', views.comment_detail) + ] urlpatterns = format_suffix_patterns(urlpatterns, allowed=['json', 'html']) diff --git a/docs/index.md b/docs/index.md index 6dcb962f5..e4c971f95 100644 --- a/docs/index.md +++ b/docs/index.md @@ -85,10 +85,10 @@ Add `'rest_framework'` to your `INSTALLED_APPS` setting. If you're intending to use the browsable API you'll probably also want to add REST framework's login and logout views. Add the following to your root `urls.py` file. - urlpatterns = patterns('', + urlpatterns = [ ... url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) - ) + ] Note that the URL path can be whatever you want, but you must include `'rest_framework.urls'` with the `'rest_framework'` namespace. diff --git a/docs/topics/2.3-announcement.md b/docs/topics/2.3-announcement.md index ba4351459..7c800afa0 100644 --- a/docs/topics/2.3-announcement.md +++ b/docs/topics/2.3-announcement.md @@ -15,7 +15,7 @@ As an example of just how simple REST framework APIs can now be, here's an API w """ A REST framework API for viewing and editing users and groups. """ - from django.conf.urls.defaults import url, patterns, include + from django.conf.urls.defaults import url, include from django.contrib.auth.models import User, Group from rest_framework import viewsets, routers @@ -36,10 +36,10 @@ As an example of just how simple REST framework APIs can now be, here's an API w # Wire up our API using automatic URL routing. # Additionally, we include login URLs for the browseable API. - urlpatterns = patterns('', + urlpatterns = [ url(r'^', include(router.urls)), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) - ) + ] The best place to get started with ViewSets and Routers is to take a look at the [newest section in the tutorial][part-6], which demonstrates their usage. diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 96214f5b4..b0565d91a 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -64,9 +64,9 @@ We'll also need to add our new `snippets` app and the `rest_framework` app to `I We also need to wire up the root urlconf, in the `tutorial/urls.py` file, to include our snippet app's URLs. - urlpatterns = patterns('', + urlpatterns = [ url(r'^', include('snippets.urls')), - ) + ] Okay, we're ready to roll. @@ -297,11 +297,12 @@ We'll also need a view which corresponds to an individual snippet, and can be us Finally we need to wire these views up. Create the `snippets/urls.py` file: from django.conf.urls import patterns, url + from snippets import views - urlpatterns = patterns('snippets.views', - url(r'^snippets/$', 'snippet_list'), - url(r'^snippets/(?P<pk>[0-9]+)/$', 'snippet_detail'), - ) + urlpatterns = [ + url(r'^snippets/$', views.snippet_list), + url(r'^snippets/(?P<pk>[0-9]+)/$', views.snippet_detail), + ] It's worth noting that there are a couple of edge cases we're not dealing with properly at the moment. If we send malformed `json`, or if a request is made with a method that the view doesn't handle, then we'll end up with a 500 "server error" response. Still, this'll do for now. diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index e70bbbfc4..136b01351 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -110,11 +110,12 @@ Now update the `urls.py` file slightly, to append a set of `format_suffix_patter from django.conf.urls import patterns, url from rest_framework.urlpatterns import format_suffix_patterns + from snippets import views - urlpatterns = patterns('snippets.views', - url(r'^snippets/$', 'snippet_list'), - url(r'^snippets/(?P<pk>[0-9]+)$', 'snippet_detail'), - ) + urlpatterns = [ + url(r'^snippets/$', views.snippet_list), + url(r'^snippets/(?P<pk>[0-9]+)$', views.snippet_detail), + ] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md index e04072ca5..382f078a3 100644 --- a/docs/tutorial/3-class-based-views.md +++ b/docs/tutorial/3-class-based-views.md @@ -68,10 +68,10 @@ We'll also need to refactor our `urls.py` slightly now we're using class based v from rest_framework.urlpatterns import format_suffix_patterns from snippets import views - urlpatterns = patterns('', + urlpatterns = [ url(r'^snippets/$', views.SnippetList.as_view()), url(r'^snippets/(?P<pk>[0-9]+)/$', views.SnippetDetail.as_view()), - ) + ] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 74ad9a551..9120e2547 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -137,10 +137,10 @@ Add the following import at the top of the file: And, at the end of the file, add a pattern to include the login and logout views for the browsable API. - urlpatterns += patterns('', + urlpatterns += [ url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), - ) + ] The `r'^api-auth/'` part of pattern can actually be whatever URL you want to use. The only restriction is that the included urls must use the `'rest_framework'` namespace. diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 9c61fe3d3..36473ce91 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -108,8 +108,8 @@ If we're going to have a hyperlinked API, we need to make sure we name our URL p After adding all those names into our URLconf, our final `snippets/urls.py` file should look something like this: # API endpoints - urlpatterns = format_suffix_patterns(patterns('snippets.views', - url(r'^$', 'api_root'), + urlpatterns = format_suffix_patterns([ + url(r'^$', views.api_root), url(r'^snippets/$', views.SnippetList.as_view(), name='snippet-list'), @@ -125,13 +125,13 @@ After adding all those names into our URLconf, our final `snippets/urls.py` file url(r'^users/(?P<pk>[0-9]+)/$', views.UserDetail.as_view(), name='user-detail') - )) + ]) # Login and logout views for the browsable API - urlpatterns += patterns('', + urlpatterns += [ url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), - ) + ] ## Adding pagination diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index b20195204..cf37a2601 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -87,14 +87,14 @@ Notice how we're creating multiple views from each `ViewSet` class, by binding t Now that we've bound our resources into concrete views, we can register the views with the URL conf as usual. - urlpatterns = format_suffix_patterns(patterns('snippets.views', - url(r'^$', 'api_root'), + urlpatterns = format_suffix_patterns([ + url(r'^$', api_root), url(r'^snippets/$', snippet_list, name='snippet-list'), url(r'^snippets/(?P<pk>[0-9]+)/$', snippet_detail, name='snippet-detail'), url(r'^snippets/(?P<pk>[0-9]+)/highlight/$', snippet_highlight, name='snippet-highlight'), url(r'^users/$', user_list, name='user-list'), url(r'^users/(?P<pk>[0-9]+)/$', user_detail, name='user-detail') - )) + ]) ## Using Routers @@ -102,7 +102,7 @@ Because we're using `ViewSet` classes rather than `View` classes, we actually do Here's our re-wired `urls.py` file. - from django.conf.urls import patterns, url, include + from django.conf.urls import url, include from snippets import views from rest_framework.routers import DefaultRouter @@ -113,10 +113,10 @@ Here's our re-wired `urls.py` file. # The API URLs are now determined automatically by the router. # Additionally, we include the login URLs for the browseable API. - urlpatterns = patterns('', + urlpatterns = [ url(r'^', include(router.urls)), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) - ) + ] Registering the viewsets with the router is similar to providing a urlpattern. We include two arguments - the URL prefix for the views, and the viewset itself. From e8c01ecdabe2abda48dd0cf298d4b6c743574449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Tue, 23 Sep 2014 21:12:58 -0400 Subject: [PATCH 0879/1652] Correctly propagate cloned_request for OPTIONS Update to fix pending changes in #1507 --- rest_framework/generics.py | 7 +++++-- tests/test_generics.py | 39 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index a6f686571..a62da00b3 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -398,10 +398,11 @@ class GenericAPIView(views.APIView): if method not in self.allowed_methods: continue - cloned_request = clone_request(request, method) + original_request = self.request + self.request = clone_request(request, method) try: # Test global permissions - self.check_permissions(cloned_request) + self.check_permissions(self.request) # Test object permissions if method == 'PUT': try: @@ -419,6 +420,8 @@ class GenericAPIView(views.APIView): # appropriate metadata about the fields that should be supplied. serializer = self.get_serializer() actions[method] = serializer.metadata() + finally: + self.request = original_request if actions: ret['actions'] = actions diff --git a/tests/test_generics.py b/tests/test_generics.py index e9f5bebdd..dd3bab186 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -681,3 +681,42 @@ class TestFilterBackendAppliedToViews(TestCase): response = view(request).render() self.assertContains(response, 'field_b') self.assertNotContains(response, 'field_a') + + def test_options_with_dynamic_serializer(self): + """ + Ensure that OPTIONS returns correct POST json schema: + DynamicSerializer with single field 'field_b' + """ + request = factory.options('/') + view = DynamicSerializerView.as_view() + + with self.assertNumQueries(0): + response = view(request).render() + + expected = { + 'name': 'Dynamic Serializer', + 'description': '', + 'renders': [ + 'text/html', + 'application/json' + ], + 'parses': [ + 'application/json', + 'application/x-www-form-urlencoded', + 'multipart/form-data' + ], + 'actions': { + 'POST': { + 'field_b': { + 'type': u'string', + 'required': True, + 'read_only': False, + 'label': u'field b', + 'max_length': 100 + } + } + } + } + + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data, expected) From 90139b3efc7da7a2c396882b6905291269387ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Tue, 23 Sep 2014 21:18:56 -0400 Subject: [PATCH 0880/1652] Remove left unicode strings --- tests/test_generics.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_generics.py b/tests/test_generics.py index dd3bab186..97116349b 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -708,10 +708,10 @@ class TestFilterBackendAppliedToViews(TestCase): 'actions': { 'POST': { 'field_b': { - 'type': u'string', + 'type': 'string', 'required': True, 'read_only': False, - 'label': u'field b', + 'label': 'field b', 'max_length': 100 } } From f4b1dcb167be0bbdaae2cc2a92f651536896dc16 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 24 Sep 2014 14:09:49 +0100 Subject: [PATCH 0881/1652] OPTIONS support --- rest_framework/generics.py | 51 +------- rest_framework/metadata.py | 126 +++++++++++++++++++ rest_framework/serializers.py | 8 +- rest_framework/settings.py | 2 + rest_framework/utils/field_mapping.py | 20 ++-- rest_framework/views.py | 24 +--- tests/test_metadata.py | 166 ++++++++++++++++++++++++++ 7 files changed, 316 insertions(+), 81 deletions(-) create mode 100644 rest_framework/metadata.py create mode 100644 tests/test_metadata.py diff --git a/rest_framework/generics.py b/rest_framework/generics.py index eb6b64efa..f49b0a439 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -4,13 +4,11 @@ Generic views that provide commonly needed behaviour. from __future__ import unicode_literals from django.db.models.query import QuerySet -from django.core.exceptions import PermissionDenied from django.core.paginator import Paginator, InvalidPage from django.http import Http404 from django.shortcuts import get_object_or_404 as _get_object_or_404 from django.utils.translation import ugettext as _ -from rest_framework import views, mixins, exceptions -from rest_framework.request import clone_request +from rest_framework import views, mixins from rest_framework.settings import api_settings @@ -249,53 +247,6 @@ class GenericAPIView(views.APIView): return obj - # The following are placeholder methods, - # and are intended to be overridden. - # - # The are not called by GenericAPIView directly, - # but are used by the mixin methods. - def metadata(self, request): - """ - Return a dictionary of metadata about the view. - Used to return responses for OPTIONS requests. - - We override the default behavior, and add some extra information - about the required request body for POST and PUT operations. - """ - ret = super(GenericAPIView, self).metadata(request) - - actions = {} - for method in ('PUT', 'POST'): - if method not in self.allowed_methods: - continue - - cloned_request = clone_request(request, method) - try: - # Test global permissions - self.check_permissions(cloned_request) - # Test object permissions - if method == 'PUT': - try: - self.get_object() - except Http404: - # Http404 should be acceptable and the serializer - # metadata should be populated. Except this so the - # outer "else" clause of the try-except-else block - # will be executed. - pass - except (exceptions.APIException, PermissionDenied): - pass - else: - # If user has appropriate permissions for the view, include - # appropriate metadata about the fields that should be supplied. - serializer = self.get_serializer() - actions[method] = serializer.metadata() - - if actions: - ret['actions'] = actions - - return ret - # Concrete view classes that provide method handlers # by composing the mixin classes with the base view. diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py new file mode 100644 index 000000000..580259de1 --- /dev/null +++ b/rest_framework/metadata.py @@ -0,0 +1,126 @@ +""" +The metadata API is used to allow cusomization of how `OPTIONS` requests +are handled. We currently provide a single default implementation that returns +some fairly ad-hoc information about the view. + +Future implementations might use JSON schema or other definations in order +to return this information in a more standardized way. +""" +from __future__ import unicode_literals + +from django.core.exceptions import PermissionDenied +from django.http import Http404 +from django.utils import six +from django.utils.datastructures import SortedDict +from rest_framework import exceptions, serializers +from rest_framework.compat import force_text +from rest_framework.request import clone_request +from rest_framework.utils.field_mapping import ClassLookupDict + + +class BaseMetadata(object): + def determine_metadata(self, request, view): + """ + Return a dictionary of metadata about the view. + Used to return responses for OPTIONS requests. + """ + raise NotImplementedError(".determine_metadata() must be overridden.") + + +class SimpleMetadata(BaseMetadata): + """ + This is the default metadata implementation. + It returns an ad-hoc set of information about the view. + There are not any formalized standards for `OPTIONS` responses + for us to base this on. + """ + label_lookup = ClassLookupDict({ + serializers.Field: 'field', + serializers.BooleanField: 'boolean', + serializers.CharField: 'string', + serializers.URLField: 'url', + serializers.EmailField: 'email', + serializers.RegexField: 'regex', + serializers.SlugField: 'slug', + serializers.IntegerField: 'integer', + serializers.FloatField: 'float', + serializers.DecimalField: 'decimal', + serializers.DateField: 'date', + serializers.DateTimeField: 'datetime', + serializers.TimeField: 'time', + serializers.ChoiceField: 'choice', + serializers.MultipleChoiceField: 'multiple choice', + serializers.FileField: 'file upload', + serializers.ImageField: 'image upload', + }) + + def determine_metadata(self, request, view): + metadata = SortedDict() + metadata['name'] = view.get_view_name() + metadata['description'] = view.get_view_description() + metadata['renders'] = [renderer.media_type for renderer in view.renderer_classes] + metadata['parses'] = [parser.media_type for parser in view.parser_classes] + if hasattr(view, 'get_serializer'): + actions = self.determine_actions(request, view) + if actions: + metadata['actions'] = actions + return metadata + + def determine_actions(self, request, view): + """ + For generic class based views we return information about + the fields that are accepted for 'PUT' and 'POST' methods. + """ + actions = {} + for method in set(['PUT', 'POST']) & set(view.allowed_methods): + view.request = clone_request(request, method) + try: + # Test global permissions + if hasattr(view, 'check_permissions'): + view.check_permissions(view.request) + # Test object permissions + if method == 'PUT' and hasattr(view, 'get_object'): + view.get_object() + except (exceptions.APIException, PermissionDenied, Http404): + pass + else: + # If user has appropriate permissions for the view, include + # appropriate metadata about the fields that should be supplied. + serializer = view.get_serializer() + actions[method] = self.get_serializer_info(serializer) + finally: + view.request = request + + return actions + + def get_serializer_info(self, serializer): + """ + Given an instance of a serializer, return a dictionary of metadata + about its fields. + """ + return SortedDict([ + (field_name, self.get_field_info(field)) + for field_name, field in six.iteritems(serializer.fields) + ]) + + def get_field_info(self, field): + """ + Given an instance of a serializer field, return a dictionary + of metadata about it. + """ + field_info = SortedDict() + field_info['type'] = self.label_lookup[field] + field_info['required'] = getattr(field, 'required', False) + + for attr in ['read_only', 'label', 'help_text', 'min_length', 'max_length']: + value = getattr(field, attr, None) + if value is not None and value != '': + field_info[attr] = force_text(value, strings_only=True) + + if hasattr(field, 'choices'): + field_info['choices'] = [ + {'value': choice_value, 'display_name': choice_name} + for choice_value, choice_name in field.choices.items() + ] + + return field_info diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index d8d72a4c6..8902294bc 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -21,7 +21,7 @@ from rest_framework.utils import html, model_meta, representation from rest_framework.utils.field_mapping import ( get_url_kwargs, get_field_kwargs, get_relation_kwargs, get_nested_relation_kwargs, - lookup_class + ClassLookupDict ) import copy import inspect @@ -318,7 +318,7 @@ class ListSerializer(BaseSerializer): class ModelSerializer(Serializer): - _field_mapping = { + _field_mapping = ClassLookupDict({ models.AutoField: IntegerField, models.BigIntegerField: IntegerField, models.BooleanField: BooleanField, @@ -341,7 +341,7 @@ class ModelSerializer(Serializer): models.TextField: CharField, models.TimeField: TimeField, models.URLField: URLField, - } + }) _related_class = PrimaryKeyRelatedField def create(self, attrs): @@ -400,7 +400,7 @@ class ModelSerializer(Serializer): elif field_name in info.fields_and_pk: # Create regular model fields. model_field = info.fields_and_pk[field_name] - field_cls = lookup_class(self._field_mapping, model_field) + field_cls = self._field_mapping[model_field] kwargs = get_field_kwargs(field_name, model_field) if 'choices' in kwargs: # Fields with choices get coerced into `ChoiceField` diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 421e146c8..d7fb0a436 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -45,6 +45,7 @@ DEFAULTS = { ), 'DEFAULT_THROTTLE_CLASSES': (), 'DEFAULT_CONTENT_NEGOTIATION_CLASS': 'rest_framework.negotiation.DefaultContentNegotiation', + 'DEFAULT_METADATA_CLASS': 'rest_framework.metadata.SimpleMetadata', # Genric view behavior 'DEFAULT_MODEL_SERIALIZER_CLASS': 'rest_framework.serializers.ModelSerializer', @@ -121,6 +122,7 @@ IMPORT_STRINGS = ( 'DEFAULT_PERMISSION_CLASSES', 'DEFAULT_THROTTLE_CLASSES', 'DEFAULT_CONTENT_NEGOTIATION_CLASS', + 'DEFAULT_METADATA_CLASS', 'DEFAULT_MODEL_SERIALIZER_CLASS', 'DEFAULT_PAGINATION_SERIALIZER_CLASS', 'DEFAULT_FILTER_BACKENDS', diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index c208afdc5..c37940832 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -9,17 +9,21 @@ from rest_framework.compat import clean_manytomany_helptext import inspect -def lookup_class(mapping, instance): +class ClassLookupDict(object): """ - Takes a dictionary with classes as keys, and an object. - Traverses the object's inheritance hierarchy in method - resolution order, and returns the first matching value + Takes a dictionary with classes as keys. + Lookups against this object will traverses the object's inheritance + hierarchy in method resolution order, and returns the first matching value from the dictionary or raises a KeyError if nothing matches. """ - for cls in inspect.getmro(instance.__class__): - if cls in mapping: - return mapping[cls] - raise KeyError('Class %s not found in lookup.', cls.__name__) + def __init__(self, mapping): + self.mapping = mapping + + def __getitem__(self, key): + for cls in inspect.getmro(key.__class__): + if cls in self.mapping: + return self.mapping[cls] + raise KeyError('Class %s not found in lookup.', cls.__name__) def needs_label(model_field, field_name): diff --git a/rest_framework/views.py b/rest_framework/views.py index 9f08a4ad5..835e223a7 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -5,7 +5,6 @@ from __future__ import unicode_literals from django.core.exceptions import PermissionDenied, ValidationError, NON_FIELD_ERRORS from django.http import Http404 -from django.utils.datastructures import SortedDict from django.views.decorators.csrf import csrf_exempt from rest_framework import status, exceptions from rest_framework.compat import smart_text, HttpResponseBase, View @@ -99,6 +98,7 @@ class APIView(View): throttle_classes = api_settings.DEFAULT_THROTTLE_CLASSES permission_classes = api_settings.DEFAULT_PERMISSION_CLASSES content_negotiation_class = api_settings.DEFAULT_CONTENT_NEGOTIATION_CLASS + metadata_class = api_settings.DEFAULT_METADATA_CLASS # Allow dependancy injection of other settings to make testing easier. settings = api_settings @@ -418,22 +418,8 @@ class APIView(View): def options(self, request, *args, **kwargs): """ Handler method for HTTP 'OPTIONS' request. - We may as well implement this as Django will otherwise provide - a less useful default implementation. """ - return Response(self.metadata(request), status=status.HTTP_200_OK) - - def metadata(self, request): - """ - Return a dictionary of metadata about the view. - Used to return responses for OPTIONS requests. - """ - # By default we can't provide any form-like information, however the - # generic views override this implementation and add additional - # information for POST and PUT methods, based on the serializer. - ret = SortedDict() - ret['name'] = self.get_view_name() - ret['description'] = self.get_view_description() - ret['renders'] = [renderer.media_type for renderer in self.renderer_classes] - ret['parses'] = [parser.media_type for parser in self.parser_classes] - return ret + if self.metadata_class is None: + return self.http_method_not_allowed(request, *args, **kwargs) + data = self.metadata_class().determine_metadata(request, self) + return Response(data, status=status.HTTP_200_OK) diff --git a/tests/test_metadata.py b/tests/test_metadata.py new file mode 100644 index 000000000..0ebea935f --- /dev/null +++ b/tests/test_metadata.py @@ -0,0 +1,166 @@ +from __future__ import unicode_literals + +from rest_framework import exceptions, serializers, views +from rest_framework.request import Request +from rest_framework.test import APIRequestFactory +import pytest + +request = Request(APIRequestFactory().options('/')) + + +class TestMetadata: + def test_metadata(self): + """ + OPTIONS requests to views should return a valid 200 response. + """ + class ExampleView(views.APIView): + """Example view.""" + pass + + response = ExampleView().options(request=request) + expected = { + 'name': 'Example', + 'description': 'Example view.', + 'renders': [ + 'application/json', + 'text/html' + ], + 'parses': [ + 'application/json', + 'application/x-www-form-urlencoded', + 'multipart/form-data' + ] + } + assert response.status_code == 200 + assert response.data == expected + + def test_none_metadata(self): + """ + OPTIONS requests to views where `metadata_class = None` should raise + a MethodNotAllowed exception, which will result in an HTTP 405 response. + """ + class ExampleView(views.APIView): + metadata_class = None + + with pytest.raises(exceptions.MethodNotAllowed): + ExampleView().options(request=request) + + def test_actions(self): + """ + On generic views OPTIONS should return an 'actions' key with metadata + on the fields that may be supplied to PUT and POST requests. + """ + class ExampleSerializer(serializers.Serializer): + choice_field = serializers.ChoiceField(['red', 'green', 'blue']) + integer_field = serializers.IntegerField(max_value=10) + char_field = serializers.CharField(required=False) + + class ExampleView(views.APIView): + """Example view.""" + def post(self, request): + pass + + def get_serializer(self): + return ExampleSerializer() + + response = ExampleView().options(request=request) + expected = { + 'name': 'Example', + 'description': 'Example view.', + 'renders': [ + 'application/json', + 'text/html' + ], + 'parses': [ + 'application/json', + 'application/x-www-form-urlencoded', + 'multipart/form-data' + ], + 'actions': { + 'POST': { + 'choice_field': { + 'type': 'choice', + 'required': True, + 'read_only': False, + 'label': 'Choice field', + 'choices': [ + {'display_name': 'blue', 'value': 'blue'}, + {'display_name': 'green', 'value': 'green'}, + {'display_name': 'red', 'value': 'red'} + ] + }, + 'integer_field': { + 'type': 'integer', + 'required': True, + 'read_only': False, + 'label': 'Integer field' + }, + 'char_field': { + 'type': 'string', + 'required': False, + 'read_only': False, + 'label': 'Char field' + } + } + } + } + assert response.status_code == 200 + assert response.data == expected + + def test_global_permissions(self): + """ + If a user does not have global permissions on an action, then any + metadata associated with it should not be included in OPTION responses. + """ + class ExampleSerializer(serializers.Serializer): + choice_field = serializers.ChoiceField(['red', 'green', 'blue']) + integer_field = serializers.IntegerField(max_value=10) + char_field = serializers.CharField(required=False) + + class ExampleView(views.APIView): + """Example view.""" + def post(self, request): + pass + + def put(self, request): + pass + + def get_serializer(self): + return ExampleSerializer() + + def check_permissions(self, request): + if request.method == 'POST': + raise exceptions.PermissionDenied() + + response = ExampleView().options(request=request) + assert response.status_code == 200 + assert list(response.data['actions'].keys()) == ['PUT'] + + def test_object_permissions(self): + """ + If a user does not have object permissions on an action, then any + metadata associated with it should not be included in OPTION responses. + """ + class ExampleSerializer(serializers.Serializer): + choice_field = serializers.ChoiceField(['red', 'green', 'blue']) + integer_field = serializers.IntegerField(max_value=10) + char_field = serializers.CharField(required=False) + + class ExampleView(views.APIView): + """Example view.""" + def post(self, request): + pass + + def put(self, request): + pass + + def get_serializer(self): + return ExampleSerializer() + + def get_object(self): + if self.request.method == 'PUT': + raise exceptions.PermissionDenied() + + response = ExampleView().options(request=request) + assert response.status_code == 200 + assert list(response.data['actions'].keys()) == ['POST'] From 358445c174629bdd55894c48eaf965bbfd4414b2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 24 Sep 2014 14:52:34 +0100 Subject: [PATCH 0882/1652] Drop redundant OPTIONS tests --- tests/test_generics.py | 180 ----------------------------------------- 1 file changed, 180 deletions(-) diff --git a/tests/test_generics.py b/tests/test_generics.py index 51004edfe..89f9def01 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -23,25 +23,16 @@ class ForeignKeySerializer(serializers.ModelSerializer): class RootView(generics.ListCreateAPIView): - """ - Example description for OPTIONS. - """ queryset = BasicModel.objects.all() serializer_class = BasicSerializer class InstanceView(generics.RetrieveUpdateDestroyAPIView): - """ - Example description for OPTIONS. - """ queryset = BasicModel.objects.exclude(text='filtered out') serializer_class = BasicSerializer class FKInstanceView(generics.RetrieveUpdateDestroyAPIView): - """ - FK: example description for OPTIONS. - """ queryset = ForeignKeySource.objects.all() serializer_class = ForeignKeySerializer @@ -122,47 +113,6 @@ class TestRootView(TestCase): self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) self.assertEqual(response.data, {"detail": "Method 'DELETE' not allowed."}) - # def test_options_root_view(self): - # """ - # OPTIONS requests to ListCreateAPIView should return metadata - # """ - # request = factory.options('/') - # with self.assertNumQueries(0): - # response = self.view(request).render() - # expected = { - # 'parses': [ - # 'application/json', - # 'application/x-www-form-urlencoded', - # 'multipart/form-data' - # ], - # 'renders': [ - # 'application/json', - # 'text/html' - # ], - # 'name': 'Root', - # 'description': 'Example description for OPTIONS.', - # 'actions': { - # 'POST': { - # 'text': { - # 'max_length': 100, - # 'read_only': False, - # 'required': True, - # 'type': 'string', - # "label": "Text comes here", - # "help_text": "Text description." - # }, - # 'id': { - # 'read_only': True, - # 'required': False, - # 'type': 'integer', - # 'label': 'ID', - # }, - # } - # } - # } - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertEqual(response.data, expected) - def test_post_cannot_set_id(self): """ POST requests to create a new object should not be able to set the id. @@ -256,89 +206,6 @@ class TestInstanceView(TestCase): ids = [obj.id for obj in self.objects.all()] self.assertEqual(ids, [2, 3]) - # def test_options_instance_view(self): - # """ - # OPTIONS requests to RetrieveUpdateDestroyAPIView should return metadata - # """ - # request = factory.options('/1') - # with self.assertNumQueries(1): - # response = self.view(request, pk=1).render() - # expected = { - # 'parses': [ - # 'application/json', - # 'application/x-www-form-urlencoded', - # 'multipart/form-data' - # ], - # 'renders': [ - # 'application/json', - # 'text/html' - # ], - # 'name': 'Instance', - # 'description': 'Example description for OPTIONS.', - # 'actions': { - # 'PUT': { - # 'text': { - # 'max_length': 100, - # 'read_only': False, - # 'required': True, - # 'type': 'string', - # 'label': 'Text comes here', - # 'help_text': 'Text description.' - # }, - # 'id': { - # 'read_only': True, - # 'required': False, - # 'type': 'integer', - # 'label': 'ID', - # }, - # } - # } - # } - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertEqual(response.data, expected) - - # def test_options_before_instance_create(self): - # """ - # OPTIONS requests to RetrieveUpdateDestroyAPIView should return metadata - # before the instance has been created - # """ - # request = factory.options('/999') - # with self.assertNumQueries(1): - # response = self.view(request, pk=999).render() - # expected = { - # 'parses': [ - # 'application/json', - # 'application/x-www-form-urlencoded', - # 'multipart/form-data' - # ], - # 'renders': [ - # 'application/json', - # 'text/html' - # ], - # 'name': 'Instance', - # 'description': 'Example description for OPTIONS.', - # 'actions': { - # 'PUT': { - # 'text': { - # 'max_length': 100, - # 'read_only': False, - # 'required': True, - # 'type': 'string', - # 'label': 'Text comes here', - # 'help_text': 'Text description.' - # }, - # 'id': { - # 'read_only': True, - # 'required': False, - # 'type': 'integer', - # 'label': 'ID', - # }, - # } - # } - # } - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertEqual(response.data, expected) - def test_get_instance_view_incorrect_arg(self): """ GET requests with an incorrect pk type, should raise 404, not 500. @@ -415,53 +282,6 @@ class TestFKInstanceView(TestCase): ] self.view = FKInstanceView.as_view() - # def test_options_root_view(self): - # """ - # OPTIONS requests to ListCreateAPIView should return metadata - # """ - # request = factory.options('/999') - # with self.assertNumQueries(1): - # response = self.view(request, pk=999).render() - # expected = { - # 'name': 'Fk Instance', - # 'description': 'FK: example description for OPTIONS.', - # 'renders': [ - # 'application/json', - # 'text/html' - # ], - # 'parses': [ - # 'application/json', - # 'application/x-www-form-urlencoded', - # 'multipart/form-data' - # ], - # 'actions': { - # 'PUT': { - # 'id': { - # 'type': 'integer', - # 'required': False, - # 'read_only': True, - # 'label': 'ID' - # }, - # 'name': { - # 'type': 'string', - # 'required': True, - # 'read_only': False, - # 'label': 'name', - # 'max_length': 100 - # }, - # 'target': { - # 'type': 'field', - # 'required': True, - # 'read_only': False, - # 'label': 'Target', - # 'help_text': 'Target' - # } - # } - # } - # } - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertEqual(response.data, expected) - class TestOverriddenGetObject(TestCase): """ From 127c0bd3d68860dd6567d81047257fbc3e70b4b9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 24 Sep 2014 20:25:59 +0100 Subject: [PATCH 0883/1652] Custom deepcopy on Field classes --- rest_framework/fields.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f859658a1..1f7d964a5 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -9,6 +9,7 @@ from rest_framework import ISO_8601 from rest_framework.compat import smart_text, EmailValidator, MinValueValidator, MaxValueValidator, URLValidator from rest_framework.settings import api_settings from rest_framework.utils import html, representation, humanize_datetime +import copy import datetime import decimal import inspect @@ -150,6 +151,11 @@ class Field(object): instance._kwargs = kwargs return instance + def __deepcopy__(self, memo): + args = copy.deepcopy(self._args) + kwargs = copy.deepcopy(self._kwargs) + return self.__class__(*args, **kwargs) + def bind(self, field_name, parent, root): """ Setup the context for the field instance. From fb1546ee50953faae8af505a0c90da00ac08ad92 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 24 Sep 2014 20:53:37 +0100 Subject: [PATCH 0884/1652] Enforce field_name != source --- rest_framework/fields.py | 11 +++++++++++ tests/test_fields.py | 13 ++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 1f7d964a5..9280ea3a3 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -160,6 +160,17 @@ class Field(object): """ Setup the context for the field instance. """ + + # In order to enforce a consistent style, we error if a redundant + # 'source' argument has been used. For example: + # my_field = serializer.CharField(source='my_field') + assert self._kwargs.get('source') != field_name, ( + "It is redundant to specify `source='%s'` on field '%s' in " + "serializer '%s', as it is the same the field name. " + "Remove the `source` keyword argument." % + (field_name, self.__class__.__name__, parent.__class__.__name__) + ) + self.field_name = field_name self.parent = parent self.root = root diff --git a/tests/test_fields.py b/tests/test_fields.py index 91f3f5db7..c2e030239 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1,6 +1,6 @@ from decimal import Decimal from django.utils import timezone -from rest_framework import fields +from rest_framework import fields, serializers import datetime import django import pytest @@ -69,6 +69,17 @@ class TestFieldOptions: output = field.run_validation() assert output is 123 + def test_redundant_source(self): + class ExampleSerializer(serializers.Serializer): + example_field = serializers.CharField(source='example_field') + with pytest.raises(AssertionError) as exc_info: + ExampleSerializer() + assert str(exc_info.value) == ( + "It is redundant to specify `source='example_field'` on field " + "'CharField' in serializer 'ExampleSerializer', as it is the " + "same the field name. Remove the `source` keyword argument." + ) + # Tests for field input and output values. # ---------------------------------------- From 1420c76453c37c023a901dd0938d717b7b5e52ca Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 25 Sep 2014 10:49:25 +0100 Subject: [PATCH 0885/1652] Ensure proper sorting of 'choices' attribute on ChoiceField --- rest_framework/fields.py | 9 ++++++--- tests/test_fields.py | 4 ++-- tests/test_metadata.py | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 9280ea3a3..d1aebbafc 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -2,6 +2,7 @@ from django.conf import settings from django.core import validators from django.core.exceptions import ValidationError from django.utils import timezone +from django.utils.datastructures import SortedDict from django.utils.dateparse import parse_date, parse_datetime, parse_time from django.utils.encoding import is_protected_type from django.utils.translation import ugettext_lazy as _ @@ -166,7 +167,7 @@ class Field(object): # my_field = serializer.CharField(source='my_field') assert self._kwargs.get('source') != field_name, ( "It is redundant to specify `source='%s'` on field '%s' in " - "serializer '%s', as it is the same the field name. " + "serializer '%s', because it is the same as the field name. " "Remove the `source` keyword argument." % (field_name, self.__class__.__name__, parent.__class__.__name__) ) @@ -303,6 +304,7 @@ class BooleanField(Field): 'invalid': _('`{input}` is not a valid boolean.') } default_empty_html = False + initial = False TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True)) FALSE_VALUES = set(('f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False)) @@ -365,6 +367,7 @@ class CharField(Field): 'blank': _('This field may not be blank.') } default_empty_html = '' + initial = '' def __init__(self, **kwargs): self.allow_blank = kwargs.pop('allow_blank', False) @@ -775,9 +778,9 @@ class ChoiceField(Field): for item in choices ] if all(pairs): - self.choices = dict([(key, display_value) for key, display_value in choices]) + self.choices = SortedDict([(key, display_value) for key, display_value in choices]) else: - self.choices = dict([(item, item) for item in choices]) + self.choices = SortedDict([(item, item) for item in choices]) # Map the string representation of choices to the underlying value. # Allows us to deal with eg. integer choices while supporting either diff --git a/tests/test_fields.py b/tests/test_fields.py index c2e030239..ebb88d3d6 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -76,8 +76,8 @@ class TestFieldOptions: ExampleSerializer() assert str(exc_info.value) == ( "It is redundant to specify `source='example_field'` on field " - "'CharField' in serializer 'ExampleSerializer', as it is the " - "same the field name. Remove the `source` keyword argument." + "'CharField' in serializer 'ExampleSerializer', because it is the " + "same as the field name. Remove the `source` keyword argument." ) diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 0ebea935f..5ff59c723 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -84,9 +84,9 @@ class TestMetadata: 'read_only': False, 'label': 'Choice field', 'choices': [ - {'display_name': 'blue', 'value': 'blue'}, + {'display_name': 'red', 'value': 'red'}, {'display_name': 'green', 'value': 'green'}, - {'display_name': 'red', 'value': 'red'} + {'display_name': 'blue', 'value': 'blue'} ] }, 'integer_field': { From b22c9602fa0f717b688fdb35e4f6f42c189af3f3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 25 Sep 2014 11:04:18 +0100 Subject: [PATCH 0886/1652] Automatic field binding --- rest_framework/metadata.py | 3 +-- rest_framework/pagination.py | 1 - rest_framework/serializers.py | 30 +++++++++++++++++++++++++----- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py index 580259de1..af4bc396b 100644 --- a/rest_framework/metadata.py +++ b/rest_framework/metadata.py @@ -10,7 +10,6 @@ from __future__ import unicode_literals from django.core.exceptions import PermissionDenied from django.http import Http404 -from django.utils import six from django.utils.datastructures import SortedDict from rest_framework import exceptions, serializers from rest_framework.compat import force_text @@ -100,7 +99,7 @@ class SimpleMetadata(BaseMetadata): """ return SortedDict([ (field_name, self.get_field_info(field)) - for field_name, field in six.iteritems(serializer.fields) + for field_name, field in serializer.fields.items() ]) def get_field_info(self, field): diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index c5a9270a4..fb4512854 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -72,7 +72,6 @@ class BasePaginationSerializer(serializers.Serializer): child=object_serializer(), source='object_list' ) - self.fields[results_field].bind(results_field, self, self) class PaginationSerializer(BasePaginationSerializer): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 8902294bc..12e380900 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -149,6 +149,28 @@ class SerializerMetaclass(type): return super(SerializerMetaclass, cls).__new__(cls, name, bases, attrs) +class BindingDict(object): + def __init__(self, serializer): + self.serializer = serializer + self.fields = SortedDict() + + def __setitem__(self, key, field): + self.fields[key] = field + field.bind(field_name=key, parent=self.serializer, root=self.serializer) + + def __getitem__(self, key): + return self.fields[key] + + def __delitem__(self, key): + del self.fields[key] + + def items(self): + return self.fields.items() + + def values(self): + return self.fields.values() + + @six.add_metaclass(SerializerMetaclass) class Serializer(BaseSerializer): def __init__(self, *args, **kwargs): @@ -161,11 +183,9 @@ class Serializer(BaseSerializer): # Every new serializer is created with a clone of the field instances. # This allows users to dynamically modify the fields on a serializer # instance without affecting every other serializer class. - self.fields = self._get_base_fields() - - # Setup all the child fields, to provide them with the current context. - for field_name, field in self.fields.items(): - field.bind(field_name, self, self) + self.fields = BindingDict(self) + for key, value in self._get_base_fields().items(): + self.fields[key] = value def __new__(cls, *args, **kwargs): # We override this method in order to automagically create From 64632da3718f501cb8174243385d38b547c2fefd Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 25 Sep 2014 11:40:32 +0100 Subject: [PATCH 0887/1652] Clean up bind - no longer needs to be called multiple times in nested fields --- rest_framework/fields.py | 21 ++++++++++++++++----- rest_framework/relations.py | 5 ----- rest_framework/serializers.py | 26 +++++++++----------------- tests/test_relations.py | 8 ++++---- 4 files changed, 29 insertions(+), 31 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index d1aebbafc..446732c3a 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -109,7 +109,8 @@ class Field(object): def __init__(self, read_only=False, write_only=False, required=None, default=empty, initial=None, source=None, label=None, help_text=None, style=None, - error_messages=None, validators=[], allow_null=False): + error_messages=None, validators=[], allow_null=False, + context=None): self._creation_counter = Field._creation_counter Field._creation_counter += 1 @@ -135,6 +136,11 @@ class Field(object): self.validators = validators or self.default_validators[:] self.allow_null = allow_null + # These are set up by `.bind()` when the field is added to a serializer. + self.field_name = None + self.parent = None + self._context = {} if (context is None) else context + # Collect default error message from self and parent classes messages = {} for cls in reversed(self.__class__.__mro__): @@ -157,7 +163,14 @@ class Field(object): kwargs = copy.deepcopy(self._kwargs) return self.__class__(*args, **kwargs) - def bind(self, field_name, parent, root): + @property + def context(self): + root = self + while root.parent is not None: + root = root.parent + return root._context + + def bind(self, field_name, parent): """ Setup the context for the field instance. """ @@ -174,10 +187,8 @@ class Field(object): self.field_name = field_name self.parent = parent - self.root = root - self.context = parent.context - # `self.label` should deafult to being based on the field name. + # `self.label` should default to being based on the field name. if self.label is None: self.label = field_name.replace('_', ' ').capitalize() diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 5aa1f8bd8..b37a6fedd 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -243,11 +243,6 @@ class ManyRelation(Field): assert child_relation is not None, '`child_relation` is a required argument.' super(ManyRelation, self).__init__(*args, **kwargs) - def bind(self, field_name, parent, root): - # ManyRelation needs to provide the current context to the child relation. - super(ManyRelation, self).bind(field_name, parent, root) - self.child_relation.bind(field_name, parent, root) - def to_internal_value(self, data): return [ self.child_relation.to_internal_value(item) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 12e380900..04721c7a3 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -150,13 +150,20 @@ class SerializerMetaclass(type): class BindingDict(object): + """ + This dict-like object is used to store fields on a serializer. + + This ensures that whenever fields are added to the serializer we call + `field.bind()` so that the `field_name` and `parent` attributes + can be set correctly. + """ def __init__(self, serializer): self.serializer = serializer self.fields = SortedDict() def __setitem__(self, key, field): self.fields[key] = field - field.bind(field_name=key, parent=self.serializer, root=self.serializer) + field.bind(field_name=key, parent=self.serializer) def __getitem__(self, key): return self.fields[key] @@ -174,7 +181,6 @@ class BindingDict(object): @six.add_metaclass(SerializerMetaclass) class Serializer(BaseSerializer): def __init__(self, *args, **kwargs): - self.context = kwargs.pop('context', {}) kwargs.pop('partial', None) kwargs.pop('many', None) @@ -198,13 +204,6 @@ class Serializer(BaseSerializer): def _get_base_fields(self): return copy.deepcopy(self._declared_fields) - def bind(self, field_name, parent, root): - # If the serializer is used as a field then when it becomes bound - # it also needs to bind all its child fields. - super(Serializer, self).bind(field_name, parent, root) - for field_name, field in self.fields.items(): - field.bind(field_name, self, root) - def get_initial(self): return dict([ (field.field_name, field.get_initial()) @@ -290,17 +289,10 @@ class ListSerializer(BaseSerializer): self.child = kwargs.pop('child', copy.deepcopy(self.child)) assert self.child is not None, '`child` is a required argument.' assert not inspect.isclass(self.child), '`child` has not been instantiated.' - self.context = kwargs.pop('context', {}) kwargs.pop('partial', None) super(ListSerializer, self).__init__(*args, **kwargs) - self.child.bind('', self, self) - - def bind(self, field_name, parent, root): - # If the list is used as a field then it needs to provide - # the current context to the child serializer. - super(ListSerializer, self).bind(field_name, parent, root) - self.child.bind(field_name, self, root) + self.child.bind(field_name='', parent=self) def get_value(self, dictionary): # We override the default field access in order to support diff --git a/tests/test_relations.py b/tests/test_relations.py index c29618ce2..2d11672b8 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -51,7 +51,7 @@ class TestHyperlinkedIdentityField(APISimpleTestCase): self.instance = MockObject(pk=1, name='foo') self.field = serializers.HyperlinkedIdentityField(view_name='example') self.field.reverse = mock_reverse - self.field.context = {'request': True} + self.field._context = {'request': True} def test_representation(self): representation = self.field.to_representation(self.instance) @@ -62,7 +62,7 @@ class TestHyperlinkedIdentityField(APISimpleTestCase): assert representation is None def test_representation_with_format(self): - self.field.context['format'] = 'xml' + self.field._context['format'] = 'xml' representation = self.field.to_representation(self.instance) assert representation == 'http://example.org/example/1.xml/' @@ -91,14 +91,14 @@ class TestHyperlinkedIdentityFieldWithFormat(APISimpleTestCase): self.instance = MockObject(pk=1, name='foo') self.field = serializers.HyperlinkedIdentityField(view_name='example', format='json') self.field.reverse = mock_reverse - self.field.context = {'request': True} + self.field._context = {'request': True} def test_representation(self): representation = self.field.to_representation(self.instance) assert representation == 'http://example.org/example/1/' def test_representation_with_format(self): - self.field.context['format'] = 'xml' + self.field._context['format'] = 'xml' representation = self.field.to_representation(self.instance) assert representation == 'http://example.org/example/1.json/' From b47ca158b9ba9733baad080e648d24b0465ec697 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 25 Sep 2014 12:09:12 +0100 Subject: [PATCH 0888/1652] Check for redundant on SerializerMethodField --- rest_framework/fields.py | 29 ++++++++++++++++++++++------- tests/test_fields.py | 30 ++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 446732c3a..328e93eff 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -178,7 +178,7 @@ class Field(object): # In order to enforce a consistent style, we error if a redundant # 'source' argument has been used. For example: # my_field = serializer.CharField(source='my_field') - assert self._kwargs.get('source') != field_name, ( + assert self.source != field_name, ( "It is redundant to specify `source='%s'` on field '%s' in " "serializer '%s', because it is the same as the field name. " "Remove the `source` keyword argument." % @@ -883,17 +883,32 @@ class SerializerMethodField(Field): def get_extra_info(self, obj): return ... # Calculate some data to return. """ - def __init__(self, method_attr=None, **kwargs): - self.method_attr = method_attr + def __init__(self, method_name=None, **kwargs): + self.method_name = method_name kwargs['source'] = '*' kwargs['read_only'] = True super(SerializerMethodField, self).__init__(**kwargs) + def bind(self, field_name, parent): + # In order to enforce a consistent style, we error if a redundant + # 'method_name' argument has been used. For example: + # my_field = serializer.CharField(source='my_field') + default_method_name = 'get_{field_name}'.format(field_name=field_name) + assert self.method_name != default_method_name, ( + "It is redundant to specify `%s` on SerializerMethodField '%s' in " + "serializer '%s', because it is the same as the default method name. " + "Remove the `method_name` argument." % + (self.method_name, field_name, parent.__class__.__name__) + ) + + # The method name should default to `get_{field_name}`. + if self.method_name is None: + self.method_name = default_method_name + + super(SerializerMethodField, self).bind(field_name, parent) + def to_representation(self, value): - method_attr = self.method_attr - if method_attr is None: - method_attr = 'get_{field_name}'.format(field_name=self.field_name) - method = getattr(self.parent, method_attr) + method = getattr(self.parent, self.method_name) return method(value) diff --git a/tests/test_fields.py b/tests/test_fields.py index ebb88d3d6..003b4b8c6 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -710,3 +710,33 @@ class TestMultipleChoiceField(FieldValues): ('diesel', 'Diesel'), ] ) + + +# Tests for SerializerMethodField. +# -------------------------------- + +class TestSerializerMethodField: + def test_serializer_method_field(self): + class ExampleSerializer(serializers.Serializer): + example_field = serializers.SerializerMethodField() + + def get_example_field(self, obj): + return 'ran get_example_field(%d)' % obj['example_field'] + + serializer = ExampleSerializer({'example_field': 123}) + assert serializer.data == { + 'example_field': 'ran get_example_field(123)' + } + + def test_redundant_method_name(self): + class ExampleSerializer(serializers.Serializer): + example_field = serializers.SerializerMethodField('get_example_field') + + with pytest.raises(AssertionError) as exc_info: + ExampleSerializer() + assert str(exc_info.value) == ( + "It is redundant to specify `get_example_field` on " + "SerializerMethodField 'example_field' in serializer " + "'ExampleSerializer', because it is the same as the default " + "method name. Remove the `method_name` argument." + ) From 8ee92f8a18c3a31a2a95233f36754203dc60bb18 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 25 Sep 2014 13:10:33 +0100 Subject: [PATCH 0889/1652] Refuse to downcast from datetime to date or time --- rest_framework/fields.py | 150 +++++++++++++++++++++------------------ tests/test_fields.py | 3 +- 2 files changed, 83 insertions(+), 70 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 328e93eff..d855e6fdc 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -608,6 +608,71 @@ class DecimalField(Field): # Date & time fields... +class DateTimeField(Field): + default_error_messages = { + 'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}'), + 'date': _('Expected a datetime but got a date.'), + } + format = api_settings.DATETIME_FORMAT + input_formats = api_settings.DATETIME_INPUT_FORMATS + default_timezone = timezone.get_default_timezone() if settings.USE_TZ else None + + def __init__(self, format=empty, input_formats=None, default_timezone=None, *args, **kwargs): + self.format = format if format is not empty else self.format + self.input_formats = input_formats if input_formats is not None else self.input_formats + self.default_timezone = default_timezone if default_timezone is not None else self.default_timezone + super(DateTimeField, self).__init__(*args, **kwargs) + + def enforce_timezone(self, value): + """ + When `self.default_timezone` is `None`, always return naive datetimes. + When `self.default_timezone` is not `None`, always return aware datetimes. + """ + if (self.default_timezone is not None) and not timezone.is_aware(value): + return timezone.make_aware(value, self.default_timezone) + elif (self.default_timezone is None) and timezone.is_aware(value): + return timezone.make_naive(value, timezone.UTC()) + return value + + def to_internal_value(self, value): + if (isinstance(value, datetime.date) and not isinstance(value, datetime.datetime): + self.fail('date') + + if isinstance(value, datetime.datetime): + return self.enforce_timezone(value) + + for format in self.input_formats: + if format.lower() == ISO_8601: + try: + parsed = parse_datetime(value) + except (ValueError, TypeError): + pass + else: + if parsed is not None: + return self.enforce_timezone(parsed) + else: + try: + parsed = datetime.datetime.strptime(value, format) + except (ValueError, TypeError): + pass + else: + return self.enforce_timezone(parsed) + + humanized_format = humanize_datetime.datetime_formats(self.input_formats) + self.fail('invalid', format=humanized_format) + + def to_representation(self, value): + if value is None or self.format is None: + return value + + if self.format.lower() == ISO_8601: + ret = value.isoformat() + if ret.endswith('+00:00'): + ret = ret[:-6] + 'Z' + return ret + return value.strftime(self.format) + + class DateField(Field): default_error_messages = { 'invalid': _('Date has wrong format. Use one of these formats instead: {format}'), @@ -652,79 +717,20 @@ class DateField(Field): if value is None or self.format is None: return value - if isinstance(value, datetime.datetime): - value = value.date() + # Applying a `DateField` to a datetime value is almost always + # not a sensible thing to do, as it means naively dropping + # any explicit or implicit timezone info. + assert not isinstance(value, datetime.datetime), ( + 'Expected a `date`, but got a `datetime`. Refusing to coerce, ' + 'as this may mean losing timezone information. Use a custom ' + 'read-only field and deal with timezone issues explicitly.' + ) if self.format.lower() == ISO_8601: return value.isoformat() return value.strftime(self.format) -class DateTimeField(Field): - default_error_messages = { - 'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}'), - 'date': _('Expected a datetime but got a date.'), - } - format = api_settings.DATETIME_FORMAT - input_formats = api_settings.DATETIME_INPUT_FORMATS - default_timezone = timezone.get_default_timezone() if settings.USE_TZ else None - - def __init__(self, format=empty, input_formats=None, default_timezone=None, *args, **kwargs): - self.format = format if format is not empty else self.format - self.input_formats = input_formats if input_formats is not None else self.input_formats - self.default_timezone = default_timezone if default_timezone is not None else self.default_timezone - super(DateTimeField, self).__init__(*args, **kwargs) - - def enforce_timezone(self, value): - """ - When `self.default_timezone` is `None`, always return naive datetimes. - When `self.default_timezone` is not `None`, always return aware datetimes. - """ - if (self.default_timezone is not None) and not timezone.is_aware(value): - return timezone.make_aware(value, self.default_timezone) - elif (self.default_timezone is None) and timezone.is_aware(value): - return timezone.make_naive(value, timezone.UTC()) - return value - - def to_internal_value(self, value): - if isinstance(value, datetime.date) and not isinstance(value, datetime.datetime): - self.fail('date') - - if isinstance(value, datetime.datetime): - return self.enforce_timezone(value) - - for format in self.input_formats: - if format.lower() == ISO_8601: - try: - parsed = parse_datetime(value) - except (ValueError, TypeError): - pass - else: - if parsed is not None: - return self.enforce_timezone(parsed) - else: - try: - parsed = datetime.datetime.strptime(value, format) - except (ValueError, TypeError): - pass - else: - return self.enforce_timezone(parsed) - - humanized_format = humanize_datetime.datetime_formats(self.input_formats) - self.fail('invalid', format=humanized_format) - - def to_representation(self, value): - if value is None or self.format is None: - return value - - if self.format.lower() == ISO_8601: - ret = value.isoformat() - if ret.endswith('+00:00'): - ret = ret[:-6] + 'Z' - return ret - return value.strftime(self.format) - - class TimeField(Field): default_error_messages = { 'invalid': _('Time has wrong format. Use one of these formats instead: {format}'), @@ -765,8 +771,14 @@ class TimeField(Field): if value is None or self.format is None: return value - if isinstance(value, datetime.datetime): - value = value.time() + # Applying a `TimeField` to a datetime value is almost always + # not a sensible thing to do, as it means naively dropping + # any explicit or implicit timezone info. + assert not isinstance(value, datetime.datetime), ( + 'Expected a `time`, but got a `datetime`. Refusing to coerce, ' + 'as this may mean losing timezone information. Use a custom ' + 'read-only field and deal with timezone issues explicitly.' + ) if self.format.lower() == ISO_8601: return value.isoformat() diff --git a/tests/test_fields.py b/tests/test_fields.py index 003b4b8c6..b29acad81 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -173,7 +173,8 @@ class TestNullBooleanField(FieldValues): 'null': None, True: True, False: False, - None: None + None: None, + 'other': True } field = fields.NullBooleanField() From 3a5335f09f58439f8e3c0bddbed8e4c7eeb32482 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 25 Sep 2014 13:12:02 +0100 Subject: [PATCH 0890/1652] Fix syntax error --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index d855e6fdc..7beccbb71 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -635,7 +635,7 @@ class DateTimeField(Field): return value def to_internal_value(self, value): - if (isinstance(value, datetime.date) and not isinstance(value, datetime.datetime): + if isinstance(value, datetime.date) and not isinstance(value, datetime.datetime): self.fail('date') if isinstance(value, datetime.datetime): From 417fe1b675bd1d42518fb89a6f81547caef5b735 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 25 Sep 2014 13:37:26 +0100 Subject: [PATCH 0891/1652] Partial support --- rest_framework/fields.py | 35 +++++++++++++++++++++++++---------- rest_framework/serializers.py | 6 ++++-- tests/test_serializer.py | 33 ++++++++++++++++++++++++++++++++- 3 files changed, 61 insertions(+), 13 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 7beccbb71..032bfd048 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -109,8 +109,7 @@ class Field(object): def __init__(self, read_only=False, write_only=False, required=None, default=empty, initial=None, source=None, label=None, help_text=None, style=None, - error_messages=None, validators=[], allow_null=False, - context=None): + error_messages=None, validators=[], allow_null=False): self._creation_counter = Field._creation_counter Field._creation_counter += 1 @@ -139,7 +138,6 @@ class Field(object): # These are set up by `.bind()` when the field is added to a serializer. self.field_name = None self.parent = None - self._context = {} if (context is None) else context # Collect default error message from self and parent classes messages = {} @@ -163,13 +161,6 @@ class Field(object): kwargs = copy.deepcopy(self._kwargs) return self.__class__(*args, **kwargs) - @property - def context(self): - root = self - while root.parent is not None: - root = root.parent - return root._context - def bind(self, field_name, parent): """ Setup the context for the field instance. @@ -254,6 +245,8 @@ class Field(object): """ if data is empty: if self.required: + if getattr(self.root, 'partial', False): + raise SkipField() self.fail('required') return self.get_default() @@ -304,7 +297,29 @@ class Field(object): raise AssertionError(msg) raise ValidationError(msg.format(**kwargs)) + @property + def root(self): + """ + Returns the top-level serializer for this field. + """ + root = self + while root.parent is not None: + root = root.parent + return root + + @property + def context(self): + """ + Returns the context as passed to the root serializer on initialization. + """ + return getattr(self.root, '_context', {}) + def __repr__(self): + """ + Fields are represented using their initial calling arguments. + This allows us to create descriptive representations for serializer + instances that show all the declared fields on the serializer. + """ return representation.field_repr(self) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 04721c7a3..b6a1898ca 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -181,8 +181,9 @@ class BindingDict(object): @six.add_metaclass(SerializerMetaclass) class Serializer(BaseSerializer): def __init__(self, *args, **kwargs): - kwargs.pop('partial', None) kwargs.pop('many', None) + self.partial = kwargs.pop('partial', False) + self._context = kwargs.pop('context', {}) super(Serializer, self).__init__(*args, **kwargs) @@ -289,7 +290,8 @@ class ListSerializer(BaseSerializer): self.child = kwargs.pop('child', copy.deepcopy(self.child)) assert self.child is not None, '`child` is a required argument.' assert not inspect.isclass(self.child), '`child` has not been instantiated.' - kwargs.pop('partial', None) + self.partial = kwargs.pop('partial', False) + self._context = kwargs.pop('context', {}) super(ListSerializer, self).__init__(*args, **kwargs) self.child.bind(field_name='', parent=self) diff --git a/tests/test_serializer.py b/tests/test_serializer.py index b0eb4e270..5646f9940 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -1,3 +1,35 @@ +from rest_framework import serializers + + +# Tests for core functionality. +# ----------------------------- + +class TestSerializer: + def setup(self): + class ExampleSerializer(serializers.Serializer): + char = serializers.CharField() + integer = serializers.IntegerField() + self.Serializer = ExampleSerializer + + def test_valid_serializer(self): + serializer = self.Serializer(data={'char': 'abc', 'integer': 123}) + assert serializer.is_valid() + assert serializer.validated_data == {'char': 'abc', 'integer': 123} + assert serializer.errors == {} + + def test_invalid_serializer(self): + serializer = self.Serializer(data={'char': 'abc'}) + assert not serializer.is_valid() + assert serializer.validated_data == {} + assert serializer.errors == {'integer': ['This field is required.']} + + def test_partial_validation(self): + serializer = self.Serializer(data={'char': 'abc'}, partial=True) + assert serializer.is_valid() + assert serializer.validated_data == {'char': 'abc'} + assert serializer.errors == {} + + # # -*- coding: utf-8 -*- # from __future__ import unicode_literals # from django.db import models @@ -334,7 +366,6 @@ # Check _data attribute is cleared on `save()` # Regression test for #1116 -# — id field is not populated if `data` is accessed prior to `save()` # """ # serializer = ActionItemSerializer(self.actionitem) # self.assertIsNone(serializer.data.get('id', None), 'New instance. `id` should not be set.') From 2859eaf524bca23f27e666d24a0b63ba61698a76 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 10:46:52 +0100 Subject: [PATCH 0892/1652] request.data attribute --- docs/topics/3.0-announcement.md | 344 ++++++++++++++++++++++++++++-- rest_framework/authtoken/views.py | 2 +- rest_framework/fields.py | 51 +++-- rest_framework/filters.py | 6 +- rest_framework/generics.py | 4 +- rest_framework/mixins.py | 6 +- rest_framework/negotiation.py | 4 +- rest_framework/renderers.py | 4 +- rest_framework/request.py | 37 +++- rest_framework/serializers.py | 21 +- tests/test_fields.py | 140 +++++++++++- tests/test_generics.py | 2 +- tests/test_serializer.py | 62 ++++++ 13 files changed, 610 insertions(+), 73 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index cd883cdd8..1795611c0 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -4,36 +4,65 @@ See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-fr # REST framework 3.0 -**Note incremental nature, discuss upgrading.** +**TODO**: Note incremental nature, discuss upgrading, motivation, features. -## Motivation - -**TODO** +* Serializer reprs. +* Non-magical model serializers. +* Base serializer class. +* Clean logic in views, serializers, fields. --- ## Request objects -#### The `request.data` property. +#### The `.data` and `.query_params` properties. -**TODO** +The usage of `request.DATA` and `request.FILES` is now discouraged in favor of a single `request.data` attribute that contains *all* the parsed data. -#### The parser API. +Having seperate attributes is reasonable for web applications that only ever parse URL encoded or MultiPart requests, but makes less sense for the general-purpose request parsing that REST framework supports. -**TODO** +You may now pass all the request data to a serializer class in a single argument: + + ExampleSerializer(data=request.data) + +Instead of passing the files argument seperately: + + # Don't do this... + ExampleSerializer(data=request.DATA, files=request.FILES) + + +The usage of `request.QUERY_PARAMS` is now discouraged in favor of the lowercased `request.query_params`. ## Serializers #### Single-step object creation. +#### The `.create()` and `.update()` methods. + **TODO**: Drop `.restore_object()`, use `.create()` and `.update()` which should save the instance. -**TODO**: Drop`.object`, use `.validated_data` or get the instance with `.save()`. +#### Use `.validated_data` instead of `.object`. -#### The `BaseSerializer` class. +You must now use the `.validated_data` attribute if you need to inspect the data before saving, rather than using the `.object` attribute, which no longer exists. -**TODO** +For example the following code *is no longer valid*: + if serializer.is_valid(): + name = serializer.object.name # Inspect validated field data. + logging.info('Creating ticket "%s"' % name) + serializer.object.user = request.user # Include the user when saving. + serializer.save() + +Instead of using `.object` to inspect a partially constructed instance, you would now use `.validated_data` to inspect the cleaned incoming values. Also you can't set extra attributes on the instance directly, but instead pass them to the `.save()` method using the `extras` keyword argument. + +The corresponding code would now look like this: + + if serializer.is_valid(): + name = serializer.validated_data['name'] # Inspect validated field data. + logging.info('Creating ticket "%s"' % name) + extras = {'user': request.user} # Include the user when saving. + serializer.save(extras=extras) + #### Always use `fields`, not `exclude`. The `exclude` option is no longer available. You should use the more explicit `fields` option instead. @@ -111,42 +140,287 @@ These fields will be mapped to `serializers.ReadOnlyField()` instances. message = CharField(max_length=1000) expiry_date = ReadOnlyField() +#### The `ListSerializer` class. + +The `ListSerializer` class has now been added, and allows you to create base serializer classes for only accepting multiple inputs. + + class MultipleUserSerializer(ListSerializer): + child = UserSerializer() + +You can also still use the `many=True` argument to serializer classes. It's worth noting that `many=True` argument transparently creates a `ListSerializer` instance, allowing the validation logic for list and non-list data to be cleanly seperated in the REST framework codebase. + +See also the new `ListField` class, which validates input in the same way, but does not include the serializer interfaces of `.is_valid()`, `.data`, `.save()` and so on. + +#### The `BaseSerializer` class. + +REST framework now includes a simple `BaseSerializer` class that can be used to easily support alternative serialization and deserialization styles. + +This class implements the same basic API as the `Serializer` class: + +* `.data` - Returns the outgoing primative representation. +* `.is_valid()` - Deserializes and validates incoming data. +* `.validated_data` - Returns the validated incoming data. +* `.errors` - Returns an errors during validation. +* `.save()` - Persists the validated data into an object instance. + +There are four mathods that can be overriding, depending on what functionality you want the serializer class to support: + +* `.to_representation()` - Override this to support serialization, for read operations. +* `.to_internal_value()` - Override this to support deserialization, for write operations. +* `.create()` and `.update()` - Overide either or both of these to support saving instances. + +##### Read-only serializers. + +To implement a read-only serializer using the `BaseSerializer` class, we just need to override the `.to_representation()` method. Let's take a look at an example using a simple Django model: + + class HighScore(models.Model): + created = models.DateTimeField(auto_now_add=True) + player_name = models.CharField(max_length=10) + score = models.IntegerField() + +It's simple to create a read-only serializer for converting `HighScore` instances into primative data types. + + class HighScoreSerializer(serializers.BaseSerializer): + def to_representation(self, obj): + return { + 'score': obj.score, + 'player_name': obj.player_name + } + +We can now use this class to serialize single `HighScore` instances: + + @api_view(['GET']) + def high_score(request, pk): + instance = HighScore.objects.get(pk=pk) + serializer = HighScoreSerializer(instance) + return Response(serializer.data) + +Or use it to serialize multiple instances: + + @api_view(['GET']) + def all_high_scores(request): + queryset = HighScore.objects.order_by('-score') + serializer = HighScoreSerializer(queryset, many=True) + return Response(serializer.data) + +##### Read-write serializers. + +To create a read-write serializer we first need to implement a `.to_internal_value()` method. This method returns the validated values that will be used to construct the object instance, and may raise a `ValidationError` if the supplied data is in an incorrect format. + +Once you've implemented `.to_internal_value()`, the basic validation API will be available on the serializer, and you will be able to use `.is_valid()`, `.validated_data` and `.errors`. + +If you want to also support `.save()` you'll need to also implement either or both of the `.create()` and `.update()` methods. + +Here's a complete example of our previous `HighScoreSerializer`, that's been updated to support both read and write operations. + + class HighScoreSerializer(serializers.BaseSerializer): + def to_internal_value(self, data): + score = data.get('score') + player_name = data.get('player_name') + + # Perform the data validation. + if not score: + raise ValidationError({ + 'score': 'This field is required.' + }) + if not player_name: + raise ValidationError({ + 'player_name': 'This field is required.' + }) + if len(player_name) > 10: + raise ValidationError({ + 'player_name': 'May not be more than 10 characters.' + }) + + # Return the validated values. This will be available as + # the `.validated_data` property. + return { + 'score': int(score), + 'player_name': player_name + } + + def to_representation(self, obj): + return { + 'score': obj.score, + 'player_name': obj.player_name + } + + def create(self, validated_data): + return HighScore.objects.create(**validated_data) + +#### Creating new base classes with `BaseSerializer`. + +The `BaseSerializer` class is also useful if you want to implement new generic serializer classes for dealing with particular serialization styles or for integrating with different storage backends. + +The following class is an example of a generic serializer that can handle coercing aribitrary objects into primative representations. + + class ObjectSerializer(serializers.BaseSerializer): + """ + A read-only serializer that coerces arbitrary complex objects + into primative representations. + """ + def to_representation(self, obj): + for attribute_name in dir(obj): + attribute = getattr(obj, attribute_name) + if attribute_name('_'): + # Ignore private attributes. + pass + elif hasattr(attribute, '__call__'): + # Ignore methods and other callables. + pass + elif isinstance(attribute, (str, int, bool, float, type(None))): + # Primative types can be passed through unmodified. + output[attribute_name] = attribute + elif isinstance(attribute, list): + # Recursivly deal with items in lists. + output[attribute_name] = [ + self.to_representation(item) for item in attribute + ] + elif isinstance(attribute, dict): + # Recursivly deal with items in dictionarys. + output[attribute_name] = { + str(key): self.to_representation(value) + for key, value in attribute.items() + } + else: + # Force anything else to its string representation. + output[attribute_name] = str(attribute) ## Serializer fields #### The `Field` and `ReadOnly` field classes. -**TODO** +There are some minor tweaks to the field base classes. + +Previously we had these two base classes: + +* `Field` as the base class for read-only fields. A default implementation was included for serializing data. +* `WriteableField` as the base class for read-write fields. + +We now use the following: + +* `Field` is the base class for all fields. It does not include any default implementation for either serializing or deserializing data. +* `ReadOnlyField` is a concrete implementation for read-only fields that simply returns the attribute value without modification. + +#### The `required`, `allow_none`, `allow_blank` and `default` arguments. + +REST framework now has more explict and clear control over validating empty values for fields. + +Previously the meaning of the `required=False` keyword argument was underspecified. In practice it's use meant that a field could either be not included in the input, or it could be included, but be `None`. + +We now have a better seperation, with seperate `required` and `allow_none` arguments. + +The following set of arguments are used to control validation of empty values: + +* `required=False`: The value does not need to be present in the input, and will not be passed to `.create()` or `.update()` if it is not seen. +* `default=<value>`: The value does not need to be present in the input, and a default value will be passed to `.create()` or `.update()` if it is not seen. +* `allow_none=True`: `None` is a valid input. +* `allow_blank=True`: `''` is valid input. For `CharField` and subclasses only. + +Typically you'll want to use `required=False` if the corresponding model field has a default value, and additionally set either `allow_none=True` or `allow_blank=True` if required. + +The `default` argument is there if you need it, but you'll more typically want defaults to be set on model fields, rather than serializer fields. #### Coercing output types. -**TODO** +The previous field implementations did not forcibly coerce returned values into the correct type in many cases. For example, an `IntegerField` would return a string output if the attribute value was a string. We now more strictly coerce to the correct return type, leading to more constrained and expected behavior. -#### The `ListSerializer` class. +#### The `ListField` class. -**TODO** +The `ListField` class has now been added. This field validates list input. It takes a `child` keyword argument which is used to specify the field used to validate each item in the list. For example: + + scores = ListField(child=IntegerField(min_value=0, max_value=100)) + +You can also use a declarative style to create new subclasses of `ListField`, like this: + + class ScoresField(ListField): + child = IntegerField(min_value=0, max_value=100) + +We can now use the `ScoresField` class inside another serializer: + + scores = ScoresField() + +See also the new `ListSerializer` class, which validates input in the same way, but also includes the serializer interfaces of `.is_valid()`, `.data`, `.save()` and so on. + +#### The `ChoiceField` class may now accept a flat list. + +The `ChoiceField` class may now accept a list of choices in addition to the existing style of using a list of pairs of `(name, display_value)`. The following is now valid: + + color = ChoiceField(choices=['red', 'green', 'blue']) #### The `MultipleChoiceField` class. -**TODO** +The `MultipleChoiceField` class has been added. This field acts like `ChoiceField`, but returns a set, which may include none, one or many of the valid choices. #### Changes to the custom field API. -**TODO** `to_representation`, `to_internal_value`. +The `from_native(self, value)` and `to_native(self, data)` method names have been replaced with the more obviously named `to_representation(self, value)` and `to_internal_value(self, data)`. -#### Explicit `querysets` required on relational fields. +The `field_from_native()` and `field_to_native()` methods are removed. -**TODO** +#### Explicit `queryset` required on relational fields. + +Previously relational fields that were explicitly declared on a serializer class could omit the queryset argument if (and only if) they were declared on a `ModelSerializer`. + +This code *would be valid* in `2.4.3`: + + class AccountSerializer(serializers.ModelSerializer): + organisations = serializers.SlugRelatedField(slug_field='name') + + class Meta: + model = Account + +However this code *would not be valid* in `2.4.3`: + + # Missing `queryset` + class AccountSerializer(serializers.Serializer): + organisations = serializers.SlugRelatedField(slug_field='name') + + def restore_object(self, attrs, instance=None): + # ... + +The queryset argument is now always required for writable relational fields. +This removes some magic and makes it easier and more obvious to move between implict `ModelSerializer` classes and explicit `Serializer` classes. + + class AccountSerializer(serializers.ModelSerializer): + organisations = serializers.SlugRelatedField( + slug_field='name', + queryset=Organisation.objects.all() + ) + + class Meta: + model = Account + +The `queryset` argument is only ever required for writable fields, and is not required or valid for fields with `read_only=True`. #### Optional argument to `SerializerMethodField`. -**TODO** +The argument to `SerializerMethodField` is now optional, and defaults to `get_<field_name>`. For example the following is valid: + + class AccountSerializer(serializers.Serializer): + # `method_name='get_billing_details'` by default. + billing_details = serializers.SerializerMethodField() + + def get_billing_details(self, account): + return calculate_billing(account) + +In order to ensure a consistent code style an assertion error will be raised if you include a redundant method name argument that matches the default method name. For example, the following code *will raise an error*: + + billing_details = serializers.SerializerMethodField('get_billing_details') + +#### Enforcing consistent `source` usage. + +I've see several codebases that unneccessarily include the `source` argument, setting it to the same value as the field name. This usage is redundant and confusing, making it less obvious that `source` is usually not required. + +The following usage will *now raise an error*: + + email = serializers.EmailField(source='email') ## Generic views #### Simplification of view logic. -**TODO** +The view logic for the default method handlers has been significantly simplified, due to the new serializers API. #### Removal of pre/post save hooks. @@ -169,6 +443,20 @@ I would personally recommend that developers treat view instances as immutable o #### PUT as create. +Allowing `PUT` as create operations is problematic, as it neccessarily exposes information about the existence or non-existance of objects. It's also not obvious that transparently allowing re-creating of previously deleted instances is neccessarily a better default behavior than simply returning `404` responses. + +Both styles "`PUT` as 404" and "`PUT` as create" can be valid in different circumstances, but we've now opted for the 404 behavior as the default, due to it being simpler and more obvious. + +If you need to restore the previous behavior you can include the `AllowPUTAsCreateMixin` class in your view. This class can be imported from `rest_framework.mixins`. + +#### Customizing error responses. + +The generic views now raise `ValidationError` for invalid data. This exception is then dealt with by the exception handler, rather than the view returning a `400 Bad Request` response directly. + +This change means that you can now easily cusomize the style of error responses across your entire API, without having to modify any of the generic views. + +## The metadata API + **TODO** ## API style @@ -241,3 +529,17 @@ Or modify it on an individual serializer field, using the `corece_to_string` key ) The default JSON renderer will return float objects for uncoerced `Decimal` instances. This allows you to easily switch between string or float representations for decimals depending on your API design needs. + +## What's coming next. + +3.0 is an incremental release, and there are several upcoming features that will build on the baseline improvements that it makes. + +The 3.1 release is planned to address improvements in the following components: + +* Request parsing, mediatypes & the implementation of the browsable API. +* Introduction of a new pagination API. +* Better support for API versioning. + +The 3.2 release is planned to introduce an alternative admin-style interface to the browsable API. + +You can follow development on the GitHub site, where we use [milestones to indicate planning timescales](https://github.com/tomchristie/django-rest-framework/milestones). diff --git a/rest_framework/authtoken/views.py b/rest_framework/authtoken/views.py index 94e6f061f..103abb27c 100644 --- a/rest_framework/authtoken/views.py +++ b/rest_framework/authtoken/views.py @@ -16,7 +16,7 @@ class ObtainAuthToken(APIView): model = Token def post(self, request): - serializer = self.serializer_class(data=request.DATA) + serializer = self.serializer_class(data=request.data) if serializer.is_valid(): user = serializer.validated_data['user'] token, created = Token.objects.get_or_create(user=user) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 032bfd048..ec07a4134 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -56,7 +56,7 @@ def get_attribute(instance, attrs): except AttributeError as exc: try: return instance[attr] - except (KeyError, TypeError): + except (KeyError, TypeError, AttributeError): raise exc return instance @@ -90,6 +90,7 @@ NOT_READ_ONLY_WRITE_ONLY = 'May not set both `read_only` and `write_only`' NOT_READ_ONLY_REQUIRED = 'May not set both `read_only` and `required`' NOT_READ_ONLY_DEFAULT = 'May not set both `read_only` and `default`' NOT_REQUIRED_DEFAULT = 'May not set both `required` and `default`' +USE_READONLYFIELD = 'Field(read_only=True) should be ReadOnlyField' MISSING_ERROR_MESSAGE = ( 'ValidationError raised by `{class_name}`, but error key `{key}` does ' 'not exist in the `error_messages` dictionary.' @@ -105,9 +106,10 @@ class Field(object): } default_validators = [] default_empty_html = None + initial = None def __init__(self, read_only=False, write_only=False, - required=None, default=empty, initial=None, source=None, + required=None, default=empty, initial=empty, source=None, label=None, help_text=None, style=None, error_messages=None, validators=[], allow_null=False): self._creation_counter = Field._creation_counter @@ -122,13 +124,14 @@ class Field(object): assert not (read_only and required), NOT_READ_ONLY_REQUIRED assert not (read_only and default is not empty), NOT_READ_ONLY_DEFAULT assert not (required and default is not empty), NOT_REQUIRED_DEFAULT + assert not (read_only and self.__class__ == Field), USE_READONLYFIELD self.read_only = read_only self.write_only = write_only self.required = required self.default = default self.source = source - self.initial = initial + self.initial = self.initial if (initial is empty) else initial self.label = label self.help_text = help_text self.style = {} if style is None else style @@ -146,24 +149,10 @@ class Field(object): messages.update(error_messages or {}) self.error_messages = messages - def __new__(cls, *args, **kwargs): - """ - When a field is instantiated, we store the arguments that were used, - so that we can present a helpful representation of the object. - """ - instance = super(Field, cls).__new__(cls) - instance._args = args - instance._kwargs = kwargs - return instance - - def __deepcopy__(self, memo): - args = copy.deepcopy(self._args) - kwargs = copy.deepcopy(self._kwargs) - return self.__class__(*args, **kwargs) - def bind(self, field_name, parent): """ - Setup the context for the field instance. + Initializes the field name and parent for the field instance. + Called when a field is added to the parent serializer instance. """ # In order to enforce a consistent style, we error if a redundant @@ -244,9 +233,9 @@ class Field(object): validated data. """ if data is empty: + if getattr(self.root, 'partial', False): + raise SkipField() if self.required: - if getattr(self.root, 'partial', False): - raise SkipField() self.fail('required') return self.get_default() @@ -314,6 +303,25 @@ class Field(object): """ return getattr(self.root, '_context', {}) + def __new__(cls, *args, **kwargs): + """ + When a field is instantiated, we store the arguments that were used, + so that we can present a helpful representation of the object. + """ + instance = super(Field, cls).__new__(cls) + instance._args = args + instance._kwargs = kwargs + return instance + + def __deepcopy__(self, memo): + """ + When cloning fields we instantiate using the arguments it was + originally created with, rather than copying the complete state. + """ + args = copy.deepcopy(self._args) + kwargs = copy.deepcopy(self._kwargs) + return self.__class__(*args, **kwargs) + def __repr__(self): """ Fields are represented using their initial calling arguments. @@ -358,6 +366,7 @@ class NullBooleanField(Field): 'invalid': _('`{input}` is not a valid boolean.') } default_empty_html = None + initial = None TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True)) FALSE_VALUES = set(('f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False)) NULL_VALUES = set(('n', 'N', 'null', 'Null', 'NULL', '', None)) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index c580f9351..085dfe659 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -64,7 +64,7 @@ class DjangoFilterBackend(BaseFilterBackend): filter_class = self.get_filter_class(view, queryset) if filter_class: - return filter_class(request.QUERY_PARAMS, queryset=queryset).qs + return filter_class(request.query_params, queryset=queryset).qs return queryset @@ -78,7 +78,7 @@ class SearchFilter(BaseFilterBackend): Search terms are set by a ?search=... query parameter, and may be comma and/or whitespace delimited. """ - params = request.QUERY_PARAMS.get(self.search_param, '') + params = request.query_params.get(self.search_param, '') return params.replace(',', ' ').split() def construct_search(self, field_name): @@ -121,7 +121,7 @@ class OrderingFilter(BaseFilterBackend): the `ordering_param` value on the OrderingFilter or by specifying an `ORDERING_PARAM` value in the API settings. """ - params = request.QUERY_PARAMS.get(self.ordering_param) + params = request.query_params.get(self.ordering_param) if params: return [param.strip() for param in params.split(',')] diff --git a/rest_framework/generics.py b/rest_framework/generics.py index f49b0a439..cf903dab3 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -112,7 +112,7 @@ class GenericAPIView(views.APIView): paginator = self.paginator_class(queryset, page_size) page_kwarg = self.kwargs.get(self.page_kwarg) - page_query_param = self.request.QUERY_PARAMS.get(self.page_kwarg) + page_query_param = self.request.query_params.get(self.page_kwarg) page = page_kwarg or page_query_param or 1 try: page_number = paginator.validate_number(page) @@ -166,7 +166,7 @@ class GenericAPIView(views.APIView): if self.paginate_by_param: try: return strict_positive_int( - self.request.QUERY_PARAMS[self.paginate_by_param], + self.request.query_params[self.paginate_by_param], cutoff=self.max_paginate_by ) except (KeyError, ValueError): diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 14a6b44b1..04b7a7636 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -18,7 +18,7 @@ class CreateModelMixin(object): Create a model instance. """ def create(self, request, *args, **kwargs): - serializer = self.get_serializer(data=request.DATA) + serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) serializer.save() headers = self.get_success_headers(serializer.data) @@ -62,7 +62,7 @@ class UpdateModelMixin(object): def update(self, request, *args, **kwargs): partial = kwargs.pop('partial', False) instance = self.get_object() - serializer = self.get_serializer(instance, data=request.DATA, partial=partial) + serializer = self.get_serializer(instance, data=request.data, partial=partial) serializer.is_valid(raise_exception=True) serializer.save() return Response(serializer.data) @@ -95,7 +95,7 @@ class AllowPUTAsCreateMixin(object): def update(self, request, *args, **kwargs): partial = kwargs.pop('partial', False) instance = self.get_object_or_none() - serializer = self.get_serializer(instance, data=request.DATA, partial=partial) + serializer = self.get_serializer(instance, data=request.data, partial=partial) serializer.is_valid(raise_exception=True) if instance is None: diff --git a/rest_framework/negotiation.py b/rest_framework/negotiation.py index ca7b53978..1838130a9 100644 --- a/rest_framework/negotiation.py +++ b/rest_framework/negotiation.py @@ -38,7 +38,7 @@ class DefaultContentNegotiation(BaseContentNegotiation): """ # Allow URL style format override. eg. "?format=json format_query_param = self.settings.URL_FORMAT_OVERRIDE - format = format_suffix or request.QUERY_PARAMS.get(format_query_param) + format = format_suffix or request.query_params.get(format_query_param) if format: renderers = self.filter_renderers(renderers, format) @@ -87,5 +87,5 @@ class DefaultContentNegotiation(BaseContentNegotiation): Allows URL style accept override. eg. "?accept=application/json" """ header = request.META.get('HTTP_ACCEPT', '*/*') - header = request.QUERY_PARAMS.get(self.settings.URL_ACCEPT_OVERRIDE, header) + header = request.query_params.get(self.settings.URL_ACCEPT_OVERRIDE, header) return [token.strip() for token in header.split(',')] diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 3bf03e62c..225f9fe8f 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -120,7 +120,7 @@ class JSONPRenderer(JSONRenderer): Determine the name of the callback to wrap around the json output. """ request = renderer_context.get('request', None) - params = request and request.QUERY_PARAMS or {} + params = request and request.query_params or {} return params.get(self.callback_parameter, self.default_callback) def render(self, data, accepted_media_type=None, renderer_context=None): @@ -426,7 +426,7 @@ class BrowsableAPIRenderer(BaseRenderer): """ if request.method == method: try: - data = request.DATA + data = request.data # files = request.FILES except ParseError: data = None diff --git a/rest_framework/request.py b/rest_framework/request.py index 275326614..d80baa705 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -4,7 +4,7 @@ The Request class is used as a wrapper around the standard request object. The wrapped request then offers a richer API, in particular : - content automatically parsed according to `Content-Type` header, - and available as `request.DATA` + and available as `request.data` - full support of PUT method, including support for file uploads - form overloading of HTTP method, content type and content """ @@ -13,6 +13,7 @@ from django.conf import settings from django.http import QueryDict from django.http.multipartparser import parse_header from django.utils.datastructures import MultiValueDict +from django.utils.datastructures import MergeDict as DjangoMergeDict from rest_framework import HTTP_HEADER_ENCODING from rest_framework import exceptions from rest_framework.compat import BytesIO @@ -58,6 +59,15 @@ class override_method(object): self.view.action = self.action +class MergeDict(DjangoMergeDict, dict): + """ + Using this as a workaround until the parsers API is properly + addressed in 3.1. + """ + def __init__(self, *dicts): + self.dicts = dicts + + class Empty(object): """ Placeholder for unset attributes. @@ -82,6 +92,7 @@ def clone_request(request, method): parser_context=request.parser_context) ret._data = request._data ret._files = request._files + ret._full_data = request._full_data ret._content_type = request._content_type ret._stream = request._stream ret._method = method @@ -133,6 +144,7 @@ class Request(object): self.parser_context = parser_context self._data = Empty self._files = Empty + self._full_data = Empty self._method = Empty self._content_type = Empty self._stream = Empty @@ -186,12 +198,25 @@ class Request(object): return self._stream @property - def QUERY_PARAMS(self): + def query_params(self): """ More semantically correct name for request.GET. """ return self._request.GET + @property + def QUERY_PARAMS(self): + """ + Synonym for `.query_params`, for backwards compatibility. + """ + return self._request.GET + + @property + def data(self): + if not _hasattr(self, '_full_data'): + self._load_data_and_files() + return self._full_data + @property def DATA(self): """ @@ -272,6 +297,10 @@ class Request(object): if not _hasattr(self, '_data'): self._data, self._files = self._parse() + if self._files: + self._full_data = MergeDict(self._data, self._files) + else: + self._full_data = self._data def _load_method_and_content_type(self): """ @@ -333,6 +362,7 @@ class Request(object): # At this point we're committed to parsing the request as form data. self._data = self._request.POST self._files = self._request.FILES + self._full_data = MergeDict(self._data, self._files) # Method overloading - change the method and remove the param from the content. if ( @@ -350,7 +380,7 @@ class Request(object): ): self._content_type = self._data[self._CONTENTTYPE_PARAM] self._stream = BytesIO(self._data[self._CONTENT_PARAM].encode(self.parser_context['encoding'])) - self._data, self._files = (Empty, Empty) + self._data, self._files, self._full_data = (Empty, Empty, Empty) def _parse(self): """ @@ -380,6 +410,7 @@ class Request(object): # logging the request or similar. self._data = QueryDict('', encoding=self._request._encoding) self._files = MultiValueDict() + self._full_data = self._data raise # Parser classes may return the raw data, or a diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b6a1898ca..a2b878ecb 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -57,21 +57,24 @@ class BaseSerializer(Field): def to_representation(self, instance): raise NotImplementedError('`to_representation()` must be implemented.') - def update(self, instance, attrs): + def update(self, instance, validated_data): raise NotImplementedError('`update()` must be implemented.') - def create(self, attrs): + def create(self, validated_data): raise NotImplementedError('`create()` must be implemented.') def save(self, extras=None): - attrs = self.validated_data + validated_data = self.validated_data if extras is not None: - attrs = dict(list(attrs.items()) + list(extras.items())) + validated_data = dict( + list(validated_data.items()) + + list(extras.items()) + ) if self.instance is not None: - self.update(self.instance, attrs) + self.update(self.instance, validated_data) else: - self.instance = self.create(attrs) + self.instance = self.create(validated_data) return self.instance @@ -321,12 +324,6 @@ class ListSerializer(BaseSerializer): def create(self, attrs_list): return [self.child.create(attrs) for attrs in attrs_list] - def save(self): - if self.instance is not None: - self.update(self.instance, self.validated_data) - self.instance = self.create(self.validated_data) - return self.instance - def __repr__(self): return representation.list_repr(self, indent=1) diff --git a/tests/test_fields.py b/tests/test_fields.py index b29acad81..1539a210e 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -9,7 +9,10 @@ import pytest # Tests for field keyword arguments and core functionality. # --------------------------------------------------------- -class TestFieldOptions: +class TestEmpty: + """ + Tests for `required`, `allow_null`, `allow_blank`, `default`. + """ def test_required(self): """ By default a field must be included in the input. @@ -69,6 +72,17 @@ class TestFieldOptions: output = field.run_validation() assert output is 123 + +class TestSource: + def test_source(self): + class ExampleSerializer(serializers.Serializer): + example_field = serializers.CharField(source='other') + serializer = ExampleSerializer(data={'example_field': 'abc'}) + print serializer.is_valid() + print serializer.data + assert serializer.is_valid() + assert serializer.validated_data == {'other': 'abc'} + def test_redundant_source(self): class ExampleSerializer(serializers.Serializer): example_field = serializers.CharField(source='example_field') @@ -81,6 +95,128 @@ class TestFieldOptions: ) +class TestReadOnly: + def setup(self): + class TestSerializer(serializers.Serializer): + read_only = fields.ReadOnlyField() + writable = fields.IntegerField() + self.Serializer = TestSerializer + + def test_validate_read_only(self): + """ + Read-only fields should not be included in validation. + """ + data = {'read_only': 123, 'writable': 456} + serializer = self.Serializer(data=data) + assert serializer.is_valid() + assert serializer.validated_data == {'writable': 456} + + def test_serialize_read_only(self): + """ + Read-only fields should be serialized. + """ + instance = {'read_only': 123, 'writable': 456} + serializer = self.Serializer(instance) + assert serializer.data == {'read_only': 123, 'writable': 456} + + +class TestWriteOnly: + def setup(self): + class TestSerializer(serializers.Serializer): + write_only = fields.IntegerField(write_only=True) + readable = fields.IntegerField() + self.Serializer = TestSerializer + + def test_validate_write_only(self): + """ + Write-only fields should be included in validation. + """ + data = {'write_only': 123, 'readable': 456} + serializer = self.Serializer(data=data) + assert serializer.is_valid() + assert serializer.validated_data == {'write_only': 123, 'readable': 456} + + def test_serialize_write_only(self): + """ + Write-only fields should not be serialized. + """ + instance = {'write_only': 123, 'readable': 456} + serializer = self.Serializer(instance) + assert serializer.data == {'readable': 456} + + +class TestInitial: + def setup(self): + class TestSerializer(serializers.Serializer): + initial_field = fields.IntegerField(initial=123) + blank_field = fields.IntegerField() + self.serializer = TestSerializer() + + def test_initial(self): + """ + Initial values should be included when serializing a new representation. + """ + assert self.serializer.data == { + 'initial_field': 123, + 'blank_field': None + } + + +class TestLabel: + def setup(self): + class TestSerializer(serializers.Serializer): + labeled = fields.IntegerField(label='My label') + self.serializer = TestSerializer() + + def test_label(self): + """ + A field's label may be set with the `label` argument. + """ + fields = self.serializer.fields + assert fields['labeled'].label == 'My label' + + +class TestInvalidErrorKey: + def setup(self): + class ExampleField(serializers.Field): + def to_native(self, data): + self.fail('incorrect') + self.field = ExampleField() + + def test_invalid_error_key(self): + """ + If a field raises a validation error, but does not have a corresponding + error message, then raise an appropriate assertion error. + """ + with pytest.raises(AssertionError) as exc_info: + self.field.to_native(123) + expected = ( + 'ValidationError raised by `ExampleField`, but error key ' + '`incorrect` does not exist in the `error_messages` dictionary.' + ) + assert str(exc_info.value) == expected + + +class TestBooleanHTMLInput: + def setup(self): + class TestSerializer(serializers.Serializer): + archived = fields.BooleanField() + self.Serializer = TestSerializer + + def test_empty_html_checkbox(self): + """ + HTML checkboxes do not send any value, but should be treated + as `False` by BooleanField. + """ + # This class mocks up a dictionary like object, that behaves + # as if it was returned for multipart or urlencoded data. + class MockHTMLDict(dict): + getlist = None + serializer = self.Serializer(data=MockHTMLDict()) + assert serializer.is_valid() + assert serializer.validated_data == {'archived': False} + + # Tests for field input and output values. # ---------------------------------------- @@ -495,7 +631,7 @@ class TestDateTimeField(FieldValues): '2001-01-01T13:00Z': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), datetime.datetime(2001, 1, 1, 13, 00): datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()), - # Note that 1.4 does not support timezone string parsing. + # Django 1.4 does not support timezone string parsing. '2001-01-01T14:00+01:00' if (django.VERSION > (1, 4)) else '2001-01-01T13:00Z': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()) } invalid_inputs = { diff --git a/tests/test_generics.py b/tests/test_generics.py index 89f9def01..2690fb47c 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -38,7 +38,7 @@ class FKInstanceView(generics.RetrieveUpdateDestroyAPIView): class SlugSerializer(serializers.ModelSerializer): - slug = serializers.Field(read_only=True) + slug = serializers.ReadOnlyField() class Meta: model = SlugBasedModel diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 5646f9940..256a12e68 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -1,4 +1,5 @@ from rest_framework import serializers +import pytest # Tests for core functionality. @@ -29,6 +30,67 @@ class TestSerializer: assert serializer.validated_data == {'char': 'abc'} assert serializer.errors == {} + def test_empty_serializer(self): + serializer = self.Serializer() + assert serializer.data == {'char': '', 'integer': None} + + def test_missing_attribute_during_serialization(self): + class MissingAttributes: + pass + instance = MissingAttributes() + serializer = self.Serializer(instance) + with pytest.raises(AttributeError): + serializer.data + + +class TestStarredSource: + """ + Tests for `source='*'` argument, which is used for nested representations. + + For example: + + nested_field = NestedField(source='*') + """ + data = { + 'nested1': {'a': 1, 'b': 2}, + 'nested2': {'c': 3, 'd': 4} + } + + def setup(self): + class NestedSerializer1(serializers.Serializer): + a = serializers.IntegerField() + b = serializers.IntegerField() + + class NestedSerializer2(serializers.Serializer): + c = serializers.IntegerField() + d = serializers.IntegerField() + + class TestSerializer(serializers.Serializer): + nested1 = NestedSerializer1(source='*') + nested2 = NestedSerializer2(source='*') + + self.Serializer = TestSerializer + + def test_nested_validate(self): + """ + A nested representation is validated into a flat internal object. + """ + serializer = self.Serializer(data=self.data) + assert serializer.is_valid() + assert serializer.validated_data == { + 'a': 1, + 'b': 2, + 'c': 3, + 'd': 4 + } + + def test_nested_serialize(self): + """ + An object can be serialized into a nested representation. + """ + instance = {'a': 1, 'b': 2, 'c': 3, 'd': 4} + serializer = self.Serializer(instance) + assert serializer.data == self.data # # -*- coding: utf-8 -*- # from __future__ import unicode_literals From 43e80c74b225e17edfe8a90da893823bf50b946f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 11:56:29 +0100 Subject: [PATCH 0893/1652] Release notes --- docs/topics/3.0-announcement.md | 79 ++++++++++++++++++++++++++++++--- rest_framework/serializers.py | 3 ++ 2 files changed, 75 insertions(+), 7 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 1795611c0..35d725ffb 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -4,12 +4,25 @@ See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-fr # REST framework 3.0 -**TODO**: Note incremental nature, discuss upgrading, motivation, features. +The 3.0 release of Django REST framework is the result of almost four years of iteration and refinement. It comprehensively addresses some of the previous remaining design issues in serializers, fields and the generic views. -* Serializer reprs. -* Non-magical model serializers. -* Base serializer class. -* Clean logic in views, serializers, fields. +This release is incremental in nature. There *are* some breaking API changes, and upgrading *will* require you to read the release notes carefully, but the migration path should otherwise be relatively straightforward. + +The difference in quality of the REST framework API and implementation should make writing, maintaining and debugging your application far easier. + +## New features + +Notable features of this new release include: + +* Printable representations on serializers that allow you to inspect exactly what fields are present on the instance. +* Simple model serializers that are vastly easier to understand and debug, and that make it easy to switch between the implicit `ModelSerializer` class and the explicit `Serializer` class. +* A new `BaseSerializer` class, making it easier to write serializers for alternative storage backends, or to completely customize your serialization and validation logic. +* A cleaner fields API plus new `ListField` and `MultipleChoiceField` classes. +* Super simple default implementations for the generic views. +* Support for overriding how validation errors are handled by your API. +* A metadata API that allows you to customize how `OPTIONS` requests are handled by your API. + +Below is an in-depth guide to the API changes and migration notes for 3.0. --- @@ -37,9 +50,59 @@ The usage of `request.QUERY_PARAMS` is now discouraged in favor of the lowercase #### Single-step object creation. +Previously the serializers used a two-step object creation, as follows: + +1. Validating the data would create an object instance. This instance would be available as `serializer.object`. +2. Calling `serializer.save()` would then save the object instance to the database. + +This style is in line with how the `ModelForm` class works in Django, but is problematic for a number of reasons: + +* Some data, such as many-to-many relationships, cannot be added to the object instance until after it has been save. This type of data needed to be hidden in some undocumentated state on the object instance, or kept as state on the serializer instance so that it could be used when `.save()` is called. +* Instantiating model instances directly means that you cannot use model manager classes for instance creation, eg `ExampleModel.objects.create(...)`. Manager classes are an excellent layer at which to enforce business logic and application-level data constraints. +* The two step process makes it unclear where to put deserialization logic. For example, should extra attributes such as the current user get added to the instance during object creation or during object save? + +We now use single-step object creation, like so: + +1. Validating the data makes the cleaned data available as `serializer.validated_data`. +2. Calling `serializer.save()` then saves and returns the new object instance. + +The resulting API changes are further detailed below. + #### The `.create()` and `.update()` methods. -**TODO**: Drop `.restore_object()`, use `.create()` and `.update()` which should save the instance. +The `.restore_object()` method is now replaced with two seperate methods, `.create()` and `.update()`. + +When using the `.create()` and `.update()` methods you should both create *and save* the object instance. This is in contrast to the previous `.restore_object()` behavior that would instantiate the object but not save it. + +The following example from the tutorial previously used `restore_object()` to handle both creating and updating object instances. + + def restore_object(self, attrs, instance=None): + if instance: + # Update existing instance + instance.title = attrs.get('title', instance.title) + instance.code = attrs.get('code', instance.code) + instance.linenos = attrs.get('linenos', instance.linenos) + instance.language = attrs.get('language', instance.language) + instance.style = attrs.get('style', instance.style) + return instance + + # Create new instance + return Snippet(**attrs) + +This would now be split out into two seperate methods. + + def update(self, instance, validated_attrs) + instance.title = validated_attrs.get('title', instance.title) + instance.code = validated_attrs.get('code', instance.code) + instance.linenos = validated_attrs.get('linenos', instance.linenos) + instance.language = validated_attrs.get('language', instance.language) + instance.style = validated_attrs.get('style', instance.style) + instance.save() + + def create(self, validated_attrs): + return Snippet.objects.create(**validated_attrs) + +Note that the `.create` method should return the newly created object instance. #### Use `.validated_data` instead of `.object`. @@ -457,7 +520,9 @@ This change means that you can now easily cusomize the style of error responses ## The metadata API -**TODO** +Behavior for dealing with `OPTIONS` requests was previously built directly into the class based views. This has now been properly seperated out into a Metadata API that allows the same pluggable style as other API policies in REST framework. + +This makes it far easier to use a different style for `OPTIONS` responses throughout your API, and makes it possible to create third-party metadata policies. ## API style diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index a2b878ecb..86bed773b 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -75,6 +75,9 @@ class BaseSerializer(Field): self.update(self.instance, validated_data) else: self.instance = self.create(validated_data) + assert self.instance is not None, ( + '`create()` did not return an object instance.' + ) return self.instance From e8af73d144d73a55aecde6a1fda8516f15f027c1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 12:17:20 +0100 Subject: [PATCH 0894/1652] Release notes --- docs/topics/3.0-announcement.md | 35 +++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 35d725ffb..144d35503 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -125,14 +125,41 @@ The corresponding code would now look like this: logging.info('Creating ticket "%s"' % name) extras = {'user': request.user} # Include the user when saving. serializer.save(extras=extras) - + +#### Printable serializer reprensentations. + +Serializer instances now support a printable representation that allows you to inspect the fields present on the instance. + +For instance, given the following example model: + + class LocationRating(models.Model): + location = models.CharField(max_length=100) + rating = models.IntegerField() + created_by = models.ForeignKey(User) + +Let's create a simple `ModelSerializer` class c. + + class LocationRatingSerializer(serializer.ModelSerializer): + class Meta: + model = LocationRating + +We can now inspect its representation in the Django shell, using `python manage.py shell`... + + >>> serializer = LocationRatingSerializer() + >>> print(serializer) # Or use `print serializer` in Python 2.x + LocationRatingSerializer(): + id = IntegerField(label='ID', read_only=True) + location = CharField(max_length=100) + rating = IntegerField() + created_by = PrimaryKeyRelatedField(queryset=User.objects.all()) + #### Always use `fields`, not `exclude`. -The `exclude` option is no longer available. You should use the more explicit `fields` option instead. +The `exclude` option on `ModelSerializer` is no longer available. You should use the more explicit `fields` option instead. #### The `extra_kwargs` option. -The `read_only_fields` and `write_only_fields` options have been removed and replaced with a more generic `extra_kwargs`. +The `read_only_fields` and `write_only_fields` options on `ModelSerializer` have been removed and replaced with a more generic `extra_kwargs`. class MySerializer(serializer.ModelSerializer): class Meta: @@ -177,7 +204,7 @@ Alternatively, specify the field explicitly on the serializer class: #### Fields for model methods and properties. -You can now specify field names in the `fields` option that refer to model methods or properties. For example, suppose you have the following model: +With `ModelSerilizer` you can now specify field names in the `fields` option that refer to model methods or properties. For example, suppose you have the following model: class Invitation(models.Model): created = models.DateTimeField() From 90311357add780433c79e97346ed85f1f4224877 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 12:18:27 +0100 Subject: [PATCH 0895/1652] Release notes --- docs/topics/3.0-announcement.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 144d35503..daacbba07 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -137,13 +137,13 @@ For instance, given the following example model: rating = models.IntegerField() created_by = models.ForeignKey(User) -Let's create a simple `ModelSerializer` class c. +Let's create a simple `ModelSerializer` class corresponding to the `LocationRating` model. class LocationRatingSerializer(serializer.ModelSerializer): class Meta: model = LocationRating -We can now inspect its representation in the Django shell, using `python manage.py shell`... +We can now inspect the serializer representation in the Django shell, using `python manage.py shell`... >>> serializer = LocationRatingSerializer() >>> print(serializer) # Or use `print serializer` in Python 2.x From fde934d33c8692bab5e0e7b6009d358101a25dd7 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 12:21:05 +0100 Subject: [PATCH 0896/1652] Release notes --- docs/topics/3.0-announcement.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index daacbba07..a4e4db148 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -21,6 +21,7 @@ Notable features of this new release include: * Super simple default implementations for the generic views. * Support for overriding how validation errors are handled by your API. * A metadata API that allows you to customize how `OPTIONS` requests are handled by your API. +* A more compact JSON output with unicode style encoding turned on by default. Below is an in-depth guide to the API changes and migration notes for 3.0. From 8b8623c5f84d443d26804cac52a793a3037a1dd0 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 12:48:20 +0100 Subject: [PATCH 0897/1652] Allow many, partial and context in BaseSerializer --- docs/topics/3.0-announcement.md | 7 ++++ rest_framework/serializers.py | 28 +++++++--------- tests/test_serializer.py | 58 +++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 16 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index a4e4db148..faba2d356 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -2,6 +2,13 @@ See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-framework/pull/1800) for more details. +Most notable outstanding issues still to resolved on the `version-3.0` branch. + +* `FileField` and `ImageField` support. +* Forms support for serializers and in the browsable API. +* Enforcing uniqueness on `unique=True` and `unique_together` fields. +* Optimisations for serialializing primary keys. + # REST framework 3.0 The 3.0 release of Django REST framework is the result of almost four years of iteration and refinement. It comprehensively addresses some of the previous remaining design issues in serializers, fields and the generic views. diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 86bed773b..245ec26f1 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -47,9 +47,20 @@ class BaseSerializer(Field): """ def __init__(self, instance=None, data=None, **kwargs): - super(BaseSerializer, self).__init__(**kwargs) self.instance = instance self._initial_data = data + self.partial = kwargs.pop('partial', False) + self._context = kwargs.pop('context', {}) + kwargs.pop('many', None) + super(BaseSerializer, self).__init__(**kwargs) + + def __new__(cls, *args, **kwargs): + # We override this method in order to automagically create + # `ListSerializer` classes instead when `many=True` is set. + if kwargs.pop('many', False): + kwargs['child'] = cls() + return ListSerializer(*args, **kwargs) + return super(BaseSerializer, cls).__new__(cls, *args, **kwargs) def to_internal_value(self, data): raise NotImplementedError('`to_internal_value()` must be implemented.') @@ -187,10 +198,6 @@ class BindingDict(object): @six.add_metaclass(SerializerMetaclass) class Serializer(BaseSerializer): def __init__(self, *args, **kwargs): - kwargs.pop('many', None) - self.partial = kwargs.pop('partial', False) - self._context = kwargs.pop('context', {}) - super(Serializer, self).__init__(*args, **kwargs) # Every new serializer is created with a clone of the field instances. @@ -200,14 +207,6 @@ class Serializer(BaseSerializer): for key, value in self._get_base_fields().items(): self.fields[key] = value - def __new__(cls, *args, **kwargs): - # We override this method in order to automagically create - # `ListSerializer` classes instead when `many=True` is set. - if kwargs.pop('many', False): - kwargs['child'] = cls() - return ListSerializer(*args, **kwargs) - return super(Serializer, cls).__new__(cls, *args, **kwargs) - def _get_base_fields(self): return copy.deepcopy(self._declared_fields) @@ -296,9 +295,6 @@ class ListSerializer(BaseSerializer): self.child = kwargs.pop('child', copy.deepcopy(self.child)) assert self.child is not None, '`child` is a required argument.' assert not inspect.isclass(self.child), '`child` has not been instantiated.' - self.partial = kwargs.pop('partial', False) - self._context = kwargs.pop('context', {}) - super(ListSerializer, self).__init__(*args, **kwargs) self.child.bind(field_name='', parent=self) diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 256a12e68..4df1b7364 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -43,6 +43,64 @@ class TestSerializer: serializer.data +class TestBaseSerializer: + def setup(self): + class ExampleSerializer(serializers.BaseSerializer): + def to_representation(self, obj): + return { + 'id': obj['id'], + 'email': obj['name'] + '@' + obj['domain'] + } + + def to_internal_value(self, data): + name, domain = str(data['email']).split('@') + return { + 'id': int(data['id']), + 'name': name, + 'domain': domain, + } + + self.Serializer = ExampleSerializer + + def test_serialize_instance(self): + instance = {'id': 1, 'name': 'tom', 'domain': 'example.com'} + serializer = self.Serializer(instance) + assert serializer.data == {'id': 1, 'email': 'tom@example.com'} + + def test_serialize_list(self): + instances = [ + {'id': 1, 'name': 'tom', 'domain': 'example.com'}, + {'id': 2, 'name': 'ann', 'domain': 'example.com'}, + ] + serializer = self.Serializer(instances, many=True) + assert serializer.data == [ + {'id': 1, 'email': 'tom@example.com'}, + {'id': 2, 'email': 'ann@example.com'} + ] + + def test_validate_data(self): + data = {'id': 1, 'email': 'tom@example.com'} + serializer = self.Serializer(data=data) + assert serializer.is_valid() + assert serializer.validated_data == { + 'id': 1, + 'name': 'tom', + 'domain': 'example.com' + } + + def test_validate_list(self): + data = [ + {'id': 1, 'email': 'tom@example.com'}, + {'id': 2, 'email': 'ann@example.com'}, + ] + serializer = self.Serializer(data=data, many=True) + assert serializer.is_valid() + assert serializer.validated_data == [ + {'id': 1, 'name': 'tom', 'domain': 'example.com'}, + {'id': 2, 'name': 'ann', 'domain': 'example.com'} + ] + + class TestStarredSource: """ Tests for `source='*'` argument, which is used for nested representations. From 802913d5e4d40ee17054415bded02981055b651d Mon Sep 17 00:00:00 2001 From: "Anton D. Kachalov" <mouse@yandex-team.ru> Date: Fri, 26 Sep 2014 16:07:46 +0400 Subject: [PATCH 0898/1652] [templates/rest_framework/base.html] Separate `object-form' and `generic-content-form' IDs for POST and PUT forms Signed-off-by: Anton D. Kachalov <mouse@yandex-team.ru> --- .../templates/rest_framework/base.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index a84ccf269..3628daa0e 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -142,16 +142,16 @@ {% if post_form %} <ul class="nav nav-tabs form-switcher"> <li> - <a name='html-tab' href="#object-form" data-toggle="tab">HTML form</a> + <a name='html-tab' href="#post-object-form" data-toggle="tab">HTML form</a> </li> <li> - <a name='raw-tab' href="#generic-content-form" data-toggle="tab">Raw data</a> + <a name='raw-tab' href="#post-generic-content-form" data-toggle="tab">Raw data</a> </li> </ul> {% endif %} <div class="well tab-content"> {% if post_form %} - <div class="tab-pane" id="object-form"> + <div class="tab-pane" id="post-object-form"> {% with form=post_form %} <form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal"> @@ -166,7 +166,7 @@ {% endwith %} </div> {% endif %} - <div {% if post_form %}class="tab-pane"{% endif %} id="generic-content-form"> + <div {% if post_form %}class="tab-pane"{% endif %} id="post-generic-content-form"> {% with form=raw_data_post_form %} <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal"> <fieldset> @@ -188,16 +188,16 @@ {% if put_form %} <ul class="nav nav-tabs form-switcher"> <li> - <a name='html-tab' href="#object-form" data-toggle="tab">HTML form</a> + <a name='html-tab' href="#put-object-form" data-toggle="tab">HTML form</a> </li> <li> - <a name='raw-tab' href="#generic-content-form" data-toggle="tab">Raw data</a> + <a name='raw-tab' href="#put-generic-content-form" data-toggle="tab">Raw data</a> </li> </ul> {% endif %} <div class="well tab-content"> {% if put_form %} - <div class="tab-pane" id="object-form"> + <div class="tab-pane" id="put-object-form"> <form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal"> <fieldset> @@ -211,7 +211,7 @@ </form> </div> {% endif %} - <div {% if put_form %}class="tab-pane"{% endif %} id="generic-content-form"> + <div {% if put_form %}class="tab-pane"{% endif %} id="put-generic-content-form"> {% with form=raw_data_put_or_patch_form %} <form action="{{ request.get_full_path }}" method="POST" class="form-horizontal"> <fieldset> From 2e87de01430d7fec83f00948e60c8d61b317053b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 13:08:20 +0100 Subject: [PATCH 0899/1652] Added ListField --- rest_framework/fields.py | 38 +++++++++++++++++++++++++++++++++++ rest_framework/serializers.py | 6 ++++-- tests/test_fields.py | 19 ++++++++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index ec07a4134..cf42d36cb 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -881,6 +881,44 @@ class ImageField(Field): # Advanced field types... +class ListField(Field): + child = None + initial = [] + default_error_messages = { + 'not_a_list': _('Expected a list of items but got type `{input_type}`') + } + + def __init__(self, *args, **kwargs): + self.child = kwargs.pop('child', copy.deepcopy(self.child)) + assert self.child is not None, '`child` is a required argument.' + assert not inspect.isclass(self.child), '`child` has not been instantiated.' + super(ListField, self).__init__(*args, **kwargs) + self.child.bind(field_name='', parent=self) + + def get_value(self, dictionary): + # We override the default field access in order to support + # lists in HTML forms. + if html.is_html_input(dictionary): + return html.parse_html_list(dictionary, prefix=self.field_name) + return dictionary.get(self.field_name, empty) + + def to_internal_value(self, data): + """ + List of dicts of native values <- List of dicts of primitive datatypes. + """ + if html.is_html_input(data): + data = html.parse_html_list(data) + if isinstance(data, type('')) or not hasattr(data, '__iter__'): + self.fail('not_a_list', input_type=type(data).__name__) + return [self.child.run_validation(item) for item in data] + + def to_representation(self, data): + """ + List of object instances -> List of dicts of primitive datatypes. + """ + return [self.child.to_representation(item) for item in data] + + class ReadOnlyField(Field): """ A read-only field that simply returns the field value. diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 245ec26f1..fa2e8fb10 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -287,6 +287,9 @@ class Serializer(BaseSerializer): return representation.serializer_repr(self, indent=1) +# There's some replication of `ListField` here, +# but that's probably better than obfuscating the call hierarchy. + class ListSerializer(BaseSerializer): child = None initial = [] @@ -301,7 +304,7 @@ class ListSerializer(BaseSerializer): def get_value(self, dictionary): # We override the default field access in order to support # lists in HTML forms. - if is_html_input(dictionary): + if html.is_html_input(dictionary): return html.parse_html_list(dictionary, prefix=self.field_name) return dictionary.get(self.field_name, empty) @@ -311,7 +314,6 @@ class ListSerializer(BaseSerializer): """ if html.is_html_input(data): data = html.parse_html_list(data) - return [self.child.run_validation(item) for item in data] def to_representation(self, data): diff --git a/tests/test_fields.py b/tests/test_fields.py index 1539a210e..681127484 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -849,6 +849,25 @@ class TestMultipleChoiceField(FieldValues): ) +class TestListField(FieldValues): + """ + Values for `ListField`. + """ + valid_inputs = [ + ([1, 2, 3], [1, 2, 3]), + (['1', '2', '3'], [1, 2, 3]) + ] + invalid_inputs = [ + ('not a list', ['Expected a list of items but got type `str`']), + ([1, 2, 'error'], ['A valid integer is required.']) + ] + outputs = [ + ([1, 2, 3], [1, 2, 3]), + (['1', '2', '3'], [1, 2, 3]) + ] + field = fields.ListField(child=fields.IntegerField()) + + # Tests for SerializerMethodField. # -------------------------------- From 0eb6a4de8a3293c3b326fadccf7aa0be67c2f5b5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 13:10:58 +0100 Subject: [PATCH 0900/1652] Release notes --- docs/topics/3.0-announcement.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index faba2d356..9769e8844 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -8,6 +8,7 @@ Most notable outstanding issues still to resolved on the `version-3.0` branch. * Forms support for serializers and in the browsable API. * Enforcing uniqueness on `unique=True` and `unique_together` fields. * Optimisations for serialializing primary keys. +* Refine style of validation errors in some cases, such as validation errors in `ListField`. # REST framework 3.0 From 24f7db2fc156b0af7749a5cc17c1df3f5522bf88 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 13:12:10 +0100 Subject: [PATCH 0901/1652] Release notes --- docs/topics/3.0-announcement.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 9769e8844..a48d22ead 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -2,13 +2,15 @@ See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-framework/pull/1800) for more details. -Most notable outstanding issues still to resolved on the `version-3.0` branch. +The most notable outstanding issues still to resolved on the `version-3.0` branch are as follows: * `FileField` and `ImageField` support. * Forms support for serializers and in the browsable API. * Enforcing uniqueness on `unique=True` and `unique_together` fields. * Optimisations for serialializing primary keys. * Refine style of validation errors in some cases, such as validation errors in `ListField`. +* `.validate()` method on fields. +* `.transform_<field>()` method on serializers. # REST framework 3.0 From 33ccf40b76ddae790c34c294a133219e68efb946 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 13:14:08 +0100 Subject: [PATCH 0902/1652] Update version number --- rest_framework/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 7f724c185..261c9c984 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '2.4.3' +__version__ = '3.0.0' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2014 Tom Christie' From ee79b453974f3dc8ead83bff86784366d59a4fb1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 13:19:32 +0100 Subject: [PATCH 0903/1652] Prepend some pre-release notes --- docs/topics/3.0-announcement.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index a48d22ead..21052ca03 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -1,6 +1,10 @@ -**THIS DOCUMENT IS CURRENTLY A WORK IN PROGRESS** +## Pre-release notes: -See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-framework/pull/1800) for more details. +The 3.0 release is now ready for some tentative testing and upgrades for super keen early adopters. You can install the development version directly from GitHub like so: + + pip install https://github.com/tomchristie/django-rest-framework/archive/version-3.0.zip + +See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-framework/pull/1800) for more details on remaining work. The most notable outstanding issues still to resolved on the `version-3.0` branch are as follows: @@ -12,6 +16,12 @@ The most notable outstanding issues still to resolved on the `version-3.0` branc * `.validate()` method on fields. * `.transform_<field>()` method on serializers. +**Your feedback on the upgrade process and 3.0 changes is hugely important!** + +Please do get in touch via twitter, IRC, a GitHub ticket, or the discussion group. + +--- + # REST framework 3.0 The 3.0 release of Django REST framework is the result of almost four years of iteration and refinement. It comprehensively addresses some of the previous remaining design issues in serializers, fields and the generic views. From 8be4496586519f84b839b07efc74148a3559349e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 13:59:37 +0100 Subject: [PATCH 0904/1652] Drop erronous print statements --- tests/test_fields.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_fields.py b/tests/test_fields.py index 681127484..342ae1927 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -78,8 +78,6 @@ class TestSource: class ExampleSerializer(serializers.Serializer): example_field = serializers.CharField(source='other') serializer = ExampleSerializer(data={'example_field': 'abc'}) - print serializer.is_valid() - print serializer.data assert serializer.is_valid() assert serializer.validated_data == {'other': 'abc'} From 609014460861fdfe82054551790d6439292dde7b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 14:32:44 +0100 Subject: [PATCH 0905/1652] Simplify serialization slightly --- rest_framework/fields.py | 11 +++++++---- rest_framework/serializers.py | 3 +-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index cf42d36cb..4c49aabaa 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -202,12 +202,15 @@ class Field(object): return self.default_empty_html if (ret == '') else ret return dictionary.get(self.field_name, empty) - def get_attribute(self, instance): + def get_field_representation(self, instance): """ - Given the *outgoing* object instance, return the value for this field - that should be returned as a primative value. + Given the outgoing object instance, return the primative value + that should be used for this field. """ - return get_attribute(instance, self.source_attrs) + attribute = get_attribute(instance, self.source_attrs) + if attribute is None: + return None + return self.to_representation(attribute) def get_default(self): """ diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index fa2e8fb10..080b958d5 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -268,8 +268,7 @@ class Serializer(BaseSerializer): fields = [field for field in self.fields.values() if not field.write_only] for field in fields: - native_value = field.get_attribute(instance) - ret[field.field_name] = field.to_representation(native_value) + ret[field.field_name] = field.get_field_representation(instance) return ret From dee3f78cb688b1bee892ef78d6eec23ccf67a80e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 17:06:20 +0100 Subject: [PATCH 0906/1652] FileField and ImageField --- requirements-test.txt | 1 - rest_framework/compat.py | 9 ---- rest_framework/fields.py | 82 +++++++++++++++++++++++++-------- rest_framework/settings.py | 3 +- tests/test_fields.py | 93 ++++++++++++++++++++++++++++++++++++-- tox.ini | 16 ------- 6 files changed, 156 insertions(+), 48 deletions(-) diff --git a/requirements-test.txt b/requirements-test.txt index d6ee5c6fd..06c8849a8 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -13,4 +13,3 @@ django-filter>=0.5.4 django-oauth-plus>=2.2.1 oauth2>=1.5.211 django-oauth2-provider>=0.2.4 -Pillow==2.3.0 diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 7303c32a6..89af9b485 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -84,15 +84,6 @@ except ImportError: from collections import UserDict from collections import MutableMapping as DictMixin -# Try to import PIL in either of the two ways it can end up installed. -try: - from PIL import Image -except ImportError: - try: - import Image - except ImportError: - Image = None - def get_model_name(model_cls): try: diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 4c49aabaa..f4b53279a 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1,3 +1,4 @@ +from django import forms from django.conf import settings from django.core import validators from django.core.exceptions import ValidationError @@ -427,8 +428,6 @@ class CharField(Field): return str(data) def to_representation(self, value): - if value is None: - return None return str(value) @@ -446,8 +445,6 @@ class EmailField(CharField): return str(data).strip() def to_representation(self, value): - if value is None: - return None return str(value).strip() @@ -513,8 +510,6 @@ class IntegerField(Field): return data def to_representation(self, value): - if value is None: - return None return int(value) @@ -543,8 +538,6 @@ class FloatField(Field): self.fail('invalid') def to_representation(self, value): - if value is None: - return None return float(value) @@ -616,9 +609,6 @@ class DecimalField(Field): return value def to_representation(self, value): - if value in (None, ''): - return None - if not isinstance(value, decimal.Decimal): value = decimal.Decimal(str(value).strip()) @@ -689,7 +679,7 @@ class DateTimeField(Field): self.fail('invalid', format=humanized_format) def to_representation(self, value): - if value is None or self.format is None: + if self.format is None: return value if self.format.lower() == ISO_8601: @@ -741,7 +731,7 @@ class DateField(Field): self.fail('invalid', format=humanized_format) def to_representation(self, value): - if value is None or self.format is None: + if self.format is None: return value # Applying a `DateField` to a datetime value is almost always @@ -795,7 +785,7 @@ class TimeField(Field): self.fail('invalid', format=humanized_format) def to_representation(self, value): - if value is None or self.format is None: + if self.format is None: return value # Applying a `TimeField` to a datetime value is almost always @@ -875,14 +865,68 @@ class MultipleChoiceField(ChoiceField): # File types... class FileField(Field): - pass # TODO + default_error_messages = { + 'required': _("No file was submitted."), + 'invalid': _("The submitted data was not a file. Check the encoding type on the form."), + 'no_name': _("No filename could be determined."), + 'empty': _("The submitted file is empty."), + 'max_length': _('Ensure this filename has at most {max_length} characters (it has {length}).'), + } + use_url = api_settings.UPLOADED_FILES_USE_URL + + def __init__(self, *args, **kwargs): + self.max_length = kwargs.pop('max_length', None) + self.allow_empty_file = kwargs.pop('allow_empty_file', False) + self.use_url = kwargs.pop('use_url', self.use_url) + super(FileField, self).__init__(*args, **kwargs) + + def to_internal_value(self, data): + try: + # `UploadedFile` objects should have name and size attributes. + file_name = data.name + file_size = data.size + except AttributeError: + self.fail('invalid') + + if not file_name: + self.fail('no_name') + if not self.allow_empty_file and not file_size: + self.fail('empty') + if self.max_length and len(file_name) > self.max_length: + self.fail('max_length', max_length=self.max_length, length=len(file_name)) + + return data + + def to_representation(self, value): + if self.use_url: + return settings.MEDIA_URL + value.url + return value.name -class ImageField(Field): - pass # TODO +class ImageField(FileField): + default_error_messages = { + 'invalid_image': _( + 'Upload a valid image. The file you uploaded was either not an ' + 'image or a corrupted image.' + ), + } + + def __init__(self, *args, **kwargs): + self._DjangoImageField = kwargs.pop('_DjangoImageField', forms.ImageField) + super(ImageField, self).__init__(*args, **kwargs) + + def to_internal_value(self, data): + # Image validation is a bit grungy, so we'll just outright + # defer to Django's implementation so we don't need to + # consider it, or treat PIL as a test dependancy. + file_object = super(ImageField, self).to_internal_value(data) + django_field = self._DjangoImageField() + django_field.error_messages = self.error_messages + django_field.to_python(file_object) + return file_object -# Advanced field types... +# Composite field types... class ListField(Field): child = None @@ -922,6 +966,8 @@ class ListField(Field): return [self.child.to_representation(item) for item in data] +# Miscellaneous field types... + class ReadOnlyField(Field): """ A read-only field that simply returns the field value. diff --git a/rest_framework/settings.py b/rest_framework/settings.py index d7fb0a436..1e8c27fc3 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -110,7 +110,8 @@ DEFAULTS = { # Encoding 'UNICODE_JSON': True, 'COMPACT_JSON': True, - 'COERCE_DECIMAL_TO_STRING': True + 'COERCE_DECIMAL_TO_STRING': True, + 'UPLOADED_FILES_USE_URL': True } diff --git a/tests/test_fields.py b/tests/test_fields.py index 342ae1927..aa8c3a68c 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1,4 +1,5 @@ from decimal import Decimal +from django.core.exceptions import ValidationError from django.utils import timezone from rest_framework import fields, serializers import datetime @@ -516,7 +517,7 @@ class TestDecimalField(FieldValues): Decimal('1.0'): '1.0', Decimal('0.0'): '0.0', Decimal('1.09'): '1.1', - Decimal('0.04'): '0.0', + Decimal('0.04'): '0.0' } field = fields.DecimalField(max_digits=3, decimal_places=1) @@ -576,7 +577,7 @@ class TestDateField(FieldValues): datetime.datetime(2001, 1, 1, 12, 00): ['Expected a date but got a datetime.'], } outputs = { - datetime.date(2001, 1, 1): '2001-01-01', + datetime.date(2001, 1, 1): '2001-01-01' } field = fields.DateField() @@ -639,7 +640,7 @@ class TestDateTimeField(FieldValues): } outputs = { datetime.datetime(2001, 1, 1, 13, 00): '2001-01-01T13:00:00', - datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z', + datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z' } field = fields.DateTimeField(default_timezone=timezone.UTC()) @@ -847,6 +848,92 @@ class TestMultipleChoiceField(FieldValues): ) +# File fields... + +class MockFile: + def __init__(self, name='', size=0, url=''): + self.name = name + self.size = size + self.url = url + + def __eq__(self, other): + return ( + isinstance(other, MockFile) and + self.name == other.name and + self.size == other.size and + self.url == other.url + ) + + +class TestFileField(FieldValues): + """ + Values for `FileField`. + """ + valid_inputs = [ + (MockFile(name='example', size=10), MockFile(name='example', size=10)) + ] + invalid_inputs = [ + ('invalid', ['The submitted data was not a file. Check the encoding type on the form.']), + (MockFile(name='example.txt', size=0), ['The submitted file is empty.']), + (MockFile(name='', size=10), ['No filename could be determined.']), + (MockFile(name='x' * 100, size=10), ['Ensure this filename has at most 10 characters (it has 100).']) + ] + outputs = [ + (MockFile(name='example.txt', url='/example.txt'), '/example.txt') + ] + field = fields.FileField(max_length=10) + + +class TestFieldFieldWithName(FieldValues): + """ + Values for `FileField` with a filename output instead of URLs. + """ + valid_inputs = {} + invalid_inputs = {} + outputs = [ + (MockFile(name='example.txt', url='/example.txt'), 'example.txt') + ] + field = fields.FileField(use_url=False) + + +# Stub out mock Django `forms.ImageField` class so we don't *actually* +# call into it's regular validation, or require PIL for testing. +class FailImageValidation(object): + def to_python(self, value): + raise ValidationError(self.error_messages['invalid_image']) + + +class PassImageValidation(object): + def to_python(self, value): + return value + + +class TestInvalidImageField(FieldValues): + """ + Values for an invalid `ImageField`. + """ + valid_inputs = {} + invalid_inputs = [ + (MockFile(name='example.txt', size=10), ['Upload a valid image. The file you uploaded was either not an image or a corrupted image.']) + ] + outputs = {} + field = fields.ImageField(_DjangoImageField=FailImageValidation) + + +class TestValidImageField(FieldValues): + """ + Values for an valid `ImageField`. + """ + valid_inputs = [ + (MockFile(name='example.txt', size=10), MockFile(name='example.txt', size=10)) + ] + invalid_inputs = {} + outputs = {} + field = fields.ImageField(_DjangoImageField=PassImageValidation) + + +# Composite fields... + class TestListField(FieldValues): """ Values for `ListField`. diff --git a/tox.ini b/tox.ini index d40a70799..5b9a0ffef 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,6 @@ basepython = python3.4 deps = Django==1.7 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.3-django1.7] @@ -29,7 +28,6 @@ basepython = python3.3 deps = Django==1.7 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.2-django1.7] @@ -37,7 +35,6 @@ basepython = python3.2 deps = Django==1.7 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.7-django1.7] @@ -49,7 +46,6 @@ deps = Django==1.7 # oauth2==1.5.211 # django-oauth2-provider==0.2.4 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.4-django1.6] @@ -57,7 +53,6 @@ basepython = python3.4 deps = Django==1.6.3 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.3-django1.6] @@ -65,7 +60,6 @@ basepython = python3.3 deps = Django==1.6.3 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.2-django1.6] @@ -73,7 +67,6 @@ basepython = python3.2 deps = Django==1.6.3 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.7-django1.6] @@ -85,7 +78,6 @@ deps = Django==1.6.3 oauth2==1.5.211 django-oauth2-provider==0.2.4 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.6-django1.6] @@ -97,7 +89,6 @@ deps = Django==1.6.3 oauth2==1.5.211 django-oauth2-provider==0.2.4 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.4-django1.5] @@ -105,7 +96,6 @@ basepython = python3.4 deps = django==1.5.6 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.3-django1.5] @@ -113,7 +103,6 @@ basepython = python3.3 deps = django==1.5.6 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py3.2-django1.5] @@ -121,7 +110,6 @@ basepython = python3.2 deps = django==1.5.6 django-filter==0.7 defusedxml==0.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.7-django1.5] @@ -133,7 +121,6 @@ deps = django==1.5.6 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.6-django1.5] @@ -145,7 +132,6 @@ deps = django==1.5.6 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.7-django1.4] @@ -157,7 +143,6 @@ deps = django==1.4.11 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 [testenv:py2.6-django1.4] @@ -169,5 +154,4 @@ deps = django==1.4.11 oauth2==1.5.211 django-oauth2-provider==0.2.3 django-guardian==1.2.3 - Pillow==2.3.0 pytest-django==2.6.1 From ce04d59a53df45715c4805831406b2105c9594a8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Sep 2014 17:07:47 +0100 Subject: [PATCH 0907/1652] Update release notes --- docs/topics/3.0-announcement.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 21052ca03..24f4ed4c2 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -8,7 +8,6 @@ See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-fr The most notable outstanding issues still to resolved on the `version-3.0` branch are as follows: -* `FileField` and `ImageField` support. * Forms support for serializers and in the browsable API. * Enforcing uniqueness on `unique=True` and `unique_together` fields. * Optimisations for serialializing primary keys. From 43fd5a873051c99600386c1fdc9fa368edeb6eda Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 29 Sep 2014 09:24:03 +0100 Subject: [PATCH 0908/1652] Uniqueness validation --- rest_framework/fields.py | 4 ++ rest_framework/utils/field_mapping.py | 5 +++ rest_framework/validators.py | 57 +++++++++++++++++++++++++++ tests/test_validators.py | 35 ++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 rest_framework/validators.py create mode 100644 tests/test_validators.py diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f4b53279a..231f693ca 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -150,6 +150,10 @@ class Field(object): messages.update(error_messages or {}) self.error_messages = messages + for validator in validators: + if getattr(validator, 'requires_context', False): + validator.serializer_field = self + def bind(self, field_name, parent): """ Initializes the field name and parent for the field instance. diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index c37940832..cf9d910aa 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -6,6 +6,7 @@ from django.core import validators from django.db import models from django.utils.text import capfirst from rest_framework.compat import clean_manytomany_helptext +from rest_framework.validators import UniqueValidator import inspect @@ -156,6 +157,10 @@ def get_field_kwargs(field_name, model_field): if validator is not validators.validate_slug ] + if getattr(model_field, 'unique', False): + validator = UniqueValidator(queryset=model_field.model._default_manager) + validator_kwarg.append(validator) + max_digits = getattr(model_field, 'max_digits', None) if max_digits is not None: kwargs['max_digits'] = max_digits diff --git a/rest_framework/validators.py b/rest_framework/validators.py new file mode 100644 index 000000000..f5fbeb3ca --- /dev/null +++ b/rest_framework/validators.py @@ -0,0 +1,57 @@ +from django.core.exceptions import ValidationError + + +class UniqueValidator: + # Validators with `requires_context` will have the field instance + # passed to them when the field is instantiated. + requires_context = True + + def __init__(self, queryset): + self.queryset = queryset + self.serializer_field = None + + def get_queryset(self): + return self.queryset.all() + + def __call__(self, value): + field = self.serializer_field + + # Determine the model field name that the serializer field corresponds to. + field_name = field.source_attrs[0] if field.source_attrs else field.field_name + + # Determine the existing instance, if this is an update operation. + instance = getattr(field.parent, 'instance', None) + + # Ensure uniqueness. + filter_kwargs = {field_name: value} + queryset = self.get_queryset().filter(**filter_kwargs) + if instance: + queryset = queryset.exclude(pk=instance.pk) + if queryset.exists(): + raise ValidationError('This field must be unique.') + + +class UniqueTogetherValidator: + requires_context = True + + def __init__(self, queryset, fields): + self.queryset = queryset + self.fields = fields + self.serializer_field = None + + def __call__(self, value): + serializer = self.serializer_field + + # Determine the existing instance, if this is an update operation. + instance = getattr(serializer, 'instance', None) + + # Ensure uniqueness. + filter_kwargs = dict([ + (field_name, value[field_name]) for field_name in self.fields + ]) + queryset = self.get_queryset().filter(**filter_kwargs) + if instance: + queryset = queryset.exclude(pk=instance.pk) + if queryset.exists(): + field_names = ' and '.join(self.fields) + raise ValidationError('The fields %s must make a unique set.' % field_names) diff --git a/tests/test_validators.py b/tests/test_validators.py new file mode 100644 index 000000000..a1366a1ad --- /dev/null +++ b/tests/test_validators.py @@ -0,0 +1,35 @@ +from django.db import models +from django.test import TestCase +from rest_framework import serializers + + +class ExampleModel(models.Model): + username = models.CharField(unique=True, max_length=100) + + +class ExampleSerializer(serializers.ModelSerializer): + class Meta: + model = ExampleModel + + +class TestUniquenessValidation(TestCase): + def setUp(self): + self.instance = ExampleModel.objects.create(username='existing') + + def test_is_not_unique(self): + data = {'username': 'existing'} + serializer = ExampleSerializer(data=data) + assert not serializer.is_valid() + assert serializer.errors == {'username': ['This field must be unique.']} + + def test_is_unique(self): + data = {'username': 'other'} + serializer = ExampleSerializer(data=data) + assert serializer.is_valid() + assert serializer.validated_data == {'username': 'other'} + + def test_updated_instance_excluded(self): + data = {'username': 'existing'} + serializer = ExampleSerializer(self.instance, data=data) + assert serializer.is_valid() + assert serializer.validated_data == {'username': 'existing'} From 9805a085fb115785f272489dc24b51ba6f8e6329 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 29 Sep 2014 11:23:02 +0100 Subject: [PATCH 0909/1652] UniqueTogetherValidator --- rest_framework/serializers.py | 80 ++++++++++++++++++--- rest_framework/validators.py | 38 +++++++--- tests/test_validators.py | 129 ++++++++++++++++++++++++++++++++-- 3 files changed, 223 insertions(+), 24 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 080b958d5..09ad376a2 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -23,6 +23,7 @@ from rest_framework.utils.field_mapping import ( get_relation_kwargs, get_nested_relation_kwargs, ClassLookupDict ) +from rest_framework.validators import UniqueTogetherValidator import copy import inspect @@ -95,7 +96,7 @@ class BaseSerializer(Field): def is_valid(self, raise_exception=False): if not hasattr(self, '_validated_data'): try: - self._validated_data = self.to_internal_value(self._initial_data) + self._validated_data = self.run_validation(self._initial_data) except ValidationError as exc: self._validated_data = {} self._errors = exc.message_dict @@ -223,15 +224,43 @@ class Serializer(BaseSerializer): return html.parse_html_dict(dictionary, prefix=self.field_name) return dictionary.get(self.field_name, empty) - def to_internal_value(self, data): + def run_validation(self, data=empty): """ - Dict of native values <- Dict of primitive datatypes. + We override the default `run_validation`, because the validation + performed by validators and the `.validate()` method should + be coerced into an error dictionary with a 'non_fields_error' key. """ + if data is empty: + if getattr(self.root, 'partial', False): + raise SkipField() + if self.required: + self.fail('required') + return self.get_default() + + if data is None: + if not self.allow_null: + self.fail('null') + return None + if not isinstance(data, dict): raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: ['Invalid data'] }) + value = self.to_internal_value(data) + try: + self.run_validators(value) + self.validate(value) + except ValidationError as exc: + raise ValidationError({ + api_settings.NON_FIELD_ERRORS_KEY: exc.messages + }) + return value + + def to_internal_value(self, data): + """ + Dict of native values <- Dict of primitive datatypes. + """ ret = {} errors = {} fields = [field for field in self.fields.values() if not field.read_only] @@ -253,12 +282,7 @@ class Serializer(BaseSerializer): if errors: raise ValidationError(errors) - try: - return self.validate(ret) - except ValidationError as exc: - raise ValidationError({ - api_settings.NON_FIELD_ERRORS_KEY: exc.messages - }) + return ret def to_representation(self, instance): """ @@ -355,6 +379,14 @@ class ModelSerializer(Serializer): }) _related_class = PrimaryKeyRelatedField + def __init__(self, *args, **kwargs): + super(ModelSerializer, self).__init__(*args, **kwargs) + if 'validators' not in kwargs: + validators = self.get_unique_together_validators() + if validators: + self.validators.extend(validators) + self._kwargs['validators'] = validators + def create(self, attrs): ModelClass = self.Meta.model @@ -381,6 +413,36 @@ class ModelSerializer(Serializer): setattr(obj, attr, value) obj.save() + def get_unique_together_validators(self): + field_names = set([ + field.source for field in self.fields.values() + if (field.source != '*') and ('.' not in field.source) + ]) + + validators = [] + model_class = self.Meta.model + + for unique_together in model_class._meta.unique_together: + if field_names.issuperset(set(unique_together)): + validator = UniqueTogetherValidator( + queryset=model_class._default_manager, + fields=unique_together + ) + validator.serializer_field = self + validators.append(validator) + + for parent_class in model_class._meta.parents.keys(): + for unique_together in parent_class._meta.unique_together: + if field_names.issuperset(set(unique_together)): + validator = UniqueTogetherValidator( + queryset=parent_class._default_manager, + fields=unique_together + ) + validator.serializer_field = self + validators.append(validator) + + return validators + def _get_base_fields(self): declared_fields = copy.deepcopy(self._declared_fields) diff --git a/rest_framework/validators.py b/rest_framework/validators.py index f5fbeb3ca..20de4b427 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -1,18 +1,26 @@ +""" +We perform uniqueness checks explicitly on the serializer class, rather +the using Django's `.full_clean()`. + +This gives us better seperation of concerns, allows us to use single-step +object creation, and makes it possible to switch between using the implicit +`ModelSerializer` class and an equivelent explicit `Serializer` class. +""" from django.core.exceptions import ValidationError +from django.utils.translation import ugettext_lazy as _ +from rest_framework.utils.representation import smart_repr class UniqueValidator: # Validators with `requires_context` will have the field instance # passed to them when the field is instantiated. requires_context = True + message = _('This field must be unique.') def __init__(self, queryset): self.queryset = queryset self.serializer_field = None - def get_queryset(self): - return self.queryset.all() - def __call__(self, value): field = self.serializer_field @@ -24,15 +32,22 @@ class UniqueValidator: # Ensure uniqueness. filter_kwargs = {field_name: value} - queryset = self.get_queryset().filter(**filter_kwargs) + queryset = self.queryset.filter(**filter_kwargs) if instance: queryset = queryset.exclude(pk=instance.pk) if queryset.exists(): - raise ValidationError('This field must be unique.') + raise ValidationError(self.message) + + def __repr__(self): + return '<%s(queryset=%s)>' % ( + self.__class__.__name__, + smart_repr(self.queryset) + ) class UniqueTogetherValidator: requires_context = True + message = _('The fields {field_names} must make a unique set.') def __init__(self, queryset, fields): self.queryset = queryset @@ -49,9 +64,16 @@ class UniqueTogetherValidator: filter_kwargs = dict([ (field_name, value[field_name]) for field_name in self.fields ]) - queryset = self.get_queryset().filter(**filter_kwargs) + queryset = self.queryset.filter(**filter_kwargs) if instance: queryset = queryset.exclude(pk=instance.pk) if queryset.exists(): - field_names = ' and '.join(self.fields) - raise ValidationError('The fields %s must make a unique set.' % field_names) + field_names = ', '.join(self.fields) + raise ValidationError(self.message.format(field_names=field_names)) + + def __repr__(self): + return '<%s(queryset=%s, fields=%s)>' % ( + self.__class__.__name__, + smart_repr(self.queryset), + smart_repr(self.fields) + ) diff --git a/tests/test_validators.py b/tests/test_validators.py index a1366a1ad..c35ecb514 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -3,33 +3,148 @@ from django.test import TestCase from rest_framework import serializers -class ExampleModel(models.Model): +def dedent(blocktext): + return '\n'.join([line[12:] for line in blocktext.splitlines()[1:-1]]) + + +# Tests for `UniqueValidator` +# --------------------------- + +class UniquenessModel(models.Model): username = models.CharField(unique=True, max_length=100) -class ExampleSerializer(serializers.ModelSerializer): +class UniquenessSerializer(serializers.ModelSerializer): class Meta: - model = ExampleModel + model = UniquenessModel class TestUniquenessValidation(TestCase): def setUp(self): - self.instance = ExampleModel.objects.create(username='existing') + self.instance = UniquenessModel.objects.create(username='existing') + + def test_repr(self): + serializer = UniquenessSerializer() + expected = dedent(""" + UniquenessSerializer(): + id = IntegerField(label='ID', read_only=True) + username = CharField(max_length=100, validators=[<UniqueValidator(queryset=UniquenessModel.objects.all())>]) + """) + assert repr(serializer) == expected def test_is_not_unique(self): data = {'username': 'existing'} - serializer = ExampleSerializer(data=data) + serializer = UniquenessSerializer(data=data) assert not serializer.is_valid() assert serializer.errors == {'username': ['This field must be unique.']} def test_is_unique(self): data = {'username': 'other'} - serializer = ExampleSerializer(data=data) + serializer = UniquenessSerializer(data=data) assert serializer.is_valid() assert serializer.validated_data == {'username': 'other'} def test_updated_instance_excluded(self): data = {'username': 'existing'} - serializer = ExampleSerializer(self.instance, data=data) + serializer = UniquenessSerializer(self.instance, data=data) assert serializer.is_valid() assert serializer.validated_data == {'username': 'existing'} + + +# Tests for `UniqueTogetherValidator` +# ----------------------------------- + +class UniquenessTogetherModel(models.Model): + race_name = models.CharField(max_length=100) + position = models.IntegerField() + + class Meta: + unique_together = ('race_name', 'position') + + +class UniquenessTogetherSerializer(serializers.ModelSerializer): + class Meta: + model = UniquenessTogetherModel + + +class TestUniquenessTogetherValidation(TestCase): + def setUp(self): + self.instance = UniquenessTogetherModel.objects.create( + race_name='example', + position=1 + ) + UniquenessTogetherModel.objects.create( + race_name='example', + position=2 + ) + UniquenessTogetherModel.objects.create( + race_name='other', + position=1 + ) + + def test_repr(self): + serializer = UniquenessTogetherSerializer() + expected = dedent(""" + UniquenessTogetherSerializer(validators=[<UniqueTogetherValidator(queryset=UniquenessTogetherModel.objects.all(), fields=('race_name', 'position'))>]): + id = IntegerField(label='ID', read_only=True) + race_name = CharField(max_length=100) + position = IntegerField() + """) + assert repr(serializer) == expected + + def test_is_not_unique_together(self): + """ + Failing unique together validation should result in non field errors. + """ + data = {'race_name': 'example', 'position': 2} + serializer = UniquenessTogetherSerializer(data=data) + print serializer.validators + assert not serializer.is_valid() + assert serializer.errors == { + 'non_field_errors': [ + 'The fields race_name, position must make a unique set.' + ] + } + + def test_is_unique_together(self): + """ + In a unique together validation, one field may be non-unique + so long as the set as a whole is unique. + """ + data = {'race_name': 'other', 'position': 2} + serializer = UniquenessTogetherSerializer(data=data) + assert serializer.is_valid() + assert serializer.validated_data == { + 'race_name': 'other', + 'position': 2 + } + + def test_updated_instance_excluded_from_unique_together(self): + """ + When performing an update, the existing instance does not count + as a match against uniqueness. + """ + data = {'race_name': 'example', 'position': 1} + serializer = UniquenessTogetherSerializer(self.instance, data=data) + assert serializer.is_valid() + assert serializer.validated_data == { + 'race_name': 'example', + 'position': 1 + } + + def test_ignore_exlcuded_fields(self): + """ + When model fields are not included in a serializer, then uniqueness + validtors should not be added for that field. + """ + class ExcludedFieldSerializer(serializers.ModelSerializer): + class Meta: + model = UniquenessTogetherModel + fields = ('id', 'race_name',) + serializer = ExcludedFieldSerializer() + expected = dedent(""" + ExcludedFieldSerializer(): + id = IntegerField(label='ID', read_only=True) + race_name = CharField(max_length=100) + """) + assert repr(serializer) == expected From d2d412993f537952fd7809ded3e981f85ec318e9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 29 Sep 2014 11:24:21 +0100 Subject: [PATCH 0910/1652] .validate() on serializer fields --- rest_framework/fields.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 231f693ca..fee6080aa 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -254,6 +254,7 @@ class Field(object): value = self.to_internal_value(data) self.run_validators(value) + self.validate(value) return value def run_validators(self, value): @@ -270,6 +271,9 @@ class Field(object): if errors: raise ValidationError(errors) + def validate(self, value): + pass + def to_internal_value(self, data): """ Transform the *incoming* primative data into a native value. From 4798df52df5d59cc570043e3eb7e26f7ce57b54f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 29 Sep 2014 12:57:05 +0100 Subject: [PATCH 0911/1652] Update release notes --- docs/topics/3.0-announcement.md | 44 +++++++++++++++++++++++++++++---- tests/test_validators.py | 1 - 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 24f4ed4c2..92062552a 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -146,7 +146,41 @@ The corresponding code would now look like this: extras = {'user': request.user} # Include the user when saving. serializer.save(extras=extras) -#### Printable serializer reprensentations. +#### Limitations of ModelSerializer validation. + +This change also means that we no longer use the `.full_clean()` method on model instances, but instead perform all validation explicitly on the serializer. This gives a cleaner seperation, and ensures that there's no automatic validation behavior on `ModelSerializer` classes that can't also be easily replicated on regular `Serializer` classes. + +This change comes with the following limitations: + +* The model `.clean()` method will not be called as part of serializer validation. Use the serializer `.validate()` method to perform a final validation step on incoming data where required. +* The `.unique_for_date`, `.unique_for_month` and `.unique_for_year` options on model fields are not automatically validated. Again, you'll need to handle these explicitly on the serializer if required. + +#### Writable nested serialization. + +REST framework 2.x attempted to automatically support writable nested serialization, but the behavior was complex and non-obvious. Attempting to automatically handle these case is problematic: + +* There can be complex dependancies involved in order of saving multiple related model instances. +* It's unclear what behavior the user should expect when related models are passed `None` data. +* It's unclear how the user should expect to-many relationships to handle updates, creations and deletions of multiple records. + +Using the `depth` option on `ModelSerializer` will now create **read-only nested serializers** by default. To use writable nested serialization you'll want to declare a nested field on the serializer class, and write the `create()` and/or `update()` methods explicitly. + + class UserSerializer(serializers.ModelSerializer): + profile = ProfileSerializer() + + class Meta: + model = User + fields = ('username', 'email', 'profile') + + def create(self, validated_data): + profile_data = validated_data.pop['profile'] + user = User.objects.create(**validated_data) + profile = Profile.objects.create(user=user, **profile_data) + return user + +The single-step object creation makes this far simpler and more obvious than the previous `.restore_object()` behavior. + +#### Printable serializer representations. Serializer instances now support a printable representation that allows you to inspect the fields present on the instance. @@ -279,7 +313,7 @@ There are four mathods that can be overriding, depending on what functionality y * `.to_internal_value()` - Override this to support deserialization, for write operations. * `.create()` and `.update()` - Overide either or both of these to support saving instances. -##### Read-only serializers. +##### Read-only `BaseSerializer` classes. To implement a read-only serializer using the `BaseSerializer` class, we just need to override the `.to_representation()` method. Let's take a look at an example using a simple Django model: @@ -313,7 +347,7 @@ Or use it to serialize multiple instances: serializer = HighScoreSerializer(queryset, many=True) return Response(serializer.data) -##### Read-write serializers. +##### Read-write `BaseSerializer` classes. To create a read-write serializer we first need to implement a `.to_internal_value()` method. This method returns the validated values that will be used to construct the object instance, and may raise a `ValidationError` if the supplied data is in an incorrect format. @@ -358,9 +392,9 @@ Here's a complete example of our previous `HighScoreSerializer`, that's been upd def create(self, validated_data): return HighScore.objects.create(**validated_data) -#### Creating new base classes with `BaseSerializer`. +#### Creating new generic serializers with `BaseSerializer`. -The `BaseSerializer` class is also useful if you want to implement new generic serializer classes for dealing with particular serialization styles or for integrating with different storage backends. +The `BaseSerializer` class is also useful if you want to implement new generic serializer classes for dealing with particular serialization styles, or for integrating with alternative storage backends. The following class is an example of a generic serializer that can handle coercing aribitrary objects into primative representations. diff --git a/tests/test_validators.py b/tests/test_validators.py index c35ecb514..ac04d2b4c 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -98,7 +98,6 @@ class TestUniquenessTogetherValidation(TestCase): """ data = {'race_name': 'example', 'position': 2} serializer = UniquenessTogetherSerializer(data=data) - print serializer.validators assert not serializer.is_valid() assert serializer.errors == { 'non_field_errors': [ From 657d1de032bfa392609d53751e89366b972cd678 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 29 Sep 2014 14:12:09 +0100 Subject: [PATCH 0912/1652] Latest release notes --- docs/topics/3.0-announcement.md | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 92062552a..584c49794 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -560,6 +560,35 @@ The following usage will *now raise an error*: email = serializers.EmailField(source='email') +#### The `UniqueValidator` and `UniqueTogetherValidator` classes. + +REST framework now provides two new validators that allow you to ensure field uniqueness, while still using a completely explicit `Serializer` class instead of using `ModelSerializer`. + +The `UniqueValidator` should be applied to a serializer field, and takes a single `queryset` argument. + + from rest_framework import serializers + from rest_framework.validators import UniqueValidator + + class OrganizationSerializer(serializers.Serializer): + url = serializers.HyperlinkedIdentityField(view_name='organisation_detail') + created = serializers.DateTimeField(read_only=True) + name = serializers.CharField( + max_length=100, + validators=UniqueValidator(queryset=Organisation.objects.all()) + ) + +The `UniqueTogetherValidator` should be applied to a serializer, and takes a `queryset` argument and a `fields` argument which should be a list or tuple of field names. + + class RaceResultSerializer(serializers.Serializer): + category = serializers.ChoiceField(['5k', '10k']) + position = serializers.IntegerField() + name = serializers.CharField(max_length=100) + + default_validators = [UniqueTogetherValidator( + queryset=RaceResult.objects.all(), + fields=('category', 'position') + )] + ## Generic views #### Simplification of view logic. @@ -633,6 +662,16 @@ The `COMPACT_JSON` setting has been added, and can be used to revert this behavi 'COMPACT_JSON': False } +#### File fields as URLs + +The `FileField` and `ImageField` classes are now represented as URLs by default. You should ensure you set Django's standard `MEDIA_URL` setting appropriately. + +You can revert this behavior, and display filenames as the representation, using the `UPLOADED_FILES_USE_URL` settings key: + + REST_FRAMEWORK = { + 'UPLOADED_FILES_USE_URL': False + } + #### Throttle headers using `Retry-After`. The custom `X-Throttle-Wait-Second` header has now been dropped in favor of the standard `Retry-After` header. You can revert this behavior if needed by writing a custom exception handler for your application. From d1b2c8ac7faec65483cbddf4f1718ca4f5805246 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 29 Sep 2014 14:12:26 +0100 Subject: [PATCH 0913/1652] Absolute URLs for file fields --- rest_framework/fields.py | 12 +++++++----- rest_framework/serializers.py | 2 -- tests/test_fields.py | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index fee6080aa..f7ea3b0c2 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -150,10 +150,6 @@ class Field(object): messages.update(error_messages or {}) self.error_messages = messages - for validator in validators: - if getattr(validator, 'requires_context', False): - validator.serializer_field = self - def bind(self, field_name, parent): """ Initializes the field name and parent for the field instance. @@ -264,6 +260,8 @@ class Field(object): """ errors = [] for validator in self.validators: + if getattr(validator, 'requires_context', False): + validator.serializer_field = self try: validator(value) except ValidationError as exc: @@ -907,7 +905,11 @@ class FileField(Field): def to_representation(self, value): if self.use_url: - return settings.MEDIA_URL + value.url + url = settings.MEDIA_URL + value.url + request = self.context.get('request', None) + if request is not None: + return request.build_absolute_uri(url) + return url return value.name diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 09ad376a2..0faa56718 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -428,7 +428,6 @@ class ModelSerializer(Serializer): queryset=model_class._default_manager, fields=unique_together ) - validator.serializer_field = self validators.append(validator) for parent_class in model_class._meta.parents.keys(): @@ -438,7 +437,6 @@ class ModelSerializer(Serializer): queryset=parent_class._default_manager, fields=unique_together ) - validator.serializer_field = self validators.append(validator) return validators diff --git a/tests/test_fields.py b/tests/test_fields.py index aa8c3a68c..bbd9f93d8 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -953,6 +953,23 @@ class TestListField(FieldValues): field = fields.ListField(child=fields.IntegerField()) +# Tests for FieldField. +# --------------------- + +class MockRequest: + def build_absolute_uri(self, value): + return 'http://example.com' + value + + +class TestFileFieldContext: + def test_fully_qualified_when_request_in_context(self): + field = fields.FileField(max_length=10) + field._context = {'request': MockRequest()} + obj = MockFile(name='example.txt', url='/example.txt') + value = field.to_representation(obj) + assert value == 'http://example.com/example.txt' + + # Tests for SerializerMethodField. # -------------------------------- From 5734b6e20241c4d0d1441535657c5ef25302b225 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 29 Sep 2014 16:56:50 +0100 Subject: [PATCH 0914/1652] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 63513f758..428fb8e9d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ There is a live example API for testing purposes, [available here][sandbox]. # Requirements -* Python (2.6.5+, 2.7, 3.2, 3.3) +* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4) * Django (1.4.2+, 1.5, 1.6, 1.7) # Installation From a8622adcd9f940131b63e91d53d2c49fcb89ee6a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 29 Sep 2014 16:57:40 +0100 Subject: [PATCH 0915/1652] Update index.md --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index e4c971f95..b18b71d20 100644 --- a/docs/index.md +++ b/docs/index.md @@ -49,7 +49,7 @@ Some reasons you might want to use REST framework: REST framework requires the following: -* Python (2.6.5+, 2.7, 3.2, 3.3) +* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4) * Django (1.4.2+, 1.5, 1.6, 1.7) The following packages are optional: From 83a5ea8db27b9452a5539f1e0574f493392a91ad Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 29 Sep 2014 21:17:13 +0100 Subject: [PATCH 0916/1652] Update release notes --- docs/topics/3.0-announcement.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 584c49794..12ab5a0dc 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -664,14 +664,26 @@ The `COMPACT_JSON` setting has been added, and can be used to revert this behavi #### File fields as URLs -The `FileField` and `ImageField` classes are now represented as URLs by default. You should ensure you set Django's standard `MEDIA_URL` setting appropriately. +The `FileField` and `ImageField` classes are now represented as URLs by default. You should ensure you set Django's [standard `MEDIA_URL` setting](https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-MEDIA_URL) appropriately, and ensure your application [serves the uploaded files](https://docs.djangoproject.com/en/dev/howto/static-files/#serving-uploaded-files-in-development). -You can revert this behavior, and display filenames as the representation, using the `UPLOADED_FILES_USE_URL` settings key: +You can revert this behavior, and display filenames in the representation by using the `UPLOADED_FILES_USE_URL` settings key: REST_FRAMEWORK = { 'UPLOADED_FILES_USE_URL': False } +You can also modify serializer fields individually, using the `use_url` argument: + + uploaded_file = serializers.FileField(user_url=False) + +Also note that you should pass the `request` object to the serializer as context when instantiating it, so that a fully qualified URL can be returned. Returned URLs will then be of the form `https://example.com/url_path/filename.txt`. For example: + + context = {'request': request} + serializer = ExampleSerializer(instance, context=context) + return Response(serializer.data) + +If the request is omitted from the context, the returned URLs will be of the form `/url_path/filename.txt`. + #### Throttle headers using `Retry-After`. The custom `X-Throttle-Wait-Second` header has now been dropped in favor of the standard `Retry-After` header. You can revert this behavior if needed by writing a custom exception handler for your application. From da4900a353bd1136aa96cb5444b34f7beefa8e85 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 30 Sep 2014 11:10:13 +0100 Subject: [PATCH 0917/1652] Update 3.0-announcement.md --- docs/topics/3.0-announcement.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 12ab5a0dc..1c7e016eb 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -9,10 +9,8 @@ See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-fr The most notable outstanding issues still to resolved on the `version-3.0` branch are as follows: * Forms support for serializers and in the browsable API. -* Enforcing uniqueness on `unique=True` and `unique_together` fields. * Optimisations for serialializing primary keys. * Refine style of validation errors in some cases, such as validation errors in `ListField`. -* `.validate()` method on fields. * `.transform_<field>()` method on serializers. **Your feedback on the upgrade process and 3.0 changes is hugely important!** From 770d63fb046917f9fe1f08449f07bf13f1adfa4f Mon Sep 17 00:00:00 2001 From: Omer Katz <omer.drow@gmail.com> Date: Wed, 1 Oct 2014 13:12:33 +0300 Subject: [PATCH 0918/1652] Fixed documentation typo. --- docs/topics/3.0-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 1c7e016eb..d2505a1b3 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -75,7 +75,7 @@ Previously the serializers used a two-step object creation, as follows: This style is in line with how the `ModelForm` class works in Django, but is problematic for a number of reasons: -* Some data, such as many-to-many relationships, cannot be added to the object instance until after it has been save. This type of data needed to be hidden in some undocumentated state on the object instance, or kept as state on the serializer instance so that it could be used when `.save()` is called. +* Some data, such as many-to-many relationships, cannot be added to the object instance until after it has been saved. This type of data needed to be hidden in some undocumentated state on the object instance, or kept as state on the serializer instance so that it could be used when `.save()` is called. * Instantiating model instances directly means that you cannot use model manager classes for instance creation, eg `ExampleModel.objects.create(...)`. Manager classes are an excellent layer at which to enforce business logic and application-level data constraints. * The two step process makes it unclear where to put deserialization logic. For example, should extra attributes such as the current user get added to the instance during object creation or during object save? From 381771731f48c75e7d5951e353049cceec386512 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 1 Oct 2014 13:09:14 +0100 Subject: [PATCH 0919/1652] Use six.text_type instead of str everywhere --- rest_framework/compat.py | 9 +++++---- rest_framework/fields.py | 22 +++++++++++----------- rest_framework/filters.py | 3 ++- rest_framework/generics.py | 5 +++-- rest_framework/parsers.py | 3 ++- rest_framework/relations.py | 3 ++- rest_framework/reverse.py | 3 ++- rest_framework/utils/encoders.py | 6 +++--- 8 files changed, 30 insertions(+), 24 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 89af9b485..3993cee6d 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -5,11 +5,12 @@ versions of django/python, and compatibility wrappers around optional packages. # flake8: noqa from __future__ import unicode_literals -import django -import inspect + from django.core.exceptions import ImproperlyConfigured from django.conf import settings from django.utils import six +import django +import inspect # Handle django.utils.encoding rename in 1.5 onwards. @@ -177,12 +178,12 @@ class RequestFactory(DjangoRequestFactory): r = { 'PATH_INFO': self._get_path(parsed), 'QUERY_STRING': force_text(parsed[4]), - 'REQUEST_METHOD': str(method), + 'REQUEST_METHOD': six.text_type(method), } if data: r.update({ 'CONTENT_LENGTH': len(data), - 'CONTENT_TYPE': str(content_type), + 'CONTENT_TYPE': six.text_type(content_type), 'wsgi.input': FakePayload(data), }) elif django.VERSION <= (1, 4): diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f7ea3b0c2..f3ff22334 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -2,7 +2,7 @@ from django import forms from django.conf import settings from django.core import validators from django.core.exceptions import ValidationError -from django.utils import timezone +from django.utils import six, timezone from django.utils.datastructures import SortedDict from django.utils.dateparse import parse_date, parse_datetime, parse_time from django.utils.encoding import is_protected_type @@ -431,10 +431,10 @@ class CharField(Field): return super(CharField, self).run_validation(data) def to_internal_value(self, data): - return str(data) + return six.text_type(data) def to_representation(self, value): - return str(value) + return six.text_type(value) class EmailField(CharField): @@ -448,10 +448,10 @@ class EmailField(CharField): self.validators.append(validator) def to_internal_value(self, data): - return str(data).strip() + return six.text_type(data).strip() def to_representation(self, value): - return str(value).strip() + return six.text_type(value).strip() class RegexField(CharField): @@ -510,7 +510,7 @@ class IntegerField(Field): def to_internal_value(self, data): try: - data = int(str(data)) + data = int(six.text_type(data)) except (ValueError, TypeError): self.fail('invalid') return data @@ -616,7 +616,7 @@ class DecimalField(Field): def to_representation(self, value): if not isinstance(value, decimal.Decimal): - value = decimal.Decimal(str(value).strip()) + value = decimal.Decimal(six.text_type(value).strip()) context = decimal.getcontext().copy() context.prec = self.max_digits @@ -832,19 +832,19 @@ class ChoiceField(Field): # Allows us to deal with eg. integer choices while supporting either # integer or string input, but still get the correct datatype out. self.choice_strings_to_values = dict([ - (str(key), key) for key in self.choices.keys() + (six.text_type(key), key) for key in self.choices.keys() ]) super(ChoiceField, self).__init__(**kwargs) def to_internal_value(self, data): try: - return self.choice_strings_to_values[str(data)] + return self.choice_strings_to_values[six.text_type(data)] except KeyError: self.fail('invalid_choice', input=data) def to_representation(self, value): - return self.choice_strings_to_values[str(value)] + return self.choice_strings_to_values[six.text_type(value)] class MultipleChoiceField(ChoiceField): @@ -864,7 +864,7 @@ class MultipleChoiceField(ChoiceField): def to_representation(self, value): return set([ - self.choice_strings_to_values[str(item)] for item in value + self.choice_strings_to_values[six.text_type(item)] for item in value ]) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 085dfe659..4c485668a 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -3,6 +3,7 @@ Provides generic filtering backends that can be used to filter the results returned by list views. """ from __future__ import unicode_literals + from django.core.exceptions import ImproperlyConfigured from django.db import models from django.utils import six @@ -97,7 +98,7 @@ class SearchFilter(BaseFilterBackend): if not search_fields: return queryset - orm_lookups = [self.construct_search(str(search_field)) + orm_lookups = [self.construct_search(six.text_type(search_field)) for search_field in search_fields] for search_term in self.get_search_terms(request): diff --git a/rest_framework/generics.py b/rest_framework/generics.py index cf903dab3..3d6cf1684 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -3,10 +3,11 @@ Generic views that provide commonly needed behaviour. """ from __future__ import unicode_literals -from django.db.models.query import QuerySet from django.core.paginator import Paginator, InvalidPage +from django.db.models.query import QuerySet from django.http import Http404 from django.shortcuts import get_object_or_404 as _get_object_or_404 +from django.utils import six from django.utils.translation import ugettext as _ from rest_framework import views, mixins from rest_framework.settings import api_settings @@ -127,7 +128,7 @@ class GenericAPIView(views.APIView): error_format = _('Invalid page (%(page_number)s): %(message)s') raise Http404(error_format % { 'page_number': page_number, - 'message': str(exc) + 'message': six.text_type(exc) }) return page diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index fa02ecf1e..ccb82f03b 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -5,6 +5,7 @@ They give us a generic way of being able to handle various media types on the request, such as form content or json encoded data. """ from __future__ import unicode_literals + from django.conf import settings from django.core.files.uploadhandler import StopFutureHandlers from django.http import QueryDict @@ -132,7 +133,7 @@ class MultiPartParser(BaseParser): data, files = parser.parse() return DataAndFiles(data, files) except MultiPartParserError as exc: - raise ParseError('Multipart form parse error - %s' % str(exc)) + raise ParseError('Multipart form parse error - %s' % six.text_type(exc)) class XMLParser(BaseParser): diff --git a/rest_framework/relations.py b/rest_framework/relations.py index b37a6fedd..b5effc6cb 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -4,6 +4,7 @@ from rest_framework.reverse import reverse from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch, Resolver404 from django.db.models.query import QuerySet +from django.utils import six from django.utils.translation import ugettext_lazy as _ @@ -49,7 +50,7 @@ class StringRelatedField(Field): super(StringRelatedField, self).__init__(**kwargs) def to_representation(self, value): - return str(value) + return six.text_type(value) class PrimaryKeyRelatedField(RelatedField): diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py index a51b07f54..a74e8aa2d 100644 --- a/rest_framework/reverse.py +++ b/rest_framework/reverse.py @@ -3,6 +3,7 @@ Provide reverse functions that return fully qualified URLs """ from __future__ import unicode_literals from django.core.urlresolvers import reverse as django_reverse +from django.utils import six from django.utils.functional import lazy @@ -20,4 +21,4 @@ def reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra return url -reverse_lazy = lazy(reverse, str) +reverse_lazy = lazy(reverse, six.text_type) diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 174b08b8b..7c4179a1f 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -2,8 +2,8 @@ Helper classes for parsers. """ from __future__ import unicode_literals -from django.utils import timezone from django.db.models.query import QuerySet +from django.utils import six, timezone from django.utils.datastructures import SortedDict from django.utils.functional import Promise from rest_framework.compat import force_text @@ -40,7 +40,7 @@ class JSONEncoder(json.JSONEncoder): representation = representation[:12] return representation elif isinstance(obj, datetime.timedelta): - return str(obj.total_seconds()) + return six.text_type(obj.total_seconds()) elif isinstance(obj, decimal.Decimal): # Serializers will coerce decimals to strings by default. return float(obj) @@ -72,7 +72,7 @@ else: than the usual behaviour of sorting the keys. """ def represent_decimal(self, data): - return self.represent_scalar('tag:yaml.org,2002:str', str(data)) + return self.represent_scalar('tag:yaml.org,2002:str', six.text_type(data)) def represent_mapping(self, tag, mapping, flow_style=None): value = [] From c630a12e26f29145784523dd1b01ab0b3576f42c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 1 Oct 2014 13:24:47 +0100 Subject: [PATCH 0920/1652] Deal with lazy strings in serializer reprs --- rest_framework/utils/representation.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py index e64fdd223..180b51f8d 100644 --- a/rest_framework/utils/representation.py +++ b/rest_framework/utils/representation.py @@ -3,6 +3,8 @@ Helper functions for creating user-friendly representations of serializer classes and serializer fields. """ from django.db import models +from django.utils.functional import Promise +from rest_framework.compat import force_text import re @@ -19,6 +21,9 @@ def smart_repr(value): if isinstance(value, models.Manager): return manager_repr(value) + if isinstance(value, Promise) and value._delegate_text: + value = force_text(value) + value = repr(value) # Representations like u'help text' From c171fa21ac62538331755524057d2435f33ec8a5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 1 Oct 2014 19:44:46 +0100 Subject: [PATCH 0921/1652] First pass at HTML form rendering --- rest_framework/renderers.py | 47 +++++++++++++++++-- rest_framework/serializers.py | 2 + .../rest_framework/fields/attrs.html | 1 + .../fields/horizontal/checkbox.html | 10 ++++ .../fields/horizontal/fieldset.html | 10 ++++ .../fields/horizontal/input.html | 7 +++ .../fields/horizontal/label.html | 1 + .../fields/horizontal/select.html | 10 ++++ .../fields/horizontal/select_checkbox.html | 22 +++++++++ .../fields/horizontal/select_multiple.html | 10 ++++ .../fields/horizontal/select_radio.html | 22 +++++++++ .../fields/horizontal/textarea.html | 7 +++ .../fields/inline/checkbox.html | 6 +++ .../fields/inline/fieldset.html | 3 ++ .../rest_framework/fields/inline/input.html | 4 ++ .../rest_framework/fields/inline/label.html | 1 + .../rest_framework/fields/inline/select.html | 8 ++++ .../fields/inline/select_checkbox.html | 11 +++++ .../fields/inline/select_multiple.html | 8 ++++ .../fields/inline/select_radio.html | 11 +++++ .../fields/inline/textarea.html | 4 ++ .../fields/vertical/checkbox.html | 6 +++ .../fields/vertical/fieldset.html | 6 +++ .../rest_framework/fields/vertical/input.html | 5 ++ .../rest_framework/fields/vertical/label.html | 1 + .../fields/vertical/select.html | 8 ++++ .../fields/vertical/select_checkbox.html | 22 +++++++++ .../fields/vertical/select_multiple.html | 8 ++++ .../fields/vertical/select_radio.html | 22 +++++++++ .../fields/vertical/textarea.html | 5 ++ .../templates/rest_framework/form.html | 40 +++++++++++----- rest_framework/templatetags/rest_framework.py | 8 ++++ rest_framework/utils/field_mapping.py | 3 ++ tests/test_model_serializer.py | 2 +- 34 files changed, 325 insertions(+), 16 deletions(-) create mode 100644 rest_framework/templates/rest_framework/fields/attrs.html create mode 100644 rest_framework/templates/rest_framework/fields/horizontal/checkbox.html create mode 100644 rest_framework/templates/rest_framework/fields/horizontal/fieldset.html create mode 100644 rest_framework/templates/rest_framework/fields/horizontal/input.html create mode 100644 rest_framework/templates/rest_framework/fields/horizontal/label.html create mode 100644 rest_framework/templates/rest_framework/fields/horizontal/select.html create mode 100644 rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html create mode 100644 rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html create mode 100644 rest_framework/templates/rest_framework/fields/horizontal/select_radio.html create mode 100644 rest_framework/templates/rest_framework/fields/horizontal/textarea.html create mode 100644 rest_framework/templates/rest_framework/fields/inline/checkbox.html create mode 100644 rest_framework/templates/rest_framework/fields/inline/fieldset.html create mode 100644 rest_framework/templates/rest_framework/fields/inline/input.html create mode 100644 rest_framework/templates/rest_framework/fields/inline/label.html create mode 100644 rest_framework/templates/rest_framework/fields/inline/select.html create mode 100644 rest_framework/templates/rest_framework/fields/inline/select_checkbox.html create mode 100644 rest_framework/templates/rest_framework/fields/inline/select_multiple.html create mode 100644 rest_framework/templates/rest_framework/fields/inline/select_radio.html create mode 100644 rest_framework/templates/rest_framework/fields/inline/textarea.html create mode 100644 rest_framework/templates/rest_framework/fields/vertical/checkbox.html create mode 100644 rest_framework/templates/rest_framework/fields/vertical/fieldset.html create mode 100644 rest_framework/templates/rest_framework/fields/vertical/input.html create mode 100644 rest_framework/templates/rest_framework/fields/vertical/label.html create mode 100644 rest_framework/templates/rest_framework/fields/vertical/select.html create mode 100644 rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html create mode 100644 rest_framework/templates/rest_framework/fields/vertical/select_multiple.html create mode 100644 rest_framework/templates/rest_framework/fields/vertical/select_radio.html create mode 100644 rest_framework/templates/rest_framework/fields/vertical/textarea.html diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 225f9fe8f..6483a47c0 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -13,17 +13,18 @@ import django from django import forms from django.core.exceptions import ImproperlyConfigured from django.http.multipartparser import parse_header -from django.template import RequestContext, loader, Template +from django.template import Context, RequestContext, loader, Template from django.test.client import encode_multipart from django.utils import six from django.utils.xmlutils import SimplerXMLGenerator +from rest_framework import exceptions, serializers, status, VERSION from rest_framework.compat import StringIO, smart_text, yaml from rest_framework.exceptions import ParseError from rest_framework.settings import api_settings from rest_framework.request import is_form_media_type, override_method from rest_framework.utils import encoders from rest_framework.utils.breadcrumbs import get_breadcrumbs -from rest_framework import exceptions, status, VERSION +from rest_framework.utils.field_mapping import ClassLookupDict def zero_as_none(value): @@ -341,6 +342,42 @@ class HTMLFormRenderer(BaseRenderer): template = 'rest_framework/form.html' charset = 'utf-8' + field_templates = ClassLookupDict({ + serializers.Field: { + 'default': 'input.html' + }, + serializers.BooleanField: { + 'default': 'checkbox.html' + }, + serializers.CharField: { + 'default': 'input.html', + 'textarea': 'textarea.html' + }, + serializers.ChoiceField: { + 'default': 'select.html', + 'radio': 'select_radio.html' + }, + serializers.MultipleChoiceField: { + 'default': 'select_multiple.html', + 'checkbox': 'select_checkbox.html' + } + }) + + def render_field(self, field, value, errors, layout=None): + layout = layout or 'vertical' + style_type = field.style.get('type', 'default') + if style_type == 'textarea' and layout == 'inline': + style_type = 'default' + base = self.field_templates[field][style_type] + template_name = 'rest_framework/fields/' + layout + '/' + base + template = loader.get_template(template_name) + context = Context({ + 'field': field, + 'value': value, + 'errors': errors + }) + return template.render(context) + def render(self, data, accepted_media_type=None, renderer_context=None): """ Render serializer data and return an HTML form, as a string. @@ -349,7 +386,11 @@ class HTMLFormRenderer(BaseRenderer): request = renderer_context['request'] template = loader.get_template(self.template) - context = RequestContext(request, {'form': data}) + context = RequestContext(request, { + 'form': data, + 'layout': getattr(getattr(data, 'Meta', None), 'layout', 'vertical'), + 'renderer': self + }) return template.render(context) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0faa56718..5da812477 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -302,6 +302,8 @@ class Serializer(BaseSerializer): def __iter__(self): errors = self.errors if hasattr(self, '_errors') else {} for field in self.fields.values(): + if field.read_only: + continue value = self.data.get(field.field_name) if self.data else None error = errors.get(field.field_name) yield FieldResult(field, value, error) diff --git a/rest_framework/templates/rest_framework/fields/attrs.html b/rest_framework/templates/rest_framework/fields/attrs.html new file mode 100644 index 000000000..b5a4dbcf1 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/attrs.html @@ -0,0 +1 @@ +name="{{ field.field_name }}" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %} diff --git a/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html b/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html new file mode 100644 index 000000000..dce4a5cf9 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html @@ -0,0 +1,10 @@ +<div class="form-group"> + <div class="col-sm-offset-2 col-sm-10"> + <div class="checkbox"> + <label> + <input type="checkbox" name="{{ field.field_name }}" value="true" {% if value %}checked{% endif %}> + {% if field.label %}{{ field.label }}{% endif %} + </label> + </div> + </div> +</div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/fieldset.html b/rest_framework/templates/rest_framework/fields/horizontal/fieldset.html new file mode 100644 index 000000000..86417633f --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/horizontal/fieldset.html @@ -0,0 +1,10 @@ +<fieldset> + {% if field.label %} + <div class="form-group" style="border-bottom: 1px solid #e5e5e5"> + <legend class="control-label col-sm-2 {% if field.style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend> + </div> + {% endif %} + {% for field_item in value.field_items.values() %} + {{ renderer.render_field(field_item, layout=layout) }} + {% endfor %} +</fieldset> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/input.html b/rest_framework/templates/rest_framework/fields/horizontal/input.html new file mode 100644 index 000000000..310154bb4 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/horizontal/input.html @@ -0,0 +1,7 @@ +<div class="form-group"> + {% include "rest_framework/fields/horizontal/label.html" %} + <div class="col-sm-10"> + <input type="{{ input_type }}" class="form-control" {% include "rest_framework/fields/attrs.html" %} {% if value %}value="{{ value }}"{% endif %}> + {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} + </div> +</div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/label.html b/rest_framework/templates/rest_framework/fields/horizontal/label.html new file mode 100644 index 000000000..bf21f78cc --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/horizontal/label.html @@ -0,0 +1 @@ +{% if field.label %}<label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>{% endif %} diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select.html b/rest_framework/templates/rest_framework/fields/horizontal/select.html new file mode 100644 index 000000000..3f8cab0a3 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/horizontal/select.html @@ -0,0 +1,10 @@ +<div class="form-group"> + {% include "rest_framework/fields/horizontal/label.html" %} + <div class="col-sm-10"> + <select class="form-control" name="{{ field.field_name }}"> + {% for key, text in field.choices.items %} + <option value="{{ key }}" {% if key == value %}selected{% endif %}>{{ text }}</option> + {% endfor %} + </select> + </div> +</div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html b/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html new file mode 100644 index 000000000..659eede84 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html @@ -0,0 +1,22 @@ +<div class="form-group"> + {% include "rest_framework/fields/horizontal/label.html" %} + <div class="col-sm-10"> + {% if field.style.inline %} + {% for key, text in field.choices.items %} + <label class="checkbox-inline"> + <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in value %}checked{% endif %}> + {{ text }} + </label> + {% endfor %} + {% else %} + {% for key, text in field.choices.items %} + <div class="checkbox"> + <label> + <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in value %}checked{% endif %}> + {{ text }} + </label> + </div> + {% endfor %} + {% endif %} + </div> +</div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html b/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html new file mode 100644 index 000000000..da25eb2bd --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html @@ -0,0 +1,10 @@ +<div class="form-group"> + {% include "rest_framework/fields/horizontal/label.html" %} + <div class="col-sm-10"> + <select multiple class="form-control" name="{{ field.field_name }}"> + {% for key, text in field.choices.items %} + <option value="{{ key }}" {% if key in value %}selected{% endif %}>{{ text }}</option> + {% endfor %} + </select> + </div> +</div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html b/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html new file mode 100644 index 000000000..188f05e27 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html @@ -0,0 +1,22 @@ +<div class="form-group"> + {% include "rest_framework/fields/horizontal/label.html" %} + <div class="col-sm-10"> + {% if field.style.inline %} + {% for key, text in field.choices.items %} + <label class="radio-inline"> + <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == value %}checked{% endif %}> + {{ text }} + </label> + {% endfor %} + {% else %} + {% for key, text in field.choices.items %} + <div class="radio"> + <label> + <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == value %}checked{% endif %}> + {{ text }} + </label> + </div> + {% endfor %} + {% endif %} + </div> +</div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/textarea.html b/rest_framework/templates/rest_framework/fields/horizontal/textarea.html new file mode 100644 index 000000000..e99266f37 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/horizontal/textarea.html @@ -0,0 +1,7 @@ +<div class="form-group"> + {% include "rest_framework/fields/horizontal/label.html" %} + <div class="col-sm-10"> + <textarea class="form-control" {% include "rest_framework/fields/attrs.html" %}>{% if value %}{{ value }}{% endif %}</textarea> + {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} + </div> +</div> diff --git a/rest_framework/templates/rest_framework/fields/inline/checkbox.html b/rest_framework/templates/rest_framework/fields/inline/checkbox.html new file mode 100644 index 000000000..01d30aaef --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/inline/checkbox.html @@ -0,0 +1,6 @@ +<div class="checkbox"> + <label> + <input type="checkbox" name="{{ field.field_name }}" value="true" {% if value %}checked{% endif %}> + {% if field.label %}{{ field.label }}{% endif %} + </label> +</div> diff --git a/rest_framework/templates/rest_framework/fields/inline/fieldset.html b/rest_framework/templates/rest_framework/fields/inline/fieldset.html new file mode 100644 index 000000000..d22982fdd --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/inline/fieldset.html @@ -0,0 +1,3 @@ +{% for field_item in value.field_items.values() %} + {{ renderer.render_field(field_item, layout=layout) }} +{% endfor %} diff --git a/rest_framework/templates/rest_framework/fields/inline/input.html b/rest_framework/templates/rest_framework/fields/inline/input.html new file mode 100644 index 000000000..aefd16723 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/inline/input.html @@ -0,0 +1,4 @@ +<div class="form-group"> + {% include "rest_framework/fields/inline/label.html" %} + <input type="{{ input_type }}" class="form-control" {% include "rest_framework/fields/attrs.html" %} {% if value %}value="{{ value }}"{% endif %}> +</div> diff --git a/rest_framework/templates/rest_framework/fields/inline/label.html b/rest_framework/templates/rest_framework/fields/inline/label.html new file mode 100644 index 000000000..7d546a571 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/inline/label.html @@ -0,0 +1 @@ +{% if field.label %}<label class="sr-only">{{ field.label }}</label>{% endif %} diff --git a/rest_framework/templates/rest_framework/fields/inline/select.html b/rest_framework/templates/rest_framework/fields/inline/select.html new file mode 100644 index 000000000..cb9a70137 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/inline/select.html @@ -0,0 +1,8 @@ +<div class="form-group"> + {% include "rest_framework/fields/inline/label.html" %} + <select class="form-control" name="{{ field.field_name }}"> + {% for key, text in field.choices.items %} + <option value="{{ key }}" {% if key == value %}selected{% endif %}>{{ text }}</option> + {% endfor %} + </select> +</div> diff --git a/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html b/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html new file mode 100644 index 000000000..424df93e6 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html @@ -0,0 +1,11 @@ +<div class="form-group"> + {% include "rest_framework/fields/inline/label.html" %} + {% for key, text in field.choices.items %} + <div class="checkbox"> + <label> + <input type="checkbox" name="{{ rest_framework/field.field_name }}" value="{{ key }}" {% if key in value %}checked{% endif %}> + {{ text }} + </label> + </div> + {% endfor %} +</div> diff --git a/rest_framework/templates/rest_framework/fields/inline/select_multiple.html b/rest_framework/templates/rest_framework/fields/inline/select_multiple.html new file mode 100644 index 000000000..6fdfd672f --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/inline/select_multiple.html @@ -0,0 +1,8 @@ +<div class="form-group"> + {% include "rest_framework/fields/inline/label.html" %} + <select multiple class="form-control" name="{{ field.field_name }}"> + {% for key, text in field.choices.items %} + <option value="{{ key }}" {% if key in value %}selected{% endif %}>{{ text }}</option> + {% endfor %} + </select> +</div> diff --git a/rest_framework/templates/rest_framework/fields/inline/select_radio.html b/rest_framework/templates/rest_framework/fields/inline/select_radio.html new file mode 100644 index 000000000..ddabc9e96 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/inline/select_radio.html @@ -0,0 +1,11 @@ +<div class="form-group"> + {% include "rest_framework/fields/inline/label.html" %} + {% for key, text in field.choices.items %} + <div class="radio"> + <label> + <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == value %}checked{% endif %}> + {{ text }} + </label> + </div> + {% endfor %} +</div> diff --git a/rest_framework/templates/rest_framework/fields/inline/textarea.html b/rest_framework/templates/rest_framework/fields/inline/textarea.html new file mode 100644 index 000000000..313668098 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/inline/textarea.html @@ -0,0 +1,4 @@ +<div class="form-group"> + {% include "rest_framework/fields/inline/label.html" %} + <textarea class="form-control" {% include "rest_framework/fields/attrs.html" %}>{% if value %}{{ value }}{% endif %}</textarea> +</div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/checkbox.html b/rest_framework/templates/rest_framework/fields/vertical/checkbox.html new file mode 100644 index 000000000..01d30aaef --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/vertical/checkbox.html @@ -0,0 +1,6 @@ +<div class="checkbox"> + <label> + <input type="checkbox" name="{{ field.field_name }}" value="true" {% if value %}checked{% endif %}> + {% if field.label %}{{ field.label }}{% endif %} + </label> +</div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/fieldset.html b/rest_framework/templates/rest_framework/fields/vertical/fieldset.html new file mode 100644 index 000000000..cad32df99 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/vertical/fieldset.html @@ -0,0 +1,6 @@ +<fieldset> + {% if field.label %}<legend {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} + {% for field_item in value.field_items.values() %} + {{ renderer.render_field(field_item, layout=layout) }} + {% endfor %} +</fieldset> diff --git a/rest_framework/templates/rest_framework/fields/vertical/input.html b/rest_framework/templates/rest_framework/fields/vertical/input.html new file mode 100644 index 000000000..c25407d16 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/vertical/input.html @@ -0,0 +1,5 @@ +<div class="form-group"> + {% include "rest_framework/fields/vertical/label.html" %} + <input type="{{ input_type }}" class="form-control" {% include "rest_framework/fields/attrs.html" %} {% if value %}value="{{ value }}"{% endif %}> + {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} +</div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/label.html b/rest_framework/templates/rest_framework/fields/vertical/label.html new file mode 100644 index 000000000..651939b26 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/vertical/label.html @@ -0,0 +1 @@ +{% if field.label %}<label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>{% endif %} diff --git a/rest_framework/templates/rest_framework/fields/vertical/select.html b/rest_framework/templates/rest_framework/fields/vertical/select.html new file mode 100644 index 000000000..44679d8a4 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/vertical/select.html @@ -0,0 +1,8 @@ +<div class="form-group"> + {% include "rest_framework/fields/vertical/label.html" %} + <select class="form-control" name="{{ field.field_name }}"> + {% for key, text in field.choices.items %} + <option value="{{ key }}" {% if key == value %}selected{% endif %}>{{ text }}</option> + {% endfor %} + </select> +</div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html b/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html new file mode 100644 index 000000000..e60574c07 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html @@ -0,0 +1,22 @@ +<div class="form-group"> + {% include "rest_framework/fields/vertical/label.html" %} + {% if field.style.inline %} + <div> + {% for key, text in field.choices.items %} + <label class="checkbox-inline"> + <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in value %}checked{% endif %}> + {{ text }} + </label> + {% endfor %} + </div> + {% else %} + {% for key, text in field.choices.items %} + <div class="checkbox"> + <label> + <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in value %}checked{% endif %}> + {{ text }} + </label> + </div> + {% endfor %} + {% endif %} +</div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html b/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html new file mode 100644 index 000000000..f0fa418b5 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html @@ -0,0 +1,8 @@ +<div class="form-group"> + {% include "rest_framework/fields/vertical/label.html" %} + <select multiple class="form-control" name="{{ field.field_name }}"> + {% for key, text in field.choices.items() %} + <option value="{{ key }}" {% if key in value %}selected{% endif %}>{{ text }}</option> + {% endfor %} + </select> +</div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_radio.html b/rest_framework/templates/rest_framework/fields/vertical/select_radio.html new file mode 100644 index 000000000..4ffe38ea9 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/vertical/select_radio.html @@ -0,0 +1,22 @@ +<div class="form-group"> + {% include "rest_framework/fields/vertical/label.html" %} + {% if field.style.inline %} + <div> + {% for key, text in field.choices.items %} + <label class="radio-inline"> + <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key|string==value|string %}checked{% endif %}> + {{ text }} + </label> + {% endfor %} + </div> + {% else %} + {% for key, text in field.choices.items %} + <div class="radio"> + <label> + <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key|string==value|string %}checked{% endif %}> + {{ text }} + </label> + </div> + {% endfor %} + {% endif %} +</div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/textarea.html b/rest_framework/templates/rest_framework/fields/vertical/textarea.html new file mode 100644 index 000000000..33cb27c75 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/vertical/textarea.html @@ -0,0 +1,5 @@ +<div class="form-group"> + {% include "rest_framework/fields/vertical/label.html" %} + <textarea class="form-control" {% include "rest_framework/fields/attrs.html" %}>{% if value %}{{ value }}{% endif %}</textarea> + {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} +</div> diff --git a/rest_framework/templates/rest_framework/form.html b/rest_framework/templates/rest_framework/form.html index b1e148df7..64b1b0bc5 100644 --- a/rest_framework/templates/rest_framework/form.html +++ b/rest_framework/templates/rest_framework/form.html @@ -1,15 +1,31 @@ +<html> +<head> + <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet"> +</head> +<body> +<div class="container"> + +<h1>User update</h1> +<div class="well"> + {% load rest_framework %} -{% csrf_token %} -{{ form.non_field_errors }} -{% for field in form.fields.values %} - {% if not field.read_only %} - <div class="control-group {% if field.errors %}error{% endif %}"> - {{ field.label_tag|add_class:"control-label" }} - <div class="controls"> - {{ field.widget_html }} - {% if field.help_text %}<span class="help-block">{{ field.help_text }}</span>{% endif %} - {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} +<form {% if layout == "inline" %}class="form-inline"{% elif layout == "horizontal" %}class="form-horizontal"{% endif %} role="form" action="" method="POST"> + {% csrf_token %} + {% for field, value, errors in form %} + {% render_field field value errors layout=layout renderer=renderer %} + {% endfor %} + <!-- form.non_field_errors --> + {% if layout == "horizontal" %} + <div class="form-group"> + <div class="col-sm-offset-2 col-sm-10"> + <button type="submit" class="btn btn-default">Submit</button> + </div> </div> - </div> + {% else %} + <button type="submit" class="btn btn-default">Submit</button> {% endif %} -{% endfor %} +</form> + +</div> +</div></body> +</html> diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 864d64dd0..88ff9d4ed 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -31,6 +31,14 @@ class_re = re.compile(r'(?<=class=["\'])(.*)(?=["\'])') # And the template tags themselves... +# @register.simple_tag +# def render_field(field, value, errors, renderer): +# return renderer.render_field(field, value, errors) +@register.simple_tag +def render_field(field, value, errors, layout=None, renderer=None): + return renderer.render_field(field, value, errors, layout) + + @register.simple_tag def optional_login(request): """ diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index cf9d910aa..b4d33e395 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -79,6 +79,9 @@ def get_field_kwargs(field_name, model_field): kwargs['choices'] = model_field.flatchoices return kwargs + if isinstance(model_field, models.TextField): + kwargs['style'] = {'type': 'textarea'} + if model_field.null and not isinstance(model_field, models.NullBooleanField): kwargs['allow_null'] = True diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index f74750247..2edf0be5b 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -95,7 +95,7 @@ class TestRegularFieldMappings(TestCase): positive_small_integer_field = IntegerField() slug_field = SlugField(max_length=100) small_integer_field = IntegerField() - text_field = CharField() + text_field = CharField(style={'type': 'textarea'}) time_field = TimeField() url_field = URLField(max_length=100) custom_field = ModelField(model_field=<tests.test_model_serializer.CustomField: custom_field>) From ffc6aa3abcb0f823b43b63db1666913565e6f934 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 1 Oct 2014 21:35:27 +0100 Subject: [PATCH 0922/1652] More forms support --- rest_framework/relations.py | 20 +++++++++++++++ rest_framework/renderers.py | 25 +++++++++++++++++-- .../fields/vertical/select_multiple.html | 2 +- .../templates/rest_framework/form.html | 2 +- 4 files changed, 45 insertions(+), 4 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index b5effc6cb..8c1356727 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -38,6 +38,16 @@ class RelatedField(Field): queryset = queryset.all() return queryset + @property + def choices(self): + return dict([ + ( + str(self.to_representation(item)), + str(item) + ) + for item in self.queryset.all() + ]) + class StringRelatedField(Field): """ @@ -255,3 +265,13 @@ class ManyRelation(Field): self.child_relation.to_representation(value) for value in obj.all() ] + + @property + def choices(self): + return dict([ + ( + str(self.child_relation.to_representation(item)), + str(item) + ) + for item in self.child_relation.queryset.all() + ]) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 6483a47c0..297c60d8f 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -360,22 +360,43 @@ class HTMLFormRenderer(BaseRenderer): serializers.MultipleChoiceField: { 'default': 'select_multiple.html', 'checkbox': 'select_checkbox.html' + }, + serializers.ManyRelation: { + 'default': 'select_multiple.html', + 'checkbox': 'select_checkbox.html' } }) + input_type = ClassLookupDict({ + serializers.Field: 'text', + serializers.EmailField: 'email', + serializers.URLField: 'url', + serializers.IntegerField: 'number', + serializers.DateTimeField: 'datetime-local', + serializers.DateField: 'date', + serializers.TimeField: 'time', + }) + def render_field(self, field, value, errors, layout=None): layout = layout or 'vertical' style_type = field.style.get('type', 'default') if style_type == 'textarea' and layout == 'inline': style_type = 'default' + + input_type = self.input_type[field] + if input_type == 'datetime-local': + value = value.rstrip('Z') + base = self.field_templates[field][style_type] template_name = 'rest_framework/fields/' + layout + '/' + base template = loader.get_template(template_name) context = Context({ 'field': field, 'value': value, - 'errors': errors + 'errors': errors, + 'input_type': input_type }) + return template.render(context) def render(self, data, accepted_media_type=None, renderer_context=None): @@ -388,7 +409,7 @@ class HTMLFormRenderer(BaseRenderer): template = loader.get_template(self.template) context = RequestContext(request, { 'form': data, - 'layout': getattr(getattr(data, 'Meta', None), 'layout', 'vertical'), + 'layout': getattr(getattr(data, 'Meta', None), 'layout', 'horizontal'), 'renderer': self }) return template.render(context) diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html b/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html index f0fa418b5..00b25b4b1 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html @@ -1,7 +1,7 @@ <div class="form-group"> {% include "rest_framework/fields/vertical/label.html" %} <select multiple class="form-control" name="{{ field.field_name }}"> - {% for key, text in field.choices.items() %} + {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key in value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> diff --git a/rest_framework/templates/rest_framework/form.html b/rest_framework/templates/rest_framework/form.html index 64b1b0bc5..658aa2934 100644 --- a/rest_framework/templates/rest_framework/form.html +++ b/rest_framework/templates/rest_framework/form.html @@ -9,7 +9,7 @@ <div class="well"> {% load rest_framework %} -<form {% if layout == "inline" %}class="form-inline"{% elif layout == "horizontal" %}class="form-horizontal"{% endif %} role="form" action="" method="POST"> +<form {% if layout == "inline" %}class="form-inline"{% elif layout == "horizontal" %}class="form-horizontal"{% endif %} role="form" action="." method="POST"> {% csrf_token %} {% for field, value, errors in form %} {% render_field field value errors layout=layout renderer=renderer %} From 79e91dff92443ab1f301638ac280bd3231a2ca15 Mon Sep 17 00:00:00 2001 From: Omer Katz <omer.drow@gmail.com> Date: Thu, 2 Oct 2014 16:44:20 +0300 Subject: [PATCH 0923/1652] The encoder now returns tuples instead of lists. Tuples take a little less memory which is significant when serializing a lot of objects. --- rest_framework/utils/encoders.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 7c4179a1f..486186c94 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -45,7 +45,7 @@ class JSONEncoder(json.JSONEncoder): # Serializers will coerce decimals to strings by default. return float(obj) elif isinstance(obj, QuerySet): - return list(obj) + return tuple(obj) elif hasattr(obj, 'tolist'): # Numpy arrays and array scalars. return obj.tolist() @@ -55,7 +55,7 @@ class JSONEncoder(json.JSONEncoder): except: pass elif hasattr(obj, '__iter__'): - return [item for item in obj] + return tuple(item for item in obj) return super(JSONEncoder, self).default(obj) From df7b6fcf58417fd95e49655eb140b387899b1ceb Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 2 Oct 2014 16:24:24 +0100 Subject: [PATCH 0924/1652] First pass on incorperating the form rendering into the browsable API --- rest_framework/fields.py | 8 +- rest_framework/relations.py | 4 +- rest_framework/renderers.py | 62 ++++---- rest_framework/serializers.py | 145 ++++++++++++------ .../rest_framework/css/bootstrap-tweaks.css | 18 ++- .../templates/rest_framework/base.html | 56 +++---- .../fields/horizontal/checkbox.html | 2 +- .../fields/horizontal/fieldset.html | 2 +- .../fields/horizontal/input.html | 2 +- .../fields/horizontal/select.html | 2 +- .../fields/horizontal/select_checkbox.html | 4 +- .../fields/horizontal/select_multiple.html | 2 +- .../fields/horizontal/select_radio.html | 4 +- .../fields/horizontal/textarea.html | 2 +- .../fields/inline/checkbox.html | 2 +- .../fields/inline/fieldset.html | 2 +- .../rest_framework/fields/inline/input.html | 2 +- .../rest_framework/fields/inline/select.html | 2 +- .../fields/inline/select_checkbox.html | 2 +- .../fields/inline/select_multiple.html | 2 +- .../fields/inline/select_radio.html | 2 +- .../fields/inline/textarea.html | 2 +- .../fields/vertical/fieldset.html | 2 +- .../rest_framework/fields/vertical/input.html | 2 +- .../fields/vertical/select.html | 2 +- .../fields/vertical/select_checkbox.html | 4 +- .../fields/vertical/select_multiple.html | 2 +- .../fields/vertical/select_radio.html | 4 +- .../fields/vertical/textarea.html | 2 +- .../templates/rest_framework/form.html | 14 +- rest_framework/templatetags/rest_framework.py | 7 +- rest_framework/utils/field_mapping.py | 9 +- 32 files changed, 225 insertions(+), 152 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f3ff22334..c794963e1 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -689,10 +689,10 @@ class DateTimeField(Field): return value if self.format.lower() == ISO_8601: - ret = value.isoformat() - if ret.endswith('+00:00'): - ret = ret[:-6] + 'Z' - return ret + value = value.isoformat() + if value.endswith('+00:00'): + value = value[:-6] + 'Z' + return value return value.strftime(self.format) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 8c1356727..988b9ede4 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -127,7 +127,7 @@ class HyperlinkedRelatedField(RelatedField): attributes are not configured to correctly match the URL conf. """ # Unsaved objects will not yet have a valid URL. - if obj.pk is None: + if obj.pk: return None lookup_value = getattr(obj, self.lookup_field) @@ -248,11 +248,13 @@ class ManyRelation(Field): You shouldn't need to be using this class directly yourself. """ + initial = [] def __init__(self, child_relation=None, *args, **kwargs): self.child_relation = child_relation assert child_relation is not None, '`child_relation` is a required argument.' super(ManyRelation, self).__init__(*args, **kwargs) + self.child_relation.bind(field_name='', parent=self) def to_internal_value(self, data): return [ diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 297c60d8f..931dd434f 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -377,23 +377,21 @@ class HTMLFormRenderer(BaseRenderer): serializers.TimeField: 'time', }) - def render_field(self, field, value, errors, layout=None): + def render_field(self, field, layout=None): layout = layout or 'vertical' style_type = field.style.get('type', 'default') if style_type == 'textarea' and layout == 'inline': style_type = 'default' input_type = self.input_type[field] - if input_type == 'datetime-local': - value = value.rstrip('Z') + if input_type == 'datetime-local' and isinstance(field.value, six.text_type): + field.value = field.value.rstrip('Z') base = self.field_templates[field][style_type] template_name = 'rest_framework/fields/' + layout + '/' + base template = loader.get_template(template_name) context = Context({ 'field': field, - 'value': value, - 'errors': errors, 'input_type': input_type }) @@ -408,7 +406,7 @@ class HTMLFormRenderer(BaseRenderer): template = loader.get_template(self.template) context = RequestContext(request, { - 'form': data, + 'form': data.serializer, 'layout': getattr(getattr(data, 'Meta', None), 'layout', 'horizontal'), 'renderer': self }) @@ -479,27 +477,29 @@ class BrowsableAPIRenderer(BaseRenderer): return False # Doesn't have permissions return True - def get_rendered_html_form(self, view, method, request): + def get_rendered_html_form(self, data, view, method, request): """ Return a string representing a rendered HTML form, possibly bound to either the input or output data. In the absence of the View having an associated form then return None. """ + serializer = getattr(data, 'serializer', None) + if serializer and not getattr(serializer, 'many', False): + instance = getattr(serializer, 'instance', None) + else: + instance = None + if request.method == method: try: data = request.data - # files = request.FILES except ParseError: data = None - # files = None else: data = None - # files = None with override_method(view, request, method) as request: - obj = getattr(view, 'object', None) - if not self.show_form_for_method(view, method, request, obj): + if not self.show_form_for_method(view, method, request, instance): return if method in ('DELETE', 'OPTIONS'): @@ -511,19 +511,24 @@ class BrowsableAPIRenderer(BaseRenderer): ): return - serializer = view.get_serializer(instance=obj, data=data) - serializer.is_valid() - data = serializer.data - + serializer = view.get_serializer(instance=instance, data=data) + if data is not None: + serializer.is_valid() form_renderer = self.form_renderer_class() - return form_renderer.render(data, self.accepted_media_type, self.renderer_context) + return form_renderer.render(serializer.data, self.accepted_media_type, self.renderer_context) - def get_raw_data_form(self, view, method, request): + def get_raw_data_form(self, data, view, method, request): """ Returns a form that allows for arbitrary content types to be tunneled via standard HTML forms. (Which are typically application/x-www-form-urlencoded) """ + serializer = getattr(data, 'serializer', None) + if serializer and not getattr(serializer, 'many', False): + instance = getattr(serializer, 'instance', None) + else: + instance = None + with override_method(view, request, method) as request: # If we're not using content overloading there's no point in # supplying a generic form, as the view won't treat the form's @@ -533,8 +538,7 @@ class BrowsableAPIRenderer(BaseRenderer): return None # Check permissions - obj = getattr(view, 'object', None) - if not self.show_form_for_method(view, method, request, obj): + if not self.show_form_for_method(view, method, request, instance): return # If possible, serialize the initial content for the generic form @@ -545,8 +549,8 @@ class BrowsableAPIRenderer(BaseRenderer): # corresponding renderer that can be used to render the data. # Get a read-only version of the serializer - serializer = view.get_serializer(instance=obj) - if obj is None: + serializer = view.get_serializer(instance=instance) + if instance is None: for name, field in serializer.fields.items(): if getattr(field, 'read_only', None): del serializer.fields[name] @@ -606,9 +610,9 @@ class BrowsableAPIRenderer(BaseRenderer): renderer = self.get_default_renderer(view) - raw_data_post_form = self.get_raw_data_form(view, 'POST', request) - raw_data_put_form = self.get_raw_data_form(view, 'PUT', request) - raw_data_patch_form = self.get_raw_data_form(view, 'PATCH', request) + raw_data_post_form = self.get_raw_data_form(data, view, 'POST', request) + raw_data_put_form = self.get_raw_data_form(data, view, 'PUT', request) + raw_data_patch_form = self.get_raw_data_form(data, view, 'PATCH', request) raw_data_put_or_patch_form = raw_data_put_form or raw_data_patch_form response_headers = dict(response.items()) @@ -632,10 +636,10 @@ class BrowsableAPIRenderer(BaseRenderer): 'available_formats': [renderer_cls.format for renderer_cls in view.renderer_classes], 'response_headers': response_headers, - # 'put_form': self.get_rendered_html_form(view, 'PUT', request), - # 'post_form': self.get_rendered_html_form(view, 'POST', request), - # 'delete_form': self.get_rendered_html_form(view, 'DELETE', request), - # 'options_form': self.get_rendered_html_form(view, 'OPTIONS', request), + 'put_form': self.get_rendered_html_form(data, view, 'PUT', request), + 'post_form': self.get_rendered_html_form(data, view, 'POST', request), + 'delete_form': self.get_rendered_html_form(data, view, 'DELETE', request), + 'options_form': self.get_rendered_html_form(data, view, 'OPTIONS', request), 'raw_data_put_form': raw_data_put_form, 'raw_data_post_form': raw_data_post_form, diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 5da812477..0f24ed402 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -14,7 +14,6 @@ from django.core.exceptions import ImproperlyConfigured, ValidationError from django.db import models from django.utils import six from django.utils.datastructures import SortedDict -from collections import namedtuple from rest_framework.fields import empty, set_value, Field, SkipField from rest_framework.settings import api_settings from rest_framework.utils import html, model_meta, representation @@ -38,8 +37,8 @@ from rest_framework.relations import * # NOQA from rest_framework.fields import * # NOQA -FieldResult = namedtuple('FieldResult', ['field', 'value', 'error']) - +# BaseSerializer +# -------------- class BaseSerializer(Field): """ @@ -113,11 +112,6 @@ class BaseSerializer(Field): if not hasattr(self, '_data'): if self.instance is not None: self._data = self.to_representation(self.instance) - elif self._initial_data is not None: - self._data = dict([ - (field_name, field.get_value(self._initial_data)) - for field_name, field in self.fields.items() - ]) else: self._data = self.get_initial() return self._data @@ -137,6 +131,79 @@ class BaseSerializer(Field): return self._validated_data +# Serializer & ListSerializer classes +# ----------------------------------- + +class ReturnDict(SortedDict): + """ + Return object from `serialier.data` for the `Serializer` class. + Includes a backlink to the serializer instance for renderers + to use if they need richer field information. + """ + def __init__(self, *args, **kwargs): + self.serializer = kwargs.pop('serializer') + super(ReturnDict, self).__init__(*args, **kwargs) + + +class ReturnList(list): + """ + Return object from `serialier.data` for the `SerializerList` class. + Includes a backlink to the serializer instance for renderers + to use if they need richer field information. + """ + def __init__(self, *args, **kwargs): + self.serializer = kwargs.pop('serializer') + super(ReturnList, self).__init__(*args, **kwargs) + + +class BoundField(object): + """ + A field object that also includes `.value` and `.error` properties. + Returned when iterating over a serializer instance, + providing an API similar to Django forms and form fields. + """ + def __init__(self, field, value, errors): + self._field = field + self.value = value + self.errors = errors + + def __getattr__(self, attr_name): + return getattr(self._field, attr_name) + + @property + def _proxy_class(self): + return self._field.__class__ + + +class BindingDict(object): + """ + This dict-like object is used to store fields on a serializer. + + This ensures that whenever fields are added to the serializer we call + `field.bind()` so that the `field_name` and `parent` attributes + can be set correctly. + """ + def __init__(self, serializer): + self.serializer = serializer + self.fields = SortedDict() + + def __setitem__(self, key, field): + self.fields[key] = field + field.bind(field_name=key, parent=self.serializer) + + def __getitem__(self, key): + return self.fields[key] + + def __delitem__(self, key): + del self.fields[key] + + def items(self): + return self.fields.items() + + def values(self): + return self.fields.values() + + class SerializerMetaclass(type): """ This metaclass sets a dictionary named `base_fields` on the class. @@ -167,35 +234,6 @@ class SerializerMetaclass(type): return super(SerializerMetaclass, cls).__new__(cls, name, bases, attrs) -class BindingDict(object): - """ - This dict-like object is used to store fields on a serializer. - - This ensures that whenever fields are added to the serializer we call - `field.bind()` so that the `field_name` and `parent` attributes - can be set correctly. - """ - def __init__(self, serializer): - self.serializer = serializer - self.fields = SortedDict() - - def __setitem__(self, key, field): - self.fields[key] = field - field.bind(field_name=key, parent=self.serializer) - - def __getitem__(self, key): - return self.fields[key] - - def __delitem__(self, key): - del self.fields[key] - - def items(self): - return self.fields.items() - - def values(self): - return self.fields.values() - - @six.add_metaclass(SerializerMetaclass) class Serializer(BaseSerializer): def __init__(self, *args, **kwargs): @@ -212,10 +250,18 @@ class Serializer(BaseSerializer): return copy.deepcopy(self._declared_fields) def get_initial(self): - return dict([ + if self._initial_data is not None: + return ReturnDict([ + (field_name, field.get_value(self._initial_data)) + for field_name, field in self.fields.items() + ], serializer=self) + #return self.to_representation(self._initial_data) + + return ReturnDict([ (field.field_name, field.get_initial()) for field in self.fields.values() - ]) + if not field.write_only + ], serializer=self) def get_value(self, dictionary): # We override the default field access in order to support @@ -288,7 +334,7 @@ class Serializer(BaseSerializer): """ Object instance -> Dict of primitive datatypes. """ - ret = SortedDict() + ret = ReturnDict(serializer=self) fields = [field for field in self.fields.values() if not field.write_only] for field in fields: @@ -302,11 +348,9 @@ class Serializer(BaseSerializer): def __iter__(self): errors = self.errors if hasattr(self, '_errors') else {} for field in self.fields.values(): - if field.read_only: - continue value = self.data.get(field.field_name) if self.data else None error = errors.get(field.field_name) - yield FieldResult(field, value, error) + yield BoundField(field, value, error) def __repr__(self): return representation.serializer_repr(self, indent=1) @@ -317,7 +361,7 @@ class Serializer(BaseSerializer): class ListSerializer(BaseSerializer): child = None - initial = [] + many = True def __init__(self, *args, **kwargs): self.child = kwargs.pop('child', copy.deepcopy(self.child)) @@ -326,6 +370,11 @@ class ListSerializer(BaseSerializer): super(ListSerializer, self).__init__(*args, **kwargs) self.child.bind(field_name='', parent=self) + def get_initial(self): + if self._initial_data is not None: + return self.to_representation(self._initial_data) + return ReturnList(serializer=self) + def get_value(self, dictionary): # We override the default field access in order to support # lists in HTML forms. @@ -345,7 +394,10 @@ class ListSerializer(BaseSerializer): """ List of object instances -> List of dicts of primitive datatypes. """ - return [self.child.to_representation(item) for item in data] + return ReturnList( + [self.child.to_representation(item) for item in data], + serializer=self + ) def create(self, attrs_list): return [self.child.create(attrs) for attrs in attrs_list] @@ -354,6 +406,9 @@ class ListSerializer(BaseSerializer): return representation.list_repr(self, indent=1) +# ModelSerializer & HyperlinkedModelSerializer +# -------------------------------------------- + class ModelSerializer(Serializer): _field_mapping = ClassLookupDict({ models.AutoField: IntegerField, diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css index 6fa1e6cb5..84389b1d1 100644 --- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css @@ -10,6 +10,12 @@ a single block in the template. background: transparent; border-top-color: transparent; padding-top: 0; + text-align: right; +} + +#generic-content-form textarea { + font-family:Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace; + font-size: 80%; } .navbar-inverse .brand a { @@ -29,7 +35,7 @@ a single block in the template. z-index: 3; } -.navbar .navbar-inner { +.navbar { background: #2C2C2C; color: white; border: none; @@ -37,7 +43,7 @@ a single block in the template. border-radius: 0px; } -.navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand:hover { +.navbar .nav li, .navbar .nav li a, .navbar .brand:hover { color: white; } @@ -45,11 +51,11 @@ a single block in the template. background: #2C2C2C; } -.navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li { +.navbar .dropdown-menu li a, .navbar .dropdown-menu li { color: #A30000; } -.navbar .navbar-inner .dropdown-menu li a:hover { +.navbar .dropdown-menu li a:hover { background: #EEEEEE; color: #C20000; } @@ -61,10 +67,10 @@ html { background: none; } -body, .navbar .navbar-inner .container-fluid { +/*body, .navbar .container-fluid { max-width: 1150px; margin: 0 auto; -} +}*/ body { background: url("../img/grid.png") repeat-x; diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index a84ccf269..2e03dd987 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -15,7 +15,8 @@ {% block style %} {% block bootstrap_theme %} - <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/> + <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet"> + <!--<link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/>--> <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/> {% endblock %} <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/prettify.css" %}"/> @@ -26,44 +27,42 @@ </head> {% block body %} - <body class="{% block bodyclass %}{% endblock %} container"> + <body class="{% block bodyclass %}{% endblock %}"> <div class="wrapper"> {% block navbar %} - <div class="navbar {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}"> - <div class="navbar-inner"> - <div class="container-fluid"> - <span> - {% block branding %} - <a class='brand' rel="nofollow" href='http://www.django-rest-framework.org'> - Django REST framework <span class="version">{{ version }}</span> - </a> - {% endblock %} - </span> - <ul class="nav pull-right"> - {% block userlinks %} - {% if user.is_authenticated %} - {% optional_logout request user %} - {% else %} - {% optional_login request %} - {% endif %} - {% endblock %} - </ul> - </div> + <div class="navbar navbar-static-top {% block bootstrap_navbar_variant %}navbar-inverse{% endblock %}"> + <div class="container"> + <span> + {% block branding %} + <a class='navbar-brand' rel="nofollow" href='http://www.django-rest-framework.org'> + Django REST framework <span class="version">{{ version }}</span> + </a> + {% endblock %} + </span> + <ul class="nav navbar-nav pull-right"> + {% block userlinks %} + {% if user.is_authenticated %} + {% optional_logout request user %} + {% else %} + {% optional_login request %} + {% endif %} + {% endblock %} + </ul> </div> </div> {% endblock %} + <div class="container"> {% block breadcrumbs %} <ul class="breadcrumb"> {% for breadcrumb_name, breadcrumb_url in breadcrumblist %} - <li> - <a href="{{ breadcrumb_url }}" {% if forloop.last %}class="active"{% endif %}> - {{ breadcrumb_name }} - </a> - {% if not forloop.last %}<span class="divider">›</span>{% endif %} - </li> + {% if forloop.last %} + <li class="active">{{ breadcrumb_name }}</li> + {% else %} + <li><a href="{{ breadcrumb_url }}">{{ breadcrumb_name }}</a></li> + {% endif %} {% endfor %} </ul> {% endblock %} @@ -238,6 +237,7 @@ {% endif %} </div> <!-- END Content --> + </div><!-- /.container --> <footer> {% block footer %} diff --git a/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html b/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html index dce4a5cf9..dd3c3cef1 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html @@ -2,7 +2,7 @@ <div class="col-sm-offset-2 col-sm-10"> <div class="checkbox"> <label> - <input type="checkbox" name="{{ field.field_name }}" value="true" {% if value %}checked{% endif %}> + <input type="checkbox" name="{{ field.field_name }}" value="true" {% if field.value %}checked{% endif %}> {% if field.label %}{{ field.label }}{% endif %} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/fieldset.html b/rest_framework/templates/rest_framework/fields/horizontal/fieldset.html index 86417633f..843a56b29 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/fieldset.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/fieldset.html @@ -4,7 +4,7 @@ <legend class="control-label col-sm-2 {% if field.style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend> </div> {% endif %} - {% for field_item in value.field_items.values() %} + {% for field_item in field.value.field_items.values() %} {{ renderer.render_field(field_item, layout=layout) }} {% endfor %} </fieldset> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/input.html b/rest_framework/templates/rest_framework/fields/horizontal/input.html index 310154bb4..6f1a504b5 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/input.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/input.html @@ -1,7 +1,7 @@ <div class="form-group"> {% include "rest_framework/fields/horizontal/label.html" %} <div class="col-sm-10"> - <input type="{{ input_type }}" class="form-control" {% include "rest_framework/fields/attrs.html" %} {% if value %}value="{{ value }}"{% endif %}> + <input type="{{ input_type }}" class="form-control" {% include "rest_framework/fields/attrs.html" %} {% if field.value %}value="{{ field.value }}"{% endif %}> {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} </div> </div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select.html b/rest_framework/templates/rest_framework/fields/horizontal/select.html index 3f8cab0a3..7367d7269 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/select.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/select.html @@ -3,7 +3,7 @@ <div class="col-sm-10"> <select class="form-control" name="{{ field.field_name }}"> {% for key, text in field.choices.items %} - <option value="{{ key }}" {% if key == value %}selected{% endif %}>{{ text }}</option> + <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> </div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html b/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html index 659eede84..381cda2cb 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html @@ -4,7 +4,7 @@ {% if field.style.inline %} {% for key, text in field.choices.items %} <label class="checkbox-inline"> - <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in value %}checked{% endif %}> + <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> {{ text }} </label> {% endfor %} @@ -12,7 +12,7 @@ {% for key, text in field.choices.items %} <div class="checkbox"> <label> - <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in value %}checked{% endif %}> + <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> {{ text }} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html b/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html index da25eb2bd..29ba86610 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html @@ -3,7 +3,7 @@ <div class="col-sm-10"> <select multiple class="form-control" name="{{ field.field_name }}"> {% for key, text in field.choices.items %} - <option value="{{ key }}" {% if key in value %}selected{% endif %}>{{ text }}</option> + <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> </div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html b/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html index 188f05e27..20aab8b22 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html @@ -4,7 +4,7 @@ {% if field.style.inline %} {% for key, text in field.choices.items %} <label class="radio-inline"> - <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == value %}checked{% endif %}> + <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> {{ text }} </label> {% endfor %} @@ -12,7 +12,7 @@ {% for key, text in field.choices.items %} <div class="radio"> <label> - <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == value %}checked{% endif %}> + <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> {{ text }} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/textarea.html b/rest_framework/templates/rest_framework/fields/horizontal/textarea.html index e99266f37..3d0161950 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/textarea.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/textarea.html @@ -1,7 +1,7 @@ <div class="form-group"> {% include "rest_framework/fields/horizontal/label.html" %} <div class="col-sm-10"> - <textarea class="form-control" {% include "rest_framework/fields/attrs.html" %}>{% if value %}{{ value }}{% endif %}</textarea> + <textarea class="form-control" {% include "rest_framework/fields/attrs.html" %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} </div> </div> diff --git a/rest_framework/templates/rest_framework/fields/inline/checkbox.html b/rest_framework/templates/rest_framework/fields/inline/checkbox.html index 01d30aaef..289bbb4d8 100644 --- a/rest_framework/templates/rest_framework/fields/inline/checkbox.html +++ b/rest_framework/templates/rest_framework/fields/inline/checkbox.html @@ -1,6 +1,6 @@ <div class="checkbox"> <label> - <input type="checkbox" name="{{ field.field_name }}" value="true" {% if value %}checked{% endif %}> + <input type="checkbox" name="{{ field.field_name }}" value="true" {% if field.value %}checked{% endif %}> {% if field.label %}{{ field.label }}{% endif %} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/inline/fieldset.html b/rest_framework/templates/rest_framework/fields/inline/fieldset.html index d22982fdd..380d46272 100644 --- a/rest_framework/templates/rest_framework/fields/inline/fieldset.html +++ b/rest_framework/templates/rest_framework/fields/inline/fieldset.html @@ -1,3 +1,3 @@ -{% for field_item in value.field_items.values() %} +{% for field_item in field.value.field_items.values() %} {{ renderer.render_field(field_item, layout=layout) }} {% endfor %} diff --git a/rest_framework/templates/rest_framework/fields/inline/input.html b/rest_framework/templates/rest_framework/fields/inline/input.html index aefd16723..e4a92ccd1 100644 --- a/rest_framework/templates/rest_framework/fields/inline/input.html +++ b/rest_framework/templates/rest_framework/fields/inline/input.html @@ -1,4 +1,4 @@ <div class="form-group"> {% include "rest_framework/fields/inline/label.html" %} - <input type="{{ input_type }}" class="form-control" {% include "rest_framework/fields/attrs.html" %} {% if value %}value="{{ value }}"{% endif %}> + <input type="{{ input_type }}" class="form-control" {% include "rest_framework/fields/attrs.html" %} {% if field.value %}value="{{ field.value }}"{% endif %}> </div> diff --git a/rest_framework/templates/rest_framework/fields/inline/select.html b/rest_framework/templates/rest_framework/fields/inline/select.html index cb9a70137..9f361c4a0 100644 --- a/rest_framework/templates/rest_framework/fields/inline/select.html +++ b/rest_framework/templates/rest_framework/fields/inline/select.html @@ -2,7 +2,7 @@ {% include "rest_framework/fields/inline/label.html" %} <select class="form-control" name="{{ field.field_name }}"> {% for key, text in field.choices.items %} - <option value="{{ key }}" {% if key == value %}selected{% endif %}>{{ text }}</option> + <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> </div> diff --git a/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html b/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html index 424df93e6..0f33fb692 100644 --- a/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html +++ b/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html @@ -3,7 +3,7 @@ {% for key, text in field.choices.items %} <div class="checkbox"> <label> - <input type="checkbox" name="{{ rest_framework/field.field_name }}" value="{{ key }}" {% if key in value %}checked{% endif %}> + <input type="checkbox" name="{{ rest_framework/field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> {{ text }} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/inline/select_multiple.html b/rest_framework/templates/rest_framework/fields/inline/select_multiple.html index 6fdfd672f..7c9e51684 100644 --- a/rest_framework/templates/rest_framework/fields/inline/select_multiple.html +++ b/rest_framework/templates/rest_framework/fields/inline/select_multiple.html @@ -2,7 +2,7 @@ {% include "rest_framework/fields/inline/label.html" %} <select multiple class="form-control" name="{{ field.field_name }}"> {% for key, text in field.choices.items %} - <option value="{{ key }}" {% if key in value %}selected{% endif %}>{{ text }}</option> + <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> </div> diff --git a/rest_framework/templates/rest_framework/fields/inline/select_radio.html b/rest_framework/templates/rest_framework/fields/inline/select_radio.html index ddabc9e96..177c0eeba 100644 --- a/rest_framework/templates/rest_framework/fields/inline/select_radio.html +++ b/rest_framework/templates/rest_framework/fields/inline/select_radio.html @@ -3,7 +3,7 @@ {% for key, text in field.choices.items %} <div class="radio"> <label> - <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == value %}checked{% endif %}> + <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> {{ text }} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/inline/textarea.html b/rest_framework/templates/rest_framework/fields/inline/textarea.html index 313668098..8259487b3 100644 --- a/rest_framework/templates/rest_framework/fields/inline/textarea.html +++ b/rest_framework/templates/rest_framework/fields/inline/textarea.html @@ -1,4 +1,4 @@ <div class="form-group"> {% include "rest_framework/fields/inline/label.html" %} - <textarea class="form-control" {% include "rest_framework/fields/attrs.html" %}>{% if value %}{{ value }}{% endif %}</textarea> + <textarea class="form-control" {% include "rest_framework/fields/attrs.html" %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> </div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/fieldset.html b/rest_framework/templates/rest_framework/fields/vertical/fieldset.html index cad32df99..8708916bd 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/fieldset.html +++ b/rest_framework/templates/rest_framework/fields/vertical/fieldset.html @@ -1,6 +1,6 @@ <fieldset> {% if field.label %}<legend {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} - {% for field_item in value.field_items.values() %} + {% for field_item in field.value.field_items.values() %} {{ renderer.render_field(field_item, layout=layout) }} {% endfor %} </fieldset> diff --git a/rest_framework/templates/rest_framework/fields/vertical/input.html b/rest_framework/templates/rest_framework/fields/vertical/input.html index c25407d16..3ee2716af 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/input.html +++ b/rest_framework/templates/rest_framework/fields/vertical/input.html @@ -1,5 +1,5 @@ <div class="form-group"> {% include "rest_framework/fields/vertical/label.html" %} - <input type="{{ input_type }}" class="form-control" {% include "rest_framework/fields/attrs.html" %} {% if value %}value="{{ value }}"{% endif %}> + <input type="{{ input_type }}" class="form-control" {% include "rest_framework/fields/attrs.html" %} {% if field.value %}value="{{ field.value }}"{% endif %}> {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} </div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/select.html b/rest_framework/templates/rest_framework/fields/vertical/select.html index 44679d8a4..dcc9a3cd9 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select.html @@ -2,7 +2,7 @@ {% include "rest_framework/fields/vertical/label.html" %} <select class="form-control" name="{{ field.field_name }}"> {% for key, text in field.choices.items %} - <option value="{{ key }}" {% if key == value %}selected{% endif %}>{{ text }}</option> + <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> </div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html b/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html index e60574c07..1fbe6a940 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html @@ -4,7 +4,7 @@ <div> {% for key, text in field.choices.items %} <label class="checkbox-inline"> - <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in value %}checked{% endif %}> + <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> {{ text }} </label> {% endfor %} @@ -13,7 +13,7 @@ {% for key, text in field.choices.items %} <div class="checkbox"> <label> - <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in value %}checked{% endif %}> + <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> {{ text }} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html b/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html index 00b25b4b1..2cc40d99e 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html @@ -2,7 +2,7 @@ {% include "rest_framework/fields/vertical/label.html" %} <select multiple class="form-control" name="{{ field.field_name }}"> {% for key, text in field.choices.items %} - <option value="{{ key }}" {% if key in value %}selected{% endif %}>{{ text }}</option> + <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> </div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_radio.html b/rest_framework/templates/rest_framework/fields/vertical/select_radio.html index 4ffe38ea9..470bcb0b0 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select_radio.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select_radio.html @@ -4,7 +4,7 @@ <div> {% for key, text in field.choices.items %} <label class="radio-inline"> - <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key|string==value|string %}checked{% endif %}> + <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> {{ text }} </label> {% endfor %} @@ -13,7 +13,7 @@ {% for key, text in field.choices.items %} <div class="radio"> <label> - <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key|string==value|string %}checked{% endif %}> + <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> {{ text }} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/textarea.html b/rest_framework/templates/rest_framework/fields/vertical/textarea.html index 33cb27c75..406cfa77d 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/textarea.html +++ b/rest_framework/templates/rest_framework/fields/vertical/textarea.html @@ -1,5 +1,5 @@ <div class="form-group"> {% include "rest_framework/fields/vertical/label.html" %} - <textarea class="form-control" {% include "rest_framework/fields/attrs.html" %}>{% if value %}{{ value }}{% endif %}</textarea> + <textarea class="form-control" {% include "rest_framework/fields/attrs.html" %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} </div> diff --git a/rest_framework/templates/rest_framework/form.html b/rest_framework/templates/rest_framework/form.html index 658aa2934..162c56336 100644 --- a/rest_framework/templates/rest_framework/form.html +++ b/rest_framework/templates/rest_framework/form.html @@ -1,4 +1,4 @@ -<html> +<!-- <html> <head> <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet"> </head> @@ -6,13 +6,15 @@ <div class="container"> <h1>User update</h1> -<div class="well"> +<div class="well"> --> {% load rest_framework %} <form {% if layout == "inline" %}class="form-inline"{% elif layout == "horizontal" %}class="form-horizontal"{% endif %} role="form" action="." method="POST"> {% csrf_token %} - {% for field, value, errors in form %} - {% render_field field value errors layout=layout renderer=renderer %} + {% for field in form %} + {% if not field.read_only %} + {% render_field field layout=layout renderer=renderer %} + {% endif %} {% endfor %} <!-- form.non_field_errors --> {% if layout == "horizontal" %} @@ -25,7 +27,7 @@ <button type="submit" class="btn btn-default">Submit</button> {% endif %} </form> - +<!-- </div> </div></body> -</html> +</html> --> diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 88ff9d4ed..49a4c3389 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -31,12 +31,9 @@ class_re = re.compile(r'(?<=class=["\'])(.*)(?=["\'])') # And the template tags themselves... -# @register.simple_tag -# def render_field(field, value, errors, renderer): -# return renderer.render_field(field, value, errors) @register.simple_tag -def render_field(field, value, errors, layout=None, renderer=None): - return renderer.render_field(field, value, errors, layout) +def render_field(field, layout=None, renderer=None): + return renderer.render_field(field, layout) @register.simple_tag diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index b4d33e395..30fae3709 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -21,7 +21,14 @@ class ClassLookupDict(object): self.mapping = mapping def __getitem__(self, key): - for cls in inspect.getmro(key.__class__): + if hasattr(key, '_proxy_class'): + # Deal with proxy classes. Ie. BoundField behaves as if it + # is a Field instance when using ClassLookupDict. + base_class = key._proxy_class + else: + base_class = key.__class__ + + for cls in inspect.getmro(base_class): if cls in self.mapping: return self.mapping[cls] raise KeyError('Class %s not found in lookup.', cls.__name__) From fec7c4b45812d22423e73ec3ab801857a55d7340 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 2 Oct 2014 18:13:15 +0100 Subject: [PATCH 0925/1652] Browsable API tweaks --- rest_framework/fields.py | 5 ++--- rest_framework/relations.py | 1 + rest_framework/serializers.py | 1 + .../static/rest_framework/css/bootstrap-tweaks.css | 2 +- rest_framework/static/rest_framework/css/default.css | 3 +-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index c794963e1..3f22660cc 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -106,7 +106,7 @@ class Field(object): 'null': _('This field may not be null.') } default_validators = [] - default_empty_html = None + default_empty_html = empty initial = None def __init__(self, read_only=False, write_only=False, @@ -375,7 +375,6 @@ class NullBooleanField(Field): default_error_messages = { 'invalid': _('`{input}` is not a valid boolean.') } - default_empty_html = None initial = None TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True)) FALSE_VALUES = set(('f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False)) @@ -411,7 +410,6 @@ class CharField(Field): default_error_messages = { 'blank': _('This field may not be blank.') } - default_empty_html = '' initial = '' def __init__(self, **kwargs): @@ -852,6 +850,7 @@ class MultipleChoiceField(ChoiceField): 'invalid_choice': _('`{input}` is not a valid choice.'), 'not_a_list': _('Expected a list of items but got type `{input_type}`') } + default_empty_html = [] def to_internal_value(self, data): if isinstance(data, type('')) or not hasattr(data, '__iter__'): diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 988b9ede4..4f971917a 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -249,6 +249,7 @@ class ManyRelation(Field): You shouldn't need to be using this class directly yourself. """ initial = [] + default_empty_html = [] def __init__(self, child_relation=None, *args, **kwargs): self.child_relation = child_relation diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0f24ed402..21cb7ea27 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -254,6 +254,7 @@ class Serializer(BaseSerializer): return ReturnDict([ (field_name, field.get_value(self._initial_data)) for field_name, field in self.fields.items() + if field.get_value(self._initial_data) is not empty ], serializer=self) #return self.to_representation(self._initial_data) diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css index 84389b1d1..6a37cae23 100644 --- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css @@ -173,7 +173,7 @@ footer a:hover { .page-header { border-bottom: none; padding-bottom: 0px; - margin-bottom: 20px; + margin: 0; } /* custom general page styles */ diff --git a/rest_framework/static/rest_framework/css/default.css b/rest_framework/static/rest_framework/css/default.css index 461cdfe5c..82c6033b6 100644 --- a/rest_framework/static/rest_framework/css/default.css +++ b/rest_framework/static/rest_framework/css/default.css @@ -33,7 +33,7 @@ h2, h3 { } ul.breadcrumb { - margin: 80px 0 0 0; + margin: 70px 0 0 0; } form select, form input, form textarea { @@ -67,5 +67,4 @@ pre { .page-header { border-bottom: none; padding-bottom: 0px; - margin-bottom: 20px; } From dfab9af294972720f59890967cd9ae1a6c0796b6 Mon Sep 17 00:00:00 2001 From: Craig de Stigter <craig.destigter@koordinates.com> Date: Fri, 3 Oct 2014 08:41:18 +1300 Subject: [PATCH 0926/1652] Minor: fix spelling and grammar, mostly in 3.0 announcement --- CONTRIBUTING.md | 2 +- docs/api-guide/fields.md | 2 +- docs/api-guide/renderers.md | 2 +- docs/topics/2.4-announcement.md | 2 +- docs/topics/3.0-announcement.md | 42 +++++++++++----------- docs/topics/contributing.md | 2 +- docs/topics/release-notes.md | 2 +- docs/topics/writable-nested-serializers.md | 2 +- rest_framework/compat.py | 2 +- rest_framework/fields.py | 12 +++---- rest_framework/relations.py | 2 +- rest_framework/validators.py | 2 +- rest_framework/views.py | 2 +- tests/test_model_serializer.py | 4 +-- tests/test_relations.py | 12 +++---- 15 files changed, 46 insertions(+), 46 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a6dd05a0e..1b1995348 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,7 +75,7 @@ You can also use the excellent [`tox`][tox] testing tool to run the tests agains It's a good idea to make pull requests early on. A pull request represents the start of a discussion, and doesn't necessarily need to be the final, finished submission. -It's also always best to make a new branch before starting work on a pull request. This means that you'll be able to later switch back to working on another seperate issue without interfering with an ongoing pull requests. +It's also always best to make a new branch before starting work on a pull request. This means that you'll be able to later switch back to working on another separate issue without interfering with an ongoing pull requests. It's also useful to remember that if you have an outstanding pull request then pushing new commits to your GitHub repo will also automatically update the pull requests. diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index f07783186..292a51d89 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -286,7 +286,7 @@ For example, to validate numbers up to 999 with a resolution of 2 decimal places serializers.DecimalField(max_digits=5, decimal_places=2) -And to validate numbers up to anything lesss than one billion with a resolution of 10 decimal places: +And to validate numbers up to anything less than one billion with a resolution of 10 decimal places: serializers.DecimalField(max_digits=19, decimal_places=10) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 2e1c892fd..db7436c23 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -74,7 +74,7 @@ If your API includes views that can serve both regular webpages and API response Renders the request data into `JSON`, using utf-8 encoding. -Note that the default style is to include unicode characters, and render the response using a compact style with no uneccessary whitespace: +Note that the default style is to include unicode characters, and render the response using a compact style with no unnecessary whitespace: {"unicode black star":"★","value":999} diff --git a/docs/topics/2.4-announcement.md b/docs/topics/2.4-announcement.md index 09294b910..d8aa5b108 100644 --- a/docs/topics/2.4-announcement.md +++ b/docs/topics/2.4-announcement.md @@ -23,7 +23,7 @@ The documentation has previously stated that usage of the more explicit style is Doing so will mean that there are cases of API code where you'll now need to include a serializer class where you previously were just using the `.model` shortcut. However we firmly believe that it is the right trade-off to make. -Removing the shortcut takes away an unneccessary layer of abstraction, and makes your codebase more explicit without any significant extra complexity. It also results in better consistency, as there's now only one way to set the serializer class and queryset attributes for the view, instead of two. +Removing the shortcut takes away an unnecessary layer of abstraction, and makes your codebase more explicit without any significant extra complexity. It also results in better consistency, as there's now only one way to set the serializer class and queryset attributes for the view, instead of two. The `DEFAULT_MODEL_SERIALIZER_CLASS` API setting is now also deprecated. diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index d2505a1b3..5242be573 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -6,10 +6,10 @@ The 3.0 release is now ready for some tentative testing and upgrades for super k See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-framework/pull/1800) for more details on remaining work. -The most notable outstanding issues still to resolved on the `version-3.0` branch are as follows: +The most notable outstanding issues still to be resolved on the `version-3.0` branch are as follows: * Forms support for serializers and in the browsable API. -* Optimisations for serialializing primary keys. +* Optimisations for serializing primary keys. * Refine style of validation errors in some cases, such as validation errors in `ListField`. * `.transform_<field>()` method on serializers. @@ -50,13 +50,13 @@ Below is an in-depth guide to the API changes and migration notes for 3.0. The usage of `request.DATA` and `request.FILES` is now discouraged in favor of a single `request.data` attribute that contains *all* the parsed data. -Having seperate attributes is reasonable for web applications that only ever parse URL encoded or MultiPart requests, but makes less sense for the general-purpose request parsing that REST framework supports. +Having separate attributes is reasonable for web applications that only ever parse URL encoded or MultiPart requests, but makes less sense for the general-purpose request parsing that REST framework supports. You may now pass all the request data to a serializer class in a single argument: ExampleSerializer(data=request.data) -Instead of passing the files argument seperately: +Instead of passing the files argument separately: # Don't do this... ExampleSerializer(data=request.DATA, files=request.FILES) @@ -75,7 +75,7 @@ Previously the serializers used a two-step object creation, as follows: This style is in line with how the `ModelForm` class works in Django, but is problematic for a number of reasons: -* Some data, such as many-to-many relationships, cannot be added to the object instance until after it has been saved. This type of data needed to be hidden in some undocumentated state on the object instance, or kept as state on the serializer instance so that it could be used when `.save()` is called. +* Some data, such as many-to-many relationships, cannot be added to the object instance until after it has been saved. This type of data needed to be hidden in some undocumented state on the object instance, or kept as state on the serializer instance so that it could be used when `.save()` is called. * Instantiating model instances directly means that you cannot use model manager classes for instance creation, eg `ExampleModel.objects.create(...)`. Manager classes are an excellent layer at which to enforce business logic and application-level data constraints. * The two step process makes it unclear where to put deserialization logic. For example, should extra attributes such as the current user get added to the instance during object creation or during object save? @@ -88,7 +88,7 @@ The resulting API changes are further detailed below. #### The `.create()` and `.update()` methods. -The `.restore_object()` method is now replaced with two seperate methods, `.create()` and `.update()`. +The `.restore_object()` method is now replaced with two separate methods, `.create()` and `.update()`. When using the `.create()` and `.update()` methods you should both create *and save* the object instance. This is in contrast to the previous `.restore_object()` behavior that would instantiate the object but not save it. @@ -107,7 +107,7 @@ The following example from the tutorial previously used `restore_object()` to ha # Create new instance return Snippet(**attrs) -This would now be split out into two seperate methods. +This would now be split out into two separate methods. def update(self, instance, validated_attrs) instance.title = validated_attrs.get('title', instance.title) @@ -146,7 +146,7 @@ The corresponding code would now look like this: #### Limitations of ModelSerializer validation. -This change also means that we no longer use the `.full_clean()` method on model instances, but instead perform all validation explicitly on the serializer. This gives a cleaner seperation, and ensures that there's no automatic validation behavior on `ModelSerializer` classes that can't also be easily replicated on regular `Serializer` classes. +This change also means that we no longer use the `.full_clean()` method on model instances, but instead perform all validation explicitly on the serializer. This gives a cleaner separation, and ensures that there's no automatic validation behavior on `ModelSerializer` classes that can't also be easily replicated on regular `Serializer` classes. This change comes with the following limitations: @@ -157,7 +157,7 @@ This change comes with the following limitations: REST framework 2.x attempted to automatically support writable nested serialization, but the behavior was complex and non-obvious. Attempting to automatically handle these case is problematic: -* There can be complex dependancies involved in order of saving multiple related model instances. +* There can be complex dependencies involved in order of saving multiple related model instances. * It's unclear what behavior the user should expect when related models are passed `None` data. * It's unclear how the user should expect to-many relationships to handle updates, creations and deletions of multiple records. @@ -289,7 +289,7 @@ The `ListSerializer` class has now been added, and allows you to create base ser class MultipleUserSerializer(ListSerializer): child = UserSerializer() -You can also still use the `many=True` argument to serializer classes. It's worth noting that `many=True` argument transparently creates a `ListSerializer` instance, allowing the validation logic for list and non-list data to be cleanly seperated in the REST framework codebase. +You can also still use the `many=True` argument to serializer classes. It's worth noting that `many=True` argument transparently creates a `ListSerializer` instance, allowing the validation logic for list and non-list data to be cleanly separated in the REST framework codebase. See also the new `ListField` class, which validates input in the same way, but does not include the serializer interfaces of `.is_valid()`, `.data`, `.save()` and so on. @@ -299,7 +299,7 @@ REST framework now includes a simple `BaseSerializer` class that can be used to This class implements the same basic API as the `Serializer` class: -* `.data` - Returns the outgoing primative representation. +* `.data` - Returns the outgoing primitive representation. * `.is_valid()` - Deserializes and validates incoming data. * `.validated_data` - Returns the validated incoming data. * `.errors` - Returns an errors during validation. @@ -320,7 +320,7 @@ To implement a read-only serializer using the `BaseSerializer` class, we just ne player_name = models.CharField(max_length=10) score = models.IntegerField() -It's simple to create a read-only serializer for converting `HighScore` instances into primative data types. +It's simple to create a read-only serializer for converting `HighScore` instances into primitive data types. class HighScoreSerializer(serializers.BaseSerializer): def to_representation(self, obj): @@ -394,12 +394,12 @@ Here's a complete example of our previous `HighScoreSerializer`, that's been upd The `BaseSerializer` class is also useful if you want to implement new generic serializer classes for dealing with particular serialization styles, or for integrating with alternative storage backends. -The following class is an example of a generic serializer that can handle coercing aribitrary objects into primative representations. +The following class is an example of a generic serializer that can handle coercing aribitrary objects into primitive representations. class ObjectSerializer(serializers.BaseSerializer): """ A read-only serializer that coerces arbitrary complex objects - into primative representations. + into primitive representations. """ def to_representation(self, obj): for attribute_name in dir(obj): @@ -411,7 +411,7 @@ The following class is an example of a generic serializer that can handle coerci # Ignore methods and other callables. pass elif isinstance(attribute, (str, int, bool, float, type(None))): - # Primative types can be passed through unmodified. + # primitive types can be passed through unmodified. output[attribute_name] = attribute elif isinstance(attribute, list): # Recursivly deal with items in lists. @@ -437,7 +437,7 @@ There are some minor tweaks to the field base classes. Previously we had these two base classes: * `Field` as the base class for read-only fields. A default implementation was included for serializing data. -* `WriteableField` as the base class for read-write fields. +* `WritableField` as the base class for read-write fields. We now use the following: @@ -448,9 +448,9 @@ We now use the following: REST framework now has more explict and clear control over validating empty values for fields. -Previously the meaning of the `required=False` keyword argument was underspecified. In practice it's use meant that a field could either be not included in the input, or it could be included, but be `None`. +Previously the meaning of the `required=False` keyword argument was underspecified. In practice its use meant that a field could either be not included in the input, or it could be included, but be `None`. -We now have a better seperation, with seperate `required` and `allow_none` arguments. +We now have a better separation, with separate `required` and `allow_none` arguments. The following set of arguments are used to control validation of empty values: @@ -552,7 +552,7 @@ In order to ensure a consistent code style an assertion error will be raised if #### Enforcing consistent `source` usage. -I've see several codebases that unneccessarily include the `source` argument, setting it to the same value as the field name. This usage is redundant and confusing, making it less obvious that `source` is usually not required. +I've see several codebases that unnecessarily include the `source` argument, setting it to the same value as the field name. This usage is redundant and confusing, making it less obvious that `source` is usually not required. The following usage will *now raise an error*: @@ -614,7 +614,7 @@ I would personally recommend that developers treat view instances as immutable o #### PUT as create. -Allowing `PUT` as create operations is problematic, as it neccessarily exposes information about the existence or non-existance of objects. It's also not obvious that transparently allowing re-creating of previously deleted instances is neccessarily a better default behavior than simply returning `404` responses. +Allowing `PUT` as create operations is problematic, as it necessarily exposes information about the existence or non-existance of objects. It's also not obvious that transparently allowing re-creating of previously deleted instances is necessarily a better default behavior than simply returning `404` responses. Both styles "`PUT` as 404" and "`PUT` as create" can be valid in different circumstances, but we've now opted for the 404 behavior as the default, due to it being simpler and more obvious. @@ -628,7 +628,7 @@ This change means that you can now easily cusomize the style of error responses ## The metadata API -Behavior for dealing with `OPTIONS` requests was previously built directly into the class based views. This has now been properly seperated out into a Metadata API that allows the same pluggable style as other API policies in REST framework. +Behavior for dealing with `OPTIONS` requests was previously built directly into the class based views. This has now been properly separated out into a Metadata API that allows the same pluggable style as other API policies in REST framework. This makes it far easier to use a different style for `OPTIONS` responses throughout your API, and makes it possible to create third-party metadata policies. diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 3400bc8f9..50b8ded16 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -109,7 +109,7 @@ You can also use the excellent [tox][tox] testing tool to run the tests against It's a good idea to make pull requests early on. A pull request represents the start of a discussion, and doesn't necessarily need to be the final, finished submission. -It's also always best to make a new branch before starting work on a pull request. This means that you'll be able to later switch back to working on another seperate issue without interfering with an ongoing pull requests. +It's also always best to make a new branch before starting work on a pull request. This means that you'll be able to later switch back to working on another separate issue without interfering with an ongoing pull requests. It's also useful to remember that if you have an outstanding pull request then pushing new commits to your GitHub repo will also automatically update the pull requests. diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 16589f3b9..4fa3d6271 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -149,7 +149,7 @@ You can determine your currently installed version using `pip freeze`: * Added `write_only_fields` option to `ModelSerializer` classes. * JSON renderer now deals with objects that implement a dict-like interface. * Fix compatiblity with newer versions of `django-oauth-plus`. -* Bugfix: Refine behavior that calls model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unneccessary queryset re-evaluations. +* Bugfix: Refine behavior that calls model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unnecessary queryset re-evaluations. * Bugfix: Allow defaults on BooleanFields to be properly honored when values are not supplied. * Bugfix: Prevent double-escaping of non-latin1 URL query params when appending `format=json` params. diff --git a/docs/topics/writable-nested-serializers.md b/docs/topics/writable-nested-serializers.md index 66ea78150..abc6a82f7 100644 --- a/docs/topics/writable-nested-serializers.md +++ b/docs/topics/writable-nested-serializers.md @@ -6,7 +6,7 @@ Although flat data structures serve to properly delineate between the individual entities in your service, there are cases where it may be more appropriate or convenient to use nested data structures. -Nested data structures are easy enough to work with if they're read-only - simply nest your serializer classes and you're good to go. However, there are a few more subtleties to using writable nested serializers, due to the dependancies between the various model instances, and the need to save or delete multiple instances in a single action. +Nested data structures are easy enough to work with if they're read-only - simply nest your serializer classes and you're good to go. However, there are a few more subtleties to using writable nested serializers, due to the dependencies between the various model instances, and the need to save or delete multiple instances in a single action. ## One-to-many data structures diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 3993cee6d..e4e69580f 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -131,7 +131,7 @@ else: self.message = kwargs.pop('message', self.message) super(MaxValueValidator, self).__init__(*args, **kwargs) -# URLValidator only accept `message` in 1.6+ +# URLValidator only accepts `message` in 1.6+ if django.VERSION >= (1, 6): from django.core.validators import URLValidator else: diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f3ff22334..bba8ccae2 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -186,14 +186,14 @@ class Field(object): def get_initial(self): """ - Return a value to use when the field is being returned as a primative + Return a value to use when the field is being returned as a primitive value, without any object instance. """ return self.initial def get_value(self, dictionary): """ - Given the *incoming* primative data, return the value for this field + Given the *incoming* primitive data, return the value for this field that should be validated and transformed to a native value. """ if html.is_html_input(dictionary): @@ -205,7 +205,7 @@ class Field(object): def get_field_representation(self, instance): """ - Given the outgoing object instance, return the primative value + Given the outgoing object instance, return the primitive value that should be used for this field. """ attribute = get_attribute(instance, self.source_attrs) @@ -274,13 +274,13 @@ class Field(object): def to_internal_value(self, data): """ - Transform the *incoming* primative data into a native value. + Transform the *incoming* primitive data into a native value. """ raise NotImplementedError('to_internal_value() must be implemented.') def to_representation(self, value): """ - Transform the *outgoing* native value into primative data. + Transform the *outgoing* native value into primitive data. """ raise NotImplementedError('to_representation() must be implemented.') @@ -928,7 +928,7 @@ class ImageField(FileField): def to_internal_value(self, data): # Image validation is a bit grungy, so we'll just outright # defer to Django's implementation so we don't need to - # consider it, or treat PIL as a test dependancy. + # consider it, or treat PIL as a test dependency. file_object = super(ImageField, self).to_internal_value(data) django_field = self._DjangoImageField() django_field.error_messages = self.error_messages diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 8c1356727..8141de134 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -100,7 +100,7 @@ class HyperlinkedRelatedField(RelatedField): self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field) self.format = kwargs.pop('format', None) - # We include these simply for dependancy injection in tests. + # We include these simply for dependency injection in tests. # We can't add them as class attributes or they would expect an # implict `self` argument to be passed. self.reverse = reverse diff --git a/rest_framework/validators.py b/rest_framework/validators.py index 20de4b427..5bb69ad88 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -2,7 +2,7 @@ We perform uniqueness checks explicitly on the serializer class, rather the using Django's `.full_clean()`. -This gives us better seperation of concerns, allows us to use single-step +This gives us better separation of concerns, allows us to use single-step object creation, and makes it possible to switch between using the implicit `ModelSerializer` class and an equivelent explicit `Serializer` class. """ diff --git a/rest_framework/views.py b/rest_framework/views.py index 835e223a7..979229eb4 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -100,7 +100,7 @@ class APIView(View): content_negotiation_class = api_settings.DEFAULT_CONTENT_NEGOTIATION_CLASS metadata_class = api_settings.DEFAULT_METADATA_CLASS - # Allow dependancy injection of other settings to make testing easier. + # Allow dependency injection of other settings to make testing easier. settings = api_settings @classmethod diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 2edf0be5b..bb74cd2e2 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -34,7 +34,7 @@ class RegularFieldsModel(models.Model): big_integer_field = models.BigIntegerField() boolean_field = models.BooleanField(default=False) char_field = models.CharField(max_length=100) - comma_seperated_integer_field = models.CommaSeparatedIntegerField(max_length=100) + comma_separated_integer_field = models.CommaSeparatedIntegerField(max_length=100) date_field = models.DateField() datetime_field = models.DateTimeField() decimal_field = models.DecimalField(max_digits=3, decimal_places=1) @@ -83,7 +83,7 @@ class TestRegularFieldMappings(TestCase): big_integer_field = IntegerField() boolean_field = BooleanField(required=False) char_field = CharField(max_length=100) - comma_seperated_integer_field = CharField(max_length=100, validators=[<django.core.validators.RegexValidator object>]) + comma_separated_integer_field = CharField(max_length=100, validators=[<django.core.validators.RegexValidator object>]) date_field = DateField() datetime_field = DateTimeField() decimal_field = DecimalField(decimal_places=1, max_digits=3) diff --git a/tests/test_relations.py b/tests/test_relations.py index 2d11672b8..66784195e 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -161,18 +161,18 @@ class TestSlugRelatedField(APISimpleTestCase): # https://github.com/tomchristie/django-rest-framework/issues/446 # """ # field = serializers.PrimaryKeyRelatedField(queryset=NullModel.objects.all()) -# self.assertRaises(serializers.ValidationError, field.to_primative, '') -# self.assertRaises(serializers.ValidationError, field.to_primative, []) +# self.assertRaises(serializers.ValidationError, field.to_primitive, '') +# self.assertRaises(serializers.ValidationError, field.to_primitive, []) # def test_hyperlinked_related_field_with_empty_string(self): # field = serializers.HyperlinkedRelatedField(queryset=NullModel.objects.all(), view_name='') -# self.assertRaises(serializers.ValidationError, field.to_primative, '') -# self.assertRaises(serializers.ValidationError, field.to_primative, []) +# self.assertRaises(serializers.ValidationError, field.to_primitive, '') +# self.assertRaises(serializers.ValidationError, field.to_primitive, []) # def test_slug_related_field_with_empty_string(self): # field = serializers.SlugRelatedField(queryset=NullModel.objects.all(), slug_field='pk') -# self.assertRaises(serializers.ValidationError, field.to_primative, '') -# self.assertRaises(serializers.ValidationError, field.to_primative, []) +# self.assertRaises(serializers.ValidationError, field.to_primitive, '') +# self.assertRaises(serializers.ValidationError, field.to_primitive, []) # class TestManyRelatedMixin(TestCase): From 857a8486b1534f89bd482de86d39ff717b6618eb Mon Sep 17 00:00:00 2001 From: Craig de Stigter <craig.destigter@koordinates.com> Date: Fri, 3 Oct 2014 09:00:33 +1300 Subject: [PATCH 0927/1652] More spelling tweaks --- docs/topics/3.0-announcement.md | 6 +++--- rest_framework/filters.py | 2 +- rest_framework/mixins.py | 2 +- rest_framework/relations.py | 2 +- tests/test_response.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 5242be573..fcae79e12 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -411,7 +411,7 @@ The following class is an example of a generic serializer that can handle coerci # Ignore methods and other callables. pass elif isinstance(attribute, (str, int, bool, float, type(None))): - # primitive types can be passed through unmodified. + # Primitive types can be passed through unmodified. output[attribute_name] = attribute elif isinstance(attribute, list): # Recursivly deal with items in lists. @@ -446,7 +446,7 @@ We now use the following: #### The `required`, `allow_none`, `allow_blank` and `default` arguments. -REST framework now has more explict and clear control over validating empty values for fields. +REST framework now has more explicit and clear control over validating empty values for fields. Previously the meaning of the `required=False` keyword argument was underspecified. In practice its use meant that a field could either be not included in the input, or it could be included, but be `None`. @@ -522,7 +522,7 @@ However this code *would not be valid* in `2.4.3`: # ... The queryset argument is now always required for writable relational fields. -This removes some magic and makes it easier and more obvious to move between implict `ModelSerializer` classes and explicit `Serializer` classes. +This removes some magic and makes it easier and more obvious to move between implicit `ModelSerializer` classes and explicit `Serializer` classes. class AccountSerializer(serializers.ModelSerializer): organisations = serializers.SlugRelatedField( diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 4c485668a..d188a2d1e 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -148,7 +148,7 @@ class OrderingFilter(BaseFilterBackend): if not getattr(field, 'write_only', False) ] elif valid_fields == '__all__': - # View explictly allows filtering on any model field + # View explicitly allows filtering on any model field valid_fields = [field.name for field in queryset.model._meta.fields] valid_fields += queryset.query.aggregates.keys() diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 04b7a7636..de334b4b9 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -83,7 +83,7 @@ class DestroyModelMixin(object): # The AllowPUTAsCreateMixin was previously the default behaviour -# for PUT requests. This has now been removed and must be *explictly* +# for PUT requests. This has now been removed and must be *explicitly* # included if it is the behavior that you want. # For more info see: ... diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 8141de134..dc9781e7c 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -102,7 +102,7 @@ class HyperlinkedRelatedField(RelatedField): # We include these simply for dependency injection in tests. # We can't add them as class attributes or they would expect an - # implict `self` argument to be passed. + # implicit `self` argument to be passed. self.reverse = reverse self.resolve = resolve diff --git a/tests/test_response.py b/tests/test_response.py index 84c39c1a6..f233ae332 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -262,9 +262,9 @@ class Issue807Tests(TestCase): expected = "{0}; charset={1}".format(RendererC.media_type, RendererC.charset) self.assertEqual(expected, resp['Content-Type']) - def test_content_type_set_explictly_on_response(self): + def test_content_type_set_explicitly_on_response(self): """ - The content type may be set explictly on the response. + The content type may be set explicitly on the response. """ headers = {"HTTP_ACCEPT": RendererC.media_type} resp = self.client.get('/setbyview', **headers) From 765b0b33bf1fa9b7c6b45d3877d10a05d4e9f6ea Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 3 Oct 2014 13:12:23 +0100 Subject: [PATCH 0928/1652] Revert accidental stupidity --- rest_framework/relations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 4f971917a..f9b5ff0d8 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -127,7 +127,7 @@ class HyperlinkedRelatedField(RelatedField): attributes are not configured to correctly match the URL conf. """ # Unsaved objects will not yet have a valid URL. - if obj.pk: + if obj.pk is None: return None lookup_value = getattr(obj, self.lookup_field) From e6c5ebdda6d0f169f21498909e2d390c460138a9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 3 Oct 2014 13:14:17 +0100 Subject: [PATCH 0929/1652] Fix indentation --- rest_framework/serializers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 21cb7ea27..c3a0815e2 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -252,10 +252,10 @@ class Serializer(BaseSerializer): def get_initial(self): if self._initial_data is not None: return ReturnDict([ - (field_name, field.get_value(self._initial_data)) - for field_name, field in self.fields.items() - if field.get_value(self._initial_data) is not empty - ], serializer=self) + (field_name, field.get_value(self._initial_data)) + for field_name, field in self.fields.items() + if field.get_value(self._initial_data) is not empty + ], serializer=self) #return self.to_representation(self._initial_data) return ReturnDict([ From 3a3e2bf57d5443dc0b058d5beb3111f87c418947 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 3 Oct 2014 13:42:06 +0100 Subject: [PATCH 0930/1652] Serializer.save() takes keyword arguments, not 'extras' argument --- docs/topics/3.0-announcement.md | 21 ++++++++++----------- rest_framework/mixins.py | 4 ++-- rest_framework/serializers.py | 7 +++---- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index fcae79e12..4a7815032 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -109,16 +109,16 @@ The following example from the tutorial previously used `restore_object()` to ha This would now be split out into two separate methods. - def update(self, instance, validated_attrs) - instance.title = validated_attrs.get('title', instance.title) - instance.code = validated_attrs.get('code', instance.code) - instance.linenos = validated_attrs.get('linenos', instance.linenos) - instance.language = validated_attrs.get('language', instance.language) - instance.style = validated_attrs.get('style', instance.style) + def update(self, instance, validated_data) + instance.title = validated_data.get('title', instance.title) + instance.code = validated_data.get('code', instance.code) + instance.linenos = validated_data.get('linenos', instance.linenos) + instance.language = validated_data.get('language', instance.language) + instance.style = validated_data.get('style', instance.style) instance.save() - def create(self, validated_attrs): - return Snippet.objects.create(**validated_attrs) + def create(self, validated_data): + return Snippet.objects.create(**validated_data) Note that the `.create` method should return the newly created object instance. @@ -134,15 +134,14 @@ For example the following code *is no longer valid*: serializer.object.user = request.user # Include the user when saving. serializer.save() -Instead of using `.object` to inspect a partially constructed instance, you would now use `.validated_data` to inspect the cleaned incoming values. Also you can't set extra attributes on the instance directly, but instead pass them to the `.save()` method using the `extras` keyword argument. +Instead of using `.object` to inspect a partially constructed instance, you would now use `.validated_data` to inspect the cleaned incoming values. Also you can't set extra attributes on the instance directly, but instead pass them to the `.save()` method as keyword arguments. The corresponding code would now look like this: if serializer.is_valid(): name = serializer.validated_data['name'] # Inspect validated field data. logging.info('Creating ticket "%s"' % name) - extras = {'user': request.user} # Include the user when saving. - serializer.save(extras=extras) + serializer.save(user=request.user) # Include the user when saving. #### Limitations of ModelSerializer validation. diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index de334b4b9..bc4ce22f1 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -101,8 +101,8 @@ class AllowPUTAsCreateMixin(object): if instance is None: lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field lookup_value = self.kwargs[lookup_url_kwarg] - extras = {self.lookup_field: lookup_value} - serializer.save(extras=extras) + extra_kwargs = {self.lookup_field: lookup_value} + serializer.save(**extra_kwargs) return Response(serializer.data, status=status.HTTP_201_CREATED) serializer.save() diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index c3a0815e2..ed024f87b 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -74,12 +74,12 @@ class BaseSerializer(Field): def create(self, validated_data): raise NotImplementedError('`create()` must be implemented.') - def save(self, extras=None): + def save(self, **kwargs): validated_data = self.validated_data - if extras is not None: + if kwargs: validated_data = dict( list(validated_data.items()) + - list(extras.items()) + list(kwargs.items()) ) if self.instance is not None: @@ -256,7 +256,6 @@ class Serializer(BaseSerializer): for field_name, field in self.fields.items() if field.get_value(self._initial_data) is not empty ], serializer=self) - #return self.to_representation(self._initial_data) return ReturnDict([ (field.field_name, field.get_initial()) From 0803716ed034389a09305b7f037cb05d9ff5c57d Mon Sep 17 00:00:00 2001 From: Kevin London <kevinlondon@gmail.com> Date: Sat, 4 Oct 2014 17:34:27 -0700 Subject: [PATCH 0931/1652] Update links in 2.4-announcement.md The links to Django Rest Framework pages were 404ing because the URLs include a slash. --- docs/topics/2.4-announcement.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/2.4-announcement.md b/docs/topics/2.4-announcement.md index 09294b910..8e4f3bb23 100644 --- a/docs/topics/2.4-announcement.md +++ b/docs/topics/2.4-announcement.md @@ -164,8 +164,8 @@ Once again, many thanks to all the generous [backers and sponsors][kickstarter-s [lts-releases]: https://docs.djangoproject.com/en/dev/internals/release-process/#long-term-support-lts-releases [2-4-release-notes]: release-notes#240 -[view-name-and-description-settings]: ../api-guide/settings/#view-names-and-descriptions -[client-ip-identification]: ../api-guide/throttling/#how-clients-are-identified +[view-name-and-description-settings]: ../api-guide/settings#view-names-and-descriptions +[client-ip-identification]: ../api-guide/throttling#how-clients-are-identified [2-3-announcement]: 2.3-announcement [github-labels]: https://github.com/tomchristie/django-rest-framework/issues [github-milestones]: https://github.com/tomchristie/django-rest-framework/milestones From 2dfe75c23a041493bc83514d8e9e9268b79072d9 Mon Sep 17 00:00:00 2001 From: Jones Chi <duguschi@gmail.com> Date: Fri, 3 Oct 2014 14:42:49 +0800 Subject: [PATCH 0932/1652] Fix follow does not work on APIClient Handle follow just like Django's Client. --- rest_framework/test.py | 46 +++++++++++++++++++++++++++++++++++++++++ tests/test_testing.py | 47 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/rest_framework/test.py b/rest_framework/test.py index 9b40353a3..74d2c868f 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -156,6 +156,52 @@ class APIClient(APIRequestFactory, DjangoClient): kwargs.update(self._credentials) return super(APIClient, self).request(**kwargs) + def get(self, path, data=None, follow=False, **extra): + response = super(APIClient, self).get(path, data=data, **extra) + if follow: + response = self._handle_redirects(response, **extra) + return response + + def post(self, path, data=None, format=None, content_type=None, + follow=False, **extra): + response = super(APIClient, self).post( + path, data=data, format=format, content_type=content_type, **extra) + if follow: + response = self._handle_redirects(response, **extra) + return response + + def put(self, path, data=None, format=None, content_type=None, + follow=False, **extra): + response = super(APIClient, self).put( + path, data=data, format=format, content_type=content_type, **extra) + if follow: + response = self._handle_redirects(response, **extra) + return response + + def patch(self, path, data=None, format=None, content_type=None, + follow=False, **extra): + response = super(APIClient, self).patch( + path, data=data, format=format, content_type=content_type, **extra) + if follow: + response = self._handle_redirects(response, **extra) + return response + + def delete(self, path, data=None, format=None, content_type=None, + follow=False, **extra): + response = super(APIClient, self).delete( + path, data=data, format=format, content_type=content_type, **extra) + if follow: + response = self._handle_redirects(response, **extra) + return response + + def options(self, path, data=None, format=None, content_type=None, + follow=False, **extra): + response = super(APIClient, self).options( + path, data=data, format=format, content_type=content_type, **extra) + if follow: + response = self._handle_redirects(response, **extra) + return response + def logout(self): self._credentials = {} return super(APIClient, self).logout() diff --git a/tests/test_testing.py b/tests/test_testing.py index 9c472026a..9fd5966eb 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -5,6 +5,7 @@ from django.conf.urls import patterns, url from io import BytesIO from django.contrib.auth.models import User +from django.shortcuts import redirect from django.test import TestCase from rest_framework.decorators import api_view from rest_framework.response import Response @@ -28,10 +29,16 @@ def session_view(request): }) +@api_view(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS']) +def redirect_view(request): + return redirect('/view/') + + urlpatterns = patterns( '', url(r'^view/$', view), url(r'^session-view/$', session_view), + url(r'^redirect-view/$', redirect_view), ) @@ -111,6 +118,46 @@ class TestAPITestClient(TestCase): response = self.client.get('/view/') self.assertEqual(response.data['auth'], b'') + def test_follow_redirect(self): + """ + Follow redirect by setting follow argument. + """ + response = self.client.get('/redirect-view/') + self.assertEqual(response.status_code, 302) + response = self.client.get('/redirect-view/', follow=True) + self.assertIsNotNone(response.redirect_chain) + self.assertEqual(response.status_code, 200) + + response = self.client.post('/redirect-view/') + self.assertEqual(response.status_code, 302) + response = self.client.post('/redirect-view/', follow=True) + self.assertIsNotNone(response.redirect_chain) + self.assertEqual(response.status_code, 200) + + response = self.client.put('/redirect-view/') + self.assertEqual(response.status_code, 302) + response = self.client.put('/redirect-view/', follow=True) + self.assertIsNotNone(response.redirect_chain) + self.assertEqual(response.status_code, 200) + + response = self.client.patch('/redirect-view/') + self.assertEqual(response.status_code, 302) + response = self.client.patch('/redirect-view/', follow=True) + self.assertIsNotNone(response.redirect_chain) + self.assertEqual(response.status_code, 200) + + response = self.client.delete('/redirect-view/') + self.assertEqual(response.status_code, 302) + response = self.client.delete('/redirect-view/', follow=True) + self.assertIsNotNone(response.redirect_chain) + self.assertEqual(response.status_code, 200) + + response = self.client.options('/redirect-view/') + self.assertEqual(response.status_code, 302) + response = self.client.options('/redirect-view/', follow=True) + self.assertIsNotNone(response.redirect_chain) + self.assertEqual(response.status_code, 200) + class TestAPIRequestFactory(TestCase): def test_csrf_exempt_by_default(self): From 6bfed6f8525a49fc50df7143ac2d492528b8f2ac Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 7 Oct 2014 17:04:53 +0100 Subject: [PATCH 0933/1652] Enforce uniqueness validation for relational fields --- rest_framework/fields.py | 2 ++ rest_framework/utils/field_mapping.py | 3 +++ tests/test_model_serializer.py | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 0963d4bf2..9d577c53c 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -224,6 +224,8 @@ class Field(object): """ if self.default is empty: raise SkipField() + if is_simple_callable(self.default): + return self.default() return self.default def run_validation(self, data=empty): diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index 30fae3709..fd6da699f 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -219,6 +219,9 @@ def get_relation_kwargs(field_name, relation_info): kwargs['required'] = False if model_field.null: kwargs['allow_null'] = True + if getattr(model_field, 'unique', False): + validator = UniqueValidator(queryset=model_field.model._default_manager) + kwargs['validators'] = [validator] return kwargs diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index bb74cd2e2..18170bc06 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -248,7 +248,7 @@ class TestRelationalFieldMappings(TestCase): TestSerializer(): id = IntegerField(label='ID', read_only=True) foreign_key = PrimaryKeyRelatedField(queryset=ForeignKeyTargetModel.objects.all()) - one_to_one = PrimaryKeyRelatedField(queryset=OneToOneTargetModel.objects.all()) + one_to_one = PrimaryKeyRelatedField(queryset=OneToOneTargetModel.objects.all(), validators=[<UniqueValidator(queryset=RelationalModel.objects.all())>]) many_to_many = PrimaryKeyRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all()) through = PrimaryKeyRelatedField(many=True, read_only=True) """) @@ -287,7 +287,7 @@ class TestRelationalFieldMappings(TestCase): TestSerializer(): url = HyperlinkedIdentityField(view_name='relationalmodel-detail') foreign_key = HyperlinkedRelatedField(queryset=ForeignKeyTargetModel.objects.all(), view_name='foreignkeytargetmodel-detail') - one_to_one = HyperlinkedRelatedField(queryset=OneToOneTargetModel.objects.all(), view_name='onetoonetargetmodel-detail') + one_to_one = HyperlinkedRelatedField(queryset=OneToOneTargetModel.objects.all(), validators=[<UniqueValidator(queryset=RelationalModel.objects.all())>], view_name='onetoonetargetmodel-detail') many_to_many = HyperlinkedRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all(), view_name='manytomanytargetmodel-detail') through = HyperlinkedRelatedField(many=True, read_only=True, view_name='throughtargetmodel-detail') """) From 3fa4a1898aee0dabee951f81f790bb2da042ec81 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 7 Oct 2014 17:21:12 +0100 Subject: [PATCH 0934/1652] Reintroduce save hooks --- rest_framework/mixins.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index bc4ce22f1..03ebb0341 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -20,10 +20,13 @@ class CreateModelMixin(object): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) - serializer.save() + self.create_valid(serializer) headers = self.get_success_headers(serializer.data) return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) + def create_valid(self, serializer): + serializer.save() + def get_success_headers(self, data): try: return {'Location': data[api_settings.URL_FIELD_NAME]} @@ -64,9 +67,12 @@ class UpdateModelMixin(object): instance = self.get_object() serializer = self.get_serializer(instance, data=request.data, partial=partial) serializer.is_valid(raise_exception=True) - serializer.save() + self.update_valid(serializer) return Response(serializer.data) + def update_valid(self, serializer): + serializer.save() + def partial_update(self, request, *args, **kwargs): kwargs['partial'] = True return self.update(request, *args, **kwargs) From 311d315a739f4d1d02e87a09de0bbf9e7b0cee46 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Wed, 8 Oct 2014 08:33:28 +0200 Subject: [PATCH 0935/1652] Reverted 59d0a0387d907260ef8f91bbbca618831abd75a3 and fixed the tests --- rest_framework/response.py | 4 ---- tests/test_renderers.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/rest_framework/response.py b/rest_framework/response.py index 0a7d313f4..d6ca1aad4 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -5,7 +5,6 @@ it is initialized with unrendered data, instead of a pre-rendered string. The appropriate renderer is called during Django's template response rendering. """ from __future__ import unicode_literals -import django from django.core.handlers.wsgi import STATUS_CODE_TEXT from django.template.response import SimpleTemplateResponse from django.utils import six @@ -16,9 +15,6 @@ class Response(SimpleTemplateResponse): An HttpResponse that allows its data to be rendered into arbitrary media types. """ - # TODO: remove that once Django 1.3 isn't supported - if django.VERSION >= (1, 4): - rendering_attrs = SimpleTemplateResponse.rendering_attrs + ['_closable_objects'] def __init__(self, data=None, status=None, template_name=None, headers=None, diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 91244e261..b922ec291 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -643,7 +643,7 @@ class CacheRenderTest(TestCase): """ method = getattr(self.client, http_method) resp = method(url) - del resp.client, resp.request + del resp.client, resp.request, resp._closable_objects try: del resp.wsgi_request except AttributeError: From 093febb91299e332c810de6a6b6aba57c2b16a91 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 8 Oct 2014 11:04:08 +0100 Subject: [PATCH 0936/1652] Tests for relational fields --- rest_framework/fields.py | 9 +- tests/test_relations_hyperlink.py | 775 +++++++++++++++--------------- tests/test_relations_pk.py | 764 +++++++++++++++-------------- tests/test_relations_slug.py | 455 +++++++++--------- 4 files changed, 1008 insertions(+), 995 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 9d577c53c..5fb0ec8d7 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1,7 +1,7 @@ from django import forms from django.conf import settings from django.core import validators -from django.core.exceptions import ValidationError +from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.utils import six, timezone from django.utils.datastructures import SortedDict from django.utils.dateparse import parse_date, parse_datetime, parse_time @@ -54,6 +54,8 @@ def get_attribute(instance, attrs): for attr in attrs: try: instance = getattr(instance, attr) + except ObjectDoesNotExist: + return None except AttributeError as exc: try: return instance[attr] @@ -108,6 +110,7 @@ class Field(object): default_validators = [] default_empty_html = empty initial = None + coerce_blank_to_null = True def __init__(self, read_only=False, write_only=False, required=None, default=empty, initial=empty, source=None, @@ -245,6 +248,9 @@ class Field(object): self.fail('required') return self.get_default() + if data == '' and self.coerce_blank_to_null: + data = None + if data is None: if not self.allow_null: self.fail('null') @@ -413,6 +419,7 @@ class CharField(Field): 'blank': _('This field may not be blank.') } initial = '' + coerce_blank_to_null = False def __init__(self, **kwargs): self.allow_blank = kwargs.pop('allow_blank', False) diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py index 315d1abf8..0337f3599 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -1,459 +1,460 @@ -# from __future__ import unicode_literals -# from django.conf.urls import patterns, url -# from django.test import TestCase -# from rest_framework import serializers -# from rest_framework.test import APIRequestFactory -# from tests.models import ( -# BlogPost, -# ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource, -# NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource -# ) +from __future__ import unicode_literals +from django.conf.urls import patterns, url +from django.test import TestCase +from rest_framework import serializers +from rest_framework.test import APIRequestFactory +from tests.models import ( + ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource, + NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource +) -# factory = APIRequestFactory() -# request = factory.get('/') # Just to ensure we have a request in the serializer context +factory = APIRequestFactory() +request = factory.get('/') # Just to ensure we have a request in the serializer context -# def dummy_view(request, pk): -# pass +dummy_view = lambda request, pk: None -# urlpatterns = patterns( -# '', -# url(r'^dummyurl/(?P<pk>[0-9]+)/$', dummy_view, name='dummy-url'), -# url(r'^manytomanysource/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanysource-detail'), -# url(r'^manytomanytarget/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanytarget-detail'), -# url(r'^foreignkeysource/(?P<pk>[0-9]+)/$', dummy_view, name='foreignkeysource-detail'), -# url(r'^foreignkeytarget/(?P<pk>[0-9]+)/$', dummy_view, name='foreignkeytarget-detail'), -# url(r'^nullableforeignkeysource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableforeignkeysource-detail'), -# url(r'^onetoonetarget/(?P<pk>[0-9]+)/$', dummy_view, name='onetoonetarget-detail'), -# url(r'^nullableonetoonesource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableonetoonesource-detail'), -# ) +urlpatterns = patterns( + '', + url(r'^dummyurl/(?P<pk>[0-9]+)/$', dummy_view, name='dummy-url'), + url(r'^manytomanysource/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanysource-detail'), + url(r'^manytomanytarget/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanytarget-detail'), + url(r'^foreignkeysource/(?P<pk>[0-9]+)/$', dummy_view, name='foreignkeysource-detail'), + url(r'^foreignkeytarget/(?P<pk>[0-9]+)/$', dummy_view, name='foreignkeytarget-detail'), + url(r'^nullableforeignkeysource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableforeignkeysource-detail'), + url(r'^onetoonetarget/(?P<pk>[0-9]+)/$', dummy_view, name='onetoonetarget-detail'), + url(r'^nullableonetoonesource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableonetoonesource-detail'), +) -# # ManyToMany -# class ManyToManyTargetSerializer(serializers.HyperlinkedModelSerializer): -# class Meta: -# model = ManyToManyTarget -# fields = ('url', 'name', 'sources') +# ManyToMany +class ManyToManyTargetSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = ManyToManyTarget + fields = ('url', 'name', 'sources') -# class ManyToManySourceSerializer(serializers.HyperlinkedModelSerializer): -# class Meta: -# model = ManyToManySource -# fields = ('url', 'name', 'targets') +class ManyToManySourceSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = ManyToManySource + fields = ('url', 'name', 'targets') -# # ForeignKey -# class ForeignKeyTargetSerializer(serializers.HyperlinkedModelSerializer): -# class Meta: -# model = ForeignKeyTarget -# fields = ('url', 'name', 'sources') +# ForeignKey +class ForeignKeyTargetSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = ForeignKeyTarget + fields = ('url', 'name', 'sources') -# class ForeignKeySourceSerializer(serializers.HyperlinkedModelSerializer): -# class Meta: -# model = ForeignKeySource -# fields = ('url', 'name', 'target') +class ForeignKeySourceSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = ForeignKeySource + fields = ('url', 'name', 'target') -# # Nullable ForeignKey -# class NullableForeignKeySourceSerializer(serializers.HyperlinkedModelSerializer): -# class Meta: -# model = NullableForeignKeySource -# fields = ('url', 'name', 'target') +# Nullable ForeignKey +class NullableForeignKeySourceSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = NullableForeignKeySource + fields = ('url', 'name', 'target') -# # Nullable OneToOne -# class NullableOneToOneTargetSerializer(serializers.HyperlinkedModelSerializer): -# class Meta: -# model = OneToOneTarget -# fields = ('url', 'name', 'nullable_source') +# Nullable OneToOne +class NullableOneToOneTargetSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = OneToOneTarget + fields = ('url', 'name', 'nullable_source') -# # TODO: Add test that .data cannot be accessed prior to .is_valid +# TODO: Add test that .data cannot be accessed prior to .is_valid -# class HyperlinkedManyToManyTests(TestCase): -# urls = 'tests.test_relations_hyperlink' +class HyperlinkedManyToManyTests(TestCase): + urls = 'tests.test_relations_hyperlink' -# def setUp(self): -# for idx in range(1, 4): -# target = ManyToManyTarget(name='target-%d' % idx) -# target.save() -# source = ManyToManySource(name='source-%d' % idx) -# source.save() -# for target in ManyToManyTarget.objects.all(): -# source.targets.add(target) + def setUp(self): + for idx in range(1, 4): + target = ManyToManyTarget(name='target-%d' % idx) + target.save() + source = ManyToManySource(name='source-%d' % idx) + source.save() + for target in ManyToManyTarget.objects.all(): + source.targets.add(target) -# def test_many_to_many_retrieve(self): -# queryset = ManyToManySource.objects.all() -# serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/']}, -# {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, -# {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} -# ] -# self.assertEqual(serializer.data, expected) + def test_many_to_many_retrieve(self): + queryset = ManyToManySource.objects.all() + serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/']}, + {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, + {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} + ] + self.assertEqual(serializer.data, expected) -# def test_reverse_many_to_many_retrieve(self): -# queryset = ManyToManyTarget.objects.all() -# serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, -# {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, -# {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']} -# ] -# self.assertEqual(serializer.data, expected) + def test_reverse_many_to_many_retrieve(self): + queryset = ManyToManyTarget.objects.all() + serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, + {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, + {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']} + ] + self.assertEqual(serializer.data, expected) -# def test_many_to_many_update(self): -# data = {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} -# instance = ManyToManySource.objects.get(pk=1) -# serializer = ManyToManySourceSerializer(instance, data=data, context={'request': request}) -# self.assertTrue(serializer.is_valid()) -# serializer.save() -# self.assertEqual(serializer.data, data) + def test_many_to_many_update(self): + data = {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} + instance = ManyToManySource.objects.get(pk=1) + serializer = ManyToManySourceSerializer(instance, data=data, context={'request': request}) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure source 1 is updated, and everything else is as expected -# queryset = ManyToManySource.objects.all() -# serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']}, -# {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, -# {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 1 is updated, and everything else is as expected + queryset = ManyToManySource.objects.all() + serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']}, + {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, + {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} + ] + self.assertEqual(serializer.data, expected) -# def test_reverse_many_to_many_update(self): -# data = {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/']} -# instance = ManyToManyTarget.objects.get(pk=1) -# serializer = ManyToManyTargetSerializer(instance, data=data, context={'request': request}) -# self.assertTrue(serializer.is_valid()) -# serializer.save() -# self.assertEqual(serializer.data, data) + def test_reverse_many_to_many_update(self): + data = {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/']} + instance = ManyToManyTarget.objects.get(pk=1) + serializer = ManyToManyTargetSerializer(instance, data=data, context={'request': request}) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure target 1 is updated, and everything else is as expected -# queryset = ManyToManyTarget.objects.all() -# serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/']}, -# {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, -# {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']} + # Ensure target 1 is updated, and everything else is as expected + queryset = ManyToManyTarget.objects.all() + serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/']}, + {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, + {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']} -# ] -# self.assertEqual(serializer.data, expected) + ] + self.assertEqual(serializer.data, expected) -# def test_many_to_many_create(self): -# data = {'url': 'http://testserver/manytomanysource/4/', 'name': 'source-4', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/3/']} -# serializer = ManyToManySourceSerializer(data=data, context={'request': request}) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'source-4') + def test_many_to_many_create(self): + data = {'url': 'http://testserver/manytomanysource/4/', 'name': 'source-4', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/3/']} + serializer = ManyToManySourceSerializer(data=data, context={'request': request}) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'source-4') -# # Ensure source 4 is added, and everything else is as expected -# queryset = ManyToManySource.objects.all() -# serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/']}, -# {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, -# {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']}, -# {'url': 'http://testserver/manytomanysource/4/', 'name': 'source-4', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/3/']} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 4 is added, and everything else is as expected + queryset = ManyToManySource.objects.all() + serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/']}, + {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, + {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']}, + {'url': 'http://testserver/manytomanysource/4/', 'name': 'source-4', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/3/']} + ] + self.assertEqual(serializer.data, expected) -# def test_reverse_many_to_many_create(self): -# data = {'url': 'http://testserver/manytomanytarget/4/', 'name': 'target-4', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/3/']} -# serializer = ManyToManyTargetSerializer(data=data, context={'request': request}) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'target-4') + def test_reverse_many_to_many_create(self): + data = {'url': 'http://testserver/manytomanytarget/4/', 'name': 'target-4', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/3/']} + serializer = ManyToManyTargetSerializer(data=data, context={'request': request}) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'target-4') -# # Ensure target 4 is added, and everything else is as expected -# queryset = ManyToManyTarget.objects.all() -# serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, -# {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, -# {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']}, -# {'url': 'http://testserver/manytomanytarget/4/', 'name': 'target-4', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/3/']} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure target 4 is added, and everything else is as expected + queryset = ManyToManyTarget.objects.all() + serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/manytomanytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, + {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, + {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']}, + {'url': 'http://testserver/manytomanytarget/4/', 'name': 'target-4', 'sources': ['http://testserver/manytomanysource/1/', 'http://testserver/manytomanysource/3/']} + ] + self.assertEqual(serializer.data, expected) -# class HyperlinkedForeignKeyTests(TestCase): -# urls = 'tests.test_relations_hyperlink' +class HyperlinkedForeignKeyTests(TestCase): + urls = 'tests.test_relations_hyperlink' -# def setUp(self): -# target = ForeignKeyTarget(name='target-1') -# target.save() -# new_target = ForeignKeyTarget(name='target-2') -# new_target.save() -# for idx in range(1, 4): -# source = ForeignKeySource(name='source-%d' % idx, target=target) -# source.save() + def setUp(self): + target = ForeignKeyTarget(name='target-1') + target.save() + new_target = ForeignKeyTarget(name='target-2') + new_target.save() + for idx in range(1, 4): + source = ForeignKeySource(name='source-%d' % idx, target=target) + source.save() -# def test_foreign_key_retrieve(self): -# queryset = ForeignKeySource.objects.all() -# serializer = ForeignKeySourceSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'} -# ] -# self.assertEqual(serializer.data, expected) + def test_foreign_key_retrieve(self): + queryset = ForeignKeySource.objects.all() + serializer = ForeignKeySourceSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'} + ] + self.assertEqual(serializer.data, expected) -# def test_reverse_foreign_key_retrieve(self): -# queryset = ForeignKeyTarget.objects.all() -# serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/2/', 'http://testserver/foreignkeysource/3/']}, -# {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, -# ] -# self.assertEqual(serializer.data, expected) + def test_reverse_foreign_key_retrieve(self): + queryset = ForeignKeyTarget.objects.all() + serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/2/', 'http://testserver/foreignkeysource/3/']}, + {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update(self): -# data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/2/'} -# instance = ForeignKeySource.objects.get(pk=1) -# serializer = ForeignKeySourceSerializer(instance, data=data, context={'request': request}) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.data, data) -# serializer.save() + def test_foreign_key_update(self): + data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/2/'} + instance = ForeignKeySource.objects.get(pk=1) + serializer = ForeignKeySourceSerializer(instance, data=data, context={'request': request}) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure source 1 is updated, and everything else is as expected -# queryset = ForeignKeySource.objects.all() -# serializer = ForeignKeySourceSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/2/'}, -# {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 1 is updated, and everything else is as expected + queryset = ForeignKeySource.objects.all() + serializer = ForeignKeySourceSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/2/'}, + {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'} + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update_incorrect_type(self): -# data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 2} -# instance = ForeignKeySource.objects.get(pk=1) -# serializer = ForeignKeySourceSerializer(instance, data=data, context={'request': request}) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'target': ['Incorrect type. Expected url string, received int.']}) + def test_foreign_key_update_incorrect_type(self): + data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 2} + instance = ForeignKeySource.objects.get(pk=1) + serializer = ForeignKeySourceSerializer(instance, data=data, context={'request': request}) + self.assertFalse(serializer.is_valid()) + self.assertEqual(serializer.errors, {'target': ['Incorrect type. Expected URL string, received int.']}) -# def test_reverse_foreign_key_update(self): -# data = {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']} -# instance = ForeignKeyTarget.objects.get(pk=2) -# serializer = ForeignKeyTargetSerializer(instance, data=data, context={'request': request}) -# self.assertTrue(serializer.is_valid()) -# # We shouldn't have saved anything to the db yet since save -# # hasn't been called. -# queryset = ForeignKeyTarget.objects.all() -# new_serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/2/', 'http://testserver/foreignkeysource/3/']}, -# {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, -# ] -# self.assertEqual(new_serializer.data, expected) + def test_reverse_foreign_key_update(self): + data = {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']} + instance = ForeignKeyTarget.objects.get(pk=2) + serializer = ForeignKeyTargetSerializer(instance, data=data, context={'request': request}) + self.assertTrue(serializer.is_valid()) + # We shouldn't have saved anything to the db yet since save + # hasn't been called. + queryset = ForeignKeyTarget.objects.all() + new_serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/2/', 'http://testserver/foreignkeysource/3/']}, + {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, + ] + self.assertEqual(new_serializer.data, expected) -# serializer.save() -# self.assertEqual(serializer.data, data) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure target 2 is update, and everything else is as expected -# queryset = ForeignKeyTarget.objects.all() -# serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/2/']}, -# {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']}, -# ] -# self.assertEqual(serializer.data, expected) + # Ensure target 2 is update, and everything else is as expected + queryset = ForeignKeyTarget.objects.all() + serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/2/']}, + {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_create(self): -# data = {'url': 'http://testserver/foreignkeysource/4/', 'name': 'source-4', 'target': 'http://testserver/foreignkeytarget/2/'} -# serializer = ForeignKeySourceSerializer(data=data, context={'request': request}) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'source-4') + def test_foreign_key_create(self): + data = {'url': 'http://testserver/foreignkeysource/4/', 'name': 'source-4', 'target': 'http://testserver/foreignkeytarget/2/'} + serializer = ForeignKeySourceSerializer(data=data, context={'request': request}) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'source-4') -# # Ensure source 1 is updated, and everything else is as expected -# queryset = ForeignKeySource.objects.all() -# serializer = ForeignKeySourceSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/foreignkeysource/4/', 'name': 'source-4', 'target': 'http://testserver/foreignkeytarget/2/'}, -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 1 is updated, and everything else is as expected + queryset = ForeignKeySource.objects.all() + serializer = ForeignKeySourceSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/foreignkeysource/4/', 'name': 'source-4', 'target': 'http://testserver/foreignkeytarget/2/'}, + ] + self.assertEqual(serializer.data, expected) -# def test_reverse_foreign_key_create(self): -# data = {'url': 'http://testserver/foreignkeytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']} -# serializer = ForeignKeyTargetSerializer(data=data, context={'request': request}) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'target-3') + def test_reverse_foreign_key_create(self): + data = {'url': 'http://testserver/foreignkeytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']} + serializer = ForeignKeyTargetSerializer(data=data, context={'request': request}) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'target-3') -# # Ensure target 4 is added, and everything else is as expected -# queryset = ForeignKeyTarget.objects.all() -# serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/2/']}, -# {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, -# {'url': 'http://testserver/foreignkeytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']}, -# ] -# self.assertEqual(serializer.data, expected) + # Ensure target 4 is added, and everything else is as expected + queryset = ForeignKeyTarget.objects.all() + serializer = ForeignKeyTargetSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/2/']}, + {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, + {'url': 'http://testserver/foreignkeytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/3/']}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update_with_invalid_null(self): -# data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': None} -# instance = ForeignKeySource.objects.get(pk=1) -# serializer = ForeignKeySourceSerializer(instance, data=data, context={'request': request}) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'target': ['This field is required.']}) + def test_foreign_key_update_with_invalid_null(self): + data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': None} + instance = ForeignKeySource.objects.get(pk=1) + serializer = ForeignKeySourceSerializer(instance, data=data, context={'request': request}) + self.assertFalse(serializer.is_valid()) + self.assertEqual(serializer.errors, {'target': ['This field may not be null.']}) -# class HyperlinkedNullableForeignKeyTests(TestCase): -# urls = 'tests.test_relations_hyperlink' +class HyperlinkedNullableForeignKeyTests(TestCase): + urls = 'tests.test_relations_hyperlink' -# def setUp(self): -# target = ForeignKeyTarget(name='target-1') -# target.save() -# for idx in range(1, 4): -# if idx == 3: -# target = None -# source = NullableForeignKeySource(name='source-%d' % idx, target=target) -# source.save() + def setUp(self): + target = ForeignKeyTarget(name='target-1') + target.save() + for idx in range(1, 4): + if idx == 3: + target = None + source = NullableForeignKeySource(name='source-%d' % idx, target=target) + source.save() -# def test_foreign_key_retrieve_with_null(self): -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, -# ] -# self.assertEqual(serializer.data, expected) + def test_foreign_key_retrieve_with_null(self): + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_create_with_valid_null(self): -# data = {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} -# serializer = NullableForeignKeySourceSerializer(data=data, context={'request': request}) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'source-4') + def test_foreign_key_create_with_valid_null(self): + data = {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} + serializer = NullableForeignKeySourceSerializer(data=data, context={'request': request}) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'source-4') -# # Ensure source 4 is created, and everything else is as expected -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, -# {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 4 is created, and everything else is as expected + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, + {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_create_with_valid_emptystring(self): -# """ -# The emptystring should be interpreted as null in the context -# of relationships. -# """ -# data = {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': ''} -# expected_data = {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} -# serializer = NullableForeignKeySourceSerializer(data=data, context={'request': request}) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, expected_data) -# self.assertEqual(obj.name, 'source-4') + def test_foreign_key_create_with_valid_emptystring(self): + """ + The emptystring should be interpreted as null in the context + of relationships. + """ + data = {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': ''} + expected_data = {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} + serializer = NullableForeignKeySourceSerializer(data=data, context={'request': request}) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, expected_data) + self.assertEqual(obj.name, 'source-4') -# # Ensure source 4 is created, and everything else is as expected -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, -# {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 4 is created, and everything else is as expected + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, + {'url': 'http://testserver/nullableforeignkeysource/4/', 'name': 'source-4', 'target': None} + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update_with_valid_null(self): -# data = {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None} -# instance = NullableForeignKeySource.objects.get(pk=1) -# serializer = NullableForeignKeySourceSerializer(instance, data=data, context={'request': request}) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.data, data) -# serializer.save() + def test_foreign_key_update_with_valid_null(self): + data = {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None} + instance = NullableForeignKeySource.objects.get(pk=1) + serializer = NullableForeignKeySourceSerializer(instance, data=data, context={'request': request}) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure source 1 is updated, and everything else is as expected -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None}, -# {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 1 is updated, and everything else is as expected + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None}, + {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update_with_valid_emptystring(self): -# """ -# The emptystring should be interpreted as null in the context -# of relationships. -# """ -# data = {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': ''} -# expected_data = {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None} -# instance = NullableForeignKeySource.objects.get(pk=1) -# serializer = NullableForeignKeySourceSerializer(instance, data=data, context={'request': request}) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.data, expected_data) -# serializer.save() + def test_foreign_key_update_with_valid_emptystring(self): + """ + The emptystring should be interpreted as null in the context + of relationships. + """ + data = {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': ''} + expected_data = {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None} + instance = NullableForeignKeySource.objects.get(pk=1) + serializer = NullableForeignKeySourceSerializer(instance, data=data, context={'request': request}) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, expected_data) -# # Ensure source 1 is updated, and everything else is as expected -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None}, -# {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, -# {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 1 is updated, and everything else is as expected + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/nullableforeignkeysource/1/', 'name': 'source-1', 'target': None}, + {'url': 'http://testserver/nullableforeignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, + {'url': 'http://testserver/nullableforeignkeysource/3/', 'name': 'source-3', 'target': None}, + ] + self.assertEqual(serializer.data, expected) # # reverse foreign keys MUST be read_only # # In the general case they do not provide .remove() or .clear() # # and cannot be arbitrarily set. -# # def test_reverse_foreign_key_update(self): -# # data = {'id': 1, 'name': 'target-1', 'sources': [1]} -# # instance = ForeignKeyTarget.objects.get(pk=1) -# # serializer = ForeignKeyTargetSerializer(instance, data=data) -# # self.assertTrue(serializer.is_valid()) -# # self.assertEqual(serializer.data, data) -# # serializer.save() + # def test_reverse_foreign_key_update(self): + # data = {'id': 1, 'name': 'target-1', 'sources': [1]} + # instance = ForeignKeyTarget.objects.get(pk=1) + # serializer = ForeignKeyTargetSerializer(instance, data=data) + # print serializer.is_valid() + # print serializer.errors + # print serializer + # self.assertTrue(serializer.is_valid()) + # serializer.save() + # self.assertEqual(serializer.data, data) -# # # Ensure target 1 is updated, and everything else is as expected -# # queryset = ForeignKeyTarget.objects.all() -# # serializer = ForeignKeyTargetSerializer(queryset, many=True) -# # expected = [ -# # {'id': 1, 'name': 'target-1', 'sources': [1]}, -# # {'id': 2, 'name': 'target-2', 'sources': []}, -# # ] -# # self.assertEqual(serializer.data, expected) + # # Ensure target 1 is updated, and everything else is as expected + # queryset = ForeignKeyTarget.objects.all() + # serializer = ForeignKeyTargetSerializer(queryset, many=True) + # expected = [ + # {'id': 1, 'name': 'target-1', 'sources': [1]}, + # {'id': 2, 'name': 'target-2', 'sources': []}, + # ] + # self.assertEqual(serializer.data, expected) -# class HyperlinkedNullableOneToOneTests(TestCase): -# urls = 'tests.test_relations_hyperlink' +class HyperlinkedNullableOneToOneTests(TestCase): + urls = 'tests.test_relations_hyperlink' -# def setUp(self): -# target = OneToOneTarget(name='target-1') -# target.save() -# new_target = OneToOneTarget(name='target-2') -# new_target.save() -# source = NullableOneToOneSource(name='source-1', target=target) -# source.save() + def setUp(self): + target = OneToOneTarget(name='target-1') + target.save() + new_target = OneToOneTarget(name='target-2') + new_target.save() + source = NullableOneToOneSource(name='source-1', target=target) + source.save() -# def test_reverse_foreign_key_retrieve_with_null(self): -# queryset = OneToOneTarget.objects.all() -# serializer = NullableOneToOneTargetSerializer(queryset, many=True, context={'request': request}) -# expected = [ -# {'url': 'http://testserver/onetoonetarget/1/', 'name': 'target-1', 'nullable_source': 'http://testserver/nullableonetoonesource/1/'}, -# {'url': 'http://testserver/onetoonetarget/2/', 'name': 'target-2', 'nullable_source': None}, -# ] -# self.assertEqual(serializer.data, expected) + def test_reverse_foreign_key_retrieve_with_null(self): + queryset = OneToOneTarget.objects.all() + serializer = NullableOneToOneTargetSerializer(queryset, many=True, context={'request': request}) + expected = [ + {'url': 'http://testserver/onetoonetarget/1/', 'name': 'target-1', 'nullable_source': 'http://testserver/nullableonetoonesource/1/'}, + {'url': 'http://testserver/onetoonetarget/2/', 'name': 'target-2', 'nullable_source': None}, + ] + self.assertEqual(serializer.data, expected) # # Regression tests for #694 (`source` attribute on related fields) diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index 031a79b32..da3c57863 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -1,446 +1,443 @@ -# from __future__ import unicode_literals -# from django.db import models -# from django.test import TestCase -# from django.utils import six -# from rest_framework import serializers -# from tests.models import ( -# BlogPost, ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource, -# NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource, -# ) +from __future__ import unicode_literals +from django.test import TestCase +from django.utils import six +from rest_framework import serializers +from tests.models import ( + ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource, + NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource, +) -# # ManyToMany -# class ManyToManyTargetSerializer(serializers.ModelSerializer): -# class Meta: -# model = ManyToManyTarget -# fields = ('id', 'name', 'sources') +# ManyToMany +class ManyToManyTargetSerializer(serializers.ModelSerializer): + class Meta: + model = ManyToManyTarget + fields = ('id', 'name', 'sources') -# class ManyToManySourceSerializer(serializers.ModelSerializer): -# class Meta: -# model = ManyToManySource -# fields = ('id', 'name', 'targets') +class ManyToManySourceSerializer(serializers.ModelSerializer): + class Meta: + model = ManyToManySource + fields = ('id', 'name', 'targets') -# # ForeignKey -# class ForeignKeyTargetSerializer(serializers.ModelSerializer): -# class Meta: -# model = ForeignKeyTarget -# fields = ('id', 'name', 'sources') +# ForeignKey +class ForeignKeyTargetSerializer(serializers.ModelSerializer): + class Meta: + model = ForeignKeyTarget + fields = ('id', 'name', 'sources') -# class ForeignKeySourceSerializer(serializers.ModelSerializer): -# class Meta: -# model = ForeignKeySource -# fields = ('id', 'name', 'target') +class ForeignKeySourceSerializer(serializers.ModelSerializer): + class Meta: + model = ForeignKeySource + fields = ('id', 'name', 'target') -# # Nullable ForeignKey -# class NullableForeignKeySourceSerializer(serializers.ModelSerializer): -# class Meta: -# model = NullableForeignKeySource -# fields = ('id', 'name', 'target') +# Nullable ForeignKey +class NullableForeignKeySourceSerializer(serializers.ModelSerializer): + class Meta: + model = NullableForeignKeySource + fields = ('id', 'name', 'target') -# # Nullable OneToOne -# class NullableOneToOneTargetSerializer(serializers.ModelSerializer): -# class Meta: -# model = OneToOneTarget -# fields = ('id', 'name', 'nullable_source') +# Nullable OneToOne +class NullableOneToOneTargetSerializer(serializers.ModelSerializer): + class Meta: + model = OneToOneTarget + fields = ('id', 'name', 'nullable_source') -# # TODO: Add test that .data cannot be accessed prior to .is_valid +# TODO: Add test that .data cannot be accessed prior to .is_valid -# class PKManyToManyTests(TestCase): -# def setUp(self): -# for idx in range(1, 4): -# target = ManyToManyTarget(name='target-%d' % idx) -# target.save() -# source = ManyToManySource(name='source-%d' % idx) -# source.save() -# for target in ManyToManyTarget.objects.all(): -# source.targets.add(target) +class PKManyToManyTests(TestCase): + def setUp(self): + for idx in range(1, 4): + target = ManyToManyTarget(name='target-%d' % idx) + target.save() + source = ManyToManySource(name='source-%d' % idx) + source.save() + for target in ManyToManyTarget.objects.all(): + source.targets.add(target) -# def test_many_to_many_retrieve(self): -# queryset = ManyToManySource.objects.all() -# serializer = ManyToManySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'targets': [1]}, -# {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, -# {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} -# ] -# self.assertEqual(serializer.data, expected) + def test_many_to_many_retrieve(self): + queryset = ManyToManySource.objects.all() + serializer = ManyToManySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'targets': [1]}, + {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, + {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} + ] + self.assertEqual(serializer.data, expected) -# def test_reverse_many_to_many_retrieve(self): -# queryset = ManyToManyTarget.objects.all() -# serializer = ManyToManyTargetSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, -# {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, -# {'id': 3, 'name': 'target-3', 'sources': [3]} -# ] -# self.assertEqual(serializer.data, expected) + def test_reverse_many_to_many_retrieve(self): + queryset = ManyToManyTarget.objects.all() + serializer = ManyToManyTargetSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, + {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, + {'id': 3, 'name': 'target-3', 'sources': [3]} + ] + self.assertEqual(serializer.data, expected) -# def test_many_to_many_update(self): -# data = {'id': 1, 'name': 'source-1', 'targets': [1, 2, 3]} -# instance = ManyToManySource.objects.get(pk=1) -# serializer = ManyToManySourceSerializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# serializer.save() -# self.assertEqual(serializer.data, data) + def test_many_to_many_update(self): + data = {'id': 1, 'name': 'source-1', 'targets': [1, 2, 3]} + instance = ManyToManySource.objects.get(pk=1) + serializer = ManyToManySourceSerializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure source 1 is updated, and everything else is as expected -# queryset = ManyToManySource.objects.all() -# serializer = ManyToManySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'targets': [1, 2, 3]}, -# {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, -# {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 1 is updated, and everything else is as expected + queryset = ManyToManySource.objects.all() + serializer = ManyToManySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'targets': [1, 2, 3]}, + {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, + {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} + ] + self.assertEqual(serializer.data, expected) -# def test_reverse_many_to_many_update(self): -# data = {'id': 1, 'name': 'target-1', 'sources': [1]} -# instance = ManyToManyTarget.objects.get(pk=1) -# serializer = ManyToManyTargetSerializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# serializer.save() -# self.assertEqual(serializer.data, data) + def test_reverse_many_to_many_update(self): + data = {'id': 1, 'name': 'target-1', 'sources': [1]} + instance = ManyToManyTarget.objects.get(pk=1) + serializer = ManyToManyTargetSerializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure target 1 is updated, and everything else is as expected -# queryset = ManyToManyTarget.objects.all() -# serializer = ManyToManyTargetSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': [1]}, -# {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, -# {'id': 3, 'name': 'target-3', 'sources': [3]} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure target 1 is updated, and everything else is as expected + queryset = ManyToManyTarget.objects.all() + serializer = ManyToManyTargetSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': [1]}, + {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, + {'id': 3, 'name': 'target-3', 'sources': [3]} + ] + self.assertEqual(serializer.data, expected) -# def test_many_to_many_create(self): -# data = {'id': 4, 'name': 'source-4', 'targets': [1, 3]} -# serializer = ManyToManySourceSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'source-4') + def test_many_to_many_create(self): + data = {'id': 4, 'name': 'source-4', 'targets': [1, 3]} + serializer = ManyToManySourceSerializer(data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'source-4') -# # Ensure source 4 is added, and everything else is as expected -# queryset = ManyToManySource.objects.all() -# serializer = ManyToManySourceSerializer(queryset, many=True) -# self.assertFalse(serializer.fields['targets'].read_only) -# expected = [ -# {'id': 1, 'name': 'source-1', 'targets': [1]}, -# {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, -# {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]}, -# {'id': 4, 'name': 'source-4', 'targets': [1, 3]}, -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 4 is added, and everything else is as expected + queryset = ManyToManySource.objects.all() + serializer = ManyToManySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'targets': [1]}, + {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, + {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]}, + {'id': 4, 'name': 'source-4', 'targets': [1, 3]}, + ] + self.assertEqual(serializer.data, expected) -# def test_reverse_many_to_many_create(self): -# data = {'id': 4, 'name': 'target-4', 'sources': [1, 3]} -# serializer = ManyToManyTargetSerializer(data=data) -# self.assertFalse(serializer.fields['sources'].read_only) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'target-4') + def test_reverse_many_to_many_create(self): + data = {'id': 4, 'name': 'target-4', 'sources': [1, 3]} + serializer = ManyToManyTargetSerializer(data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'target-4') -# # Ensure target 4 is added, and everything else is as expected -# queryset = ManyToManyTarget.objects.all() -# serializer = ManyToManyTargetSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, -# {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, -# {'id': 3, 'name': 'target-3', 'sources': [3]}, -# {'id': 4, 'name': 'target-4', 'sources': [1, 3]} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure target 4 is added, and everything else is as expected + queryset = ManyToManyTarget.objects.all() + serializer = ManyToManyTargetSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, + {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, + {'id': 3, 'name': 'target-3', 'sources': [3]}, + {'id': 4, 'name': 'target-4', 'sources': [1, 3]} + ] + self.assertEqual(serializer.data, expected) -# class PKForeignKeyTests(TestCase): -# def setUp(self): -# target = ForeignKeyTarget(name='target-1') -# target.save() -# new_target = ForeignKeyTarget(name='target-2') -# new_target.save() -# for idx in range(1, 4): -# source = ForeignKeySource(name='source-%d' % idx, target=target) -# source.save() +class PKForeignKeyTests(TestCase): + def setUp(self): + target = ForeignKeyTarget(name='target-1') + target.save() + new_target = ForeignKeyTarget(name='target-2') + new_target.save() + for idx in range(1, 4): + source = ForeignKeySource(name='source-%d' % idx, target=target) + source.save() -# def test_foreign_key_retrieve(self): -# queryset = ForeignKeySource.objects.all() -# serializer = ForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': 1}, -# {'id': 2, 'name': 'source-2', 'target': 1}, -# {'id': 3, 'name': 'source-3', 'target': 1} -# ] -# self.assertEqual(serializer.data, expected) + def test_foreign_key_retrieve(self): + queryset = ForeignKeySource.objects.all() + serializer = ForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': 1}, + {'id': 2, 'name': 'source-2', 'target': 1}, + {'id': 3, 'name': 'source-3', 'target': 1} + ] + self.assertEqual(serializer.data, expected) -# def test_reverse_foreign_key_retrieve(self): -# queryset = ForeignKeyTarget.objects.all() -# serializer = ForeignKeyTargetSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, -# {'id': 2, 'name': 'target-2', 'sources': []}, -# ] -# self.assertEqual(serializer.data, expected) + def test_reverse_foreign_key_retrieve(self): + queryset = ForeignKeyTarget.objects.all() + serializer = ForeignKeyTargetSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, + {'id': 2, 'name': 'target-2', 'sources': []}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update(self): -# data = {'id': 1, 'name': 'source-1', 'target': 2} -# instance = ForeignKeySource.objects.get(pk=1) -# serializer = ForeignKeySourceSerializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.data, data) -# serializer.save() + def test_foreign_key_update(self): + data = {'id': 1, 'name': 'source-1', 'target': 2} + instance = ForeignKeySource.objects.get(pk=1) + serializer = ForeignKeySourceSerializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure source 1 is updated, and everything else is as expected -# queryset = ForeignKeySource.objects.all() -# serializer = ForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': 2}, -# {'id': 2, 'name': 'source-2', 'target': 1}, -# {'id': 3, 'name': 'source-3', 'target': 1} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 1 is updated, and everything else is as expected + queryset = ForeignKeySource.objects.all() + serializer = ForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': 2}, + {'id': 2, 'name': 'source-2', 'target': 1}, + {'id': 3, 'name': 'source-3', 'target': 1} + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update_incorrect_type(self): -# data = {'id': 1, 'name': 'source-1', 'target': 'foo'} -# instance = ForeignKeySource.objects.get(pk=1) -# serializer = ForeignKeySourceSerializer(instance, data=data) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'target': ['Incorrect type. Expected pk value, received %s.' % six.text_type.__name__]}) + def test_foreign_key_update_incorrect_type(self): + data = {'id': 1, 'name': 'source-1', 'target': 'foo'} + instance = ForeignKeySource.objects.get(pk=1) + serializer = ForeignKeySourceSerializer(instance, data=data) + self.assertFalse(serializer.is_valid()) + self.assertEqual(serializer.errors, {'target': ['Incorrect type. Expected pk value, received %s.' % six.text_type.__name__]}) -# def test_reverse_foreign_key_update(self): -# data = {'id': 2, 'name': 'target-2', 'sources': [1, 3]} -# instance = ForeignKeyTarget.objects.get(pk=2) -# serializer = ForeignKeyTargetSerializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# # We shouldn't have saved anything to the db yet since save -# # hasn't been called. -# queryset = ForeignKeyTarget.objects.all() -# new_serializer = ForeignKeyTargetSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, -# {'id': 2, 'name': 'target-2', 'sources': []}, -# ] -# self.assertEqual(new_serializer.data, expected) + def test_reverse_foreign_key_update(self): + data = {'id': 2, 'name': 'target-2', 'sources': [1, 3]} + instance = ForeignKeyTarget.objects.get(pk=2) + serializer = ForeignKeyTargetSerializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + # We shouldn't have saved anything to the db yet since save + # hasn't been called. + queryset = ForeignKeyTarget.objects.all() + new_serializer = ForeignKeyTargetSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, + {'id': 2, 'name': 'target-2', 'sources': []}, + ] + self.assertEqual(new_serializer.data, expected) -# serializer.save() -# self.assertEqual(serializer.data, data) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure target 2 is update, and everything else is as expected -# queryset = ForeignKeyTarget.objects.all() -# serializer = ForeignKeyTargetSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': [2]}, -# {'id': 2, 'name': 'target-2', 'sources': [1, 3]}, -# ] -# self.assertEqual(serializer.data, expected) + # Ensure target 2 is update, and everything else is as expected + queryset = ForeignKeyTarget.objects.all() + serializer = ForeignKeyTargetSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': [2]}, + {'id': 2, 'name': 'target-2', 'sources': [1, 3]}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_create(self): -# data = {'id': 4, 'name': 'source-4', 'target': 2} -# serializer = ForeignKeySourceSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'source-4') + def test_foreign_key_create(self): + data = {'id': 4, 'name': 'source-4', 'target': 2} + serializer = ForeignKeySourceSerializer(data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'source-4') -# # Ensure source 4 is added, and everything else is as expected -# queryset = ForeignKeySource.objects.all() -# serializer = ForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': 1}, -# {'id': 2, 'name': 'source-2', 'target': 1}, -# {'id': 3, 'name': 'source-3', 'target': 1}, -# {'id': 4, 'name': 'source-4', 'target': 2}, -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 4 is added, and everything else is as expected + queryset = ForeignKeySource.objects.all() + serializer = ForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': 1}, + {'id': 2, 'name': 'source-2', 'target': 1}, + {'id': 3, 'name': 'source-3', 'target': 1}, + {'id': 4, 'name': 'source-4', 'target': 2}, + ] + self.assertEqual(serializer.data, expected) -# def test_reverse_foreign_key_create(self): -# data = {'id': 3, 'name': 'target-3', 'sources': [1, 3]} -# serializer = ForeignKeyTargetSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'target-3') + def test_reverse_foreign_key_create(self): + data = {'id': 3, 'name': 'target-3', 'sources': [1, 3]} + serializer = ForeignKeyTargetSerializer(data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'target-3') -# # Ensure target 3 is added, and everything else is as expected -# queryset = ForeignKeyTarget.objects.all() -# serializer = ForeignKeyTargetSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': [2]}, -# {'id': 2, 'name': 'target-2', 'sources': []}, -# {'id': 3, 'name': 'target-3', 'sources': [1, 3]}, -# ] -# self.assertEqual(serializer.data, expected) + # Ensure target 3 is added, and everything else is as expected + queryset = ForeignKeyTarget.objects.all() + serializer = ForeignKeyTargetSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': [2]}, + {'id': 2, 'name': 'target-2', 'sources': []}, + {'id': 3, 'name': 'target-3', 'sources': [1, 3]}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update_with_invalid_null(self): -# data = {'id': 1, 'name': 'source-1', 'target': None} -# instance = ForeignKeySource.objects.get(pk=1) -# serializer = ForeignKeySourceSerializer(instance, data=data) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'target': ['This field is required.']}) + def test_foreign_key_update_with_invalid_null(self): + data = {'id': 1, 'name': 'source-1', 'target': None} + instance = ForeignKeySource.objects.get(pk=1) + serializer = ForeignKeySourceSerializer(instance, data=data) + self.assertFalse(serializer.is_valid()) + self.assertEqual(serializer.errors, {'target': ['This field may not be null.']}) -# def test_foreign_key_with_empty(self): -# """ -# Regression test for #1072 + def test_foreign_key_with_empty(self): + """ + Regression test for #1072 -# https://github.com/tomchristie/django-rest-framework/issues/1072 -# """ -# serializer = NullableForeignKeySourceSerializer() -# self.assertEqual(serializer.data['target'], None) + https://github.com/tomchristie/django-rest-framework/issues/1072 + """ + serializer = NullableForeignKeySourceSerializer() + self.assertEqual(serializer.data['target'], None) -# class PKNullableForeignKeyTests(TestCase): -# def setUp(self): -# target = ForeignKeyTarget(name='target-1') -# target.save() -# for idx in range(1, 4): -# if idx == 3: -# target = None -# source = NullableForeignKeySource(name='source-%d' % idx, target=target) -# source.save() +class PKNullableForeignKeyTests(TestCase): + def setUp(self): + target = ForeignKeyTarget(name='target-1') + target.save() + for idx in range(1, 4): + if idx == 3: + target = None + source = NullableForeignKeySource(name='source-%d' % idx, target=target) + source.save() -# def test_foreign_key_retrieve_with_null(self): -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': 1}, -# {'id': 2, 'name': 'source-2', 'target': 1}, -# {'id': 3, 'name': 'source-3', 'target': None}, -# ] -# self.assertEqual(serializer.data, expected) + def test_foreign_key_retrieve_with_null(self): + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': 1}, + {'id': 2, 'name': 'source-2', 'target': 1}, + {'id': 3, 'name': 'source-3', 'target': None}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_create_with_valid_null(self): -# data = {'id': 4, 'name': 'source-4', 'target': None} -# serializer = NullableForeignKeySourceSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'source-4') + def test_foreign_key_create_with_valid_null(self): + data = {'id': 4, 'name': 'source-4', 'target': None} + serializer = NullableForeignKeySourceSerializer(data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'source-4') -# # Ensure source 4 is created, and everything else is as expected -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': 1}, -# {'id': 2, 'name': 'source-2', 'target': 1}, -# {'id': 3, 'name': 'source-3', 'target': None}, -# {'id': 4, 'name': 'source-4', 'target': None} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 4 is created, and everything else is as expected + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': 1}, + {'id': 2, 'name': 'source-2', 'target': 1}, + {'id': 3, 'name': 'source-3', 'target': None}, + {'id': 4, 'name': 'source-4', 'target': None} + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_create_with_valid_emptystring(self): -# """ -# The emptystring should be interpreted as null in the context -# of relationships. -# """ -# data = {'id': 4, 'name': 'source-4', 'target': ''} -# expected_data = {'id': 4, 'name': 'source-4', 'target': None} -# serializer = NullableForeignKeySourceSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, expected_data) -# self.assertEqual(obj.name, 'source-4') + def test_foreign_key_create_with_valid_emptystring(self): + """ + The emptystring should be interpreted as null in the context + of relationships. + """ + data = {'id': 4, 'name': 'source-4', 'target': ''} + expected_data = {'id': 4, 'name': 'source-4', 'target': None} + serializer = NullableForeignKeySourceSerializer(data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, expected_data) + self.assertEqual(obj.name, 'source-4') -# # Ensure source 4 is created, and everything else is as expected -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': 1}, -# {'id': 2, 'name': 'source-2', 'target': 1}, -# {'id': 3, 'name': 'source-3', 'target': None}, -# {'id': 4, 'name': 'source-4', 'target': None} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 4 is created, and everything else is as expected + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': 1}, + {'id': 2, 'name': 'source-2', 'target': 1}, + {'id': 3, 'name': 'source-3', 'target': None}, + {'id': 4, 'name': 'source-4', 'target': None} + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update_with_valid_null(self): -# data = {'id': 1, 'name': 'source-1', 'target': None} -# instance = NullableForeignKeySource.objects.get(pk=1) -# serializer = NullableForeignKeySourceSerializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.data, data) -# serializer.save() + def test_foreign_key_update_with_valid_null(self): + data = {'id': 1, 'name': 'source-1', 'target': None} + instance = NullableForeignKeySource.objects.get(pk=1) + serializer = NullableForeignKeySourceSerializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure source 1 is updated, and everything else is as expected -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': None}, -# {'id': 2, 'name': 'source-2', 'target': 1}, -# {'id': 3, 'name': 'source-3', 'target': None} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 1 is updated, and everything else is as expected + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': None}, + {'id': 2, 'name': 'source-2', 'target': 1}, + {'id': 3, 'name': 'source-3', 'target': None} + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update_with_valid_emptystring(self): -# """ -# The emptystring should be interpreted as null in the context -# of relationships. -# """ -# data = {'id': 1, 'name': 'source-1', 'target': ''} -# expected_data = {'id': 1, 'name': 'source-1', 'target': None} -# instance = NullableForeignKeySource.objects.get(pk=1) -# serializer = NullableForeignKeySourceSerializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.data, expected_data) -# serializer.save() + def test_foreign_key_update_with_valid_emptystring(self): + """ + The emptystring should be interpreted as null in the context + of relationships. + """ + data = {'id': 1, 'name': 'source-1', 'target': ''} + expected_data = {'id': 1, 'name': 'source-1', 'target': None} + instance = NullableForeignKeySource.objects.get(pk=1) + serializer = NullableForeignKeySourceSerializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, expected_data) -# # Ensure source 1 is updated, and everything else is as expected -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': None}, -# {'id': 2, 'name': 'source-2', 'target': 1}, -# {'id': 3, 'name': 'source-3', 'target': None} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 1 is updated, and everything else is as expected + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': None}, + {'id': 2, 'name': 'source-2', 'target': 1}, + {'id': 3, 'name': 'source-3', 'target': None} + ] + self.assertEqual(serializer.data, expected) -# # reverse foreign keys MUST be read_only -# # In the general case they do not provide .remove() or .clear() -# # and cannot be arbitrarily set. + # reverse foreign keys MUST be read_only + # In the general case they do not provide .remove() or .clear() + # and cannot be arbitrarily set. -# # def test_reverse_foreign_key_update(self): -# # data = {'id': 1, 'name': 'target-1', 'sources': [1]} -# # instance = ForeignKeyTarget.objects.get(pk=1) -# # serializer = ForeignKeyTargetSerializer(instance, data=data) -# # self.assertTrue(serializer.is_valid()) -# # self.assertEqual(serializer.data, data) -# # serializer.save() + # def test_reverse_foreign_key_update(self): + # data = {'id': 1, 'name': 'target-1', 'sources': [1]} + # instance = ForeignKeyTarget.objects.get(pk=1) + # serializer = ForeignKeyTargetSerializer(instance, data=data) + # self.assertTrue(serializer.is_valid()) + # self.assertEqual(serializer.data, data) + # serializer.save() -# # # Ensure target 1 is updated, and everything else is as expected -# # queryset = ForeignKeyTarget.objects.all() -# # serializer = ForeignKeyTargetSerializer(queryset, many=True) -# # expected = [ -# # {'id': 1, 'name': 'target-1', 'sources': [1]}, -# # {'id': 2, 'name': 'target-2', 'sources': []}, -# # ] -# # self.assertEqual(serializer.data, expected) + # # Ensure target 1 is updated, and everything else is as expected + # queryset = ForeignKeyTarget.objects.all() + # serializer = ForeignKeyTargetSerializer(queryset, many=True) + # expected = [ + # {'id': 1, 'name': 'target-1', 'sources': [1]}, + # {'id': 2, 'name': 'target-2', 'sources': []}, + # ] + # self.assertEqual(serializer.data, expected) -# class PKNullableOneToOneTests(TestCase): -# def setUp(self): -# target = OneToOneTarget(name='target-1') -# target.save() -# new_target = OneToOneTarget(name='target-2') -# new_target.save() -# source = NullableOneToOneSource(name='source-1', target=new_target) -# source.save() +class PKNullableOneToOneTests(TestCase): + def setUp(self): + target = OneToOneTarget(name='target-1') + target.save() + new_target = OneToOneTarget(name='target-2') + new_target.save() + source = NullableOneToOneSource(name='source-1', target=new_target) + source.save() -# def test_reverse_foreign_key_retrieve_with_null(self): -# queryset = OneToOneTarget.objects.all() -# serializer = NullableOneToOneTargetSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'nullable_source': None}, -# {'id': 2, 'name': 'target-2', 'nullable_source': 1}, -# ] -# self.assertEqual(serializer.data, expected) + def test_reverse_foreign_key_retrieve_with_null(self): + queryset = OneToOneTarget.objects.all() + serializer = NullableOneToOneTargetSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'target-1', 'nullable_source': None}, + {'id': 2, 'name': 'target-2', 'nullable_source': 1}, + ] + self.assertEqual(serializer.data, expected) -# # The below models and tests ensure that serializer fields corresponding -# # to a ManyToManyField field with a user-specified ``through`` model are -# # set to read only +# The below models and tests ensure that serializer fields corresponding +# to a ManyToManyField field with a user-specified ``through`` model are +# set to read only # class ManyToManyThroughTarget(models.Model): @@ -481,7 +478,6 @@ # def test_many_to_many_create(self): # data = {'id': 2, 'name': 'source-2', 'targets': [self.target.pk]} # serializer = ManyToManyThroughSourceSerializer(data=data) -# self.assertTrue(serializer.fields['targets'].read_only) # self.assertTrue(serializer.is_valid()) # obj = serializer.save() # self.assertEqual(obj.name, 'source-2') @@ -490,9 +486,7 @@ # def test_many_to_many_reverse_create(self): # data = {'id': 2, 'name': 'target-2', 'sources': [self.source.pk]} # serializer = ManyToManyThroughTargetSerializer(data=data) -# self.assertTrue(serializer.fields['sources'].read_only) # self.assertTrue(serializer.is_valid()) -# serializer.save() # obj = serializer.save() # self.assertEqual(obj.name, 'target-2') # self.assertEqual(obj.sources.count(), 0) diff --git a/tests/test_relations_slug.py b/tests/test_relations_slug.py index f7a59a957..7bac90460 100644 --- a/tests/test_relations_slug.py +++ b/tests/test_relations_slug.py @@ -1,257 +1,268 @@ -# from django.test import TestCase -# from rest_framework import serializers -# from tests.models import NullableForeignKeySource, ForeignKeySource, ForeignKeyTarget +from django.test import TestCase +from rest_framework import serializers +from tests.models import NullableForeignKeySource, ForeignKeySource, ForeignKeyTarget -# class ForeignKeyTargetSerializer(serializers.ModelSerializer): -# sources = serializers.SlugRelatedField(many=True, slug_field='name') +class ForeignKeyTargetSerializer(serializers.ModelSerializer): + sources = serializers.SlugRelatedField( + slug_field='name', + queryset=ForeignKeySource.objects.all(), + many=True + ) -# class Meta: -# model = ForeignKeyTarget + class Meta: + model = ForeignKeyTarget -# class ForeignKeySourceSerializer(serializers.ModelSerializer): -# target = serializers.SlugRelatedField(slug_field='name') +class ForeignKeySourceSerializer(serializers.ModelSerializer): + target = serializers.SlugRelatedField( + slug_field='name', + queryset=ForeignKeyTarget.objects.all() + ) -# class Meta: -# model = ForeignKeySource + class Meta: + model = ForeignKeySource -# class NullableForeignKeySourceSerializer(serializers.ModelSerializer): -# target = serializers.SlugRelatedField(slug_field='name', required=False) +class NullableForeignKeySourceSerializer(serializers.ModelSerializer): + target = serializers.SlugRelatedField( + slug_field='name', + queryset=ForeignKeyTarget.objects.all(), + allow_null=True + ) -# class Meta: -# model = NullableForeignKeySource + class Meta: + model = NullableForeignKeySource -# # TODO: M2M Tests, FKTests (Non-nullable), One2One -# class SlugForeignKeyTests(TestCase): -# def setUp(self): -# target = ForeignKeyTarget(name='target-1') -# target.save() -# new_target = ForeignKeyTarget(name='target-2') -# new_target.save() -# for idx in range(1, 4): -# source = ForeignKeySource(name='source-%d' % idx, target=target) -# source.save() +# TODO: M2M Tests, FKTests (Non-nullable), One2One +class SlugForeignKeyTests(TestCase): + def setUp(self): + target = ForeignKeyTarget(name='target-1') + target.save() + new_target = ForeignKeyTarget(name='target-2') + new_target.save() + for idx in range(1, 4): + source = ForeignKeySource(name='source-%d' % idx, target=target) + source.save() -# def test_foreign_key_retrieve(self): -# queryset = ForeignKeySource.objects.all() -# serializer = ForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': 'target-1'}, -# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, -# {'id': 3, 'name': 'source-3', 'target': 'target-1'} -# ] -# self.assertEqual(serializer.data, expected) + def test_foreign_key_retrieve(self): + queryset = ForeignKeySource.objects.all() + serializer = ForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': 'target-1'}, + {'id': 2, 'name': 'source-2', 'target': 'target-1'}, + {'id': 3, 'name': 'source-3', 'target': 'target-1'} + ] + self.assertEqual(serializer.data, expected) -# def test_reverse_foreign_key_retrieve(self): -# queryset = ForeignKeyTarget.objects.all() -# serializer = ForeignKeyTargetSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': ['source-1', 'source-2', 'source-3']}, -# {'id': 2, 'name': 'target-2', 'sources': []}, -# ] -# self.assertEqual(serializer.data, expected) + def test_reverse_foreign_key_retrieve(self): + queryset = ForeignKeyTarget.objects.all() + serializer = ForeignKeyTargetSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': ['source-1', 'source-2', 'source-3']}, + {'id': 2, 'name': 'target-2', 'sources': []}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update(self): -# data = {'id': 1, 'name': 'source-1', 'target': 'target-2'} -# instance = ForeignKeySource.objects.get(pk=1) -# serializer = ForeignKeySourceSerializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.data, data) -# serializer.save() + def test_foreign_key_update(self): + data = {'id': 1, 'name': 'source-1', 'target': 'target-2'} + instance = ForeignKeySource.objects.get(pk=1) + serializer = ForeignKeySourceSerializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure source 1 is updated, and everything else is as expected -# queryset = ForeignKeySource.objects.all() -# serializer = ForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': 'target-2'}, -# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, -# {'id': 3, 'name': 'source-3', 'target': 'target-1'} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 1 is updated, and everything else is as expected + queryset = ForeignKeySource.objects.all() + serializer = ForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': 'target-2'}, + {'id': 2, 'name': 'source-2', 'target': 'target-1'}, + {'id': 3, 'name': 'source-3', 'target': 'target-1'} + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update_incorrect_type(self): -# data = {'id': 1, 'name': 'source-1', 'target': 123} -# instance = ForeignKeySource.objects.get(pk=1) -# serializer = ForeignKeySourceSerializer(instance, data=data) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'target': ['Object with name=123 does not exist.']}) + def test_foreign_key_update_incorrect_type(self): + data = {'id': 1, 'name': 'source-1', 'target': 123} + instance = ForeignKeySource.objects.get(pk=1) + serializer = ForeignKeySourceSerializer(instance, data=data) + self.assertFalse(serializer.is_valid()) + self.assertEqual(serializer.errors, {'target': ['Object with name=123 does not exist.']}) -# def test_reverse_foreign_key_update(self): -# data = {'id': 2, 'name': 'target-2', 'sources': ['source-1', 'source-3']} -# instance = ForeignKeyTarget.objects.get(pk=2) -# serializer = ForeignKeyTargetSerializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# # We shouldn't have saved anything to the db yet since save -# # hasn't been called. -# queryset = ForeignKeyTarget.objects.all() -# new_serializer = ForeignKeyTargetSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': ['source-1', 'source-2', 'source-3']}, -# {'id': 2, 'name': 'target-2', 'sources': []}, -# ] -# self.assertEqual(new_serializer.data, expected) + def test_reverse_foreign_key_update(self): + data = {'id': 2, 'name': 'target-2', 'sources': ['source-1', 'source-3']} + instance = ForeignKeyTarget.objects.get(pk=2) + serializer = ForeignKeyTargetSerializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + # We shouldn't have saved anything to the db yet since save + # hasn't been called. + queryset = ForeignKeyTarget.objects.all() + new_serializer = ForeignKeyTargetSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': ['source-1', 'source-2', 'source-3']}, + {'id': 2, 'name': 'target-2', 'sources': []}, + ] + self.assertEqual(new_serializer.data, expected) -# serializer.save() -# self.assertEqual(serializer.data, data) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure target 2 is update, and everything else is as expected -# queryset = ForeignKeyTarget.objects.all() -# serializer = ForeignKeyTargetSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': ['source-2']}, -# {'id': 2, 'name': 'target-2', 'sources': ['source-1', 'source-3']}, -# ] -# self.assertEqual(serializer.data, expected) + # Ensure target 2 is update, and everything else is as expected + queryset = ForeignKeyTarget.objects.all() + serializer = ForeignKeyTargetSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': ['source-2']}, + {'id': 2, 'name': 'target-2', 'sources': ['source-1', 'source-3']}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_create(self): -# data = {'id': 4, 'name': 'source-4', 'target': 'target-2'} -# serializer = ForeignKeySourceSerializer(data=data) -# serializer.is_valid() -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'source-4') + def test_foreign_key_create(self): + data = {'id': 4, 'name': 'source-4', 'target': 'target-2'} + serializer = ForeignKeySourceSerializer(data=data) + serializer.is_valid() + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'source-4') -# # Ensure source 4 is added, and everything else is as expected -# queryset = ForeignKeySource.objects.all() -# serializer = ForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': 'target-1'}, -# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, -# {'id': 3, 'name': 'source-3', 'target': 'target-1'}, -# {'id': 4, 'name': 'source-4', 'target': 'target-2'}, -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 4 is added, and everything else is as expected + queryset = ForeignKeySource.objects.all() + serializer = ForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': 'target-1'}, + {'id': 2, 'name': 'source-2', 'target': 'target-1'}, + {'id': 3, 'name': 'source-3', 'target': 'target-1'}, + {'id': 4, 'name': 'source-4', 'target': 'target-2'}, + ] + self.assertEqual(serializer.data, expected) -# def test_reverse_foreign_key_create(self): -# data = {'id': 3, 'name': 'target-3', 'sources': ['source-1', 'source-3']} -# serializer = ForeignKeyTargetSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'target-3') + def test_reverse_foreign_key_create(self): + data = {'id': 3, 'name': 'target-3', 'sources': ['source-1', 'source-3']} + serializer = ForeignKeyTargetSerializer(data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'target-3') -# # Ensure target 3 is added, and everything else is as expected -# queryset = ForeignKeyTarget.objects.all() -# serializer = ForeignKeyTargetSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': ['source-2']}, -# {'id': 2, 'name': 'target-2', 'sources': []}, -# {'id': 3, 'name': 'target-3', 'sources': ['source-1', 'source-3']}, -# ] -# self.assertEqual(serializer.data, expected) + # Ensure target 3 is added, and everything else is as expected + queryset = ForeignKeyTarget.objects.all() + serializer = ForeignKeyTargetSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'target-1', 'sources': ['source-2']}, + {'id': 2, 'name': 'target-2', 'sources': []}, + {'id': 3, 'name': 'target-3', 'sources': ['source-1', 'source-3']}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update_with_invalid_null(self): -# data = {'id': 1, 'name': 'source-1', 'target': None} -# instance = ForeignKeySource.objects.get(pk=1) -# serializer = ForeignKeySourceSerializer(instance, data=data) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'target': ['This field is required.']}) + def test_foreign_key_update_with_invalid_null(self): + data = {'id': 1, 'name': 'source-1', 'target': None} + instance = ForeignKeySource.objects.get(pk=1) + serializer = ForeignKeySourceSerializer(instance, data=data) + self.assertFalse(serializer.is_valid()) + self.assertEqual(serializer.errors, {'target': ['This field may not be null.']}) -# class SlugNullableForeignKeyTests(TestCase): -# def setUp(self): -# target = ForeignKeyTarget(name='target-1') -# target.save() -# for idx in range(1, 4): -# if idx == 3: -# target = None -# source = NullableForeignKeySource(name='source-%d' % idx, target=target) -# source.save() +class SlugNullableForeignKeyTests(TestCase): + def setUp(self): + target = ForeignKeyTarget(name='target-1') + target.save() + for idx in range(1, 4): + if idx == 3: + target = None + source = NullableForeignKeySource(name='source-%d' % idx, target=target) + source.save() -# def test_foreign_key_retrieve_with_null(self): -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': 'target-1'}, -# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, -# {'id': 3, 'name': 'source-3', 'target': None}, -# ] -# self.assertEqual(serializer.data, expected) + def test_foreign_key_retrieve_with_null(self): + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': 'target-1'}, + {'id': 2, 'name': 'source-2', 'target': 'target-1'}, + {'id': 3, 'name': 'source-3', 'target': None}, + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_create_with_valid_null(self): -# data = {'id': 4, 'name': 'source-4', 'target': None} -# serializer = NullableForeignKeySourceSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'source-4') + def test_foreign_key_create_with_valid_null(self): + data = {'id': 4, 'name': 'source-4', 'target': None} + serializer = NullableForeignKeySourceSerializer(data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, data) + self.assertEqual(obj.name, 'source-4') -# # Ensure source 4 is created, and everything else is as expected -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': 'target-1'}, -# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, -# {'id': 3, 'name': 'source-3', 'target': None}, -# {'id': 4, 'name': 'source-4', 'target': None} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 4 is created, and everything else is as expected + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': 'target-1'}, + {'id': 2, 'name': 'source-2', 'target': 'target-1'}, + {'id': 3, 'name': 'source-3', 'target': None}, + {'id': 4, 'name': 'source-4', 'target': None} + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_create_with_valid_emptystring(self): -# """ -# The emptystring should be interpreted as null in the context -# of relationships. -# """ -# data = {'id': 4, 'name': 'source-4', 'target': ''} -# expected_data = {'id': 4, 'name': 'source-4', 'target': None} -# serializer = NullableForeignKeySourceSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, expected_data) -# self.assertEqual(obj.name, 'source-4') + def test_foreign_key_create_with_valid_emptystring(self): + """ + The emptystring should be interpreted as null in the context + of relationships. + """ + data = {'id': 4, 'name': 'source-4', 'target': ''} + expected_data = {'id': 4, 'name': 'source-4', 'target': None} + serializer = NullableForeignKeySourceSerializer(data=data) + self.assertTrue(serializer.is_valid()) + obj = serializer.save() + self.assertEqual(serializer.data, expected_data) + self.assertEqual(obj.name, 'source-4') -# # Ensure source 4 is created, and everything else is as expected -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': 'target-1'}, -# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, -# {'id': 3, 'name': 'source-3', 'target': None}, -# {'id': 4, 'name': 'source-4', 'target': None} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 4 is created, and everything else is as expected + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': 'target-1'}, + {'id': 2, 'name': 'source-2', 'target': 'target-1'}, + {'id': 3, 'name': 'source-3', 'target': None}, + {'id': 4, 'name': 'source-4', 'target': None} + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update_with_valid_null(self): -# data = {'id': 1, 'name': 'source-1', 'target': None} -# instance = NullableForeignKeySource.objects.get(pk=1) -# serializer = NullableForeignKeySourceSerializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.data, data) -# serializer.save() + def test_foreign_key_update_with_valid_null(self): + data = {'id': 1, 'name': 'source-1', 'target': None} + instance = NullableForeignKeySource.objects.get(pk=1) + serializer = NullableForeignKeySourceSerializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, data) -# # Ensure source 1 is updated, and everything else is as expected -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': None}, -# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, -# {'id': 3, 'name': 'source-3', 'target': None} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 1 is updated, and everything else is as expected + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': None}, + {'id': 2, 'name': 'source-2', 'target': 'target-1'}, + {'id': 3, 'name': 'source-3', 'target': None} + ] + self.assertEqual(serializer.data, expected) -# def test_foreign_key_update_with_valid_emptystring(self): -# """ -# The emptystring should be interpreted as null in the context -# of relationships. -# """ -# data = {'id': 1, 'name': 'source-1', 'target': ''} -# expected_data = {'id': 1, 'name': 'source-1', 'target': None} -# instance = NullableForeignKeySource.objects.get(pk=1) -# serializer = NullableForeignKeySourceSerializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.data, expected_data) -# serializer.save() + def test_foreign_key_update_with_valid_emptystring(self): + """ + The emptystring should be interpreted as null in the context + of relationships. + """ + data = {'id': 1, 'name': 'source-1', 'target': ''} + expected_data = {'id': 1, 'name': 'source-1', 'target': None} + instance = NullableForeignKeySource.objects.get(pk=1) + serializer = NullableForeignKeySourceSerializer(instance, data=data) + self.assertTrue(serializer.is_valid()) + serializer.save() + self.assertEqual(serializer.data, expected_data) -# # Ensure source 1 is updated, and everything else is as expected -# queryset = NullableForeignKeySource.objects.all() -# serializer = NullableForeignKeySourceSerializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': None}, -# {'id': 2, 'name': 'source-2', 'target': 'target-1'}, -# {'id': 3, 'name': 'source-3', 'target': None} -# ] -# self.assertEqual(serializer.data, expected) + # Ensure source 1 is updated, and everything else is as expected + queryset = NullableForeignKeySource.objects.all() + serializer = NullableForeignKeySourceSerializer(queryset, many=True) + expected = [ + {'id': 1, 'name': 'source-1', 'target': None}, + {'id': 2, 'name': 'source-2', 'target': 'target-1'}, + {'id': 3, 'name': 'source-3', 'target': None} + ] + self.assertEqual(serializer.data, expected) From 6b09e5f2bba9167404ec329fa12c7f0215ca51ac Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 8 Oct 2014 11:22:10 +0100 Subject: [PATCH 0937/1652] Tests for generic relationships --- rest_framework/relations.py | 2 +- rest_framework/serializers.py | 10 +- tests/test_genericrelations.py | 217 +++++++++++++-------------------- 3 files changed, 91 insertions(+), 138 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index e5bdf60c7..df5025b80 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -49,7 +49,7 @@ class RelatedField(Field): ]) -class StringRelatedField(Field): +class StringRelatedField(RelatedField): """ A read only field that represents its targets using their plain string representation. diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index ed024f87b..3d868a9ee 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -520,11 +520,6 @@ class ModelSerializer(Serializer): ret[field_name] = declared_fields[field_name] continue - elif field_name == api_settings.URL_FIELD_NAME: - # Create the URL field. - field_cls = HyperlinkedIdentityField - kwargs = get_url_kwargs(model) - elif field_name in info.fields_and_pk: # Create regular model fields. model_field = info.fields_and_pk[field_name] @@ -561,6 +556,11 @@ class ModelSerializer(Serializer): field_cls = ReadOnlyField kwargs = {} + elif field_name == api_settings.URL_FIELD_NAME: + # Create the URL field. + field_cls = HyperlinkedIdentityField + kwargs = get_url_kwargs(model) + else: raise ImproperlyConfigured( 'Field name `%s` is not valid for model `%s`.' % diff --git a/tests/test_genericrelations.py b/tests/test_genericrelations.py index a87ea3fdd..380ad91db 100644 --- a/tests/test_genericrelations.py +++ b/tests/test_genericrelations.py @@ -1,151 +1,104 @@ -# from __future__ import unicode_literals -# from django.contrib.contenttypes.models import ContentType -# from django.contrib.contenttypes.generic import GenericRelation, GenericForeignKey -# from django.db import models -# from django.test import TestCase -# from rest_framework import serializers -# from rest_framework.compat import python_2_unicode_compatible +from __future__ import unicode_literals +from django.contrib.contenttypes.models import ContentType +from django.contrib.contenttypes.generic import GenericRelation, GenericForeignKey +from django.db import models +from django.test import TestCase +from rest_framework import serializers +from rest_framework.compat import python_2_unicode_compatible -# @python_2_unicode_compatible -# class Tag(models.Model): -# """ -# Tags have a descriptive slug, and are attached to an arbitrary object. -# """ -# tag = models.SlugField() -# content_type = models.ForeignKey(ContentType) -# object_id = models.PositiveIntegerField() -# tagged_item = GenericForeignKey('content_type', 'object_id') +@python_2_unicode_compatible +class Tag(models.Model): + """ + Tags have a descriptive slug, and are attached to an arbitrary object. + """ + tag = models.SlugField() + content_type = models.ForeignKey(ContentType) + object_id = models.PositiveIntegerField() + tagged_item = GenericForeignKey('content_type', 'object_id') -# def __str__(self): -# return self.tag + def __str__(self): + return self.tag -# @python_2_unicode_compatible -# class Bookmark(models.Model): -# """ -# A URL bookmark that may have multiple tags attached. -# """ -# url = models.URLField() -# tags = GenericRelation(Tag) +@python_2_unicode_compatible +class Bookmark(models.Model): + """ + A URL bookmark that may have multiple tags attached. + """ + url = models.URLField() + tags = GenericRelation(Tag) -# def __str__(self): -# return 'Bookmark: %s' % self.url + def __str__(self): + return 'Bookmark: %s' % self.url -# @python_2_unicode_compatible -# class Note(models.Model): -# """ -# A textual note that may have multiple tags attached. -# """ -# text = models.TextField() -# tags = GenericRelation(Tag) +@python_2_unicode_compatible +class Note(models.Model): + """ + A textual note that may have multiple tags attached. + """ + text = models.TextField() + tags = GenericRelation(Tag) -# def __str__(self): -# return 'Note: %s' % self.text + def __str__(self): + return 'Note: %s' % self.text -# class TestGenericRelations(TestCase): -# def setUp(self): -# self.bookmark = Bookmark.objects.create(url='https://www.djangoproject.com/') -# Tag.objects.create(tagged_item=self.bookmark, tag='django') -# Tag.objects.create(tagged_item=self.bookmark, tag='python') -# self.note = Note.objects.create(text='Remember the milk') -# Tag.objects.create(tagged_item=self.note, tag='reminder') +class TestGenericRelations(TestCase): + def setUp(self): + self.bookmark = Bookmark.objects.create(url='https://www.djangoproject.com/') + Tag.objects.create(tagged_item=self.bookmark, tag='django') + Tag.objects.create(tagged_item=self.bookmark, tag='python') + self.note = Note.objects.create(text='Remember the milk') + Tag.objects.create(tagged_item=self.note, tag='reminder') -# def test_generic_relation(self): -# """ -# Test a relationship that spans a GenericRelation field. -# IE. A reverse generic relationship. -# """ + def test_generic_relation(self): + """ + Test a relationship that spans a GenericRelation field. + IE. A reverse generic relationship. + """ -# class BookmarkSerializer(serializers.ModelSerializer): -# tags = serializers.RelatedField(many=True) + class BookmarkSerializer(serializers.ModelSerializer): + tags = serializers.StringRelatedField(many=True) -# class Meta: -# model = Bookmark -# exclude = ('id',) + class Meta: + model = Bookmark + fields = ('tags', 'url') -# serializer = BookmarkSerializer(self.bookmark) -# expected = { -# 'tags': ['django', 'python'], -# 'url': 'https://www.djangoproject.com/' -# } -# self.assertEqual(serializer.data, expected) + serializer = BookmarkSerializer(self.bookmark) + expected = { + 'tags': ['django', 'python'], + 'url': 'https://www.djangoproject.com/' + } + self.assertEqual(serializer.data, expected) -# def test_generic_nested_relation(self): -# """ -# Test saving a GenericRelation field via a nested serializer. -# """ + def test_generic_fk(self): + """ + Test a relationship that spans a GenericForeignKey field. + IE. A forward generic relationship. + """ -# class TagSerializer(serializers.ModelSerializer): -# class Meta: -# model = Tag -# exclude = ('content_type', 'object_id') + class TagSerializer(serializers.ModelSerializer): + tagged_item = serializers.StringRelatedField() -# class BookmarkSerializer(serializers.ModelSerializer): -# tags = TagSerializer(many=True) + class Meta: + model = Tag + fields = ('tag', 'tagged_item') -# class Meta: -# model = Bookmark -# exclude = ('id',) - -# data = { -# 'url': 'https://docs.djangoproject.com/', -# 'tags': [ -# {'tag': 'contenttypes'}, -# {'tag': 'genericrelations'}, -# ] -# } -# serializer = BookmarkSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# serializer.save() -# self.assertEqual(serializer.object.tags.count(), 2) - -# def test_generic_fk(self): -# """ -# Test a relationship that spans a GenericForeignKey field. -# IE. A forward generic relationship. -# """ - -# class TagSerializer(serializers.ModelSerializer): -# tagged_item = serializers.RelatedField() - -# class Meta: -# model = Tag -# exclude = ('id', 'content_type', 'object_id') - -# serializer = TagSerializer(Tag.objects.all(), many=True) -# expected = [ -# { -# 'tag': 'django', -# 'tagged_item': 'Bookmark: https://www.djangoproject.com/' -# }, -# { -# 'tag': 'python', -# 'tagged_item': 'Bookmark: https://www.djangoproject.com/' -# }, -# { -# 'tag': 'reminder', -# 'tagged_item': 'Note: Remember the milk' -# } -# ] -# self.assertEqual(serializer.data, expected) - -# def test_restore_object_generic_fk(self): -# """ -# Ensure an object with a generic foreign key can be restored. -# """ - -# class TagSerializer(serializers.ModelSerializer): -# class Meta: -# model = Tag -# exclude = ('content_type', 'object_id') - -# serializer = TagSerializer() - -# bookmark = Bookmark(url='http://example.com') -# attrs = {'tagged_item': bookmark, 'tag': 'example'} - -# tag = serializer.restore_object(attrs) -# self.assertEqual(tag.tagged_item, bookmark) + serializer = TagSerializer(Tag.objects.all(), many=True) + expected = [ + { + 'tag': 'django', + 'tagged_item': 'Bookmark: https://www.djangoproject.com/' + }, + { + 'tag': 'python', + 'tagged_item': 'Bookmark: https://www.djangoproject.com/' + }, + { + 'tag': 'reminder', + 'tagged_item': 'Note: Remember the milk' + } + ] + self.assertEqual(serializer.data, expected) From af0f01c5b6597fe2f146268f7632f7e3954d17c2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 8 Oct 2014 11:23:40 +0100 Subject: [PATCH 0938/1652] Move generic relation tests --- tests/{test_genericrelations.py => test_relations_generic.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{test_genericrelations.py => test_relations_generic.py} (100%) diff --git a/tests/test_genericrelations.py b/tests/test_relations_generic.py similarity index 100% rename from tests/test_genericrelations.py rename to tests/test_relations_generic.py From 0cbb57b40fdb073c7ca09c9d1078926260c646db Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 8 Oct 2014 12:17:30 +0100 Subject: [PATCH 0939/1652] Tweak pre/post save hooks. Return instance in .update(). --- docs/topics/3.0-announcement.md | 26 ++++++++++++++++++-------- rest_framework/mixins.py | 13 ++++++++----- rest_framework/serializers.py | 24 ++++++++++++++---------- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 4a7815032..89817ea5d 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -116,11 +116,12 @@ This would now be split out into two separate methods. instance.language = validated_data.get('language', instance.language) instance.style = validated_data.get('style', instance.style) instance.save() + return instance def create(self, validated_data): return Snippet.objects.create(**validated_data) -Note that the `.create` method should return the newly created object instance. +Note that these methods should return the newly created object instance. #### Use `.validated_data` instead of `.object`. @@ -592,18 +593,27 @@ The `UniqueTogetherValidator` should be applied to a serializer, and takes a `qu The view logic for the default method handlers has been significantly simplified, due to the new serializers API. -#### Removal of pre/post save hooks. +#### Changes to pre/post save hooks. -The following method hooks no longer exist on the new, simplified, generic views: `pre_save`, `post_save`, `pre_delete`, `post_delete`. +The `pre_save` and `post_save` hooks no longer exist, but are replaced with `perform_create(self, serializer)` and `perform_update(self, serializer)`. -If you do need custom behavior, you might choose to instead override the `.save()` method on your serializer class. For example: +These method should save the object instance by calling `serializer.save()`, adding in any explicit additional arguments as required. They may also perform any custom pre-save or post-save behavior. - def save(self, *args, **kwargs): - instance = super(MySerializer).save(*args, **kwarg) +For example: + + def perform_create(self, serializer): + # Include the owner attribute directly, rather than from request data. + instance = serializer.save(owner=self.request.user) + # Perform a custom post-save action. send_email(instance.to_email, instance.message) - return instance -Alternatively write your view logic exlpicitly, or tie your pre/post save behavior into the model class or model manager. +The `pre_delete` and `post_delete` hooks no longer exist, and are replaced with `.perform_destroy(self, instance)`, which should delete the instance and perform any custom actions. + + def perform_destroy(self, instance): + # Perform a custom pre-delete action. + send_deletion_alert(user=instance.created_by, deleted=instance) + # Delete the object instance. + instance.delete() #### Removal of view attributes. diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 03ebb0341..4c62debb0 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -20,11 +20,11 @@ class CreateModelMixin(object): def create(self, request, *args, **kwargs): serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) - self.create_valid(serializer) + self.perform_create(serializer) headers = self.get_success_headers(serializer.data) return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) - def create_valid(self, serializer): + def perform_create(self, serializer): serializer.save() def get_success_headers(self, data): @@ -67,10 +67,10 @@ class UpdateModelMixin(object): instance = self.get_object() serializer = self.get_serializer(instance, data=request.data, partial=partial) serializer.is_valid(raise_exception=True) - self.update_valid(serializer) + self.preform_update(serializer) return Response(serializer.data) - def update_valid(self, serializer): + def preform_update(self, serializer): serializer.save() def partial_update(self, request, *args, **kwargs): @@ -84,9 +84,12 @@ class DestroyModelMixin(object): """ def destroy(self, request, *args, **kwargs): instance = self.get_object() - instance.delete() + self.perform_destroy(instance) return Response(status=status.HTTP_204_NO_CONTENT) + def perform_destroy(self, instance): + instance.delete() + # The AllowPUTAsCreateMixin was previously the default behaviour # for PUT requests. This has now been removed and must be *explicitly* diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 3d868a9ee..e7cd50d67 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -83,7 +83,10 @@ class BaseSerializer(Field): ) if self.instance is not None: - self.update(self.instance, validated_data) + self.instance = self.update(self.instance, validated_data) + assert self.instance is not None, ( + '`update()` did not return an object instance.' + ) else: self.instance = self.create(validated_data) assert self.instance is not None, ( @@ -444,19 +447,19 @@ class ModelSerializer(Serializer): self.validators.extend(validators) self._kwargs['validators'] = validators - def create(self, attrs): + def create(self, validated_attrs): ModelClass = self.Meta.model - # Remove many-to-many relationships from attrs. + # Remove many-to-many relationships from validated_attrs. # They are not valid arguments to the default `.create()` method, # as they require that the instance has already been saved. info = model_meta.get_field_info(ModelClass) many_to_many = {} for field_name, relation_info in info.relations.items(): - if relation_info.to_many and (field_name in attrs): - many_to_many[field_name] = attrs.pop(field_name) + if relation_info.to_many and (field_name in validated_attrs): + many_to_many[field_name] = validated_attrs.pop(field_name) - instance = ModelClass.objects.create(**attrs) + instance = ModelClass.objects.create(**validated_attrs) # Save many-to-many relationships after the instance is created. if many_to_many: @@ -465,10 +468,11 @@ class ModelSerializer(Serializer): return instance - def update(self, obj, attrs): - for attr, value in attrs.items(): - setattr(obj, attr, value) - obj.save() + def update(self, instance, validated_attrs): + for attr, value in validated_attrs.items(): + setattr(instance, attr, value) + instance.save() + return instance def get_unique_together_validators(self): field_names = set([ From 28f3b314f12cbff33c55602c2c5f5f5cce956171 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 8 Oct 2014 12:36:28 +0100 Subject: [PATCH 0940/1652] .validate() returning validated data. transform_<field> hooks. --- rest_framework/serializers.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index e7cd50d67..8513428cf 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -299,7 +299,8 @@ class Serializer(BaseSerializer): value = self.to_internal_value(data) try: self.run_validators(value) - self.validate(value) + value = self.validate(value) + assert value is not None, '.validate() should return the validated data' except ValidationError as exc: raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: exc.messages @@ -341,7 +342,12 @@ class Serializer(BaseSerializer): fields = [field for field in self.fields.values() if not field.write_only] for field in fields: - ret[field.field_name] = field.get_field_representation(instance) + value = field.get_field_representation(instance) + transform_method = getattr(self, 'transform_' + field.field_name, None) + if transform_method is not None: + value = transform_method(value) + + ret[field.field_name] = value return ret From 14ae52a24e93063f77c6010269bf9cd3316627fe Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 8 Oct 2014 16:09:37 +0100 Subject: [PATCH 0941/1652] More gradual deprecation --- docs/topics/3.0-announcement.md | 26 +++++----- rest_framework/request.py | 16 ++++++ rest_framework/serializers.py | 71 ++++++++++++++++++++++++++- rest_framework/utils/field_mapping.py | 22 ++++----- rest_framework/utils/model_meta.py | 4 +- 5 files changed, 113 insertions(+), 26 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 89817ea5d..6520f2bdd 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -8,10 +8,9 @@ See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-fr The most notable outstanding issues still to be resolved on the `version-3.0` branch are as follows: -* Forms support for serializers and in the browsable API. +* Finish forms support for serializers and in the browsable API. * Optimisations for serializing primary keys. * Refine style of validation errors in some cases, such as validation errors in `ListField`. -* `.transform_<field>()` method on serializers. **Your feedback on the upgrade process and 3.0 changes is hugely important!** @@ -48,12 +47,13 @@ Below is an in-depth guide to the API changes and migration notes for 3.0. #### The `.data` and `.query_params` properties. -The usage of `request.DATA` and `request.FILES` is now discouraged in favor of a single `request.data` attribute that contains *all* the parsed data. +The usage of `request.DATA` and `request.FILES` is now pending deprecation in favor of a single `request.data` attribute that contains *all* the parsed data. -Having separate attributes is reasonable for web applications that only ever parse URL encoded or MultiPart requests, but makes less sense for the general-purpose request parsing that REST framework supports. +Having separate attributes is reasonable for web applications that only ever parse url-encoded or multipart requests, but makes less sense for the general-purpose request parsing that REST framework supports. You may now pass all the request data to a serializer class in a single argument: + # Do this... ExampleSerializer(data=request.data) Instead of passing the files argument separately: @@ -62,7 +62,7 @@ Instead of passing the files argument separately: ExampleSerializer(data=request.DATA, files=request.FILES) -The usage of `request.QUERY_PARAMS` is now discouraged in favor of the lowercased `request.query_params`. +The usage of `request.QUERY_PARAMS` is now pending deprecation in favor of the lowercased `request.query_params`. ## Serializers @@ -73,7 +73,7 @@ Previously the serializers used a two-step object creation, as follows: 1. Validating the data would create an object instance. This instance would be available as `serializer.object`. 2. Calling `serializer.save()` would then save the object instance to the database. -This style is in line with how the `ModelForm` class works in Django, but is problematic for a number of reasons: +This style is in-line with how the `ModelForm` class works in Django, but is problematic for a number of reasons: * Some data, such as many-to-many relationships, cannot be added to the object instance until after it has been saved. This type of data needed to be hidden in some undocumented state on the object instance, or kept as state on the serializer instance so that it could be used when `.save()` is called. * Instantiating model instances directly means that you cannot use model manager classes for instance creation, eg `ExampleModel.objects.create(...)`. Manager classes are an excellent layer at which to enforce business logic and application-level data constraints. @@ -109,7 +109,7 @@ The following example from the tutorial previously used `restore_object()` to ha This would now be split out into two separate methods. - def update(self, instance, validated_data) + def update(self, instance, validated_data): instance.title = validated_data.get('title', instance.title) instance.code = validated_data.get('code', instance.code) instance.linenos = validated_data.get('linenos', instance.linenos) @@ -211,28 +211,30 @@ The `exclude` option on `ModelSerializer` is no longer available. You should use #### The `extra_kwargs` option. -The `read_only_fields` and `write_only_fields` options on `ModelSerializer` have been removed and replaced with a more generic `extra_kwargs`. +The `write_only_fields` option on `ModelSerializer` has been moved to `PendingDeprecation` and replaced with a more generic `extra_kwargs`. class MySerializer(serializer.ModelSerializer): class Meta: model = MyModel fields = ('id', 'email', 'notes', 'is_admin') extra_kwargs = { - 'is_admin': {'read_only': True} + 'is_admin': {'write_only': True} } Alternatively, specify the field explicitly on the serializer class: class MySerializer(serializer.ModelSerializer): - is_admin = serializers.BooleanField(read_only=True) + is_admin = serializers.BooleanField(write_only=True) class Meta: model = MyModel fields = ('id', 'email', 'notes', 'is_admin') +The `read_only_fields` option remains as a convenient shortcut for the more common case. + #### Changes to `HyperlinkedModelSerializer`. -The `view_name` and `lookup_field` options have been removed. They are no longer required, as you can use the `extra_kwargs` argument instead: +The `view_name` and `lookup_field` options have been moved to `PendingDeprecation`. They are no longer required, as you can use the `extra_kwargs` argument instead: class MySerializer(serializer.HyperlinkedModelSerializer): class Meta: @@ -633,7 +635,7 @@ If you need to restore the previous behavior you can include the `AllowPUTAsCrea The generic views now raise `ValidationError` for invalid data. This exception is then dealt with by the exception handler, rather than the view returning a `400 Bad Request` response directly. -This change means that you can now easily cusomize the style of error responses across your entire API, without having to modify any of the generic views. +This change means that you can now easily customize the style of error responses across your entire API, without having to modify any of the generic views. ## The metadata API diff --git a/rest_framework/request.py b/rest_framework/request.py index d80baa705..d43527421 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -18,6 +18,7 @@ from rest_framework import HTTP_HEADER_ENCODING from rest_framework import exceptions from rest_framework.compat import BytesIO from rest_framework.settings import api_settings +import warnings def is_form_media_type(media_type): @@ -209,6 +210,11 @@ class Request(object): """ Synonym for `.query_params`, for backwards compatibility. """ + warnings.warn( + "`request.QUERY_PARAMS` is pending deprecation. Use `request.query_params` instead.", + PendingDeprecationWarning, + stacklevel=1 + ) return self._request.GET @property @@ -225,6 +231,11 @@ class Request(object): Similar to usual behaviour of `request.POST`, except that it handles arbitrary parsers, and also works on methods other than POST (eg PUT). """ + warnings.warn( + "`request.DATA` is pending deprecation. Use `request.data` instead.", + PendingDeprecationWarning, + stacklevel=1 + ) if not _hasattr(self, '_data'): self._load_data_and_files() return self._data @@ -237,6 +248,11 @@ class Request(object): Similar to usual behaviour of `request.FILES`, except that it handles arbitrary parsers, and also works on methods other than POST (eg PUT). """ + warnings.warn( + "`request.FILES` is pending deprecation. Use `request.data` instead.", + PendingDeprecationWarning, + stacklevel=1 + ) if not _hasattr(self, '_files'): self._load_data_and_files() return self._files diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 8513428cf..9fcbcba76 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -25,6 +25,7 @@ from rest_framework.utils.field_mapping import ( from rest_framework.validators import UniqueTogetherValidator import copy import inspect +import warnings # Note: We do the following so that users of the framework can use this style: # @@ -517,12 +518,24 @@ class ModelSerializer(Serializer): depth = getattr(self.Meta, 'depth', 0) extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) + extra_kwargs = self._include_additional_options(extra_kwargs) + # Retrieve metadata about fields & relationships on the model class. info = model_meta.get_field_info(model) # Use the default set of fields if none is supplied explicitly. if fields is None: fields = self._get_default_field_names(declared_fields, info) + exclude = getattr(self.Meta, 'exclude', None) + if exclude is not None: + warnings.warn( + "The `Meta.exclude` option is pending deprecation. " + "Use the explicit `Meta.fields` instead.", + PendingDeprecationWarning, + stacklevel=3 + ) + for field_name in exclude: + fields.remove(field_name) for field_name in fields: if field_name in declared_fields: @@ -589,13 +602,69 @@ class ModelSerializer(Serializer): ) # Populate any kwargs defined in `Meta.extra_kwargs` - kwargs.update(extra_kwargs.get(field_name, {})) + extras = extra_kwargs.get(field_name, {}) + if extras.get('read_only', False): + for attr in [ + 'required', 'default', 'allow_blank', 'allow_null', + 'min_length', 'max_length', 'min_value', 'max_value', + 'validators' + ]: + kwargs.pop(attr, None) + kwargs.update(extras) # Create the serializer field. ret[field_name] = field_cls(**kwargs) return ret + def _include_additional_options(self, extra_kwargs): + read_only_fields = getattr(self.Meta, 'read_only_fields', None) + if read_only_fields is not None: + for field_name in read_only_fields: + kwargs = extra_kwargs.get(field_name, {}) + kwargs['read_only'] = True + extra_kwargs[field_name] = kwargs + + # These are all pending deprecation. + write_only_fields = getattr(self.Meta, 'write_only_fields', None) + if write_only_fields is not None: + warnings.warn( + "The `Meta.write_only_fields` option is pending deprecation. " + "Use `Meta.extra_kwargs={<field_name>: {'write_only': True}}` instead.", + PendingDeprecationWarning, + stacklevel=3 + ) + for field_name in write_only_fields: + kwargs = extra_kwargs.get(field_name, {}) + kwargs['write_only'] = True + extra_kwargs[field_name] = kwargs + + view_name = getattr(self.Meta, 'view_name', None) + if view_name is not None: + warnings.warn( + "The `Meta.view_name` option is pending deprecation. " + "Use `Meta.extra_kwargs={'url': {'view_name': ...}}` instead.", + PendingDeprecationWarning, + stacklevel=3 + ) + kwargs = extra_kwargs.get(field_name, {}) + kwargs['view_name'] = view_name + extra_kwargs[api_settings.URL_FIELD_NAME] = kwargs + + lookup_field = getattr(self.Meta, 'lookup_field', None) + if lookup_field is not None: + warnings.warn( + "The `Meta.lookup_field` option is pending deprecation. " + "Use `Meta.extra_kwargs={'url': {'lookup_field': ...}}` instead.", + PendingDeprecationWarning, + stacklevel=3 + ) + kwargs = extra_kwargs.get(field_name, {}) + kwargs['lookup_field'] = lookup_field + extra_kwargs[api_settings.URL_FIELD_NAME] = kwargs + + return extra_kwargs + def _get_default_field_names(self, declared_fields, model_info): return ( [model_info.pk.name] + diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index fd6da699f..6db371469 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -71,6 +71,17 @@ def get_field_kwargs(field_name, model_field): if model_field.help_text: kwargs['help_text'] = model_field.help_text + max_digits = getattr(model_field, 'max_digits', None) + if max_digits is not None: + kwargs['max_digits'] = max_digits + + decimal_places = getattr(model_field, 'decimal_places', None) + if decimal_places is not None: + kwargs['decimal_places'] = decimal_places + + if isinstance(model_field, models.TextField): + kwargs['style'] = {'type': 'textarea'} + if isinstance(model_field, models.AutoField) or not model_field.editable: # If this field is read-only, then return early. # Further keyword arguments are not valid. @@ -86,9 +97,6 @@ def get_field_kwargs(field_name, model_field): kwargs['choices'] = model_field.flatchoices return kwargs - if isinstance(model_field, models.TextField): - kwargs['style'] = {'type': 'textarea'} - if model_field.null and not isinstance(model_field, models.NullBooleanField): kwargs['allow_null'] = True @@ -171,14 +179,6 @@ def get_field_kwargs(field_name, model_field): validator = UniqueValidator(queryset=model_field.model._default_manager) validator_kwarg.append(validator) - max_digits = getattr(model_field, 'max_digits', None) - if max_digits is not None: - kwargs['max_digits'] = max_digits - - decimal_places = getattr(model_field, 'decimal_places', None) - if decimal_places is not None: - kwargs['decimal_places'] = decimal_places - if validator_kwarg: kwargs['validators'] = validator_kwarg diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py index b6c41174e..7a95bcdd1 100644 --- a/rest_framework/utils/model_meta.py +++ b/rest_framework/utils/model_meta.py @@ -107,8 +107,8 @@ def get_field_info(model): related=relation.model, to_many=True, has_through_model=( - hasattr(relation.field.rel, 'through') and - not relation.field.rel.through._meta.auto_created + (getattr(relation.field.rel, 'through', None) is not None) + and not relation.field.rel.through._meta.auto_created ) ) From 4c015df28cfb7dc7cf29f6dc4985c57e1f5cdc5d Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 8 Oct 2014 16:43:33 +0100 Subject: [PATCH 0942/1652] Tweaks --- docs/topics/3.0-announcement.md | 18 ++++++++++++++++++ rest_framework/relations.py | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 6520f2bdd..26d261edd 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -144,6 +144,24 @@ The corresponding code would now look like this: logging.info('Creating ticket "%s"' % name) serializer.save(user=request.user) # Include the user when saving. +#### Change to `validate_<field_name>`. + +The `validate_<field_name>` method hooks that can be attached to serializer classes change their signature slightly and return type. Previously these would take a dictionary of all incoming data, and a key representing the field name, and would return a dictionary including the validated data for that field: + + def validate_score(self, attrs, source): + if attrs[score] % 10 != 0: + raise ValidationError('This field should be a multiple of ten.') + return attrs + +This is now simplified slightly, and the method hooks simply take the value to be validated, and return it's validated value. + + def validate_score(self, value): + if value % 10 != 0: + raise ValidationError('This field should be a multiple of ten.') + return value + +Any ad-hoc validation that applies to more than one field should go in the `.validate(self, attrs)` method as usual. + #### Limitations of ModelSerializer validation. This change also means that we no longer use the `.full_clean()` method on model instances, but instead perform all validation explicitly on the serializer. This gives a cleaner separation, and ensures that there's no automatic validation behavior on `ModelSerializer` classes that can't also be easily replicated on regular `Serializer` classes. diff --git a/rest_framework/relations.py b/rest_framework/relations.py index df5025b80..e9dd7ddea 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -264,9 +264,10 @@ class ManyRelation(Field): ] def to_representation(self, obj): + iterable = obj.all() if (hasattr(obj, 'all')) else obj return [ self.child_relation.to_representation(value) - for value in obj.all() + for value in iterable ] @property From 5ead8dc89d1a99d6189170dc8dac19cdc8ba7750 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 8 Oct 2014 16:59:52 +0100 Subject: [PATCH 0943/1652] Support empty file fields --- rest_framework/fields.py | 2 ++ tests/test_fields.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 5fb0ec8d7..f86f66266 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -913,6 +913,8 @@ class FileField(Field): def to_representation(self, value): if self.use_url: + if not value: + return None url = settings.MEDIA_URL + value.url request = self.context.get('request', None) if request is not None: diff --git a/tests/test_fields.py b/tests/test_fields.py index bbd9f93d8..eaa0a3c83 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -879,7 +879,8 @@ class TestFileField(FieldValues): (MockFile(name='x' * 100, size=10), ['Ensure this filename has at most 10 characters (it has 100).']) ] outputs = [ - (MockFile(name='example.txt', url='/example.txt'), '/example.txt') + (MockFile(name='example.txt', url='/example.txt'), '/example.txt'), + ('', None) ] field = fields.FileField(max_length=10) From f7d43f530a94e686d2f93781471b9ac4e90d0f58 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 8 Oct 2014 17:03:14 +0100 Subject: [PATCH 0944/1652] Limit blank string -> None to just be on relational fields --- rest_framework/fields.py | 4 ---- rest_framework/relations.py | 8 +++++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f86f66266..b371c7d0a 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -110,7 +110,6 @@ class Field(object): default_validators = [] default_empty_html = empty initial = None - coerce_blank_to_null = True def __init__(self, read_only=False, write_only=False, required=None, default=empty, initial=empty, source=None, @@ -248,9 +247,6 @@ class Field(object): self.fail('required') return self.get_default() - if data == '' and self.coerce_blank_to_null: - data = None - if data is None: if not self.allow_null: self.fail('null') diff --git a/rest_framework/relations.py b/rest_framework/relations.py index e9dd7ddea..c1e5aa187 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -1,5 +1,5 @@ from rest_framework.compat import smart_text, urlparse -from rest_framework.fields import Field +from rest_framework.fields import empty, Field from rest_framework.reverse import reverse from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch, Resolver404 @@ -31,6 +31,12 @@ class RelatedField(Field): ) return super(RelatedField, cls).__new__(cls, *args, **kwargs) + def run_validation(self, data=empty): + # We force empty strings to None values for relational fields. + if data == '': + data = None + return super(RelatedField, self).run_validation(data) + def get_queryset(self): queryset = self.queryset if isinstance(queryset, QuerySet): From a58cfe167d837d34994b50f52098c552f6b0860e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 9 Oct 2014 09:38:03 +0100 Subject: [PATCH 0945/1652] Update tutorial for 3.0 --- docs/tutorial/1-serialization.md | 81 ++++++++++--------- .../4-authentication-and-permissions.md | 14 ++-- 2 files changed, 51 insertions(+), 44 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index b0565d91a..db5b9ea7b 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -41,20 +41,7 @@ Once that's done we can create an app that we'll use to create a simple Web API. python manage.py startapp snippets -The simplest way to get up and running will probably be to use an `sqlite3` database for the tutorial. Edit the `tutorial/settings.py` file, and set the default database `"ENGINE"` to `"sqlite3"`, and `"NAME"` to `"tmp.db"`. - - DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': 'tmp.db', - 'USER': '', - 'PASSWORD': '', - 'HOST': '', - 'PORT': '', - } - } - -We'll also need to add our new `snippets` app and the `rest_framework` app to `INSTALLED_APPS`. +We'll need to add our new `snippets` app and the `rest_framework` app to `INSTALLED_APPS`. Let's edit the `tutorial/settings.py` file: INSTALLED_APPS = ( ... @@ -72,7 +59,7 @@ Okay, we're ready to roll. ## Creating a model to work with -For the purposes of this tutorial we're going to start by creating a simple `Snippet` model that is used to store code snippets. Go ahead and edit the `snippets` app's `models.py` file. Note: Good programming practices include comments. Although you will find them in our repository version of this tutorial code, we have omitted them here to focus on the code itself. +For the purposes of this tutorial we're going to start by creating a simple `Snippet` model that is used to store code snippets. Go ahead and edit the `snippets/models.py` file. Note: Good programming practices include comments. Although you will find them in our repository version of this tutorial code, we have omitted them here to focus on the code itself. from django.db import models from pygments.lexers import get_all_lexers @@ -98,9 +85,10 @@ For the purposes of this tutorial we're going to start by creating a simple `Sni class Meta: ordering = ('created',) -Don't forget to sync the database for the first time. +We'll also need to create an initial migration for our snippet model, and sync the database for the first time. - python manage.py syncdb + python manage.py makemigrations snippets + python manage.py migrate ## Creating a Serializer class @@ -112,40 +100,39 @@ The first thing we need to get started on our Web API is to provide a way of ser class SnippetSerializer(serializers.Serializer): - pk = serializers.Field() # Note: `Field` is an untyped read-only field. + pk = serializers.IntegerField(read_only=True) title = serializers.CharField(required=False, max_length=100) - code = serializers.CharField(widget=widgets.Textarea, - max_length=100000) + code = serializers.CharField(style={'type': 'textarea'}) linenos = serializers.BooleanField(required=False) language = serializers.ChoiceField(choices=LANGUAGE_CHOICES, default='python') style = serializers.ChoiceField(choices=STYLE_CHOICES, default='friendly') - def restore_object(self, attrs, instance=None): + def create(self, validated_attrs): """ - Create or update a new snippet instance, given a dictionary - of deserialized field values. - - Note that if we don't define this method, then deserializing - data will simply return a dictionary of items. + Create and return a new `Snippet` instance, given the validated data. """ - if instance: - # Update existing instance - instance.title = attrs.get('title', instance.title) - instance.code = attrs.get('code', instance.code) - instance.linenos = attrs.get('linenos', instance.linenos) - instance.language = attrs.get('language', instance.language) - instance.style = attrs.get('style', instance.style) - return instance + return Snippet.objects.create(**validated_attrs) - # Create new instance - return Snippet(**attrs) + def update(self, instance, validated_attrs): + """ + Update and return an existing `Snippet` instance, given the validated data. + """ + instance.title = validated_attrs.get('title', instance.title) + instance.code = validated_attrs.get('code', instance.code) + instance.linenos = validated_attrs.get('linenos', instance.linenos) + instance.language = validated_attrs.get('language', instance.language) + instance.style = validated_attrs.get('style', instance.style) + instance.save() + return instance -The first part of the serializer class defines the fields that get serialized/deserialized. The `restore_object` method defines how fully fledged instances get created when deserializing data. +The first part of the serializer class defines the fields that get serialized/deserialized. The `create()` and `update()` methods define how fully fledged instances are created or modified when calling `serializer.save()` -Notice that we can also use various attributes that would typically be used on form fields, such as `widget=widgets.Textarea`. These can be used to control how the serializer should render when displayed as an HTML form. This is particularly useful for controlling how the browsable API should be displayed, as we'll see later in the tutorial. +A serializer class is very similar to a Django `Form` class, and includes similar validation flags on the various fields, such as `required`, `max_length` and `default`. + +The field flags can also control how the serializer should be displayed in certain circumstances, such as when rendering to HTML. The `style={'type': 'textarea'}` flag above is equivelent to using `widget=widgets.Textarea` on a Django `Form` class. This is particularly useful for controlling how the browsable API should be displayed, as we'll see later in the tutorial. We can actually also save ourselves some time by using the `ModelSerializer` class, as we'll see later, but for now we'll keep our serializer definition explicit. @@ -219,6 +206,24 @@ Open the file `snippets/serializers.py` again, and edit the `SnippetSerializer` model = Snippet fields = ('id', 'title', 'code', 'linenos', 'language', 'style') +Once nice property that serializers have is that you can inspect all the fields an serializer instance, by printing it's representation. Open the Django shell with `python manange.py shell`, then try the following: + + >>> from snippets.serializers import SnippetSerializer + >>> serializer = SnippetSerializer() + >>> print repr(serializer) # In python 3 use `print(repr(serializer))` + SnippetSerializer(): + id = IntegerField(label='ID', read_only=True) + title = CharField(allow_blank=True, max_length=100, required=False) + code = CharField(style={'type': 'textarea'}) + linenos = BooleanField(required=False) + language = ChoiceField(choices=[('Clipper', 'FoxPro'), ('Cucumber', 'Gherkin'), ('RobotFramework', 'RobotFramework'), ('abap', 'ABAP'), ('ada', 'Ada')... + style = ChoiceField(choices=[('autumn', 'autumn'), ('borland', 'borland'), ('bw', 'bw'), ('colorful', 'colorful')... + +It's important to remember that `ModelSerializer` classes don't do anything particularly magically, they are simply a shortcut to creating a serializer class with: + +* An automatically determined set of fields. +* Simple default implementations for the `create()` and `update()` methods. + ## Writing regular Django views using our Serializer Let's see how we can write some API views using our new Serializer class. diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 9120e2547..adab1b55a 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -92,24 +92,26 @@ Finally we need to add those views into the API, by referencing them from the UR Right now, if we created a code snippet, there'd be no way of associating the user that created the snippet, with the snippet instance. The user isn't sent as part of the serialized representation, but is instead a property of the incoming request. -The way we deal with that is by overriding a `.pre_save()` method on our snippet views, that allows us to handle any information that is implicit in the incoming request or requested URL. +The way we deal with that is by overriding a `.perform_create()` method on our snippet views, that allows us to modify how the instance save is managed, and handle any information that is implicit in the incoming request or requested URL. -On **both** the `SnippetList` and `SnippetDetail` view classes, add the following method: +On the `SnippetList` view class, add the following method: - def pre_save(self, obj): - obj.owner = self.request.user + def perform_create(self, serializer): + serializer.save(owner=self.request.user) + +The `create()` method of our serializer will now be passed an additional `'owner'` field, along with the validated data from the request. ## Updating our serializer Now that snippets are associated with the user that created them, let's update our `SnippetSerializer` to reflect that. Add the following field to the serializer definition in `serializers.py`: - owner = serializers.Field(source='owner.username') + owner = serializers.ReadOnlyField(source='owner.username') **Note**: Make sure you also add `'owner',` to the list of fields in the inner `Meta` class. This field is doing something quite interesting. The `source` argument controls which attribute is used to populate a field, and can point at any attribute on the serialized instance. It can also take the dotted notation shown above, in which case it will traverse the given attributes, in a similar way as it is used with Django's template language. -The field we've added is the untyped `Field` class, in contrast to the other typed fields, such as `CharField`, `BooleanField` etc... The untyped `Field` is always read-only, and will be used for serialized representations, but will not be used for updating model instances when they are deserialized. +The field we've added is the untyped `ReadOnlyField` class, in contrast to the other typed fields, such as `CharField`, `BooleanField` etc... The untyped `ReadOnlyField` is always read-only, and will be used for serialized representations, but will not be used for updating model instances when they are deserialized. We could have also used `CharField(read_only=True)` here. ## Adding required permissions to views From 5f4cc52ef5c0f603420c6ea809594710a372d336 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 9 Oct 2014 10:11:44 +0100 Subject: [PATCH 0946/1652] Tweaking --- rest_framework/validators.py | 6 ++++++ tests/test_validators.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rest_framework/validators.py b/rest_framework/validators.py index 5bb69ad88..f76faaa4b 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -12,6 +12,9 @@ from rest_framework.utils.representation import smart_repr class UniqueValidator: + """ + Validator that corresponds to `unique=True` on a model field. + """ # Validators with `requires_context` will have the field instance # passed to them when the field is instantiated. requires_context = True @@ -46,6 +49,9 @@ class UniqueValidator: class UniqueTogetherValidator: + """ + Validator that corresponds to `unique_together = (...)` on a model class. + """ requires_context = True message = _('The fields {field_names} must make a unique set.') diff --git a/tests/test_validators.py b/tests/test_validators.py index ac04d2b4c..1d0814115 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -131,7 +131,7 @@ class TestUniquenessTogetherValidation(TestCase): 'position': 1 } - def test_ignore_exlcuded_fields(self): + def test_ignore_excluded_fields(self): """ When model fields are not included in a serializer, then uniqueness validtors should not be added for that field. From 6637b2fae0dab65447ff0bfd5ac0ba68644446eb Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 9 Oct 2014 11:08:26 +0100 Subject: [PATCH 0947/1652] Document the Metadata API --- docs/api-guide/metadata.md | 103 +++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 docs/api-guide/metadata.md diff --git a/docs/api-guide/metadata.md b/docs/api-guide/metadata.md new file mode 100644 index 000000000..c3f036b75 --- /dev/null +++ b/docs/api-guide/metadata.md @@ -0,0 +1,103 @@ +<a class="github" href="metadata.py"></a> + +# Metadata + +> [The `OPTIONS`] method allows a client to determine the options and/or requirements associated with a resource, or the capabilities of a server, without implying a resource action or initiating a resource retrieval. +> +> — [RFC7231, Section 4.3.7.][cite] + +REST framework includes a configurable mechanism for determining how your API should respond to `OPTIONS` requests. This allows you to return API schema or other resource information. + +There are not currently any widely adopted conventions for exactly what style of response should be returned for HTTP `OPTIONS` requests, so we provide an ad-hoc style that returns some useful information. + +Here's an example response that demonstrates the information that is returned by default. + + HTTP 200 OK + Allow: GET, POST, HEAD, OPTIONS + Content-Type: application/json + + { + "name": "To Do List", + "description": "List existing 'To Do' items, or create a new item.", + "renders": [ + "application/json", + "text/html" + ], + "parses": [ + "application/json", + "application/x-www-form-urlencoded", + "multipart/form-data" + ], + "actions": { + "POST": { + "note": { + "type": "string", + "required": false, + "read_only": false, + "label": "title", + "max_length": 100 + } + } + } + } + +## Setting the metadata scheme + +You can set the metadata class globally using the `'DEFAULT_METADATA_CLASS'` settings key: + + REST_FRAMEWORK = { + 'DEFAULT_METADATA_CLASS': 'rest_framework.metadata.SimpleMetadata' + } + +Or you can set the metadata class individually for a view: + + class APIRoot(APIView): + metadata_class = APIRootMetadata + + def get(self, request, format=None): + return Response({ + ... + }) + +The REST framework package only includes a single metadata class implementation, named `SimpleMetadata`. If you want to use an alternative style you'll need to implement a custom metadata class. + +## Creating schema endpoints + +If you have specific requirements for creating schema endpoints that are accessed with regular `GET` requests, you might consider re-using the metadata API for doing so. + +For example, the following additional route could be used on a viewset to provide a linkable schema endpoint. + + @list_route(methods=['GET']) + def schema(self, request): + meta = self.metadata_class() + data = meta.determine_metadata(request, self) + return Response(data) + +There are a couple of reasons that you might choose to take this approach, including that `OPTIONS` responses [are not cacheable][no-options]. + +--- + +# Custom metadata classes + +If you want to provide a custom metadata class you should override `BaseMetadata` and implement the `determine_metadata(self, request, view)` method. + +Useful things that you might want to do could include returning schema information, using a format such as [JSON schema][json-schema], or returning debug information to admin users. + +## Example + +The following class could be used to limit the information that is returned to `OPTIONS` requests. + + class MinimalMetadata(BaseMetadata): + """ + Don't include field and other information for `OPTIONS` requests. + Just return the name and description. + """ + def determine_metadata(self, request, view): + return { + 'name': view.get_view_name(), + 'description': view.get_view_description() + } + +[cite]: http://tools.ietf.org/html/rfc7231#section-4.3.7 +[no-options]: https://www.mnot.net/blog/2012/10/29/NO_OPTIONS +[json-schema]: http://json-schema.org/ From babdc78e61ac915fa4a01bdfb04e11a32dbf5d79 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 9 Oct 2014 11:39:01 +0100 Subject: [PATCH 0948/1652] Typo --- docs/api-guide/validators.md | 0 docs/topics/3.0-announcement.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 docs/api-guide/validators.md diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md new file mode 100644 index 000000000..e69de29bb diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 26d261edd..bffc608a8 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -617,7 +617,7 @@ The view logic for the default method handlers has been significantly simplified The `pre_save` and `post_save` hooks no longer exist, but are replaced with `perform_create(self, serializer)` and `perform_update(self, serializer)`. -These method should save the object instance by calling `serializer.save()`, adding in any explicit additional arguments as required. They may also perform any custom pre-save or post-save behavior. +These methods should save the object instance by calling `serializer.save()`, adding in any additional arguments as required. They may also perform any custom pre-save or post-save behavior. For example: From 5d247a65c89594a7ab5ce2333612f23eadc6828d Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 9 Oct 2014 15:11:19 +0100 Subject: [PATCH 0949/1652] First pass on nested serializers in HTML --- docs/tutorial/quickstart.md | 8 ++- rest_framework/compat.py | 16 ++++- rest_framework/fields.py | 28 ++++++-- rest_framework/relations.py | 20 +++++- rest_framework/renderers.py | 10 ++- rest_framework/serializers.py | 37 +++++++--- .../fields/horizontal/fieldset.html | 5 +- .../fields/horizontal/list_fieldset.html | 13 ++++ .../fields/inline/fieldset.html | 5 +- .../fields/vertical/fieldset.html | 5 +- .../fields/vertical/list_fieldset.html | 7 ++ tests/test_bound_fields.py | 69 +++++++++++++++++++ 12 files changed, 195 insertions(+), 28 deletions(-) create mode 100644 rest_framework/templates/rest_framework/fields/horizontal/list_fieldset.html create mode 100644 rest_framework/templates/rest_framework/fields/vertical/list_fieldset.html create mode 100644 tests/test_bound_fields.py diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 813e9872c..c2dc4bea9 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -26,11 +26,13 @@ Create a new Django project named `tutorial`, then start a new app called `quick Now sync your database for the first time: - python manage.py syncdb + python manage.py migrate -Make sure to create an initial user named `admin` with a password of `password`. We'll authenticate as that user later in our example. +We'll also create an initial user named `admin` with a password of `password`. We'll authenticate as that user later in our example. -Once you've set up a database and got everything synced and ready to go, open up the app's directory and we'll get coding... + python manage.py createsuperuser + +Once you've set up a database and initial user created and ready to go, open up the app's directory and we'll get coding... ## Serializers diff --git a/rest_framework/compat.py b/rest_framework/compat.py index e4e69580f..4ab23a4da 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -114,12 +114,15 @@ else: -# MinValueValidator and MaxValueValidator only accept `message` in 1.8+ +# MinValueValidator, MaxValueValidator et al. only accept `message` in 1.8+ if django.VERSION >= (1, 8): from django.core.validators import MinValueValidator, MaxValueValidator + from django.core.validators import MinLengthValidator, MaxLengthValidator else: from django.core.validators import MinValueValidator as DjangoMinValueValidator from django.core.validators import MaxValueValidator as DjangoMaxValueValidator + from django.core.validators import MinLengthValidator as DjangoMinLengthValidator + from django.core.validators import MaxLengthValidator as DjangoMaxLengthValidator class MinValueValidator(DjangoMinValueValidator): def __init__(self, *args, **kwargs): @@ -131,6 +134,17 @@ else: self.message = kwargs.pop('message', self.message) super(MaxValueValidator, self).__init__(*args, **kwargs) + class MinLengthValidator(DjangoMinLengthValidator): + def __init__(self, *args, **kwargs): + self.message = kwargs.pop('message', self.message) + super(MinLengthValidator, self).__init__(*args, **kwargs) + + class MaxLengthValidator(DjangoMaxLengthValidator): + def __init__(self, *args, **kwargs): + self.message = kwargs.pop('message', self.message) + super(MaxLengthValidator, self).__init__(*args, **kwargs) + + # URLValidator only accepts `message` in 1.6+ if django.VERSION >= (1, 6): from django.core.validators import URLValidator diff --git a/rest_framework/fields.py b/rest_framework/fields.py index b371c7d0a..7053acee0 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -8,7 +8,10 @@ from django.utils.dateparse import parse_date, parse_datetime, parse_time from django.utils.encoding import is_protected_type from django.utils.translation import ugettext_lazy as _ from rest_framework import ISO_8601 -from rest_framework.compat import smart_text, EmailValidator, MinValueValidator, MaxValueValidator, URLValidator +from rest_framework.compat import ( + smart_text, EmailValidator, MinValueValidator, MaxValueValidator, + MinLengthValidator, MaxLengthValidator, URLValidator +) from rest_framework.settings import api_settings from rest_framework.utils import html, representation, humanize_datetime import copy @@ -138,7 +141,7 @@ class Field(object): self.label = label self.help_text = help_text self.style = {} if style is None else style - self.validators = validators or self.default_validators[:] + self.validators = validators[:] or self.default_validators[:] self.allow_null = allow_null # These are set up by `.bind()` when the field is added to a serializer. @@ -412,16 +415,24 @@ class NullBooleanField(Field): class CharField(Field): default_error_messages = { - 'blank': _('This field may not be blank.') + 'blank': _('This field may not be blank.'), + 'max_length': _('Ensure this field has no more than {max_length} characters.'), + 'min_length': _('Ensure this field has no more than {min_length} characters.') } initial = '' coerce_blank_to_null = False def __init__(self, **kwargs): self.allow_blank = kwargs.pop('allow_blank', False) - self.max_length = kwargs.pop('max_length', None) - self.min_length = kwargs.pop('min_length', None) + max_length = kwargs.pop('max_length', None) + min_length = kwargs.pop('min_length', None) super(CharField, self).__init__(**kwargs) + if max_length is not None: + message = self.error_messages['max_length'].format(max_length=max_length) + self.validators.append(MaxLengthValidator(max_length, message=message)) + if min_length is not None: + message = self.error_messages['min_length'].format(min_length=min_length) + self.validators.append(MinLengthValidator(min_length, message=message)) def run_validation(self, data=empty): # Test for the empty string here so that it does not get validated, @@ -857,6 +868,13 @@ class MultipleChoiceField(ChoiceField): } default_empty_html = [] + def get_value(self, dictionary): + # We override the default field access in order to support + # lists in HTML forms. + if html.is_html_input(dictionary): + return dictionary.getlist(self.field_name) + return dictionary.get(self.field_name, empty) + def to_internal_value(self, data): if isinstance(data, type('')) or not hasattr(data, '__iter__'): self.fail('not_a_list', input_type=type(data).__name__) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index c1e5aa187..268b95cf1 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -1,6 +1,7 @@ from rest_framework.compat import smart_text, urlparse from rest_framework.fields import empty, Field from rest_framework.reverse import reverse +from rest_framework.utils import html from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch, Resolver404 from django.db.models.query import QuerySet @@ -263,6 +264,13 @@ class ManyRelation(Field): super(ManyRelation, self).__init__(*args, **kwargs) self.child_relation.bind(field_name='', parent=self) + def get_value(self, dictionary): + # We override the default field access in order to support + # lists in HTML forms. + if html.is_html_input(dictionary): + return dictionary.getlist(self.field_name) + return dictionary.get(self.field_name, empty) + def to_internal_value(self, data): return [ self.child_relation.to_internal_value(item) @@ -278,10 +286,16 @@ class ManyRelation(Field): @property def choices(self): + queryset = self.child_relation.queryset + iterable = queryset.all() if (hasattr(queryset, 'all')) else queryset + items_and_representations = [ + (item, self.child_relation.to_representation(item)) + for item in iterable + ] return dict([ ( - str(self.child_relation.to_representation(item)), - str(item) + str(item_representation), + str(item) + ' - ' + str(item_representation) ) - for item in self.child_relation.queryset.all() + for item, item_representation in items_and_representations ]) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 931dd434f..4fb360609 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -364,6 +364,12 @@ class HTMLFormRenderer(BaseRenderer): serializers.ManyRelation: { 'default': 'select_multiple.html', 'checkbox': 'select_checkbox.html' + }, + serializers.Serializer: { + 'default': 'fieldset.html' + }, + serializers.ListSerializer: { + 'default': 'list_fieldset.html' } }) @@ -392,7 +398,9 @@ class HTMLFormRenderer(BaseRenderer): template = loader.get_template(template_name) context = Context({ 'field': field, - 'input_type': input_type + 'input_type': input_type, + 'renderer': self, + 'layout': layout }) return template.render(context) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 9fcbcba76..1c006990b 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -166,14 +166,25 @@ class BoundField(object): Returned when iterating over a serializer instance, providing an API similar to Django forms and form fields. """ - def __init__(self, field, value, errors): + def __init__(self, field, value, errors, prefix=''): self._field = field self.value = value self.errors = errors + self.name = prefix + self.field_name def __getattr__(self, attr_name): return getattr(self._field, attr_name) + def __iter__(self): + for field in self.fields.values(): + yield self[field.field_name] + + def __getitem__(self, key): + field = self.fields[key] + value = self.value.get(key) if self.value else None + error = self.errors.get(key) if self.errors else None + return BoundField(field, value, error, prefix=self.name + '.') + @property def _proxy_class(self): return self._field.__class__ @@ -355,16 +366,23 @@ class Serializer(BaseSerializer): def validate(self, attrs): return attrs - def __iter__(self): - errors = self.errors if hasattr(self, '_errors') else {} - for field in self.fields.values(): - value = self.data.get(field.field_name) if self.data else None - error = errors.get(field.field_name) - yield BoundField(field, value, error) - def __repr__(self): return representation.serializer_repr(self, indent=1) + # The following are used for accessing `BoundField` instances on the + # serializer, for the purposes of presenting a form-like API onto the + # field values and field errors. + + def __iter__(self): + for field in self.fields.values(): + yield self[field.field_name] + + def __getitem__(self, key): + field = self.fields[key] + value = self.data.get(key) + error = self.errors.get(key) if hasattr(self, '_errors') else None + return BoundField(field, value, error) + # There's some replication of `ListField` here, # but that's probably better than obfuscating the call hierarchy. @@ -404,8 +422,9 @@ class ListSerializer(BaseSerializer): """ List of object instances -> List of dicts of primitive datatypes. """ + iterable = data.all() if (hasattr(data, 'all')) else data return ReturnList( - [self.child.to_representation(item) for item in data], + [self.child.to_representation(item) for item in iterable], serializer=self ) diff --git a/rest_framework/templates/rest_framework/fields/horizontal/fieldset.html b/rest_framework/templates/rest_framework/fields/horizontal/fieldset.html index 843a56b29..ff93c6baa 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/fieldset.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/fieldset.html @@ -1,10 +1,11 @@ +{% load rest_framework %} <fieldset> {% if field.label %} <div class="form-group" style="border-bottom: 1px solid #e5e5e5"> <legend class="control-label col-sm-2 {% if field.style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend> </div> {% endif %} - {% for field_item in field.value.field_items.values() %} - {{ renderer.render_field(field_item, layout=layout) }} + {% for nested_field in field %} + {% render_field nested_field layout=layout renderer=renderer %} {% endfor %} </fieldset> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/list_fieldset.html b/rest_framework/templates/rest_framework/fields/horizontal/list_fieldset.html new file mode 100644 index 000000000..68c75d4f8 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/horizontal/list_fieldset.html @@ -0,0 +1,13 @@ +{% load rest_framework %} +<fieldset> + {% if field.label %} + <div class="form-group" style="border-bottom: 1px solid #e5e5e5"> + <legend class="control-label col-sm-2 {% if field.style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend> + </div> + {% endif %} + <ul> + {% for child in field.value %} + <li>TODO</li> + {% endfor %} + </ul> +</fieldset> diff --git a/rest_framework/templates/rest_framework/fields/inline/fieldset.html b/rest_framework/templates/rest_framework/fields/inline/fieldset.html index 380d46272..ba9f1835a 100644 --- a/rest_framework/templates/rest_framework/fields/inline/fieldset.html +++ b/rest_framework/templates/rest_framework/fields/inline/fieldset.html @@ -1,3 +1,4 @@ -{% for field_item in field.value.field_items.values() %} - {{ renderer.render_field(field_item, layout=layout) }} +{% load rest_framework %} +{% for nested_field in field %} + {% render_field nested_field layout=layout renderer=renderer %} {% endfor %} diff --git a/rest_framework/templates/rest_framework/fields/vertical/fieldset.html b/rest_framework/templates/rest_framework/fields/vertical/fieldset.html index 8708916bd..248fe9044 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/fieldset.html +++ b/rest_framework/templates/rest_framework/fields/vertical/fieldset.html @@ -1,6 +1,7 @@ +{% load rest_framework %} <fieldset> {% if field.label %}<legend {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} - {% for field_item in field.value.field_items.values() %} - {{ renderer.render_field(field_item, layout=layout) }} + {% for nested_field in field %} + {% render_field nested_field layout=layout renderer=renderer %} {% endfor %} </fieldset> diff --git a/rest_framework/templates/rest_framework/fields/vertical/list_fieldset.html b/rest_framework/templates/rest_framework/fields/vertical/list_fieldset.html new file mode 100644 index 000000000..6b99a8349 --- /dev/null +++ b/rest_framework/templates/rest_framework/fields/vertical/list_fieldset.html @@ -0,0 +1,7 @@ +<fieldset> + {% if field.label %}<legend {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} +<!-- {% if field.label %}<legend {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} + {% for field_item in field.value.field_items.values() %} + {{ renderer.render_field(field_item, layout=layout) }} + {% endfor %} --> +</fieldset> diff --git a/tests/test_bound_fields.py b/tests/test_bound_fields.py new file mode 100644 index 000000000..469437e4b --- /dev/null +++ b/tests/test_bound_fields.py @@ -0,0 +1,69 @@ +from rest_framework import serializers + + +class TestSimpleBoundField: + def test_empty_bound_field(self): + class ExampleSerializer(serializers.Serializer): + text = serializers.CharField(max_length=100) + amount = serializers.IntegerField() + + serializer = ExampleSerializer() + + assert serializer['text'].value == '' + assert serializer['text'].errors is None + assert serializer['text'].name == 'text' + assert serializer['amount'].value is None + assert serializer['amount'].errors is None + assert serializer['amount'].name == 'amount' + + def test_populated_bound_field(self): + class ExampleSerializer(serializers.Serializer): + text = serializers.CharField(max_length=100) + amount = serializers.IntegerField() + + serializer = ExampleSerializer(data={'text': 'abc', 'amount': 123}) + + assert serializer['text'].value == 'abc' + assert serializer['text'].errors is None + assert serializer['text'].name == 'text' + assert serializer['amount'].value is 123 + assert serializer['amount'].errors is None + assert serializer['amount'].name == 'amount' + + def test_error_bound_field(self): + class ExampleSerializer(serializers.Serializer): + text = serializers.CharField(max_length=100) + amount = serializers.IntegerField() + + serializer = ExampleSerializer(data={'text': 'x' * 1000, 'amount': 123}) + serializer.is_valid() + + assert serializer['text'].value == 'x' * 1000 + assert serializer['text'].errors == ['Ensure this field has no more than 100 characters.'] + assert serializer['text'].name == 'text' + assert serializer['amount'].value is 123 + assert serializer['amount'].errors is None + assert serializer['amount'].name == 'amount' + + +class TestNestedBoundField: + def test_nested_empty_bound_field(self): + class Nested(serializers.Serializer): + more_text = serializers.CharField(max_length=100) + amount = serializers.IntegerField() + + class ExampleSerializer(serializers.Serializer): + text = serializers.CharField(max_length=100) + nested = Nested() + + serializer = ExampleSerializer() + + assert serializer['text'].value == '' + assert serializer['text'].errors is None + assert serializer['text'].name == 'text' + assert serializer['nested']['more_text'].value == '' + assert serializer['nested']['more_text'].errors is None + assert serializer['nested']['more_text'].name == 'nested.more_text' + assert serializer['nested']['amount'].value is None + assert serializer['nested']['amount'].errors is None + assert serializer['nested']['amount'].name == 'nested.amount' From f83ed19d22250eb646c9d77ccb1614a78d134e75 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 9 Oct 2014 16:29:34 +0100 Subject: [PATCH 0950/1652] Checks and repr on BoundField --- rest_framework/serializers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 1c006990b..3bd7b17b7 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -180,6 +180,7 @@ class BoundField(object): yield self[field.field_name] def __getitem__(self, key): + assert hasattr(self, 'fields'), '"%s" is not a nested field. Cannot perform indexing.' % self.name field = self.fields[key] value = self.value.get(key) if self.value else None error = self.errors.get(key) if self.errors else None @@ -189,6 +190,9 @@ class BoundField(object): def _proxy_class(self): return self._field.__class__ + def __repr__(self): + return '<%s value=%s errors=%s>' % (self.__class__.__name__, self.value, self.errors) + class BindingDict(object): """ From a0e852a4d52558db93209b4616f030b4ae2dcedb Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 9 Oct 2014 16:30:06 +0100 Subject: [PATCH 0951/1652] Use BoundField .name on fields --- rest_framework/templates/rest_framework/fields/attrs.html | 2 +- .../templates/rest_framework/fields/horizontal/checkbox.html | 2 +- .../templates/rest_framework/fields/horizontal/select.html | 2 +- .../rest_framework/fields/horizontal/select_checkbox.html | 4 ++-- .../rest_framework/fields/horizontal/select_multiple.html | 2 +- .../rest_framework/fields/horizontal/select_radio.html | 4 ++-- .../templates/rest_framework/fields/inline/checkbox.html | 2 +- .../templates/rest_framework/fields/inline/select.html | 2 +- .../rest_framework/fields/inline/select_checkbox.html | 2 +- .../rest_framework/fields/inline/select_multiple.html | 2 +- .../templates/rest_framework/fields/inline/select_radio.html | 2 +- .../templates/rest_framework/fields/vertical/checkbox.html | 2 +- .../templates/rest_framework/fields/vertical/select.html | 2 +- .../rest_framework/fields/vertical/select_checkbox.html | 4 ++-- .../rest_framework/fields/vertical/select_multiple.html | 2 +- .../rest_framework/fields/vertical/select_radio.html | 4 ++-- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/rest_framework/templates/rest_framework/fields/attrs.html b/rest_framework/templates/rest_framework/fields/attrs.html index b5a4dbcf1..1e23c4655 100644 --- a/rest_framework/templates/rest_framework/fields/attrs.html +++ b/rest_framework/templates/rest_framework/fields/attrs.html @@ -1 +1 @@ -name="{{ field.field_name }}" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %} +name="{{ field.name }}" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %} diff --git a/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html b/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html index dd3c3cef1..ee3bf9366 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html @@ -2,7 +2,7 @@ <div class="col-sm-offset-2 col-sm-10"> <div class="checkbox"> <label> - <input type="checkbox" name="{{ field.field_name }}" value="true" {% if field.value %}checked{% endif %}> + <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}> {% if field.label %}{{ field.label }}{% endif %} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select.html b/rest_framework/templates/rest_framework/fields/horizontal/select.html index 7367d7269..10b4b1393 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/select.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/select.html @@ -1,7 +1,7 @@ <div class="form-group"> {% include "rest_framework/fields/horizontal/label.html" %} <div class="col-sm-10"> - <select class="form-control" name="{{ field.field_name }}"> + <select class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html b/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html index 381cda2cb..6041fa746 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html @@ -4,7 +4,7 @@ {% if field.style.inline %} {% for key, text in field.choices.items %} <label class="checkbox-inline"> - <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> + <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> {{ text }} </label> {% endfor %} @@ -12,7 +12,7 @@ {% for key, text in field.choices.items %} <div class="checkbox"> <label> - <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> + <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> {{ text }} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html b/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html index 29ba86610..c0dbb989a 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html @@ -1,7 +1,7 @@ <div class="form-group"> {% include "rest_framework/fields/horizontal/label.html" %} <div class="col-sm-10"> - <select multiple class="form-control" name="{{ field.field_name }}"> + <select multiple class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html b/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html index 20aab8b22..0eeb9bc67 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html @@ -4,7 +4,7 @@ {% if field.style.inline %} {% for key, text in field.choices.items %} <label class="radio-inline"> - <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> + <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> {{ text }} </label> {% endfor %} @@ -12,7 +12,7 @@ {% for key, text in field.choices.items %} <div class="radio"> <label> - <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> + <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> {{ text }} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/inline/checkbox.html b/rest_framework/templates/rest_framework/fields/inline/checkbox.html index 289bbb4d8..57fa5dc04 100644 --- a/rest_framework/templates/rest_framework/fields/inline/checkbox.html +++ b/rest_framework/templates/rest_framework/fields/inline/checkbox.html @@ -1,6 +1,6 @@ <div class="checkbox"> <label> - <input type="checkbox" name="{{ field.field_name }}" value="true" {% if field.value %}checked{% endif %}> + <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}> {% if field.label %}{{ field.label }}{% endif %} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/inline/select.html b/rest_framework/templates/rest_framework/fields/inline/select.html index 9f361c4a0..eebb91d24 100644 --- a/rest_framework/templates/rest_framework/fields/inline/select.html +++ b/rest_framework/templates/rest_framework/fields/inline/select.html @@ -1,6 +1,6 @@ <div class="form-group"> {% include "rest_framework/fields/inline/label.html" %} - <select class="form-control" name="{{ field.field_name }}"> + <select class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} diff --git a/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html b/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html index 0f33fb692..b7561cd4d 100644 --- a/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html +++ b/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html @@ -3,7 +3,7 @@ {% for key, text in field.choices.items %} <div class="checkbox"> <label> - <input type="checkbox" name="{{ rest_framework/field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> + <input type="checkbox" name="{{ rest_framework/field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> {{ text }} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/inline/select_multiple.html b/rest_framework/templates/rest_framework/fields/inline/select_multiple.html index 7c9e51684..74e17f9fb 100644 --- a/rest_framework/templates/rest_framework/fields/inline/select_multiple.html +++ b/rest_framework/templates/rest_framework/fields/inline/select_multiple.html @@ -1,6 +1,6 @@ <div class="form-group"> {% include "rest_framework/fields/inline/label.html" %} - <select multiple class="form-control" name="{{ field.field_name }}"> + <select multiple class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} diff --git a/rest_framework/templates/rest_framework/fields/inline/select_radio.html b/rest_framework/templates/rest_framework/fields/inline/select_radio.html index 177c0eeba..27927a62d 100644 --- a/rest_framework/templates/rest_framework/fields/inline/select_radio.html +++ b/rest_framework/templates/rest_framework/fields/inline/select_radio.html @@ -3,7 +3,7 @@ {% for key, text in field.choices.items %} <div class="radio"> <label> - <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> + <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> {{ text }} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/checkbox.html b/rest_framework/templates/rest_framework/fields/vertical/checkbox.html index 01d30aaef..9fd4cdaa2 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/checkbox.html +++ b/rest_framework/templates/rest_framework/fields/vertical/checkbox.html @@ -1,6 +1,6 @@ <div class="checkbox"> <label> - <input type="checkbox" name="{{ field.field_name }}" value="true" {% if value %}checked{% endif %}> + <input type="checkbox" name="{{ field.name }}" value="true" {% if value %}checked{% endif %}> {% if field.label %}{{ field.label }}{% endif %} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/select.html b/rest_framework/templates/rest_framework/fields/vertical/select.html index dcc9a3cd9..1a651663f 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select.html @@ -1,6 +1,6 @@ <div class="form-group"> {% include "rest_framework/fields/vertical/label.html" %} - <select class="form-control" name="{{ field.field_name }}"> + <select class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html b/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html index 1fbe6a940..2e792e6a5 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html @@ -4,7 +4,7 @@ <div> {% for key, text in field.choices.items %} <label class="checkbox-inline"> - <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> + <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> {{ text }} </label> {% endfor %} @@ -13,7 +13,7 @@ {% for key, text in field.choices.items %} <div class="checkbox"> <label> - <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> + <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> {{ text }} </label> </div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html b/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html index 2cc40d99e..5f4166cd9 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html @@ -1,6 +1,6 @@ <div class="form-group"> {% include "rest_framework/fields/vertical/label.html" %} - <select multiple class="form-control" name="{{ field.field_name }}"> + <select multiple class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_radio.html b/rest_framework/templates/rest_framework/fields/vertical/select_radio.html index 470bcb0b0..2aa0fe289 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select_radio.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select_radio.html @@ -4,7 +4,7 @@ <div> {% for key, text in field.choices.items %} <label class="radio-inline"> - <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> + <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> {{ text }} </label> {% endfor %} @@ -13,7 +13,7 @@ {% for key, text in field.choices.items %} <div class="radio"> <label> - <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> + <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> {{ text }} </label> </div> From d9a199ca0ddf92f999aa37b396596d0e3e0a26d9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 10 Oct 2014 14:16:09 +0100 Subject: [PATCH 0952/1652] exceptions.ValidationFailed, not Django's ValidationError --- docs/topics/3.0-announcement.md | 6 +-- rest_framework/authtoken/serializers.py | 8 +-- rest_framework/exceptions.py | 14 +++++ rest_framework/fields.py | 21 +++++--- rest_framework/serializers.py | 68 ++++++++++++++----------- rest_framework/views.py | 27 ++++------ tests/test_fields.py | 23 ++++----- tests/test_relations.py | 20 ++++---- tests/test_validation.py | 11 ++-- 9 files changed, 107 insertions(+), 91 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index bffc608a8..b28670cf7 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -191,7 +191,7 @@ Using the `depth` option on `ModelSerializer` will now create **read-only nested def create(self, validated_data): profile_data = validated_data.pop['profile'] user = User.objects.create(**validated_data) - profile = Profile.objects.create(user=user, **profile_data) + Profile.objects.create(user=user, **profile_data) return user The single-step object creation makes this far simpler and more obvious than the previous `.restore_object()` behavior. @@ -223,10 +223,6 @@ We can now inspect the serializer representation in the Django shell, using `pyt rating = IntegerField() created_by = PrimaryKeyRelatedField(queryset=User.objects.all()) -#### Always use `fields`, not `exclude`. - -The `exclude` option on `ModelSerializer` is no longer available. You should use the more explicit `fields` option instead. - #### The `extra_kwargs` option. The `write_only_fields` option on `ModelSerializer` has been moved to `PendingDeprecation` and replaced with a more generic `extra_kwargs`. diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py index c2c456dea..a808d0a32 100644 --- a/rest_framework/authtoken/serializers.py +++ b/rest_framework/authtoken/serializers.py @@ -1,7 +1,7 @@ from django.contrib.auth import authenticate from django.utils.translation import ugettext_lazy as _ -from rest_framework import serializers +from rest_framework import exceptions, serializers class AuthTokenSerializer(serializers.Serializer): @@ -18,13 +18,13 @@ class AuthTokenSerializer(serializers.Serializer): if user: if not user.is_active: msg = _('User account is disabled.') - raise serializers.ValidationError(msg) + raise exceptions.ValidationFailed(msg) else: msg = _('Unable to log in with provided credentials.') - raise serializers.ValidationError(msg) + raise exceptions.ValidationFailed(msg) else: msg = _('Must include "username" and "password"') - raise serializers.ValidationError(msg) + raise exceptions.ValidationFailed(msg) attrs['user'] = user return attrs diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 06b5e8a27..b7c2d16d6 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -24,6 +24,20 @@ class APIException(Exception): return self.detail +class ValidationFailed(APIException): + status_code = status.HTTP_400_BAD_REQUEST + + def __init__(self, detail): + # For validation errors the 'detail' key is always required. + # The details should always be coerced to a list if not already. + if not isinstance(detail, dict) and not isinstance(detail, list): + detail = [detail] + self.detail = detail + + def __str__(self): + return str(self.detail) + + class ParseError(APIException): status_code = status.HTTP_400_BAD_REQUEST default_detail = 'Malformed request.' diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 7053acee0..b881ad13b 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1,7 +1,8 @@ -from django import forms from django.conf import settings from django.core import validators -from django.core.exceptions import ObjectDoesNotExist, ValidationError +from django.core.exceptions import ObjectDoesNotExist +from django.core.exceptions import ValidationError as DjangoValidationError +from django.forms import ImageField as DjangoImageField from django.utils import six, timezone from django.utils.datastructures import SortedDict from django.utils.dateparse import parse_date, parse_datetime, parse_time @@ -12,6 +13,7 @@ from rest_framework.compat import ( smart_text, EmailValidator, MinValueValidator, MaxValueValidator, MinLengthValidator, MaxLengthValidator, URLValidator ) +from rest_framework.exceptions import ValidationFailed from rest_framework.settings import api_settings from rest_framework.utils import html, representation, humanize_datetime import copy @@ -98,7 +100,7 @@ NOT_READ_ONLY_DEFAULT = 'May not set both `read_only` and `default`' NOT_REQUIRED_DEFAULT = 'May not set both `required` and `default`' USE_READONLYFIELD = 'Field(read_only=True) should be ReadOnlyField' MISSING_ERROR_MESSAGE = ( - 'ValidationError raised by `{class_name}`, but error key `{key}` does ' + 'ValidationFailed raised by `{class_name}`, but error key `{key}` does ' 'not exist in the `error_messages` dictionary.' ) @@ -263,7 +265,7 @@ class Field(object): def run_validators(self, value): """ Test the given value against all the validators on the field, - and either raise a `ValidationError` or simply return. + and either raise a `ValidationFailed` or simply return. """ errors = [] for validator in self.validators: @@ -271,10 +273,12 @@ class Field(object): validator.serializer_field = self try: validator(value) - except ValidationError as exc: + except ValidationFailed as exc: + errors.extend(exc.detail) + except DjangoValidationError as exc: errors.extend(exc.messages) if errors: - raise ValidationError(errors) + raise ValidationFailed(errors) def validate(self, value): pass @@ -301,7 +305,8 @@ class Field(object): class_name = self.__class__.__name__ msg = MISSING_ERROR_MESSAGE.format(class_name=class_name, key=key) raise AssertionError(msg) - raise ValidationError(msg.format(**kwargs)) + message_string = msg.format(**kwargs) + raise ValidationFailed(message_string) @property def root(self): @@ -946,7 +951,7 @@ class ImageField(FileField): } def __init__(self, *args, **kwargs): - self._DjangoImageField = kwargs.pop('_DjangoImageField', forms.ImageField) + self._DjangoImageField = kwargs.pop('_DjangoImageField', DjangoImageField) super(ImageField, self).__init__(*args, **kwargs) def to_internal_value(self, data): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 3bd7b17b7..2f6835629 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -10,10 +10,11 @@ python primitives. 2. The process of marshalling between python primitives and request and response content is handled by parsers and renderers. """ -from django.core.exceptions import ImproperlyConfigured, ValidationError +from django.core.exceptions import ImproperlyConfigured from django.db import models from django.utils import six from django.utils.datastructures import SortedDict +from rest_framework.exceptions import ValidationFailed from rest_framework.fields import empty, set_value, Field, SkipField from rest_framework.settings import api_settings from rest_framework.utils import html, model_meta, representation @@ -100,14 +101,14 @@ class BaseSerializer(Field): if not hasattr(self, '_validated_data'): try: self._validated_data = self.run_validation(self._initial_data) - except ValidationError as exc: + except ValidationFailed as exc: self._validated_data = {} - self._errors = exc.message_dict + self._errors = exc.detail else: self._errors = {} if self._errors and raise_exception: - raise ValidationError(self._errors) + raise ValidationFailed(self._errors) return not bool(self._errors) @@ -175,23 +176,33 @@ class BoundField(object): def __getattr__(self, attr_name): return getattr(self._field, attr_name) - def __iter__(self): - for field in self.fields.values(): - yield self[field.field_name] - - def __getitem__(self, key): - assert hasattr(self, 'fields'), '"%s" is not a nested field. Cannot perform indexing.' % self.name - field = self.fields[key] - value = self.value.get(key) if self.value else None - error = self.errors.get(key) if self.errors else None - return BoundField(field, value, error, prefix=self.name + '.') - @property def _proxy_class(self): return self._field.__class__ def __repr__(self): - return '<%s value=%s errors=%s>' % (self.__class__.__name__, self.value, self.errors) + return '<%s value=%s errors=%s>' % ( + self.__class__.__name__, self.value, self.errors + ) + + +class NestedBoundField(BoundField): + """ + This BoundField additionally implements __iter__ and __getitem__ + in order to support nested bound fields. This class is the type of + BoundField that is used for serializer fields. + """ + def __iter__(self): + for field in self.fields.values(): + yield self[field.field_name] + + def __getitem__(self, key): + field = self.fields[key] + value = self.value.get(key) if self.value else None + error = self.errors.get(key) if self.errors else None + if isinstance(field, Serializer): + return NestedBoundField(field, value, error, prefix=self.name + '.') + return BoundField(field, value, error, prefix=self.name + '.') class BindingDict(object): @@ -308,7 +319,7 @@ class Serializer(BaseSerializer): return None if not isinstance(data, dict): - raise ValidationError({ + raise ValidationFailed({ api_settings.NON_FIELD_ERRORS_KEY: ['Invalid data'] }) @@ -317,9 +328,9 @@ class Serializer(BaseSerializer): self.run_validators(value) value = self.validate(value) assert value is not None, '.validate() should return the validated data' - except ValidationError as exc: - raise ValidationError({ - api_settings.NON_FIELD_ERRORS_KEY: exc.messages + except ValidationFailed as exc: + raise ValidationFailed({ + api_settings.NON_FIELD_ERRORS_KEY: exc.detail }) return value @@ -338,15 +349,15 @@ class Serializer(BaseSerializer): validated_value = field.run_validation(primitive_value) if validate_method is not None: validated_value = validate_method(validated_value) - except ValidationError as exc: - errors[field.field_name] = exc.messages + except ValidationFailed as exc: + errors[field.field_name] = exc.detail except SkipField: pass else: set_value(ret, field.source_attrs, validated_value) if errors: - raise ValidationError(errors) + raise ValidationFailed(errors) return ret @@ -385,6 +396,8 @@ class Serializer(BaseSerializer): field = self.fields[key] value = self.data.get(key) error = self.errors.get(key) if hasattr(self, '_errors') else None + if isinstance(field, Serializer): + return NestedBoundField(field, value, error) return BoundField(field, value, error) @@ -538,9 +551,12 @@ class ModelSerializer(Serializer): ret = SortedDict() model = getattr(self.Meta, 'model') fields = getattr(self.Meta, 'fields', None) + exclude = getattr(self.Meta, 'exclude', None) depth = getattr(self.Meta, 'depth', 0) extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) + assert not fields and exclude, "Cannot set both 'fields' and 'exclude'." + extra_kwargs = self._include_additional_options(extra_kwargs) # Retrieve metadata about fields & relationships on the model class. @@ -551,12 +567,6 @@ class ModelSerializer(Serializer): fields = self._get_default_field_names(declared_fields, info) exclude = getattr(self.Meta, 'exclude', None) if exclude is not None: - warnings.warn( - "The `Meta.exclude` option is pending deprecation. " - "Use the explicit `Meta.fields` instead.", - PendingDeprecationWarning, - stacklevel=3 - ) for field_name in exclude: fields.remove(field_name) diff --git a/rest_framework/views.py b/rest_framework/views.py index 979229eb4..292431c8a 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -3,7 +3,7 @@ Provides an APIView class that is the base of all views in REST framework. """ from __future__ import unicode_literals -from django.core.exceptions import PermissionDenied, ValidationError, NON_FIELD_ERRORS +from django.core.exceptions import PermissionDenied from django.http import Http404 from django.views.decorators.csrf import csrf_exempt from rest_framework import status, exceptions @@ -63,27 +63,20 @@ def exception_handler(exc): if getattr(exc, 'wait', None): headers['Retry-After'] = '%d' % exc.wait - return Response({'detail': exc.detail}, - status=exc.status_code, - headers=headers) + if isinstance(exc.detail, (list, dict)): + data = exc.detail + else: + data = {'detail': exc.detail} - elif isinstance(exc, ValidationError): - # ValidationErrors may include the non-field key named '__all__'. - # When returning a response we map this to a key name that can be - # modified in settings. - if NON_FIELD_ERRORS in exc.message_dict: - errors = exc.message_dict.pop(NON_FIELD_ERRORS) - exc.message_dict[api_settings.NON_FIELD_ERRORS_KEY] = errors - return Response(exc.message_dict, - status=status.HTTP_400_BAD_REQUEST) + return Response(data, status=exc.status_code, headers=headers) elif isinstance(exc, Http404): - return Response({'detail': 'Not found'}, - status=status.HTTP_404_NOT_FOUND) + data = {'detail': 'Not found'} + return Response(data, status=status.HTTP_404_NOT_FOUND) elif isinstance(exc, PermissionDenied): - return Response({'detail': 'Permission denied'}, - status=status.HTTP_403_FORBIDDEN) + data = {'detail': 'Permission denied'} + return Response(data, status=status.HTTP_403_FORBIDDEN) # Note: Unhandled exceptions will raise a 500 error. return None diff --git a/tests/test_fields.py b/tests/test_fields.py index eaa0a3c83..5e8c67c54 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1,7 +1,6 @@ from decimal import Decimal -from django.core.exceptions import ValidationError from django.utils import timezone -from rest_framework import fields, serializers +from rest_framework import exceptions, fields, serializers import datetime import django import pytest @@ -19,9 +18,9 @@ class TestEmpty: By default a field must be included in the input. """ field = fields.IntegerField() - with pytest.raises(fields.ValidationError) as exc_info: + with pytest.raises(exceptions.ValidationFailed) as exc_info: field.run_validation() - assert exc_info.value.messages == ['This field is required.'] + assert exc_info.value.detail == ['This field is required.'] def test_not_required(self): """ @@ -36,9 +35,9 @@ class TestEmpty: By default `None` is not a valid input. """ field = fields.IntegerField() - with pytest.raises(fields.ValidationError) as exc_info: + with pytest.raises(exceptions.ValidationFailed) as exc_info: field.run_validation(None) - assert exc_info.value.messages == ['This field may not be null.'] + assert exc_info.value.detail == ['This field may not be null.'] def test_allow_null(self): """ @@ -53,9 +52,9 @@ class TestEmpty: By default '' is not a valid input. """ field = fields.CharField() - with pytest.raises(fields.ValidationError) as exc_info: + with pytest.raises(exceptions.ValidationFailed) as exc_info: field.run_validation('') - assert exc_info.value.messages == ['This field may not be blank.'] + assert exc_info.value.detail == ['This field may not be blank.'] def test_allow_blank(self): """ @@ -190,7 +189,7 @@ class TestInvalidErrorKey: with pytest.raises(AssertionError) as exc_info: self.field.to_native(123) expected = ( - 'ValidationError raised by `ExampleField`, but error key ' + 'ValidationFailed raised by `ExampleField`, but error key ' '`incorrect` does not exist in the `error_messages` dictionary.' ) assert str(exc_info.value) == expected @@ -244,9 +243,9 @@ class FieldValues: Ensure that invalid values raise the expected validation error. """ for input_value, expected_failure in get_items(self.invalid_inputs): - with pytest.raises(fields.ValidationError) as exc_info: + with pytest.raises(exceptions.ValidationFailed) as exc_info: self.field.run_validation(input_value) - assert exc_info.value.messages == expected_failure + assert exc_info.value.detail == expected_failure def test_outputs(self): for output_value, expected_output in get_items(self.outputs): @@ -901,7 +900,7 @@ class TestFieldFieldWithName(FieldValues): # call into it's regular validation, or require PIL for testing. class FailImageValidation(object): def to_python(self, value): - raise ValidationError(self.error_messages['invalid_image']) + raise exceptions.ValidationFailed(self.error_messages['invalid_image']) class PassImageValidation(object): diff --git a/tests/test_relations.py b/tests/test_relations.py index 66784195e..53c1b25c7 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -1,6 +1,6 @@ from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset -from django.core.exceptions import ImproperlyConfigured, ValidationError -from rest_framework import serializers +from django.core.exceptions import ImproperlyConfigured +from rest_framework import exceptions, serializers from rest_framework.test import APISimpleTestCase import pytest @@ -30,15 +30,15 @@ class TestPrimaryKeyRelatedField(APISimpleTestCase): assert instance is self.instance def test_pk_related_lookup_does_not_exist(self): - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(exceptions.ValidationFailed) as excinfo: self.field.to_internal_value(4) - msg = excinfo.value.messages[0] + msg = excinfo.value.detail[0] assert msg == "Invalid pk '4' - object does not exist." def test_pk_related_lookup_invalid_type(self): - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(exceptions.ValidationFailed) as excinfo: self.field.to_internal_value(BadType()) - msg = excinfo.value.messages[0] + msg = excinfo.value.detail[0] assert msg == 'Incorrect type. Expected pk value, received BadType.' def test_pk_representation(self): @@ -120,15 +120,15 @@ class TestSlugRelatedField(APISimpleTestCase): assert instance is self.instance def test_slug_related_lookup_does_not_exist(self): - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(exceptions.ValidationFailed) as excinfo: self.field.to_internal_value('doesnotexist') - msg = excinfo.value.messages[0] + msg = excinfo.value.detail[0] assert msg == 'Object with name=doesnotexist does not exist.' def test_slug_related_lookup_invalid_type(self): - with pytest.raises(ValidationError) as excinfo: + with pytest.raises(exceptions.ValidationFailed) as excinfo: self.field.to_internal_value(BadType()) - msg = excinfo.value.messages[0] + msg = excinfo.value.detail[0] assert msg == 'Invalid value.' def test_representation(self): diff --git a/tests/test_validation.py b/tests/test_validation.py index ce39714d1..849c7e9d5 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -1,9 +1,8 @@ from __future__ import unicode_literals from django.core.validators import MaxValueValidator -from django.core.exceptions import ValidationError from django.db import models from django.test import TestCase -from rest_framework import generics, serializers, status +from rest_framework import exceptions, generics, serializers, status from rest_framework.test import APIRequestFactory factory = APIRequestFactory() @@ -38,7 +37,7 @@ class ShouldValidateModelSerializer(serializers.ModelSerializer): def validate_renamed(self, value): if len(value) < 3: - raise serializers.ValidationError('Minimum 3 characters.') + raise exceptions.ValidationFailed('Minimum 3 characters.') return value class Meta: @@ -74,10 +73,10 @@ class ValidationSerializer(serializers.Serializer): foo = serializers.CharField() def validate_foo(self, attrs, source): - raise serializers.ValidationError("foo invalid") + raise exceptions.ValidationFailed("foo invalid") def validate(self, attrs): - raise serializers.ValidationError("serializer invalid") + raise exceptions.ValidationFailed("serializer invalid") class TestAvoidValidation(TestCase): @@ -159,7 +158,7 @@ class TestChoiceFieldChoicesValidate(TestCase): value = self.CHOICES[0][0] try: f.to_internal_value(value) - except ValidationError: + except exceptions.ValidationFailed: self.fail("Value %s does not validate" % str(value)) # def test_nested_choices(self): From d8a8987ab1eb6abbaee1a0de8cfea38eafe21293 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 10 Oct 2014 14:32:02 +0100 Subject: [PATCH 0953/1652] Tweaks --- docs/topics/3.0-announcement.md | 6 ++++++ rest_framework/serializers.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index b28670cf7..aa0e0c7e7 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -144,6 +144,12 @@ The corresponding code would now look like this: logging.info('Creating ticket "%s"' % name) serializer.save(user=request.user) # Include the user when saving. +#### Use `rest_framework.exceptions.ValidationFailed`. + +Django's `ValidationError` class is intended for use with HTML forms and it's API makes its use slightly awkward with nested validation errors as can occur in serializers. + +We now include a simpler `ValidationFailed` exception class in REST framework that you should use when raising validation failures. + #### Change to `validate_<field_name>`. The `validate_<field_name>` method hooks that can be attached to serializer classes change their signature slightly and return type. Previously these would take a dictionary of all incoming data, and a key representing the field name, and would return a dictionary including the validated data for that field: diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 2f6835629..0f6cf2bcd 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -555,7 +555,7 @@ class ModelSerializer(Serializer): depth = getattr(self.Meta, 'depth', 0) extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) - assert not fields and exclude, "Cannot set both 'fields' and 'exclude'." + assert not (fields and exclude), "Cannot set both 'fields' and 'exclude'." extra_kwargs = self._include_additional_options(extra_kwargs) From b5a4216aff06bfb36238d0f587d8645db0ee4a69 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 10 Oct 2014 15:08:43 +0100 Subject: [PATCH 0954/1652] Flake8 --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0f6cf2bcd..f3f5c837f 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -555,7 +555,7 @@ class ModelSerializer(Serializer): depth = getattr(self.Meta, 'depth', 0) extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) - assert not (fields and exclude), "Cannot set both 'fields' and 'exclude'." + assert not (fields and exclude), "Cannot set both 'fields' and 'exclude'." extra_kwargs = self._include_additional_options(extra_kwargs) From 826b5a889704452c53c05a44905f9fa62889ff34 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 10 Oct 2014 15:34:00 +0100 Subject: [PATCH 0955/1652] Relations in 'read_only_fields' should not include a queryset kwarg --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index f3f5c837f..bc9c15eb3 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -640,7 +640,7 @@ class ModelSerializer(Serializer): for attr in [ 'required', 'default', 'allow_blank', 'allow_null', 'min_length', 'max_length', 'min_value', 'max_value', - 'validators' + 'validators', 'queryset' ]: kwargs.pop(attr, None) kwargs.update(extras) From 81abf2bf341d8d7b27e2974a01a78c30c796b4d6 Mon Sep 17 00:00:00 2001 From: Andy Freeland <andy.freeland@redjack.com> Date: Sun, 12 Oct 2014 01:19:14 -0400 Subject: [PATCH 0956/1652] Rename `preform_update` to `perform_update` --- rest_framework/mixins.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 4c62debb0..467ff5155 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -67,10 +67,10 @@ class UpdateModelMixin(object): instance = self.get_object() serializer = self.get_serializer(instance, data=request.data, partial=partial) serializer.is_valid(raise_exception=True) - self.preform_update(serializer) + self.perform_update(serializer) return Response(serializer.data) - def preform_update(self, serializer): + def perform_update(self, serializer): serializer.save() def partial_update(self, request, *args, **kwargs): From f8f101268e1d3ff0621c61299c13d78914874a2b Mon Sep 17 00:00:00 2001 From: wolfe <davidgameswolfe@gmail.com> Date: Tue, 14 Oct 2014 18:58:25 -0300 Subject: [PATCH 0957/1652] Update 3.0-announcement.md Swap order of custom field API changes so the two "and" clauses are in the same order. --- docs/topics/3.0-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index aa0e0c7e7..dcd6d90cb 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -518,7 +518,7 @@ The `MultipleChoiceField` class has been added. This field acts like `ChoiceFiel #### Changes to the custom field API. -The `from_native(self, value)` and `to_native(self, data)` method names have been replaced with the more obviously named `to_representation(self, value)` and `to_internal_value(self, data)`. +The `from_native(self, value)` and `to_native(self, data)` method names have been replaced with the more obviously named `to_internal_value(self, data)` and `to_representation(self, value)`. The `field_from_native()` and `field_to_native()` methods are removed. From e272a36c9b444c1da3a3d8bc809070deb26d9c64 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 15 Oct 2014 09:24:49 +0100 Subject: [PATCH 0958/1652] Fix 'lookup_field' on ModelSerializer. Closes #1944. --- rest_framework/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index bc9c15eb3..c844605fc 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -680,7 +680,7 @@ class ModelSerializer(Serializer): PendingDeprecationWarning, stacklevel=3 ) - kwargs = extra_kwargs.get(field_name, {}) + kwargs = extra_kwargs.get(api_settings.URL_FIELD_NAME, {}) kwargs['view_name'] = view_name extra_kwargs[api_settings.URL_FIELD_NAME] = kwargs @@ -692,7 +692,7 @@ class ModelSerializer(Serializer): PendingDeprecationWarning, stacklevel=3 ) - kwargs = extra_kwargs.get(field_name, {}) + kwargs = extra_kwargs.get(api_settings.URL_FIELD_NAME, {}) kwargs['lookup_field'] = lookup_field extra_kwargs[api_settings.URL_FIELD_NAME] = kwargs From e558f806c0e87a329915b7077783f9ed3a79bb07 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 15 Oct 2014 10:04:01 +0100 Subject: [PATCH 0959/1652] Drop template includes --- rest_framework/templates/rest_framework/fields/attrs.html | 1 - .../templates/rest_framework/fields/horizontal/input.html | 6 ++++-- .../templates/rest_framework/fields/horizontal/label.html | 1 - .../rest_framework/fields/horizontal/select.html | 8 +++++--- .../rest_framework/fields/horizontal/select_checkbox.html | 4 +++- .../rest_framework/fields/horizontal/select_multiple.html | 4 +++- .../rest_framework/fields/horizontal/select_radio.html | 4 +++- .../rest_framework/fields/horizontal/textarea.html | 6 ++++-- .../templates/rest_framework/fields/inline/input.html | 6 ++++-- .../templates/rest_framework/fields/inline/label.html | 1 - .../templates/rest_framework/fields/inline/select.html | 4 +++- .../rest_framework/fields/inline/select_checkbox.html | 4 +++- .../rest_framework/fields/inline/select_multiple.html | 4 +++- .../rest_framework/fields/inline/select_radio.html | 4 +++- .../templates/rest_framework/fields/inline/textarea.html | 6 ++++-- .../templates/rest_framework/fields/vertical/input.html | 6 ++++-- .../templates/rest_framework/fields/vertical/label.html | 1 - .../templates/rest_framework/fields/vertical/select.html | 4 +++- .../rest_framework/fields/vertical/select_checkbox.html | 4 +++- .../rest_framework/fields/vertical/select_multiple.html | 4 +++- .../rest_framework/fields/vertical/select_radio.html | 4 +++- .../rest_framework/fields/vertical/textarea.html | 6 ++++-- 22 files changed, 62 insertions(+), 30 deletions(-) delete mode 100644 rest_framework/templates/rest_framework/fields/attrs.html delete mode 100644 rest_framework/templates/rest_framework/fields/horizontal/label.html delete mode 100644 rest_framework/templates/rest_framework/fields/inline/label.html delete mode 100644 rest_framework/templates/rest_framework/fields/vertical/label.html diff --git a/rest_framework/templates/rest_framework/fields/attrs.html b/rest_framework/templates/rest_framework/fields/attrs.html deleted file mode 100644 index 1e23c4655..000000000 --- a/rest_framework/templates/rest_framework/fields/attrs.html +++ /dev/null @@ -1 +0,0 @@ -name="{{ field.name }}" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %} diff --git a/rest_framework/templates/rest_framework/fields/horizontal/input.html b/rest_framework/templates/rest_framework/fields/horizontal/input.html index 6f1a504b5..6621c7e60 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/input.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/input.html @@ -1,7 +1,9 @@ <div class="form-group"> - {% include "rest_framework/fields/horizontal/label.html" %} + {% if field.label %} + <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> + {% endif %} <div class="col-sm-10"> - <input type="{{ input_type }}" class="form-control" {% include "rest_framework/fields/attrs.html" %} {% if field.value %}value="{{ field.value }}"{% endif %}> + <input name="{{ field.name }}" type="{{ input_type }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} </div> </div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/label.html b/rest_framework/templates/rest_framework/fields/horizontal/label.html deleted file mode 100644 index bf21f78cc..000000000 --- a/rest_framework/templates/rest_framework/fields/horizontal/label.html +++ /dev/null @@ -1 +0,0 @@ -{% if field.label %}<label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label>{% endif %} diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select.html b/rest_framework/templates/rest_framework/fields/horizontal/select.html index 10b4b1393..eaa6d575a 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/select.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/select.html @@ -1,10 +1,12 @@ <div class="form-group"> - {% include "rest_framework/fields/horizontal/label.html" %} + {% if field.label %} + <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> + {% endif %} <div class="col-sm-10"> <select class="form-control" name="{{ field.name }}"> - {% for key, text in field.choices.items %} + {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> - {% endfor %} + {% endfor %} </select> </div> </div> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html b/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html index 6041fa746..ff3fab573 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/horizontal/label.html" %} + {% if field.label %} + <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> + {% endif %} <div class="col-sm-10"> {% if field.style.inline %} {% for key, text in field.choices.items %} diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html b/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html index c0dbb989a..3ed2874b2 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/horizontal/label.html" %} + {% if field.label %} + <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> + {% endif %} <div class="col-sm-10"> <select multiple class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html b/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html index 0eeb9bc67..6e56afb52 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/horizontal/label.html" %} + {% if field.label %} + <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> + {% endif %} <div class="col-sm-10"> {% if field.style.inline %} {% for key, text in field.choices.items %} diff --git a/rest_framework/templates/rest_framework/fields/horizontal/textarea.html b/rest_framework/templates/rest_framework/fields/horizontal/textarea.html index 3d0161950..ae263c48c 100644 --- a/rest_framework/templates/rest_framework/fields/horizontal/textarea.html +++ b/rest_framework/templates/rest_framework/fields/horizontal/textarea.html @@ -1,7 +1,9 @@ <div class="form-group"> - {% include "rest_framework/fields/horizontal/label.html" %} + {% if field.label %} + <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> + {% endif %} <div class="col-sm-10"> - <textarea class="form-control" {% include "rest_framework/fields/attrs.html" %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> + <textarea name="{{ field.name }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} </div> </div> diff --git a/rest_framework/templates/rest_framework/fields/inline/input.html b/rest_framework/templates/rest_framework/fields/inline/input.html index e4a92ccd1..bdf25ffe6 100644 --- a/rest_framework/templates/rest_framework/fields/inline/input.html +++ b/rest_framework/templates/rest_framework/fields/inline/input.html @@ -1,4 +1,6 @@ <div class="form-group"> - {% include "rest_framework/fields/inline/label.html" %} - <input type="{{ input_type }}" class="form-control" {% include "rest_framework/fields/attrs.html" %} {% if field.value %}value="{{ field.value }}"{% endif %}> + {% if field.label %} + <label class="sr-only">{{ field.label }}</label> + {% endif %} + <input name="{{ field.name }}" type="{{ input_type }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> </div> diff --git a/rest_framework/templates/rest_framework/fields/inline/label.html b/rest_framework/templates/rest_framework/fields/inline/label.html deleted file mode 100644 index 7d546a571..000000000 --- a/rest_framework/templates/rest_framework/fields/inline/label.html +++ /dev/null @@ -1 +0,0 @@ -{% if field.label %}<label class="sr-only">{{ field.label }}</label>{% endif %} diff --git a/rest_framework/templates/rest_framework/fields/inline/select.html b/rest_framework/templates/rest_framework/fields/inline/select.html index eebb91d24..730fcce61 100644 --- a/rest_framework/templates/rest_framework/fields/inline/select.html +++ b/rest_framework/templates/rest_framework/fields/inline/select.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/inline/label.html" %} + {% if field.label %} + <label class="sr-only">{{ field.label }}</label> + {% endif %} <select class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> diff --git a/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html b/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html index b7561cd4d..cca71d689 100644 --- a/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html +++ b/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/inline/label.html" %} + {% if field.label %} + <label class="sr-only">{{ field.label }}</label> + {% endif %} {% for key, text in field.choices.items %} <div class="checkbox"> <label> diff --git a/rest_framework/templates/rest_framework/fields/inline/select_multiple.html b/rest_framework/templates/rest_framework/fields/inline/select_multiple.html index 74e17f9fb..3f9b27017 100644 --- a/rest_framework/templates/rest_framework/fields/inline/select_multiple.html +++ b/rest_framework/templates/rest_framework/fields/inline/select_multiple.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/inline/label.html" %} + {% if field.label %} + <label class="sr-only">{{ field.label }}</label> + {% endif %} <select multiple class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> diff --git a/rest_framework/templates/rest_framework/fields/inline/select_radio.html b/rest_framework/templates/rest_framework/fields/inline/select_radio.html index 27927a62d..3fffceac4 100644 --- a/rest_framework/templates/rest_framework/fields/inline/select_radio.html +++ b/rest_framework/templates/rest_framework/fields/inline/select_radio.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/inline/label.html" %} + {% if field.label %} + <label class="sr-only">{{ field.label }}</label> + {% endif %} {% for key, text in field.choices.items %} <div class="radio"> <label> diff --git a/rest_framework/templates/rest_framework/fields/inline/textarea.html b/rest_framework/templates/rest_framework/fields/inline/textarea.html index 8259487b3..a644ea382 100644 --- a/rest_framework/templates/rest_framework/fields/inline/textarea.html +++ b/rest_framework/templates/rest_framework/fields/inline/textarea.html @@ -1,4 +1,6 @@ <div class="form-group"> - {% include "rest_framework/fields/inline/label.html" %} - <textarea class="form-control" {% include "rest_framework/fields/attrs.html" %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> + {% if field.label %} + <label class="sr-only">{{ field.label }}</label> + {% endif %} + <textarea name="{{ field.name }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> </div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/input.html b/rest_framework/templates/rest_framework/fields/vertical/input.html index 3ee2716af..10a576b2a 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/input.html +++ b/rest_framework/templates/rest_framework/fields/vertical/input.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/vertical/label.html" %} - <input type="{{ input_type }}" class="form-control" {% include "rest_framework/fields/attrs.html" %} {% if field.value %}value="{{ field.value }}"{% endif %}> + {% if field.label %} + <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + {% endif %} + <input name="{{ field.name }}" type="{{ input_type }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} </div> diff --git a/rest_framework/templates/rest_framework/fields/vertical/label.html b/rest_framework/templates/rest_framework/fields/vertical/label.html deleted file mode 100644 index 651939b26..000000000 --- a/rest_framework/templates/rest_framework/fields/vertical/label.html +++ /dev/null @@ -1 +0,0 @@ -{% if field.label %}<label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>{% endif %} diff --git a/rest_framework/templates/rest_framework/fields/vertical/select.html b/rest_framework/templates/rest_framework/fields/vertical/select.html index 1a651663f..b0545f7e1 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/vertical/label.html" %} + {% if field.label %} + <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + {% endif %} <select class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html b/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html index 2e792e6a5..c486b1b39 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/vertical/label.html" %} + {% if field.label %} + <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + {% endif %} {% if field.style.inline %} <div> {% for key, text in field.choices.items %} diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html b/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html index 5f4166cd9..ca63192e9 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/vertical/label.html" %} + {% if field.label %} + <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + {% endif %} <select multiple class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_radio.html b/rest_framework/templates/rest_framework/fields/vertical/select_radio.html index 2aa0fe289..d7655b008 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/select_radio.html +++ b/rest_framework/templates/rest_framework/fields/vertical/select_radio.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/vertical/label.html" %} + {% if field.label %} + <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + {% endif %} {% if field.style.inline %} <div> {% for key, text in field.choices.items %} diff --git a/rest_framework/templates/rest_framework/fields/vertical/textarea.html b/rest_framework/templates/rest_framework/fields/vertical/textarea.html index 406cfa77d..8d9514961 100644 --- a/rest_framework/templates/rest_framework/fields/vertical/textarea.html +++ b/rest_framework/templates/rest_framework/fields/vertical/textarea.html @@ -1,5 +1,7 @@ <div class="form-group"> - {% include "rest_framework/fields/vertical/label.html" %} - <textarea class="form-control" {% include "rest_framework/fields/attrs.html" %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> + {% if field.label %} + <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + {% endif %} + <textarea name="{{ field.name }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} </div> From cc1c4232554153ac6a24b6b4f89ecaac80b28bfd Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 15 Oct 2014 11:12:34 +0100 Subject: [PATCH 0960/1652] Reorganize to use template_pack in form rendering --- rest_framework/renderers.py | 15 +++------ .../fields/inline/textarea.html | 6 ---- .../templates/rest_framework/form.html | 33 ------------------- .../fields}/checkbox.html | 0 .../fields}/fieldset.html | 0 .../fields}/input.html | 0 .../fields}/list_fieldset.html | 0 .../fields}/select.html | 0 .../fields}/select_checkbox.html | 0 .../fields}/select_multiple.html | 0 .../fields}/select_radio.html | 0 .../fields}/textarea.html | 0 .../rest_framework/horizontal/form.html | 15 +++++++++ .../inline => inline/fields}/checkbox.html | 0 .../inline => inline/fields}/fieldset.html | 0 .../inline => inline/fields}/input.html | 0 .../inline => inline/fields}/select.html | 0 .../fields}/select_checkbox.html | 0 .../fields}/select_multiple.html | 0 .../fields}/select_radio.html | 0 .../inline/fields/textarea.html | 6 ++++ .../templates/rest_framework/inline/form.html | 11 +++++++ .../fields}/checkbox.html | 0 .../fields}/fieldset.html | 0 .../vertical => vertical/fields}/input.html | 0 .../fields}/list_fieldset.html | 0 .../vertical => vertical/fields}/select.html | 0 .../fields}/select_checkbox.html | 0 .../fields}/select_multiple.html | 0 .../fields}/select_radio.html | 0 .../fields}/textarea.html | 0 .../rest_framework/vertical/form.html | 11 +++++++ rest_framework/templatetags/rest_framework.py | 4 +-- 33 files changed, 49 insertions(+), 52 deletions(-) delete mode 100644 rest_framework/templates/rest_framework/fields/inline/textarea.html delete mode 100644 rest_framework/templates/rest_framework/form.html rename rest_framework/templates/rest_framework/{fields/horizontal => horizontal/fields}/checkbox.html (100%) rename rest_framework/templates/rest_framework/{fields/horizontal => horizontal/fields}/fieldset.html (100%) rename rest_framework/templates/rest_framework/{fields/horizontal => horizontal/fields}/input.html (100%) rename rest_framework/templates/rest_framework/{fields/horizontal => horizontal/fields}/list_fieldset.html (100%) rename rest_framework/templates/rest_framework/{fields/horizontal => horizontal/fields}/select.html (100%) rename rest_framework/templates/rest_framework/{fields/horizontal => horizontal/fields}/select_checkbox.html (100%) rename rest_framework/templates/rest_framework/{fields/horizontal => horizontal/fields}/select_multiple.html (100%) rename rest_framework/templates/rest_framework/{fields/horizontal => horizontal/fields}/select_radio.html (100%) rename rest_framework/templates/rest_framework/{fields/horizontal => horizontal/fields}/textarea.html (100%) create mode 100644 rest_framework/templates/rest_framework/horizontal/form.html rename rest_framework/templates/rest_framework/{fields/inline => inline/fields}/checkbox.html (100%) rename rest_framework/templates/rest_framework/{fields/inline => inline/fields}/fieldset.html (100%) rename rest_framework/templates/rest_framework/{fields/inline => inline/fields}/input.html (100%) rename rest_framework/templates/rest_framework/{fields/inline => inline/fields}/select.html (100%) rename rest_framework/templates/rest_framework/{fields/inline => inline/fields}/select_checkbox.html (100%) rename rest_framework/templates/rest_framework/{fields/inline => inline/fields}/select_multiple.html (100%) rename rest_framework/templates/rest_framework/{fields/inline => inline/fields}/select_radio.html (100%) create mode 100644 rest_framework/templates/rest_framework/inline/fields/textarea.html create mode 100644 rest_framework/templates/rest_framework/inline/form.html rename rest_framework/templates/rest_framework/{fields/vertical => vertical/fields}/checkbox.html (100%) rename rest_framework/templates/rest_framework/{fields/vertical => vertical/fields}/fieldset.html (100%) rename rest_framework/templates/rest_framework/{fields/vertical => vertical/fields}/input.html (100%) rename rest_framework/templates/rest_framework/{fields/vertical => vertical/fields}/list_fieldset.html (100%) rename rest_framework/templates/rest_framework/{fields/vertical => vertical/fields}/select.html (100%) rename rest_framework/templates/rest_framework/{fields/vertical => vertical/fields}/select_checkbox.html (100%) rename rest_framework/templates/rest_framework/{fields/vertical => vertical/fields}/select_multiple.html (100%) rename rest_framework/templates/rest_framework/{fields/vertical => vertical/fields}/select_radio.html (100%) rename rest_framework/templates/rest_framework/{fields/vertical => vertical/fields}/textarea.html (100%) create mode 100644 rest_framework/templates/rest_framework/vertical/form.html diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 4fb360609..5fae75f2e 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -339,7 +339,6 @@ class HTMLFormRenderer(BaseRenderer): """ media_type = 'text/html' format = 'form' - template = 'rest_framework/form.html' charset = 'utf-8' field_templates = ClassLookupDict({ @@ -383,26 +382,21 @@ class HTMLFormRenderer(BaseRenderer): serializers.TimeField: 'time', }) - def render_field(self, field, layout=None): - layout = layout or 'vertical' + def render_field(self, field, template_pack=None): style_type = field.style.get('type', 'default') - if style_type == 'textarea' and layout == 'inline': - style_type = 'default' input_type = self.input_type[field] if input_type == 'datetime-local' and isinstance(field.value, six.text_type): field.value = field.value.rstrip('Z') base = self.field_templates[field][style_type] - template_name = 'rest_framework/fields/' + layout + '/' + base + template_name = template_pack + '/fields/' + base template = loader.get_template(template_name) context = Context({ 'field': field, 'input_type': input_type, 'renderer': self, - 'layout': layout }) - return template.render(context) def render(self, data, accepted_media_type=None, renderer_context=None): @@ -411,11 +405,10 @@ class HTMLFormRenderer(BaseRenderer): """ renderer_context = renderer_context or {} request = renderer_context['request'] - - template = loader.get_template(self.template) + template = loader.get_template('rest_framework/horizontal/form.html') context = RequestContext(request, { 'form': data.serializer, - 'layout': getattr(getattr(data, 'Meta', None), 'layout', 'horizontal'), + 'template_pack': 'rest_framework/horizontal', 'renderer': self }) return template.render(context) diff --git a/rest_framework/templates/rest_framework/fields/inline/textarea.html b/rest_framework/templates/rest_framework/fields/inline/textarea.html deleted file mode 100644 index a644ea382..000000000 --- a/rest_framework/templates/rest_framework/fields/inline/textarea.html +++ /dev/null @@ -1,6 +0,0 @@ -<div class="form-group"> - {% if field.label %} - <label class="sr-only">{{ field.label }}</label> - {% endif %} - <textarea name="{{ field.name }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> -</div> diff --git a/rest_framework/templates/rest_framework/form.html b/rest_framework/templates/rest_framework/form.html deleted file mode 100644 index 162c56336..000000000 --- a/rest_framework/templates/rest_framework/form.html +++ /dev/null @@ -1,33 +0,0 @@ -<!-- <html> -<head> - <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet"> -</head> -<body> -<div class="container"> - -<h1>User update</h1> -<div class="well"> --> - -{% load rest_framework %} -<form {% if layout == "inline" %}class="form-inline"{% elif layout == "horizontal" %}class="form-horizontal"{% endif %} role="form" action="." method="POST"> - {% csrf_token %} - {% for field in form %} - {% if not field.read_only %} - {% render_field field layout=layout renderer=renderer %} - {% endif %} - {% endfor %} - <!-- form.non_field_errors --> - {% if layout == "horizontal" %} - <div class="form-group"> - <div class="col-sm-offset-2 col-sm-10"> - <button type="submit" class="btn btn-default">Submit</button> - </div> - </div> - {% else %} - <button type="submit" class="btn btn-default">Submit</button> - {% endif %} -</form> -<!-- -</div> -</div></body> -</html> --> diff --git a/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html b/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/horizontal/checkbox.html rename to rest_framework/templates/rest_framework/horizontal/fields/checkbox.html diff --git a/rest_framework/templates/rest_framework/fields/horizontal/fieldset.html b/rest_framework/templates/rest_framework/horizontal/fields/fieldset.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/horizontal/fieldset.html rename to rest_framework/templates/rest_framework/horizontal/fields/fieldset.html diff --git a/rest_framework/templates/rest_framework/fields/horizontal/input.html b/rest_framework/templates/rest_framework/horizontal/fields/input.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/horizontal/input.html rename to rest_framework/templates/rest_framework/horizontal/fields/input.html diff --git a/rest_framework/templates/rest_framework/fields/horizontal/list_fieldset.html b/rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/horizontal/list_fieldset.html rename to rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select.html b/rest_framework/templates/rest_framework/horizontal/fields/select.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/horizontal/select.html rename to rest_framework/templates/rest_framework/horizontal/fields/select.html diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html b/rest_framework/templates/rest_framework/horizontal/fields/select_checkbox.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html rename to rest_framework/templates/rest_framework/horizontal/fields/select_checkbox.html diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html b/rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html rename to rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html b/rest_framework/templates/rest_framework/horizontal/fields/select_radio.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/horizontal/select_radio.html rename to rest_framework/templates/rest_framework/horizontal/fields/select_radio.html diff --git a/rest_framework/templates/rest_framework/fields/horizontal/textarea.html b/rest_framework/templates/rest_framework/horizontal/fields/textarea.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/horizontal/textarea.html rename to rest_framework/templates/rest_framework/horizontal/fields/textarea.html diff --git a/rest_framework/templates/rest_framework/horizontal/form.html b/rest_framework/templates/rest_framework/horizontal/form.html new file mode 100644 index 000000000..7560d8a26 --- /dev/null +++ b/rest_framework/templates/rest_framework/horizontal/form.html @@ -0,0 +1,15 @@ +{% load rest_framework %} +<form class="form-horizontal" role="form" action="." method="POST"> + {% csrf_token %} + {% for field in form %} + {% if not field.read_only %} + {% render_field field template_pack=template_pack renderer=renderer %} + {% endif %} + {% endfor %} + <!-- form.non_field_errors --> + <div class="form-group"> + <div class="col-sm-offset-2 col-sm-10"> + <button type="submit" class="btn btn-default">Submit</button> + </div> + </div> +</form> diff --git a/rest_framework/templates/rest_framework/fields/inline/checkbox.html b/rest_framework/templates/rest_framework/inline/fields/checkbox.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/inline/checkbox.html rename to rest_framework/templates/rest_framework/inline/fields/checkbox.html diff --git a/rest_framework/templates/rest_framework/fields/inline/fieldset.html b/rest_framework/templates/rest_framework/inline/fields/fieldset.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/inline/fieldset.html rename to rest_framework/templates/rest_framework/inline/fields/fieldset.html diff --git a/rest_framework/templates/rest_framework/fields/inline/input.html b/rest_framework/templates/rest_framework/inline/fields/input.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/inline/input.html rename to rest_framework/templates/rest_framework/inline/fields/input.html diff --git a/rest_framework/templates/rest_framework/fields/inline/select.html b/rest_framework/templates/rest_framework/inline/fields/select.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/inline/select.html rename to rest_framework/templates/rest_framework/inline/fields/select.html diff --git a/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html b/rest_framework/templates/rest_framework/inline/fields/select_checkbox.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/inline/select_checkbox.html rename to rest_framework/templates/rest_framework/inline/fields/select_checkbox.html diff --git a/rest_framework/templates/rest_framework/fields/inline/select_multiple.html b/rest_framework/templates/rest_framework/inline/fields/select_multiple.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/inline/select_multiple.html rename to rest_framework/templates/rest_framework/inline/fields/select_multiple.html diff --git a/rest_framework/templates/rest_framework/fields/inline/select_radio.html b/rest_framework/templates/rest_framework/inline/fields/select_radio.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/inline/select_radio.html rename to rest_framework/templates/rest_framework/inline/fields/select_radio.html diff --git a/rest_framework/templates/rest_framework/inline/fields/textarea.html b/rest_framework/templates/rest_framework/inline/fields/textarea.html new file mode 100644 index 000000000..bdf25ffe6 --- /dev/null +++ b/rest_framework/templates/rest_framework/inline/fields/textarea.html @@ -0,0 +1,6 @@ +<div class="form-group"> + {% if field.label %} + <label class="sr-only">{{ field.label }}</label> + {% endif %} + <input name="{{ field.name }}" type="{{ input_type }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> +</div> diff --git a/rest_framework/templates/rest_framework/inline/form.html b/rest_framework/templates/rest_framework/inline/form.html new file mode 100644 index 000000000..b13d16614 --- /dev/null +++ b/rest_framework/templates/rest_framework/inline/form.html @@ -0,0 +1,11 @@ +{% load rest_framework %} +<form class="form-inline" role="form" action="." method="POST"> + {% csrf_token %} + {% for field in form %} + {% if not field.read_only %} + {% render_field field template_pack=template_pack renderer=renderer %} + {% endif %} + {% endfor %} + <!-- form.non_field_errors --> + <button type="submit" class="btn btn-default">Submit</button> +</form> diff --git a/rest_framework/templates/rest_framework/fields/vertical/checkbox.html b/rest_framework/templates/rest_framework/vertical/fields/checkbox.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/vertical/checkbox.html rename to rest_framework/templates/rest_framework/vertical/fields/checkbox.html diff --git a/rest_framework/templates/rest_framework/fields/vertical/fieldset.html b/rest_framework/templates/rest_framework/vertical/fields/fieldset.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/vertical/fieldset.html rename to rest_framework/templates/rest_framework/vertical/fields/fieldset.html diff --git a/rest_framework/templates/rest_framework/fields/vertical/input.html b/rest_framework/templates/rest_framework/vertical/fields/input.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/vertical/input.html rename to rest_framework/templates/rest_framework/vertical/fields/input.html diff --git a/rest_framework/templates/rest_framework/fields/vertical/list_fieldset.html b/rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/vertical/list_fieldset.html rename to rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html diff --git a/rest_framework/templates/rest_framework/fields/vertical/select.html b/rest_framework/templates/rest_framework/vertical/fields/select.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/vertical/select.html rename to rest_framework/templates/rest_framework/vertical/fields/select.html diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html b/rest_framework/templates/rest_framework/vertical/fields/select_checkbox.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html rename to rest_framework/templates/rest_framework/vertical/fields/select_checkbox.html diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html b/rest_framework/templates/rest_framework/vertical/fields/select_multiple.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/vertical/select_multiple.html rename to rest_framework/templates/rest_framework/vertical/fields/select_multiple.html diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_radio.html b/rest_framework/templates/rest_framework/vertical/fields/select_radio.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/vertical/select_radio.html rename to rest_framework/templates/rest_framework/vertical/fields/select_radio.html diff --git a/rest_framework/templates/rest_framework/fields/vertical/textarea.html b/rest_framework/templates/rest_framework/vertical/fields/textarea.html similarity index 100% rename from rest_framework/templates/rest_framework/fields/vertical/textarea.html rename to rest_framework/templates/rest_framework/vertical/fields/textarea.html diff --git a/rest_framework/templates/rest_framework/vertical/form.html b/rest_framework/templates/rest_framework/vertical/form.html new file mode 100644 index 000000000..fe908af02 --- /dev/null +++ b/rest_framework/templates/rest_framework/vertical/form.html @@ -0,0 +1,11 @@ +{% load rest_framework %} +<form role="form" action="." method="POST"> + {% csrf_token %} + {% for field in form %} + {% if not field.read_only %} + {% render_field field template_pack=template_pack renderer=renderer %} + {% endif %} + {% endfor %} + <!-- form.non_field_errors --> + <button type="submit" class="btn btn-default">Submit</button> +</form> diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 49a4c3389..c092d39f6 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -32,8 +32,8 @@ class_re = re.compile(r'(?<=class=["\'])(.*)(?=["\'])') # And the template tags themselves... @register.simple_tag -def render_field(field, layout=None, renderer=None): - return renderer.render_field(field, layout) +def render_field(field, template_pack=None, renderer=None): + return renderer.render_field(field, template_pack) @register.simple_tag From 36fbc7678c3437dfe2d70380ab1b153429641bb5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 15 Oct 2014 13:35:12 +0100 Subject: [PATCH 0961/1652] Moar form styling --- .../templates/rest_framework/base.html | 2 +- .../horizontal/fields/checkbox.html | 8 +++++++- ...t_checkbox.html => checkbox_multiple.html} | 10 ++++++++-- .../horizontal/fields/fieldset.html | 4 ++-- .../horizontal/fields/input.html | 13 ++++++++---- .../horizontal/fields/list_fieldset.html | 2 +- .../fields/{select_radio.html => radio.html} | 10 ++++++++-- .../horizontal/fields/select.html | 8 +++++++- .../horizontal/fields/select_multiple.html | 8 +++++++- .../horizontal/fields/textarea.html | 13 ++++++++---- .../inline/fields/checkbox.html | 12 ++++++----- ...t_checkbox.html => checkbox_multiple.html} | 2 +- .../inline/fields/fieldset.html | 2 +- .../rest_framework/inline/fields/input.html | 4 ++-- .../fields/{select_radio.html => radio.html} | 2 +- .../rest_framework/inline/fields/select.html | 2 +- .../inline/fields/select_multiple.html | 2 +- .../inline/fields/textarea.html | 4 ++-- .../vertical/fields/checkbox.html | 20 +++++++++++++------ ...t_checkbox.html => checkbox_multiple.html} | 12 ++++++++--- .../vertical/fields/fieldset.html | 4 ++-- .../rest_framework/vertical/fields/input.html | 13 ++++++++---- .../vertical/fields/list_fieldset.html | 4 ++-- .../fields/{select_radio.html => radio.html} | 12 ++++++++--- .../vertical/fields/select.html | 10 ++++++++-- .../vertical/fields/select_multiple.html | 10 ++++++++-- .../vertical/fields/textarea.html | 13 ++++++++---- 27 files changed, 145 insertions(+), 61 deletions(-) rename rest_framework/templates/rest_framework/horizontal/fields/{select_checkbox.html => checkbox_multiple.html} (66%) rename rest_framework/templates/rest_framework/horizontal/fields/{select_radio.html => radio.html} (66%) rename rest_framework/templates/rest_framework/inline/fields/{select_checkbox.html => checkbox_multiple.html} (85%) rename rest_framework/templates/rest_framework/inline/fields/{select_radio.html => radio.html} (85%) rename rest_framework/templates/rest_framework/vertical/fields/{select_checkbox.html => checkbox_multiple.html} (62%) rename rest_framework/templates/rest_framework/vertical/fields/{select_radio.html => radio.html} (62%) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 2e03dd987..4b6c7fcfc 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -59,7 +59,7 @@ <ul class="breadcrumb"> {% for breadcrumb_name, breadcrumb_url in breadcrumblist %} {% if forloop.last %} - <li class="active">{{ breadcrumb_name }}</li> + <li class="active"><a href="{{ breadcrumb_url }}">{{ breadcrumb_name }}</a></li> {% else %} <li><a href="{{ breadcrumb_url }}">{{ breadcrumb_name }}</a></li> {% endif %} diff --git a/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html b/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html index ee3bf9366..07a7308f0 100644 --- a/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html +++ b/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html @@ -1,4 +1,4 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> <div class="col-sm-offset-2 col-sm-10"> <div class="checkbox"> <label> @@ -6,5 +6,11 @@ {% if field.label %}{{ field.label }}{% endif %} </label> </div> + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> + {% endif %} </div> </div> diff --git a/rest_framework/templates/rest_framework/horizontal/fields/select_checkbox.html b/rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html similarity index 66% rename from rest_framework/templates/rest_framework/horizontal/fields/select_checkbox.html rename to rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html index ff3fab573..ec7d59356 100644 --- a/rest_framework/templates/rest_framework/horizontal/fields/select_checkbox.html +++ b/rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html @@ -1,9 +1,9 @@ <div class="form-group"> {% if field.label %} - <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> + <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> {% endif %} <div class="col-sm-10"> - {% if field.style.inline %} + {% if style.inline %} {% for key, text in field.choices.items %} <label class="checkbox-inline"> <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> @@ -20,5 +20,11 @@ </div> {% endfor %} {% endif %} + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> + {% endif %} </div> </div> diff --git a/rest_framework/templates/rest_framework/horizontal/fields/fieldset.html b/rest_framework/templates/rest_framework/horizontal/fields/fieldset.html index ff93c6baa..f6d5dd9d2 100644 --- a/rest_framework/templates/rest_framework/horizontal/fields/fieldset.html +++ b/rest_framework/templates/rest_framework/horizontal/fields/fieldset.html @@ -2,10 +2,10 @@ <fieldset> {% if field.label %} <div class="form-group" style="border-bottom: 1px solid #e5e5e5"> - <legend class="control-label col-sm-2 {% if field.style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend> + <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend> </div> {% endif %} {% for nested_field in field %} - {% render_field nested_field layout=layout renderer=renderer %} + {% render_field nested_field template_pack=template_pack renderer=renderer %} {% endfor %} </fieldset> diff --git a/rest_framework/templates/rest_framework/horizontal/fields/input.html b/rest_framework/templates/rest_framework/horizontal/fields/input.html index 6621c7e60..43ab41512 100644 --- a/rest_framework/templates/rest_framework/horizontal/fields/input.html +++ b/rest_framework/templates/rest_framework/horizontal/fields/input.html @@ -1,9 +1,14 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} - <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> + <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> {% endif %} <div class="col-sm-10"> - <input name="{{ field.name }}" type="{{ input_type }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> - {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} + <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" novalidate {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> + {% endif %} </div> </div> diff --git a/rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html b/rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html index 68c75d4f8..a30514c68 100644 --- a/rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html +++ b/rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html @@ -2,7 +2,7 @@ <fieldset> {% if field.label %} <div class="form-group" style="border-bottom: 1px solid #e5e5e5"> - <legend class="control-label col-sm-2 {% if field.style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend> + <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend> </div> {% endif %} <ul> diff --git a/rest_framework/templates/rest_framework/horizontal/fields/select_radio.html b/rest_framework/templates/rest_framework/horizontal/fields/radio.html similarity index 66% rename from rest_framework/templates/rest_framework/horizontal/fields/select_radio.html rename to rest_framework/templates/rest_framework/horizontal/fields/radio.html index 6e56afb52..52238bb1a 100644 --- a/rest_framework/templates/rest_framework/horizontal/fields/select_radio.html +++ b/rest_framework/templates/rest_framework/horizontal/fields/radio.html @@ -1,9 +1,9 @@ <div class="form-group"> {% if field.label %} - <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> + <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> {% endif %} <div class="col-sm-10"> - {% if field.style.inline %} + {% if style.inline %} {% for key, text in field.choices.items %} <label class="radio-inline"> <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}> @@ -20,5 +20,11 @@ </div> {% endfor %} {% endif %} + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> + {% endif %} </div> </div> diff --git a/rest_framework/templates/rest_framework/horizontal/fields/select.html b/rest_framework/templates/rest_framework/horizontal/fields/select.html index eaa6d575a..1d00f4241 100644 --- a/rest_framework/templates/rest_framework/horizontal/fields/select.html +++ b/rest_framework/templates/rest_framework/horizontal/fields/select.html @@ -1,6 +1,6 @@ <div class="form-group"> {% if field.label %} - <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> + <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> {% endif %} <div class="col-sm-10"> <select class="form-control" name="{{ field.name }}"> @@ -8,5 +8,11 @@ <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> + {% endif %} </div> </div> diff --git a/rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html b/rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html index 3ed2874b2..01c251fb0 100644 --- a/rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html +++ b/rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html @@ -1,6 +1,6 @@ <div class="form-group"> {% if field.label %} - <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> + <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> {% endif %} <div class="col-sm-10"> <select multiple class="form-control" name="{{ field.name }}"> @@ -8,5 +8,11 @@ <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> + {% endif %} </div> </div> diff --git a/rest_framework/templates/rest_framework/horizontal/fields/textarea.html b/rest_framework/templates/rest_framework/horizontal/fields/textarea.html index ae263c48c..ec1075495 100644 --- a/rest_framework/templates/rest_framework/horizontal/fields/textarea.html +++ b/rest_framework/templates/rest_framework/horizontal/fields/textarea.html @@ -1,9 +1,14 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} - <label class="col-sm-2 control-label {% if field.style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> + <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> {% endif %} <div class="col-sm-10"> - <textarea name="{{ field.name }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> - {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} + <textarea name="{{ field.name }}" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if style.rows %}rows="{{ style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> + {% endif %} </div> </div> diff --git a/rest_framework/templates/rest_framework/inline/fields/checkbox.html b/rest_framework/templates/rest_framework/inline/fields/checkbox.html index 57fa5dc04..71737f15f 100644 --- a/rest_framework/templates/rest_framework/inline/fields/checkbox.html +++ b/rest_framework/templates/rest_framework/inline/fields/checkbox.html @@ -1,6 +1,8 @@ -<div class="checkbox"> - <label> - <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}> - {% if field.label %}{{ field.label }}{% endif %} - </label> +<div class="form-group {% if field.errors %}has-error{% endif %}"> + <div class="checkbox"> + <label> + <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}> + {% if field.label %}{{ field.label }}{% endif %} + </label> + </div> </div> diff --git a/rest_framework/templates/rest_framework/inline/fields/select_checkbox.html b/rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html similarity index 85% rename from rest_framework/templates/rest_framework/inline/fields/select_checkbox.html rename to rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html index cca71d689..6caf64403 100644 --- a/rest_framework/templates/rest_framework/inline/fields/select_checkbox.html +++ b/rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html @@ -1,4 +1,4 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} <label class="sr-only">{{ field.label }}</label> {% endif %} diff --git a/rest_framework/templates/rest_framework/inline/fields/fieldset.html b/rest_framework/templates/rest_framework/inline/fields/fieldset.html index ba9f1835a..5ee182a5b 100644 --- a/rest_framework/templates/rest_framework/inline/fields/fieldset.html +++ b/rest_framework/templates/rest_framework/inline/fields/fieldset.html @@ -1,4 +1,4 @@ {% load rest_framework %} {% for nested_field in field %} - {% render_field nested_field layout=layout renderer=renderer %} + {% render_field nested_field template_pack=template_pack renderer=renderer %} {% endfor %} diff --git a/rest_framework/templates/rest_framework/inline/fields/input.html b/rest_framework/templates/rest_framework/inline/fields/input.html index bdf25ffe6..0d3eb8845 100644 --- a/rest_framework/templates/rest_framework/inline/fields/input.html +++ b/rest_framework/templates/rest_framework/inline/fields/input.html @@ -1,6 +1,6 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} <label class="sr-only">{{ field.label }}</label> {% endif %} - <input name="{{ field.name }}" type="{{ input_type }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> + <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" novalidate {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> </div> diff --git a/rest_framework/templates/rest_framework/inline/fields/select_radio.html b/rest_framework/templates/rest_framework/inline/fields/radio.html similarity index 85% rename from rest_framework/templates/rest_framework/inline/fields/select_radio.html rename to rest_framework/templates/rest_framework/inline/fields/radio.html index 3fffceac4..1915f4f84 100644 --- a/rest_framework/templates/rest_framework/inline/fields/select_radio.html +++ b/rest_framework/templates/rest_framework/inline/fields/radio.html @@ -1,4 +1,4 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} <label class="sr-only">{{ field.label }}</label> {% endif %} diff --git a/rest_framework/templates/rest_framework/inline/fields/select.html b/rest_framework/templates/rest_framework/inline/fields/select.html index 730fcce61..e9fcebb48 100644 --- a/rest_framework/templates/rest_framework/inline/fields/select.html +++ b/rest_framework/templates/rest_framework/inline/fields/select.html @@ -1,4 +1,4 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} <label class="sr-only">{{ field.label }}</label> {% endif %} diff --git a/rest_framework/templates/rest_framework/inline/fields/select_multiple.html b/rest_framework/templates/rest_framework/inline/fields/select_multiple.html index 3f9b27017..feddf7abd 100644 --- a/rest_framework/templates/rest_framework/inline/fields/select_multiple.html +++ b/rest_framework/templates/rest_framework/inline/fields/select_multiple.html @@ -1,4 +1,4 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} <label class="sr-only">{{ field.label }}</label> {% endif %} diff --git a/rest_framework/templates/rest_framework/inline/fields/textarea.html b/rest_framework/templates/rest_framework/inline/fields/textarea.html index bdf25ffe6..0766a01c5 100644 --- a/rest_framework/templates/rest_framework/inline/fields/textarea.html +++ b/rest_framework/templates/rest_framework/inline/fields/textarea.html @@ -1,6 +1,6 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} <label class="sr-only">{{ field.label }}</label> {% endif %} - <input name="{{ field.name }}" type="{{ input_type }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> + <input name="{{ field.name }}" type="text" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> </div> diff --git a/rest_framework/templates/rest_framework/vertical/fields/checkbox.html b/rest_framework/templates/rest_framework/vertical/fields/checkbox.html index 9fd4cdaa2..e21a8e902 100644 --- a/rest_framework/templates/rest_framework/vertical/fields/checkbox.html +++ b/rest_framework/templates/rest_framework/vertical/fields/checkbox.html @@ -1,6 +1,14 @@ -<div class="checkbox"> - <label> - <input type="checkbox" name="{{ field.name }}" value="true" {% if value %}checked{% endif %}> - {% if field.label %}{{ field.label }}{% endif %} - </label> -</div> +<div class="form-group {% if field.errors %}has-error{% endif %}"> + <div class="checkbox"> + <label> + <input type="checkbox" name="{{ field.name }}" value="true" {% if value %}checked{% endif %}> + {% if field.label %}{{ field.label }}{% endif %} + </label> + </div> + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> + {% endif %} +</div> \ No newline at end of file diff --git a/rest_framework/templates/rest_framework/vertical/fields/select_checkbox.html b/rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html similarity index 62% rename from rest_framework/templates/rest_framework/vertical/fields/select_checkbox.html rename to rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html index c486b1b39..134cca661 100644 --- a/rest_framework/templates/rest_framework/vertical/fields/select_checkbox.html +++ b/rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html @@ -1,8 +1,8 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} - <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> {% endif %} - {% if field.style.inline %} + {% if style.inline %} <div> {% for key, text in field.choices.items %} <label class="checkbox-inline"> @@ -21,4 +21,10 @@ </div> {% endfor %} {% endif %} + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> + {% endif %} </div> diff --git a/rest_framework/templates/rest_framework/vertical/fields/fieldset.html b/rest_framework/templates/rest_framework/vertical/fields/fieldset.html index 248fe9044..824e6098f 100644 --- a/rest_framework/templates/rest_framework/vertical/fields/fieldset.html +++ b/rest_framework/templates/rest_framework/vertical/fields/fieldset.html @@ -1,7 +1,7 @@ {% load rest_framework %} <fieldset> - {% if field.label %}<legend {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} + {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} {% for nested_field in field %} - {% render_field nested_field layout=layout renderer=renderer %} + {% render_field nested_field template_pack=template_pack renderer=renderer %} {% endfor %} </fieldset> diff --git a/rest_framework/templates/rest_framework/vertical/fields/input.html b/rest_framework/templates/rest_framework/vertical/fields/input.html index 10a576b2a..4f4cb017a 100644 --- a/rest_framework/templates/rest_framework/vertical/fields/input.html +++ b/rest_framework/templates/rest_framework/vertical/fields/input.html @@ -1,7 +1,12 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} - <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + {% endif %} + <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" novalidate {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> {% endif %} - <input name="{{ field.name }}" type="{{ input_type }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> - {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} </div> diff --git a/rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html b/rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html index 6b99a8349..74bbf4483 100644 --- a/rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html +++ b/rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html @@ -1,6 +1,6 @@ <fieldset> - {% if field.label %}<legend {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} -<!-- {% if field.label %}<legend {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} + {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} +<!-- {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} {% for field_item in field.value.field_items.values() %} {{ renderer.render_field(field_item, layout=layout) }} {% endfor %} --> diff --git a/rest_framework/templates/rest_framework/vertical/fields/select_radio.html b/rest_framework/templates/rest_framework/vertical/fields/radio.html similarity index 62% rename from rest_framework/templates/rest_framework/vertical/fields/select_radio.html rename to rest_framework/templates/rest_framework/vertical/fields/radio.html index d7655b008..ed9f9ddbb 100644 --- a/rest_framework/templates/rest_framework/vertical/fields/select_radio.html +++ b/rest_framework/templates/rest_framework/vertical/fields/radio.html @@ -1,8 +1,8 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} - <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> {% endif %} - {% if field.style.inline %} + {% if style.inline %} <div> {% for key, text in field.choices.items %} <label class="radio-inline"> @@ -21,4 +21,10 @@ </div> {% endfor %} {% endif %} + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> + {% endif %} </div> diff --git a/rest_framework/templates/rest_framework/vertical/fields/select.html b/rest_framework/templates/rest_framework/vertical/fields/select.html index b0545f7e1..7c673ebb5 100644 --- a/rest_framework/templates/rest_framework/vertical/fields/select.html +++ b/rest_framework/templates/rest_framework/vertical/fields/select.html @@ -1,10 +1,16 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} - <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> {% endif %} <select class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> + {% endif %} </div> diff --git a/rest_framework/templates/rest_framework/vertical/fields/select_multiple.html b/rest_framework/templates/rest_framework/vertical/fields/select_multiple.html index ca63192e9..54839294a 100644 --- a/rest_framework/templates/rest_framework/vertical/fields/select_multiple.html +++ b/rest_framework/templates/rest_framework/vertical/fields/select_multiple.html @@ -1,10 +1,16 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} - <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> {% endif %} <select multiple class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> + {% endif %} </div> diff --git a/rest_framework/templates/rest_framework/vertical/fields/textarea.html b/rest_framework/templates/rest_framework/vertical/fields/textarea.html index 8d9514961..840ea853c 100644 --- a/rest_framework/templates/rest_framework/vertical/fields/textarea.html +++ b/rest_framework/templates/rest_framework/vertical/fields/textarea.html @@ -1,7 +1,12 @@ -<div class="form-group"> +<div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} - <label {% if field.style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> + {% endif %} + <textarea name="{{ field.name }}" class="form-control" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if style.rows %}rows="{{ style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> + {% if field.errors %} + {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} + {% endif %} + {% if field.help_text %} + <span class="help-block">{{ field.help_text }}</span> {% endif %} - <textarea name="{{ field.name }}" class="form-control" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %}>{% if field.value %}{{ field.value }}{% endif %}</textarea> - {% if field.help_text %}<p class="help-block">{{ field.help_text }}</p>{% endif %} </div> From e8ea365c15b13185efc2ba03e57a3302f783d538 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 15 Oct 2014 15:11:01 +0100 Subject: [PATCH 0962/1652] Moar form styling --- rest_framework/templates/rest_framework/base.html | 4 ++-- .../rest_framework/horizontal/{fields => }/checkbox.html | 0 .../horizontal/{fields => }/checkbox_multiple.html | 0 .../rest_framework/horizontal/{fields => }/fieldset.html | 0 rest_framework/templates/rest_framework/horizontal/form.html | 4 ++-- .../rest_framework/horizontal/{fields => }/input.html | 2 +- .../rest_framework/horizontal/{fields => }/list_fieldset.html | 0 .../rest_framework/horizontal/{fields => }/radio.html | 0 .../rest_framework/horizontal/{fields => }/select.html | 0 .../horizontal/{fields => }/select_multiple.html | 0 .../rest_framework/horizontal/{fields => }/textarea.html | 0 .../rest_framework/inline/{fields => }/checkbox.html | 0 .../rest_framework/inline/{fields => }/checkbox_multiple.html | 0 .../rest_framework/inline/{fields => }/fieldset.html | 0 rest_framework/templates/rest_framework/inline/form.html | 4 ++-- .../templates/rest_framework/inline/{fields => }/input.html | 2 +- .../templates/rest_framework/inline/{fields => }/radio.html | 0 .../templates/rest_framework/inline/{fields => }/select.html | 0 .../rest_framework/inline/{fields => }/select_multiple.html | 0 .../rest_framework/inline/{fields => }/textarea.html | 0 .../rest_framework/vertical/{fields => }/checkbox.html | 0 .../vertical/{fields => }/checkbox_multiple.html | 0 .../rest_framework/vertical/{fields => }/fieldset.html | 0 rest_framework/templates/rest_framework/vertical/form.html | 4 ++-- .../templates/rest_framework/vertical/{fields => }/input.html | 2 +- .../rest_framework/vertical/{fields => }/list_fieldset.html | 0 .../templates/rest_framework/vertical/{fields => }/radio.html | 0 .../rest_framework/vertical/{fields => }/select.html | 0 .../rest_framework/vertical/{fields => }/select_multiple.html | 0 .../rest_framework/vertical/{fields => }/textarea.html | 0 30 files changed, 11 insertions(+), 11 deletions(-) rename rest_framework/templates/rest_framework/horizontal/{fields => }/checkbox.html (100%) rename rest_framework/templates/rest_framework/horizontal/{fields => }/checkbox_multiple.html (100%) rename rest_framework/templates/rest_framework/horizontal/{fields => }/fieldset.html (100%) rename rest_framework/templates/rest_framework/horizontal/{fields => }/input.html (77%) rename rest_framework/templates/rest_framework/horizontal/{fields => }/list_fieldset.html (100%) rename rest_framework/templates/rest_framework/horizontal/{fields => }/radio.html (100%) rename rest_framework/templates/rest_framework/horizontal/{fields => }/select.html (100%) rename rest_framework/templates/rest_framework/horizontal/{fields => }/select_multiple.html (100%) rename rest_framework/templates/rest_framework/horizontal/{fields => }/textarea.html (100%) rename rest_framework/templates/rest_framework/inline/{fields => }/checkbox.html (100%) rename rest_framework/templates/rest_framework/inline/{fields => }/checkbox_multiple.html (100%) rename rest_framework/templates/rest_framework/inline/{fields => }/fieldset.html (100%) rename rest_framework/templates/rest_framework/inline/{fields => }/input.html (58%) rename rest_framework/templates/rest_framework/inline/{fields => }/radio.html (100%) rename rest_framework/templates/rest_framework/inline/{fields => }/select.html (100%) rename rest_framework/templates/rest_framework/inline/{fields => }/select_multiple.html (100%) rename rest_framework/templates/rest_framework/inline/{fields => }/textarea.html (100%) rename rest_framework/templates/rest_framework/vertical/{fields => }/checkbox.html (100%) rename rest_framework/templates/rest_framework/vertical/{fields => }/checkbox_multiple.html (100%) rename rest_framework/templates/rest_framework/vertical/{fields => }/fieldset.html (100%) rename rest_framework/templates/rest_framework/vertical/{fields => }/input.html (75%) rename rest_framework/templates/rest_framework/vertical/{fields => }/list_fieldset.html (100%) rename rest_framework/templates/rest_framework/vertical/{fields => }/radio.html (100%) rename rest_framework/templates/rest_framework/vertical/{fields => }/select.html (100%) rename rest_framework/templates/rest_framework/vertical/{fields => }/select_multiple.html (100%) rename rest_framework/templates/rest_framework/vertical/{fields => }/textarea.html (100%) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 4b6c7fcfc..dcb0da2c0 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -153,7 +153,7 @@ <div class="tab-pane" id="object-form"> {% with form=post_form %} <form action="{{ request.get_full_path }}" - method="POST" enctype="multipart/form-data" class="form-horizontal"> + method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate> <fieldset> {{ post_form }} <div class="form-actions"> @@ -198,7 +198,7 @@ {% if put_form %} <div class="tab-pane" id="object-form"> <form action="{{ request.get_full_path }}" - method="POST" enctype="multipart/form-data" class="form-horizontal"> + method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate> <fieldset> {{ put_form }} <div class="form-actions"> diff --git a/rest_framework/templates/rest_framework/horizontal/fields/checkbox.html b/rest_framework/templates/rest_framework/horizontal/checkbox.html similarity index 100% rename from rest_framework/templates/rest_framework/horizontal/fields/checkbox.html rename to rest_framework/templates/rest_framework/horizontal/checkbox.html diff --git a/rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html similarity index 100% rename from rest_framework/templates/rest_framework/horizontal/fields/checkbox_multiple.html rename to rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html diff --git a/rest_framework/templates/rest_framework/horizontal/fields/fieldset.html b/rest_framework/templates/rest_framework/horizontal/fieldset.html similarity index 100% rename from rest_framework/templates/rest_framework/horizontal/fields/fieldset.html rename to rest_framework/templates/rest_framework/horizontal/fieldset.html diff --git a/rest_framework/templates/rest_framework/horizontal/form.html b/rest_framework/templates/rest_framework/horizontal/form.html index 7560d8a26..fd15b6261 100644 --- a/rest_framework/templates/rest_framework/horizontal/form.html +++ b/rest_framework/templates/rest_framework/horizontal/form.html @@ -1,9 +1,9 @@ {% load rest_framework %} -<form class="form-horizontal" role="form" action="." method="POST"> +<form class="form-horizontal" role="form" action="." method="POST" novalidate> {% csrf_token %} {% for field in form %} {% if not field.read_only %} - {% render_field field template_pack=template_pack renderer=renderer %} + {% render_field field style=style %} {% endif %} {% endfor %} <!-- form.non_field_errors --> diff --git a/rest_framework/templates/rest_framework/horizontal/fields/input.html b/rest_framework/templates/rest_framework/horizontal/input.html similarity index 77% rename from rest_framework/templates/rest_framework/horizontal/fields/input.html rename to rest_framework/templates/rest_framework/horizontal/input.html index 43ab41512..df4aa40fc 100644 --- a/rest_framework/templates/rest_framework/horizontal/fields/input.html +++ b/rest_framework/templates/rest_framework/horizontal/input.html @@ -3,7 +3,7 @@ <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> {% endif %} <div class="col-sm-10"> - <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" novalidate {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> + <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> {% if field.errors %} {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} {% endif %} diff --git a/rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html b/rest_framework/templates/rest_framework/horizontal/list_fieldset.html similarity index 100% rename from rest_framework/templates/rest_framework/horizontal/fields/list_fieldset.html rename to rest_framework/templates/rest_framework/horizontal/list_fieldset.html diff --git a/rest_framework/templates/rest_framework/horizontal/fields/radio.html b/rest_framework/templates/rest_framework/horizontal/radio.html similarity index 100% rename from rest_framework/templates/rest_framework/horizontal/fields/radio.html rename to rest_framework/templates/rest_framework/horizontal/radio.html diff --git a/rest_framework/templates/rest_framework/horizontal/fields/select.html b/rest_framework/templates/rest_framework/horizontal/select.html similarity index 100% rename from rest_framework/templates/rest_framework/horizontal/fields/select.html rename to rest_framework/templates/rest_framework/horizontal/select.html diff --git a/rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html b/rest_framework/templates/rest_framework/horizontal/select_multiple.html similarity index 100% rename from rest_framework/templates/rest_framework/horizontal/fields/select_multiple.html rename to rest_framework/templates/rest_framework/horizontal/select_multiple.html diff --git a/rest_framework/templates/rest_framework/horizontal/fields/textarea.html b/rest_framework/templates/rest_framework/horizontal/textarea.html similarity index 100% rename from rest_framework/templates/rest_framework/horizontal/fields/textarea.html rename to rest_framework/templates/rest_framework/horizontal/textarea.html diff --git a/rest_framework/templates/rest_framework/inline/fields/checkbox.html b/rest_framework/templates/rest_framework/inline/checkbox.html similarity index 100% rename from rest_framework/templates/rest_framework/inline/fields/checkbox.html rename to rest_framework/templates/rest_framework/inline/checkbox.html diff --git a/rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html similarity index 100% rename from rest_framework/templates/rest_framework/inline/fields/checkbox_multiple.html rename to rest_framework/templates/rest_framework/inline/checkbox_multiple.html diff --git a/rest_framework/templates/rest_framework/inline/fields/fieldset.html b/rest_framework/templates/rest_framework/inline/fieldset.html similarity index 100% rename from rest_framework/templates/rest_framework/inline/fields/fieldset.html rename to rest_framework/templates/rest_framework/inline/fieldset.html diff --git a/rest_framework/templates/rest_framework/inline/form.html b/rest_framework/templates/rest_framework/inline/form.html index b13d16614..6a0ea81d3 100644 --- a/rest_framework/templates/rest_framework/inline/form.html +++ b/rest_framework/templates/rest_framework/inline/form.html @@ -1,9 +1,9 @@ {% load rest_framework %} -<form class="form-inline" role="form" action="." method="POST"> +<form class="form-inline" role="form" action="." method="POST" novalidate> {% csrf_token %} {% for field in form %} {% if not field.read_only %} - {% render_field field template_pack=template_pack renderer=renderer %} + {% render_field field style=style %} {% endif %} {% endfor %} <!-- form.non_field_errors --> diff --git a/rest_framework/templates/rest_framework/inline/fields/input.html b/rest_framework/templates/rest_framework/inline/input.html similarity index 58% rename from rest_framework/templates/rest_framework/inline/fields/input.html rename to rest_framework/templates/rest_framework/inline/input.html index 0d3eb8845..f8ec4faf2 100644 --- a/rest_framework/templates/rest_framework/inline/fields/input.html +++ b/rest_framework/templates/rest_framework/inline/input.html @@ -2,5 +2,5 @@ {% if field.label %} <label class="sr-only">{{ field.label }}</label> {% endif %} - <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" novalidate {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> + <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> </div> diff --git a/rest_framework/templates/rest_framework/inline/fields/radio.html b/rest_framework/templates/rest_framework/inline/radio.html similarity index 100% rename from rest_framework/templates/rest_framework/inline/fields/radio.html rename to rest_framework/templates/rest_framework/inline/radio.html diff --git a/rest_framework/templates/rest_framework/inline/fields/select.html b/rest_framework/templates/rest_framework/inline/select.html similarity index 100% rename from rest_framework/templates/rest_framework/inline/fields/select.html rename to rest_framework/templates/rest_framework/inline/select.html diff --git a/rest_framework/templates/rest_framework/inline/fields/select_multiple.html b/rest_framework/templates/rest_framework/inline/select_multiple.html similarity index 100% rename from rest_framework/templates/rest_framework/inline/fields/select_multiple.html rename to rest_framework/templates/rest_framework/inline/select_multiple.html diff --git a/rest_framework/templates/rest_framework/inline/fields/textarea.html b/rest_framework/templates/rest_framework/inline/textarea.html similarity index 100% rename from rest_framework/templates/rest_framework/inline/fields/textarea.html rename to rest_framework/templates/rest_framework/inline/textarea.html diff --git a/rest_framework/templates/rest_framework/vertical/fields/checkbox.html b/rest_framework/templates/rest_framework/vertical/checkbox.html similarity index 100% rename from rest_framework/templates/rest_framework/vertical/fields/checkbox.html rename to rest_framework/templates/rest_framework/vertical/checkbox.html diff --git a/rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html similarity index 100% rename from rest_framework/templates/rest_framework/vertical/fields/checkbox_multiple.html rename to rest_framework/templates/rest_framework/vertical/checkbox_multiple.html diff --git a/rest_framework/templates/rest_framework/vertical/fields/fieldset.html b/rest_framework/templates/rest_framework/vertical/fieldset.html similarity index 100% rename from rest_framework/templates/rest_framework/vertical/fields/fieldset.html rename to rest_framework/templates/rest_framework/vertical/fieldset.html diff --git a/rest_framework/templates/rest_framework/vertical/form.html b/rest_framework/templates/rest_framework/vertical/form.html index fe908af02..e68835c0e 100644 --- a/rest_framework/templates/rest_framework/vertical/form.html +++ b/rest_framework/templates/rest_framework/vertical/form.html @@ -1,9 +1,9 @@ {% load rest_framework %} -<form role="form" action="." method="POST"> +<form role="form" action="." method="POST" novalidate> {% csrf_token %} {% for field in form %} {% if not field.read_only %} - {% render_field field template_pack=template_pack renderer=renderer %} + {% render_field field style=style %} {% endif %} {% endfor %} <!-- form.non_field_errors --> diff --git a/rest_framework/templates/rest_framework/vertical/fields/input.html b/rest_framework/templates/rest_framework/vertical/input.html similarity index 75% rename from rest_framework/templates/rest_framework/vertical/fields/input.html rename to rest_framework/templates/rest_framework/vertical/input.html index 4f4cb017a..e1e21ca1f 100644 --- a/rest_framework/templates/rest_framework/vertical/fields/input.html +++ b/rest_framework/templates/rest_framework/vertical/input.html @@ -2,7 +2,7 @@ {% if field.label %} <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> {% endif %} - <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" novalidate {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> + <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> {% if field.errors %} {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} {% endif %} diff --git a/rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html b/rest_framework/templates/rest_framework/vertical/list_fieldset.html similarity index 100% rename from rest_framework/templates/rest_framework/vertical/fields/list_fieldset.html rename to rest_framework/templates/rest_framework/vertical/list_fieldset.html diff --git a/rest_framework/templates/rest_framework/vertical/fields/radio.html b/rest_framework/templates/rest_framework/vertical/radio.html similarity index 100% rename from rest_framework/templates/rest_framework/vertical/fields/radio.html rename to rest_framework/templates/rest_framework/vertical/radio.html diff --git a/rest_framework/templates/rest_framework/vertical/fields/select.html b/rest_framework/templates/rest_framework/vertical/select.html similarity index 100% rename from rest_framework/templates/rest_framework/vertical/fields/select.html rename to rest_framework/templates/rest_framework/vertical/select.html diff --git a/rest_framework/templates/rest_framework/vertical/fields/select_multiple.html b/rest_framework/templates/rest_framework/vertical/select_multiple.html similarity index 100% rename from rest_framework/templates/rest_framework/vertical/fields/select_multiple.html rename to rest_framework/templates/rest_framework/vertical/select_multiple.html diff --git a/rest_framework/templates/rest_framework/vertical/fields/textarea.html b/rest_framework/templates/rest_framework/vertical/textarea.html similarity index 100% rename from rest_framework/templates/rest_framework/vertical/fields/textarea.html rename to rest_framework/templates/rest_framework/vertical/textarea.html From b4f3379c7002f0c80a26605fdd9c69d7cef2f16f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 15 Oct 2014 15:13:28 +0100 Subject: [PATCH 0963/1652] Support fields that reference a simple callable --- rest_framework/fields.py | 4 +- rest_framework/renderers.py | 105 +++++++++++------- rest_framework/serializers.py | 4 +- .../rest_framework/css/bootstrap-tweaks.css | 4 - .../static/rest_framework/css/default.css | 4 + rest_framework/templatetags/rest_framework.py | 7 +- 6 files changed, 78 insertions(+), 50 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index b881ad13b..24dfaaf54 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -66,6 +66,8 @@ def get_attribute(instance, attrs): return instance[attr] except (KeyError, TypeError, AttributeError): raise exc + if is_simple_callable(instance): + return instance() return instance @@ -1025,8 +1027,6 @@ class ReadOnlyField(Field): super(ReadOnlyField, self).__init__(**kwargs) def to_representation(self, value): - if is_simple_callable(value): - return value() return value diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 5fae75f2e..d5defa318 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -340,76 +340,101 @@ class HTMLFormRenderer(BaseRenderer): media_type = 'text/html' format = 'form' charset = 'utf-8' + template_pack = 'rest_framework/horizontal/' + base_template = 'form.html' - field_templates = ClassLookupDict({ + default_style = ClassLookupDict({ serializers.Field: { - 'default': 'input.html' + 'base_template': 'input.html', + 'input_type': 'text' + }, + serializers.EmailField: { + 'base_template': 'input.html', + 'input_type': 'email' + }, + serializers.URLField: { + 'base_template': 'input.html', + 'input_type': 'url' + }, + serializers.IntegerField: { + 'base_template': 'input.html', + 'input_type': 'number' + }, + serializers.DateTimeField: { + 'base_template': 'input.html', + 'input_type': 'datetime-local' + }, + serializers.DateField: { + 'base_template': 'input.html', + 'input_type': 'date' + }, + serializers.TimeField: { + 'base_template': 'input.html', + 'input_type': 'time' }, serializers.BooleanField: { - 'default': 'checkbox.html' - }, - serializers.CharField: { - 'default': 'input.html', - 'textarea': 'textarea.html' + 'base_template': 'checkbox.html' }, serializers.ChoiceField: { - 'default': 'select.html', - 'radio': 'select_radio.html' + 'base_template': 'select.html', # Also valid: 'radio.html' }, serializers.MultipleChoiceField: { - 'default': 'select_multiple.html', - 'checkbox': 'select_checkbox.html' + 'base_template': 'select_multiple.html', # Also valid: 'checkbox_multiple.html' }, serializers.ManyRelation: { - 'default': 'select_multiple.html', - 'checkbox': 'select_checkbox.html' + 'base_template': 'select_multiple.html', # Also valid: 'checkbox_multiple.html' }, serializers.Serializer: { - 'default': 'fieldset.html' + 'base_template': 'fieldset.html' }, serializers.ListSerializer: { - 'default': 'list_fieldset.html' + 'base_template': 'list_fieldset.html' } }) - input_type = ClassLookupDict({ - serializers.Field: 'text', - serializers.EmailField: 'email', - serializers.URLField: 'url', - serializers.IntegerField: 'number', - serializers.DateTimeField: 'datetime-local', - serializers.DateField: 'date', - serializers.TimeField: 'time', - }) + def render_field(self, field, parent_style): + style = dict(self.default_style[field]) + style.update(field.style) + if 'template_pack' not in style: + style['template_pack'] = parent_style['template_pack'] + style['renderer'] = self - def render_field(self, field, template_pack=None): - style_type = field.style.get('type', 'default') - - input_type = self.input_type[field] - if input_type == 'datetime-local' and isinstance(field.value, six.text_type): + if style.get('input_type') == 'datetime-local' and isinstance(field.value, six.text_type): field.value = field.value.rstrip('Z') - base = self.field_templates[field][style_type] - template_name = template_pack + '/fields/' + base + if 'template' in style: + template_name = style['template'] + else: + template_name = style['template_pack'].strip('/') + '/' + style['base_template'] + template = loader.get_template(template_name) - context = Context({ - 'field': field, - 'input_type': input_type, - 'renderer': self, - }) + context = Context({'field': field, 'style': style}) return template.render(context) def render(self, data, accepted_media_type=None, renderer_context=None): """ Render serializer data and return an HTML form, as a string. """ + form = data.serializer + meta = getattr(form, 'Meta', None) + style = getattr(meta, 'style', {}) + if 'template_pack' not in style: + style['template_pack'] = self.template_pack + if 'base_template' not in style: + style['base_template'] = self.base_template + style['renderer'] = self + + if 'template' in style: + template_name = style['template'] + else: + template_name = style['template_pack'].strip('/') + '/' + style['base_template'] + renderer_context = renderer_context or {} request = renderer_context['request'] - template = loader.get_template('rest_framework/horizontal/form.html') + template = loader.get_template(template_name) context = RequestContext(request, { - 'form': data.serializer, - 'template_pack': 'rest_framework/horizontal', - 'renderer': self + 'form': form, + 'style': style }) return template.render(context) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index c844605fc..534be6f90 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -115,7 +115,7 @@ class BaseSerializer(Field): @property def data(self): if not hasattr(self, '_data'): - if self.instance is not None: + if self.instance is not None and not getattr(self, '_errors', None): self._data = self.to_representation(self.instance) else: self._data = self.get_initial() @@ -339,7 +339,7 @@ class Serializer(BaseSerializer): Dict of native values <- Dict of primitive datatypes. """ ret = {} - errors = {} + errors = ReturnDict(serializer=self) fields = [field for field in self.fields.values() if not field.read_only] for field in fields: diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css index 6a37cae23..36c7be481 100644 --- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css @@ -115,10 +115,6 @@ html, body { margin-bottom: 0; } -.well form .help-block { - color: #999999; -} - .nav-tabs { border: 0; } diff --git a/rest_framework/static/rest_framework/css/default.css b/rest_framework/static/rest_framework/css/default.css index 82c6033b6..4f52cc566 100644 --- a/rest_framework/static/rest_framework/css/default.css +++ b/rest_framework/static/rest_framework/css/default.css @@ -36,6 +36,10 @@ ul.breadcrumb { margin: 70px 0 0 0; } +.breadcrumb li.active a { + color: #777; +} + form select, form input, form textarea { width: 90%; } diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index c092d39f6..d9424f022 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -8,6 +8,7 @@ from django.utils.html import escape from django.utils.safestring import SafeData, mark_safe from django.utils.html import smart_urlquote from rest_framework.compat import urlparse, force_text +from rest_framework.renderers import HTMLFormRenderer import re register = template.Library() @@ -32,8 +33,10 @@ class_re = re.compile(r'(?<=class=["\'])(.*)(?=["\'])') # And the template tags themselves... @register.simple_tag -def render_field(field, template_pack=None, renderer=None): - return renderer.render_field(field, template_pack) +def render_field(field, style=None): + style = style or {} + renderer = style.get('renderer', HTMLFormRenderer()) + return renderer.render_field(field, style) @register.simple_tag From 4248a6c499cf31d2e38199f05a42e7a131dc014e Mon Sep 17 00:00:00 2001 From: Marty Alchin <marty@heroku.com> Date: Wed, 15 Oct 2014 17:54:58 -0700 Subject: [PATCH 0964/1652] Add a keys method to BindingDict --- rest_framework/serializers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 534be6f90..2066fcf70 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -230,6 +230,9 @@ class BindingDict(object): def items(self): return self.fields.items() + def keys(self): + return self.fields.keys() + def values(self): return self.fields.values() From 113a28ed8ad65d912180e8be7a92b679251b0249 Mon Sep 17 00:00:00 2001 From: konradhalas <halas.konrad@gmail.com> Date: Thu, 16 Oct 2014 13:48:18 +0200 Subject: [PATCH 0965/1652] Add djoser to authentication docs. --- docs/api-guide/authentication.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 0ec5bad10..b355012e1 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -415,6 +415,10 @@ The [HawkREST][hawkrest] library builds on the [Mohawk][mohawk] library to let y HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a way to achieve origin authentication and message integrity for HTTP messages. Similar to [Amazon's HTTP Signature scheme][amazon-http-signature], used by many of its services, it permits stateless, per-request authentication. [Elvio Toccalino][etoccalino] maintains the [djangorestframework-httpsignature][djangorestframework-httpsignature] package which provides an easy to use HTTP Signature Authentication mechanism. +## Djoser + +[Djoser][djoser] library provides a set of views to handle basic actions such as registration, login, logout, password reset and account activation. The package works with a custom user model and it uses token based authentication. This is a ready to use REST implementation of Django authentication system. + [cite]: http://jacobian.org/writing/rest-worst-practices/ [http401]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.2 [http403]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.4 @@ -449,3 +453,4 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a [hawk]: https://github.com/hueniverse/hawk [mohawk]: http://mohawk.readthedocs.org/en/latest/ [mac]: http://tools.ietf.org/html/draft-hammer-oauth-v2-mac-token-05 +[djoser]: https://github.com/sunscrapers/djoser From 5e89994a10105b03b89abf0d0c9fee766942660e Mon Sep 17 00:00:00 2001 From: konradhalas <halas.konrad@gmail.com> Date: Thu, 16 Oct 2014 15:16:13 +0200 Subject: [PATCH 0966/1652] Add to main 3rd party resources list. --- docs/topics/third-party-resources.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 1ca917427..0317dd64c 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -16,6 +16,7 @@ To submit new content, [open an issue](https://github.com/tomchristie/django-res * [djangorestframework-jwt](https://github.com/GetBlimp/django-rest-framework-jwt) - Provides JSON Web Token Authentication support. * [hawkrest](https://github.com/kumar303/hawkrest) - Provides Hawk HTTP Authorization. * [djangorestframework-httpsignature](https://github.com/etoccalino/django-rest-framework-httpsignature) - Provides an easy to use HTTP Signature Authentication mechanism. +* [djoser](https://github.com/sunscrapers/djoser) - Provides a set of views to handle basic actions such as registration, login, logout, password reset and account activation. ### Permissions From d0f610be4457947f78d20da4f2bdb04ef52d0db3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 16 Oct 2014 20:43:35 +0100 Subject: [PATCH 0967/1652] Update release notes --- docs/topics/3.0-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index dcd6d90cb..f868b344a 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -653,7 +653,7 @@ If you need to restore the previous behavior you can include the `AllowPUTAsCrea #### Customizing error responses. -The generic views now raise `ValidationError` for invalid data. This exception is then dealt with by the exception handler, rather than the view returning a `400 Bad Request` response directly. +The generic views now raise `ValidationFailed` exception for invalid data. This exception is then dealt with by the exception handler, rather than the view returning a `400 Bad Request` response directly. This change means that you can now easily customize the style of error responses across your entire API, without having to modify any of the generic views. From 7b666e982c461e237567435851dcc93bc76581e5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 16 Oct 2014 20:45:18 +0100 Subject: [PATCH 0968/1652] Stricter checking for failure cases. --- rest_framework/serializers.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 2066fcf70..f72ecb0bf 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -77,6 +77,13 @@ class BaseSerializer(Field): raise NotImplementedError('`create()` must be implemented.') def save(self, **kwargs): + assert not hasattr(self, 'restore_object'), ( + 'Serializer %s has old-style version 2 `.restore_object()` ' + 'that is no longer compatible with REST framework 3. ' + 'Use the new-style `.create()` and `.update()` methods instead.' % + self.__class__.__name__ + ) + validated_data = self.validated_data if kwargs: validated_data = dict( @@ -494,6 +501,16 @@ class ModelSerializer(Serializer): self._kwargs['validators'] = validators def create(self, validated_attrs): + assert not any( + isinstance(field, BaseSerializer) and not field.read_only + for field in self.fields.values() + ), ( + 'The `.create()` method does not suport nested writable fields ' + 'by default. Write an explicit `.create()` method for serializer ' + '%s, or set `read_only=True` on nested serializer fields.' % + self.__class__.__name__ + ) + ModelClass = self.Meta.model # Remove many-to-many relationships from validated_attrs. @@ -515,6 +532,16 @@ class ModelSerializer(Serializer): return instance def update(self, instance, validated_attrs): + assert not any( + isinstance(field, BaseSerializer) and not field.read_only + for field in self.fields.values() + ), ( + 'The `.update()` method does not suport nested writable fields ' + 'by default. Write an explicit `.update()` method for serializer ' + '%s, or set `read_only=True` on nested serializer fields.' % + self.__class__.__name__ + ) + for attr, value in validated_attrs.items(): setattr(instance, attr, value) instance.save() From 32fd82ba0d6082418e5ca5633f9e9709bd44e86b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 16 Oct 2014 20:45:36 +0100 Subject: [PATCH 0969/1652] get_attribute method on fields --- rest_framework/fields.py | 9 +++------ rest_framework/serializers.py | 6 +++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 24dfaaf54..597d5e122 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -212,15 +212,12 @@ class Field(object): return self.default_empty_html if (ret == '') else ret return dictionary.get(self.field_name, empty) - def get_field_representation(self, instance): + def get_attribute(self, instance): """ - Given the outgoing object instance, return the primitive value + Given the *outgoing* object instance, return the primitive value that should be used for this field. """ - attribute = get_attribute(instance, self.source_attrs) - if attribute is None: - return None - return self.to_representation(attribute) + return get_attribute(instance, self.source_attrs) def get_default(self): """ diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index f72ecb0bf..30e6bfeb1 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -379,7 +379,11 @@ class Serializer(BaseSerializer): fields = [field for field in self.fields.values() if not field.write_only] for field in fields: - value = field.get_field_representation(instance) + attribute = field.get_attribute(instance) + if attribute is None: + value = None + else: + value = field.to_representation(attribute) transform_method = getattr(self, 'transform_' + field.field_name, None) if transform_method is not None: value = transform_method(value) From 3af5df19552103aaea3f4c6338acfb61f54c0d34 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 16 Oct 2014 20:47:34 +0100 Subject: [PATCH 0970/1652] Performance for PK fields --- rest_framework/relations.py | 42 ++++++++++++++++++++++++++++++++++--- tests/test_relations_pk.py | 12 +++++++---- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 268b95cf1..1665dd35e 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -1,5 +1,5 @@ from rest_framework.compat import smart_text, urlparse -from rest_framework.fields import empty, Field +from rest_framework.fields import get_attribute, empty, Field from rest_framework.reverse import reverse from rest_framework.utils import html from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured @@ -9,6 +9,11 @@ from django.utils import six from django.utils.translation import ugettext_lazy as _ +class PKOnlyObject(object): + def __init__(self, pk): + self.pk = pk + + class RelatedField(Field): def __init__(self, **kwargs): self.queryset = kwargs.pop('queryset', None) @@ -45,6 +50,10 @@ class RelatedField(Field): queryset = queryset.all() return queryset + def get_iterable(self, instance, source): + relationship = get_attribute(instance, [source]) + return relationship.all() if (hasattr(relationship, 'all')) else relationship + @property def choices(self): return dict([ @@ -85,6 +94,31 @@ class PrimaryKeyRelatedField(RelatedField): except (TypeError, ValueError): self.fail('incorrect_type', data_type=type(data).__name__) + def get_attribute(self, instance): + # We customize `get_attribute` here for performance reasons. + # For relationships the instance will already have the pk of + # the related object. We return this directly instead of returning the + # object itself, which would require a database lookup. + try: + return PKOnlyObject(pk=instance.serializable_value(self.source)) + except AttributeError: + return get_attribute(instance, [self.source]) + + def get_iterable(self, instance, source): + # For consistency with `get_attribute` we're using `serializable_value()` + # here. Typically there won't be any difference, but some custom field + # types might return a non-primative value for the pk otherwise. + # + # We could try to get smart with `values_list('pk', flat=True)`, which + # would be better in some case, but would actually end up with *more* + # queries if the developer is using `prefetch_related` across the + # relationship. + relationship = super(PrimaryKeyRelatedField, self).get_iterable(instance, source) + return [ + PKOnlyObject(pk=item.serializable_value('pk')) + for item in relationship + ] + def to_representation(self, value): return value.pk @@ -277,8 +311,10 @@ class ManyRelation(Field): for item in data ] - def to_representation(self, obj): - iterable = obj.all() if (hasattr(obj, 'all')) else obj + def get_attribute(self, instance): + return self.child_relation.get_iterable(instance, self.source) + + def to_representation(self, iterable): return [ self.child_relation.to_representation(value) for value in iterable diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index da3c57863..ba5f6c178 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -68,7 +68,8 @@ class PKManyToManyTests(TestCase): {'id': 2, 'name': 'source-2', 'targets': [1, 2]}, {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} ] - self.assertEqual(serializer.data, expected) + with self.assertNumQueries(4): + self.assertEqual(serializer.data, expected) def test_reverse_many_to_many_retrieve(self): queryset = ManyToManyTarget.objects.all() @@ -78,7 +79,8 @@ class PKManyToManyTests(TestCase): {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, {'id': 3, 'name': 'target-3', 'sources': [3]} ] - self.assertEqual(serializer.data, expected) + with self.assertNumQueries(4): + self.assertEqual(serializer.data, expected) def test_many_to_many_update(self): data = {'id': 1, 'name': 'source-1', 'targets': [1, 2, 3]} @@ -173,7 +175,8 @@ class PKForeignKeyTests(TestCase): {'id': 2, 'name': 'source-2', 'target': 1}, {'id': 3, 'name': 'source-3', 'target': 1} ] - self.assertEqual(serializer.data, expected) + with self.assertNumQueries(1): + self.assertEqual(serializer.data, expected) def test_reverse_foreign_key_retrieve(self): queryset = ForeignKeyTarget.objects.all() @@ -182,7 +185,8 @@ class PKForeignKeyTests(TestCase): {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, {'id': 2, 'name': 'target-2', 'sources': []}, ] - self.assertEqual(serializer.data, expected) + with self.assertNumQueries(3): + self.assertEqual(serializer.data, expected) def test_foreign_key_update(self): data = {'id': 1, 'name': 'source-1', 'target': 2} From 5882a7a9d52de1084d2be68adc73dc19bc706e4a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 16 Oct 2014 20:47:40 +0100 Subject: [PATCH 0971/1652] Tweak --- rest_framework/renderers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index d5defa318..4dfd0f498 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -396,7 +396,7 @@ class HTMLFormRenderer(BaseRenderer): style = dict(self.default_style[field]) style.update(field.style) if 'template_pack' not in style: - style['template_pack'] = parent_style['template_pack'] + style['template_pack'] = parent_style.get('template_pack', self.template_pack) style['renderer'] = self if style.get('input_type') == 'datetime-local' and isinstance(field.value, six.text_type): From 05cbec9dd7f9f0b6a9b59b29ac6c9272b6ae50d8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 17 Oct 2014 13:23:14 +0100 Subject: [PATCH 0972/1652] Use serializers.ValidationError --- docs/topics/3.0-announcement.md | 14 ++- rest_framework/authtoken/serializers.py | 6 +- rest_framework/exceptions.py | 9 +- rest_framework/fields.py | 12 +-- rest_framework/serializers.py | 32 +++--- tests/test_fields.py | 134 ++++++++++++------------ tests/test_relations.py | 10 +- tests/test_validation.py | 10 +- 8 files changed, 120 insertions(+), 107 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index f868b344a..658b50d31 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -144,11 +144,15 @@ The corresponding code would now look like this: logging.info('Creating ticket "%s"' % name) serializer.save(user=request.user) # Include the user when saving. -#### Use `rest_framework.exceptions.ValidationFailed`. +#### Using `serializers.ValidationError`. -Django's `ValidationError` class is intended for use with HTML forms and it's API makes its use slightly awkward with nested validation errors as can occur in serializers. +Previously `serializers.ValidationError` error was simply a synonym for `django.core.exceptions.ValidationError`. This has now been altered so that it inherits from the standard `APIException` base class. -We now include a simpler `ValidationFailed` exception class in REST framework that you should use when raising validation failures. +The reason behind this is that Django's `ValidationError` class is intended for use with HTML forms and its API makes using it slightly awkward with nested validation errors that can occur in serializers. + +For most users this change shouldn't require any updates to your codebase, but it is worth ensuring that whenever raising validation errors you are always using the `serializers.ValidationError` exception class, and not Django's built-in exception. + +We strongly recommend that you use the namespaced import style of `import serializers` and not `from serializers import ValidationError` in order to avoid any potential confusion. #### Change to `validate_<field_name>`. @@ -156,14 +160,14 @@ The `validate_<field_name>` method hooks that can be attached to serializer clas def validate_score(self, attrs, source): if attrs[score] % 10 != 0: - raise ValidationError('This field should be a multiple of ten.') + raise serializers.ValidationError('This field should be a multiple of ten.') return attrs This is now simplified slightly, and the method hooks simply take the value to be validated, and return it's validated value. def validate_score(self, value): if value % 10 != 0: - raise ValidationError('This field should be a multiple of ten.') + raise serializers.ValidationError('This field should be a multiple of ten.') return value Any ad-hoc validation that applies to more than one field should go in the `.validate(self, attrs)` method as usual. diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py index a808d0a32..f31dded17 100644 --- a/rest_framework/authtoken/serializers.py +++ b/rest_framework/authtoken/serializers.py @@ -18,13 +18,13 @@ class AuthTokenSerializer(serializers.Serializer): if user: if not user.is_active: msg = _('User account is disabled.') - raise exceptions.ValidationFailed(msg) + raise exceptions.ValidationError(msg) else: msg = _('Unable to log in with provided credentials.') - raise exceptions.ValidationFailed(msg) + raise exceptions.ValidationError(msg) else: msg = _('Must include "username" and "password"') - raise exceptions.ValidationFailed(msg) + raise exceptions.ValidationError(msg) attrs['user'] = user return attrs diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index b7c2d16d6..388d3dee9 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -24,7 +24,14 @@ class APIException(Exception): return self.detail -class ValidationFailed(APIException): +# The recommended style for using `ValidationError` is to keep it namespaced +# under `serializers`, in order to minimize potential confusion with Django's +# built in `ValidationError`. For example: +# +# from rest_framework import serializers +# raise serializers.ValidationError('Value was invalid') + +class ValidationError(APIException): status_code = status.HTTP_400_BAD_REQUEST def __init__(self, detail): diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 597d5e122..2da4aa8b2 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -13,7 +13,7 @@ from rest_framework.compat import ( smart_text, EmailValidator, MinValueValidator, MaxValueValidator, MinLengthValidator, MaxLengthValidator, URLValidator ) -from rest_framework.exceptions import ValidationFailed +from rest_framework.exceptions import ValidationError from rest_framework.settings import api_settings from rest_framework.utils import html, representation, humanize_datetime import copy @@ -102,7 +102,7 @@ NOT_READ_ONLY_DEFAULT = 'May not set both `read_only` and `default`' NOT_REQUIRED_DEFAULT = 'May not set both `required` and `default`' USE_READONLYFIELD = 'Field(read_only=True) should be ReadOnlyField' MISSING_ERROR_MESSAGE = ( - 'ValidationFailed raised by `{class_name}`, but error key `{key}` does ' + 'ValidationError raised by `{class_name}`, but error key `{key}` does ' 'not exist in the `error_messages` dictionary.' ) @@ -264,7 +264,7 @@ class Field(object): def run_validators(self, value): """ Test the given value against all the validators on the field, - and either raise a `ValidationFailed` or simply return. + and either raise a `ValidationError` or simply return. """ errors = [] for validator in self.validators: @@ -272,12 +272,12 @@ class Field(object): validator.serializer_field = self try: validator(value) - except ValidationFailed as exc: + except ValidationError as exc: errors.extend(exc.detail) except DjangoValidationError as exc: errors.extend(exc.messages) if errors: - raise ValidationFailed(errors) + raise ValidationError(errors) def validate(self, value): pass @@ -305,7 +305,7 @@ class Field(object): msg = MISSING_ERROR_MESSAGE.format(class_name=class_name, key=key) raise AssertionError(msg) message_string = msg.format(**kwargs) - raise ValidationFailed(message_string) + raise ValidationError(message_string) @property def root(self): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 30e6bfeb1..d29dc684a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -14,7 +14,7 @@ from django.core.exceptions import ImproperlyConfigured from django.db import models from django.utils import six from django.utils.datastructures import SortedDict -from rest_framework.exceptions import ValidationFailed +from rest_framework.exceptions import ValidationError from rest_framework.fields import empty, set_value, Field, SkipField from rest_framework.settings import api_settings from rest_framework.utils import html, model_meta, representation @@ -77,13 +77,6 @@ class BaseSerializer(Field): raise NotImplementedError('`create()` must be implemented.') def save(self, **kwargs): - assert not hasattr(self, 'restore_object'), ( - 'Serializer %s has old-style version 2 `.restore_object()` ' - 'that is no longer compatible with REST framework 3. ' - 'Use the new-style `.create()` and `.update()` methods instead.' % - self.__class__.__name__ - ) - validated_data = self.validated_data if kwargs: validated_data = dict( @@ -105,17 +98,24 @@ class BaseSerializer(Field): return self.instance def is_valid(self, raise_exception=False): + assert not hasattr(self, 'restore_object'), ( + 'Serializer %s has old-style version 2 `.restore_object()` ' + 'that is no longer compatible with REST framework 3. ' + 'Use the new-style `.create()` and `.update()` methods instead.' % + self.__class__.__name__ + ) + if not hasattr(self, '_validated_data'): try: self._validated_data = self.run_validation(self._initial_data) - except ValidationFailed as exc: + except ValidationError as exc: self._validated_data = {} self._errors = exc.detail else: self._errors = {} if self._errors and raise_exception: - raise ValidationFailed(self._errors) + raise ValidationError(self._errors) return not bool(self._errors) @@ -124,6 +124,8 @@ class BaseSerializer(Field): if not hasattr(self, '_data'): if self.instance is not None and not getattr(self, '_errors', None): self._data = self.to_representation(self.instance) + elif hasattr(self, '_validated_data') and not getattr(self, '_errors', None): + self._data = self.to_representation(self.validated_data) else: self._data = self.get_initial() return self._data @@ -329,7 +331,7 @@ class Serializer(BaseSerializer): return None if not isinstance(data, dict): - raise ValidationFailed({ + raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: ['Invalid data'] }) @@ -338,8 +340,8 @@ class Serializer(BaseSerializer): self.run_validators(value) value = self.validate(value) assert value is not None, '.validate() should return the validated data' - except ValidationFailed as exc: - raise ValidationFailed({ + except ValidationError as exc: + raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: exc.detail }) return value @@ -359,7 +361,7 @@ class Serializer(BaseSerializer): validated_value = field.run_validation(primitive_value) if validate_method is not None: validated_value = validate_method(validated_value) - except ValidationFailed as exc: + except ValidationError as exc: errors[field.field_name] = exc.detail except SkipField: pass @@ -367,7 +369,7 @@ class Serializer(BaseSerializer): set_value(ret, field.source_attrs, validated_value) if errors: - raise ValidationFailed(errors) + raise ValidationError(errors) return ret diff --git a/tests/test_fields.py b/tests/test_fields.py index 5e8c67c54..6dc5f87d2 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1,6 +1,6 @@ from decimal import Decimal from django.utils import timezone -from rest_framework import exceptions, fields, serializers +from rest_framework import serializers import datetime import django import pytest @@ -17,8 +17,8 @@ class TestEmpty: """ By default a field must be included in the input. """ - field = fields.IntegerField() - with pytest.raises(exceptions.ValidationFailed) as exc_info: + field = serializers.IntegerField() + with pytest.raises(serializers.ValidationError) as exc_info: field.run_validation() assert exc_info.value.detail == ['This field is required.'] @@ -26,16 +26,16 @@ class TestEmpty: """ If `required=False` then a field may be omitted from the input. """ - field = fields.IntegerField(required=False) - with pytest.raises(fields.SkipField): + field = serializers.IntegerField(required=False) + with pytest.raises(serializers.SkipField): field.run_validation() def test_disallow_null(self): """ By default `None` is not a valid input. """ - field = fields.IntegerField() - with pytest.raises(exceptions.ValidationFailed) as exc_info: + field = serializers.IntegerField() + with pytest.raises(serializers.ValidationError) as exc_info: field.run_validation(None) assert exc_info.value.detail == ['This field may not be null.'] @@ -43,7 +43,7 @@ class TestEmpty: """ If `allow_null=True` then `None` is a valid input. """ - field = fields.IntegerField(allow_null=True) + field = serializers.IntegerField(allow_null=True) output = field.run_validation(None) assert output is None @@ -51,8 +51,8 @@ class TestEmpty: """ By default '' is not a valid input. """ - field = fields.CharField() - with pytest.raises(exceptions.ValidationFailed) as exc_info: + field = serializers.CharField() + with pytest.raises(serializers.ValidationError) as exc_info: field.run_validation('') assert exc_info.value.detail == ['This field may not be blank.'] @@ -60,7 +60,7 @@ class TestEmpty: """ If `allow_blank=True` then '' is a valid input. """ - field = fields.CharField(allow_blank=True) + field = serializers.CharField(allow_blank=True) output = field.run_validation('') assert output is '' @@ -68,7 +68,7 @@ class TestEmpty: """ If `default` is set, then omitted values get the default input. """ - field = fields.IntegerField(default=123) + field = serializers.IntegerField(default=123) output = field.run_validation() assert output is 123 @@ -96,13 +96,13 @@ class TestSource: class TestReadOnly: def setup(self): class TestSerializer(serializers.Serializer): - read_only = fields.ReadOnlyField() - writable = fields.IntegerField() + read_only = serializers.ReadOnlyField() + writable = serializers.IntegerField() self.Serializer = TestSerializer def test_validate_read_only(self): """ - Read-only fields should not be included in validation. + Read-only serializers.should not be included in validation. """ data = {'read_only': 123, 'writable': 456} serializer = self.Serializer(data=data) @@ -111,7 +111,7 @@ class TestReadOnly: def test_serialize_read_only(self): """ - Read-only fields should be serialized. + Read-only serializers.should be serialized. """ instance = {'read_only': 123, 'writable': 456} serializer = self.Serializer(instance) @@ -121,13 +121,13 @@ class TestReadOnly: class TestWriteOnly: def setup(self): class TestSerializer(serializers.Serializer): - write_only = fields.IntegerField(write_only=True) - readable = fields.IntegerField() + write_only = serializers.IntegerField(write_only=True) + readable = serializers.IntegerField() self.Serializer = TestSerializer def test_validate_write_only(self): """ - Write-only fields should be included in validation. + Write-only serializers.should be included in validation. """ data = {'write_only': 123, 'readable': 456} serializer = self.Serializer(data=data) @@ -136,7 +136,7 @@ class TestWriteOnly: def test_serialize_write_only(self): """ - Write-only fields should not be serialized. + Write-only serializers.should not be serialized. """ instance = {'write_only': 123, 'readable': 456} serializer = self.Serializer(instance) @@ -146,8 +146,8 @@ class TestWriteOnly: class TestInitial: def setup(self): class TestSerializer(serializers.Serializer): - initial_field = fields.IntegerField(initial=123) - blank_field = fields.IntegerField() + initial_field = serializers.IntegerField(initial=123) + blank_field = serializers.IntegerField() self.serializer = TestSerializer() def test_initial(self): @@ -163,7 +163,7 @@ class TestInitial: class TestLabel: def setup(self): class TestSerializer(serializers.Serializer): - labeled = fields.IntegerField(label='My label') + labeled = serializers.IntegerField(label='My label') self.serializer = TestSerializer() def test_label(self): @@ -189,7 +189,7 @@ class TestInvalidErrorKey: with pytest.raises(AssertionError) as exc_info: self.field.to_native(123) expected = ( - 'ValidationFailed raised by `ExampleField`, but error key ' + 'ValidationError raised by `ExampleField`, but error key ' '`incorrect` does not exist in the `error_messages` dictionary.' ) assert str(exc_info.value) == expected @@ -198,7 +198,7 @@ class TestInvalidErrorKey: class TestBooleanHTMLInput: def setup(self): class TestSerializer(serializers.Serializer): - archived = fields.BooleanField() + archived = serializers.BooleanField() self.Serializer = TestSerializer def test_empty_html_checkbox(self): @@ -243,7 +243,7 @@ class FieldValues: Ensure that invalid values raise the expected validation error. """ for input_value, expected_failure in get_items(self.invalid_inputs): - with pytest.raises(exceptions.ValidationFailed) as exc_info: + with pytest.raises(serializers.ValidationError) as exc_info: self.field.run_validation(input_value) assert exc_info.value.detail == expected_failure @@ -283,7 +283,7 @@ class TestBooleanField(FieldValues): False: False, 'other': True } - field = fields.BooleanField() + field = serializers.BooleanField() class TestNullBooleanField(FieldValues): @@ -310,7 +310,7 @@ class TestNullBooleanField(FieldValues): None: None, 'other': True } - field = fields.NullBooleanField() + field = serializers.NullBooleanField() # String types... @@ -330,7 +330,7 @@ class TestCharField(FieldValues): 1: '1', 'abc': 'abc' } - field = fields.CharField() + field = serializers.CharField() class TestEmailField(FieldValues): @@ -345,7 +345,7 @@ class TestEmailField(FieldValues): 'examplecom': ['Enter a valid email address.'] } outputs = {} - field = fields.EmailField() + field = serializers.EmailField() class TestRegexField(FieldValues): @@ -359,7 +359,7 @@ class TestRegexField(FieldValues): 'A9': ["This value does not match the required pattern."] } outputs = {} - field = fields.RegexField(regex='[a-z][0-9]') + field = serializers.RegexField(regex='[a-z][0-9]') class TestSlugField(FieldValues): @@ -373,7 +373,7 @@ class TestSlugField(FieldValues): 'slug 99': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."] } outputs = {} - field = fields.SlugField() + field = serializers.SlugField() class TestURLField(FieldValues): @@ -387,7 +387,7 @@ class TestURLField(FieldValues): 'example.com': ['Enter a valid URL.'] } outputs = {} - field = fields.URLField() + field = serializers.URLField() # Number types... @@ -415,7 +415,7 @@ class TestIntegerField(FieldValues): 1.0: 1, 0.0: 0 } - field = fields.IntegerField() + field = serializers.IntegerField() class TestMinMaxIntegerField(FieldValues): @@ -435,7 +435,7 @@ class TestMinMaxIntegerField(FieldValues): '4': ['Ensure this value is less than or equal to 3.'], } outputs = {} - field = fields.IntegerField(min_value=1, max_value=3) + field = serializers.IntegerField(min_value=1, max_value=3) class TestFloatField(FieldValues): @@ -461,7 +461,7 @@ class TestFloatField(FieldValues): 1.0: 1.0, 0.0: 0.0, } - field = fields.FloatField() + field = serializers.FloatField() class TestMinMaxFloatField(FieldValues): @@ -483,7 +483,7 @@ class TestMinMaxFloatField(FieldValues): '3.1': ['Ensure this value is less than or equal to 3.'], } outputs = {} - field = fields.FloatField(min_value=1, max_value=3) + field = serializers.FloatField(min_value=1, max_value=3) class TestDecimalField(FieldValues): @@ -518,7 +518,7 @@ class TestDecimalField(FieldValues): Decimal('1.09'): '1.1', Decimal('0.04'): '0.0' } - field = fields.DecimalField(max_digits=3, decimal_places=1) + field = serializers.DecimalField(max_digits=3, decimal_places=1) class TestMinMaxDecimalField(FieldValues): @@ -534,7 +534,7 @@ class TestMinMaxDecimalField(FieldValues): '20.1': ['Ensure this value is less than or equal to 20.'], } outputs = {} - field = fields.DecimalField( + field = serializers.DecimalField( max_digits=3, decimal_places=1, min_value=10, max_value=20 ) @@ -554,13 +554,13 @@ class TestNoStringCoercionDecimalField(FieldValues): Decimal('1.09'): Decimal('1.1'), Decimal('0.04'): Decimal('0.0'), } - field = fields.DecimalField( + field = serializers.DecimalField( max_digits=3, decimal_places=1, coerce_to_string=False ) -# Date & time fields... +# Date & time serializers... class TestDateField(FieldValues): """ @@ -578,7 +578,7 @@ class TestDateField(FieldValues): outputs = { datetime.date(2001, 1, 1): '2001-01-01' } - field = fields.DateField() + field = serializers.DateField() class TestCustomInputFormatDateField(FieldValues): @@ -592,7 +592,7 @@ class TestCustomInputFormatDateField(FieldValues): '2001-01-01': ['Date has wrong format. Use one of these formats instead: DD [Jan-Dec] YYYY'] } outputs = {} - field = fields.DateField(input_formats=['%d %b %Y']) + field = serializers.DateField(input_formats=['%d %b %Y']) class TestCustomOutputFormatDateField(FieldValues): @@ -604,7 +604,7 @@ class TestCustomOutputFormatDateField(FieldValues): outputs = { datetime.date(2001, 1, 1): '01 Jan 2001' } - field = fields.DateField(format='%d %b %Y') + field = serializers.DateField(format='%d %b %Y') class TestNoOutputFormatDateField(FieldValues): @@ -616,7 +616,7 @@ class TestNoOutputFormatDateField(FieldValues): outputs = { datetime.date(2001, 1, 1): datetime.date(2001, 1, 1) } - field = fields.DateField(format=None) + field = serializers.DateField(format=None) class TestDateTimeField(FieldValues): @@ -641,7 +641,7 @@ class TestDateTimeField(FieldValues): datetime.datetime(2001, 1, 1, 13, 00): '2001-01-01T13:00:00', datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()): '2001-01-01T13:00:00Z' } - field = fields.DateTimeField(default_timezone=timezone.UTC()) + field = serializers.DateTimeField(default_timezone=timezone.UTC()) class TestCustomInputFormatDateTimeField(FieldValues): @@ -655,7 +655,7 @@ class TestCustomInputFormatDateTimeField(FieldValues): '2001-01-01T20:50': ['Datetime has wrong format. Use one of these formats instead: hh:mm[AM|PM], DD [Jan-Dec] YYYY'] } outputs = {} - field = fields.DateTimeField(default_timezone=timezone.UTC(), input_formats=['%I:%M%p, %d %b %Y']) + field = serializers.DateTimeField(default_timezone=timezone.UTC(), input_formats=['%I:%M%p, %d %b %Y']) class TestCustomOutputFormatDateTimeField(FieldValues): @@ -667,7 +667,7 @@ class TestCustomOutputFormatDateTimeField(FieldValues): outputs = { datetime.datetime(2001, 1, 1, 13, 00): '01:00PM, 01 Jan 2001', } - field = fields.DateTimeField(format='%I:%M%p, %d %b %Y') + field = serializers.DateTimeField(format='%I:%M%p, %d %b %Y') class TestNoOutputFormatDateTimeField(FieldValues): @@ -679,7 +679,7 @@ class TestNoOutputFormatDateTimeField(FieldValues): outputs = { datetime.datetime(2001, 1, 1, 13, 00): datetime.datetime(2001, 1, 1, 13, 00), } - field = fields.DateTimeField(format=None) + field = serializers.DateTimeField(format=None) class TestNaiveDateTimeField(FieldValues): @@ -692,7 +692,7 @@ class TestNaiveDateTimeField(FieldValues): } invalid_inputs = {} outputs = {} - field = fields.DateTimeField(default_timezone=None) + field = serializers.DateTimeField(default_timezone=None) class TestTimeField(FieldValues): @@ -710,7 +710,7 @@ class TestTimeField(FieldValues): outputs = { datetime.time(13, 00): '13:00:00' } - field = fields.TimeField() + field = serializers.TimeField() class TestCustomInputFormatTimeField(FieldValues): @@ -724,7 +724,7 @@ class TestCustomInputFormatTimeField(FieldValues): '13:00': ['Time has wrong format. Use one of these formats instead: hh:mm[AM|PM]'], } outputs = {} - field = fields.TimeField(input_formats=['%I:%M%p']) + field = serializers.TimeField(input_formats=['%I:%M%p']) class TestCustomOutputFormatTimeField(FieldValues): @@ -736,7 +736,7 @@ class TestCustomOutputFormatTimeField(FieldValues): outputs = { datetime.time(13, 00): '01:00PM' } - field = fields.TimeField(format='%I:%M%p') + field = serializers.TimeField(format='%I:%M%p') class TestNoOutputFormatTimeField(FieldValues): @@ -748,7 +748,7 @@ class TestNoOutputFormatTimeField(FieldValues): outputs = { datetime.time(13, 00): datetime.time(13, 00) } - field = fields.TimeField(format=None) + field = serializers.TimeField(format=None) # Choice types... @@ -768,7 +768,7 @@ class TestChoiceField(FieldValues): outputs = { 'good': 'good' } - field = fields.ChoiceField( + field = serializers.ChoiceField( choices=[ ('poor', 'Poor quality'), ('medium', 'Medium quality'), @@ -794,7 +794,7 @@ class TestChoiceFieldWithType(FieldValues): '1': 1, 1: 1 } - field = fields.ChoiceField( + field = serializers.ChoiceField( choices=[ (1, 'Poor quality'), (2, 'Medium quality'), @@ -819,7 +819,7 @@ class TestChoiceFieldWithListChoices(FieldValues): outputs = { 'good': 'good' } - field = fields.ChoiceField(choices=('poor', 'medium', 'good')) + field = serializers.ChoiceField(choices=('poor', 'medium', 'good')) class TestMultipleChoiceField(FieldValues): @@ -838,7 +838,7 @@ class TestMultipleChoiceField(FieldValues): outputs = [ (['aircon', 'manual'], set(['aircon', 'manual'])) ] - field = fields.MultipleChoiceField( + field = serializers.MultipleChoiceField( choices=[ ('aircon', 'AirCon'), ('manual', 'Manual drive'), @@ -847,7 +847,7 @@ class TestMultipleChoiceField(FieldValues): ) -# File fields... +# File serializers... class MockFile: def __init__(self, name='', size=0, url=''): @@ -881,7 +881,7 @@ class TestFileField(FieldValues): (MockFile(name='example.txt', url='/example.txt'), '/example.txt'), ('', None) ] - field = fields.FileField(max_length=10) + field = serializers.FileField(max_length=10) class TestFieldFieldWithName(FieldValues): @@ -893,14 +893,14 @@ class TestFieldFieldWithName(FieldValues): outputs = [ (MockFile(name='example.txt', url='/example.txt'), 'example.txt') ] - field = fields.FileField(use_url=False) + field = serializers.FileField(use_url=False) # Stub out mock Django `forms.ImageField` class so we don't *actually* # call into it's regular validation, or require PIL for testing. class FailImageValidation(object): def to_python(self, value): - raise exceptions.ValidationFailed(self.error_messages['invalid_image']) + raise serializers.ValidationError(self.error_messages['invalid_image']) class PassImageValidation(object): @@ -917,7 +917,7 @@ class TestInvalidImageField(FieldValues): (MockFile(name='example.txt', size=10), ['Upload a valid image. The file you uploaded was either not an image or a corrupted image.']) ] outputs = {} - field = fields.ImageField(_DjangoImageField=FailImageValidation) + field = serializers.ImageField(_DjangoImageField=FailImageValidation) class TestValidImageField(FieldValues): @@ -929,10 +929,10 @@ class TestValidImageField(FieldValues): ] invalid_inputs = {} outputs = {} - field = fields.ImageField(_DjangoImageField=PassImageValidation) + field = serializers.ImageField(_DjangoImageField=PassImageValidation) -# Composite fields... +# Composite serializers... class TestListField(FieldValues): """ @@ -950,7 +950,7 @@ class TestListField(FieldValues): ([1, 2, 3], [1, 2, 3]), (['1', '2', '3'], [1, 2, 3]) ] - field = fields.ListField(child=fields.IntegerField()) + field = serializers.ListField(child=serializers.IntegerField()) # Tests for FieldField. @@ -963,7 +963,7 @@ class MockRequest: class TestFileFieldContext: def test_fully_qualified_when_request_in_context(self): - field = fields.FileField(max_length=10) + field = serializers.FileField(max_length=10) field._context = {'request': MockRequest()} obj = MockFile(name='example.txt', url='/example.txt') value = field.to_representation(obj) diff --git a/tests/test_relations.py b/tests/test_relations.py index 53c1b25c7..16ead1f2f 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -1,6 +1,6 @@ from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset from django.core.exceptions import ImproperlyConfigured -from rest_framework import exceptions, serializers +from rest_framework import serializers from rest_framework.test import APISimpleTestCase import pytest @@ -30,13 +30,13 @@ class TestPrimaryKeyRelatedField(APISimpleTestCase): assert instance is self.instance def test_pk_related_lookup_does_not_exist(self): - with pytest.raises(exceptions.ValidationFailed) as excinfo: + with pytest.raises(serializers.ValidationError) as excinfo: self.field.to_internal_value(4) msg = excinfo.value.detail[0] assert msg == "Invalid pk '4' - object does not exist." def test_pk_related_lookup_invalid_type(self): - with pytest.raises(exceptions.ValidationFailed) as excinfo: + with pytest.raises(serializers.ValidationError) as excinfo: self.field.to_internal_value(BadType()) msg = excinfo.value.detail[0] assert msg == 'Incorrect type. Expected pk value, received BadType.' @@ -120,13 +120,13 @@ class TestSlugRelatedField(APISimpleTestCase): assert instance is self.instance def test_slug_related_lookup_does_not_exist(self): - with pytest.raises(exceptions.ValidationFailed) as excinfo: + with pytest.raises(serializers.ValidationError) as excinfo: self.field.to_internal_value('doesnotexist') msg = excinfo.value.detail[0] assert msg == 'Object with name=doesnotexist does not exist.' def test_slug_related_lookup_invalid_type(self): - with pytest.raises(exceptions.ValidationFailed) as excinfo: + with pytest.raises(serializers.ValidationError) as excinfo: self.field.to_internal_value(BadType()) msg = excinfo.value.detail[0] assert msg == 'Invalid value.' diff --git a/tests/test_validation.py b/tests/test_validation.py index 849c7e9d5..4d64e6e11 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.core.validators import MaxValueValidator from django.db import models from django.test import TestCase -from rest_framework import exceptions, generics, serializers, status +from rest_framework import generics, serializers, status from rest_framework.test import APIRequestFactory factory = APIRequestFactory() @@ -37,7 +37,7 @@ class ShouldValidateModelSerializer(serializers.ModelSerializer): def validate_renamed(self, value): if len(value) < 3: - raise exceptions.ValidationFailed('Minimum 3 characters.') + raise serializers.ValidationError('Minimum 3 characters.') return value class Meta: @@ -73,10 +73,10 @@ class ValidationSerializer(serializers.Serializer): foo = serializers.CharField() def validate_foo(self, attrs, source): - raise exceptions.ValidationFailed("foo invalid") + raise serializers.ValidationError("foo invalid") def validate(self, attrs): - raise exceptions.ValidationFailed("serializer invalid") + raise serializers.ValidationError("serializer invalid") class TestAvoidValidation(TestCase): @@ -158,7 +158,7 @@ class TestChoiceFieldChoicesValidate(TestCase): value = self.CHOICES[0][0] try: f.to_internal_value(value) - except exceptions.ValidationFailed: + except serializers.ValidationError: self.fail("Value %s does not validate" % str(value)) # def test_nested_choices(self): From 11edd01c34debbe3b689da91efd63cddab7b28c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 17 Oct 2014 08:58:31 -0400 Subject: [PATCH 0973/1652] Add docs regarding linking third party packages --- docs/topics/contributing.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 3400bc8f9..4fafb1b1e 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -210,7 +210,9 @@ We recommend the [`django-reusable-app`][django-reusable-app] template as a good ## Linking to your package -Once your package is decently documented and available on PyPI open a pull request or issue, and we'll add a link to it from the main REST framework documentation. +Once your package is decently documented and available on PyPI open a pull request or issue, and we'll add a link to it from the main REST framework documentation. You can add your package under **Third party packages** of the API Guide section that best applies, like [Authentication][authentication] or [Permissions][permissions]. You can also link your package under the [Third Party Resources][third-party-resources] section. + +We also suggest adding it to the [REST Framework][rest-framework-grid] grid on Django Packages. [cite]: http://www.w3.org/People/Berners-Lee/FAQ.html [code-of-conduct]: https://www.djangoproject.com/conduct/ @@ -225,3 +227,7 @@ Once your package is decently documented and available on PyPI open a pull reque [docs]: https://github.com/tomchristie/django-rest-framework/tree/master/docs [mou]: http://mouapp.com/ [django-reusable-app]: https://github.com/dabapps/django-reusable-app +[authentication]: ../api-guide/authentication.md +[permissions]: ../api-guide/permissions.md +[third-party-resources]: third-party-resources.md +[rest-framework-grid]: https://www.djangopackages.com/grids/g/django-rest-framework/ From 140f8620aea44daa368b244d96c68377716fac7e Mon Sep 17 00:00:00 2001 From: Carl Meyer <carl@oddbird.net> Date: Thu, 16 Oct 2014 12:16:13 -0600 Subject: [PATCH 0974/1652] Set up serializer fields lazily on-demand. This avoids AppRegistryNotReady problems in Django 1.7 with nested serializers, which are instantiated at import time, possibly before Django's app registry is fully populated. --- rest_framework/serializers.py | 6 +++++- tests/test_relations.py | 5 +++-- tests/test_serializer.py | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b3db35823..340c6be01 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -22,6 +22,7 @@ from django.db import models from django.forms import widgets from django.utils import six from django.utils.datastructures import SortedDict +from django.utils.functional import cached_property from django.core.exceptions import ObjectDoesNotExist from rest_framework.settings import api_settings @@ -197,7 +198,6 @@ class BaseSerializer(WritableField): self.init_data = data self.init_files = files self.object = instance - self.fields = self.get_fields() self._data = None self._files = None @@ -212,6 +212,10 @@ class BaseSerializer(WritableField): ##### # Methods to determine which fields to use when (de)serializing objects. + @cached_property + def fields(self): + return self.get_fields() + def get_default_fields(self): """ Return the complete set of default fields for the object, as a dict. diff --git a/tests/test_relations.py b/tests/test_relations.py index bc1db69fc..501a9208f 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -102,7 +102,7 @@ class RelatedFieldSourceTests(TestCase): self.assertEqual(value, ['BlogPost object']) # Regression for #1129 - def test_exception_for_incorect_fk(self): + def test_exception_for_incorrect_fk(self): """ Check that the exception message are correct if the source field doesn't exist. @@ -123,8 +123,9 @@ class RelatedFieldSourceTests(TestCase): (serializers.ModelSerializer,), attrs ) + serializer = TestSerializer(data={'name': 'foo'}) with self.assertRaises(AttributeError): - TestSerializer(data={'name': 'foo'}) + serializer.fields @unittest.skipIf(get_version() < '1.6.0', 'Upstream behaviour changed in v1.6') diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 90f37cf2e..e72b723f0 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -327,7 +327,9 @@ class BasicTests(TestCase): """ Regression test for #652. """ - self.assertRaises(AssertionError, PersonSerializerInvalidReadOnly, []) + serializer = PersonSerializerInvalidReadOnly() + with self.assertRaises(AssertionError): + serializer.fields def test_serializer_data_is_cleared_on_save(self): """ From 12b677039d5485afa7bc913a6f56c4b107fbbe3f Mon Sep 17 00:00:00 2001 From: Erik Wickstrom <erik@erikwickstrom.com> Date: Sun, 19 Oct 2014 21:03:33 -0700 Subject: [PATCH 0975/1652] Maintain order of views on router for api root view. --- rest_framework/routers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index f2d062118..9937566d2 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -16,7 +16,7 @@ For example, you might have a `urls.py` that looks something like this: from __future__ import unicode_literals import itertools -from collections import namedtuple +from collections import namedtuple, OrderedDict from django.conf.urls import patterns, url from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import NoReverseMatch @@ -277,7 +277,7 @@ class DefaultRouter(SimpleRouter): """ Return a view to use as the API root. """ - api_root_dict = {} + api_root_dict = OrderedDict() list_name = self.routes[0].name for prefix, viewset, basename in self.registry: api_root_dict[prefix] = list_name.format(basename=basename) @@ -286,7 +286,7 @@ class DefaultRouter(SimpleRouter): _ignore_model_permissions = True def get(self, request, *args, **kwargs): - ret = {} + ret = OrderedDict() for key, url_name in api_root_dict.items(): try: ret[key] = reverse( From 674855a114cca8afbcd7a9927170d0d420aea819 Mon Sep 17 00:00:00 2001 From: Erik Wickstrom <erik@erikwickstrom.com> Date: Mon, 20 Oct 2014 08:47:45 -0700 Subject: [PATCH 0976/1652] Used Django utils SortedDict instead of stdlib's OrderedDict for wider compatability. --- rest_framework/routers.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 9937566d2..169e6e8bc 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -16,10 +16,11 @@ For example, you might have a `urls.py` that looks something like this: from __future__ import unicode_literals import itertools -from collections import namedtuple, OrderedDict +from collections import namedtuple from django.conf.urls import patterns, url from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import NoReverseMatch +from django.utils.datastructures import SortedDict from rest_framework import views from rest_framework.response import Response from rest_framework.reverse import reverse @@ -277,7 +278,7 @@ class DefaultRouter(SimpleRouter): """ Return a view to use as the API root. """ - api_root_dict = OrderedDict() + api_root_dict = SortedDict() list_name = self.routes[0].name for prefix, viewset, basename in self.registry: api_root_dict[prefix] = list_name.format(basename=basename) @@ -286,7 +287,7 @@ class DefaultRouter(SimpleRouter): _ignore_model_permissions = True def get(self, request, *args, **kwargs): - ret = OrderedDict() + ret = SortedDict() for key, url_name in api_root_dict.items(): try: ret[key] = reverse( From c5d1be8eac6cdb5cce000ec7c55e1847bfcf2359 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 22 Oct 2014 10:32:32 +0100 Subject: [PATCH 0977/1652] .validate() can raise field errors or non-field errors --- docs/topics/3.0-announcement.md | 45 +++++++++++++++++++++++++++++++-- rest_framework/serializers.py | 34 ++++++++++++++++++------- tests/test_serializer.py | 26 +++++++++++++++++++ 3 files changed, 94 insertions(+), 11 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 658b50d31..9aeb5df6f 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -163,7 +163,7 @@ The `validate_<field_name>` method hooks that can be attached to serializer clas raise serializers.ValidationError('This field should be a multiple of ten.') return attrs -This is now simplified slightly, and the method hooks simply take the value to be validated, and return it's validated value. +This is now simplified slightly, and the method hooks simply take the value to be validated, and return the validated value. def validate_score(self, value): if value % 10 != 0: @@ -172,6 +172,22 @@ This is now simplified slightly, and the method hooks simply take the value to b Any ad-hoc validation that applies to more than one field should go in the `.validate(self, attrs)` method as usual. +Because `.validate_<field_name>` would previously accept the complete dictionary of attributes, it could be used to validate a field depending on the input in another field. Now if you need to do this you should use `.validate()` instead. + +You can either return `non_field_errors` from the validate method by raising a simple `ValidationError` + + def validate(self, attrs): + # serializer.errors == {'non_field_errors': ['A non field error']} + raise serailizers.ValidationError('A non field error') + +Alternatively if you want the errors to be against a specific field, use a dictionary of when instantiating the `ValidationError`, like so: + + def validate(self, attrs): + # serializer.errors == {'my_field': ['A field error']} + raise serailizers.ValidationError({'my_field': 'A field error'}) + +This ensures you can still write validation that compares all the input fields, but that marks the error against a particular field. + #### Limitations of ModelSerializer validation. This change also means that we no longer use the `.full_clean()` method on model instances, but instead perform all validation explicitly on the serializer. This gives a cleaner separation, and ensures that there's no automatic validation behavior on `ModelSerializer` classes that can't also be easily replicated on regular `Serializer` classes. @@ -189,7 +205,32 @@ REST framework 2.x attempted to automatically support writable nested serializat * It's unclear what behavior the user should expect when related models are passed `None` data. * It's unclear how the user should expect to-many relationships to handle updates, creations and deletions of multiple records. -Using the `depth` option on `ModelSerializer` will now create **read-only nested serializers** by default. To use writable nested serialization you'll want to declare a nested field on the serializer class, and write the `create()` and/or `update()` methods explicitly. +Using the `depth` option on `ModelSerializer` will now create **read-only nested serializers** by default. + +If you try to use a writable nested serializer without writing a custom `create()` and/or `update()` method you'll see an assertion error when you attempt to save the serializer. For example: + + >>> class ProfileSerializer(serializers.ModelSerializer): + >>> class Meta: + >>> model = Profile + >>> fields = ('address', 'phone') + >>> + >>> class UserSerializer(serializers.ModelSerializer): + >>> profile = ProfileSerializer() + >>> class Meta: + >>> model = User + >>> fields = ('username', 'email', 'profile') + >>> + >>> data = { + >>> 'username': 'lizzy', + >>> 'email': 'lizzy@example.com', + >>> 'profile': {'address': '123 Acacia Avenue', 'phone': '01273 100200'} + >>> } + >>> + >>> serializer = UserSerializer(data=data) + >>> serializer.save() + AssertionError: The `.create()` method does not suport nested writable fields by default. Write an explicit `.create()` method for serializer `UserSerializer`, or set `read_only=True` on nested serializer fields. + +To use writable nested serialization you'll want to declare a nested field on the serializer class, and write the `create()` and/or `update()` methods explicitly. class UserSerializer(serializers.ModelSerializer): profile = ProfileSerializer() diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index d29dc684a..59f38a73d 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -99,10 +99,10 @@ class BaseSerializer(Field): def is_valid(self, raise_exception=False): assert not hasattr(self, 'restore_object'), ( - 'Serializer %s has old-style version 2 `.restore_object()` ' + 'Serializer `%s.%s` has old-style version 2 `.restore_object()` ' 'that is no longer compatible with REST framework 3. ' 'Use the new-style `.create()` and `.update()` methods instead.' % - self.__class__.__name__ + (self.__class__.__module__, self.__class__.__name__) ) if not hasattr(self, '_validated_data'): @@ -341,9 +341,22 @@ class Serializer(BaseSerializer): value = self.validate(value) assert value is not None, '.validate() should return the validated data' except ValidationError as exc: - raise ValidationError({ - api_settings.NON_FIELD_ERRORS_KEY: exc.detail - }) + if isinstance(exc.detail, dict): + # .validate() errors may be a dict, in which case, use + # standard {key: list of values} style. + raise ValidationError(dict([ + (key, value if isinstance(value, list) else [value]) + for key, value in exc.detail.items() + ])) + elif isinstance(exc.detail, list): + raise ValidationError({ + api_settings.NON_FIELD_ERRORS_KEY: exc.detail + }) + else: + raise ValidationError({ + api_settings.NON_FIELD_ERRORS_KEY: [exc.detail] + }) + return value def to_internal_value(self, data): @@ -507,14 +520,17 @@ class ModelSerializer(Serializer): self._kwargs['validators'] = validators def create(self, validated_attrs): + # Check that the user isn't trying to handle a writable nested field. + # If we don't do this explicitly they'd likely get a confusing + # error at the point of calling `Model.objects.create()`. assert not any( isinstance(field, BaseSerializer) and not field.read_only for field in self.fields.values() ), ( 'The `.create()` method does not suport nested writable fields ' 'by default. Write an explicit `.create()` method for serializer ' - '%s, or set `read_only=True` on nested serializer fields.' % - self.__class__.__name__ + '`%s.%s`, or set `read_only=True` on nested serializer fields.' % + (self.__class__.__module__, self.__class__.__name__) ) ModelClass = self.Meta.model @@ -544,8 +560,8 @@ class ModelSerializer(Serializer): ), ( 'The `.update()` method does not suport nested writable fields ' 'by default. Write an explicit `.update()` method for serializer ' - '%s, or set `read_only=True` on nested serializer fields.' % - self.__class__.__name__ + '`%s.%s`, or set `read_only=True` on nested serializer fields.' % + (self.__class__.__module__, self.__class__.__name__) ) for attr, value in validated_attrs.items(): diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 4df1b7364..77d5c3199 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -43,6 +43,32 @@ class TestSerializer: serializer.data +class TestValidateMethod: + def test_non_field_error_validate_method(self): + class ExampleSerializer(serializers.Serializer): + char = serializers.CharField() + integer = serializers.IntegerField() + + def validate(self, attrs): + raise serializers.ValidationError('Non field error') + + serializer = ExampleSerializer(data={'char': 'abc', 'integer': 123}) + assert not serializer.is_valid() + assert serializer.errors == {'non_field_errors': ['Non field error']} + + def test_field_error_validate_method(self): + class ExampleSerializer(serializers.Serializer): + char = serializers.CharField() + integer = serializers.IntegerField() + + def validate(self, attrs): + raise serializers.ValidationError({'char': 'Field error'}) + + serializer = ExampleSerializer(data={'char': 'abc', 'integer': 123}) + assert not serializer.is_valid() + assert serializer.errors == {'char': ['Field error']} + + class TestBaseSerializer: def setup(self): class ExampleSerializer(serializers.BaseSerializer): From ae53fdff9c6bb3e81a1ec005134462f0d629688f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 22 Oct 2014 13:30:28 +0100 Subject: [PATCH 0978/1652] First pass at unique_for_date, unique_for_month, unique_for_year --- rest_framework/fields.py | 10 ++- rest_framework/serializers.py | 26 +++++--- rest_framework/validators.py | 121 +++++++++++++++++++++++++++------- tests/test_validators.py | 68 +++++++++++++++++++ 4 files changed, 191 insertions(+), 34 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 2da4aa8b2..e939b2f29 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -268,11 +268,17 @@ class Field(object): """ errors = [] for validator in self.validators: - if getattr(validator, 'requires_context', False): - validator.serializer_field = self + if hasattr(validator, 'set_context'): + validator.set_context(self) + try: validator(value) except ValidationError as exc: + # If the validation error contains a mapping of fields to + # errors then simply raise it immediately rather than + # attempting to accumulate a list of errors. + if isinstance(exc.detail, dict): + raise errors.extend(exc.detail) except DjangoValidationError as exc: errors.extend(exc.messages) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 59f38a73d..5770fcf6a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -23,7 +23,9 @@ from rest_framework.utils.field_mapping import ( get_relation_kwargs, get_nested_relation_kwargs, ClassLookupDict ) -from rest_framework.validators import UniqueTogetherValidator +from rest_framework.validators import ( + UniqueForDateValidator, UniqueTogetherValidator +) import copy import inspect import warnings @@ -578,15 +580,9 @@ class ModelSerializer(Serializer): validators = [] model_class = self.Meta.model - for unique_together in model_class._meta.unique_together: - if field_names.issuperset(set(unique_together)): - validator = UniqueTogetherValidator( - queryset=model_class._default_manager, - fields=unique_together - ) - validators.append(validator) - - for parent_class in model_class._meta.parents.keys(): + # Note that we make sure to check `unique_together` both on the + # base model class, but also on any parent classes. + for parent_class in [model_class] + list(model_class._meta.parents.keys()): for unique_together in parent_class._meta.unique_together: if field_names.issuperset(set(unique_together)): validator = UniqueTogetherValidator( @@ -595,6 +591,16 @@ class ModelSerializer(Serializer): ) validators.append(validator) + info = model_meta.get_field_info(model_class) + for field_name, field in info.fields_and_pk.items(): + if field.unique_for_date and field_name in field_names: + validator = UniqueForDateValidator( + queryset=model_class._default_manager, + field=field_name, + date_field=field.unique_for_date + ) + validators.append(validator) + return validators def _get_base_fields(self): diff --git a/rest_framework/validators.py b/rest_framework/validators.py index f76faaa4b..e302a0e41 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -6,38 +6,36 @@ This gives us better separation of concerns, allows us to use single-step object creation, and makes it possible to switch between using the implicit `ModelSerializer` class and an equivelent explicit `Serializer` class. """ -from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _ +from rest_framework.exceptions import ValidationError from rest_framework.utils.representation import smart_repr class UniqueValidator: """ Validator that corresponds to `unique=True` on a model field. + + Should be applied to an individual field on the serializer. """ - # Validators with `requires_context` will have the field instance - # passed to them when the field is instantiated. - requires_context = True message = _('This field must be unique.') def __init__(self, queryset): self.queryset = queryset self.serializer_field = None - def __call__(self, value): - field = self.serializer_field - - # Determine the model field name that the serializer field corresponds to. - field_name = field.source_attrs[0] if field.source_attrs else field.field_name - + def set_context(self, serializer_field): + # Determine the underlying model field name. This may not be the + # same as the serializer field name if `source=<>` is set. + self.field_name = serializer_field.source_attrs[0] # Determine the existing instance, if this is an update operation. - instance = getattr(field.parent, 'instance', None) + self.instance = getattr(serializer_field.parent, 'instance', None) + def __call__(self, value): # Ensure uniqueness. - filter_kwargs = {field_name: value} + filter_kwargs = {self.field_name: value} queryset = self.queryset.filter(**filter_kwargs) - if instance: - queryset = queryset.exclude(pk=instance.pk) + if self.instance is not None: + queryset = queryset.exclude(pk=self.instance.pk) if queryset.exists(): raise ValidationError(self.message) @@ -51,8 +49,9 @@ class UniqueValidator: class UniqueTogetherValidator: """ Validator that corresponds to `unique_together = (...)` on a model class. + + Should be applied to the serializer class, not to an individual field. """ - requires_context = True message = _('The fields {field_names} must make a unique set.') def __init__(self, queryset, fields): @@ -60,19 +59,18 @@ class UniqueTogetherValidator: self.fields = fields self.serializer_field = None - def __call__(self, value): - serializer = self.serializer_field - + def set_context(self, serializer): # Determine the existing instance, if this is an update operation. - instance = getattr(serializer, 'instance', None) + self.instance = getattr(serializer, 'instance', None) + def __call__(self, attrs): # Ensure uniqueness. filter_kwargs = dict([ - (field_name, value[field_name]) for field_name in self.fields + (field_name, attrs[field_name]) for field_name in self.fields ]) queryset = self.queryset.filter(**filter_kwargs) - if instance: - queryset = queryset.exclude(pk=instance.pk) + if self.instance is not None: + queryset = queryset.exclude(pk=self.instance.pk) if queryset.exists(): field_names = ', '.join(self.fields) raise ValidationError(self.message.format(field_names=field_names)) @@ -83,3 +81,82 @@ class UniqueTogetherValidator: smart_repr(self.queryset), smart_repr(self.fields) ) + + +class BaseUniqueForValidator: + message = None + + def __init__(self, queryset, field, date_field): + self.queryset = queryset + self.field = field + self.date_field = date_field + + def set_context(self, serializer): + # Determine the underlying model field names. These may not be the + # same as the serializer field names if `source=<>` is set. + self.field_name = serializer.fields[self.field].source_attrs[0] + self.date_field_name = serializer.fields[self.date_field].source_attrs[0] + # Determine the existing instance, if this is an update operation. + self.instance = getattr(serializer, 'instance', None) + + def get_filter_kwargs(self, attrs): + raise NotImplementedError('`get_filter_kwargs` must be implemented.') + + def __call__(self, attrs): + filter_kwargs = self.get_filter_kwargs(attrs) + + queryset = self.queryset.filter(**filter_kwargs) + if self.instance is not None: + queryset = queryset.exclude(pk=self.instance.pk) + if queryset.exists(): + message = self.message.format(date_field=self.date_field) + raise ValidationError({self.field: message}) + + def __repr__(self): + return '<%s(queryset=%s, field=%s, date_field=%s)>' % ( + self.__class__.__name__, + smart_repr(self.queryset), + smart_repr(self.field), + smart_repr(self.date_field) + ) + + +class UniqueForDateValidator(BaseUniqueForValidator): + message = _('This field must be unique for the "{date_field}" date.') + + def get_filter_kwargs(self, attrs): + value = attrs[self.field] + date = attrs[self.date_field] + + filter_kwargs = {} + filter_kwargs[self.field_name] = value + filter_kwargs['%s__day' % self.date_field_name] = date.day + filter_kwargs['%s__month' % self.date_field_name] = date.month + filter_kwargs['%s__year' % self.date_field_name] = date.year + return filter_kwargs + + +class UniqueForMonthValidator(BaseUniqueForValidator): + message = _('This field must be unique for the "{date_field}" month.') + + def get_filter_kwargs(self, attrs): + value = attrs[self.field] + date = attrs[self.date_field] + + filter_kwargs = {} + filter_kwargs[self.field_name] = value + filter_kwargs['%s__month' % self.date_field_name] = date.month + return filter_kwargs + + +class UniqueForYearValidator(BaseUniqueForValidator): + message = _('This field must be unique for the "{date_field}" year.') + + def get_filter_kwargs(self, attrs): + value = attrs[self.field] + date = attrs[self.date_field] + + filter_kwargs = {} + filter_kwargs[self.field_name] = value + filter_kwargs['%s__year' % self.date_field_name] = date.year + return filter_kwargs diff --git a/tests/test_validators.py b/tests/test_validators.py index 1d0814115..5adb76783 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -1,6 +1,7 @@ from django.db import models from django.test import TestCase from rest_framework import serializers +import datetime def dedent(blocktext): @@ -147,3 +148,70 @@ class TestUniquenessTogetherValidation(TestCase): race_name = CharField(max_length=100) """) assert repr(serializer) == expected + + +# Tests for `UniqueForDateValidator` +# ---------------------------------- + +class UniqueForDateModel(models.Model): + slug = models.CharField(max_length=100, unique_for_date='published') + published = models.DateField() + + +class UniqueForDateSerializer(serializers.ModelSerializer): + class Meta: + model = UniqueForDateModel + + +class TestUniquenessForDateValidation(TestCase): + def setUp(self): + self.instance = UniqueForDateModel.objects.create( + slug='existing', + published='2000-01-01' + ) + + def test_repr(self): + serializer = UniqueForDateSerializer() + expected = dedent(""" + UniqueForDateSerializer(validators=[<UniqueForDateValidator(queryset=UniqueForDateModel.objects.all(), field='slug', date_field='published')>]): + id = IntegerField(label='ID', read_only=True) + slug = CharField(max_length=100) + published = DateField() + """) + assert repr(serializer) == expected + + def test_is_not_unique_for_date(self): + """ + Failing unique for date validation should result in field error. + """ + data = {'slug': 'existing', 'published': '2000-01-01'} + serializer = UniqueForDateSerializer(data=data) + assert not serializer.is_valid() + assert serializer.errors == { + 'slug': ['This field must be unique for the "published" date.'] + } + + def test_is_unique_for_date(self): + """ + Passing unique for date validation. + """ + data = {'slug': 'existing', 'published': '2000-01-02'} + serializer = UniqueForDateSerializer(data=data) + assert serializer.is_valid() + assert serializer.validated_data == { + 'slug': 'existing', + 'published': datetime.date(2000, 1, 2) + } + + def test_updated_instance_excluded_from_unique_for_date(self): + """ + When performing an update, the existing instance does not count + as a match against unique_for_date. + """ + data = {'slug': 'existing', 'published': '2000-01-01'} + serializer = UniqueForDateSerializer(instance=self.instance, data=data) + assert serializer.is_valid() + assert serializer.validated_data == { + 'slug': 'existing', + 'published': datetime.date(2000, 1, 1) + } From d6ccdfc53d266e1f6b329069722c106775120181 Mon Sep 17 00:00:00 2001 From: Carlton Gibson <carlton.gibson@noumenal.co.uk> Date: Wed, 22 Oct 2014 16:43:37 +0200 Subject: [PATCH 0979/1652] Added Note on tox & .pyc files. Fixes #1957 --- CONTRIBUTING.md | 9 +++++++++ docs/topics/contributing.md | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a6dd05a0e..6abc65534 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -71,6 +71,15 @@ You can also use the excellent [`tox`][tox] testing tool to run the tests agains tox +--- + +**Note**: If you run `tox` followed by `./runtests.py` you _may_ encounter a "bad marshall data" error as `pytest` attempts to read `.pyc` files from an incompatible Python version. To clear the offending `.pyc` files run: + + $ find . -name '*.pyc' -delete + +--- + + ## Pull requests It's a good idea to make pull requests early on. A pull request represents the start of a discussion, and doesn't necessarily need to be the final, finished submission. diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 4fafb1b1e..8be753f2b 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -105,6 +105,15 @@ You can also use the excellent [tox][tox] testing tool to run the tests against tox +--- + +**Note**: If you run `tox` followed by `./runtests.py` you _may_ encounter a "bad marshall data" error as `pytest` attempts to read `.pyc` files from an incompatible Python version. To clear the offending `.pyc` files run: + + $ find . -name '*.pyc' -delete + +--- + + ## Pull requests It's a good idea to make pull requests early on. A pull request represents the start of a discussion, and doesn't necessarily need to be the final, finished submission. From ba52c0c62762b9976fffa72dde7ce922176e481d Mon Sep 17 00:00:00 2001 From: Carlton Gibson <carlton.gibson@noumenal.co.uk> Date: Wed, 22 Oct 2014 17:08:44 +0200 Subject: [PATCH 0980/1652] Revert "Added Note on tox & .pyc files. Fixes #1957" This reverts commit d6ccdfc53d266e1f6b329069722c106775120181. --- CONTRIBUTING.md | 9 --------- docs/topics/contributing.md | 9 --------- 2 files changed, 18 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6abc65534..a6dd05a0e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -71,15 +71,6 @@ You can also use the excellent [`tox`][tox] testing tool to run the tests agains tox ---- - -**Note**: If you run `tox` followed by `./runtests.py` you _may_ encounter a "bad marshall data" error as `pytest` attempts to read `.pyc` files from an incompatible Python version. To clear the offending `.pyc` files run: - - $ find . -name '*.pyc' -delete - ---- - - ## Pull requests It's a good idea to make pull requests early on. A pull request represents the start of a discussion, and doesn't necessarily need to be the final, finished submission. diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 8be753f2b..4fafb1b1e 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -105,15 +105,6 @@ You can also use the excellent [tox][tox] testing tool to run the tests against tox ---- - -**Note**: If you run `tox` followed by `./runtests.py` you _may_ encounter a "bad marshall data" error as `pytest` attempts to read `.pyc` files from an incompatible Python version. To clear the offending `.pyc` files run: - - $ find . -name '*.pyc' -delete - ---- - - ## Pull requests It's a good idea to make pull requests early on. A pull request represents the start of a discussion, and doesn't necessarily need to be the final, finished submission. From f9c0e6ee1b045f69920cf9c3aceda4e44f110bfb Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 22 Oct 2014 16:29:09 +0100 Subject: [PATCH 0981/1652] unique_for_month, unique_for_year --- rest_framework/serializers.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 5770fcf6a..b45f343a4 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -24,7 +24,8 @@ from rest_framework.utils.field_mapping import ( ClassLookupDict ) from rest_framework.validators import ( - UniqueForDateValidator, UniqueTogetherValidator + UniqueForDateValidator, UniqueForMonthValidator, UniqueForYearValidator, + UniqueTogetherValidator ) import copy import inspect @@ -601,6 +602,22 @@ class ModelSerializer(Serializer): ) validators.append(validator) + if field.unique_for_month and field_name in field_names: + validator = UniqueForMonthValidator( + queryset=model_class._default_manager, + field=field_name, + date_field=field.unique_for_month + ) + validators.append(validator) + + if field.unique_for_year and field_name in field_names: + validator = UniqueForYearValidator( + queryset=model_class._default_manager, + field=field_name, + date_field=field.unique_for_year + ) + validators.append(validator) + return validators def _get_base_fields(self): From 702f47700de2c10f26f06b23099740c408ffe797 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 24 Oct 2014 12:12:01 +0100 Subject: [PATCH 0982/1652] Updated requirements --- README.md | 2 +- docs/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 63513f758..e71fe7bf1 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ There is a live example API for testing purposes, [available here][sandbox]. # Requirements * Python (2.6.5+, 2.7, 3.2, 3.3) -* Django (1.4.2+, 1.5, 1.6, 1.7) +* Django (1.4.11+, 1.5.5+, 1.6, 1.7) # Installation diff --git a/docs/index.md b/docs/index.md index e4c971f95..9d436ad5a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -50,7 +50,7 @@ Some reasons you might want to use REST framework: REST framework requires the following: * Python (2.6.5+, 2.7, 3.2, 3.3) -* Django (1.4.2+, 1.5, 1.6, 1.7) +* Django (1.4.11+, 1.5.5+, 1.6, 1.7) The following packages are optional: From 9ebaabd6eb31e18cf0bb1c70893f719f18ecb0f9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 28 Oct 2014 16:21:49 +0000 Subject: [PATCH 0983/1652] unique_for_date/unique_for_month/unique_for_year --- rest_framework/fields.py | 54 +++++++++++++++++++++-- rest_framework/serializers.py | 82 +++++++++++++++++++++++++++++++++-- tests/test_fields.py | 27 ++++++++++++ tests/test_validators.py | 39 ++++++++++++++++- 4 files changed, 194 insertions(+), 8 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index e939b2f29..82b7eb374 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -92,13 +92,35 @@ def set_value(dictionary, keys, value): dictionary[keys[-1]] = value +class CreateOnlyDefault: + """ + This class may be used to provide default values that are only used + for create operations, but that do not return any value for update + operations. + """ + def __init__(self, default): + self.default = default + + def set_context(self, serializer_field): + self.is_update = serializer_field.parent.instance is not None + + def __call__(self): + if self.is_update: + raise SkipField() + if callable(self.default): + return self.default() + return self.default + + def __repr__(self): + return '%s(%s)' % (self.__class__.__name__, repr(self.default)) + + class SkipField(Exception): pass NOT_READ_ONLY_WRITE_ONLY = 'May not set both `read_only` and `write_only`' NOT_READ_ONLY_REQUIRED = 'May not set both `read_only` and `required`' -NOT_READ_ONLY_DEFAULT = 'May not set both `read_only` and `default`' NOT_REQUIRED_DEFAULT = 'May not set both `required` and `default`' USE_READONLYFIELD = 'Field(read_only=True) should be ReadOnlyField' MISSING_ERROR_MESSAGE = ( @@ -132,7 +154,6 @@ class Field(object): # Some combinations of keyword arguments do not make sense. assert not (read_only and write_only), NOT_READ_ONLY_WRITE_ONLY assert not (read_only and required), NOT_READ_ONLY_REQUIRED - assert not (read_only and default is not empty), NOT_READ_ONLY_DEFAULT assert not (required and default is not empty), NOT_REQUIRED_DEFAULT assert not (read_only and self.__class__ == Field), USE_READONLYFIELD @@ -230,7 +251,9 @@ class Field(object): """ if self.default is empty: raise SkipField() - if is_simple_callable(self.default): + if callable(self.default): + if hasattr(self.default, 'set_context'): + self.default.set_context(self) return self.default() return self.default @@ -244,6 +267,9 @@ class Field(object): May raise `SkipField` if the field should not be included in the validated data. """ + if self.read_only: + return self.get_default() + if data is empty: if getattr(self.root, 'partial', False): raise SkipField() @@ -1033,6 +1059,28 @@ class ReadOnlyField(Field): return value +class HiddenField(Field): + """ + A hidden field does not take input from the user, or present any output, + but it does populate a field in `validated_data`, based on its default + value. This is particularly useful when we have a `unique_for_date` + constrain on a pair of fields, as we need some way to include the date in + the validated data. + """ + def __init__(self, **kwargs): + assert 'default' in kwargs, 'default is a required argument.' + kwargs['write_only'] = True + super(HiddenField, self).__init__(**kwargs) + + def get_value(self, dictionary): + # We always use the default value for `HiddenField`. + # User input is never provided or accepted. + return empty + + def to_internal_value(self, data): + return data + + class SerializerMethodField(Field): """ A read-only field that get its representation from calling a method on the diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b45f343a4..6aab020ef 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -12,6 +12,7 @@ response content is handled by parsers and renderers. """ from django.core.exceptions import ImproperlyConfigured from django.db import models +from django.db.models.fields import FieldDoesNotExist from django.utils import six from django.utils.datastructures import SortedDict from rest_framework.exceptions import ValidationError @@ -368,7 +369,10 @@ class Serializer(BaseSerializer): """ ret = {} errors = ReturnDict(serializer=self) - fields = [field for field in self.fields.values() if not field.read_only] + fields = [ + field for field in self.fields.values() + if (not field.read_only) or (field.default is not empty) + ] for field in fields: validate_method = getattr(self, 'validate_' + field.field_name, None) @@ -517,7 +521,7 @@ class ModelSerializer(Serializer): def __init__(self, *args, **kwargs): super(ModelSerializer, self).__init__(*args, **kwargs) if 'validators' not in kwargs: - validators = self.get_unique_together_validators() + validators = self.get_default_validators() if validators: self.validators.extend(validators) self._kwargs['validators'] = validators @@ -572,7 +576,7 @@ class ModelSerializer(Serializer): instance.save() return instance - def get_unique_together_validators(self): + def get_default_validators(self): field_names = set([ field.source for field in self.fields.values() if (field.source != '*') and ('.' not in field.source) @@ -592,6 +596,7 @@ class ModelSerializer(Serializer): ) validators.append(validator) + # Add any unique_for_date/unique_for_month/unique_for_year constraints. info = model_meta.get_field_info(model_class) for field_name, field in info.fields_and_pk.items(): if field.unique_for_date and field_name in field_names: @@ -637,7 +642,7 @@ class ModelSerializer(Serializer): # Retrieve metadata about fields & relationships on the model class. info = model_meta.get_field_info(model) - # Use the default set of fields if none is supplied explicitly. + # Use the default set of field names if none is supplied explicitly. if fields is None: fields = self._get_default_field_names(declared_fields, info) exclude = getattr(self.Meta, 'exclude', None) @@ -645,6 +650,72 @@ class ModelSerializer(Serializer): for field_name in exclude: fields.remove(field_name) + # Determine the set of model fields, and the fields that they map to. + # We actually only need this to deal with the slightly awkward case + # of supporting `unique_for_date`/`unique_for_month`/`unique_for_year`. + model_field_mapping = {} + for field_name in fields: + if field_name in declared_fields: + field = declared_fields[field_name] + source = field.source or field_name + else: + try: + source = extra_kwargs[field_name]['source'] + except KeyError: + source = field_name + # Model fields will always have a simple source mapping, + # they can't be nested attribute lookups. + if '.' not in source and source != '*': + model_field_mapping[source] = field_name + + # Determine if we need any additional `HiddenField` or extra keyword + # arguments to deal with `unique_for` dates that are required to + # be in the input data in order to validate it. + unique_fields = {} + for model_field_name, field_name in model_field_mapping.items(): + try: + model_field = model._meta.get_field(model_field_name) + except FieldDoesNotExist: + continue + + # Deal with each of the `unique_for_*` cases. + for date_field_name in ( + model_field.unique_for_date, + model_field.unique_for_month, + model_field.unique_for_year + ): + if date_field_name is None: + continue + + # Get the model field that is refered too. + date_field = model._meta.get_field(date_field_name) + + if date_field.auto_now_add: + default = CreateOnlyDefault(timezone.now) + elif date_field.auto_now: + default = timezone.now + elif date_field.has_default(): + default = model_field.default + else: + default = empty + + if date_field_name in model_field_mapping: + # The corresponding date field is present in the serializer + if date_field_name not in extra_kwargs: + extra_kwargs[date_field_name] = {} + if default is empty: + if 'required' not in extra_kwargs[date_field_name]: + extra_kwargs[date_field_name]['required'] = True + else: + if 'default' not in extra_kwargs[date_field_name]: + extra_kwargs[date_field_name]['default'] = default + else: + # The corresponding date field is not present in the, + # serializer. We have a default to use for the date, so + # add in a hidden field that populates it. + unique_fields[date_field_name] = HiddenField(default=default) + + # Now determine the fields that should be included on the serializer. for field_name in fields: if field_name in declared_fields: # Field is explicitly declared on the class, use that. @@ -723,6 +794,9 @@ class ModelSerializer(Serializer): # Create the serializer field. ret[field_name] = field_cls(**kwargs) + for field_name, field in unique_fields.items(): + ret[field_name] = field + return ret def _include_additional_options(self, extra_kwargs): diff --git a/tests/test_fields.py b/tests/test_fields.py index 6dc5f87d2..3e102ab5a 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -215,6 +215,33 @@ class TestBooleanHTMLInput: assert serializer.validated_data == {'archived': False} +class TestCreateOnlyDefault: + def setup(self): + default = serializers.CreateOnlyDefault('2001-01-01') + + class TestSerializer(serializers.Serializer): + published = serializers.HiddenField(default=default) + text = serializers.CharField() + self.Serializer = TestSerializer + + def test_create_only_default_is_provided(self): + serializer = self.Serializer(data={'text': 'example'}) + assert serializer.is_valid() + assert serializer.validated_data == { + 'text': 'example', 'published': '2001-01-01' + } + + def test_create_only_default_is_not_provided_on_update(self): + instance = { + 'text': 'example', 'published': '2001-01-01' + } + serializer = self.Serializer(instance, data={'text': 'example'}) + assert serializer.is_valid() + assert serializer.validated_data == { + 'text': 'example', + } + + # Tests for field input and output values. # ---------------------------------------- diff --git a/tests/test_validators.py b/tests/test_validators.py index 5adb76783..6cc52c837 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -176,7 +176,7 @@ class TestUniquenessForDateValidation(TestCase): UniqueForDateSerializer(validators=[<UniqueForDateValidator(queryset=UniqueForDateModel.objects.all(), field='slug', date_field='published')>]): id = IntegerField(label='ID', read_only=True) slug = CharField(max_length=100) - published = DateField() + published = DateField(required=True) """) assert repr(serializer) == expected @@ -215,3 +215,40 @@ class TestUniquenessForDateValidation(TestCase): 'slug': 'existing', 'published': datetime.date(2000, 1, 1) } + + +class HiddenFieldUniqueForDateModel(models.Model): + slug = models.CharField(max_length=100, unique_for_date='published') + published = models.DateTimeField(auto_now_add=True) + + +class TestHiddenFieldUniquenessForDateValidation(TestCase): + def test_repr_date_field_not_included(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = HiddenFieldUniqueForDateModel + fields = ('id', 'slug') + + serializer = TestSerializer() + expected = dedent(""" + TestSerializer(validators=[<UniqueForDateValidator(queryset=HiddenFieldUniqueForDateModel.objects.all(), field='slug', date_field='published')>]): + id = IntegerField(label='ID', read_only=True) + slug = CharField(max_length=100) + published = HiddenField(default=CreateOnlyDefault(<function now>)) + """) + assert repr(serializer) == expected + + def test_repr_date_field_included(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = HiddenFieldUniqueForDateModel + fields = ('id', 'slug', 'published') + + serializer = TestSerializer() + expected = dedent(""" + TestSerializer(validators=[<UniqueForDateValidator(queryset=HiddenFieldUniqueForDateModel.objects.all(), field='slug', date_field='published')>]): + id = IntegerField(label='ID', read_only=True) + slug = CharField(max_length=100) + published = DateTimeField(default=CreateOnlyDefault(<function now>), read_only=True) + """) + assert repr(serializer) == expected From 8af3d5db492c7468a1f2e4befdcd78b59216241d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Tue, 28 Oct 2014 16:58:25 -0400 Subject: [PATCH 0984/1652] Use PYTHONDONTWRITEBYTECODE=1 on tox environment This fixes bad marshal data errors after running tests with tox and later running tests manually via runtests.py. Fixes #1957 --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index d40a70799..b3f53cce2 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,8 @@ envlist = [testenv] commands = ./runtests.py --fast +setenv = + PYTHONDONTWRITEBYTECODE=1 [testenv:flake8] basepython = python2.7 From f25f05dde58908ca6885c88499e4d5984f0f3502 Mon Sep 17 00:00:00 2001 From: Andrew Conti <agc11d@gmail.com> Date: Wed, 29 Oct 2014 16:31:36 -0400 Subject: [PATCH 0985/1652] Update authentication.md Based on the [new documentation](https://docs.djangoproject.com/en/dev/topics/auth/customizing/#django.contrib.auth.get_user_model) for Django 1.7 we should now use: ```python @receiver(post_save, sender=settings.AUTH_USER_MODEL) ``` instead of: ```python @receiver(post_save, sender=get_user_model()) ``` because `get_user_model()` only works once Django has imported all models. Otherwise you'll get: ```python django.core.exceptions.AppRegistryNotReady: Models aren't loaded yet. ``` When trying to start your sever after adding token authentication. From the Docs, ( linked above as well ) : >New in Django 1.7: >When connecting to signals sent by the User model, you should specify the custom model using the AUTH_USER_MODEL setting. --- docs/api-guide/authentication.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index b355012e1..3a5156fd1 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -168,12 +168,13 @@ The `curl` command line tool may be useful for testing token authenticated APIs. If you want every user to have an automatically generated Token, you can simply catch the User's `post_save` signal. + from django.conf import settings from django.contrib.auth import get_user_model from django.db.models.signals import post_save from django.dispatch import receiver from rest_framework.authtoken.models import Token - @receiver(post_save, sender=get_user_model()) + @receiver(post_save, sender=settings.AUTH_USER_MODEL) def create_auth_token(sender, instance=None, created=False, **kwargs): if created: Token.objects.create(user=instance) From 0dea509dc9847206d830a0e48b91fa1c5b8ac52e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 30 Oct 2014 15:59:16 +0000 Subject: [PATCH 0986/1652] Nested serializer tests --- tests/test_serializer_nested.py | 41 +++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/tests/test_serializer_nested.py b/tests/test_serializer_nested.py index b0f64ca77..5e2074490 100644 --- a/tests/test_serializer_nested.py +++ b/tests/test_serializer_nested.py @@ -1,3 +1,44 @@ +from rest_framework import serializers + + +class TestNestedSerializer: + def setup(self): + class NestedSerializer(serializers.Serializer): + one = serializers.IntegerField(max_value=10) + two = serializers.IntegerField(max_value=10) + + class TestSerializer(serializers.Serializer): + nested = NestedSerializer() + + self.Serializer = TestSerializer + + def test_nested_validate(self): + input_data = { + 'nested': { + 'one': '1', + 'two': '2', + } + } + expected_data = { + 'nested': { + 'one': 1, + 'two': 2, + } + } + serializer = self.Serializer(data=input_data) + assert serializer.is_valid() + assert serializer.validated_data == expected_data + + def test_nested_serialize_empty(self): + expected_data = { + 'nested': { + 'one': None, + 'two': None + } + } + serializer = self.Serializer() + assert serializer.data == expected_data + # """ # Tests to cover nested serializers. From cd40dcb06500424ef9016913a1a89db0deed8a1f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 30 Oct 2014 16:53:12 +0000 Subject: [PATCH 0987/1652] Ensure json.dumps(separators=...) works on both 2.x and 3.x --- rest_framework/compat.py | 9 +++++++++ rest_framework/renderers.py | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 4ab23a4da..0201bd830 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -291,6 +291,15 @@ except ImportError: oauth2_constants = None provider_now = None +# `seperators` argument to `json.dumps()` differs between 2.x and 3.x +# See: http://bugs.python.org/issue22767 +if six.PY3: + SHORT_SEPARATORS = (',', ':') + LONG_SEPARATORS = (', ', ': ') +else: + SHORT_SEPARATORS = (b',', b':') + LONG_SEPARATORS = (b', ', b': ') + # Handle lazy strings across Py2/Py3 from django.utils.functional import Promise diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 4dfd0f498..c950b4981 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -18,7 +18,9 @@ from django.test.client import encode_multipart from django.utils import six from django.utils.xmlutils import SimplerXMLGenerator from rest_framework import exceptions, serializers, status, VERSION -from rest_framework.compat import StringIO, smart_text, yaml +from rest_framework.compat import ( + SHORT_SEPARATORS, LONG_SEPARATORS, StringIO, smart_text, yaml +) from rest_framework.exceptions import ParseError from rest_framework.settings import api_settings from rest_framework.request import is_form_media_type, override_method @@ -87,7 +89,7 @@ class JSONRenderer(BaseRenderer): renderer_context = renderer_context or {} indent = self.get_indent(accepted_media_type, renderer_context) - separators = (',', ':') if (indent is None and self.compact) else (', ', ': ') + separators = SHORT_SEPARATORS if (indent is None and self.compact) else LONG_SEPARATORS ret = json.dumps( data, cls=self.encoder_class, From 27622058872c00e357deb7d7e86619a793ef4b41 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 31 Oct 2014 13:47:36 +0000 Subject: [PATCH 0988/1652] Validator documentation and tweaks --- docs/api-guide/validators.md | 183 ++++++++++++++++++++++++++++++++++ docs/index.md | 2 + docs/template.html | 1 + mkdocs.py | 1 + rest_framework/serializers.py | 2 + rest_framework/validators.py | 9 +- 6 files changed, 195 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index e69de29bb..52c9e0822 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -0,0 +1,183 @@ +<a class="github" href="validators.py"></a> + +# Validators + +> Validators can be useful for re-using validation logic between different types of fields. +> +> — [Django documentation][cite] + +Most of the time you're dealing with validation in REST framework you'll simply be relying on the default field validation, or writing explicit validation methods on serializer or field classes. + +Sometimes you'll want to place your validation logic into reusable components, so that it can easily be reused throughout your codebase. This can be achieved by using validator functions and validator classes. + +## Validation in REST framework + +Validation in Django REST framework serializers is handled a little differently to how validation works in Django's `ModelForm` class. + +With `ModelForm` the validation is performed partially on the form, and partially on the model instance. With REST framework the validation is performed entirely on the serializer class. This is advantageous for the following reasons: + +* It introduces a proper separation of concerns, making your code behaviour more obvious. +* It is easy to switch between using shortcut `ModelSerializer` classes and using explicit `Serializer` classes. Any validation behaviour being used for `ModelSerializer` is simple to replicate. +* Printing the `repr` of a serializer instance will show you exactly what validation rules it applies. There's no extra hidden validation behaviour being called on the model instance. + +When you're using `ModelSerializer` all of this is handled automatically for you. If you want to drop down to using a `Serializer` classes instead, then you need to define the validation rules explicitly. + +#### Example + +As an example of how REST framework uses explicit validation, we'll take a simple model class that has a field with a uniqueness constraint. + + class CustomerReportRecord(models.Model): + time_raised = models.DateTimeField(default=timezone.now, editable=False) + reference = models.CharField(unique=True, max_length=20) + description = models.TextField() + +Here's a basic `ModelSerializer` that we can use for creating or updating instances of `CustomerReportRecord`: + + class CustomerReportSerializer(serializers.ModelSerializer): + class Meta: + model = CustomerReportRecord + +If we open up the Django shell using `manage.py shell` we can now + + >>> from project.example.serializers import CustomerReportSerializer + >>> serializer = CustomerReportSerializer() + >>> print(repr(serializer)) + CustomerReportSerializer(): + id = IntegerField(label='ID', read_only=True) + time_raised = DateTimeField(read_only=True) + reference = CharField(max_length=20, validators=[<UniqueValidator(queryset=CustomerReportRecord.objects.all())>]) + description = CharField(style={'type': 'textarea'}) + +The interesting bit here is the `reference` field. We can see that the uniqueness constraint is being explicitly enforced by a validator on the serializer field. + +Because of this more explicit style REST framework includes a few validator classes that are not available in core Django. These classes are detailed below. + +--- + +## UniqueValidator + +This validator can be used to enforce the `unique=True` constraint on model fields. +It takes a single required argument, and an optional `messages` argument: + +* `queryset` *required* - This is the queryset against which uniqueness should be enforced. +* `message` - The error message that should be used when validation fails. + +This validator should be applied to *serializer fields*, like so: + + slug = SlugField( + max_length=100, + validators=[UniqueValidator(queryset=BlogPost.objects.all())] + ) + +## UniqueTogetherValidator + +This validator can be used to enforce `unique_together` constraints on model instances. +It has two required arguments, and a single optional `messages` argument: + +* `queryset` *required* - This is the queryset against which uniqueness should be enforced. +* `fields` *required* - A list or tuple of field names which should make a unique set. These must exist as fields on the serializer class. +* `message` - The error message that should be used when validation fails. + +The validator should be applied to *serializer classes*, like so: + + class ExampleSerializer(serializers.Serializer): + # ... + class Meta: + # ToDo items belong to a parent list, and have an ordering defined + # by the 'position' field. No two items in a given list may share + # the same position. + validators = [ + UniqueTogetherValidator( + queryset=ToDoItem.objects.all(), + fields=('list', 'position') + ) + ] + +## UniqueForDateValidator + +## UniqueForMonthValidator + +## UniqueForYearValidator + +These validators can be used to enforce the `unique_for_date`, `unique_for_month` and `unique_for_year` constraints on model instances. They take the following arguments: + +* `queryset` *required* - This is the queryset against which uniqueness should be enforced. +* `field` *required* - A field name against which uniqueness in the given date range will be validated. This must exist as a field on the serializer class. +* `date_field` *required* - A field name which will be used to determine date range for the uniqueness constrain. This must exist as a field on the serializer class. +* `message` - The error message that should be used when validation fails. + +The validator should be applied to *serializer classes*, like so: + + class ExampleSerializer(serializers.Serializer): + # ... + class Meta: + # Blog posts should have a slug that is unique for the current year. + validators = [ + UniqueForYearValidator( + queryset=BlogPostItem.objects.all(), + field='slug', + date_field='published' + ) + ] + +The date field that is used for the validation is always required to be present on the serializer class. You can't simply rely on a model class `default=...`, because the value being used for the default wouldn't be generated until after the validation has run. + +There are a couple of styles you may want to use for this depending on how you want your API to behave. If you're using `ModelSerializer` you'll probably simply rely on the defaults that REST framework generates for you, but if you are using `Serializer` or simply want more explicit control, use on of the styles demonstrated below. + +#### Using with a writable date field. + +If you want the date field to be writable the only thing worth noting is that you should ensure that it is always available in the input data, either by setting a `default` argument, or by setting `required=True`. + + published = serializers.DateTimeField(required=True) + +#### Using with a read-only date field. + +If you want the date field to be visible, but not editable by the user, then set `read_only=True` and additionally set a `default=...` argument. + + published = serializers.DateTimeField(read_only=True, default=timezone.now) + +The field will not be writable to the user, but the default value will still be passed through to the `validated_data`. + +#### Using with a hidden date field. + +If you want the date field to be entirely hidden from the user, then use `HiddenField`. This field type does not accept user input, but instead always returns it's default value to the `validated_data` in the serializer. + + published = serializers.HiddenField(default=timezone.now) + +--- + +# Writing custom validators + +You can use any of Django's existing validators, or write your own custom validators. + +## Function based + +A validator may be any callable that raises a `serializers.ValidationError` on failure. + + def even_number(value): + if value % 2 != 0: + raise serializers.ValidationError('This field must be an even number.') + +## Class based + +To write a class based validator, use the `__call__` method. Class based validators are useful as they allow you to parameterize and reuse behavior. + + class MultipleOf: + def __init__(self, base): + self.base = base + + def __call__(self, value): + if value % self.base != 0 + message = 'This field must be a multiple of %d.' % self.base + raise serializers.ValidationError(message) + +#### Using `set_context()` + +In some advanced cases you might want a validator to be passed the serializer field it is being used with as additional context. You can do so by declaring a `set_context` method on a class based validator. + + def set_context(self, serializer_field): + # Determine if this is an update or a create operation. + # In `__call__` we can then use that information to modify the validation behavior. + self.is_update = serializer_field.parent.instance is not None + +[cite]: https://docs.djangoproject.com/en/dev/ref/validators/ diff --git a/docs/index.md b/docs/index.md index 9d436ad5a..cff7b8351 100644 --- a/docs/index.md +++ b/docs/index.md @@ -173,6 +173,7 @@ The API guide is your complete reference manual to all the functionality provide * [Serializers][serializers] * [Serializer fields][fields] * [Serializer relations][relations] +* [Validation][validation] * [Authentication][authentication] * [Permissions][permissions] * [Throttling][throttling] @@ -294,6 +295,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [serializers]: api-guide/serializers.md [fields]: api-guide/fields.md [relations]: api-guide/relations.md +[validation]: api-guide/validation.md [authentication]: api-guide/authentication.md [permissions]: api-guide/permissions.md [throttling]: api-guide/throttling.md diff --git a/docs/template.html b/docs/template.html index bb3ae221a..0d2fb16eb 100644 --- a/docs/template.html +++ b/docs/template.html @@ -95,6 +95,7 @@ a.fusion-poweredby { <li><a href="{{ base_url }}/api-guide/serializers{{ suffix }}">Serializers</a></li> <li><a href="{{ base_url }}/api-guide/fields{{ suffix }}">Serializer fields</a></li> <li><a href="{{ base_url }}/api-guide/relations{{ suffix }}">Serializer relations</a></li> + <li><a href="{{ base_url }}/api-guide/validation{{ suffix }}">Validation</a></li> <li><a href="{{ base_url }}/api-guide/authentication{{ suffix }}">Authentication</a></li> <li><a href="{{ base_url }}/api-guide/permissions{{ suffix }}">Permissions</a></li> <li><a href="{{ base_url }}/api-guide/throttling{{ suffix }}">Throttling</a></li> diff --git a/mkdocs.py b/mkdocs.py index 25cb55e21..acd11b633 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -59,6 +59,7 @@ path_list = [ 'api-guide/serializers.md', 'api-guide/fields.md', 'api-guide/relations.md', + 'api-guide/validation.md', 'api-guide/authentication.md', 'api-guide/permissions.md', 'api-guide/throttling.md', diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 6aab020ef..c9f70f2da 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -292,6 +292,8 @@ class Serializer(BaseSerializer): for key, value in self._get_base_fields().items(): self.fields[key] = value + self.validators = getattr(getattr(self, 'Meta', None), 'validators', []) + def _get_base_fields(self): return copy.deepcopy(self._declared_fields) diff --git a/rest_framework/validators.py b/rest_framework/validators.py index e302a0e41..f3773f176 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -19,9 +19,10 @@ class UniqueValidator: """ message = _('This field must be unique.') - def __init__(self, queryset): + def __init__(self, queryset, message=None): self.queryset = queryset self.serializer_field = None + self.message = message or self.message def set_context(self, serializer_field): # Determine the underlying model field name. This may not be the @@ -54,10 +55,11 @@ class UniqueTogetherValidator: """ message = _('The fields {field_names} must make a unique set.') - def __init__(self, queryset, fields): + def __init__(self, queryset, fields, message=None): self.queryset = queryset self.fields = fields self.serializer_field = None + self.message = message or self.message def set_context(self, serializer): # Determine the existing instance, if this is an update operation. @@ -86,10 +88,11 @@ class UniqueTogetherValidator: class BaseUniqueForValidator: message = None - def __init__(self, queryset, field, date_field): + def __init__(self, queryset, field, date_field, message=None): self.queryset = queryset self.field = field self.date_field = date_field + self.message = message or self.message def set_context(self, serializer): # Determine the underlying model field names. These may not be the From 254701230d85612cf0210d4549c2d74f410a181d Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 31 Oct 2014 13:58:40 +0000 Subject: [PATCH 0989/1652] Fix up validators docs --- docs/api-guide/validators.md | 2 +- docs/index.md | 2 +- docs/template.html | 2 +- mkdocs.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index 52c9e0822..6a0ef4ff4 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -8,7 +8,7 @@ Most of the time you're dealing with validation in REST framework you'll simply be relying on the default field validation, or writing explicit validation methods on serializer or field classes. -Sometimes you'll want to place your validation logic into reusable components, so that it can easily be reused throughout your codebase. This can be achieved by using validator functions and validator classes. +However, sometimes you'll want to place your validation logic into reusable components, so that it can easily be reused throughout your codebase. This can be achieved by using validator functions and validator classes. ## Validation in REST framework diff --git a/docs/index.md b/docs/index.md index cff7b8351..161886a4e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -173,7 +173,7 @@ The API guide is your complete reference manual to all the functionality provide * [Serializers][serializers] * [Serializer fields][fields] * [Serializer relations][relations] -* [Validation][validation] +* [Validators][validators] * [Authentication][authentication] * [Permissions][permissions] * [Throttling][throttling] diff --git a/docs/template.html b/docs/template.html index 0d2fb16eb..f36cffc6d 100644 --- a/docs/template.html +++ b/docs/template.html @@ -95,7 +95,7 @@ a.fusion-poweredby { <li><a href="{{ base_url }}/api-guide/serializers{{ suffix }}">Serializers</a></li> <li><a href="{{ base_url }}/api-guide/fields{{ suffix }}">Serializer fields</a></li> <li><a href="{{ base_url }}/api-guide/relations{{ suffix }}">Serializer relations</a></li> - <li><a href="{{ base_url }}/api-guide/validation{{ suffix }}">Validation</a></li> + <li><a href="{{ base_url }}/api-guide/validators{{ suffix }}">Validators</a></li> <li><a href="{{ base_url }}/api-guide/authentication{{ suffix }}">Authentication</a></li> <li><a href="{{ base_url }}/api-guide/permissions{{ suffix }}">Permissions</a></li> <li><a href="{{ base_url }}/api-guide/throttling{{ suffix }}">Throttling</a></li> diff --git a/mkdocs.py b/mkdocs.py index acd11b633..3787d7920 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -59,7 +59,7 @@ path_list = [ 'api-guide/serializers.md', 'api-guide/fields.md', 'api-guide/relations.md', - 'api-guide/validation.md', + 'api-guide/validators.md', 'api-guide/authentication.md', 'api-guide/permissions.md', 'api-guide/throttling.md', From 45b5f23f3142c1b63258c8ad092887538eee5517 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 31 Oct 2014 14:56:41 +0000 Subject: [PATCH 0990/1652] Update to bootstrap 3. Closes #1085 --- .../rest_framework/css/bootstrap.min.css | 844 +----------------- .../static/rest_framework/js/bootstrap.min.js | 13 +- .../templates/rest_framework/base.html | 3 +- 3 files changed, 11 insertions(+), 849 deletions(-) diff --git a/rest_framework/static/rest_framework/css/bootstrap.min.css b/rest_framework/static/rest_framework/css/bootstrap.min.css index 373f4b430..a9f35ceed 100644 --- a/rest_framework/static/rest_framework/css/bootstrap.min.css +++ b/rest_framework/static/rest_framework/css/bootstrap.min.css @@ -1,841 +1,5 @@ /*! - * Bootstrap v2.1.1 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ -.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0;} -.clearfix:after{clear:both;} -.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;} -.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} -article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} -audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} -audio:not([controls]){display:none;} -html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} -a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -a:hover,a:active{outline:0;} -sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} -sup{top:-0.5em;} -sub{bottom:-0.25em;} -img{max-width:100%;width:auto\9;height:auto;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic;} -#map_canvas img{max-width:none;} -button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;} -button,input{*overflow:visible;line-height:normal;} -button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} -button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;} -input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield;} -input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;} -textarea{overflow:auto;vertical-align:top;} -body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333333;background-color:#ffffff;} -a{color:#0088cc;text-decoration:none;} -a:hover{color:#005580;text-decoration:underline;} -.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);} -.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px;} -.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";line-height:0;} -.row:after{clear:both;} -[class*="span"]{float:left;min-height:1px;margin-left:20px;} -.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} -.span12{width:940px;} -.span11{width:860px;} -.span10{width:780px;} -.span9{width:700px;} -.span8{width:620px;} -.span7{width:540px;} -.span6{width:460px;} -.span5{width:380px;} -.span4{width:300px;} -.span3{width:220px;} -.span2{width:140px;} -.span1{width:60px;} -.offset12{margin-left:980px;} -.offset11{margin-left:900px;} -.offset10{margin-left:820px;} -.offset9{margin-left:740px;} -.offset8{margin-left:660px;} -.offset7{margin-left:580px;} -.offset6{margin-left:500px;} -.offset5{margin-left:420px;} -.offset4{margin-left:340px;} -.offset3{margin-left:260px;} -.offset2{margin-left:180px;} -.offset1{margin-left:100px;} -.row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0;} -.row-fluid:after{clear:both;} -.row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;} -.row-fluid [class*="span"]:first-child{margin-left:0;} -.row-fluid .span12{width:100%;*width:99.94680851063829%;} -.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%;} -.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%;} -.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%;} -.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%;} -.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%;} -.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%;} -.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%;} -.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%;} -.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%;} -.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%;} -.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%;} -.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%;} -.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%;} -.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%;} -.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%;} -.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%;} -.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%;} -.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%;} -.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%;} -.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%;} -.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%;} -.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%;} -.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%;} -.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%;} -.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%;} -.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%;} -.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%;} -.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%;} -.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%;} -.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%;} -.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%;} -.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%;} -.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%;} -.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%;} -.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%;} -[class*="span"].hide,.row-fluid [class*="span"].hide{display:none;} -[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right;} -.container{margin-right:auto;margin-left:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";line-height:0;} -.container:after{clear:both;} -.container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";line-height:0;} -.container-fluid:after{clear:both;} -p{margin:0 0 10px;} -.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px;} -small{font-size:85%;} -strong{font-weight:bold;} -em{font-style:italic;} -cite{font-style:normal;} -.muted{color:#999999;} -.text-warning{color:#c09853;} -.text-error{color:#b94a48;} -.text-info{color:#3a87ad;} -.text-success{color:#468847;} -h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:1;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999999;} -h1{font-size:36px;line-height:40px;} -h2{font-size:30px;line-height:40px;} -h3{font-size:24px;line-height:40px;} -h4{font-size:18px;line-height:20px;} -h5{font-size:14px;line-height:20px;} -h6{font-size:12px;line-height:20px;} -h1 small{font-size:24px;} -h2 small{font-size:18px;} -h3 small{font-size:14px;} -h4 small{font-size:14px;} -.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eeeeee;} -ul,ol{padding:0;margin:0 0 10px 25px;} -ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} -li{line-height:20px;} -ul.unstyled,ol.unstyled{margin-left:0;list-style:none;} -dl{margin-bottom:20px;} -dt,dd{line-height:20px;} -dt{font-weight:bold;} -dd{margin-left:10px;} -.dl-horizontal{*zoom:1;}.dl-horizontal:before,.dl-horizontal:after{display:table;content:"";line-height:0;} -.dl-horizontal:after{clear:both;} -.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} -.dl-horizontal dd{margin-left:180px;} -hr{margin:20px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} -abbr[title]{cursor:help;border-bottom:1px dotted #999999;} -abbr.initialism{font-size:90%;text-transform:uppercase;} -blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:25px;} -blockquote small{display:block;line-height:20px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} -blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eeeeee;border-left:0;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} -blockquote.pull-right small:before{content:'';} -blockquote.pull-right small:after{content:'\00A0 \2014';} -q:before,q:after,blockquote:before,blockquote:after{content:"";} -address{display:block;margin-bottom:20px;font-style:normal;line-height:20px;} -code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} -pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}pre.prettyprint{margin-bottom:20px;} -pre code{padding:0;color:inherit;background-color:transparent;border:0;} -.pre-scrollable{max-height:340px;overflow-y:scroll;} -.label,.badge{font-size:11.844px;font-weight:bold;line-height:14px;color:#ffffff;vertical-align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;} -.label{padding:1px 4px 2px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.badge{padding:1px 9px 2px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;} -a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} -.label-important,.badge-important{background-color:#b94a48;} -.label-important[href],.badge-important[href]{background-color:#953b39;} -.label-warning,.badge-warning{background-color:#f89406;} -.label-warning[href],.badge-warning[href]{background-color:#c67605;} -.label-success,.badge-success{background-color:#468847;} -.label-success[href],.badge-success[href]{background-color:#356635;} -.label-info,.badge-info{background-color:#3a87ad;} -.label-info[href],.badge-info[href]{background-color:#2d6987;} -.label-inverse,.badge-inverse{background-color:#333333;} -.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a;} -.btn .label,.btn .badge{position:relative;top:-1px;} -.btn-mini .label,.btn-mini .badge{top:0;} -table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0;} -.table{width:100%;margin-bottom:20px;}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;} -.table th{font-weight:bold;} -.table thead th{vertical-align:bottom;} -.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;} -.table tbody+tbody{border-top:2px solid #dddddd;} -.table-condensed th,.table-condensed td{padding:4px 5px;} -.table-bordered{border:1px solid #dddddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;} -.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;} -.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px;} -.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px;} -.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child,.table-bordered tfoot:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;} -.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child,.table-bordered tfoot:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;} -.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px;} -.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topleft:4px;} -.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;} -.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#f5f5f5;} -table [class*=span],.row-fluid table [class*=span]{display:table-cell;float:none;margin-left:0;} -.table .span1{float:none;width:44px;margin-left:0;} -.table .span2{float:none;width:124px;margin-left:0;} -.table .span3{float:none;width:204px;margin-left:0;} -.table .span4{float:none;width:284px;margin-left:0;} -.table .span5{float:none;width:364px;margin-left:0;} -.table .span6{float:none;width:444px;margin-left:0;} -.table .span7{float:none;width:524px;margin-left:0;} -.table .span8{float:none;width:604px;margin-left:0;} -.table .span9{float:none;width:684px;margin-left:0;} -.table .span10{float:none;width:764px;margin-left:0;} -.table .span11{float:none;width:844px;margin-left:0;} -.table .span12{float:none;width:924px;margin-left:0;} -.table .span13{float:none;width:1004px;margin-left:0;} -.table .span14{float:none;width:1084px;margin-left:0;} -.table .span15{float:none;width:1164px;margin-left:0;} -.table .span16{float:none;width:1244px;margin-left:0;} -.table .span17{float:none;width:1324px;margin-left:0;} -.table .span18{float:none;width:1404px;margin-left:0;} -.table .span19{float:none;width:1484px;margin-left:0;} -.table .span20{float:none;width:1564px;margin-left:0;} -.table .span21{float:none;width:1644px;margin-left:0;} -.table .span22{float:none;width:1724px;margin-left:0;} -.table .span23{float:none;width:1804px;margin-left:0;} -.table .span24{float:none;width:1884px;margin-left:0;} -.table tbody tr.success td{background-color:#dff0d8;} -.table tbody tr.error td{background-color:#f2dede;} -.table tbody tr.warning td{background-color:#fcf8e3;} -.table tbody tr.info td{background-color:#d9edf7;} -.table-hover tbody tr.success:hover td{background-color:#d0e9c6;} -.table-hover tbody tr.error:hover td{background-color:#ebcccc;} -.table-hover tbody tr.warning:hover td{background-color:#faf2cc;} -.table-hover tbody tr.info:hover td{background-color:#c4e3f3;} -form{margin:0 0 20px;} -fieldset{padding:0;margin:0;border:0;} -legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:15px;color:#999999;} -label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px;} -input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;} -label{display:block;margin-bottom:5px;} -select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:9px;font-size:14px;line-height:20px;color:#555555;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -input,textarea,.uneditable-input{width:206px;} -textarea{height:auto;} -textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#ffffff;border:1px solid #cccccc;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear .2s, box-shadow linear .2s;-moz-transition:border linear .2s, box-shadow linear .2s;-o-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);} -input[type="radio"],input[type="checkbox"]{margin:4px 0 0;*margin-top:0;margin-top:1px \9;line-height:normal;cursor:pointer;} -input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto;} -select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px;} -select{width:220px;border:1px solid #cccccc;background-color:#ffffff;} -select[multiple],select[size]{height:auto;} -select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -.uneditable-input,.uneditable-textarea{color:#999999;background-color:#fcfcfc;border-color:#cccccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} -.uneditable-input{overflow:hidden;white-space:nowrap;} -.uneditable-textarea{width:auto;height:auto;} -input:-moz-placeholder,textarea:-moz-placeholder{color:#999999;} -input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999999;} -input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999999;} -.radio,.checkbox{min-height:18px;padding-left:18px;} -.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;} -.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} -.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;} -.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} -.input-mini{width:60px;} -.input-small{width:90px;} -.input-medium{width:150px;} -.input-large{width:210px;} -.input-xlarge{width:270px;} -.input-xxlarge{width:530px;} -input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0;} -.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block;} -input,textarea,.uneditable-input{margin-left:0;} -.controls-row [class*="span"]+[class*="span"]{margin-left:20px;} -input.span12, textarea.span12, .uneditable-input.span12{width:926px;} -input.span11, textarea.span11, .uneditable-input.span11{width:846px;} -input.span10, textarea.span10, .uneditable-input.span10{width:766px;} -input.span9, textarea.span9, .uneditable-input.span9{width:686px;} -input.span8, textarea.span8, .uneditable-input.span8{width:606px;} -input.span7, textarea.span7, .uneditable-input.span7{width:526px;} -input.span6, textarea.span6, .uneditable-input.span6{width:446px;} -input.span5, textarea.span5, .uneditable-input.span5{width:366px;} -input.span4, textarea.span4, .uneditable-input.span4{width:286px;} -input.span3, textarea.span3, .uneditable-input.span3{width:206px;} -input.span2, textarea.span2, .uneditable-input.span2{width:126px;} -input.span1, textarea.span1, .uneditable-input.span1{width:46px;} -.controls-row{*zoom:1;}.controls-row:before,.controls-row:after{display:table;content:"";line-height:0;} -.controls-row:after{clear:both;} -.controls-row [class*="span"]{float:left;} -input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eeeeee;} -input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent;} -.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;} -.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;} -.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;} -.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;} -.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} -.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;} -.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;} -.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;} -.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;} -.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;} -.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;} -.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;} -.control-group.info>label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad;} -.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad;} -.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;} -.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad;} -input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} -.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";line-height:0;} -.form-actions:after{clear:both;} -.help-block,.help-inline{color:#595959;} -.help-block{display:block;margin-bottom:10px;} -.help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} -.input-append,.input-prepend{margin-bottom:5px;font-size:0;white-space:nowrap;}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;font-size:14px;vertical-align:top;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2;} -.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#eeeeee;border:1px solid #ccc;} -.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546;} -.input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} -.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-append .add-on,.input-append .btn{margin-left:-1px;} -.input-append .add-on:last-child,.input-append .btn:last-child{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} -.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px;} -.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0;} -.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0;} -.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px;} -.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;*zoom:1;margin-bottom:0;vertical-align:middle;} -.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none;} -.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block;} -.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;} -.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;} -.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0;} -.control-group{margin-bottom:10px;} -legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate;} -.form-horizontal .control-group{margin-bottom:20px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";line-height:0;} -.form-horizontal .control-group:after{clear:both;} -.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right;} -.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0;}.form-horizontal .controls:first-child{*padding-left:180px;} -.form-horizontal .help-block{margin-bottom:0;} -.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block{margin-top:10px;} -.form-horizontal .form-actions{padding-left:180px;} -.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 14px;margin-bottom:0;font-size:14px;line-height:20px;*line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #bbbbbb;*border:0;border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;} -.btn:active,.btn.active{background-color:#cccccc \9;} -.btn:first-child{*margin-left:0;} -.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;*background-color:#d9d9d9;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} -.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -.btn.active,.btn:active{background-color:#e6e6e6;background-color:#d9d9d9 \9;background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);} -.btn.disabled,.btn[disabled]{cursor:default;background-color:#e6e6e6;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn-large{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.btn-large [class^="icon-"]{margin-top:2px;} -.btn-small{padding:3px 9px;font-size:12px;line-height:18px;} -.btn-small [class^="icon-"]{margin-top:0;} -.btn-mini{padding:2px 6px;font-size:11px;line-height:17px;} -.btn-block{display:block;width:100%;padding-left:0;padding-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} -.btn-block+.btn-block{margin-top:5px;} -input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%;} -.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);} -.btn{border-color:#c5c5c5;border-color:rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);} -.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top, #0088cc, #0044cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));background-image:-webkit-linear-gradient(top, #0088cc, #0044cc);background-image:-o-linear-gradient(top, #0088cc, #0044cc);background-image:linear-gradient(to bottom, #0088cc, #0044cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);border-color:#0044cc #0044cc #002a80;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#0044cc;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#0044cc;*background-color:#003bb3;} -.btn-primary:active,.btn-primary.active{background-color:#003399 \9;} -.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(to bottom, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#f89406;*background-color:#df8505;} -.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;} -.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(to bottom, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#bd362f;*background-color:#a9302a;} -.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} -.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(to bottom, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#51a351;*background-color:#499249;} -.btn-success:active,.btn-success.active{background-color:#408140 \9;} -.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(to bottom, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#ffffff;background-color:#2f96b4;*background-color:#2a85a0;} -.btn-info:active,.btn-info.active{background-color:#24748c \9;} -.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#363636;background-image:-moz-linear-gradient(top, #444444, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));background-image:-webkit-linear-gradient(top, #444444, #222222);background-image:-o-linear-gradient(top, #444444, #222222);background-image:linear-gradient(to bottom, #444444, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#222222;*background-color:#151515;} -.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;} -button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;} -button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;} -button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;} -button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;} -.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn-link{border-color:transparent;cursor:pointer;color:#0088cc;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.btn-link:hover{color:#005580;text-decoration:underline;background-color:transparent;} -.btn-link[disabled]:hover{color:#333333;text-decoration:none;} -[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;} -.icon-white,.nav-tabs>.active>a>[class^="icon-"],.nav-tabs>.active>a>[class*=" icon-"],.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png");} -.icon-glass{background-position:0 0;} -.icon-music{background-position:-24px 0;} -.icon-search{background-position:-48px 0;} -.icon-envelope{background-position:-72px 0;} -.icon-heart{background-position:-96px 0;} -.icon-star{background-position:-120px 0;} -.icon-star-empty{background-position:-144px 0;} -.icon-user{background-position:-168px 0;} -.icon-film{background-position:-192px 0;} -.icon-th-large{background-position:-216px 0;} -.icon-th{background-position:-240px 0;} -.icon-th-list{background-position:-264px 0;} -.icon-ok{background-position:-288px 0;} -.icon-remove{background-position:-312px 0;} -.icon-zoom-in{background-position:-336px 0;} -.icon-zoom-out{background-position:-360px 0;} -.icon-off{background-position:-384px 0;} -.icon-signal{background-position:-408px 0;} -.icon-cog{background-position:-432px 0;} -.icon-trash{background-position:-456px 0;} -.icon-home{background-position:0 -24px;} -.icon-file{background-position:-24px -24px;} -.icon-time{background-position:-48px -24px;} -.icon-road{background-position:-72px -24px;} -.icon-download-alt{background-position:-96px -24px;} -.icon-download{background-position:-120px -24px;} -.icon-upload{background-position:-144px -24px;} -.icon-inbox{background-position:-168px -24px;} -.icon-play-circle{background-position:-192px -24px;} -.icon-repeat{background-position:-216px -24px;} -.icon-refresh{background-position:-240px -24px;} -.icon-list-alt{background-position:-264px -24px;} -.icon-lock{background-position:-287px -24px;} -.icon-flag{background-position:-312px -24px;} -.icon-headphones{background-position:-336px -24px;} -.icon-volume-off{background-position:-360px -24px;} -.icon-volume-down{background-position:-384px -24px;} -.icon-volume-up{background-position:-408px -24px;} -.icon-qrcode{background-position:-432px -24px;} -.icon-barcode{background-position:-456px -24px;} -.icon-tag{background-position:0 -48px;} -.icon-tags{background-position:-25px -48px;} -.icon-book{background-position:-48px -48px;} -.icon-bookmark{background-position:-72px -48px;} -.icon-print{background-position:-96px -48px;} -.icon-camera{background-position:-120px -48px;} -.icon-font{background-position:-144px -48px;} -.icon-bold{background-position:-167px -48px;} -.icon-italic{background-position:-192px -48px;} -.icon-text-height{background-position:-216px -48px;} -.icon-text-width{background-position:-240px -48px;} -.icon-align-left{background-position:-264px -48px;} -.icon-align-center{background-position:-288px -48px;} -.icon-align-right{background-position:-312px -48px;} -.icon-align-justify{background-position:-336px -48px;} -.icon-list{background-position:-360px -48px;} -.icon-indent-left{background-position:-384px -48px;} -.icon-indent-right{background-position:-408px -48px;} -.icon-facetime-video{background-position:-432px -48px;} -.icon-picture{background-position:-456px -48px;} -.icon-pencil{background-position:0 -72px;} -.icon-map-marker{background-position:-24px -72px;} -.icon-adjust{background-position:-48px -72px;} -.icon-tint{background-position:-72px -72px;} -.icon-edit{background-position:-96px -72px;} -.icon-share{background-position:-120px -72px;} -.icon-check{background-position:-144px -72px;} -.icon-move{background-position:-168px -72px;} -.icon-step-backward{background-position:-192px -72px;} -.icon-fast-backward{background-position:-216px -72px;} -.icon-backward{background-position:-240px -72px;} -.icon-play{background-position:-264px -72px;} -.icon-pause{background-position:-288px -72px;} -.icon-stop{background-position:-312px -72px;} -.icon-forward{background-position:-336px -72px;} -.icon-fast-forward{background-position:-360px -72px;} -.icon-step-forward{background-position:-384px -72px;} -.icon-eject{background-position:-408px -72px;} -.icon-chevron-left{background-position:-432px -72px;} -.icon-chevron-right{background-position:-456px -72px;} -.icon-plus-sign{background-position:0 -96px;} -.icon-minus-sign{background-position:-24px -96px;} -.icon-remove-sign{background-position:-48px -96px;} -.icon-ok-sign{background-position:-72px -96px;} -.icon-question-sign{background-position:-96px -96px;} -.icon-info-sign{background-position:-120px -96px;} -.icon-screenshot{background-position:-144px -96px;} -.icon-remove-circle{background-position:-168px -96px;} -.icon-ok-circle{background-position:-192px -96px;} -.icon-ban-circle{background-position:-216px -96px;} -.icon-arrow-left{background-position:-240px -96px;} -.icon-arrow-right{background-position:-264px -96px;} -.icon-arrow-up{background-position:-289px -96px;} -.icon-arrow-down{background-position:-312px -96px;} -.icon-share-alt{background-position:-336px -96px;} -.icon-resize-full{background-position:-360px -96px;} -.icon-resize-small{background-position:-384px -96px;} -.icon-plus{background-position:-408px -96px;} -.icon-minus{background-position:-433px -96px;} -.icon-asterisk{background-position:-456px -96px;} -.icon-exclamation-sign{background-position:0 -120px;} -.icon-gift{background-position:-24px -120px;} -.icon-leaf{background-position:-48px -120px;} -.icon-fire{background-position:-72px -120px;} -.icon-eye-open{background-position:-96px -120px;} -.icon-eye-close{background-position:-120px -120px;} -.icon-warning-sign{background-position:-144px -120px;} -.icon-plane{background-position:-168px -120px;} -.icon-calendar{background-position:-192px -120px;} -.icon-random{background-position:-216px -120px;width:16px;} -.icon-comment{background-position:-240px -120px;} -.icon-magnet{background-position:-264px -120px;} -.icon-chevron-up{background-position:-288px -120px;} -.icon-chevron-down{background-position:-313px -119px;} -.icon-retweet{background-position:-336px -120px;} -.icon-shopping-cart{background-position:-360px -120px;} -.icon-folder-close{background-position:-384px -120px;} -.icon-folder-open{background-position:-408px -120px;width:16px;} -.icon-resize-vertical{background-position:-432px -119px;} -.icon-resize-horizontal{background-position:-456px -118px;} -.icon-hdd{background-position:0 -144px;} -.icon-bullhorn{background-position:-24px -144px;} -.icon-bell{background-position:-48px -144px;} -.icon-certificate{background-position:-72px -144px;} -.icon-thumbs-up{background-position:-96px -144px;} -.icon-thumbs-down{background-position:-120px -144px;} -.icon-hand-right{background-position:-144px -144px;} -.icon-hand-left{background-position:-168px -144px;} -.icon-hand-up{background-position:-192px -144px;} -.icon-hand-down{background-position:-216px -144px;} -.icon-circle-arrow-right{background-position:-240px -144px;} -.icon-circle-arrow-left{background-position:-264px -144px;} -.icon-circle-arrow-up{background-position:-288px -144px;} -.icon-circle-arrow-down{background-position:-312px -144px;} -.icon-globe{background-position:-336px -144px;} -.icon-wrench{background-position:-360px -144px;} -.icon-tasks{background-position:-384px -144px;} -.icon-filter{background-position:-408px -144px;} -.icon-briefcase{background-position:-432px -144px;} -.icon-fullscreen{background-position:-456px -144px;} -.btn-group{position:relative;font-size:0;vertical-align:middle;white-space:nowrap;*margin-left:.3em;}.btn-group:first-child{*margin-left:0;} -.btn-group+.btn-group{margin-left:5px;} -.btn-toolbar{font-size:0;margin-top:10px;margin-bottom:10px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;} -.btn-toolbar .btn+.btn,.btn-toolbar .btn-group+.btn,.btn-toolbar .btn+.btn-group{margin-left:5px;} -.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.btn-group>.btn+.btn{margin-left:-1px;} -.btn-group>.btn,.btn-group>.dropdown-menu{font-size:14px;} -.btn-group>.btn-mini{font-size:11px;} -.btn-group>.btn-small{font-size:12px;} -.btn-group>.btn-large{font-size:16px;} -.btn-group>.btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} -.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} -.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;} -.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;} -.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2;} -.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;} -.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:5px;*padding-bottom:5px;} -.btn-group>.btn-mini+.dropdown-toggle{padding-left:5px;padding-right:5px;*padding-top:2px;*padding-bottom:2px;} -.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px;} -.btn-group>.btn-large+.dropdown-toggle{padding-left:12px;padding-right:12px;*padding-top:7px;*padding-bottom:7px;} -.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);} -.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6;} -.btn-group.open .btn-primary.dropdown-toggle{background-color:#0044cc;} -.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406;} -.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f;} -.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351;} -.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4;} -.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222222;} -.btn .caret{margin-top:8px;margin-left:0;} -.btn-mini .caret,.btn-small .caret,.btn-large .caret{margin-top:6px;} -.btn-large .caret{border-left-width:5px;border-right-width:5px;border-top-width:5px;} -.dropup .btn-large .caret{border-bottom:5px solid #000000;border-top:0;} -.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} -.btn-group-vertical{display:inline-block;*display:inline;*zoom:1;} -.btn-group-vertical .btn{display:block;float:none;width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.btn-group-vertical .btn+.btn{margin-left:0;margin-top:-1px;} -.btn-group-vertical .btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} -.btn-group-vertical .btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} -.btn-group-vertical .btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0;} -.btn-group-vertical .btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;} -.nav{margin-left:0;margin-bottom:20px;list-style:none;} -.nav>li>a{display:block;} -.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} -.nav>.pull-right{float:right;} -.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} -.nav li+.nav-header{margin-top:9px;} -.nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} -.nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} -.nav-list>li>a{padding:3px 15px;} -.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;} -.nav-list [class^="icon-"]{margin-right:2px;} -.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} -.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";line-height:0;} -.nav-tabs:after,.nav-pills:after{clear:both;} -.nav-tabs>li,.nav-pills>li{float:left;} -.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} -.nav-tabs{border-bottom:1px solid #ddd;} -.nav-tabs>li{margin-bottom:-1px;} -.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;} -.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} -.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#0088cc;} -.nav-stacked>li{float:none;} -.nav-stacked>li>a{margin-right:0;} -.nav-tabs.nav-stacked{border-bottom:0;} -.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;} -.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} -.nav-tabs.nav-stacked>li>a:hover{border-color:#ddd;z-index:2;} -.nav-pills.nav-stacked>li>a{margin-bottom:3px;} -.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;} -.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;} -.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.nav .dropdown-toggle .caret{border-top-color:#0088cc;border-bottom-color:#0088cc;margin-top:6px;} -.nav .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580;} -.nav-tabs .dropdown-toggle .caret{margin-top:8px;} -.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff;} -.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;} -.nav>.dropdown.active>a:hover{cursor:pointer;} -.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;} -.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100);} -.tabs-stacked .open>a:hover{border-color:#999999;} -.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";line-height:0;} -.tabbable:after{clear:both;} -.tab-content{overflow:auto;} -.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0;} -.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} -.tab-content>.active,.pill-content>.active{display:block;} -.tabs-below>.nav-tabs{border-top:1px solid #ddd;} -.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0;} -.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below>.nav-tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;} -.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd;} -.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none;} -.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;} -.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;} -.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} -.tabs-left>.nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;} -.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;} -.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;} -.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} -.tabs-right>.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} -.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} -.nav>.disabled>a{color:#999999;} -.nav>.disabled>a:hover{text-decoration:none;background-color:transparent;cursor:default;} -.navbar{overflow:visible;margin-bottom:20px;color:#777777;*position:relative;*z-index:2;} -.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top, #ffffff, #f2f2f2);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));background-image:-webkit-linear-gradient(top, #ffffff, #f2f2f2);background-image:-o-linear-gradient(top, #ffffff, #f2f2f2);background-image:linear-gradient(to bottom, #ffffff, #f2f2f2);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);-moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);*zoom:1;}.navbar-inner:before,.navbar-inner:after{display:table;content:"";line-height:0;} -.navbar-inner:after{clear:both;} -.navbar .container{width:auto;} -.nav-collapse.collapse{height:auto;} -.navbar .brand{float:left;display:block;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777777;text-shadow:0 1px 0 #ffffff;}.navbar .brand:hover{text-decoration:none;} -.navbar-text{margin-bottom:0;line-height:40px;} -.navbar-link{color:#777777;}.navbar-link:hover{color:#333333;} -.navbar .divider-vertical{height:40px;margin:0 9px;border-left:1px solid #f2f2f2;border-right:1px solid #ffffff;} -.navbar .btn,.navbar .btn-group{margin-top:5px;} -.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn{margin-top:0;} -.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";line-height:0;} -.navbar-form:after{clear:both;} -.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;} -.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0;} -.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;} -.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;} -.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0;}.navbar-search .search-query{margin-bottom:0;padding:4px 14px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} -.navbar-static-top{position:static;width:100%;margin-bottom:0;}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;} -.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px;} -.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0;} -.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} -.navbar-fixed-top{top:0;} -.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);} -.navbar-fixed-bottom{bottom:0;}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);} -.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;} -.navbar .nav.pull-right{float:right;margin-right:0;} -.navbar .nav>li{float:left;} -.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777777;text-decoration:none;text-shadow:0 1px 0 #ffffff;} -.navbar .nav .dropdown-toggle .caret{margin-top:8px;} -.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{background-color:transparent;color:#333333;text-decoration:none;} -.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);-moz-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);} -.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ededed;background-image:-moz-linear-gradient(top, #f2f2f2, #e5e5e5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));background-image:-webkit-linear-gradient(top, #f2f2f2, #e5e5e5);background-image:-o-linear-gradient(top, #f2f2f2, #e5e5e5);background-image:linear-gradient(to bottom, #f2f2f2, #e5e5e5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e5e5e5;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#ffffff;background-color:#e5e5e5;*background-color:#d9d9d9;} -.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#cccccc \9;} -.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);} -.btn-navbar .icon-bar+.icon-bar{margin-top:3px;} -.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;} -.navbar .nav>li>.dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;} -.navbar-fixed-bottom .nav>li>.dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;} -.navbar-fixed-bottom .nav>li>.dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;} -.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:#e5e5e5;color:#555555;} -.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777777;border-bottom-color:#777777;} -.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;} -.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{left:auto;right:0;}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{left:auto;right:12px;} -.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{left:auto;right:13px;} -.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{left:auto;right:100%;margin-left:0;margin-right:-1px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;} -.navbar-inverse{color:#999999;}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top, #222222, #111111);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));background-image:-webkit-linear-gradient(top, #222222, #111111);background-image:-o-linear-gradient(top, #222222, #111111);background-image:linear-gradient(to bottom, #222222, #111111);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);border-color:#252525;} -.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999999;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover{color:#ffffff;} -.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{background-color:transparent;color:#ffffff;} -.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#ffffff;background-color:#111111;} -.navbar-inverse .navbar-link{color:#999999;}.navbar-inverse .navbar-link:hover{color:#ffffff;} -.navbar-inverse .divider-vertical{border-left-color:#111111;border-right-color:#222222;} -.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{background-color:#111111;color:#ffffff;} -.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999999;border-bottom-color:#999999;} -.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} -.navbar-inverse .navbar-search .search-query{color:#ffffff;background-color:#515151;border-color:#111111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none;}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#cccccc;} -.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#cccccc;} -.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;} -.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} -.navbar-inverse .btn-navbar{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e0e0e;background-image:-moz-linear-gradient(top, #151515, #040404);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));background-image:-webkit-linear-gradient(top, #151515, #040404);background-image:-o-linear-gradient(top, #151515, #040404);background-image:linear-gradient(to bottom, #151515, #040404);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);border-color:#040404 #040404 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#040404;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#ffffff;background-color:#040404;*background-color:#000000;} -.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000000 \9;} -.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.breadcrumb li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;} -.breadcrumb .divider{padding:0 5px;color:#ccc;} -.breadcrumb .active{color:#999999;} -.pagination{height:40px;margin:20px 0;} -.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} -.pagination ul>li{display:inline;} -.pagination ul>li>a,.pagination ul>li>span{float:left;padding:0 14px;line-height:38px;text-decoration:none;background-color:#ffffff;border:1px solid #dddddd;border-left-width:0;} -.pagination ul>li>a:hover,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5;} -.pagination ul>.active>a,.pagination ul>.active>span{color:#999999;cursor:default;} -.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover{color:#999999;background-color:transparent;cursor:default;} -.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.pagination-centered{text-align:center;} -.pagination-right{text-align:right;} -.pager{margin:20px 0;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";line-height:0;} -.pager:after{clear:both;} -.pager li{display:inline;} -.pager a,.pager span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} -.pager a:hover{text-decoration:none;background-color:#f5f5f5;} -.pager .next a,.pager .next span{float:right;} -.pager .previous a{float:left;} -.pager .disabled a,.pager .disabled a:hover,.pager .disabled span{color:#999999;background-color:#fff;cursor:default;} -.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";line-height:0;} -.thumbnails:after{clear:both;} -.row-fluid .thumbnails{margin-left:0;} -.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px;} -.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;} -a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} -.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} -.thumbnail .caption{padding:9px;color:#555555;} -.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;} -.alert h4{margin:0;} -.alert .close{position:relative;top:-2px;right:-21px;line-height:20px;} -.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;} -.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;} -.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;} -.alert-block{padding-top:14px;padding-bottom:14px;} -.alert-block>p,.alert-block>ul{margin-bottom:0;} -.alert-block p+p{margin-top:5px;} -@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-o-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}.progress{overflow:hidden;height:20px;margin-bottom:20px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(to bottom, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.progress .bar{width:0%;height:100%;color:#ffffff;float:left;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(to bottom, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} -.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);} -.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} -.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;} -.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(to bottom, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);} -.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(to bottom, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);} -.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(to bottom, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);} -.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(to bottom, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);} -.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} -.hero-unit p{font-size:18px;font-weight:200;line-height:30px;color:inherit;} -.tooltip{position:absolute;z-index:1030;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);} -.tooltip.top{margin-top:-3px;} -.tooltip.right{margin-left:3px;} -.tooltip.bottom{margin-top:3px;} -.tooltip.left{margin-left:-3px;} -.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid;} -.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000000;} -.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000000;} -.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000000;} -.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000000;} -.popover{position:absolute;top:0;left:0;z-index:1010;display:none;width:236px;padding:1px;background-color:#ffffff;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);}.popover.top{margin-bottom:10px;} -.popover.right{margin-left:10px;} -.popover.bottom{margin-top:10px;} -.popover.left{margin-right:10px;} -.popover-title{margin:0;padding:8px 14px;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;} -.popover-content{padding:9px 14px;}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0;} -.popover .arrow,.popover .arrow:after{position:absolute;display:inline-block;width:0;height:0;border-color:transparent;border-style:solid;} -.popover .arrow:after{content:"";z-index:-1;} -.popover.top .arrow{bottom:-10px;left:50%;margin-left:-10px;border-width:10px 10px 0;border-top-color:#ffffff;}.popover.top .arrow:after{border-width:11px 11px 0;border-top-color:rgba(0, 0, 0, 0.25);bottom:-1px;left:-11px;} -.popover.right .arrow{top:50%;left:-10px;margin-top:-10px;border-width:10px 10px 10px 0;border-right-color:#ffffff;}.popover.right .arrow:after{border-width:11px 11px 11px 0;border-right-color:rgba(0, 0, 0, 0.25);bottom:-11px;left:-1px;} -.popover.bottom .arrow{top:-10px;left:50%;margin-left:-10px;border-width:0 10px 10px;border-bottom-color:#ffffff;}.popover.bottom .arrow:after{border-width:0 11px 11px;border-bottom-color:rgba(0, 0, 0, 0.25);top:-1px;left:-11px;} -.popover.left .arrow{top:50%;right:-10px;margin-top:-10px;border-width:10px 0 10px 10px;border-left-color:#ffffff;}.popover.left .arrow:after{border-width:11px 0 11px 11px;border-left-color:rgba(0, 0, 0, 0.25);bottom:-11px;right:-1px;} -.modal-open .modal .dropdown-menu{z-index:2050;} -.modal-open .modal .dropdown.open{*z-index:2050;} -.modal-open .modal .popover{z-index:2060;} -.modal-open .modal .tooltip{z-index:2080;} -.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;} -.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);} -.modal{position:fixed;top:50%;left:50%;z-index:1050;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} -.modal.fade.in{top:50%;} -.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;} -.modal-header h3{margin:0;line-height:30px;} -.modal-body{overflow-y:auto;max-height:400px;padding:15px;} -.modal-form{margin-bottom:0;} -.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";line-height:0;} -.modal-footer:after{clear:both;} -.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0;} -.modal-footer .btn-group .btn+.btn{margin-left:-1px;} -.dropup,.dropdown{position:relative;} -.dropdown-toggle{*margin-bottom:-3px;} -.dropdown-toggle:active,.open .dropdown-toggle{outline:0;} -.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";} -.dropdown .caret{margin-top:8px;margin-left:2px;} -.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;} -.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} -.dropdown-menu a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333333;white-space:nowrap;} -.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{text-decoration:none;color:#ffffff;background-color:#0088cc;background-color:#0081c2;background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(to bottom, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);} -.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;outline:0;background-color:#0088cc;background-color:#0081c2;background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(to bottom, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);} -.dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#999999;} -.dropdown-menu .disabled>a:hover{text-decoration:none;background-color:transparent;cursor:default;} -.open{*z-index:1000;}.open >.dropdown-menu{display:block;} -.pull-right>.dropdown-menu{right:0;left:auto;} -.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"";} -.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;} -.dropdown-submenu{position:relative;} -.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} -.dropdown-submenu:hover>.dropdown-menu{display:block;} -.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#cccccc;margin-top:5px;margin-right:-10px;} -.dropdown-submenu:hover>a:after{border-left-color:#ffffff;} -.dropdown .dropdown-menu .nav-header{padding-left:20px;padding-right:20px;} -.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.accordion{margin-bottom:20px;} -.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.accordion-heading{border-bottom:0;} -.accordion-heading .accordion-toggle{display:block;padding:8px 15px;} -.accordion-toggle{cursor:pointer;} -.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;} -.carousel{position:relative;margin-bottom:20px;line-height:1;} -.carousel-inner{overflow:hidden;width:100%;position:relative;} -.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} -.carousel .item>img{display:block;line-height:1;} -.carousel .active,.carousel .next,.carousel .prev{display:block;} -.carousel .active{left:0;} -.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;} -.carousel .next{left:100%;} -.carousel .prev{left:-100%;} -.carousel .next.left,.carousel .prev.right{left:0;} -.carousel .active.left{left:-100%;} -.carousel .active.right{left:100%;} -.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;} -.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} -.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:15px;background:#333333;background:rgba(0, 0, 0, 0.75);} -.carousel-caption h4,.carousel-caption p{color:#ffffff;line-height:20px;} -.carousel-caption h4{margin:0 0 5px;} -.carousel-caption p{margin-bottom:0;} -.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} -.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);} -button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;} -.pull-right{float:right;} -.pull-left{float:left;} -.hide{display:none;} -.show{display:block;} -.invisible{visibility:hidden;} -.affix{position:fixed;} -.fade{opacity:0;-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;} -.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;}.collapse.in{height:auto;} -.hidden{display:none;visibility:hidden;} -.visible-phone{display:none !important;} -.visible-tablet{display:none !important;} -.hidden-desktop{display:none !important;} -.visible-desktop{display:inherit !important;} -@media (min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit !important;} .visible-desktop{display:none !important ;} .visible-tablet{display:inherit !important;} .hidden-tablet{display:none !important;}}@media (max-width:767px){.hidden-desktop{display:inherit !important;} .visible-desktop{display:none !important;} .visible-phone{display:inherit !important;} .hidden-phone{display:none !important;}}@media (max-width:767px){body{padding-left:20px;padding-right:20px;} .navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-left:-20px;margin-right:-20px;} .container-fluid{padding:0;} .dl-horizontal dt{float:none;clear:none;width:auto;text-align:left;} .dl-horizontal dd{margin-left:0;} .container{width:auto;} .row-fluid{width:100%;} .row,.thumbnails{margin-left:0;} .thumbnails>li{float:none;margin-left:0;} [class*="span"],.row-fluid [class*="span"]{float:none;display:block;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} .span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} .input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} .input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto;} .controls-row [class*="span"]+[class*="span"]{margin-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;}}@media (max-width:480px){.nav-collapse{-webkit-transform:translate3d(0, 0, 0);} .page-header h1 small{display:block;line-height:20px;} input[type="checkbox"],input[type="radio"]{border:1px solid #ccc;} .form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:10px;padding-right:10px;} .modal{top:10px;left:10px;right:10px;} .modal-header .close{padding:10px;margin:-10px;} .carousel-caption{position:static;}}@media (min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";line-height:0;} .row:after{clear:both;} [class*="span"]{float:left;min-height:1px;margin-left:20px;} .container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px;} .span12{width:724px;} .span11{width:662px;} .span10{width:600px;} .span9{width:538px;} .span8{width:476px;} .span7{width:414px;} .span6{width:352px;} .span5{width:290px;} .span4{width:228px;} .span3{width:166px;} .span2{width:104px;} .span1{width:42px;} .offset12{margin-left:764px;} .offset11{margin-left:702px;} .offset10{margin-left:640px;} .offset9{margin-left:578px;} .offset8{margin-left:516px;} .offset7{margin-left:454px;} .offset6{margin-left:392px;} .offset5{margin-left:330px;} .offset4{margin-left:268px;} .offset3{margin-left:206px;} .offset2{margin-left:144px;} .offset1{margin-left:82px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0;} .row-fluid:after{clear:both;} .row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;} .row-fluid [class*="span"]:first-child{margin-left:0;} .row-fluid .span12{width:100%;*width:99.94680851063829%;} .row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%;} .row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%;} .row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%;} .row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%;} .row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%;} .row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%;} .row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%;} .row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%;} .row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%;} .row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%;} .row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%;} .row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%;} .row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%;} .row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%;} .row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%;} .row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%;} .row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%;} .row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%;} .row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%;} .row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%;} .row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%;} .row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%;} .row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%;} .row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%;} .row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%;} .row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%;} .row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%;} .row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%;} .row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%;} .row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%;} .row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%;} .row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%;} .row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%;} .row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%;} .row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%;} input,textarea,.uneditable-input{margin-left:0;} .controls-row [class*="span"]+[class*="span"]{margin-left:20px;} input.span12, textarea.span12, .uneditable-input.span12{width:710px;} input.span11, textarea.span11, .uneditable-input.span11{width:648px;} input.span10, textarea.span10, .uneditable-input.span10{width:586px;} input.span9, textarea.span9, .uneditable-input.span9{width:524px;} input.span8, textarea.span8, .uneditable-input.span8{width:462px;} input.span7, textarea.span7, .uneditable-input.span7{width:400px;} input.span6, textarea.span6, .uneditable-input.span6{width:338px;} input.span5, textarea.span5, .uneditable-input.span5{width:276px;} input.span4, textarea.span4, .uneditable-input.span4{width:214px;} input.span3, textarea.span3, .uneditable-input.span3{width:152px;} input.span2, textarea.span2, .uneditable-input.span2{width:90px;} input.span1, textarea.span1, .uneditable-input.span1{width:28px;}}@media (min-width:1200px){.row{margin-left:-30px;*zoom:1;}.row:before,.row:after{display:table;content:"";line-height:0;} .row:after{clear:both;} [class*="span"]{float:left;min-height:1px;margin-left:30px;} .container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px;} .span12{width:1170px;} .span11{width:1070px;} .span10{width:970px;} .span9{width:870px;} .span8{width:770px;} .span7{width:670px;} .span6{width:570px;} .span5{width:470px;} .span4{width:370px;} .span3{width:270px;} .span2{width:170px;} .span1{width:70px;} .offset12{margin-left:1230px;} .offset11{margin-left:1130px;} .offset10{margin-left:1030px;} .offset9{margin-left:930px;} .offset8{margin-left:830px;} .offset7{margin-left:730px;} .offset6{margin-left:630px;} .offset5{margin-left:530px;} .offset4{margin-left:430px;} .offset3{margin-left:330px;} .offset2{margin-left:230px;} .offset1{margin-left:130px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0;} .row-fluid:after{clear:both;} .row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;} .row-fluid [class*="span"]:first-child{margin-left:0;} .row-fluid .span12{width:100%;*width:99.94680851063829%;} .row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%;} .row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%;} .row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%;} .row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%;} .row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%;} .row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%;} .row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%;} .row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%;} .row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%;} .row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%;} .row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%;} .row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%;} .row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%;} .row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%;} .row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%;} .row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%;} .row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%;} .row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%;} .row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%;} .row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%;} .row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%;} .row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%;} .row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%;} .row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%;} .row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%;} .row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%;} .row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%;} .row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%;} .row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%;} .row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%;} .row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%;} .row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%;} .row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%;} .row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%;} .row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%;} input,textarea,.uneditable-input{margin-left:0;} .controls-row [class*="span"]+[class*="span"]{margin-left:30px;} input.span12, textarea.span12, .uneditable-input.span12{width:1156px;} input.span11, textarea.span11, .uneditable-input.span11{width:1056px;} input.span10, textarea.span10, .uneditable-input.span10{width:956px;} input.span9, textarea.span9, .uneditable-input.span9{width:856px;} input.span8, textarea.span8, .uneditable-input.span8{width:756px;} input.span7, textarea.span7, .uneditable-input.span7{width:656px;} input.span6, textarea.span6, .uneditable-input.span6{width:556px;} input.span5, textarea.span5, .uneditable-input.span5{width:456px;} input.span4, textarea.span4, .uneditable-input.span4{width:356px;} input.span3, textarea.span3, .uneditable-input.span3{width:256px;} input.span2, textarea.span2, .uneditable-input.span2{width:156px;} input.span1, textarea.span1, .uneditable-input.span1{width:56px;} .thumbnails{margin-left:-30px;} .thumbnails>li{margin-left:30px;} .row-fluid .thumbnails{margin-left:0;}}@media (max-width:979px){body{padding-top:0;} .navbar-fixed-top,.navbar-fixed-bottom{position:static;} .navbar-fixed-top{margin-bottom:20px;} .navbar-fixed-bottom{margin-top:20px;} .navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px;} .navbar .container{width:auto;padding:0;} .navbar .brand{padding-left:10px;padding-right:10px;margin:0 0 0 -5px;} .nav-collapse{clear:both;} .nav-collapse .nav{float:none;margin:0 0 10px;} .nav-collapse .nav>li{float:none;} .nav-collapse .nav>li>a{margin-bottom:2px;} .nav-collapse .nav>.divider-vertical{display:none;} .nav-collapse .nav .nav-header{color:#777777;text-shadow:none;} .nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .nav-collapse .dropdown-menu li+li a{margin-bottom:2px;} .nav-collapse .nav>li>a:hover,.nav-collapse .dropdown-menu a:hover{background-color:#f2f2f2;} .navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:#111111;} .nav-collapse.in .btn-group{margin-top:5px;padding:0;} .nav-collapse .dropdown-menu{position:static;top:auto;left:auto;float:none;display:block;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none;} .nav-collapse .dropdown-menu .divider{display:none;} .nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none;} .nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);} .navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111111;border-bottom-color:#111111;} .navbar .nav-collapse .nav.pull-right{float:none;margin-left:0;} .nav-collapse,.nav-collapse.collapse{overflow:hidden;height:0;} .navbar .btn-navbar{display:block;} .navbar-static .navbar-inner{padding-left:10px;padding-right:10px;}}@media (min-width:980px){.nav-collapse.collapse{height:auto !important;overflow:visible !important;}} + * Bootstrap v3.2.0 (http://getbootstrap.com) + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + *//*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:before,:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive,.thumbnail>img,.thumbnail a>img,.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;width:100% \9;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;width:100% \9;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:400;line-height:1;color:#777}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}mark,.mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#428bca}a.text-primary:hover{color:#3071a9}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#428bca}a.bg-primary:hover{background-color:#3071a9}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover,.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.info,.table>tbody>tr>td.info,.table>tfoot>tr>td.info,.table>thead>tr>th.info,.table>tbody>tr>th.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>tbody>tr.info>td,.table>tfoot>tr.info>td,.table>thead>tr.info>th,.table>tbody>tr.info>th,.table>tfoot>tr.info>th{background-color:#d9edf7}.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover,.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr.info:hover>th{background-color:#c4e3f3}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:auto;overflow-y:hidden;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=radio],input[type=checkbox]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=radio]:focus,input[type=checkbox]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#777;opacity:1}.form-control:-ms-input-placeholder{color:#777}.form-control::-webkit-input-placeholder{color:#777}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:34px;line-height:1.42857143 \0}input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}.form-group{margin-bottom:15px}.radio,.checkbox{position:relative;display:block;min-height:20px;margin-top:10px;margin-bottom:10px}.radio label,.checkbox label{padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.radio input[type=radio],.radio-inline input[type=radio],.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox]{position:absolute;margin-top:4px \9;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type=radio][disabled],input[type=checkbox][disabled],input[type=radio].disabled,input[type=checkbox].disabled,fieldset[disabled] input[type=radio],fieldset[disabled] input[type=checkbox]{cursor:not-allowed}.radio-inline.disabled,.checkbox-inline.disabled,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.radio.disabled label,.checkbox.disabled label,fieldset[disabled] .radio label,fieldset[disabled] .checkbox label{cursor:not-allowed}.form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm,.form-horizontal .form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm,select[multiple].input-sm{height:auto}.input-lg,.form-horizontal .form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg,select[multiple].input-lg{height:auto}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:25px;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center}.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn,.form-inline .input-group .form-control{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .radio label,.form-inline .checkbox label{padding-left:0}.form-inline .radio input[type=radio],.form-inline .checkbox input[type=checkbox]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{top:0;right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.3px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn:focus,.btn:active:focus,.btn.active:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default:active,.btn-default.active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#3071a9;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success:active,.btn-success.active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info:active,.btn-info.active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#777;text-decoration:none}.btn-lg,.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs,.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=submit].btn-block,input[type=reset].btn-block,input[type=button].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#428bca;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#777}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px solid}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn>input[type=radio],[data-toggle=buttons]>.btn>input[type=checkbox]{position:absolute;z-index:-1;filter:alpha(opacity=0);opacity:0}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn,select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn,select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=radio],.input-group-addon input[type=checkbox]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:hover,.input-group-btn>.btn:focus,.input-group-btn>.btn:active{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{max-height:340px}@media (max-width:480px) and (orientation:landscape){.navbar-fixed-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{max-height:200px}}.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;-webkit-transform:translate3d(0,0,0);-o-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}@media (min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn,.navbar-form .input-group .form-control{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .radio label,.navbar-form .checkbox label{padding-left:0}.navbar-form .radio input[type=radio],.navbar-form .checkbox input[type=checkbox]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:hover,.navbar-default .btn-link:focus{color:#333}.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:hover,.navbar-default .btn-link[disabled]:focus,fieldset[disabled] .navbar-default .btn-link:focus{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#777}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#777}.navbar-inverse .navbar-nav>li>a{color:#777}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#777}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#777}.navbar-inverse .btn-link:hover,.navbar-inverse .btn-link:focus{color:#fff}.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:hover,.navbar-inverse .btn-link[disabled]:focus,fieldset[disabled] .navbar-inverse .btn-link:focus{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#428bca;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{color:#2a6496;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;cursor:default;background-color:#428bca;border-color:#428bca}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:hover,a.label:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:hover,.label-default[href]:focus{background-color:#5e5e5e}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron h1,.jumbotron .h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1,.jumbotron .h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img,.thumbnail a>img{margin-right:auto;margin-left:auto}a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#428bca}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar,.progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress.active .progress-bar,.progress-bar.active{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar[aria-valuenow="1"],.progress-bar[aria-valuenow="2"]{min-width:30px}.progress-bar[aria-valuenow="0"]{min-width:30px;color:#777;background-color:transparent;background-image:none;-webkit-box-shadow:none;box-shadow:none}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{color:#555;text-decoration:none;background-color:#f5f5f5}.list-group-item.disabled,.list-group-item.disabled:hover,.list-group-item.disabled:focus{color:#777;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>.small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:hover .list-group-item-text,.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:hover,a.list-group-item-success:focus{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:hover,a.list-group-item-success.active:focus{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:hover,a.list-group-item-info:focus{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:hover,a.list-group-item-info.active:focus{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:hover,a.list-group-item-warning:focus{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:hover,a.list-group-item-warning.active:focus{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:hover,a.list-group-item-danger:focus{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:hover,a.list-group-item-danger.active:focus{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.table,.panel>.table-responsive>.table,.panel>.panel-collapse>.table{margin-bottom:0}.panel>.table:first-child,.panel>.table-responsive:first-child>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table:last-child,.panel>.table-responsive:last-child>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child th,.panel>.table>tbody:first-child>tr:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#428bca}.panel-primary>.panel-heading .badge{color:#428bca;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive iframe,.embed-responsive embed,.embed-responsive object{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate3d(0,-25%,0);-o-transform:translate3d(0,-25%,0);transform:translate3d(0,-25%,0)}.modal.in .modal-dialog{-webkit-transform:translate3d(0,0,0);-o-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-size:12px;line-height:1.4;visibility:visible;filter:alpha(opacity=0);opacity:0}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .glyphicon-chevron-left{left:50%;margin-left:-10px}.carousel-control .icon-next,.carousel-control .glyphicon-chevron-right{right:50%;margin-right:-10px}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after,.dl-horizontal dd:before,.dl-horizontal dd:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after,.form-horizontal .form-group:before,.form-horizontal .form-group:after,.btn-toolbar:before,.btn-toolbar:after,.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after,.pager:before,.pager:after,.panel-body:before,.panel-body:after,.modal-footer:before,.modal-footer:after{display:table;content:" "}.clearfix:after,.dl-horizontal dd:after,.container:after,.container-fluid:after,.row:after,.form-horizontal .form-group:after,.btn-toolbar:after,.btn-group-vertical>.btn-group:after,.nav:after,.navbar:after,.navbar-header:after,.navbar-collapse:after,.pager:after,.panel-body:after,.modal-footer:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed;-webkit-transform:translate3d(0,0,0);-o-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}@-ms-viewport{width:device-width}.visible-xs,.visible-sm,.visible-md,.visible-lg{display:none!important}.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}} \ No newline at end of file diff --git a/rest_framework/static/rest_framework/js/bootstrap.min.js b/rest_framework/static/rest_framework/js/bootstrap.min.js index e0b220f40..7c1561a8b 100644 --- a/rest_framework/static/rest_framework/js/bootstrap.min.js +++ b/rest_framework/static/rest_framework/js/bootstrap.min.js @@ -1,7 +1,6 @@ -/** -* Bootstrap.js by @fat & @mdo -* plugins: bootstrap-transition.js, bootstrap-modal.js, bootstrap-dropdown.js, bootstrap-scrollspy.js, bootstrap-tab.js, bootstrap-tooltip.js, bootstrap-popover.js, bootstrap-affix.js, bootstrap-alert.js, bootstrap-button.js, bootstrap-collapse.js, bootstrap-carousel.js, bootstrap-typeahead.js -* Copyright 2012 Twitter, Inc. -* http://www.apache.org/licenses/LICENSE-2.0.txt -*/ -!function(a){a(function(){a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;a("body").addClass("modal-open"),this.isShown=!0,this.escape(),this.backdrop(function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in").attr("aria-hidden",!1).focus(),b.enforceFocus(),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();var c=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,a("body").removeClass("modal-open"),this.escape(),a(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),a.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var b=this;a(document).on("focusin.modal",function(a){b.$element[0]!==a.target&&!b.$element.has(a.target).length&&b.$element.focus()})},escape:function(){var a=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(b){b.which==27&&a.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),b.hideModal()},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),b.hideModal()})},hideModal:function(a){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('<div class="modal-backdrop '+d+'" />').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(this.removeBackdrop,this)):this.removeBackdrop()):b&&b()}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());b.preventDefault(),e.modal(f).one("hide",function(){c.focus()})})})}(window.jQuery),!function(a){function d(){e(a(b)).removeClass("open")}function e(b){var c=b.attr("data-target"),d;return c||(c=b.attr("href"),c=c&&/#/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,"")),d=a(c),d.length||(d=b.parent()),d}var b="[data-toggle=dropdown]",c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),f,g;if(c.is(".disabled, :disabled"))return;return f=e(c),g=f.hasClass("open"),d(),g||(f.toggleClass("open"),c.focus()),!1},keydown:function(b){var c,d,f,g,h,i;if(!/(38|40|27)/.test(b.keyCode))return;c=a(this),b.preventDefault(),b.stopPropagation();if(c.is(".disabled, :disabled"))return;g=e(c),h=g.hasClass("open");if(!h||h&&b.keyCode==27)return c.click();d=a("[role=menu] li:not(.divider) a",g);if(!d.length)return;i=d.index(d.filter(":focus")),b.keyCode==38&&i>0&&i--,b.keyCode==40&&i<d.length-1&&i++,~i||(i=0),d.eq(i).focus()}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api touchstart.dropdown.data-api",d),a("body").on("click.dropdown touchstart.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",b,c.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",b+", [role=menu]",c.prototype.keydown)})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll-spy.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body"),this.refresh(),this.process()}b.prototype={constructor:b,refresh:function(){var b=this,c;this.offsets=a([]),this.targets=a([]),c=this.$body.find(this.selector).map(function(){var b=a(this),c=b.data("target")||b.attr("href"),d=/^#\w/.test(c)&&a(c);return d&&d.length&&[[d.position().top,c]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,c=b-this.$scrollElement.height(),d=this.offsets,e=this.targets,f=this.activeTarget,g;if(a>=c)return f!=(g=e.last()[0])&&this.activate(g);for(g=d.length;g--;)f!=e[g]&&a>=d[g]&&(!d[g+1]||a<=d[g+1])&&this.activate(e[g])},activate:function(b){var c,d;this.activeTarget=b,a(this.selector).parent(".active").removeClass("active"),d=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',c=a(d).parent("li").addClass("active"),c.parent(".dropdown-menu").length&&(c=c.closest("li.dropdown").addClass("active")),c.trigger("activate")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f,g;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],g=a.Event("show",{relatedTarget:e}),b.trigger(g);if(g.isDefaultPrevented())return;f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this)):this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f+"."+this.type,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.show)return c.show();clearTimeout(this.timeout),c.hoverState="in",this.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!c.options.delay||!c.options.delay.hide)return c.hide();c.hoverState="out",this.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();return c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove(),this},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(a){var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content > *")[this.options.html?"html":"text"](c),a.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(a){var b=function(b,c){this.options=a.extend({},a.fn.affix.defaults,c),this.$window=a(window).on("scroll.affix.data-api",a.proxy(this.checkPosition,this)),this.$element=a(b),this.checkPosition()};b.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var b=a(document).height(),c=this.$window.scrollTop(),d=this.$element.offset(),e=this.options.offset,f=e.bottom,g=e.top,h="affix affix-top affix-bottom",i;typeof e!="object"&&(f=g=e),typeof g=="function"&&(g=e.top()),typeof f=="function"&&(f=e.bottom()),i=this.unpin!=null&&c+this.unpin<=d.top?!1:f!=null&&d.top+this.$element.height()>=b-f?"bottom":g!=null&&c<=g?"top":!1;if(this.affixed===i)return;this.affixed=i,this.unpin=i=="bottom"?d.top-c:null,this.$element.removeClass(h).addClass("affix"+(i?"-"+i:""))},a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("affix"),f=typeof c=="object"&&c;e||d.data("affix",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.defaults={offset:0},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(window.jQuery),!function(a){var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.closest('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),a.support.transition&&this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c.type=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();c[a(e).hasClass("in")?"addClass":"removeClass"]("collapsed"),a(e).collapse(f)})})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=c,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".item.active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition.end&&(this.$element.trigger(a.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j=a.Event("slide",{relatedTarget:e[0]});this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c),g=typeof c=="string"?c:f.slide;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):g?e[g]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(a)).change(),this.hide()},updater:function(a){return a},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(c=a.isFunction(this.source)?this.source(this.query,a.proxy(this.process,this)):this.source,c?this.process(c):this)},process:function(b){var c=this;return b=a.grep(b,function(a){return c.matcher(a)}),b=this.sorter(b),b.length?this.render(b.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){var b=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return a.replace(new RegExp("("+b+")","ig"),function(a,b){return"<strong>"+b+"</strong>"})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.chrome||a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keydown,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},move:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}a.stopPropagation()},keydown:function(b){this.suppressKeyPressRepeat=!~a.inArray(b.keyCode,[40,38,9,13,27]),this.move(b)},keypress:function(a){if(this.suppressKeyPressRepeat)return;this.move(a)},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery) \ No newline at end of file +/*! + * Bootstrap v3.2.0 (http://getbootstrap.com) + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.2.0",d.prototype.close=function(b){function c(){f.detach().trigger("closed.bs.alert").remove()}var d=a(this),e=d.attr("data-target");e||(e=d.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,""));var f=a(e);b&&b.preventDefault(),f.length||(f=d.hasClass("alert")?d:d.parent()),f.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",c).emulateTransitionEnd(150):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.2.0",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),d[e](null==f[b]?this.options[b]:f[b]),setTimeout(a.proxy(function(){"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}a&&this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),c.preventDefault()})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b).on("keydown.bs.carousel",a.proxy(this.keydown,this)),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.2.0",c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},c.prototype.keydown=function(a){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.to=function(b){var c=this,d=this.getItemIndex(this.$active=this.$element.find(".item.active"));return b>this.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g="next"==b?"left":"right",h="next"==b?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}if(e.hasClass("active"))return this.sliding=!1;var j=e[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:g});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,f&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(e)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:g});return a.support.transition&&this.$element.hasClass("slide")?(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one("bsTransitionEnd",function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(1e3*d.css("transition-duration").slice(0,-1))):(d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger(m)),f&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b);!e&&f.toggle&&"show"==b&&(b=!b),e||d.data("bs.collapse",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};c.VERSION="3.2.0",c.DEFAULTS={toggle:!0},c.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},c.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var c=a.Event("show.bs.collapse");if(this.$element.trigger(c),!c.isDefaultPrevented()){var d=this.$parent&&this.$parent.find("> .panel > .in");if(d&&d.length){var e=d.data("bs.collapse");if(e&&e.transitioning)return;b.call(d,"hide"),e||d.data("bs.collapse",null)}var f=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[f](0),this.transitioning=1;var g=function(){this.$element.removeClass("collapsing").addClass("collapse in")[f](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return g.call(this);var h=a.camelCase(["scroll",f].join("-"));this.$element.one("bsTransitionEnd",a.proxy(g,this)).emulateTransitionEnd(350)[f](this.$element[0][h])}}},c.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(d,this)).emulateTransitionEnd(350):d.call(this)}}},c.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var d=a.fn.collapse;a.fn.collapse=b,a.fn.collapse.Constructor=c,a.fn.collapse.noConflict=function(){return a.fn.collapse=d,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(c){var d,e=a(this),f=e.attr("data-target")||c.preventDefault()||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),g=a(f),h=g.data("bs.collapse"),i=h?"toggle":e.data(),j=e.attr("data-parent"),k=j&&a(j);h&&h.transitioning||(k&&k.find('[data-toggle="collapse"][data-parent="'+j+'"]').not(e).addClass("collapsed"),e[g.hasClass("in")?"addClass":"removeClass"]("collapsed")),b.call(g,i)})}(jQuery),+function(a){"use strict";function b(b){b&&3===b.which||(a(e).remove(),a(f).each(function(){var d=c(a(this)),e={relatedTarget:this};d.hasClass("open")&&(d.trigger(b=a.Event("hide.bs.dropdown",e)),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown",e))}))}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.2.0",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('<div class="dropdown-backdrop"/>').insertAfter(a(this)).on("click",b);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(b){if(/(38|40|27)/.test(b.keyCode)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var e=c(d),g=e.hasClass("open");if(!g||g&&27==b.keyCode)return 27==b.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.divider):visible a",i=e.find('[role="menu"]'+h+', [role="listbox"]'+h);if(i.length){var j=i.index(i.filter(":focus"));38==b.keyCode&&j>0&&j--,40==b.keyCode&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",b).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f+', [role="menu"], [role="listbox"]',g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$backdrop=this.isShown=null,this.scrollbarWidth=0,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.2.0",c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var c=this,d=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(d),this.isShown||d.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.$body.addClass("modal-open"),this.setScrollbar(),this.escape(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.backdrop(function(){var d=a.support.transition&&c.$element.hasClass("fade");c.$element.parent().length||c.$element.appendTo(c.$body),c.$element.show().scrollTop(0),d&&c.$element[0].offsetWidth,c.$element.addClass("in").attr("aria-hidden",!1),c.enforceFocus();var e=a.Event("shown.bs.modal",{relatedTarget:b});d?c.$element.find(".modal-dialog").one("bsTransitionEnd",function(){c.$element.trigger("focus").trigger(e)}).emulateTransitionEnd(300):c.$element.trigger("focus").trigger(e)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.$body.removeClass("modal-open"),this.resetScrollbar(),this.escape(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(300):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keyup.dismiss.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;if(this.$backdrop=a('<div class="modal-backdrop '+d+'" />').appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;e?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(150):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var f=function(){c.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",f).emulateTransitionEnd(150):f()}else b&&b()},c.prototype.checkScrollbar=function(){document.body.clientWidth>=window.innerWidth||(this.scrollbarWidth=this.scrollbarWidth||this.measureScrollbar())},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.scrollbarWidth&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right","")},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;(e||"destroy"!=b)&&(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};c.VERSION="3.2.0",c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(this.options.viewport.selector||this.options.viewport);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show()},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var c=a.contains(document.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!c)return;var d=this,e=this.tip(),f=this.getUID(this.type);this.setContent(),e.attr("id",f),this.$element.attr("aria-describedby",f),this.options.animation&&e.addClass("fade");var g="function"==typeof this.options.placement?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,h=/\s?auto?\s?/i,i=h.test(g);i&&(g=g.replace(h,"")||"top"),e.detach().css({top:0,left:0,display:"block"}).addClass(g).data("bs."+this.type,this),this.options.container?e.appendTo(this.options.container):e.insertAfter(this.$element);var j=this.getPosition(),k=e[0].offsetWidth,l=e[0].offsetHeight;if(i){var m=g,n=this.$element.parent(),o=this.getPosition(n);g="bottom"==g&&j.top+j.height+l-o.scroll>o.height?"top":"top"==g&&j.top-o.scroll-l<0?"bottom":"right"==g&&j.right+k>o.width?"left":"left"==g&&j.left-k<o.left?"right":g,e.removeClass(m).addClass(g)}var p=this.getCalculatedOffset(g,j,k,l);this.applyPlacement(p,g);var q=function(){d.$element.trigger("shown.bs."+d.type),d.hoverState=null};a.support.transition&&this.$tip.hasClass("fade")?e.one("bsTransitionEnd",q).emulateTransitionEnd(150):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top=b.top+g,b.left=b.left+h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=k.left?2*k.left-e+i:2*k.top-f+j,m=k.left?"left":"top",n=k.left?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(l,d[0][n],m)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c,a?50*(1-a/b)+"%":"")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(){function b(){"in"!=c.hoverState&&d.detach(),c.$element.trigger("hidden.bs."+c.type)}var c=this,d=this.tip(),e=a.Event("hide.bs."+this.type);return this.$element.removeAttr("aria-describedby"),this.$element.trigger(e),e.isDefaultPrevented()?void 0:(d.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d.one("bsTransitionEnd",b).emulateTransitionEnd(150):b(),this.hoverState=null,this)},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName;return a.extend({},"function"==typeof c.getBoundingClientRect?c.getBoundingClientRect():null,{scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop(),width:d?a(window).width():b.outerWidth(),height:d?a(window).height():b.outerHeight()},d?{top:0,left:0}:b.offset())},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.width&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){clearTimeout(this.timeout),this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||"destroy"!=b)&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.2.0",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").empty()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},c.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){var e=a.proxy(this.process,this);this.$body=a("body"),this.$scrollElement=a(a(c).is("body")?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",e),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.2.0",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b="offset",c=0;a.isWindow(this.$scrollElement[0])||(b="position",c=this.$scrollElement.scrollTop()),this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight();var d=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[b]().top+c,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){d.offsets.push(this[0]),d.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<=e[0])return g!=(a=f[0])&&this.activate(a);for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parentsUntil(this.options.target,".active").removeClass("active");var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.2.0",c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});if(b.trigger(f),!f.isDefaultPrevented()){var g=a(d);this.activate(b.closest("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})}}},c.prototype.activate=function(b,c,d){function e(){f.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),g?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var f=c.find("> .active"),g=d&&a.support.transition&&f.hasClass("fade");g?f.one("bsTransitionEnd",e).emulateTransitionEnd(150):e(),f.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(c){c.preventDefault(),b.call(a(this),"show")})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=this.unpin=this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.2.0",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=a(document).height(),d=this.$target.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top(this.$element)),"function"==typeof h&&(h=f.bottom(this.$element));var i=null!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=b-h?"bottom":null!=g&&g>=d?"top":!1;if(this.affixed!==i){null!=this.unpin&&this.$element.css("top","");var j="affix"+(i?"-"+i:""),k=a.Event(j+".bs.affix");this.$element.trigger(k),k.isDefaultPrevented()||(this.affixed=i,this.unpin="bottom"==i?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(j).trigger(a.Event(j.replace("affix","affixed"))),"bottom"==i&&this.$element.offset({top:b-this.$element.height()-h}))}}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},d.offsetBottom&&(d.offset.bottom=d.offsetBottom),d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery); \ No newline at end of file diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index dcb0da2c0..58e7e86cd 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -15,8 +15,7 @@ {% block style %} {% block bootstrap_theme %} - <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet"> - <!--<link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/>--> + <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap.min.css" %}"/> <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/bootstrap-tweaks.css" %}"/> {% endblock %} <link rel="stylesheet" type="text/css" href="{% static "rest_framework/css/prettify.css" %}"/> From bacf8cfa9d9331d0876e7ad7adccdabc5f4833a5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 31 Oct 2014 15:40:08 +0000 Subject: [PATCH 0991/1652] Guard against malicious string inputs for numbers. Closes #1903. --- rest_framework/fields.py | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 82b7eb374..d5dccd723 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -545,7 +545,9 @@ class IntegerField(Field): 'invalid': _('A valid integer is required.'), 'max_value': _('Ensure this value is less than or equal to {max_value}.'), 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), + 'max_string_length': _('String value too large') } + MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. def __init__(self, **kwargs): max_value = kwargs.pop('max_value', None) @@ -559,8 +561,11 @@ class IntegerField(Field): self.validators.append(MinValueValidator(min_value, message=message)) def to_internal_value(self, data): + if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH: + self.fail('max_string_length') + try: - data = int(six.text_type(data)) + data = int(data) except (ValueError, TypeError): self.fail('invalid') return data @@ -574,7 +579,9 @@ class FloatField(Field): 'invalid': _("A valid number is required."), 'max_value': _('Ensure this value is less than or equal to {max_value}.'), 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), + 'max_string_length': _('String value too large') } + MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. def __init__(self, **kwargs): max_value = kwargs.pop('max_value', None) @@ -587,9 +594,12 @@ class FloatField(Field): message = self.error_messages['min_value'].format(min_value=min_value) self.validators.append(MinValueValidator(min_value, message=message)) - def to_internal_value(self, value): + def to_internal_value(self, data): + if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH: + self.fail('max_string_length') + try: - return float(value) + return float(data) except (TypeError, ValueError): self.fail('invalid') @@ -604,8 +614,10 @@ class DecimalField(Field): 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), 'max_digits': _('Ensure that there are no more than {max_digits} digits in total.'), 'max_decimal_places': _('Ensure that there are no more than {max_decimal_places} decimal places.'), - 'max_whole_digits': _('Ensure that there are no more than {max_whole_digits} digits before the decimal point.') + 'max_whole_digits': _('Ensure that there are no more than {max_whole_digits} digits before the decimal point.'), + 'max_string_length': _('String value too large') } + MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. coerce_to_string = api_settings.COERCE_DECIMAL_TO_STRING @@ -621,16 +633,19 @@ class DecimalField(Field): message = self.error_messages['min_value'].format(min_value=min_value) self.validators.append(MinValueValidator(min_value, message=message)) - def to_internal_value(self, value): + def to_internal_value(self, data): """ Validates that the input is a decimal number. Returns a Decimal instance. Returns None for empty values. Ensures that there are no more than max_digits in the number, and no more than decimal_places digits after the decimal point. """ - value = smart_text(value).strip() + data = smart_text(data).strip() + if len(data) > self.MAX_STRING_LENGTH: + self.fail('max_string_length') + try: - value = decimal.Decimal(value) + value = decimal.Decimal(data) except decimal.DecimalException: self.fail('invalid') From 207208fedff2457e921ef7d825ea7c3933b5dd6e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 31 Oct 2014 16:38:39 +0000 Subject: [PATCH 0992/1652] Lazy loading of fields and validators. Closes #1963. --- rest_framework/fields.py | 21 ++++++++++++++-- rest_framework/serializers.py | 34 +++++++++++--------------- rest_framework/utils/representation.py | 5 ++++ tests/test_fields.py | 4 +-- tests/test_model_serializer.py | 4 +-- tests/test_validators.py | 16 +++++++++--- 6 files changed, 54 insertions(+), 30 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index d5dccd723..8cc8e81ec 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -143,7 +143,7 @@ class Field(object): def __init__(self, read_only=False, write_only=False, required=None, default=empty, initial=empty, source=None, label=None, help_text=None, style=None, - error_messages=None, validators=[], allow_null=False): + error_messages=None, validators=None, allow_null=False): self._creation_counter = Field._creation_counter Field._creation_counter += 1 @@ -166,9 +166,11 @@ class Field(object): self.label = label self.help_text = help_text self.style = {} if style is None else style - self.validators = validators[:] or self.default_validators[:] self.allow_null = allow_null + if validators is not None: + self.validators = validators[:] + # These are set up by `.bind()` when the field is added to a serializer. self.field_name = None self.parent = None @@ -214,6 +216,21 @@ class Field(object): else: self.source_attrs = self.source.split('.') + # .validators is a lazily loaded property, that gets its default + # value from `get_validators`. + @property + def validators(self): + if not hasattr(self, '_validators'): + self._validators = self.get_validators() + return self._validators + + @validators.setter + def validators(self, validators): + self._validators = validators + + def get_validators(self): + return self.default_validators[:] + def get_initial(self): """ Return a value to use when the field is being returned as a primitive diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index c9f70f2da..82e932ddd 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -282,21 +282,23 @@ class SerializerMetaclass(type): @six.add_metaclass(SerializerMetaclass) class Serializer(BaseSerializer): - def __init__(self, *args, **kwargs): - super(Serializer, self).__init__(*args, **kwargs) + @property + def fields(self): + if not hasattr(self, '_fields'): + self._fields = BindingDict(self) + for key, value in self.get_fields().items(): + self._fields[key] = value + return self._fields + def get_fields(self): # Every new serializer is created with a clone of the field instances. # This allows users to dynamically modify the fields on a serializer # instance without affecting every other serializer class. - self.fields = BindingDict(self) - for key, value in self._get_base_fields().items(): - self.fields[key] = value - - self.validators = getattr(getattr(self, 'Meta', None), 'validators', []) - - def _get_base_fields(self): return copy.deepcopy(self._declared_fields) + def get_validators(self): + return getattr(getattr(self, 'Meta', None), 'validators', []) + def get_initial(self): if self._initial_data is not None: return ReturnDict([ @@ -520,14 +522,6 @@ class ModelSerializer(Serializer): }) _related_class = PrimaryKeyRelatedField - def __init__(self, *args, **kwargs): - super(ModelSerializer, self).__init__(*args, **kwargs) - if 'validators' not in kwargs: - validators = self.get_default_validators() - if validators: - self.validators.extend(validators) - self._kwargs['validators'] = validators - def create(self, validated_attrs): # Check that the user isn't trying to handle a writable nested field. # If we don't do this explicitly they'd likely get a confusing @@ -578,13 +572,13 @@ class ModelSerializer(Serializer): instance.save() return instance - def get_default_validators(self): + def get_validators(self): field_names = set([ field.source for field in self.fields.values() if (field.source != '*') and ('.' not in field.source) ]) - validators = [] + validators = getattr(getattr(self, 'Meta', None), 'validators', []) model_class = self.Meta.model # Note that we make sure to check `unique_together` both on the @@ -627,7 +621,7 @@ class ModelSerializer(Serializer): return validators - def _get_base_fields(self): + def get_fields(self): declared_fields = copy.deepcopy(self._declared_fields) ret = SortedDict() diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py index 180b51f8d..2a7c46753 100644 --- a/rest_framework/utils/representation.py +++ b/rest_framework/utils/representation.py @@ -82,6 +82,11 @@ def serializer_repr(serializer, indent, force_many=None): ret += field_repr(field.child_relation, force_many=field.child_relation) else: ret += field_repr(field) + + if serializer.validators: + ret += '\n' + indent_str + 'class Meta:' + ret += '\n' + indent_str + ' validators = ' + smart_repr(serializer.validators) + return ret diff --git a/tests/test_fields.py b/tests/test_fields.py index 3e102ab5a..96d09900e 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -85,7 +85,7 @@ class TestSource: class ExampleSerializer(serializers.Serializer): example_field = serializers.CharField(source='example_field') with pytest.raises(AssertionError) as exc_info: - ExampleSerializer() + ExampleSerializer().fields assert str(exc_info.value) == ( "It is redundant to specify `source='example_field'` on field " "'CharField' in serializer 'ExampleSerializer', because it is the " @@ -1018,7 +1018,7 @@ class TestSerializerMethodField: example_field = serializers.SerializerMethodField('get_example_field') with pytest.raises(AssertionError) as exc_info: - ExampleSerializer() + ExampleSerializer().fields assert str(exc_info.value) == ( "It is redundant to specify `get_example_field` on " "SerializerMethodField 'example_field' in serializer " diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 18170bc06..b8b621be8 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -181,7 +181,7 @@ class TestRegularFieldMappings(TestCase): fields = ('auto_field', 'invalid') with self.assertRaises(ImproperlyConfigured) as excinfo: - TestSerializer() + TestSerializer().fields expected = 'Field name `invalid` is not valid for model `ModelBase`.' assert str(excinfo.exception) == expected @@ -198,7 +198,7 @@ class TestRegularFieldMappings(TestCase): fields = ('auto_field',) with self.assertRaises(ImproperlyConfigured) as excinfo: - TestSerializer() + TestSerializer().fields expected = ( 'Field `missing` has been declared on serializer ' '`TestSerializer`, but is missing from `Meta.fields`.' diff --git a/tests/test_validators.py b/tests/test_validators.py index 6cc52c837..e6e0b23a8 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -86,10 +86,12 @@ class TestUniquenessTogetherValidation(TestCase): def test_repr(self): serializer = UniquenessTogetherSerializer() expected = dedent(""" - UniquenessTogetherSerializer(validators=[<UniqueTogetherValidator(queryset=UniquenessTogetherModel.objects.all(), fields=('race_name', 'position'))>]): + UniquenessTogetherSerializer(): id = IntegerField(label='ID', read_only=True) race_name = CharField(max_length=100) position = IntegerField() + class Meta: + validators = [<UniqueTogetherValidator(queryset=UniquenessTogetherModel.objects.all(), fields=('race_name', 'position'))>] """) assert repr(serializer) == expected @@ -173,10 +175,12 @@ class TestUniquenessForDateValidation(TestCase): def test_repr(self): serializer = UniqueForDateSerializer() expected = dedent(""" - UniqueForDateSerializer(validators=[<UniqueForDateValidator(queryset=UniqueForDateModel.objects.all(), field='slug', date_field='published')>]): + UniqueForDateSerializer(): id = IntegerField(label='ID', read_only=True) slug = CharField(max_length=100) published = DateField(required=True) + class Meta: + validators = [<UniqueForDateValidator(queryset=UniqueForDateModel.objects.all(), field='slug', date_field='published')>] """) assert repr(serializer) == expected @@ -231,10 +235,12 @@ class TestHiddenFieldUniquenessForDateValidation(TestCase): serializer = TestSerializer() expected = dedent(""" - TestSerializer(validators=[<UniqueForDateValidator(queryset=HiddenFieldUniqueForDateModel.objects.all(), field='slug', date_field='published')>]): + TestSerializer(): id = IntegerField(label='ID', read_only=True) slug = CharField(max_length=100) published = HiddenField(default=CreateOnlyDefault(<function now>)) + class Meta: + validators = [<UniqueForDateValidator(queryset=HiddenFieldUniqueForDateModel.objects.all(), field='slug', date_field='published')>] """) assert repr(serializer) == expected @@ -246,9 +252,11 @@ class TestHiddenFieldUniquenessForDateValidation(TestCase): serializer = TestSerializer() expected = dedent(""" - TestSerializer(validators=[<UniqueForDateValidator(queryset=HiddenFieldUniqueForDateModel.objects.all(), field='slug', date_field='published')>]): + TestSerializer(): id = IntegerField(label='ID', read_only=True) slug = CharField(max_length=100) published = DateTimeField(default=CreateOnlyDefault(<function now>), read_only=True) + class Meta: + validators = [<UniqueForDateValidator(queryset=HiddenFieldUniqueForDateModel.objects.all(), field='slug', date_field='published')>] """) assert repr(serializer) == expected From 964b3401fbcf27afcc2f1e41c5b0e7c538b1c68f Mon Sep 17 00:00:00 2001 From: Andy Baker <andy@andybak.net> Date: Sat, 1 Nov 2014 10:25:59 +0000 Subject: [PATCH 0993/1652] typo fix --- docs/topics/3.0-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 9aeb5df6f..f69c0b252 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -323,7 +323,7 @@ Alternatively, specify the field explicitly on the serializer class: #### Fields for model methods and properties. -With `ModelSerilizer` you can now specify field names in the `fields` option that refer to model methods or properties. For example, suppose you have the following model: +With `ModelSerializer` you can now specify field names in the `fields` option that refer to model methods or properties. For example, suppose you have the following model: class Invitation(models.Model): created = models.DateTimeField() From 56d054e6348a7806dd2591562d7738f1aa0bb002 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 11:06:45 +0000 Subject: [PATCH 0994/1652] Proper escaping of URLs when replacing query parameter --- rest_framework/templatetags/rest_framework.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index d9424f022..7251f0711 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -23,7 +23,7 @@ def replace_query_param(url, key, val): query_dict = QueryDict(query).copy() query_dict[key] = val query = query_dict.urlencode() - return urlparse.urlunsplit((scheme, netloc, path, query, fragment)) + return escape(urlparse.urlunsplit((scheme, netloc, path, query, fragment))) # Regex for adding classes to html snippets From b5c98f686d8aa8f249aa0270f8ee0560482d9538 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 11:10:24 +0000 Subject: [PATCH 0995/1652] Properly escape URLs when replacing query parameter --- rest_framework/templatetags/rest_framework.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 864d64dd0..7c914ed65 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -22,7 +22,7 @@ def replace_query_param(url, key, val): query_dict = QueryDict(query).copy() query_dict[key] = val query = query_dict.urlencode() - return urlparse.urlunsplit((scheme, netloc, path, query, fragment)) + return escape(urlparse.urlunsplit((scheme, netloc, path, query, fragment))) # Regex for adding classes to html snippets From 96bb77dc35a75df0fd9ad2fabb0f4661b2485600 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 11:20:18 +0000 Subject: [PATCH 0996/1652] Version 2.4.4 --- docs/topics/release-notes.md | 10 ++++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 16589f3b9..11d12ae32 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,16 @@ You can determine your currently installed version using `pip freeze`: ## 2.4.x series +### 2.4.4 + +**Date**: [3rd November 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.4+Release%22+). + +* **Security fix**: Escape URLs when replacing `format=` query parameter, as used in dropdown on `GET` button in browsable API to allow explicit selection of JSON vs HTML output. +* Maintain ordering of URLs in API root view for `DefaultRouter`. +* Fix `follow=True` in `APIRequestFactory` +* Resolve issue with invalid `read_only=True`, `required=True` fields being automatically generated by `ModelSerializer` in some cases. +* Resolve issue with `OPTIONS` requests returning incorrect information for views using `get_serializer_class` to dynamically determine serializer based on request method. + ### 2.4.3 **Date**: [19th September 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.3+Release%22+). diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 7f724c185..15b12d9be 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '2.4.3' +__version__ = '2.4.4' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2014 Tom Christie' From 650a91ac24cbd3e5b4ad5d7d7c6706fdf6160a78 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 11:29:48 +0000 Subject: [PATCH 0997/1652] Fix URL escaping --- rest_framework/templatetags/rest_framework.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 7c914ed65..84ba1b0a7 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -22,7 +22,7 @@ def replace_query_param(url, key, val): query_dict = QueryDict(query).copy() query_dict[key] = val query = query_dict.urlencode() - return escape(urlparse.urlunsplit((scheme, netloc, path, query, fragment))) + return urlparse.urlunsplit((scheme, netloc, path, query, fragment)) # Regex for adding classes to html snippets @@ -75,7 +75,7 @@ def add_query_param(request, key, val): """ iri = request.get_full_path() uri = iri_to_uri(iri) - return replace_query_param(uri, key, val) + return escape(replace_query_param(uri, key, val)) @register.filter From d27b8cc09b83bac10346effa1021493d2835b794 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 12:00:19 +0000 Subject: [PATCH 0998/1652] PUT as create docs, and move mixin out to external gist --- docs/api-guide/generic-views.md | 14 ++++++++++ docs/topics/3.0-announcement.md | 2 +- rest_framework/mixins.py | 48 --------------------------------- 3 files changed, 15 insertions(+), 49 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 49be0cae8..d2836fa6d 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -368,6 +368,20 @@ If you are using a mixin across multiple views, you can take this a step further Using custom base classes is a good option if you have custom behavior that consistently needs to be repeated across a large number of views throughout your project. +--- + +# PUT as create + +Prior to version 3.0 the REST framework mixins treated `PUT` as either an update or a create operation, depending on if the object already existed or not. + +Allowing `PUT` as create operations is problematic, as it necessarily exposes information about the existence or non-existance of objects. It's also not obvious that transparently allowing re-creating of previously deleted instances is necessarily a better default behavior than simply returning `404` responses. + +Both styles "`PUT` as 404" and "`PUT` as create" can be valid in different circumstances, but from version 3.0 onwards we now use 404 behavior as the default, due to it being simpler and more obvious. + +If you need to generic PUT-as-create behavior you may want to include something like [this `AllowPUTAsCreateMixin` class](https://gist.github.com/tomchristie/a2ace4577eff2c603b1b) as a mixin to your views. + +--- + # Third party packages The following third party packages provide additional generic view implementations. diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index f69c0b252..97ffdcf3f 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -694,7 +694,7 @@ Allowing `PUT` as create operations is problematic, as it necessarily exposes in Both styles "`PUT` as 404" and "`PUT` as create" can be valid in different circumstances, but we've now opted for the 404 behavior as the default, due to it being simpler and more obvious. -If you need to restore the previous behavior you can include the `AllowPUTAsCreateMixin` class in your view. This class can be imported from `rest_framework.mixins`. +If you need to restore the previous behavior you may want to include [this `AllowPUTAsCreateMixin` class](https://gist.github.com/tomchristie/a2ace4577eff2c603b1b) as a mixin to your views. #### Customizing error responses. diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 467ff5155..2074a1072 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -6,10 +6,8 @@ which allows mixin classes to be composed in interesting ways. """ from __future__ import unicode_literals -from django.http import Http404 from rest_framework import status from rest_framework.response import Response -from rest_framework.request import clone_request from rest_framework.settings import api_settings @@ -89,49 +87,3 @@ class DestroyModelMixin(object): def perform_destroy(self, instance): instance.delete() - - -# The AllowPUTAsCreateMixin was previously the default behaviour -# for PUT requests. This has now been removed and must be *explicitly* -# included if it is the behavior that you want. -# For more info see: ... - -class AllowPUTAsCreateMixin(object): - """ - The following mixin class may be used in order to support PUT-as-create - behavior for incoming requests. - """ - def update(self, request, *args, **kwargs): - partial = kwargs.pop('partial', False) - instance = self.get_object_or_none() - serializer = self.get_serializer(instance, data=request.data, partial=partial) - serializer.is_valid(raise_exception=True) - - if instance is None: - lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field - lookup_value = self.kwargs[lookup_url_kwarg] - extra_kwargs = {self.lookup_field: lookup_value} - serializer.save(**extra_kwargs) - return Response(serializer.data, status=status.HTTP_201_CREATED) - - serializer.save() - return Response(serializer.data) - - def partial_update(self, request, *args, **kwargs): - kwargs['partial'] = True - return self.update(request, *args, **kwargs) - - def get_object_or_none(self): - try: - return self.get_object() - except Http404: - if self.request.method == 'PUT': - # For PUT-as-create operation, we need to ensure that we have - # relevant permissions, as if this was a POST request. This - # will either raise a PermissionDenied exception, or simply - # return None. - self.check_permissions(clone_request(self.request, 'POST')) - else: - # PATCH requests where the object does not exist should still - # return a 404 response. - raise From d972df7c9c1867b4a0a57307f423a488c4d4f4b1 Mon Sep 17 00:00:00 2001 From: tanwanirahul <tanwanirahul@gmail.com> Date: Mon, 3 Nov 2014 14:43:53 +0100 Subject: [PATCH 0999/1652] Ability to override default method names by customizing it --- rest_framework/routers.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 169e6e8bc..d1c9fa1b9 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -176,23 +176,27 @@ class SimpleRouter(BaseRouter): if isinstance(route, DynamicDetailRoute): # Dynamic detail routes (@detail_route decorator) for httpmethods, methodname in detail_routes: + method_kwargs = getattr(viewset, methodname).kwargs + custom_method_name = method_kwargs.pop("custom_method_name", None) or methodname initkwargs = route.initkwargs.copy() - initkwargs.update(getattr(viewset, methodname).kwargs) + initkwargs.update(method_kwargs) ret.append(Route( - url=replace_methodname(route.url, methodname), + url=replace_methodname(route.url, custom_method_name), mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), - name=replace_methodname(route.name, methodname), + name=replace_methodname(route.name, custom_method_name), initkwargs=initkwargs, )) elif isinstance(route, DynamicListRoute): # Dynamic list routes (@list_route decorator) for httpmethods, methodname in list_routes: + method_kwargs = getattr(viewset, methodname).kwargs + custom_method_name = method_kwargs.pop("custom_method_name", None) or methodname initkwargs = route.initkwargs.copy() - initkwargs.update(getattr(viewset, methodname).kwargs) + initkwargs.update(method_kwargs) ret.append(Route( - url=replace_methodname(route.url, methodname), + url=replace_methodname(route.url, custom_method_name), mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), - name=replace_methodname(route.name, methodname), + name=replace_methodname(route.name, custom_method_name), initkwargs=initkwargs, )) else: From ea8c40520165fc33343fceb15221b770701bdedf Mon Sep 17 00:00:00 2001 From: tanwanirahul <tanwanirahul@gmail.com> Date: Mon, 3 Nov 2014 14:44:47 +0100 Subject: [PATCH 1000/1652] Tests for validating custom_method_name router attribute --- tests/test_routers.py | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/tests/test_routers.py b/tests/test_routers.py index f6f5a977a..d426f8320 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -8,6 +8,7 @@ from rest_framework.decorators import detail_route, list_route from rest_framework.response import Response from rest_framework.routers import SimpleRouter, DefaultRouter from rest_framework.test import APIRequestFactory +from collections import namedtuple factory = APIRequestFactory() @@ -260,6 +261,14 @@ class DynamicListAndDetailViewSet(viewsets.ViewSet): def detail_route_get(self, request, *args, **kwargs): return Response({'method': 'link2'}) + @list_route(custom_method_name="list_custom-route") + def list_custom_route_get(self, request, *args, **kwargs): + return Response({'method': 'link1'}) + + @detail_route(custom_method_name="detail_custom-route") + def detail_custom_route_get(self, request, *args, **kwargs): + return Response({'method': 'link2'}) + class TestDynamicListAndDetailRouter(TestCase): def setUp(self): @@ -268,22 +277,33 @@ class TestDynamicListAndDetailRouter(TestCase): def test_list_and_detail_route_decorators(self): routes = self.router.get_routes(DynamicListAndDetailViewSet) decorator_routes = [r for r in routes if not (r.name.endswith('-list') or r.name.endswith('-detail'))] + + MethodNamesMap = namedtuple('MethodNamesMap', 'method_name custom_method_name') # Make sure all these endpoints exist and none have been clobbered - for i, endpoint in enumerate(['list_route_get', 'list_route_post', 'detail_route_get', 'detail_route_post']): + for i, endpoint in enumerate([MethodNamesMap('list_custom_route_get', 'list_custom-route'), + MethodNamesMap('list_route_get', 'list_route_get'), + MethodNamesMap('list_route_post', 'list_route_post'), + MethodNamesMap('detail_custom_route_get', 'detail_custom-route'), + MethodNamesMap('detail_route_get', 'detail_route_get'), + MethodNamesMap('detail_route_post', 'detail_route_post') + ]): route = decorator_routes[i] # check url listing - if endpoint.startswith('list_'): + method_name = endpoint.method_name + custom_method_name = endpoint.custom_method_name + + if method_name.startswith('list_'): self.assertEqual(route.url, - '^{{prefix}}/{0}{{trailing_slash}}$'.format(endpoint)) + '^{{prefix}}/{0}{{trailing_slash}}$'.format(custom_method_name)) else: self.assertEqual(route.url, - '^{{prefix}}/{{lookup}}/{0}{{trailing_slash}}$'.format(endpoint)) + '^{{prefix}}/{{lookup}}/{0}{{trailing_slash}}$'.format(custom_method_name)) # check method to function mapping - if endpoint.endswith('_post'): + if method_name.endswith('_post'): method_map = 'post' else: method_map = 'get' - self.assertEqual(route.mapping[method_map], endpoint) + self.assertEqual(route.mapping[method_map], method_name) class TestRootWithAListlessViewset(TestCase): From 9ce130d1b56039b0b7a7b04024f95c8c49c8fff7 Mon Sep 17 00:00:00 2001 From: Rocky Meza <rocky@fusionbox.com> Date: Mon, 3 Nov 2014 06:56:42 -0700 Subject: [PATCH 1001/1652] Fixed some typos in 3.0 release notes --- docs/topics/3.0-announcement.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 97ffdcf3f..f9987ad0f 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -748,7 +748,7 @@ You can revert this behavior, and display filenames in the representation by usi You can also modify serializer fields individually, using the `use_url` argument: - uploaded_file = serializers.FileField(user_url=False) + uploaded_file = serializers.FileField(use_url=False) Also note that you should pass the `request` object to the serializer as context when instantiating it, so that a fully qualified URL can be returned. Returned URLs will then be of the form `https://example.com/url_path/filename.txt`. For example: @@ -790,7 +790,7 @@ You can modify this behavior globally by using the `COERCE_DECIMAL_TO_STRING` se 'COERCE_DECIMAL_TO_STRING': False } -Or modify it on an individual serializer field, using the `corece_to_string` keyword argument. +Or modify it on an individual serializer field, using the `coerce_to_string` keyword argument. # Return `Decimal` instances in `serializer.data`, not strings. amount = serializers.DecimalField( From 003c42b0f51f9bfa93964be69fb8cb68b7394280 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 14:01:02 +0000 Subject: [PATCH 1002/1652] Use invalid_data key for error message. Closes #2002. --- rest_framework/serializers.py | 10 +++++++++- tests/test_validation.py | 7 +++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 82e932ddd..f00b685f4 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -15,6 +15,7 @@ from django.db import models from django.db.models.fields import FieldDoesNotExist from django.utils import six from django.utils.datastructures import SortedDict +from django.utils.translation import ugettext_lazy as _ from rest_framework.exceptions import ValidationError from rest_framework.fields import empty, set_value, Field, SkipField from rest_framework.settings import api_settings @@ -282,6 +283,10 @@ class SerializerMetaclass(type): @six.add_metaclass(SerializerMetaclass) class Serializer(BaseSerializer): + default_error_messages = { + 'invalid': _('Invalid data. Expected a dictionary, but got {datatype}.') + } + @property def fields(self): if not hasattr(self, '_fields'): @@ -339,8 +344,11 @@ class Serializer(BaseSerializer): return None if not isinstance(data, dict): + message = self.error_messages['invalid'].format( + datatype=type(data).__name__ + ) raise ValidationError({ - api_settings.NON_FIELD_ERRORS_KEY: ['Invalid data'] + api_settings.NON_FIELD_ERRORS_KEY: [message] }) value = self.to_internal_value(data) diff --git a/tests/test_validation.py b/tests/test_validation.py index 4d64e6e11..1b6aa358d 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -87,8 +87,11 @@ class TestAvoidValidation(TestCase): def test_serializer_errors_has_only_invalid_data_error(self): serializer = ValidationSerializer(data='invalid data') self.assertFalse(serializer.is_valid()) - self.assertDictEqual(serializer.errors, - {'non_field_errors': ['Invalid data']}) + self.assertDictEqual(serializer.errors, { + 'non_field_errors': [ + 'Invalid data. Expected a dictionary, but got unicode.' + ] + }) # regression tests for issue: 1493 From 2b535954cdfb050f96588c60d45664b3802dcc25 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 14:14:12 +0000 Subject: [PATCH 1003/1652] Py2/3 compat for validation test --- tests/test_validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_validation.py b/tests/test_validation.py index 1b6aa358d..c278d90f3 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -89,7 +89,7 @@ class TestAvoidValidation(TestCase): self.assertFalse(serializer.is_valid()) self.assertDictEqual(serializer.errors, { 'non_field_errors': [ - 'Invalid data. Expected a dictionary, but got unicode.' + 'Invalid data. Expected a dictionary, but got %s.' % type('').__name__ ] }) From 0da30e6d1dea68d7c075067dd997fb1e0e26f27b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 14:43:00 +0000 Subject: [PATCH 1004/1652] Add note about 3.0 being merged to master --- README.md | 8 +++++++- docs/index.md | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ec13e1b33..394d7fcf4 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,13 @@ **Awesome web-browseable Web APIs.** -**Note**: Full documentation for the project is available at [http://www.django-rest-framework.org][docs]. +Full documentation for the project is available at [http://www.django-rest-framework.org][docs]. + +--- + +**Note**: The incoming 3.0 version has now been merged to the `master` branch on GitHub. For the source of the currently available PyPI version, please see the `2.4.4` tag. + +--- # Overview diff --git a/docs/index.md b/docs/index.md index 5b31cc830..6288efa3c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,6 +9,10 @@ --- +**Note**: The incoming 3.0 version has now been merged to the `master` branch on GitHub. For the source of the currently available PyPI version, please see the `2.4.4` tag. + +--- + <p> <h1 style="position: absolute; width: 1px; @@ -43,8 +47,6 @@ Some reasons you might want to use REST framework: **Above**: *Screenshot from the browsable API* ----- - ## Requirements REST framework requires the following: From 21d06a4103d1966cd6e19f7cc6f3c6e450cc1680 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 15:03:10 +0000 Subject: [PATCH 1005/1652] Added NON_FIELD_ERRORS_KEY to serializer docs. Closes #1971. --- docs/api-guide/settings.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 6a855c929..2144a2ed3 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -399,6 +399,12 @@ This should be a function with the following signature: Default: `'rest_framework.views.exception_handler'` +#### NON_FIELD_ERRORS_KEY + +A string representing the key that should be used for serializer errors that do not refer to a specific field, but are instead general errors. + +Default: `'non_field_errors'` + #### URL_FIELD_NAME A string representing the key that should be used for the URL fields generated by `HyperlinkedModelSerializer`. From 78ac332f18c51bb151ae32f1f3d207595b0b3ca2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 15:08:19 +0000 Subject: [PATCH 1006/1652] Add docs on Meta inheritance. Closes #1926. --- docs/api-guide/serializers.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index a3694510e..eeeffa136 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -413,6 +413,16 @@ Alternative representations include serializing using hyperlinks, serializing co For full details see the [serializer relations][relations] documentation. +## Inheritance of the 'Meta' class + +The inner `Meta` class on serializers is not inherited from parent classes by default. This is the same behaviour as with Django's `Model` and `ModelForm` classes. If you want the `Meta` class to inherit from a parent class you must do so explicitly. For example: + + class AccountSerializer(MyBaseSerializer): + class Meta(MyBaseSerializer.Meta): + model = Account + +Typically we would recommend *not* using inheritance on inner Meta classes, but instead declaring all options explicitly. + --- # HyperlinkedModelSerializer From 09f3eedb235b476202cbd4e5a94b883898f3f661 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 15:23:16 +0000 Subject: [PATCH 1007/1652] Add notes re view-level and instance-level permissions checks. Closes #1819. --- docs/api-guide/permissions.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index e867a4569..f3ae81717 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -183,11 +183,7 @@ If you need to test if a request is a read operation or a write operation, you s --- -**Note**: In versions 2.0 and 2.1, the signature for the permission checks always included an optional `obj` parameter, like so: `.has_permission(self, request, view, obj=None)`. The method would be called twice, first for the global permission checks, with no object supplied, and second for the object-level check when required. - -As of version 2.2 this signature has now been replaced with two separate method calls, which is more explicit and obvious. The old style signature continues to work, but its use will result in a `PendingDeprecationWarning`, which is silent by default. In 2.3 this will be escalated to a `DeprecationWarning`, and in 2.4 the old-style signature will be removed. - -For more details see the [2.2 release announcement][2.2-announcement]. +**Note**: The instance-level `has_object_permission` method will only be called if the view-level `has_permission` checks have already passed. Also note that in order for the instance-level checks to run, the view code should explicitly call `.check_object_permissions(request, obj)`. If you are using the generic views then this will be handled for you by default. --- From 5d7b8356082e7c70f2723d1773c13125a4608dcc Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 16:17:53 +0000 Subject: [PATCH 1008/1652] Tweaks to validation notes --- docs/topics/3.0-announcement.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index f9987ad0f..b30643c00 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -188,14 +188,11 @@ Alternatively if you want the errors to be against a specific field, use a dicti This ensures you can still write validation that compares all the input fields, but that marks the error against a particular field. -#### Limitations of ModelSerializer validation. +#### Differences between ModelSerializer validation and ModelForm. -This change also means that we no longer use the `.full_clean()` method on model instances, but instead perform all validation explicitly on the serializer. This gives a cleaner separation, and ensures that there's no automatic validation behavior on `ModelSerializer` classes that can't also be easily replicated on regular `Serializer` classes. +This change also means that we no longer use the `.full_clean()` method on model instances, but instead perform all validation explicitly on the serializer. This gives a cleaner separation, and ensures that there's no automatic validation behaviour on `ModelSerializer` classes that can't also be easily replicated on regular `Serializer` classes. -This change comes with the following limitations: - -* The model `.clean()` method will not be called as part of serializer validation. Use the serializer `.validate()` method to perform a final validation step on incoming data where required. -* The `.unique_for_date`, `.unique_for_month` and `.unique_for_year` options on model fields are not automatically validated. Again, you'll need to handle these explicitly on the serializer if required. +It's important to note that this change also means that the model `.clean()` method will not be called as part of serializer validation, as it would be if using a `ModelForm`. Use the serializer `.validate()` method to perform a final validation step on incoming data where required. #### Writable nested serialization. From 1925d465ae0c3558d6919e56ee753602ac61119f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 3 Nov 2014 16:42:00 +0000 Subject: [PATCH 1009/1652] Call out 'get_value' and 'get_attribute' --- docs/topics/3.0-announcement.md | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index b30643c00..78abc5eec 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -562,7 +562,26 @@ The `MultipleChoiceField` class has been added. This field acts like `ChoiceFiel The `from_native(self, value)` and `to_native(self, data)` method names have been replaced with the more obviously named `to_internal_value(self, data)` and `to_representation(self, value)`. -The `field_from_native()` and `field_to_native()` methods are removed. +The `field_from_native()` and `field_to_native()` methods are removed. Previously you could use these methods if you wanted to customise the behaviour in a way that did not simply lookup the field value from the object. For example... + + def field_to_native(self, obj, field_name): + """A custom read-only field that returns the class name.""" + return obj.__class__.__name__ + +Now if you need to access the entire object you'll instead need to override one or both of the following: + +* Use `get_attribute` to modify the attribute value passed to `to_representation()`. +* Use `get_value` to modify the data value passed `to_internal_value()`. + +For example: + + def get_attribute(self, obj): + # Pass the entire object through to `to_representation()`, + # instead of the standard attribute lookup. + return obj + + def to_representation(self, value): + return value.__class__.__name__ #### Explicit `queryset` required on relational fields. From 3375fecc8bf8f8ba781d952e6dd5986b947a7ec2 Mon Sep 17 00:00:00 2001 From: Tom Davis <tom@recursivedream.com> Date: Mon, 3 Nov 2014 15:05:45 -0500 Subject: [PATCH 1010/1652] Fix typo That's all. --- docs/topics/3.0-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 78abc5eec..e8428bc20 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -369,7 +369,7 @@ This class implements the same basic API as the `Serializer` class: * `.errors` - Returns an errors during validation. * `.save()` - Persists the validated data into an object instance. -There are four mathods that can be overriding, depending on what functionality you want the serializer class to support: +There are four methods that can be overridden, depending on what functionality you want the serializer class to support: * `.to_representation()` - Override this to support serialization, for read operations. * `.to_internal_value()` - Override this to support deserialization, for write operations. From 735240569733ae40b96f83e15e7a19faee3b44bf Mon Sep 17 00:00:00 2001 From: Sumana Harihareswara <sumanah@panix.com> Date: Tue, 4 Nov 2014 17:18:13 -0500 Subject: [PATCH 1011/1652] Updated book link in HATEOAS page Per http://www.crummy.com/2013/10/03/0 , the new book is *RESTful Web APIs* and the old book, *RESTful Web Services*, is obsolete. --- docs/topics/rest-hypermedia-hateoas.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/rest-hypermedia-hateoas.md b/docs/topics/rest-hypermedia-hateoas.md index 3d7004880..4e3ccf924 100644 --- a/docs/topics/rest-hypermedia-hateoas.md +++ b/docs/topics/rest-hypermedia-hateoas.md @@ -13,7 +13,7 @@ The following fall into the "required reading" category. * Roy Fielding's dissertation - [Architectural Styles and the Design of Network-based Software Architectures][dissertation]. * Roy Fielding's "[REST APIs must be hypertext-driven][hypertext-driven]" blog post. -* Leonard Richardson & Sam Ruby's [RESTful Web Services][restful-web-services]. +* Leonard Richardson & Mike Amundsen's [RESTful Web APIs][restful-web-apis]. * Mike Amundsen's [Building Hypermedia APIs with HTML5 and Node][building-hypermedia-apis]. * Steve Klabnik's [Designing Hypermedia APIs][designing-hypermedia-apis]. * The [Richardson Maturity Model][maturitymodel]. @@ -37,7 +37,7 @@ What REST framework doesn't do is give you is machine readable hypermedia format [cite]: http://vimeo.com/channels/restfest/page:2 [dissertation]: http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm [hypertext-driven]: http://roy.gbiv.com/untangled/2008/rest-apis-must-be-hypertext-driven -[restful-web-services]: http://www.amazon.com/Restful-Web-Services-Leonard-Richardson/dp/0596529260 +[restful-web-apis]: http://restfulwebapis.org/ [building-hypermedia-apis]: http://www.amazon.com/Building-Hypermedia-APIs-HTML5-Node/dp/1449306578 [designing-hypermedia-apis]: http://designinghypermediaapis.com/ [restisover]: http://blog.steveklabnik.com/posts/2012-02-23-rest-is-over From 4d3831cae8753a1580adc23d580e6fd0f73953a7 Mon Sep 17 00:00:00 2001 From: Aron Jones <aron.jones@gmail.com> Date: Tue, 4 Nov 2014 22:01:23 -0500 Subject: [PATCH 1012/1652] add glyphicons font files --- .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20335 bytes .../fonts/glyphicons-halflings-regular.svg | 229 ++++++++++++++++++ .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41280 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23320 bytes 4 files changed, 229 insertions(+) create mode 100644 rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.eot create mode 100644 rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.svg create mode 100644 rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.ttf create mode 100644 rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.woff diff --git a/rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.eot b/rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 0000000000000000000000000000000000000000..4a4ca865d67e86f961bc6e2ef00bffa4e34bb9ed GIT binary patch literal 20335 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 literal 0 HcmV?d00001 diff --git a/rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.svg b/rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 000000000..25691af8f --- /dev/null +++ b/rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,229 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > +<svg xmlns="http://www.w3.org/2000/svg"> +<metadata></metadata> +<defs> +<font id="glyphicons_halflingsregular" horiz-adv-x="1200" > +<font-face units-per-em="1200" ascent="960" descent="-240" /> +<missing-glyph horiz-adv-x="500" /> +<glyph /> +<glyph /> +<glyph unicode=" " /> +<glyph unicode=" " /> +<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" /> +<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" /> +<glyph unicode=" " /> +<glyph unicode=" " horiz-adv-x="652" /> +<glyph unicode=" " horiz-adv-x="1304" /> +<glyph unicode=" " horiz-adv-x="652" /> +<glyph unicode=" " horiz-adv-x="1304" /> +<glyph unicode=" " horiz-adv-x="434" /> +<glyph unicode=" " horiz-adv-x="326" /> +<glyph unicode=" " horiz-adv-x="217" /> +<glyph unicode=" " horiz-adv-x="217" /> +<glyph unicode=" " horiz-adv-x="163" /> +<glyph unicode=" " horiz-adv-x="260" /> +<glyph unicode=" " horiz-adv-x="72" /> +<glyph unicode=" " horiz-adv-x="260" /> +<glyph unicode=" " horiz-adv-x="326" /> +<glyph unicode="€" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" /> +<glyph unicode="−" d="M200 400h900v300h-900v-300z" /> +<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" /> +<glyph unicode="☁" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" /> +<glyph unicode="✉" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" /> +<glyph unicode="✏" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" /> +<glyph unicode="" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" /> +<glyph unicode="" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" /> +<glyph unicode="" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" /> +<glyph unicode="" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" /> +<glyph unicode="" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" /> +<glyph unicode="" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" /> +<glyph unicode="" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" /> +<glyph unicode="" d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z" /> +<glyph unicode="" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" /> +<glyph unicode="" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" /> +<glyph unicode="" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" /> +<glyph unicode="" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" /> +<glyph unicode="" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" /> +<glyph unicode="" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" /> +<glyph unicode="" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" /> +<glyph unicode="" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" /> +<glyph unicode="" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" /> +<glyph unicode="" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" /> +<glyph unicode="" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" /> +<glyph unicode="" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z" /> +<glyph unicode="" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" /> +<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z" /> +<glyph unicode="" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" /> +<glyph unicode="" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" /> +<glyph unicode="" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z" /> +<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z" /> +<glyph unicode="" d="M0 25v475l200 700h800l199 -700l1 -475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" /> +<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" /> +<glyph unicode="" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" /> +<glyph unicode="" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" /> +<glyph unicode="" d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z" /> +<glyph unicode="" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" /> +<glyph unicode="" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" /> +<glyph unicode="" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z" /> +<glyph unicode="" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z" /> +<glyph unicode="" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" /> +<glyph unicode="" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" /> +<glyph unicode="" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" /> +<glyph unicode="" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" /> +<glyph unicode="" d="M0 700l1 475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" /> +<glyph unicode="" d="M1 700l1 475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" /> +<glyph unicode="" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" /> +<glyph unicode="" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" /> +<glyph unicode="" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" /> +<glyph unicode="" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" /> +<glyph unicode="" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" /> +<glyph unicode="" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v71l471 -1q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" /> +<glyph unicode="" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" /> +<glyph unicode="" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " /> +<glyph unicode="" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" /> +<glyph unicode="" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" /> +<glyph unicode="" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" /> +<glyph unicode="" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z" /> +<glyph unicode="" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" /> +<glyph unicode="" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" /> +<glyph unicode="" d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z" /> +<glyph unicode="" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z" /> +<glyph unicode="" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z" /> +<glyph unicode="" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " /> +<glyph unicode="" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z" /> +<glyph unicode="" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" /> +<glyph unicode="" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 139t-64 210zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" /> +<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" /> +<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" /> +<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q61 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l567 567l-137 137l-430 -431l-146 147z" /> +<glyph unicode="" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" /> +<glyph unicode="" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" /> +<glyph unicode="" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" /> +<glyph unicode="" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z" /> +<glyph unicode="" d="M200 0l900 550l-900 550v-1100z" /> +<glyph unicode="" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" /> +<glyph unicode="" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" /> +<glyph unicode="" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" /> +<glyph unicode="" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" /> +<glyph unicode="" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" /> +<glyph unicode="" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" /> +<glyph unicode="" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z" /> +<glyph unicode="" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z" /> +<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" /> +<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h600v200h-600v-200z" /> +<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141 z" /> +<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" /> +<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM364 700h143q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5 q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5 -12t-75 -38.5t-53.5 -74.5t-19 -114zM500 300h200v100h-200 v-100z" /> +<glyph unicode="" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" /> +<glyph unicode="" d="M0 500v200h195q31 125 98.5 199.5t206.5 100.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200v-206 q149 48 201 206h-201v200h200q-25 74 -75.5 127t-124.5 77v-204h-200v203q-75 -23 -130 -77t-79 -126h209v-200h-210z" /> +<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" /> +<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z" /> +<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" /> +<glyph unicode="" d="M0 547l600 453v-300h600v-300h-600v-301z" /> +<glyph unicode="" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z" /> +<glyph unicode="" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z" /> +<glyph unicode="" d="M104 600h296v600h300v-600h298l-449 -600z" /> +<glyph unicode="" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z" /> +<glyph unicode="" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" /> +<glyph unicode="" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" /> +<glyph unicode="" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5h-207q-21 0 -33 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" /> +<glyph unicode="" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111q1 1 1 6.5t-1.5 15t-3.5 17.5l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6 h-111v-100zM100 0h400v400h-400v-400zM200 900q-3 0 14 48t36 96l18 47l213 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" /> +<glyph unicode="" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" /> +<glyph unicode="" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" /> +<glyph unicode="" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" /> +<glyph unicode="" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" /> +<glyph unicode="" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 34 -48 36.5t-48 -29.5l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" /> +<glyph unicode="" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32 0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" /> +<glyph unicode="" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" /> +<glyph unicode="" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" /> +<glyph unicode="" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" /> +<glyph unicode="" d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" /> +<glyph unicode="" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z" /> +<glyph unicode="" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z" /> +<glyph unicode="" d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z" /> +<glyph unicode="" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z" /> +<glyph unicode="" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" /> +<glyph unicode="" d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z" /> +<glyph unicode="" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" /> +<glyph unicode="" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" /> +<glyph unicode="" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" /> +<glyph unicode="" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3 4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" /> +<glyph unicode="" d="M74 350q0 21 13.5 35.5t33.5 14.5h18l117 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18 -36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-8 -3 -23 -8.5 t-65 -20t-103 -25t-132.5 -19.5t-158.5 -9q-125 0 -245.5 20.5t-178.5 40.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" /> +<glyph unicode="" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" /> +<glyph unicode="" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q124 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 213l100 212h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" /> +<glyph unicode="" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q124 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" /> +<glyph unicode="" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z" /> +<glyph unicode="" d="M-101 651q0 72 54 110t139 38l302 -1l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 17 -10.5t26.5 -26t16.5 -36.5v-526q0 -13 -86 -93.5t-94 -80.5h-341q-16 0 -29.5 20t-19.5 41l-130 339h-107q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l107 89v502l-343 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM1000 201v600h200v-600h-200z" /> +<glyph unicode="" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6.5v7.5v6.5v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" /> +<glyph unicode="" d="M2 585q-16 -31 6 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM77 565l236 339h503 l89 -100v-294l-340 -130q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" /> +<glyph unicode="" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM298 701l2 -201h300l-2 -194l402 294l-402 298v-197h-300z" /> +<glyph unicode="" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l402 -294l-2 194h300l2 201h-300v197z" /> +<glyph unicode="" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" /> +<glyph unicode="" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" /> +<glyph unicode="" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60 q12 0 23 -5.5t23 -15t20 -13.5q24 -12 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49t20.5 62q-14 9 -37 9.5t-36 7.5q-14 7 -49 15t-52 19q-9 0 -39.5 -0.5 t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5 q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 39 2 44q31 -13 58 -14.5t39 3.5l11 4q7 36 -16.5 53.5t-64.5 28.5t-56 23q-19 -3 -37 0 q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -45.5 0.5t-45.5 -2.5q-21 -7 -52 -26.5t-34 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5zM518 916q3 12 16 30t16 25q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -24 17 -66.5t17 -43.5 q-9 2 -31 5t-36 5t-32 8t-30 14zM692 1003h1h-1z" /> +<glyph unicode="" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" /> +<glyph unicode="" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" /> +<glyph unicode="" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" /> +<glyph unicode="" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" /> +<glyph unicode="" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" /> +<glyph unicode="" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM514 609q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-14 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" /> +<glyph unicode="" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -78.5 -16.5t-67.5 -51.5l-389 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23 q38 0 53 -36q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60 l517 511q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" /> +<glyph unicode="" d="M80 784q0 131 98.5 229.5t230.5 98.5q143 0 241 -129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100q-71 70 -104.5 105.5t-77 89.5t-61 99 t-17.5 91zM250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-105 48.5q-74 0 -132 -83l-118 -171l-114 174q-51 80 -123 80q-60 0 -109.5 -49.5t-49.5 -118.5z" /> +<glyph unicode="" d="M57 353q0 -95 66 -159l141 -142q68 -66 159 -66q93 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-8 9 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141q7 -7 19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -17q47 -49 77 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" /> +<glyph unicode="" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" /> +<glyph unicode="" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" /> +<glyph unicode="" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6 1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5 zM700 237q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" /> +<glyph unicode="" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5 -69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q33 1 103 -16t103 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221z" /> +<glyph unicode="" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" /> +<glyph unicode="" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" /> +<glyph unicode="" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" /> +<glyph unicode="" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" /> +<glyph unicode="" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" /> +<glyph unicode="" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z" /> +<glyph unicode="" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z" /> +<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z" /> +<glyph unicode="" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z" /> +<glyph unicode="" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" /> +<glyph unicode="" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" /> +<glyph unicode="" d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z" /> +<glyph unicode="" d="M217 519q8 -19 31 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8h9q14 0 26 15q11 13 274.5 321.5t264.5 308.5q14 19 5 36q-8 17 -31 17l-301 -1q1 4 78 219.5t79 227.5q2 15 -5 27l-9 9h-9q-15 0 -25 -16q-4 -6 -98 -111.5t-228.5 -257t-209.5 -237.5q-16 -19 -6 -41 z" /> +<glyph unicode="" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " /> +<glyph unicode="" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z" /> +<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z" /> +<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z" /> +<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z" /> +<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z" /> +<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 400l697 1l3 699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" /> +<glyph unicode="" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l249 -237l-1 697zM900 150h100v50h-100v-50z" /> +<glyph unicode="" d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z" /> +<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z" /> +<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" /> +<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z" /> +<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z" /> +<glyph unicode="" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z" /> +<glyph unicode="" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" /> +<glyph unicode="" d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z" /> +<glyph unicode="" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -116q-25 -17 -43.5 -51.5t-18.5 -65.5v-359z" /> +<glyph unicode="" d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" /> +<glyph unicode="" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" /> +<glyph unicode="" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q17 18 13.5 41t-22.5 37l-192 136q-19 14 -45 12t-42 -19l-118 -118q-142 101 -268 227t-227 268l118 118q17 17 20 41.5t-11 44.5 l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" /> +<glyph unicode="" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-20 0 -35 14.5t-15 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" /> +<glyph unicode="" d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z" /> +<glyph unicode="" d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" /> +<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" /> +<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" /> +<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z" /> +<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z" /> +<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z" /> +<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" /> +<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" /> +<glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z" /> +<glyph unicode="" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z" /> +<glyph unicode="" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z" /> +<glyph unicode="" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300h200 l-300 -300z" /> +<glyph unicode="" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104.5t60.5 178.5q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" /> +<glyph unicode="" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" /> +<glyph unicode="" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" /> +</font> +</defs></svg> \ No newline at end of file diff --git a/rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.ttf b/rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..67fa00bf83801d2fa568546b982c80d27f6ef74e GIT binary patch literal 41280 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℞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 literal 0 HcmV?d00001 diff --git a/rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.woff b/rest_framework/static/rest_framework/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 0000000000000000000000000000000000000000..8c54182aa5d4d1ab3c9171976b615c1dcb1dc187 GIT binary patch literal 23320 zcmY&<V{j&2v~_ITn%EQDwryvUOl&(7+qP}nwr%T)@#Xz))vdaxYSlh#^~UKsfBJOq zc9j<s0|Ey68QNGt$p6_qf&bzE&HwKZ6H}1|0s{8?QStu6AJzU_aS>6mA1(8T6a0V( z7zzkXUYUXEN9+9I!ap!DFOd#1wlTB=0s{G=z_>rwLFyJd-Ppy62nY!Dzg$rNAC#b> zW_IQ_KN{(eU)_(Nsd6JjiMgTUPb}E#|M~#|A(>mdoBe3JKtOVEKtTU^2nd*oEldqf zfPj=PfBaZ}zy@NZ@n!KN0s$!#{qX<lkisy5AzIitx&3H7KQ+*PYCQJ!AxB%=8vppI zDEw#@KWJr%QIoSVbo;5R`tcL@Upx^A7;x@iLmN{dAhn-dzyUw&^jfS*yRx%&bOHiW z&;8*7KerOpCRS`|=V1C1tF`+RNB<vc?`hCnO^trmtc~=;A^w9#jneUt1^xlhByaxA ze|82A<NkjvG`-upv4M$!!7iu~Gz5}?kpWo0w!kFF@oyj?_)=haAfW%Qn^~G<_V$kV z_D>Et`TP45!w50c8!{TL10RAG)dniu*zrR^LTrn}O+tRb0xd~0E&>H($0brSGJ*iX z8bUAs<d}-%mmV-c8osevmk6I%5UC7vh0-by)a@7&y&?k3<Z9wTgT)U|*lKsVAQ_rM z+&xXPgm8?(&&*sD4SGrU6V}DU^V<FD+WbVgCL;-D+8{ONP3x|b(K?Z}FqQyDA8lEK zfxcR(LOT*zcWBYweqCi%t<h2v=dH4k#a&-ac4;gT#=k%#pf1hx|HU#VgeV+oAC)04 z6<?!EWj}**203RT=#5@wm77PFeIX#u<?oLuhz~4>lphEzmTHiWB72`anLv4VuEY~_ za}WVZu^zT;R-~y&T~BYSiJ>00^O~gpl9q$zHI%Y>Lhsr-MaOrb%y%q|(42pX<4bce z&%S(EIYGx}q8~@4pX*EKdS?h=SI&tEv`GGM8)AScL0;U}brn10v;~p2;1NOn2Um$W z*U=i%VuwBRz@Z11qKr(qgO8vr*&X5{?12dd{6*l`Yp`?k3MDcih%qI+g!qV2n61L{ zS-80y9H-NmrN`sSUC*p$lut-w`?nyb*goYXni_zf3okCBA{zrCwXDq^$DQB5U?DQ* z61o2X9r4;yA!5sN`)f6pe9e8pguH(cK5%0-vMf9<azURFgB@qsO9$RyPqj}Vz6C7p z88I>zrWWth^A{_9wXmH0nW$}wo9hf@Mt&V*5m2_W0Zac{Bwl*3N0W}7D6V5mO|AbT zMePe7b5d1qntWOB)2(kfH3+1h@`qd<P;-YPKtLo%n{Oc<r-es;GO8GaLQcSg;XK+L z`zjQ8l|UKpl$7E=2x)>Cj$7%?Ws`6C=E;z?vBmFy(ZuU>?ZKAjdKnE_$3iyZHlp%_ z77-FteGS2x>7s==RC=EgNc20pi}B5ZYP?<*;Yn$7M)<7;<>9ljc|Q@}q1HAXA>?XX z{-<=FYU*8Yx_bmPn*eq|(6}#S=KV{`|BZ*Xn#BSEOxT0n<2%3UJglM<ldqm)p{Gvk zznudH0{;F6LUdd2>Vh`FJxT)N*_o6m(8iH0h%=F{CzZaZ8j3d^x{KT0bRC__^79ko z=tr+cA_{hBgbop+gr}pTjdh4lR9OGJYID{f-h7TdFVsTYrJ)sVL)@`Nes|mRJSCBQ z1vY;D{cTS=MK<Mm<GJ&`%?mft_#5sOZl&KYvbRt=XbdhHJlmT=n+fO3rgpNfb}W&D z$GUgGv~Lt2mll;L8@0fQgkpGOlooKs|D9&V`DBLsjvB%!T0F|Im%_-jFit5WR(FD? zq*|$&|H2%85^FR{eO*psA`Lu0CUbFjSWp%~dpsCGD^gTSTR7NCSqLNA&)akG3eyQy z61~KRD9@D}JvRXa5Aikku9YS#v)0d;<>u(Wy%|e~Iy~QIi?KJEB~oXKHbERbMSWb} zZ$4oLo6Q7!JY7E&nSn99sadal3PMV~{548>MpAHY2H1T`ZcmF;%7p*Gd@)Z2X$V%V z$1bYU`a7{N-&8b(7EKxaD_#{2yNI&{t3rygLIQh8i%wdtQ^A4QWPw@AUkIZjStyRy zt6gfVP}$xz$w}4TO!~910gWc?ujr|I`%rxo*~ZRJj0)|c2kf0tb<J$b#5f=4c81x( zZ%7)E;8Mka7RH<jgof8lMaE&{G8Renh!ku+hV5hxuca?UHbk792|7)*r{|fpGvXD@ zr9iQI*zKu>H}jLi*?h7#a}r#3UcIh%=Rq+9Oy<}9gOY2vy$@K}ixTio-4X=M1@9qI z^=K!qz=h?boc7!Dn&O<!kiOq#v5G#>o<J`XvhMyBD8Vy{aO<O>iZq*aBh4h7*kXhO z>pcXk->0DSLp`H8gAy`9imj3RrTwYMLn%~ax2R;y6z$S#bv?dXh$n!f{I%|F6CUzH zNglJr&iX(OdhO|M-zijiorLRikL!4b&v<-I;cb2U*9AhJqg6Km0|C@3UPi3VuIeHB zE<VAre{dbMO!g>vJkk^d768V;-U<9n39<fS4Z!%OE6P*)w|cf~z&NJ9q>OEzwHebV z^!;=ohVM{+SKmNmc(fHuOajOg)eZg4gP9Z?_0r_5C&wd<_hxoo_+<48kwZJ{Y3kdj z-euRxbNtS4ORoUDw~*0{d?YbybVf*Z&j3f0Df|p6wtg}#){z60vHIVDYyvXYiqt<E zv42ntRD|g6;QriC<grTFp5B)Lqd3|98*VJr$rST6j1b8XNyF5`p`cVWJdx#RkA#3e zK~fI0Lv34q9~2^ftGRpUzt2|_Cshs_!#Ws{m%d-|Pq~eGfxM2-tNOYQxA)ybo&tPr zy}D*~4m(FY$#qBh{JlV|hcVkn-@(3qcZ{-=R5EM+SZ&PVI;!a`!xqz&hp{B8=wre4 zg1>w5fLstI@;wPh+Bd5ldW?|#AJXDCfR%eUYew_;&(+g6-=ThC?S3>8w7??8cY@rx zXANRWBOACbA6cC_l4+aF!&NSKMmj<F50TeM^11=0$IbOguWx+Ry>mK4PZoF7UG%C5 zf)X%cLC&;>^$NdUhi>}OaeOh-03Qt>c;rBMl8FXlh6u#+T;)aNQAM7iYm9MwQAwQ$ zauN?iXC->xfF|9A>Yn3rfOkVpm+8&z?LmtUcZTECdVP6@K8N`=NVn%wvgYT?wv(~@ zRQi1syDn_w+iAw6*B2j_C#*4Oa=3>>HsxLFzfc-lqHiBWPsG=v_Rqfna_4v6=XxDj zbWvX=bCj4jf>-mGLa)^qT)yEMN*AOa6}Y=z5r^W#5+eB*=NMYFLlxp|l;Umkrykmm z>1Pb@=d7ZMXh-p<@vNTD{%C%$y%YYN-VTD)5%>5QvQP<I{bfuNJ!2gb6l~c^l`rwM zG@=4mWTj39^|f+JZJM_C@N;q3-yGkk&ndIcW8)lqt|q(bP^jigG875^*m;bm5S(E( z$scq?l);fG6I8|J^XaOU*kozS)~ZEx6&%b`;&S$?N!6A6W0Yr^`&HBn^<lmo8Nv=o zMJdt0^ta6G+d8Wp)b?~K^PkeL@`F0Q%ID#3aMVNUrKFwpt+ZEIc$W65Mfb)<JY5m5 z9hQ^`z!Rom0;pCOcWO9>lpLYJRS<O<9_~I0F{K1kixeF)9XlPIeCxgt2d7r`-nbZj zV)f_UpvRSv<VKp8V;I}L7M8^*W*G-2O~g{`@yk|{KpW#s@*<feBo|;ie@Dy@h^~n9 zcXmk8`Eejsb(PD^B+KP{f!^mKl2*&37|ImXnfS?UQsmh2f$0zh3&po%?~Jsp0Vuc< zY&a(MHfx!m`u|Nc67f<TbZ2r#v?aF1wZSg`kqVyQ73C}xE^A2@l}b#uo+74`a;y&e zyp}n8Wa#y=YHEB-rd2RUD^qqLUP$wQU9V3RS`bj0(gNQ2T$&F6yqr<n_!(!|23*0G z7g_zCF_U&x9^cc!B3idTC9Nw={eJO||Nee@i&YT}$l8sH{Mwl|zwkVqJFp>mulc?J zubo~#6g|MIS#tM^y?0~C`jU2#a#T$VEGW;6HZHFWLEd6C6gfhTw6Hw56Q8*V+~VWN z4AL!NdF6?QxaUpsR*ZThZ22BrG(+5-Ud8j`|8n^?HPZ7*MH$Y-GdTEy_<}Ip%UH`% zC_ybkuvZT`(*5-7zTSgt1y-AX_=4Vq{_y1PK|t=n8Jsz8N`x^1R#L(Hf(SZ(R}et= z20=K0`i!{GTB{~I3$HZ!fZ7PE0K3mgrlOj^=HLjmlzB{Q!INjU2`4JhvkVArhWI3g z2BFDRMNusx)0QK>n-{_BPLkO*tH<t6Dz(DCVw{(pWg4$U6mjW^M?!b)K>?}~b^*t2 zL|B8@3a#it1GzFLG>-jntCpno1TF0OMs-3&ICPgAm$awK{?_0%(W?W=|3Ym<2B399 z6?sOv=odFeFq-4ZH~dK}*A#W0I_F%hOcy3B(B=(oS9N?rZK6R)u8SFgYl67%j$Vzn zT2com)G;k5ej>5&f(ldAjf;DQ6!5hOSn{C{3@HGgJ<Y#}SD=GkOhxTYRR&WZgTQhx zH_d=VT<?t*N+>fyHHbCwb;JWINl)t_@@KmMH+bk8Q`tU&fRBnQ(#)4NSadxDOZI(w zdDV`IZHTev{l3e|YJOjG)!*{Qd3Bbc-oK>W2LbR{;`&r7v=uuYN}Q!j?bR6qQf6%Z zD|U^HaP=Duw&<9^4wcHPM`Vo0d8#?cwduvt)W!CY2}SzBBsBVDmS^qNq)C$4z-w!v zu|}GDNU(nCqGP?m2nGh>so7Y#2j<s;oMD)xzvzC@oAEg^IkE-H)aIAdPE&ddbR{Kv zz?P4Ls9REPf?_nP3Y37utt$xkK1mOG%TcYwRL-8$gEJXuB&z{Uq<|?HBo6KK(Wj?J zn7?lpO((?e@oqz1L?HE1V44tGAJ;Rlb*G73(-gvZ*QVV})sDeYktz#OLucHjCa`iz zj#G{XAhW@jqDko)(_*u1&v1QghF|w-!*B71m}pm0C9o7Ths?<4GzUCzkEOtcFd(N) zR-NK}WafFMD|Yn9UNLQQ#p?BeUtWHSIeazWv%Sn@qu9vfc(%jk;7a67g6}2v+3{N; zI#9U6dr!|U1?vC3mcwzx51E-7&71_sTc6<u*&Iv5&S5s0A3kjCeY4qE&Z)P-9ToDY z@_9tA!RpL?j<L!GKSn6V8){pIS^jF=rlmzMlWF_4kpk+RR|Z2(PK_Q-&yhW*(1AYr zzDum*tfgB7Ha$=|AChj#IVVPj1`4-zEaYA&14_4~dhTC!T{*9<db#Fci>SAF;UD3l zTWTJlAQB4XoWDz=q%Vn+jEY#AwT@9A52;uB*W>Xje?f=`^s2DJ+s}<wE);O8ttKAV zVVdi0E%z=EH;#44EW3V7YGseH0SU3b=c!pSV1J2X(*4xe=knCMiuVMhF)aRUm66^B z<_q!fn{|~)S7uEH;JoWOJ2Mrkpw6zyi(3XJqtBEoaErvHIYp}H*j`(3Nrw&~`l>6b zZHctO--vJs(vA6u2D!C~MMV%ZF_OWKERqY*L7bn~pu>emnX~};w>xKsx+HmlModD* zRe7jxvS`Tr6uHz_O`!|yld+VyK0FQd$icoJ&6I5J_C@tYl{!GM>wg8ezB^sMFG{SP z+~tO=8DM|68>>8kL{vLa+9stZVE2&^q(j<a=P=MIUQl<~6qs3Whk!U)8BaM7o#vWf zHIdjUw~C6@0W0r*n-~|yri;{}t?kwlaip!a)eiKO8x;G(J1BdM^qkFm{(cS&@ZJeE zxe6sLm!E`;yNen|^?a%|FO&BQD;ZHCIurauQ%lG@$_T+Qi*}@{)lwgXX9S0l#4L=D zD0l8gWM*QRXx!cyo`47GOFBNpDIXnyIo80RMDX+##KZlh_6}*oYs<#lM{_E`*&a|0 z9?IH-SaET>&WrimlxADG12>h3l$)M<qSLSC7+dyn!#^5>nnoG~F+Q9%u&_RYNWV-S zu8Zij1T3udO7yF++y7qK8?@Qy;j&>d29gBr(=CZ4lKGZq^?3#ajS1CkdX7~BF>3+> zYZVG#qpmz`T?l5}q@jYe4}&tAuC*{c-?JynbwY*R0wc+;hotR!1CBsHEV}H{pEV_Q zQbs{v@#pEsI<-g|xh#rQJeXH}di`N|kNqjL$UE~3So5<F@?4q5Mb!nL7@lG`&~&MU zulIpEtGc%l)tznBy7I1aI$su^HayiY>Z0bsl-UTxtBvq=J|gu+RP<bZ7mBGQ#%SN3 zgj~!&&tvvZGu|rTA0DRsV8TQU-kP&fwaU!0U7k$;vNuead<VU(pSX@nojEX>Erd8o zq%Cu)1CPBz7A=EEzAUR|YC=IU9%hvt-M5s$vP}yYbrS8_xEfnDFCI~k&{z?<!G1!E zK^iZQe+bHf`7!IHXQ83rJd#1}5)~%c_&+uxINN4BK3{JfWuezYs-XMRHwoBD>w$lx zkHl$$>l6w9E<=%h&m}p0DcU+fGPM`d($iGo+S3fJhaypcIE2yU{5H<0HCgoFK{GLe zCVD+P9e_etX_H9_t6xc?c?>7@pb;TOf<dm}8%_nHJ)`I(F}c!$ODTK9uZilbNw2u_ zeb8C*HyGMNBey@3QUre)`94+`W7q(zLbH@7+)X-{T$!=p$K>6%r&2oND`VL682Y@H zo9cs|v@$?BZbm;;TeI&1a|hDjryghe`LAHHYtRh=V`G;8&hH=u_R(Y1pv%n=LH^3^ zFkvIs>V~3aP^2c9bjt$HI!&KIsHF;<6GGV<&cs3&h&!7&F_0TJrW*V^F`?h4z4b9P z)shrVOIq;gnBtPE8xy|c?B+5Qhe9v=A{q0$_8i?gn>U-#3cMhdDV#r)gg$jBSHuwk zk}gryawT5)H|i8gP1CW0tGr3sKVvSH=C;mKYmExi&<#lKQbxbVfh72pcQ7oRvXB%= zj1OXzBoz0nqSwe)?dUE|N0dA`Jm0((=&k$p`<hR}4eiPswo$9aPyxLO4i~!g=mnTx zE>L1c)=>Mo*a}LJx~+>;2tcjSh+G1pg5Y6PO}pj8+;D<i%(EpdjDHzVa5^P(H!aRN zDG9aJ;;WOiOGzB8X)Nf8hRU|IOjcSDRn-2j)z^c-OzLsWd>LXc4La-kzxi{dPSiJ7 z8<GOI{i~RF1BpdCtTs;#S~FBa!Y7@=1{d(WZMJIG^D(UJx_Z+Vv+cN7VVIAJM38F` z&w!hdCl8g+wz9NpnB>JC>pyci_t`xsI3_*zD$W!<hdW6$Q9Ua-zyo25I&FrlHu{|_ zYp#0clvH2Ks-Oy?Lx!n}E7joN)Q~0cD}!}Wrbv<rv_aX<y%W!&1%8=}Vw|(??+{!< zGGpBE^MdtcpA><jqcoA=99>*$<4tXVP|Lyd;LAI{(?h2Cw%dD@_;lH-jHe9S+i*4E z4mm+=yxP3;fjmRcM+tj5WK$Q-9_(!w&4?Zu{~+v=o|o<F@{wDx{!G^tmVmkOV5uOB zh$QgAFD4CeDn>`vvKeY_m&uw>iUOhrn)3ws&_6vxHpM+hCYx}osCc0Y-Tyq0z<hZX zfpCQ-{8OvGpZwcW^f)}Lo+>_HH?lw9s=QM+-Q{gQx~FocK9j!8!mtbNX&zBR0Xt$l zvErya$XNJ@m2B@ie45(Z(19?S0|j@Eej=zw0gE??YVlwp4LSl7VHUHoo|LraFf00W znbw<}e@I<Hbw;);W7UCbDgM&wIGk*$E`08I8>Uzes(fu}n<{VdSNo|T`)7axnJ2E3 zGN-K>ywjN_qvqSYS+3(Tift}Ac+Th~V)w~#F13j;D~$iUE^?zyrm7R;K!FVAfwf4+ zgEe5#q65&2_@2P9Xi0@IzKK<kAr!<DPjQ=xFOaLN-rrtR7gc3RK{~fhjwdfH&csKj zaZe1M4|b616oGh|PlK!ylqSbV+%BkUfh6LMQBPDHedW1RPRNBs6bBoa-b;N6+{mbS z!$ND!ZmgFWmo}hTfxvinE|g{AU`~8Q0za+=Z8c0n=;zija<Evjk@?80M4rrT#ZQRO zrBy?VgD@Zjk%XQb5U2>B$Mr=t77zjDw^ry*`L~i%3hjv^6l}?gMTjnmHPNyRD!RE? zVzeC>gkFuW>V5P|ms&5GT4O@NM-mhCx+a!f0)LQsDAs{!i(cE9Ov8j9Ot~S$SX^Tu zbvv@~cen9fE3YI>r2~|YyQVnWpZ-X~m^M6OE$L`m&MG`G=33X8DprYlBgvrAjN>#) zf7F5}TO}Od#i%Pvr08HxB1L|F7Lms;vt;^z`LYoE^HAlcM$*80N!_Nc@Z0C)>z37! zB*8pC&7s#0b$L(fb6zzb_{hxyz+_iYonkQLn|M^r48oOlXXt>e7{zFo03wLhcxL@> zruxmZD;ZM5U?3RR7ni`br#{#)H87#K@FBbE7!;=-Y}c+8!h3d5JExlz2JatQJ+?rH zEiUGqC0jaoW>(Evnh`H^?>C|E?;wdM>7y!8D4dVkC<+|T0zP?LNZT4#$T22k5m50< zzoALNpZ84Yo=WEiK^k;g##y>nq*73%RqJFJOX%P{Sin)USV69lwgt`-QDJjC{IgNf zBW4`*siNB=F5h|FpHc}mY9&H}jGvvlX!|~~dIc_J`?;(WsSic(jU>39iqS|Q7u!DA zY&kA%G@cdsQv^FWgQ+Nx#A;({7tI>&nigS1N0T`xz+mg6@_{zT%;E%P(``j&bsETN zs(q(bWF8KI1M_eY6S%3}4I-pbgJgDL2EYIzP<M(+c_8ONwVQS94>p(Kd(4_CqWI0N zt8t_kb+H2&h#4kT$#q>Ac%Z2bj@0N+O;y@sWv$8hU9Zv@p#uT7sP~{kG6820-K~jc zzx+zAW+=CEi%kufkYzrAXi1hFg5D^8VfWJSQx~1y>x~0bBV$33&FY`a087m+i@@r# zv~L(PphOgimWm81wL^lXk96(eK$#U=hQ}pu<-Srb@X)RzEK4@vVL9cwNBv&D7`P0@ zqV@&7+T19`yV}oc>o1R%dLPHOtgykfkQ$mBKeZU*==5=O;{`t7RV`&nOFus5HWa@{ zXbhx+TZxRv=(Ko|DZe>7Tjhggvxn2ed0umrYSl8cq1^h1GLxv~Ovi$ld?|yHWQbL0 z!Ivh5s&TPz0K^%VfE05%mJqQKs?A%Hu%Xt@^>Aoa$L6|fp<>G;+%>slePPEnR_yRL zj;yc0lCyoP$Ic|g#bX(o<$00nsg*!S33aGHMx(FL1IZKmm2(3;)8v<UYB+5=P6wsg zSniF&#fPt2L{XsG-fQTT_#$ivPp_t^(ahKd(Rh(8Ou|TmUnGJfHU<g0KoA^t>{BEh zq+0};_3dYnO)g&8rn2p~Esgh&5iy4}Tc`s#l(NQVP*B`-s(Tsgb%=E*x!`vNJk-`k z+fm(7Qcae_0=zlj<0~2F)s}a7tknTT`cdo_)g;9@CX6}Sx(tZ<L{_8e_IXE&8e26V z;CLS(t^T)iM*3Q*+_UBMm!L%|#-JZ)!8T?7qZ1fd)9%>-vBXh9eV`-C^l3uT_&kk_ zy!QGr?i9qmGaJ`03`VTK^)eYd43pD#6!NwJr0B=zjQz5pDVIxqPspfGxc527cKuN} zM+02tzw?((Ojfsh0mh)!EsE8yz$@B*zv5LC{@~DSWie_CKtd_%3$Mw8a()p(IDD|g zE`aGjSXm`BggX|S0Iz8=DQwWq7Y>nH=l2gF6&gHY9=4{U@)*&>a5Lg$i6r`O!H}dD zW;VLr?c@ISTZz-X^w-r)NsJz*7Ik*4Ly0i!Bq{Zd;rF?m8fkO1OM@>WW%j&Gv#v`$ zQmZ$kLeIBScr38Jb@l%c_PQ|;xB~H7qh?jaoofQxl!Mou$divTfpW_5t{jt5n6rPK z!vRqg8v?Nc`M^e6lM(@2!!NA&BnKun1vVjc1z9YJv06oEUF=G;UtEZ%aSas1z8-O2 z9BC#xzszD?1bF!myHOXw5=A=9o9-@Lhm!h0YZ-|@A8@Y(+_Z-DK5aN{$p1>cump2t zD5Y<$oDGvcGH&@I&=`_@&z9%lM_#_W8iyXJa<&`Ydn;~#brX*PwN-j%3h<fB>f05d z4E%>Bj9t_c-iGDTJ%p5oMe%gVzvc6bd`PTb9cQF~$q=bA787VjPi04Chi`i>W<+{G zV&FRA7KPur^W&w!IseMOaI{i>RU}bnWQwl$BQA-{N7}-t4=-KVk!vbXQ}zLtKK~Vb zh}Ni+HS~8TjiAhC5SP%}5)++t1N`_`^O*%;^P^`Rj#KY=<U1<4iRfgcC$Gn}AMb1M zN?s6PT##cH6iIlsJTd~6{wMa#z>G1%z*MAySF&MiUH~wJ&BDU^kXcQH6%9!xbzqRA z*C;FT!ttCmLLmGAVU95En90d_(qX5~%fa`pstx}K4cq`D|L4WUM|^?pXIDSM7j{_` z3G3~Fb+5YFcta__mAzP+vqYM1(W%@8)d!*dz-)tf@tMWp!rn*|T0x9DwQmg`{~HF^ z(&{06L_~x$VO)QgY!}xSiz9L|mX<F;xlthCD7a~1a@Gs3cyPn{grQxByg1GOXdc~g zC&tNHba*q4{u+aEh4(Vc$rrXWAwRiwf_2gno6<9!ufwpdCfLD}U<ho-u{69IiT5KA z8$Az5fb@wbUgN&CY#$^xNtXax7fm*Q|0*Y)gFOLDY4DfWRy#SN)58U?zu(EJo@?!k z`g~m&={E0ikHy-t=>(gredtzS?t3cy_RjmTIU(u5dB$Pw+b^CLxKo!Kal-ql57<b| z#z$iOz*q>+p#JJ3zg*_!Lh#CTQlhLZaSdUpir$y9?7cH^D{5SFz4E4#R}~cZf9Y7m zo;9Cm&MV)C>%p+!bv-*M+$WJVT;|<w-@zHzJ>RqRPchoQ_7BbK-|yWM-<~FecpFY< z*+V%yqBEN@TuW|VvPKxu;wzn6PE#vLx(^m2Npl0_=R`(f{eE#>@hhO=C}MNbxWW_v z>i*?56p5poIt)%$`T(F>Fbvwm_u72fIj{*&-QjYl(EG&}&x2XCp-|gm&6LNw(*^~r z(;e^7)q{$HCsydP(lnZ{CMFoZw`Di*O0teoyeuOUSTp1qVs*`Z9<21;EeAe2nsvN~ zRC6*s$3cgHx807}TdF!K-J0iGN^SO{w>QZ;&Y$k3Kg?6j$YHFGxQg*a{%}-aq4xqy z&jBywOH07(H!X%N)*9k*pouLg-u)|*fP*&bSExgq7b56vts%pZKc$!0Wz)kTr{n^c zH0~1dFP!u<3h8{HY$Lt50id%$jqN@8k8{VALlSz2UVh`a-#R#>zHXSNNR|{7e9pN> z7TX5KSq#wFmVO-1xo)>HN)vR#Rlnv;&}%R75X^KT9xE{?m|>iz_BH-9O;l0+ZPl<= zgateSH#Dy&8cL!Z-sT5hq(D<^FoqY@mUzl=C-x$<T+(cfwtvuiXjK|(NH0Xn9A|_8 zN@Q$ctLyk|VnTqJ<NKw#hx8ix=C`ZQ=y`SN17CnncVUIa8w(jE!LoMo8}(k9DHQHI z-g&fb4KwDTDdi1#zx9j#%q^`6*=ori8}VKF8$0S2b`R=}fw6)b=D-v}<oUJtcxAX^ z5yb{cj{=L1IfI0%x5~<*u#%4nyRE74AKhkNb*K1%B>j>?y7nvAexvXwZ#MsHgqBZp zatbN4V_H3K-L2vU@+EGATIm6Ap`GU7lnAV|6g`8C(61y*zDel%2}VNAy1~`blPHN= zu~bPszDZI<LbFNp<XK!85Ox6XIee9uyf^$d&821GmFd;!#5u!KAcJ}-GvLVn{Rtzt z4zjdT6ugS_{As}g_ErL5f<PA_xGS&hN1g8BpwToJRatyg9x>*Nw<W)=hPmW`YgJD` z=B+8j-?sG+Thqq_vo3^H8CG)Xn#qUaQ;fyaV0>!P&qvtzvpA@&tGdJu;DIn1jLdX; z)t`xZwPI`TdB?s+nt}J71mU}hawwEbPnX$OL8-5nO5zHu%kT?MIW=*XjkB-H;p1>i zcVuPz(G&BP?D09Rzm-PH5sJ;n5|jQEen*(AWy!9%8%FrobT2yz?d&1r2KSS&4>U<6 zI`!cdm9dC1Hqn|R>+xX&B?|~3hd5zh)13!mfVsLczdYF0Z^iL|oZ=M%0c8`h0j{;h z%1hkP*~06j7+rI@eA;#HV5_3yPVSKp^*V2eP_Sfgqg3u-*%?R0LP3RyTYh<}z$74T zm;u}KQ$iP(LarIp;*m~l_iNZU>-f~@+~!>SGMv8xF)qs2Y$b}ymmJp+*51+kk=cjL zmrRQpnwbhoGj^9~t(5N((?x;Acs$~9zAnWpC^CsfbL2PPH_JB*;3Rr>5>gypdKu}@ z_u^!zU-oM)A~Rv>w@^Qe=A>t8Iv^I5(_hL|C*0994Dztje1-tP3-Ei}#z%jPDdt{8 zyj~NQD-NaTJp#iw;$eW^b71W?UD@s5BzgyHwZ@1vXRIB(t^Jc6R_Dv)Hs|F8qoLtu zkC$6KPc3aY4^Z{pf-Y8+AhHwBfE}WYF<334Vo!l}AXb%trV`AC8!T6My>xRvk#pm3 zHHM+JX=1+RLngN;k-3IQ<#A5MJ7DB2=>^LqD<l_g_~$luZN9^63q#scdK0@f)9IOw zA&(zw%*8yaBSL&uLmjAs8KwkiSI6xl=341jC97;R1@1QVV~D(vZNyy8Xl&h?Y?;E! z9Z1Dl3|0IWE(K{uonkZ1LcQK)G$v8J8#|F7>b1%kc#Q5A6%d%>IN;UIK4n-`2>D{q z6jHM}#0~z-%3!K9@Y#+aN0N<0nV7!}Yjdma*li{=yZCa<F`-5NNS&=0#|ERXw{Gy_ zeoZGR<(IJJ^nA8%&J>;H1McT5{GWCXe?F`+{8IZy5lj<y+5J1!-z#B+u2;#MN>QQS zrTFrqEl5LQ6y%wNh;`4Sr5J9RFfaH9Na!?n-M<k|Af+EbiZ7QA?2xsPhD^qz1z5x* zO2?bs*rPyYgwJ%?SXv5v2bAex_t4(hJro?l(T((Jv!`eG90#&V04Z296VLz}5!%p= z^(GEIK6V+H*Gx1sQ-NMVFsf|%1QmoudyaMWuoK5xSjasUxi`JT<{9<3W^0G<T}b~E z`7*D)r(1~cq6nI2K(`WfW=CoL3(B|r*xoq&GdK<UP58`oRb~tO+q|^w^G@xp(RYjw z%T+~^DCV2*3+QV;IC_*m?!z(30jGX;JG913#sV23j!!DHsAG3$-@h??7KUB0F?)DT zL<*@-Ew>FD%$2Vk4(|tbc=g}P52_RgNSWcn3t)I333gCka0q_DoXC$EE|u?la)3Hi z^Oqsl%8F|h!W<CC1cZi|dVYNdge6i>fxtA3&}E0KOg)%}(*;8p7JP~oIr7x~qr5ZS zt}-eG#D;|kb-q_a=YwMke!SFlTUXIIIyhgBr@r1$`M=v573zGUZ&Z;ovB#T+9BM0n zr7D53GV;cMPnitw@6~l#XLgD-r1|n4y?bO!UcEc(qc7(MCKr0=6j!>Gfu7UOSM}Wr zrxrvQMB^yRGbu2{3OLrjP=6`>V`nK;{YAu2$`B8FPF$7gZq2ZawtwRV0kK!LeuHJz zBRuR2nG8L&T7&sF(BmF^9-`K%l-a6BxnQhEsSCcMv@ca`7C+N|8~^)`NY6R>9&v-F zrSt9am3)7()<FA2XNl4(@>aGkIp=6JF|$3I0`=vgS2}W>J>gIe0La)`lZ<Dt$gm|Z zcmtk}6gR;1VHh5K&H9jg^Mu1{S46hfy;3(K4aO|1iR)rdSd;@aWuSB9|J|<c9zMPs zQQ}@)X*RZjpDOe6J72Ol<6K(TDwoQ9YY<M;G6T1Cf=OeoVA$=yl*-788E><ruYO zrdKCMK3(HqvlZkq4EVz}e4!vKUZ*=zxyU!Vj_tL%aT4{w?AG%<67P#6akCSh6N>1P z{l;udc}QmIM(7D`(wZl?Lb}i=W9(rVd}caMm3YX@2^XEe7&6ov>SA_Ul!YAv^tDYe z*R}KK;n3W|(DgTksHFp3@6t-fBvNI)YrjgMY^JK*K9SzP<OUBT4KSew8yLe$5W*qA zp;CX{?+b-;vd0|07I6=L94UCseOgaTWXHY;oyh|qfO@U_$}@a42Kz*l1%^?a25)hR z(!!u($BZqmb4dbO!itc^ir)ZkvFR6f%i`1~9mCrC3g8!^_anuZrWSW1{>;OKf3rVT zZIRx%tWtOEFkX+LaNh*i3kxphn^$o6AR{?)Vf=48wJF#hmJAL{4=%^PHvR5{s~IP{ zw@K5SuH&}_b<P?45;M%vM|WKItmW$i*#LIx;T|TI!fog9o9dfmNLwz?_uk!f9oJU= zkASy<oJ+j~W?bIs{-`I_U!DofGwqhn%T{bbAZ;{ST6%B9(`nM!xcs5th-Scc*oqiR z(dpW%$L&&qjA#+NtQ?rD=3<1hUG|=)8qnT2wT2+I0raTkVTk&t#>#waDN@Dr*1#;8 zj3>L`zy2mj!ymgpko;mUZsF9%+di@q6&^JI&CNM|2-W!Zeqx=@JCWw~Na&^Xr+cBx zD~Z_rhQn8JeQezgl~_%EHY<}DHhMelQ2W>38M}*g^5Ct4+hNyYc-PQrKYdKg5LHHH z5W7c4sF^;~J5~Mpel;s1wg&NA+sZYw=yb=+oocgx@pdsA=k7k;S&^0Ye2PKV+jA=J z%kv8!s;L>%L)sb~z5JD`X-KkMJ5d1~ffCHpybzHPuu8Wkh9i;1AKMAU1s;ZClWgMl z9P`0tCm%NxKJ+&MOk+0dFd)syx<+DEDBOC1G?twC@TmJP@Pf+(*wj=;G#0iQZJ(iJ zhG-xA3G|5*R@}e@#7hh_*PQ0J_Ka#hcc~Q+8mb_($57A2Z^ikOt#!vf@PA|k3?1E5 z^UZ$&A+KqZAMh0`O@?fzgWeM%dCVoQ%|~*CFOh+?GLu=z8cs0Doi&=R*WpzS47aux zHba&$jRt-gFb4(L@D#uGjmM|c$++VCtQCqFUas=KKW6lql}beIi}Ay+xI^LtKc@0l zdkQ#o-z()ZN*r?{x*<<JW4l}CpTW9Q_N*te=v;@R3~~W9{yt=@HH}X+|9pnlXLxLz z)^z<1tVpW9e>KqloOm<s7_-#Oz@ZD~a284&Nu$B&TjMIZ{LN9)-+<N8;u)c65uo%b zUIOy^2D{EDp2^ktTwcMcCa!aMb5@-&$^M8T%-C^BXwR=?{gZt#86BQpyv$g5GEk7n z^ti?x8Kb-AY2T+m+kB|Wy0%u{Ip5gx`9O)vPjjB4$p|ox*}0N2OJM$NSj8>bT5w&V zwbjn3a$Q(Enfrp$2j4p_eha~MoJ&}&iUWxSZ!8q_P97wWkI`RGWaL1RonK|Uak^P; z{w86F#atZuy~}Jq{ejU<W@f?ZQ9AnNRoM|10M`+?c;7@y?Yd#8W_(ZS;3zI8sla(L z5Y1sqI2Hf+I+b-4RHIg)bq*%?OlHs?+HaANHc)#etx)3C-BRPX4S5~|gZhYGh(ZFu zHj&U_G|CAMuwW#Q;G<Y;^tte;A3J-9I0qfdJ(*;megylO=I3B-bnzlErBveR_4sIb zYki7~$Fyu&wS3BcZdi6}>dkdpr)fS;-)D&h^{m;kRv&q0P&gY>_Wn_t;WSnIeQ`eb z%#)mE*~XX(4i>^EwvF2`&wtc>49nS`qmL5rVz_@uPo?s)>dW#p*sb5eNQ$qmB5fE7 zIKEk*|9H&Y!}-D<?r#-H;rn-P>4T&BI9rH|YQxZHIugY!WQFWiyQn?n9k3;PL8)U< z#A$~V3iae6z(8e(o%*Jz6x-yjLA3G>j@cDD{8TQFa@~$UQzl;@bJcoH%=3~W6|DQs z<e{K1lyude^*(aF;ojwvJEwmPp{rB@?BY+HmT_vDjz#dxh$p$yG$M+(=&LYn?J*Up z_-N)AJ0hc2Hah+{n4KeggFlt{?eo-9eOmIL)Za1k<3<QF;s{f3a=BvZZ%PTPXrQ?E zcGdA2vv7vk(gf1jyABAdI<Y)|>(HWs+Dv4k7d(U{^^k~iOA&FEyEHm?ov{QGSJr>~ zNBu!tDZKyZ{}g5cj*I*BSypu7bHuIB>1sJ{JNP717@@1r>7Y4r23)bUfoFRm^)9*) zCp9u|gQ?d{lA>+D7QCSr-=sytp!RCmlefdPbI3o?<*$WGQBXkp!Cmif{c*L*AGg&b z?7DWdx+ZbqK6&wh=w7UbYfJvH%6U0zyA-;}t7CBq?(%dq3th6bFl7)PLYI4xVL;II zyHxo?4$HrM`P6?8Tvl|24X-t54n_i-h0-n0Sl27fDZZL8HpAEcQr6*yVHCb~N7E27 zmK=cCh>pD6WTW;ikgkvgiM7ROCf}QC3cT(BH$oGu-0t^8PgZ6MX?z=8Lz0ne4T4^V z-thAcyiPMh&#zu3J_ES$FBkO~$SuMt-s!u@48@57H?*$e8Pwbi2Yrp3CQGtR8@!yj zUk8<?1<K6e*y=Nk6->vkyy#dDr0sf^D6wod7j5Ylf6w`wCmvcUyN^|w?dyUD_KL31 zE~V1>J!2e)z`E#xwN&7d0=DYa2DB6pQ4$wj;@8aSM@4AZA{vjr3qxAHqrY=7T1`94 z_r7;6x{PXo9hdnJ!N8{tBM9uaKE8=KN-T_n=P(rOra}Vi)`j2v%gIZ{7+g3|lAtj* zB}}a4stt3~a*NENyqPR5c(%njgkzR6v4J&RA53RN_zXRj1VRWa@ng<k!Qa@m6fFa` zYzyZkjpB6J>nMMCvLZvQ@+s}}=U?P|DLxeem<(Nuv7p63NlkA7!CE10D3wO$!ANw9 zObXX`YL=R6%2TeGd1?xrLK$VEwP`qN7HPlo`MM}dK3I_H9Mzu;W}$)%JINEGUpF90 z<gvB7E(zrOZxcP#6{UX~`yp&i;NQ9R%e4utineLnt8bPaovVl{U<?4W^;QtD0q6x4 zi@>#}mTOLB17SWhL}ZMRGTaFgmU`2O4g(>;@kprlF*Cp)kpy38(i>~14$R3s?6^?3 z(HgVQFov4jM7QWqadph`*vm$aIIXJNNcy|m2$G|ntBgb!GwWC48iMztD|o=(>;15q z{$%3Oyvm9@O`4JoB64cJ6IF%XU*;BiuoJW(Z#j^UH$l#9HR{Mm7GhSUp-f9TbS(>+ z=TBhELjbeJW#KE%-tr3Zh`nd{*Z|1O0F`(MTCf5%G2HfRAaIr0SmvO)Tb5xAR`)IS zDJQ*_aT_PknaBS3@{3I7may&O+zm8(y_ea0+%G2M5N-*A7TFy3Ev_pPhhj93^hy2p zsf~STscg0VHv6)-suJJ_HvfhYQrC_Zn#OPKnOTJx<X2^otW&`+!NnGf3aSt3yp|54 z+yQPf*!ss2Q(Kpt?XAz_dj6}O?~?T=!sj^5(-A(8x4!Bf+V_L6PhXv<jB3ax*7njB z(ZN)fN?(@hO&2KRV~x^%E70YK<#LQLS3d(0I9eOJyQ1uyeG@@(Wb^n;QV}xx?EYO- zdy9$(39dUI3(6v&26xINoAl#VyOx&L3aF5W2yuk1Xqz-X9i2;xi(gqo)d?+79qn>| zt$bef1E2v24uA^CoX;uvbNr#<^;$Bn%#1V#=IB2G9-e7<Y@mLs%DwUC)-Hx+BO`{b zhM$L)vLPrd>lqg49ji0~i?uStqONO;%fa+^ReCL3RZjio@nXo^g1nNPbwp1HNQV$> z1@gTfZyF)87$l6~%5yxJnEQ+ie9+G%;f-}&?6HbOe(kPIzzE$iqX`vfok4&ai`W-d zwC99WD{QBt=6MXVD;D962#XX?i!3ihIshIg{q>fXgAMys=@kLkS%9d+mfwd@#_C~~ zWK@5#ngAyP8WOs%@7M-tVjQG={`OIT#6O?~USMV}Aqz>h#^!wFb!x$Ak5eY`gw_Il z+T)(XzI$10nIxlz0YQ2v4bhDugbSQ_y@s>>rHp1+Svi2@-tSsqlpIzzPTyUJ4&6Wg z8t%*#w>(z0UiMXQELXctsZ9~k5wCOwHVp$8E;=11PHAtA3;??YDwCu|jO0#YA&u$Y zH5r8Whl=eb)AhDqcB?eTs5~8M?tF{1{8~NvkvAAqv1XpE@W8WAi4NlSL<2eyn*gM< z`9H|9_I|T^m{J0!3b3`LzciFAtd2LRu7s*s_Jsb0!7S+S7aJc*lt;`*gA-fKO8ArY zhA?VR7)jaRX;6nU@n|8Tf?%{mBM3tZ{xr8|dm^KZpSP}F*K>^y1+c#*N_x*PnQV4j zHXXs6C)_oV)=7T8wRg}#7y$*Oxzi|WxACj3t`$g+Hqob;^h}z0MYNO*)*)W%TP2K^ z8+E9AzoFgl+*G|4FIloWVp$TG!&6mGHAR&+;NTh5J^p6y6{5nltCkJrWQ|oU6qW*h zPfOY$qZTp;a(A%n4fddVdJyiB=7!MR^#1%L6Aw9d{;jcxYG!qJqe2pMrVyVhg_AWH zCaVB55F%KKa5^A)lmMTPG=x(hh32&U*SA$xDMyd3{ZPxizi!QSz5K)*82;WGBaTay zHDeWU8ME{rnLTO@q8U-xW(Oe4ST5z)w)yoW?X}$W+<N7V69>~i-yIXAq7T_olt03# zG2Gu}eml^<1&ha=qIj=`nCg>Wm_0+Cwd6oS*LRkQkSgAw;gvpLKW`3noP`D1=r5(` zPz>bAt@<5_%*bgTP#IghY!XJ=NFJ98zDt@(K^*}B$ts!PZjYpvq%tq5kYKLcJ@r)h zpjGeWgspjG<GafDL_GP^8o5K}%PZ<VzL7lT5HNT1e$4Cl)*p6*!d+KArn*qU&~5?< z=13dW+N(1QRo+4<sP69GTD|<}p1FF83s<#E<LG!Ncw!3Yh<M|eOrXGqtYl$!`uRHo zz|PwfS$tzTC9KQlG}_)o;2jyN7L+2h{pBIsO2B3y2#z@^!j#!`va-UfgP7FS5lX6| zkTc4APIj4o;nQ_e$$Q@60kkMgThl2KUwA;KtM83s;LumjuG=zc0Q1I@+Gq_Ckvy(& zZ*)V(e(an?7r9!aT2>$}U5I3;E(wFu-T*ttBj99nkVSJy04B*>3M>M=4CJBW{W+wr zmo8Lbm?dVE#ijL><;n9dCt|#Od|9HFF4#}Y<2rV})IKejs~q4`MWlQNc41Kjp$r;F zAUY8dDHmc{hLF%=Kik+j1W{WEZP4aaE0T_9G2k3)50J+n4@!F~;6Mm#3~zA2!(uNW zD?3~9!k5Ez<bEJKo|shg=HV_MzmL2RhEsG=wqr%^(7TYkCpz}~z1~}mY0ilUA<weS z)oL-t+Op{}(shbk+iI?PS$EjzuRODJ-<wi~q__QZ411Qnz|CwinBwX@hTW%a2)?WC zIbFu*zA5@EHzSgLi{%}#LSZt;N*lTsfT(My2Pv30h+)9h?|TVl4Q7f|Q08qJuo2uX zl$ta^3L?dsNd@N^YyvEN6wH!xF1;5SN~1iS2ue=X9E!fnhmiRJu8*<Z$wxJX?vPlx zqO@;G`k7HShV_drXXjA=3ilc@ZC*#bB@T<vQI!MZ1kbX=INO5Yk7P$ZeKyvH`!X8T zI6=(PDN{2mwv7!!Xy^%QXCKLnw^$0*e)3fE(~C^T65d&ZX7Hp`$;j0u970B>u$*P; z0Z-5cF&^e2ZT=G7;H2(U6=DL_gI^{}SNj?dg8|^Sxt0p`cq^jwVM;7!Xjm8d4}Ns& zKcd#kpeC&YrVPU?^63<(P>{Ui+6jp;gFDhm^1pecu3C8b+kR_Tdy{IMWKB?1fmzJA zRrWbi2iAWJf`OWX5*Mgp>n7+MnqV+8M&DPEmPa?H%ZJ7^zBIqoh9?*U3kCchz3T<( z{o=DphBZPs)&O&+xL<}PTrSUw@BBJF-j`J7B@go*T)LO-j{0ZZpPSq}+fSEg4@}1L zZ8|B8jgb2gyHh2Popw{~EdhN#pk1m(0#ygca8F4f!i2@Brzr~+t!U)sEME!yD(7c} zH<p^y$`^Do%eXFLgQ>IM`C5Sn4OHuPfASSw^KEK{5G&ZKT-udhQ|yIrv`02n2nEE6 zJaaj=cYtkxDp%*vn;v7!mw#(ERHUI8&%?XwWWwd<KpDk(zORy8V*vJGdJ4n9x6cKw zfd*LCF)T_bQsEZ^g)LOAC_~c&_(PViw7@Nx3OEp{ey=;vVhe)=`~fkT72CG2q9Dcy z8L~9Qav?TpXuW14gRE?o5^+S7io#dEAR}0`65pC{WVViSDYVM%n&<QLfgr;B6o)rv zTIb6}hLPs7#OGq}s~%}B#cV9lGRx);Rdk6gx7t&ilp$ilgyv0LB@Cu9KvHdOt8WNU zRKE)Jmffi^kZ1~E;OK3djWI^Fpjc~Zw8H9AKhg7Hm~#E+7sc04Yv@z#YVE2vr`%0h z0#-i0Nt+D*ywDBSwdR0Zq`4t^JgxPfRRm83TuXWye4%JX;j%9Ar})cG729R5bu8e# zyFXy9Sgt5k3m1GHQhvrqBSebv3B8uXLOW`nQDR5wndp=soDn~pnVZ*3Y=R5Minq-= ze;L<YU;KHO@o%%GB!`p^tto`v-d)0h^XuIi{>^?J-?@A*9kw-cvd2{8XJT$}8H$!5 z(CR70IjoaC>DD~Sdvbq8(GW$Ab&QVq<a+b~w99k=9&}6LFT3*KMEP01Q?{#*n~r?C zvt-+rN33S#(1B3y<PPt=Wu3o8HQ=_wp9MW85HGf%H?)vfFc0`js*U>s>5qM-s&(pM zPqqe9RFj;kYc-8w?^V+V%7{u54k`7Ve?+hh+r~`oRnKXVB3p_X{b-SP*}HtZ{G!PA zYJH&DPN4_-LI0Qq?XoMhMUDvc#~1H5z9hRdmx!A;m8^?6m~Y-#b1hlP<)Eq8U>?U? zbrG~tojEl{f3~|C?x{5NaaOUOJ;yJ2hOz;`4;z|OgBGHrpdB>_F3<8WI*%OHZMd3j zy2oRMzZ)xk)fy^F3L0R20hg0paZ$rdG{I|!)H%|BW%n4OCnFJO{@5hlKEt@{ZF)bo zm3&_P62l@ToZ9vsZl7rqgY|j&J=M}0aCXo$QWJ`uVjhB(*uS+H^UDM}9<dRkDnlc* znAM;mGTO}Ao1UY|3y&UBgw?_ap9soX+%OBoMMb88N+Y<dHS*nr(I!;0QO8(LisB$V z<!{@?<-<+;>(ER4+JpW&Q9Bny4m*?YQ~L|5@IZr?xwVdan$7a%9{gv7nROdai@`14 zG+-^|Z})4_OtE~I#aE~AS0(LCtNXU(!?C{8pLWYD$$@TV2HsDljoVJZ)B}69$9)?5 ziNy=R_Yv5a^;<rYaG7BE09?Qz657Ti2c;I2FS5a)kV2poDVF{gnp}ioiqH@FhH&lo zNh7nE#KPz(LINNl@EqXFJCTKeE`|_&iDZq5N7~ZwLyi}YDdrNHX}?ShK>THLpxNLO zy{q2MTR&jkfAcY;d3}8rjNG3Cyi-4GYlGzJkoOXtWoKd{@;N{&Tdn@M?Y}BW7UX`* zGLMt1)|BC45~;O<iG{uDYNd+R7zlyRioO0-GzLFjJh!_*Fra|clo*|^suLEj*rJ!F zkIi$_N71d5nHQ`UZc+L*F}t3Z*Ccwat;B|pP|`48_exav-A};rgp-YxJ}bS&pN)<> zYEbYSZ2{~+yv)QlkAVg?M_pjZ-!GCpjqn>zMaydQ%*lyE0`=2E_1o>1!sJ380i_My zB})!KN8vNL^sR*WbvXhjt`v!TIljZl+nd*r_Ksa?e3=XQf1O-aR2;mzg<{2Bixzj6 z!AsHN?hb=%ahKw5#bL1GFgQgEgBN$VL0hCa#pd##a~|%x_wD3M@@21Y<s~o4TG@Li zKvvuZRmC`t6i7fS^4={cls_z;u{+2QrjY^QMeFKzNuY5V$E^Or1}_&O4u*=0RhIMj zPfa1o)WSIp2R)SrIdRH~T%FOUx*gJk@uA7DqTX{|<N+71#BcK$WWROSv$&%-U8mg! z`C`id2GkcYkNkAQK`V~WxR)I#9w_!s5*&xmjKSJ1QZ`librtCu7f&f5*2so$+#Bf2 z4e;JKW4ueQbeXAH-j0<r^!2__bXa}kZ)_3OroSCU^l}_?!>V9+3{YvzBcTXYf<5#f zw@nazWj_=%=H(>O2QSy@P=u8`{8`_bk}x;!P%>I-jlqoScuG}=Yua=oBl+#ICF~F+ znS@$6yzx^4vw5R$n+4Gep@PYrOxf{U!b#0SW0W|~0Cd`pg<Rvo4*OxzaYeP0>H+d9 z<CT0ieN&>HF2Y}rq%oV6;IeW|n{J_U0dOcSD`AWh!D^dDYCb*c8^ladlx6e8v=7}U zpGCJ-DErivDK7O9PLYZ!KW$fh`Bl7Ghke)_A2^fB_mP3$@dtVOu4PdD;J9^%pt#r7 z9aUCSF@MAA8f69~*msmp;gomRMsbEyIuir9mRT;mS7@#2U>)4Yq%WOoTL5&hULy8K z>kDnMX|3fn-RNuw(0Sen*8dtIY+Cz>5U7I^6VXeO{2jLdd$q><>Xl&1Vu0p7fs&1| z$PbIJ`zdYzEI~m!7&#%G%tX&h5*}N*sl~^UqaR>nhk<lr{hTHXZ>NBS8AZM}wh=ZX zrjv;)`|w%_y2#qZAId_YsddV+wJ2*du<$W+5t&FUFZk{rEi3ntr&SUnt|%1C=Jd5_ ze_<yanX6@z147LHKx@j@TnwK7aynuRYD8{a33Sf1D$a1HOjlmEEBTsOo+Yh^|Ko^% z#z20MgXKL|1u#y|Zpseh+BP9sNZlb;3yv@~@Ov0{>CF4u9zeMdmT+erqTwwyjqRMS zXmyK_a6D!#O9m>R+q5u*q)F~4F&iq;iKuj7YDjg=gR!K0M@3p&cI+#a>do7bc+EFf zp}{hAArKj;X%SHZ6D9Rz4`|SSmahv#VAGy11cXaX)Mt;d8M1&}1|-hAvZVNiXA6o< z6cfy5!JL;QBlt}Ru*oAMLs~|FY5`ga72TPzIc9tZFpU~37kdem-*}k9(J*PIpJJ^J zsSU)i+YsOesy~Wy%t%w6zMqz(_qC;@@v>^vIJuyqXhxU}irkNHR{VlcZHy_J-_{`! z{(i{Z^`o?+;-T}NH3_eik^=@7nJ{&KH>NC>I8$+d06Es1h|Pqo^o{1;)^}_EW(|57 zyJj+53*y)m6e5F~AR#?Ia_O;t0+cCf@_;lqd9@>cWM%$cNkbgsDZ7Cp`OsmBv5a<U zjh^{aGIUo4i-y!0T=1g3w9$iB8CV261F0G%lg>=TQADA0^??l-fO1^j=fqzmv>$Ik zsF<+b%&B*pk!HX9Wifnau{En>S<+**we#g+tIq++C!fFshl@IZ%_AS&j%yNkj=w#j zV1zL4>BCBv?8m!_A8vU5w_+jRJAUa*K$Sh=>u;o)@%gZm(Hl#>>H9yA=VD<p@r1Rd z>eWW`zerl}&-1icy~%Cs2WRZT1JiK;)SUZQ>Vwq?HIZ#4y{7%`Ht@uU9-2mT?U8mz zC94OXy-c}dfYYZ@TnK!7OnYwUnU#=S)k-Tj1Py{Y_*g>!$igUn_8Hg?Yd`YAZ|<hh zk~N=8h?1_pr*6E4d9TU>zO)ET;+xY)CD|&4M8hSGJ5rwlLozN)`xJkphmTWhnkH7R zp|GN?8<bnBp;)ahkVscbCR7;QM!t_lE8kzXl={MGio#(UZs0#}ScXhYD&vDw7yAHy z;1Wl6l%nBSxH3Wb;2jNP!5@sLiaK}~M&FPvTgpw^zf?p2F<tcN!h2T<sXv6B_`}ck zq|uwu9pKSt;s+j3OlaNU+o2^T9))uOl5t=Y1ZbT<U@kEFYicx8UxzC<pXepzVaI}) z)n{JDWYpe$bp>6tSl;KdX2OoQGhRYBxMNYX@MpSn5D7F}DSPf1*q`Ib#*a4Jg@qHh z`7qyVkKaMCcRemWNY651aHvi)D<vKqkvwl1p<meSi&(~-=)zFH@IDQaI7VtC`hZoZ zq;&+xoxe4EbjNODw&HE8CRyV6QCTwD&RXY{f_q#{hWG;yvo%}$YL8BRA0h1o5KK*O zXD3rjd>t;N!*0nRH%gv3csv7=?{>O*|2rMzztJ4FC53iHh~I24S*ZN8u3B45qTO2k zV#a%<aCGQ#Wan|7k?*UJ|IW?bBFS}!^|`1$gTuL|(_JODa-|cXMJH)anre2(uEuqy z${k#Ws8<}?5mj|d-F)cVG`Qp8-~37TJ8B|MiCI&p^uZT?;hIgoU1@FM%YA>2-hio? zIFEIohf8EYWRDv0QIK6XdRv9JD+t>+-4?eH^&08HLs(EaIj}>ufdPG-&FK`ox(hP) zSX*Zqbos^?mzT7`kU=2R(_sFto#;e1-jS!3{wMk2OMcoJ>~6zIk%mvT-Jh7Kvbt$B z8|rO?J^g2Xr^H3M{Vu`P<)l*|Vr*E1X<+$j`p8kgt6ScMbN952xjmdzc;`Uu<QHf4 zl~+TX!1`0?ucVcQ&IRAQq=}Km!mS9OlBq@0VWTPwxEavR`#bgV!0ScvE>BmU19zH1 zdQm<7)we%}!ruutZS5wmd;bx?EJ416t*z8Mi{3Jr!!9It;_W3U$&c}W?2NupfPAbz zaEvS>tF=;!K5Ao~-wL{`AaKW`2vX9W!v);+3<v!_qH4;)NV~`;e`*3LWP>Ne%UcVx zb;L=lm)%rYtA=x^cwa@f^IsmG_fHBMF!yLCJ+BFOHR>7stJd)?=Nxz%<lP`F<7F6i zl(Ho9v=s6I2a&Xf0<qVjc%moSjV*_;&?jyU+`ZB>8iP-Ve6eSZD~t{%G|HvhpWj*; za3=~ov&HyCmD2vW$N+mUE$10$G3&6M?QY&iR^o`>Vh|lw=YCxOOE?w`X@(U<9Y7~6 z)Fcq!<`YOUk`P*#e17Azvnu6Onjf2;iYsll!t!`CbngkGOAaC^m4^RW((d+S-n)L~ zTM!mauKzQ?74*h_S1<vmr>@6)A_2|}RmHj8#A&~vV*Vg@W*Y<^Q_2%(ZD@hdlKyCe zl)xetJ8!pZ#}qf;Cj>*iNq*>30qx?euIoKYV8uSrbVuX;KB~UnQ#KvGL+w`BNcSS1 z;U~2{1T}vKDOh?GjZqA^@8P+OEsh={qVYmQ$vY&4jYp=IpNGGesr;aBWx6o41JoSQ z(}BH4cv2?sB~?BFm6;E1bvk7aC#n*P%Oi?dG5L^1-hlm5(P&r2+cnG+!{_XV`;L8< zl|p)Pedy^d3gl4Zq{eg%;hsN&<yB-qP%*JDx-dYQv_c*-)yQp|O~sa@A@qd80>VW1 z*YjjpggMwY-|~3Adr8jW^cl@Ov{4xMvHHP;dHlW{U@^uuI}B#!zEBT+oebadmu;(T zo?I5REG^zcKLB?tC^&z^j$_l$2Lu>djULQa(#{(k8C0@jcH@Y5plQC>XSdZR<%2Fn zC1CnY9?x1zI@i<LQ@m?QRaFCg8bH71r7>^uFuX5uMtLaq!#%??TkQR2I!ifI;x}j8 zfr`BP^Q6sA8vDu}yITqBe`9jn(s4p+U@XAi4YXGwT!~ej6K_%!Fo)U1FJx5?IX7s? znI|z&$~=$$T+LNGw@LY9(K6|S?R%;K9(2@!slJPxmJQWG-*CpPI!DGkfnTM3=U`@k zo*N7*koGrw`pli4^pJpjgSMLFVm&}>!aSM4cPn7hzsL14QkK>UK(EW*q=T~B>6G2r z3kc0PU=Gmf_i1!^$IwY;XsZc*z39uQZd1T0?3v{XK|jR#Tw@inoudHrzw!~8x`ZUL zP>9mhb4GJ95$7l35USY0dK*R}JR4u>ysHdTTaV{r`q%*N4gv7}Dp8PMMD8}ve;U>< zz?5tAj*Jp><IN%YdB8@cm3jxX9*mppISr~d;tk2{_{IB?(_%J4+iwPWLW7@J_VAYL zzdJ+ZteN4DN{i_VlbhK-Ppe=T&+r+1hx5qxl(|W?sBMQw=h7sewyaRI({(_eSk4<; z`Bh}Gu})Q+7wA<cBygT$NEPbl#?A3U^Fk9K3l<q4HRljayEgA*#Nkrbh%gU3hN$em zPucOG6oHlBnNr1wzDFxK_wh3}^r95;j<fX$*qk{H%6beur0}K?J%93#EZ#HsUUlmX zCvMC0cRVC&7=A1sW)c_WZlhXii{CUwErjM2`T8?jf1<sH=Tx>e1)7Dm#5|^+uIQ)R zX62|+|J^j_h#O};zES66?fadp5IKr-?2tmw=@pHfATcp)iM6Rfhw?q^hF;g%B>Ngy zio;8u$*OB7`R;LZ8jGhZ+?gbNu(sYs<hh|bmbY{K;N*kL<Od%8%}u=IF69X#MV;qL z+QUIFpOZ9=kfclQW6E9_B{Om^e5D0i-uxVg%-U+Pj$+`81*I#9GMEux<W9CsnlD1k zn7%enEHH*A&~I37UC<en1fA}f)b*k$QY{?{{&i4%_PJsMq9n4~{0rC1CGnHUPnuuK ziw|0M=%KfWDSpsigScFy!0PBq<YuYpAc7l;3G(_fS1<}+T`>cLxZ<bt%BXGvu)SmG znX2o;X+a%wa9G7({6BvKi{r!*K=hl7MV_>v$G)#thMhWlfXW2Q$W_rJ(Q!NDXH0+x zQ<!jQ;88~H34Bc(d2W+-QGOZ|#FCQ*l>3s->rPUy=JY3Vfy|$uMz(uPW}@g0hNlv$ z8ijAn!zVyZm6Y}Z3dOh3D#DU@xDFGReL@V#ku=QZMao^QT&DAIy!9<RP@~8U+%)@q zVkwJ4LLwV=RLDq9_{*r$_FzdGgK3W-h=qmW$65GyKEm5=t>xSy^UP-`SW&!tYS7JG zFuK6m-6-0VSp-+>X2;maXQ{4IlvcA2;7P8*nSegnv|P;nf$F9NvbhM?*;a6o)S^Gb z(#qjN-*PB$lw~&sFU;|DeLP1Jbw(%3@f$Qif%2~O;`X-ZWzTE(*kP+j%s0<2)Gc{o zZK-afhs+SDT!8Ina4zgiAp9*+$_7H7)cTEKJW8+e^gJKxMz$6cypGY^89fs|HazKi z9n3p~+HR|@$_yMOa9sUnF;{1K)uoFj5JlS{O;LE*{bHusUdI3Tf@H8^QTqikAog%~ zKpdW@gb&u4i17=8{|9yEsYL~NCnUb3#Jq@Qp#7zhik~?7U0OP-<_c7yiHiuw$`g5h z4Dk+W4~Sojj=p;}luTuL6Lg+6F>9i|YRt#X8cuo(eUrk>Z>~;aJ7ZEaCnWA`MdBc) zf<hNND~}u*o2Xd)Iri|0H9swb`LbSWn2cDSh0gA+o%>cc&Z3TO&v%@gFl5^ijq;B^ zvz8RN(2l6Y91W9g(>MrZChD2F_&#rCv~!<f45JT6M}OHkUN^WVXTJV^{V`r3C9l0( zr3a_1_2aelWao5ys`qZW$Sl%_pU=?0-NJS3ApDa`^LG;=z>t_Y<!og5^sFzg=y_9L z4Q*po6iL{|iHL<GG9-zr)%V!Mm$b;e2U>mXK2dn;Sfp`KiR*b4t{fjQf3Q%`r#62E zj5SJx>6Fh)rVp`o2&;!MR!DuBI_q1wKrBVwev-|v@UfT;AjKp)rCR(I^k*jgDeg(( zdIc?W4ny#lvCc_WrNwMjR|zJNNMLrso)T%|FFxc4pSXieYJ+Job9`0RJB;*H!b0G7 zyjcJul}ATXgRQD@Yuqc@Nx`3oT8^GKT7Y2wB1^J~i?05JS~|{5gv0O!nY8;jhq0iY zVPoNDo!<0;UZgQ{97H7O8$7r_f}$GyC*2ad(Cb5O_SsS6e2xlbCFI@169mKacNBKf zncO?#D0m>Z?KHU#0TyrHUQLXd?I=E6L`*<Nz{R)&V^|S@lZo6^n-eRj%x7Xwle&*T z{OEfJad==KTsS)DNLC@yY)&opBP2c#6`1|dhksAi^QACjV`HPU^3JTXqh9CSkNrs{ zbPLk~3wrTjRiiX&jsE@#R3YeFEL7@&5r7AT7_SxXaO&}Oqo1dq8G3{QL|mVl`#1}H z_i1Y&T}N+jC4;*6F4;S%YhEfkbFCo6Y?pEdlkbFYnuatv{P#X>jy4f<!LT_BWAOgt zr)Xy7YV-ipR2A)=&_(wBiYbX3c_o_X$Mw*=00Y!`>(hrAVIealGr`&NqObgCPsaV$ z8;05!V_^4BID!xGSMV_+$cnGE^*&HvV`wNmYWa_4B{2+)8oakTZumHz++1AiUv>v2 z#nF>*L#C+#6)*VlrjjSHLTcbM41+%nJ9?1D{^dNxjG)t8k0`ncWIu@OM^XynqfH0G z=WwG`Md9|NH0e)Y7u}<yL}vTGQ5YwnxeaDb))}a~gE>|NWi1mh^%BJSW&Nd4yG7L! zA@u}#ogp?Nh4ArWVO%kyr}loh$H1|nzQ_RWz(EfYHvCCq4=quN)z(Gd%sNZ1qRFGv z^hc><PfVFevc;BWBCr&^9Z-@SM<cY6>BnG`qrT+|>4Uw)fXDcX!5DHZN5M4o<qhsO zLzdMCJX{+|BxW;wB<dR2XEhr6LzpT|0)C$bUW2SI;Ggp{n-1&ei=@A&E`cvWv4pck zhq4TPj)!H9X92nL&HaXJASaNgh_Yz@h=e5Nn2Cr}+)nIA<Xd8LO(9Gne4%nzH@EMu zp03?cENH=x=lJ178-#ic7t(VUan>Hh9*!Q7CqcvjL}A1_)JxPVR25u2+)p?i^lS|4 zjQzB!bd8Ey${wkDsmttcR2Kpl#CSw_%6N}-o^&?yFDaL)RVk|sp31*snxmUTn+rX1 zuLX`#W=*Z`t%|L_j&!B*r;5=rQZLcp$!;nKg+9Uml|yqxGeC1j^F_la5N8H5Q>wdb z2p1WZcd5uoTc?ikYU3_oEdZ)=wYDl{Dm^PsHT{bw%L~eaR3K8cGL})_vJVJrMQa6D zNmp~5gOA&f#-}&RAC)+jT~aqW16dJJ!<{1SBRwNC<AvhANEk^}xl(xat;Q^JfE`mx z<7`8Yaez$Uu)kzi5=8JshHUg~v~1=2CJm|J*e3g?4q&aNu|?q2P#**2Ah9;?6iozP z1iMqr>-+@s#0J0xpc8U*({ev?ecGPiyM}y+{LPI^Pz?Ji3a8#5efn?b(KWc-fBU|^ znzO>c4x)cqC;rQm)MvF;V?w20k|d9a4=;gCLFjI~FAkIXegCKr4lG7?rbLS=Ln@|L z3$L)>=Fje6xLl#+7Nq=-S)MTw-AEsaotO9R?|`NzO}OzLB(ed{M5IYv+ZmE2)-yjn z2;LdNB6l201nn}Usb78XPvsv(=a!oOv=Mt%G*z0SZdP*I7d0QUxQDKO-T~4G=ztAc z@B5-Vu`Zg*ttfNbRp&NiZ?^jV+^<Um45H05gZ$*n6|^Cta*2GY^5zj0{cXrzuAxLr z#+M=kVOt@iW5`D0L&;&B-r9BAbrh4CR?Zg(hfGD$P6d9^2;^zHrC;O7qCN)ZiplM* zwVTW2rCQi%_%UyPDbHNdC8@sAwDXnz-G&vP(xd5%U3e~*-3KmDoj*G5srKYS&`aGS z^~lnL8cC*AVcMgqBxt+2N5tgnWzY_<&*{OS?8Cv87Yl0Q44uY7`vQR?V=Yrvk`uwu z^y5aU!(uWFo)z8f+vl?Elo8&ju5q3zHlA>p<pFxaXmrFs9<NRd+DqxyaI!lqA!eZ) z8?~Q%uNIfzUaf3wyon8AV)62RZRXzI!=V!Wg`oS1+wr?S6J7_P#8e-@gRrG=$<!9Q zu*@N>KthCKh^v*imA8R6#*MAthXKqK*C3<_ro+!3&|sV3VO#qfx35<~sF#wVm#wXr zv7ndFub0-Mm+PsQd81c|xtyG^oTa>+{`$UVUrwz(!b9^**P7>RzFx_3TK;;vTtKm$ zGI}yV@QugpOa4lP@k+wRO1RicT=z;;;7ZanAOryr9S->N5fBdngwX<GO8}9UfJ7)D z6dw>{r(}c7_!*5CkfA>g#46{`oCAdW=8fv-O$1Et7)?S0IJTuYb}cw|G&rE{b=#ln zcJ1qS4C<hM&fBuiyFlk19cQT5*|y5ruJhTB$r&_=a{B}2t~uq7IwjPtU|XSJ*REhk zzX0lMvMpn>Yi+WlZDI*ue}(LFN#t^cb$&^Ceg#i;iA!~bT6jrXc!gwoNoab7xphgg zb%h{ti7#=5-h273_iFgwj`wgXy8!hHIC13FsTn2m{qdX#eajU}<UGZ`F;=@V<h0Qv z;@dtr;#!^J7Vi7mCaI@F_FKI3sd<8_eMbourB6&~Cdum*g)JJey@P;F<#P|pt$Y2u zv|ucA;JmeX?e$>YW!4kITQvWO?tT;Vf8g(x{~xTU8MmMO%erSx?CP6!SO0-5{u$k4 zCf4<hx+~Qu+W&&9CQjw8nroG(^IrBME%~b|mgN^F3Ee{`mh}xw%MK^}w`Bgc-HRp; z^({-Q4yP@*2LFOvCjUEvm*dV#9*@K!R9pSE>#NV_{<R`qa@SPPa<G};|2}QV-OU7g zQ2n1&-dYYjl6XjZDfw>_?ECrJF}4UgOzZ`I+?ZFg9Uc||hEIS~1iw|&Yk-GO)NhbQ mX4Rts<LE1b2{c|8A^H?xWL6_ReJ}y*KfbXV2YPjIaQ_1m_8C<G literal 0 HcmV?d00001 From 26b6180f5047e965383553177cd5cd7938bbe63e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 5 Nov 2014 10:28:34 +0000 Subject: [PATCH 1013/1652] Support None if initial part of dotted lookup returns None. Closes #1223. --- rest_framework/fields.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 8cc8e81ec..24ddb7a44 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -57,6 +57,9 @@ def get_attribute(instance, attrs): Also accepts either attribute lookup on objects or dictionary lookups. """ for attr in attrs: + if instance is None: + # Break out early if we get `None` at any point in a nested lookup. + return None try: instance = getattr(instance, attr) except ObjectDoesNotExist: From 0a5d088287be1bb56f37504cc75cee10fb4e74a0 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 5 Nov 2014 10:48:30 +0000 Subject: [PATCH 1014/1652] Fix failing copy of fields when RegexValidator is used. Closes #1954. --- rest_framework/fields.py | 16 ++++++++++++---- tests/test_validation.py | 20 +++++++++++++++++++- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 24ddb7a44..363b684f0 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1,7 +1,7 @@ from django.conf import settings -from django.core import validators from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ValidationError as DjangoValidationError +from django.core.validators import RegexValidator from django.forms import ImageField as DjangoImageField from django.utils import six, timezone from django.utils.datastructures import SortedDict @@ -392,7 +392,15 @@ class Field(object): originally created with, rather than copying the complete state. """ args = copy.deepcopy(self._args) - kwargs = copy.deepcopy(self._kwargs) + kwargs = dict(self._kwargs) + # Bit ugly, but we need to special case 'validators' as Django's + # RegexValidator does not support deepcopy. + # We treat validator callables as immutable objects. + # See https://github.com/tomchristie/django-rest-framework/issues/1954 + validators = kwargs.pop('validators', None) + kwargs = copy.deepcopy(kwargs) + if validators is not None: + kwargs['validators'] = validators return self.__class__(*args, **kwargs) def __repr__(self): @@ -531,7 +539,7 @@ class RegexField(CharField): def __init__(self, regex, **kwargs): super(RegexField, self).__init__(**kwargs) - validator = validators.RegexValidator(regex, message=self.error_messages['invalid']) + validator = RegexValidator(regex, message=self.error_messages['invalid']) self.validators.append(validator) @@ -543,7 +551,7 @@ class SlugField(CharField): def __init__(self, **kwargs): super(SlugField, self).__init__(**kwargs) slug_regex = re.compile(r'^[-a-zA-Z0-9_]+$') - validator = validators.RegexValidator(slug_regex, message=self.error_messages['invalid']) + validator = RegexValidator(slug_regex, message=self.error_messages['invalid']) self.validators.append(validator) diff --git a/tests/test_validation.py b/tests/test_validation.py index c278d90f3..3db825557 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -1,9 +1,10 @@ from __future__ import unicode_literals -from django.core.validators import MaxValueValidator +from django.core.validators import RegexValidator, MaxValueValidator from django.db import models from django.test import TestCase from rest_framework import generics, serializers, status from rest_framework.test import APIRequestFactory +import re factory = APIRequestFactory() @@ -174,3 +175,20 @@ class TestChoiceFieldChoicesValidate(TestCase): # f.to_native(value) # except ValidationError: # self.fail("Value %s does not validate" % str(value)) + + +class RegexSerializer(serializers.Serializer): + pin = serializers.CharField( + validators=[RegexValidator(regex=re.compile('^[0-9]{4,6}$'), + message='A PIN is 4-6 digits')]) + +expected_repr = """ +RegexSerializer(): + pin = CharField(validators=[<django.core.validators.RegexValidator object>]) +""".strip() + + +class TestRegexSerializer(TestCase): + def test_regex_repr(self): + serializer_repr = repr(RegexSerializer()) + assert serializer_repr == expected_repr From 571440e143870cf38230eea7c3a49df23d1eaa7c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 5 Nov 2014 10:53:46 +0000 Subject: [PATCH 1015/1652] Stronger calling out of 'DjangoObjectPermissionsFilter'. Closes #1934. --- docs/api-guide/permissions.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index f3ae81717..446e362e1 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -146,7 +146,13 @@ As with `DjangoModelPermissions`, this permission must only be applied to views Note that `DjangoObjectPermissions` **does not** require the `django-guardian` package, and should support other object-level backends equally well. -As with `DjangoModelPermissions` you can use custom model permissions by overriding `DjangoModelPermissions` and setting the `.perms_map` property. Refer to the source code for details. Note that if you add a custom `view` permission for `GET`, `HEAD` and `OPTIONS` requests, you'll probably also want to consider adding the `DjangoObjectPermissionsFilter` class to ensure that list endpoints only return results including objects for which the user has appropriate view permissions. +As with `DjangoModelPermissions` you can use custom model permissions by overriding `DjangoModelPermissions` and setting the `.perms_map` property. Refer to the source code for details. + +--- + +**Note**: If you need object level `view` permissions for `GET`, `HEAD` and `OPTIONS` requests, you'll want to consider also adding the `DjangoObjectPermissionsFilter` class to ensure that list endpoints only return results including objects for which the user has appropriate view permissions. + +--- ## TokenHasReadWriteScope From 2daf085100b32fd4c13add0fcfa2dbb97722de4a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 5 Nov 2014 11:08:32 +0000 Subject: [PATCH 1016/1652] Copy accepted_renderer and accepted_media_type when cloing a request. Closes #1950. --- rest_framework/request.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/request.py b/rest_framework/request.py index d43527421..096b30424 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -103,6 +103,10 @@ def clone_request(request, method): ret._auth = request._auth if hasattr(request, '_authenticator'): ret._authenticator = request._authenticator + if hasattr(request, 'accepted_renderer'): + ret.accepted_renderer = request.accepted_renderer + if hasattr(request, 'accepted_media_type'): + ret.accepted_media_type = request.accepted_media_type return ret From 52507006595af4f9da34491e4211bf7ae447a457 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 5 Nov 2014 11:14:41 +0000 Subject: [PATCH 1017/1652] Add docs on request.accepted_renderer and .accepted_media_type --- docs/api-guide/requests.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/api-guide/requests.md b/docs/api-guide/requests.md index 0696fedf6..87425ed1b 100644 --- a/docs/api-guide/requests.md +++ b/docs/api-guide/requests.md @@ -49,6 +49,20 @@ If a client sends a request with a content-type that cannot be parsed then a `Un --- +# Content negotiation + +The request exposes some properties that allow you to determine the result of the content negotiation stage. This allows you to implement behaviour such as selecting a different serialisation schemes for different media types. + +## .accepted_renderer + +The renderer instance what was selected by the content negotiation stage. + +## .accepted_media_type + +A string representing the media type that was accepted by the content negotiation stage. + +--- + # Authentication REST framework provides flexible, per-request authentication, that gives you the ability to: From d048d32876e4a2f4acb6848b809097b9b9d48e50 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 5 Nov 2014 13:40:21 +0000 Subject: [PATCH 1018/1652] Minor cleanup --- rest_framework/serializers.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index f00b685f4..9e5d0cabe 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -306,11 +306,7 @@ class Serializer(BaseSerializer): def get_initial(self): if self._initial_data is not None: - return ReturnDict([ - (field_name, field.get_value(self._initial_data)) - for field_name, field in self.fields.items() - if field.get_value(self._initial_data) is not empty - ], serializer=self) + return self.to_representation(self._initial_data) return ReturnDict([ (field.field_name, field.get_initial()) From 49fae230005bba4607f425d90de77363d6b8659e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 5 Nov 2014 15:23:13 +0000 Subject: [PATCH 1019/1652] Pass through kwargs to both Serializer and ListSerializer --- rest_framework/relations.py | 14 ++++++++++---- rest_framework/serializers.py | 14 +++++++++++--- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 1665dd35e..f6ae30d05 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -13,6 +13,11 @@ class PKOnlyObject(object): def __init__(self, pk): self.pk = pk +MANY_RELATION_KWARGS = ( + 'read_only', 'write_only', 'required', 'default', 'initial', 'source', + 'label', 'help_text', 'style', 'error_messages' +) + class RelatedField(Field): def __init__(self, **kwargs): @@ -31,10 +36,11 @@ class RelatedField(Field): # We override this method in order to automagically create # `ManyRelation` classes instead when `many=True` is set. if kwargs.pop('many', False): - return ManyRelation( - child_relation=cls(*args, **kwargs), - read_only=kwargs.get('read_only', False) - ) + list_kwargs = {'child_relation': cls(*args, **kwargs)} + for key in kwargs.keys(): + if key in MANY_RELATION_KWARGS: + list_kwargs[key] = kwargs[key] + return ManyRelation(**list_kwargs) return super(RelatedField, cls).__new__(cls, *args, **kwargs) def run_validation(self, data=empty): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 9e5d0cabe..dfac75fc5 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -43,6 +43,12 @@ import warnings from rest_framework.relations import * # NOQA from rest_framework.fields import * # NOQA +LIST_SERIALIZER_KWARGS = ( + 'read_only', 'write_only', 'required', 'default', 'initial', 'source', + 'label', 'help_text', 'style', 'error_messages', + 'instance', 'data', 'partial', 'context' +) + # BaseSerializer # -------------- @@ -52,7 +58,6 @@ class BaseSerializer(Field): The BaseSerializer class provides a minimal class which may be used for writing custom serializer implementations. """ - def __init__(self, instance=None, data=None, **kwargs): self.instance = instance self._initial_data = data @@ -65,8 +70,11 @@ class BaseSerializer(Field): # We override this method in order to automagically create # `ListSerializer` classes instead when `many=True` is set. if kwargs.pop('many', False): - kwargs['child'] = cls() - return ListSerializer(*args, **kwargs) + list_kwargs = {'child': cls(*args, **kwargs)} + for key in kwargs.keys(): + if key in LIST_SERIALIZER_KWARGS: + list_kwargs[key] = kwargs[key] + return ListSerializer(*args, **list_kwargs) return super(BaseSerializer, cls).__new__(cls, *args, **kwargs) def to_internal_value(self, data): From 73daf407150b4d0c456b529c4d9bba0e035fc370 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 5 Nov 2014 15:51:45 +0000 Subject: [PATCH 1020/1652] ModelField should support max_length. Closes #2018. --- rest_framework/fields.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 363b684f0..b554f2382 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1175,10 +1175,20 @@ class ModelField(Field): This is used by `ModelSerializer` when dealing with custom model fields, that do not have a serializer field to be mapped to. """ + default_error_messages = { + 'max_length': _('Ensure this field has no more than {max_length} characters.'), + } + def __init__(self, model_field, **kwargs): self.model_field = model_field kwargs['source'] = '*' + # The `max_length` option is supported by Django's base `Field` class, + # so we'd better support it here. + max_length = kwargs.pop('max_length', None) super(ModelField, self).__init__(**kwargs) + if max_length is not None: + message = self.error_messages['max_length'].format(max_length=max_length) + self.validators.append(MaxLengthValidator(max_length, message=message)) def to_internal_value(self, data): rel = getattr(self.model_field, 'rel', None) From ed541864e637681e1aca3a808be1f26202b4c271 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 6 Nov 2014 10:34:59 +0000 Subject: [PATCH 1021/1652] Support for bulk create. Closes #1965. --- rest_framework/fields.py | 2 +- rest_framework/serializers.py | 65 +++++++-- tests/test_fields.py | 2 +- tests/test_serializer_bulk_update.py | 202 +++++++++++++-------------- 4 files changed, 157 insertions(+), 114 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index b554f2382..a9e2e48bd 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -943,7 +943,7 @@ class ChoiceField(Field): class MultipleChoiceField(ChoiceField): default_error_messages = { 'invalid_choice': _('`{input}` is not a valid choice.'), - 'not_a_list': _('Expected a list of items but got type `{input_type}`') + 'not_a_list': _('Expected a list of items but got type `{input_type}`.') } default_empty_html = [] diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index dfac75fc5..cbac39928 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -90,12 +90,10 @@ class BaseSerializer(Field): raise NotImplementedError('`create()` must be implemented.') def save(self, **kwargs): - validated_data = self.validated_data - if kwargs: - validated_data = dict( - list(validated_data.items()) + - list(kwargs.items()) - ) + validated_data = dict( + list(self.validated_data.items()) + + list(kwargs.items()) + ) if self.instance is not None: self.instance = self.update(self.instance, validated_data) @@ -210,9 +208,9 @@ class BoundField(object): class NestedBoundField(BoundField): """ - This BoundField additionally implements __iter__ and __getitem__ + This `BoundField` additionally implements __iter__ and __getitem__ in order to support nested bound fields. This class is the type of - BoundField that is used for serializer fields. + `BoundField` that is used for serializer fields. """ def __iter__(self): for field in self.fields.values(): @@ -460,6 +458,10 @@ class ListSerializer(BaseSerializer): child = None many = True + default_error_messages = { + 'not_a_list': _('Expected a list of items but got type `{input_type}`.') + } + def __init__(self, *args, **kwargs): self.child = kwargs.pop('child', copy.deepcopy(self.child)) assert self.child is not None, '`child` is a required argument.' @@ -485,7 +487,31 @@ class ListSerializer(BaseSerializer): """ if html.is_html_input(data): data = html.parse_html_list(data) - return [self.child.run_validation(item) for item in data] + + if not isinstance(data, list): + message = self.error_messages['not_a_list'].format( + input_type=type(data).__name__ + ) + raise ValidationError({ + api_settings.NON_FIELD_ERRORS_KEY: [message] + }) + + ret = [] + errors = ReturnList(serializer=self) + + for item in data: + try: + validated = self.child.run_validation(item) + except ValidationError, exc: + errors.append(exc.detail) + else: + ret.append(validated) + errors.append({}) + + if any(errors): + raise ValidationError(errors) + + return ret def to_representation(self, data): """ @@ -497,8 +523,25 @@ class ListSerializer(BaseSerializer): serializer=self ) - def create(self, attrs_list): - return [self.child.create(attrs) for attrs in attrs_list] + def save(self, **kwargs): + assert self.instance is None, ( + "Serializers do not support multiple update by default, because " + "it would be unclear how to deal with insertions, updates and " + "deletions. If you need to support multiple update, use a " + "`ListSerializer` class and override `.save()` so you can specify " + "the behavior exactly." + ) + + validated_data = [ + dict(list(attrs.items()) + list(kwargs.items())) + for attrs in self.validated_data + ] + + self.instance = [ + self.child.create(attrs) for attrs in validated_data + ] + + return self.instance def __repr__(self): return representation.list_repr(self, indent=1) diff --git a/tests/test_fields.py b/tests/test_fields.py index 96d09900e..5db381acc 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -859,7 +859,7 @@ class TestMultipleChoiceField(FieldValues): ('aircon', 'manual'): set(['aircon', 'manual']), } invalid_inputs = { - 'abc': ['Expected a list of items but got type `str`'], + 'abc': ['Expected a list of items but got type `str`.'], ('aircon', 'incorrect'): ['`incorrect` is not a valid choice.'] } outputs = [ diff --git a/tests/test_serializer_bulk_update.py b/tests/test_serializer_bulk_update.py index 3341ce590..85b6b2fa3 100644 --- a/tests/test_serializer_bulk_update.py +++ b/tests/test_serializer_bulk_update.py @@ -1,123 +1,123 @@ -# """ -# Tests to cover bulk create and update using serializers. -# """ -# from __future__ import unicode_literals -# from django.test import TestCase -# from rest_framework import serializers +""" +Tests to cover bulk create and update using serializers. +""" +from __future__ import unicode_literals +from django.test import TestCase +from rest_framework import serializers -# class BulkCreateSerializerTests(TestCase): -# """ -# Creating multiple instances using serializers. -# """ +class BulkCreateSerializerTests(TestCase): + """ + Creating multiple instances using serializers. + """ -# def setUp(self): -# class BookSerializer(serializers.Serializer): -# id = serializers.IntegerField() -# title = serializers.CharField(max_length=100) -# author = serializers.CharField(max_length=100) + def setUp(self): + class BookSerializer(serializers.Serializer): + id = serializers.IntegerField() + title = serializers.CharField(max_length=100) + author = serializers.CharField(max_length=100) -# self.BookSerializer = BookSerializer + self.BookSerializer = BookSerializer -# def test_bulk_create_success(self): -# """ -# Correct bulk update serialization should return the input data. -# """ + def test_bulk_create_success(self): + """ + Correct bulk update serialization should return the input data. + """ -# data = [ -# { -# 'id': 0, -# 'title': 'The electric kool-aid acid test', -# 'author': 'Tom Wolfe' -# }, { -# 'id': 1, -# 'title': 'If this is a man', -# 'author': 'Primo Levi' -# }, { -# 'id': 2, -# 'title': 'The wind-up bird chronicle', -# 'author': 'Haruki Murakami' -# } -# ] + data = [ + { + 'id': 0, + 'title': 'The electric kool-aid acid test', + 'author': 'Tom Wolfe' + }, { + 'id': 1, + 'title': 'If this is a man', + 'author': 'Primo Levi' + }, { + 'id': 2, + 'title': 'The wind-up bird chronicle', + 'author': 'Haruki Murakami' + } + ] -# serializer = self.BookSerializer(data=data, many=True) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.object, data) + serializer = self.BookSerializer(data=data, many=True) + self.assertEqual(serializer.is_valid(), True) + self.assertEqual(serializer.validated_data, data) -# def test_bulk_create_errors(self): -# """ -# Correct bulk update serialization should return the input data. -# """ + def test_bulk_create_errors(self): + """ + Incorrect bulk create serialization should return errors. + """ -# data = [ -# { -# 'id': 0, -# 'title': 'The electric kool-aid acid test', -# 'author': 'Tom Wolfe' -# }, { -# 'id': 1, -# 'title': 'If this is a man', -# 'author': 'Primo Levi' -# }, { -# 'id': 'foo', -# 'title': 'The wind-up bird chronicle', -# 'author': 'Haruki Murakami' -# } -# ] -# expected_errors = [ -# {}, -# {}, -# {'id': ['Enter a whole number.']} -# ] + data = [ + { + 'id': 0, + 'title': 'The electric kool-aid acid test', + 'author': 'Tom Wolfe' + }, { + 'id': 1, + 'title': 'If this is a man', + 'author': 'Primo Levi' + }, { + 'id': 'foo', + 'title': 'The wind-up bird chronicle', + 'author': 'Haruki Murakami' + } + ] + expected_errors = [ + {}, + {}, + {'id': ['A valid integer is required.']} + ] -# serializer = self.BookSerializer(data=data, many=True) -# self.assertEqual(serializer.is_valid(), False) -# self.assertEqual(serializer.errors, expected_errors) + serializer = self.BookSerializer(data=data, many=True) + self.assertEqual(serializer.is_valid(), False) + self.assertEqual(serializer.errors, expected_errors) -# def test_invalid_list_datatype(self): -# """ -# Data containing list of incorrect data type should return errors. -# """ -# data = ['foo', 'bar', 'baz'] -# serializer = self.BookSerializer(data=data, many=True) -# self.assertEqual(serializer.is_valid(), False) + def test_invalid_list_datatype(self): + """ + Data containing list of incorrect data type should return errors. + """ + data = ['foo', 'bar', 'baz'] + serializer = self.BookSerializer(data=data, many=True) + self.assertEqual(serializer.is_valid(), False) -# expected_errors = [ -# {'non_field_errors': ['Invalid data']}, -# {'non_field_errors': ['Invalid data']}, -# {'non_field_errors': ['Invalid data']} -# ] + expected_errors = [ + {'non_field_errors': ['Invalid data. Expected a dictionary, but got unicode.']}, + {'non_field_errors': ['Invalid data. Expected a dictionary, but got unicode.']}, + {'non_field_errors': ['Invalid data. Expected a dictionary, but got unicode.']} + ] -# self.assertEqual(serializer.errors, expected_errors) + self.assertEqual(serializer.errors, expected_errors) -# def test_invalid_single_datatype(self): -# """ -# Data containing a single incorrect data type should return errors. -# """ -# data = 123 -# serializer = self.BookSerializer(data=data, many=True) -# self.assertEqual(serializer.is_valid(), False) + def test_invalid_single_datatype(self): + """ + Data containing a single incorrect data type should return errors. + """ + data = 123 + serializer = self.BookSerializer(data=data, many=True) + self.assertEqual(serializer.is_valid(), False) -# expected_errors = {'non_field_errors': ['Expected a list of items.']} + expected_errors = {'non_field_errors': ['Expected a list of items but got type `int`.']} -# self.assertEqual(serializer.errors, expected_errors) + self.assertEqual(serializer.errors, expected_errors) -# def test_invalid_single_object(self): -# """ -# Data containing only a single object, instead of a list of objects -# should return errors. -# """ -# data = { -# 'id': 0, -# 'title': 'The electric kool-aid acid test', -# 'author': 'Tom Wolfe' -# } -# serializer = self.BookSerializer(data=data, many=True) -# self.assertEqual(serializer.is_valid(), False) + def test_invalid_single_object(self): + """ + Data containing only a single object, instead of a list of objects + should return errors. + """ + data = { + 'id': 0, + 'title': 'The electric kool-aid acid test', + 'author': 'Tom Wolfe' + } + serializer = self.BookSerializer(data=data, many=True) + self.assertEqual(serializer.is_valid(), False) -# expected_errors = {'non_field_errors': ['Expected a list of items.']} + expected_errors = {'non_field_errors': ['Expected a list of items but got type `dict`.']} -# self.assertEqual(serializer.errors, expected_errors) + self.assertEqual(serializer.errors, expected_errors) # class BulkUpdateSerializerTests(TestCase): From 4482be46ae8c9ed9864123903e114fcc833441ae Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 6 Nov 2014 11:10:36 +0000 Subject: [PATCH 1022/1652] More precise assertion error for bulk update --- rest_framework/serializers.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index cbac39928..68f9e362c 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -525,11 +525,11 @@ class ListSerializer(BaseSerializer): def save(self, **kwargs): assert self.instance is None, ( - "Serializers do not support multiple update by default, because " - "it would be unclear how to deal with insertions, updates and " - "deletions. If you need to support multiple update, use a " - "`ListSerializer` class and override `.save()` so you can specify " - "the behavior exactly." + "Serializers do not support multiple update by default, only " + "multiple create. For updates it is unclear how to deal with " + "insertions and deletions. If you need to support multiple update, " + "use a `ListSerializer` class and override `.save()` so you can " + "specify the behavior exactly." ) validated_data = [ From a919068c5df3677469064fa2e300d27ae4d6e39f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 6 Nov 2014 11:35:34 +0000 Subject: [PATCH 1023/1652] Fix exception style for py3 --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 68f9e362c..7cd206c90 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -502,7 +502,7 @@ class ListSerializer(BaseSerializer): for item in data: try: validated = self.child.run_validation(item) - except ValidationError, exc: + except ValidationError as exc: errors.append(exc.detail) else: ret.append(validated) From 9923a6ce9013693ea1723e7895b3cab638d719fd Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 6 Nov 2014 11:51:10 +0000 Subject: [PATCH 1024/1652] Fix tests for py2/3 compat --- tests/test_serializer_bulk_update.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/test_serializer_bulk_update.py b/tests/test_serializer_bulk_update.py index 85b6b2fa3..2259ee317 100644 --- a/tests/test_serializer_bulk_update.py +++ b/tests/test_serializer_bulk_update.py @@ -3,6 +3,7 @@ Tests to cover bulk create and update using serializers. """ from __future__ import unicode_literals from django.test import TestCase +from django.utils import six from rest_framework import serializers @@ -82,10 +83,12 @@ class BulkCreateSerializerTests(TestCase): serializer = self.BookSerializer(data=data, many=True) self.assertEqual(serializer.is_valid(), False) + text_type_string = six.text_type.__name__ + message = 'Invalid data. Expected a dictionary, but got %s.' % text_type_string expected_errors = [ - {'non_field_errors': ['Invalid data. Expected a dictionary, but got unicode.']}, - {'non_field_errors': ['Invalid data. Expected a dictionary, but got unicode.']}, - {'non_field_errors': ['Invalid data. Expected a dictionary, but got unicode.']} + {'non_field_errors': [message]}, + {'non_field_errors': [message]}, + {'non_field_errors': [message]} ] self.assertEqual(serializer.errors, expected_errors) From 4e001dbb7ac0bc13d6d5fbb4524e905184610aa2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 6 Nov 2014 12:00:30 +0000 Subject: [PATCH 1025/1652] Drop usage of SortedDict. Closes #2027. --- rest_framework/compat.py | 10 ++++++++++ rest_framework/fields.py | 7 +++---- rest_framework/metadata.py | 9 ++++----- rest_framework/routers.py | 6 +++--- rest_framework/serializers.py | 10 +++++----- rest_framework/utils/encoders.py | 11 +++++------ rest_framework/utils/model_meta.py | 12 ++++++------ 7 files changed, 36 insertions(+), 29 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 0201bd830..5bd85e743 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -26,6 +26,16 @@ except ImportError: from django.utils.encoding import force_unicode as force_text +# OrderedDict only available in Python 2.7. +# This will always be the case in Django 1.7 and above, as these versions +# no longer support Python 2.6. +# For Django <= 1.6 and Python 2.6 fall back to OrderedDict. +try: + from collections import OrderedDict +except: + from django.utils.datastructures import SortedDict as OrderedDict + + # HttpResponseBase only exists from 1.5 onwards try: from django.http.response import HttpResponseBase diff --git a/rest_framework/fields.py b/rest_framework/fields.py index a9e2e48bd..71377326f 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -4,14 +4,13 @@ from django.core.exceptions import ValidationError as DjangoValidationError from django.core.validators import RegexValidator from django.forms import ImageField as DjangoImageField from django.utils import six, timezone -from django.utils.datastructures import SortedDict from django.utils.dateparse import parse_date, parse_datetime, parse_time from django.utils.encoding import is_protected_type from django.utils.translation import ugettext_lazy as _ from rest_framework import ISO_8601 from rest_framework.compat import ( smart_text, EmailValidator, MinValueValidator, MaxValueValidator, - MinLengthValidator, MaxLengthValidator, URLValidator + MinLengthValidator, MaxLengthValidator, URLValidator, OrderedDict ) from rest_framework.exceptions import ValidationError from rest_framework.settings import api_settings @@ -917,9 +916,9 @@ class ChoiceField(Field): for item in choices ] if all(pairs): - self.choices = SortedDict([(key, display_value) for key, display_value in choices]) + self.choices = OrderedDict([(key, display_value) for key, display_value in choices]) else: - self.choices = SortedDict([(item, item) for item in choices]) + self.choices = OrderedDict([(item, item) for item in choices]) # Map the string representation of choices to the underlying value. # Allows us to deal with eg. integer choices while supporting either diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py index af4bc396b..b08d3ab67 100644 --- a/rest_framework/metadata.py +++ b/rest_framework/metadata.py @@ -10,9 +10,8 @@ from __future__ import unicode_literals from django.core.exceptions import PermissionDenied from django.http import Http404 -from django.utils.datastructures import SortedDict from rest_framework import exceptions, serializers -from rest_framework.compat import force_text +from rest_framework.compat import force_text, OrderedDict from rest_framework.request import clone_request from rest_framework.utils.field_mapping import ClassLookupDict @@ -54,7 +53,7 @@ class SimpleMetadata(BaseMetadata): }) def determine_metadata(self, request, view): - metadata = SortedDict() + metadata = OrderedDict() metadata['name'] = view.get_view_name() metadata['description'] = view.get_view_description() metadata['renders'] = [renderer.media_type for renderer in view.renderer_classes] @@ -97,7 +96,7 @@ class SimpleMetadata(BaseMetadata): Given an instance of a serializer, return a dictionary of metadata about its fields. """ - return SortedDict([ + return OrderedDict([ (field_name, self.get_field_info(field)) for field_name, field in serializer.fields.items() ]) @@ -107,7 +106,7 @@ class SimpleMetadata(BaseMetadata): Given an instance of a serializer field, return a dictionary of metadata about it. """ - field_info = SortedDict() + field_info = OrderedDict() field_info['type'] = self.label_lookup[field] field_info['required'] = getattr(field, 'required', False) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 169e6e8bc..6e99f14de 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -20,8 +20,8 @@ from collections import namedtuple from django.conf.urls import patterns, url from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import NoReverseMatch -from django.utils.datastructures import SortedDict from rest_framework import views +from rest_framework.compat import OrderedDict from rest_framework.response import Response from rest_framework.reverse import reverse from rest_framework.urlpatterns import format_suffix_patterns @@ -278,7 +278,7 @@ class DefaultRouter(SimpleRouter): """ Return a view to use as the API root. """ - api_root_dict = SortedDict() + api_root_dict = OrderedDict() list_name = self.routes[0].name for prefix, viewset, basename in self.registry: api_root_dict[prefix] = list_name.format(basename=basename) @@ -287,7 +287,7 @@ class DefaultRouter(SimpleRouter): _ignore_model_permissions = True def get(self, request, *args, **kwargs): - ret = SortedDict() + ret = OrderedDict() for key, url_name in api_root_dict.items(): try: ret[key] = reverse( diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 7cd206c90..0efa95241 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -14,8 +14,8 @@ from django.core.exceptions import ImproperlyConfigured from django.db import models from django.db.models.fields import FieldDoesNotExist from django.utils import six -from django.utils.datastructures import SortedDict from django.utils.translation import ugettext_lazy as _ +from rest_framework.compat import OrderedDict from rest_framework.exceptions import ValidationError from rest_framework.fields import empty, set_value, Field, SkipField from rest_framework.settings import api_settings @@ -159,7 +159,7 @@ class BaseSerializer(Field): # Serializer & ListSerializer classes # ----------------------------------- -class ReturnDict(SortedDict): +class ReturnDict(OrderedDict): """ Return object from `serialier.data` for the `Serializer` class. Includes a backlink to the serializer instance for renderers @@ -235,7 +235,7 @@ class BindingDict(object): """ def __init__(self, serializer): self.serializer = serializer - self.fields = SortedDict() + self.fields = OrderedDict() def __setitem__(self, key, field): self.fields[key] = field @@ -280,7 +280,7 @@ class SerializerMetaclass(type): if hasattr(base, '_declared_fields'): fields = list(base._declared_fields.items()) + fields - return SortedDict(fields) + return OrderedDict(fields) def __new__(cls, name, bases, attrs): attrs['_declared_fields'] = cls._get_declared_fields(bases, attrs) @@ -679,7 +679,7 @@ class ModelSerializer(Serializer): def get_fields(self): declared_fields = copy.deepcopy(self._declared_fields) - ret = SortedDict() + ret = OrderedDict() model = getattr(self.Meta, 'model') fields = getattr(self.Meta, 'fields', None) exclude = getattr(self.Meta, 'exclude', None) diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 486186c94..4d6bb3a34 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -4,9 +4,8 @@ Helper classes for parsers. from __future__ import unicode_literals from django.db.models.query import QuerySet from django.utils import six, timezone -from django.utils.datastructures import SortedDict from django.utils.functional import Promise -from rest_framework.compat import force_text +from rest_framework.compat import force_text, OrderedDict import datetime import decimal import types @@ -68,7 +67,7 @@ else: class SafeDumper(yaml.SafeDumper): """ Handles decimals as strings. - Handles SortedDicts as usual dicts, but preserves field order, rather + Handles OrderedDicts as usual dicts, but preserves field order, rather than the usual behaviour of sorting the keys. """ def represent_decimal(self, data): @@ -82,7 +81,7 @@ else: best_style = True if hasattr(mapping, 'items'): mapping = list(mapping.items()) - if not isinstance(mapping, SortedDict): + if not isinstance(mapping, OrderedDict): mapping.sort() for item_key, item_value in mapping: node_key = self.represent_data(item_key) @@ -104,7 +103,7 @@ else: SafeDumper.represent_decimal ) SafeDumper.add_representer( - SortedDict, + OrderedDict, yaml.representer.SafeRepresenter.represent_dict ) # SafeDumper.add_representer( @@ -112,7 +111,7 @@ else: # yaml.representer.SafeRepresenter.represent_dict # ) # SafeDumper.add_representer( - # SortedDictWithMetadata, + # OrderedDictWithMetadata, # yaml.representer.SafeRepresenter.represent_dict # ) SafeDumper.add_representer( diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py index 7a95bcdd1..82361edf9 100644 --- a/rest_framework/utils/model_meta.py +++ b/rest_framework/utils/model_meta.py @@ -8,7 +8,7 @@ Usage: `get_field_info(model)` returns a `FieldInfo` instance. from collections import namedtuple from django.db import models from django.utils import six -from django.utils.datastructures import SortedDict +from rest_framework.compat import OrderedDict import inspect @@ -63,12 +63,12 @@ def get_field_info(model): pk = pk.rel.to._meta.pk # Deal with regular fields. - fields = SortedDict() + fields = OrderedDict() for field in [field for field in opts.fields if field.serialize and not field.rel]: fields[field.name] = field # Deal with forward relationships. - forward_relations = SortedDict() + forward_relations = OrderedDict() for field in [field for field in opts.fields if field.serialize and field.rel]: forward_relations[field.name] = RelationInfo( model_field=field, @@ -89,7 +89,7 @@ def get_field_info(model): ) # Deal with reverse relationships. - reverse_relations = SortedDict() + reverse_relations = OrderedDict() for relation in opts.get_all_related_objects(): accessor_name = relation.get_accessor_name() reverse_relations[accessor_name] = RelationInfo( @@ -114,14 +114,14 @@ def get_field_info(model): # Shortcut that merges both regular fields and the pk, # for simplifying regular field lookup. - fields_and_pk = SortedDict() + fields_and_pk = OrderedDict() fields_and_pk['pk'] = pk fields_and_pk[pk.name] = pk fields_and_pk.update(fields) # Shortcut that merges both forward and reverse relationships - relations = SortedDict( + relations = OrderedDict( list(forward_relations.items()) + list(reverse_relations.items()) ) From ea76dc18b6770aefcc53a6c5752674c2fff0ddcf Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Thu, 6 Nov 2014 18:20:55 +0100 Subject: [PATCH 1026/1652] Fixed base_url duplication in FileField.use_url Django already joins base_url when constructing FileField.url --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 71377326f..95cda2ced 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1007,7 +1007,7 @@ class FileField(Field): if self.use_url: if not value: return None - url = settings.MEDIA_URL + value.url + url = value.url request = self.context.get('request', None) if request is not None: return request.build_absolute_uri(url) From db1dd8e2406bf54a82d154babd360fba52a0d4bc Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 6 Nov 2014 17:32:33 +0000 Subject: [PATCH 1027/1652] Tests & fixes for list serialization --- rest_framework/utils/html.py | 4 +- tests/test_serializer_lists.py | 274 +++++++++++++++++++++++++++++++++ 2 files changed, 276 insertions(+), 2 deletions(-) create mode 100644 tests/test_serializer_lists.py diff --git a/rest_framework/utils/html.py b/rest_framework/utils/html.py index edc591e9c..15e83b3b4 100644 --- a/rest_framework/utils/html.py +++ b/rest_framework/utils/html.py @@ -2,6 +2,7 @@ Helpers for dealing with HTML input. """ import re +from django.utils.datastructures import MultiValueDict def is_html_input(dictionary): @@ -43,7 +44,6 @@ def parse_html_list(dictionary, prefix=''): {'foo': 'hij', 'bar': 'klm'} ] """ - Dict = type(dictionary) ret = {} regex = re.compile(r'^%s\[([0-9]+)\](.*)$' % re.escape(prefix)) for field, value in dictionary.items(): @@ -57,7 +57,7 @@ def parse_html_list(dictionary, prefix=''): elif isinstance(ret.get(index), dict): ret[index][key] = value else: - ret[index] = Dict({key: value}) + ret[index] = MultiValueDict({key: [value]}) return [ret[item] for item in sorted(ret.keys())] diff --git a/tests/test_serializer_lists.py b/tests/test_serializer_lists.py new file mode 100644 index 000000000..640067e3a --- /dev/null +++ b/tests/test_serializer_lists.py @@ -0,0 +1,274 @@ +from rest_framework import serializers +from django.utils.datastructures import MultiValueDict + + +class BasicObject: + """ + A mock object for testing serializer save behavior. + """ + def __init__(self, **kwargs): + self._data = kwargs + for key, value in kwargs.items(): + setattr(self, key, value) + + def __eq__(self, other): + if self._data.keys() != other._data.keys(): + return False + for key in self._data.keys(): + if self._data[key] != other._data[key]: + return False + return True + + +class TestListSerializer: + """ + Tests for using a ListSerializer as a top-level serializer. + Note that this is in contrast to using ListSerializer as a field. + """ + + def setup(self): + class IntegerListSerializer(serializers.ListSerializer): + child = serializers.IntegerField() + self.Serializer = IntegerListSerializer + + def test_validate(self): + """ + Validating a list of items should return a list of validated items. + """ + input_data = ["123", "456"] + expected_output = [123, 456] + serializer = self.Serializer(data=input_data) + assert serializer.is_valid() + assert serializer.validated_data == expected_output + + def test_validate_html_input(self): + """ + HTML input should be able to mock list structures using [x] style ids. + """ + input_data = MultiValueDict({"[0]": ["123"], "[1]": ["456"]}) + expected_output = [123, 456] + serializer = self.Serializer(data=input_data) + assert serializer.is_valid() + assert serializer.validated_data == expected_output + + +class TestListSerializerContainingNestedSerializer: + """ + Tests for using a ListSerializer containing another serializer. + """ + + def setup(self): + class TestSerializer(serializers.Serializer): + integer = serializers.IntegerField() + boolean = serializers.BooleanField() + + def create(self, validated_data): + return BasicObject(**validated_data) + + class ObjectListSerializer(serializers.ListSerializer): + child = TestSerializer() + + self.Serializer = ObjectListSerializer + + def test_validate(self): + """ + Validating a list of dictionaries should return a list of + validated dictionaries. + """ + input_data = [ + {"integer": "123", "boolean": "true"}, + {"integer": "456", "boolean": "false"} + ] + expected_output = [ + {"integer": 123, "boolean": True}, + {"integer": 456, "boolean": False} + ] + serializer = self.Serializer(data=input_data) + assert serializer.is_valid() + assert serializer.validated_data == expected_output + + def test_create(self): + """ + Creating from a list of dictionaries should return a list of objects. + """ + input_data = [ + {"integer": "123", "boolean": "true"}, + {"integer": "456", "boolean": "false"} + ] + expected_output = [ + BasicObject(integer=123, boolean=True), + BasicObject(integer=456, boolean=False), + ] + serializer = self.Serializer(data=input_data) + assert serializer.is_valid() + assert serializer.save() == expected_output + + def test_serialize(self): + """ + Serialization of a list of objects should return a list of dictionaries. + """ + input_objects = [ + BasicObject(integer=123, boolean=True), + BasicObject(integer=456, boolean=False) + ] + expected_output = [ + {"integer": 123, "boolean": True}, + {"integer": 456, "boolean": False} + ] + serializer = self.Serializer(input_objects) + assert serializer.data == expected_output + + def test_validate_html_input(self): + """ + HTML input should be able to mock list structures using [x] + style prefixes. + """ + input_data = MultiValueDict({ + "[0]integer": ["123"], + "[0]boolean": ["true"], + "[1]integer": ["456"], + "[1]boolean": ["false"] + }) + expected_output = [ + {"integer": 123, "boolean": True}, + {"integer": 456, "boolean": False} + ] + serializer = self.Serializer(data=input_data) + assert serializer.is_valid() + assert serializer.validated_data == expected_output + + +class TestNestedListSerializer: + """ + Tests for using a ListSerializer as a field. + """ + + def setup(self): + class TestSerializer(serializers.Serializer): + integers = serializers.ListSerializer(child=serializers.IntegerField()) + booleans = serializers.ListSerializer(child=serializers.BooleanField()) + + def create(self, validated_data): + return BasicObject(**validated_data) + + self.Serializer = TestSerializer + + def test_validate(self): + """ + Validating a list of items should return a list of validated items. + """ + input_data = { + "integers": ["123", "456"], + "booleans": ["true", "false"] + } + expected_output = { + "integers": [123, 456], + "booleans": [True, False] + } + serializer = self.Serializer(data=input_data) + assert serializer.is_valid() + assert serializer.validated_data == expected_output + + def test_create(self): + """ + Creation with a list of items return an object with an attribute that + is a list of items. + """ + input_data = { + "integers": ["123", "456"], + "booleans": ["true", "false"] + } + expected_output = BasicObject( + integers=[123, 456], + booleans=[True, False] + ) + serializer = self.Serializer(data=input_data) + assert serializer.is_valid() + assert serializer.save() == expected_output + + def test_serialize(self): + """ + Serialization of a list of items should return a list of items. + """ + input_object = BasicObject( + integers=[123, 456], + booleans=[True, False] + ) + expected_output = { + "integers": [123, 456], + "booleans": [True, False] + } + serializer = self.Serializer(input_object) + assert serializer.data == expected_output + + def test_validate_html_input(self): + """ + HTML input should be able to mock list structures using [x] + style prefixes. + """ + input_data = MultiValueDict({ + "integers[0]": ["123"], + "integers[1]": ["456"], + "booleans[0]": ["true"], + "booleans[1]": ["false"] + }) + expected_output = { + "integers": [123, 456], + "booleans": [True, False] + } + serializer = self.Serializer(data=input_data) + assert serializer.is_valid() + assert serializer.validated_data == expected_output + + +class TestNestedListOfListsSerializer: + def setup(self): + class TestSerializer(serializers.Serializer): + integers = serializers.ListSerializer( + child=serializers.ListSerializer( + child=serializers.IntegerField() + ) + ) + booleans = serializers.ListSerializer( + child=serializers.ListSerializer( + child=serializers.BooleanField() + ) + ) + + self.Serializer = TestSerializer + + def test_validate(self): + input_data = { + 'integers': [['123', '456'], ['789', '0']], + 'booleans': [['true', 'true'], ['false', 'true']] + } + expected_output = { + "integers": [[123, 456], [789, 0]], + "booleans": [[True, True], [False, True]] + } + serializer = self.Serializer(data=input_data) + assert serializer.is_valid() + assert serializer.validated_data == expected_output + + def test_validate_html_input(self): + """ + HTML input should be able to mock lists of lists using [x][y] + style prefixes. + """ + input_data = MultiValueDict({ + "integers[0][0]": ["123"], + "integers[0][1]": ["456"], + "integers[1][0]": ["789"], + "integers[1][1]": ["000"], + "booleans[0][0]": ["true"], + "booleans[0][1]": ["true"], + "booleans[1][0]": ["false"], + "booleans[1][1]": ["true"] + }) + expected_output = { + "integers": [[123, 456], [789, 0]], + "booleans": [[True, True], [False, True]] + } + serializer = self.Serializer(data=input_data) + assert serializer.is_valid() + assert serializer.validated_data == expected_output From b44def465054345b6099aae7bdd34b623fdc124c Mon Sep 17 00:00:00 2001 From: Brett Koonce <koonce@gmail.com> Date: Thu, 6 Nov 2014 23:19:26 -0800 Subject: [PATCH 1028/1652] minor spelling tweaks --- docs/api-guide/authentication.md | 2 +- docs/api-guide/generic-views.md | 2 +- docs/api-guide/relations.md | 2 +- docs/api-guide/settings.md | 6 +++--- docs/api-guide/throttling.md | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 3a5156fd1..01774c10d 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -398,7 +398,7 @@ HTTP digest authentication is a widely implemented scheme that was intended to r ## Django OAuth Toolkit -The [Django OAuth Toolkit][django-oauth-toolkit] package provides OAuth 2.0 support, and works with Python 2.7 and Python 3.3+. The package is maintained by [Evonove][evonove] and uses the excelllent [OAuthLib][oauthlib]. The package is well documented, and comes as a recommended alternative for OAuth 2.0 support. +The [Django OAuth Toolkit][django-oauth-toolkit] package provides OAuth 2.0 support, and works with Python 2.7 and Python 3.3+. The package is maintained by [Evonove][evonove] and uses the excellent [OAuthLib][oauthlib]. The package is well documented, and comes as a recommended alternative for OAuth 2.0 support. ## Django OAuth2 Consumer diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index d2836fa6d..49a5e58f0 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -374,7 +374,7 @@ Using custom base classes is a good option if you have custom behavior that cons Prior to version 3.0 the REST framework mixins treated `PUT` as either an update or a create operation, depending on if the object already existed or not. -Allowing `PUT` as create operations is problematic, as it necessarily exposes information about the existence or non-existance of objects. It's also not obvious that transparently allowing re-creating of previously deleted instances is necessarily a better default behavior than simply returning `404` responses. +Allowing `PUT` as create operations is problematic, as it necessarily exposes information about the existence or non-existence of objects. It's also not obvious that transparently allowing re-creating of previously deleted instances is necessarily a better default behavior than simply returning `404` responses. Both styles "`PUT` as 404" and "`PUT` as create" can be valid in different circumstances, but from version 3.0 onwards we now use 404 behavior as the default, due to it being simpler and more obvious. diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index cc4f55851..d03a75ae5 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -202,7 +202,7 @@ This field is always read-only. **Arguments**: -* `view_name` - The view name that should be used as the target of the relationship. If you're using [the standard router classes][routers] this wil be a string with the format `<model_name>-detail`. **required**. +* `view_name` - The view name that should be used as the target of the relationship. If you're using [the standard router classes][routers] this will be a string with the format `<model_name>-detail`. **required**. * `lookup_field` - The field on the target that should be used for the lookup. Should correspond to a URL keyword argument on the referenced view. Default is `'pk'`. * `format` - If using format suffixes, hyperlinked fields will use the same format suffix for the target unless overridden by using the `format` argument. diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 2144a2ed3..48af30a52 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -154,13 +154,13 @@ Default: `None` ### SEARCH_PARAM -The name of a query paramater, which can be used to specify the search term used by `SearchFilter`. +The name of a query parameter, which can be used to specify the search term used by `SearchFilter`. Default: `search` #### ORDERING_PARAM -The name of a query paramater, which can be used to specify the ordering of results returned by `OrderingFilter`. +The name of a query parameter, which can be used to specify the ordering of results returned by `OrderingFilter`. Default: `ordering` @@ -321,7 +321,7 @@ When set to `False`, JSON responses will escape non-ascii characters, like so: {"unicode black star":"\u2605"} -Both styles conform to [RFC 4627][rfc4627], and are syntactically valid JSON. The unicode style is prefered as being more user-friendly when inspecting API responses. +Both styles conform to [RFC 4627][rfc4627], and are syntactically valid JSON. The unicode style is preferred as being more user-friendly when inspecting API responses. Default: `True` diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index 16a7457b0..147c16ff7 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -74,7 +74,7 @@ If you need to strictly identify unique client IP addresses, you'll need to firs It is important to understand that if you configure the `NUM_PROXIES` setting, then all clients behind a unique [NAT'd](http://en.wikipedia.org/wiki/Network_address_translation) gateway will be treated as a single client. -Further context on how the `X-Forwarded-For` header works, and identifing a remote client IP can be [found here][identifing-clients]. +Further context on how the `X-Forwarded-For` header works, and identifying a remote client IP can be [found here][identifing-clients]. ## Setting up the cache @@ -85,7 +85,7 @@ If you need to use a cache other than `'default'`, you can do so by creating a c class CustomAnonRateThrottle(AnonRateThrottle): cache = get_cache('alternate') -You'll need to rememeber to also set your custom throttle class in the `'DEFAULT_THROTTLE_CLASSES'` settings key, or using the `throttle_classes` view attribute. +You'll need to remember to also set your custom throttle class in the `'DEFAULT_THROTTLE_CLASSES'` settings key, or using the `throttle_classes` view attribute. --- From 9b19b5a59485c9dad4a18538a8a86f1ae4ea2a55 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 10:13:46 +0000 Subject: [PATCH 1029/1652] Serializer cleanup --- rest_framework/serializers.py | 128 +++++---------------- rest_framework/utils/serializer_helpers.py | 99 ++++++++++++++++ 2 files changed, 129 insertions(+), 98 deletions(-) create mode 100644 rest_framework/utils/serializer_helpers.py diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0efa95241..68ea27ab6 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -25,6 +25,9 @@ from rest_framework.utils.field_mapping import ( get_relation_kwargs, get_nested_relation_kwargs, ClassLookupDict ) +from rest_framework.utils.serializer_helpers import ( + ReturnDict, ReturnList, BoundField, NestedBoundField, BindingDict +) from rest_framework.validators import ( UniqueForDateValidator, UniqueForMonthValidator, UniqueForYearValidator, UniqueTogetherValidator @@ -159,104 +162,6 @@ class BaseSerializer(Field): # Serializer & ListSerializer classes # ----------------------------------- -class ReturnDict(OrderedDict): - """ - Return object from `serialier.data` for the `Serializer` class. - Includes a backlink to the serializer instance for renderers - to use if they need richer field information. - """ - def __init__(self, *args, **kwargs): - self.serializer = kwargs.pop('serializer') - super(ReturnDict, self).__init__(*args, **kwargs) - - -class ReturnList(list): - """ - Return object from `serialier.data` for the `SerializerList` class. - Includes a backlink to the serializer instance for renderers - to use if they need richer field information. - """ - def __init__(self, *args, **kwargs): - self.serializer = kwargs.pop('serializer') - super(ReturnList, self).__init__(*args, **kwargs) - - -class BoundField(object): - """ - A field object that also includes `.value` and `.error` properties. - Returned when iterating over a serializer instance, - providing an API similar to Django forms and form fields. - """ - def __init__(self, field, value, errors, prefix=''): - self._field = field - self.value = value - self.errors = errors - self.name = prefix + self.field_name - - def __getattr__(self, attr_name): - return getattr(self._field, attr_name) - - @property - def _proxy_class(self): - return self._field.__class__ - - def __repr__(self): - return '<%s value=%s errors=%s>' % ( - self.__class__.__name__, self.value, self.errors - ) - - -class NestedBoundField(BoundField): - """ - This `BoundField` additionally implements __iter__ and __getitem__ - in order to support nested bound fields. This class is the type of - `BoundField` that is used for serializer fields. - """ - def __iter__(self): - for field in self.fields.values(): - yield self[field.field_name] - - def __getitem__(self, key): - field = self.fields[key] - value = self.value.get(key) if self.value else None - error = self.errors.get(key) if self.errors else None - if isinstance(field, Serializer): - return NestedBoundField(field, value, error, prefix=self.name + '.') - return BoundField(field, value, error, prefix=self.name + '.') - - -class BindingDict(object): - """ - This dict-like object is used to store fields on a serializer. - - This ensures that whenever fields are added to the serializer we call - `field.bind()` so that the `field_name` and `parent` attributes - can be set correctly. - """ - def __init__(self, serializer): - self.serializer = serializer - self.fields = OrderedDict() - - def __setitem__(self, key, field): - self.fields[key] = field - field.bind(field_name=key, parent=self.serializer) - - def __getitem__(self, key): - return self.fields[key] - - def __delitem__(self, key): - del self.fields[key] - - def items(self): - return self.fields.items() - - def keys(self): - return self.fields.keys() - - def values(self): - return self.fields.values() - - class SerializerMetaclass(type): """ This metaclass sets a dictionary named `base_fields` on the class. @@ -295,6 +200,12 @@ class Serializer(BaseSerializer): @property def fields(self): + """ + A dictionary of {field_name: field_instance}. + """ + # `fields` is evalutated lazily. We do this to ensure that we don't + # have issues importing modules that use ModelSerializers as fields, + # even if Django's app-loading stage has not yet run. if not hasattr(self, '_fields'): self._fields = BindingDict(self) for key, value in self.get_fields().items(): @@ -302,12 +213,19 @@ class Serializer(BaseSerializer): return self._fields def get_fields(self): + """ + Returns a dictionary of {field_name: field_instance}. + """ # Every new serializer is created with a clone of the field instances. # This allows users to dynamically modify the fields on a serializer # instance without affecting every other serializer class. return copy.deepcopy(self._declared_fields) def get_validators(self): + """ + Returns a list of validator callables. + """ + # Used by the lazily-evaluated `validators` property. return getattr(getattr(self, 'Meta', None), 'validators', []) def get_initial(self): @@ -551,6 +469,13 @@ class ListSerializer(BaseSerializer): # -------------------------------------------- class ModelSerializer(Serializer): + """ + A `ModelSerializer` is just a regular `Serializer`, except that: + + * A set of default fields are automatically populated. + * A set of default validators are automatically populated. + * Default `.create()` and `.update()` implementations are provided. + """ _field_mapping = ClassLookupDict({ models.AutoField: IntegerField, models.BigIntegerField: IntegerField, @@ -915,6 +840,13 @@ class ModelSerializer(Serializer): class HyperlinkedModelSerializer(ModelSerializer): + """ + A type of `ModelSerializer` that uses hyperlinked relationships instead + of primary key relationships. Specifically: + + * A 'url' field is included instead of the 'id' field. + * Relationships to other instances are hyperlinks, instead of primary keys. + """ _related_class = HyperlinkedRelatedField def _get_default_field_names(self, declared_fields, model_info): diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py new file mode 100644 index 000000000..a861ca077 --- /dev/null +++ b/rest_framework/utils/serializer_helpers.py @@ -0,0 +1,99 @@ +from rest_framework.compat import OrderedDict + + +class ReturnDict(OrderedDict): + """ + Return object from `serialier.data` for the `Serializer` class. + Includes a backlink to the serializer instance for renderers + to use if they need richer field information. + """ + def __init__(self, *args, **kwargs): + self.serializer = kwargs.pop('serializer') + super(ReturnDict, self).__init__(*args, **kwargs) + + +class ReturnList(list): + """ + Return object from `serialier.data` for the `SerializerList` class. + Includes a backlink to the serializer instance for renderers + to use if they need richer field information. + """ + def __init__(self, *args, **kwargs): + self.serializer = kwargs.pop('serializer') + super(ReturnList, self).__init__(*args, **kwargs) + + +class BoundField(object): + """ + A field object that also includes `.value` and `.error` properties. + Returned when iterating over a serializer instance, + providing an API similar to Django forms and form fields. + """ + def __init__(self, field, value, errors, prefix=''): + self._field = field + self.value = value + self.errors = errors + self.name = prefix + self.field_name + + def __getattr__(self, attr_name): + return getattr(self._field, attr_name) + + @property + def _proxy_class(self): + return self._field.__class__ + + def __repr__(self): + return '<%s value=%s errors=%s>' % ( + self.__class__.__name__, self.value, self.errors + ) + + +class NestedBoundField(BoundField): + """ + This `BoundField` additionally implements __iter__ and __getitem__ + in order to support nested bound fields. This class is the type of + `BoundField` that is used for serializer fields. + """ + def __iter__(self): + for field in self.fields.values(): + yield self[field.field_name] + + def __getitem__(self, key): + field = self.fields[key] + value = self.value.get(key) if self.value else None + error = self.errors.get(key) if self.errors else None + if hasattr(field, 'fields'): + return NestedBoundField(field, value, error, prefix=self.name + '.') + return BoundField(field, value, error, prefix=self.name + '.') + + +class BindingDict(object): + """ + This dict-like object is used to store fields on a serializer. + + This ensures that whenever fields are added to the serializer we call + `field.bind()` so that the `field_name` and `parent` attributes + can be set correctly. + """ + def __init__(self, serializer): + self.serializer = serializer + self.fields = OrderedDict() + + def __setitem__(self, key, field): + self.fields[key] = field + field.bind(field_name=key, parent=self.serializer) + + def __getitem__(self, key): + return self.fields[key] + + def __delitem__(self, key): + del self.fields[key] + + def items(self): + return self.fields.items() + + def keys(self): + return self.fields.keys() + + def values(self): + return self.fields.values() From e399140031a0738a054f5f07e42ef7208f9e45f4 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 10:51:08 +0000 Subject: [PATCH 1030/1652] Minor tweaks --- rest_framework/serializers.py | 6 ++++++ rest_framework/utils/field_mapping.py | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 68ea27ab6..b00f9b7a8 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -393,6 +393,9 @@ class ListSerializer(BaseSerializer): return ReturnList(serializer=self) def get_value(self, dictionary): + """ + Given the input dictionary, return the field value. + """ # We override the default field access in order to support # lists in HTML forms. if html.is_html_input(dictionary): @@ -442,6 +445,9 @@ class ListSerializer(BaseSerializer): ) def save(self, **kwargs): + """ + Save and return a list of object instances. + """ assert self.instance is None, ( "Serializers do not support multiple update by default, only " "multiple create. For updates it is unclear how to deal with " diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index 6db371469..246390853 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -219,9 +219,11 @@ def get_relation_kwargs(field_name, relation_info): kwargs['required'] = False if model_field.null: kwargs['allow_null'] = True + if model_field.validators: + kwargs['validators'] = model_field.validators if getattr(model_field, 'unique', False): validator = UniqueValidator(queryset=model_field.model._default_manager) - kwargs['validators'] = [validator] + kwargs['validators'] = kwargs.get('validators', []) + [validator] return kwargs From a16a8a10a9204e574ad912eeced535d70a385b37 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 11:16:26 +0000 Subject: [PATCH 1031/1652] .copy() for serializer .data and .errors dictionaries --- rest_framework/utils/serializer_helpers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py index a861ca077..92d19857e 100644 --- a/rest_framework/utils/serializer_helpers.py +++ b/rest_framework/utils/serializer_helpers.py @@ -11,6 +11,9 @@ class ReturnDict(OrderedDict): self.serializer = kwargs.pop('serializer') super(ReturnDict, self).__init__(*args, **kwargs) + def copy(self): + return ReturnDict(self, serializer=self.serializer) + class ReturnList(list): """ From eafb7e1e24c31f0a6795ef5b8ac52940569d5854 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 11:44:16 +0000 Subject: [PATCH 1032/1652] ModelField fix. Closes #2018. --- rest_framework/fields.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 95cda2ced..4933d8db6 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1180,7 +1180,6 @@ class ModelField(Field): def __init__(self, model_field, **kwargs): self.model_field = model_field - kwargs['source'] = '*' # The `max_length` option is supported by Django's base `Field` class, # so we'd better support it here. max_length = kwargs.pop('max_length', None) @@ -1195,6 +1194,11 @@ class ModelField(Field): return rel.to._meta.get_field(rel.field_name).to_python(data) return self.model_field.to_python(data) + def get_attribute(self, obj): + # We pass the object instance onto `to_representation`, + # not just the field attribute. + return obj + def to_representation(self, obj): value = self.model_field._get_val_from_obj(obj) if is_protected_type(value): From bb21216a7c7f3435ece44462beb24275bb44551a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 12:16:25 +0000 Subject: [PATCH 1033/1652] Metadata API should examine child serializer if passed parent ListSerializer. Closes #2035. --- rest_framework/metadata.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py index b08d3ab67..90d3f2e01 100644 --- a/rest_framework/metadata.py +++ b/rest_framework/metadata.py @@ -96,6 +96,10 @@ class SimpleMetadata(BaseMetadata): Given an instance of a serializer, return a dictionary of metadata about its fields. """ + if hasattr(serializer, 'child'): + # If this is a `ListSerializer` then we want to examine the + # underlying child serializer instance instead. + serializer = serializer.child return OrderedDict([ (field_name, self.get_field_info(field)) for field_name, field in serializer.fields.items() From 73bebbba64ddd287b7eb7c27047abe889b69f67e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 12:53:01 +0000 Subject: [PATCH 1034/1652] Add font files --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index d407865fb..d202c86ea 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -recursive-include rest_framework/static *.js *.css *.png +recursive-include rest_framework/static *.js *.css *.png *.eot *.svg *.ttf *.woff recursive-include rest_framework/templates *.html recursive-exclude * __pycache__ recursive-exclude * *.py[co] From 041435f4eeee80fbc805154977140cf42335c954 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 14:08:20 +0000 Subject: [PATCH 1035/1652] Prevent re-running deserialization. Closes #1975. --- rest_framework/renderers.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index c950b4981..87fe4d29f 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -523,8 +523,10 @@ class BrowsableAPIRenderer(BaseRenderer): data = request.data except ParseError: data = None + existing_serializer = serializer else: data = None + existing_serializer = None with override_method(view, request, method) as request: if not self.show_form_for_method(view, method, request, instance): @@ -539,9 +541,12 @@ class BrowsableAPIRenderer(BaseRenderer): ): return - serializer = view.get_serializer(instance=instance, data=data) - if data is not None: - serializer.is_valid() + if existing_serializer is not None: + serializer = existing_serializer + else: + serializer = view.get_serializer(instance=instance, data=data) + if data is not None: + serializer.is_valid() form_renderer = self.form_renderer_class() return form_renderer.render(serializer.data, self.accepted_media_type, self.renderer_context) From 55c44fc92192f63867c6c7ebcb7f75bf0569c900 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 14:13:50 +0000 Subject: [PATCH 1036/1652] Fix serializer initial data --- rest_framework/serializers.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b00f9b7a8..833a4e486 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -230,7 +230,11 @@ class Serializer(BaseSerializer): def get_initial(self): if self._initial_data is not None: - return self.to_representation(self._initial_data) + return ReturnDict([ + (field_name, field.get_value(self._initial_data)) + for field_name, field in self.fields.items() + if field.get_value(self._initial_data) is not empty + ], serializer=self) return ReturnDict([ (field.field_name, field.get_initial()) From 02844a1507285b7146dede5023b784fe63678cf7 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 15:22:17 +0000 Subject: [PATCH 1037/1652] Fix up fieldset templates. Closes #2039 --- .../templates/rest_framework/horizontal/fieldset.html | 4 +++- rest_framework/templates/rest_framework/inline/fieldset.html | 4 +++- .../templates/rest_framework/vertical/fieldset.html | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/rest_framework/templates/rest_framework/horizontal/fieldset.html b/rest_framework/templates/rest_framework/horizontal/fieldset.html index f6d5dd9d2..ba3e3abae 100644 --- a/rest_framework/templates/rest_framework/horizontal/fieldset.html +++ b/rest_framework/templates/rest_framework/horizontal/fieldset.html @@ -6,6 +6,8 @@ </div> {% endif %} {% for nested_field in field %} - {% render_field nested_field template_pack=template_pack renderer=renderer %} + {% if not nested_field.read_only %} + {% render_field nested_field style=style %} + {% endif %} {% endfor %} </fieldset> diff --git a/rest_framework/templates/rest_framework/inline/fieldset.html b/rest_framework/templates/rest_framework/inline/fieldset.html index 5ee182a5b..e49b42fdf 100644 --- a/rest_framework/templates/rest_framework/inline/fieldset.html +++ b/rest_framework/templates/rest_framework/inline/fieldset.html @@ -1,4 +1,6 @@ {% load rest_framework %} {% for nested_field in field %} - {% render_field nested_field template_pack=template_pack renderer=renderer %} + {% if not nested_field.read_only %} + {% render_field nested_field style=style %} + {% endif %} {% endfor %} diff --git a/rest_framework/templates/rest_framework/vertical/fieldset.html b/rest_framework/templates/rest_framework/vertical/fieldset.html index 824e6098f..3eb5191c7 100644 --- a/rest_framework/templates/rest_framework/vertical/fieldset.html +++ b/rest_framework/templates/rest_framework/vertical/fieldset.html @@ -2,6 +2,8 @@ <fieldset> {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} {% for nested_field in field %} - {% render_field nested_field template_pack=template_pack renderer=renderer %} + {% if not nested_field.read_only %} + {% render_field nested_field style=style %} + {% endif %} {% endfor %} </fieldset> From 3e878a3207ba79785d41b4d6af5cd956156d45a3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 15:38:27 +0000 Subject: [PATCH 1038/1652] Fix initial data on serializers to reflect writable fields --- rest_framework/renderers.py | 5 ----- rest_framework/serializers.py | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 87fe4d29f..b56f99db9 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -581,12 +581,7 @@ class BrowsableAPIRenderer(BaseRenderer): # View has a serializer defined and parser class has a # corresponding renderer that can be used to render the data. - # Get a read-only version of the serializer serializer = view.get_serializer(instance=instance) - if instance is None: - for name, field in serializer.fields.items(): - if getattr(field, 'read_only', None): - del serializer.fields[name] # Render the raw data content renderer = renderer_class() diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 833a4e486..d83367f40 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -234,12 +234,13 @@ class Serializer(BaseSerializer): (field_name, field.get_value(self._initial_data)) for field_name, field in self.fields.items() if field.get_value(self._initial_data) is not empty + and not field.read_only ], serializer=self) return ReturnDict([ (field.field_name, field.get_initial()) for field in self.fields.values() - if not field.write_only + if not field.read_only ], serializer=self) def get_value(self, dictionary): From 51d86a65055491df3fe0533f8e2e89237a51e379 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 16:05:07 +0000 Subject: [PATCH 1039/1652] Support dotted source on relational fields --- rest_framework/relations.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index f6ae30d05..48ddf41e0 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -56,8 +56,8 @@ class RelatedField(Field): queryset = queryset.all() return queryset - def get_iterable(self, instance, source): - relationship = get_attribute(instance, [source]) + def get_iterable(self, instance, source_attrs): + relationship = get_attribute(instance, source_attrs) return relationship.all() if (hasattr(relationship, 'all')) else relationship @property @@ -106,11 +106,12 @@ class PrimaryKeyRelatedField(RelatedField): # the related object. We return this directly instead of returning the # object itself, which would require a database lookup. try: - return PKOnlyObject(pk=instance.serializable_value(self.source)) + instance = get_attribute(instance, self.source_attrs[:-1]) + return PKOnlyObject(pk=instance.serializable_value(self.source_attrs[-1])) except AttributeError: - return get_attribute(instance, [self.source]) + return get_attribute(instance, self.source_attrs) - def get_iterable(self, instance, source): + def get_iterable(self, instance, source_attrs): # For consistency with `get_attribute` we're using `serializable_value()` # here. Typically there won't be any difference, but some custom field # types might return a non-primative value for the pk otherwise. @@ -119,7 +120,7 @@ class PrimaryKeyRelatedField(RelatedField): # would be better in some case, but would actually end up with *more* # queries if the developer is using `prefetch_related` across the # relationship. - relationship = super(PrimaryKeyRelatedField, self).get_iterable(instance, source) + relationship = super(PrimaryKeyRelatedField, self).get_iterable(instance, source_attrs) return [ PKOnlyObject(pk=item.serializable_value('pk')) for item in relationship @@ -318,7 +319,7 @@ class ManyRelation(Field): ] def get_attribute(self, instance): - return self.child_relation.get_iterable(instance, self.source) + return self.child_relation.get_iterable(instance, self.source_attrs) def to_representation(self, iterable): return [ From 59b30307e80fb26f2c7caa82492c78fe265b537e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 20:10:15 +0000 Subject: [PATCH 1040/1652] Fixes to release notes --- docs/topics/3.0-announcement.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index e8428bc20..272b730c4 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -1,17 +1,11 @@ ## Pre-release notes: -The 3.0 release is now ready for some tentative testing and upgrades for super keen early adopters. You can install the development version directly from GitHub like so: +The 3.0 release is now ready for some tentative testing and upgrades for early adopters. You can install the development version directly from GitHub like so: - pip install https://github.com/tomchristie/django-rest-framework/archive/version-3.0.zip + pip install https://github.com/tomchristie/django-rest-framework/archive/master.zip See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-framework/pull/1800) for more details on remaining work. -The most notable outstanding issues still to be resolved on the `version-3.0` branch are as follows: - -* Finish forms support for serializers and in the browsable API. -* Optimisations for serializing primary keys. -* Refine style of validation errors in some cases, such as validation errors in `ListField`. - **Your feedback on the upgrade process and 3.0 changes is hugely important!** Please do get in touch via twitter, IRC, a GitHub ticket, or the discussion group. @@ -237,7 +231,7 @@ To use writable nested serialization you'll want to declare a nested field on th fields = ('username', 'email', 'profile') def create(self, validated_data): - profile_data = validated_data.pop['profile'] + profile_data = validated_data.pop('profile') user = User.objects.create(**validated_data) Profile.objects.create(user=user, **profile_data) return user From 93633c297c69a1eefda5e153553c4f021cf10bd8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 7 Nov 2014 20:44:12 +0000 Subject: [PATCH 1041/1652] Tweaks to release notes --- docs/topics/3.0-announcement.md | 43 +++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 272b730c4..d3da0607e 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -27,8 +27,8 @@ Notable features of this new release include: * Printable representations on serializers that allow you to inspect exactly what fields are present on the instance. * Simple model serializers that are vastly easier to understand and debug, and that make it easy to switch between the implicit `ModelSerializer` class and the explicit `Serializer` class. * A new `BaseSerializer` class, making it easier to write serializers for alternative storage backends, or to completely customize your serialization and validation logic. -* A cleaner fields API plus new `ListField` and `MultipleChoiceField` classes. -* Super simple default implementations for the generic views. +* A cleaner fields API including new classes such as `ListField` and `MultipleChoiceField`. +* [Super simple default implementations][mixins.py] for the generic views. * Support for overriding how validation errors are handled by your API. * A metadata API that allows you to customize how `OPTIONS` requests are handled by your API. * A more compact JSON output with unicode style encoding turned on by default. @@ -70,7 +70,7 @@ Previously the serializers used a two-step object creation, as follows: This style is in-line with how the `ModelForm` class works in Django, but is problematic for a number of reasons: * Some data, such as many-to-many relationships, cannot be added to the object instance until after it has been saved. This type of data needed to be hidden in some undocumented state on the object instance, or kept as state on the serializer instance so that it could be used when `.save()` is called. -* Instantiating model instances directly means that you cannot use model manager classes for instance creation, eg `ExampleModel.objects.create(...)`. Manager classes are an excellent layer at which to enforce business logic and application-level data constraints. +* Instantiating model instances directly means that you cannot use model manager classes for instance creation, e.g. `ExampleModel.objects.create(...)`. Manager classes are an excellent layer at which to enforce business logic and application-level data constraints. * The two step process makes it unclear where to put deserialization logic. For example, should extra attributes such as the current user get added to the instance during object creation or during object save? We now use single-step object creation, like so: @@ -184,7 +184,7 @@ This ensures you can still write validation that compares all the input fields, #### Differences between ModelSerializer validation and ModelForm. -This change also means that we no longer use the `.full_clean()` method on model instances, but instead perform all validation explicitly on the serializer. This gives a cleaner separation, and ensures that there's no automatic validation behaviour on `ModelSerializer` classes that can't also be easily replicated on regular `Serializer` classes. +This change also means that we no longer use the `.full_clean()` method on model instances, but instead perform all validation explicitly on the serializer. This gives a cleaner separation, and ensures that there's no automatic validation behavior on `ModelSerializer` classes that can't also be easily replicated on regular `Serializer` classes. It's important to note that this change also means that the model `.clean()` method will not be called as part of serializer validation, as it would be if using a `ModelForm`. Use the serializer `.validate()` method to perform a final validation step on incoming data where required. @@ -219,7 +219,7 @@ If you try to use a writable nested serializer without writing a custom `create( >>> >>> serializer = UserSerializer(data=data) >>> serializer.save() - AssertionError: The `.create()` method does not suport nested writable fields by default. Write an explicit `.create()` method for serializer `UserSerializer`, or set `read_only=True` on nested serializer fields. + AssertionError: The `.create()` method does not support nested writable fields by default. Write an explicit `.create()` method for serializer `UserSerializer`, or set `read_only=True` on nested serializer fields. To use writable nested serialization you'll want to declare a nested field on the serializer class, and write the `create()` and/or `update()` methods explicitly. @@ -274,7 +274,7 @@ The `write_only_fields` option on `ModelSerializer` has been moved to `PendingDe model = MyModel fields = ('id', 'email', 'notes', 'is_admin') extra_kwargs = { - 'is_admin': {'write_only': True} + 'is_admin': {'write_only': True} } Alternatively, specify the field explicitly on the serializer class: @@ -321,8 +321,8 @@ With `ModelSerializer` you can now specify field names in the `fields` option th to_email = models.EmailField() message = models.CharField(max_length=1000) - def expiry_date(self): - return self.created + datetime.timedelta(days=30) + def expiry_date(self): + return self.created + datetime.timedelta(days=30) You can include `expiry_date` as a field option on a `ModelSerializer` class. @@ -584,7 +584,7 @@ Previously relational fields that were explicitly declared on a serializer class This code *would be valid* in `2.4.3`: class AccountSerializer(serializers.ModelSerializer): - organisations = serializers.SlugRelatedField(slug_field='name') + organizations = serializers.SlugRelatedField(slug_field='name') class Meta: model = Account @@ -593,7 +593,7 @@ However this code *would not be valid* in `2.4.3`: # Missing `queryset` class AccountSerializer(serializers.Serializer): - organisations = serializers.SlugRelatedField(slug_field='name') + organizations = serializers.SlugRelatedField(slug_field='name') def restore_object(self, attrs, instance=None): # ... @@ -602,9 +602,9 @@ The queryset argument is now always required for writable relational fields. This removes some magic and makes it easier and more obvious to move between implicit `ModelSerializer` classes and explicit `Serializer` classes. class AccountSerializer(serializers.ModelSerializer): - organisations = serializers.SlugRelatedField( + organizations = serializers.SlugRelatedField( slug_field='name', - queryset=Organisation.objects.all() + queryset=Organization.objects.all() ) class Meta: @@ -637,7 +637,7 @@ The following usage will *now raise an error*: #### The `UniqueValidator` and `UniqueTogetherValidator` classes. -REST framework now provides two new validators that allow you to ensure field uniqueness, while still using a completely explicit `Serializer` class instead of using `ModelSerializer`. +REST framework now provides new validators that allow you to ensure field uniqueness, while still using a completely explicit `Serializer` class instead of using `ModelSerializer`. The `UniqueValidator` should be applied to a serializer field, and takes a single `queryset` argument. @@ -645,11 +645,11 @@ The `UniqueValidator` should be applied to a serializer field, and takes a singl from rest_framework.validators import UniqueValidator class OrganizationSerializer(serializers.Serializer): - url = serializers.HyperlinkedIdentityField(view_name='organisation_detail') + url = serializers.HyperlinkedIdentityField(view_name='organization_detail') created = serializers.DateTimeField(read_only=True) name = serializers.CharField( max_length=100, - validators=UniqueValidator(queryset=Organisation.objects.all()) + validators=UniqueValidator(queryset=Organization.objects.all()) ) The `UniqueTogetherValidator` should be applied to a serializer, and takes a `queryset` argument and a `fields` argument which should be a list or tuple of field names. @@ -664,6 +664,10 @@ The `UniqueTogetherValidator` should be applied to a serializer, and takes a `qu fields=('category', 'position') )] +#### The `UniqueForDateValidator` classes. + +**TODO: Needs documenting.** + ## Generic views #### Simplification of view logic. @@ -700,7 +704,7 @@ I would personally recommend that developers treat view instances as immutable o #### PUT as create. -Allowing `PUT` as create operations is problematic, as it necessarily exposes information about the existence or non-existance of objects. It's also not obvious that transparently allowing re-creating of previously deleted instances is necessarily a better default behavior than simply returning `404` responses. +Allowing `PUT` as create operations is problematic, as it necessarily exposes information about the existence or non-existence of objects. It's also not obvious that transparently allowing re-creating of previously deleted instances is necessarily a better default behavior than simply returning `404` responses. Both styles "`PUT` as 404" and "`PUT` as create" can be valid in different circumstances, but we've now opted for the 404 behavior as the default, due to it being simpler and more obvious. @@ -718,6 +722,10 @@ Behavior for dealing with `OPTIONS` requests was previously built directly into This makes it far easier to use a different style for `OPTIONS` responses throughout your API, and makes it possible to create third-party metadata policies. +## Serializers as HTML forms + +**TODO: Document this.** + ## API style There are some improvements in the default style we use in our API responses. @@ -817,6 +825,7 @@ The default JSON renderer will return float objects for uncoerced `Decimal` inst The 3.1 release is planned to address improvements in the following components: +* Public API for using serializers as HTML forms. * Request parsing, mediatypes & the implementation of the browsable API. * Introduction of a new pagination API. * Better support for API versioning. @@ -824,3 +833,5 @@ The 3.1 release is planned to address improvements in the following components: The 3.2 release is planned to introduce an alternative admin-style interface to the browsable API. You can follow development on the GitHub site, where we use [milestones to indicate planning timescales](https://github.com/tomchristie/django-rest-framework/milestones). + +[mixins.py]: https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/mixins.py \ No newline at end of file From 058fea23d3a9776e5fb23b77e81c087d0d8d7e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 7 Nov 2014 23:55:42 -0400 Subject: [PATCH 1042/1652] Fix csrf-ajax link. Closes #2045 --- docs/topics/ajax-csrf-cors.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/topics/ajax-csrf-cors.md b/docs/topics/ajax-csrf-cors.md index 97dd4710b..ad88810da 100644 --- a/docs/topics/ajax-csrf-cors.md +++ b/docs/topics/ajax-csrf-cors.md @@ -10,7 +10,7 @@ If you’re building a JavaScript client to interface with your Web API, you'll AJAX requests that are made within the same context as the API they are interacting with will typically use `SessionAuthentication`. This ensures that once a user has logged in, any AJAX requests made can be authenticated using the same session-based authentication that is used for the rest of the website. -AJAX requests that are made on a different site from the API they are communicating with will typically need to use a non-session-based authentication scheme, such as `TokenAuthentication`. +AJAX requests that are made on a different site from the API they are communicating with will typically need to use a non-session-based authentication scheme, such as `TokenAuthentication`. ## CSRF protection @@ -19,7 +19,7 @@ AJAX requests that are made on a different site from the API they are communicat To guard against these type of attacks, you need to do two things: 1. Ensure that the 'safe' HTTP operations, such as `GET`, `HEAD` and `OPTIONS` cannot be used to alter any server-side state. -2. Ensure that any 'unsafe' HTTP operations, such as `POST`, `PUT`, `PATCH` and `DELETE`, always require a valid CSRF token. +2. Ensure that any 'unsafe' HTTP operations, such as `POST`, `PUT`, `PATCH` and `DELETE`, always require a valid CSRF token. If you're using `SessionAuthentication` you'll need to include valid CSRF tokens for any `POST`, `PUT`, `PATCH` or `DELETE` operations. @@ -35,7 +35,7 @@ The best way to deal with CORS in REST framework is to add the required response [cite]: http://www.codinghorror.com/blog/2008/10/preventing-csrf-and-xsrf-attacks.html [csrf]: https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF) -[csrf-ajax]: https://docs.djangoproject.com/en/dev/ref/contrib/csrf/#ajax +[csrf-ajax]: https://docs.djangoproject.com/en/dev/ref/csrf/#ajax [cors]: http://www.w3.org/TR/cors/ [ottoyiu]: https://github.com/ottoyiu/ [django-cors-headers]: https://github.com/ottoyiu/django-cors-headers/ From 440d61ab364da971973ae8d784e77e21e5cdaa7f Mon Sep 17 00:00:00 2001 From: Jochen Van de Velde <jochenvandevelde@gmail.com> Date: Sat, 8 Nov 2014 11:02:48 +0100 Subject: [PATCH 1043/1652] Fix some typos and other errors --- docs/topics/contributing.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 96d9a98c0..6c289938f 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -10,9 +10,9 @@ There are many ways you can contribute to Django REST framework. We'd like it t The most important thing you can do to help push the REST framework project forward is to be actively involved wherever possible. Code contributions are often overvalued as being the primary way to get involved in a project, we don't believe that needs to be the case. -If you use REST framework, we'd love you to be vocal about your experiences with it - you might consider writing a blog post about using REST framework, or publishing a tutorial about building a project with a particular Javascript framework. Experiences from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are more difficult to understand and work with. +If you use REST framework, we'd love you to be vocal about your experiences with it - you might consider writing a blog post about using REST framework, or publishing a tutorial about building a project with a particular JavaScript framework. Experiences from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are more difficult to understand and work with. -Other really great ways you can help move the community forward include helping answer questions on the [discussion group][google-group], or setting up an [email alert on StackOverflow][so-filter] so that you get notified of any new questions with the `django-rest-framework` tag. +Other really great ways you can help move the community forward include helping to answer questions on the [discussion group][google-group], or setting up an [email alert on StackOverflow][so-filter] so that you get notified of any new questions with the `django-rest-framework` tag. When answering questions make sure to help future contributors find their way around by hyperlinking wherever possible to related threads and tickets, and include backlinks from those items if relevant. @@ -33,7 +33,7 @@ Some tips on good issue reporting: * When describing issues try to phrase your ticket in terms of the *behavior* you think needs changing rather than the *code* you think need changing. * Search the issue list first for related items, and make sure you're running the latest version of REST framework before reporting an issue. * If reporting a bug, then try to include a pull request with a failing test case. This will help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one. -* Feature requests will often be closed with a recommendation that they be implemented outside of the core REST framework library. Keeping new feature requests implemented as third party libraries allows us to keep down the maintainence overhead of REST framework, so that the focus can be on continued stability, bugfixes, and great documentation. +* Feature requests will often be closed with a recommendation that they be implemented outside of the core REST framework library. Keeping new feature requests implemented as third party libraries allows us to keep down the maintenance overhead of REST framework, so that the focus can be on continued stability, bugfixes, and great documentation. * Closing an issue doesn't necessarily mean the end of a discussion. If you believe your issue has been closed incorrectly, explain why and we'll consider if it needs to be reopened. ## Triaging issues @@ -52,7 +52,7 @@ To start developing on Django REST framework, clone the repo: git clone git@github.com:tomchristie/django-rest-framework.git -Changes should broadly follow the [PEP 8][pep-8] style conventions, and we recommend you setup your editor to automatically indicated non-conforming styles. +Changes should broadly follow the [PEP 8][pep-8] style conventions, and we recommend you set up your editor to automatically indicate non-conforming styles. ## Testing @@ -117,7 +117,7 @@ GitHub's documentation for working on pull requests is [available here][pull-req Always run the tests before submitting pull requests, and ideally run `tox` in order to check that your modifications are compatible with both Python 2 and Python 3, and that they run properly on all supported versions of Django. -Once you've made a pull request take a look at the travis build status in the GitHub interface and make sure the tests are runnning as you'd expect. +Once you've made a pull request take a look at the Travis build status in the GitHub interface and make sure the tests are running as you'd expect. ![Travis status][travis-status] @@ -131,7 +131,7 @@ Sometimes, in order to ensure your code works on various different versions of D The documentation for REST framework is built from the [Markdown][markdown] source files in [the docs directory][docs]. -There are many great markdown editors that make working with the documentation really easy. The [Mou editor for Mac][mou] is one such editor that comes highly recommended. +There are many great Markdown editors that make working with the documentation really easy. The [Mou editor for Mac][mou] is one such editor that comes highly recommended. ## Building the documentation @@ -153,7 +153,7 @@ Some other tips: * Keep paragraphs reasonably short. * Use double spacing after the end of sentences. -* Don't use the abbreviations such as 'e.g.' but instead use long form, such as 'For example'. +* Don't use abbreviations such as 'e.g.' but instead use the long form, such as 'For example'. ## Markdown style @@ -186,7 +186,7 @@ If you are hyperlinking to another REST framework document, you should use a rel [authentication]: ../api-guide/authentication.md -Linking in this style means you'll be able to click the hyperlink in your markdown editor to open the referenced document. When the documentation is built, these links will be converted into regular links to HTML pages. +Linking in this style means you'll be able to click the hyperlink in your Markdown editor to open the referenced document. When the documentation is built, these links will be converted into regular links to HTML pages. ##### 3. Notes From f387cd89da55ef88fcac504f5795ea9b591f3fba Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 10 Nov 2014 12:21:27 +0000 Subject: [PATCH 1044/1652] Uniqueness constraints imply a forced 'required=True'. Refs #1945 --- docs/api-guide/validators.md | 10 ++++ rest_framework/validators.py | 97 +++++++++++++++++++++++++++++------- tests/test_validators.py | 11 ++++ 3 files changed, 101 insertions(+), 17 deletions(-) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index 6a0ef4ff4..bb073f576 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -93,6 +93,12 @@ The validator should be applied to *serializer classes*, like so: ) ] +--- + +**Note**: The `UniqueTogetherValidation` class always imposes an implicit constraint that all the fields it applies to are always treated as required. Fields with `default` values are an exception to this as they always supply a value even when omitted from user input. + +--- + ## UniqueForDateValidator ## UniqueForMonthValidator @@ -146,6 +152,10 @@ If you want the date field to be entirely hidden from the user, then use `Hidden --- +**Note**: The `UniqueFor<Range>Validation` classes always imposes an implicit constraint that the fields they are applied to are always treated as required. Fields with `default` values are an exception to this as they always supply a value even when omitted from user input. + +--- + # Writing custom validators You can use any of Django's existing validators, or write your own custom validators. diff --git a/rest_framework/validators.py b/rest_framework/validators.py index f3773f176..d7f847aaf 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -25,6 +25,10 @@ class UniqueValidator: self.message = message or self.message def set_context(self, serializer_field): + """ + This hook is called by the serializer instance, + prior to the validation call being made. + """ # Determine the underlying model field name. This may not be the # same as the serializer field name if `source=<>` is set. self.field_name = serializer_field.source_attrs[0] @@ -54,6 +58,7 @@ class UniqueTogetherValidator: Should be applied to the serializer class, not to an individual field. """ message = _('The fields {field_names} must make a unique set.') + missing_message = _('This field is required.') def __init__(self, queryset, fields, message=None): self.queryset = queryset @@ -62,17 +67,49 @@ class UniqueTogetherValidator: self.message = message or self.message def set_context(self, serializer): + """ + This hook is called by the serializer instance, + prior to the validation call being made. + """ # Determine the existing instance, if this is an update operation. self.instance = getattr(serializer, 'instance', None) - def __call__(self, attrs): - # Ensure uniqueness. + def enforce_required_fields(self, attrs): + """ + The `UniqueTogetherValidator` always forces an implied 'required' + state on the fields it applies to. + """ + missing = dict([ + (field_name, self.missing_message) + for field_name in self.fields + if field_name not in attrs + ]) + if missing: + raise ValidationError(missing) + + def filter_queryset(self, attrs, queryset): + """ + Filter the queryset to all instances matching the given attributes. + """ filter_kwargs = dict([ (field_name, attrs[field_name]) for field_name in self.fields ]) - queryset = self.queryset.filter(**filter_kwargs) + return queryset.filter(**filter_kwargs) + + def exclude_current_instance(self, attrs, queryset): + """ + If an instance is being updated, then do not include + that instance itself as a uniqueness conflict. + """ if self.instance is not None: - queryset = queryset.exclude(pk=self.instance.pk) + return queryset.exclude(pk=self.instance.pk) + return queryset + + def __call__(self, attrs): + self.enforce_required_fields(attrs) + queryset = self.queryset + queryset = self.filter_queryset(attrs, queryset) + queryset = self.exclude_current_instance(attrs, queryset) if queryset.exists(): field_names = ', '.join(self.fields) raise ValidationError(self.message.format(field_names=field_names)) @@ -87,6 +124,7 @@ class UniqueTogetherValidator: class BaseUniqueForValidator: message = None + missing_message = _('This field is required.') def __init__(self, queryset, field, date_field, message=None): self.queryset = queryset @@ -95,6 +133,10 @@ class BaseUniqueForValidator: self.message = message or self.message def set_context(self, serializer): + """ + This hook is called by the serializer instance, + prior to the validation call being made. + """ # Determine the underlying model field names. These may not be the # same as the serializer field names if `source=<>` is set. self.field_name = serializer.fields[self.field].source_attrs[0] @@ -102,15 +144,36 @@ class BaseUniqueForValidator: # Determine the existing instance, if this is an update operation. self.instance = getattr(serializer, 'instance', None) - def get_filter_kwargs(self, attrs): - raise NotImplementedError('`get_filter_kwargs` must be implemented.') + def enforce_required_fields(self, attrs): + """ + The `UniqueFor<Range>Validator` classes always force an implied + 'required' state on the fields they are applied to. + """ + missing = dict([ + (field_name, self.missing_message) + for field_name in [self.field, self.date_field] + if field_name not in attrs + ]) + if missing: + raise ValidationError(missing) + + def filter_queryset(self, attrs, queryset): + raise NotImplementedError('`filter_queryset` must be implemented.') + + def exclude_current_instance(self, attrs, queryset): + """ + If an instance is being updated, then do not include + that instance itself as a uniqueness conflict. + """ + if self.instance is not None: + return queryset.exclude(pk=self.instance.pk) + return queryset def __call__(self, attrs): - filter_kwargs = self.get_filter_kwargs(attrs) - - queryset = self.queryset.filter(**filter_kwargs) - if self.instance is not None: - queryset = queryset.exclude(pk=self.instance.pk) + self.enforce_required_fields(attrs) + queryset = self.queryset + queryset = self.filter_queryset(attrs, queryset) + queryset = self.exclude_current_instance(attrs, queryset) if queryset.exists(): message = self.message.format(date_field=self.date_field) raise ValidationError({self.field: message}) @@ -127,7 +190,7 @@ class BaseUniqueForValidator: class UniqueForDateValidator(BaseUniqueForValidator): message = _('This field must be unique for the "{date_field}" date.') - def get_filter_kwargs(self, attrs): + def filter_queryset(self, attrs, queryset): value = attrs[self.field] date = attrs[self.date_field] @@ -136,30 +199,30 @@ class UniqueForDateValidator(BaseUniqueForValidator): filter_kwargs['%s__day' % self.date_field_name] = date.day filter_kwargs['%s__month' % self.date_field_name] = date.month filter_kwargs['%s__year' % self.date_field_name] = date.year - return filter_kwargs + return queryset.filter(**filter_kwargs) class UniqueForMonthValidator(BaseUniqueForValidator): message = _('This field must be unique for the "{date_field}" month.') - def get_filter_kwargs(self, attrs): + def filter_queryset(self, attrs, queryset): value = attrs[self.field] date = attrs[self.date_field] filter_kwargs = {} filter_kwargs[self.field_name] = value filter_kwargs['%s__month' % self.date_field_name] = date.month - return filter_kwargs + return queryset.filter(**filter_kwargs) class UniqueForYearValidator(BaseUniqueForValidator): message = _('This field must be unique for the "{date_field}" year.') - def get_filter_kwargs(self, attrs): + def filter_queryset(self, attrs, queryset): value = attrs[self.field] date = attrs[self.date_field] filter_kwargs = {} filter_kwargs[self.field_name] = value filter_kwargs['%s__year' % self.date_field_name] = date.year - return filter_kwargs + return queryset.filter(**filter_kwargs) diff --git a/tests/test_validators.py b/tests/test_validators.py index e6e0b23a8..86614b109 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -134,6 +134,17 @@ class TestUniquenessTogetherValidation(TestCase): 'position': 1 } + def test_unique_together_is_required(self): + """ + In a unique together validation, all fields are required. + """ + data = {'position': 2} + serializer = UniquenessTogetherSerializer(data=data, partial=True) + assert not serializer.is_valid() + assert serializer.errors == { + 'race_name': ['This field is required.'] + } + def test_ignore_excluded_fields(self): """ When model fields are not included in a serializer, then uniqueness From fd7db776addbd5e30f132fe6846ec5c5caab5c40 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 10 Nov 2014 12:32:03 +0000 Subject: [PATCH 1045/1652] Bring UniqueValidator implementation in line with other uniquness validators. --- docs/api-guide/validators.md | 6 +++--- rest_framework/validators.py | 22 ++++++++++++++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index bb073f576..a50636bcc 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -16,9 +16,9 @@ Validation in Django REST framework serializers is handled a little differently With `ModelForm` the validation is performed partially on the form, and partially on the model instance. With REST framework the validation is performed entirely on the serializer class. This is advantageous for the following reasons: -* It introduces a proper separation of concerns, making your code behaviour more obvious. -* It is easy to switch between using shortcut `ModelSerializer` classes and using explicit `Serializer` classes. Any validation behaviour being used for `ModelSerializer` is simple to replicate. -* Printing the `repr` of a serializer instance will show you exactly what validation rules it applies. There's no extra hidden validation behaviour being called on the model instance. +* It introduces a proper separation of concerns, making your code behavior more obvious. +* It is easy to switch between using shortcut `ModelSerializer` classes and using explicit `Serializer` classes. Any validation behavior being used for `ModelSerializer` is simple to replicate. +* Printing the `repr` of a serializer instance will show you exactly what validation rules it applies. There's no extra hidden validation behavior being called on the model instance. When you're using `ModelSerializer` all of this is handled automatically for you. If you want to drop down to using a `Serializer` classes instead, then you need to define the validation rules explicitly. diff --git a/rest_framework/validators.py b/rest_framework/validators.py index d7f847aaf..fa4f18474 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -35,12 +35,26 @@ class UniqueValidator: # Determine the existing instance, if this is an update operation. self.instance = getattr(serializer_field.parent, 'instance', None) - def __call__(self, value): - # Ensure uniqueness. + def filter_queryset(self, value, queryset): + """ + Filter the queryset to all instances matching the given attribute. + """ filter_kwargs = {self.field_name: value} - queryset = self.queryset.filter(**filter_kwargs) + return queryset.filter(**filter_kwargs) + + def exclude_current_instance(self, queryset): + """ + If an instance is being updated, then do not include + that instance itself as a uniqueness conflict. + """ if self.instance is not None: - queryset = queryset.exclude(pk=self.instance.pk) + return queryset.exclude(pk=self.instance.pk) + return queryset + + def __call__(self, value): + queryset = self.queryset + queryset = self.filter_queryset(value, queryset) + queryset = self.exclude_current_instance(queryset) if queryset.exists(): raise ValidationError(self.message) From 62ce653c61bb596f7fca99db86280c497c71b7ac Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 10 Nov 2014 14:44:26 +0000 Subject: [PATCH 1046/1652] Update fields.py --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 4933d8db6..58482db55 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1106,7 +1106,7 @@ class HiddenField(Field): A hidden field does not take input from the user, or present any output, but it does populate a field in `validated_data`, based on its default value. This is particularly useful when we have a `unique_for_date` - constrain on a pair of fields, as we need some way to include the date in + constraint on a pair of fields, as we need some way to include the date in the validated data. """ def __init__(self, **kwargs): From 9521b697110f35187669e501c4fb89036c73c640 Mon Sep 17 00:00:00 2001 From: Kevin London <kevinlondon@gmail.com> Date: Mon, 10 Nov 2014 11:08:39 -0800 Subject: [PATCH 1047/1652] #2054: Update exceptions to allow custom detail This addresses the changes requested in #2054 and allows for custom messages that do not necessarily require a string formatter be present in the detail message. --- rest_framework/exceptions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 388d3dee9..0b06d6e60 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -70,7 +70,7 @@ class MethodNotAllowed(APIException): default_detail = "Method '%s' not allowed." def __init__(self, method, detail=None): - self.detail = (detail or self.default_detail) % method + self.detail = detail or (self.default_detail % method) class NotAcceptable(APIException): @@ -87,7 +87,7 @@ class UnsupportedMediaType(APIException): default_detail = "Unsupported media type '%s' in request." def __init__(self, media_type, detail=None): - self.detail = (detail or self.default_detail) % media_type + self.detail = detail or (self.default_detail % media_type) class Throttled(APIException): From 1838e18aeea1bfa5f033fb12adbd97e19231c8a1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 12 Nov 2014 15:38:05 +0000 Subject: [PATCH 1048/1652] Update html.py --- rest_framework/utils/html.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/utils/html.py b/rest_framework/utils/html.py index 15e83b3b4..c7af22843 100644 --- a/rest_framework/utils/html.py +++ b/rest_framework/utils/html.py @@ -36,7 +36,7 @@ def parse_html_list(dictionary, prefix=''): '[0]foo': 'abc', '[0]bar': 'def', '[1]foo': 'hij', - '[2]bar': 'klm', + '[1]bar': 'klm', } --> [ From e70b82b6c890eed5088a8f1b2f3aa642d5218398 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 12 Nov 2014 15:38:39 +0000 Subject: [PATCH 1049/1652] Update html.py --- rest_framework/utils/html.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/utils/html.py b/rest_framework/utils/html.py index c7af22843..d773952dc 100644 --- a/rest_framework/utils/html.py +++ b/rest_framework/utils/html.py @@ -72,7 +72,7 @@ def parse_html_dict(dictionary, prefix): --> { 'profile': { - 'username': 'example, + 'username': 'example', 'email': 'example@example.com' } } From dbb435ca3165eba990d3dc2ce72c8e108e123f2f Mon Sep 17 00:00:00 2001 From: Kevin Chang <kevincgw@gmail.com> Date: Wed, 12 Nov 2014 12:46:09 -0800 Subject: [PATCH 1050/1652] Added missing default style for FileField --- rest_framework/renderers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index b56f99db9..37d3c47c3 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -374,6 +374,10 @@ class HTMLFormRenderer(BaseRenderer): 'base_template': 'input.html', 'input_type': 'time' }, + serializers.FileField: { + 'base_template': 'input.html', + 'input_type': 'file' + }, serializers.BooleanField: { 'base_template': 'checkbox.html' }, From 03310cc33ae800a36f17a421c8114e0e6616ccb6 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 13 Nov 2014 12:06:45 +0000 Subject: [PATCH 1051/1652] Add PyPI version badge. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 394d7fcf4..c86bb65ff 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Django REST framework [![build-status-image]][travis] +[![pypi-version]][pypi] **Awesome web-browseable Web APIs.** @@ -181,6 +182,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [build-status-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master [travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master +[pypi-version]: https://pypip.in/version/djangorestframework/badge.svg +[pypi]: https://pypi.python.org/pypi/djangorestframework [twitter]: https://twitter.com/_tomchristie [group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework [0.4]: https://github.com/tomchristie/django-rest-framework/tree/0.4.X From e5cd693e7b76fe497d10f4bcd447c3a319466efc Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 13 Nov 2014 16:07:25 +0000 Subject: [PATCH 1052/1652] Remove test cruft --- tests/accounts/__init__.py | 0 tests/accounts/models.py | 8 -------- tests/accounts/serializers.py | 11 ----------- tests/conftest.py | 3 --- tests/put_as_create_workspace.txt | 33 ------------------------------- tests/records/__init__.py | 0 tests/records/models.py | 6 ------ tests/settings.py | 3 --- tests/test_serializer_import.py | 19 ------------------ tests/users/__init__.py | 0 tests/users/models.py | 6 ------ tests/users/serializers.py | 8 -------- 12 files changed, 97 deletions(-) delete mode 100644 tests/accounts/__init__.py delete mode 100644 tests/accounts/models.py delete mode 100644 tests/accounts/serializers.py delete mode 100644 tests/put_as_create_workspace.txt delete mode 100644 tests/records/__init__.py delete mode 100644 tests/records/models.py delete mode 100644 tests/test_serializer_import.py delete mode 100644 tests/users/__init__.py delete mode 100644 tests/users/models.py delete mode 100644 tests/users/serializers.py diff --git a/tests/accounts/__init__.py b/tests/accounts/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/accounts/models.py b/tests/accounts/models.py deleted file mode 100644 index 3bf4a0c3c..000000000 --- a/tests/accounts/models.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.db import models - -from tests.users.models import User - - -class Account(models.Model): - owner = models.ForeignKey(User, related_name='accounts_owned') - admins = models.ManyToManyField(User, blank=True, null=True, related_name='accounts_administered') diff --git a/tests/accounts/serializers.py b/tests/accounts/serializers.py deleted file mode 100644 index 57a91b92c..000000000 --- a/tests/accounts/serializers.py +++ /dev/null @@ -1,11 +0,0 @@ -from rest_framework import serializers - -from tests.accounts.models import Account -from tests.users.serializers import UserSerializer - - -class AccountSerializer(serializers.ModelSerializer): - admins = UserSerializer(many=True) - - class Meta: - model = Account diff --git a/tests/conftest.py b/tests/conftest.py index 4b33e19c1..31142eaf9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -33,9 +33,6 @@ def pytest_configure(): 'rest_framework', 'rest_framework.authtoken', 'tests', - 'tests.accounts', - 'tests.records', - 'tests.users', ), PASSWORD_HASHERS=( 'django.contrib.auth.hashers.SHA1PasswordHasher', diff --git a/tests/put_as_create_workspace.txt b/tests/put_as_create_workspace.txt deleted file mode 100644 index 6bc5218eb..000000000 --- a/tests/put_as_create_workspace.txt +++ /dev/null @@ -1,33 +0,0 @@ -# From test_validation... - -class TestPreSaveValidationExclusions(TestCase): - def test_pre_save_validation_exclusions(self): - """ - Somewhat weird test case to ensure that we don't perform model - validation on read only fields. - """ - obj = ValidationModel.objects.create(blank_validated_field='') - request = factory.put('/', {}, format='json') - view = UpdateValidationModel().as_view() - response = view(request, pk=obj.pk).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - - -# From test_permissions... - -class ModelPermissionsIntegrationTests(TestCase): - def setUp(...): - ... - - def test_has_put_as_create_permissions(self): - # User only has update permissions - should be able to update an entity. - request = factory.put('/1', {'text': 'foobar'}, format='json', - HTTP_AUTHORIZATION=self.updateonly_credentials) - response = instance_view(request, pk='1') - self.assertEqual(response.status_code, status.HTTP_200_OK) - - # But if PUTing to a new entity, permission should be denied. - request = factory.put('/2', {'text': 'foobar'}, format='json', - HTTP_AUTHORIZATION=self.updateonly_credentials) - response = instance_view(request, pk='2') - self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) diff --git a/tests/records/__init__.py b/tests/records/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/records/models.py b/tests/records/models.py deleted file mode 100644 index 769548074..000000000 --- a/tests/records/models.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.db import models - - -class Record(models.Model): - account = models.ForeignKey('accounts.Account', blank=True, null=True) - owner = models.ForeignKey('users.User', blank=True, null=True) diff --git a/tests/settings.py b/tests/settings.py index 91c9ed09e..b6736199c 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -96,9 +96,6 @@ INSTALLED_APPS = ( 'rest_framework', 'rest_framework.authtoken', 'tests', - 'tests.accounts', - 'tests.records', - 'tests.users', ) # OAuth is optional and won't work if there is no oauth_provider & oauth2 diff --git a/tests/test_serializer_import.py b/tests/test_serializer_import.py deleted file mode 100644 index d029c3c55..000000000 --- a/tests/test_serializer_import.py +++ /dev/null @@ -1,19 +0,0 @@ -# from django.test import TestCase - -# from rest_framework import serializers -# from tests.accounts.serializers import AccountSerializer - - -# class ImportingModelSerializerTests(TestCase): -# """ -# In some situations like, GH #1225, it is possible, especially in -# testing, to import a serializer who's related models have not yet -# been resolved by Django. `AccountSerializer` is an example of such -# a serializer (imported at the top of this file). -# """ -# def test_import_model_serializer(self): -# """ -# The serializer at the top of this file should have been -# imported successfully, and we should be able to instantiate it. -# """ -# self.assertIsInstance(AccountSerializer(), serializers.ModelSerializer) diff --git a/tests/users/__init__.py b/tests/users/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/users/models.py b/tests/users/models.py deleted file mode 100644 index 128bac90b..000000000 --- a/tests/users/models.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.db import models - - -class User(models.Model): - account = models.ForeignKey('accounts.Account', blank=True, null=True, related_name='users') - active_record = models.ForeignKey('records.Record', blank=True, null=True) diff --git a/tests/users/serializers.py b/tests/users/serializers.py deleted file mode 100644 index 4893ddb34..000000000 --- a/tests/users/serializers.py +++ /dev/null @@ -1,8 +0,0 @@ -from rest_framework import serializers - -from tests.users.models import User - - -class UserSerializer(serializers.ModelSerializer): - class Meta: - model = User From 502a86cedb2ed3844c61f0cb3a7663082395356f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 13 Nov 2014 16:10:48 +0000 Subject: [PATCH 1053/1652] Remove tests/settings. Using conftest instead. --- tests/settings.py | 162 ---------------------------------------------- 1 file changed, 162 deletions(-) delete mode 100644 tests/settings.py diff --git a/tests/settings.py b/tests/settings.py deleted file mode 100644 index b6736199c..000000000 --- a/tests/settings.py +++ /dev/null @@ -1,162 +0,0 @@ -# Django settings for testproject project. - -DEBUG = True -TEMPLATE_DEBUG = DEBUG -DEBUG_PROPAGATE_EXCEPTIONS = True - -ALLOWED_HOSTS = ['*'] - -ADMINS = ( - # ('Your Name', 'your_email@domain.com'), -) - -MANAGERS = ADMINS - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'sqlite.db', # Or path to database file if using sqlite3. - 'USER': '', # Not used with sqlite3. - 'PASSWORD': '', # Not used with sqlite3. - 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. - } -} - -CACHES = { - 'default': { - 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', - } -} - -# Local time zone for this installation. Choices can be found here: -# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name -# although not all choices may be available on all operating systems. -# On Unix systems, a value of None will cause Django to use the same -# timezone as the operating system. -# If running in a Windows environment this must be set to the same as your -# system time zone. -TIME_ZONE = 'Europe/London' - -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'en-uk' - -SITE_ID = 1 - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. -USE_I18N = True - -# If you set this to False, Django will not format dates, numbers and -# calendars according to the current locale -USE_L10N = True - -# Absolute filesystem path to the directory that will hold user-uploaded files. -# Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = '' - -# URL that handles the media served from MEDIA_ROOT. Make sure to use a -# trailing slash if there is a path component (optional in other cases). -# Examples: "http://media.lawrence.com", "http://example.com/media/" -MEDIA_URL = '' - -# Make this unique, and don't share it with anybody. -SECRET_KEY = 'u@x-aj9(hoh#rb-^ymf#g2jx_hp0vj7u5#b@ag1n^seu9e!%cy' - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -) - -MIDDLEWARE_CLASSES = ( - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', -) - -ROOT_URLCONF = 'tests.urls' - -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) - -INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'rest_framework', - 'rest_framework.authtoken', - 'tests', -) - -# OAuth is optional and won't work if there is no oauth_provider & oauth2 -try: - import oauth_provider # NOQA - import oauth2 # NOQA -except ImportError: - pass -else: - INSTALLED_APPS += ( - 'oauth_provider', - ) - -try: - import provider # NOQA -except ImportError: - pass -else: - INSTALLED_APPS += ( - 'provider', - 'provider.oauth2', - ) - -# guardian is optional -try: - import guardian # NOQA -except ImportError: - pass -else: - ANONYMOUS_USER_ID = -1 - AUTHENTICATION_BACKENDS = ( - 'django.contrib.auth.backends.ModelBackend', # default - 'guardian.backends.ObjectPermissionBackend', - ) - INSTALLED_APPS += ( - 'guardian', - ) - -STATIC_URL = '/static/' - -PASSWORD_HASHERS = ( - 'django.contrib.auth.hashers.SHA1PasswordHasher', - 'django.contrib.auth.hashers.PBKDF2PasswordHasher', - 'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher', - 'django.contrib.auth.hashers.BCryptPasswordHasher', - 'django.contrib.auth.hashers.MD5PasswordHasher', - 'django.contrib.auth.hashers.CryptPasswordHasher', -) - -AUTH_USER_MODEL = 'auth.User' - -import django - -if django.VERSION < (1, 3): - INSTALLED_APPS += ('staticfiles',) - - -# If we're running on the Jenkins server we want to archive the coverage reports as XML. -import os -if os.environ.get('HUDSON_URL', None): - TEST_RUNNER = 'xmlrunner.extra.djangotestrunner.XMLTestRunner' - TEST_OUTPUT_VERBOSE = True - TEST_OUTPUT_DESCRIPTIONS = True - TEST_OUTPUT_DIR = 'xmlrunner' From 9e75c4d8eab11d1637d65a8a7683f7970a41111b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 13 Nov 2014 16:24:03 +0000 Subject: [PATCH 1054/1652] Reinstate OPTIONS tests --- tests/test_permissions.py | 96 +++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/tests/test_permissions.py b/tests/test_permissions.py index ac398f80d..97bac33db 100644 --- a/tests/test_permissions.py +++ b/tests/test_permissions.py @@ -95,59 +95,59 @@ class ModelPermissionsIntegrationTests(TestCase): response = instance_view(request, pk=1) self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - # def test_options_permitted(self): - # request = factory.options( - # '/', - # HTTP_AUTHORIZATION=self.permitted_credentials - # ) - # response = root_view(request, pk='1') - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertIn('actions', response.data) - # self.assertEqual(list(response.data['actions'].keys()), ['POST']) + def test_options_permitted(self): + request = factory.options( + '/', + HTTP_AUTHORIZATION=self.permitted_credentials + ) + response = root_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertIn('actions', response.data) + self.assertEqual(list(response.data['actions'].keys()), ['POST']) - # request = factory.options( - # '/1', - # HTTP_AUTHORIZATION=self.permitted_credentials - # ) - # response = instance_view(request, pk='1') - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertIn('actions', response.data) - # self.assertEqual(list(response.data['actions'].keys()), ['PUT']) + request = factory.options( + '/1', + HTTP_AUTHORIZATION=self.permitted_credentials + ) + response = instance_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertIn('actions', response.data) + self.assertEqual(list(response.data['actions'].keys()), ['PUT']) - # def test_options_disallowed(self): - # request = factory.options( - # '/', - # HTTP_AUTHORIZATION=self.disallowed_credentials - # ) - # response = root_view(request, pk='1') - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertNotIn('actions', response.data) + def test_options_disallowed(self): + request = factory.options( + '/', + HTTP_AUTHORIZATION=self.disallowed_credentials + ) + response = root_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertNotIn('actions', response.data) - # request = factory.options( - # '/1', - # HTTP_AUTHORIZATION=self.disallowed_credentials - # ) - # response = instance_view(request, pk='1') - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertNotIn('actions', response.data) + request = factory.options( + '/1', + HTTP_AUTHORIZATION=self.disallowed_credentials + ) + response = instance_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertNotIn('actions', response.data) - # def test_options_updateonly(self): - # request = factory.options( - # '/', - # HTTP_AUTHORIZATION=self.updateonly_credentials - # ) - # response = root_view(request, pk='1') - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertNotIn('actions', response.data) + def test_options_updateonly(self): + request = factory.options( + '/', + HTTP_AUTHORIZATION=self.updateonly_credentials + ) + response = root_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertNotIn('actions', response.data) - # request = factory.options( - # '/1', - # HTTP_AUTHORIZATION=self.updateonly_credentials - # ) - # response = instance_view(request, pk='1') - # self.assertEqual(response.status_code, status.HTTP_200_OK) - # self.assertIn('actions', response.data) - # self.assertEqual(list(response.data['actions'].keys()), ['PUT']) + request = factory.options( + '/1', + HTTP_AUTHORIZATION=self.updateonly_credentials + ) + response = instance_view(request, pk='1') + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertIn('actions', response.data) + self.assertEqual(list(response.data['actions'].keys()), ['PUT']) class BasicPermModel(models.Model): From ea98de9b889173235a908ee2ce5a2aba5d8223c7 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 13 Nov 2014 19:28:57 +0000 Subject: [PATCH 1055/1652] Model fields with .blank or .null now map to required=False. Closes #2017. Closes #2021. --- docs/topics/3.0-announcement.md | 6 +++--- rest_framework/utils/field_mapping.py | 2 +- tests/test_model_serializer.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index d3da0607e..885fc183e 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -506,9 +506,9 @@ We now use the following: REST framework now has more explicit and clear control over validating empty values for fields. -Previously the meaning of the `required=False` keyword argument was underspecified. In practice its use meant that a field could either be not included in the input, or it could be included, but be `None`. +Previously the meaning of the `required=False` keyword argument was underspecified. In practice its use meant that a field could either be not included in the input, or it could be included, but be `None` or the empty string. -We now have a better separation, with separate `required` and `allow_none` arguments. +We now have a better separation, with separate `required`, `allow_none` and `allow_blank` arguments. The following set of arguments are used to control validation of empty values: @@ -519,7 +519,7 @@ The following set of arguments are used to control validation of empty values: Typically you'll want to use `required=False` if the corresponding model field has a default value, and additionally set either `allow_none=True` or `allow_blank=True` if required. -The `default` argument is there if you need it, but you'll more typically want defaults to be set on model fields, rather than serializer fields. +The `default` argument is also available and always implies that the field is not required to be in the input. It is unnecessary to use the `required` argument when a default is specified, and doing so will result in an error. #### Coercing output types. diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index 246390853..ce339971f 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -88,7 +88,7 @@ def get_field_kwargs(field_name, model_field): kwargs['read_only'] = True return kwargs - if model_field.has_default(): + if model_field.has_default() or model_field.blank or model_field.null: kwargs['required'] = False if model_field.flatchoices: diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index b8b621be8..3aec0da0c 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -90,7 +90,7 @@ class TestRegularFieldMappings(TestCase): email_field = EmailField(max_length=100) float_field = FloatField() integer_field = IntegerField() - null_boolean_field = NullBooleanField() + null_boolean_field = NullBooleanField(required=False) positive_integer_field = IntegerField() positive_small_integer_field = IntegerField() slug_field = SlugField(max_length=100) @@ -112,8 +112,8 @@ class TestRegularFieldMappings(TestCase): id = IntegerField(label='ID', read_only=True) value_limit_field = IntegerField(max_value=10, min_value=1) length_limit_field = CharField(max_length=12, min_length=3) - blank_field = CharField(allow_blank=True, max_length=10) - null_field = IntegerField(allow_null=True) + blank_field = CharField(allow_blank=True, max_length=10, required=False) + null_field = IntegerField(allow_null=True, required=False) default_field = IntegerField(required=False) descriptive_field = IntegerField(help_text='Some help text', label='A label') choices_field = ChoiceField(choices=[('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')]) From fd97d9bff82b96b9362930686b9008ba78326115 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 13 Nov 2014 19:35:03 +0000 Subject: [PATCH 1056/1652] Use select inputs for relationships. Closes #2058. --- rest_framework/relations.py | 12 ++++++------ rest_framework/renderers.py | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 48ddf41e0..6dc02a11b 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -34,13 +34,13 @@ class RelatedField(Field): def __new__(cls, *args, **kwargs): # We override this method in order to automagically create - # `ManyRelation` classes instead when `many=True` is set. + # `ManyRelatedField` classes instead when `many=True` is set. if kwargs.pop('many', False): list_kwargs = {'child_relation': cls(*args, **kwargs)} for key in kwargs.keys(): if key in MANY_RELATION_KWARGS: list_kwargs[key] = kwargs[key] - return ManyRelation(**list_kwargs) + return ManyRelatedField(**list_kwargs) return super(RelatedField, cls).__new__(cls, *args, **kwargs) def run_validation(self, data=empty): @@ -286,12 +286,12 @@ class SlugRelatedField(RelatedField): return getattr(obj, self.slug_field) -class ManyRelation(Field): +class ManyRelatedField(Field): """ Relationships with `many=True` transparently get coerced into instead being - a ManyRelation with a child relationship. + a ManyRelatedField with a child relationship. - The `ManyRelation` class is responsible for handling iterating through + The `ManyRelatedField` class is responsible for handling iterating through the values and passing each one to the child relationship. You shouldn't need to be using this class directly yourself. @@ -302,7 +302,7 @@ class ManyRelation(Field): def __init__(self, child_relation=None, *args, **kwargs): self.child_relation = child_relation assert child_relation is not None, '`child_relation` is a required argument.' - super(ManyRelation, self).__init__(*args, **kwargs) + super(ManyRelatedField, self).__init__(*args, **kwargs) self.child_relation.bind(field_name='', parent=self) def get_value(self, dictionary): diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index b56f99db9..eb04e81e1 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -383,7 +383,10 @@ class HTMLFormRenderer(BaseRenderer): serializers.MultipleChoiceField: { 'base_template': 'select_multiple.html', # Also valid: 'checkbox_multiple.html' }, - serializers.ManyRelation: { + serializers.RelatedField: { + 'base_template': 'select.html', # Also valid: 'radio.html' + }, + serializers.ManyRelatedField: { 'base_template': 'select_multiple.html', # Also valid: 'checkbox_multiple.html' }, serializers.Serializer: { From 78a741be27f5007d6fa2f73c6cedf04bfe638f9c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 13 Nov 2014 20:24:48 +0000 Subject: [PATCH 1057/1652] Split out .create and .update on ListSerializer --- rest_framework/serializers.py | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index d83367f40..a4aeeeb79 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -449,26 +449,39 @@ class ListSerializer(BaseSerializer): serializer=self ) + def update(self, instance, validated_data): + raise NotImplementedError( + "Serializers with many=True do not support multiple update by " + "default, only multiple create. For updates it is unclear how to " + "deal with insertions and deletions. If you need to support " + "multiple update, use a `ListSerializer` class and override " + "`.update()` so you can specify the behavior exactly." + ) + + def create(self, validated_data): + return [ + self.child.create(attrs) for attrs in validated_data + ] + def save(self, **kwargs): """ Save and return a list of object instances. """ - assert self.instance is None, ( - "Serializers do not support multiple update by default, only " - "multiple create. For updates it is unclear how to deal with " - "insertions and deletions. If you need to support multiple update, " - "use a `ListSerializer` class and override `.save()` so you can " - "specify the behavior exactly." - ) - validated_data = [ dict(list(attrs.items()) + list(kwargs.items())) for attrs in self.validated_data ] - self.instance = [ - self.child.create(attrs) for attrs in validated_data - ] + if self.instance is not None: + self.instance = self.update(self.instance, validated_data) + assert self.instance is not None, ( + '`update()` did not return an object instance.' + ) + else: + self.instance = self.create(validated_data) + assert self.instance is not None, ( + '`create()` did not return an object instance.' + ) return self.instance From 992330055eeb5d787ddd7d62dfc9121a2256fd9b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 13 Nov 2014 21:11:13 +0000 Subject: [PATCH 1058/1652] Refactor many --- rest_framework/relations.py | 22 +++++++++++++++++----- rest_framework/serializers.py | 25 ++++++++++++++++++++----- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 6dc02a11b..79c8057b6 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -10,9 +10,17 @@ from django.utils.translation import ugettext_lazy as _ class PKOnlyObject(object): + """ + This is a mock object, used for when we only need the pk of the object + instance, but still want to return an object with a .pk attribute, + in order to keep the same interface as a regular model instance. + """ def __init__(self, pk): self.pk = pk + +# We assume that 'validators' are intended for the child serializer, +# rather than the parent serializer. MANY_RELATION_KWARGS = ( 'read_only', 'write_only', 'required', 'default', 'initial', 'source', 'label', 'help_text', 'style', 'error_messages' @@ -36,13 +44,17 @@ class RelatedField(Field): # We override this method in order to automagically create # `ManyRelatedField` classes instead when `many=True` is set. if kwargs.pop('many', False): - list_kwargs = {'child_relation': cls(*args, **kwargs)} - for key in kwargs.keys(): - if key in MANY_RELATION_KWARGS: - list_kwargs[key] = kwargs[key] - return ManyRelatedField(**list_kwargs) + return cls.many_init(*args, **kwargs) return super(RelatedField, cls).__new__(cls, *args, **kwargs) + @classmethod + def many_init(cls, *args, **kwargs): + list_kwargs = {'child_relation': cls(*args, **kwargs)} + for key in kwargs.keys(): + if key in MANY_RELATION_KWARGS: + list_kwargs[key] = kwargs[key] + return ManyRelatedField(**list_kwargs) + def run_validation(self, data=empty): # We force empty strings to None values for relational fields. if data == '': diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index a4aeeeb79..70bba8ab2 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -46,6 +46,9 @@ import warnings from rest_framework.relations import * # NOQA from rest_framework.fields import * # NOQA + +# We assume that 'validators' are intended for the child serializer, +# rather than the parent serializer. LIST_SERIALIZER_KWARGS = ( 'read_only', 'write_only', 'required', 'default', 'initial', 'source', 'label', 'help_text', 'style', 'error_messages', @@ -73,13 +76,25 @@ class BaseSerializer(Field): # We override this method in order to automagically create # `ListSerializer` classes instead when `many=True` is set. if kwargs.pop('many', False): - list_kwargs = {'child': cls(*args, **kwargs)} - for key in kwargs.keys(): - if key in LIST_SERIALIZER_KWARGS: - list_kwargs[key] = kwargs[key] - return ListSerializer(*args, **list_kwargs) + return cls.many_init(*args, **kwargs) return super(BaseSerializer, cls).__new__(cls, *args, **kwargs) + @classmethod + def many_init(cls, *args, **kwargs): + """ + This method implements the creation of a `ListSerializer` parent + class when `many=True` is used. You can customize it if you need to + control which keyword arguments are passed to the parent, and + which are passed to the child. + """ + child_serializer = cls(*args, **kwargs) + list_kwargs = {'child': child_serializer} + list_kwargs.update(dict([ + (key, value) for key, value in kwargs.items() + if key in LIST_SERIALIZER_KWARGS + ])) + return ListSerializer(*args, **list_kwargs) + def to_internal_value(self, data): raise NotImplementedError('`to_internal_value()` must be implemented.') From 7394dcec9e625e7eee5c041276f81745359ed7c4 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 13 Nov 2014 23:05:44 +0000 Subject: [PATCH 1059/1652] ReturnList and ReturnDict wrapped at nicer point --- rest_framework/serializers.py | 53 ++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 70bba8ab2..e7e93f380 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -245,18 +245,18 @@ class Serializer(BaseSerializer): def get_initial(self): if self._initial_data is not None: - return ReturnDict([ + return OrderedDict([ (field_name, field.get_value(self._initial_data)) for field_name, field in self.fields.items() if field.get_value(self._initial_data) is not empty and not field.read_only - ], serializer=self) + ]) - return ReturnDict([ + return OrderedDict([ (field.field_name, field.get_initial()) for field in self.fields.values() if not field.read_only - ], serializer=self) + ]) def get_value(self, dictionary): # We override the default field access in order to support @@ -319,8 +319,8 @@ class Serializer(BaseSerializer): """ Dict of native values <- Dict of primitive datatypes. """ - ret = {} - errors = ReturnDict(serializer=self) + ret = OrderedDict() + errors = OrderedDict() fields = [ field for field in self.fields.values() if (not field.read_only) or (field.default is not empty) @@ -349,7 +349,7 @@ class Serializer(BaseSerializer): """ Object instance -> Dict of primitive datatypes. """ - ret = ReturnDict(serializer=self) + ret = OrderedDict() fields = [field for field in self.fields.values() if not field.write_only] for field in fields: @@ -388,6 +388,19 @@ class Serializer(BaseSerializer): return NestedBoundField(field, value, error) return BoundField(field, value, error) + # Include a backlink to the serializer class on return objects. + # Allows renderers such as HTMLFormRenderer to get the full field info. + + @property + def data(self): + ret = super(Serializer, self).data + return ReturnDict(ret, serializer=self) + + @property + def errors(self): + ret = super(Serializer, self).errors + return ReturnDict(ret, serializer=self) + # There's some replication of `ListField` here, # but that's probably better than obfuscating the call hierarchy. @@ -410,7 +423,7 @@ class ListSerializer(BaseSerializer): def get_initial(self): if self._initial_data is not None: return self.to_representation(self._initial_data) - return ReturnList(serializer=self) + return [] def get_value(self, dictionary): """ @@ -438,7 +451,7 @@ class ListSerializer(BaseSerializer): }) ret = [] - errors = ReturnList(serializer=self) + errors = [] for item in data: try: @@ -459,10 +472,9 @@ class ListSerializer(BaseSerializer): List of object instances -> List of dicts of primitive datatypes. """ iterable = data.all() if (hasattr(data, 'all')) else data - return ReturnList( - [self.child.to_representation(item) for item in iterable], - serializer=self - ) + return [ + self.child.to_representation(item) for item in iterable + ] def update(self, instance, validated_data): raise NotImplementedError( @@ -503,6 +515,21 @@ class ListSerializer(BaseSerializer): def __repr__(self): return representation.list_repr(self, indent=1) + # Include a backlink to the serializer class on return objects. + # Allows renderers such as HTMLFormRenderer to get the full field info. + + @property + def data(self): + ret = super(ListSerializer, self).data + return ReturnList(ret, serializer=self) + + @property + def errors(self): + ret = super(ListSerializer, self).errors + if isinstance(ret, dict): + return ReturnDict(ret, serializer=self) + return ReturnList(ret, serializer=self) + # ModelSerializer & HyperlinkedModelSerializer # -------------------------------------------- From 4e035184384db8ed1227fdcb1dad2ea6ddb1cf68 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 13 Nov 2014 23:30:42 +0000 Subject: [PATCH 1060/1652] required=False for nullable relationships --- rest_framework/utils/field_mapping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index ce339971f..9c187176d 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -215,7 +215,7 @@ def get_relation_kwargs(field_name, relation_info): # If this field is read-only, then return early. # No further keyword arguments are valid. return kwargs - if model_field.has_default(): + if model_field.has_default() or model_field.null: kwargs['required'] = False if model_field.null: kwargs['allow_null'] = True From ad060aa360fa2ed33bd83cbb419d7b996a428726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20M=C3=BCllegger?= <gregor@muellegger.de> Date: Sat, 15 Nov 2014 15:23:58 +0100 Subject: [PATCH 1061/1652] More helpful error message when default `.create` fails. Closes #2013. --- rest_framework/serializers.py | 14 +++++++++++++- tests/test_model_serializer.py | 28 ++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index e7e93f380..8dafea4d4 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -34,6 +34,7 @@ from rest_framework.validators import ( ) import copy import inspect +import sys import warnings # Note: We do the following so that users of the framework can use this style: @@ -593,7 +594,18 @@ class ModelSerializer(Serializer): if relation_info.to_many and (field_name in validated_attrs): many_to_many[field_name] = validated_attrs.pop(field_name) - instance = ModelClass.objects.create(**validated_attrs) + try: + instance = ModelClass.objects.create(**validated_attrs) + except TypeError as exc: + msg = ( + 'The mentioned argument might be a field on the serializer ' + 'that is not part of the model. You need to override the ' + 'create() method in your ModelSerializer subclass to support ' + 'this.') + six.reraise( + type(exc), + type(exc)(str(exc) + '. ' + msg), + sys.exc_info()[2]) # Save many-to-many relationships after the instance is created. if many_to_many: diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 3aec0da0c..90767dac1 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -10,6 +10,7 @@ from django.core.validators import MaxValueValidator, MinValueValidator, MinLeng from django.db import models from django.test import TestCase from rest_framework import serializers +import pytest def dedent(blocktext): @@ -26,6 +27,10 @@ class CustomField(models.Field): pass +class OneFieldModel(models.Model): + char_field = models.CharField(max_length=100) + + class RegularFieldsModel(models.Model): """ A model class for testing regular flat fields. @@ -68,6 +73,29 @@ class FieldOptionsModel(models.Model): choices_field = models.CharField(max_length=100, choices=COLOR_CHOICES) +class TestModelSerializer(TestCase): + def test_create_method(self): + class TestSerializer(serializers.ModelSerializer): + non_model_field = serializers.CharField() + + class Meta: + model = OneFieldModel + fields = ('char_field', 'non_model_field') + + serializer = TestSerializer(data={ + 'char_field': 'foo', + 'non_model_field': 'bar', + }) + serializer.is_valid() + with pytest.raises(TypeError): + serializer.save() + + try: + serializer.save() + except TypeError as exc: + assert 'ModelSerializer' in str(exc) + + class TestRegularFieldMappings(TestCase): def test_regular_fields(self): """ From b001a146d73348af18cfc4c943d87f2f389349c9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 17 Nov 2014 09:56:20 +0000 Subject: [PATCH 1062/1652] Add django master to build matrix. Closes #2075. --- .travis.yml | 10 ++++++++++ tox.ini | 24 +++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a5b6d7d91..4c06acf59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,16 @@ env: - TOX_ENV=py2.6-django1.5 - TOX_ENV=py2.7-django1.4 - TOX_ENV=py2.6-django1.4 + - TOX_ENV=py3.4-djangomaster + - TOX_ENV=py3.3-djangomaster + - TOX_ENV=py2.7-djangomaster + +matrix: + fast_finish: true + allow_failures: + - env: TOX_ENV=py3.4-djangomaster + - env: TOX_ENV=py3.3-djangomaster + - env: TOX_ENV=py2.7-djangomaster install: - "pip install tox --download-cache $HOME/.pip-cache" diff --git a/tox.ini b/tox.ini index d52dd1558..493712a1b 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,8 @@ envlist = py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7, py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6, py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5, - py2.7-django1.4,py2.6-django1.4 + py2.7-django1.4,py2.6-django1.4, + py3.4-djangomaster,py3.3-djangomaster,py2.7-djangomaster [testenv] commands = ./runtests.py --fast @@ -157,3 +158,24 @@ deps = django==1.4.11 django-oauth2-provider==0.2.3 django-guardian==1.2.3 pytest-django==2.6.1 + +[testenv:py3.4-djangomaster] +basepython = python3.4 +deps = https://github.com/django/django/zipball/master + django-filter==0.7 + defusedxml==0.3 + pytest-django==2.6.1 + +[testenv:py3.3-djangomaster] +basepython = python3.3 +deps = https://github.com/django/django/zipball/master + django-filter==0.7 + defusedxml==0.3 + pytest-django==2.6.1 + +[testenv:py2.7-djangomaster] +basepython = python3.2 +deps = https://github.com/django/django/zipball/master + django-filter==0.7 + defusedxml==0.3 + pytest-django==2.6.1 From d08cfb0559033acaefbc23863c43ef858c2c0e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Mon, 17 Nov 2014 08:17:40 -0400 Subject: [PATCH 1063/1652] Fix runtests examples Correctly rename runtests examples to work with current runtests.py file. --- docs/topics/contributing.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 6c289938f..52f6e287d 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -71,31 +71,31 @@ To run the tests, clone the repository, and then: Run using a more concise output style. - ./runtests -q + ./runtests.py -q Run the tests using a more concise output style, no coverage, no flake8. - ./runtests --fast + ./runtests.py --fast Don't run the flake8 code linting. - ./runtests --nolint + ./runtests.py --nolint Only run the flake8 code linting, don't run the tests. - ./runtests --lintonly + ./runtests.py --lintonly Run the tests for a given test case. - ./runtests MyTestCase + ./runtests.py MyTestCase Run the tests for a given test method. - ./runtests MyTestCase.test_this_method + ./runtests.py MyTestCase.test_this_method Shorter form to run the tests for a given test method. - ./runtests test_this_method + ./runtests.py test_this_method Note: The test case and test method matching is fuzzy and will sometimes run other tests that contain a partial string match to the given command line input. From 5f580cad523a4133e9805a7dfac4bf239d295a1e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 17 Nov 2014 18:17:44 +0000 Subject: [PATCH 1064/1652] Remove class='form-control' for file inputs. Closes #2065. --- rest_framework/templates/rest_framework/horizontal/input.html | 2 +- rest_framework/templates/rest_framework/inline/input.html | 2 +- rest_framework/templates/rest_framework/vertical/input.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/templates/rest_framework/horizontal/input.html b/rest_framework/templates/rest_framework/horizontal/input.html index df4aa40fc..c41cd523a 100644 --- a/rest_framework/templates/rest_framework/horizontal/input.html +++ b/rest_framework/templates/rest_framework/horizontal/input.html @@ -3,7 +3,7 @@ <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> {% endif %} <div class="col-sm-10"> - <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> + <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> {% if field.errors %} {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} {% endif %} diff --git a/rest_framework/templates/rest_framework/inline/input.html b/rest_framework/templates/rest_framework/inline/input.html index f8ec4faf2..de85ba485 100644 --- a/rest_framework/templates/rest_framework/inline/input.html +++ b/rest_framework/templates/rest_framework/inline/input.html @@ -2,5 +2,5 @@ {% if field.label %} <label class="sr-only">{{ field.label }}</label> {% endif %} - <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> + <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> </div> diff --git a/rest_framework/templates/rest_framework/vertical/input.html b/rest_framework/templates/rest_framework/vertical/input.html index e1e21ca1f..43cccd3ea 100644 --- a/rest_framework/templates/rest_framework/vertical/input.html +++ b/rest_framework/templates/rest_framework/vertical/input.html @@ -2,7 +2,7 @@ {% if field.label %} <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> {% endif %} - <input name="{{ field.name }}" class="form-control" type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> + <input name="{{ field.name }}" {% if style.input_type != "file" %}class="form-control"{% endif %} type="{{ style.input_type }}" {% if style.placeholder %}placeholder="{{ style.placeholder }}"{% endif %} {% if field.value %}value="{{ field.value }}"{% endif %}> {% if field.errors %} {% for error in field.errors %}<span class="help-block">{{ error }}</span>{% endfor %} {% endif %} From 0f508c58211051c873aae5a2d1c65a0c595e732a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 17 Nov 2014 18:36:32 +0000 Subject: [PATCH 1065/1652] Docs for advanced default argument usage. Closes #1945 --- docs/api-guide/validators.md | 32 ++++++++++++++++++++++++++++++++ rest_framework/fields.py | 11 +++++++++++ 2 files changed, 43 insertions(+) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index a50636bcc..ac2f32485 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -156,6 +156,38 @@ If you want the date field to be entirely hidden from the user, then use `Hidden --- +# Advanced 'default' argument usage + +Validators that are applied across multiple fields in the serializer can sometimes require a field input that should not be provided by the API client, but that *is* available as input to the validator. + +Two patterns that you may want to use for this sort of validation include: + +* Using `HiddenField`. This field will be present in `validated_data` but *will not* be used in the serializer output representation. +* Using a standard field with `read_only=True`, but that also includes a `default=…` argument. This field *will* be used in the serializer output representation, but cannot be set directly by the user. + +REST framework includes a couple of defaults that may be useful in this context. + +#### CurrentUserDefault + +A default class that can be used to represent the current user. In order to use this, the 'request' must have been provided as part of the context dictionary when instantiating the serializer. + + owner = serializers.HiddenField( + default=CurrentUserDefault() + ) + +#### CreateOnlyDefault + +A default class that can be used to *only set a default argument during create operations*. During updates the field is omitted. + +It takes a single argument, which is the default value or callable that should be used during create operations. + + created_at = serializers.DateTimeField( + read_only=True, + default=CreateOnlyDefault(timezone.now) + ) + +--- + # Writing custom validators You can use any of Django's existing validators, or write your own custom validators. diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 58482db55..36afe7a99 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -117,6 +117,17 @@ class CreateOnlyDefault: return '%s(%s)' % (self.__class__.__name__, repr(self.default)) +class CurrentUserDefault: + def set_context(self, serializer_field): + self.user = serializer_field.context['request'].user + + def __call__(self): + return self.user + + def __repr__(self): + return '%s()' % self.__class__.__name__ + + class SkipField(Exception): pass From 67735687b297e66c7cfe61614040efcd9763f1f1 Mon Sep 17 00:00:00 2001 From: Doug Beck <doug@douglasbeck.com> Date: Tue, 18 Nov 2014 01:26:23 -0500 Subject: [PATCH 1066/1652] Ensure `_resolve_model` does not return `None` --- rest_framework/utils/model_meta.py | 6 +++++- tests/test_utils.py | 33 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py index 82361edf9..54f9310db 100644 --- a/rest_framework/utils/model_meta.py +++ b/rest_framework/utils/model_meta.py @@ -43,7 +43,11 @@ def _resolve_model(obj): """ if isinstance(obj, six.string_types) and len(obj.split('.')) == 2: app_name, model_name = obj.split('.') - return models.get_model(app_name, model_name) + resolved_model = models.get_model(app_name, model_name) + if not resolved_model: + raise ValueError("Django did not return a model for " + "{0}.{1}".format(app_name, model_name)) + return resolved_model elif inspect.isclass(obj) and issubclass(obj, models.Model): return obj raise ValueError("{0} is not a Django model".format(obj)) diff --git a/tests/test_utils.py b/tests/test_utils.py index 96c5f997e..0bdb36bba 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -7,6 +7,8 @@ from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework.views import APIView from tests.models import BasicModel +import rest_framework.utils.model_meta + class Root(APIView): pass @@ -130,3 +132,34 @@ class ResolveModelTests(TestCase): def test_resolve_improper_string_representation(self): with self.assertRaises(ValueError): _resolve_model('BasicModel') + + +class ResolveModelWithPatchedDjangoTests(TestCase): + """ + Test coverage for when Django's `get_model` returns `None`. + + Under certain circumstances Django may return `None` with `get_model`: + http://git.io/get-model-source + + It usually happens with circular imports so it is important that DRF + excepts early, otherwise fault happens downstream and is much more + difficult to debug. + + """ + + def setUp(self): + """Monkeypatch get_model.""" + self.get_model = rest_framework.utils.model_meta.models.get_model + + def get_model(app_label, model_name): + return None + + rest_framework.utils.model_meta.models.get_model = get_model + + def tearDown(self): + """Revert monkeypatching.""" + rest_framework.utils.model_meta.models.get_model = self.get_model + + def test_blows_up_if_model_does_not_resolve(self): + with self.assertRaises(ValueError): + _resolve_model('tests.BasicModel') From 5e74f02d61e05d38bf4e22c6227144def2a96128 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 18 Nov 2014 14:49:00 +0000 Subject: [PATCH 1067/1652] Note removal of 'save_object' and fail loudly if it exists --- docs/topics/3.0-announcement.md | 2 ++ rest_framework/serializers.py | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 885fc183e..90cbda4d6 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -84,6 +84,8 @@ The resulting API changes are further detailed below. The `.restore_object()` method is now replaced with two separate methods, `.create()` and `.update()`. +These methods also replace the optional `.save_object()` method, which no longer exists. + When using the `.create()` and `.update()` methods you should both create *and save* the object instance. This is in contrast to the previous `.restore_object()` behavior that would instantiate the object but not save it. The following example from the tutorial previously used `restore_object()` to handle both creating and updating object instances. diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index e7e93f380..84282cdb2 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -108,6 +108,13 @@ class BaseSerializer(Field): raise NotImplementedError('`create()` must be implemented.') def save(self, **kwargs): + assert not hasattr(self, 'save_object'), ( + 'Serializer `%s.%s` has old-style version 2 `.save_object()` ' + 'that is no longer compatible with REST framework 3. ' + 'Use the new-style `.create()` and `.update()` methods instead.' % + (self.__class__.__module__, self.__class__.__name__) + ) + validated_data = dict( list(self.validated_data.items()) + list(kwargs.items()) From 084354d3ebf3949f8c1664d68da4a568da0b10fa Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 18 Nov 2014 15:11:40 +0000 Subject: [PATCH 1068/1652] Only pass instance to form for PUT and PATCH. Closes #2073. --- rest_framework/renderers.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index eb04e81e1..7c2b51566 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -547,7 +547,10 @@ class BrowsableAPIRenderer(BaseRenderer): if existing_serializer is not None: serializer = existing_serializer else: - serializer = view.get_serializer(instance=instance, data=data) + if method in ('PUT', 'PATCH'): + serializer = view.get_serializer(instance=instance, data=data) + else: + serializer = view.get_serializer(data=data) if data is not None: serializer.is_valid() form_renderer = self.form_renderer_class() @@ -584,7 +587,10 @@ class BrowsableAPIRenderer(BaseRenderer): # View has a serializer defined and parser class has a # corresponding renderer that can be used to render the data. - serializer = view.get_serializer(instance=instance) + if method in ('PUT', 'PATCH'): + serializer = view.get_serializer(instance=instance) + else: + serializer = view.get_serializer() # Render the raw data content renderer = renderer_class() From 080bd3d24e1866df2acc3aae0ec0f97ebe3a8c36 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 18 Nov 2014 15:38:31 +0000 Subject: [PATCH 1069/1652] Add comment ref #2089 --- rest_framework/renderers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 7c2b51566..6596fc44c 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -515,6 +515,7 @@ class BrowsableAPIRenderer(BaseRenderer): In the absence of the View having an associated form then return None. """ + # See issue #2089 for refactoring this. serializer = getattr(data, 'serializer', None) if serializer and not getattr(serializer, 'many', False): instance = getattr(serializer, 'instance', None) @@ -562,6 +563,7 @@ class BrowsableAPIRenderer(BaseRenderer): via standard HTML forms. (Which are typically application/x-www-form-urlencoded) """ + # See issue #2089 for refactoring this. serializer = getattr(data, 'serializer', None) if serializer and not getattr(serializer, 'many', False): instance = getattr(serializer, 'instance', None) From c0d356edaa425868dbcdb29c5d2f8e88f177f604 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 18 Nov 2014 15:42:52 +0000 Subject: [PATCH 1070/1652] Fix byte decode error rendering 'display_name' with OPTIONS. Closes #2084 --- rest_framework/metadata.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py index 90d3f2e01..de829d003 100644 --- a/rest_framework/metadata.py +++ b/rest_framework/metadata.py @@ -121,7 +121,10 @@ class SimpleMetadata(BaseMetadata): if hasattr(field, 'choices'): field_info['choices'] = [ - {'value': choice_value, 'display_name': choice_name} + { + 'value': choice_value, + 'display_name': force_text(choice_name, strings_only=True) + } for choice_value, choice_name in field.choices.items() ] From f269826a7d8a980536ffbce369be369c4df58d23 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 18 Nov 2014 16:26:45 +0000 Subject: [PATCH 1071/1652] Note on 3.0 beta --- docs/topics/3.0-announcement.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 90cbda4d6..06fdc9fdc 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -1,10 +1,12 @@ ## Pre-release notes: -The 3.0 release is now ready for some tentative testing and upgrades for early adopters. You can install the development version directly from GitHub like so: +The 3.0 release is now in beta and ready for final testing. You can install the development version directly from GitHub like so: - pip install https://github.com/tomchristie/django-rest-framework/archive/master.zip + pip install https://github.com/tomchristie/django-rest-framework/archive/3.0-beta.zip -See the [Version 3.0 GitHub issue](https://github.com/tomchristie/django-rest-framework/pull/1800) for more details on remaining work. +Currently the only known remaining blockers are documentation issues and tickets. Any critical bugs raised in the next week or two will be resolved for the 3.0 release, but otherwise consider this as code-complete. + +Please work through this document throughly in order to understand the API differences that exist between 2.4 and 3.0. **Your feedback on the upgrade process and 3.0 changes is hugely important!** From f573aaee4eabb9bf677c350219c8feb2333a6fa1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 18 Nov 2014 17:25:05 +0000 Subject: [PATCH 1072/1652] List serializer no explicitly renders as 'not supported for HTML input' --- .../templates/rest_framework/horizontal/list_fieldset.html | 3 +++ .../templates/rest_framework/inline/list_fieldset.html | 1 + .../templates/rest_framework/vertical/list_fieldset.html | 1 + 3 files changed, 5 insertions(+) create mode 100644 rest_framework/templates/rest_framework/inline/list_fieldset.html diff --git a/rest_framework/templates/rest_framework/horizontal/list_fieldset.html b/rest_framework/templates/rest_framework/horizontal/list_fieldset.html index a30514c68..a9ff04a62 100644 --- a/rest_framework/templates/rest_framework/horizontal/list_fieldset.html +++ b/rest_framework/templates/rest_framework/horizontal/list_fieldset.html @@ -5,9 +5,12 @@ <legend class="control-label col-sm-2 {% if style.hide_label %}sr-only{% endif %}" style="border-bottom: 0">{{ field.label }}</legend> </div> {% endif %} + <!-- <ul> {% for child in field.value %} <li>TODO</li> {% endfor %} </ul> + --> + <p>Lists are not currently supported in HTML input.</p> </fieldset> diff --git a/rest_framework/templates/rest_framework/inline/list_fieldset.html b/rest_framework/templates/rest_framework/inline/list_fieldset.html new file mode 100644 index 000000000..2ae56d7cd --- /dev/null +++ b/rest_framework/templates/rest_framework/inline/list_fieldset.html @@ -0,0 +1 @@ +<span>Lists are not currently supported in HTML input.</span> diff --git a/rest_framework/templates/rest_framework/vertical/list_fieldset.html b/rest_framework/templates/rest_framework/vertical/list_fieldset.html index 74bbf4483..1d86c7f2b 100644 --- a/rest_framework/templates/rest_framework/vertical/list_fieldset.html +++ b/rest_framework/templates/rest_framework/vertical/list_fieldset.html @@ -4,4 +4,5 @@ {% for field_item in field.value.field_items.values() %} {{ renderer.render_field(field_item, layout=layout) }} {% endfor %} --> + <p>Lists are not currently supported in HTML input.</p> </fieldset> From 5cda5ad18e2871c0e0d80c1aed448b56301db8b3 Mon Sep 17 00:00:00 2001 From: Josh Kalderimis <josh.kalderimis@gmail.com> Date: Tue, 18 Nov 2014 13:06:08 -0500 Subject: [PATCH 1073/1652] Use the new build env on Travis faster vms, more ram, more cpu, better vm boot times official docs coming soon --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4c06acf59..9b2e47383 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: python python: 2.7 +sudo: false + env: - TOX_ENV=flake8 - TOX_ENV=py3.4-django1.7 From e49d22dbda5ac889ab89f277e17752c840819de2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 19 Nov 2014 09:31:26 +0000 Subject: [PATCH 1074/1652] Allow blank choices to render. Closes #2071. --- rest_framework/fields.py | 2 ++ tests/test_fields.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 36afe7a99..bb43708dc 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -947,6 +947,8 @@ class ChoiceField(Field): self.fail('invalid_choice', input=data) def to_representation(self, value): + if value in ('', None): + return value return self.choice_strings_to_values[six.text_type(value)] diff --git a/tests/test_fields.py b/tests/test_fields.py index 5db381acc..135256320 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -793,7 +793,8 @@ class TestChoiceField(FieldValues): 'amazing': ['`amazing` is not a valid choice.'] } outputs = { - 'good': 'good' + 'good': 'good', + '': '' } field = serializers.ChoiceField( choices=[ From 6cb6510132b319c96b28bea732032aaf2d495895 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 19 Nov 2014 12:15:05 +0000 Subject: [PATCH 1075/1652] Use translatable error strings. Refs #2063. --- rest_framework/exceptions.py | 74 +++++++++++++++++++++++++++--------- 1 file changed, 56 insertions(+), 18 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 0b06d6e60..dbab66842 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -5,7 +5,11 @@ In addition Django's built in 403 and 404 exceptions are handled. (`django.http.Http404` and `django.core.exceptions.PermissionDenied`) """ from __future__ import unicode_literals + +from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ungettext_lazy from rest_framework import status +from rest_framework.compat import force_text import math @@ -15,10 +19,13 @@ class APIException(Exception): Subclasses should provide `.status_code` and `.default_detail` properties. """ status_code = status.HTTP_500_INTERNAL_SERVER_ERROR - default_detail = 'A server error occured' + default_detail = _('A server error occured') def __init__(self, detail=None): - self.detail = detail or self.default_detail + if detail is not None: + self.detail = force_text(detail) + else: + self.detail = force_text(self.default_detail) def __str__(self): return self.detail @@ -31,6 +38,19 @@ class APIException(Exception): # from rest_framework import serializers # raise serializers.ValidationError('Value was invalid') +def force_text_recursive(data): + if isinstance(data, list): + return [ + force_text_recursive(item) for item in data + ] + elif isinstance(data, dict): + return dict([ + (key, force_text_recursive(value)) + for key, value in data.items() + ]) + return force_text(data) + + class ValidationError(APIException): status_code = status.HTTP_400_BAD_REQUEST @@ -39,7 +59,7 @@ class ValidationError(APIException): # The details should always be coerced to a list if not already. if not isinstance(detail, dict) and not isinstance(detail, list): detail = [detail] - self.detail = detail + self.detail = force_text_recursive(detail) def __str__(self): return str(self.detail) @@ -47,59 +67,77 @@ class ValidationError(APIException): class ParseError(APIException): status_code = status.HTTP_400_BAD_REQUEST - default_detail = 'Malformed request.' + default_detail = _('Malformed request.') class AuthenticationFailed(APIException): status_code = status.HTTP_401_UNAUTHORIZED - default_detail = 'Incorrect authentication credentials.' + default_detail = _('Incorrect authentication credentials.') class NotAuthenticated(APIException): status_code = status.HTTP_401_UNAUTHORIZED - default_detail = 'Authentication credentials were not provided.' + default_detail = _('Authentication credentials were not provided.') class PermissionDenied(APIException): status_code = status.HTTP_403_FORBIDDEN - default_detail = 'You do not have permission to perform this action.' + default_detail = _('You do not have permission to perform this action.') class MethodNotAllowed(APIException): status_code = status.HTTP_405_METHOD_NOT_ALLOWED - default_detail = "Method '%s' not allowed." + default_detail = _("Method '%s' not allowed.") def __init__(self, method, detail=None): - self.detail = detail or (self.default_detail % method) + if detail is not None: + self.detail = force_text(detail) + else: + self.detail = force_text(self.default_detail) % method class NotAcceptable(APIException): status_code = status.HTTP_406_NOT_ACCEPTABLE - default_detail = "Could not satisfy the request Accept header" + default_detail = _('Could not satisfy the request Accept header') def __init__(self, detail=None, available_renderers=None): - self.detail = detail or self.default_detail + if detail is not None: + self.detail = force_text(detail) + else: + self.detail = force_text(self.default_detail) self.available_renderers = available_renderers class UnsupportedMediaType(APIException): status_code = status.HTTP_415_UNSUPPORTED_MEDIA_TYPE - default_detail = "Unsupported media type '%s' in request." + default_detail = _("Unsupported media type '%s' in request.") def __init__(self, media_type, detail=None): - self.detail = detail or (self.default_detail % media_type) + if detail is not None: + self.detail = force_text(detail) + else: + self.detail = force_text(self.default_detail) % media_type class Throttled(APIException): status_code = status.HTTP_429_TOO_MANY_REQUESTS - default_detail = 'Request was throttled.' - extra_detail = " Expected available in %d second%s." + default_detail = _('Request was throttled.') + extra_detail = ungettext_lazy( + 'Expected available in %(wait)d second.', + 'Expected available in %(wait)d seconds.', + 'wait' + ) def __init__(self, wait=None, detail=None): + if detail is not None: + self.detail = force_text(detail) + else: + self.detail = force_text(self.default_detail) + if wait is None: - self.detail = detail or self.default_detail self.wait = None else: - format = (detail or self.default_detail) + self.extra_detail - self.detail = format % (wait, wait != 1 and 's' or '') self.wait = math.ceil(wait) + self.detail += ' ' + force_text( + self.extra_detail % {'wait': self.wait} + ) From 8586290df80ac8448d71cdb3326bc822c399cad1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 19 Nov 2014 13:55:10 +0000 Subject: [PATCH 1076/1652] Apply defaults and requiredness to unique_together fields. Closes #2092. --- rest_framework/serializers.py | 79 +++++++++++++++++++++-------------- rest_framework/validators.py | 14 ++++++- tests/test_validators.py | 4 +- 3 files changed, 62 insertions(+), 35 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 84282cdb2..2e34dbe75 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -720,49 +720,60 @@ class ModelSerializer(Serializer): # Determine if we need any additional `HiddenField` or extra keyword # arguments to deal with `unique_for` dates that are required to # be in the input data in order to validate it. - unique_fields = {} + hidden_fields = {} + for model_field_name, field_name in model_field_mapping.items(): try: model_field = model._meta.get_field(model_field_name) except FieldDoesNotExist: continue - # Deal with each of the `unique_for_*` cases. - for date_field_name in ( + # Include each of the `unique_for_*` field names. + unique_constraint_names = set([ model_field.unique_for_date, model_field.unique_for_month, model_field.unique_for_year - ): - if date_field_name is None: - continue + ]) + unique_constraint_names -= set([None]) - # Get the model field that is refered too. - date_field = model._meta.get_field(date_field_name) + # Include each of the `unique_together` field names, + # so long as all the field names are included on the serializer. + for parent_class in [model] + list(model._meta.parents.keys()): + for unique_together_list in parent_class._meta.unique_together: + if set(fields).issuperset(set(unique_together_list)): + unique_constraint_names |= set(unique_together_list) - if date_field.auto_now_add: - default = CreateOnlyDefault(timezone.now) - elif date_field.auto_now: - default = timezone.now - elif date_field.has_default(): - default = model_field.default + # Now we have all the field names that have uniqueness constraints + # applied, we can add the extra 'required=...' or 'default=...' + # arguments that are appropriate to these fields, or add a `HiddenField` for it. + for unique_constraint_name in unique_constraint_names: + # Get the model field that is refered too. + unique_constraint_field = model._meta.get_field(unique_constraint_name) + + if getattr(unique_constraint_field, 'auto_now_add', None): + default = CreateOnlyDefault(timezone.now) + elif getattr(unique_constraint_field, 'auto_now', None): + default = timezone.now + elif unique_constraint_field.has_default(): + default = model_field.default + else: + default = empty + + if unique_constraint_name in model_field_mapping: + # The corresponding field is present in the serializer + if unique_constraint_name not in extra_kwargs: + extra_kwargs[unique_constraint_name] = {} + if default is empty: + if 'required' not in extra_kwargs[unique_constraint_name]: + extra_kwargs[unique_constraint_name]['required'] = True else: - default = empty - - if date_field_name in model_field_mapping: - # The corresponding date field is present in the serializer - if date_field_name not in extra_kwargs: - extra_kwargs[date_field_name] = {} - if default is empty: - if 'required' not in extra_kwargs[date_field_name]: - extra_kwargs[date_field_name]['required'] = True - else: - if 'default' not in extra_kwargs[date_field_name]: - extra_kwargs[date_field_name]['default'] = default - else: - # The corresponding date field is not present in the, - # serializer. We have a default to use for the date, so - # add in a hidden field that populates it. - unique_fields[date_field_name] = HiddenField(default=default) + if 'default' not in extra_kwargs[unique_constraint_name]: + extra_kwargs[unique_constraint_name]['default'] = default + elif default is not empty: + # The corresponding field is not present in the, + # serializer. We have a default to use for it, so + # add in a hidden field that populates it. + hidden_fields[unique_constraint_name] = HiddenField(default=default) # Now determine the fields that should be included on the serializer. for field_name in fields: @@ -838,12 +849,16 @@ class ModelSerializer(Serializer): 'validators', 'queryset' ]: kwargs.pop(attr, None) + + if extras.get('default') and kwargs.get('required') is False: + kwargs.pop('required') + kwargs.update(extras) # Create the serializer field. ret[field_name] = field_cls(**kwargs) - for field_name, field in unique_fields.items(): + for field_name, field in hidden_fields.items(): ret[field_name] = field return ret diff --git a/rest_framework/validators.py b/rest_framework/validators.py index fa4f18474..7ca4e6a9b 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -93,6 +93,9 @@ class UniqueTogetherValidator: The `UniqueTogetherValidator` always forces an implied 'required' state on the fields it applies to. """ + if self.instance is not None: + return + missing = dict([ (field_name, self.missing_message) for field_name in self.fields @@ -105,8 +108,17 @@ class UniqueTogetherValidator: """ Filter the queryset to all instances matching the given attributes. """ + # If this is an update, then any unprovided field should + # have it's value set based on the existing instance attribute. + if self.instance is not None: + for field_name in self.fields: + if field_name not in attrs: + attrs[field_name] = getattr(self.instance, field_name) + + # Determine the filter keyword arguments and filter the queryset. filter_kwargs = dict([ - (field_name, attrs[field_name]) for field_name in self.fields + (field_name, attrs[field_name]) + for field_name in self.fields ]) return queryset.filter(**filter_kwargs) diff --git a/tests/test_validators.py b/tests/test_validators.py index 86614b109..1df0641c5 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -88,8 +88,8 @@ class TestUniquenessTogetherValidation(TestCase): expected = dedent(""" UniquenessTogetherSerializer(): id = IntegerField(label='ID', read_only=True) - race_name = CharField(max_length=100) - position = IntegerField() + race_name = CharField(max_length=100, required=True) + position = IntegerField(required=True) class Meta: validators = [<UniqueTogetherValidator(queryset=UniquenessTogetherModel.objects.all(), fields=('race_name', 'position'))>] """) From 51b7033e4aeeefe19012a77b09a0b23d4a52a5bc Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 19 Nov 2014 14:03:19 +0000 Subject: [PATCH 1077/1652] Further notes in 3.0 announcement --- docs/topics/3.0-announcement.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 90cbda4d6..3c73881ff 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -821,6 +821,11 @@ Or modify it on an individual serializer field, using the `coerce_to_string` key The default JSON renderer will return float objects for uncoerced `Decimal` instances. This allows you to easily switch between string or float representations for decimals depending on your API design needs. +## Miscellaneous notes. + +* The serializer `ChoiceField` does not currently display nested choices, as was the case in 2.4. This will be address as part of 3.1. +* Due to the new templated form rendering, the 'widget' option is no longer valid. This means there's no easy way of using third party "autocomplete" widgets for rendering select inputs that contain a large number of choices. You'll either need to use a regular select or a plain text input. We may consider addressing this in 3.1 or 3.2 if there's sufficient demand. + ## What's coming next. 3.0 is an incremental release, and there are several upcoming features that will build on the baseline improvements that it makes. From 851628107842a5bf84725247a42cae1ac90decf6 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 19 Nov 2014 14:40:30 +0000 Subject: [PATCH 1078/1652] Minor fix for #2092. --- rest_framework/serializers.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 2e34dbe75..3189619e3 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -736,12 +736,12 @@ class ModelSerializer(Serializer): ]) unique_constraint_names -= set([None]) - # Include each of the `unique_together` field names, - # so long as all the field names are included on the serializer. - for parent_class in [model] + list(model._meta.parents.keys()): - for unique_together_list in parent_class._meta.unique_together: - if set(fields).issuperset(set(unique_together_list)): - unique_constraint_names |= set(unique_together_list) + # Include each of the `unique_together` field names, + # so long as all the field names are included on the serializer. + for parent_class in [model] + list(model._meta.parents.keys()): + for unique_together_list in parent_class._meta.unique_together: + if set(fields).issuperset(set(unique_together_list)): + unique_constraint_names |= set(unique_together_list) # Now we have all the field names that have uniqueness constraints # applied, we can add the extra 'required=...' or 'default=...' From 40b1ea919b00bd8bf1f53f8eb8bf33a498b237b8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 19 Nov 2014 14:51:49 +0000 Subject: [PATCH 1079/1652] Fix non-determanistic unique constraint mapping. Refs #2092. --- rest_framework/serializers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 3189619e3..ce0d14d6f 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -721,6 +721,7 @@ class ModelSerializer(Serializer): # arguments to deal with `unique_for` dates that are required to # be in the input data in order to validate it. hidden_fields = {} + unique_constraint_names = set() for model_field_name, field_name in model_field_mapping.items(): try: @@ -729,12 +730,13 @@ class ModelSerializer(Serializer): continue # Include each of the `unique_for_*` field names. - unique_constraint_names = set([ + unique_constraint_names |= set([ model_field.unique_for_date, model_field.unique_for_month, model_field.unique_for_year ]) - unique_constraint_names -= set([None]) + + unique_constraint_names -= set([None]) # Include each of the `unique_together` field names, # so long as all the field names are included on the serializer. From 928cbc640ef1db2c3fb96d352f69b8ffb66313e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raony=20Guimar=C3=A3es?= <raonyguimaraes@gmail.com> Date: Wed, 19 Nov 2014 13:53:36 -0200 Subject: [PATCH 1080/1652] small type --- docs/tutorial/quickstart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index c2dc4bea9..1c398c1ff 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -19,7 +19,7 @@ Create a new Django project named `tutorial`, then start a new app called `quick pip install djangorestframework # Set up a new project with a single application - django-admin.py startproject tutorial . + django-admin.py startproject tutorial cd tutorial django-admin.py startapp quickstart cd .. From bde725541359de1fef785801fc5dad98e70a8e2f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 20 Nov 2014 09:30:49 +0000 Subject: [PATCH 1081/1652] Fix non-determanistic default bug. Closes #2099. --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index ce0d14d6f..2d5c843e5 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -757,7 +757,7 @@ class ModelSerializer(Serializer): elif getattr(unique_constraint_field, 'auto_now', None): default = timezone.now elif unique_constraint_field.has_default(): - default = model_field.default + default = unique_constraint_field.default else: default = empty From 04d2635b24f0699ed8ed24436a58c203ad6a9a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gil=20Gon=C3=A7alves?= <lursty@gmail.com> Date: Thu, 20 Nov 2014 11:33:42 +0000 Subject: [PATCH 1082/1652] Removed unused import from code snippet in tutorial --- docs/tutorial/5-relationships-and-hyperlinked-apis.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 36473ce91..50552616b 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -6,7 +6,6 @@ At the moment relationships within our API are represented by using primary keys Right now we have endpoints for 'snippets' and 'users', but we don't have a single entry point to our API. To create one, we'll use a regular function-based view and the `@api_view` decorator we introduced earlier. In your `snippets/views.py` add: - from rest_framework import renderers from rest_framework.decorators import api_view from rest_framework.response import Response from rest_framework.reverse import reverse From 7d417fc67864fc4c1c340eeae276cea0d5d428b1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 20 Nov 2014 12:02:58 +0000 Subject: [PATCH 1083/1652] Make _force_text_recursive private. --- rest_framework/exceptions.py | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index dbab66842..906de3b04 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -13,6 +13,23 @@ from rest_framework.compat import force_text import math +def _force_text_recursive(data): + """ + Descend into a nested data structure, forcing any + lazy translation strings into plain text. + """ + if isinstance(data, list): + return [ + _force_text_recursive(item) for item in data + ] + elif isinstance(data, dict): + return dict([ + (key, _force_text_recursive(value)) + for key, value in data.items() + ]) + return force_text(data) + + class APIException(Exception): """ Base class for REST framework exceptions. @@ -38,19 +55,6 @@ class APIException(Exception): # from rest_framework import serializers # raise serializers.ValidationError('Value was invalid') -def force_text_recursive(data): - if isinstance(data, list): - return [ - force_text_recursive(item) for item in data - ] - elif isinstance(data, dict): - return dict([ - (key, force_text_recursive(value)) - for key, value in data.items() - ]) - return force_text(data) - - class ValidationError(APIException): status_code = status.HTTP_400_BAD_REQUEST @@ -59,7 +63,7 @@ class ValidationError(APIException): # The details should always be coerced to a list if not already. if not isinstance(detail, dict) and not isinstance(detail, list): detail = [detail] - self.detail = force_text_recursive(detail) + self.detail = _force_text_recursive(detail) def __str__(self): return str(self.detail) From 6794b3380a32b53fa88547a8b2a2b34834fe4df7 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 20 Nov 2014 12:15:33 +0000 Subject: [PATCH 1084/1652] Fixes for defaulting empty HTML fields to '', None, or empty. --- rest_framework/fields.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index bb43708dc..778bc7187 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -181,6 +181,9 @@ class Field(object): self.style = {} if style is None else style self.allow_null = allow_null + if allow_null and self.default_empty_html is empty: + self.default_empty_html = None + if validators is not None: self.validators = validators[:] @@ -495,6 +498,7 @@ class CharField(Field): } initial = '' coerce_blank_to_null = False + default_empty_html = '' def __init__(self, **kwargs): self.allow_blank = kwargs.pop('allow_blank', False) From 9c6bead8b6d3f9ae11e9859ed305e8d0f7a9e0d8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 20 Nov 2014 12:38:08 +0000 Subject: [PATCH 1085/1652] Add --- null option for selects. Closes #2096. --- .../templates/rest_framework/horizontal/select.html | 3 +++ rest_framework/templates/rest_framework/inline/select.html | 5 ++++- rest_framework/templates/rest_framework/vertical/select.html | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/rest_framework/templates/rest_framework/horizontal/select.html b/rest_framework/templates/rest_framework/horizontal/select.html index 1d00f4241..380b38e94 100644 --- a/rest_framework/templates/rest_framework/horizontal/select.html +++ b/rest_framework/templates/rest_framework/horizontal/select.html @@ -4,6 +4,9 @@ {% endif %} <div class="col-sm-10"> <select class="form-control" name="{{ field.name }}"> + {% if field.allow_null %} + <option value="" {% if not field.value %}selected{% endif %}>--------</option> + {% endif %} {% for key, text in field.choices.items %} <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} diff --git a/rest_framework/templates/rest_framework/inline/select.html b/rest_framework/templates/rest_framework/inline/select.html index e9fcebb48..53af2772b 100644 --- a/rest_framework/templates/rest_framework/inline/select.html +++ b/rest_framework/templates/rest_framework/inline/select.html @@ -3,8 +3,11 @@ <label class="sr-only">{{ field.label }}</label> {% endif %} <select class="form-control" name="{{ field.name }}"> + {% if field.allow_null %} + <option value="" {% if not field.value %}selected{% endif %}>--------</option> + {% endif %} {% for key, text in field.choices.items %} - <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> + <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> </div> diff --git a/rest_framework/templates/rest_framework/vertical/select.html b/rest_framework/templates/rest_framework/vertical/select.html index 7c673ebb5..de72e1ddb 100644 --- a/rest_framework/templates/rest_framework/vertical/select.html +++ b/rest_framework/templates/rest_framework/vertical/select.html @@ -3,8 +3,11 @@ <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> {% endif %} <select class="form-control" name="{{ field.name }}"> + {% if field.allow_null %} + <option value="" {% if not field.value %}selected{% endif %}>--------</option> + {% endif %} {% for key, text in field.choices.items %} - <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> + <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option> {% endfor %} </select> {% if field.errors %} From 6ec96d0bac1e738aceec9f8c21282c172120c7ac Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 20 Nov 2014 13:43:38 +0000 Subject: [PATCH 1086/1652] Resolve PUT and POST buttons in browsable API --- rest_framework/renderers.py | 14 ++++++++++++-- .../templates/rest_framework/api_form.html | 8 ++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 rest_framework/templates/rest_framework/api_form.html diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 6596fc44c..8717137af 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -429,7 +429,10 @@ class HTMLFormRenderer(BaseRenderer): style['base_template'] = self.base_template style['renderer'] = self - if 'template' in style: + # This API needs to be finessed and finalized for 3.1 + if 'template' in renderer_context: + template_name = renderer_context['template'] + elif 'template' in style: template_name = style['template'] else: template_name = style['template_pack'].strip('/') + '/' + style['base_template'] @@ -555,7 +558,14 @@ class BrowsableAPIRenderer(BaseRenderer): if data is not None: serializer.is_valid() form_renderer = self.form_renderer_class() - return form_renderer.render(serializer.data, self.accepted_media_type, self.renderer_context) + return form_renderer.render( + serializer.data, + self.accepted_media_type, + dict( + self.renderer_context.items() + + [('template', 'rest_framework/api_form.html')] + ) + ) def get_raw_data_form(self, data, view, method, request): """ diff --git a/rest_framework/templates/rest_framework/api_form.html b/rest_framework/templates/rest_framework/api_form.html new file mode 100644 index 000000000..96f924ed8 --- /dev/null +++ b/rest_framework/templates/rest_framework/api_form.html @@ -0,0 +1,8 @@ +{% load rest_framework %} +{% csrf_token %} +{% for field in form %} + {% if not field.read_only %} + {% render_field field style=style %} + {% endif %} +{% endfor %} +<!-- form.non_field_errors --> From 6a2023a362bcc10978ed725fa8816ddf08ea7c73 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 20 Nov 2014 13:52:00 +0000 Subject: [PATCH 1087/1652] Note on 3.1 and 3.2 releases. --- docs/topics/3.0-announcement.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 958be2d6b..03e3e070b 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -34,6 +34,9 @@ Notable features of this new release include: * Support for overriding how validation errors are handled by your API. * A metadata API that allows you to customize how `OPTIONS` requests are handled by your API. * A more compact JSON output with unicode style encoding turned on by default. +* Templated based HTML form rendering for serializers. This will be finalized as public API in the upcoming 3.1 release. + +Significant new functionality continues to be planned for the 3.1 and 3.2 releases. These releases will present simple upgrades, without the same level of fundamental API changes necessary for the 3.0 release. Below is an in-depth guide to the API changes and migration notes for 3.0. From 071c064d251bb2f268762fb34cf3f248b5ce4557 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 20 Nov 2014 14:22:53 +0000 Subject: [PATCH 1088/1652] Fill in TODOs for 3.0 beta release notes --- docs/topics/3.0-announcement.md | 47 ++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 03e3e070b..7bbfba5ba 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -36,7 +36,7 @@ Notable features of this new release include: * A more compact JSON output with unicode style encoding turned on by default. * Templated based HTML form rendering for serializers. This will be finalized as public API in the upcoming 3.1 release. -Significant new functionality continues to be planned for the 3.1 and 3.2 releases. These releases will present simple upgrades, without the same level of fundamental API changes necessary for the 3.0 release. +Significant new functionality continues to be planned for the 3.1 and 3.2 releases. These releases will correspond to the two [Kickstarter stretch goals](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) - "Feature improvements" and "Admin interface". Further 3.x releases will present simple upgrades, without the same level of fundamental API changes necessary for the 3.0 release. Below is an in-depth guide to the API changes and migration notes for 3.0. @@ -145,6 +145,16 @@ The corresponding code would now look like this: logging.info('Creating ticket "%s"' % name) serializer.save(user=request.user) # Include the user when saving. +#### Using `.is_valid(raise_exception=True)` + +The `.is_valid()` method now takes an optional boolean flag, `raise_exception`. + +Calling `.is_valid(raise_exception=True)` will cause a `ValidationError` to be raised if the serializer data contains validation errors. This error will be handled by REST framework's default exception handler, allowing you to remove error response handling from your view code. + +The handling and formatting of error responses may be altered globally by using the `EXCEPTION_HANDLER` settings key. + +This change also means it's now possible to alter the style of error responses used by the built-in generic views, without having to include mixin classes or other overrides. + #### Using `serializers.ValidationError`. Previously `serializers.ValidationError` error was simply a synonym for `django.core.exceptions.ValidationError`. This has now been altered so that it inherits from the standard `APIException` base class. @@ -356,6 +366,8 @@ The `ListSerializer` class has now been added, and allows you to create base ser You can also still use the `many=True` argument to serializer classes. It's worth noting that `many=True` argument transparently creates a `ListSerializer` instance, allowing the validation logic for list and non-list data to be cleanly separated in the REST framework codebase. +You will typically want to *continue to use the existing `many=True` flag* rather than declaring `ListSerializer` classes explicitly, but declaring the classes explicitly can be useful if you need to write custom `create` or `update` methods for bulk updates, or provide for other custom behavior. + See also the new `ListField` class, which validates input in the same way, but does not include the serializer interfaces of `.is_valid()`, `.data`, `.save()` and so on. #### The `BaseSerializer` class. @@ -673,7 +685,9 @@ The `UniqueTogetherValidator` should be applied to a serializer, and takes a `qu #### The `UniqueForDateValidator` classes. -**TODO: Needs documenting.** +REST framework also now includes explicit validator classes for validating the `unique_for_date`, `unique_for_month`, and `unique_for_year` model field constraints. These are used internally instead of calling into `Model.full_clean()`. + +These classes are documented in the [Validators](../api-guide/validators.md) section of the documentation. ## Generic views @@ -731,7 +745,34 @@ This makes it far easier to use a different style for `OPTIONS` responses throug ## Serializers as HTML forms -**TODO: Document this.** +REST framework 3.0 includes templated HTML form rendering for serializers. + +This API should not yet be considered finalized, and will only be promoted to public API for the 3.1 release. + +Significant changes that you do need to be aware of include: + +* Nested HTML forms are now supported, for example, a `UserSerializer` with a nested `ProfileSerializer` will now render a nested `fieldset` when used in the browsable API. +* Nested lists of HTML forms are not yet supported, but are planned for 3.1. +* Because we now use templated HTML form generation, **the `widget` option is no longer available for serializer fields**. You can instead control the template that is used for a given field, by using the `style` dictionary. + +#### The `style` keyword argument for serializer fields. + +The `style` keyword argument can be used to pass through additional information from a serializer field, to the renderer class. In particular, the `HTMLFormRenderer` uses the `base_template` key to determine which template to render the field with. + +For example, to use a `textarea` control instead of the default `input` control, you would use the following… + + additional_notes = serializers.CharField( + style={'base_template': 'text_area.html'} + ) + +Similarly, to use a radio button control instead of the default `select` control, you would use the following… + + color_channel = serializers.ChoiceField( + choices=['red', 'blue', 'green'], + style={'base_template': 'radio.html'} + ) + +This API should be considered provisional, and there may be minor alterations with the incoming 3.1 release. ## API style From 1aa58d16be0e96c7337b1d6bef928c9542c72741 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 20 Nov 2014 14:26:40 +0000 Subject: [PATCH 1089/1652] Py3 fix - .items is not a list. --- rest_framework/renderers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 8717137af..a9885d3e0 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -562,7 +562,7 @@ class BrowsableAPIRenderer(BaseRenderer): serializer.data, self.accepted_media_type, dict( - self.renderer_context.items() + + list(self.renderer_context.items()) + [('template', 'rest_framework/api_form.html')] ) ) From 5b671cb515cf49bc0335bdaa7ca0759827eb844d Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 20 Nov 2014 16:14:51 +0000 Subject: [PATCH 1090/1652] Fix rendering HTML form when API error raised. Closes #2103. --- rest_framework/renderers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index a9885d3e0..e87d16d0d 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -525,7 +525,10 @@ class BrowsableAPIRenderer(BaseRenderer): else: instance = None - if request.method == method: + # If this is valid serializer data, and the form is for the same + # HTTP method as was used in the request then use the existing + # serializer instance, rather than dynamically creating a new one. + if request.method == method and serializer is not None: try: data = request.data except ParseError: From 8e940a22fb292ed6b20b9e4b5da607ffca1dba2f Mon Sep 17 00:00:00 2001 From: Matthew Dapena-Tretter <m@tthewwithanm.com> Date: Fri, 21 Nov 2014 15:58:31 -0500 Subject: [PATCH 1091/1652] Clarify how permission classes are composed all/every/AND or any/OR? all/every/AND! --- docs/api-guide/settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 48af30a52..96d715ea2 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -74,7 +74,7 @@ Default: #### DEFAULT_PERMISSION_CLASSES -A list or tuple of permission classes, that determines the default set of permissions checked at the start of a view. +A list or tuple of permission classes, that determines the default set of permissions checked at the start of a view. Permission must be granted by every class in the list. Default: From fe9a758d7e0db90be7fe5878d1617444c2465391 Mon Sep 17 00:00:00 2001 From: Andreas Bernacca <andreas@agoodid.se> Date: Fri, 21 Nov 2014 22:15:43 +0100 Subject: [PATCH 1092/1652] remove sponsored by dabapps --- rest_framework/templates/rest_framework/base.html | 1 - 1 file changed, 1 deletion(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index e9d99a659..a2bd8cd57 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -240,7 +240,6 @@ <footer> {% block footer %} - <p>Sponsored by <a href="http://dabapps.com/">DabApps</a>.</p> {% endblock %} </footer> From 2ec0e7417f7e64a40062266f535778435fd3f9ba Mon Sep 17 00:00:00 2001 From: Andreas Bernacca <andreas@agoodid.se> Date: Fri, 21 Nov 2014 22:45:28 +0100 Subject: [PATCH 1093/1652] removed the whole footer section --- rest_framework/templates/rest_framework/base.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index a2bd8cd57..e96681932 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -237,12 +237,6 @@ </div> <!-- END Content --> </div><!-- /.container --> - - <footer> - {% block footer %} - {% endblock %} - </footer> - </div><!-- ./wrapper --> {% block script %} From c94d1e6d3ea76eb8bdd28717364e42d14e6722d7 Mon Sep 17 00:00:00 2001 From: Tony Nguyen <hgiasac@gmail.com> Date: Sun, 23 Nov 2014 22:40:40 +0700 Subject: [PATCH 1094/1652] Fix typo "serailizers" to "serializers" --- docs/topics/3.0-announcement.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 7bbfba5ba..694ad8a5c 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -189,13 +189,13 @@ You can either return `non_field_errors` from the validate method by raising a s def validate(self, attrs): # serializer.errors == {'non_field_errors': ['A non field error']} - raise serailizers.ValidationError('A non field error') + raise serializers.ValidationError('A non field error') Alternatively if you want the errors to be against a specific field, use a dictionary of when instantiating the `ValidationError`, like so: def validate(self, attrs): # serializer.errors == {'my_field': ['A field error']} - raise serailizers.ValidationError({'my_field': 'A field error'}) + raise serializers.ValidationError({'my_field': 'A field error'}) This ensures you can still write validation that compares all the input fields, but that marks the error against a particular field. @@ -303,7 +303,7 @@ Alternatively, specify the field explicitly on the serializer class: model = MyModel fields = ('id', 'email', 'notes', 'is_admin') -The `read_only_fields` option remains as a convenient shortcut for the more common case. +The `read_only_fields` option remains as a convenient shortcut for the more common case. #### Changes to `HyperlinkedModelSerializer`. @@ -364,7 +364,7 @@ The `ListSerializer` class has now been added, and allows you to create base ser class MultipleUserSerializer(ListSerializer): child = UserSerializer() -You can also still use the `many=True` argument to serializer classes. It's worth noting that `many=True` argument transparently creates a `ListSerializer` instance, allowing the validation logic for list and non-list data to be cleanly separated in the REST framework codebase. +You can also still use the `many=True` argument to serializer classes. It's worth noting that `many=True` argument transparently creates a `ListSerializer` instance, allowing the validation logic for list and non-list data to be cleanly separated in the REST framework codebase. You will typically want to *continue to use the existing `many=True` flag* rather than declaring `ListSerializer` classes explicitly, but declaring the classes explicitly can be useful if you need to write custom `create` or `update` methods for bulk updates, or provide for other custom behavior. @@ -436,7 +436,7 @@ Here's a complete example of our previous `HighScoreSerializer`, that's been upd def to_internal_value(self, data): score = data.get('score') player_name = data.get('player_name') - + # Perform the data validation. if not score: raise ValidationError({ @@ -450,7 +450,7 @@ Here's a complete example of our previous `HighScoreSerializer`, that's been upd raise ValidationError({ 'player_name': 'May not be more than 10 characters.' }) - + # Return the validated values. This will be available as # the `.validated_data` property. return { @@ -463,7 +463,7 @@ Here's a complete example of our previous `HighScoreSerializer`, that's been upd 'score': obj.score, 'player_name': obj.player_name } - + def create(self, validated_data): return HighScore.objects.create(**validated_data) @@ -471,7 +471,7 @@ Here's a complete example of our previous `HighScoreSerializer`, that's been upd The `BaseSerializer` class is also useful if you want to implement new generic serializer classes for dealing with particular serialization styles, or for integrating with alternative storage backends. -The following class is an example of a generic serializer that can handle coercing aribitrary objects into primitive representations. +The following class is an example of a generic serializer that can handle coercing aribitrary objects into primitive representations. class ObjectSerializer(serializers.BaseSerializer): """ @@ -542,7 +542,7 @@ The `default` argument is also available and always implies that the field is no #### Coercing output types. -The previous field implementations did not forcibly coerce returned values into the correct type in many cases. For example, an `IntegerField` would return a string output if the attribute value was a string. We now more strictly coerce to the correct return type, leading to more constrained and expected behavior. +The previous field implementations did not forcibly coerce returned values into the correct type in many cases. For example, an `IntegerField` would return a string output if the attribute value was a string. We now more strictly coerce to the correct return type, leading to more constrained and expected behavior. #### The `ListField` class. @@ -695,7 +695,7 @@ These classes are documented in the [Validators](../api-guide/validators.md) sec The view logic for the default method handlers has been significantly simplified, due to the new serializers API. -#### Changes to pre/post save hooks. +#### Changes to pre/post save hooks. The `pre_save` and `post_save` hooks no longer exist, but are replaced with `perform_create(self, serializer)` and `perform_update(self, serializer)`. @@ -887,4 +887,4 @@ The 3.2 release is planned to introduce an alternative admin-style interface to You can follow development on the GitHub site, where we use [milestones to indicate planning timescales](https://github.com/tomchristie/django-rest-framework/milestones). -[mixins.py]: https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/mixins.py \ No newline at end of file +[mixins.py]: https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/mixins.py From 790a651893c4bc6e68bc4d724d5df4ea3f883ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gil=20Gon=C3=A7alves?= <lursty@gmail.com> Date: Mon, 24 Nov 2014 08:51:08 +0000 Subject: [PATCH 1095/1652] Fixed database update instructions --- docs/tutorial/4-authentication-and-permissions.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index adab1b55a..4e4edeeac 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -44,7 +44,9 @@ When that's all done we'll need to update our database tables. Normally we'd create a database migration in order to do that, but for the purposes of this tutorial, let's just delete the database and start again. rm tmp.db - python manage.py syncdb + rm -r snippets/migrations + python manage.py makemigrations snippets + python manage.py migrate You might also want to create a few different users, to use for testing the API. The quickest way to do this will be with the `createsuperuser` command. From 918b9cc6a605ee4701d77f73e93a62f04c2345b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gil=20Gon=C3=A7alves?= <lursty@gmail.com> Date: Mon, 24 Nov 2014 08:54:07 +0000 Subject: [PATCH 1096/1652] Added missing import in tutorial snippet --- docs/tutorial/6-viewsets-and-routers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index cf37a2601..3fad509a1 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -60,7 +60,7 @@ To see what's going on under the hood let's first explicitly create a set of vie In the `urls.py` file we bind our `ViewSet` classes into a set of concrete views. - from snippets.views import SnippetViewSet, UserViewSet + from snippets.views import SnippetViewSet, UserViewSet, api_root from rest_framework import renderers snippet_list = SnippetViewSet.as_view({ From bdacb6624484209fb008293a9dc40c06a439ef71 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 25 Nov 2014 08:59:45 +0000 Subject: [PATCH 1097/1652] Lowercase HTML label tag. Refs #2121. --- rest_framework/templates/rest_framework/login_base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html index 8ab682ac8..c688cc28e 100644 --- a/rest_framework/templates/rest_framework/login_base.html +++ b/rest_framework/templates/rest_framework/login_base.html @@ -22,7 +22,7 @@ <div id="div_id_username" class="clearfix control-group {% if form.username.errors %}error{% endif %}"> <div class="controls"> - <Label class="span4">Username:</label> + <label class="span4">Username:</label> <input style="height: 25px" type="text" name="username" maxlength="100" autocapitalize="off" autocorrect="off" class="span12 textinput textInput" @@ -38,7 +38,7 @@ <div id="div_id_password" class="clearfix control-group {% if form.password.errors %}error{% endif %}"> <div class="controls"> - <Label class="span4">Password:</label> + <label class="span4">Password:</label> <input style="height: 25px" type="password" name="password" maxlength="100" autocapitalize="off" autocorrect="off" class="span12 textinput textInput" id="id_password" required> From ecc26f6cb1e8b1f1a4cd72cf980b750aeed65cf7 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 25 Nov 2014 09:07:25 +0000 Subject: [PATCH 1098/1652] Style tweaks to login template. --- rest_framework/templates/rest_framework/login_base.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html index c688cc28e..e050cbdc4 100644 --- a/rest_framework/templates/rest_framework/login_base.html +++ b/rest_framework/templates/rest_framework/login_base.html @@ -36,7 +36,8 @@ </div> </div> <div id="div_id_password" - class="clearfix control-group {% if form.password.errors %}error{% endif %}"> + class="clearfix control-group {% if form.password.errors %}error{% endif %}" + style="margin-top: 10px"> <div class="controls"> <label class="span4">Password:</label> <input style="height: 25px" type="password" name="password" maxlength="100" @@ -55,7 +56,7 @@ <div class="well well-small text-error" style="border: none">{{ error }}</div> {% endfor %} {% endif %} - <div class="form-actions-no-box"> + <div class="form-actions-no-box" style="margin-top: 20px"> <input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit"> </div> </form> From 585054f0120b9c73c8158a92466f8959ff7f932e Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Tue, 25 Nov 2014 10:57:46 +0100 Subject: [PATCH 1099/1652] Streamlined tox config with 1.8 features --- tox.ini | 193 +++++++------------------------------------------------- 1 file changed, 22 insertions(+), 171 deletions(-) diff --git a/tox.ini b/tox.ini index 493712a1b..b6d94678e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,181 +1,32 @@ [tox] -downloadcache = {toxworkdir}/cache/ envlist = - flake8, - py3.4-django1.7,py3.3-django1.7,py3.2-django1.7,py2.7-django1.7, - py3.4-django1.6,py3.3-django1.6,py3.2-django1.6,py2.7-django1.6,py2.6-django1.6, - py3.4-django1.5,py3.3-django1.5,py3.2-django1.5,py2.7-django1.5,py2.6-django1.5, - py2.7-django1.4,py2.6-django1.4, - py3.4-djangomaster,py3.3-djangomaster,py2.7-djangomaster + py27-flake8, + {py26,py27}-django1.4, + {py26,py27,py32,py33,py34}-django{1.5,1.6}, + {py27,py32,py33,py34}-django1.7, + {py27,py33,py34}-djangomaster [testenv] commands = ./runtests.py --fast setenv = PYTHONDONTWRITEBYTECODE=1 +deps = + django1.4: django==1.4.11 + django1.5: django==1.5.6 + django1.6: Django==1.6.3 + django1.7: Django==1.7 + djangomaster: https://github.com/django/django/zipball/master + {py26,py27}-django{1.4,1.5,1.6,1.7}: django-guardian==1.2.3 + {py26,py27}-django{1.4,1.5,1.6}: oauth2==1.5.211 + {py26,py27}-django{1.4,1.5,1.6}: django-oauth-plus==2.2.1 + {py26,py27}-django{1.4,1.5}: django-oauth2-provider==0.2.3 + {py26,py27}-django1.6: django-oauth2-provider==0.2.4 + pytest-django==2.6.1 + django-filter==0.7 + defusedxml==0.3 -[testenv:flake8] -basepython = python2.7 -deps = pytest==2.5.2 +[testenv:py27-flake8] +deps = + pytest==2.5.2 flake8==2.2.2 commands = ./runtests.py --lintonly - -[testenv:py3.4-django1.7] -basepython = python3.4 -deps = Django==1.7 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py3.3-django1.7] -basepython = python3.3 -deps = Django==1.7 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py3.2-django1.7] -basepython = python3.2 -deps = Django==1.7 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py2.7-django1.7] -basepython = python2.7 -deps = Django==1.7 - django-filter==0.7 - defusedxml==0.3 - # django-oauth-plus==2.2.1 - # oauth2==1.5.211 - # django-oauth2-provider==0.2.4 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py3.4-django1.6] -basepython = python3.4 -deps = Django==1.6.3 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py3.3-django1.6] -basepython = python3.3 -deps = Django==1.6.3 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py3.2-django1.6] -basepython = python3.2 -deps = Django==1.6.3 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py2.7-django1.6] -basepython = python2.7 -deps = Django==1.6.3 - django-filter==0.7 - defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.4 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py2.6-django1.6] -basepython = python2.6 -deps = Django==1.6.3 - django-filter==0.7 - defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.4 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py3.4-django1.5] -basepython = python3.4 -deps = django==1.5.6 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py3.3-django1.5] -basepython = python3.3 -deps = django==1.5.6 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py3.2-django1.5] -basepython = python3.2 -deps = django==1.5.6 - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py2.7-django1.5] -basepython = python2.7 -deps = django==1.5.6 - django-filter==0.7 - defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py2.6-django1.5] -basepython = python2.6 -deps = django==1.5.6 - django-filter==0.7 - defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py2.7-django1.4] -basepython = python2.7 -deps = django==1.4.11 - django-filter==0.7 - defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py2.6-django1.4] -basepython = python2.6 -deps = django==1.4.11 - django-filter==0.7 - defusedxml==0.3 - django-oauth-plus==2.2.1 - oauth2==1.5.211 - django-oauth2-provider==0.2.3 - django-guardian==1.2.3 - pytest-django==2.6.1 - -[testenv:py3.4-djangomaster] -basepython = python3.4 -deps = https://github.com/django/django/zipball/master - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py3.3-djangomaster] -basepython = python3.3 -deps = https://github.com/django/django/zipball/master - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 - -[testenv:py2.7-djangomaster] -basepython = python3.2 -deps = https://github.com/django/django/zipball/master - django-filter==0.7 - defusedxml==0.3 - pytest-django==2.6.1 From 1fcb495456bebf56b820c89951af285a45383d6f Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Tue, 25 Nov 2014 10:58:03 +0100 Subject: [PATCH 1100/1652] Updated travis config --- .travis.yml | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b2e47383..e19efdba5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,40 +1,38 @@ language: python -python: 2.7 - sudo: false env: - - TOX_ENV=flake8 - - TOX_ENV=py3.4-django1.7 - - TOX_ENV=py3.3-django1.7 - - TOX_ENV=py3.2-django1.7 - - TOX_ENV=py2.7-django1.7 - - TOX_ENV=py3.4-django1.6 - - TOX_ENV=py3.3-django1.6 - - TOX_ENV=py3.2-django1.6 - - TOX_ENV=py2.7-django1.6 - - TOX_ENV=py2.6-django1.6 - - TOX_ENV=py3.4-django1.5 - - TOX_ENV=py3.3-django1.5 - - TOX_ENV=py3.2-django1.5 - - TOX_ENV=py2.7-django1.5 - - TOX_ENV=py2.6-django1.5 - - TOX_ENV=py2.7-django1.4 - - TOX_ENV=py2.6-django1.4 - - TOX_ENV=py3.4-djangomaster - - TOX_ENV=py3.3-djangomaster - - TOX_ENV=py2.7-djangomaster + - TOX_ENV=py27-flake8 + - TOX_ENV=py34-django1.7 + - TOX_ENV=py33-django1.7 + - TOX_ENV=py32-django1.7 + - TOX_ENV=py27-django1.7 + - TOX_ENV=py34-django1.6 + - TOX_ENV=py33-django1.6 + - TOX_ENV=py32-django1.6 + - TOX_ENV=py27-django1.6 + - TOX_ENV=py26-django1.6 + - TOX_ENV=py34-django1.5 + - TOX_ENV=py33-django1.5 + - TOX_ENV=py32-django1.5 + - TOX_ENV=py27-django1.5 + - TOX_ENV=py26-django1.5 + - TOX_ENV=py27-django1.4 + - TOX_ENV=py26-django1.4 + - TOX_ENV=py34-djangomaster + - TOX_ENV=py33-djangomaster + - TOX_ENV=py27-djangomaster matrix: fast_finish: true allow_failures: - - env: TOX_ENV=py3.4-djangomaster - - env: TOX_ENV=py3.3-djangomaster - - env: TOX_ENV=py2.7-djangomaster + - env: TOX_ENV=py34-djangomaster + - env: TOX_ENV=py33-djangomaster + - env: TOX_ENV=py27-djangomaster install: - - "pip install tox --download-cache $HOME/.pip-cache" + - pip install tox script: - tox -e $TOX_ENV From b6de2660eaa19dbd656215f47b6d24a5cc8bb5b3 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Tue, 25 Nov 2014 11:09:36 +0100 Subject: [PATCH 1101/1652] Added python 3.2 to test against django master . Related to #2075. --- .travis.yml | 2 ++ tox.ini | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e19efdba5..2791df6e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ env: - TOX_ENV=py26-django1.4 - TOX_ENV=py34-djangomaster - TOX_ENV=py33-djangomaster + - TOX_ENV=py32-djangomaster - TOX_ENV=py27-djangomaster matrix: @@ -29,6 +30,7 @@ matrix: allow_failures: - env: TOX_ENV=py34-djangomaster - env: TOX_ENV=py33-djangomaster + - env: TOX_ENV=py32-djangomaster - env: TOX_ENV=py27-djangomaster install: diff --git a/tox.ini b/tox.ini index b6d94678e..b1e03580e 100644 --- a/tox.ini +++ b/tox.ini @@ -3,8 +3,7 @@ envlist = py27-flake8, {py26,py27}-django1.4, {py26,py27,py32,py33,py34}-django{1.5,1.6}, - {py27,py32,py33,py34}-django1.7, - {py27,py33,py34}-djangomaster + {py27,py32,py33,py34}-django{1.7,master} [testenv] commands = ./runtests.py --fast From 9c58dfec4e6865a5296d0913be907a20f712f0d3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 25 Nov 2014 10:34:21 +0000 Subject: [PATCH 1102/1652] Fix shoddy test case --- tests/test_authentication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 32041f9c1..28c3a8b35 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -142,7 +142,7 @@ class SessionAuthTests(TestCase): cf. [#1810](https://github.com/tomchristie/django-rest-framework/pull/1810) """ response = self.csrf_client.get('/auth/login/') - self.assertContains(response, '<Label class="span4">Username:</label>') + self.assertContains(response, '<label class="span4">Username:</label>') def test_post_form_session_auth_failing_csrf(self): """ From fd980be39be7f09d4cf0ceb16688ad0157d4df35 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 25 Nov 2014 10:39:58 +0000 Subject: [PATCH 1103/1652] Documentation in 'many_init' docstring. Refs #2120. --- rest_framework/serializers.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 2d5c843e5..00362dbb4 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -86,6 +86,15 @@ class BaseSerializer(Field): class when `many=True` is used. You can customize it if you need to control which keyword arguments are passed to the parent, and which are passed to the child. + + Note that we're over-cautious in passing most arguments to both parent + and child classes in order to try to cover the general case. If you're + overriding this method you'll probably want something much simpler, eg: + + @classmethod + def many_init(cls, *args, **kwargs): + kwargs['child'] = cls() + return CustomListSerializer(*args, **kwargs) """ child_serializer = cls(*args, **kwargs) list_kwargs = {'child': child_serializer} From c559ec6da8f983e34ca9a4183e5f632124d77cbc Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Tue, 25 Nov 2014 12:03:54 +0100 Subject: [PATCH 1104/1652] Removed dots in Django versions in tox. Refs #2124. --- .travis.yml | 32 ++++++++++++++++---------------- tox.ini | 24 ++++++++++++------------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2791df6e6..9dd587be9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,22 +4,22 @@ sudo: false env: - TOX_ENV=py27-flake8 - - TOX_ENV=py34-django1.7 - - TOX_ENV=py33-django1.7 - - TOX_ENV=py32-django1.7 - - TOX_ENV=py27-django1.7 - - TOX_ENV=py34-django1.6 - - TOX_ENV=py33-django1.6 - - TOX_ENV=py32-django1.6 - - TOX_ENV=py27-django1.6 - - TOX_ENV=py26-django1.6 - - TOX_ENV=py34-django1.5 - - TOX_ENV=py33-django1.5 - - TOX_ENV=py32-django1.5 - - TOX_ENV=py27-django1.5 - - TOX_ENV=py26-django1.5 - - TOX_ENV=py27-django1.4 - - TOX_ENV=py26-django1.4 + - TOX_ENV=py34-django17 + - TOX_ENV=py33-django17 + - TOX_ENV=py32-django17 + - TOX_ENV=py27-django17 + - TOX_ENV=py34-django16 + - TOX_ENV=py33-django16 + - TOX_ENV=py32-django16 + - TOX_ENV=py27-django16 + - TOX_ENV=py26-django16 + - TOX_ENV=py34-django15 + - TOX_ENV=py33-django15 + - TOX_ENV=py32-django15 + - TOX_ENV=py27-django15 + - TOX_ENV=py26-django15 + - TOX_ENV=py27-django14 + - TOX_ENV=py26-django14 - TOX_ENV=py34-djangomaster - TOX_ENV=py33-djangomaster - TOX_ENV=py32-djangomaster diff --git a/tox.ini b/tox.ini index b1e03580e..a7200a3f3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,25 +1,25 @@ [tox] envlist = py27-flake8, - {py26,py27}-django1.4, - {py26,py27,py32,py33,py34}-django{1.5,1.6}, - {py27,py32,py33,py34}-django{1.7,master} + {py26,py27}-django14, + {py26,py27,py32,py33,py34}-django{15,16}, + {py27,py32,py33,py34}-django{17,master} [testenv] commands = ./runtests.py --fast setenv = PYTHONDONTWRITEBYTECODE=1 deps = - django1.4: django==1.4.11 - django1.5: django==1.5.6 - django1.6: Django==1.6.3 - django1.7: Django==1.7 + django14: django==1.4.11 + django15: django==1.5.6 + django16: Django==1.6.3 + django17: Django==1.7 djangomaster: https://github.com/django/django/zipball/master - {py26,py27}-django{1.4,1.5,1.6,1.7}: django-guardian==1.2.3 - {py26,py27}-django{1.4,1.5,1.6}: oauth2==1.5.211 - {py26,py27}-django{1.4,1.5,1.6}: django-oauth-plus==2.2.1 - {py26,py27}-django{1.4,1.5}: django-oauth2-provider==0.2.3 - {py26,py27}-django1.6: django-oauth2-provider==0.2.4 + {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 + {py26,py27}-django{14,15,16}: oauth2==1.5.211 + {py26,py27}-django{14,15,16}: django-oauth-plus==2.2.1 + {py26,py27}-django{14,15}: django-oauth2-provider==0.2.3 + {py26,py27}-django16: django-oauth2-provider==0.2.4 pytest-django==2.6.1 django-filter==0.7 defusedxml==0.3 From 06fd63dade20e1a19276b7414a54b9f5d2ef8329 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 25 Nov 2014 11:14:28 +0000 Subject: [PATCH 1105/1652] Don't use default_empty_html value for partial updates. Closes #2118. --- rest_framework/fields.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 778bc7187..3cf348865 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -262,7 +262,11 @@ class Field(object): if html.is_html_input(dictionary): # HTML forms will represent empty fields as '', and cannot # represent None or False values directly. - ret = dictionary.get(self.field_name, '') + if self.field_name not in dictionary: + if getattr(self.root, 'partial', False): + return empty + return self.default_empty_html + ret = dictionary[self.field_name] return self.default_empty_html if (ret == '') else ret return dictionary.get(self.field_name, empty) From 83e556ba1e129fac28a74b0a2784e4728f491a41 Mon Sep 17 00:00:00 2001 From: Marc <marctc@gmail.com> Date: Tue, 25 Nov 2014 12:37:20 +0100 Subject: [PATCH 1106/1652] Missing quotes on validate_score example --- docs/topics/3.0-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 694ad8a5c..6a662326b 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -170,7 +170,7 @@ We strongly recommend that you use the namespaced import style of `import serial The `validate_<field_name>` method hooks that can be attached to serializer classes change their signature slightly and return type. Previously these would take a dictionary of all incoming data, and a key representing the field name, and would return a dictionary including the validated data for that field: def validate_score(self, attrs, source): - if attrs[score] % 10 != 0: + if attrs['score'] % 10 != 0: raise serializers.ValidationError('This field should be a multiple of ten.') return attrs From 2e726e22a394347b7337eb38a2a3a1b0ccde88bc Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 25 Nov 2014 11:42:43 +0000 Subject: [PATCH 1107/1652] request.DATA, request.FILES -> request.data --- docs/api-guide/exceptions.md | 4 ++-- docs/api-guide/parsers.md | 20 ++++++++++---------- docs/api-guide/requests.md | 21 ++++++++++++--------- docs/api-guide/settings.md | 2 +- docs/api-guide/viewsets.md | 2 +- docs/tutorial/2-requests-and-responses.md | 12 ++++++------ docs/tutorial/3-class-based-views.md | 4 ++-- rest_framework/request.py | 2 +- 8 files changed, 35 insertions(+), 32 deletions(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index e61dcfa90..8a99abb9d 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -100,7 +100,7 @@ For example, if your API relies on a third party service that may sometimes be u **Signature:** `ParseError(detail=None)` -Raised if the request contains malformed data when accessing `request.DATA` or `request.FILES`. +Raised if the request contains malformed data when accessing `request.data`. By default this exception results in a response with the HTTP status code "400 Bad Request". @@ -140,7 +140,7 @@ By default this exception results in a response with the HTTP status code "405 M **Signature:** `UnsupportedMediaType(media_type, detail=None)` -Raised if there are no parsers that can handle the content type of the request data when accessing `request.DATA` or `request.FILES`. +Raised if there are no parsers that can handle the content type of the request data when accessing `request.data`. By default this exception results in a response with the HTTP status code "415 Unsupported Media Type". diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index 72a4af643..a50b52408 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -12,7 +12,7 @@ REST framework includes a number of built in Parser classes, that allow you to a ## How the parser is determined -The set of valid parsers for a view is always defined as a list of classes. When either `request.DATA` or `request.FILES` is accessed, REST framework will examine the `Content-Type` header on the incoming request, and determine which parser to use to parse the request content. +The set of valid parsers for a view is always defined as a list of classes. When `request.data` is accessed, REST framework will examine the `Content-Type` header on the incoming request, and determine which parser to use to parse the request content. --- @@ -48,7 +48,7 @@ using the `APIView` class based views. parser_classes = (YAMLParser,) def post(self, request, format=None): - return Response({'received data': request.DATA}) + return Response({'received data': request.data}) Or, if you're using the `@api_view` decorator with function based views. @@ -58,7 +58,7 @@ Or, if you're using the `@api_view` decorator with function based views. """ A view that can accept POST requests with YAML content. """ - return Response({'received data': request.DATA}) + return Response({'received data': request.data}) --- @@ -92,7 +92,7 @@ Requires the `defusedxml` package to be installed. ## FormParser -Parses HTML form content. `request.DATA` will be populated with a `QueryDict` of data, `request.FILES` will be populated with an empty `QueryDict` of data. +Parses HTML form content. `request.data` will be populated with a `QueryDict` of data. You will typically want to use both `FormParser` and `MultiPartParser` together in order to fully support HTML form data. @@ -100,7 +100,7 @@ You will typically want to use both `FormParser` and `MultiPartParser` together ## MultiPartParser -Parses multipart HTML form content, which supports file uploads. Both `request.DATA` and `request.FILES` will be populated with a `QueryDict`. +Parses multipart HTML form content, which supports file uploads. Both `request.data` will be populated with a `QueryDict`. You will typically want to use both `FormParser` and `MultiPartParser` together in order to fully support HTML form data. @@ -108,7 +108,7 @@ You will typically want to use both `FormParser` and `MultiPartParser` together ## FileUploadParser -Parses raw file upload content. The `request.DATA` property will be an empty `QueryDict`, and `request.FILES` will be a dictionary with a single key `'file'` containing the uploaded file. +Parses raw file upload content. The `request.data` property will be a dictionary with a single key `'file'` containing the uploaded file. If the view used with `FileUploadParser` is called with a `filename` URL keyword argument, then that argument will be used as the filename. If it is called without a `filename` URL keyword argument, then the client must set the filename in the `Content-Disposition` HTTP header. For example `Content-Disposition: attachment; filename=upload.jpg`. @@ -126,7 +126,7 @@ If the view used with `FileUploadParser` is called with a `filename` URL keyword parser_classes = (FileUploadParser,) def put(self, request, filename, format=None): - file_obj = request.FILES['file'] + file_obj = request.data['file'] # ... # do some staff with uploaded file # ... @@ -139,7 +139,7 @@ If the view used with `FileUploadParser` is called with a `filename` URL keyword To implement a custom parser, you should override `BaseParser`, set the `.media_type` property, and implement the `.parse(self, stream, media_type, parser_context)` method. -The method should return the data that will be used to populate the `request.DATA` property. +The method should return the data that will be used to populate the `request.data` property. The arguments passed to `.parse()` are: @@ -161,7 +161,7 @@ By default this will include the following keys: `view`, `request`, `args`, `kwa ## Example -The following is an example plaintext parser that will populate the `request.DATA` property with a string representing the body of the request. +The following is an example plaintext parser that will populate the `request.data` property with a string representing the body of the request. class PlainTextParser(BaseParser): """ @@ -197,4 +197,4 @@ The following third party packages are also available. [juanriaza]: https://github.com/juanriaza [vbabiy]: https://github.com/vbabiy [djangorestframework-msgpack]: https://github.com/juanriaza/django-rest-framework-msgpack -[djangorestframework-camel-case]: https://github.com/vbabiy/djangorestframework-camel-case \ No newline at end of file +[djangorestframework-camel-case]: https://github.com/vbabiy/djangorestframework-camel-case diff --git a/docs/api-guide/requests.md b/docs/api-guide/requests.md index 87425ed1b..d659e17a0 100644 --- a/docs/api-guide/requests.md +++ b/docs/api-guide/requests.md @@ -14,26 +14,29 @@ REST framework's `Request` class extends the standard `HttpRequest`, adding supp REST framework's Request objects provide flexible request parsing that allows you to treat requests with JSON data or other media types in the same way that you would normally deal with form data. -## .DATA +## .data -`request.DATA` returns the parsed content of the request body. This is similar to the standard `request.POST` attribute except that: +`request.data` returns the parsed content of the request body. This is similar to the standard `request.POST` and `request.FILES` attributes except that: +* It includes all parsed content, including *file and non-file* inputs. * It supports parsing the content of HTTP methods other than `POST`, meaning that you can access the content of `PUT` and `PATCH` requests. * It supports REST framework's flexible request parsing, rather than just supporting form data. For example you can handle incoming JSON data in the same way that you handle incoming form data. For more details see the [parsers documentation]. -## .FILES +## .query_params -`request.FILES` returns any uploaded files that may be present in the content of the request body. This is the same as the standard `HttpRequest` behavior, except that the same flexible request parsing is used for `request.DATA`. +`request.query_params` is a more correctly named synonym for `request.GET`. -For more details see the [parsers documentation]. +For clarity inside your code, we recommend using `request.query_params` instead of the Django's standard `request.GET`. Doing so will help keep your codebase more correct and obvious - any HTTP method type may include query parameters, not just `GET` requests. + +## .DATA and .FILES + +The old-style version 2.x `request.data` and `request.FILES` attributes are still available, but are now pending deprecation in favor of the unified `request.data` attribute. ## .QUERY_PARAMS -`request.QUERY_PARAMS` is a more correctly named synonym for `request.GET`. - -For clarity inside your code, we recommend using `request.QUERY_PARAMS` instead of the usual `request.GET`, as *any* HTTP method type may include query parameters. +The old-style version 2.x `request.QUERY_PARAMS` attribute is still available, but is now pending deprecation in favor of the more pythonic `request.query_params`. ## .parsers @@ -43,7 +46,7 @@ You won't typically need to access this property. --- -**Note:** If a client sends malformed content, then accessing `request.DATA` or `request.FILES` may raise a `ParseError`. By default REST framework's `APIView` class or `@api_view` decorator will catch the error and return a `400 Bad Request` response. +**Note:** If a client sends malformed content, then accessing `request.data` may raise a `ParseError`. By default REST framework's `APIView` class or `@api_view` decorator will catch the error and return a `400 Bad Request` response. If a client sends a request with a content-type that cannot be parsed then a `UnsupportedMediaType` exception will be raised, which by default will be caught and return a `415 Unsupported Media Type` response. diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 96d715ea2..ba470f8bb 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -51,7 +51,7 @@ Default: #### DEFAULT_PARSER_CLASSES -A list or tuple of parser classes, that determines the default set of parsers used when accessing the `request.DATA` property. +A list or tuple of parser classes, that determines the default set of parsers used when accessing the `request.data` property. Default: diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 9030e3ee0..f60d4a47f 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -124,7 +124,7 @@ For example: @detail_route(methods=['post']) def set_password(self, request, pk=None): user = self.get_object() - serializer = PasswordSerializer(data=request.DATA) + serializer = PasswordSerializer(data=request.data) if serializer.is_valid(): user.set_password(serializer.data['password']) user.save() diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 136b01351..f377c7122 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -5,10 +5,10 @@ Let's introduce a couple of essential building blocks. ## Request objects -REST framework introduces a `Request` object that extends the regular `HttpRequest`, and provides more flexible request parsing. The core functionality of the `Request` object is the `request.DATA` attribute, which is similar to `request.POST`, but more useful for working with Web APIs. +REST framework introduces a `Request` object that extends the regular `HttpRequest`, and provides more flexible request parsing. The core functionality of the `Request` object is the `request.data` attribute, which is similar to `request.POST`, but more useful for working with Web APIs. request.POST # Only handles form data. Only works for 'POST' method. - request.DATA # Handles arbitrary data. Works for 'POST', 'PUT' and 'PATCH' methods. + request.data # Handles arbitrary data. Works for 'POST', 'PUT' and 'PATCH' methods. ## Response objects @@ -29,7 +29,7 @@ REST framework provides two wrappers you can use to write API views. These wrappers provide a few bits of functionality such as making sure you receive `Request` instances in your view, and adding context to `Response` objects so that content negotiation can be performed. -The wrappers also provide behaviour such as returning `405 Method Not Allowed` responses when appropriate, and handling any `ParseError` exception that occurs when accessing `request.DATA` with malformed input. +The wrappers also provide behaviour such as returning `405 Method Not Allowed` responses when appropriate, and handling any `ParseError` exception that occurs when accessing `request.data` with malformed input. ## Pulling it all together @@ -55,7 +55,7 @@ We don't need our `JSONResponse` class in `views.py` anymore, so go ahead and de return Response(serializer.data) elif request.method == 'POST': - serializer = SnippetSerializer(data=request.DATA) + serializer = SnippetSerializer(data=request.data) if serializer.is_valid(): serializer.save() return Response(serializer.data, status=status.HTTP_201_CREATED) @@ -80,7 +80,7 @@ Here is the view for an individual snippet, in the `views.py` module. return Response(serializer.data) elif request.method == 'PUT': - serializer = SnippetSerializer(snippet, data=request.DATA) + serializer = SnippetSerializer(snippet, data=request.data) if serializer.is_valid(): serializer.save() return Response(serializer.data) @@ -92,7 +92,7 @@ Here is the view for an individual snippet, in the `views.py` module. This should all feel very familiar - it is not a lot different from working with regular Django views. -Notice that we're no longer explicitly tying our requests or responses to a given content type. `request.DATA` can handle incoming `json` requests, but it can also handle `yaml` and other formats. Similarly we're returning response objects with data, but allowing REST framework to render the response into the correct content type for us. +Notice that we're no longer explicitly tying our requests or responses to a given content type. `request.data` can handle incoming `json` requests, but it can also handle `yaml` and other formats. Similarly we're returning response objects with data, but allowing REST framework to render the response into the correct content type for us. ## Adding optional format suffixes to our URLs diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md index 382f078a3..0a9ea3f15 100644 --- a/docs/tutorial/3-class-based-views.md +++ b/docs/tutorial/3-class-based-views.md @@ -24,7 +24,7 @@ We'll start by rewriting the root view as a class based view. All this involves return Response(serializer.data) def post(self, request, format=None): - serializer = SnippetSerializer(data=request.DATA) + serializer = SnippetSerializer(data=request.data) if serializer.is_valid(): serializer.save() return Response(serializer.data, status=status.HTTP_201_CREATED) @@ -49,7 +49,7 @@ So far, so good. It looks pretty similar to the previous case, but we've got be def put(self, request, pk, format=None): snippet = self.get_object(pk) - serializer = SnippetSerializer(snippet, data=request.DATA) + serializer = SnippetSerializer(snippet, data=request.data) if serializer.is_valid(): serializer.save() return Response(serializer.data) diff --git a/rest_framework/request.py b/rest_framework/request.py index 096b30424..d7e746743 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -310,7 +310,7 @@ class Request(object): def _load_data_and_files(self): """ - Parses the request content into self.DATA and self.FILES. + Parses the request content into `self.data`. """ if not _hasattr(self, '_content_type'): self._load_method_and_content_type() From a3c0c8fb90f084d494cdf46551c8a6228ca5ffd0 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 25 Nov 2014 12:04:35 +0000 Subject: [PATCH 1108/1652] Add missing period. --- docs/api-guide/generic-views.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 49a5e58f0..16ae8c554 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -352,7 +352,7 @@ You can then simply apply this mixin to a view or viewset anytime you need to ap serializer_class = UserSerializer lookup_fields = ('account', 'username') -Using custom mixins is a good option if you have custom behavior that needs to be used +Using custom mixins is a good option if you have custom behavior that needs to be used. ## Creating custom base classes From c4dff54ecc487b192d17763e48adc0bfcaa620d3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 25 Nov 2014 12:04:46 +0000 Subject: [PATCH 1109/1652] Docs on ValidationError --- docs/api-guide/exceptions.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index 8a99abb9d..33eb74c8e 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -152,5 +152,23 @@ Raised when an incoming request fails the throttling checks. By default this exception results in a response with the HTTP status code "429 Too Many Requests". +## ValidationError + +**Signature:** `ValidationError(detail)` + +The `ValidationError` exception is slightly different from the other `APIException` classes: + +* The `detail` argument is mandatory, not optional. +* The `detail` argument may be a list or dictionary of error details, and may also be a nested data structure. +* By convention you should import the serializers module and use a fully qualified `ValidationError` style, in order to differentiate it from Django's built-in validation error. For example. `raise serializers.ValidationError('This field must be an integer value.')` + +The `ValidationError` class should be used for serializer and field validation, and by validator classes. It is also raised when calling `serializer.is_valid` with the `raise_exception` keyword argument: + + serializer.is_valid(raise_exception=True) + +The generic views use the `raise_exception=True` flag, which means that you can override the style of validation error responses globally in your API. To do so, use a custom exception handler, as described above. + +By default this exception results in a response with the HTTP status code "400 Bad Request". + [cite]: http://www.doughellmann.com/articles/how-tos/python-exception-handling/index.html [authentication]: authentication.md From 83281254d1a4685535ab877fb9f9affeb93578bd Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 25 Nov 2014 12:06:27 +0000 Subject: [PATCH 1110/1652] Hypenate 'un-coerced' --- docs/topics/3.0-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 694ad8a5c..24b0923f9 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -865,7 +865,7 @@ Or modify it on an individual serializer field, using the `coerce_to_string` key coerce_to_string=False ) -The default JSON renderer will return float objects for uncoerced `Decimal` instances. This allows you to easily switch between string or float representations for decimals depending on your API design needs. +The default JSON renderer will return float objects for un-coerced `Decimal` instances. This allows you to easily switch between string or float representations for decimals depending on your API design needs. ## Miscellaneous notes. From 3b40f8c1c110ef44d112a705652b9ef57a36d9c9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 25 Nov 2014 12:15:48 +0000 Subject: [PATCH 1111/1652] Drop 0.x release notes --- docs/topics/release-notes.md | 122 ++--------------------------------- 1 file changed, 4 insertions(+), 118 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 88780c3fb..efc49ba11 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -442,7 +442,7 @@ The security vulnerabilities only affect APIs which use the `XMLParser` class, b * Bugfix: Validation errors instead of exceptions when related fields receive incorrect types. * Bugfix: Handle ObjectDoesNotExist exception when serializing null reverse one-to-one -**Note**: Prior to 2.1.16, The Decimals would render in JSON using floating point if `simplejson` was installed, but otherwise render using string notation. Now that use of `simplejson` has been deprecated, Decimals will consistently render using string notation. See [#582] for more details. +**Note**: Prior to 2.1.16, The Decimals would render in JSON using floating point if `simplejson` was installed, but otherwise render using string notation. Now that use of `simplejson` has been deprecated, Decimals will consistently render using string notation. See [ticket 582](ticket-582) for more details. ### 2.1.15 @@ -614,122 +614,7 @@ This change will not affect user code, so long as it's following the recommended * **Fix all of the things.** (Well, almost.) * For more information please see the [2.0 announcement][announcement]. ---- - -## 0.4.x series - -### 0.4.0 - -* Supports Django 1.5. -* Fixes issues with 'HEAD' method. -* Allow views to specify template used by TemplateRenderer -* More consistent error responses -* Some serializer fixes -* Fix internet explorer ajax behavior -* Minor xml and yaml fixes -* Improve setup (e.g. use staticfiles, not the defunct ADMIN_MEDIA_PREFIX) -* Sensible absolute URL generation, not using hacky set_script_prefix - ---- - -## 0.3.x series - -### 0.3.3 - -* Added DjangoModelPermissions class to support `django.contrib.auth` style permissions. -* Use `staticfiles` for css files. - - Easier to override. Won't conflict with customized admin styles (e.g. grappelli) -* Templates are now nicely namespaced. - - Allows easier overriding. -* Drop implied 'pk' filter if last arg in urlconf is unnamed. - - Too magical. Explicit is better than implicit. -* Saner template variable auto-escaping. -* Tidier setup.py -* Updated for URLObject 2.0 -* Bugfixes: - - Bug with PerUserThrottling when user contains unicode chars. - -### 0.3.2 - -* Bugfixes: - * Fix 403 for POST and PUT from the UI with UserLoggedInAuthentication (#115) - * serialize_model method in serializer.py may cause wrong value (#73) - * Fix Error when clicking OPTIONS button (#146) - * And many other fixes -* Remove short status codes - - Zen of Python: "There should be one-- and preferably only one --obvious way to do it." -* get_name, get_description become methods on the view - makes them overridable. -* Improved model mixin API - Hooks for build_query, get_instance_data, get_model, get_queryset, get_ordering - -### 0.3.1 - -* [not documented] - -### 0.3.0 - -* JSONP Support -* Bugfixes, including support for latest markdown release - ---- - -## 0.2.x series - -### 0.2.4 - -* Fix broken IsAdminUser permission. -* OPTIONS support. -* XMLParser. -* Drop mentions of Blog, BitBucket. - -### 0.2.3 - -* Fix some throttling bugs. -* ``X-Throttle`` header on throttling. -* Support for nesting resources on related models. - -### 0.2.2 - -* Throttling support complete. - -### 0.2.1 - -* Couple of simple bugfixes over 0.2.0 - -### 0.2.0 - -* Big refactoring changes since 0.1.0, ask on the discussion group if anything isn't clear. - The public API has been massively cleaned up. Expect it to be fairly stable from here on in. - -* ``Resource`` becomes decoupled into ``View`` and ``Resource``, your views should now inherit from ``View``, not ``Resource``. - -* The handler functions on views ``.get() .put() .post()`` etc, no longer have the ``content`` and ``auth`` args. - Use ``self.CONTENT`` inside a view to access the deserialized, validated content. - Use ``self.user`` inside a view to access the authenticated user. - -* ``allowed_methods`` and ``anon_allowed_methods`` are now defunct. if a method is defined, it's available. - The ``permissions`` attribute on a ``View`` is now used to provide generic permissions checking. - Use permission classes such as ``FullAnonAccess``, ``IsAuthenticated`` or ``IsUserOrIsAnonReadOnly`` to set the permissions. - -* The ``authenticators`` class becomes ``authentication``. Class names change to ``Authentication``. - -* The ``emitters`` class becomes ``renderers``. Class names change to ``Renderers``. - -* ``ResponseException`` becomes ``ErrorResponse``. - -* The mixin classes have been nicely refactored, the basic mixins are now ``RequestMixin``, ``ResponseMixin``, ``AuthMixin``, and ``ResourceMixin`` - You can reuse these mixin classes individually without using the ``View`` class. - ---- - -## 0.1.x series - -### 0.1.1 - -* Final build before pulling in all the refactoring changes for 0.2, in case anyone needs to hang on to 0.1. - -### 0.1.0 - -* Initial release. +For older release notes, [please see the GitHub repo](old-release-notes). [cite]: http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/ar01s04.html [deprecation-policy]: #deprecation-policy @@ -742,5 +627,6 @@ This change will not affect user code, so long as it's following the recommended [staticfiles13]: https://docs.djangoproject.com/en/1.3/howto/static-files/#with-a-template-tag [2.1.0-notes]: https://groups.google.com/d/topic/django-rest-framework/Vv2M0CMY9bg/discussion [announcement]: rest-framework-2-announcement.md -[#582]: https://github.com/tomchristie/django-rest-framework/issues/582 +[ticket-582]: https://github.com/tomchristie/django-rest-framework/issues/582 [rfc-6266]: http://tools.ietf.org/html/rfc6266#section-4.3 +[old-release-notes]: https://github.com/tomchristie/django-rest-framework/blob/2.4.4/docs/topics/release-notes.md#04x-series From 3a648b9f0b0aa9a955065b96ea1a03376816ec00 Mon Sep 17 00:00:00 2001 From: Dougal Matthews <dougal@redhat.com> Date: Thu, 9 Oct 2014 10:14:04 +0100 Subject: [PATCH 1112/1652] Migrate documentation to MkDocs proper --- .gitignore | 1 + docs/{ => theme}/404.html | 0 docs/{template.html => theme/base.html} | 7 +- mkdocs.py | 203 ------------------------ mkdocs.yml | 55 +++++++ 5 files changed, 62 insertions(+), 204 deletions(-) rename docs/{ => theme}/404.html (100%) rename docs/{template.html => theme/base.html} (96%) delete mode 100755 mkdocs.py create mode 100644 mkdocs.yml diff --git a/.gitignore b/.gitignore index ae73f8379..9e17827bd 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ local/ !.gitignore !.travis.yml +site/ diff --git a/docs/404.html b/docs/theme/404.html similarity index 100% rename from docs/404.html rename to docs/theme/404.html diff --git a/docs/template.html b/docs/theme/base.html similarity index 96% rename from docs/template.html rename to docs/theme/base.html index f36cffc6d..45e19cf37 100644 --- a/docs/template.html +++ b/docs/theme/base.html @@ -187,7 +187,12 @@ a.fusion-poweredby { --> <div id="table-of-contents"> <ul class="nav nav-list side-nav well sidebar-nav-fixed"> - {{ toc }} + {% for toc_item in toc %} + <li class="main {% if toc_item.active %}active{% endif %}"><a href="{{ toc_item.url }}">{{ toc_item.title }}</a></li> + {% for toc_item in toc_item.children %} + <li><a href="{{ toc_item.url }}">{{ toc_item.title }}</a></li> + {% endfor %} + {% endfor %} <div class="promo"> {{ ad_block }} </div> diff --git a/mkdocs.py b/mkdocs.py deleted file mode 100755 index 3787d7920..000000000 --- a/mkdocs.py +++ /dev/null @@ -1,203 +0,0 @@ -#!/usr/bin/env python - -import markdown -import os -import re -import shutil -import sys - -root_dir = os.path.abspath(os.path.dirname(__file__)) -docs_dir = os.path.join(root_dir, 'docs') -html_dir = os.path.join(root_dir, 'html') - -local = not '--deploy' in sys.argv -preview = '-p' in sys.argv - -if local: - base_url = 'file://%s/' % os.path.normpath(os.path.join(os.getcwd(), html_dir)) - suffix = '.html' - index = 'index.html' -else: - base_url = 'http://www.django-rest-framework.org' - suffix = '' - index = '' - - -main_header = '<li class="main"><a href="#{{ anchor }}">{{ title }}</a></li>' -sub_header = '<li><a href="#{{ anchor }}">{{ title }}</a></li>' -code_label = r'<a class="github" href="https://github.com/tomchristie/django-rest-framework/tree/master/rest_framework/\1"><span class="label label-info">\1</span></a>' - -page = open(os.path.join(docs_dir, 'template.html'), 'r').read() - -# Copy static files -# for static in ['css', 'js', 'img']: -# source = os.path.join(docs_dir, 'static', static) -# target = os.path.join(html_dir, static) -# if os.path.exists(target): -# shutil.rmtree(target) -# shutil.copytree(source, target) - - -# Hacky, but what the hell, it'll do the job -path_list = [ - 'index.md', - 'tutorial/quickstart.md', - 'tutorial/1-serialization.md', - 'tutorial/2-requests-and-responses.md', - 'tutorial/3-class-based-views.md', - 'tutorial/4-authentication-and-permissions.md', - 'tutorial/5-relationships-and-hyperlinked-apis.md', - 'tutorial/6-viewsets-and-routers.md', - 'api-guide/requests.md', - 'api-guide/responses.md', - 'api-guide/views.md', - 'api-guide/generic-views.md', - 'api-guide/viewsets.md', - 'api-guide/routers.md', - 'api-guide/parsers.md', - 'api-guide/renderers.md', - 'api-guide/serializers.md', - 'api-guide/fields.md', - 'api-guide/relations.md', - 'api-guide/validators.md', - 'api-guide/authentication.md', - 'api-guide/permissions.md', - 'api-guide/throttling.md', - 'api-guide/filtering.md', - 'api-guide/pagination.md', - 'api-guide/content-negotiation.md', - 'api-guide/format-suffixes.md', - 'api-guide/reverse.md', - 'api-guide/exceptions.md', - 'api-guide/status-codes.md', - 'api-guide/testing.md', - 'api-guide/settings.md', - 'topics/documenting-your-api.md', - 'topics/ajax-csrf-cors.md', - 'topics/browser-enhancements.md', - 'topics/browsable-api.md', - 'topics/rest-hypermedia-hateoas.md', - 'topics/third-party-resources.md', - 'topics/contributing.md', - 'topics/rest-framework-2-announcement.md', - 'topics/2.2-announcement.md', - 'topics/2.3-announcement.md', - 'topics/2.4-announcement.md', - 'topics/release-notes.md', - 'topics/credits.md', -] - -prev_url_map = {} -next_url_map = {} -for idx in range(len(path_list)): - path = path_list[idx] - rel = '../' * path.count('/') - - if idx == 1 and not local: - # Link back to '/', not '/index' - prev_url_map[path] = '/' - elif idx > 0: - prev_url_map[path] = rel + path_list[idx - 1][:-3] + suffix - - if idx < len(path_list) - 1: - next_url_map[path] = rel + path_list[idx + 1][:-3] + suffix - - -for (dirpath, dirnames, filenames) in os.walk(docs_dir): - relative_dir = dirpath.replace(docs_dir, '').lstrip(os.path.sep) - build_dir = os.path.join(html_dir, relative_dir) - - if not os.path.exists(build_dir): - os.makedirs(build_dir) - - for filename in filenames: - path = os.path.join(dirpath, filename) - relative_path = os.path.join(relative_dir, filename) - - if not filename.endswith('.md'): - if relative_dir: - output_path = os.path.join(build_dir, filename) - shutil.copy(path, output_path) - continue - - output_path = os.path.join(build_dir, filename[:-3] + '.html') - - toc = '' - text = open(path, 'r').read().decode('utf-8') - main_title = None - description = 'Django, API, REST' - for line in text.splitlines(): - if line.startswith('# '): - title = line[2:].strip() - template = main_header - description = description + ', ' + title - elif line.startswith('## '): - title = line[3:].strip() - template = sub_header - else: - continue - - if not main_title: - main_title = title - anchor = title.lower().replace(' ', '-').replace(':-', '-').replace("'", '').replace('?', '').replace('.', '') - template = template.replace('{{ title }}', title) - template = template.replace('{{ anchor }}', anchor) - toc += template + '\n' - - if filename == 'index.md': - main_title = 'Django REST framework - Web APIs for Django' - else: - main_title = main_title + ' - Django REST framework' - - if relative_path == 'index.md': - canonical_url = base_url - else: - canonical_url = base_url + '/' + relative_path[:-3] + suffix - prev_url = prev_url_map.get(relative_path) - next_url = next_url_map.get(relative_path) - - content = markdown.markdown(text, ['headerid']) - - output = page.replace('{{ content }}', content).replace('{{ toc }}', toc).replace('{{ base_url }}', base_url).replace('{{ suffix }}', suffix).replace('{{ index }}', index) - output = output.replace('{{ title }}', main_title) - output = output.replace('{{ description }}', description) - output = output.replace('{{ page_id }}', filename[:-3]) - output = output.replace('{{ canonical_url }}', canonical_url) - - if filename =='index.md': - output = output.replace('{{ ad_block }}', """<hr/> - <script type="text/javascript" src="//cdn.fusionads.net/fusion.js?zoneid=1332&serve=C6SDP2Y&placement=djangorestframework" id="_fusionads_js"></script>""") - else: - output = output.replace('{{ ad_block }}', '') - - if prev_url: - output = output.replace('{{ prev_url }}', prev_url) - output = output.replace('{{ prev_url_disabled }}', '') - else: - output = output.replace('{{ prev_url }}', '#') - output = output.replace('{{ prev_url_disabled }}', 'disabled') - - if next_url: - output = output.replace('{{ next_url }}', next_url) - output = output.replace('{{ next_url_disabled }}', '') - else: - output = output.replace('{{ next_url }}', '#') - output = output.replace('{{ next_url_disabled }}', 'disabled') - - output = re.sub(r'a href="([^"]*)\.md"', r'a href="\1%s"' % suffix, output) - output = re.sub(r'<pre><code>:::bash', r'<pre class="prettyprint lang-bsh">', output) - output = re.sub(r'<pre>', r'<pre class="prettyprint lang-py">', output) - output = re.sub(r'<a class="github" href="([^"]*)"></a>', code_label, output) - open(output_path, 'w').write(output.encode('utf-8')) - -if preview: - import subprocess - - url = 'html/index.html' - - try: - subprocess.Popen(["open", url]) # Mac - except OSError: - subprocess.Popen(["xdg-open", url]) # Linux - except: - os.startfile(url) # Windows diff --git a/mkdocs.yml b/mkdocs.yml new file mode 100644 index 000000000..0134679c4 --- /dev/null +++ b/mkdocs.yml @@ -0,0 +1,55 @@ +site_name: Django REST frameowkr +site_url: http://www.django-rest-framework.org/ +site_description: Django REST framework - Web APIs for DjangoProject documentation with Markdown. + +repo_url: https://github.com/tomchristie/django-rest-framework + +pages: + - ['index.md', ] + - ['tutorial/quickstart.md', ] + - ['tutorial/1-serialization.md', ] + - ['tutorial/2-requests-and-responses.md', ] + - ['tutorial/3-class-based-views.md', ] + - ['tutorial/4-authentication-and-permissions.md', ] + - ['tutorial/5-relationships-and-hyperlinked-apis.md', ] + - ['tutorial/6-viewsets-and-routers.md', ] + - ['api-guide/requests.md', ] + - ['api-guide/responses.md', ] + - ['api-guide/views.md', ] + - ['api-guide/generic-views.md', ] + - ['api-guide/viewsets.md', ] + - ['api-guide/routers.md', ] + - ['api-guide/parsers.md', ] + - ['api-guide/renderers.md', ] + - ['api-guide/serializers.md', ] + - ['api-guide/fields.md', ] + - ['api-guide/relations.md', ] + - ['api-guide/authentication.md', ] + - ['api-guide/permissions.md', ] + - ['api-guide/throttling.md', ] + - ['api-guide/filtering.md', ] + - ['api-guide/pagination.md', ] + - ['api-guide/content-negotiation.md', ] + - ['api-guide/format-suffixes.md', ] + - ['api-guide/reverse.md', ] + - ['api-guide/exceptions.md', ] + - ['api-guide/status-codes.md', ] + - ['api-guide/testing.md', ] + - ['api-guide/settings.md', ] + - ['topics/documenting-your-api.md', ] + - ['topics/ajax-csrf-cors.md', ] + - ['topics/browser-enhancements.md', ] + - ['topics/browsable-api.md', ] + - ['topics/rest-hypermedia-hateoas.md', ] + - ['topics/third-party-resources.md', ] + - ['topics/contributing.md', ] + - ['topics/rest-framework-2-announcement.md', ] + - ['topics/2.2-announcement.md', ] + - ['topics/2.3-announcement.md', ] + - ['topics/2.4-announcement.md', ] + - ['topics/release-notes.md', ] + - ['topics/credits.md', ] + +theme_dir: docs/theme +copyright: Copyright © 2014, <a href="https://twitter.com/_tomchristie">Tom Christie</a>. +google_analytics: ['UA-27795084-5', 'mkdocs.org'] From b2762cbb76a2602361fe5a9af6804863127d1c67 Mon Sep 17 00:00:00 2001 From: Dougal Matthews <dougal@redhat.com> Date: Wed, 22 Oct 2014 21:13:08 +0100 Subject: [PATCH 1113/1652] Fixed typos in the config and updated Google analytics --- .gitignore | 1 + mkdocs.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9e17827bd..2341eba0d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ local/ !.gitignore !.travis.yml + site/ diff --git a/mkdocs.yml b/mkdocs.yml index 0134679c4..8db4efc16 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: Django REST frameowkr +site_name: Django REST framework site_url: http://www.django-rest-framework.org/ site_description: Django REST framework - Web APIs for DjangoProject documentation with Markdown. @@ -52,4 +52,4 @@ pages: theme_dir: docs/theme copyright: Copyright © 2014, <a href="https://twitter.com/_tomchristie">Tom Christie</a>. -google_analytics: ['UA-27795084-5', 'mkdocs.org'] +google_analytics: ['UA-18852272-2', 'django-rest-framework.org'] From 261c4ce9aff6725a4e069cf45d0f57ec97a27bdb Mon Sep 17 00:00:00 2001 From: Dougal Matthews <dougal@redhat.com> Date: Wed, 22 Oct 2014 21:13:40 +0100 Subject: [PATCH 1114/1652] Remove redundant requirements file --- docs/requirements.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 docs/requirements.txt diff --git a/docs/requirements.txt b/docs/requirements.txt deleted file mode 100644 index a91fb9785..000000000 --- a/docs/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -markdown>=2.1.0 From ae36a258d7266f73b73a0a722d39ff806d552e1b Mon Sep 17 00:00:00 2001 From: Dougal Matthews <dougal@redhat.com> Date: Wed, 22 Oct 2014 21:21:59 +0100 Subject: [PATCH 1115/1652] Add the kickstarter annoucement to the TOC --- mkdocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/mkdocs.yml b/mkdocs.yml index 8db4efc16..cfaaed420 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -47,6 +47,7 @@ pages: - ['topics/2.2-announcement.md', ] - ['topics/2.3-announcement.md', ] - ['topics/2.4-announcement.md', ] + - ['topics/kickstarter-announcement.md', ] - ['topics/release-notes.md', ] - ['topics/credits.md', ] From 04abe9830c1b6c0670a49129529e8e8d9e411f2c Mon Sep 17 00:00:00 2001 From: Dougal Matthews <dougal@redhat.com> Date: Wed, 22 Oct 2014 21:22:16 +0100 Subject: [PATCH 1116/1652] Add a docs build to the Tox run --- .travis.yml | 1 + tox.ini | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9dd587be9..6191e7e26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ sudo: false env: - TOX_ENV=py27-flake8 + - TOX_ENV=py27-docs - TOX_ENV=py34-django17 - TOX_ENV=py33-django17 - TOX_ENV=py32-django17 diff --git a/tox.ini b/tox.ini index a7200a3f3..6b680813d 100644 --- a/tox.ini +++ b/tox.ini @@ -29,3 +29,8 @@ deps = pytest==2.5.2 flake8==2.2.2 commands = ./runtests.py --lintonly + +[testenv:py27-docs] +deps = + mkdocs>=0.11.1 +commands = mkdocs build From 84d9c4b46eacda54b31a3779c623554758f4dccc Mon Sep 17 00:00:00 2001 From: Dougal Matthews <dougal@redhat.com> Date: Wed, 22 Oct 2014 21:36:11 +0100 Subject: [PATCH 1117/1652] Change site_dir to html to match mkdocs.py --- CONTRIBUTING.md | 8 ++++---- docs/topics/contributing.md | 8 ++++---- mkdocs.yml | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1b1995348..ff82c9545 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -101,15 +101,15 @@ There are many great markdown editors that make working with the documentation r ## Building the documentation -To build the documentation, simply run the `mkdocs.py` script. +To build the documentation, simply install MkDocs with `pip install mkdocs` and then run the following command. - ./mkdocs.py + mkdocs build This will build the html output into the `html` directory. -You can build the documentation and open a preview in a browser window by using the `-p` flag. +You can build the documentation and open a preview in a browser window by using the `serve` command. - ./mkdocs.py -p + mkdocs serve ## Language style diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 52f6e287d..5809af65c 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -135,15 +135,15 @@ There are many great Markdown editors that make working with the documentation r ## Building the documentation -To build the documentation, simply run the `mkdocs.py` script. +To build the documentation, simply install MkDocs with `pip install mkdocs` and then run the following command. - ./mkdocs.py + mkdocs build This will build the html output into the `html` directory. -You can build the documentation and open a preview in a browser window by using the `-p` flag. +You can build the documentation and open a preview in a browser window by using the `serve` command. - ./mkdocs.py -p + mkdocs serve ## Language style diff --git a/mkdocs.yml b/mkdocs.yml index cfaaed420..e2c3abe8c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -51,6 +51,7 @@ pages: - ['topics/release-notes.md', ] - ['topics/credits.md', ] +site_dir: html theme_dir: docs/theme copyright: Copyright © 2014, <a href="https://twitter.com/_tomchristie">Tom Christie</a>. google_analytics: ['UA-18852272-2', 'django-rest-framework.org'] From 792c0c291f2cbe3c51de9e43cfee35c121e13687 Mon Sep 17 00:00:00 2001 From: Dougal Matthews <dougal@redhat.com> Date: Thu, 23 Oct 2014 08:11:24 +0100 Subject: [PATCH 1118/1652] Remove the site ignore which isn't needed as we will use the html output directory as before --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2341eba0d..ae73f8379 100644 --- a/.gitignore +++ b/.gitignore @@ -18,5 +18,3 @@ local/ !.gitignore !.travis.yml - -site/ From 2ddef2d3263b2187fd502e42eaaecc3a4f0ad2b2 Mon Sep 17 00:00:00 2001 From: Dougal Matthews <dougal@redhat.com> Date: Thu, 23 Oct 2014 14:10:23 +0100 Subject: [PATCH 1119/1652] Drop simply from the mkdocs install lines It is still simple tho', honest ;) --- CONTRIBUTING.md | 2 +- docs/topics/contributing.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff82c9545..698029959 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -101,7 +101,7 @@ There are many great markdown editors that make working with the documentation r ## Building the documentation -To build the documentation, simply install MkDocs with `pip install mkdocs` and then run the following command. +To build the documentation, install MkDocs with `pip install mkdocs` and then run the following command. mkdocs build diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 5809af65c..c7991a0fe 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -135,7 +135,7 @@ There are many great Markdown editors that make working with the documentation r ## Building the documentation -To build the documentation, simply install MkDocs with `pip install mkdocs` and then run the following command. +To build the documentation, install MkDocs with `pip install mkdocs` and then run the following command. mkdocs build From d6b203f013890cc25f5454696805bc85c1ca2482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Tue, 28 Oct 2014 17:40:29 -0400 Subject: [PATCH 1120/1652] Use page_title instead of title in docs theme --- docs/theme/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/theme/base.html b/docs/theme/base.html index 45e19cf37..943a60e4c 100644 --- a/docs/theme/base.html +++ b/docs/theme/base.html @@ -2,7 +2,7 @@ <html lang="en"> <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta charset="utf-8"> - <title>{{ title }} + {{ page_title }} From 18712a5cbcbb25d935b93baac589cacfe1cbb754 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 29 Oct 2014 20:54:20 +0000 Subject: [PATCH 1121/1652] Fix the Navigation style --- docs/theme/base.html | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/theme/base.html b/docs/theme/base.html index 943a60e4c..e5ad43777 100644 --- a/docs/theme/base.html +++ b/docs/theme/base.html @@ -188,15 +188,12 @@ a.fusion-poweredby {
    +
  • Opbeat
    • From 49a493f61f4d5b4447d139d189d78995e65231b2 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 29 Oct 2014 20:54:31 +0000 Subject: [PATCH 1122/1652] Bring back the promo section --- docs/theme/base.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/theme/base.html b/docs/theme/base.html index e5ad43777..7ca7de145 100644 --- a/docs/theme/base.html +++ b/docs/theme/base.html @@ -191,7 +191,8 @@ a.fusion-poweredby {
  • {{ toc_item.title }}
    • {% endfor %}
    - {{ ad_block }} +
    +
    From 3c49b9fe4648d6fb291f0d34bf2e9ef4b72d45be Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 29 Oct 2014 21:03:00 +0000 Subject: [PATCH 1123/1652] Add next and previous page. --- docs/theme/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/theme/base.html b/docs/theme/base.html index 7ca7de145..0f876cc16 100644 --- a/docs/theme/base.html +++ b/docs/theme/base.html @@ -57,8 +57,8 @@ a.fusion-poweredby {
    GitHub - Next - Previous + Next + Previous Search From 5600878672a47a6aedd49322b4e0c9cce561d1d6 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 29 Oct 2014 21:26:23 +0000 Subject: [PATCH 1124/1652] Fixed the TOC (again) Not sure how I broke it ;-) --- docs/theme/base.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/theme/base.html b/docs/theme/base.html index 0f876cc16..bb3ede2a2 100644 --- a/docs/theme/base.html +++ b/docs/theme/base.html @@ -189,11 +189,10 @@ a.fusion-poweredby {
    From 6da9d5aee09aecbfb7afdacdd2e445e7c30c5999 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 29 Oct 2014 21:26:51 +0000 Subject: [PATCH 1125/1652] Add a workaround for not having the index name --- docs/theme/base.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/theme/base.html b/docs/theme/base.html index bb3ede2a2..d8ff0e072 100644 --- a/docs/theme/base.html +++ b/docs/theme/base.html @@ -49,7 +49,8 @@ a.fusion-poweredby { } - + {# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #} +
    @@ -193,6 +194,15 @@ a.fusion-poweredby {
  • {{ toc_item.title }}
    • {% endfor %} {% endfor %} + + {# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #} + {% if current_page.input_path == 'index.md' %} +
    +
    + +
    + {% endif %} +
    From b443f81481815423d0f953ca41052b4993dfb12f Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 29 Oct 2014 22:29:11 +0000 Subject: [PATCH 1126/1652] Add meta description --- docs/theme/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/theme/base.html b/docs/theme/base.html index d8ff0e072..5187d581a 100644 --- a/docs/theme/base.html +++ b/docs/theme/base.html @@ -6,7 +6,7 @@ - + From 5d479c20d8b9a376057517a4d53d58ff891f5483 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 29 Oct 2014 22:29:41 +0000 Subject: [PATCH 1127/1652] Move nav to it's own template based on the MkDocs theme --- docs/theme/base.html | 93 +------------------------------------------- docs/theme/nav.html | 45 +++++++++++++++++++++ 2 files changed, 46 insertions(+), 92 deletions(-) create mode 100644 docs/theme/nav.html diff --git a/docs/theme/base.html b/docs/theme/base.html index 5187d581a..4ca6cd810 100644 --- a/docs/theme/base.html +++ b/docs/theme/base.html @@ -54,98 +54,7 @@ a.fusion-poweredby {
    -
    -
    -
    - GitHub - Next - Previous - Search - - - - - - Django REST framework -
    - -
      - -
    -
    -
    -
    -
    + {% include "nav.html" %}
    diff --git a/docs/theme/nav.html b/docs/theme/nav.html new file mode 100644 index 000000000..a7a72d68e --- /dev/null +++ b/docs/theme/nav.html @@ -0,0 +1,45 @@ + +
    +
    +
    + GitHub + Next + Previous + Search + + + + + + Django REST framework +
    + {% if include_nav %} + + + {% endif %} +
    + +
    +
    +
    From 6a10b90f72e2f36b1eae1da649eba758b1377be3 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 29 Oct 2014 22:30:00 +0000 Subject: [PATCH 1128/1652] Correct the capitalisation of API --- mkdocs.yml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index e2c3abe8c..de4b9922c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -13,29 +13,29 @@ pages: - ['tutorial/4-authentication-and-permissions.md', ] - ['tutorial/5-relationships-and-hyperlinked-apis.md', ] - ['tutorial/6-viewsets-and-routers.md', ] - - ['api-guide/requests.md', ] - - ['api-guide/responses.md', ] - - ['api-guide/views.md', ] - - ['api-guide/generic-views.md', ] - - ['api-guide/viewsets.md', ] - - ['api-guide/routers.md', ] - - ['api-guide/parsers.md', ] - - ['api-guide/renderers.md', ] - - ['api-guide/serializers.md', ] - - ['api-guide/fields.md', ] - - ['api-guide/relations.md', ] - - ['api-guide/authentication.md', ] - - ['api-guide/permissions.md', ] - - ['api-guide/throttling.md', ] - - ['api-guide/filtering.md', ] - - ['api-guide/pagination.md', ] - - ['api-guide/content-negotiation.md', ] - - ['api-guide/format-suffixes.md', ] - - ['api-guide/reverse.md', ] - - ['api-guide/exceptions.md', ] - - ['api-guide/status-codes.md', ] - - ['api-guide/testing.md', ] - - ['api-guide/settings.md', ] + - ['api-guide/requests.md', "API Guide", ] + - ['api-guide/responses.md', "API Guide", ] + - ['api-guide/views.md', "API Guide", ] + - ['api-guide/generic-views.md', "API Guide", ] + - ['api-guide/viewsets.md', "API Guide", ] + - ['api-guide/routers.md', "API Guide", ] + - ['api-guide/parsers.md', "API Guide", ] + - ['api-guide/renderers.md', "API Guide", ] + - ['api-guide/serializers.md', "API Guide", ] + - ['api-guide/fields.md', "API Guide", ] + - ['api-guide/relations.md', "API Guide", ] + - ['api-guide/authentication.md', "API Guide", ] + - ['api-guide/permissions.md', "API Guide", ] + - ['api-guide/throttling.md', "API Guide", ] + - ['api-guide/filtering.md', "API Guide", ] + - ['api-guide/pagination.md', "API Guide", ] + - ['api-guide/content-negotiation.md', "API Guide", ] + - ['api-guide/format-suffixes.md', "API Guide", ] + - ['api-guide/reverse.md', "API Guide", ] + - ['api-guide/exceptions.md', "API Guide", ] + - ['api-guide/status-codes.md', "API Guide", ] + - ['api-guide/testing.md', "API Guide", ] + - ['api-guide/settings.md', "API Guide", ] - ['topics/documenting-your-api.md', ] - ['topics/ajax-csrf-cors.md', ] - ['topics/browser-enhancements.md', ] From d72a56f37f59d0700d163b67d5af78fc545c91f7 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Fri, 31 Oct 2014 15:02:47 +0000 Subject: [PATCH 1129/1652] Move the docs theme out of the docs folder. --- {docs/theme => docs_theme}/404.html | 0 {docs/theme => docs_theme}/base.html | 0 {docs/theme => docs_theme}/nav.html | 0 mkdocs.yml | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename {docs/theme => docs_theme}/404.html (100%) rename {docs/theme => docs_theme}/base.html (100%) rename {docs/theme => docs_theme}/nav.html (100%) diff --git a/docs/theme/404.html b/docs_theme/404.html similarity index 100% rename from docs/theme/404.html rename to docs_theme/404.html diff --git a/docs/theme/base.html b/docs_theme/base.html similarity index 100% rename from docs/theme/base.html rename to docs_theme/base.html diff --git a/docs/theme/nav.html b/docs_theme/nav.html similarity index 100% rename from docs/theme/nav.html rename to docs_theme/nav.html diff --git a/mkdocs.yml b/mkdocs.yml index de4b9922c..4e5840093 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -52,6 +52,6 @@ pages: - ['topics/credits.md', ] site_dir: html -theme_dir: docs/theme +theme_dir: docs_theme copyright: Copyright © 2014, Tom Christie. google_analytics: ['UA-18852272-2', 'django-rest-framework.org'] From 78223eb8efe2e4e44516edd9a70597b62211df35 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Fri, 31 Oct 2014 15:05:21 +0000 Subject: [PATCH 1130/1652] Fixed copypasta fail --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 4e5840093..45cbb7e72 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,6 +1,6 @@ site_name: Django REST framework site_url: http://www.django-rest-framework.org/ -site_description: Django REST framework - Web APIs for DjangoProject documentation with Markdown. +site_description: Django REST framework - Web APIs for Django repo_url: https://github.com/tomchristie/django-rest-framework From cbb6799d2dc2d87e58e67e1044075319262a674b Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 5 Nov 2014 13:59:45 +0000 Subject: [PATCH 1131/1652] Add validators from 27622058872c00e357deb7d7e86619a793ef4b41 and 254701230d85612cf0210d4549c2d74f410a181d --- mkdocs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/mkdocs.yml b/mkdocs.yml index 45cbb7e72..2d1886a05 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -24,6 +24,7 @@ pages: - ['api-guide/serializers.md', "API Guide", ] - ['api-guide/fields.md', "API Guide", ] - ['api-guide/relations.md', "API Guide", ] + - ['api-guide/validators.md', "API Guide", ] - ['api-guide/authentication.md', "API Guide", ] - ['api-guide/permissions.md', "API Guide", ] - ['api-guide/throttling.md', "API Guide", ] From 16d442dda3ee9d4ff40d067d76706959aac4c6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20Padilla?= Date: Fri, 31 Oct 2014 09:04:39 -0400 Subject: [PATCH 1132/1652] Use MkDocs meta.source to render source code links --- docs/api-guide/authentication.md | 2 +- docs/api-guide/content-negotiation.md | 6 ++-- docs/api-guide/exceptions.md | 2 +- docs/api-guide/fields.md | 4 +-- docs/api-guide/filtering.md | 24 ++++++++-------- docs/api-guide/format-suffixes.md | 12 ++++---- docs/api-guide/generic-views.md | 4 +-- docs/api-guide/pagination.md | 6 ++-- docs/api-guide/parsers.md | 6 ++-- docs/api-guide/permissions.md | 8 +++--- docs/api-guide/relations.md | 40 +++++++++++++-------------- docs/api-guide/renderers.md | 14 +++++----- docs/api-guide/requests.md | 8 +++--- docs/api-guide/responses.md | 4 +-- docs/api-guide/reverse.md | 4 +-- docs/api-guide/routers.md | 8 +++--- docs/api-guide/serializers.md | 34 +++++++++++------------ docs/api-guide/settings.md | 2 +- docs/api-guide/status-codes.md | 6 ++-- docs/api-guide/testing.md | 6 ++-- docs/api-guide/throttling.md | 10 +++---- docs/api-guide/views.md | 7 +++-- docs/api-guide/viewsets.md | 2 +- docs/theme/content.html | 11 ++++++++ docs_theme/base.html | 2 +- 25 files changed, 122 insertions(+), 110 deletions(-) create mode 100644 docs/theme/content.html diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 01774c10d..b04858e39 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -1,4 +1,4 @@ - +source: authentication.py # Authentication diff --git a/docs/api-guide/content-negotiation.md b/docs/api-guide/content-negotiation.md index 94dd59cac..bc3b09fb7 100644 --- a/docs/api-guide/content-negotiation.md +++ b/docs/api-guide/content-negotiation.md @@ -1,4 +1,4 @@ - +source: negotiation.py # Content negotiation @@ -29,7 +29,7 @@ The priorities for each of the given media types would be: If the requested view was only configured with renderers for `YAML` and `HTML`, then REST framework would select whichever renderer was listed first in the `renderer_classes` list or `DEFAULT_RENDERER_CLASSES` setting. -For more information on the `HTTP Accept` header, see [RFC 2616][accept-header] +For more information on the `HTTP Accept` header, see [RFC 2616][accept-header] --- @@ -62,7 +62,7 @@ request when selecting the appropriate parser or renderer. Select the first parser in the `.parser_classes` list. """ return parsers[0] - + def select_renderer(self, request, renderers, format_suffix): """ Select the first renderer in the `.renderer_classes` list. diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index e61dcfa90..8e0b1958e 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -1,4 +1,4 @@ - +source: exceptions.py # Exceptions diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 292a51d89..354ec9662 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -1,4 +1,4 @@ - +source: fields.py # Serializer fields @@ -62,7 +62,7 @@ A dictionary of error codes to error messages. ### `widget` Used only if rendering the field to HTML. -This argument sets the widget that should be used to render the field. For more details, and a list of available widgets, see [the Django documentation on form widgets][django-widgets]. +This argument sets the widget that should be used to render the field. For more details, and a list of available widgets, see [the Django documentation on form widgets][django-widgets]. ### `label` diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index cfeb43349..83977048f 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -1,4 +1,4 @@ - +source: filters.py # Filtering @@ -26,7 +26,7 @@ For example: class PurchaseList(generics.ListAPIView): serializer_class = PurchaseSerializer - + def get_queryset(self): """ This view should return a list of all the purchases @@ -38,7 +38,7 @@ For example: ## Filtering against the URL -Another style of filtering might involve restricting the queryset based on some part of the URL. +Another style of filtering might involve restricting the queryset based on some part of the URL. For example if your URL config contained an entry like this: @@ -48,7 +48,7 @@ You could then write a view that returned a purchase queryset filtered by the us class PurchaseList(generics.ListAPIView): serializer_class = PurchaseSerializer - + def get_queryset(self): """ This view should return a list of all the purchases for @@ -57,7 +57,7 @@ You could then write a view that returned a purchase queryset filtered by the us username = self.kwargs['username'] return Purchase.objects.filter(purchaser__username=username) -## Filtering against query parameters +## Filtering against query parameters A final example of filtering the initial queryset would be to determine the initial queryset based on query parameters in the url. @@ -65,7 +65,7 @@ We can override `.get_queryset()` to deal with URLs such as `http://example.com/ class PurchaseList(generics.ListAPIView): serializer_class = PurchaseSerializer - + def get_queryset(self): """ Optionally restricts the returned purchases to a given user, @@ -113,7 +113,7 @@ For instance, given the previous example, and a product with an id of `4675`, th http://example.com/api/products/4675/?category=clothing&max_price=10.00 ## Overriding the initial queryset - + Note that you can use both an overridden `.get_queryset()` and generic filtering together, and everything will work as expected. For example, if `Product` had a many-to-many relationship with `User`, named `purchase`, you might want to write a view like this: class PurchasedProductsList(generics.ListAPIView): @@ -124,7 +124,7 @@ Note that you can use both an overridden `.get_queryset()` and generic filtering model = Product serializer_class = ProductSerializer filter_class = ProductFilter - + def get_queryset(self): user = self.request.user return user.purchase_set.all() @@ -135,7 +135,7 @@ Note that you can use both an overridden `.get_queryset()` and generic filtering ## DjangoFilterBackend -The `DjangoFilterBackend` class supports highly customizable field filtering, using the [django-filter package][django-filter]. +The `DjangoFilterBackend` class supports highly customizable field filtering, using the [django-filter package][django-filter]. To use REST framework's `DjangoFilterBackend`, first install `django-filter`. @@ -216,7 +216,7 @@ This is nice, but it exposes the Django's double underscore convention as part o And now you can execute: http://example.com/api/products?manufacturer=foo - + For more details on using filter sets see the [django-filter documentation][django-filter-docs]. --- @@ -224,7 +224,7 @@ For more details on using filter sets see the [django-filter documentation][djan **Hints & Tips** * By default filtering is not enabled. If you want to use `DjangoFilterBackend` remember to make sure it is installed by using the `'DEFAULT_FILTER_BACKENDS'` setting. -* When using boolean fields, you should use the values `True` and `False` in the URL query parameters, rather than `0`, `1`, `true` or `false`. (The allowed boolean values are currently hardwired in Django's [NullBooleanSelect implementation][nullbooleanselect].) +* When using boolean fields, you should use the values `True` and `False` in the URL query parameters, rather than `0`, `1`, `true` or `false`. (The allowed boolean values are currently hardwired in Django's [NullBooleanSelect implementation][nullbooleanselect].) * `django-filter` supports filtering across relationships, using Django's double-underscore syntax. * For Django 1.3 support, make sure to install `django-filter` version 0.5.4, as later versions drop support for 1.3. @@ -316,7 +316,7 @@ Typically you'd instead control this by setting `order_by` on the initial querys queryset = User.objects.all() serializer_class = UserSerializer filter_backends = (filters.OrderingFilter,) - ordering = ('username',) + ordering = ('username',) The `ordering` attribute may be either a string or a list/tuple of strings. diff --git a/docs/api-guide/format-suffixes.md b/docs/api-guide/format-suffixes.md index 76a3367b0..20c1e9952 100644 --- a/docs/api-guide/format-suffixes.md +++ b/docs/api-guide/format-suffixes.md @@ -1,4 +1,4 @@ - +source: urlpatterns.py # Format suffixes @@ -7,7 +7,7 @@ used all the time. > > — Roy Fielding, [REST discuss mailing list][cite] -A common pattern for Web APIs is to use filename extensions on URLs to provide an endpoint for a given media type. For example, 'http://example.com/api/users.json' to serve a JSON representation. +A common pattern for Web APIs is to use filename extensions on URLs to provide an endpoint for a given media type. For example, 'http://example.com/api/users.json' to serve a JSON representation. Adding format-suffix patterns to each individual entry in the URLconf for your API is error-prone and non-DRY, so REST framework provides a shortcut to adding these patterns to your URLConf. @@ -21,7 +21,7 @@ Arguments: * **urlpatterns**: Required. A URL pattern list. * **suffix_required**: Optional. A boolean indicating if suffixes in the URLs should be optional or mandatory. Defaults to `False`, meaning that suffixes are optional by default. -* **allowed**: Optional. A list or tuple of valid format suffixes. If not provided, a wildcard format suffix pattern will be used. +* **allowed**: Optional. A list or tuple of valid format suffixes. If not provided, a wildcard format suffix pattern will be used. Example: @@ -33,7 +33,7 @@ Example: url(r'^comments/$', views.comment_list), url(r'^comments/(?P[0-9]+)/$', views.comment_detail) ] - + urlpatterns = format_suffix_patterns(urlpatterns, allowed=['json', 'html']) When using `format_suffix_patterns`, you must make sure to add the `'format'` keyword argument to the corresponding views. For example: @@ -56,12 +56,12 @@ The name of the kwarg used may be modified by using the `FORMAT_SUFFIX_KWARG` se Also note that `format_suffix_patterns` does not support descending into `include` URL patterns. --- - + ## Accept headers vs. format suffixes There seems to be a view among some of the Web community that filename extensions are not a RESTful pattern, and that `HTTP Accept` headers should always be used instead. -It is actually a misconception. For example, take the following quote from Roy Fielding discussing the relative merits of query parameter media-type indicators vs. file extension media-type indicators: +It is actually a misconception. For example, take the following quote from Roy Fielding discussing the relative merits of query parameter media-type indicators vs. file extension media-type indicators: “That's why I always prefer extensions. Neither choice has anything to do with REST.” — Roy Fielding, [REST discuss mailing list][cite2] diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 49a5e58f0..648ece827 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -1,5 +1,5 @@ - - +source: mixins.py + generics.py # Generic views diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index e57aed1a9..9b7086c54 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -1,4 +1,4 @@ - +source: pagination.py # Pagination @@ -6,7 +6,7 @@ > > — [Django documentation][cite] -REST framework includes a `PaginationSerializer` class that makes it easy to return paginated data in a way that can then be rendered to arbitrary media types. +REST framework includes a `PaginationSerializer` class that makes it easy to return paginated data in a way that can then be rendered to arbitrary media types. ## Paginating basic data @@ -33,7 +33,7 @@ The `context` argument of the `PaginationSerializer` class may optionally includ request = RequestFactory().get('/foobar') serializer = PaginationSerializer(instance=page, context={'request': request}) serializer.data - # {'count': 4, 'next': 'http://testserver/foobar?page=2', 'previous': None, 'results': [u'john', u'paul']} + # {'count': 4, 'next': 'http://testserver/foobar?page=2', 'previous': None, 'results': [u'john', u'paul']} We could now return that data in a `Response` object, and it would be rendered into the correct media type. diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index 72a4af643..42d77b223 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -1,4 +1,4 @@ - +source: parsers.py # Parsers @@ -161,7 +161,7 @@ By default this will include the following keys: `view`, `request`, `args`, `kwa ## Example -The following is an example plaintext parser that will populate the `request.DATA` property with a string representing the body of the request. +The following is an example plaintext parser that will populate the `request.DATA` property with a string representing the body of the request. class PlainTextParser(BaseParser): """ @@ -197,4 +197,4 @@ The following third party packages are also available. [juanriaza]: https://github.com/juanriaza [vbabiy]: https://github.com/vbabiy [djangorestframework-msgpack]: https://github.com/juanriaza/django-rest-framework-msgpack -[djangorestframework-camel-case]: https://github.com/vbabiy/djangorestframework-camel-case \ No newline at end of file +[djangorestframework-camel-case]: https://github.com/vbabiy/djangorestframework-camel-case diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index 446e362e1..f068f0f72 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -1,4 +1,4 @@ - +source: permissions.py # Permissions @@ -12,7 +12,7 @@ Permission checks are always run at the very start of the view, before any other ## How permissions are determined -Permissions in REST framework are always defined as a list of permission classes. +Permissions in REST framework are always defined as a list of permission classes. Before running the main body of the view each permission in the list is checked. If any permission check fails an `exceptions.PermissionDenied` exception will be raised, and the main body of the view will not run. @@ -220,9 +220,9 @@ As well as global permissions, that are run against all incoming requests, you c def has_object_permission(self, request, view, obj): # Read permissions are allowed to any request, # so we'll always allow GET, HEAD or OPTIONS requests. - if request.method in permissions.SAFE_METHODS: + if request.method in permissions.SAFE_METHODS: return True - + # Instance must have an attribute named `owner`. return obj.owner == request.user diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index d03a75ae5..ad981b2bb 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -1,4 +1,4 @@ - +source: relations.py # Serializer relations @@ -33,7 +33,7 @@ In order to explain the various types of relational fields, we'll use a couple o class Meta: unique_together = ('album', 'order') order_by = 'order' - + def __unicode__(self): return '%d: %s' % (self.order, self.title) @@ -42,10 +42,10 @@ In order to explain the various types of relational fields, we'll use a couple o `RelatedField` may be used to represent the target of the relationship using its `__unicode__` method. For example, the following serializer. - + class AlbumSerializer(serializers.ModelSerializer): tracks = serializers.RelatedField(many=True) - + class Meta: model = Album fields = ('album_name', 'artist', 'tracks') @@ -74,10 +74,10 @@ This field is read only. `PrimaryKeyRelatedField` may be used to represent the target of the relationship using its primary key. For example, the following serializer: - + class AlbumSerializer(serializers.ModelSerializer): tracks = serializers.PrimaryKeyRelatedField(many=True, read_only=True) - + class Meta: model = Album fields = ('album_name', 'artist', 'tracks') @@ -108,11 +108,11 @@ By default this field is read-write, although you can change this behavior using `HyperlinkedRelatedField` may be used to represent the target of the relationship using a hyperlink. For example, the following serializer: - + class AlbumSerializer(serializers.ModelSerializer): tracks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='track-detail') - + class Meta: model = Album fields = ('album_name', 'artist', 'tracks') @@ -146,11 +146,11 @@ By default this field is read-write, although you can change this behavior using `SlugRelatedField` may be used to represent the target of the relationship using a field on the target. For example, the following serializer: - + class AlbumSerializer(serializers.ModelSerializer): tracks = serializers.SlugRelatedField(many=True, read_only=True, slug_field='title') - + class Meta: model = Album fields = ('album_name', 'artist', 'tracks') @@ -222,10 +222,10 @@ For example, the following serializer: class Meta: model = Track fields = ('order', 'title') - + class AlbumSerializer(serializers.ModelSerializer): tracks = TrackSerializer(many=True) - + class Meta: model = Album fields = ('album_name', 'artist', 'tracks') @@ -262,7 +262,7 @@ For, example, we could define a relational field, to serialize a track to a cust class AlbumSerializer(serializers.ModelSerializer): tracks = TrackListingField(many=True) - + class Meta: model = Album fields = ('album_name', 'artist', 'tracks') @@ -302,7 +302,7 @@ If you have not set a related name for the reverse relationship, you'll need to class AlbumSerializer(serializers.ModelSerializer): class Meta: - fields = ('track_set', ...) + fields = ('track_set', ...) See the Django documentation on [reverse relationships][reverse-relationships] for more details. @@ -315,14 +315,14 @@ For example, given the following model for a tag, which has a generic relationsh class TaggedItem(models.Model): """ Tags arbitrary model instances using a generic relation. - + See: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/ """ tag_name = models.SlugField() content_type = models.ForeignKey(ContentType) object_id = models.PositiveIntegerField() tagged_object = GenericForeignKey('content_type', 'object_id') - + def __unicode__(self): return self.tag @@ -353,7 +353,7 @@ We could define a custom field that could be used to serialize tagged instances, def to_native(self, value): """ Serialize tagged objects to a simple textual representation. - """ + """ if isinstance(value, Bookmark): return 'Bookmark: ' + value.url elif isinstance(value, Note): @@ -366,7 +366,7 @@ If you need the target of the relationship to have a nested representation, you """ Serialize bookmark instances using a bookmark serializer, and note instances using a note serializer. - """ + """ if isinstance(value, Bookmark): serializer = BookmarkSerializer(value) elif isinstance(value, Note): @@ -391,7 +391,7 @@ to ``True``. ## Advanced Hyperlinked fields -If you have very specific requirements for the style of your hyperlinked relationships you can override `HyperlinkedRelatedField`. +If you have very specific requirements for the style of your hyperlinked relationships you can override `HyperlinkedRelatedField`. There are two methods you'll need to override. @@ -411,7 +411,7 @@ May raise an `ObjectDoesNotExist` exception. ### Example -For example, if all your object URLs used both a account and a slug in the the URL to reference the object, you might create a custom field like this: +For example, if all your object URLs used both a account and a slug in the the URL to reference the object, you might create a custom field like this: class CustomHyperlinkedField(serializers.HyperlinkedRelatedField): def get_url(self, obj, view_name, request, format): diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index db7436c23..035ec1d27 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -1,4 +1,4 @@ - +source: renderers.py # Renderers @@ -115,7 +115,7 @@ The `jsonp` approach is essentially a browser hack, and is [only appropriate for ## YAMLRenderer -Renders the request data into `YAML`. +Renders the request data into `YAML`. Requires the `pyyaml` package to be installed. @@ -131,7 +131,7 @@ Note that non-ascii characters will be rendered using `\uXXXX` character escape. ## UnicodeYAMLRenderer -Renders the request data into `YAML`. +Renders the request data into `YAML`. Requires the `pyyaml` package to be installed. @@ -184,7 +184,7 @@ An example of a view that uses `TemplateHTMLRenderer`: def get(self, request, *args, **kwargs): self.object = self.get_object() return Response({'user': self.object}, template_name='user_detail.html') - + You can use `TemplateHTMLRenderer` either to return regular HTML pages using REST framework, or to return both HTML and API responses from a single endpoint. If you're building websites that use `TemplateHTMLRenderer` along with other renderer classes, you should consider listing `TemplateHTMLRenderer` as the first class in the `renderer_classes` list, so that it will be prioritised first even for browsers that send poorly formed `ACCEPT:` headers. @@ -205,7 +205,7 @@ An example of a view that uses `TemplateHTMLRenderer`: @api_view(('GET',)) @renderer_classes((StaticHTMLRenderer,)) - def simple_html_view(request): + def simple_html_view(request): data = '

    Hello, world

    ' return Response(data) @@ -300,7 +300,7 @@ The following is an example plaintext renderer that will return a response with class PlainTextRenderer(renderers.BaseRenderer): media_type = 'text/plain' format = 'txt' - + def render(self, data, media_type=None, renderer_context=None): return data.encode(self.charset) @@ -340,7 +340,7 @@ You can do some pretty flexible things using REST framework's renderers. Some e * Provide either flat or nested representations from the same endpoint, depending on the requested media type. * Serve both regular HTML webpages, and JSON based API responses from the same endpoints. * Specify multiple types of HTML representation for API clients to use. -* Underspecify a renderer's media type, such as using `media_type = 'image/*'`, and use the `Accept` header to vary the encoding of the response. +* Underspecify a renderer's media type, such as using `media_type = 'image/*'`, and use the `Accept` header to vary the encoding of the response. ## Varying behaviour by media type diff --git a/docs/api-guide/requests.md b/docs/api-guide/requests.md index 87425ed1b..8713fa2a6 100644 --- a/docs/api-guide/requests.md +++ b/docs/api-guide/requests.md @@ -1,4 +1,4 @@ - +source: request.py # Requests @@ -105,7 +105,7 @@ REST framework supports a few browser enhancements such as browser-based `PUT`, Browser-based `PUT`, `PATCH` and `DELETE` forms are transparently supported. -For more information see the [browser enhancements documentation]. +For more information see the [browser enhancements documentation]. ## .content_type @@ -115,7 +115,7 @@ You won't typically need to directly access the request's content type, as you'l If you do need to access the content type of the request you should use the `.content_type` property in preference to using `request.META.get('HTTP_CONTENT_TYPE')`, as it provides transparent support for browser-based non-form content. -For more information see the [browser enhancements documentation]. +For more information see the [browser enhancements documentation]. ## .stream @@ -125,7 +125,7 @@ You won't typically need to directly access the request's content, as you'll nor If you do need to access the raw content directly, you should use the `.stream` property in preference to using `request.content`, as it provides transparent support for browser-based non-form content. -For more information see the [browser enhancements documentation]. +For more information see the [browser enhancements documentation]. --- diff --git a/docs/api-guide/responses.md b/docs/api-guide/responses.md index 5a42aa923..97f312710 100644 --- a/docs/api-guide/responses.md +++ b/docs/api-guide/responses.md @@ -1,4 +1,4 @@ - +source: response.py # Responses @@ -90,6 +90,6 @@ The `Response` class extends `SimpleTemplateResponse`, and all the usual attribu As with any other `TemplateResponse`, this method is called to render the serialized data of the response into the final response content. When `.render()` is called, the response content will be set to the result of calling the `.render(data, accepted_media_type, renderer_context)` method on the `accepted_renderer` instance. You won't typically need to call `.render()` yourself, as it's handled by Django's standard response cycle. - + [cite]: https://docs.djangoproject.com/en/dev/ref/template-response/ [statuscodes]: status-codes.md diff --git a/docs/api-guide/reverse.md b/docs/api-guide/reverse.md index 383eca4ce..71fb83f9e 100644 --- a/docs/api-guide/reverse.md +++ b/docs/api-guide/reverse.md @@ -1,4 +1,4 @@ - +source: reverse.py # Returning URLs @@ -30,7 +30,7 @@ You should **include the request as a keyword argument** to the function, for ex from rest_framework.reverse import reverse from rest_framework.views import APIView from django.utils.timezone import now - + class APIRootView(APIView): def get(self, request): year = now().year diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 61a476b8b..080230faf 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -1,4 +1,4 @@ - +source: routers.py # Routers @@ -56,10 +56,10 @@ For example, given a method like this on the `UserViewSet` class: from myapp.permissions import IsAdminOrIsSelf from rest_framework.decorators import detail_route - + class UserViewSet(ModelViewSet): ... - + @detail_route(methods=['post'], permission_classes=[IsAdminOrIsSelf]) def set_password(self, request, pk=None): ... @@ -228,7 +228,7 @@ For another example of setting the `.routes` attribute, see the source code for ## Advanced custom routers -If you want to provide totally custom behavior, you can override `BaseRouter` and override the `get_urls(self)` method. The method should inspect the registered viewsets and return a list of URL patterns. The registered prefix, viewset and basename tuples may be inspected by accessing the `self.registry` attribute. +If you want to provide totally custom behavior, you can override `BaseRouter` and override the `get_urls(self)` method. The method should inspect the registered viewsets and return a list of URL patterns. The registered prefix, viewset and basename tuples may be inspected by accessing the `self.registry` attribute. You may also want to override the `get_default_base_name(self, viewset)` method, or else always explicitly set the `base_name` argument when registering your viewsets with the router. diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index eeeffa136..2d0ff79a4 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1,4 +1,4 @@ - +source: serializers.py # Serializers @@ -21,7 +21,7 @@ Let's start by creating a simple object we can use for example purposes: self.email = email self.content = content self.created = created or datetime.datetime.now() - + comment = Comment(email='leila@example.com', content='foo bar') We'll declare a serializer that we can use to serialize and deserialize `Comment` objects. @@ -45,7 +45,7 @@ Declaring a serializer looks very similar to declaring a form: instance.content = attrs.get('content', instance.content) instance.created = attrs.get('created', instance.created) return instance - return Comment(**attrs) + return Comment(**attrs) The first part of serializer class defines the fields that get serialized/deserialized. The `restore_object` method defines how fully fledged instances get created when deserializing data. @@ -83,8 +83,8 @@ If you need to customize the serialized value of a particular field, you can do These methods are essentially the reverse of `validate_` (see *Validation* below.) ## Deserializing objects - -Deserialization is similar. First we parse a stream into Python native datatypes... + +Deserialization is similar. First we parse a stream into Python native datatypes... from StringIO import StringIO from rest_framework.parsers import JSONParser @@ -174,7 +174,7 @@ To save the deserialized objects created by a serializer, call the `.save()` met The default behavior of the method is to simply call `.save()` on the deserialized object instance. You can override the default save behaviour by overriding the `.save_object(obj)` method on the serializer class. -The generic views provided by REST framework call the `.save()` method when updating or creating entities. +The generic views provided by REST framework call the `.save()` method when updating or creating entities. ## Dealing with nested objects @@ -288,12 +288,12 @@ By default the serializer class will use the `id` key on the incoming data to de slug = serializers.CharField(max_length=100) created = serializers.DateTimeField() ... # Various other fields - + def get_identity(self, data): """ This hook is required for bulk update. We need to override the default, to use the slug as the identity. - + Note that the data has not yet been validated at this point, so we need to deal gracefully with incorrect datatypes. """ @@ -361,7 +361,7 @@ The `depth` option should be set to an integer value that indicates the depth of If you want to customize the way the serialization is done (e.g. using `allow_add_remove`) you'll need to define the field yourself. -## Specifying which fields should be read-only +## Specifying which fields should be read-only You may wish to specify multiple fields as read-only. Instead of adding each field explicitly with the `read_only=True` attribute, you may use the `read_only_fields` Meta option, like so: @@ -371,9 +371,9 @@ You may wish to specify multiple fields as read-only. Instead of adding each fi fields = ('id', 'account_name', 'users', 'created') read_only_fields = ('account_name',) -Model fields which have `editable=False` set, and `AutoField` fields will be set to read-only by default, and do not need to be added to the `read_only_fields` option. +Model fields which have `editable=False` set, and `AutoField` fields will be set to read-only by default, and do not need to be added to the `read_only_fields` option. -## Specifying which fields should be write-only +## Specifying which fields should be write-only You may wish to specify multiple fields as write-only. Instead of adding each field explicitly with the `write_only=True` attribute, you may use the `write_only_fields` Meta option, like so: @@ -387,12 +387,12 @@ You may wish to specify multiple fields as write-only. Instead of adding each f """ Instantiate a new User instance. """ - assert instance is None, 'Cannot update users with CreateUserSerializer' + assert instance is None, 'Cannot update users with CreateUserSerializer' user = User(email=attrs['email'], username=attrs['username']) user.set_password(attrs['password']) return user - -## Specifying fields explicitly + +## Specifying fields explicitly You can add extra fields to a `ModelSerializer` or override the default fields by declaring fields on the class, just as you would for a `Serializer` class. @@ -524,10 +524,10 @@ For example, if you wanted to be able to set which fields should be used by a se def __init__(self, *args, **kwargs): # Don't pass the 'fields' arg up to the superclass fields = kwargs.pop('fields', None) - + # Instantiate the superclass normally super(DynamicFieldsModelSerializer, self).__init__(*args, **kwargs) - + if fields: # Drop any fields that are not specified in the `fields` argument. allowed = set(fields) @@ -550,7 +550,7 @@ This would then allow you to do the following: ## Customising the default fields -The `field_mapping` attribute is a dictionary that maps model classes to serializer classes. Overriding the attribute will let you set a different set of default serializer classes. +The `field_mapping` attribute is a dictionary that maps model classes to serializer classes. Overriding the attribute will let you set a different set of default serializer classes. For more advanced customization than simply changing the default serializer class you can override various `get__field` methods. Doing so will allow you to customize the arguments that each serializer field is initialized with. Each of these methods may either return a field or serializer instance, or `None`. diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 96d715ea2..0aa4b6a97 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -1,4 +1,4 @@ - +source: settings.py # Settings diff --git a/docs/api-guide/status-codes.md b/docs/api-guide/status-codes.md index 64c464349..d81e092c5 100644 --- a/docs/api-guide/status-codes.md +++ b/docs/api-guide/status-codes.md @@ -1,4 +1,4 @@ - +source: status.py # Status Codes @@ -27,7 +27,7 @@ The module also includes a set of helper functions for testing if a status code url = reverse('index') response = self.client.get(url) self.assertTrue(status.is_success(response.status_code)) - + For more information on proper usage of HTTP status codes see [RFC 2616][rfc2616] and [RFC 6585][rfc6585]. @@ -51,7 +51,7 @@ This class of status code indicates that the client's request was successfully r HTTP_205_RESET_CONTENT HTTP_206_PARTIAL_CONTENT -## Redirection - 3xx +## Redirection - 3xx This class of status code indicates that further action needs to be taken by the user agent in order to fulfill the request. diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index 72c339613..d059fdab5 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -1,4 +1,4 @@ - +source: test.py # Testing @@ -170,7 +170,7 @@ This can be a useful shortcut if you're testing the API but don't want to have t To unauthenticate subsequent requests, call `force_authenticate` setting the user and/or token to `None`. - client.force_authenticate(user=None) + client.force_authenticate(user=None) ## CSRF validation @@ -197,7 +197,7 @@ You can use any of REST framework's test case classes as you would for the regul from django.core.urlresolvers import reverse from rest_framework import status - from rest_framework.test import APITestCase + from rest_framework.test import APITestCase class AccountTests(APITestCase): def test_create_account(self): diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index 147c16ff7..3f668867c 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -1,4 +1,4 @@ - +source: throttling.py # Throttling @@ -83,7 +83,7 @@ The throttle classes provided by REST framework use Django's cache backend. You If you need to use a cache other than `'default'`, you can do so by creating a custom throttle class and setting the `cache` attribute. For example: class CustomAnonRateThrottle(AnonRateThrottle): - cache = get_cache('alternate') + cache = get_cache('alternate') You'll need to remember to also set your custom throttle class in the `'DEFAULT_THROTTLE_CLASSES'` settings key, or using the `throttle_classes` view attribute. @@ -147,15 +147,15 @@ For example, given the following views... class ContactListView(APIView): throttle_scope = 'contacts' ... - + class ContactDetailView(ApiView): throttle_scope = 'contacts' ... - class UploadView(APIView): + class UploadView(APIView): throttle_scope = 'uploads' ... - + ...and the following settings. REST_FRAMEWORK = { diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md index 194a7a6b3..31c62682f 100644 --- a/docs/api-guide/views.md +++ b/docs/api-guide/views.md @@ -1,4 +1,5 @@ - +source: decorators.py + views.py # Class Based Views @@ -26,7 +27,7 @@ For example: class ListUsers(APIView): """ View to list all users in the system. - + * Requires token authentication. * Only admin users are able to access this view. """ @@ -54,7 +55,7 @@ The following attributes control the pluggable aspects of API views. ### .permission_classes -### .content_negotiation_class +### .content_negotiation_class ## API policy instantiation methods diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 9030e3ee0..9249d8756 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -1,4 +1,4 @@ - +source: viewsets.py # ViewSets diff --git a/docs/theme/content.html b/docs/theme/content.html new file mode 100644 index 000000000..93a437ff8 --- /dev/null +++ b/docs/theme/content.html @@ -0,0 +1,11 @@ +{% if meta.source %} + + {% for filename in meta.source %} + + {{ filename }} + + {% endfor %} + +{% endif %} + +{{ content }} diff --git a/docs_theme/base.html b/docs_theme/base.html index 4ca6cd810..07582392f 100644 --- a/docs_theme/base.html +++ b/docs_theme/base.html @@ -118,7 +118,7 @@ a.fusion-poweredby {
    - {{ content }} + {% include "content.html" %}
    From 361827350a8bd4efb4d6a09bcb29c0185a5454ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Fri, 31 Oct 2014 10:25:19 -0400 Subject: [PATCH 1133/1652] Move content template into base.html --- docs/theme/content.html | 11 ----------- docs_theme/base.html | 10 +++++++++- 2 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 docs/theme/content.html diff --git a/docs/theme/content.html b/docs/theme/content.html deleted file mode 100644 index 93a437ff8..000000000 --- a/docs/theme/content.html +++ /dev/null @@ -1,11 +0,0 @@ -{% if meta.source %} - - {% for filename in meta.source %} - - {{ filename }} - - {% endfor %} - -{% endif %} - -{{ content }} diff --git a/docs_theme/base.html b/docs_theme/base.html index 07582392f..67290df60 100644 --- a/docs_theme/base.html +++ b/docs_theme/base.html @@ -118,7 +118,15 @@ a.fusion-poweredby {
    - {% include "content.html" %} + {% if meta.source %} + {% for filename in meta.source %} + + {{ filename }} + + {% endfor %} + {% endif %} + + {{ content }}
    From 3bfc82068b068defee470910a850757e4c12df3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Fri, 31 Oct 2014 11:38:27 -0400 Subject: [PATCH 1134/1652] Update tabbing and cleanup theme templates --- docs_theme/404.html | 197 +++++++++++++++++++---------------- docs_theme/base.html | 241 +++++++++++++++++++++++-------------------- docs_theme/nav.html | 51 +++++---- 3 files changed, 258 insertions(+), 231 deletions(-) diff --git a/docs_theme/404.html b/docs_theme/404.html index 864247e78..44993e37d 100644 --- a/docs_theme/404.html +++ b/docs_theme/404.html @@ -1,50 +1,54 @@ - - - Django REST framework - 404 - Page not found - - - - - - - - - - + + + + Django REST framework - 404 - Page not found + + + + + - - + + + + + - + - - - +
    - GitHub - Next - Previous - Search + GitHub + Next + Previous + Search @@ -121,81 +125,92 @@ --> -
    +
    +
    - - - + +

    404

    -

    Page not found

    +

    Page not found +

    Try the homepage, or search the documentation.

    -
    -
    -
    -
    + + + + + + + + -
    - +
    + + - - - - - - + + + + - // Dynamically force sidenav to no higher than browser window - $('.side-nav').css('max-height', window.innerHeight - 130); - - $(function(){ - $(window).resize(function(){ - $('.side-nav').css('max-height', window.innerHeight - 130); - }); - }); - - + diff --git a/docs_theme/base.html b/docs_theme/base.html index 67290df60..544e21881 100644 --- a/docs_theme/base.html +++ b/docs_theme/base.html @@ -1,56 +1,62 @@ - - - {{ page_title }} - - - - - - - - - - + + + + {{ page_title }} + + + + + - - + + + + + - - - + +{# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #} -a.fusion-poweredby { - display: block; - margin-top: 10px; -} -@media (max-width: 767px) { - div.promo {display: none;} -} - - - {# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #} - +
    @@ -59,32 +65,34 @@ a.fusion-poweredby {
    - - + +
    @@ -98,18 +106,16 @@ a.fusion-poweredby {
      {% for toc_item in toc %} -
    • {{ toc_item.title }}
      • - {% for toc_item in toc_item.children %} -
    • {{ toc_item.title }}
      • - {% endfor %} - {% endfor %} - - {# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #} - {% if current_page.input_path == 'index.md' %} -
      -
      - -
      +
    • {{ toc_item.title }} +
      • + {% for toc_item in toc_item.children %} +
    • {{ toc_item.title }} +
      • + {% endfor %} {% endfor %} {# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #} {% if current_page.input_path == 'index.md' %} +
      +
      + +
      {% endif %}
    @@ -127,42 +133,51 @@ a.fusion-poweredby { {% endif %} {{ content }} -
    -
    -
    -
    - -
    -
    + + + + + + + + +
    + + - - - - - + + + + + - + - // Dynamically force sidenav to no higher than browser window - $('.side-nav').css('max-height', window.innerHeight - 130); - - $(function(){ - $(window).resize(function(){ - $('.side-nav').css('max-height', window.innerHeight - 130); - }); - }); - - + diff --git a/docs_theme/nav.html b/docs_theme/nav.html index a7a72d68e..87e197b35 100644 --- a/docs_theme/nav.html +++ b/docs_theme/nav.html @@ -1,11 +1,10 @@ -
    - GitHub - Next - Previous - Search + GitHub + Next + Previous + Search @@ -14,31 +13,29 @@ Django REST framework
    {% if include_nav %} - - {% endif %} -
    +
    +
    From 06683b86b2b15153df52fe481b5c4eeb489a80cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Fri, 31 Oct 2014 13:02:11 -0400 Subject: [PATCH 1135/1652] Use single quotes for consistency Conflicts: mkdocs.yml --- mkdocs.yml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 2d1886a05..c70de9822 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -13,30 +13,30 @@ pages: - ['tutorial/4-authentication-and-permissions.md', ] - ['tutorial/5-relationships-and-hyperlinked-apis.md', ] - ['tutorial/6-viewsets-and-routers.md', ] - - ['api-guide/requests.md', "API Guide", ] - - ['api-guide/responses.md', "API Guide", ] - - ['api-guide/views.md', "API Guide", ] - - ['api-guide/generic-views.md', "API Guide", ] - - ['api-guide/viewsets.md', "API Guide", ] - - ['api-guide/routers.md', "API Guide", ] - - ['api-guide/parsers.md', "API Guide", ] - - ['api-guide/renderers.md', "API Guide", ] - - ['api-guide/serializers.md', "API Guide", ] - - ['api-guide/fields.md', "API Guide", ] - - ['api-guide/relations.md', "API Guide", ] - - ['api-guide/validators.md', "API Guide", ] - - ['api-guide/authentication.md', "API Guide", ] - - ['api-guide/permissions.md', "API Guide", ] - - ['api-guide/throttling.md', "API Guide", ] - - ['api-guide/filtering.md', "API Guide", ] - - ['api-guide/pagination.md', "API Guide", ] - - ['api-guide/content-negotiation.md', "API Guide", ] - - ['api-guide/format-suffixes.md', "API Guide", ] - - ['api-guide/reverse.md', "API Guide", ] - - ['api-guide/exceptions.md', "API Guide", ] - - ['api-guide/status-codes.md', "API Guide", ] - - ['api-guide/testing.md', "API Guide", ] - - ['api-guide/settings.md', "API Guide", ] + - ['api-guide/requests.md', 'API Guide', ] + - ['api-guide/responses.md', 'API Guide', ] + - ['api-guide/views.md', 'API Guide', ] + - ['api-guide/generic-views.md', 'API Guide', ] + - ['api-guide/viewsets.md', 'API Guide', ] + - ['api-guide/routers.md', 'API Guide', ] + - ['api-guide/parsers.md', 'API Guide', ] + - ['api-guide/renderers.md', 'API Guide', ] + - ['api-guide/serializers.md', 'API Guide', ] + - ['api-guide/fields.md', 'API Guide', ] + - ['api-guide/relations.md', 'API Guide', ] + - ['api-guide/validators.md', 'API Guide', ] + - ['api-guide/authentication.md', 'API Guide', ] + - ['api-guide/permissions.md', 'API Guide', ] + - ['api-guide/throttling.md', 'API Guide', ] + - ['api-guide/filtering.md', 'API Guide', ] + - ['api-guide/pagination.md', 'API Guide', ] + - ['api-guide/content-negotiation.md', 'API Guide', ] + - ['api-guide/format-suffixes.md', 'API Guide', ] + - ['api-guide/reverse.md', 'API Guide', ] + - ['api-guide/exceptions.md', 'API Guide', ] + - ['api-guide/status-codes.md', 'API Guide', ] + - ['api-guide/testing.md', 'API Guide', ] + - ['api-guide/settings.md', 'API Guide', ] - ['topics/documenting-your-api.md', ] - ['topics/ajax-csrf-cors.md', ] - ['topics/browser-enhancements.md', ] From 200e0b17daecd07de6d1f9926a430d29b3ee948f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Fri, 31 Oct 2014 13:03:39 -0400 Subject: [PATCH 1136/1652] Clean up extra white space --- docs/topics/2.2-announcement.md | 8 ++++---- docs/topics/2.3-announcement.md | 8 ++++---- docs/topics/documenting-your-api.md | 8 ++++---- docs/topics/kickstarter-announcement.md | 2 +- docs/topics/release-notes.md | 2 +- docs/topics/rest-framework-2-announcement.md | 4 ++-- docs/topics/writable-nested-serializers.md | 10 +++++----- docs/tutorial/1-serialization.md | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/topics/2.2-announcement.md b/docs/topics/2.2-announcement.md index a997c7829..1df52cff2 100644 --- a/docs/topics/2.2-announcement.md +++ b/docs/topics/2.2-announcement.md @@ -42,7 +42,7 @@ The 2.2 release makes a few changes to the API, in order to make it more consist The `ManyRelatedField()` style is being deprecated in favor of a new `RelatedField(many=True)` syntax. -For example, if a user is associated with multiple questions, which we want to represent using a primary key relationship, we might use something like the following: +For example, if a user is associated with multiple questions, which we want to represent using a primary key relationship, we might use something like the following: class UserSerializer(serializers.HyperlinkedModelSerializer): questions = serializers.PrimaryKeyRelatedField(many=True) @@ -58,10 +58,10 @@ The change also applies to serializers. If you have a nested serializer, you sh class Meta: model = Track fields = ('name', 'duration') - + class AlbumSerializer(serializer.ModelSerializer): tracks = TrackSerializer(many=True) - + class Meta: model = Album fields = ('album_name', 'artist', 'tracks') @@ -87,7 +87,7 @@ For example, is a user account has an optional foreign key to a company, that yo This is in line both with the rest of the serializer fields API, and with Django's `Form` and `ModelForm` API. -Using `required` throughout the serializers API means you won't need to consider if a particular field should take `blank` or `null` arguments instead of `required`, and also means there will be more consistent behavior for how fields are treated when they are not present in the incoming data. +Using `required` throughout the serializers API means you won't need to consider if a particular field should take `blank` or `null` arguments instead of `required`, and also means there will be more consistent behavior for how fields are treated when they are not present in the incoming data. The `null=True` argument will continue to function, and will imply `required=False`, but will raise a `PendingDeprecationWarning`. diff --git a/docs/topics/2.3-announcement.md b/docs/topics/2.3-announcement.md index 7c800afa0..9c9f3e9f6 100644 --- a/docs/topics/2.3-announcement.md +++ b/docs/topics/2.3-announcement.md @@ -27,7 +27,7 @@ As an example of just how simple REST framework APIs can now be, here's an API w class GroupViewSet(viewsets.ModelViewSet): model = Group - + # Routers provide an easy way of automatically determining the URL conf router = routers.DefaultRouter() router.register(r'users', UserViewSet) @@ -197,13 +197,13 @@ Usage of the old-style attributes continues to be supported, but will raise a `P For most cases APIs using model fields will behave as previously, however if you are using a custom renderer, not provided by REST framework, then you may now need to add support for rendering `Decimal` instances to your renderer implementation. -## ModelSerializers and reverse relationships +## ModelSerializers and reverse relationships The support for adding reverse relationships to the `fields` option on a `ModelSerializer` class means that the `get_related_field` and `get_nested_field` method signatures have now changed. In the unlikely event that you're providing a custom serializer class, and implementing these methods you should note the new call signature for both methods is now `(self, model_field, related_model, to_many)`. For reverse relationships `model_field` will be `None`. -The old-style signature will continue to function but will raise a `PendingDeprecationWarning`. +The old-style signature will continue to function but will raise a `PendingDeprecationWarning`. ## View names and descriptions @@ -211,7 +211,7 @@ The mechanics of how the names and descriptions used in the browseable API are g If you've been customizing this behavior, for example perhaps to use `rst` markup for the browseable API, then you'll need to take a look at the implementation to see what updates you need to make. -Note that the relevant methods have always been private APIs, and the docstrings called them out as intended to be deprecated. +Note that the relevant methods have always been private APIs, and the docstrings called them out as intended to be deprecated. --- diff --git a/docs/topics/documenting-your-api.md b/docs/topics/documenting-your-api.md index e20f97122..d65e251f1 100644 --- a/docs/topics/documenting-your-api.md +++ b/docs/topics/documenting-your-api.md @@ -54,7 +54,7 @@ The title that is used in the browsable API is generated from the view class nam For example, the view `UserListView`, will be named `User List` when presented in the browsable API. -When working with viewsets, an appropriate suffix is appended to each generated view. For example, the view set `UserViewSet` will generate views named `User List` and `User Instance`. +When working with viewsets, an appropriate suffix is appended to each generated view. For example, the view set `UserViewSet` will generate views named `User List` and `User Instance`. #### Setting the description @@ -65,9 +65,9 @@ If the python `markdown` library is installed, then [markdown syntax][markdown] class AccountListView(views.APIView): """ Returns a list of all **active** accounts in the system. - + For more details on how accounts are activated please [see here][ref]. - + [ref]: http://example.com/activating-accounts """ @@ -84,7 +84,7 @@ You can modify the response behavior to `OPTIONS` requests by overriding the `me def metadata(self, request): """ Don't include the view description in OPTIONS responses. - """ + """ data = super(ExampleView, self).metadata(request) data.pop('description') return data diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 7d1f6d0eb..e8bad95be 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -160,4 +160,4 @@ The following individuals made a significant financial contribution to the devel ### Supporters -There were also almost 300 further individuals choosing to help fund the project at other levels or choosing to give anonymously. Again, thank you, thank you, thank you! \ No newline at end of file +There were also almost 300 further individuals choosing to help fund the project at other levels or choosing to give anonymously. Again, thank you, thank you, thank you! diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 88780c3fb..9fca949ab 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -63,7 +63,7 @@ You can determine your currently installed version using `pip freeze`: * Bugfix: Fix migration in `authtoken` application. * Bugfix: Allow selection of integer keys in nested choices. * Bugfix: Return `None` instead of `'None'` in `CharField` with `allow_none=True`. -* Bugfix: Ensure custom model fields map to equivelent serializer fields more reliably. +* Bugfix: Ensure custom model fields map to equivelent serializer fields more reliably. * Bugfix: `DjangoFilterBackend` no longer quietly changes queryset ordering. ### 2.4.2 diff --git a/docs/topics/rest-framework-2-announcement.md b/docs/topics/rest-framework-2-announcement.md index f1060d90b..a7746932e 100644 --- a/docs/topics/rest-framework-2-announcement.md +++ b/docs/topics/rest-framework-2-announcement.md @@ -8,7 +8,7 @@ What it is, and why you should care. --- -**Announcement:** REST framework 2 released - Tue 30th Oct 2012 +**Announcement:** REST framework 2 released - Tue 30th Oct 2012 --- @@ -37,7 +37,7 @@ REST framework 2 includes a totally re-worked serialization engine, that was ini * A declarative serialization API, that mirrors Django's `Forms`/`ModelForms` API. * Structural concerns are decoupled from encoding concerns. * Able to support rendering and parsing to many formats, including both machine-readable representations and HTML forms. -* Validation that can be mapped to obvious and comprehensive error responses. +* Validation that can be mapped to obvious and comprehensive error responses. * Serializers that support both nested, flat, and partially-nested representations. * Relationships that can be expressed as primary keys, hyperlinks, slug fields, and other custom representations. diff --git a/docs/topics/writable-nested-serializers.md b/docs/topics/writable-nested-serializers.md index abc6a82f7..ed614bd24 100644 --- a/docs/topics/writable-nested-serializers.md +++ b/docs/topics/writable-nested-serializers.md @@ -8,7 +8,7 @@ Although flat data structures serve to properly delineate between the individual Nested data structures are easy enough to work with if they're read-only - simply nest your serializer classes and you're good to go. However, there are a few more subtleties to using writable nested serializers, due to the dependencies between the various model instances, and the need to save or delete multiple instances in a single action. -## One-to-many data structures +## One-to-many data structures *Example of a **read-only** nested serializer. Nothing complex to worry about here.* @@ -16,10 +16,10 @@ Nested data structures are easy enough to work with if they're read-only - simpl class Meta: model = ToDoItem fields = ('text', 'is_completed') - + class ToDoListSerializer(serializers.ModelSerializer): items = ToDoItemSerializer(many=True, read_only=True) - + class Meta: model = ToDoList fields = ('title', 'items') @@ -31,7 +31,7 @@ Some example output from our serializer. 'items': { {'text': 'Compile playlist', 'is_completed': True}, {'text': 'Send invites', 'is_completed': False}, - {'text': 'Clean house', 'is_completed': False} + {'text': 'Clean house', 'is_completed': False} } } @@ -44,4 +44,4 @@ Let's take a look at updating our nested one-to-many data structure. ### Making PATCH requests -[cite]: http://jsonapi.org/format/#url-based-json-api \ No newline at end of file +[cite]: http://jsonapi.org/format/#url-based-json-api diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index db5b9ea7b..f9027b688 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -134,7 +134,7 @@ A serializer class is very similar to a Django `Form` class, and includes simila The field flags can also control how the serializer should be displayed in certain circumstances, such as when rendering to HTML. The `style={'type': 'textarea'}` flag above is equivelent to using `widget=widgets.Textarea` on a Django `Form` class. This is particularly useful for controlling how the browsable API should be displayed, as we'll see later in the tutorial. -We can actually also save ourselves some time by using the `ModelSerializer` class, as we'll see later, but for now we'll keep our serializer definition explicit. +We can actually also save ourselves some time by using the `ModelSerializer` class, as we'll see later, but for now we'll keep our serializer definition explicit. ## Working with Serializers From b8aa7e0c34dc839a47b679aa2402d0f1b98704a0 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Tue, 18 Nov 2014 17:16:54 +0000 Subject: [PATCH 1137/1652] Fix previous and next links --- docs_theme/nav.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs_theme/nav.html b/docs_theme/nav.html index 87e197b35..0f3b9871c 100644 --- a/docs_theme/nav.html +++ b/docs_theme/nav.html @@ -2,8 +2,12 @@
    GitHub - Next - Previous + + Search From 8677316959c65da1305b0bfc7c06733093d5af3e Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Tue, 18 Nov 2014 17:20:42 +0000 Subject: [PATCH 1138/1652] Disable prev and next links --- docs_theme/nav.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs_theme/nav.html b/docs_theme/nav.html index 0f3b9871c..e6ab01bad 100644 --- a/docs_theme/nav.html +++ b/docs_theme/nav.html @@ -2,10 +2,10 @@
    GitHub - - Search From 6f28adeefe21df4330fe70bc20cb457e249a29d2 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 19 Nov 2014 08:56:14 +0000 Subject: [PATCH 1139/1652] Added nicer page titles --- mkdocs.yml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index c70de9822..d5feab65c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -7,12 +7,12 @@ repo_url: https://github.com/tomchristie/django-rest-framework pages: - ['index.md', ] - ['tutorial/quickstart.md', ] - - ['tutorial/1-serialization.md', ] - - ['tutorial/2-requests-and-responses.md', ] - - ['tutorial/3-class-based-views.md', ] - - ['tutorial/4-authentication-and-permissions.md', ] - - ['tutorial/5-relationships-and-hyperlinked-apis.md', ] - - ['tutorial/6-viewsets-and-routers.md', ] + - ['tutorial/1-serialization.md', "Tutorial", "1 - Serialization"] + - ['tutorial/2-requests-and-responses.md', "Tutorial", "2 - Requests and responses"] + - ['tutorial/3-class-based-views.md', "Tutorial", "3 - Class based views"] + - ['tutorial/4-authentication-and-permissions.md', "Tutorial", "4 - Authentication and permissions"] + - ['tutorial/5-relationships-and-hyperlinked-apis.md', "Tutorial", "5 - Relationships and hyperlinked APIs"] + - ['tutorial/6-viewsets-and-routers.md', "Tutorial", "6- Viewsets and routers"] - ['api-guide/requests.md', 'API Guide', ] - ['api-guide/responses.md', 'API Guide', ] - ['api-guide/views.md', 'API Guide', ] @@ -22,8 +22,8 @@ pages: - ['api-guide/parsers.md', 'API Guide', ] - ['api-guide/renderers.md', 'API Guide', ] - ['api-guide/serializers.md', 'API Guide', ] - - ['api-guide/fields.md', 'API Guide', ] - - ['api-guide/relations.md', 'API Guide', ] + - ['api-guide/fields.md', 'API Guide', "Serializer fields"] + - ['api-guide/relations.md', 'API Guide', "Serializer relations"] - ['api-guide/validators.md', 'API Guide', ] - ['api-guide/authentication.md', 'API Guide', ] - ['api-guide/permissions.md', 'API Guide', ] @@ -32,25 +32,25 @@ pages: - ['api-guide/pagination.md', 'API Guide', ] - ['api-guide/content-negotiation.md', 'API Guide', ] - ['api-guide/format-suffixes.md', 'API Guide', ] - - ['api-guide/reverse.md', 'API Guide', ] + - ['api-guide/reverse.md', 'API Guide', 'Returning URLs'] - ['api-guide/exceptions.md', 'API Guide', ] - ['api-guide/status-codes.md', 'API Guide', ] - ['api-guide/testing.md', 'API Guide', ] - ['api-guide/settings.md', 'API Guide', ] - - ['topics/documenting-your-api.md', ] - - ['topics/ajax-csrf-cors.md', ] - - ['topics/browser-enhancements.md', ] - - ['topics/browsable-api.md', ] - - ['topics/rest-hypermedia-hateoas.md', ] - - ['topics/third-party-resources.md', ] - - ['topics/contributing.md', ] - - ['topics/rest-framework-2-announcement.md', ] - - ['topics/2.2-announcement.md', ] - - ['topics/2.3-announcement.md', ] - - ['topics/2.4-announcement.md', ] - - ['topics/kickstarter-announcement.md', ] - - ['topics/release-notes.md', ] - - ['topics/credits.md', ] + - ['topics/documenting-your-api.md', 'Topics', 'Documenting your API'] + - ['topics/ajax-csrf-cors.md', 'Topics', 'AJAX, CSRF & CORS'] + - ['topics/browser-enhancements.md', 'Topics',] + - ['topics/browsable-api.md', 'Topics', 'The Browsable API'] + - ['topics/rest-hypermedia-hateoas.md', 'Topics', 'REST, Hypermedia & HATEOAS'] + - ['topics/third-party-resources.md', 'Topics', 'Third Party Resources'] + - ['topics/contributing.md', 'Topics', 'Contributing to REST framework'] + - ['topics/rest-framework-2-announcement.md', 'Topics', '2.0 Announcement'] + - ['topics/2.2-announcement.md', 'Topics', '2.2 Announcement'] + - ['topics/2.3-announcement.md', 'Topics', '2.3 Announcement'] + - ['topics/2.4-announcement.md', 'Topics', '2.4 Announcement'] + - ['topics/kickstarter-announcement.md', 'Topics', 'Kickstarter Announcement'] + - ['topics/release-notes.md', 'Topics', 'Release Notes'] + - ['topics/credits.md', 'Topics', 'Credits'] site_dir: html theme_dir: docs_theme From df33538f141f5d5d4a9f905a56cad0f881fb20de Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 19 Nov 2014 12:41:58 +0000 Subject: [PATCH 1140/1652] Make the quotes consistent --- mkdocs.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index d5feab65c..925586d19 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -7,12 +7,12 @@ repo_url: https://github.com/tomchristie/django-rest-framework pages: - ['index.md', ] - ['tutorial/quickstart.md', ] - - ['tutorial/1-serialization.md', "Tutorial", "1 - Serialization"] - - ['tutorial/2-requests-and-responses.md', "Tutorial", "2 - Requests and responses"] - - ['tutorial/3-class-based-views.md', "Tutorial", "3 - Class based views"] - - ['tutorial/4-authentication-and-permissions.md', "Tutorial", "4 - Authentication and permissions"] - - ['tutorial/5-relationships-and-hyperlinked-apis.md', "Tutorial", "5 - Relationships and hyperlinked APIs"] - - ['tutorial/6-viewsets-and-routers.md', "Tutorial", "6- Viewsets and routers"] + - ['tutorial/1-serialization.md', 'Tutorial', '1 - Serialization'] + - ['tutorial/2-requests-and-responses.md', 'Tutorial', '2 - Requests and responses'] + - ['tutorial/3-class-based-views.md', 'Tutorial', '3 - Class based views'] + - ['tutorial/4-authentication-and-permissions.md', 'Tutorial', '4 - Authentication and permissions'] + - ['tutorial/5-relationships-and-hyperlinked-apis.md', 'Tutorial', '5 - Relationships and hyperlinked APIs'] + - ['tutorial/6-viewsets-and-routers.md', 'Tutorial', '6- Viewsets and routers'] - ['api-guide/requests.md', 'API Guide', ] - ['api-guide/responses.md', 'API Guide', ] - ['api-guide/views.md', 'API Guide', ] @@ -22,8 +22,8 @@ pages: - ['api-guide/parsers.md', 'API Guide', ] - ['api-guide/renderers.md', 'API Guide', ] - ['api-guide/serializers.md', 'API Guide', ] - - ['api-guide/fields.md', 'API Guide', "Serializer fields"] - - ['api-guide/relations.md', 'API Guide', "Serializer relations"] + - ['api-guide/fields.md', 'API Guide', 'Serializer fields'] + - ['api-guide/relations.md', 'API Guide', 'Serializer relations'] - ['api-guide/validators.md', 'API Guide', ] - ['api-guide/authentication.md', 'API Guide', ] - ['api-guide/permissions.md', 'API Guide', ] @@ -54,5 +54,5 @@ pages: site_dir: html theme_dir: docs_theme -copyright: Copyright © 2014, Tom Christie. +copyright: Copyright © 2014, Tom Christie. google_analytics: ['UA-18852272-2', 'django-rest-framework.org'] From 5a6bdd01ba9f8731c0963c355b41839860a5a4de Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 19 Nov 2014 15:59:25 +0000 Subject: [PATCH 1141/1652] Highlight H1's in the TOC --- docs_theme/base.html | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/docs_theme/base.html b/docs_theme/base.html index 544e21881..02be73ee8 100644 --- a/docs_theme/base.html +++ b/docs_theme/base.html @@ -106,12 +106,21 @@
      {% for toc_item in toc %} -
    • {{ toc_item.title }} -
      • - {% for toc_item in toc_item.children %} -
    • {{ toc_item.title }} -
      • - {% endfor %} {% endfor %} {# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #} {% if current_page.input_path == 'index.md' %} + +
    • + {{ toc_item.title }} +
      • + + {% for toc_item in toc_item.children %} +
    • + {{ toc_item.title }} +
      • + {% endfor %} + + {% endfor %} + + {# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #} + {% if current_page.input_path == 'index.md' %}
      From deb2bb4376600187c881f91791c278d9486ea8d9 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 19 Nov 2014 16:15:47 +0000 Subject: [PATCH 1142/1652] Add Home link to the theme --- docs_theme/nav.html | 1 + 1 file changed, 1 insertion(+) diff --git a/docs_theme/nav.html b/docs_theme/nav.html index e6ab01bad..622cb33bf 100644 --- a/docs_theme/nav.html +++ b/docs_theme/nav.html @@ -19,6 +19,7 @@ {% if include_nav %}
        +
      • Home
        • {% for nav_item in nav %} {% if nav_item.children %}
      • {{ nav_item.title }} From a0c12bf7c5cf96fbbdf0a0eb12702a093ccd3a51 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 19 Nov 2014 16:22:23 +0000 Subject: [PATCH 1143/1652] Change the background of the selected page on the dropdown --- docs/css/default.css | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/css/default.css b/docs/css/default.css index 7f3acfed2..8c9cd5363 100644 --- a/docs/css/default.css +++ b/docs/css/default.css @@ -181,7 +181,7 @@ body{ } .navbar .navbar-inner .nav li, .navbar .navbar-inner .nav li a, .navbar .navbar-inner .brand{ - color: white; + color: white; } .nav-list > .active > a, .navbar .navbar-inner .nav li a:hover { @@ -190,8 +190,20 @@ body{ } .navbar .navbar-inner .dropdown-menu li a, .navbar .navbar-inner .dropdown-menu li{ - color: #A30000; + color: #A30000; } + +.dropdown-menu .active > a, +.dropdown-menu .active > a:hover { + background-image: none; +} + +.navbar-inverse .nav .dropdown .active > a, +.navbar-inverse .nav .dropdown .active > a:hover, +.navbar-inverse .nav .dropdown .active > a:focus { + background-color: #eeeeee; +} + .navbar .navbar-inner .dropdown-menu li a:hover{ background: #eeeeee; color: #c20000; From f2d4e51aaa33edf35921c459327b0a0ba2526ced Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Wed, 19 Nov 2014 16:22:39 +0000 Subject: [PATCH 1144/1652] Mark the homepage as active when visited --- docs_theme/nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs_theme/nav.html b/docs_theme/nav.html index 622cb33bf..84982ff31 100644 --- a/docs_theme/nav.html +++ b/docs_theme/nav.html @@ -19,7 +19,7 @@ {% if include_nav %}
          -
        • Home
          • +
        • Home
          • {% for nav_item in nav %} {% if nav_item.children %}
        • {{ nav_item.title }} From aa1a844154e96719c9a91f604286eb0f436f32ea Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Tue, 25 Nov 2014 13:05:48 +0000 Subject: [PATCH 1145/1652] Add The title to the top of the TOC for the home page --- docs_theme/base.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs_theme/base.html b/docs_theme/base.html index 02be73ee8..228b0ba4f 100644 --- a/docs_theme/base.html +++ b/docs_theme/base.html @@ -105,6 +105,13 @@ -->
            + + {% if current_page.input_path == 'index.md' %} +
          • + Django REST framework +
            • + {% endif %} + {% for toc_item in toc %}
          • From 935d94c034b63cbe699d5d0ef04f472c3aeb3237 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Tue, 25 Nov 2014 13:07:35 +0000 Subject: [PATCH 1146/1652] Don't add main to the top level items on the home page --- docs_theme/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs_theme/base.html b/docs_theme/base.html index 228b0ba4f..004fbacd1 100644 --- a/docs_theme/base.html +++ b/docs_theme/base.html @@ -114,7 +114,7 @@ {% for toc_item in toc %} -
          • +
          • {{ toc_item.title }}
            • From 4d28a0930995a3a73860d6a2d405e12abbf5d653 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Tue, 25 Nov 2014 13:09:47 +0000 Subject: [PATCH 1147/1652] Refer to the current_page title rather than filename --- docs_theme/base.html | 11 ++++------- docs_theme/nav.html | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docs_theme/base.html b/docs_theme/base.html index 004fbacd1..cefaef484 100644 --- a/docs_theme/base.html +++ b/docs_theme/base.html @@ -54,9 +54,7 @@ } -{# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #} - - +
            @@ -106,7 +104,7 @@
              - {% if current_page.input_path == 'index.md' %} + {% if current_page.title == 'Home' %}
            • Django REST framework
              • @@ -114,7 +112,7 @@ {% for toc_item in toc %} -
            • +
            • {{ toc_item.title }}
              • @@ -126,8 +124,7 @@ {% endfor %} - {# TODO: This is a bit of a hack. We don't want to refer to the file specifically. #} - {% if current_page.input_path == 'index.md' %} + {% if current_page.title == 'Home' %}
              diff --git a/docs_theme/nav.html b/docs_theme/nav.html index 84982ff31..24304b8a8 100644 --- a/docs_theme/nav.html +++ b/docs_theme/nav.html @@ -19,7 +19,7 @@ {% if include_nav %}
                -
              • Home
                • +
              • Home
                • {% for nav_item in nav %} {% if nav_item.children %}
              • {{ nav_item.title }} From 673f48242f34ee6b7ba91ab4cf8a67f1bb26a272 Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Tue, 25 Nov 2014 13:11:30 +0000 Subject: [PATCH 1148/1652] Remove commented out title --- docs/index.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/index.md b/docs/index.md index 6288efa3c..ca10befe3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -26,9 +26,6 @@ Django REST Framework

                - Django REST framework is a powerful and flexible toolkit that makes it easy to build Web APIs. From 66fc51de5c4622073e7e6cfd12cc7c4a1a8ba60c Mon Sep 17 00:00:00 2001 From: Dougal Matthews Date: Tue, 25 Nov 2014 13:14:51 +0000 Subject: [PATCH 1149/1652] Use the is_homepage property. --- docs_theme/base.html | 8 ++++---- docs_theme/nav.html | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs_theme/base.html b/docs_theme/base.html index cefaef484..6bfccab26 100644 --- a/docs_theme/base.html +++ b/docs_theme/base.html @@ -54,7 +54,7 @@ } - +
                @@ -104,7 +104,7 @@
                  - {% if current_page.title == 'Home' %} + {% if current_page.is_homepage %}
                • Django REST framework
                  • @@ -112,7 +112,7 @@ {% for toc_item in toc %} -
                • +
                • {{ toc_item.title }}
                  • @@ -124,7 +124,7 @@ {% endfor %} - {% if current_page.title == 'Home' %} + {% if current_page.is_homepage %}
                  diff --git a/docs_theme/nav.html b/docs_theme/nav.html index 24304b8a8..ca1afc0ec 100644 --- a/docs_theme/nav.html +++ b/docs_theme/nav.html @@ -19,7 +19,7 @@ {% if include_nav %}
                    -
                  • Home
                    • +
                  • Home
                    • {% for nav_item in nav %} {% if nav_item.children %}
                  • {{ nav_item.title }} From e1b8412eed18e305d7b6338a133b7f6a1270184c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Tue, 25 Nov 2014 09:22:29 -0400 Subject: [PATCH 1150/1652] Add markdown and PyYAML to tox test requirements --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index a7200a3f3..b33c07002 100644 --- a/tox.ini +++ b/tox.ini @@ -23,6 +23,8 @@ deps = pytest-django==2.6.1 django-filter==0.7 defusedxml==0.3 + markdown>=2.1.0 + PyYAML>=3.10 [testenv:py27-flake8] deps = From 38fe2c9dad89e58c97aad26fa16d91dddf377ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20Padilla?= Date: Tue, 25 Nov 2014 09:36:57 -0400 Subject: [PATCH 1151/1652] Document writing third party packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add the following sections: - “About Third Party Packages” - “How to create a Third Party Package” - “Existing Third Party Packages” Resolve #2043 --- docs/topics/third-party-resources.md | 332 +++++++++++++++++++++++---- 1 file changed, 281 insertions(+), 51 deletions(-) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 0317dd64c..d6a4346e3 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -1,92 +1,322 @@ # Third Party Resources +## About Third Party Packages + +Third Party Packages allow developers to share code that extends the functionality of Django REST framework, in order to support additional use-cases. + +We **support**, **encourage** and **strongly favour** the creation of Third Party Packages to encapsulate new behaviour rather than adding additional functionality directly to Django REST Framework. + +We aim to make creating Third Party Packages as easy as possible, whilst keeping the **simplicity** of the core API and ensuring that **maintainance** of the main project remains under control. If a Third Party Package proves popular it is relatively easy to move it into the main project; removing features is much more problematic. + +If you have an idea for a new feature please consider how it may be packaged as a Third Party Package. We're always happy to dicuss ideas on the [Mailing List][discussion-group]. + +## How to create a Third Party Package + +### Creating your package + +You can use [this cookiecutter template][cookiecutter] for creating reusable Django REST Framework packages quickly. Cookiecutter creates projects from project templates. While optional, this cookiecutter template includes best practices from Django REST framework and other packages, as well as a Travis CI configuration, Tox configuration, and a sane setup.py for easy PyPI registration/distribution. + +Note: Let us know if you have an alternate cookiecuter package so we can also link to it. + +#### Running the initial cookiecutter command + +To run the initial cookiecutter command, you'll first need to install the Python `cookiecutter` package. + + $ pip install cookiecutter + +Once `cookiecutter` is installed just run the following to create a new project. + + $ cookiecutter gh:jpadilla/cookiecutter-django-rest-framework + +You'll be prompted for some questions, answer them, then it'll create your Python package in the current working directory based on those values. + + full_name (default is "Your full name here")? Johnny Appleseed + email (default is "you@example.com")? jappleseed@example.com + github_username (default is "yourname")? jappleseed + pypi_project_name (default is "dj-package")? djangorestframework-custom-auth + repo_name (default is "dj-package")? django-rest-framework-custom-auth + app_name (default is "djpackage")? custom_auth + project_short_description (default is "Your project description goes here")? + year (default is "2014")? + version (default is "0.1.0")? + +#### Getting it onto GitHub + +To put your project up on GitHub, you'll need a repository for it to live in. You can create a new repository [here][new-repo]. If you need help, check out the [Create A Repo][create-a-repo] article on GitHub. + + +#### Adding to Travis CI + +We recommend using [Travis CI][travis-ci], a hosted continuous integration service which integrates well with GitHub and is free for public repositories. + +To get started with Travis CI, [sign in][travis-ci] with your GitHub account. Once you're signed in, go to your [profile page][travis-profile] and enable the service hook for the repository you want. + +If you use the cookiecutter template, your project will already contain a `.travis.yml` file which Travis CI will use to build your project and run tests. By default, builds are triggered everytime you push to your repository or create Pull Request. + +#### Uploading to PyPI + +Once you've got at least a prototype working and tests running, you should publish it on PyPI to allow others to install it via `pip`. + +You must [register][pypi-register] an account before publishing to PyPI. + +To register your package on PyPI run the following command. + + $ python setup.py register + +If this is the first time publishing to PyPI, you'll be prompted to login. + +Note: Before publishing you'll need to make sure you have the latest pip that supports `wheel` as well as install the `wheel` package. + + $ pip install --upgrade pip + $ pip install wheel + +After this, every time you want to release a new version on PyPI just run the following command. + + $ python setup.py publish + You probably want to also tag the version now: + git tag -a {0} -m 'version 0.1.0' + git push --tags + +After releasing a new version to PyPI, it's always a good idea to tag the version and make available as a GitHub Release. + +We recommend to follow [Semantic Versioning][semver] for your package's versions. + +### Development + +#### Version requirements + +The cookiecutter template assumes a set of supported versions will be provided for Python and Django. Make sure you correctly update your requirements, docs, `tox.ini`, `.travis.yml`, and `setup.py` to match the set of versions you wish to support. + +#### Tests + +The cookiecutter template includes a `runtests.py` which uses the `pytest` package as a test runner. + +Before running, you'll need to install a couple test requirements. + + $ pip install -r requirements-test.txt + +Once requirements installed, you can run `runtests.py`. + + $ ./runtests.py + +Run using a more concise output style. + + $ ./runtests.py -q + +Run the tests using a more concise output style, no coverage, no flake8. + + $ ./runtests.py --fast + +Don't run the flake8 code linting. + + $ ./runtests.py --nolint + +Only run the flake8 code linting, don't run the tests. + + $ ./runtests.py --lintonly + +Run the tests for a given test case. + + $ ./runtests.py MyTestCase + +Run the tests for a given test method. + + $ ./runtests.py MyTestCase.test_this_method + +Shorter form to run the tests for a given test method. + + $ ./runtests.py test_this_method + +To run your tests against multiple versions of Python as different versions of requirements such as Django we recommend using `tox`. [Tox][tox-docs] is a generic virtualenv management and test command line tool. + +First, install `tox` globally. + + $ pip install tox + +To run `tox`, just simply run: + + $ tox + +To run a particular `tox` environment: + + $ tox -e envlist + +`envlist` is a comma-separated value to that specifies the environments to run tests against. To view a list of all possible test environments, run: + + $ tox -l + +#### Version compatibility + +Sometimes, in order to ensure your code works on various different versions of Django, Python or third party libraries, you'll need to run slightly different code depending on the environment. Any code that branches in this way should be isolated into a `compat.py` module, and should provide a single common interface that the rest of the codebase can use. + +Check out Django REST framework's [compat.py][drf-compat] for an example. + +### Once your package is available + +Once your package is decently documented and available on PyPI, you might want share it with others that might find it useful. + +#### Adding to the Django REST framework grid + +We suggest adding your package to the [REST Framework][rest-framework-grid] grid on Django Packages. + +#### Adding to the Django REST framework docs + +Create a [Pull Request][drf-create-pr] or [Issue][drf-create-issue] on GitHub, and we'll add a link to it from the main REST framework documentation. You can add your package under **Third party packages** of the API Guide section that best applies, like [Authentication][authentication] or [Permissions][permissions]. You can also link your package under the [Third Party Resources][third-party-resources] section. + +#### Announce on the discussion group. + +You can also let others know about your package through the [discussion group][discussion-group]. + +## Existing Third Party Packages + Django REST Framework has a growing community of developers, packages, and resources. -Check out a grid detailing all the packages and ecosystem around Django REST Framework at [Django Packages](https://www.djangopackages.com/grids/g/django-rest-framework/). +Check out a grid detailing all the packages and ecosystem around Django REST Framework at [Django Packages][rest-framework-grid]. -To submit new content, [open an issue](https://github.com/tomchristie/django-rest-framework/issues/new) or [create a pull request](https://github.com/tomchristie/django-rest-framework/). - -## Libraries and Extensions +To submit new content, [open an issue][drf-create-issue] or [create a pull request][drf-create-pr]. ### Authentication -* [djangorestframework-digestauth](https://github.com/juanriaza/django-rest-framework-digestauth) - Provides Digest Access Authentication support. -* [django-oauth-toolkit](https://github.com/evonove/django-oauth-toolkit) - Provides OAuth 2.0 support. -* [doac](https://github.com/Rediker-Software/doac) - Provides OAuth 2.0 support. -* [djangorestframework-jwt](https://github.com/GetBlimp/django-rest-framework-jwt) - Provides JSON Web Token Authentication support. -* [hawkrest](https://github.com/kumar303/hawkrest) - Provides Hawk HTTP Authorization. -* [djangorestframework-httpsignature](https://github.com/etoccalino/django-rest-framework-httpsignature) - Provides an easy to use HTTP Signature Authentication mechanism. -* [djoser](https://github.com/sunscrapers/djoser) - Provides a set of views to handle basic actions such as registration, login, logout, password reset and account activation. +* [djangorestframework-digestauth][djangorestframework-digestauth] - Provides Digest Access Authentication support. +* [django-oauth-toolkit][django-oauth-toolkit] - Provides OAuth 2.0 support. +* [doac][doac] - Provides OAuth 2.0 support. +* [djangorestframework-jwt][djangorestframework-jwt] - Provides JSON Web Token Authentication support. +* [hawkrest][hawkrest] - Provides Hawk HTTP Authorization. +* [djangorestframework-httpsignature][djangorestframework-httpsignature] - Provides an easy to use HTTP Signature Authentication mechanism. +* [djoser][djoser] - Provides a set of views to handle basic actions such as registration, login, logout, password reset and account activation. ### Permissions -* [drf-any-permissions](https://github.com/kevin-brown/drf-any-permissions) - Provides alternative permission handling. -* [djangorestframework-composed-permissions](https://github.com/niwibe/djangorestframework-composed-permissions) - Provides a simple way to define complex permissions. -* [rest_condition](https://github.com/caxap/rest_condition) - Another extension for building complex permissions in a simple and convenient way. +* [drf-any-permissions][drf-any-permissions] - Provides alternative permission handling. +* [djangorestframework-composed-permissions][djangorestframework-composed-permissions] - Provides a simple way to define complex permissions. +* [rest_condition][rest-condition] - Another extension for building complex permissions in a simple and convenient way. ### Serializers -* [django-rest-framework-mongoengine](https://github.com/umutbozkurt/django-rest-framework-mongoengine) - Serializer class that supports using MongoDB as the storage layer for Django REST framework. -* [djangorestframework-gis](https://github.com/djangonauts/django-rest-framework-gis) - Geographic add-ons -* [djangorestframework-hstore](https://github.com/djangonauts/django-rest-framework-hstore) - Serializer class to support django-hstore DictionaryField model field and its schema-mode feature. +* [django-rest-framework-mongoengine][django-rest-framework-mongoengine] - Serializer class that supports using MongoDB as the storage layer for Django REST framework. +* [djangorestframework-gis][djangorestframework-gis] - Geographic add-ons +* [djangorestframework-hstore][djangorestframework-hstore] - Serializer class to support django-hstore DictionaryField model field and its schema-mode feature. ### Serializer fields -* [drf-compound-fields](https://github.com/estebistec/drf-compound-fields) - Provides "compound" serializer fields, such as lists of simple values. -* [django-extra-fields](https://github.com/Hipo/drf-extra-fields) - Provides extra serializer fields. +* [drf-compound-fields][drf-compound-fields] - Provides "compound" serializer fields, such as lists of simple values. +* [django-extra-fields][django-extra-fields] - Provides extra serializer fields. ### Views -* [djangorestframework-bulk](https://github.com/miki725/django-rest-framework-bulk) - Implements generic view mixins as well as some common concrete generic views to allow to apply bulk operations via API requests. +* [djangorestframework-bulk][djangorestframework-bulk] - Implements generic view mixins as well as some common concrete generic views to allow to apply bulk operations via API requests. ### Routers -* [drf-nested-routers](https://github.com/alanjds/drf-nested-routers) - Provides routers and relationship fields for working with nested resources. -* [wq.db.rest](http://wq.io/docs/about-rest) - Provides an admin-style model registration API with reasonable default URLs and viewsets. +* [drf-nested-routers][drf-nested-routers] - Provides routers and relationship fields for working with nested resources. +* [wq.db.rest][wq.db.rest] - Provides an admin-style model registration API with reasonable default URLs and viewsets. ### Parsers -* [djangorestframework-msgpack](https://github.com/juanriaza/django-rest-framework-msgpack) - Provides MessagePack renderer and parser support. -* [djangorestframework-camel-case](https://github.com/vbabiy/djangorestframework-camel-case) - Provides camel case JSON renderers and parsers. +* [djangorestframework-msgpack][djangorestframework-msgpack] - Provides MessagePack renderer and parser support. +* [djangorestframework-camel-case][djangorestframework-camel-case] - Provides camel case JSON renderers and parsers. ### Renderers -* [djangorestframework-csv](https://github.com/mjumbewu/django-rest-framework-csv) - Provides CSV renderer support. -* [drf_ujson](https://github.com/gizmag/drf-ujson-renderer) - Implements JSON rendering using the UJSON package. -* [Django REST Pandas](https://github.com/wq/django-rest-pandas) - Pandas DataFrame-powered renderers including Excel, CSV, and SVG formats. +* [djangorestframework-csv][djangorestframework-csv] - Provides CSV renderer support. +* [drf_ujson][drf_ujson] - Implements JSON rendering using the UJSON package. +* [rest-pandas][rest-pandas] - Pandas DataFrame-powered renderers including Excel, CSV, and SVG formats. ### Filtering -* [djangorestframework-chain](https://github.com/philipn/django-rest-framework-chain) - Allows arbitrary chaining of both relations and lookup filters. +* [djangorestframework-chain][djangorestframework-chain] - Allows arbitrary chaining of both relations and lookup filters. ### Misc -* [djangorestrelationalhyperlink](https://github.com/fredkingham/django_rest_model_hyperlink_serializers_project) - A hyperlinked serialiser that can can be used to alter relationships via hyperlinks, but otherwise like a hyperlink model serializer. -* [django-rest-swagger](https://github.com/marcgibbons/django-rest-swagger) - An API documentation generator for Swagger UI. -* [django-rest-framework-proxy ](https://github.com/eofs/django-rest-framework-proxy) - Proxy to redirect incoming request to another API server. -* [gaiarestframework](https://github.com/AppsFuel/gaiarestframework) - Utils for django-rest-framewok -* [drf-extensions](https://github.com/chibisov/drf-extensions) - A collection of custom extensions -* [ember-data-django-rest-adapter](https://github.com/toranb/ember-data-django-rest-adapter) - An ember-data adapter +* [djangorestrelationalhyperlink][djangorestrelationalhyperlink] - A hyperlinked serialiser that can can be used to alter relationships via hyperlinks, but otherwise like a hyperlink model serializer. +* [django-rest-swagger][django-rest-swagger] - An API documentation generator for Swagger UI. +* [django-rest-framework-proxy][django-rest-framework-proxy] - Proxy to redirect incoming request to another API server. +* [gaiarestframework][gaiarestframework] - Utils for django-rest-framewok +* [drf-extensions][drf-extensions] - A collection of custom extensions +* [ember-data-django-rest-adapter][ember-data-django-rest-adapter] - An ember-data adapter -## Tutorials +## Other Resources -* [Beginner's Guide to the Django Rest Framework](http://code.tutsplus.com/tutorials/beginners-guide-to-the-django-rest-framework--cms-19786) -* [Getting Started with Django Rest Framework and AngularJS](http://blog.kevinastone.com/getting-started-with-django-rest-framework-and-angularjs.html) -* [End to end web app with Django-Rest-Framework & AngularJS](http://blog.mourafiq.com/post/55034504632/end-to-end-web-app-with-django-rest-framework) -* [Start Your API - django-rest-framework part 1](https://godjango.com/41-start-your-api-django-rest-framework-part-1/) -* [Permissions & Authentication - django-rest-framework part 2](https://godjango.com/43-permissions-authentication-django-rest-framework-part-2/) -* [ViewSets and Routers - django-rest-framework part 3](https://godjango.com/45-viewsets-and-routers-django-rest-framework-part-3/) -* [Django Rest Framework User Endpoint](http://richardtier.com/2014/02/25/django-rest-framework-user-endpoint/) -* [Check credentials using Django Rest Framework](http://richardtier.com/2014/03/06/110/) +### Tutorials -## Videos +* [Beginner's Guide to the Django Rest Framework][beginners-guide-to-the-django-rest-framework] +* [Getting Started with Django Rest Framework and AngularJS][getting-started-with-django-rest-framework-and-angularjs] +* [End to end web app with Django-Rest-Framework & AngularJS][end-to-end-web-app-with-django-rest-framework-angularjs] +* [Start Your API - django-rest-framework part 1][start-your-api-django-rest-framework-part-1] +* [Permissions & Authentication - django-rest-framework part 2][permissions-authentication-django-rest-framework-part-2] +* [ViewSets and Routers - django-rest-framework part 3][viewsets-and-routers-django-rest-framework-part-3] +* [Django Rest Framework User Endpoint][django-rest-framework-user-endpoint] +* [Check credentials using Django Rest Framework][check-credentials-using-django-rest-framework] -* [Ember and Django Part 1 (Video)](http://www.neckbeardrepublic.com/screencasts/ember-and-django-part-1) -* [Django Rest Framework Part 1 (Video)](http://www.neckbeardrepublic.com/screencasts/django-rest-framework-part-1) -* [Pyowa July 2013 - Django Rest Framework (Video)](http://www.youtube.com/watch?v=E1ZrehVxpBo) -* [django-rest-framework and angularjs (Video)](http://www.youtube.com/watch?v=Q8FRBGTJ020) +### Videos -## Articles +* [Ember and Django Part 1 (Video)][ember-and-django-part 1-video] +* [Django Rest Framework Part 1 (Video)][django-rest-framework-part-1-video] +* [Pyowa July 2013 - Django Rest Framework (Video)][pyowa-july-2013-django-rest-framework-video] +* [django-rest-framework and angularjs (Video)][django-rest-framework-and-angularjs-video] -* [Web API performance: profiling Django REST framework](http://dabapps.com/blog/api-performance-profiling-django-rest-framework/) -* [API Development with Django and Django REST Framework](https://bnotions.com/api-development-with-django-and-django-rest-framework/) +### Articles + +* [Web API performance: profiling Django REST framework][web-api-performance-profiling-django-rest-framework] +* [API Development with Django and Django REST Framework][api-development-with-django-and-django-rest-framework] + + +[cookiecutter]: https://github.com/jpadilla/cookiecutter-django-rest-framework +[new-repo]: https://github.com/new +[create-a-repo]: https://help.github.com/articles/create-a-repo/ +[travis-ci]: https://travis-ci.org +[travis-profile]: https://travis-ci.org/profile +[pypi-register]: https://pypi.python.org/pypi?%3Aaction=register_form +[semver]: http://semver.org/ +[tox-docs]: https://tox.readthedocs.org/en/latest/ +[drf-compat]: https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/compat.py +[rest-framework-grid]: https://www.djangopackages.com/grids/g/django-rest-framework/ +[drf-create-pr]: https://github.com/tomchristie/django-rest-framework/compare +[drf-create-issue]: https://github.com/tomchristie/django-rest-framework/issues/new +[authentication]: ../api-guide/authentication.md +[permissions]: ../api-guide/permissions.md +[discussion-group]: https://groups.google.com/forum/#!forum/django-rest-framework +[djangorestframework-digestauth]: https://github.com/juanriaza/django-rest-framework-digestauth +[django-oauth-toolkit]: https://github.com/evonove/django-oauth-toolkit +[doac]: https://github.com/Rediker-Software/doac +[djangorestframework-jwt]: https://github.com/GetBlimp/django-rest-framework-jwt +[hawkrest]: https://github.com/kumar303/hawkrest +[djangorestframework-httpsignature]: https://github.com/etoccalino/django-rest-framework-httpsignature +[djoser]: https://github.com/sunscrapers/djoser +[drf-any-permissions]: https://github.com/kevin-brown/drf-any-permissions +[djangorestframework-composed-permissions]: https://github.com/niwibe/djangorestframework-composed-permissions +[rest-condition]: https://github.com/caxap/rest_condition +[django-rest-framework-mongoengine]: https://github.com/umutbozkurt/django-rest-framework-mongoengine +[djangorestframework-gis]: https://github.com/djangonauts/django-rest-framework-gis +[djangorestframework-hstore]: https://github.com/djangonauts/django-rest-framework-hstore +[drf-compound-fields]: https://github.com/estebistec/drf-compound-fields +[django-extra-fields]: https://github.com/Hipo/drf-extra-fields +[djangorestframework-bulk]: https://github.com/miki725/django-rest-framework-bulk +[drf-nested-routers]: https://github.com/alanjds/drf-nested-routers +[wq.db.rest]: http://wq.io/docs/about-rest +[djangorestframework-msgpack]: https://github.com/juanriaza/django-rest-framework-msgpack +[djangorestframework-camel-case]: https://github.com/vbabiy/djangorestframework-camel-case +[djangorestframework-csv]: https://github.com/mjumbewu/django-rest-framework-csv +[drf_ujson]: https://github.com/gizmag/drf-ujson-renderer +[rest-pandas]: https://github.com/wq/django-rest-pandas +[djangorestframework-chain]: https://github.com/philipn/django-rest-framework-chain +[djangorestrelationalhyperlink]: https://github.com/fredkingham/django_rest_model_hyperlink_serializers_project +[django-rest-swagger]: https://github.com/marcgibbons/django-rest-swagger +[django-rest-framework-proxy]: https://github.com/eofs/django-rest-framework-proxy +[gaiarestframework]: https://github.com/AppsFuel/gaiarestframework +[drf-extensions]: https://github.com/chibisov/drf-extensions +[ember-data-django-rest-adapter]: https://github.com/toranb/ember-data-django-rest-adapter +[beginners-guide-to-the-django-rest-framework]: http://code.tutsplus.com/tutorials/beginners-guide-to-the-django-rest-framework--cms-19786 +[getting-started-with-django-rest-framework-and-angularjs]: http://blog.kevinastone.com/getting-started-with-django-rest-framework-and-angularjs.html +[end-to-end-web-app-with-django-rest-framework-angularjs]: http://blog.mourafiq.com/post/55034504632/end-to-end-web-app-with-django-rest-framework +[start-your-api-django-rest-framework-part-1]: https://godjango.com/41-start-your-api-django-rest-framework-part-1/ +[permissions-authentication-django-rest-framework-part-2]: https://godjango.com/43-permissions-authentication-django-rest-framework-part-2/ +[viewsets-and-routers-django-rest-framework-part-3]: https://godjango.com/45-viewsets-and-routers-django-rest-framework-part-3/ +[django-rest-framework-user-endpoint]: http://richardtier.com/2014/02/25/django-rest-framework-user-endpoint/ +[check-credentials-using-django-rest-framework]: http://richardtier.com/2014/03/06/110/ +[ember-and-django-part 1-video]: http://www.neckbeardrepublic.com/screencasts/ember-and-django-part-1 +[django-rest-framework-part-1-video]: http://www.neckbeardrepublic.com/screencasts/django-rest-framework-part-1 +[pyowa-july-2013-django-rest-framework-video]: http://www.youtube.com/watch?v=e1zrehvxpbo +[django-rest-framework-and-angularjs-video]: http://www.youtube.com/watch?v=q8frbgtj020 +[web-api-performance-profiling-django-rest-framework]: http://dabapps.com/blog/api-performance-profiling-django-rest-framework/ +[api-development-with-django-and-django-rest-framework]: https://bnotions.com/api-development-with-django-and-django-rest-framework/ From 64d8e3dcb6846610e1908e067962b0c8457a86f8 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 25 Nov 2014 13:50:35 +0000 Subject: [PATCH 1152/1652] Typo. Refs #2132. --- docs/topics/third-party-resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index d6a4346e3..ffb490af3 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -6,7 +6,7 @@ Third Party Packages allow developers to share code that extends the functionali We **support**, **encourage** and **strongly favour** the creation of Third Party Packages to encapsulate new behaviour rather than adding additional functionality directly to Django REST Framework. -We aim to make creating Third Party Packages as easy as possible, whilst keeping the **simplicity** of the core API and ensuring that **maintainance** of the main project remains under control. If a Third Party Package proves popular it is relatively easy to move it into the main project; removing features is much more problematic. +We aim to make creating Third Party Packages as easy as possible, whilst keeping the **simplicity** of the core API and ensuring that **maintenance** of the main project remains under control. If a Third Party Package proves popular it is relatively easy to move it into the main project; removing features is much more problematic. If you have an idea for a new feature please consider how it may be packaged as a Third Party Package. We're always happy to dicuss ideas on the [Mailing List][discussion-group]. From 653d626b3c3189260423bec7a1dd4faed9f8708d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Tue, 25 Nov 2014 11:33:18 -0400 Subject: [PATCH 1153/1652] Fix failing YAML tests --- tests/test_renderers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_renderers.py b/tests/test_renderers.py index a8fd5f460..5ef65dd77 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -9,7 +9,7 @@ from django.test import TestCase from django.utils import six, unittest from django.utils.translation import ugettext_lazy as _ from rest_framework import status, permissions -from rest_framework.compat import yaml, etree, StringIO +from rest_framework.compat import yaml, etree, StringIO, BytesIO from rest_framework.response import Response from rest_framework.views import APIView from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \ @@ -467,7 +467,7 @@ if yaml: obj = {'foo': ['bar', 'baz']} renderer = YAMLRenderer() content = renderer.render(obj, 'application/yaml') - self.assertEqual(content, _yaml_repr) + self.assertEqual(content.decode('utf-8'), _yaml_repr) def test_render_and_parse(self): """ @@ -480,7 +480,7 @@ if yaml: parser = YAMLParser() content = renderer.render(obj, 'application/yaml') - data = parser.parse(StringIO(content)) + data = parser.parse(BytesIO(content)) self.assertEqual(obj, data) def test_render_decimal(self): @@ -489,7 +489,7 @@ if yaml: """ renderer = YAMLRenderer() content = renderer.render({'field': Decimal('111.2')}, 'application/yaml') - self.assertYAMLContains(content, "field: '111.2'") + self.assertYAMLContains(content.decode('utf-8'), "field: '111.2'") def assertYAMLContains(self, content, string): self.assertTrue(string in content, '%r not in %r' % (string, content)) From 8c91e7b742067b6d4e4ed6d476bfe2cf5839ac8b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 25 Nov 2014 15:52:13 +0000 Subject: [PATCH 1154/1652] Add missing options --- docs/api-guide/fields.md | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 292a51d89..aef7792b7 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -22,7 +22,7 @@ Each serializer field class constructor takes at least these arguments. Some Fi The name of the attribute that will be used to populate the field. May be a method that only takes a `self` argument, such as `Field(source='get_absolute_url')`, or may use dotted notation to traverse attributes, such as `Field(source='user.email')`. -The value `source='*'` has a special meaning, and is used to indicate that the entire object should be passed through to the field. This can be useful for creating nested representations. (See the implementation of the `PaginationSerializer` class for an example.) +The value `source='*'` has a special meaning, and is used to indicate that the entire object should be passed through to the field. This can be useful for creating nested representations, or for fields which require access to the complete object in order to determine the output representation. Defaults to the name of the field. @@ -45,25 +45,28 @@ Set to false if this field is not required to be present during deserialization. Defaults to `True`. +### `allow_null` + +Normally an error will be raise if `None` is passed to a serializer field. Set this keyword argument to `True` if `None` should be considered a valid value. + +Defaults to `False` + ### `default` If set, this gives the default value that will be used for the field if no input value is supplied. If not set the default behavior is to not populate the attribute at all. May be set to a function or other callable, in which case the value will be evaluated each time it is used. +Note that setting a `default` value implies that the field is not required. Including both the `default` and `required` keyword arguments is invalid and will raise an error. + ### `validators` -A list of Django validators that should be used to validate deserialized values. +A list of validator functions which should be applied to the incoming field input, and which either raise a validation error or simply return. Validator functions should typically raise `serializers.ValidationError`, but Django's built-in `ValidationError` is also supported for compatibility with validators defined in the Django codebase or third party Django packages. ### `error_messages` A dictionary of error codes to error messages. -### `widget` - -Used only if rendering the field to HTML. -This argument sets the widget that should be used to render the field. For more details, and a list of available widgets, see [the Django documentation on form widgets][django-widgets]. - ### `label` A short text string that may be used as the name of the field in HTML form fields or other descriptive elements. @@ -72,6 +75,29 @@ A short text string that may be used as the name of the field in HTML form field A text string that may be used as a description of the field in HTML form fields or other descriptive elements. +### `initial` + +A value that should be used for pre-populating the value of HTML form fields. + +### `style` + +A dictionary of key-value pairs that can be used to control how renderers should render the field. The API for this should still be considered experimental, and will be formalized with the 3.1 release. + +Two options are currently used in HTML form generation, `'input_type'` and `'base_template'`. + + # Use for the input. + password = serializers.CharField( + style={'input_type': 'password'} + ) + + # Use a radio input instead of a select input. + color_channel = serializers.ChoiceField( + choices=['red', 'green', 'blue'] + style = {'base_template': 'radio.html'} + } + +**Note**: The `style` argument replaces the old-style version 2.x `widget` keyword argument. Because REST framework 3 now uses templated HTML form generation, the `widget` option that was used to support Django built-in widgets can no longer be supported. Version 3.1 is planned to include public API support for customizing HTML form generation. + --- # Generic Fields From 929135ea58d5a41f1980d23280c6ae65bb5b3443 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 25 Nov 2014 16:01:32 +0000 Subject: [PATCH 1155/1652] Include CNAME file --- docs/CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/CNAME diff --git a/docs/CNAME b/docs/CNAME new file mode 100644 index 000000000..4e3328996 --- /dev/null +++ b/docs/CNAME @@ -0,0 +1 @@ +www.django-rest-framework.org From 84b34d43307704ad8240b871a48dcd6e73848cd1 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 25 Nov 2014 16:06:18 +0000 Subject: [PATCH 1156/1652] Use default 'site' directory for docs builds --- .gitignore | 2 +- mkdocs.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ae73f8379..2bdf8f7eb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ *~ .* -html/ +site/ htmlcov/ coverage/ build/ diff --git a/mkdocs.yml b/mkdocs.yml index 925586d19..f956ecf0b 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -4,6 +4,8 @@ site_description: Django REST framework - Web APIs for Django repo_url: https://github.com/tomchristie/django-rest-framework +theme_dir: docs_theme + pages: - ['index.md', ] - ['tutorial/quickstart.md', ] @@ -52,7 +54,5 @@ pages: - ['topics/release-notes.md', 'Topics', 'Release Notes'] - ['topics/credits.md', 'Topics', 'Credits'] -site_dir: html -theme_dir: docs_theme copyright: Copyright © 2014, Tom Christie. google_analytics: ['UA-18852272-2', 'django-rest-framework.org'] From c7701cd75a746a863ddf8c517a4ec9c6272d66ca Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 25 Nov 2014 16:08:48 +0000 Subject: [PATCH 1157/1652] Tweak --- docs/topics/contributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index c7991a0fe..7654136cf 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -139,7 +139,7 @@ To build the documentation, install MkDocs with `pip install mkdocs` and then ru mkdocs build -This will build the html output into the `html` directory. +This will build the documentation into the `site` directory. You can build the documentation and open a preview in a browser window by using the `serve` command. From b733f85ff1e3f70e9f5dee6f52bebe861bc0f411 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 25 Nov 2014 16:24:35 +0000 Subject: [PATCH 1158/1652] Minor docs tweaks --- docs/index.md | 2 +- mkdocs.yml | 49 ++++++++++++++++++++++++------------------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/docs/index.md b/docs/index.md index ca10befe3..9312bb2fd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -172,7 +172,7 @@ The API guide is your complete reference manual to all the functionality provide * [Serializers][serializers] * [Serializer fields][fields] * [Serializer relations][relations] -* [Validators][validators] + * [Authentication][authentication] * [Permissions][permissions] * [Throttling][throttling] diff --git a/mkdocs.yml b/mkdocs.yml index f956ecf0b..e112315be 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -7,38 +7,38 @@ repo_url: https://github.com/tomchristie/django-rest-framework theme_dir: docs_theme pages: - - ['index.md', ] - - ['tutorial/quickstart.md', ] + - ['index.md', 'Home'] + - ['tutorial/quickstart.md', 'Quickstart'] - ['tutorial/1-serialization.md', 'Tutorial', '1 - Serialization'] - ['tutorial/2-requests-and-responses.md', 'Tutorial', '2 - Requests and responses'] - ['tutorial/3-class-based-views.md', 'Tutorial', '3 - Class based views'] - ['tutorial/4-authentication-and-permissions.md', 'Tutorial', '4 - Authentication and permissions'] - ['tutorial/5-relationships-and-hyperlinked-apis.md', 'Tutorial', '5 - Relationships and hyperlinked APIs'] - - ['tutorial/6-viewsets-and-routers.md', 'Tutorial', '6- Viewsets and routers'] - - ['api-guide/requests.md', 'API Guide', ] - - ['api-guide/responses.md', 'API Guide', ] - - ['api-guide/views.md', 'API Guide', ] - - ['api-guide/generic-views.md', 'API Guide', ] - - ['api-guide/viewsets.md', 'API Guide', ] - - ['api-guide/routers.md', 'API Guide', ] - - ['api-guide/parsers.md', 'API Guide', ] - - ['api-guide/renderers.md', 'API Guide', ] - - ['api-guide/serializers.md', 'API Guide', ] + - ['tutorial/6-viewsets-and-routers.md', 'Tutorial', '6 - Viewsets and routers'] + - ['api-guide/requests.md', 'API Guide', 'Requests'] + - ['api-guide/responses.md', 'API Guide', 'Responses'] + - ['api-guide/views.md', 'API Guide', 'Views'] + - ['api-guide/generic-views.md', 'API Guide', 'Generic views'] + - ['api-guide/viewsets.md', 'API Guide', 'Viewsets'] + - ['api-guide/routers.md', 'API Guide', 'Routers'] + - ['api-guide/parsers.md', 'API Guide', 'Parsers'] + - ['api-guide/renderers.md', 'API Guide', 'Renderers'] + - ['api-guide/serializers.md', 'API Guide', 'Serializers'] - ['api-guide/fields.md', 'API Guide', 'Serializer fields'] - ['api-guide/relations.md', 'API Guide', 'Serializer relations'] - - ['api-guide/validators.md', 'API Guide', ] - - ['api-guide/authentication.md', 'API Guide', ] - - ['api-guide/permissions.md', 'API Guide', ] - - ['api-guide/throttling.md', 'API Guide', ] - - ['api-guide/filtering.md', 'API Guide', ] - - ['api-guide/pagination.md', 'API Guide', ] - - ['api-guide/content-negotiation.md', 'API Guide', ] - - ['api-guide/format-suffixes.md', 'API Guide', ] +# - ['api-guide/validators.md', 'API Guide', 'Validators'] + - ['api-guide/authentication.md', 'API Guide', 'Authentication'] + - ['api-guide/permissions.md', 'API Guide', 'Permissions'] + - ['api-guide/throttling.md', 'API Guide', 'Throttling'] + - ['api-guide/filtering.md', 'API Guide', 'Filtering'] + - ['api-guide/pagination.md', 'API Guide', 'Pagination'] + - ['api-guide/content-negotiation.md', 'API Guide', 'Content negotiation'] + - ['api-guide/format-suffixes.md', 'API Guide', 'Format suffixes'] - ['api-guide/reverse.md', 'API Guide', 'Returning URLs'] - - ['api-guide/exceptions.md', 'API Guide', ] - - ['api-guide/status-codes.md', 'API Guide', ] - - ['api-guide/testing.md', 'API Guide', ] - - ['api-guide/settings.md', 'API Guide', ] + - ['api-guide/exceptions.md', 'API Guide', 'Exceptions'] + - ['api-guide/status-codes.md', 'API Guide', 'Status codes'] + - ['api-guide/testing.md', 'API Guide', 'Testing'] + - ['api-guide/settings.md', 'API Guide', 'Settings'] - ['topics/documenting-your-api.md', 'Topics', 'Documenting your API'] - ['topics/ajax-csrf-cors.md', 'Topics', 'AJAX, CSRF & CORS'] - ['topics/browser-enhancements.md', 'Topics',] @@ -54,5 +54,4 @@ pages: - ['topics/release-notes.md', 'Topics', 'Release Notes'] - ['topics/credits.md', 'Topics', 'Credits'] -copyright: Copyright © 2014, Tom Christie. google_analytics: ['UA-18852272-2', 'django-rest-framework.org'] From 4ed0ae82e353e918c4f8e2b1c3bd27d67d349fe3 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 25 Nov 2014 16:29:14 +0000 Subject: [PATCH 1159/1652] Add validators page --- docs/index.md | 4 ++-- mkdocs.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/index.md b/docs/index.md index 9312bb2fd..b18f3d6a6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -172,7 +172,7 @@ The API guide is your complete reference manual to all the functionality provide * [Serializers][serializers] * [Serializer fields][fields] * [Serializer relations][relations] - +* [Validators][validators] * [Authentication][authentication] * [Permissions][permissions] * [Throttling][throttling] @@ -294,7 +294,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [serializers]: api-guide/serializers.md [fields]: api-guide/fields.md [relations]: api-guide/relations.md -[validation]: api-guide/validation.md +[validators]: api-guide/validators.md [authentication]: api-guide/authentication.md [permissions]: api-guide/permissions.md [throttling]: api-guide/throttling.md diff --git a/mkdocs.yml b/mkdocs.yml index e112315be..1a60a7421 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -26,7 +26,7 @@ pages: - ['api-guide/serializers.md', 'API Guide', 'Serializers'] - ['api-guide/fields.md', 'API Guide', 'Serializer fields'] - ['api-guide/relations.md', 'API Guide', 'Serializer relations'] -# - ['api-guide/validators.md', 'API Guide', 'Validators'] + - ['api-guide/validators.md', 'API Guide', 'Validators'] - ['api-guide/authentication.md', 'API Guide', 'Authentication'] - ['api-guide/permissions.md', 'API Guide', 'Permissions'] - ['api-guide/throttling.md', 'API Guide', 'Throttling'] From 2647e1aaaadfc2cfd947c633399dca1060c17401 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 25 Nov 2014 16:30:17 +0000 Subject: [PATCH 1160/1652] Move Quickstart back into 'Tutorial' section --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index e112315be..8932fa96e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -8,7 +8,7 @@ theme_dir: docs_theme pages: - ['index.md', 'Home'] - - ['tutorial/quickstart.md', 'Quickstart'] + - ['tutorial/quickstart.md', 'Tutorial', 'Quickstart'] - ['tutorial/1-serialization.md', 'Tutorial', '1 - Serialization'] - ['tutorial/2-requests-and-responses.md', 'Tutorial', '2 - Requests and responses'] - ['tutorial/3-class-based-views.md', 'Tutorial', '3 - Class based views'] From 31536566d7fee430fb549621b4e324ddec4081fd Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 25 Nov 2014 17:35:27 +0000 Subject: [PATCH 1161/1652] Updating fields docs --- docs/api-guide/fields.md | 276 +++++++++++++++++++++++++-------------- 1 file changed, 177 insertions(+), 99 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 68cdc6226..17a65ab8e 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -47,7 +47,7 @@ Defaults to `True`. ### `allow_null` -Normally an error will be raise if `None` is passed to a serializer field. Set this keyword argument to `True` if `None` should be considered a valid value. +Normally an error will be raised if `None` is passed to a serializer field. Set this keyword argument to `True` if `None` should be considered a valid value. Defaults to `False` @@ -100,10 +100,6 @@ Two options are currently used in HTML form generation, `'input_type'` and `'bas --- -# Generic Fields - -These generic fields are used for representing arbitrary model fields or the output of model methods. - ## Field A generic, **read-only** field. You can use this field for any attribute that does not need to support write operations. @@ -146,96 +142,143 @@ By default, the `Field` class will perform a basic translation of the source val You can customize this behavior by overriding the `.to_native(self, value)` method. -## WritableField - -A field that supports both read and write operations. By itself `WritableField` does not perform any translation of input values into a given type. You won't typically use this field directly, but you may want to override it and implement the `.to_native(self, value)` and `.from_native(self, value)` methods. - -## ModelField - -A generic field that can be tied to any arbitrary model field. The `ModelField` class delegates the task of serialization/deserialization to its associated model field. This field can be used to create serializer fields for custom model fields, without having to create a new custom serializer field. - -The `ModelField` class is generally intended for internal use, but can be used by your API if needed. In order to properly instantiate a `ModelField`, it must be passed a field that is attached to an instantiated model. For example: `ModelField(model_field=MyModel()._meta.get_field('custom_field'))` - -**Signature:** `ModelField(model_field=)` - -## SerializerMethodField - -This is a read-only field. It gets its value by calling a method on the serializer class it is attached to. It can be used to add any sort of data to the serialized representation of your object. The field's constructor accepts a single argument, which is the name of the method on the serializer to be called. The method should accept a single argument (in addition to `self`), which is the object being serialized. It should return whatever you want to be included in the serialized representation of the object. For example: - - from django.contrib.auth.models import User - from django.utils.timezone import now - from rest_framework import serializers - - class UserSerializer(serializers.ModelSerializer): - days_since_joined = serializers.SerializerMethodField('get_days_since_joined') - - class Meta: - model = User - - def get_days_since_joined(self, obj): - return (now() - obj.date_joined).days +**TODO**: Note removal of `WritableField` --- -# Typed Fields - -These fields represent basic datatypes, and support both reading and writing values. +# Boolean fields ## BooleanField -A Boolean representation. +A boolean representation. Corresponds to `django.db.models.fields.BooleanField`. +## NullBooleanField + +A boolean representation that also accepts `None` as a valid value. + +Corresponds to `django.db.models.fields.NullBooleanField`. + +--- + +# String fields + ## CharField -A text representation, optionally validates the text to be shorter than `max_length` and longer than `min_length`. -If `allow_none` is `False` (default), `None` values will be converted to an empty string. +A text representation. Optionally validates the text to be shorter than `max_length` and longer than `min_length`. -Corresponds to `django.db.models.fields.CharField` -or `django.db.models.fields.TextField`. +Corresponds to `django.db.models.fields.CharField` or `django.db.models.fields.TextField`. **Signature:** `CharField(max_length=None, min_length=None, allow_none=False)` -## URLField - -Corresponds to `django.db.models.fields.URLField`. Uses Django's `django.core.validators.URLValidator` for validation. - -**Signature:** `URLField(max_length=200, min_length=None)` - -## SlugField - -Corresponds to `django.db.models.fields.SlugField`. - -**Signature:** `SlugField(max_length=50, min_length=None)` - -## ChoiceField - -A field that can accept a value out of a limited set of choices. Optionally takes a `blank_display_value` parameter that customizes the display value of an empty choice. - -**Signature:** `ChoiceField(choices=(), blank_display_value=None)` - ## EmailField A text representation, validates the text to be a valid e-mail address. Corresponds to `django.db.models.fields.EmailField` +**Signature:** `EmailField(max_length=None, min_length=None)` + ## RegexField A text representation, that validates the given value matches against a certain regular expression. +The mandatory `regex` argument may either be a string, or a compiled python regular expression object. + Uses Django's `django.core.validators.RegexValidator` for validation. Corresponds to `django.forms.fields.RegexField` **Signature:** `RegexField(regex, max_length=None, min_length=None)` +## SlugField + +A `RegexField` that validates the input against the pattern `[a-zA-Z0-9_-]+`. + +Corresponds to `django.db.models.fields.SlugField`. + +**Signature:** `SlugField(max_length=50, min_length=None)` + +## URLField + +A `RegexField` that validates the input against a URL matching pattern. Expects fully qualified URLs of the form `http:///`. + +Corresponds to `django.db.models.fields.URLField`. Uses Django's `django.core.validators.URLValidator` for validation. + +**Signature:** `URLField(max_length=200, min_length=None)` + +--- + +# Numeric fields + +## IntegerField + +An integer representation. + +Has two optional arguments: + +- `max_value` Validate that the number provided is no greater than this value. + +- `min_value` Validate that the number provided is no less than this value. + +Corresponds to `django.db.models.fields.IntegerField`, `django.db.models.fields.SmallIntegerField`, `django.db.models.fields.PositiveIntegerField` and `django.db.models.fields.PositiveSmallIntegerField`. + +## FloatField + +A floating point representation. + +Has two optional arguments: + +- `max_value` Validate that the number provided is no greater than this value. + +- `min_value` Validate that the number provided is no less than this value. + +Corresponds to `django.db.models.fields.FloatField`. + +## DecimalField + +A decimal representation, represented in Python by a Decimal instance. + +Has two required arguments, and three optional arguments: + +- `max_digits` The maximum number of digits allowed in the number. Note that this number must be greater than or equal to decimal_places. + +- `decimal_places` The number of decimal places to store with the number. + +- `coerce_to_string` Set to `True` if string values should be returned for the representation, or `False` if `Decimal` objects should be returned. Defaults to the same value as the `COERCE_DECIMAL_TO_STRING` settings key, which will be `True` unless overridden. If `Decimal` objects are returned by the serializer, then the final output format will be determined by the renderer. + +- `max_value` Validate that the number provided is no greater than this value. + +- `min_value` Validate that the number provided is no less than this value. + +#### Example usage + +To validate numbers up to 999 with a resolution of 2 decimal places, you would use: + + serializers.DecimalField(max_digits=5, decimal_places=2) + +And to validate numbers up to anything less than one billion with a resolution of 10 decimal places: + + serializers.DecimalField(max_digits=19, decimal_places=10) + +This field also takes an optional argument, `coerce_to_string`. If set to `True` the representation will be output as a string. If set to `False` the representation will be left as a `Decimal` instance and the final representation will be determined by the renderer. + +If unset, this will default to the same value as the `COERCE_DECIMAL_TO_STRING` setting, which is `True` unless set otherwise. + +**Signature:** `DecimalField(max_digits, decimal_places, coerce_to_string=None)` + +Corresponds to `django.db.models.fields.DecimalField`. + +--- + +# Date and time fields + ## DateTimeField A date and time representation. -Corresponds to `django.db.models.fields.DateTimeField` +Corresponds to `django.db.models.fields.DateTimeField`. When using `ModelSerializer` or `HyperlinkedModelSerializer`, note that any model fields with `auto_now=True` or `auto_now_add=True` will use serializer fields that are `read_only=True` by default. @@ -253,10 +296,10 @@ In the case of JSON this means the default datetime representation uses the [ECM **Signature:** `DateTimeField(format=None, input_formats=None)` -* `format` - A string representing the output format. If not specified, this defaults to `None`, which indicates that Python `datetime` objects should be returned by `to_native`. In this case the datetime encoding will be determined by the renderer. +* `format` - A string representing the output format. If not specified, this defaults to the same value as the `DATETIME_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `datetime` objects should be returned by `to_representation`. In this case the datetime encoding will be determined by the renderer. * `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `DATETIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. -DateTime format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style datetimes should be used. (eg `'2013-01-29T12:34:56.000000Z'`) +**DateTimeField format strings**: Format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style datetimes should be used. (eg `'2013-01-29T12:34:56.000000Z'`) ## DateField @@ -266,63 +309,47 @@ Corresponds to `django.db.models.fields.DateField` **Signature:** `DateField(format=None, input_formats=None)` -* `format` - A string representing the output format. If not specified, this defaults to `None`, which indicates that Python `date` objects should be returned by `to_native`. In this case the date encoding will be determined by the renderer. +* `format` - A string representing the output format. If not specified, this defaults to the same value as the `DATE_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `date` objects should be returned by `to_representation`. In this case the date encoding will be determined by the renderer. * `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `DATE_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. -Date format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style dates should be used. (eg `'2013-01-29'`) +**DateField format strings**: Format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style dates should be used. (eg `'2013-01-29'`) ## TimeField A time representation. -Optionally takes `format` as parameter to replace the matching pattern. - Corresponds to `django.db.models.fields.TimeField` **Signature:** `TimeField(format=None, input_formats=None)` -* `format` - A string representing the output format. If not specified, this defaults to `None`, which indicates that Python `time` objects should be returned by `to_native`. In this case the time encoding will be determined by the renderer. +* `format` - A string representing the output format. If not specified, this defaults to the same value as the `TIME_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `time` objects should be returned by `to_representation`. In this case the time encoding will be determined by the renderer. * `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `TIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. -Time format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style times should be used. (eg `'12:34:56.000000'`) +**TimeField format strings**: Format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style times should be used. (eg `'12:34:56.000000'`) -## IntegerField +--- -An integer representation. +# Choice selection fields -Corresponds to `django.db.models.fields.IntegerField`, `django.db.models.fields.SmallIntegerField`, `django.db.models.fields.PositiveIntegerField` and `django.db.models.fields.PositiveSmallIntegerField` +## ChoiceField -## FloatField +A field that can accept a value out of a limited set of choices. Takes a single mandatory argument. -A floating point representation. +- `choices` - A list of valid values, or a list of `(key, display_name)` tuples. -Corresponds to `django.db.models.fields.FloatField`. +**Signature:** `ChoiceField(choices=())` -## DecimalField +## MultipleChoiceField -A decimal representation, represented in Python by a Decimal instance. +A field that can accept a set of zero, one or many values, chosen from a limited set of choices. Takes a single mandatory argument. `to_internal_representation` returns a `set` containing the selected values. -Has two required arguments: +- `choices` - A list of valid values, or a list of `(key, display_name)` tuples. -- `max_digits` The maximum number of digits allowed in the number. Note that this number must be greater than or equal to decimal_places. +**Signature:** `MultipleChoiceField(choices=())` -- `decimal_places` The number of decimal places to store with the number. +--- -For example, to validate numbers up to 999 with a resolution of 2 decimal places, you would use: - - serializers.DecimalField(max_digits=5, decimal_places=2) - -And to validate numbers up to anything less than one billion with a resolution of 10 decimal places: - - serializers.DecimalField(max_digits=19, decimal_places=10) - -This field also takes an optional argument, `coerce_to_string`. If set to `True` the representation will be output as a string. If set to `False` the representation will be left as a `Decimal` instance and the final representation will be determined by the renderer. - -If unset, this will default to the same value as the `COERCE_DECIMAL_TO_STRING` setting, which is `True` unless set otherwise. - -**Signature:** `DecimalField(max_digits, decimal_places, coerce_to_string=None)` - -Corresponds to `django.db.models.fields.DecimalField`. +# File upload fields ## FileField @@ -330,15 +357,17 @@ A file representation. Performs Django's standard FileField validation. Corresponds to `django.forms.fields.FileField`. -**Signature:** `FileField(max_length=None, allow_empty_file=False)` +**Signature:** `FileField(max_length=None, allow_empty_file=False, use_url=UPLOADED_FILES_USE_URL)` - - `max_length` designates the maximum length for the file name. + - `max_length` - designates the maximum length for the file name. - - `allow_empty_file` designates if empty files are allowed. + - `allow_empty_file` - designates if empty files are allowed. + +- `use_url` - If set to `True` then URL string values will be used for the output representation. If set to `False` then filename string values will be used for the output representation. Defaults to the value of the `UPLOADED_FILES_USE_URL` settings key, which is `True` unless set otherwise. ## ImageField -An image representation. +An image representation. Validates the uploaded file content as matching a known image format. Corresponds to `django.forms.fields.ImageField`. @@ -348,11 +377,60 @@ Signature and validation is the same as with `FileField`. --- -**Note:** `FileFields` and `ImageFields` are only suitable for use with MultiPartParser, since e.g. json doesn't support file uploads. +**Note:** `FileFields` and `ImageFields` are only suitable for use with `MultiPartParser` or `FileUploadParser`. Most parsers, such as e.g. JSON don't support file uploads. Django's regular [FILE_UPLOAD_HANDLERS] are used for handling uploaded files. --- +# Composite fields + +## ListField + +**TODO** + +--- + +# Miscellaneous fields + +## ReadOnlyField + +**TODO** + +## HiddenField + +**TODO** + +## ModelField + +A generic field that can be tied to any arbitrary model field. The `ModelField` class delegates the task of serialization/deserialization to its associated model field. This field can be used to create serializer fields for custom model fields, without having to create a new custom serializer field. + +The `ModelField` class is generally intended for internal use, but can be used by your API if needed. In order to properly instantiate a `ModelField`, it must be passed a field that is attached to an instantiated model. For example: `ModelField(model_field=MyModel()._meta.get_field('custom_field'))` + +**Signature:** `ModelField(model_field=)` + +## SerializerMethodField + +This is a read-only field. It gets its value by calling a method on the serializer class it is attached to. It can be used to add any sort of data to the serialized representation of your object. + +The field constructor accepts a single optional argument, which is the name of the method on the serializer to be called. If not included this defaults to `get_`. + +The method should accept a single argument (in addition to `self`), which is the object being serialized. It should return whatever you want to be included in the serialized representation of the object. For example: + + from django.contrib.auth.models import User + from django.utils.timezone import now + from rest_framework import serializers + + class UserSerializer(serializers.ModelSerializer): + days_since_joined = serializers.SerializerMethodField() + + class Meta: + model = User + + def get_days_since_joined(self, obj): + return (now() - obj.date_joined).days + +--- + # Custom fields If you want to create a custom field, you'll probably want to override either one or both of the `.to_native()` and `.from_native()` methods. These two methods are used to convert between the initial datatype, and a primitive, serializable datatype. Primitive datatypes may be any of a number, string, date/time/datetime or None. They may also be any list or dictionary like object that only contains other primitive objects. From c01c631ef2c5a0f303460c505810c4987371dbcc Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 26 Nov 2014 09:04:48 +0000 Subject: [PATCH 1162/1652] perform_create, perform_update, perform_destroy hooks --- docs/api-guide/fields.md | 19 ++++++++++++------- docs/api-guide/generic-views.md | 28 ++++++++++++++-------------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 17a65ab8e..1e856853a 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -433,9 +433,9 @@ The method should accept a single argument (in addition to `self`), which is the # Custom fields -If you want to create a custom field, you'll probably want to override either one or both of the `.to_native()` and `.from_native()` methods. These two methods are used to convert between the initial datatype, and a primitive, serializable datatype. Primitive datatypes may be any of a number, string, date/time/datetime or None. They may also be any list or dictionary like object that only contains other primitive objects. +If you want to create a custom field, you'll probably want to override either one or both of the `.to_representation()` and `.to_internal_value()` methods. These two methods are used to convert between the initial datatype, and a primitive, serializable datatype. Primitive datatypes may be any of a number, string, date/time/datetime or None. They may also be any list or dictionary like object that only contains other primitive objects. -The `.to_native()` method is called to convert the initial datatype into a primitive, serializable datatype. The `from_native()` method is called to restore a primitive datatype into its initial representation. +The `.to_representation()` method is called to convert the initial datatype into a primitive, serializable datatype. The `to_internal_value()` method is called to restore a primitive datatype into its internal python representation. ## Examples @@ -450,25 +450,30 @@ Let's look at an example of serializing a class that represents an RGB color val assert(red < 256 and green < 256 and blue < 256) self.red, self.green, self.blue = red, green, blue - class ColourField(serializers.WritableField): + class ColorField(serializers.Field): """ Color objects are serialized into "rgb(#, #, #)" notation. """ - def to_native(self, obj): + def to_representation(self, obj): return "rgb(%d, %d, %d)" % (obj.red, obj.green, obj.blue) - def from_native(self, data): + def to_internal_value(self, data): data = data.strip('rgb(').rstrip(')') red, green, blue = [int(col) for col in data.split(',')] return Color(red, green, blue) -By default field values are treated as mapping to an attribute on the object. If you need to customize how the field value is accessed and set you need to override `.field_to_native()` and/or `.field_from_native()`. +By default field values are treated as mapping to an attribute on the object. If you need to customize how the field value is accessed and set you need to override `.get_attribute()` and/or `.get_value()`. As an example, let's create a field that can be used represent the class name of the object being serialized: class ClassNameField(serializers.Field): - def field_to_native(self, obj, field_name): + def get_attribute(self, obj): + # We pass the object instance onto `to_representation`, + # not just the field attribute. + return obj + + def to_representation(self, obj): """ Serialize the object's class name. """ diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 489b628fc..dc51189c3 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -7,7 +7,7 @@ source: mixins.py > > — [Django Documentation][cite] -One of the key benefits of class based views is the way they allow you to compose bits of reusable behaviour. REST framework takes advantage of this by providing a number of pre-built views that provide for commonly used patterns. +One of the key benefits of class based views is the way they allow you to compose bits of reusable behavior. REST framework takes advantage of this by providing a number of pre-built views that provide for commonly used patterns. The generic views provided by REST framework allow you to quickly build API views that map closely to your database models. @@ -171,24 +171,24 @@ For example: return 20 return 100 -**Save / deletion hooks**: +**Save and deletion hooks**: -The following methods are provided as placeholder interfaces. They contain empty implementations and are not called directly by `GenericAPIView`, but they are overridden and used by some of the mixin classes. +The following methods are provided by the mixin classes, and provide easy overriding of the object save or deletion behavior. -* `pre_save(self, obj)` - A hook that is called before saving an object. -* `post_save(self, obj, created=False)` - A hook that is called after saving an object. -* `pre_delete(self, obj)` - A hook that is called before deleting an object. -* `post_delete(self, obj)` - A hook that is called after deleting an object. +* `perform_create(self, serializer)` - Called by `CreateModelMixin` when saving a new object instance. +* `perform_update(self, serializer)` - Called by `UpdateModelMixin` when saving an existing object instance. +* `perform_destroy(self, instance)` - Called by `DestroyModelMixin` when deleting an object instance. -The `pre_save` method in particular is a useful hook for setting attributes that are implicit in the request, but are not part of the request data. For instance, you might set an attribute on the object based on the request user, or based on a URL keyword argument. +These hooks are particularly useful for setting attributes that are implicit in the request, but are not part of the request data. For instance, you might set an attribute on the object based on the request user, or based on a URL keyword argument. - def pre_save(self, obj): - """ - Set the object's owner, based on the incoming request. - """ - obj.owner = self.request.user + def perform_create(self, serializer): + serializer.save(user=self.request.user) -Remember that the `pre_save()` method is not called by `GenericAPIView` itself, but it is called by `create()` and `update()` methods on the `CreateModelMixin` and `UpdateModelMixin` classes. +These override points are also particularly useful for adding behavior that occurs before or after saving an object, such as emailing a confirmation, or logging the update. + + def perform_update(self, serializer): + instance = serializer.save() + send_email_confirmation(user=self.request.user, modified=instance) **Other methods**: From 0f5338ada90ca2c6e53b9e095bec6a3b853d107b Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 26 Nov 2014 09:06:15 +0000 Subject: [PATCH 1163/1652] Call out removal of pre_save/post_save more strongly --- docs/api-guide/generic-views.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index dc51189c3..8c1b7dc9d 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -190,6 +190,8 @@ These override points are also particularly useful for adding behavior that occu instance = serializer.save() send_email_confirmation(user=self.request.user, modified=instance) +**Note**: These methods replace the old-style version 2.x `pre_save`, `post_save`, `pre_delete` and `post_delete` methods, which are no longer available. + **Other methods**: You won't typically need to override the following methods, although you might need to call into them if you're writing custom views using `GenericAPIView`. From e1b14cbe4acafa47154acf66c21cd9e627c7ba1a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 26 Nov 2014 10:27:29 +0000 Subject: [PATCH 1164/1652] 3.0 docs for serializer fields --- docs/api-guide/fields.md | 253 ++++++++++++++++++++------------------- 1 file changed, 133 insertions(+), 120 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 1e856853a..ca551540d 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -10,7 +10,7 @@ Serializer fields handle converting between primitive values and internal dataty --- -**Note:** The serializer fields are declared in fields.py, but by convention you should import them using `from rest_framework import serializers` and refer to fields as `serializers.`. +**Note:** The serializer fields are declared in `fields.py`, but by convention you should import them using `from rest_framework import serializers` and refer to fields as `serializers.`. --- @@ -18,14 +18,6 @@ Serializer fields handle converting between primitive values and internal dataty Each serializer field class constructor takes at least these arguments. Some Field classes take additional, field-specific arguments, but the following should always be accepted: -### `source` - -The name of the attribute that will be used to populate the field. May be a method that only takes a `self` argument, such as `Field(source='get_absolute_url')`, or may use dotted notation to traverse attributes, such as `Field(source='user.email')`. - -The value `source='*'` has a special meaning, and is used to indicate that the entire object should be passed through to the field. This can be useful for creating nested representations, or for fields which require access to the complete object in order to determine the output representation. - -Defaults to the name of the field. - ### `read_only` Set this to `True` to ensure that the field is used when serializing a representation, but is not used when creating or updating an instance during deserialization. @@ -59,6 +51,14 @@ May be set to a function or other callable, in which case the value will be eval Note that setting a `default` value implies that the field is not required. Including both the `default` and `required` keyword arguments is invalid and will raise an error. +### `source` + +The name of the attribute that will be used to populate the field. May be a method that only takes a `self` argument, such as `URLField('get_absolute_url')`, or may use dotted notation to traverse attributes, such as `EmailField(source='user.email')`. + +The value `source='*'` has a special meaning, and is used to indicate that the entire object should be passed through to the field. This can be useful for creating nested representations, or for fields which require access to the complete object in order to determine the output representation. + +Defaults to the name of the field. + ### `validators` A list of validator functions which should be applied to the incoming field input, and which either raise a validation error or simply return. Validator functions should typically raise `serializers.ValidationError`, but Django's built-in `ValidationError` is also supported for compatibility with validators defined in the Django codebase or third party Django packages. @@ -100,52 +100,6 @@ Two options are currently used in HTML form generation, `'input_type'` and `'bas --- -## Field - -A generic, **read-only** field. You can use this field for any attribute that does not need to support write operations. - -For example, using the following model. - - from django.db import models - from django.utils.timezone import now - - class Account(models.Model): - owner = models.ForeignKey('auth.user') - name = models.CharField(max_length=100) - created = models.DateTimeField(auto_now_add=True) - payment_expiry = models.DateTimeField() - - def has_expired(self): - return now() > self.payment_expiry - -A serializer definition that looked like this: - - from rest_framework import serializers - - class AccountSerializer(serializers.HyperlinkedModelSerializer): - expired = serializers.Field(source='has_expired') - - class Meta: - model = Account - fields = ('url', 'owner', 'name', 'expired') - -Would produce output similar to: - - { - 'url': 'http://example.com/api/accounts/3/', - 'owner': 'http://example.com/api/users/12/', - 'name': 'FooCorp business account', - 'expired': True - } - -By default, the `Field` class will perform a basic translation of the source value into primitive datatypes, falling back to unicode representations of complex datatypes when necessary. - -You can customize this behavior by overriding the `.to_native(self, value)` method. - -**TODO**: Note removal of `WritableField` - ---- - # Boolean fields ## BooleanField @@ -154,12 +108,16 @@ A boolean representation. Corresponds to `django.db.models.fields.BooleanField`. +**Signature:** `BooleanField()` + ## NullBooleanField A boolean representation that also accepts `None` as a valid value. Corresponds to `django.db.models.fields.NullBooleanField`. +**Signature:** `NullBooleanField()` + --- # String fields @@ -170,7 +128,13 @@ A text representation. Optionally validates the text to be shorter than `max_len Corresponds to `django.db.models.fields.CharField` or `django.db.models.fields.TextField`. -**Signature:** `CharField(max_length=None, min_length=None, allow_none=False)` +**Signature:** `CharField(max_length=None, min_length=None, allow_blank=False)` + +- `max_length` - Validates that the input contains no more than this number of characters. +- `min_length` - Validates that the input contains no fewer than this number of characters. +- `allow_blank` - If set to `True` then the empty string should be considered a valid value. If set to `False` then the empty string is considered invalid and will raise a validation error. Defaults to `False`. + +The `allow_null` option is also available for string fields, although its usage is discouraged in favor of `allow_blank`. It is valid to set both `allow_blank=True` and `allow_null=True`, but doing so means that there will be two differing types of empty value permissible for string representations, which can lead to data inconsistencies and subtle application bugs. ## EmailField @@ -178,27 +142,27 @@ A text representation, validates the text to be a valid e-mail address. Corresponds to `django.db.models.fields.EmailField` -**Signature:** `EmailField(max_length=None, min_length=None)` +**Signature:** `EmailField(max_length=None, min_length=None, allow_blank=False)` ## RegexField A text representation, that validates the given value matches against a certain regular expression. +Corresponds to `django.forms.fields.RegexField`. + +**Signature:** `RegexField(regex, max_length=None, min_length=None, allow_blank=False)` + The mandatory `regex` argument may either be a string, or a compiled python regular expression object. Uses Django's `django.core.validators.RegexValidator` for validation. -Corresponds to `django.forms.fields.RegexField` - -**Signature:** `RegexField(regex, max_length=None, min_length=None)` - ## SlugField A `RegexField` that validates the input against the pattern `[a-zA-Z0-9_-]+`. Corresponds to `django.db.models.fields.SlugField`. -**Signature:** `SlugField(max_length=50, min_length=None)` +**Signature:** `SlugField(max_length=50, min_length=None, allow_blank=False)` ## URLField @@ -206,7 +170,7 @@ A `RegexField` that validates the input against a URL matching pattern. Expects Corresponds to `django.db.models.fields.URLField`. Uses Django's `django.core.validators.URLValidator` for validation. -**Signature:** `URLField(max_length=200, min_length=None)` +**Signature:** `URLField(max_length=200, min_length=None, allow_blank=False)` --- @@ -216,40 +180,36 @@ Corresponds to `django.db.models.fields.URLField`. Uses Django's `django.core.v An integer representation. -Has two optional arguments: +Corresponds to `django.db.models.fields.IntegerField`, `django.db.models.fields.SmallIntegerField`, `django.db.models.fields.PositiveIntegerField` and `django.db.models.fields.PositiveSmallIntegerField`. + +**Signature**: `IntegerField(max_value=None, min_value=None)` - `max_value` Validate that the number provided is no greater than this value. - - `min_value` Validate that the number provided is no less than this value. -Corresponds to `django.db.models.fields.IntegerField`, `django.db.models.fields.SmallIntegerField`, `django.db.models.fields.PositiveIntegerField` and `django.db.models.fields.PositiveSmallIntegerField`. - ## FloatField A floating point representation. -Has two optional arguments: +Corresponds to `django.db.models.fields.FloatField`. + +**Signature**: `FloatField(max_value=None, min_value=None)` - `max_value` Validate that the number provided is no greater than this value. - - `min_value` Validate that the number provided is no less than this value. -Corresponds to `django.db.models.fields.FloatField`. - ## DecimalField -A decimal representation, represented in Python by a Decimal instance. +A decimal representation, represented in Python by a `Decimal` instance. -Has two required arguments, and three optional arguments: +Corresponds to `django.db.models.fields.DecimalField`. + +**Signature**: `DecimalField(max_digits, decimal_places, coerce_to_string=None, max_value=None, min_value=None)` - `max_digits` The maximum number of digits allowed in the number. Note that this number must be greater than or equal to decimal_places. - - `decimal_places` The number of decimal places to store with the number. - - `coerce_to_string` Set to `True` if string values should be returned for the representation, or `False` if `Decimal` objects should be returned. Defaults to the same value as the `COERCE_DECIMAL_TO_STRING` settings key, which will be `True` unless overridden. If `Decimal` objects are returned by the serializer, then the final output format will be determined by the renderer. - - `max_value` Validate that the number provided is no greater than this value. - - `min_value` Validate that the number provided is no less than this value. #### Example usage @@ -266,10 +226,6 @@ This field also takes an optional argument, `coerce_to_string`. If set to `True` If unset, this will default to the same value as the `COERCE_DECIMAL_TO_STRING` setting, which is `True` unless set otherwise. -**Signature:** `DecimalField(max_digits, decimal_places, coerce_to_string=None)` - -Corresponds to `django.db.models.fields.DecimalField`. - --- # Date and time fields @@ -280,6 +236,21 @@ A date and time representation. Corresponds to `django.db.models.fields.DateTimeField`. +**Signature:** `DateTimeField(format=None, input_formats=None)` + +* `format` - A string representing the output format. If not specified, this defaults to the same value as the `DATETIME_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `datetime` objects should be returned by `to_representation`. In this case the datetime encoding will be determined by the renderer. +* `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `DATETIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. + +#### `DateTimeField` format strings. + +Format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style datetimes should be used. (eg `'2013-01-29T12:34:56.000000Z'`) + +When a value of `None` is used for the format `datetime` objects will be returned by `to_representation` and the final output representation will determined by the renderer class. + +In the case of JSON this means the default datetime representation uses the [ECMA 262 date time string specification][ecma262]. This is a subset of ISO 8601 which uses millisecond precision, and includes the 'Z' suffix for the UTC timezone, for example: `2013-01-29T12:34:56.123Z`. + +#### `auto_now` and `auto_now_add` model fields. + When using `ModelSerializer` or `HyperlinkedModelSerializer`, note that any model fields with `auto_now=True` or `auto_now_add=True` will use serializer fields that are `read_only=True` by default. If you want to override this behavior, you'll need to declare the `DateTimeField` explicitly on the serializer. For example: @@ -290,17 +261,6 @@ If you want to override this behavior, you'll need to declare the `DateTimeField class Meta: model = Comment -Note that by default, datetime representations are determined by the renderer in use, although this can be explicitly overridden as detailed below. - -In the case of JSON this means the default datetime representation uses the [ECMA 262 date time string specification][ecma262]. This is a subset of ISO 8601 which uses millisecond precision, and includes the 'Z' suffix for the UTC timezone, for example: `2013-01-29T12:34:56.123Z`. - -**Signature:** `DateTimeField(format=None, input_formats=None)` - -* `format` - A string representing the output format. If not specified, this defaults to the same value as the `DATETIME_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `datetime` objects should be returned by `to_representation`. In this case the datetime encoding will be determined by the renderer. -* `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `DATETIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. - -**DateTimeField format strings**: Format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style datetimes should be used. (eg `'2013-01-29T12:34:56.000000Z'`) - ## DateField A date representation. @@ -312,7 +272,9 @@ Corresponds to `django.db.models.fields.DateField` * `format` - A string representing the output format. If not specified, this defaults to the same value as the `DATE_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `date` objects should be returned by `to_representation`. In this case the date encoding will be determined by the renderer. * `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `DATE_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. -**DateField format strings**: Format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style dates should be used. (eg `'2013-01-29'`) +#### `DateField` format strings + +Format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style dates should be used. (eg `'2013-01-29'`) ## TimeField @@ -325,7 +287,9 @@ Corresponds to `django.db.models.fields.TimeField` * `format` - A string representing the output format. If not specified, this defaults to the same value as the `TIME_FORMAT` settings key, which will be `'iso-8601'` unless set. Setting to a format string indicates that `to_representation` return values should be coerced to string output. Format strings are described below. Setting this value to `None` indicates that Python `time` objects should be returned by `to_representation`. In this case the time encoding will be determined by the renderer. * `input_formats` - A list of strings representing the input formats which may be used to parse the date. If not specified, the `TIME_INPUT_FORMATS` setting will be used, which defaults to `['iso-8601']`. -**TimeField format strings**: Format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style times should be used. (eg `'12:34:56.000000'`) +#### `TimeField` format strings + +Format strings may either be [Python strftime formats][strftime] which explicitly specify the format, or the special string `'iso-8601'`, which indicates that [ISO 8601][iso8601] style times should be used. (eg `'12:34:56.000000'`) --- @@ -333,24 +297,31 @@ Corresponds to `django.db.models.fields.TimeField` ## ChoiceField -A field that can accept a value out of a limited set of choices. Takes a single mandatory argument. +A field that can accept a value out of a limited set of choices. + +Used by `ModelSerializer` to automatically generate fields if the corresponding model field includes a `choices=…` argument. + +**Signature:** `ChoiceField(choices)` - `choices` - A list of valid values, or a list of `(key, display_name)` tuples. -**Signature:** `ChoiceField(choices=())` - ## MultipleChoiceField A field that can accept a set of zero, one or many values, chosen from a limited set of choices. Takes a single mandatory argument. `to_internal_representation` returns a `set` containing the selected values. -- `choices` - A list of valid values, or a list of `(key, display_name)` tuples. +**Signature:** `MultipleChoiceField(choices)` -**Signature:** `MultipleChoiceField(choices=())` +- `choices` - A list of valid values, or a list of `(key, display_name)` tuples. --- # File upload fields +#### Parsers and file uploads. + +The `FileField` and `ImageField` classes are only suitable for use with `MultiPartParser` or `FileUploadParser`. Most parsers, such as e.g. JSON don't support file uploads. +Django's regular [FILE_UPLOAD_HANDLERS] are used for handling uploaded files. + ## FileField A file representation. Performs Django's standard FileField validation. @@ -359,10 +330,8 @@ Corresponds to `django.forms.fields.FileField`. **Signature:** `FileField(max_length=None, allow_empty_file=False, use_url=UPLOADED_FILES_USE_URL)` - - `max_length` - designates the maximum length for the file name. - - - `allow_empty_file` - designates if empty files are allowed. - + - `max_length` - Designates the maximum length for the file name. + - `allow_empty_file` - Designates if empty files are allowed. - `use_url` - If set to `True` then URL string values will be used for the output representation. If set to `False` then filename string values will be used for the output representation. Defaults to the value of the `UPLOADED_FILES_USE_URL` settings key, which is `True` unless set otherwise. ## ImageField @@ -371,22 +340,38 @@ An image representation. Validates the uploaded file content as matching a known Corresponds to `django.forms.fields.ImageField`. +**Signature:** `ImageField(max_length=None, allow_empty_file=False, use_url=UPLOADED_FILES_USE_URL)` + + - `max_length` - Designates the maximum length for the file name. + - `allow_empty_file` - Designates if empty files are allowed. +- `use_url` - If set to `True` then URL string values will be used for the output representation. If set to `False` then filename string values will be used for the output representation. Defaults to the value of the `UPLOADED_FILES_USE_URL` settings key, which is `True` unless set otherwise. + Requires either the `Pillow` package or `PIL` package. The `Pillow` package is recommended, as `PIL` is no longer actively maintained. -Signature and validation is the same as with `FileField`. - ---- - -**Note:** `FileFields` and `ImageFields` are only suitable for use with `MultiPartParser` or `FileUploadParser`. Most parsers, such as e.g. JSON don't support file uploads. -Django's regular [FILE_UPLOAD_HANDLERS] are used for handling uploaded files. - --- # Composite fields ## ListField -**TODO** +A field class that validates a list of objects. + +**Signature**: `ListField(child)` + +- `child` - A field instance that should be used for validating the objects in the list. + +For example, to validate a list of integers you might use something like the following: + + scores = serializers.ListField( + child=serializers.IntegerField(min_value=0, max_value=100) + ) + +The `ListField` class also supports a declarative style that allows you to write reusable list field classes. + + class StringListField(serializers.ListField): + child = serializers.CharField() + +We can now reuse our custom `StringListField` class throughout our application, without having to provide a `child` argument to it. --- @@ -394,27 +379,52 @@ Django's regular [FILE_UPLOAD_HANDLERS] are used for handling uploaded files. ## ReadOnlyField -**TODO** +A field class that simply returns the value of the field without modification. + +This field is used by default with `ModelSerializer` when including field names that relate to an attribute rather than a model field. + +**Signature**: `ReadOnlyField()` + +For example, is `has_expired` was a property on the `Account` model, then the following serializer would automatically generate it as a `ReadOnlyField`: + + class AccountSerializer(serializers.ModelSerializer): + class Meta: + model = Account + fields = ('id', 'account_name', 'has_expired') ## HiddenField -**TODO** +A field class that does not take a value based on user input, but instead takes its value from a default value or callable. + +**Signature**: `HiddenField()` + +For example, to include a field that always provides the current time as part of the serializer validated data, you would use the following: + + modified = serializer.HiddenField(default=timezone.now) + +The `HiddenField` class is usually only needed if you have some validation that needs to run based on some pre-provided field values, but you do not want to expose all of those fields to the end user. + +For further examples on `HiddenField` see the [validators](validators.md) documentation. ## ModelField -A generic field that can be tied to any arbitrary model field. The `ModelField` class delegates the task of serialization/deserialization to its associated model field. This field can be used to create serializer fields for custom model fields, without having to create a new custom serializer field. +A generic field that can be tied to any arbitrary model field. The `ModelField` class delegates the task of serialization/deserialization to its associated model field. This field can be used to create serializer fields for custom model fields, without having to create a new custom serializer field. -The `ModelField` class is generally intended for internal use, but can be used by your API if needed. In order to properly instantiate a `ModelField`, it must be passed a field that is attached to an instantiated model. For example: `ModelField(model_field=MyModel()._meta.get_field('custom_field'))` +This field is used by `ModelSerializer` to correspond to custom model field classes. **Signature:** `ModelField(model_field=)` +The `ModelField` class is generally intended for internal use, but can be used by your API if needed. In order to properly instantiate a `ModelField`, it must be passed a field that is attached to an instantiated model. For example: `ModelField(model_field=MyModel()._meta.get_field('custom_field'))` + ## SerializerMethodField This is a read-only field. It gets its value by calling a method on the serializer class it is attached to. It can be used to add any sort of data to the serialized representation of your object. -The field constructor accepts a single optional argument, which is the name of the method on the serializer to be called. If not included this defaults to `get_`. +**Signature**: `SerializerMethodField(method_name=None)` -The method should accept a single argument (in addition to `self`), which is the object being serialized. It should return whatever you want to be included in the serialized representation of the object. For example: +- `method-name` - The name of the method on the serializer to be called. If not included this defaults to `get_`. + +The serializer method referred to by the `method_name` argument should accept a single argument (in addition to `self`), which is the object being serialized. It should return whatever you want to be included in the serialized representation of the object. For example: from django.contrib.auth.models import User from django.utils.timezone import now @@ -433,9 +443,13 @@ The method should accept a single argument (in addition to `self`), which is the # Custom fields -If you want to create a custom field, you'll probably want to override either one or both of the `.to_representation()` and `.to_internal_value()` methods. These two methods are used to convert between the initial datatype, and a primitive, serializable datatype. Primitive datatypes may be any of a number, string, date/time/datetime or None. They may also be any list or dictionary like object that only contains other primitive objects. +If you want to create a custom field, you'll need to subclass `Field` and then override either one or both of the `.to_representation()` and `.to_internal_value()` methods. These two methods are used to convert between the initial datatype, and a primitive, serializable datatype. Primitive datatypes will typically be any of a number, string, boolean, `date`/`time`/`datetime` or `None`. They may also be any list or dictionary like object that only contains other primitive objects. Other types might be supported, depending on the renderer that you are using. -The `.to_representation()` method is called to convert the initial datatype into a primitive, serializable datatype. The `to_internal_value()` method is called to restore a primitive datatype into its internal python representation. +The `.to_representation()` method is called to convert the initial datatype into a primitive, serializable datatype. + +The `to_internal_value()` method is called to restore a primitive datatype into its internal python representation. + +Note that the `WritableField` class that was present in version 2.x no longer exists. You should subclass `Field` and override `to_internal_value()` if the field supports data input. ## Examples @@ -462,7 +476,6 @@ Let's look at an example of serializing a class that represents an RGB color val red, green, blue = [int(col) for col in data.split(',')] return Color(red, green, blue) - By default field values are treated as mapping to an attribute on the object. If you need to customize how the field value is accessed and set you need to override `.get_attribute()` and/or `.get_value()`. As an example, let's create a field that can be used represent the class name of the object being serialized: From 678f7b4c654ccc1bc147d36e0ecb4a3a3a1cacdb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 26 Nov 2014 10:43:45 +0000 Subject: [PATCH 1165/1652] Update notes on autocomplete --- docs/topics/browsable-api.md | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/docs/topics/browsable-api.md b/docs/topics/browsable-api.md index ad812f4b4..2879db74b 100644 --- a/docs/topics/browsable-api.md +++ b/docs/topics/browsable-api.md @@ -130,34 +130,24 @@ You can override the `BrowsableAPIRenderer.get_context()` method to customise th For more advanced customization, such as not having a Bootstrap basis or tighter integration with the rest of your site, you can simply choose not to have `api.html` extend `base.html`. Then the page content and capabilities are entirely up to you. -#### Autocompletion +#### Handling `ChoiceField` with large numbers of items. -When a `ChoiceField` has too many items, rendering the widget containing all the options can become very slow, and cause the browsable API rendering to perform poorly. One solution is to replace the selector by an autocomplete widget, that only loads and renders a subset of the available options as needed. +When a relationship or `ChoiceField` has too many items, rendering the widget containing all the options can become very slow, and cause the browsable API rendering to perform poorly. -There are [a variety of packages for autocomplete widgets][autocomplete-packages], such as [django-autocomplete-light][django-autocomplete-light]. To setup `django-autocomplete-light`, follow the [installation documentation][django-autocomplete-light-install], add the the following to the `api.html` template: +The simplest option in this case is to replace the select input with a standard text input. For example: - {% block script %} - {{ block.super }} - {% include 'autocomplete_light/static.html' %} - {% endblock %} + author = serializers.HyperlinkedRelatedField( + queryset=User.objects.all(), + style={'base_template': 'input.html'} + ) -You can now add the `autocomplete_light.ChoiceWidget` widget to the serializer field. +#### Autocomplete - import autocomplete_light +An alternative, but more complex option would be to replace the input with an autocomplete widget, that only loads and renders a subset of the available options as needed. If you need to do this you'll need to do some work to build a custom autocomplete HTML template yourself. - class BookSerializer(serializers.ModelSerializer): - author = serializers.ChoiceField( - widget=autocomplete_light.ChoiceWidget('AuthorAutocomplete') - ) +There are [a variety of packages for autocomplete widgets][autocomplete-packages], such as [django-autocomplete-light][django-autocomplete-light], that you may want to refer to. Note that you will not be able to simply include these components as standard widgets, but will need to write the HTML template explicitly. This is because REST framework 3.0 no longer supports the `widget` keyword argument since it now uses templated HTML generation. - class Meta: - model = Book - ---- - -![Autocomplete][autocomplete-image] - -*Screenshot of the autocomplete-light widget* +Better support for autocomplete inputs is planned in future versions. --- @@ -175,4 +165,3 @@ You can now add the `autocomplete_light.ChoiceWidget` widget to the serializer f [autocomplete-packages]: https://www.djangopackages.com/grids/g/auto-complete/ [django-autocomplete-light]: https://github.com/yourlabs/django-autocomplete-light [django-autocomplete-light-install]: http://django-autocomplete-light.readthedocs.org/en/latest/#install -[autocomplete-image]: ../img/autocomplete.png From b4550c65dd339731ff3dd2b0dd3c6dad12565906 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 26 Nov 2014 11:30:28 +0000 Subject: [PATCH 1166/1652] Docstring for 'many_init' --- rest_framework/relations.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 79c8057b6..5a3403f58 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -49,6 +49,21 @@ class RelatedField(Field): @classmethod def many_init(cls, *args, **kwargs): + """ + This method handles creating a parent `ManyRelatedField` instance + when the `many=True` keyword argument is passed. + + Typically you won't need to override this method. + + Note that we're over-cautious in passing most arguments to both parent + and child classes in order to try to cover the general case. If you're + overriding this method you'll probably want something much simpler, eg: + + @classmethod + def many_init(cls, *args, **kwargs): + kwargs['child'] = cls() + return CustomManyRelatedField(*args, **kwargs) + """ list_kwargs = {'child_relation': cls(*args, **kwargs)} for key in kwargs.keys(): if key in MANY_RELATION_KWARGS: From 5a5a73c7fef49899a37721e6c68228ef605e11f8 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 26 Nov 2014 11:30:49 +0000 Subject: [PATCH 1167/1652] 3.0 docs and tidy-up for serializer relationships --- docs/api-guide/relations.md | 81 +++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index ad981b2bb..7d19eba21 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -16,6 +16,20 @@ Relational fields are used to represent model relationships. They can be applie --- +#### Inspecting automatically generated relationships. + +When using the `ModelSerializer` class, serializer fields and relationships will be automatically generated for you. Inspecting these automatically generated fields can be a useful tool for determining how to customize the relationship style. + +To do so, open the Django shell, using `python manage.py shell`, then import the serializer class, instantiate it, and print the object representation… + + >>> from myapp.serializers import AccountSerializer + >>> serializer = AccountSerializer() + >>> print repr(serializer) # Or `print(repr(serializer))` in Python 3.x. + AccountSerializer(): + id = IntegerField(label='ID', read_only=True) + name = CharField(allow_blank=True, max_length=100, required=False) + owner = PrimaryKeyRelatedField(queryset=User.objects.all()) + # API Reference In order to explain the various types of relational fields, we'll use a couple of simple models for our examples. Our models will be for music albums, and the tracks listed on each album. @@ -37,14 +51,14 @@ In order to explain the various types of relational fields, we'll use a couple o def __unicode__(self): return '%d: %s' % (self.order, self.title) -## RelatedField +## StringRelatedField -`RelatedField` may be used to represent the target of the relationship using its `__unicode__` method. +`StringRelatedField` may be used to represent the target of the relationship using its `__unicode__` method. For example, the following serializer. class AlbumSerializer(serializers.ModelSerializer): - tracks = serializers.RelatedField(many=True) + tracks = serializers.StringRelatedField(many=True) class Meta: model = Album @@ -99,9 +113,9 @@ By default this field is read-write, although you can change this behavior using **Arguments**: +* `queryset` - The queryset used for model instance lookups when validating the field input. Relationships must either set a queryset explicitly, or set `read_only=True`. * `many` - If applied to a to-many relationship, you should set this argument to `True`. -* `required` - If set to `False`, the field will accept values of `None` or the empty-string for nullable relationships. -* `queryset` - By default `ModelSerializer` classes will use the default queryset for the relationship. `Serializer` classes must either set a queryset explicitly, or set `read_only=True`. +* `allow_null` - If set to `True`, the field will accept values of `None` or the empty string for nullable relationships. Defaults to `False`. ## HyperlinkedRelatedField @@ -110,8 +124,11 @@ By default this field is read-write, although you can change this behavior using For example, the following serializer: class AlbumSerializer(serializers.ModelSerializer): - tracks = serializers.HyperlinkedRelatedField(many=True, read_only=True, - view_name='track-detail') + tracks = serializers.HyperlinkedRelatedField( + many=True, + read_only=True, + view_name='track-detail' + ) class Meta: model = Album @@ -134,11 +151,12 @@ By default this field is read-write, although you can change this behavior using **Arguments**: -* `view_name` - The view name that should be used as the target of the relationship. If you're using [the standard router classes][routers] this wil be a string with the format `-detail`. **required**. +* `view_name` - The view name that should be used as the target of the relationship. If you're using [the standard router classes][routers] this will be a string with the format `-detail`. **required**. +* `queryset` - The queryset used for model instance lookups when validating the field input. Relationships must either set a queryset explicitly, or set `read_only=True`. * `many` - If applied to a to-many relationship, you should set this argument to `True`. -* `required` - If set to `False`, the field will accept values of `None` or the empty-string for nullable relationships. -* `queryset` - By default `ModelSerializer` classes will use the default queryset for the relationship. `Serializer` classes must either set a queryset explicitly, or set `read_only=True`. +* `allow_null` - If set to `True`, the field will accept values of `None` or the empty string for nullable relationships. Defaults to `False`. * `lookup_field` - The field on the target that should be used for the lookup. Should correspond to a URL keyword argument on the referenced view. Default is `'pk'`. +* `lookup_url_kwarg` - The name of the keyword argument defined in the URL conf that corresponds to the lookup field. Defaults to using the same value as `lookup_field`. * `format` - If using format suffixes, hyperlinked fields will use the same format suffix for the target unless overridden by using the `format` argument. ## SlugRelatedField @@ -148,8 +166,11 @@ By default this field is read-write, although you can change this behavior using For example, the following serializer: class AlbumSerializer(serializers.ModelSerializer): - tracks = serializers.SlugRelatedField(many=True, read_only=True, - slug_field='title') + tracks = serializers.SlugRelatedField( + many=True, + read_only=True, + slug_field='title' + ) class Meta: model = Album @@ -175,9 +196,9 @@ When using `SlugRelatedField` as a read-write field, you will normally want to e **Arguments**: * `slug_field` - The field on the target that should be used to represent it. This should be a field that uniquely identifies any given instance. For example, `username`. **required** +* `queryset` - The queryset used for model instance lookups when validating the field input. Relationships must either set a queryset explicitly, or set `read_only=True`. * `many` - If applied to a to-many relationship, you should set this argument to `True`. -* `required` - If set to `False`, the field will accept values of `None` or the empty-string for nullable relationships. -* `queryset` - By default `ModelSerializer` classes will use the default queryset for the relationship. `Serializer` classes must either set a queryset explicitly, or set `read_only=True`. +* `allow_null` - If set to `True`, the field will accept values of `None` or the empty string for nullable relationships. Defaults to `False`. ## HyperlinkedIdentityField @@ -245,9 +266,9 @@ Would serialize to a nested representation like this: # Custom relational fields -To implement a custom relational field, you should override `RelatedField`, and implement the `.to_native(self, value)` method. This method takes the target of the field as the `value` argument, and should return the representation that should be used to serialize the target. +To implement a custom relational field, you should override `RelatedField`, and implement the `.to_representation(self, value)` method. This method takes the target of the field as the `value` argument, and should return the representation that should be used to serialize the target. The `value` argument will typically be a model instance. -If you want to implement a read-write relational field, you must also implement the `.from_native(self, data)` method, and add `read_only = False` to the class definition. +If you want to implement a read-write relational field, you must also implement the `.to_internal_value(self, data)` method. ## Example @@ -256,7 +277,7 @@ For, example, we could define a relational field, to serialize a track to a cust import time class TrackListingField(serializers.RelatedField): - def to_native(self, value): + def to_representation(self, value): duration = time.strftime('%M:%S', time.gmtime(value.duration)) return 'Track %d: %s (%s)' % (value.order, value.name, duration) @@ -350,7 +371,7 @@ We could define a custom field that could be used to serialize tagged instances, A custom field to use for the `tagged_object` generic relationship. """ - def to_native(self, value): + def to_representation(self, value): """ Serialize tagged objects to a simple textual representation. """ @@ -360,9 +381,9 @@ We could define a custom field that could be used to serialize tagged instances, return 'Note: ' + value.text raise Exception('Unexpected type of tagged object') -If you need the target of the relationship to have a nested representation, you can use the required serializers inside the `.to_native()` method: +If you need the target of the relationship to have a nested representation, you can use the required serializers inside the `.to_native()` method: - def to_native(self, value): + def to_representation(self, value): """ Serialize bookmark instances using a bookmark serializer, and note instances using a note serializer. @@ -404,7 +425,6 @@ attributes are not configured to correctly match the URL conf. #### get_object(self, queryset, view_name, view_args, view_kwargs) - This method should the object that corresponds to the matched URL conf arguments. May raise an `ObjectDoesNotExist` exception. @@ -425,25 +445,6 @@ For example, if all your object URLs used both a account and a slug in the the U --- -## Deprecated APIs - -The following classes have been deprecated, in favor of the `many=` syntax. -They continue to function, but their usage will raise a `PendingDeprecationWarning`, which is silent by default. - -* `ManyRelatedField` -* `ManyPrimaryKeyRelatedField` -* `ManyHyperlinkedRelatedField` -* `ManySlugRelatedField` - -The `null=` flag has been deprecated in favor of the `required=` flag. It will continue to function, but will raise a `PendingDeprecationWarning`. - -In the 2.3 release, these warnings will be escalated to a `DeprecationWarning`, which is loud by default. -In the 2.4 release, these parts of the API will be removed entirely. - -For more details see the [2.2 release announcement][2.2-announcement]. - ---- - # Third Party Packages The following third party packages are also available. From 786cab705a37f6b2196560d0e476e5c849420a61 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Wed, 26 Nov 2014 11:38:48 +0000 Subject: [PATCH 1168/1652] Tweak to 3.0 relationship docs --- docs/api-guide/relations.md | 12 +++++++++++- rest_framework/relations.py | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 7d19eba21..17009bbcd 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -245,7 +245,7 @@ For example, the following serializer: fields = ('order', 'title') class AlbumSerializer(serializers.ModelSerializer): - tracks = TrackSerializer(many=True) + tracks = TrackSerializer(many=True, read_only=True) class Meta: model = Album @@ -305,6 +305,16 @@ This custom field would then serialize to the following representation. # Further notes +## The `queryset` argument + +The `queryset` argument is only ever required for *writable* relationship field, in which case it is used for performing the model instance lookup, that maps from the primitive user input, into a model instance. + +In version 2.x a serializer class could *sometimes* automatically determine the `queryset` argument *if* a `ModelSerializer` class was being used. + +This behavior is now replaced with *always* using an explicit `queryset` argument for writable relational fields. + +Doing so reduces the amount of hidden 'magic' that `ModelSerializer` provides, makes the behavior of the field more clear, and ensures that it is trivial to move between using the `ModelSerializer` shortcut, or using fully explicit `Serializer` classes. + ## Reverse relations Note that reverse relationships are not automatically included by the `ModelSerializer` and `HyperlinkedModelSerializer` classes. To include a reverse relationship, you must explicitly add it to the fields list. For example: diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 5a3403f58..d1ea497aa 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -321,7 +321,9 @@ class ManyRelatedField(Field): The `ManyRelatedField` class is responsible for handling iterating through the values and passing each one to the child relationship. - You shouldn't need to be using this class directly yourself. + This class is treated as private API. + You shouldn't generally need to be using this class directly yourself, + and should instead simply set 'many=True' on the relationship. """ initial = [] default_empty_html = [] From 34bd2b782875f93471c346230579cc75e52fb2c9 Mon Sep 17 00:00:00 2001 From: Will Stott Date: Wed, 26 Nov 2014 15:48:08 +0000 Subject: [PATCH 1169/1652] a few typos --- docs/tutorial/1-serialization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index f9027b688..84ed247ac 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -206,7 +206,7 @@ Open the file `snippets/serializers.py` again, and edit the `SnippetSerializer` model = Snippet fields = ('id', 'title', 'code', 'linenos', 'language', 'style') -Once nice property that serializers have is that you can inspect all the fields an serializer instance, by printing it's representation. Open the Django shell with `python manange.py shell`, then try the following: +One nice property that serializers have is that you can inspect all the fields in a serializer instance, by printing it's representation. Open the Django shell with `python manange.py shell`, then try the following: >>> from snippets.serializers import SnippetSerializer >>> serializer = SnippetSerializer() From d0e245baba63dd8e2c0a497fc4f65b34b3d25a4a Mon Sep 17 00:00:00 2001 From: Will Stott Date: Wed, 26 Nov 2014 15:51:28 +0000 Subject: [PATCH 1170/1652] grammar --- docs/tutorial/1-serialization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 84ed247ac..a3c19858d 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -219,7 +219,7 @@ One nice property that serializers have is that you can inspect all the fields i language = ChoiceField(choices=[('Clipper', 'FoxPro'), ('Cucumber', 'Gherkin'), ('RobotFramework', 'RobotFramework'), ('abap', 'ABAP'), ('ada', 'Ada')... style = ChoiceField(choices=[('autumn', 'autumn'), ('borland', 'borland'), ('bw', 'bw'), ('colorful', 'colorful')... -It's important to remember that `ModelSerializer` classes don't do anything particularly magically, they are simply a shortcut to creating a serializer class with: +It's important to remember that `ModelSerializer` classes don't do anything particularly magical, they are simply a shortcut for creating serializer classes: * An automatically determined set of fields. * Simple default implementations for the `create()` and `update()` methods. From 767414439b5553d6cb4e1825b39ff7de65d39a35 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Wed, 26 Nov 2014 22:20:14 +0100 Subject: [PATCH 1171/1652] Be nicer with __closable_objects. --- tests/test_renderers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_renderers.py b/tests/test_renderers.py index a842babaa..416d7f224 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -646,7 +646,8 @@ class CacheRenderTest(TestCase): """ method = getattr(self.client, http_method) resp = method(url) - del resp.client, resp.request, resp._closable_objects + resp._closable_objects = [] + del resp.client, resp.request try: del resp.wsgi_request except AttributeError: From 9b88c096e0627f1f054a50097d653543909662ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Wed, 26 Nov 2014 18:12:12 -0400 Subject: [PATCH 1172/1652] Remove Third party packages section Information about Third party packages is already covered under the Third Party Resources topic --- docs/topics/contributing.md | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 7654136cf..30a9678f6 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -198,21 +198,6 @@ If you want to draw attention to a note or warning, use a pair of enclosing line --- -# Third party packages - -New features to REST framework are generally recommended to be implemented as third party libraries that are developed outside of the core framework. Ideally third party libraries should be properly documented and packaged, and made available on PyPI. - -## Getting started - -If you have some functionality that you would like to implement as a third party package it's worth contacting the [discussion group][google-group] as others may be willing to get involved. We strongly encourage third party package development and will always try to prioritize time spent helping their development, documentation and packaging. - -We recommend the [`django-reusable-app`][django-reusable-app] template as a good resource for getting up and running with implementing a third party Django package. - -## Linking to your package - -Once your package is decently documented and available on PyPI open a pull request or issue, and we'll add a link to it from the main REST framework documentation. You can add your package under **Third party packages** of the API Guide section that best applies, like [Authentication][authentication] or [Permissions][permissions]. You can also link your package under the [Third Party Resources][third-party-resources] section. - -We also suggest adding it to the [REST Framework][rest-framework-grid] grid on Django Packages. [cite]: http://www.w3.org/People/Berners-Lee/FAQ.html [code-of-conduct]: https://www.djangoproject.com/conduct/ @@ -226,8 +211,3 @@ We also suggest adding it to the [REST Framework][rest-framework-grid] grid on D [markdown]: http://daringfireball.net/projects/markdown/basics [docs]: https://github.com/tomchristie/django-rest-framework/tree/master/docs [mou]: http://mouapp.com/ -[django-reusable-app]: https://github.com/dabapps/django-reusable-app -[authentication]: ../api-guide/authentication.md -[permissions]: ../api-guide/permissions.md -[third-party-resources]: third-party-resources.md -[rest-framework-grid]: https://www.djangopackages.com/grids/g/django-rest-framework/ From 0262262feefc1a8130cb852a6b710a16ebc24cb9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 27 Nov 2014 08:09:58 +0000 Subject: [PATCH 1173/1652] 3.0 serializer docs --- docs/api-guide/serializers.md | 347 +++++++++++++++++++++------------- 1 file changed, 212 insertions(+), 135 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 2d0ff79a4..e476d9577 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -10,7 +10,7 @@ will take some serious design work. Serializers allow complex data such as querysets and model instances to be converted to native Python datatypes that can then be easily rendered into `JSON`, `XML` or other content types. Serializers also provide deserialization, allowing parsed data to be converted back into complex types, after first validating the incoming data. -REST framework's serializers work very similarly to Django's `Form` and `ModelForm` classes. It provides a `Serializer` class which gives you a powerful, generic way to control the output of your responses, as well as a `ModelSerializer` class which provides a useful shortcut for creating serializers that deal with model instances and querysets. +The serializers in REST framework work very similarly to Django's `Form` and `ModelForm` classes. We provide a `Serializer` class which gives you a powerful, generic way to control the output of your responses, as well as a `ModelSerializer` class which provides a useful shortcut for creating serializers that deal with model instances and querysets. ## Declaring Serializers @@ -24,7 +24,7 @@ Let's start by creating a simple object we can use for example purposes: comment = Comment(email='leila@example.com', content='foo bar') -We'll declare a serializer that we can use to serialize and deserialize `Comment` objects. +We'll declare a serializer that we can use to serialize and deserialize data that corresponds to `Comment` objects. Declaring a serializer looks very similar to declaring a form: @@ -35,25 +35,9 @@ Declaring a serializer looks very similar to declaring a form: content = serializers.CharField(max_length=200) created = serializers.DateTimeField() - def restore_object(self, attrs, instance=None): - """ - Given a dictionary of deserialized field values, either update - an existing model instance, or create a new model instance. - """ - if instance is not None: - instance.email = attrs.get('email', instance.email) - instance.content = attrs.get('content', instance.content) - instance.created = attrs.get('created', instance.created) - return instance - return Comment(**attrs) - -The first part of serializer class defines the fields that get serialized/deserialized. The `restore_object` method defines how fully fledged instances get created when deserializing data. - -The `restore_object` method is optional, and is only required if we want our serializer to support deserialization into fully fledged object instances. If we don't define this method, then deserializing data will simply return a dictionary of items. - ## Serializing objects -We can now use `CommentSerializer` to serialize a comment, or list of comments. Again, using the `Serializer` class looks a lot like using a `Form` class. +We can now use `CommentSerializer` to serialize a comment, or list of comments. Again, using the `Serializer` class looks a lot like using a `Form` class. serializer = CommentSerializer(comment) serializer.data @@ -67,24 +51,9 @@ At this point we've translated the model instance into Python native datatypes. json # '{"email": "leila@example.com", "content": "foo bar", "created": "2012-08-22T16:20:09.822"}' -### Customizing field representation - -Sometimes when serializing objects, you may not want to represent everything exactly the way it is in your model. - -If you need to customize the serialized value of a particular field, you can do this by creating a `transform_` method. For example if you needed to render some markdown from a text field: - - description = serializers.CharField() - description_html = serializers.CharField(source='description', read_only=True) - - def transform_description_html(self, obj, value): - from django.contrib.markup.templatetags.markup import markdown - return markdown(value) - -These methods are essentially the reverse of `validate_` (see *Validation* below.) - ## Deserializing objects -Deserialization is similar. First we parse a stream into Python native datatypes... +Deserialization is similar. First we parse a stream into Python native datatypes... from StringIO import StringIO from rest_framework.parsers import JSONParser @@ -92,26 +61,90 @@ Deserialization is similar. First we parse a stream into Python native datatype stream = StringIO(json) data = JSONParser().parse(stream) -...then we restore those native datatypes into a fully populated object instance. +...then we restore those native datatypes into a dictionary of validated data. serializer = CommentSerializer(data=data) serializer.is_valid() # True - serializer.object - # + serializer.validated_data + # {'content': 'foo bar', 'email': 'leila@example.com', 'created': datetime.datetime(2012, 08, 22, 16, 20, 09, 822243)} -When deserializing data, we can either create a new instance, or update an existing instance. +## Saving instances - serializer = CommentSerializer(data=data) # Create new instance - serializer = CommentSerializer(comment, data=data) # Update `comment` +If we want to be able to return complete object instances based on the validated data we need to implement one or both of the `.create()` and `update()` methods. For example: -By default, serializers must be passed values for all required fields or they will throw validation errors. You can use the `partial` argument in order to allow partial updates. + class CommentSerializer(serializers.Serializer): + email = serializers.EmailField() + content = serializers.CharField(max_length=200) + created = serializers.DateTimeField() - serializer = CommentSerializer(comment, data={'content': u'foo bar'}, partial=True) # Update `comment` with partial data + def create(self, validated_data): + return Comment(**validated_data) + + def update(self, instance, validated_data): + instance.email = validated_data.get('email', instance.email) + instance.content = validated_data.get('content', instance.content) + instance.created = validated_data.get('created', instance.created) + return instance + +If your object instances correspond to Django models you'll also want to ensure that these methods save the object to the database. For example, if `Comment` was a Django model, the methods might look like this: + + def create(self, validated_data): + return Comment.objcts.create(**validated_data) + + def update(self, instance, validated_data): + instance.email = validated_data.get('email', instance.email) + instance.content = validated_data.get('content', instance.content) + instance.created = validated_data.get('created', instance.created) + instance.save() + return instance + +Now when deserializing data, we can call `.save()` to return an object instance, based on the validated data. + + comment = serializer.save() + +Calling `.save()` will either create a new instance, or update an existing instance, depending on if an existing instance was passed when instantiating the serializer class: + + # .save() will create a new instance. + serializer = CommentSerializer(data=data) + + # .save() will update the existing `comment` instance. + serializer = CommentSerializer(comment, data=data) + +Both the `.create()` and `.update()` methods are optional. You can implement either neither, one, or both of them, depending on the use-case for your serializer class. + +#### Passing additional attributes to `.save()` + +Sometimes you'll want your view code to be able to inject additional data at the point of saving the instance. This additional data might include information like the current user, the current time, or anything else that is not part of the request data. + +You can do so by including additional keyword arguments when calling `.save()`. For example: + + serializer.save(owner=request.user) + +Any additional keyword arguments will be included in the `validated_data` argument when `.create()` or `.update()` are called. + +#### Overriding `.save()` directly. + +In some cases the `.create()` and `.update()` method names may not be meaningful. For example, in a contact form we may not be creating new instances, but instead sending an email or other message. + +In these cases you might instead choose to override `.save()` directly, as being more readable and meaningful. + +For example: + + class ContactForm(serializers.Serializer): + email = serializers.EmailField() + message = serializers.CharField() + + def save(self): + email = self.validated_data['email'] + message = self.validated_data['message'] + send_email(from=email, message=message) + +Note that in the case above we're now having to access the serializer `.validated_data` property directly. ## Validation -When deserializing data, you always need to call `is_valid()` before attempting to access the deserialized object. If any validation errors occur, the `.errors` property will contain a dictionary representing the resulting error messages. For example: +When deserializing data, you always need to call `is_valid()` before attempting to access the validated data, or save an object instance. If any validation errors occur, the `.errors` property will contain a dictionary representing the resulting error messages. For example: serializer = CommentSerializer(data={'email': 'foobar', 'content': 'baz'}) serializer.is_valid() @@ -119,17 +152,26 @@ When deserializing data, you always need to call `is_valid()` before attempting serializer.errors # {'email': [u'Enter a valid e-mail address.'], 'created': [u'This field is required.']} -Each key in the dictionary will be the field name, and the values will be lists of strings of any error messages corresponding to that field. The `non_field_errors` key may also be present, and will list any general validation errors. +Each key in the dictionary will be the field name, and the values will be lists of strings of any error messages corresponding to that field. The `non_field_errors` key may also be present, and will list any general validation errors. The name of the `non_field_errors` key may be customized using the `NON_FIELD_ERRORS_KEY` REST framework setting. When deserializing a list of items, errors will be returned as a list of dictionaries representing each of the deserialized items. +#### Raising an exception on invalid data + +The `.is_valid()` method takes an optional `raise_exception` flag that will cause it to raise a `serializers.ValidationError` exception if there are validation errors. + +These exceptions are automatically dealt with by the default exception handler that REST framework provides, and will return `HTTP 400 Bad Request` responses by default. + + # Return a 400 response if the data was invalid. + serializer.is_valid(raise_exception=True) + #### Field-level validation -You can specify custom field-level validation by adding `.validate_` methods to your `Serializer` subclass. These are analogous to `.clean_` methods on Django forms, but accept slightly different arguments. +You can specify custom field-level validation by adding `.validate_` methods to your `Serializer` subclass. These are similar to the `.clean_` methods on Django forms. -They take a dictionary of deserialized attributes as a first argument, and the field name in that dictionary as a second argument (which will be either the name of the field or the value of the `source` argument to the field, if one was provided). +These methods take a single argument, which is the field value that requires validation. -Your `validate_` methods should either just return the `attrs` dictionary or raise a `ValidationError`. For example: +Your `validate_` methods should return the validated value or raise a `ValidationError`. For example: from rest_framework import serializers @@ -137,18 +179,17 @@ Your `validate_` methods should either just return the `attrs` dictio title = serializers.CharField(max_length=100) content = serializers.CharField() - def validate_title(self, attrs, source): + def validate_title(self, value): """ Check that the blog post is about Django. """ - value = attrs[source] - if "django" not in value.lower(): + if 'django' not in value.lower(): raise serializers.ValidationError("Blog post is not about Django") - return attrs + return value #### Object-level validation -To do any other validation that requires access to multiple fields, add a method called `.validate()` to your `Serializer` subclass. This method takes a single argument, which is the `attrs` dictionary. It should raise a `ValidationError` if necessary, or just return `attrs`. For example: +To do any other validation that requires access to multiple fields, add a method called `.validate()` to your `Serializer` subclass. This method takes a single argument, which is a dictionary of field values. It should raise a `ValidationError` if necessary, or just return the validated values. For example: from rest_framework import serializers @@ -157,24 +198,48 @@ To do any other validation that requires access to multiple fields, add a method start = serializers.DateTimeField() finish = serializers.DateTimeField() - def validate(self, attrs): + def validate(self, data): """ Check that the start is before the stop. """ - if attrs['start'] > attrs['finish']: + if data['start'] > data['finish']: raise serializers.ValidationError("finish must occur after start") - return attrs + return data -## Saving object state +#### Validators -To save the deserialized objects created by a serializer, call the `.save()` method: +Individual fields on a serializer can include validators, by declaring them on the field instance, for example: - if serializer.is_valid(): - serializer.save() + def multiple_of_ten(value): + if value % 10 != 0: + raise serializers.ValidationError('Not a multiple of ten') -The default behavior of the method is to simply call `.save()` on the deserialized object instance. You can override the default save behaviour by overriding the `.save_object(obj)` method on the serializer class. + class GameRecord(serializers.Serializer): + score = IntegerField(validators=[multiple_of_ten]) + ... -The generic views provided by REST framework call the `.save()` method when updating or creating entities. +Serializer classes can also include reusable validators that are applied to the complete set of field data. These validators are included by declaring them on an inner `Meta` class, like so: + + class EventSerializer(serializers.Serializer): + name = serializers.CharField() + room_number = serializers.IntegerField(choices=[101, 102, 103, 201]) + date = serializers.DateField() + + class Meta: + # Each room only has one event per day. + validators = UniqueTogetherValidator( + queryset=Event.objects.all(), + fields=['room_number', 'date'] + ) + +For more information see the [validators documentation](validators.md). + +## Partial updates + +By default, serializers must be passed values for all required fields or they will raise validation errors. You can use the `partial` argument in order to allow partial updates. + + # Update `comment` with partial data + serializer = CommentSerializer(comment, data={'content': u'foo bar'}, partial=True) ## Dealing with nested objects @@ -214,6 +279,8 @@ Validation of nested objects will work the same as before. Errors with nested o serializer.errors # {'user': {'email': [u'Enter a valid e-mail address.']}, 'created': [u'This field is required.']} +**TODO** Document create and update for nested serializers + ## Dealing with multiple objects The `Serializer` class can also handle serializing or deserializing lists of objects. @@ -233,6 +300,8 @@ To serialize a queryset or list of objects instead of a single object instance, #### Deserializing multiple objects for creation +**TODO** + To deserialize a list of object data, and create multiple object instances in a single pass, you should also set the `many=True` flag, and pass a list of data to be deserialized. This allows you to write views that create multiple items when a `POST` request is made. @@ -250,6 +319,8 @@ For example: #### Deserializing multiple objects for update +**TODO** + You can also deserialize a list of objects as part of a bulk update of multiple existing items. In this case you need to supply both an existing list or queryset of items, as well as a list of data to update those items with. @@ -278,32 +349,6 @@ When performing a bulk update you may want to allow new items to be created, and Passing `allow_add_remove=True` ensures that any update operations will completely overwrite the existing queryset, rather than simply updating existing objects. -#### How identity is determined when performing bulk updates - -Performing a bulk update is slightly more complicated than performing a bulk creation, because the serializer needs a way to determine how the items in the incoming data should be matched against the existing object instances. - -By default the serializer class will use the `id` key on the incoming data to determine the canonical identity of an object. If you need to change this behavior you should override the `get_identity` method on the `Serializer` class. For example: - - class AccountSerializer(serializers.Serializer): - slug = serializers.CharField(max_length=100) - created = serializers.DateTimeField() - ... # Various other fields - - def get_identity(self, data): - """ - This hook is required for bulk update. - We need to override the default, to use the slug as the identity. - - Note that the data has not yet been validated at this point, - so we need to deal gracefully with incorrect datatypes. - """ - try: - return data.get('slug', None) - except AttributeError: - return None - -To map the incoming data items to their corresponding object instances, the `.get_identity()` method will be called both against the incoming data, and against the serialized representation of the existing objects. - ## Including extra context There are some cases where you need to provide extra context to the serializer in addition to the object being serialized. One common case is if you're using a serializer that includes hyperlinked relations, which requires the serializer to have access to the current request so that it can properly generate fully qualified URLs. @@ -314,28 +359,46 @@ You can provide arbitrary additional context by passing a `context` argument whe serializer.data # {'id': 6, 'owner': u'denvercoder9', 'created': datetime.datetime(2013, 2, 12, 09, 44, 56, 678870), 'details': 'http://example.com/accounts/6/details'} -The context dictionary can be used within any serializer field logic, such as a custom `.to_native()` method, by accessing the `self.context` attribute. +The context dictionary can be used within any serializer field logic, such as a custom `.to_representation()` method, by accessing the `self.context` attribute. + +--- -- # ModelSerializer -Often you'll want serializer classes that map closely to model definitions. -The `ModelSerializer` class lets you automatically create a Serializer class with fields that correspond to the Model fields. +Often you'll want serializer classes that map closely to Django model definitions. + +The `ModelSerializer` class provides a shortcut that lets you automatically create a `Serializer` class with fields that correspond to the Model fields. + +**The `ModelSerializer` class is the same as a regular `Serializer` class, except that**: + +* It will automatically generate a set of fields for you, based on the model. +* It will automatically generate validators for the serializer, such as unique_together validators. +* It includes simple default implementations of `.create()` and `.update()`. + +Declaring a `ModelSerializer` looks like this: class AccountSerializer(serializers.ModelSerializer): class Meta: model = Account -By default, all the model fields on the class will be mapped to corresponding serializer fields. +By default, all the model fields on the class will be mapped to a corresponding serializer fields. -Any relationships such as foreign keys on the model will be mapped to `PrimaryKeyRelatedField`. Other models fields will be mapped to a corresponding serializer field. +Any relationships such as foreign keys on the model will be mapped to `PrimaryKeyRelatedField`. Reverse relationships are not included by default unless explicitly included as described below. ---- +#### Inspecting the generated `ModelSerializer` class. -**Note**: When validation is applied to a `ModelSerializer`, both the serializer fields, and their corresponding model fields must correctly validate. If you have optional fields on your model, make sure to correctly set `blank=True` on the model field, as well as setting `required=False` on the serializer field. +Serializer classes generate helpful verbose representation strings, that allow you to fully inspect the state of their fields. This is particularly useful when working with `ModelSerializers` where you want to determine what set of fields and validators are being automatically created for you. ---- +To do so, open the Django shell, using `python manage.py shell`, then import the serializer class, instantiate it, and print the object representation… + >>> from myapp.serializers import AccountSerializer + >>> serializer = AccountSerializer() + >>> print repr(serializer) # Or `print(repr(serializer))` in Python 3.x. + AccountSerializer(): + id = IntegerField(label='ID', read_only=True) + name = CharField(allow_blank=True, max_length=100, required=False) + owner = PrimaryKeyRelatedField(queryset=User.objects.all()) + ## Specifying which fields should be included If you only want a subset of the default fields to be used in a model serializer, you can do so using `fields` or `exclude` options, just as you would with a `ModelForm`. @@ -347,6 +410,10 @@ For example: model = Account fields = ('id', 'account_name', 'users', 'created') +The names in the `fields` option will normally map to model fields on the model class. + +Alternatively names in the `fields` options can map to properties or methods which take no arguments that exist on the model class. + ## Specifying nested serialization The default `ModelSerializer` uses primary keys for relationships, but you can also easily generate nested representations using the `depth` option: @@ -361,37 +428,6 @@ The `depth` option should be set to an integer value that indicates the depth of If you want to customize the way the serialization is done (e.g. using `allow_add_remove`) you'll need to define the field yourself. -## Specifying which fields should be read-only - -You may wish to specify multiple fields as read-only. Instead of adding each field explicitly with the `read_only=True` attribute, you may use the `read_only_fields` Meta option, like so: - - class AccountSerializer(serializers.ModelSerializer): - class Meta: - model = Account - fields = ('id', 'account_name', 'users', 'created') - read_only_fields = ('account_name',) - -Model fields which have `editable=False` set, and `AutoField` fields will be set to read-only by default, and do not need to be added to the `read_only_fields` option. - -## Specifying which fields should be write-only - -You may wish to specify multiple fields as write-only. Instead of adding each field explicitly with the `write_only=True` attribute, you may use the `write_only_fields` Meta option, like so: - - class CreateUserSerializer(serializers.ModelSerializer): - class Meta: - model = User - fields = ('email', 'username', 'password') - write_only_fields = ('password',) # Note: Password field is write-only - - def restore_object(self, attrs, instance=None): - """ - Instantiate a new User instance. - """ - assert instance is None, 'Cannot update users with CreateUserSerializer' - user = User(email=attrs['email'], username=attrs['username']) - user.set_password(attrs['password']) - return user - ## Specifying fields explicitly You can add extra fields to a `ModelSerializer` or override the default fields by declaring fields on the class, just as you would for a `Serializer` class. @@ -405,6 +441,41 @@ You can add extra fields to a `ModelSerializer` or override the default fields b Extra fields can correspond to any property or callable on the model. +## Specifying which fields should be read-only + +You may wish to specify multiple fields as read-only. Instead of adding each field explicitly with the `read_only=True` attribute, you may use the shortcut Meta option, `read_only_fields`. + +This option should be a list or tuple of field names, and is declared as follows: + + class AccountSerializer(serializers.ModelSerializer): + class Meta: + model = Account + fields = ('id', 'account_name', 'users', 'created') + read_only_fields = ('account_name',) + +Model fields which have `editable=False` set, and `AutoField` fields will be set to read-only by default, and do not need to be added to the `read_only_fields` option. + +## Specifying additional keyword arguments for fields. + +There is also a shortcut allowing you to specify arbitrary additional keyword arguments on fields, using the `extra_kwargs` option. Similarly to `read_only_fields` this means you do not need to explicitly declare the field on the serializer. + +This option is a dictionary, mapping field names to a dictionary of keyword arguments. For example: + + class CreateUserSerializer(serializers.ModelSerializer): + class Meta: + model = User + fields = ('email', 'username', 'password') + extra_kwargs = {'password': {'write_only': True}} + + def create(self, validated_data): + user = User( + email=validated_data['email'], + username=validated_data['username'] + ) + user.set_password(validated_data['password']) + user.save() + return user + ## Relational fields When serializing model instances, there are a number of different ways you might choose to represent relationships. The default representation for `ModelSerializer` is to use the primary keys of the related instances. @@ -415,7 +486,7 @@ For full details see the [serializer relations][relations] documentation. ## Inheritance of the 'Meta' class -The inner `Meta` class on serializers is not inherited from parent classes by default. This is the same behaviour as with Django's `Model` and `ModelForm` classes. If you want the `Meta` class to inherit from a parent class you must do so explicitly. For example: +The inner `Meta` class on serializers is not inherited from parent classes by default. This is the same behavior as with Django's `Model` and `ModelForm` classes. If you want the `Meta` class to inherit from a parent class you must do so explicitly. For example: class AccountSerializer(MyBaseSerializer): class Meta(MyBaseSerializer.Meta): @@ -446,7 +517,7 @@ There needs to be a way of determining which views should be used for hyperlinki By default hyperlinks are expected to correspond to a view name that matches the style `'{model_name}-detail'`, and looks up the instance by a `pk` keyword argument. -You can change the field that is used for object lookups by setting the `lookup_field` option. The value of this option should correspond both with a kwarg in the URL conf, and with a field on the model. For example: +You can change the field that is used for object lookups by setting the `lookup_field` option. The value of this option should correspond both with a kwarg in the URL conf, and with a field on the model. For example: class AccountSerializer(serializers.HyperlinkedModelSerializer): class Meta: @@ -460,8 +531,8 @@ For more specific requirements such as specifying a different lookup for each fi class AccountSerializer(serializers.HyperlinkedModelSerializer): url = serializers.HyperlinkedIdentityField( - view_name='account_detail', - lookup_field='account_name' + view_name='account-detail', + lookup_field='slug' ) users = serializers.HyperlinkedRelatedField( view_name='user-detail', @@ -486,7 +557,7 @@ You can also override this on a per-serializer basis by using the `url_field_nam fields = ('account_url', 'account_name', 'users', 'created') url_field_name = 'account_url' -**Note**: The generic view implementations normally generate a `Location` header in response to successful `POST` requests. Serializers using `url_field_name` option will not have this header automatically included by the view. If you need to do so you will ned to also override the view's `get_success_headers()` method. +**Note**: The generic view implementations normally generate a `Location` header in response to successful `POST` requests. Serializers using `url_field_name` option will not have this header automatically included by the view. If you need to do so you will ned to also override the view's `get_success_headers()` method. You can also override the URL field's view name and lookup field without overriding the field explicitly, by using the `view_name` and `lookup_field` options, like so: @@ -499,8 +570,12 @@ You can also override the URL field's view name and lookup field without overrid --- +**TODO**: ListSerializer, BaseSerializer, overriding `to_representation` on serializers. + # Advanced serializer usage +**TODO**: Tweak section below + You can create customized subclasses of `ModelSerializer` or `HyperlinkedModelSerializer` that use a different set of default fields. Doing so should be considered advanced usage, and will only be needed if you have some particular serializer requirements that you often need to repeat. @@ -528,7 +603,7 @@ For example, if you wanted to be able to set which fields should be used by a se # Instantiate the superclass normally super(DynamicFieldsModelSerializer, self).__init__(*args, **kwargs) - if fields: + if fields is not None: # Drop any fields that are not specified in the `fields` argument. allowed = set(fields) existing = set(self.fields.keys()) @@ -548,7 +623,9 @@ This would then allow you to do the following: >>> print UserSerializer(user, fields=('id', 'email')) {'id': 2, 'email': 'jon@example.com'} -## Customising the default fields +## Customizing the default fields + +**TODO**: Remove and note incoming API. The `field_mapping` attribute is a dictionary that maps model classes to serializer classes. Overriding the attribute will let you set a different set of default serializer classes. From 1ffe4857ec51c3b6c5a90059cca0fb82820d759e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 27 Nov 2014 08:10:52 +0000 Subject: [PATCH 1174/1652] Support callable attributes in dotted source. Closes #2142. --- rest_framework/fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 3cf348865..ca770f775 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -68,8 +68,8 @@ def get_attribute(instance, attrs): return instance[attr] except (KeyError, TypeError, AttributeError): raise exc - if is_simple_callable(instance): - return instance() + if is_simple_callable(instance): + return instance() return instance From 2fe6709769048944127c8c48af4364101914e690 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 27 Nov 2014 11:00:57 +0000 Subject: [PATCH 1175/1652] Fix sponsor images for mkdocs --- docs/topics/kickstarter-announcement.md | 142 ++++++++++++------------ 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index e8bad95be..91ead751b 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -43,20 +43,20 @@ We've now blazed way past all our goals, with a staggering £30,000 (~$50,000), Our platinum sponsors have each made a hugely substantial contribution to the future development of Django REST framework, and I simply can't thank them enough.
                    @@ -68,31 +68,31 @@ Our platinum sponsors have each made a hugely substantial contribution to the fu Our gold sponsors include companies large and small. Many thanks for their significant funding of the project and their commitment to sustainable open-source development. @@ -105,41 +105,41 @@ Our gold sponsors include companies large and small. Many thanks for their signi The serious financial contribution that our silver sponsors have made is very much appreciated. I'd like to say a particular thank you to individuals who have choosen to privately support the project at this level.
                    From fceeecf1e229de5ecf8930d3aacf4ef914d50b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Thu, 27 Nov 2014 09:06:37 -0400 Subject: [PATCH 1176/1652] Update to latest minor Django versions --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 11ea17b98..d5cb9ef94 100644 --- a/tox.ini +++ b/tox.ini @@ -10,10 +10,10 @@ commands = ./runtests.py --fast setenv = PYTHONDONTWRITEBYTECODE=1 deps = - django14: django==1.4.11 - django15: django==1.5.6 - django16: Django==1.6.3 - django17: Django==1.7 + django14: Django==1.4.16 + django15: Django==1.5.11 + django16: Django==1.6.8 + django17: Django==1.7.1 djangomaster: https://github.com/django/django/zipball/master {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 {py26,py27}-django{14,15,16}: oauth2==1.5.211 From 8579222cbdff98aef50e244e179b7c32a76ce8ad Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 27 Nov 2014 15:14:11 +0000 Subject: [PATCH 1177/1652] Fix for nested attribute lookups where one is a callable --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index ca770f775..2e2a68b87 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -69,7 +69,7 @@ def get_attribute(instance, attrs): except (KeyError, TypeError, AttributeError): raise exc if is_simple_callable(instance): - return instance() + instance = instance() return instance From 6b2033f7894319c827c04a5caded7187797fc0b3 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 27 Nov 2014 16:40:58 +0000 Subject: [PATCH 1178/1652] Drop transform_ --- rest_framework/serializers.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 00362dbb4..e86e67f79 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -371,14 +371,9 @@ class Serializer(BaseSerializer): for field in fields: attribute = field.get_attribute(instance) if attribute is None: - value = None + ret[field.field_name] = None else: - value = field.to_representation(attribute) - transform_method = getattr(self, 'transform_' + field.field_name, None) - if transform_method is not None: - value = transform_method(value) - - ret[field.field_name] = value + ret[field.field_name] = field.to_representation(attribute) return ret From d2d7e1dfde2a62ee8f6d904368dbd6581de278c9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 27 Nov 2014 16:41:53 +0000 Subject: [PATCH 1179/1652] Drop Field.validate --- rest_framework/fields.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 2e2a68b87..ca9c479f0 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -321,7 +321,6 @@ class Field(object): value = self.to_internal_value(data) self.run_validators(value) - self.validate(value) return value def run_validators(self, value): @@ -348,9 +347,6 @@ class Field(object): if errors: raise ValidationError(errors) - def validate(self, value): - pass - def to_internal_value(self, data): """ Transform the *incoming* primitive data into a native value. From c61c59f8b7260f0d6beb95c34f531e8c6c5929c9 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 27 Nov 2014 17:01:46 +0000 Subject: [PATCH 1180/1652] Notes on removal of Field.validate() and Serializer.transform_ --- docs/topics/3.0-announcement.md | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index f20a4296b..c925b5f08 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -199,6 +199,33 @@ Alternatively if you want the errors to be against a specific field, use a dicti This ensures you can still write validation that compares all the input fields, but that marks the error against a particular field. +#### Removal of `transform_`. + +The under-used `transform_` on serializer classes is no longer provided. Instead you should just override `to_representation()` if you need to apply any modifications to the representation style. + +For example: + + def to_representation(self, instance): + ret = super(UserSerializer, self).to_representation(instance) + ret['username'] = ret['username'].lower() + return ret + +Dropping the extra point of API means there's now only one right way to do things. This helps with repetition and reinforcement of the core API, rather than having multiple differing approaches. + +If you absolutely need to preserve `transform_` behavior, for example, in order to provide a simpler 2.x to 3.0 upgrade, you can use a mixin, or serializer base class that add the behavior back in. For example: + + class BaseModelSerializer(ModelSerializer): + """ + A custom ModelSerializer class that preserves 2.x style `transform_` behavior. + """ + def to_representation(self, instance): + ret = super(BaseModelSerializer, self).to_representation(instance) + for key, value in ret.items(): + method = getattr(self, 'transform_' + key, None) + if method is not None: + ret[key] = method(value) + return ret + #### Differences between ModelSerializer validation and ModelForm. This change also means that we no longer use the `.full_clean()` method on model instances, but instead perform all validation explicitly on the serializer. This gives a cleaner separation, and ensures that there's no automatic validation behavior on `ModelSerializer` classes that can't also be easily replicated on regular `Serializer` classes. @@ -544,6 +571,19 @@ The `default` argument is also available and always implies that the field is no The previous field implementations did not forcibly coerce returned values into the correct type in many cases. For example, an `IntegerField` would return a string output if the attribute value was a string. We now more strictly coerce to the correct return type, leading to more constrained and expected behavior. +#### Removal of `.validate()`. + +The `.validate()` method is now removed from field classes. This method was in any case undocumented and not public API. You should instead simply override `to_internal_value()`. + + class UppercaseCharField(serializers.CharField): + def to_internal_value(self, data): + value = super(UppercaseCharField, self).to_internal_value(data) + if value != value.upper(): + raise serializers.ValidationError('The input should be uppercase only.') + return value + +Previously validation errors could be raised in either `.to_native()` or `.validate()`, making it non-obvious which should be used. Providing only a single point of API ensures more repetition and reinforcement of the core API. + #### The `ListField` class. The `ListField` class has now been added. This field validates list input. It takes a `child` keyword argument which is used to specify the field used to validate each item in the list. For example: From 34ca8cd2a5c030d9acc89720876ba9583c1dc988 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 28 Nov 2014 09:56:44 +0000 Subject: [PATCH 1181/1652] Moar docs. Amazing. --- docs/api-guide/serializers.md | 306 +++++++++++++++++++++++++++----- docs/topics/3.0-announcement.md | 12 +- rest_framework/serializers.py | 4 +- 3 files changed, 273 insertions(+), 49 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index e476d9577..6c370f754 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -167,11 +167,11 @@ These exceptions are automatically dealt with by the default exception handler t #### Field-level validation -You can specify custom field-level validation by adding `.validate_` methods to your `Serializer` subclass. These are similar to the `.clean_` methods on Django forms. +You can specify custom field-level validation by adding `.validate_` methods to your `Serializer` subclass. These are similar to the `.clean_` methods on Django forms. These methods take a single argument, which is the field value that requires validation. -Your `validate_` methods should return the validated value or raise a `ValidationError`. For example: +Your `validate_` methods should return the validated value or raise a `serializers.ValidationError`. For example: from rest_framework import serializers @@ -317,6 +317,20 @@ For example: # True serializer.save() # `.save()` will be called on each deserialized instance +The default implementation for multiple object creation is to simply call `.create()` for each item in the list. If you want to customize this behavior, you'll need to customize the `.create()` method on `ListSerializer` class that is used when `many=True` is passed. + +For example: + + class BookListSerializer(serializers.ListSerializer): + def create(self, validated_data): + books = [Book(**item) for item in validated_data] + return Book.objects.bulk_create(books) + + class BookSerializer(serializers.Serializer): + … + class Meta: + list_serializer_class = BookListSerializer + #### Deserializing multiple objects for update **TODO** @@ -570,15 +584,253 @@ You can also override the URL field's view name and lookup field without overrid --- -**TODO**: ListSerializer, BaseSerializer, overriding `to_representation` on serializers. +# ListSerializer + +The `ListSerializer` class provides the behavior for serializing and validating multiple objects at once. You won't *typically* need to use `ListSerializer` directly, but should instead simply pass `many=True` when instantiating a serializer. + +When a serializer is instantiated and `many=True` is passed, a `ListSerializer` instance will be created. The serializer class then becomes a child of the parent `ListSerializer` + +There *are* a few use cases when you might want to customize the `ListSerializer` behavior. For example: + +* You want to provide particular validation of the lists, such as always ensuring that there is at least one element in a list. +* You want to customize the create or update behavior of multiple objects. + +For these cases you can modify the class that is used when `many=True` is passed, by using the `list_serializer_class` option on the serializer `Meta` class. + +For example: + + class CustomListSerializer(serializers.ListSerializer): + ... + + class CustomSerializer(serializers.Serializer): + ... + class Meta: + list_serializer_class = CustomListSerializer + +#### Customizing `.create()` for multiple objects. + +The default implementation for multiple object creation is to simply call `.create()` for each item in the list. If you want to customize this behavior, you'll need to customize the `.create()` method on `ListSerializer` class that is used when `many=True` is passed. + +For example: + + class BookListSerializer(serializers.ListSerializer): + def create(self, validated_data): + books = [Book(**item) for item in validated_data] + return Book.objects.bulk_create(books) + + class BookSerializer(serializers.Serializer): + ... + class Meta: + list_serializer_class = BookListSerializer + +#### Customizing `.update()` for multiple objects. + +By default the `ListSerializer` class does not support multiple updates. This is because the behavior that should be expected for insertions and deletions is ambiguous. + +To support multiple updates you'll need to do so explicitly. When writing your multiple update code make sure to keep the following in mind: + +* How do you determine which instance should be updated for each item in the list of data? +* How should insertions be handled? Are they invalid, or do they create new objects? +* How should removals be handled? Do they imply object deletion, or removing a relationship? Should they be silently ignored, or are they invalid? +* How should ordering be handled? Does changing the position of two items imply any state change or is it ignored? + +Here's an example of how you might choose to implement multiple updates: + + class BookListSerializer(serializers.ListSerializer): + def update(self, instance, validated_data): + # Maps for id->instance and id->data item. + book_mapping = {book.id: book for book in instance} + data_mapping = {item['id']: item for item in validated_data} + + # Perform creations and updates. + ret = [] + for book_id, data in data_mapping.items(): + book = book_mapping.get(book_id, None): + if book is None: + ret.append(self.child.create(data)) + else: + ret.append(self.child.update(book, data)) + + # Perform deletions. + for book_id, book in book_mapping.items(): + if book_id not in data_mapping: + book.delete() + + return ret + + class BookSerializer(serializers.Serializer): + ... + class Meta: + list_serializer_class = BookListSerializer + +--- + +# BaseSerializer + +`BaseSerializer` class that can be used to easily support alternative serialization and deserialization styles. + +This class implements the same basic API as the `Serializer` class: + +* `.data` - Returns the outgoing primitive representation. +* `.is_valid()` - Deserializes and validates incoming data. +* `.validated_data` - Returns the validated incoming data. +* `.errors` - Returns an errors during validation. +* `.save()` - Persists the validated data into an object instance. + +There are four methods that can be overridden, depending on what functionality you want the serializer class to support: + +* `.to_representation()` - Override this to support serialization, for read operations. +* `.to_internal_value()` - Override this to support deserialization, for write operations. +* `.create()` and `.update()` - Overide either or both of these to support saving instances. + +Because this class provides the same interface as the `Serializer` class, you can use it with the existing generic class based views exactly as you would for a regular `Serializer` or `ModelSerializer`. + +The only difference you'll notice when doing so is the `BaseSerializer` classes will not generate HTML forms in the browsable API. This is because the data they return does not include all the field information that would allow each field to be rendered into a suitable HTML input. + +##### Read-only `BaseSerializer` classes. + +To implement a read-only serializer using the `BaseSerializer` class, we just need to override the `.to_representation()` method. Let's take a look at an example using a simple Django model: + + class HighScore(models.Model): + created = models.DateTimeField(auto_now_add=True) + player_name = models.CharField(max_length=10) + score = models.IntegerField() + +It's simple to create a read-only serializer for converting `HighScore` instances into primitive data types. + + class HighScoreSerializer(serializers.BaseSerializer): + def to_representation(self, obj): + return { + 'score': obj.score, + 'player_name': obj.player_name + } + +We can now use this class to serialize single `HighScore` instances: + + @api_view(['GET']) + def high_score(request, pk): + instance = HighScore.objects.get(pk=pk) + serializer = HighScoreSerializer(instance) + return Response(serializer.data) + +Or use it to serialize multiple instances: + + @api_view(['GET']) + def all_high_scores(request): + queryset = HighScore.objects.order_by('-score') + serializer = HighScoreSerializer(queryset, many=True) + return Response(serializer.data) + +##### Read-write `BaseSerializer` classes. + +To create a read-write serializer we first need to implement a `.to_internal_value()` method. This method returns the validated values that will be used to construct the object instance, and may raise a `ValidationError` if the supplied data is in an incorrect format. + +Once you've implemented `.to_internal_value()`, the basic validation API will be available on the serializer, and you will be able to use `.is_valid()`, `.validated_data` and `.errors`. + +If you want to also support `.save()` you'll need to also implement either or both of the `.create()` and `.update()` methods. + +Here's a complete example of our previous `HighScoreSerializer`, that's been updated to support both read and write operations. + + class HighScoreSerializer(serializers.BaseSerializer): + def to_internal_value(self, data): + score = data.get('score') + player_name = data.get('player_name') + + # Perform the data validation. + if not score: + raise ValidationError({ + 'score': 'This field is required.' + }) + if not player_name: + raise ValidationError({ + 'player_name': 'This field is required.' + }) + if len(player_name) > 10: + raise ValidationError({ + 'player_name': 'May not be more than 10 characters.' + }) + + # Return the validated values. This will be available as + # the `.validated_data` property. + return { + 'score': int(score), + 'player_name': player_name + } + + def to_representation(self, obj): + return { + 'score': obj.score, + 'player_name': obj.player_name + } + + def create(self, validated_data): + return HighScore.objects.create(**validated_data) + +#### Creating new generic serializers with `BaseSerializer`. + +The `BaseSerializer` class is also useful if you want to implement new generic serializer classes for dealing with particular serialization styles, or for integrating with alternative storage backends. + +The following class is an example of a generic serializer that can handle coercing arbitrary objects into primitive representations. + + class ObjectSerializer(serializers.BaseSerializer): + """ + A read-only serializer that coerces arbitrary complex objects + into primitive representations. + """ + def to_representation(self, obj): + for attribute_name in dir(obj): + attribute = getattr(obj, attribute_name) + if attribute_name('_'): + # Ignore private attributes. + pass + elif hasattr(attribute, '__call__'): + # Ignore methods and other callables. + pass + elif isinstance(attribute, (str, int, bool, float, type(None))): + # Primitive types can be passed through unmodified. + output[attribute_name] = attribute + elif isinstance(attribute, list): + # Recursively deal with items in lists. + output[attribute_name] = [ + self.to_representation(item) for item in attribute + ] + elif isinstance(attribute, dict): + # Recursively deal with items in dictionaries. + output[attribute_name] = { + str(key): self.to_representation(value) + for key, value in attribute.items() + } + else: + # Force anything else to its string representation. + output[attribute_name] = str(attribute) + +--- # Advanced serializer usage -**TODO**: Tweak section below +## Overriding serialization and deserialization behavior -You can create customized subclasses of `ModelSerializer` or `HyperlinkedModelSerializer` that use a different set of default fields. +If you need to alter the serialization, deserialization or validation of a serializer class you can do so by overriding the `.to_representation()` or `.to_internal_value()` methods. -Doing so should be considered advanced usage, and will only be needed if you have some particular serializer requirements that you often need to repeat. +Some reasons this might be useful include... + +* Adding new behavior for new serializer base classes. +* Modifying the behavior slightly for an existing class. +* Improving serialization performance for a frequently accessed API endpoint that returns lots of data. + +The signatures for these methods are as follows: + +#### `.to_representation(self, obj)` + +Takes the object instance that requires serialization, and should return a primitive representation. Typically this means returning a structure of built-in Python datatypes. The exact types that can be handled will depend on the render classes you have configured for your API. + +#### ``.to_internal_value(self, data)`` + +Takes the unvalidated incoming data as input and should return the validated data that will be made available as `serializer.validated_data`. The return value will also be passed to the `.create()` or `.update()` methods if `.save()` is called on the serializer class. + +If any of the validation fails, then the method should raise a `serializers.ValidationError(errors)`. Typically the `errors` argument here will be a dictionary mapping field names to error messages. + +The `data` argument passed to this method will normally be the value of `request.data`, so the datatype it provides will depend on the parser classes you have configured for your API. ## Dynamically modifying fields @@ -625,47 +877,13 @@ This would then allow you to do the following: ## Customizing the default fields -**TODO**: Remove and note incoming API. +REST framework 2 provided an API to allow developers to override how a `ModelSerializer` class would automatically generate the default set of fields. -The `field_mapping` attribute is a dictionary that maps model classes to serializer classes. Overriding the attribute will let you set a different set of default serializer classes. +This API included the `.get_field()`, `.get_pk_field()` and other methods. -For more advanced customization than simply changing the default serializer class you can override various `get__field` methods. Doing so will allow you to customize the arguments that each serializer field is initialized with. Each of these methods may either return a field or serializer instance, or `None`. +Because the serializers have been fundamentally redesigned with 3.0 this API no longer exists. You can still modify the fields that get created but you'll need to refer to the source code, and be aware that if the changes you make are against private bits of API then they may be subject to change. -### get_pk_field - -**Signature**: `.get_pk_field(self, model_field)` - -Returns the field instance that should be used to represent the pk field. - -### get_nested_field - -**Signature**: `.get_nested_field(self, model_field, related_model, to_many)` - -Returns the field instance that should be used to represent a related field when `depth` is specified as being non-zero. - -Note that the `model_field` argument will be `None` for reverse relationships. The `related_model` argument will be the model class for the target of the field. The `to_many` argument will be a boolean indicating if this is a to-one or to-many relationship. - -### get_related_field - -**Signature**: `.get_related_field(self, model_field, related_model, to_many)` - -Returns the field instance that should be used to represent a related field when `depth` is not specified, or when nested representations are being used and the depth reaches zero. - -Note that the `model_field` argument will be `None` for reverse relationships. The `related_model` argument will be the model class for the target of the field. The `to_many` argument will be a boolean indicating if this is a to-one or to-many relationship. - -### get_field - -**Signature**: `.get_field(self, model_field)` - -Returns the field instance that should be used for non-relational, non-pk fields. - -### Example - -The following custom model serializer could be used as a base class for model serializers that should always exclude the pk by default. - - class NoPKModelSerializer(serializers.ModelSerializer): - def get_pk_field(self, model_field): - return None +A new interface for controlling this behavior is currently planned for REST framework 3.1. --- diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index c925b5f08..9087e2aee 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -413,7 +413,11 @@ There are four methods that can be overridden, depending on what functionality y * `.to_representation()` - Override this to support serialization, for read operations. * `.to_internal_value()` - Override this to support deserialization, for write operations. -* `.create()` and `.update()` - Overide either or both of these to support saving instances. +* `.create()` and `.update()` - Override either or both of these to support saving instances. + +Because this class provides the same interface as the `Serializer` class, you can use it with the existing generic class based views exactly as you would for a regular `Serializer` or `ModelSerializer`. + +The only difference you'll notice when doing so is the `BaseSerializer` classes will not generate HTML forms in the browsable API. This is because the data they return does not include all the field information that would allow each field to be rendered into a suitable HTML input. ##### Read-only `BaseSerializer` classes. @@ -498,7 +502,7 @@ Here's a complete example of our previous `HighScoreSerializer`, that's been upd The `BaseSerializer` class is also useful if you want to implement new generic serializer classes for dealing with particular serialization styles, or for integrating with alternative storage backends. -The following class is an example of a generic serializer that can handle coercing aribitrary objects into primitive representations. +The following class is an example of a generic serializer that can handle coercing arbitrary objects into primitive representations. class ObjectSerializer(serializers.BaseSerializer): """ @@ -518,12 +522,12 @@ The following class is an example of a generic serializer that can handle coerci # Primitive types can be passed through unmodified. output[attribute_name] = attribute elif isinstance(attribute, list): - # Recursivly deal with items in lists. + # Recursively deal with items in lists. output[attribute_name] = [ self.to_representation(item) for item in attribute ] elif isinstance(attribute, dict): - # Recursivly deal with items in dictionarys. + # Recursively deal with items in dictionaries. output[attribute_name] = { str(key): self.to_representation(value) for key, value in attribute.items() diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 00362dbb4..14078e64f 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -102,7 +102,9 @@ class BaseSerializer(Field): (key, value) for key, value in kwargs.items() if key in LIST_SERIALIZER_KWARGS ])) - return ListSerializer(*args, **list_kwargs) + meta = getattr(cls, 'Meta', None) + list_serializer_class = getattr(meta, 'list_serializer_class', ListSerializer) + return list_serializer_class(*args, **list_kwargs) def to_internal_value(self, data): raise NotImplementedError('`to_internal_value()` must be implemented.') From 276a2a52eedb97a15d85e059424870bf2d21854d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 28 Nov 2014 11:26:35 +0000 Subject: [PATCH 1182/1652] Docs on nested creates/updates and suchlike --- docs/api-guide/serializers.md | 176 ++++++++++++++++++++-------------- 1 file changed, 105 insertions(+), 71 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 6c370f754..cd076b4f0 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -271,7 +271,9 @@ Similarly if a nested representation should be a list of items, you should pass content = serializers.CharField(max_length=200) created = serializers.DateTimeField() -Validation of nested objects will work the same as before. Errors with nested objects will be nested under the field name of the nested object. +## Writable nested representations + +When dealing with nested representations that support deserializing the data, an errors with nested objects will be nested under the field name of the nested object. serializer = CommentSerializer(data={'user': {'email': 'foobar', 'username': 'doe'}, 'content': 'baz'}) serializer.is_valid() @@ -279,7 +281,96 @@ Validation of nested objects will work the same as before. Errors with nested o serializer.errors # {'user': {'email': [u'Enter a valid e-mail address.']}, 'created': [u'This field is required.']} -**TODO** Document create and update for nested serializers +Similarly, the `.validated_data` property will include nested data structures. + +#### Writing `.create()` methods for nested representations + +If you're supporting writable nested representations you'll need to write `.create()` or `.update()` methods that handle saving multiple objects. + +The following example demonstrates how you might handle creating a user with a nested profile object. + + class UserSerializer(serializers.ModelSerializer): + profile = ProfileSerializer() + + class Meta: + model = User + fields = ('username', 'email', 'profile') + + def create(self, validated_data): + profile_data = validated_data.pop('profile') + user = User.objects.create(**validated_data) + Profile.objects.create(user=user, **profile_data) + return user + +#### Writing `.update()` methods for nested representations + +For updates you'll want to think carefully about how to handle updates to relationships. For example if the data for the relationship is `None`, or not provided, which of the following should occur? + +* Set the relationship to `NULL` in the database. +* Delete the associated instance. +* Ignore the data and leave the instance as it is. +* Raise a validation error. + +Here's an example for an `update()` method on our previous `UserSerializer` class. + + def update(self, instance, validated_data): + profile_data = validated_data.pop('profile') + # Unless the application properly enforces that this field is + # always set, the follow could raise a `DoesNotExist`, which + # would need to be handled. + profile = instance.profile + + user.username = validated_data.get('username', instance.username) + user.email = validated_data.get('email', instance.email) + user.save() + + profile.is_premium_member = profile_data.get( + 'is_premium_member', + profile.is_premium_member + ) + profile.has_support_contract = profile_data.get( + 'has_support_contract', + profile.has_support_contract + ) + profile.save() + + return user + +Because the behavior of nested creates and updates can be ambiguous, and may require complex dependancies between related models, REST framework 3 requires you to always write these methods explicitly. The default `ModelSerializer` `.create()` and `.update()` methods do not include support for writable nested representations. + +It is possible that a third party package, providing automatic support some kinds of automatic writable nested representations may be released alongside the 3.1 release. + +#### Handling saving related instances in model manager classes + +An alternative to saving multiple related instances in the serializer is to write custom model manager classes handle creating the correct instances. + +For example, suppose we wanted to ensure that `User` instances and `Profile` instances are always created together as a pair. We might write a custom manager class that looks something like this: + + class UserManager(models.Manager): + ... + + def create(self, username, email, is_premium_member=False, has_support_contract=False): + user = User(username=username, email=email) + user.save() + profile = Profile( + user=user, + is_premium_member=is_premium_member, + has_support_contract=has_support_contract + ) + profile.save() + return user + +This manager class now more nicely encapsulates that user instances and profile instances are always created at the same time. Our `.create()` method on the serializer class can now be re-written to use the new manager method. + + def create(self, validated_data): + return User.objects.create( + username=validated_data['username'], + email=validated_data['email'] + is_premium_member=validated_data['profile']['is_premium_member'] + has_support_contract=validated_data['profile']['has_support_contract'] + ) + +For more details on this approach see the Django documentation on [model managers](model-managers), and [this blogpost on using model and manger classes](encapsulation-blogpost). ## Dealing with multiple objects @@ -298,70 +389,9 @@ To serialize a queryset or list of objects instead of a single object instance, # {'id': 2, 'title': 'The wind-up bird chronicle', 'author': 'Haruki Murakami'} # ] -#### Deserializing multiple objects for creation +#### Deserializing multiple objects -**TODO** - -To deserialize a list of object data, and create multiple object instances in a single pass, you should also set the `many=True` flag, and pass a list of data to be deserialized. - -This allows you to write views that create multiple items when a `POST` request is made. - -For example: - - data = [ - {'title': 'The bell jar', 'author': 'Sylvia Plath'}, - {'title': 'For whom the bell tolls', 'author': 'Ernest Hemingway'} - ] - serializer = BookSerializer(data=data, many=True) - serializer.is_valid() - # True - serializer.save() # `.save()` will be called on each deserialized instance - -The default implementation for multiple object creation is to simply call `.create()` for each item in the list. If you want to customize this behavior, you'll need to customize the `.create()` method on `ListSerializer` class that is used when `many=True` is passed. - -For example: - - class BookListSerializer(serializers.ListSerializer): - def create(self, validated_data): - books = [Book(**item) for item in validated_data] - return Book.objects.bulk_create(books) - - class BookSerializer(serializers.Serializer): - … - class Meta: - list_serializer_class = BookListSerializer - -#### Deserializing multiple objects for update - -**TODO** - -You can also deserialize a list of objects as part of a bulk update of multiple existing items. -In this case you need to supply both an existing list or queryset of items, as well as a list of data to update those items with. - -This allows you to write views that update or create multiple items when a `PUT` request is made. - - # Capitalizing the titles of the books - queryset = Book.objects.all() - data = [ - {'id': 3, 'title': 'The Bell Jar', 'author': 'Sylvia Plath'}, - {'id': 4, 'title': 'For Whom the Bell Tolls', 'author': 'Ernest Hemingway'} - ] - serializer = BookSerializer(queryset, data=data, many=True) - serializer.is_valid() - # True - serializer.save() # `.save()` will be called on each updated or newly created instance. - -By default bulk updates will be limited to updating instances that already exist in the provided queryset. - -When performing a bulk update you may want to allow new items to be created, and missing items to be deleted. To do so, pass `allow_add_remove=True` to the serializer. - - serializer = BookSerializer(queryset, data=data, many=True, allow_add_remove=True) - serializer.is_valid() - # True - serializer.save() # `.save()` will be called on updated or newly created instances. - # `.delete()` will be called on any other items in the `queryset`. - -Passing `allow_add_remove=True` ensures that any update operations will completely overwrite the existing queryset, rather than simply updating existing objects. +The default behavior for deserializing multiple objects is to support multiple object creation, but not support multiple object updates. For more information on how to support or customize either of these cases, see the [ListSerializer](#ListSerializer) documentation below. ## Including extra context @@ -399,7 +429,7 @@ By default, all the model fields on the class will be mapped to a corresponding Any relationships such as foreign keys on the model will be mapped to `PrimaryKeyRelatedField`. Reverse relationships are not included by default unless explicitly included as described below. -#### Inspecting the generated `ModelSerializer` class. +#### Inspecting a `ModelSerializer` Serializer classes generate helpful verbose representation strings, that allow you to fully inspect the state of their fields. This is particularly useful when working with `ModelSerializers` where you want to determine what set of fields and validators are being automatically created for you. @@ -607,7 +637,7 @@ For example: class Meta: list_serializer_class = CustomListSerializer -#### Customizing `.create()` for multiple objects. +#### Customizing multiple create The default implementation for multiple object creation is to simply call `.create()` for each item in the list. If you want to customize this behavior, you'll need to customize the `.create()` method on `ListSerializer` class that is used when `many=True` is passed. @@ -623,7 +653,7 @@ For example: class Meta: list_serializer_class = BookListSerializer -#### Customizing `.update()` for multiple objects. +#### Customizing multiple update By default the `ListSerializer` class does not support multiple updates. This is because the behavior that should be expected for insertions and deletions is ambiguous. @@ -663,6 +693,8 @@ Here's an example of how you might choose to implement multiple updates: class Meta: list_serializer_class = BookListSerializer +It is possible that a third party package may be included alongside the 3.1 release that provides some automatic support for multiple update operations, similar to the `allow_add_remove` behavior that was present in REST framework 2. + --- # BaseSerializer @@ -687,7 +719,7 @@ Because this class provides the same interface as the `Serializer` class, you ca The only difference you'll notice when doing so is the `BaseSerializer` classes will not generate HTML forms in the browsable API. This is because the data they return does not include all the field information that would allow each field to be rendered into a suitable HTML input. -##### Read-only `BaseSerializer` classes. +##### Read-only `BaseSerializer` classes To implement a read-only serializer using the `BaseSerializer` class, we just need to override the `.to_representation()` method. Let's take a look at an example using a simple Django model: @@ -721,7 +753,7 @@ Or use it to serialize multiple instances: serializer = HighScoreSerializer(queryset, many=True) return Response(serializer.data) -##### Read-write `BaseSerializer` classes. +##### Read-write `BaseSerializer` classes To create a read-write serializer we first need to implement a `.to_internal_value()` method. This method returns the validated values that will be used to construct the object instance, and may raise a `ValidationError` if the supplied data is in an incorrect format. @@ -766,7 +798,7 @@ Here's a complete example of our previous `HighScoreSerializer`, that's been upd def create(self, validated_data): return HighScore.objects.create(**validated_data) -#### Creating new generic serializers with `BaseSerializer`. +#### Creating new base classes The `BaseSerializer` class is also useful if you want to implement new generic serializer classes for dealing with particular serialization styles, or for integrating with alternative storage backends. @@ -905,6 +937,8 @@ The [django-rest-framework-hstore][django-rest-framework-hstore] package provide [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion [relations]: relations.md +[model-managers]: https://docs.djangoproject.com/en/dev/topics/db/managers/ +[encapsulation-blogpost]: http://www.dabapps.com/blog/django-models-and-encapsulation/ [mongoengine]: https://github.com/umutbozkurt/django-rest-framework-mongoengine [django-rest-framework-gis]: https://github.com/djangonauts/django-rest-framework-gis [django-rest-framework-hstore]: https://github.com/djangonauts/django-rest-framework-hstore From 0539b1be01fd9c6b842a4a8bbdf23b65af8357d1 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin Date: Fri, 28 Nov 2014 12:27:05 +0100 Subject: [PATCH 1183/1652] Update token auth view. Closes #2151. --- rest_framework/authtoken/views.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/rest_framework/authtoken/views.py b/rest_framework/authtoken/views.py index 103abb27c..1fee5068e 100644 --- a/rest_framework/authtoken/views.py +++ b/rest_framework/authtoken/views.py @@ -12,16 +12,13 @@ class ObtainAuthToken(APIView): permission_classes = () parser_classes = (parsers.FormParser, parsers.MultiPartParser, parsers.JSONParser,) renderer_classes = (renderers.JSONRenderer,) - serializer_class = AuthTokenSerializer - model = Token def post(self, request): - serializer = self.serializer_class(data=request.data) - if serializer.is_valid(): - user = serializer.validated_data['user'] - token, created = Token.objects.get_or_create(user=user) - return Response({'token': token.key}) - return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + serializer = AuthTokenSerializer(data=request.data) + serializer.is_valid(raise_exception=True) + user = serializer.validated_data['user'] + token, created = Token.objects.get_or_create(user=user) + return Response({'token': token.key}) obtain_auth_token = ObtainAuthToken.as_view() From d9a09f7826d7faf7e6bfa10fc83e0b7db4689a72 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin Date: Fri, 28 Nov 2014 13:33:07 +0100 Subject: [PATCH 1184/1652] Removed unused import --- rest_framework/authtoken/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rest_framework/authtoken/views.py b/rest_framework/authtoken/views.py index 1fee5068e..b75c2e252 100644 --- a/rest_framework/authtoken/views.py +++ b/rest_framework/authtoken/views.py @@ -1,5 +1,4 @@ from rest_framework.views import APIView -from rest_framework import status from rest_framework import parsers from rest_framework import renderers from rest_framework.response import Response From 05a86e3d6539f4f33d440daf04fa8b0e9b1e371a Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 28 Nov 2014 12:51:44 +0000 Subject: [PATCH 1185/1652] Docs. Minor tweaks. --- docs/topics/contributing.md | 1 - docs/topics/rest-hypermedia-hateoas.md | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 30a9678f6..99f4fc3c8 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -152,7 +152,6 @@ Documentation should be in American English. The tone of the documentation is v Some other tips: * Keep paragraphs reasonably short. -* Use double spacing after the end of sentences. * Don't use abbreviations such as 'e.g.' but instead use the long form, such as 'For example'. ## Markdown style diff --git a/docs/topics/rest-hypermedia-hateoas.md b/docs/topics/rest-hypermedia-hateoas.md index 4e3ccf924..7e6d24081 100644 --- a/docs/topics/rest-hypermedia-hateoas.md +++ b/docs/topics/rest-hypermedia-hateoas.md @@ -1,12 +1,12 @@ # REST, Hypermedia & HATEOAS -> You keep using that word "REST". I do not think it means what you think it means. +> You keep using that word "REST". I do not think it means what you think it means. > > — Mike Amundsen, [REST fest 2012 keynote][cite]. -First off, the disclaimer. The name "Django REST framework" was chosen simply to sure the project would be easily found by developers. Throughout the documentation we try to use the more simple and technically correct terminology of "Web APIs". +First off, the disclaimer. The name "Django REST framework" was decided back in early 2011 and was chosen simply to sure the project would be easily found by developers. Throughout the documentation we try to use the more simple and technically correct terminology of "Web APIs". -If you are serious about designing a Hypermedia APIs, you should look to resources outside of this documentation to help inform your design choices. +If you are serious about designing a Hypermedia API, you should look to resources outside of this documentation to help inform your design choices. The following fall into the "required reading" category. @@ -32,7 +32,7 @@ REST framework also includes [serialization] and [parser]/[renderer] components ## What REST framework doesn't provide. -What REST framework doesn't do is give you is machine readable hypermedia formats such as [HAL][hal], [Collection+JSON][collection], [JSON API][json-api] or HTML [microformats] by default, or the ability to auto-magically create fully HATEOAS style APIs that include hypermedia-based form descriptions and semantically labelled hyperlinks. Doing so would involve making opinionated choices about API design that should really remain outside of the framework's scope. +What REST framework doesn't do is give you is machine readable hypermedia formats such as [HAL][hal], [Collection+JSON][collection], [JSON API][json-api] or HTML [microformats] by default, or the ability to auto-magically create fully HATEOAS style APIs that include hypermedia-based form descriptions and semantically labelled hyperlinks. Doing so would involve making opinionated choices about API design that should really remain outside of the framework's scope. [cite]: http://vimeo.com/channels/restfest/page:2 [dissertation]: http://www.ics.uci.edu/~fielding/pubs/dissertation/top.htm From 9e03b0843ad8b9b3481d7e64f9159daf33d04136 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 28 Nov 2014 12:53:59 +0000 Subject: [PATCH 1186/1652] Drop google_analytics config since it's in the base template anyways. --- mkdocs.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/mkdocs.yml b/mkdocs.yml index 89763acd1..cc31b1be6 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -53,5 +53,3 @@ pages: - ['topics/kickstarter-announcement.md', 'Topics', 'Kickstarter Announcement'] - ['topics/release-notes.md', 'Topics', 'Release Notes'] - ['topics/credits.md', 'Topics', 'Credits'] - -google_analytics: ['UA-18852272-2', 'django-rest-framework.org'] From d84582fe1f5ca0fb0694e5bde40a8e34f22947f7 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 28 Nov 2014 12:55:08 +0000 Subject: [PATCH 1187/1652] Add 'built with MkDocs' footer --- docs_theme/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs_theme/base.html b/docs_theme/base.html index 6bfccab26..25bd33ef0 100644 --- a/docs_theme/base.html +++ b/docs_theme/base.html @@ -159,7 +159,7 @@ From c8764de7881f419c9269913ec3654fc1d904ab2e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 28 Nov 2014 13:04:42 +0000 Subject: [PATCH 1188/1652] Drop defunct tests --- tests/test_files.py | 92 -- tests/test_hyperlinkedserializers.py | 406 ------ tests/test_nullable_fields.py | 39 - tests/test_relations.py | 152 -- tests/test_relations_hyperlink.py | 93 -- tests/test_relations_nested.py | 326 ----- tests/test_relations_pk.py | 131 -- tests/test_request.py | 95 -- tests/test_serializer.py | 2004 -------------------------- tests/test_serializer_bulk_update.py | 158 -- tests/test_serializer_empty.py | 15 - tests/test_serializer_nested.py | 350 ----- tests/test_validation.py | 11 - 13 files changed, 3872 deletions(-) delete mode 100644 tests/test_files.py delete mode 100644 tests/test_hyperlinkedserializers.py delete mode 100644 tests/test_nullable_fields.py delete mode 100644 tests/test_relations_nested.py delete mode 100644 tests/test_serializer_empty.py diff --git a/tests/test_files.py b/tests/test_files.py deleted file mode 100644 index a5613fcbe..000000000 --- a/tests/test_files.py +++ /dev/null @@ -1,92 +0,0 @@ -# from __future__ import unicode_literals -# from django.test import TestCase -# from django.utils import six -# from rest_framework import serializers -# from rest_framework.compat import BytesIO -# import datetime - - -# class UploadedFile(object): -# def __init__(self, file=None, created=None): -# self.file = file -# self.created = created or datetime.datetime.now() - - -# class UploadedFileSerializer(serializers.Serializer): -# file = serializers.FileField(required=False) -# created = serializers.DateTimeField() - -# def restore_object(self, attrs, instance=None): -# if instance: -# instance.file = attrs['file'] -# instance.created = attrs['created'] -# return instance -# return UploadedFile(**attrs) - - -# class FileSerializerTests(TestCase): -# def test_create(self): -# now = datetime.datetime.now() -# file = BytesIO(six.b('stuff')) -# file.name = 'stuff.txt' -# file.size = len(file.getvalue()) -# serializer = UploadedFileSerializer(data={'created': now}, files={'file': file}) -# uploaded_file = UploadedFile(file=file, created=now) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.object.created, uploaded_file.created) -# self.assertEqual(serializer.object.file, uploaded_file.file) -# self.assertFalse(serializer.object is uploaded_file) - -# def test_creation_failure(self): -# """ -# Passing files=None should result in an ValidationError - -# Regression test for: -# https://github.com/tomchristie/django-rest-framework/issues/542 -# """ -# now = datetime.datetime.now() - -# serializer = UploadedFileSerializer(data={'created': now}) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.object.created, now) -# self.assertIsNone(serializer.object.file) - -# def test_remove_with_empty_string(self): -# """ -# Passing empty string as data should cause file to be removed - -# Test for: -# https://github.com/tomchristie/django-rest-framework/issues/937 -# """ -# now = datetime.datetime.now() -# file = BytesIO(six.b('stuff')) -# file.name = 'stuff.txt' -# file.size = len(file.getvalue()) - -# uploaded_file = UploadedFile(file=file, created=now) - -# serializer = UploadedFileSerializer(instance=uploaded_file, data={'created': now, 'file': ''}) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.object.created, uploaded_file.created) -# self.assertIsNone(serializer.object.file) - -# def test_validation_error_with_non_file(self): -# """ -# Passing non-files should raise a validation error. -# """ -# now = datetime.datetime.now() -# errmsg = 'No file was submitted. Check the encoding type on the form.' - -# serializer = UploadedFileSerializer(data={'created': now, 'file': 'abc'}) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'file': [errmsg]}) - -# def test_validation_with_no_data(self): -# """ -# Validation should still function when no data dictionary is provided. -# """ -# uploaded_file = BytesIO(six.b('stuff')) -# uploaded_file.name = 'stuff.txt' -# uploaded_file.size = len(uploaded_file.getvalue()) -# serializer = UploadedFileSerializer(files={'file': uploaded_file}) -# self.assertFalse(serializer.is_valid()) diff --git a/tests/test_hyperlinkedserializers.py b/tests/test_hyperlinkedserializers.py deleted file mode 100644 index ff3663dd3..000000000 --- a/tests/test_hyperlinkedserializers.py +++ /dev/null @@ -1,406 +0,0 @@ -# from __future__ import unicode_literals -# import json -# from django.test import TestCase -# from rest_framework import generics, status, serializers -# from django.conf.urls import patterns, url -# from rest_framework.settings import api_settings -# from rest_framework.test import APIRequestFactory -# from tests.models import ( -# Anchor, BasicModel, ManyToManyModel, BlogPost, BlogPostComment, -# Album, Photo, OptionalRelationModel -# ) - -# factory = APIRequestFactory() - - -# class BlogPostCommentSerializer(serializers.ModelSerializer): -# url = serializers.HyperlinkedIdentityField(view_name='blogpostcomment-detail') -# text = serializers.CharField() -# blog_post_url = serializers.HyperlinkedRelatedField(source='blog_post', view_name='blogpost-detail') - -# class Meta: -# model = BlogPostComment -# fields = ('text', 'blog_post_url', 'url') - - -# class PhotoSerializer(serializers.Serializer): -# description = serializers.CharField() -# album_url = serializers.HyperlinkedRelatedField(source='album', view_name='album-detail', queryset=Album.objects.all(), lookup_field='title') - -# def restore_object(self, attrs, instance=None): -# return Photo(**attrs) - - -# class AlbumSerializer(serializers.ModelSerializer): -# url = serializers.HyperlinkedIdentityField(view_name='album-detail', lookup_field='title') - -# class Meta: -# model = Album -# fields = ('title', 'url') - - -# class BasicSerializer(serializers.HyperlinkedModelSerializer): -# class Meta: -# model = BasicModel - - -# class AnchorSerializer(serializers.HyperlinkedModelSerializer): -# class Meta: -# model = Anchor - - -# class ManyToManySerializer(serializers.HyperlinkedModelSerializer): -# class Meta: -# model = ManyToManyModel - - -# class BlogPostSerializer(serializers.ModelSerializer): -# class Meta: -# model = BlogPost - - -# class OptionalRelationSerializer(serializers.HyperlinkedModelSerializer): -# class Meta: -# model = OptionalRelationModel - - -# class BasicList(generics.ListCreateAPIView): -# queryset = BasicModel.objects.all() -# serializer_class = BasicSerializer - - -# class BasicDetail(generics.RetrieveUpdateDestroyAPIView): -# queryset = BasicModel.objects.all() -# serializer_class = BasicSerializer - - -# class AnchorDetail(generics.RetrieveAPIView): -# queryset = Anchor.objects.all() -# serializer_class = AnchorSerializer - - -# class ManyToManyList(generics.ListAPIView): -# queryset = ManyToManyModel.objects.all() -# serializer_class = ManyToManySerializer - - -# class ManyToManyDetail(generics.RetrieveAPIView): -# queryset = ManyToManyModel.objects.all() -# serializer_class = ManyToManySerializer - - -# class BlogPostCommentListCreate(generics.ListCreateAPIView): -# queryset = BlogPostComment.objects.all() -# serializer_class = BlogPostCommentSerializer - - -# class BlogPostCommentDetail(generics.RetrieveAPIView): -# queryset = BlogPostComment.objects.all() -# serializer_class = BlogPostCommentSerializer - - -# class BlogPostDetail(generics.RetrieveAPIView): -# queryset = BlogPost.objects.all() -# serializer_class = BlogPostSerializer - - -# class PhotoListCreate(generics.ListCreateAPIView): -# queryset = Photo.objects.all() -# serializer_class = PhotoSerializer - - -# class AlbumDetail(generics.RetrieveAPIView): -# queryset = Album.objects.all() -# serializer_class = AlbumSerializer -# lookup_field = 'title' - - -# class OptionalRelationDetail(generics.RetrieveUpdateDestroyAPIView): -# queryset = OptionalRelationModel.objects.all() -# serializer_class = OptionalRelationSerializer - - -# urlpatterns = patterns( -# '', -# url(r'^basic/$', BasicList.as_view(), name='basicmodel-list'), -# url(r'^basic/(?P\d+)/$', BasicDetail.as_view(), name='basicmodel-detail'), -# url(r'^anchor/(?P\d+)/$', AnchorDetail.as_view(), name='anchor-detail'), -# url(r'^manytomany/$', ManyToManyList.as_view(), name='manytomanymodel-list'), -# url(r'^manytomany/(?P\d+)/$', ManyToManyDetail.as_view(), name='manytomanymodel-detail'), -# url(r'^posts/(?P\d+)/$', BlogPostDetail.as_view(), name='blogpost-detail'), -# url(r'^comments/$', BlogPostCommentListCreate.as_view(), name='blogpostcomment-list'), -# url(r'^comments/(?P\d+)/$', BlogPostCommentDetail.as_view(), name='blogpostcomment-detail'), -# url(r'^albums/(?P\w[\w-]*)/$', AlbumDetail.as_view(), name='album-detail'), -# url(r'^photos/$', PhotoListCreate.as_view(), name='photo-list'), -# url(r'^optionalrelation/(?P<pk>\d+)/$', OptionalRelationDetail.as_view(), name='optionalrelationmodel-detail'), -# ) - - -# class TestBasicHyperlinkedView(TestCase): -# urls = 'tests.test_hyperlinkedserializers' - -# def setUp(self): -# """ -# Create 3 BasicModel instances. -# """ -# items = ['foo', 'bar', 'baz'] -# for item in items: -# BasicModel(text=item).save() -# self.objects = BasicModel.objects -# self.data = [ -# {'url': 'http://testserver/basic/%d/' % obj.id, 'text': obj.text} -# for obj in self.objects.all() -# ] -# self.list_view = BasicList.as_view() -# self.detail_view = BasicDetail.as_view() - -# def test_get_list_view(self): -# """ -# GET requests to ListCreateAPIView should return list of objects. -# """ -# request = factory.get('/basic/') -# response = self.list_view(request).render() -# self.assertEqual(response.status_code, status.HTTP_200_OK) -# self.assertEqual(response.data, self.data) - -# def test_get_detail_view(self): -# """ -# GET requests to ListCreateAPIView should return list of objects. -# """ -# request = factory.get('/basic/1') -# response = self.detail_view(request, pk=1).render() -# self.assertEqual(response.status_code, status.HTTP_200_OK) -# self.assertEqual(response.data, self.data[0]) - - -# class TestManyToManyHyperlinkedView(TestCase): -# urls = 'tests.test_hyperlinkedserializers' - -# def setUp(self): -# """ -# Create 3 BasicModel instances. -# """ -# items = ['foo', 'bar', 'baz'] -# anchors = [] -# for item in items: -# anchor = Anchor(text=item) -# anchor.save() -# anchors.append(anchor) - -# manytomany = ManyToManyModel() -# manytomany.save() -# manytomany.rel.add(*anchors) - -# self.data = [{ -# 'url': 'http://testserver/manytomany/1/', -# 'rel': [ -# 'http://testserver/anchor/1/', -# 'http://testserver/anchor/2/', -# 'http://testserver/anchor/3/', -# ] -# }] -# self.list_view = ManyToManyList.as_view() -# self.detail_view = ManyToManyDetail.as_view() - -# def test_get_list_view(self): -# """ -# GET requests to ListCreateAPIView should return list of objects. -# """ -# request = factory.get('/manytomany/') -# response = self.list_view(request) -# self.assertEqual(response.status_code, status.HTTP_200_OK) -# self.assertEqual(response.data, self.data) - -# def test_get_detail_view(self): -# """ -# GET requests to ListCreateAPIView should return list of objects. -# """ -# request = factory.get('/manytomany/1/') -# response = self.detail_view(request, pk=1) -# self.assertEqual(response.status_code, status.HTTP_200_OK) -# self.assertEqual(response.data, self.data[0]) - - -# class TestHyperlinkedIdentityFieldLookup(TestCase): -# urls = 'tests.test_hyperlinkedserializers' - -# def setUp(self): -# """ -# Create 3 Album instances. -# """ -# titles = ['foo', 'bar', 'baz'] -# for title in titles: -# album = Album(title=title) -# album.save() -# self.detail_view = AlbumDetail.as_view() -# self.data = { -# 'foo': {'title': 'foo', 'url': 'http://testserver/albums/foo/'}, -# 'bar': {'title': 'bar', 'url': 'http://testserver/albums/bar/'}, -# 'baz': {'title': 'baz', 'url': 'http://testserver/albums/baz/'} -# } - -# def test_lookup_field(self): -# """ -# GET requests to AlbumDetail view should return serialized Albums -# with a url field keyed by `title`. -# """ -# for album in Album.objects.all(): -# request = factory.get('/albums/{0}/'.format(album.title)) -# response = self.detail_view(request, title=album.title) -# self.assertEqual(response.status_code, status.HTTP_200_OK) -# self.assertEqual(response.data, self.data[album.title]) - - -# class TestCreateWithForeignKeys(TestCase): -# urls = 'tests.test_hyperlinkedserializers' - -# def setUp(self): -# """ -# Create a blog post -# """ -# self.post = BlogPost.objects.create(title="Test post") -# self.create_view = BlogPostCommentListCreate.as_view() - -# def test_create_comment(self): - -# data = { -# 'text': 'A test comment', -# 'blog_post_url': 'http://testserver/posts/1/' -# } - -# request = factory.post('/comments/', data=data) -# response = self.create_view(request) -# self.assertEqual(response.status_code, status.HTTP_201_CREATED) -# self.assertEqual(response['Location'], 'http://testserver/comments/1/') -# self.assertEqual(self.post.blogpostcomment_set.count(), 1) -# self.assertEqual(self.post.blogpostcomment_set.all()[0].text, 'A test comment') - - -# class TestCreateWithForeignKeysAndCustomSlug(TestCase): -# urls = 'tests.test_hyperlinkedserializers' - -# def setUp(self): -# """ -# Create an Album -# """ -# self.post = Album.objects.create(title='test-album') -# self.list_create_view = PhotoListCreate.as_view() - -# def test_create_photo(self): - -# data = { -# 'description': 'A test photo', -# 'album_url': 'http://testserver/albums/test-album/' -# } - -# request = factory.post('/photos/', data=data) -# response = self.list_create_view(request) -# self.assertEqual(response.status_code, status.HTTP_201_CREATED) -# self.assertNotIn('Location', response, msg='Location should only be included if there is a "url" field on the serializer') -# self.assertEqual(self.post.photo_set.count(), 1) -# self.assertEqual(self.post.photo_set.all()[0].description, 'A test photo') - - -# class TestOptionalRelationHyperlinkedView(TestCase): -# urls = 'tests.test_hyperlinkedserializers' - -# def setUp(self): -# """ -# Create 1 OptionalRelationModel instances. -# """ -# OptionalRelationModel().save() -# self.objects = OptionalRelationModel.objects -# self.detail_view = OptionalRelationDetail.as_view() -# self.data = {"url": "http://testserver/optionalrelation/1/", "other": None} - -# def test_get_detail_view(self): -# """ -# GET requests to RetrieveAPIView with optional relations should return None -# for non existing relations. -# """ -# request = factory.get('/optionalrelationmodel-detail/1') -# response = self.detail_view(request, pk=1) -# self.assertEqual(response.status_code, status.HTTP_200_OK) -# self.assertEqual(response.data, self.data) - -# def test_put_detail_view(self): -# """ -# PUT requests to RetrieveUpdateDestroyAPIView with optional relations -# should accept None for non existing relations. -# """ -# response = self.client.put('/optionalrelation/1/', -# data=json.dumps(self.data), -# content_type='application/json') -# self.assertEqual(response.status_code, status.HTTP_200_OK) - - -# class TestOverriddenURLField(TestCase): -# def setUp(self): -# class OverriddenURLSerializer(serializers.HyperlinkedModelSerializer): -# url = serializers.SerializerMethodField('get_url') - -# class Meta: -# model = BlogPost -# fields = ('title', 'url') - -# def get_url(self, obj): -# return 'foo bar' - -# self.Serializer = OverriddenURLSerializer -# self.obj = BlogPost.objects.create(title='New blog post') - -# def test_overridden_url_field(self): -# """ -# The 'url' field should respect overriding. -# Regression test for #936. -# """ -# serializer = self.Serializer(self.obj) -# self.assertEqual( -# serializer.data, -# {'title': 'New blog post', 'url': 'foo bar'} -# ) - - -# class TestURLFieldNameBySettings(TestCase): -# urls = 'tests.test_hyperlinkedserializers' - -# def setUp(self): -# self.saved_url_field_name = api_settings.URL_FIELD_NAME -# api_settings.URL_FIELD_NAME = 'global_url_field' - -# class Serializer(serializers.HyperlinkedModelSerializer): - -# class Meta: -# model = BlogPost -# fields = ('title', api_settings.URL_FIELD_NAME) - -# self.Serializer = Serializer -# self.obj = BlogPost.objects.create(title="New blog post") - -# def tearDown(self): -# api_settings.URL_FIELD_NAME = self.saved_url_field_name - -# def test_overridden_url_field_name(self): -# request = factory.get('/posts/') -# serializer = self.Serializer(self.obj, context={'request': request}) -# self.assertIn(api_settings.URL_FIELD_NAME, serializer.data) - - -# class TestURLFieldNameByOptions(TestCase): -# urls = 'tests.test_hyperlinkedserializers' - -# def setUp(self): -# class Serializer(serializers.HyperlinkedModelSerializer): - -# class Meta: -# model = BlogPost -# fields = ('title', 'serializer_url_field') -# url_field_name = 'serializer_url_field' - -# self.Serializer = Serializer -# self.obj = BlogPost.objects.create(title="New blog post") - -# def test_overridden_url_field_name(self): -# request = factory.get('/posts/') -# serializer = self.Serializer(self.obj, context={'request': request}) -# self.assertIn(self.Serializer.Meta.url_field_name, serializer.data) diff --git a/tests/test_nullable_fields.py b/tests/test_nullable_fields.py deleted file mode 100644 index 9843182ad..000000000 --- a/tests/test_nullable_fields.py +++ /dev/null @@ -1,39 +0,0 @@ -# from django.core.urlresolvers import reverse - -# from django.conf.urls import patterns, url -# from rest_framework import serializers, generics -# from rest_framework.test import APITestCase -# from tests.models import NullableForeignKeySource - - -# class NullableFKSourceSerializer(serializers.ModelSerializer): -# class Meta: -# model = NullableForeignKeySource - - -# class NullableFKSourceDetail(generics.RetrieveUpdateDestroyAPIView): -# queryset = NullableForeignKeySource.objects.all() -# serializer_class = NullableFKSourceSerializer - - -# urlpatterns = patterns( -# '', -# url(r'^objects/(?P<pk>\d+)/$', NullableFKSourceDetail.as_view(), name='object-detail'), -# ) - - -# class NullableForeignKeyTests(APITestCase): -# """ -# DRF should be able to handle nullable foreign keys when a test -# Client POST/PUT request is made with its own serialized object. -# """ -# urls = 'tests.test_nullable_fields' - -# def test_updating_object_with_null_fk(self): -# obj = NullableForeignKeySource(name='example', target=None) -# obj.save() -# serialized_data = NullableFKSourceSerializer(obj).data - -# response = self.client.put(reverse('object-detail', args=[obj.pk]), serialized_data) - -# self.assertEqual(response.data, serialized_data) diff --git a/tests/test_relations.py b/tests/test_relations.py index 16ead1f2f..62353dc25 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -134,155 +134,3 @@ class TestSlugRelatedField(APISimpleTestCase): def test_representation(self): representation = self.field.to_representation(self.instance) assert representation == self.instance.name - -# Older tests, for review... - -# """ -# General tests for relational fields. -# """ -# from __future__ import unicode_literals -# from django import get_version -# from django.db import models -# from django.test import TestCase -# from django.utils import unittest -# from rest_framework import serializers -# from tests.models import BlogPost - - -# class NullModel(models.Model): -# pass - - -# class FieldTests(TestCase): -# def test_pk_related_field_with_empty_string(self): -# """ -# Regression test for #446 - -# https://github.com/tomchristie/django-rest-framework/issues/446 -# """ -# field = serializers.PrimaryKeyRelatedField(queryset=NullModel.objects.all()) -# self.assertRaises(serializers.ValidationError, field.to_primitive, '') -# self.assertRaises(serializers.ValidationError, field.to_primitive, []) - -# def test_hyperlinked_related_field_with_empty_string(self): -# field = serializers.HyperlinkedRelatedField(queryset=NullModel.objects.all(), view_name='') -# self.assertRaises(serializers.ValidationError, field.to_primitive, '') -# self.assertRaises(serializers.ValidationError, field.to_primitive, []) - -# def test_slug_related_field_with_empty_string(self): -# field = serializers.SlugRelatedField(queryset=NullModel.objects.all(), slug_field='pk') -# self.assertRaises(serializers.ValidationError, field.to_primitive, '') -# self.assertRaises(serializers.ValidationError, field.to_primitive, []) - - -# class TestManyRelatedMixin(TestCase): -# def test_missing_many_to_many_related_field(self): -# ''' -# Regression test for #632 - -# https://github.com/tomchristie/django-rest-framework/pull/632 -# ''' -# field = serializers.RelatedField(many=True, read_only=False) - -# into = {} -# field.field_from_native({}, None, 'field_name', into) -# self.assertEqual(into['field_name'], []) - - -# # Regression tests for #694 (`source` attribute on related fields) - -# class RelatedFieldSourceTests(TestCase): -# def test_related_manager_source(self): -# """ -# Relational fields should be able to use manager-returning methods as their source. -# """ -# BlogPost.objects.create(title='blah') -# field = serializers.RelatedField(many=True, source='get_blogposts_manager') - -# class ClassWithManagerMethod(object): -# def get_blogposts_manager(self): -# return BlogPost.objects - -# obj = ClassWithManagerMethod() -# value = field.field_to_native(obj, 'field_name') -# self.assertEqual(value, ['BlogPost object']) - -# def test_related_queryset_source(self): -# """ -# Relational fields should be able to use queryset-returning methods as their source. -# """ -# BlogPost.objects.create(title='blah') -# field = serializers.RelatedField(many=True, source='get_blogposts_queryset') - -# class ClassWithQuerysetMethod(object): -# def get_blogposts_queryset(self): -# return BlogPost.objects.all() - -# obj = ClassWithQuerysetMethod() -# value = field.field_to_native(obj, 'field_name') -# self.assertEqual(value, ['BlogPost object']) - -# def test_dotted_source(self): -# """ -# Source argument should support dotted.source notation. -# """ -# BlogPost.objects.create(title='blah') -# field = serializers.RelatedField(many=True, source='a.b.c') - -# class ClassWithQuerysetMethod(object): -# a = { -# 'b': { -# 'c': BlogPost.objects.all() -# } -# } - -# obj = ClassWithQuerysetMethod() -# value = field.field_to_native(obj, 'field_name') -# self.assertEqual(value, ['BlogPost object']) - -# # Regression for #1129 -# def test_exception_for_incorect_fk(self): -# """ -# Check that the exception message are correct if the source field -# doesn't exist. -# """ -# from tests.models import ManyToManySource - -# class Meta: -# model = ManyToManySource - -# attrs = { -# 'name': serializers.SlugRelatedField( -# slug_field='name', source='banzai'), -# 'Meta': Meta, -# } - -# TestSerializer = type( -# str('TestSerializer'), -# (serializers.ModelSerializer,), -# attrs -# ) -# with self.assertRaises(AttributeError): -# TestSerializer(data={'name': 'foo'}) - - -# @unittest.skipIf(get_version() < '1.6.0', 'Upstream behaviour changed in v1.6') -# class RelatedFieldChoicesTests(TestCase): -# """ -# Tests for #1408 "Web browseable API doesn't have blank option on drop down list box" -# https://github.com/tomchristie/django-rest-framework/issues/1408 -# """ -# def test_blank_option_is_added_to_choice_if_required_equals_false(self): -# """ - -# """ -# post = BlogPost(title="Checking blank option is added") -# post.save() - -# queryset = BlogPost.objects.all() -# field = serializers.RelatedField(required=False, queryset=queryset) - -# choice_count = BlogPost.objects.count() -# widget_count = len(field.widget.choices) - -# self.assertEqual(widget_count, choice_count + 1, 'BLANK_CHOICE_DASH option should have been added') diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py index 0337f3599..b938e3857 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -411,30 +411,6 @@ class HyperlinkedNullableForeignKeyTests(TestCase): ] self.assertEqual(serializer.data, expected) -# # reverse foreign keys MUST be read_only -# # In the general case they do not provide .remove() or .clear() -# # and cannot be arbitrarily set. - - # def test_reverse_foreign_key_update(self): - # data = {'id': 1, 'name': 'target-1', 'sources': [1]} - # instance = ForeignKeyTarget.objects.get(pk=1) - # serializer = ForeignKeyTargetSerializer(instance, data=data) - # print serializer.is_valid() - # print serializer.errors - # print serializer - # self.assertTrue(serializer.is_valid()) - # serializer.save() - # self.assertEqual(serializer.data, data) - - # # Ensure target 1 is updated, and everything else is as expected - # queryset = ForeignKeyTarget.objects.all() - # serializer = ForeignKeyTargetSerializer(queryset, many=True) - # expected = [ - # {'id': 1, 'name': 'target-1', 'sources': [1]}, - # {'id': 2, 'name': 'target-2', 'sources': []}, - # ] - # self.assertEqual(serializer.data, expected) - class HyperlinkedNullableOneToOneTests(TestCase): urls = 'tests.test_relations_hyperlink' @@ -455,72 +431,3 @@ class HyperlinkedNullableOneToOneTests(TestCase): {'url': 'http://testserver/onetoonetarget/2/', 'name': 'target-2', 'nullable_source': None}, ] self.assertEqual(serializer.data, expected) - - -# # Regression tests for #694 (`source` attribute on related fields) - -# class HyperlinkedRelatedFieldSourceTests(TestCase): -# urls = 'tests.test_relations_hyperlink' - -# def test_related_manager_source(self): -# """ -# Relational fields should be able to use manager-returning methods as their source. -# """ -# BlogPost.objects.create(title='blah') -# field = serializers.HyperlinkedRelatedField( -# many=True, -# source='get_blogposts_manager', -# view_name='dummy-url', -# ) -# field.context = {'request': request} - -# class ClassWithManagerMethod(object): -# def get_blogposts_manager(self): -# return BlogPost.objects - -# obj = ClassWithManagerMethod() -# value = field.field_to_native(obj, 'field_name') -# self.assertEqual(value, ['http://testserver/dummyurl/1/']) - -# def test_related_queryset_source(self): -# """ -# Relational fields should be able to use queryset-returning methods as their source. -# """ -# BlogPost.objects.create(title='blah') -# field = serializers.HyperlinkedRelatedField( -# many=True, -# source='get_blogposts_queryset', -# view_name='dummy-url', -# ) -# field.context = {'request': request} - -# class ClassWithQuerysetMethod(object): -# def get_blogposts_queryset(self): -# return BlogPost.objects.all() - -# obj = ClassWithQuerysetMethod() -# value = field.field_to_native(obj, 'field_name') -# self.assertEqual(value, ['http://testserver/dummyurl/1/']) - -# def test_dotted_source(self): -# """ -# Source argument should support dotted.source notation. -# """ -# BlogPost.objects.create(title='blah') -# field = serializers.HyperlinkedRelatedField( -# many=True, -# source='a.b.c', -# view_name='dummy-url', -# ) -# field.context = {'request': request} - -# class ClassWithQuerysetMethod(object): -# a = { -# 'b': { -# 'c': BlogPost.objects.all() -# } -# } - -# obj = ClassWithQuerysetMethod() -# value = field.field_to_native(obj, 'field_name') -# self.assertEqual(value, ['http://testserver/dummyurl/1/']) diff --git a/tests/test_relations_nested.py b/tests/test_relations_nested.py deleted file mode 100644 index 4a99fee99..000000000 --- a/tests/test_relations_nested.py +++ /dev/null @@ -1,326 +0,0 @@ -# from __future__ import unicode_literals -# from django.db import models -# from django.test import TestCase -# from rest_framework import serializers - -# from .models import OneToOneTarget - - -# class OneToOneSource(models.Model): -# name = models.CharField(max_length=100) -# target = models.OneToOneField(OneToOneTarget, related_name='source', -# null=True, blank=True) - - -# class OneToManyTarget(models.Model): -# name = models.CharField(max_length=100) - - -# class OneToManySource(models.Model): -# name = models.CharField(max_length=100) -# target = models.ForeignKey(OneToManyTarget, related_name='sources') - - -# class ReverseNestedOneToOneTests(TestCase): -# def setUp(self): -# class OneToOneSourceSerializer(serializers.ModelSerializer): -# class Meta: -# model = OneToOneSource -# fields = ('id', 'name') - -# class OneToOneTargetSerializer(serializers.ModelSerializer): -# source = OneToOneSourceSerializer() - -# class Meta: -# model = OneToOneTarget -# fields = ('id', 'name', 'source') - -# self.Serializer = OneToOneTargetSerializer - -# for idx in range(1, 4): -# target = OneToOneTarget(name='target-%d' % idx) -# target.save() -# source = OneToOneSource(name='source-%d' % idx, target=target) -# source.save() - -# def test_one_to_one_retrieve(self): -# queryset = OneToOneTarget.objects.all() -# serializer = self.Serializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, -# {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, -# {'id': 3, 'name': 'target-3', 'source': {'id': 3, 'name': 'source-3'}} -# ] -# self.assertEqual(serializer.data, expected) - -# def test_one_to_one_create(self): -# data = {'id': 4, 'name': 'target-4', 'source': {'id': 4, 'name': 'source-4'}} -# serializer = self.Serializer(data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'target-4') - -# # Ensure (target 4, target_source 4, source 4) are added, and -# # everything else is as expected. -# queryset = OneToOneTarget.objects.all() -# serializer = self.Serializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, -# {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, -# {'id': 3, 'name': 'target-3', 'source': {'id': 3, 'name': 'source-3'}}, -# {'id': 4, 'name': 'target-4', 'source': {'id': 4, 'name': 'source-4'}} -# ] -# self.assertEqual(serializer.data, expected) - -# def test_one_to_one_create_with_invalid_data(self): -# data = {'id': 4, 'name': 'target-4', 'source': {'id': 4}} -# serializer = self.Serializer(data=data) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'source': [{'name': ['This field is required.']}]}) - -# def test_one_to_one_update(self): -# data = {'id': 3, 'name': 'target-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}} -# instance = OneToOneTarget.objects.get(pk=3) -# serializer = self.Serializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'target-3-updated') - -# # Ensure (target 3, target_source 3, source 3) are updated, -# # and everything else is as expected. -# queryset = OneToOneTarget.objects.all() -# serializer = self.Serializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, -# {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, -# {'id': 3, 'name': 'target-3-updated', 'source': {'id': 3, 'name': 'source-3-updated'}} -# ] -# self.assertEqual(serializer.data, expected) - - -# class ForwardNestedOneToOneTests(TestCase): -# def setUp(self): -# class OneToOneTargetSerializer(serializers.ModelSerializer): -# class Meta: -# model = OneToOneTarget -# fields = ('id', 'name') - -# class OneToOneSourceSerializer(serializers.ModelSerializer): -# target = OneToOneTargetSerializer() - -# class Meta: -# model = OneToOneSource -# fields = ('id', 'name', 'target') - -# self.Serializer = OneToOneSourceSerializer - -# for idx in range(1, 4): -# target = OneToOneTarget(name='target-%d' % idx) -# target.save() -# source = OneToOneSource(name='source-%d' % idx, target=target) -# source.save() - -# def test_one_to_one_retrieve(self): -# queryset = OneToOneSource.objects.all() -# serializer = self.Serializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, -# {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, -# {'id': 3, 'name': 'source-3', 'target': {'id': 3, 'name': 'target-3'}} -# ] -# self.assertEqual(serializer.data, expected) - -# def test_one_to_one_create(self): -# data = {'id': 4, 'name': 'source-4', 'target': {'id': 4, 'name': 'target-4'}} -# serializer = self.Serializer(data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'source-4') - -# # Ensure (target 4, target_source 4, source 4) are added, and -# # everything else is as expected. -# queryset = OneToOneSource.objects.all() -# serializer = self.Serializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, -# {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, -# {'id': 3, 'name': 'source-3', 'target': {'id': 3, 'name': 'target-3'}}, -# {'id': 4, 'name': 'source-4', 'target': {'id': 4, 'name': 'target-4'}} -# ] -# self.assertEqual(serializer.data, expected) - -# def test_one_to_one_create_with_invalid_data(self): -# data = {'id': 4, 'name': 'source-4', 'target': {'id': 4}} -# serializer = self.Serializer(data=data) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'target': [{'name': ['This field is required.']}]}) - -# def test_one_to_one_update(self): -# data = {'id': 3, 'name': 'source-3-updated', 'target': {'id': 3, 'name': 'target-3-updated'}} -# instance = OneToOneSource.objects.get(pk=3) -# serializer = self.Serializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'source-3-updated') - -# # Ensure (target 3, target_source 3, source 3) are updated, -# # and everything else is as expected. -# queryset = OneToOneSource.objects.all() -# serializer = self.Serializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, -# {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, -# {'id': 3, 'name': 'source-3-updated', 'target': {'id': 3, 'name': 'target-3-updated'}} -# ] -# self.assertEqual(serializer.data, expected) - -# def test_one_to_one_update_to_null(self): -# data = {'id': 3, 'name': 'source-3-updated', 'target': None} -# instance = OneToOneSource.objects.get(pk=3) -# serializer = self.Serializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() - -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'source-3-updated') -# self.assertEqual(obj.target, None) - -# queryset = OneToOneSource.objects.all() -# serializer = self.Serializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'source-1', 'target': {'id': 1, 'name': 'target-1'}}, -# {'id': 2, 'name': 'source-2', 'target': {'id': 2, 'name': 'target-2'}}, -# {'id': 3, 'name': 'source-3-updated', 'target': None} -# ] -# self.assertEqual(serializer.data, expected) - -# # TODO: Nullable 1-1 tests -# # def test_one_to_one_delete(self): -# # data = {'id': 3, 'name': 'target-3', 'target_source': None} -# # instance = OneToOneTarget.objects.get(pk=3) -# # serializer = self.Serializer(instance, data=data) -# # self.assertTrue(serializer.is_valid()) -# # serializer.save() - -# # # Ensure (target_source 3, source 3) are deleted, -# # # and everything else is as expected. -# # queryset = OneToOneTarget.objects.all() -# # serializer = self.Serializer(queryset) -# # expected = [ -# # {'id': 1, 'name': 'target-1', 'source': {'id': 1, 'name': 'source-1'}}, -# # {'id': 2, 'name': 'target-2', 'source': {'id': 2, 'name': 'source-2'}}, -# # {'id': 3, 'name': 'target-3', 'source': None} -# # ] -# # self.assertEqual(serializer.data, expected) - - -# class ReverseNestedOneToManyTests(TestCase): -# def setUp(self): -# class OneToManySourceSerializer(serializers.ModelSerializer): -# class Meta: -# model = OneToManySource -# fields = ('id', 'name') - -# class OneToManyTargetSerializer(serializers.ModelSerializer): -# sources = OneToManySourceSerializer(many=True, allow_add_remove=True) - -# class Meta: -# model = OneToManyTarget -# fields = ('id', 'name', 'sources') - -# self.Serializer = OneToManyTargetSerializer - -# target = OneToManyTarget(name='target-1') -# target.save() -# for idx in range(1, 4): -# source = OneToManySource(name='source-%d' % idx, target=target) -# source.save() - -# def test_one_to_many_retrieve(self): -# queryset = OneToManyTarget.objects.all() -# serializer = self.Serializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, -# {'id': 2, 'name': 'source-2'}, -# {'id': 3, 'name': 'source-3'}]}, -# ] -# self.assertEqual(serializer.data, expected) - -# def test_one_to_many_create(self): -# data = {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, -# {'id': 2, 'name': 'source-2'}, -# {'id': 3, 'name': 'source-3'}, -# {'id': 4, 'name': 'source-4'}]} -# instance = OneToManyTarget.objects.get(pk=1) -# serializer = self.Serializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'target-1') - -# # Ensure source 4 is added, and everything else is as -# # expected. -# queryset = OneToManyTarget.objects.all() -# serializer = self.Serializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, -# {'id': 2, 'name': 'source-2'}, -# {'id': 3, 'name': 'source-3'}, -# {'id': 4, 'name': 'source-4'}]} -# ] -# self.assertEqual(serializer.data, expected) - -# def test_one_to_many_create_with_invalid_data(self): -# data = {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, -# {'id': 2, 'name': 'source-2'}, -# {'id': 3, 'name': 'source-3'}, -# {'id': 4}]} -# serializer = self.Serializer(data=data) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'sources': [{}, {}, {}, {'name': ['This field is required.']}]}) - -# def test_one_to_many_update(self): -# data = {'id': 1, 'name': 'target-1-updated', 'sources': [{'id': 1, 'name': 'source-1-updated'}, -# {'id': 2, 'name': 'source-2'}, -# {'id': 3, 'name': 'source-3'}]} -# instance = OneToManyTarget.objects.get(pk=1) -# serializer = self.Serializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(serializer.data, data) -# self.assertEqual(obj.name, 'target-1-updated') - -# # Ensure (target 1, source 1) are updated, -# # and everything else is as expected. -# queryset = OneToManyTarget.objects.all() -# serializer = self.Serializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1-updated', 'sources': [{'id': 1, 'name': 'source-1-updated'}, -# {'id': 2, 'name': 'source-2'}, -# {'id': 3, 'name': 'source-3'}]} - -# ] -# self.assertEqual(serializer.data, expected) - -# def test_one_to_many_delete(self): -# data = {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, -# {'id': 3, 'name': 'source-3'}]} -# instance = OneToManyTarget.objects.get(pk=1) -# serializer = self.Serializer(instance, data=data) -# self.assertTrue(serializer.is_valid()) -# serializer.save() - -# # Ensure source 2 is deleted, and everything else is as -# # expected. -# queryset = OneToManyTarget.objects.all() -# serializer = self.Serializer(queryset, many=True) -# expected = [ -# {'id': 1, 'name': 'target-1', 'sources': [{'id': 1, 'name': 'source-1'}, -# {'id': 3, 'name': 'source-3'}]} - -# ] -# self.assertEqual(serializer.data, expected) diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index ba5f6c178..e95a877e1 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -398,27 +398,6 @@ class PKNullableForeignKeyTests(TestCase): ] self.assertEqual(serializer.data, expected) - # reverse foreign keys MUST be read_only - # In the general case they do not provide .remove() or .clear() - # and cannot be arbitrarily set. - - # def test_reverse_foreign_key_update(self): - # data = {'id': 1, 'name': 'target-1', 'sources': [1]} - # instance = ForeignKeyTarget.objects.get(pk=1) - # serializer = ForeignKeyTargetSerializer(instance, data=data) - # self.assertTrue(serializer.is_valid()) - # self.assertEqual(serializer.data, data) - # serializer.save() - - # # Ensure target 1 is updated, and everything else is as expected - # queryset = ForeignKeyTarget.objects.all() - # serializer = ForeignKeyTargetSerializer(queryset, many=True) - # expected = [ - # {'id': 1, 'name': 'target-1', 'sources': [1]}, - # {'id': 2, 'name': 'target-2', 'sources': []}, - # ] - # self.assertEqual(serializer.data, expected) - class PKNullableOneToOneTests(TestCase): def setUp(self): @@ -437,113 +416,3 @@ class PKNullableOneToOneTests(TestCase): {'id': 2, 'name': 'target-2', 'nullable_source': 1}, ] self.assertEqual(serializer.data, expected) - - -# The below models and tests ensure that serializer fields corresponding -# to a ManyToManyField field with a user-specified ``through`` model are -# set to read only - - -# class ManyToManyThroughTarget(models.Model): -# name = models.CharField(max_length=100) - - -# class ManyToManyThrough(models.Model): -# source = models.ForeignKey('ManyToManyThroughSource') -# target = models.ForeignKey(ManyToManyThroughTarget) - - -# class ManyToManyThroughSource(models.Model): -# name = models.CharField(max_length=100) -# targets = models.ManyToManyField(ManyToManyThroughTarget, -# related_name='sources', -# through='ManyToManyThrough') - - -# class ManyToManyThroughTargetSerializer(serializers.ModelSerializer): -# class Meta: -# model = ManyToManyThroughTarget -# fields = ('id', 'name', 'sources') - - -# class ManyToManyThroughSourceSerializer(serializers.ModelSerializer): -# class Meta: -# model = ManyToManyThroughSource -# fields = ('id', 'name', 'targets') - - -# class PKManyToManyThroughTests(TestCase): -# def setUp(self): -# self.source = ManyToManyThroughSource.objects.create( -# name='through-source-1') -# self.target = ManyToManyThroughTarget.objects.create( -# name='through-target-1') - -# def test_many_to_many_create(self): -# data = {'id': 2, 'name': 'source-2', 'targets': [self.target.pk]} -# serializer = ManyToManyThroughSourceSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(obj.name, 'source-2') -# self.assertEqual(obj.targets.count(), 0) - -# def test_many_to_many_reverse_create(self): -# data = {'id': 2, 'name': 'target-2', 'sources': [self.source.pk]} -# serializer = ManyToManyThroughTargetSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# obj = serializer.save() -# self.assertEqual(obj.name, 'target-2') -# self.assertEqual(obj.sources.count(), 0) - - -# # Regression tests for #694 (`source` attribute on related fields) - - -# class PrimaryKeyRelatedFieldSourceTests(TestCase): -# def test_related_manager_source(self): -# """ -# Relational fields should be able to use manager-returning methods as their source. -# """ -# BlogPost.objects.create(title='blah') -# field = serializers.PrimaryKeyRelatedField(many=True, source='get_blogposts_manager') - -# class ClassWithManagerMethod(object): -# def get_blogposts_manager(self): -# return BlogPost.objects - -# obj = ClassWithManagerMethod() -# value = field.field_to_native(obj, 'field_name') -# self.assertEqual(value, [1]) - -# def test_related_queryset_source(self): -# """ -# Relational fields should be able to use queryset-returning methods as their source. -# """ -# BlogPost.objects.create(title='blah') -# field = serializers.PrimaryKeyRelatedField(many=True, source='get_blogposts_queryset') - -# class ClassWithQuerysetMethod(object): -# def get_blogposts_queryset(self): -# return BlogPost.objects.all() - -# obj = ClassWithQuerysetMethod() -# value = field.field_to_native(obj, 'field_name') -# self.assertEqual(value, [1]) - -# def test_dotted_source(self): -# """ -# Source argument should support dotted.source notation. -# """ -# BlogPost.objects.create(title='blah') -# field = serializers.PrimaryKeyRelatedField(many=True, source='a.b.c') - -# class ClassWithQuerysetMethod(object): -# a = { -# 'b': { -# 'c': BlogPost.objects.all() -# } -# } - -# obj = ClassWithQuerysetMethod() -# value = field.field_to_native(obj, 'field_name') -# self.assertEqual(value, [1]) diff --git a/tests/test_request.py b/tests/test_request.py index 8ddaf0a70..44afd2438 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -179,89 +179,6 @@ class TestContentParsing(TestCase): self.assertEqual(request._data, Empty) self.assertEqual(request._files, Empty) - # def test_accessing_post_after_data_form(self): - # """ - # Ensures request.POST can be accessed after request.DATA in - # form request. - # """ - # data = {'qwerty': 'uiop'} - # request = factory.post('/', data=data) - # self.assertEqual(request.DATA.items(), data.items()) - # self.assertEqual(request.POST.items(), data.items()) - - # def test_accessing_post_after_data_for_json(self): - # """ - # Ensures request.POST can be accessed after request.DATA in - # json request. - # """ - # data = {'qwerty': 'uiop'} - # content = json.dumps(data) - # content_type = 'application/json' - # parsers = (JSONParser, ) - - # request = factory.post('/', content, content_type=content_type, - # parsers=parsers) - # self.assertEqual(request.DATA.items(), data.items()) - # self.assertEqual(request.POST.items(), []) - - # def test_accessing_post_after_data_for_overloaded_json(self): - # """ - # Ensures request.POST can be accessed after request.DATA in overloaded - # json request. - # """ - # data = {'qwerty': 'uiop'} - # content = json.dumps(data) - # content_type = 'application/json' - # parsers = (JSONParser, ) - # form_data = {Request._CONTENT_PARAM: content, - # Request._CONTENTTYPE_PARAM: content_type} - - # request = factory.post('/', form_data, parsers=parsers) - # self.assertEqual(request.DATA.items(), data.items()) - # self.assertEqual(request.POST.items(), form_data.items()) - - # def test_accessing_data_after_post_form(self): - # """ - # Ensures request.DATA can be accessed after request.POST in - # form request. - # """ - # data = {'qwerty': 'uiop'} - # parsers = (FormParser, MultiPartParser) - # request = factory.post('/', data, parsers=parsers) - - # self.assertEqual(request.POST.items(), data.items()) - # self.assertEqual(request.DATA.items(), data.items()) - - # def test_accessing_data_after_post_for_json(self): - # """ - # Ensures request.DATA can be accessed after request.POST in - # json request. - # """ - # data = {'qwerty': 'uiop'} - # content = json.dumps(data) - # content_type = 'application/json' - # parsers = (JSONParser, ) - # request = factory.post('/', content, content_type=content_type, - # parsers=parsers) - # self.assertEqual(request.POST.items(), []) - # self.assertEqual(request.DATA.items(), data.items()) - - # def test_accessing_data_after_post_for_overloaded_json(self): - # """ - # Ensures request.DATA can be accessed after request.POST in overloaded - # json request - # """ - # data = {'qwerty': 'uiop'} - # content = json.dumps(data) - # content_type = 'application/json' - # parsers = (JSONParser, ) - # form_data = {Request._CONTENT_PARAM: content, - # Request._CONTENTTYPE_PARAM: content_type} - - # request = factory.post('/', form_data, parsers=parsers) - # self.assertEqual(request.POST.items(), form_data.items()) - # self.assertEqual(request.DATA.items(), data.items()) - class MockView(APIView): authentication_classes = (SessionAuthentication,) @@ -301,18 +218,6 @@ class TestContentParsingWithAuthentication(TestCase): response = self.csrf_client.post('/', content) self.assertEqual(status.HTTP_200_OK, response.status_code) - # def test_user_logged_in_authentication_has_post_when_logged_in(self): - # """Ensures request.POST exists after UserLoggedInAuthentication when user does log in""" - # self.client.login(username='john', password='password') - # self.csrf_client.login(username='john', password='password') - # content = {'example': 'example'} - - # response = self.client.post('/', content) - # self.assertEqual(status.OK, response.status_code, "POST data is malformed") - - # response = self.csrf_client.post('/', content) - # self.assertEqual(status.OK, response.status_code, "POST data is malformed") - class TestUserSetter(TestCase): diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 77d5c3199..6dabaf42e 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -175,2007 +175,3 @@ class TestStarredSource: instance = {'a': 1, 'b': 2, 'c': 3, 'd': 4} serializer = self.Serializer(instance) assert serializer.data == self.data - -# # -*- coding: utf-8 -*- -# from __future__ import unicode_literals -# from django.db import models -# from django.db.models.fields import BLANK_CHOICE_DASH -# from django.test import TestCase -# from django.utils import unittest -# from django.utils.datastructures import MultiValueDict -# from django.utils.translation import ugettext_lazy as _ -# from rest_framework import serializers, fields, relations -# from tests.models import ( -# HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel, -# BlankFieldModel, BlogPost, BlogPostComment, Book, CallableDefaultValueModel, -# DefaultValueModel, ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo, -# RESTFrameworkModel, ForeignKeySource -# ) -# from tests.models import BasicModelSerializer -# import datetime -# import pickle -# try: -# import PIL -# except: -# PIL = None - - -# if PIL is not None: -# class AMOAFModel(RESTFrameworkModel): -# char_field = models.CharField(max_length=1024, blank=True) -# comma_separated_integer_field = models.CommaSeparatedIntegerField(max_length=1024, blank=True) -# decimal_field = models.DecimalField(max_digits=64, decimal_places=32, blank=True) -# email_field = models.EmailField(max_length=1024, blank=True) -# file_field = models.FileField(upload_to='test', max_length=1024, blank=True) -# image_field = models.ImageField(upload_to='test', max_length=1024, blank=True) -# slug_field = models.SlugField(max_length=1024, blank=True) -# url_field = models.URLField(max_length=1024, blank=True) -# nullable_char_field = models.CharField(max_length=1024, blank=True, null=True) - -# class DVOAFModel(RESTFrameworkModel): -# positive_integer_field = models.PositiveIntegerField(blank=True) -# positive_small_integer_field = models.PositiveSmallIntegerField(blank=True) -# email_field = models.EmailField(blank=True) -# file_field = models.FileField(upload_to='test', blank=True) -# image_field = models.ImageField(upload_to='test', blank=True) -# slug_field = models.SlugField(blank=True) -# url_field = models.URLField(blank=True) - - -# class SubComment(object): -# def __init__(self, sub_comment): -# self.sub_comment = sub_comment - - -# class Comment(object): -# def __init__(self, email, content, created): -# self.email = email -# self.content = content -# self.created = created or datetime.datetime.now() - -# def __eq__(self, other): -# return all([getattr(self, attr) == getattr(other, attr) -# for attr in ('email', 'content', 'created')]) - -# def get_sub_comment(self): -# sub_comment = SubComment('And Merry Christmas!') -# return sub_comment - - -# class CommentSerializer(serializers.Serializer): -# email = serializers.EmailField() -# content = serializers.CharField(max_length=1000) -# created = serializers.DateTimeField() -# sub_comment = serializers.Field(source='get_sub_comment.sub_comment') - -# def restore_object(self, data, instance=None): -# if instance is None: -# return Comment(**data) -# for key, val in data.items(): -# setattr(instance, key, val) -# return instance - - -# class NamesSerializer(serializers.Serializer): -# first = serializers.CharField() -# last = serializers.CharField(required=False, default='') -# initials = serializers.CharField(required=False, default='') - - -# class PersonIdentifierSerializer(serializers.Serializer): -# ssn = serializers.CharField() -# names = NamesSerializer(source='names', required=False) - - -# class BookSerializer(serializers.ModelSerializer): -# isbn = serializers.RegexField(regex=r'^[0-9]{13}$', error_messages={'invalid': 'isbn has to be exact 13 numbers'}) - -# class Meta: -# model = Book - - -# class ActionItemSerializer(serializers.ModelSerializer): - -# class Meta: -# model = ActionItem - - -# class ActionItemSerializerOptionalFields(serializers.ModelSerializer): -# """ -# Intended to test that fields with `required=False` are excluded from validation. -# """ -# title = serializers.CharField(required=False) - -# class Meta: -# model = ActionItem -# fields = ('title',) - - -# class ActionItemSerializerCustomRestore(serializers.ModelSerializer): - -# class Meta: -# model = ActionItem - -# def restore_object(self, data, instance=None): -# if instance is None: -# return ActionItem(**data) -# for key, val in data.items(): -# setattr(instance, key, val) -# return instance - - -# class PersonSerializer(serializers.ModelSerializer): -# info = serializers.Field(source='info') - -# class Meta: -# model = Person -# fields = ('name', 'age', 'info') -# read_only_fields = ('age',) - - -# class NestedSerializer(serializers.Serializer): -# info = serializers.Field() - - -# class ModelSerializerWithNestedSerializer(serializers.ModelSerializer): -# nested = NestedSerializer(source='*') - -# class Meta: -# model = Person - - -# class NestedSerializerWithRenamedField(serializers.Serializer): -# renamed_info = serializers.Field(source='info') - - -# class ModelSerializerWithNestedSerializerWithRenamedField(serializers.ModelSerializer): -# nested = NestedSerializerWithRenamedField(source='*') - -# class Meta: -# model = Person - - -# class PersonSerializerInvalidReadOnly(serializers.ModelSerializer): -# """ -# Testing for #652. -# """ -# info = serializers.Field(source='info') - -# class Meta: -# model = Person -# fields = ('name', 'age', 'info') -# read_only_fields = ('age', 'info') - - -# class AlbumsSerializer(serializers.ModelSerializer): - -# class Meta: -# model = Album -# fields = ['title', 'ref'] # lists are also valid options - - -# class PositiveIntegerAsChoiceSerializer(serializers.ModelSerializer): -# class Meta: -# model = HasPositiveIntegerAsChoice -# fields = ['some_integer'] - - -# class ForeignKeySourceSerializer(serializers.ModelSerializer): -# class Meta: -# model = ForeignKeySource - - -# class HyperlinkedForeignKeySourceSerializer(serializers.HyperlinkedModelSerializer): -# class Meta: -# model = ForeignKeySource - - -# class BasicTests(TestCase): -# def setUp(self): -# self.comment = Comment( -# 'tom@example.com', -# 'Happy new year!', -# datetime.datetime(2012, 1, 1) -# ) -# self.actionitem = ActionItem(title='Some to do item',) -# self.data = { -# 'email': 'tom@example.com', -# 'content': 'Happy new year!', -# 'created': datetime.datetime(2012, 1, 1), -# 'sub_comment': 'This wont change' -# } -# self.expected = { -# 'email': 'tom@example.com', -# 'content': 'Happy new year!', -# 'created': datetime.datetime(2012, 1, 1), -# 'sub_comment': 'And Merry Christmas!' -# } -# self.person_data = {'name': 'dwight', 'age': 35} -# self.person = Person(**self.person_data) -# self.person.save() - -# def test_empty(self): -# serializer = CommentSerializer() -# expected = { -# 'email': '', -# 'content': '', -# 'created': None -# } -# self.assertEqual(serializer.data, expected) - -# def test_retrieve(self): -# serializer = CommentSerializer(self.comment) -# self.assertEqual(serializer.data, self.expected) - -# def test_create(self): -# serializer = CommentSerializer(data=self.data) -# expected = self.comment -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.object, expected) -# self.assertFalse(serializer.object is expected) -# self.assertEqual(serializer.data['sub_comment'], 'And Merry Christmas!') - -# def test_create_nested(self): -# """Test a serializer with nested data.""" -# names = {'first': 'John', 'last': 'Doe', 'initials': 'jd'} -# data = {'ssn': '1234567890', 'names': names} -# serializer = PersonIdentifierSerializer(data=data) - -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.object, data) -# self.assertFalse(serializer.object is data) -# self.assertEqual(serializer.data['names'], names) - -# def test_create_partial_nested(self): -# """Test a serializer with nested data which has missing fields.""" -# names = {'first': 'John'} -# data = {'ssn': '1234567890', 'names': names} -# serializer = PersonIdentifierSerializer(data=data) - -# expected_names = {'first': 'John', 'last': '', 'initials': ''} -# data['names'] = expected_names - -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.object, data) -# self.assertFalse(serializer.object is expected_names) -# self.assertEqual(serializer.data['names'], expected_names) - -# def test_null_nested(self): -# """Test a serializer with a nonexistent nested field""" -# data = {'ssn': '1234567890'} -# serializer = PersonIdentifierSerializer(data=data) - -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.object, data) -# self.assertFalse(serializer.object is data) -# expected = {'ssn': '1234567890', 'names': None} -# self.assertEqual(serializer.data, expected) - -# def test_update(self): -# serializer = CommentSerializer(self.comment, data=self.data) -# expected = self.comment -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.object, expected) -# self.assertTrue(serializer.object is expected) -# self.assertEqual(serializer.data['sub_comment'], 'And Merry Christmas!') - -# def test_partial_update(self): -# msg = 'Merry New Year!' -# partial_data = {'content': msg} -# serializer = CommentSerializer(self.comment, data=partial_data) -# self.assertEqual(serializer.is_valid(), False) -# serializer = CommentSerializer(self.comment, data=partial_data, partial=True) -# expected = self.comment -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.object, expected) -# self.assertTrue(serializer.object is expected) -# self.assertEqual(serializer.data['content'], msg) - -# def test_model_fields_as_expected(self): -# """ -# Make sure that the fields returned are the same as defined -# in the Meta data -# """ -# serializer = PersonSerializer(self.person) -# self.assertEqual( -# set(serializer.data.keys()), -# set(['name', 'age', 'info']) -# ) - -# def test_field_with_dictionary(self): -# """ -# Make sure that dictionaries from fields are left intact -# """ -# serializer = PersonSerializer(self.person) -# expected = self.person_data -# self.assertEqual(serializer.data['info'], expected) - -# def test_read_only_fields(self): -# """ -# Attempting to update fields set as read_only should have no effect. -# """ -# serializer = PersonSerializer(self.person, data={'name': 'dwight', 'age': 99}) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() -# self.assertEqual(serializer.errors, {}) -# # Assert age is unchanged (35) -# self.assertEqual(instance.age, self.person_data['age']) - -# def test_invalid_read_only_fields(self): -# """ -# Regression test for #652. -# """ -# self.assertRaises(AssertionError, PersonSerializerInvalidReadOnly, []) - -# def test_serializer_data_is_cleared_on_save(self): -# """ -# Check _data attribute is cleared on `save()` - -# Regression test for #1116 -# """ -# serializer = ActionItemSerializer(self.actionitem) -# self.assertIsNone(serializer.data.get('id', None), 'New instance. `id` should not be set.') -# serializer.save() -# self.assertIsNotNone(serializer.data.get('id', None), 'Model is saved. `id` should be set.') - -# def test_fields_marked_as_not_required_are_excluded_from_validation(self): -# """ -# Check that fields with `required=False` are included in list of exclusions. -# """ -# serializer = ActionItemSerializerOptionalFields(self.actionitem) -# exclusions = serializer.get_validation_exclusions() -# self.assertTrue('title' in exclusions, '`title` field was marked `required=False` and should be excluded') - - -# class DictStyleSerializer(serializers.Serializer): -# """ -# Note that we don't have any `restore_object` method, so the default -# case of simply returning a dict will apply. -# """ -# email = serializers.EmailField() - - -# class DictStyleSerializerTests(TestCase): -# def test_dict_style_deserialize(self): -# """ -# Ensure serializers can deserialize into a dict. -# """ -# data = {'email': 'foo@example.com'} -# serializer = DictStyleSerializer(data=data) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.data, data) - -# def test_dict_style_serialize(self): -# """ -# Ensure serializers can serialize dict objects. -# """ -# data = {'email': 'foo@example.com'} -# serializer = DictStyleSerializer(data) -# self.assertEqual(serializer.data, data) - - -# class ValidationTests(TestCase): -# def setUp(self): -# self.comment = Comment( -# 'tom@example.com', -# 'Happy new year!', -# datetime.datetime(2012, 1, 1) -# ) -# self.data = { -# 'email': 'tom@example.com', -# 'content': 'x' * 1001, -# 'created': datetime.datetime(2012, 1, 1) -# } -# self.actionitem = ActionItem(title='Some to do item',) - -# def test_create(self): -# serializer = CommentSerializer(data=self.data) -# self.assertEqual(serializer.is_valid(), False) -# self.assertEqual(serializer.errors, {'content': ['Ensure this value has at most 1000 characters (it has 1001).']}) - -# def test_update(self): -# serializer = CommentSerializer(self.comment, data=self.data) -# self.assertEqual(serializer.is_valid(), False) -# self.assertEqual(serializer.errors, {'content': ['Ensure this value has at most 1000 characters (it has 1001).']}) - -# def test_update_missing_field(self): -# data = { -# 'content': 'xxx', -# 'created': datetime.datetime(2012, 1, 1) -# } -# serializer = CommentSerializer(self.comment, data=data) -# self.assertEqual(serializer.is_valid(), False) -# self.assertEqual(serializer.errors, {'email': ['This field is required.']}) - -# def test_missing_bool_with_default(self): -# """Make sure that a boolean value with a 'False' value is not -# mistaken for not having a default.""" -# data = { -# 'title': 'Some action item', -# # No 'done' value. -# } -# serializer = ActionItemSerializer(self.actionitem, data=data) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.errors, {}) - -# def test_cross_field_validation(self): - -# class CommentSerializerWithCrossFieldValidator(CommentSerializer): - -# def validate(self, attrs): -# if attrs["email"] not in attrs["content"]: -# raise serializers.ValidationError("Email address not in content") -# return attrs - -# data = { -# 'email': 'tom@example.com', -# 'content': 'A comment from tom@example.com', -# 'created': datetime.datetime(2012, 1, 1) -# } - -# serializer = CommentSerializerWithCrossFieldValidator(data=data) -# self.assertTrue(serializer.is_valid()) - -# data['content'] = 'A comment from foo@bar.com' - -# serializer = CommentSerializerWithCrossFieldValidator(data=data) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'non_field_errors': ['Email address not in content']}) - -# def test_null_is_true_fields(self): -# """ -# Omitting a value for null-field should validate. -# """ -# serializer = PersonSerializer(data={'name': 'marko'}) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.errors, {}) - -# def test_modelserializer_max_length_exceeded(self): -# data = { -# 'title': 'x' * 201, -# } -# serializer = ActionItemSerializer(data=data) -# self.assertEqual(serializer.is_valid(), False) -# self.assertEqual(serializer.errors, {'title': ['Ensure this value has at most 200 characters (it has 201).']}) - -# def test_modelserializer_max_length_exceeded_with_custom_restore(self): -# """ -# When overriding ModelSerializer.restore_object, validation tests should still apply. -# Regression test for #623. - -# https://github.com/tomchristie/django-rest-framework/pull/623 -# """ -# data = { -# 'title': 'x' * 201, -# } -# serializer = ActionItemSerializerCustomRestore(data=data) -# self.assertEqual(serializer.is_valid(), False) -# self.assertEqual(serializer.errors, {'title': ['Ensure this value has at most 200 characters (it has 201).']}) - -# def test_default_modelfield_max_length_exceeded(self): -# data = { -# 'title': 'Testing "info" field...', -# 'info': 'x' * 13, -# } -# serializer = ActionItemSerializer(data=data) -# self.assertEqual(serializer.is_valid(), False) -# self.assertEqual(serializer.errors, {'info': ['Ensure this value has at most 12 characters (it has 13).']}) - -# def test_datetime_validation_failure(self): -# """ -# Test DateTimeField validation errors on non-str values. -# Regression test for #669. - -# https://github.com/tomchristie/django-rest-framework/issues/669 -# """ -# data = self.data -# data['created'] = 0 - -# serializer = CommentSerializer(data=data) -# self.assertEqual(serializer.is_valid(), False) - -# self.assertIn('created', serializer.errors) - -# def test_missing_model_field_exception_msg(self): -# """ -# Assert that a meaningful exception message is outputted when the model -# field is missing (e.g. when mistyping ``model``). -# """ -# class BrokenModelSerializer(serializers.ModelSerializer): -# class Meta: -# fields = ['some_field'] - -# try: -# BrokenModelSerializer() -# except AssertionError as e: -# self.assertEqual(e.args[0], "Serializer class 'BrokenModelSerializer' is missing 'model' Meta option") -# except: -# self.fail('Wrong exception type thrown.') - -# def test_writable_star_source_on_nested_serializer(self): -# """ -# Assert that a nested serializer instantiated with source='*' correctly -# expands the data into the outer serializer. -# """ -# serializer = ModelSerializerWithNestedSerializer(data={ -# 'name': 'marko', -# 'nested': {'info': 'hi'}}, -# ) -# self.assertEqual(serializer.is_valid(), True) - -# def test_writable_star_source_on_nested_serializer_with_parent_object(self): -# class TitleSerializer(serializers.Serializer): -# title = serializers.WritableField(source='title') - -# class AlbumSerializer(serializers.ModelSerializer): -# nested = TitleSerializer(source='*') - -# class Meta: -# model = Album -# fields = ('nested',) - -# class PhotoSerializer(serializers.ModelSerializer): -# album = AlbumSerializer(source='album') - -# class Meta: -# model = Photo -# fields = ('album', ) - -# photo = Photo(album=Album()) - -# data = {'album': {'nested': {'title': 'test'}}} - -# serializer = PhotoSerializer(photo, data=data) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.data, data) - -# def test_writable_star_source_with_inner_source_fields(self): -# """ -# Tests that a serializer with source="*" correctly expands the -# it's fields into the outer serializer even if they have their -# own 'source' parameters. -# """ - -# serializer = ModelSerializerWithNestedSerializerWithRenamedField(data={ -# 'name': 'marko', -# 'nested': {'renamed_info': 'hi'}}, -# ) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.errors, {}) - - -# class CustomValidationTests(TestCase): -# class CommentSerializerWithFieldValidator(CommentSerializer): - -# def validate_email(self, attrs, source): -# attrs[source] -# return attrs - -# def validate_content(self, attrs, source): -# value = attrs[source] -# if "test" not in value: -# raise serializers.ValidationError("Test not in value") -# return attrs - -# def test_field_validation(self): -# data = { -# 'email': 'tom@example.com', -# 'content': 'A test comment', -# 'created': datetime.datetime(2012, 1, 1) -# } - -# serializer = self.CommentSerializerWithFieldValidator(data=data) -# self.assertTrue(serializer.is_valid()) - -# data['content'] = 'This should not validate' - -# serializer = self.CommentSerializerWithFieldValidator(data=data) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'content': ['Test not in value']}) - -# def test_missing_data(self): -# """ -# Make sure that validate_content isn't called if the field is missing -# """ -# incomplete_data = { -# 'email': 'tom@example.com', -# 'created': datetime.datetime(2012, 1, 1) -# } -# serializer = self.CommentSerializerWithFieldValidator(data=incomplete_data) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'content': ['This field is required.']}) - -# def test_wrong_data(self): -# """ -# Make sure that validate_content isn't called if the field input is wrong -# """ -# wrong_data = { -# 'email': 'not an email', -# 'content': 'A test comment', -# 'created': datetime.datetime(2012, 1, 1) -# } -# serializer = self.CommentSerializerWithFieldValidator(data=wrong_data) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'email': ['Enter a valid email address.']}) - -# def test_partial_update(self): -# """ -# Make sure that validate_email isn't called when partial=True and email -# isn't found in data. -# """ -# initial_data = { -# 'email': 'tom@example.com', -# 'content': 'A test comment', -# 'created': datetime.datetime(2012, 1, 1) -# } - -# serializer = self.CommentSerializerWithFieldValidator(data=initial_data) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.object - -# new_content = 'An *updated* test comment' -# partial_data = { -# 'content': new_content -# } - -# serializer = self.CommentSerializerWithFieldValidator(instance=instance, -# data=partial_data, -# partial=True) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.object -# self.assertEqual(instance.content, new_content) - - -# class PositiveIntegerAsChoiceTests(TestCase): -# def test_positive_integer_in_json_is_correctly_parsed(self): -# data = {'some_integer': 1} -# serializer = PositiveIntegerAsChoiceSerializer(data=data) -# self.assertEqual(serializer.is_valid(), True) - - -# class ModelValidationTests(TestCase): -# def test_validate_unique(self): -# """ -# Just check if serializers.ModelSerializer handles unique checks via .full_clean() -# """ -# serializer = AlbumsSerializer(data={'title': 'a', 'ref': '1'}) -# serializer.is_valid() -# serializer.save() -# second_serializer = AlbumsSerializer(data={'title': 'a'}) -# self.assertFalse(second_serializer.is_valid()) -# self.assertEqual(second_serializer.errors, {'title': ['Album with this Title already exists.']}) -# third_serializer = AlbumsSerializer(data=[{'title': 'b', 'ref': '1'}, {'title': 'c'}], many=True) -# self.assertFalse(third_serializer.is_valid()) -# self.assertEqual(third_serializer.errors, [{'ref': ['Album with this Ref already exists.']}, {}]) - -# def test_foreign_key_is_null_with_partial(self): -# """ -# Test ModelSerializer validation with partial=True - -# Specifically test that a null foreign key does not pass validation -# """ -# album = Album(title='test') -# album.save() - -# class PhotoSerializer(serializers.ModelSerializer): -# class Meta: -# model = Photo - -# photo_serializer = PhotoSerializer(data={'description': 'test', 'album': album.pk}) -# self.assertTrue(photo_serializer.is_valid()) -# photo = photo_serializer.save() - -# # Updating only the album (foreign key) -# photo_serializer = PhotoSerializer(instance=photo, data={'album': ''}, partial=True) -# self.assertFalse(photo_serializer.is_valid()) -# self.assertTrue('album' in photo_serializer.errors) -# self.assertEqual(photo_serializer.errors['album'], [photo_serializer.error_messages['required']]) - -# def test_foreign_key_with_partial(self): -# """ -# Test ModelSerializer validation with partial=True - -# Specifically test foreign key validation. -# """ - -# album = Album(title='test') -# album.save() - -# class PhotoSerializer(serializers.ModelSerializer): -# class Meta: -# model = Photo - -# photo_serializer = PhotoSerializer(data={'description': 'test', 'album': album.pk}) -# self.assertTrue(photo_serializer.is_valid()) -# photo = photo_serializer.save() - -# # Updating only the album (foreign key) -# photo_serializer = PhotoSerializer(instance=photo, data={'album': album.pk}, partial=True) -# self.assertTrue(photo_serializer.is_valid()) -# self.assertTrue(photo_serializer.save()) - -# # Updating only the description -# photo_serializer = PhotoSerializer(instance=photo, -# data={'description': 'new'}, -# partial=True) - -# self.assertTrue(photo_serializer.is_valid()) -# self.assertTrue(photo_serializer.save()) - - -# class RegexValidationTest(TestCase): -# def test_create_failed(self): -# serializer = BookSerializer(data={'isbn': '1234567890'}) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'isbn': ['isbn has to be exact 13 numbers']}) - -# serializer = BookSerializer(data={'isbn': '12345678901234'}) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'isbn': ['isbn has to be exact 13 numbers']}) - -# serializer = BookSerializer(data={'isbn': 'abcdefghijklm'}) -# self.assertFalse(serializer.is_valid()) -# self.assertEqual(serializer.errors, {'isbn': ['isbn has to be exact 13 numbers']}) - -# def test_create_success(self): -# serializer = BookSerializer(data={'isbn': '1234567890123'}) -# self.assertTrue(serializer.is_valid()) - - -# class MetadataTests(TestCase): -# def test_empty(self): -# serializer = CommentSerializer() -# expected = { -# 'email': serializers.CharField, -# 'content': serializers.CharField, -# 'created': serializers.DateTimeField -# } -# for field_name, field in expected.items(): -# self.assertTrue(isinstance(serializer.data.fields[field_name], field)) - - -# class ManyToManyTests(TestCase): -# def setUp(self): -# class ManyToManySerializer(serializers.ModelSerializer): -# class Meta: -# model = ManyToManyModel - -# self.serializer_class = ManyToManySerializer - -# # An anchor instance to use for the relationship -# self.anchor = Anchor() -# self.anchor.save() - -# # A model instance with a many to many relationship to the anchor -# self.instance = ManyToManyModel() -# self.instance.save() -# self.instance.rel.add(self.anchor) - -# # A serialized representation of the model instance -# self.data = {'id': 1, 'rel': [self.anchor.id]} - -# def test_retrieve(self): -# """ -# Serialize an instance of a model with a ManyToMany relationship. -# """ -# serializer = self.serializer_class(instance=self.instance) -# expected = self.data -# self.assertEqual(serializer.data, expected) - -# def test_create(self): -# """ -# Create an instance of a model with a ManyToMany relationship. -# """ -# data = {'rel': [self.anchor.id]} -# serializer = self.serializer_class(data=data) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() -# self.assertEqual(len(ManyToManyModel.objects.all()), 2) -# self.assertEqual(instance.pk, 2) -# self.assertEqual(list(instance.rel.all()), [self.anchor]) - -# def test_update(self): -# """ -# Update an instance of a model with a ManyToMany relationship. -# """ -# new_anchor = Anchor() -# new_anchor.save() -# data = {'rel': [self.anchor.id, new_anchor.id]} -# serializer = self.serializer_class(self.instance, data=data) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() -# self.assertEqual(len(ManyToManyModel.objects.all()), 1) -# self.assertEqual(instance.pk, 1) -# self.assertEqual(list(instance.rel.all()), [self.anchor, new_anchor]) - -# def test_create_empty_relationship(self): -# """ -# Create an instance of a model with a ManyToMany relationship, -# containing no items. -# """ -# data = {'rel': []} -# serializer = self.serializer_class(data=data) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() -# self.assertEqual(len(ManyToManyModel.objects.all()), 2) -# self.assertEqual(instance.pk, 2) -# self.assertEqual(list(instance.rel.all()), []) - -# def test_update_empty_relationship(self): -# """ -# Update an instance of a model with a ManyToMany relationship, -# containing no items. -# """ -# new_anchor = Anchor() -# new_anchor.save() -# data = {'rel': []} -# serializer = self.serializer_class(self.instance, data=data) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() -# self.assertEqual(len(ManyToManyModel.objects.all()), 1) -# self.assertEqual(instance.pk, 1) -# self.assertEqual(list(instance.rel.all()), []) - -# def test_create_empty_relationship_flat_data(self): -# """ -# Create an instance of a model with a ManyToMany relationship, -# containing no items, using a representation that does not support -# lists (eg form data). -# """ -# data = MultiValueDict() -# data.setlist('rel', ['']) -# serializer = self.serializer_class(data=data) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() -# self.assertEqual(len(ManyToManyModel.objects.all()), 2) -# self.assertEqual(instance.pk, 2) -# self.assertEqual(list(instance.rel.all()), []) - - -# class ReadOnlyManyToManyTests(TestCase): -# def setUp(self): -# class ReadOnlyManyToManySerializer(serializers.ModelSerializer): -# rel = serializers.RelatedField(many=True, read_only=True) - -# class Meta: -# model = ReadOnlyManyToManyModel - -# self.serializer_class = ReadOnlyManyToManySerializer - -# # An anchor instance to use for the relationship -# self.anchor = Anchor() -# self.anchor.save() - -# # A model instance with a many to many relationship to the anchor -# self.instance = ReadOnlyManyToManyModel() -# self.instance.save() -# self.instance.rel.add(self.anchor) - -# # A serialized representation of the model instance -# self.data = {'rel': [self.anchor.id], 'id': 1, 'text': 'anchor'} - -# def test_update(self): -# """ -# Attempt to update an instance of a model with a ManyToMany -# relationship. Not updated due to read_only=True -# """ -# new_anchor = Anchor() -# new_anchor.save() -# data = {'rel': [self.anchor.id, new_anchor.id]} -# serializer = self.serializer_class(self.instance, data=data) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() -# self.assertEqual(len(ReadOnlyManyToManyModel.objects.all()), 1) -# self.assertEqual(instance.pk, 1) -# # rel is still as original (1 entry) -# self.assertEqual(list(instance.rel.all()), [self.anchor]) - -# def test_update_without_relationship(self): -# """ -# Attempt to update an instance of a model where many to ManyToMany -# relationship is not supplied. Not updated due to read_only=True -# """ -# new_anchor = Anchor() -# new_anchor.save() -# data = {} -# serializer = self.serializer_class(self.instance, data=data) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() -# self.assertEqual(len(ReadOnlyManyToManyModel.objects.all()), 1) -# self.assertEqual(instance.pk, 1) -# # rel is still as original (1 entry) -# self.assertEqual(list(instance.rel.all()), [self.anchor]) - - -# class DefaultValueTests(TestCase): -# def setUp(self): -# class DefaultValueSerializer(serializers.ModelSerializer): -# class Meta: -# model = DefaultValueModel - -# self.serializer_class = DefaultValueSerializer -# self.objects = DefaultValueModel.objects - -# def test_create_using_default(self): -# data = {} -# serializer = self.serializer_class(data=data) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() -# self.assertEqual(len(self.objects.all()), 1) -# self.assertEqual(instance.pk, 1) -# self.assertEqual(instance.text, 'foobar') - -# def test_create_overriding_default(self): -# data = {'text': 'overridden'} -# serializer = self.serializer_class(data=data) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() -# self.assertEqual(len(self.objects.all()), 1) -# self.assertEqual(instance.pk, 1) -# self.assertEqual(instance.text, 'overridden') - -# def test_partial_update_default(self): -# """ Regression test for issue #532 """ -# data = {'text': 'overridden'} -# serializer = self.serializer_class(data=data, partial=True) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() - -# data = {'extra': 'extra_value'} -# serializer = self.serializer_class(instance=instance, data=data, partial=True) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() - -# self.assertEqual(instance.extra, 'extra_value') -# self.assertEqual(instance.text, 'overridden') - - -# class WritableFieldDefaultValueTests(TestCase): - -# def setUp(self): -# self.expected = {'default': 'value'} -# self.create_field = fields.WritableField - -# def test_get_default_value_with_noncallable(self): -# field = self.create_field(default=self.expected) -# got = field.get_default_value() -# self.assertEqual(got, self.expected) - -# def test_get_default_value_with_callable(self): -# field = self.create_field(default=lambda: self.expected) -# got = field.get_default_value() -# self.assertEqual(got, self.expected) - -# def test_get_default_value_when_not_required(self): -# field = self.create_field(default=self.expected, required=False) -# got = field.get_default_value() -# self.assertEqual(got, self.expected) - -# def test_get_default_value_returns_None(self): -# field = self.create_field() -# got = field.get_default_value() -# self.assertIsNone(got) - -# def test_get_default_value_returns_non_True_values(self): -# values = [None, '', False, 0, [], (), {}] # values that assumed as 'False' in the 'if' clause -# for expected in values: -# field = self.create_field(default=expected) -# got = field.get_default_value() -# self.assertEqual(got, expected) - - -# class RelatedFieldDefaultValueTests(WritableFieldDefaultValueTests): - -# def setUp(self): -# self.expected = {'foo': 'bar'} -# self.create_field = relations.RelatedField - -# def test_get_default_value_returns_empty_list(self): -# field = self.create_field(many=True) -# got = field.get_default_value() -# self.assertListEqual(got, []) - -# def test_get_default_value_returns_expected(self): -# expected = [1, 2, 3] -# field = self.create_field(many=True, default=expected) -# got = field.get_default_value() -# self.assertListEqual(got, expected) - - -# class CallableDefaultValueTests(TestCase): -# def setUp(self): -# class CallableDefaultValueSerializer(serializers.ModelSerializer): -# class Meta: -# model = CallableDefaultValueModel - -# self.serializer_class = CallableDefaultValueSerializer -# self.objects = CallableDefaultValueModel.objects - -# def test_create_using_default(self): -# data = {} -# serializer = self.serializer_class(data=data) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() -# self.assertEqual(len(self.objects.all()), 1) -# self.assertEqual(instance.pk, 1) -# self.assertEqual(instance.text, 'foobar') - -# def test_create_overriding_default(self): -# data = {'text': 'overridden'} -# serializer = self.serializer_class(data=data) -# self.assertEqual(serializer.is_valid(), True) -# instance = serializer.save() -# self.assertEqual(len(self.objects.all()), 1) -# self.assertEqual(instance.pk, 1) -# self.assertEqual(instance.text, 'overridden') - - -# class ManyRelatedTests(TestCase): -# def test_reverse_relations(self): -# post = BlogPost.objects.create(title="Test blog post") -# post.blogpostcomment_set.create(text="I hate this blog post") -# post.blogpostcomment_set.create(text="I love this blog post") - -# class BlogPostCommentSerializer(serializers.Serializer): -# text = serializers.CharField() - -# class BlogPostSerializer(serializers.Serializer): -# title = serializers.CharField() -# comments = BlogPostCommentSerializer(source='blogpostcomment_set') - -# serializer = BlogPostSerializer(instance=post) -# expected = { -# 'title': 'Test blog post', -# 'comments': [ -# {'text': 'I hate this blog post'}, -# {'text': 'I love this blog post'} -# ] -# } - -# self.assertEqual(serializer.data, expected) - -# def test_include_reverse_relations(self): -# post = BlogPost.objects.create(title="Test blog post") -# post.blogpostcomment_set.create(text="I hate this blog post") -# post.blogpostcomment_set.create(text="I love this blog post") - -# class BlogPostSerializer(serializers.ModelSerializer): -# class Meta: -# model = BlogPost -# fields = ('id', 'title', 'blogpostcomment_set') - -# serializer = BlogPostSerializer(instance=post) -# expected = { -# 'id': 1, 'title': 'Test blog post', 'blogpostcomment_set': [1, 2] -# } -# self.assertEqual(serializer.data, expected) - -# def test_depth_include_reverse_relations(self): -# post = BlogPost.objects.create(title="Test blog post") -# post.blogpostcomment_set.create(text="I hate this blog post") -# post.blogpostcomment_set.create(text="I love this blog post") - -# class BlogPostSerializer(serializers.ModelSerializer): -# class Meta: -# model = BlogPost -# fields = ('id', 'title', 'blogpostcomment_set') -# depth = 1 - -# serializer = BlogPostSerializer(instance=post) -# expected = { -# 'id': 1, 'title': 'Test blog post', -# 'blogpostcomment_set': [ -# {'id': 1, 'text': 'I hate this blog post', 'blog_post': 1}, -# {'id': 2, 'text': 'I love this blog post', 'blog_post': 1} -# ] -# } -# self.assertEqual(serializer.data, expected) - -# def test_callable_source(self): -# post = BlogPost.objects.create(title="Test blog post") -# post.blogpostcomment_set.create(text="I love this blog post") - -# class BlogPostCommentSerializer(serializers.Serializer): -# text = serializers.CharField() - -# class BlogPostSerializer(serializers.Serializer): -# title = serializers.CharField() -# first_comment = BlogPostCommentSerializer(source='get_first_comment') - -# serializer = BlogPostSerializer(post) - -# expected = { -# 'title': 'Test blog post', -# 'first_comment': {'text': 'I love this blog post'} -# } -# self.assertEqual(serializer.data, expected) - - -# class RelatedTraversalTest(TestCase): -# def test_nested_traversal(self): -# """ -# Source argument should support dotted.source notation. -# """ -# user = Person.objects.create(name="django") -# post = BlogPost.objects.create(title="Test blog post", writer=user) -# post.blogpostcomment_set.create(text="I love this blog post") - -# class PersonSerializer(serializers.ModelSerializer): -# class Meta: -# model = Person -# fields = ("name", "age") - -# class BlogPostCommentSerializer(serializers.ModelSerializer): -# class Meta: -# model = BlogPostComment -# fields = ("text", "post_owner") - -# text = serializers.CharField() -# post_owner = PersonSerializer(source='blog_post.writer') - -# class BlogPostSerializer(serializers.Serializer): -# title = serializers.CharField() -# comments = BlogPostCommentSerializer(source='blogpostcomment_set') - -# serializer = BlogPostSerializer(instance=post) - -# expected = { -# 'title': 'Test blog post', -# 'comments': [{ -# 'text': 'I love this blog post', -# 'post_owner': { -# "name": "django", -# "age": None -# } -# }] -# } - -# self.assertEqual(serializer.data, expected) - -# def test_nested_traversal_with_none(self): -# """ -# If a component of the dotted.source is None, return None for the field. -# """ -# from tests.models import NullableForeignKeySource -# instance = NullableForeignKeySource.objects.create(name='Source with null FK') - -# class NullableSourceSerializer(serializers.Serializer): -# target_name = serializers.Field(source='target.name') - -# serializer = NullableSourceSerializer(instance=instance) - -# expected = { -# 'target_name': None, -# } - -# self.assertEqual(serializer.data, expected) - - -# class SerializerMethodFieldTests(TestCase): -# def setUp(self): - -# class BoopSerializer(serializers.Serializer): -# beep = serializers.SerializerMethodField('get_beep') -# boop = serializers.Field() -# boop_count = serializers.SerializerMethodField('get_boop_count') - -# def get_beep(self, obj): -# return 'hello!' - -# def get_boop_count(self, obj): -# return len(obj.boop) - -# self.serializer_class = BoopSerializer - -# def test_serializer_method_field(self): - -# class MyModel(object): -# boop = ['a', 'b', 'c'] - -# source_data = MyModel() - -# serializer = self.serializer_class(source_data) - -# expected = { -# 'beep': 'hello!', -# 'boop': ['a', 'b', 'c'], -# 'boop_count': 3, -# } - -# self.assertEqual(serializer.data, expected) - - -# # Test for issue #324 -# class BlankFieldTests(TestCase): -# def setUp(self): - -# class BlankFieldModelSerializer(serializers.ModelSerializer): -# class Meta: -# model = BlankFieldModel - -# class BlankFieldSerializer(serializers.Serializer): -# title = serializers.CharField(required=False) - -# class NotBlankFieldModelSerializer(serializers.ModelSerializer): -# class Meta: -# model = BasicModel - -# class NotBlankFieldSerializer(serializers.Serializer): -# title = serializers.CharField() - -# self.model_serializer_class = BlankFieldModelSerializer -# self.serializer_class = BlankFieldSerializer -# self.not_blank_model_serializer_class = NotBlankFieldModelSerializer -# self.not_blank_serializer_class = NotBlankFieldSerializer -# self.data = {'title': ''} - -# def test_create_blank_field(self): -# serializer = self.serializer_class(data=self.data) -# self.assertEqual(serializer.is_valid(), True) - -# def test_create_model_blank_field(self): -# serializer = self.model_serializer_class(data=self.data) -# self.assertEqual(serializer.is_valid(), True) - -# def test_create_model_null_field(self): -# serializer = self.model_serializer_class(data={'title': None}) -# self.assertEqual(serializer.is_valid(), True) -# serializer.save() -# self.assertIsNot(serializer.object.pk, None) -# self.assertEqual(serializer.object.title, '') - -# def test_create_not_blank_field(self): -# """ -# Test to ensure blank data in a field not marked as blank=True -# is considered invalid in a non-model serializer -# """ -# serializer = self.not_blank_serializer_class(data=self.data) -# self.assertEqual(serializer.is_valid(), False) - -# def test_create_model_not_blank_field(self): -# """ -# Test to ensure blank data in a field not marked as blank=True -# is considered invalid in a model serializer -# """ -# serializer = self.not_blank_model_serializer_class(data=self.data) -# self.assertEqual(serializer.is_valid(), False) - -# def test_create_model_empty_field(self): -# serializer = self.model_serializer_class(data={}) -# self.assertEqual(serializer.is_valid(), True) - -# def test_create_model_null_field_save(self): -# """ -# Regression test for #1330. - -# https://github.com/tomchristie/django-rest-framework/pull/1330 -# """ -# serializer = self.model_serializer_class(data={'title': None}) -# self.assertEqual(serializer.is_valid(), True) - -# try: -# serializer.save() -# except Exception: -# self.fail('Exception raised on save() after validation passes') - - -# # Test for issue #460 -# class SerializerPickleTests(TestCase): -# """ -# Test pickleability of the output of Serializers -# """ -# def test_pickle_simple_model_serializer_data(self): -# """ -# Test simple serializer -# """ -# pickle.dumps(PersonSerializer(Person(name="Methusela", age=969)).data) - -# def test_pickle_inner_serializer(self): -# """ -# Test pickling a serializer whose resulting .data (a SortedDictWithMetadata) will -# have unpickleable meta data--in order to make sure metadata doesn't get pulled into the pickle. -# See DictWithMetadata.__getstate__ -# """ -# class InnerPersonSerializer(serializers.ModelSerializer): -# class Meta: -# model = Person -# fields = ('name', 'age') -# pickle.dumps(InnerPersonSerializer(Person(name="Noah", age=950)).data, 0) - -# def test_getstate_method_should_not_return_none(self): -# """ -# Regression test for #645. -# """ -# data = serializers.DictWithMetadata({1: 1}) -# self.assertEqual(data.__getstate__(), serializers.SortedDict({1: 1})) - -# def test_serializer_data_is_pickleable(self): -# """ -# Another regression test for #645. -# """ -# data = serializers.SortedDictWithMetadata({1: 1}) -# repr(pickle.loads(pickle.dumps(data, 0))) - - -# # test for issue #725 -# class SeveralChoicesModel(models.Model): -# color = models.CharField( -# max_length=10, -# choices=[('red', 'Red'), ('green', 'Green'), ('blue', 'Blue')], -# blank=False -# ) -# drink = models.CharField( -# max_length=10, -# choices=[('beer', 'Beer'), ('wine', 'Wine'), ('cider', 'Cider')], -# blank=False, -# default='beer' -# ) -# os = models.CharField( -# max_length=10, -# choices=[('linux', 'Linux'), ('osx', 'OSX'), ('windows', 'Windows')], -# blank=True -# ) -# music_genre = models.CharField( -# max_length=10, -# choices=[('rock', 'Rock'), ('metal', 'Metal'), ('grunge', 'Grunge')], -# blank=True, -# default='metal' -# ) - - -# class SerializerChoiceFields(TestCase): - -# def setUp(self): -# super(SerializerChoiceFields, self).setUp() - -# class SeveralChoicesSerializer(serializers.ModelSerializer): -# class Meta: -# model = SeveralChoicesModel -# fields = ('color', 'drink', 'os', 'music_genre') - -# self.several_choices_serializer = SeveralChoicesSerializer - -# def test_choices_blank_false_not_default(self): -# serializer = self.several_choices_serializer() -# self.assertEqual( -# serializer.fields['color'].choices, -# [('red', 'Red'), ('green', 'Green'), ('blue', 'Blue')] -# ) - -# def test_choices_blank_false_with_default(self): -# serializer = self.several_choices_serializer() -# self.assertEqual( -# serializer.fields['drink'].choices, -# [('beer', 'Beer'), ('wine', 'Wine'), ('cider', 'Cider')] -# ) - -# def test_choices_blank_true_not_default(self): -# serializer = self.several_choices_serializer() -# self.assertEqual( -# serializer.fields['os'].choices, -# BLANK_CHOICE_DASH + [('linux', 'Linux'), ('osx', 'OSX'), ('windows', 'Windows')] -# ) - -# def test_choices_blank_true_with_default(self): -# serializer = self.several_choices_serializer() -# self.assertEqual( -# serializer.fields['music_genre'].choices, -# BLANK_CHOICE_DASH + [('rock', 'Rock'), ('metal', 'Metal'), ('grunge', 'Grunge')] -# ) - - -# # Regression tests for #675 -# class Ticket(models.Model): -# assigned = models.ForeignKey( -# Person, related_name='assigned_tickets') -# reviewer = models.ForeignKey( -# Person, blank=True, null=True, related_name='reviewed_tickets') - - -# class SerializerRelatedChoicesTest(TestCase): - -# def setUp(self): -# super(SerializerRelatedChoicesTest, self).setUp() - -# class RelatedChoicesSerializer(serializers.ModelSerializer): -# class Meta: -# model = Ticket -# fields = ('assigned', 'reviewer') - -# self.related_fields_serializer = RelatedChoicesSerializer - -# def test_empty_queryset_required(self): -# serializer = self.related_fields_serializer() -# self.assertEqual(serializer.fields['assigned'].queryset.count(), 0) -# self.assertEqual( -# [x for x in serializer.fields['assigned'].widget.choices], -# [] -# ) - -# def test_empty_queryset_not_required(self): -# serializer = self.related_fields_serializer() -# self.assertEqual(serializer.fields['reviewer'].queryset.count(), 0) -# self.assertEqual( -# [x for x in serializer.fields['reviewer'].widget.choices], -# [('', '---------')] -# ) - -# def test_with_some_persons_required(self): -# Person.objects.create(name="Lionel Messi") -# Person.objects.create(name="Xavi Hernandez") -# serializer = self.related_fields_serializer() -# self.assertEqual(serializer.fields['assigned'].queryset.count(), 2) -# self.assertEqual( -# [x for x in serializer.fields['assigned'].widget.choices], -# [(1, 'Person object - 1'), (2, 'Person object - 2')] -# ) - -# def test_with_some_persons_not_required(self): -# Person.objects.create(name="Lionel Messi") -# Person.objects.create(name="Xavi Hernandez") -# serializer = self.related_fields_serializer() -# self.assertEqual(serializer.fields['reviewer'].queryset.count(), 2) -# self.assertEqual( -# [x for x in serializer.fields['reviewer'].widget.choices], -# [('', '---------'), (1, 'Person object - 1'), (2, 'Person object - 2')] -# ) - - -# class DepthTest(TestCase): -# def test_implicit_nesting(self): - -# writer = Person.objects.create(name="django", age=1) -# post = BlogPost.objects.create(title="Test blog post", writer=writer) -# comment = BlogPostComment.objects.create(text="Test blog post comment", blog_post=post) - -# class BlogPostCommentSerializer(serializers.ModelSerializer): -# class Meta: -# model = BlogPostComment -# depth = 2 - -# serializer = BlogPostCommentSerializer(instance=comment) -# expected = {'id': 1, 'text': 'Test blog post comment', 'blog_post': {'id': 1, 'title': 'Test blog post', -# 'writer': {'id': 1, 'name': 'django', 'age': 1}}} - -# self.assertEqual(serializer.data, expected) - -# def test_explicit_nesting(self): -# writer = Person.objects.create(name="django", age=1) -# post = BlogPost.objects.create(title="Test blog post", writer=writer) -# comment = BlogPostComment.objects.create(text="Test blog post comment", blog_post=post) - -# class PersonSerializer(serializers.ModelSerializer): -# class Meta: -# model = Person - -# class BlogPostSerializer(serializers.ModelSerializer): -# writer = PersonSerializer() - -# class Meta: -# model = BlogPost - -# class BlogPostCommentSerializer(serializers.ModelSerializer): -# blog_post = BlogPostSerializer() - -# class Meta: -# model = BlogPostComment - -# serializer = BlogPostCommentSerializer(instance=comment) -# expected = {'id': 1, 'text': 'Test blog post comment', 'blog_post': {'id': 1, 'title': 'Test blog post', -# 'writer': {'id': 1, 'name': 'django', 'age': 1}}} - -# self.assertEqual(serializer.data, expected) - - -# class NestedSerializerContextTests(TestCase): - -# def test_nested_serializer_context(self): -# """ -# Regression for #497 - -# https://github.com/tomchristie/django-rest-framework/issues/497 -# """ -# class PhotoSerializer(serializers.ModelSerializer): -# class Meta: -# model = Photo -# fields = ("description", "callable") - -# callable = serializers.SerializerMethodField('_callable') - -# def _callable(self, instance): -# if 'context_item' not in self.context: -# raise RuntimeError("context isn't getting passed into 2nd level nested serializer") -# return "success" - -# class AlbumSerializer(serializers.ModelSerializer): -# class Meta: -# model = Album -# fields = ("photo_set", "callable") - -# photo_set = PhotoSerializer(source="photo_set", many=True) -# callable = serializers.SerializerMethodField("_callable") - -# def _callable(self, instance): -# if 'context_item' not in self.context: -# raise RuntimeError("context isn't getting passed into 1st level nested serializer") -# return "success" - -# class AlbumCollection(object): -# albums = None - -# class AlbumCollectionSerializer(serializers.Serializer): -# albums = AlbumSerializer(source="albums", many=True) - -# album1 = Album.objects.create(title="album 1") -# album2 = Album.objects.create(title="album 2") -# Photo.objects.create(description="Bigfoot", album=album1) -# Photo.objects.create(description="Unicorn", album=album1) -# Photo.objects.create(description="Yeti", album=album2) -# Photo.objects.create(description="Sasquatch", album=album2) -# album_collection = AlbumCollection() -# album_collection.albums = [album1, album2] - -# # This will raise RuntimeError if context doesn't get passed correctly to the nested Serializers -# AlbumCollectionSerializer(album_collection, context={'context_item': 'album context'}).data - - -# class DeserializeListTestCase(TestCase): - -# def setUp(self): -# self.data = { -# 'email': 'nobody@nowhere.com', -# 'content': 'This is some test content', -# 'created': datetime.datetime(2013, 3, 7), -# } - -# def test_no_errors(self): -# data = [self.data.copy() for x in range(0, 3)] -# serializer = CommentSerializer(data=data, many=True) -# self.assertTrue(serializer.is_valid()) -# self.assertTrue(isinstance(serializer.object, list)) -# self.assertTrue( -# all((isinstance(item, Comment) for item in serializer.object)) -# ) - -# def test_errors_return_as_list(self): -# invalid_item = self.data.copy() -# invalid_item['email'] = '' -# data = [self.data.copy(), invalid_item, self.data.copy()] - -# serializer = CommentSerializer(data=data, many=True) -# self.assertFalse(serializer.is_valid()) -# expected = [{}, {'email': ['This field is required.']}, {}] -# self.assertEqual(serializer.errors, expected) - - -# # Test for issue 747 - -# class LazyStringModel(object): -# def __init__(self, lazystring): -# self.lazystring = lazystring - - -# class LazyStringSerializer(serializers.Serializer): -# lazystring = serializers.Field() - -# def restore_object(self, attrs, instance=None): -# if instance is not None: -# instance.lazystring = attrs.get('lazystring', instance.lazystring) -# return instance -# return LazyStringModel(**attrs) - - -# class LazyStringsTestCase(TestCase): -# def setUp(self): -# self.model = LazyStringModel(lazystring=_('lazystring')) - -# def test_lazy_strings_are_translated(self): -# serializer = LazyStringSerializer(self.model) -# self.assertEqual(type(serializer.data['lazystring']), -# type('lazystring')) - - -# # Test for issue #467 - -# class FieldLabelTest(TestCase): -# def setUp(self): -# self.serializer_class = BasicModelSerializer - -# def test_label_from_model(self): -# """ -# Validates that label and help_text are correctly copied from the model class. -# """ -# serializer = self.serializer_class() -# text_field = serializer.fields['text'] - -# self.assertEqual('Text comes here', text_field.label) -# self.assertEqual('Text description.', text_field.help_text) - -# def test_field_ctor(self): -# """ -# This is check that ctor supports both label and help_text. -# """ -# self.assertEqual('Label', fields.Field(label='Label', help_text='Help').label) -# self.assertEqual('Help', fields.CharField(label='Label', help_text='Help').help_text) -# self.assertEqual('Label', relations.HyperlinkedRelatedField(view_name='fake', label='Label', help_text='Help', many=True).label) - - -# # Test for issue #961 - -# class ManyFieldHelpTextTest(TestCase): -# def test_help_text_no_hold_down_control_msg(self): -# """ -# Validate that help_text doesn't contain the 'Hold down "Control" ...' -# message that Django appends to choice fields. -# """ -# rel_field = fields.Field(help_text=ManyToManyModel._meta.get_field('rel').help_text) -# self.assertEqual('Some help text.', rel_field.help_text) - - -# class AttributeMappingOnAutogeneratedRelatedFields(TestCase): - -# def test_primary_key_related_field(self): -# serializer = ForeignKeySourceSerializer() -# self.assertEqual(serializer.fields['target'].help_text, 'Target') -# self.assertEqual(serializer.fields['target'].label, 'Target') - -# def test_hyperlinked_related_field(self): -# serializer = HyperlinkedForeignKeySourceSerializer() -# self.assertEqual(serializer.fields['target'].help_text, 'Target') -# self.assertEqual(serializer.fields['target'].label, 'Target') - - -# @unittest.skipUnless(PIL is not None, 'PIL is not installed') -# class AttributeMappingOnAutogeneratedFieldsTests(TestCase): - -# def setUp(self): - -# class AMOAFSerializer(serializers.ModelSerializer): -# class Meta: -# model = AMOAFModel - -# self.serializer_class = AMOAFSerializer -# self.fields_attributes = { -# 'char_field': [ -# ('max_length', 1024), -# ], -# 'comma_separated_integer_field': [ -# ('max_length', 1024), -# ], -# 'decimal_field': [ -# ('max_digits', 64), -# ('decimal_places', 32), -# ], -# 'email_field': [ -# ('max_length', 1024), -# ], -# 'file_field': [ -# ('max_length', 1024), -# ], -# 'image_field': [ -# ('max_length', 1024), -# ], -# 'slug_field': [ -# ('max_length', 1024), -# ], -# 'url_field': [ -# ('max_length', 1024), -# ], -# 'nullable_char_field': [ -# ('max_length', 1024), -# ('allow_none', True), -# ], -# } - -# def field_test(self, field): -# serializer = self.serializer_class(data={}) -# self.assertEqual(serializer.is_valid(), True) - -# for attribute in self.fields_attributes[field]: -# self.assertEqual( -# getattr(serializer.fields[field], attribute[0]), -# attribute[1] -# ) - -# def test_char_field(self): -# self.field_test('char_field') - -# def test_comma_separated_integer_field(self): -# self.field_test('comma_separated_integer_field') - -# def test_decimal_field(self): -# self.field_test('decimal_field') - -# def test_email_field(self): -# self.field_test('email_field') - -# def test_file_field(self): -# self.field_test('file_field') - -# def test_image_field(self): -# self.field_test('image_field') - -# def test_slug_field(self): -# self.field_test('slug_field') - -# def test_url_field(self): -# self.field_test('url_field') - -# def test_nullable_char_field(self): -# self.field_test('nullable_char_field') - - -# @unittest.skipUnless(PIL is not None, 'PIL is not installed') -# class DefaultValuesOnAutogeneratedFieldsTests(TestCase): - -# def setUp(self): - -# class DVOAFSerializer(serializers.ModelSerializer): -# class Meta: -# model = DVOAFModel - -# self.serializer_class = DVOAFSerializer -# self.fields_attributes = { -# 'positive_integer_field': [ -# ('min_value', 0), -# ], -# 'positive_small_integer_field': [ -# ('min_value', 0), -# ], -# 'email_field': [ -# ('max_length', 75), -# ], -# 'file_field': [ -# ('max_length', 100), -# ], -# 'image_field': [ -# ('max_length', 100), -# ], -# 'slug_field': [ -# ('max_length', 50), -# ], -# 'url_field': [ -# ('max_length', 200), -# ], -# } - -# def field_test(self, field): -# serializer = self.serializer_class(data={}) -# self.assertEqual(serializer.is_valid(), True) - -# for attribute in self.fields_attributes[field]: -# self.assertEqual( -# getattr(serializer.fields[field], attribute[0]), -# attribute[1] -# ) - -# def test_positive_integer_field(self): -# self.field_test('positive_integer_field') - -# def test_positive_small_integer_field(self): -# self.field_test('positive_small_integer_field') - -# def test_email_field(self): -# self.field_test('email_field') - -# def test_file_field(self): -# self.field_test('file_field') - -# def test_image_field(self): -# self.field_test('image_field') - -# def test_slug_field(self): -# self.field_test('slug_field') - -# def test_url_field(self): -# self.field_test('url_field') - - -# class MetadataSerializer(serializers.Serializer): -# field1 = serializers.CharField(max_length=3, required=True) -# field2 = serializers.CharField(max_length=10, required=False) - - -# class MetadataSerializerTestCase(TestCase): -# def setUp(self): -# self.serializer = MetadataSerializer() - -# def test_serializer_metadata(self): -# metadata = self.serializer.metadata() -# expected = { -# 'field1': { -# 'required': True, -# 'max_length': 3, -# 'type': 'string', -# 'read_only': False -# }, -# 'field2': { -# 'required': False, -# 'max_length': 10, -# 'type': 'string', -# 'read_only': False -# } -# } -# self.assertEqual(expected, metadata) - - -# # Regression test for #840 - -# class SimpleModel(models.Model): -# text = models.CharField(max_length=100) - - -# class SimpleModelSerializer(serializers.ModelSerializer): -# text = serializers.CharField() -# other = serializers.CharField() - -# class Meta: -# model = SimpleModel - -# def validate_other(self, attrs, source): -# del attrs['other'] -# return attrs - - -# class FieldValidationRemovingAttr(TestCase): -# def test_removing_non_model_field_in_validation(self): -# """ -# Removing an attr during field valiation should ensure that it is not -# passed through when restoring the object. - -# This allows additional non-model fields to be supported. - -# Regression test for #840. -# """ -# serializer = SimpleModelSerializer(data={'text': 'foo', 'other': 'bar'}) -# self.assertTrue(serializer.is_valid()) -# serializer.save() -# self.assertEqual(serializer.object.text, 'foo') - - -# # Regression test for #878 - -# class SimpleTargetModel(models.Model): -# text = models.CharField(max_length=100) - - -# class SimplePKSourceModelSerializer(serializers.Serializer): -# targets = serializers.PrimaryKeyRelatedField(queryset=SimpleTargetModel.objects.all(), many=True) -# text = serializers.CharField() - - -# class SimpleSlugSourceModelSerializer(serializers.Serializer): -# targets = serializers.SlugRelatedField(queryset=SimpleTargetModel.objects.all(), many=True, slug_field='pk') -# text = serializers.CharField() - - -# class SerializerSupportsManyRelationships(TestCase): -# def setUp(self): -# SimpleTargetModel.objects.create(text='foo') -# SimpleTargetModel.objects.create(text='bar') - -# def test_serializer_supports_pk_many_relationships(self): -# """ -# Regression test for #878. - -# Note that pk behavior has a different code path to usual cases, -# for performance reasons. -# """ -# serializer = SimplePKSourceModelSerializer(data={'text': 'foo', 'targets': [1, 2]}) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.data, {'text': 'foo', 'targets': [1, 2]}) - -# def test_serializer_supports_slug_many_relationships(self): -# """ -# Regression test for #878. -# """ -# serializer = SimpleSlugSourceModelSerializer(data={'text': 'foo', 'targets': [1, 2]}) -# self.assertTrue(serializer.is_valid()) -# self.assertEqual(serializer.data, {'text': 'foo', 'targets': [1, 2]}) - - -# class TransformMethodsSerializer(serializers.Serializer): -# a = serializers.CharField() -# b_renamed = serializers.CharField(source='b') - -# def transform_a(self, obj, value): -# return value.lower() - -# def transform_b_renamed(self, obj, value): -# if value is not None: -# return 'and ' + value - - -# class TestSerializerTransformMethods(TestCase): -# def setUp(self): -# self.s = TransformMethodsSerializer() - -# def test_transform_methods(self): -# self.assertEqual( -# self.s.to_native({'a': 'GREEN EGGS', 'b': 'HAM'}), -# { -# 'a': 'green eggs', -# 'b_renamed': 'and HAM', -# } -# ) - -# def test_missing_fields(self): -# self.assertEqual( -# self.s.to_native({'a': 'GREEN EGGS'}), -# { -# 'a': 'green eggs', -# 'b_renamed': None, -# } -# ) - - -# class DefaultTrueBooleanModel(models.Model): -# cat = models.BooleanField(default=True) -# dog = models.BooleanField(default=False) - - -# class SerializerDefaultTrueBoolean(TestCase): - -# def setUp(self): -# super(SerializerDefaultTrueBoolean, self).setUp() - -# class DefaultTrueBooleanSerializer(serializers.ModelSerializer): -# class Meta: -# model = DefaultTrueBooleanModel -# fields = ('cat', 'dog') - -# self.default_true_boolean_serializer = DefaultTrueBooleanSerializer - -# def test_enabled_as_false(self): -# serializer = self.default_true_boolean_serializer(data={'cat': False, -# 'dog': False}) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.data['cat'], False) -# self.assertEqual(serializer.data['dog'], False) - -# def test_enabled_as_true(self): -# serializer = self.default_true_boolean_serializer(data={'cat': True, -# 'dog': True}) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.data['cat'], True) -# self.assertEqual(serializer.data['dog'], True) - -# def test_enabled_partial(self): -# serializer = self.default_true_boolean_serializer(data={'cat': False}, -# partial=True) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.data['cat'], False) -# self.assertEqual(serializer.data['dog'], False) - - -# class BoolenFieldTypeTest(TestCase): -# ''' -# Ensure the various Boolean based model fields are rendered as the proper -# field type - -# ''' - -# def setUp(self): -# ''' -# Setup an ActionItemSerializer for BooleanTesting -# ''' -# data = { -# 'title': 'b' * 201, -# } -# self.serializer = ActionItemSerializer(data=data) - -# def test_booleanfield_type(self): -# ''' -# Test that BooleanField is infered from models.BooleanField -# ''' -# bfield = self.serializer.get_fields()['done'] -# self.assertEqual(type(bfield), fields.BooleanField) - -# def test_nullbooleanfield_type(self): -# ''' -# Test that BooleanField is infered from models.NullBooleanField - -# https://groups.google.com/forum/#!topic/django-rest-framework/D9mXEftpuQ8 -# ''' -# bfield = self.serializer.get_fields()['started'] -# self.assertEqual(type(bfield), fields.BooleanField) diff --git a/tests/test_serializer_bulk_update.py b/tests/test_serializer_bulk_update.py index 2259ee317..fb881a755 100644 --- a/tests/test_serializer_bulk_update.py +++ b/tests/test_serializer_bulk_update.py @@ -121,161 +121,3 @@ class BulkCreateSerializerTests(TestCase): expected_errors = {'non_field_errors': ['Expected a list of items but got type `dict`.']} self.assertEqual(serializer.errors, expected_errors) - - -# class BulkUpdateSerializerTests(TestCase): -# """ -# Updating multiple instances using serializers. -# """ - -# def setUp(self): -# class Book(object): -# """ -# A data type that can be persisted to a mock storage backend -# with `.save()` and `.delete()`. -# """ -# object_map = {} - -# def __init__(self, id, title, author): -# self.id = id -# self.title = title -# self.author = author - -# def save(self): -# Book.object_map[self.id] = self - -# def delete(self): -# del Book.object_map[self.id] - -# class BookSerializer(serializers.Serializer): -# id = serializers.IntegerField() -# title = serializers.CharField(max_length=100) -# author = serializers.CharField(max_length=100) - -# def restore_object(self, attrs, instance=None): -# if instance: -# instance.id = attrs['id'] -# instance.title = attrs['title'] -# instance.author = attrs['author'] -# return instance -# return Book(**attrs) - -# self.Book = Book -# self.BookSerializer = BookSerializer - -# data = [ -# { -# 'id': 0, -# 'title': 'The electric kool-aid acid test', -# 'author': 'Tom Wolfe' -# }, { -# 'id': 1, -# 'title': 'If this is a man', -# 'author': 'Primo Levi' -# }, { -# 'id': 2, -# 'title': 'The wind-up bird chronicle', -# 'author': 'Haruki Murakami' -# } -# ] - -# for item in data: -# book = Book(item['id'], item['title'], item['author']) -# book.save() - -# def books(self): -# """ -# Return all the objects in the mock storage backend. -# """ -# return self.Book.object_map.values() - -# def test_bulk_update_success(self): -# """ -# Correct bulk update serialization should return the input data. -# """ -# data = [ -# { -# 'id': 0, -# 'title': 'The electric kool-aid acid test', -# 'author': 'Tom Wolfe' -# }, { -# 'id': 2, -# 'title': 'Kafka on the shore', -# 'author': 'Haruki Murakami' -# } -# ] -# serializer = self.BookSerializer(self.books(), data=data, many=True, allow_add_remove=True) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.data, data) -# serializer.save() -# new_data = self.BookSerializer(self.books(), many=True).data - -# self.assertEqual(data, new_data) - -# def test_bulk_update_and_create(self): -# """ -# Bulk update serialization may also include created items. -# """ -# data = [ -# { -# 'id': 0, -# 'title': 'The electric kool-aid acid test', -# 'author': 'Tom Wolfe' -# }, { -# 'id': 3, -# 'title': 'Kafka on the shore', -# 'author': 'Haruki Murakami' -# } -# ] -# serializer = self.BookSerializer(self.books(), data=data, many=True, allow_add_remove=True) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.data, data) -# serializer.save() -# new_data = self.BookSerializer(self.books(), many=True).data -# self.assertEqual(data, new_data) - -# def test_bulk_update_invalid_create(self): -# """ -# Bulk update serialization without allow_add_remove may not create items. -# """ -# data = [ -# { -# 'id': 0, -# 'title': 'The electric kool-aid acid test', -# 'author': 'Tom Wolfe' -# }, { -# 'id': 3, -# 'title': 'Kafka on the shore', -# 'author': 'Haruki Murakami' -# } -# ] -# expected_errors = [ -# {}, -# {'non_field_errors': ['Cannot create a new item, only existing items may be updated.']} -# ] -# serializer = self.BookSerializer(self.books(), data=data, many=True) -# self.assertEqual(serializer.is_valid(), False) -# self.assertEqual(serializer.errors, expected_errors) - -# def test_bulk_update_error(self): -# """ -# Incorrect bulk update serialization should return error data. -# """ -# data = [ -# { -# 'id': 0, -# 'title': 'The electric kool-aid acid test', -# 'author': 'Tom Wolfe' -# }, { -# 'id': 'foo', -# 'title': 'Kafka on the shore', -# 'author': 'Haruki Murakami' -# } -# ] -# expected_errors = [ -# {}, -# {'id': ['Enter a whole number.']} -# ] -# serializer = self.BookSerializer(self.books(), data=data, many=True, allow_add_remove=True) -# self.assertEqual(serializer.is_valid(), False) -# self.assertEqual(serializer.errors, expected_errors) diff --git a/tests/test_serializer_empty.py b/tests/test_serializer_empty.py deleted file mode 100644 index 805ac7d46..000000000 --- a/tests/test_serializer_empty.py +++ /dev/null @@ -1,15 +0,0 @@ -# from django.test import TestCase -# from rest_framework import serializers - - -# class EmptySerializerTestCase(TestCase): -# def test_empty_serializer(self): -# class FooBarSerializer(serializers.Serializer): -# foo = serializers.IntegerField() -# bar = serializers.SerializerMethodField() - -# def get_bar(self, obj): -# return 'bar' - -# serializer = FooBarSerializer() -# self.assertEquals(serializer.data, {'foo': 0}) diff --git a/tests/test_serializer_nested.py b/tests/test_serializer_nested.py index 5e2074490..f5e4b26ad 100644 --- a/tests/test_serializer_nested.py +++ b/tests/test_serializer_nested.py @@ -38,353 +38,3 @@ class TestNestedSerializer: } serializer = self.Serializer() assert serializer.data == expected_data - -# """ -# Tests to cover nested serializers. - -# Doesn't cover model serializers. -# """ -# from __future__ import unicode_literals -# from django.test import TestCase -# from rest_framework import serializers -# from . import models - - -# class WritableNestedSerializerBasicTests(TestCase): -# """ -# Tests for deserializing nested entities. -# Basic tests that use serializers that simply restore to dicts. -# """ - -# def setUp(self): -# class TrackSerializer(serializers.Serializer): -# order = serializers.IntegerField() -# title = serializers.CharField(max_length=100) -# duration = serializers.IntegerField() - -# class AlbumSerializer(serializers.Serializer): -# album_name = serializers.CharField(max_length=100) -# artist = serializers.CharField(max_length=100) -# tracks = TrackSerializer(many=True) - -# self.AlbumSerializer = AlbumSerializer - -# def test_nested_validation_success(self): -# """ -# Correct nested serialization should return the input data. -# """ - -# data = { -# 'album_name': 'Discovery', -# 'artist': 'Daft Punk', -# 'tracks': [ -# {'order': 1, 'title': 'One More Time', 'duration': 235}, -# {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, -# {'order': 3, 'title': 'Digital Love', 'duration': 239} -# ] -# } - -# serializer = self.AlbumSerializer(data=data) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.object, data) - -# def test_nested_validation_error(self): -# """ -# Incorrect nested serialization should return appropriate error data. -# """ - -# data = { -# 'album_name': 'Discovery', -# 'artist': 'Daft Punk', -# 'tracks': [ -# {'order': 1, 'title': 'One More Time', 'duration': 235}, -# {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, -# {'order': 3, 'title': 'Digital Love', 'duration': 'foobar'} -# ] -# } -# expected_errors = { -# 'tracks': [ -# {}, -# {}, -# {'duration': ['Enter a whole number.']} -# ] -# } - -# serializer = self.AlbumSerializer(data=data) -# self.assertEqual(serializer.is_valid(), False) -# self.assertEqual(serializer.errors, expected_errors) - -# def test_many_nested_validation_error(self): -# """ -# Incorrect nested serialization should return appropriate error data -# when multiple entities are being deserialized. -# """ - -# data = [ -# { -# 'album_name': 'Russian Red', -# 'artist': 'I Love Your Glasses', -# 'tracks': [ -# {'order': 1, 'title': 'Cigarettes', 'duration': 121}, -# {'order': 2, 'title': 'No Past Land', 'duration': 198}, -# {'order': 3, 'title': 'They Don\'t Believe', 'duration': 191} -# ] -# }, -# { -# 'album_name': 'Discovery', -# 'artist': 'Daft Punk', -# 'tracks': [ -# {'order': 1, 'title': 'One More Time', 'duration': 235}, -# {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, -# {'order': 3, 'title': 'Digital Love', 'duration': 'foobar'} -# ] -# } -# ] -# expected_errors = [ -# {}, -# { -# 'tracks': [ -# {}, -# {}, -# {'duration': ['Enter a whole number.']} -# ] -# } -# ] - -# serializer = self.AlbumSerializer(data=data, many=True) -# self.assertEqual(serializer.is_valid(), False) -# self.assertEqual(serializer.errors, expected_errors) - - -# class WritableNestedSerializerObjectTests(TestCase): -# """ -# Tests for deserializing nested entities. -# These tests use serializers that restore to concrete objects. -# """ - -# def setUp(self): -# # Couple of concrete objects that we're going to deserialize into -# class Track(object): -# def __init__(self, order, title, duration): -# self.order, self.title, self.duration = order, title, duration - -# def __eq__(self, other): -# return ( -# self.order == other.order and -# self.title == other.title and -# self.duration == other.duration -# ) - -# class Album(object): -# def __init__(self, album_name, artist, tracks): -# self.album_name, self.artist, self.tracks = album_name, artist, tracks - -# def __eq__(self, other): -# return ( -# self.album_name == other.album_name and -# self.artist == other.artist and -# self.tracks == other.tracks -# ) - -# # And their corresponding serializers -# class TrackSerializer(serializers.Serializer): -# order = serializers.IntegerField() -# title = serializers.CharField(max_length=100) -# duration = serializers.IntegerField() - -# def restore_object(self, attrs, instance=None): -# return Track(attrs['order'], attrs['title'], attrs['duration']) - -# class AlbumSerializer(serializers.Serializer): -# album_name = serializers.CharField(max_length=100) -# artist = serializers.CharField(max_length=100) -# tracks = TrackSerializer(many=True) - -# def restore_object(self, attrs, instance=None): -# return Album(attrs['album_name'], attrs['artist'], attrs['tracks']) - -# self.Album, self.Track = Album, Track -# self.AlbumSerializer = AlbumSerializer - -# def test_nested_validation_success(self): -# """ -# Correct nested serialization should return a restored object -# that corresponds to the input data. -# """ - -# data = { -# 'album_name': 'Discovery', -# 'artist': 'Daft Punk', -# 'tracks': [ -# {'order': 1, 'title': 'One More Time', 'duration': 235}, -# {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, -# {'order': 3, 'title': 'Digital Love', 'duration': 239} -# ] -# } -# expected_object = self.Album( -# album_name='Discovery', -# artist='Daft Punk', -# tracks=[ -# self.Track(order=1, title='One More Time', duration=235), -# self.Track(order=2, title='Aerodynamic', duration=184), -# self.Track(order=3, title='Digital Love', duration=239), -# ] -# ) - -# serializer = self.AlbumSerializer(data=data) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.object, expected_object) - -# def test_many_nested_validation_success(self): -# """ -# Correct nested serialization should return multiple restored objects -# that corresponds to the input data when multiple objects are -# being deserialized. -# """ - -# data = [ -# { -# 'album_name': 'Russian Red', -# 'artist': 'I Love Your Glasses', -# 'tracks': [ -# {'order': 1, 'title': 'Cigarettes', 'duration': 121}, -# {'order': 2, 'title': 'No Past Land', 'duration': 198}, -# {'order': 3, 'title': 'They Don\'t Believe', 'duration': 191} -# ] -# }, -# { -# 'album_name': 'Discovery', -# 'artist': 'Daft Punk', -# 'tracks': [ -# {'order': 1, 'title': 'One More Time', 'duration': 235}, -# {'order': 2, 'title': 'Aerodynamic', 'duration': 184}, -# {'order': 3, 'title': 'Digital Love', 'duration': 239} -# ] -# } -# ] -# expected_object = [ -# self.Album( -# album_name='Russian Red', -# artist='I Love Your Glasses', -# tracks=[ -# self.Track(order=1, title='Cigarettes', duration=121), -# self.Track(order=2, title='No Past Land', duration=198), -# self.Track(order=3, title='They Don\'t Believe', duration=191), -# ] -# ), -# self.Album( -# album_name='Discovery', -# artist='Daft Punk', -# tracks=[ -# self.Track(order=1, title='One More Time', duration=235), -# self.Track(order=2, title='Aerodynamic', duration=184), -# self.Track(order=3, title='Digital Love', duration=239), -# ] -# ) -# ] - -# serializer = self.AlbumSerializer(data=data, many=True) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.object, expected_object) - - -# class ForeignKeyNestedSerializerUpdateTests(TestCase): -# def setUp(self): -# class Artist(object): -# def __init__(self, name): -# self.name = name - -# def __eq__(self, other): -# return self.name == other.name - -# class Album(object): -# def __init__(self, name, artist): -# self.name, self.artist = name, artist - -# def __eq__(self, other): -# return self.name == other.name and self.artist == other.artist - -# class ArtistSerializer(serializers.Serializer): -# name = serializers.CharField() - -# def restore_object(self, attrs, instance=None): -# if instance: -# instance.name = attrs['name'] -# else: -# instance = Artist(attrs['name']) -# return instance - -# class AlbumSerializer(serializers.Serializer): -# name = serializers.CharField() -# by = ArtistSerializer(source='artist') - -# def restore_object(self, attrs, instance=None): -# if instance: -# instance.name = attrs['name'] -# instance.artist = attrs['artist'] -# else: -# instance = Album(attrs['name'], attrs['artist']) -# return instance - -# self.Artist = Artist -# self.Album = Album -# self.AlbumSerializer = AlbumSerializer - -# def test_create_via_foreign_key_with_source(self): -# """ -# Check that we can both *create* and *update* into objects across -# ForeignKeys that have a `source` specified. -# Regression test for #1170 -# """ -# data = { -# 'name': 'Discovery', -# 'by': {'name': 'Daft Punk'}, -# } - -# expected = self.Album(artist=self.Artist('Daft Punk'), name='Discovery') - -# # create -# serializer = self.AlbumSerializer(data=data) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.object, expected) - -# # update -# original = self.Album(artist=self.Artist('The Bats'), name='Free All the Monsters') -# serializer = self.AlbumSerializer(instance=original, data=data) -# self.assertEqual(serializer.is_valid(), True) -# self.assertEqual(serializer.object, expected) - - -# class NestedModelSerializerUpdateTests(TestCase): -# def test_second_nested_level(self): -# john = models.Person.objects.create(name="john") - -# post = john.blogpost_set.create(title="Test blog post") -# post.blogpostcomment_set.create(text="I hate this blog post") -# post.blogpostcomment_set.create(text="I love this blog post") - -# class BlogPostCommentSerializer(serializers.ModelSerializer): -# class Meta: -# model = models.BlogPostComment - -# class BlogPostSerializer(serializers.ModelSerializer): -# comments = BlogPostCommentSerializer(many=True, source='blogpostcomment_set') - -# class Meta: -# model = models.BlogPost -# fields = ('id', 'title', 'comments') - -# class PersonSerializer(serializers.ModelSerializer): -# posts = BlogPostSerializer(many=True, source='blogpost_set') - -# class Meta: -# model = models.Person -# fields = ('id', 'name', 'age', 'posts') - -# serialize = PersonSerializer(instance=john) -# deserialize = PersonSerializer(data=serialize.data, instance=john) -# self.assertTrue(deserialize.is_valid()) - -# result = deserialize.object -# result.save() -# self.assertEqual(result.id, john.id) diff --git a/tests/test_validation.py b/tests/test_validation.py index 3db825557..4234efd36 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -165,17 +165,6 @@ class TestChoiceFieldChoicesValidate(TestCase): except serializers.ValidationError: self.fail("Value %s does not validate" % str(value)) - # def test_nested_choices(self): - # """ - # Make sure a nested value for choices works as expected. - # """ - # f = serializers.ChoiceField(choices=self.CHOICES_NESTED) - # value = self.CHOICES_NESTED[0][1][0][0] - # try: - # f.to_native(value) - # except ValidationError: - # self.fail("Value %s does not validate" % str(value)) - class RegexSerializer(serializers.Serializer): pin = serializers.CharField( From 66b3daebbd0da8aee178585cae9ebe561494533e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 28 Nov 2014 13:14:47 +0000 Subject: [PATCH 1189/1652] Docs. Sponsor call-out. --- docs/topics/3.0-announcement.md | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 9087e2aee..722682475 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -1,19 +1,3 @@ -## Pre-release notes: - -The 3.0 release is now in beta and ready for final testing. You can install the development version directly from GitHub like so: - - pip install https://github.com/tomchristie/django-rest-framework/archive/3.0-beta.zip - -Currently the only known remaining blockers are documentation issues and tickets. Any critical bugs raised in the next week or two will be resolved for the 3.0 release, but otherwise consider this as code-complete. - -Please work through this document throughly in order to understand the API differences that exist between 2.4 and 3.0. - -**Your feedback on the upgrade process and 3.0 changes is hugely important!** - -Please do get in touch via twitter, IRC, a GitHub ticket, or the discussion group. - ---- - # REST framework 3.0 The 3.0 release of Django REST framework is the result of almost four years of iteration and refinement. It comprehensively addresses some of the previous remaining design issues in serializers, fields and the generic views. @@ -22,6 +6,10 @@ This release is incremental in nature. There *are* some breaking API changes, an The difference in quality of the REST framework API and implementation should make writing, maintaining and debugging your application far easier. +3.0 is the first of three releases that have been funded by our recent [Kickstarter campaign](kickstarter.com/projects/tomchristie/django-rest-framework-3). + +As ever, a huge thank you to our many [wonderful sponsors](sponsors). If you're looking for a Django gig, and want to work with smart community-minded folks, you should probably check out that list and see who's hiring. + ## New features Notable features of this new release include: @@ -931,4 +919,5 @@ The 3.2 release is planned to introduce an alternative admin-style interface to You can follow development on the GitHub site, where we use [milestones to indicate planning timescales](https://github.com/tomchristie/django-rest-framework/milestones). +[sponsors]: http://www.django-rest-framework.org/topics/kickstarter-announcement/#sponsors [mixins.py]: https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/mixins.py From 8e549a76ea0ff6b44e1dcf08ba733a5fbfc004ed Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 28 Nov 2014 14:26:03 +0000 Subject: [PATCH 1190/1652] Add 2.x notes and links --- docs/api-guide/fields.md | 6 ++++++ docs/api-guide/generic-views.md | 6 ++++++ docs/api-guide/metadata.md | 6 ++++++ docs/api-guide/relations.md | 6 ++++++ docs/api-guide/requests.md | 6 ++++++ docs/api-guide/serializers.md | 6 ++++++ docs/api-guide/validators.md | 6 ++++++ docs/index.md | 2 +- 8 files changed, 43 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index ca551540d..391a52e52 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -1,5 +1,11 @@ source: fields.py +--- + +**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. + +--- + # Serializer fields > Each field in a Form class is responsible not only for validating data, but also for "cleaning" it — normalizing it to a consistent format. diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 8c1b7dc9d..f5bbdfdda 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -1,6 +1,12 @@ source: mixins.py generics.py +--- + +**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. + +--- + # Generic views > Django’s generic views... were developed as a shortcut for common usage patterns... They take certain common idioms and patterns found in view development and abstract them so that you can quickly write common views of data without having to repeat yourself. diff --git a/docs/api-guide/metadata.md b/docs/api-guide/metadata.md index c3f036b75..c3e511487 100644 --- a/docs/api-guide/metadata.md +++ b/docs/api-guide/metadata.md @@ -1,5 +1,11 @@ <a class="github" href="metadata.py"></a> +--- + +**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. + +--- + # Metadata > [The `OPTIONS`] method allows a client to determine the options and/or requirements associated with a resource, or the capabilities of a server, without implying a resource action or initiating a resource retrieval. diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 17009bbcd..a79b6ea5a 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -1,5 +1,11 @@ source: relations.py +--- + +**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. + +--- + # Serializer relations > Bad programmers worry about the code. diff --git a/docs/api-guide/requests.md b/docs/api-guide/requests.md index 433d666c9..77000ffa2 100644 --- a/docs/api-guide/requests.md +++ b/docs/api-guide/requests.md @@ -1,5 +1,11 @@ source: request.py +--- + +**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. + +--- + # Requests > If you're doing REST-based web service stuff ... you should ignore request.POST. diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index cd076b4f0..4d6c491f4 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1,5 +1,11 @@ source: serializers.py +--- + +**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. + +--- + # Serializers > Expanding the usefulness of the serializers is something that we would diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index ac2f32485..f087e1914 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -1,5 +1,11 @@ <a class="github" href="validators.py"></a> +--- + +**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. + +--- + # Validators > Validators can be useful for re-using validation logic between different types of fields. diff --git a/docs/index.md b/docs/index.md index b18f3d6a6..b5257c734 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,7 +9,7 @@ --- -**Note**: The incoming 3.0 version has now been merged to the `master` branch on GitHub. For the source of the currently available PyPI version, please see the `2.4.4` tag. +**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. --- From 9ba29a88d6674d65bf5e8438eba2a072f0d44bf1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 28 Nov 2014 14:43:33 +0000 Subject: [PATCH 1191/1652] Finalizing 3.0 release notes --- docs/api-guide/serializers.md | 42 ++++++++++++--------------------- docs/topics/3.0-announcement.md | 2 +- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 4d6c491f4..0ee80d53f 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -567,21 +567,22 @@ There needs to be a way of determining which views should be used for hyperlinki By default hyperlinks are expected to correspond to a view name that matches the style `'{model_name}-detail'`, and looks up the instance by a `pk` keyword argument. -You can change the field that is used for object lookups by setting the `lookup_field` option. The value of this option should correspond both with a kwarg in the URL conf, and with a field on the model. For example: +You can override a URL field view name and lookup field by using either, or both of, the `view_name` and `lookup_field` options in the `extra_field_kwargs` setting, like so: class AccountSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = Account - fields = ('url', 'account_name', 'users', 'created') - lookup_field = 'slug' + fields = ('account_url', 'account_name', 'users', 'created') + extra_field_kwargs = { + 'url': {'view_name': 'accounts', 'lookup_field': 'account_name'} + 'users': {'lookup_field': 'username'} + } -Note that the `lookup_field` will be used as the default on *all* hyperlinked fields, including both the URL identity, and any hyperlinked relationships. - -For more specific requirements such as specifying a different lookup for each field, you'll want to set the fields on the serializer explicitly. For example: +Alternatively you can set the fields on the serializer explicitly. For example: class AccountSerializer(serializers.HyperlinkedModelSerializer): url = serializers.HyperlinkedIdentityField( - view_name='account-detail', + view_name='accounts', lookup_field='slug' ) users = serializers.HyperlinkedRelatedField( @@ -595,29 +596,16 @@ For more specific requirements such as specifying a different lookup for each fi model = Account fields = ('url', 'account_name', 'users', 'created') -## Overriding the URL field behavior +--- + +**Tip**: Properly matching together hyperlinked representations and your URL conf can sometimes be a bit fiddly. Printing the `repr` of a `HyperlinkedModelSerializer` instance is a particularly useful way to inspect exactly which view names and lookup fields the relationships are expected to map too. + +--- + +## Changing the URL field name The name of the URL field defaults to 'url'. You can override this globally, by using the `URL_FIELD_NAME` setting. -You can also override this on a per-serializer basis by using the `url_field_name` option on the serializer, like so: - - class AccountSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = Account - fields = ('account_url', 'account_name', 'users', 'created') - url_field_name = 'account_url' - -**Note**: The generic view implementations normally generate a `Location` header in response to successful `POST` requests. Serializers using `url_field_name` option will not have this header automatically included by the view. If you need to do so you will ned to also override the view's `get_success_headers()` method. - -You can also override the URL field's view name and lookup field without overriding the field explicitly, by using the `view_name` and `lookup_field` options, like so: - - class AccountSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = Account - fields = ('account_url', 'account_name', 'users', 'created') - view_name = 'account_detail' - lookup_field='account_name' - --- # ListSerializer diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 722682475..b32fe5102 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -329,7 +329,7 @@ The `view_name` and `lookup_field` options have been moved to `PendingDeprecatio model = MyModel fields = ('url', 'email', 'notes', 'is_admin') extra_kwargs = { - 'url': {'lookup_field': 'uuid'} + 'url': {'lookup_field': 'uuid'} } Alternatively, specify the field explicitly on the serializer class: From 3a5b3772fefc3c2f2c0899947cbc07bfe6e6b5d2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 28 Nov 2014 15:36:04 +0000 Subject: [PATCH 1192/1652] Use ImproperlyConfigured when model meta lookup fails --- rest_framework/utils/model_meta.py | 7 ++++--- tests/test_utils.py | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py index 54f9310db..c98725c66 100644 --- a/rest_framework/utils/model_meta.py +++ b/rest_framework/utils/model_meta.py @@ -6,6 +6,7 @@ relationships and their associated metadata. Usage: `get_field_info(model)` returns a `FieldInfo` instance. """ from collections import namedtuple +from django.core.exceptions import ImproperlyConfigured from django.db import models from django.utils import six from rest_framework.compat import OrderedDict @@ -44,9 +45,9 @@ def _resolve_model(obj): if isinstance(obj, six.string_types) and len(obj.split('.')) == 2: app_name, model_name = obj.split('.') resolved_model = models.get_model(app_name, model_name) - if not resolved_model: - raise ValueError("Django did not return a model for " - "{0}.{1}".format(app_name, model_name)) + if resolved_model is None: + msg = "Django did not return a model for {0}.{1}" + raise ImproperlyConfigured(msg.format(app_name, model_name)) return resolved_model elif inspect.isclass(obj) and issubclass(obj, models.Model): return obj diff --git a/tests/test_utils.py b/tests/test_utils.py index 0bdb36bba..8c286ea42 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,4 +1,5 @@ from __future__ import unicode_literals +from django.core.exceptions import ImproperlyConfigured from django.conf.urls import patterns, url from django.test import TestCase from django.utils import six @@ -161,5 +162,5 @@ class ResolveModelWithPatchedDjangoTests(TestCase): rest_framework.utils.model_meta.models.get_model = self.get_model def test_blows_up_if_model_does_not_resolve(self): - with self.assertRaises(ValueError): + with self.assertRaises(ImproperlyConfigured): _resolve_model('tests.BasicModel') From 08c727add37790b5a556db3fff762f4a27a5c660 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 28 Nov 2014 15:55:02 +0000 Subject: [PATCH 1193/1652] @api_view defaults to allowing GET --- docs/api-guide/views.md | 15 +++++++++++---- rest_framework/decorators.py | 4 +++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md index 31c62682f..291fe7376 100644 --- a/docs/api-guide/views.md +++ b/docs/api-guide/views.md @@ -127,19 +127,26 @@ REST framework also allows you to work with regular function based views. It pr ## @api_view() -**Signature:** `@api_view(http_method_names)` +**Signature:** `@api_view(http_method_names=['GET'])` -The core of this functionality is the `api_view` decorator, which takes a list of HTTP methods that your view should respond to. For example, this is how you would write a very simple view that just manually returns some data: +The core of this functionality is the `api_view` decorator, which takes a list of HTTP methods that your view should respond to. For example, this is how you would write a very simple view that just manually returns some data: from rest_framework.decorators import api_view - @api_view(['GET']) + @api_view() def hello_world(request): return Response({"message": "Hello, world!"}) - This view will use the default renderers, parsers, authentication classes etc specified in the [settings]. +By default only `GET` methods will be accepted. Other methods will respond with "405 Method Not Allowed". To alter this behavior, specify which methods the view allows, like so: + + @api_view(['GET', 'POST']) + def hello_world(request): + if request.method == 'POST': + return Response({"message": "Got some data!", "data": request.data}) + return Response({"message": "Hello, world!"}) + ## API policy decorators To override the default settings, REST framework provides a set of additional decorators which can be added to your views. These must come *after* (below) the `@api_view` decorator. For example, to create a view that uses a [throttle][throttling] to ensure it can only be called once per day by a particular user, use the `@throttle_classes` decorator, passing a list of throttle classes: diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index d28d6e22a..325435b3f 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -12,12 +12,14 @@ from rest_framework.views import APIView import types -def api_view(http_method_names): +def api_view(http_method_names=None): """ Decorator that converts a function-based view into an APIView subclass. Takes a list of allowed methods for the view as an argument. """ + if http_method_names is None: + http_method_names = ['GET'] def decorator(func): From caf1de3b88c6644b55065abea255f64a81e800c0 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 28 Nov 2014 16:06:44 +0000 Subject: [PATCH 1194/1652] Minor tweaks to contributing docs --- docs/topics/third-party-resources.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index ffb490af3..efa0b91fe 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -4,11 +4,11 @@ Third Party Packages allow developers to share code that extends the functionality of Django REST framework, in order to support additional use-cases. -We **support**, **encourage** and **strongly favour** the creation of Third Party Packages to encapsulate new behaviour rather than adding additional functionality directly to Django REST Framework. +We **support**, **encourage** and **strongly favor** the creation of Third Party Packages to encapsulate new behavior rather than adding additional functionality directly to Django REST Framework. -We aim to make creating Third Party Packages as easy as possible, whilst keeping the **simplicity** of the core API and ensuring that **maintenance** of the main project remains under control. If a Third Party Package proves popular it is relatively easy to move it into the main project; removing features is much more problematic. +We aim to make creating third party packages as easy as possible, whilst keeping a **simple** and **well maintained** core API. By promoting third party packages we ensure that the responsibility for a package remains with its author. If a package proves suitably popular it can always be considered for inclusion into the core REST framework. -If you have an idea for a new feature please consider how it may be packaged as a Third Party Package. We're always happy to dicuss ideas on the [Mailing List][discussion-group]. +If you have an idea for a new feature please consider how it may be packaged as a Third Party Package. We're always happy to discuss ideas on the [Mailing List][discussion-group]. ## How to create a Third Party Package From 85c96bb574b57e5889cd54b98c0320f8dd090e31 Mon Sep 17 00:00:00 2001 From: Martin Maillard <self@martin-maillard.com> Date: Fri, 28 Nov 2014 21:12:13 +0100 Subject: [PATCH 1195/1652] Set user on wrapped request --- rest_framework/request.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index d7e746743..dcf63abea 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -277,8 +277,11 @@ class Request(object): Sets the user on the current request. This is necessary to maintain compatibility with django.contrib.auth where the user property is set in the login and logout functions. + + Sets the user on the wrapped original request as well. """ self._user = value + self._request.user = value @property def auth(self): @@ -456,7 +459,7 @@ class Request(object): if user_auth_tuple is not None: self._authenticator = authenticator - self._user, self._auth = user_auth_tuple + self.user, self._auth = user_auth_tuple return self._not_authenticated() @@ -471,9 +474,9 @@ class Request(object): self._authenticator = None if api_settings.UNAUTHENTICATED_USER: - self._user = api_settings.UNAUTHENTICATED_USER() + self.user = api_settings.UNAUTHENTICATED_USER() else: - self._user = None + self.user = None if api_settings.UNAUTHENTICATED_TOKEN: self._auth = api_settings.UNAUTHENTICATED_TOKEN() From 731c8421afe3093a78cdabb9c3cc28fa52cd1c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sat, 29 Nov 2014 14:43:05 -0400 Subject: [PATCH 1196/1652] Remove YAML support from core --- README.md | 49 +++++++++-------- docs/api-guide/parsers.md | 24 +++------ docs/api-guide/renderers.md | 42 ++------------- docs/api-guide/settings.md | 4 +- docs/api-guide/testing.md | 4 +- docs/index.md | 2 - docs/tutorial/2-requests-and-responses.md | 2 +- requirements-test.txt | 1 - rest_framework/compat.py | 7 --- rest_framework/parsers.py | 25 +-------- rest_framework/renderers.py | 25 +-------- rest_framework/settings.py | 4 +- rest_framework/utils/encoders.py | 65 +---------------------- tests/test_renderers.py | 57 ++------------------ tests/test_templatetags.py | 13 +---- tox.ini | 1 - 16 files changed, 52 insertions(+), 273 deletions(-) diff --git a/README.md b/README.md index c86bb65ff..aafcb29b9 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Add `'rest_framework'` to your `INSTALLED_APPS` setting. Let's take a look at a quick example of using REST framework to build a simple model-backed API for accessing users and groups. -Startup up a new project like so... +Startup up a new project like so... pip install django pip install djangorestframework @@ -79,7 +79,7 @@ class UserViewSet(viewsets.ModelViewSet): queryset = User.objects.all() serializer_class = UserSerializer - + # Routers provide a way of automatically determining the URL conf. router = routers.DefaultRouter() router.register(r'users', UserViewSet) @@ -100,7 +100,7 @@ Add the following to your `settings.py` module: ```python INSTALLED_APPS = ( ... # Make sure to include the default installed apps here. - 'rest_framework', + 'rest_framework', ) REST_FRAMEWORK = { @@ -123,10 +123,10 @@ You can also interact with the API using command line tools such as [`curl`](htt $ curl -H 'Accept: application/json; indent=4' -u admin:password http://127.0.0.1:8000/users/ [ { - "url": "http://127.0.0.1:8000/users/1/", - "username": "admin", - "email": "admin@example.com", - "is_staff": true, + "url": "http://127.0.0.1:8000/users/1/", + "username": "admin", + "email": "admin@example.com", + "is_staff": true, } ] @@ -134,10 +134,10 @@ Or to create a new user: $ curl -X POST -d username=new -d email=new@example.com -d is_staff=false -H 'Accept: application/json; indent=4' -u admin:password http://127.0.0.1:8000/users/ { - "url": "http://127.0.0.1:8000/users/2/", - "username": "new", - "email": "new@example.com", - "is_staff": false, + "url": "http://127.0.0.1:8000/users/2/", + "username": "new", + "email": "new@example.com", + "is_staff": false, } # Documentation & Support @@ -159,24 +159,24 @@ Send a description of the issue via email to [rest-framework-security@googlegrou Copyright (c) 2011-2014, Tom Christie All rights reserved. -Redistribution and use in source and binary forms, with or without +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, this +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -214,7 +214,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [docs]: http://www.django-rest-framework.org/ [urlobject]: https://github.com/zacharyvoase/urlobject [markdown]: http://pypi.python.org/pypi/Markdown/ -[pyyaml]: http://pypi.python.org/pypi/PyYAML [defusedxml]: https://pypi.python.org/pypi/defusedxml [django-filter]: http://pypi.python.org/pypi/django-filter [security-mail]: mailto:rest-framework-security@googlegroups.com diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index 73e3a7057..1e134c772 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -26,26 +26,26 @@ As an example, if you are sending `json` encoded data using jQuery with the [.aj ## Setting the parsers -The default set of parsers may be set globally, using the `DEFAULT_PARSER_CLASSES` setting. For example, the following settings would allow requests with `YAML` content. +The default set of parsers may be set globally, using the `DEFAULT_PARSER_CLASSES` setting. For example, the following settings would allow requests with `JSON` content. REST_FRAMEWORK = { 'DEFAULT_PARSER_CLASSES': ( - 'rest_framework.parsers.YAMLParser', + 'rest_framework.parsers.JSONParser', ) } You can also set the parsers used for an individual view, or viewset, using the `APIView` class based views. - from rest_framework.parsers import YAMLParser + from rest_framework.parsers import JSONParser from rest_framework.response import Response from rest_framework.views import APIView class ExampleView(APIView): """ - A view that can accept POST requests with YAML content. + A view that can accept POST requests with JSON content. """ - parser_classes = (YAMLParser,) + parser_classes = (JSONParser,) def post(self, request, format=None): return Response({'received data': request.data}) @@ -53,10 +53,10 @@ using the `APIView` class based views. Or, if you're using the `@api_view` decorator with function based views. @api_view(['POST']) - @parser_classes((YAMLParser,)) + @parser_classes((JSONParser,)) def example_view(request, format=None): """ - A view that can accept POST requests with YAML content. + A view that can accept POST requests with JSON content. """ return Response({'received data': request.data}) @@ -70,14 +70,6 @@ Parses `JSON` request content. **.media_type**: `application/json` -## YAMLParser - -Parses `YAML` request content. - -Requires the `pyyaml` package to be installed. - -**.media_type**: `application/yaml` - ## XMLParser Parses REST framework's default style of `XML` request content. @@ -161,7 +153,7 @@ By default this will include the following keys: `view`, `request`, `args`, `kwa ## Example -The following is an example plaintext parser that will populate the `request.data` property with a string representing the body of the request. +The following is an example plaintext parser that will populate the `request.data` property with a string representing the body of the request. class PlainTextParser(BaseParser): """ diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 035ec1d27..aa8da0886 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -18,11 +18,11 @@ For more information see the documentation on [content negotiation][conneg]. ## Setting the renderers -The default set of renderers may be set globally, using the `DEFAULT_RENDERER_CLASSES` setting. For example, the following settings would use `YAML` as the main media type and also include the self describing API. +The default set of renderers may be set globally, using the `DEFAULT_RENDERER_CLASSES` setting. For example, the following settings would use `JSON` as the main media type and also include the self describing API. REST_FRAMEWORK = { 'DEFAULT_RENDERER_CLASSES': ( - 'rest_framework.renderers.YAMLRenderer', + 'rest_framework.renderers.JSONRenderer', 'rest_framework.renderers.BrowsableAPIRenderer', ) } @@ -31,15 +31,15 @@ You can also set the renderers used for an individual view, or viewset, using the `APIView` class based views. from django.contrib.auth.models import User - from rest_framework.renderers import JSONRenderer, YAMLRenderer + from rest_framework.renderers import JSONRenderer from rest_framework.response import Response from rest_framework.views import APIView class UserCountView(APIView): """ - A view that returns the count of active users, in JSON or YAML. + A view that returns the count of active users in JSON. """ - renderer_classes = (JSONRenderer, YAMLRenderer) + renderer_classes = (JSONRenderer, ) def get(self, request, format=None): user_count = User.objects.filter(active=True).count() @@ -113,38 +113,6 @@ The `jsonp` approach is essentially a browser hack, and is [only appropriate for **.charset**: `utf-8` -## YAMLRenderer - -Renders the request data into `YAML`. - -Requires the `pyyaml` package to be installed. - -Note that non-ascii characters will be rendered using `\uXXXX` character escape. For example: - - unicode black star: "\u2605" - -**.media_type**: `application/yaml` - -**.format**: `'.yaml'` - -**.charset**: `utf-8` - -## UnicodeYAMLRenderer - -Renders the request data into `YAML`. - -Requires the `pyyaml` package to be installed. - -Note that non-ascii characters will not be character escaped. For example: - - unicode black star: ★ - -**.media_type**: `application/yaml` - -**.format**: `'.yaml'` - -**.charset**: `utf-8` - ## XMLRenderer Renders REST framework's default style of `XML` response content. diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 9005511b7..623d89fbc 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -12,10 +12,10 @@ For example your project's `settings.py` file might include something like this: REST_FRAMEWORK = { 'DEFAULT_RENDERER_CLASSES': ( - 'rest_framework.renderers.YAMLRenderer', + 'rest_framework.renderers.JSONRenderer', ), 'DEFAULT_PARSER_CLASSES': ( - 'rest_framework.parsers.YAMLParser', + 'rest_framework.parsers.JSONParser', ) } diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index d059fdab5..cd8c7820a 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -255,14 +255,14 @@ The default format used to make test requests may be set using the `TEST_REQUEST If you need to test requests using something other than multipart or json requests, you can do so by setting the `TEST_REQUEST_RENDERER_CLASSES` setting. -For example, to add support for using `format='yaml'` in test requests, you might have something like this in your `settings.py` file. +For example, to add support for using `format='html'` in test requests, you might have something like this in your `settings.py` file. REST_FRAMEWORK = { ... 'TEST_REQUEST_RENDERER_CLASSES': ( 'rest_framework.renderers.MultiPartRenderer', 'rest_framework.renderers.JSONRenderer', - 'rest_framework.renderers.YAMLRenderer' + 'rest_framework.renderers.TemplateHTMLRenderer' ) } diff --git a/docs/index.md b/docs/index.md index b5257c734..c2836dbb9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -54,7 +54,6 @@ REST framework requires the following: The following packages are optional: * [Markdown][markdown] (2.1.0+) - Markdown support for the browsable API. -* [PyYAML][yaml] (3.10+) - YAML content-type support. * [defusedxml][defusedxml] (0.3+) - XML content-type support. * [django-filter][django-filter] (0.5.4+) - Filtering support. * [django-oauth-plus][django-oauth-plus] (2.0+) and [oauth2][oauth2] (1.5.211+) - OAuth 1.0a support. @@ -258,7 +257,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [mozilla]: http://www.mozilla.org/en-US/about/ [eventbrite]: https://www.eventbrite.co.uk/about/ [markdown]: http://pypi.python.org/pypi/Markdown/ -[yaml]: http://pypi.python.org/pypi/PyYAML [defusedxml]: https://pypi.python.org/pypi/defusedxml [django-filter]: http://pypi.python.org/pypi/django-filter [oauth2]: https://github.com/simplegeo/python-oauth2 diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index f377c7122..06a684b17 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -92,7 +92,7 @@ Here is the view for an individual snippet, in the `views.py` module. This should all feel very familiar - it is not a lot different from working with regular Django views. -Notice that we're no longer explicitly tying our requests or responses to a given content type. `request.data` can handle incoming `json` requests, but it can also handle `yaml` and other formats. Similarly we're returning response objects with data, but allowing REST framework to render the response into the correct content type for us. +Notice that we're no longer explicitly tying our requests or responses to a given content type. `request.data` can handle incoming `json` requests, but it can also handle other formats. Similarly we're returning response objects with data, but allowing REST framework to render the response into the correct content type for us. ## Adding optional format suffixes to our URLs diff --git a/requirements-test.txt b/requirements-test.txt index 06c8849a8..bd09211ea 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -6,7 +6,6 @@ flake8==2.2.2 # Optional packages markdown>=2.1.0 -PyYAML>=3.10 defusedxml>=0.3 django-guardian==1.2.4 django-filter>=0.5.4 diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 5bd85e743..52db96257 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -237,13 +237,6 @@ except ImportError: apply_markdown = None -# Yaml is optional -try: - import yaml -except ImportError: - yaml = None - - # XML is optional try: import defusedxml.ElementTree as etree diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index ccb82f03b..e6bb75f6d 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -12,7 +12,7 @@ from django.http import QueryDict from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter from django.utils import six -from rest_framework.compat import etree, yaml, force_text, urlparse +from rest_framework.compat import etree, force_text, urlparse from rest_framework.exceptions import ParseError from rest_framework import renderers import json @@ -65,29 +65,6 @@ class JSONParser(BaseParser): raise ParseError('JSON parse error - %s' % six.text_type(exc)) -class YAMLParser(BaseParser): - """ - Parses YAML-serialized data. - """ - - media_type = 'application/yaml' - - def parse(self, stream, media_type=None, parser_context=None): - """ - Parses the incoming bytestream as YAML and returns the resulting data. - """ - assert yaml, 'YAMLParser requires pyyaml to be installed' - - parser_context = parser_context or {} - encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET) - - try: - data = stream.read().decode(encoding) - return yaml.safe_load(data) - except (ValueError, yaml.parser.ParserError) as exc: - raise ParseError('YAML parse error - %s' % six.text_type(exc)) - - class FormParser(BaseParser): """ Parser for form data. diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index e87d16d0d..a6e4f1bb9 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -19,7 +19,7 @@ from django.utils import six from django.utils.xmlutils import SimplerXMLGenerator from rest_framework import exceptions, serializers, status, VERSION from rest_framework.compat import ( - SHORT_SEPARATORS, LONG_SEPARATORS, StringIO, smart_text, yaml + SHORT_SEPARATORS, LONG_SEPARATORS, StringIO, smart_text ) from rest_framework.exceptions import ParseError from rest_framework.settings import api_settings @@ -189,29 +189,6 @@ class XMLRenderer(BaseRenderer): xml.characters(smart_text(data)) -class YAMLRenderer(BaseRenderer): - """ - Renderer which serializes to YAML. - """ - - media_type = 'application/yaml' - format = 'yaml' - encoder = encoders.SafeDumper - charset = 'utf-8' - ensure_ascii = False - - def render(self, data, accepted_media_type=None, renderer_context=None): - """ - Renders `data` into serialized YAML. - """ - assert yaml, 'YAMLRenderer requires pyyaml to be installed' - - if data is None: - return '' - - return yaml.dump(data, stream=None, encoding=self.charset, Dumper=self.encoder, allow_unicode=not self.ensure_ascii) - - class TemplateHTMLRenderer(BaseRenderer): """ An HTML renderer for use with templates. diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 1e8c27fc3..3abc1fe85 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -5,11 +5,11 @@ For example your project's `settings.py` file might look like this: REST_FRAMEWORK = { 'DEFAULT_RENDERER_CLASSES': ( 'rest_framework.renderers.JSONRenderer', - 'rest_framework.renderers.YAMLRenderer', + 'rest_framework.renderers.TemplateHTMLRenderer', ) 'DEFAULT_PARSER_CLASSES': ( 'rest_framework.parsers.JSONParser', - 'rest_framework.parsers.YAMLParser', + 'rest_framework.parsers.TemplateHTMLRenderer', ) } diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 4d6bb3a34..2c97f1d7a 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -5,10 +5,9 @@ from __future__ import unicode_literals from django.db.models.query import QuerySet from django.utils import six, timezone from django.utils.functional import Promise -from rest_framework.compat import force_text, OrderedDict +from rest_framework.compat import force_text import datetime import decimal -import types import json @@ -56,65 +55,3 @@ class JSONEncoder(json.JSONEncoder): elif hasattr(obj, '__iter__'): return tuple(item for item in obj) return super(JSONEncoder, self).default(obj) - - -try: - import yaml -except ImportError: - SafeDumper = None -else: - # Adapted from http://pyyaml.org/attachment/ticket/161/use_ordered_dict.py - class SafeDumper(yaml.SafeDumper): - """ - Handles decimals as strings. - Handles OrderedDicts as usual dicts, but preserves field order, rather - than the usual behaviour of sorting the keys. - """ - def represent_decimal(self, data): - return self.represent_scalar('tag:yaml.org,2002:str', six.text_type(data)) - - def represent_mapping(self, tag, mapping, flow_style=None): - value = [] - node = yaml.MappingNode(tag, value, flow_style=flow_style) - if self.alias_key is not None: - self.represented_objects[self.alias_key] = node - best_style = True - if hasattr(mapping, 'items'): - mapping = list(mapping.items()) - if not isinstance(mapping, OrderedDict): - mapping.sort() - for item_key, item_value in mapping: - node_key = self.represent_data(item_key) - node_value = self.represent_data(item_value) - if not (isinstance(node_key, yaml.ScalarNode) and not node_key.style): - best_style = False - if not (isinstance(node_value, yaml.ScalarNode) and not node_value.style): - best_style = False - value.append((node_key, node_value)) - if flow_style is None: - if self.default_flow_style is not None: - node.flow_style = self.default_flow_style - else: - node.flow_style = best_style - return node - - SafeDumper.add_representer( - decimal.Decimal, - SafeDumper.represent_decimal - ) - SafeDumper.add_representer( - OrderedDict, - yaml.representer.SafeRepresenter.represent_dict - ) - # SafeDumper.add_representer( - # DictWithMetadata, - # yaml.representer.SafeRepresenter.represent_dict - # ) - # SafeDumper.add_representer( - # OrderedDictWithMetadata, - # yaml.representer.SafeRepresenter.represent_dict - # ) - SafeDumper.add_representer( - types.GeneratorType, - yaml.representer.SafeRepresenter.represent_list - ) diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 416d7f224..0603f800b 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -9,12 +9,12 @@ from django.test import TestCase from django.utils import six, unittest from django.utils.translation import ugettext_lazy as _ from rest_framework import status, permissions -from rest_framework.compat import yaml, etree, StringIO, BytesIO +from rest_framework.compat import etree, StringIO from rest_framework.response import Response from rest_framework.views import APIView -from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \ - XMLRenderer, JSONPRenderer, BrowsableAPIRenderer -from rest_framework.parsers import YAMLParser, XMLParser +from rest_framework.renderers import BaseRenderer, JSONRenderer, XMLRenderer, \ + JSONPRenderer, BrowsableAPIRenderer +from rest_framework.parsers import XMLParser from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory from collections import MutableMapping @@ -452,55 +452,6 @@ class JSONPRendererTests(TestCase): ) -if yaml: - _yaml_repr = 'foo: [bar, baz]\n' - - class YAMLRendererTests(TestCase): - """ - Tests specific to the YAML Renderer - """ - - def test_render(self): - """ - Test basic YAML rendering. - """ - obj = {'foo': ['bar', 'baz']} - renderer = YAMLRenderer() - content = renderer.render(obj, 'application/yaml') - self.assertEqual(content.decode('utf-8'), _yaml_repr) - - def test_render_and_parse(self): - """ - Test rendering and then parsing returns the original object. - IE obj -> render -> parse -> obj. - """ - obj = {'foo': ['bar', 'baz']} - - renderer = YAMLRenderer() - parser = YAMLParser() - - content = renderer.render(obj, 'application/yaml') - data = parser.parse(BytesIO(content)) - self.assertEqual(obj, data) - - def test_render_decimal(self): - """ - Test YAML decimal rendering. - """ - renderer = YAMLRenderer() - content = renderer.render({'field': Decimal('111.2')}, 'application/yaml') - self.assertYAMLContains(content.decode('utf-8'), "field: '111.2'") - - def assertYAMLContains(self, content, string): - self.assertTrue(string in content, '%r not in %r' % (string, content)) - - def test_proper_encoding(self): - obj = {'countries': ['United Kingdom', 'France', 'España']} - renderer = YAMLRenderer() - content = renderer.render(obj, 'application/yaml') - self.assertEqual(content.strip(), 'countries: [United Kingdom, France, España]'.encode('utf-8')) - - class XMLRendererTestCase(TestCase): """ Tests specific to the XML Renderer diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index b04a937e0..0cee91f19 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -54,7 +54,7 @@ class Issue1386Tests(TestCase): class URLizerTests(TestCase): """ - Test if both JSON and YAML URLs are transformed into links well + Test if JSON URLs are transformed into links well """ def _urlize_dict_check(self, data): """ @@ -73,14 +73,3 @@ class URLizerTests(TestCase): data['"foo_set": [\n "http://api/foos/1/"\n], '] = \ '"foo_set": [\n "<a href="http://api/foos/1/">http://api/foos/1/</a>"\n], ' self._urlize_dict_check(data) - - def test_yaml_with_url(self): - """ - Test if YAML URLs are transformed into links well - """ - data = {} - data['''{users: 'http://api/users/'}'''] = \ - '''{users: '<a href="http://api/users/">http://api/users/</a>'}''' - data['''foo_set: ['http://api/foos/1/']'''] = \ - '''foo_set: ['<a href="http://api/foos/1/">http://api/foos/1/</a>']''' - self._urlize_dict_check(data) diff --git a/tox.ini b/tox.ini index d5cb9ef94..edfeb33d8 100644 --- a/tox.ini +++ b/tox.ini @@ -24,7 +24,6 @@ deps = django-filter==0.7 defusedxml==0.3 markdown>=2.1.0 - PyYAML>=3.10 [testenv:py27-flake8] deps = From 2f03483f966c5402734b5db2f7006c788bbe04f7 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Sat, 29 Nov 2014 19:45:26 +0100 Subject: [PATCH 1197/1652] Removed unused models --- tests/models.py | 99 +------------------------------------------------ 1 file changed, 1 insertion(+), 98 deletions(-) diff --git a/tests/models.py b/tests/models.py index 06ec5a221..a0e0b3cc8 100644 --- a/tests/models.py +++ b/tests/models.py @@ -3,35 +3,16 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ -def foobar(): - return 'foobar' - - -class CustomField(models.CharField): - - def __init__(self, *args, **kwargs): - kwargs['max_length'] = 12 - super(CustomField, self).__init__(*args, **kwargs) - - class RESTFrameworkModel(models.Model): """ Base for test models that sets app_label, so they play nicely. """ + class Meta: app_label = 'tests' abstract = True -class HasPositiveIntegerAsChoice(RESTFrameworkModel): - some_choices = ((1, 'A'), (2, 'B'), (3, 'C')) - some_integer = models.PositiveIntegerField(choices=some_choices) - - -class Anchor(RESTFrameworkModel): - text = models.CharField(max_length=100, default='anchor') - - class BasicModel(RESTFrameworkModel): text = models.CharField(max_length=100, verbose_name=_("Text comes here"), help_text=_("Text description.")) @@ -41,24 +22,6 @@ class SlugBasedModel(RESTFrameworkModel): slug = models.SlugField(max_length=32) -class DefaultValueModel(RESTFrameworkModel): - text = models.CharField(default='foobar', max_length=100) - extra = models.CharField(blank=True, null=True, max_length=100) - - -class CallableDefaultValueModel(RESTFrameworkModel): - text = models.CharField(default=foobar, max_length=100) - - -class ManyToManyModel(RESTFrameworkModel): - rel = models.ManyToManyField(Anchor, help_text='Some help text.') - - -class ReadOnlyManyToManyModel(RESTFrameworkModel): - text = models.CharField(max_length=100, default='anchor') - rel = models.ManyToManyField(Anchor) - - class BaseFilterableItem(RESTFrameworkModel): text = models.CharField(max_length=100) @@ -72,72 +35,12 @@ class FilterableItem(BaseFilterableItem): # Model for regression test for #285 - class Comment(RESTFrameworkModel): email = models.EmailField() content = models.CharField(max_length=200) created = models.DateTimeField(auto_now_add=True) -class ActionItem(RESTFrameworkModel): - title = models.CharField(max_length=200) - started = models.NullBooleanField(default=False) - done = models.BooleanField(default=False) - info = CustomField(default='---', max_length=12) - - -# Models for reverse relations -class Person(RESTFrameworkModel): - name = models.CharField(max_length=10) - age = models.IntegerField(null=True, blank=True) - - @property - def info(self): - return { - 'name': self.name, - 'age': self.age, - } - - -class BlogPost(RESTFrameworkModel): - title = models.CharField(max_length=100) - writer = models.ForeignKey(Person, null=True, blank=True) - - def get_first_comment(self): - return self.blogpostcomment_set.all()[0] - - -class BlogPostComment(RESTFrameworkModel): - text = models.TextField() - blog_post = models.ForeignKey(BlogPost) - - -class Album(RESTFrameworkModel): - title = models.CharField(max_length=100, unique=True) - ref = models.CharField(max_length=10, unique=True, null=True, blank=True) - - -class Photo(RESTFrameworkModel): - description = models.TextField() - album = models.ForeignKey(Album) - - -# Model for issue #324 -class BlankFieldModel(RESTFrameworkModel): - title = models.CharField(max_length=100, blank=True, null=False, - default="title") - - -# Model for issue #380 -class OptionalRelationModel(RESTFrameworkModel): - other = models.ForeignKey('OptionalRelationModel', blank=True, null=True) - - -# Model for RegexField -class Book(RESTFrameworkModel): - isbn = models.CharField(max_length=13) - - # Models for relations tests # ManyToMany class ManyToManyTarget(RESTFrameworkModel): From fe745b96163282e492f17a6b003418b81350333f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sat, 29 Nov 2014 14:55:33 -0400 Subject: [PATCH 1198/1652] Remove JSONP support from core --- docs/api-guide/renderers.md | 28 ++---------------- rest_framework/renderers.py | 34 ---------------------- tests/test_renderers.py | 58 +------------------------------------ 3 files changed, 3 insertions(+), 117 deletions(-) diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 035ec1d27..a77b9db26 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -49,10 +49,10 @@ using the `APIView` class based views. Or, if you're using the `@api_view` decorator with function based views. @api_view(['GET']) - @renderer_classes((JSONRenderer, JSONPRenderer)) + @renderer_classes((JSONRenderer,)) def user_count_view(request, format=None): """ - A view that returns the count of active users, in JSON or JSONp. + A view that returns the count of active users in JSON. """ user_count = User.objects.filter(active=True).count() content = {'user_count': user_count} @@ -93,26 +93,6 @@ The default JSON encoding style can be altered using the `UNICODE_JSON` and `COM **.charset**: `None` -## JSONPRenderer - -Renders the request data into `JSONP`. The `JSONP` media type provides a mechanism of allowing cross-domain AJAX requests, by wrapping a `JSON` response in a javascript callback. - -The javascript callback function must be set by the client including a `callback` URL query parameter. For example `http://example.com/api/users?callback=jsonpCallback`. If the callback function is not explicitly set by the client it will default to `'callback'`. - ---- - -**Warning**: If you require cross-domain AJAX requests, you should almost certainly be using the more modern approach of [CORS][cors] as an alternative to `JSONP`. See the [CORS documentation][cors-docs] for more details. - -The `jsonp` approach is essentially a browser hack, and is [only appropriate for globally readable API endpoints][jsonp-security], where `GET` requests are unauthenticated and do not require any user permissions. - ---- - -**.media_type**: `application/javascript` - -**.format**: `'.jsonp'` - -**.charset**: `utf-8` - ## YAMLRenderer Renders the request data into `YAML`. @@ -433,10 +413,6 @@ Comma-separated values are a plain-text tabular data format, that can be easily [cite]: https://docs.djangoproject.com/en/dev/ref/template-response/#the-rendering-process [conneg]: content-negotiation.md [browser-accept-headers]: http://www.gethifi.com/blog/browser-rest-http-accept-headers -[rfc4627]: http://www.ietf.org/rfc/rfc4627.txt -[cors]: http://www.w3.org/TR/cors/ -[cors-docs]: ../topics/ajax-csrf-cors.md -[jsonp-security]: http://stackoverflow.com/questions/613962/is-jsonp-safe-to-use [testing]: testing.md [HATEOAS]: http://timelessrepo.com/haters-gonna-hateoas [quote]: http://roy.gbiv.com/untangled/2008/rest-apis-must-be-hypertext-driven diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index e87d16d0d..ab6f251c5 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -106,40 +106,6 @@ class JSONRenderer(BaseRenderer): return ret -class JSONPRenderer(JSONRenderer): - """ - Renderer which serializes to json, - wrapping the json output in a callback function. - """ - - media_type = 'application/javascript' - format = 'jsonp' - callback_parameter = 'callback' - default_callback = 'callback' - charset = 'utf-8' - - def get_callback(self, renderer_context): - """ - Determine the name of the callback to wrap around the json output. - """ - request = renderer_context.get('request', None) - params = request and request.query_params or {} - return params.get(self.callback_parameter, self.default_callback) - - def render(self, data, accepted_media_type=None, renderer_context=None): - """ - Renders into jsonp, wrapping the json output in a callback function. - - Clients may set the callback function name using a query parameter - on the URL, for example: ?callback=exampleCallbackName - """ - renderer_context = renderer_context or {} - callback = self.get_callback(renderer_context) - json = super(JSONPRenderer, self).render(data, accepted_media_type, - renderer_context) - return callback.encode(self.charset) + b'(' + json + b');' - - class XMLRenderer(BaseRenderer): """ Renderer which serializes to XML. diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 416d7f224..15f15dcd2 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -13,7 +13,7 @@ from rest_framework.compat import yaml, etree, StringIO, BytesIO from rest_framework.response import Response from rest_framework.views import APIView from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \ - XMLRenderer, JSONPRenderer, BrowsableAPIRenderer + XMLRenderer, BrowsableAPIRenderer from rest_framework.parsers import YAMLParser, XMLParser from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory @@ -106,8 +106,6 @@ urlpatterns = patterns( url(r'^.*\.(?P<format>.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB])), url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB])), url(r'^cache$', MockGETView.as_view()), - url(r'^jsonp/jsonrenderer$', MockGETView.as_view(renderer_classes=[JSONRenderer, JSONPRenderer])), - url(r'^jsonp/nojsonrenderer$', MockGETView.as_view(renderer_classes=[JSONPRenderer])), url(r'^parseerror$', MockPOSTView.as_view(renderer_classes=[JSONRenderer, BrowsableAPIRenderer])), url(r'^html$', HTMLView.as_view()), url(r'^html1$', HTMLView1.as_view()), @@ -398,60 +396,6 @@ class AsciiJSONRendererTests(TestCase): self.assertEqual(content, '{"countries":["United Kingdom","France","Espa\\u00f1a"]}'.encode('utf-8')) -class JSONPRendererTests(TestCase): - """ - Tests specific to the JSONP Renderer - """ - - urls = 'tests.test_renderers' - - def test_without_callback_with_json_renderer(self): - """ - Test JSONP rendering with View JSON Renderer. - """ - resp = self.client.get( - '/jsonp/jsonrenderer', - HTTP_ACCEPT='application/javascript' - ) - self.assertEqual(resp.status_code, status.HTTP_200_OK) - self.assertEqual(resp['Content-Type'], 'application/javascript; charset=utf-8') - self.assertEqual( - resp.content, - ('callback(%s);' % _flat_repr).encode('ascii') - ) - - def test_without_callback_without_json_renderer(self): - """ - Test JSONP rendering without View JSON Renderer. - """ - resp = self.client.get( - '/jsonp/nojsonrenderer', - HTTP_ACCEPT='application/javascript' - ) - self.assertEqual(resp.status_code, status.HTTP_200_OK) - self.assertEqual(resp['Content-Type'], 'application/javascript; charset=utf-8') - self.assertEqual( - resp.content, - ('callback(%s);' % _flat_repr).encode('ascii') - ) - - def test_with_callback(self): - """ - Test JSONP rendering with callback function name. - """ - callback_func = 'myjsonpcallback' - resp = self.client.get( - '/jsonp/nojsonrenderer?callback=' + callback_func, - HTTP_ACCEPT='application/javascript' - ) - self.assertEqual(resp.status_code, status.HTTP_200_OK) - self.assertEqual(resp['Content-Type'], 'application/javascript; charset=utf-8') - self.assertEqual( - resp.content, - ('%s(%s);' % (callback_func, _flat_repr)).encode('ascii') - ) - - if yaml: _yaml_repr = 'foo: [bar, baz]\n' From 7f9dc736728baf92a3198a7f90bd302fff240373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20Padilla?= <jpadilla@webapplicate.com> Date: Sat, 29 Nov 2014 14:50:51 -0400 Subject: [PATCH 1199/1652] Remove XML support from core --- README.md | 49 ++++++++--------- docs/api-guide/parsers.md | 14 +---- docs/api-guide/renderers.md | 14 ----- docs/index.md | 2 - requirements-test.txt | 1 - rest_framework/compat.py | 7 --- rest_framework/parsers.py | 76 +------------------------ rest_framework/renderers.py | 54 +----------------- tests/test_parsers.py | 62 +-------------------- tests/test_renderers.py | 107 ++---------------------------------- 10 files changed, 32 insertions(+), 354 deletions(-) diff --git a/README.md b/README.md index c86bb65ff..83d16030d 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Add `'rest_framework'` to your `INSTALLED_APPS` setting. Let's take a look at a quick example of using REST framework to build a simple model-backed API for accessing users and groups. -Startup up a new project like so... +Startup up a new project like so... pip install django pip install djangorestframework @@ -79,7 +79,7 @@ class UserViewSet(viewsets.ModelViewSet): queryset = User.objects.all() serializer_class = UserSerializer - + # Routers provide a way of automatically determining the URL conf. router = routers.DefaultRouter() router.register(r'users', UserViewSet) @@ -100,7 +100,7 @@ Add the following to your `settings.py` module: ```python INSTALLED_APPS = ( ... # Make sure to include the default installed apps here. - 'rest_framework', + 'rest_framework', ) REST_FRAMEWORK = { @@ -123,10 +123,10 @@ You can also interact with the API using command line tools such as [`curl`](htt $ curl -H 'Accept: application/json; indent=4' -u admin:password http://127.0.0.1:8000/users/ [ { - "url": "http://127.0.0.1:8000/users/1/", - "username": "admin", - "email": "admin@example.com", - "is_staff": true, + "url": "http://127.0.0.1:8000/users/1/", + "username": "admin", + "email": "admin@example.com", + "is_staff": true, } ] @@ -134,10 +134,10 @@ Or to create a new user: $ curl -X POST -d username=new -d email=new@example.com -d is_staff=false -H 'Accept: application/json; indent=4' -u admin:password http://127.0.0.1:8000/users/ { - "url": "http://127.0.0.1:8000/users/2/", - "username": "new", - "email": "new@example.com", - "is_staff": false, + "url": "http://127.0.0.1:8000/users/2/", + "username": "new", + "email": "new@example.com", + "is_staff": false, } # Documentation & Support @@ -159,24 +159,24 @@ Send a description of the issue via email to [rest-framework-security@googlegrou Copyright (c) 2011-2014, Tom Christie All rights reserved. -Redistribution and use in source and binary forms, with or without +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, this +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -215,6 +215,5 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [urlobject]: https://github.com/zacharyvoase/urlobject [markdown]: http://pypi.python.org/pypi/Markdown/ [pyyaml]: http://pypi.python.org/pypi/PyYAML -[defusedxml]: https://pypi.python.org/pypi/defusedxml [django-filter]: http://pypi.python.org/pypi/django-filter [security-mail]: mailto:rest-framework-security@googlegroups.com diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index 73e3a7057..32819146e 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -78,18 +78,6 @@ Requires the `pyyaml` package to be installed. **.media_type**: `application/yaml` -## XMLParser - -Parses REST framework's default style of `XML` request content. - -Note that the `XML` markup language is typically used as the base language for more strictly defined domain-specific languages, such as `RSS`, `Atom`, and `XHTML`. - -If you are considering using `XML` for your API, you may want to consider implementing a custom renderer and parser for your specific requirements, and using an existing domain-specific media-type, or creating your own custom XML-based media-type. - -Requires the `defusedxml` package to be installed. - -**.media_type**: `application/xml` - ## FormParser Parses HTML form content. `request.data` will be populated with a `QueryDict` of data. @@ -161,7 +149,7 @@ By default this will include the following keys: `view`, `request`, `args`, `kwa ## Example -The following is an example plaintext parser that will populate the `request.data` property with a string representing the body of the request. +The following is an example plaintext parser that will populate the `request.data` property with a string representing the body of the request. class PlainTextParser(BaseParser): """ diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 035ec1d27..47bf2e601 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -145,20 +145,6 @@ Note that non-ascii characters will not be character escaped. For example: **.charset**: `utf-8` -## XMLRenderer - -Renders REST framework's default style of `XML` response content. - -Note that the `XML` markup language is used typically used as the base language for more strictly defined domain-specific languages, such as `RSS`, `Atom`, and `XHTML`. - -If you are considering using `XML` for your API, you may want to consider implementing a custom renderer and parser for your specific requirements, and using an existing domain-specific media-type, or creating your own custom XML-based media-type. - -**.media_type**: `application/xml` - -**.format**: `'.xml'` - -**.charset**: `utf-8` - ## TemplateHTMLRenderer Renders data to HTML, using Django's standard template rendering. diff --git a/docs/index.md b/docs/index.md index b5257c734..3b75821bd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -55,7 +55,6 @@ The following packages are optional: * [Markdown][markdown] (2.1.0+) - Markdown support for the browsable API. * [PyYAML][yaml] (3.10+) - YAML content-type support. -* [defusedxml][defusedxml] (0.3+) - XML content-type support. * [django-filter][django-filter] (0.5.4+) - Filtering support. * [django-oauth-plus][django-oauth-plus] (2.0+) and [oauth2][oauth2] (1.5.211+) - OAuth 1.0a support. * [django-oauth2-provider][django-oauth2-provider] (0.2.3+) - OAuth 2.0 support. @@ -259,7 +258,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [eventbrite]: https://www.eventbrite.co.uk/about/ [markdown]: http://pypi.python.org/pypi/Markdown/ [yaml]: http://pypi.python.org/pypi/PyYAML -[defusedxml]: https://pypi.python.org/pypi/defusedxml [django-filter]: http://pypi.python.org/pypi/django-filter [oauth2]: https://github.com/simplegeo/python-oauth2 [django-oauth-plus]: https://bitbucket.org/david/django-oauth-plus/wiki/Home diff --git a/requirements-test.txt b/requirements-test.txt index 06c8849a8..75cffb9b7 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -7,7 +7,6 @@ flake8==2.2.2 # Optional packages markdown>=2.1.0 PyYAML>=3.10 -defusedxml>=0.3 django-guardian==1.2.4 django-filter>=0.5.4 django-oauth-plus>=2.2.1 diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 5bd85e743..899dd2b48 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -244,13 +244,6 @@ except ImportError: yaml = None -# XML is optional -try: - import defusedxml.ElementTree as etree -except ImportError: - etree = None - - # OAuth2 is optional try: # Note: The `oauth2` package actually provides oauth1.0a support. Urg. diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index ccb82f03b..6d0e932bd 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -12,12 +12,10 @@ from django.http import QueryDict from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter from django.utils import six -from rest_framework.compat import etree, yaml, force_text, urlparse +from rest_framework.compat import yaml, force_text, urlparse from rest_framework.exceptions import ParseError from rest_framework import renderers import json -import datetime -import decimal class DataAndFiles(object): @@ -136,78 +134,6 @@ class MultiPartParser(BaseParser): raise ParseError('Multipart form parse error - %s' % six.text_type(exc)) -class XMLParser(BaseParser): - """ - XML parser. - """ - - media_type = 'application/xml' - - def parse(self, stream, media_type=None, parser_context=None): - """ - Parses the incoming bytestream as XML and returns the resulting data. - """ - assert etree, 'XMLParser requires defusedxml to be installed' - - parser_context = parser_context or {} - encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET) - parser = etree.DefusedXMLParser(encoding=encoding) - try: - tree = etree.parse(stream, parser=parser, forbid_dtd=True) - except (etree.ParseError, ValueError) as exc: - raise ParseError('XML parse error - %s' % six.text_type(exc)) - data = self._xml_convert(tree.getroot()) - - return data - - def _xml_convert(self, element): - """ - convert the xml `element` into the corresponding python object - """ - - children = list(element) - - if len(children) == 0: - return self._type_convert(element.text) - else: - # if the fist child tag is list-item means all children are list-item - if children[0].tag == "list-item": - data = [] - for child in children: - data.append(self._xml_convert(child)) - else: - data = {} - for child in children: - data[child.tag] = self._xml_convert(child) - - return data - - def _type_convert(self, value): - """ - Converts the value returned by the XMl parse into the equivalent - Python type - """ - if value is None: - return value - - try: - return datetime.datetime.strptime(value, '%Y-%m-%d %H:%M:%S') - except ValueError: - pass - - try: - return int(value) - except ValueError: - pass - - try: - return decimal.Decimal(value) - except decimal.InvalidOperation: - pass - - return value - - class FileUploadParser(BaseParser): """ Parser for file upload data. diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index e87d16d0d..dd49ae828 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -16,11 +16,8 @@ from django.http.multipartparser import parse_header from django.template import Context, RequestContext, loader, Template from django.test.client import encode_multipart from django.utils import six -from django.utils.xmlutils import SimplerXMLGenerator from rest_framework import exceptions, serializers, status, VERSION -from rest_framework.compat import ( - SHORT_SEPARATORS, LONG_SEPARATORS, StringIO, smart_text, yaml -) +from rest_framework.compat import SHORT_SEPARATORS, LONG_SEPARATORS, yaml from rest_framework.exceptions import ParseError from rest_framework.settings import api_settings from rest_framework.request import is_form_media_type, override_method @@ -140,55 +137,6 @@ class JSONPRenderer(JSONRenderer): return callback.encode(self.charset) + b'(' + json + b');' -class XMLRenderer(BaseRenderer): - """ - Renderer which serializes to XML. - """ - - media_type = 'application/xml' - format = 'xml' - charset = 'utf-8' - - def render(self, data, accepted_media_type=None, renderer_context=None): - """ - Renders `data` into serialized XML. - """ - if data is None: - return '' - - stream = StringIO() - - xml = SimplerXMLGenerator(stream, self.charset) - xml.startDocument() - xml.startElement("root", {}) - - self._to_xml(xml, data) - - xml.endElement("root") - xml.endDocument() - return stream.getvalue() - - def _to_xml(self, xml, data): - if isinstance(data, (list, tuple)): - for item in data: - xml.startElement("list-item", {}) - self._to_xml(xml, item) - xml.endElement("list-item") - - elif isinstance(data, dict): - for key, value in six.iteritems(data): - xml.startElement(key, {}) - self._to_xml(xml, value) - xml.endElement(key) - - elif data is None: - # Don't output any value - pass - - else: - xml.characters(smart_text(data)) - - class YAMLRenderer(BaseRenderer): """ Renderer which serializes to YAML. diff --git a/tests/test_parsers.py b/tests/test_parsers.py index 3f2672df0..32fb05955 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -1,15 +1,11 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from rest_framework.compat import StringIO from django import forms from django.core.files.uploadhandler import MemoryFileUploadHandler from django.test import TestCase -from django.utils import unittest -from rest_framework.compat import etree +from rest_framework.compat import StringIO from rest_framework.parsers import FormParser, FileUploadParser -from rest_framework.parsers import XMLParser -import datetime class Form(forms.Form): @@ -31,62 +27,6 @@ class TestFormParser(TestCase): self.assertEqual(Form(data).is_valid(), True) -class TestXMLParser(TestCase): - def setUp(self): - self._input = StringIO( - '<?xml version="1.0" encoding="utf-8"?>' - '<root>' - '<field_a>121.0</field_a>' - '<field_b>dasd</field_b>' - '<field_c></field_c>' - '<field_d>2011-12-25 12:45:00</field_d>' - '</root>' - ) - self._data = { - 'field_a': 121, - 'field_b': 'dasd', - 'field_c': None, - 'field_d': datetime.datetime(2011, 12, 25, 12, 45, 00) - } - self._complex_data_input = StringIO( - '<?xml version="1.0" encoding="utf-8"?>' - '<root>' - '<creation_date>2011-12-25 12:45:00</creation_date>' - '<sub_data_list>' - '<list-item><sub_id>1</sub_id><sub_name>first</sub_name></list-item>' - '<list-item><sub_id>2</sub_id><sub_name>second</sub_name></list-item>' - '</sub_data_list>' - '<name>name</name>' - '</root>' - ) - self._complex_data = { - "creation_date": datetime.datetime(2011, 12, 25, 12, 45, 00), - "name": "name", - "sub_data_list": [ - { - "sub_id": 1, - "sub_name": "first" - }, - { - "sub_id": 2, - "sub_name": "second" - } - ] - } - - @unittest.skipUnless(etree, 'defusedxml not installed') - def test_parse(self): - parser = XMLParser() - data = parser.parse(self._input) - self.assertEqual(data, self._data) - - @unittest.skipUnless(etree, 'defusedxml not installed') - def test_complex_data_parse(self): - parser = XMLParser() - data = parser.parse(self._complex_data_input) - self.assertEqual(data, self._complex_data) - - class TestFileUploadParser(TestCase): def setUp(self): class MockRequest(object): diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 416d7f224..1eec37dc3 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -6,19 +6,18 @@ from django.conf.urls import patterns, url, include from django.core.cache import cache from django.db import models from django.test import TestCase -from django.utils import six, unittest +from django.utils import six from django.utils.translation import ugettext_lazy as _ from rest_framework import status, permissions -from rest_framework.compat import yaml, etree, StringIO, BytesIO +from rest_framework.compat import yaml, BytesIO from rest_framework.response import Response from rest_framework.views import APIView from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \ - XMLRenderer, JSONPRenderer, BrowsableAPIRenderer -from rest_framework.parsers import YAMLParser, XMLParser + JSONPRenderer, BrowsableAPIRenderer +from rest_framework.parsers import YAMLParser from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory from collections import MutableMapping -import datetime import json import pickle import re @@ -501,104 +500,6 @@ if yaml: self.assertEqual(content.strip(), 'countries: [United Kingdom, France, España]'.encode('utf-8')) -class XMLRendererTestCase(TestCase): - """ - Tests specific to the XML Renderer - """ - - _complex_data = { - "creation_date": datetime.datetime(2011, 12, 25, 12, 45, 00), - "name": "name", - "sub_data_list": [ - { - "sub_id": 1, - "sub_name": "first" - }, - { - "sub_id": 2, - "sub_name": "second" - } - ] - } - - def test_render_string(self): - """ - Test XML rendering. - """ - renderer = XMLRenderer() - content = renderer.render({'field': 'astring'}, 'application/xml') - self.assertXMLContains(content, '<field>astring</field>') - - def test_render_integer(self): - """ - Test XML rendering. - """ - renderer = XMLRenderer() - content = renderer.render({'field': 111}, 'application/xml') - self.assertXMLContains(content, '<field>111</field>') - - def test_render_datetime(self): - """ - Test XML rendering. - """ - renderer = XMLRenderer() - content = renderer.render({ - 'field': datetime.datetime(2011, 12, 25, 12, 45, 00) - }, 'application/xml') - self.assertXMLContains(content, '<field>2011-12-25 12:45:00</field>') - - def test_render_float(self): - """ - Test XML rendering. - """ - renderer = XMLRenderer() - content = renderer.render({'field': 123.4}, 'application/xml') - self.assertXMLContains(content, '<field>123.4</field>') - - def test_render_decimal(self): - """ - Test XML rendering. - """ - renderer = XMLRenderer() - content = renderer.render({'field': Decimal('111.2')}, 'application/xml') - self.assertXMLContains(content, '<field>111.2</field>') - - def test_render_none(self): - """ - Test XML rendering. - """ - renderer = XMLRenderer() - content = renderer.render({'field': None}, 'application/xml') - self.assertXMLContains(content, '<field></field>') - - def test_render_complex_data(self): - """ - Test XML rendering. - """ - renderer = XMLRenderer() - content = renderer.render(self._complex_data, 'application/xml') - self.assertXMLContains(content, '<sub_name>first</sub_name>') - self.assertXMLContains(content, '<sub_name>second</sub_name>') - - @unittest.skipUnless(etree, 'defusedxml not installed') - def test_render_and_parse_complex_data(self): - """ - Test XML rendering. - """ - renderer = XMLRenderer() - content = StringIO(renderer.render(self._complex_data, 'application/xml')) - - parser = XMLParser() - complex_data_out = parser.parse(content) - error_msg = "complex data differs!IN:\n %s \n\n OUT:\n %s" % (repr(self._complex_data), repr(complex_data_out)) - self.assertEqual(self._complex_data, complex_data_out, error_msg) - - def assertXMLContains(self, xml, string): - self.assertTrue(xml.startswith('<?xml version="1.0" encoding="utf-8"?>\n<root>')) - self.assertTrue(xml.endswith('</root>')) - self.assertTrue(string in xml, '%r not in %r' % (string, xml)) - - # Tests for caching issue, #346 class CacheRenderTest(TestCase): """ From dd9d40d8c01f54f1542ba728d89b8b2da584dc1f Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Sat, 29 Nov 2014 20:04:50 +0100 Subject: [PATCH 1200/1652] Moved non-conflicting models --- tests/models.py | 12 ------------ tests/test_generics.py | 34 +++++++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/tests/models.py b/tests/models.py index a0e0b3cc8..456b0a0bb 100644 --- a/tests/models.py +++ b/tests/models.py @@ -17,11 +17,6 @@ class BasicModel(RESTFrameworkModel): text = models.CharField(max_length=100, verbose_name=_("Text comes here"), help_text=_("Text description.")) -class SlugBasedModel(RESTFrameworkModel): - text = models.CharField(max_length=100) - slug = models.SlugField(max_length=32) - - class BaseFilterableItem(RESTFrameworkModel): text = models.CharField(max_length=100) @@ -34,13 +29,6 @@ class FilterableItem(BaseFilterableItem): date = models.DateField() -# Model for regression test for #285 -class Comment(RESTFrameworkModel): - email = models.EmailField() - content = models.CharField(max_length=200) - created = models.DateTimeField(auto_now_add=True) - - # Models for relations tests # ManyToMany class ManyToManyTarget(RESTFrameworkModel): diff --git a/tests/test_generics.py b/tests/test_generics.py index 2690fb47c..b78584f01 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -6,12 +6,26 @@ from django.test import TestCase from django.utils import six from rest_framework import generics, renderers, serializers, status from rest_framework.test import APIRequestFactory -from tests.models import BasicModel, Comment, SlugBasedModel +from tests.models import BasicModel, RESTFrameworkModel from tests.models import ForeignKeySource, ForeignKeyTarget factory = APIRequestFactory() +# Models +class SlugBasedModel(RESTFrameworkModel): + text = models.CharField(max_length=100) + slug = models.SlugField(max_length=32) + + +# Model for regression test for #285 +class Comment(RESTFrameworkModel): + email = models.EmailField() + content = models.CharField(max_length=200) + created = models.DateTimeField(auto_now_add=True) + + +# Serializers class BasicSerializer(serializers.ModelSerializer): class Meta: model = BasicModel @@ -22,6 +36,15 @@ class ForeignKeySerializer(serializers.ModelSerializer): model = ForeignKeySource +class SlugSerializer(serializers.ModelSerializer): + slug = serializers.ReadOnlyField() + + class Meta: + model = SlugBasedModel + fields = ('text', 'slug') + + +# Views class RootView(generics.ListCreateAPIView): queryset = BasicModel.objects.all() serializer_class = BasicSerializer @@ -37,14 +60,6 @@ class FKInstanceView(generics.RetrieveUpdateDestroyAPIView): serializer_class = ForeignKeySerializer -class SlugSerializer(serializers.ModelSerializer): - slug = serializers.ReadOnlyField() - - class Meta: - model = SlugBasedModel - fields = ('text', 'slug') - - class SlugBasedInstanceView(InstanceView): """ A model with a slug-field. @@ -54,6 +69,7 @@ class SlugBasedInstanceView(InstanceView): lookup_field = 'slug' +# Tests class TestRootView(TestCase): def setUp(self): """ From e2ea98e8ab3192fa8d252d33cc03929fcf6ed02f Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Sat, 29 Nov 2014 20:23:55 +0100 Subject: [PATCH 1201/1652] Fixed typos --- README.md | 8 ++++---- docs/index.md | 4 ++-- docs/topics/2.3-announcement.md | 6 +++--- docs/topics/release-notes.md | 4 ++-- docs/tutorial/6-viewsets-and-routers.md | 4 ++-- docs/tutorial/quickstart.md | 2 +- tests/test_generics.py | 22 +++++++++++----------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index c86bb65ff..31fe1e52e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![build-status-image]][travis] [![pypi-version]][pypi] -**Awesome web-browseable Web APIs.** +**Awesome web-browsable Web APIs.** Full documentation for the project is available at [http://www.django-rest-framework.org][docs]. @@ -19,7 +19,7 @@ Django REST framework is a powerful and flexible toolkit for building Web APIs. Some reasons you might want to use REST framework: -* The [Web browseable API][sandbox] is a huge useability win for your developers. +* The [Web browsable API][sandbox] is a huge usability win for your developers. * [Authentication policies][authentication] including [OAuth1a][oauth1-section] and [OAuth2][oauth2-section] out of the box. * [Serialization][serializers] that supports both [ORM][modelserializer-section] and [non-ORM][serializer-section] data sources. * Customizable all the way down - just use [regular function-based views][functionview-section] if you don't need the [more][generic-views] [powerful][viewsets] [features][routers]. @@ -27,7 +27,7 @@ Some reasons you might want to use REST framework: There is a live example API for testing purposes, [available here][sandbox]. -**Below**: *Screenshot from the browseable API* +**Below**: *Screenshot from the browsable API* ![Screenshot][image] @@ -86,7 +86,7 @@ router.register(r'users', UserViewSet) # Wire up our API using automatic URL routing. -# Additionally, we include login URLs for the browseable API. +# Additionally, we include login URLs for the browsable API. urlpatterns = [ url(r'^', include(router.urls)), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) diff --git a/docs/index.md b/docs/index.md index b5257c734..feada2a92 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ Django REST framework is a powerful and flexible toolkit that makes it easy to b Some reasons you might want to use REST framework: -* The [Web browseable API][sandbox] is a huge usability win for your developers. +* The [Web browsable API][sandbox] is a huge usability win for your developers. * [Authentication policies][authentication] including [OAuth1a][oauth1-section] and [OAuth2][oauth2-section] out of the box. * [Serialization][serializers] that supports both [ORM][modelserializer-section] and [non-ORM][serializer-section] data sources. * Customizable all the way down - just use [regular function-based views][functionview-section] if you don't need the [more][generic-views] [powerful][viewsets] [features][routers]. @@ -132,7 +132,7 @@ Here's our project's root `urls.py` module: router.register(r'users', UserViewSet) # Wire up our API using automatic URL routing. - # Additionally, we include login URLs for the browseable API. + # Additionally, we include login URLs for the browsable API. urlpatterns = [ url(r'^', include(router.urls)), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) diff --git a/docs/topics/2.3-announcement.md b/docs/topics/2.3-announcement.md index 9c9f3e9f6..66e468655 100644 --- a/docs/topics/2.3-announcement.md +++ b/docs/topics/2.3-announcement.md @@ -35,7 +35,7 @@ As an example of just how simple REST framework APIs can now be, here's an API w # Wire up our API using automatic URL routing. - # Additionally, we include login URLs for the browseable API. + # Additionally, we include login URLs for the browsable API. urlpatterns = [ url(r'^', include(router.urls)), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) @@ -207,9 +207,9 @@ The old-style signature will continue to function but will raise a `PendingDepre ## View names and descriptions -The mechanics of how the names and descriptions used in the browseable API are generated has been modified and cleaned up somewhat. +The mechanics of how the names and descriptions used in the browsable API are generated has been modified and cleaned up somewhat. -If you've been customizing this behavior, for example perhaps to use `rst` markup for the browseable API, then you'll need to take a look at the implementation to see what updates you need to make. +If you've been customizing this behavior, for example perhaps to use `rst` markup for the browsable API, then you'll need to take a look at the implementation to see what updates you need to make. Note that the relevant methods have always been private APIs, and the docstrings called them out as intended to be deprecated. diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 531875891..19dfbb985 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -121,7 +121,7 @@ You can determine your currently installed version using `pip freeze`: * Add `UnicodeYAMLRenderer` that extends `YAMLRenderer` with unicode. * Fix `parse_header` argument convertion. * Fix mediatype detection under Python 3. -* Web browseable API now offers blank option on dropdown when the field is not required. +* Web browsable API now offers blank option on dropdown when the field is not required. * `APIException` representation improved for logging purposes. * Allow source="*" within nested serializers. * Better support for custom oauth2 provider backends. @@ -200,7 +200,7 @@ You can determine your currently installed version using `pip freeze`: * Added `MAX_PAGINATE_BY` setting and `max_paginate_by` generic view attribute. * Added `cache` attribute to throttles to allow overriding of default cache. * 'Raw data' tab in browsable API now contains pre-populated data. -* 'Raw data' and 'HTML form' tab preference in browseable API now saved between page views. +* 'Raw data' and 'HTML form' tab preference in browsable API now saved between page views. * Bugfix: `required=True` argument fixed for boolean serializer fields. * Bugfix: `client.force_authenticate(None)` should also clear session info if it exists. * Bugfix: Client sending empty string instead of file now clears `FileField`. diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index 3fad509a1..816e9da69 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -112,7 +112,7 @@ Here's our re-wired `urls.py` file. router.register(r'users', views.UserViewSet) # The API URLs are now determined automatically by the router. - # Additionally, we include the login URLs for the browseable API. + # Additionally, we include the login URLs for the browsable API. urlpatterns = [ url(r'^', include(router.urls)), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) @@ -130,7 +130,7 @@ That doesn't mean it's always the right approach to take. There's a similar set ## Reviewing our work -With an incredibly small amount of code, we've now got a complete pastebin Web API, which is fully web browseable, and comes complete with authentication, per-object permissions, and multiple renderer formats. +With an incredibly small amount of code, we've now got a complete pastebin Web API, which is fully web browsable, and comes complete with authentication, per-object permissions, and multiple renderer formats. We've walked through each step of the design process, and seen how if we need to customize anything we can gradually work our way down to simply using regular Django views. diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 1c398c1ff..3e1ce0a9b 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -100,7 +100,7 @@ Okay, now let's wire up the API URLs. On to `tutorial/urls.py`... router.register(r'groups', views.GroupViewSet) # Wire up our API using automatic URL routing. - # Additionally, we include login URLs for the browseable API. + # Additionally, we include login URLs for the browsable API. urlpatterns = [ url(r'^', include(router.urls)), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) diff --git a/tests/test_generics.py b/tests/test_generics.py index b78584f01..94023c30a 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -143,13 +143,13 @@ class TestRootView(TestCase): self.assertEqual(created.text, 'foobar') -EXPECTED_QUERYS_FOR_PUT = 3 if django.VERSION < (1, 6) else 2 +EXPECTED_QUERIES_FOR_PUT = 3 if django.VERSION < (1, 6) else 2 class TestInstanceView(TestCase): def setUp(self): """ - Create 3 BasicModel intances. + Create 3 BasicModel instances. """ items = ['foo', 'bar', 'baz', 'filtered out'] for item in items: @@ -189,7 +189,7 @@ class TestInstanceView(TestCase): """ data = {'text': 'foobar'} request = factory.put('/1', data, format='json') - with self.assertNumQueries(EXPECTED_QUERYS_FOR_PUT): + with self.assertNumQueries(EXPECTED_QUERIES_FOR_PUT): response = self.view(request, pk='1').render() self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(dict(response.data), {'id': 1, 'text': 'foobar'}) @@ -203,7 +203,7 @@ class TestInstanceView(TestCase): data = {'text': 'foobar'} request = factory.patch('/1', data, format='json') - with self.assertNumQueries(EXPECTED_QUERYS_FOR_PUT): + with self.assertNumQueries(EXPECTED_QUERIES_FOR_PUT): response = self.view(request, pk=1).render() self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.data, {'id': 1, 'text': 'foobar'}) @@ -238,7 +238,7 @@ class TestInstanceView(TestCase): """ data = {'id': 999, 'text': 'foobar'} request = factory.put('/1', data, format='json') - with self.assertNumQueries(EXPECTED_QUERYS_FOR_PUT): + with self.assertNumQueries(EXPECTED_QUERIES_FOR_PUT): response = self.view(request, pk=1).render() self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.data, {'id': 1, 'text': 'foobar'}) @@ -304,9 +304,10 @@ class TestOverriddenGetObject(TestCase): Test cases for a RetrieveUpdateDestroyAPIView that does NOT use the queryset/model mechanism but instead overrides get_object() """ + def setUp(self): """ - Create 3 BasicModel intances. + Create 3 BasicModel instances. """ items = ['foo', 'bar', 'baz'] for item in items: @@ -379,11 +380,11 @@ class ClassB(models.Model): class ClassA(models.Model): name = models.CharField(max_length=255) - childs = models.ManyToManyField(ClassB, blank=True, null=True) + children = models.ManyToManyField(ClassB, blank=True, null=True) class ClassASerializer(serializers.ModelSerializer): - childs = serializers.PrimaryKeyRelatedField( + children = serializers.PrimaryKeyRelatedField( many=True, queryset=ClassB.objects.all() ) @@ -396,8 +397,8 @@ class ExampleView(generics.ListCreateAPIView): queryset = ClassA.objects.all() -class TestM2MBrowseableAPI(TestCase): - def test_m2m_in_browseable_api(self): +class TestM2MBrowsableAPI(TestCase): + def test_m2m_in_browsable_api(self): """ Test for particularly ugly regression with m2m in browsable API """ @@ -440,7 +441,6 @@ class DynamicSerializerView(generics.ListCreateAPIView): class TestFilterBackendAppliedToViews(TestCase): - def setUp(self): """ Create 3 BasicModel instances to filter on. From 72c4ec4e189796e506655e275cd9c77abe98e1b9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 1 Dec 2014 08:54:12 +0000 Subject: [PATCH 1202/1652] Add 3.0 announcement --- docs/index.md | 4 ++++ mkdocs.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/docs/index.md b/docs/index.md index b5257c734..10b45584c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,6 +11,8 @@ **Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. +For more details see the [3.0 release notes](3.0-announcement). + --- <p> @@ -201,6 +203,7 @@ General guides to using REST framework. * [2.2 Announcement][2.2-announcement] * [2.3 Announcement][2.3-announcement] * [2.4 Announcement][2.4-announcement] +* [3.0 Announcement][3.0-announcement] * [Kickstarter Announcement][kickstarter-announcement] * [Release Notes][release-notes] * [Credits][credits] @@ -319,6 +322,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [2.2-announcement]: topics/2.2-announcement.md [2.3-announcement]: topics/2.3-announcement.md [2.4-announcement]: topics/2.4-announcement.md +[3.0-announcement]: topics/3.0-announcement.md [kickstarter-announcement]: topics/kickstarter-announcement.md [release-notes]: topics/release-notes.md [credits]: topics/credits.md diff --git a/mkdocs.yml b/mkdocs.yml index cc31b1be6..9513f04f7 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -50,6 +50,7 @@ pages: - ['topics/2.2-announcement.md', 'Topics', '2.2 Announcement'] - ['topics/2.3-announcement.md', 'Topics', '2.3 Announcement'] - ['topics/2.4-announcement.md', 'Topics', '2.4 Announcement'] + - ['topics/3.0-announcement.md', 'Topics', '3.0 Announcement'] - ['topics/kickstarter-announcement.md', 'Topics', 'Kickstarter Announcement'] - ['topics/release-notes.md', 'Topics', 'Release Notes'] - ['topics/credits.md', 'Topics', 'Credits'] From b9503cd603613e4ae72b7718ba70a00b1537b289 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 1 Dec 2014 10:48:45 +0000 Subject: [PATCH 1203/1652] Support Django's core ValidationError for backwards compat. Refs #2145. --- docs/index.md | 2 +- docs/topics/3.0-announcement.md | 42 ++++++++++++++++++++++++++++----- rest_framework/serializers.py | 11 +++++++++ 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/docs/index.md b/docs/index.md index 10b45584c..7631be1e2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,7 @@ **Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. -For more details see the [3.0 release notes](3.0-announcement). +For more details see the [3.0 release notes][3.0-announcement]. --- diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index b32fe5102..72fee0193 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -6,9 +6,11 @@ This release is incremental in nature. There *are* some breaking API changes, an The difference in quality of the REST framework API and implementation should make writing, maintaining and debugging your application far easier. -3.0 is the first of three releases that have been funded by our recent [Kickstarter campaign](kickstarter.com/projects/tomchristie/django-rest-framework-3). +3.0 is the first of three releases that have been funded by our recent [Kickstarter campaign][kickstarter]. -As ever, a huge thank you to our many [wonderful sponsors](sponsors). If you're looking for a Django gig, and want to work with smart community-minded folks, you should probably check out that list and see who's hiring. +As ever, a huge thank you to our many [wonderful sponsors][sponsors]. If you're looking for a Django gig, and want to work with smart community-minded folks, you should probably check out that list and see who's hiring. + +--- ## New features @@ -51,6 +53,8 @@ Instead of passing the files argument separately: The usage of `request.QUERY_PARAMS` is now pending deprecation in favor of the lowercased `request.query_params`. +--- + ## Serializers #### Single-step object creation. @@ -149,7 +153,7 @@ Previously `serializers.ValidationError` error was simply a synonym for `django. The reason behind this is that Django's `ValidationError` class is intended for use with HTML forms and its API makes using it slightly awkward with nested validation errors that can occur in serializers. -For most users this change shouldn't require any updates to your codebase, but it is worth ensuring that whenever raising validation errors you are always using the `serializers.ValidationError` exception class, and not Django's built-in exception. +For most users this change shouldn't require any updates to your codebase, but it is worth ensuring that whenever raising validation errors you should prefer using the `serializers.ValidationError` exception class, and not Django's built-in exception. We strongly recommend that you use the namespaced import style of `import serializers` and not `from serializers import ValidationError` in order to avoid any potential confusion. @@ -218,7 +222,18 @@ If you absolutely need to preserve `transform_<field_name>` behavior, for exampl This change also means that we no longer use the `.full_clean()` method on model instances, but instead perform all validation explicitly on the serializer. This gives a cleaner separation, and ensures that there's no automatic validation behavior on `ModelSerializer` classes that can't also be easily replicated on regular `Serializer` classes. -It's important to note that this change also means that the model `.clean()` method will not be called as part of serializer validation, as it would be if using a `ModelForm`. Use the serializer `.validate()` method to perform a final validation step on incoming data where required. +For the most part this change should be transparent. Field validation and uniqueness checks will still be run as normal, but the implementation is a little different. + +The one difference that you do need to note is that the `.clean()` method will not be called as part of serializer validation, as it would be if using a `ModelForm`. Use the serializer `.validate()` method to perform a final validation step on incoming data where required. + +There may be some cases where you really do need to keep validation logic in the model `.clean()` method, and cannot instead separate it into the serializer `.validate()`. You can do so by explicitly instantiating a model instance in the `.validate()` method. + + def validate(self, attrs): + instance = ExampleModel(**attrs) + instance.clean() + return attrs + +Again, you really should look at properly separating the validation logic out of the model method if possible, but the above might be useful in some backwards compatibility cases, or for an easy migration path. #### Writable nested serialization. @@ -524,6 +539,8 @@ The following class is an example of a generic serializer that can handle coerci # Force anything else to its string representation. output[attribute_name] = str(attribute) +--- + ## Serializer fields #### The `Field` and `ReadOnly` field classes. @@ -721,6 +738,8 @@ REST framework also now includes explicit validator classes for validating the ` These classes are documented in the [Validators](../api-guide/validators.md) section of the documentation. +--- + ## Generic views #### Simplification of view logic. @@ -769,12 +788,16 @@ The generic views now raise `ValidationFailed` exception for invalid data. This This change means that you can now easily customize the style of error responses across your entire API, without having to modify any of the generic views. +--- + ## The metadata API Behavior for dealing with `OPTIONS` requests was previously built directly into the class based views. This has now been properly separated out into a Metadata API that allows the same pluggable style as other API policies in REST framework. This makes it far easier to use a different style for `OPTIONS` responses throughout your API, and makes it possible to create third-party metadata policies. +--- + ## Serializers as HTML forms REST framework 3.0 includes templated HTML form rendering for serializers. @@ -806,6 +829,8 @@ Similarly, to use a radio button control instead of the default `select` control This API should be considered provisional, and there may be minor alterations with the incoming 3.1 release. +--- + ## API style There are some improvements in the default style we use in our API responses. @@ -899,12 +924,16 @@ Or modify it on an individual serializer field, using the `coerce_to_string` key The default JSON renderer will return float objects for un-coerced `Decimal` instances. This allows you to easily switch between string or float representations for decimals depending on your API design needs. -## Miscellaneous notes. +--- + +## Miscellaneous notes * The serializer `ChoiceField` does not currently display nested choices, as was the case in 2.4. This will be address as part of 3.1. * Due to the new templated form rendering, the 'widget' option is no longer valid. This means there's no easy way of using third party "autocomplete" widgets for rendering select inputs that contain a large number of choices. You'll either need to use a regular select or a plain text input. We may consider addressing this in 3.1 or 3.2 if there's sufficient demand. -## What's coming next. +--- + +## What's coming next 3.0 is an incremental release, and there are several upcoming features that will build on the baseline improvements that it makes. @@ -919,5 +948,6 @@ The 3.2 release is planned to introduce an alternative admin-style interface to You can follow development on the GitHub site, where we use [milestones to indicate planning timescales](https://github.com/tomchristie/django-rest-framework/milestones). +[kickstarter]: http://kickstarter.com/projects/tomchristie/django-rest-framework-3 [sponsors]: http://www.django-rest-framework.org/topics/kickstarter-announcement/#sponsors [mixins.py]: https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/mixins.py diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index f7aa3a7dc..de0d026da 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -11,6 +11,7 @@ python primitives. response content is handled by parsers and renderers. """ from django.core.exceptions import ImproperlyConfigured +from django.core.exceptions import ValidationError as DjangoValidationError from django.db import models from django.db.models.fields import FieldDoesNotExist from django.utils import six @@ -330,6 +331,14 @@ class Serializer(BaseSerializer): raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: [exc.detail] }) + except DjangoValidationError as exc: + # Normally you should raise `serializers.ValidationError` + # inside your codebase, but we handle Django's validation + # exception class as well for simpler compat. + # Eg. Calling Model.clean() explictily inside Serializer.validate() + raise ValidationError({ + api_settings.NON_FIELD_ERRORS_KEY: list(exc.messages) + }) return value @@ -353,6 +362,8 @@ class Serializer(BaseSerializer): validated_value = validate_method(validated_value) except ValidationError as exc: errors[field.field_name] = exc.detail + except DjangoValidationError as exc: + errors[field.field_name] = list(exc.messages) except SkipField: pass else: From 22c5b863bc395a6df84ec2536849540d3e92da7a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 1 Dec 2014 11:37:38 +0000 Subject: [PATCH 1204/1652] More descriptive docstring on ModelSerializer --- rest_framework/serializers.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index de0d026da..3783b285a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -565,6 +565,14 @@ class ModelSerializer(Serializer): * A set of default fields are automatically populated. * A set of default validators are automatically populated. * Default `.create()` and `.update()` implementations are provided. + + The process of automatically determining a set of serializer fields + based on the model fields is reasonably complex, but you almost certainly + don't need to dig into the implemention. + + If the `ModelSerializer` class *doesn't* generate the set of fields that + you need you should either declare the extra/differing fields explicitly on + the serializer class, or simply use a `Serializer` class. """ _field_mapping = ClassLookupDict({ models.AutoField: IntegerField, From 270c7acdd75e9dd0b7a600e5648b0ec364c9a510 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 1 Dec 2014 11:59:04 +0000 Subject: [PATCH 1205/1652] Minor validtors tweak --- docs/topics/3.0-announcement.md | 9 +++++---- rest_framework/serializers.py | 31 ++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 72fee0193..281e33bd1 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -727,10 +727,11 @@ The `UniqueTogetherValidator` should be applied to a serializer, and takes a `qu position = serializers.IntegerField() name = serializers.CharField(max_length=100) - default_validators = [UniqueTogetherValidator( - queryset=RaceResult.objects.all(), - fields=('category', 'position') - )] + class Meta: + validators = [UniqueTogetherValidator( + queryset=RaceResult.objects.all(), + fields=('category', 'position') + )] #### The `UniqueForDateValidator` classes. diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 3783b285a..0d0a4d9a1 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -601,6 +601,26 @@ class ModelSerializer(Serializer): _related_class = PrimaryKeyRelatedField def create(self, validated_attrs): + """ + We have a bit of extra checking around this in order to provide + descriptive messages when something goes wrong, but this method is + essentially just: + + return ExampleModel.objects.create(**validated_attrs) + + If there are many to many fields present on the instance then they + cannot be set until the model is instantiated, in which case the + implementation is like so: + + example_relationship = validated_attrs.pop('example_relationship') + instance = ExampleModel.objects.create(**validated_attrs) + instance.example_relationship = example_relationship + return instance + + The default implementation also does not handle nested relationships. + If you want to support writable nested relationships you'll need + to write an explicit `.create()` method. + """ # Check that the user isn't trying to handle a writable nested field. # If we don't do this explicitly they'd likely get a confusing # error at the point of calling `Model.objects.create()`. @@ -651,14 +671,19 @@ class ModelSerializer(Serializer): return instance def get_validators(self): + # If the validators have been declared explicitly then use that. + validators = getattr(getattr(self, 'Meta', None), 'validators', None) + if validators is not None: + return validators + + # Determine the default set of validators. + validators = [] + model_class = self.Meta.model field_names = set([ field.source for field in self.fields.values() if (field.source != '*') and ('.' not in field.source) ]) - validators = getattr(getattr(self, 'Meta', None), 'validators', []) - model_class = self.Meta.model - # Note that we make sure to check `unique_together` both on the # base model class, but also on any parent classes. for parent_class in [model_class] + list(model_class._meta.parents.keys()): From 1caa14dd1425812fd47f58e859d694a81915caf3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 1 Dec 2014 12:22:21 +0000 Subject: [PATCH 1206/1652] Minor 3.0 announcment tweaks --- docs/topics/3.0-announcement.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 281e33bd1..4aafb3d8c 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -1,8 +1,8 @@ -# REST framework 3.0 +# Django REST framework 3.0 The 3.0 release of Django REST framework is the result of almost four years of iteration and refinement. It comprehensively addresses some of the previous remaining design issues in serializers, fields and the generic views. -This release is incremental in nature. There *are* some breaking API changes, and upgrading *will* require you to read the release notes carefully, but the migration path should otherwise be relatively straightforward. +**This release is incremental in nature. There *are* some breaking API changes, and upgrading *will* require you to read the release notes carefully, but the migration path should otherwise be relatively straightforward.** The difference in quality of the REST framework API and implementation should make writing, maintaining and debugging your application far easier. From 34b5db62e560e73516fb569eaf9b71ea5562958f Mon Sep 17 00:00:00 2001 From: phalt <paulandrewhallett@gmail.com> Date: Mon, 1 Dec 2014 13:39:53 +0000 Subject: [PATCH 1207/1652] Use httpie for tutorials --- docs/tutorial/1-serialization.md | 48 ++++++++++++++--- docs/tutorial/2-requests-and-responses.md | 51 +++++++++++++++---- .../4-authentication-and-permissions.md | 18 +++++-- docs/tutorial/quickstart.md | 29 +++++++++++ 4 files changed, 126 insertions(+), 20 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index a3c19858d..3ef651163 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -332,17 +332,51 @@ Quit out of the shell... In another terminal window, we can test the server. -We can get a list of all of the snippets. +We could use `curl`, but let's use a nicer tool called [httpie][httpie] to test our server. It has much nicer formatting and makes our output easier to read. This is especially useful when testing. - curl http://127.0.0.1:8000/snippets/ +You can install httpie on all operating systems using pip: - [{"id": 1, "title": "", "code": "foo = \"bar\"\n", "linenos": false, "language": "python", "style": "friendly"}, {"id": 2, "title": "", "code": "print \"hello, world\"\n", "linenos": false, "language": "python", "style": "friendly"}] + pip install httpie -Or we can get a particular snippet by referencing its id. +It can also be installed through [Homebrew][brew] on Mac: - curl http://127.0.0.1:8000/snippets/2/ + brew install httpie - {"id": 2, "title": "", "code": "print \"hello, world\"\n", "linenos": false, "language": "python", "style": "friendly"} +Finally, we can get a list of all of the snippets: + + http http://127.0.0.1:8000/snippets/ --body + + [ + { + "id": 1, + "title": "", + "code": "foo = \"bar\"\n", + "linenos": false, + "language": "python", + "style": "friendly" + }, + { + "id": 2, + "title": "", + "code": "print \"hello, world\"\n", + "linenos": false, + "language": "python", + "style": "friendly" + } + ] + +Or we can get a particular snippet by referencing its id: + + http http://127.0.0.1:8000/snippets/2/ --body + + { + "id": 2, + "title": "", + "code": "print \"hello, world\"\n", + "linenos": false, + "language": "python", + "style": "friendly" + } Similarly, you can have the same json displayed by visiting these URLs in a web browser. @@ -359,3 +393,5 @@ We'll see how we can start to improve things in [part 2 of the tutorial][tut-2]. [sandbox]: http://restframework.herokuapp.com/ [virtualenv]: http://www.virtualenv.org/en/latest/index.html [tut-2]: 2-requests-and-responses.md +[httpie]: https://github.com/jakubroztocil/httpie#installation +[brew]: http://brew.sh diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index f377c7122..dcaf7c0c2 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -127,31 +127,62 @@ Go ahead and test the API from the command line, as we did in [tutorial part 1][ We can get a list of all of the snippets, as before. - curl http://127.0.0.1:8000/snippets/ + http http://127.0.0.1:8000/snippets/ --body - [{"id": 1, "title": "", "code": "foo = \"bar\"\n", "linenos": false, "language": "python", "style": "friendly"}, {"id": 2, "title": "", "code": "print \"hello, world\"\n", "linenos": false, "language": "python", "style": "friendly"}] + [ + { + "id": 1, + "title": "", + "code": "foo = \"bar\"\n", + "linenos": false, + "language": "python", + "style": "friendly" + }, + { + "id": 2, + "title": "", + "code": "print \"hello, world\"\n", + "linenos": false, + "language": "python", + "style": "friendly" + } + ] We can control the format of the response that we get back, either by using the `Accept` header: - curl http://127.0.0.1:8000/snippets/ -H 'Accept: application/json' # Request JSON - curl http://127.0.0.1:8000/snippets/ -H 'Accept: text/html' # Request HTML + http http://127.0.0.1:8000/snippets/ Accept:application/json # Request JSON + http http://127.0.0.1:8000/snippets/ Accept:text/html # Request HTML Or by appending a format suffix: - curl http://127.0.0.1:8000/snippets/.json # JSON suffix - curl http://127.0.0.1:8000/snippets/.api # Browsable API suffix + http http://127.0.0.1:8000/snippets/.json # JSON suffix + http http://127.0.0.1:8000/snippets/.api # Browsable API suffix Similarly, we can control the format of the request that we send, using the `Content-Type` header. # POST using form data - curl -X POST http://127.0.0.1:8000/snippets/ -d "code=print 123" + http --form POST http://127.0.0.1:8000/snippets/ code="print 123" - {"id": 3, "title": "", "code": "print 123", "linenos": false, "language": "python", "style": "friendly"} + { + "id": 3, + "title": "", + "code": "print 123", + "linenos": false, + "language": "python", + "style": "friendly" + } # POST using JSON - curl -X POST http://127.0.0.1:8000/snippets/ -d '{"code": "print 456"}' -H "Content-Type: application/json" + http --json POST http://127.0.0.1:8000/snippets/ code="print 456" - {"id": 4, "title": "", "code": "print 456", "linenos": true, "language": "python", "style": "friendly"} + { + "id": 4, + "title": "", + "code": "print 456", + "linenos": true, + "language": "python", + "style": "friendly" + } Now go and open the API in a web browser, by visiting [http://127.0.0.1:8000/snippets/][devserver]. diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 4e4edeeac..15d93a62a 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -198,15 +198,25 @@ If we're interacting with the API programmatically we need to explicitly provide If we try to create a snippet without authenticating, we'll get an error: - curl -i -X POST http://127.0.0.1:8000/snippets/ -d "code=print 123" + http POST http://127.0.0.1:8000/snippets/ code="print 123" - {"detail": "Authentication credentials were not provided."} + { + "detail": "Authentication credentials were not provided." + } We can make a successful request by including the username and password of one of the users we created earlier. - curl -X POST http://127.0.0.1:8000/snippets/ -d "code=print 789" -u tom:password + http POST -a tom:password http://127.0.0.1:8000/snippets/ code="print 789" - {"id": 5, "owner": "tom", "title": "foo", "code": "print 789", "linenos": false, "language": "python", "style": "friendly"} + { + "id": 5, + "owner": "tom", + "title": "foo", + "code": "print 789", + "linenos": false, + "language": "python", + "style": "friendly" + } ## Summary diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 1c398c1ff..41e864ccd 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -24,6 +24,10 @@ Create a new Django project named `tutorial`, then start a new app called `quick django-admin.py startapp quickstart cd .. +Optionally, install [httpie][httpie] for tastier HTTP requests: + + pip install httpie + Now sync your database for the first time: python manage.py migrate @@ -159,6 +163,30 @@ We can now access our API, both from the command-line, using tools like `curl`.. ] } +Or with [httpie][httpie], a tastier version of `curl`... + + bash: http -a username:password http://127.0.0.1:8000/users/ --body + { + "count": 2, + "next": null, + "previous": null, + "results": [ + { + "email": "admin@example.com", + "groups": [], + "url": "http://localhost:8000/users/1/", + "username": "paul" + }, + { + "email": "tom@example.com", + "groups": [ ], + "url": "http://127.0.0.1:8000/users/2/", + "username": "tom" + } + ] + } + + Or directly through the browser... ![Quick start image][image] @@ -173,3 +201,4 @@ If you want to get a more in depth understanding of how REST framework fits toge [image]: ../img/quickstart.png [tutorial]: 1-serialization.md [guide]: ../#api-guide +[httpie]: https://github.com/jakubroztocil/httpie#installation From 555c450497e96bf8fed82fc76e70adf907c5c409 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 1 Dec 2014 14:46:47 +0000 Subject: [PATCH 1208/1652] Add missing 'validators.py' link. Closes #2166. --- docs/api-guide/validators.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index f087e1914..8f5a89298 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -1,4 +1,4 @@ -<a class="github" href="validators.py"></a> +source: validators.py --- From 080fa4f5f863609f5647ce1424f13b01e9f427ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Mon, 1 Dec 2014 11:26:50 -0400 Subject: [PATCH 1209/1652] Change allow_none to allow_null --- docs/topics/3.0-announcement.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 4aafb3d8c..8791ad089 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -557,22 +557,22 @@ We now use the following: * `Field` is the base class for all fields. It does not include any default implementation for either serializing or deserializing data. * `ReadOnlyField` is a concrete implementation for read-only fields that simply returns the attribute value without modification. -#### The `required`, `allow_none`, `allow_blank` and `default` arguments. +#### The `required`, `allow_null`, `allow_blank` and `default` arguments. REST framework now has more explicit and clear control over validating empty values for fields. Previously the meaning of the `required=False` keyword argument was underspecified. In practice its use meant that a field could either be not included in the input, or it could be included, but be `None` or the empty string. -We now have a better separation, with separate `required`, `allow_none` and `allow_blank` arguments. +We now have a better separation, with separate `required`, `allow_null` and `allow_blank` arguments. The following set of arguments are used to control validation of empty values: * `required=False`: The value does not need to be present in the input, and will not be passed to `.create()` or `.update()` if it is not seen. * `default=<value>`: The value does not need to be present in the input, and a default value will be passed to `.create()` or `.update()` if it is not seen. -* `allow_none=True`: `None` is a valid input. +* `allow_null=True`: `None` is a valid input. * `allow_blank=True`: `''` is valid input. For `CharField` and subclasses only. -Typically you'll want to use `required=False` if the corresponding model field has a default value, and additionally set either `allow_none=True` or `allow_blank=True` if required. +Typically you'll want to use `required=False` if the corresponding model field has a default value, and additionally set either `allow_null=True` or `allow_blank=True` if required. The `default` argument is also available and always implies that the field is not required to be in the input. It is unnecessary to use the `required` argument when a default is specified, and doing so will result in an error. From d1fe61ce94af1e942f8d1026fb84b1909c230779 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 1 Dec 2014 17:05:11 +0000 Subject: [PATCH 1210/1652] Fix requirements. Closes #2170. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8a6982305..f284644a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -Django>=1.4.2 +Django>=1.4.11 From bc0c25df3020772124e1767895c7e7cb60d974c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Mon, 1 Dec 2014 17:31:11 -0400 Subject: [PATCH 1211/1652] Consolidate Django and test requirements --- CONTRIBUTING.md | 17 ++++++++--------- docs/topics/contributing.md | 1 - docs/topics/third-party-resources.md | 2 +- requirements-test.txt | 15 --------------- requirements.txt | 17 +++++++++++++++++ 5 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 requirements-test.txt diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 698029959..96e551617 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ If you use REST framework, we'd love you to be vocal about your experiences with Other really great ways you can help move the community forward include helping answer questions on the [discussion group][google-group], or setting up an [email alert on StackOverflow][so-filter] so that you get notified of any new questions with the `django-rest-framework` tag. -When answering questions make sure to help future contributors find their way around by hyperlinking wherever possible to related threads and tickets, and include backlinks from those items if relevant. +When answering questions make sure to help future contributors find their way around by hyperlinking wherever possible to related threads and tickets, and include backlinks from those items if relevant. ## Code of conduct @@ -38,7 +38,7 @@ Some tips on good issue reporting: ## Triaging issues -Getting involved in triaging incoming issues is a good way to start contributing. Every single ticket that comes into the ticket tracker needs to be reviewed in order to determine what the next steps should be. Anyone can help out with this, you just need to be willing to +Getting involved in triaging incoming issues is a good way to start contributing. Every single ticket that comes into the ticket tracker needs to be reviewed in order to determine what the next steps should be. Anyone can help out with this, you just need to be willing to * Read through the ticket - does it make sense, is it missing any context that would help explain it better? * Is the ticket reported in the correct place, would it be better suited as a discussion on the discussion group? @@ -62,7 +62,6 @@ To run the tests, clone the repository, and then: virtualenv env env/bin/activate pip install -r requirements.txt - pip install -r requirements-test.txt # Run the tests ./runtests.py @@ -130,8 +129,8 @@ There are a couple of conventions you should follow when working on the document Headers should use the hash style. For example: ### Some important topic - -The underline style should not be used. **Don't do this:** + +The underline style should not be used. **Don't do this:** Some important topic ==================== @@ -141,9 +140,9 @@ The underline style should not be used. **Don't do this:** Links should always use the reference style, with the referenced hyperlinks kept at the end of the document. Here is a link to [some other thing][other-thing]. - + More text... - + [other-thing]: http://example.com/other/thing This style helps keep the documentation source consistent and readable. @@ -159,9 +158,9 @@ Linking in this style means you'll be able to click the hyperlink in your markdo If you want to draw attention to a note or warning, use a pair of enclosing lines, like so: --- - + **Note:** A useful documentation note. - + --- # Third party packages diff --git a/docs/topics/contributing.md b/docs/topics/contributing.md index 99f4fc3c8..c9626ebff 100644 --- a/docs/topics/contributing.md +++ b/docs/topics/contributing.md @@ -62,7 +62,6 @@ To run the tests, clone the repository, and then: virtualenv env source env/bin/activate pip install -r requirements.txt - pip install -r requirements-test.txt # Run the tests ./runtests.py diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index efa0b91fe..0358d6148 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -93,7 +93,7 @@ The cookiecutter template includes a `runtests.py` which uses the `pytest` packa Before running, you'll need to install a couple test requirements. - $ pip install -r requirements-test.txt + $ pip install -r requirements.txt Once requirements installed, you can run `runtests.py`. diff --git a/requirements-test.txt b/requirements-test.txt deleted file mode 100644 index 06c8849a8..000000000 --- a/requirements-test.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Test requirements -pytest-django==2.6 -pytest==2.5.2 -pytest-cov==1.6 -flake8==2.2.2 - -# Optional packages -markdown>=2.1.0 -PyYAML>=3.10 -defusedxml>=0.3 -django-guardian==1.2.4 -django-filter>=0.5.4 -django-oauth-plus>=2.2.1 -oauth2>=1.5.211 -django-oauth2-provider>=0.2.4 diff --git a/requirements.txt b/requirements.txt index f284644a2..f282d3baf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,18 @@ +# Minimum Django version Django>=1.4.11 + +# Test requirements +pytest-django==2.6 +pytest==2.5.2 +pytest-cov==1.6 +flake8==2.2.2 + +# Optional packages +markdown>=2.1.0 +PyYAML>=3.10 +defusedxml>=0.3 +django-guardian==1.2.4 +django-filter>=0.5.4 +django-oauth-plus>=2.2.1 +oauth2>=1.5.211 +django-oauth2-provider>=0.2.4 From f4fc4670ca491eabd5bcdfcef382d8373dd5e380 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 2 Dec 2014 08:53:36 +0000 Subject: [PATCH 1212/1652] Promote 'many_init' to public API. Closes #2152. --- docs/api-guide/serializers.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 0ee80d53f..4c78473e3 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -689,6 +689,21 @@ Here's an example of how you might choose to implement multiple updates: It is possible that a third party package may be included alongside the 3.1 release that provides some automatic support for multiple update operations, similar to the `allow_add_remove` behavior that was present in REST framework 2. +#### Customizing ListSerializer initialization + +When a serializer with `many=True` is instantiated, we need to determine which arguments and keyword arguments should be passed to the `.__init__()` method for both the child `Serializer` class, and for the parent `ListSerializer` class. + +The default implementation is to pass all arguments to both classes, except for `validators`, and any custom keyword arguments, both of which are assumed to be intended for the child serializer class. + +Occasionally you might need to explicitly specify how the child and parent classes should be instantiated when `many=True` is passed. You can do so by using the `many_init` class method. + + @classmethod + def many_init(cls, *args, **kwargs): + # Instantiate the child serializer. + kwargs['child'] = cls() + # Instantiate the parent list serializer. + return CustomListSerializer(*args, **kwargs) + --- # BaseSerializer From 53f52765fc90472a05cbeb34760b45f735a7332c Mon Sep 17 00:00:00 2001 From: BrickXu <49068995@qq.com> Date: Tue, 2 Dec 2014 12:55:34 +0800 Subject: [PATCH 1213/1652] Not allow to pass an empty actions to viewset.as_view(). Refs issue #2171 --- rest_framework/viewsets.py | 6 ++++++ tests/test_viewsets.py | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 tests/test_viewsets.py diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py index 84b4bd8dd..70d14695b 100644 --- a/rest_framework/viewsets.py +++ b/rest_framework/viewsets.py @@ -48,6 +48,12 @@ class ViewSetMixin(object): # eg. 'List' or 'Instance'. cls.suffix = None + # actions must not be empty + if not actions: + raise TypeError("The `actions` argument must be provided when " + "calling `.as_view()` on a ViewSet. For example " + "`.as_view({'get': 'list'})`") + # sanitize keyword arguments for key in initkwargs: if key in cls.http_method_names: diff --git a/tests/test_viewsets.py b/tests/test_viewsets.py new file mode 100644 index 000000000..4d18a955d --- /dev/null +++ b/tests/test_viewsets.py @@ -0,0 +1,35 @@ +from django.test import TestCase +from rest_framework import status +from rest_framework.response import Response +from rest_framework.test import APIRequestFactory +from rest_framework.viewsets import GenericViewSet + + +factory = APIRequestFactory() + + +class BasicViewSet(GenericViewSet): + def list(self, request, *args, **kwargs): + return Response({'ACTION': 'LIST'}) + + +class InitializeViewSetsTestCase(TestCase): + def test_initialize_view_set_with_actions(self): + request = factory.get('/', '', content_type='application/json') + my_view = BasicViewSet.as_view(actions={ + 'get': 'list', + }) + + response = my_view(request) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data, {'ACTION': 'LIST'}) + + def test_initialize_view_set_with_empty_actions(self): + try: + BasicViewSet.as_view() + except TypeError as e: + self.assertEqual(str(e), "The `actions` argument must be provided " + "when calling `.as_view()` on a ViewSet. " + "For example `.as_view({'get': 'list'})`") + else: + self.fail("actions must not be empty.") From 6ac79b822325784ad145ff0ad064127750c4f7e0 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 2 Dec 2014 09:19:59 +0000 Subject: [PATCH 1214/1652] Document Field.fail(). Closes #2147. --- docs/api-guide/fields.md | 49 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 391a52e52..aa5cc84ea 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -453,7 +453,7 @@ If you want to create a custom field, you'll need to subclass `Field` and then o The `.to_representation()` method is called to convert the initial datatype into a primitive, serializable datatype. -The `to_internal_value()` method is called to restore a primitive datatype into its internal python representation. +The `to_internal_value()` method is called to restore a primitive datatype into its internal python representation. This method should raise a `serializer.ValidationError` if the data is invalid. Note that the `WritableField` class that was present in version 2.x no longer exists. You should subclass `Field` and override `to_internal_value()` if the field supports data input. @@ -498,6 +498,53 @@ As an example, let's create a field that can be used represent the class name of """ return obj.__class__.__name__ +#### Raising validation errors + +Our `ColorField` class above currently does not perform any data validation. +To indicate invalid data, we should raise a `serializers.ValidationError`, like so: + + def to_internal_value(self, data): + if not isinstance(data, six.text_type): + msg = 'Incorrect type. Expected a string, but got %s' + raise ValidationError(msg % type(data).__name__) + + if not re.match(r'^rgb\([0-9]+,[0-9]+,[0-9]+\)$', data): + raise ValidationError('Incorrect format. Expected `rgb(#,#,#)`.') + + data = data.strip('rgb(').rstrip(')') + red, green, blue = [int(col) for col in data.split(',')] + + if any([col > 255 or col < 0 for col in (red, green, blue)]): + raise ValidationError('Value out of range. Must be between 0 and 255.') + + return Color(red, green, blue) + +The `.fail()` method is a shortcut for raising `ValidationError` that takes a message string from the `error_messages` dictionary. For example: + + default_error_messages = { + 'incorrect_type': 'Incorrect type. Expected a string, but got {input_type}', + 'incorrect_format': 'Incorrect format. Expected `rgb(#,#,#)`.', + 'out_of_range': 'Value out of range. Must be between 0 and 255.' + } + + def to_internal_value(self, data): + if not isinstance(data, six.text_type): + msg = 'Incorrect type. Expected a string, but got %s' + self.fail('incorrect_type', input_type=type(data).__name__) + + if not re.match(r'^rgb\([0-9]+,[0-9]+,[0-9]+\)$', data): + self.fail('incorrect_format') + + data = data.strip('rgb(').rstrip(')') + red, green, blue = [int(col) for col in data.split(',')] + + if any([col > 255 or col < 0 for col in (red, green, blue)]): + self.fail('out_of_range') + + return Color(red, green, blue) + +This style keeps you error messages more cleanly separated from your code, and should be preferred. + # Third party packages The following third party packages are also available. From 79e18a2a06178e8c00dfafc1cfd062f2528ec2c1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 2 Dec 2014 09:27:40 +0000 Subject: [PATCH 1215/1652] Raise assertion error if calling .save() on a serializer with errors. Closes #2098. --- rest_framework/serializers.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 0d0a4d9a1..a4140c0fd 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -127,6 +127,14 @@ class BaseSerializer(Field): (self.__class__.__module__, self.__class__.__name__) ) + assert hasattr(self, '_errors'), ( + 'You must call `.is_valid()` before calling `.save()`.' + ) + + assert not self.errors, ( + 'You cannot call `.save()` on a serializer with invalid data.' + ) + validated_data = dict( list(self.validated_data.items()) + list(kwargs.items()) From 515060a6ab71e1ef22f4a1e03cb23dbad28a7b23 Mon Sep 17 00:00:00 2001 From: phalt <paulandrewhallett@gmail.com> Date: Tue, 2 Dec 2014 10:16:41 +0000 Subject: [PATCH 1216/1652] Only show pip install for httpie --- docs/tutorial/1-serialization.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 3ef651163..dc4fddf91 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -332,16 +332,12 @@ Quit out of the shell... In another terminal window, we can test the server. -We could use `curl`, but let's use a nicer tool called [httpie][httpie] to test our server. It has much nicer formatting and makes our output easier to read. This is especially useful when testing. +We can test our API using using `curl` or [httpie][httpie]. Httpie is a user friendly http client that's written in Python. Let's install that. You can install httpie on all operating systems using pip: pip install httpie -It can also be installed through [Homebrew][brew] on Mac: - - brew install httpie - Finally, we can get a list of all of the snippets: http http://127.0.0.1:8000/snippets/ --body From 76ac641fbd6c9d7dff5da3c551c3fd1ef7dedd2e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 2 Dec 2014 13:04:49 +0000 Subject: [PATCH 1217/1652] Minor tweaks for helpful message on Model.objects.create() failure. --- rest_framework/serializers.py | 23 ++++++++++++++--------- tests/test_model_serializer.py | 10 +++------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 143d205d6..d417ca806 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -35,7 +35,6 @@ from rest_framework.validators import ( ) import copy import inspect -import sys import warnings # Note: We do the following so that users of the framework can use this style: @@ -658,14 +657,20 @@ class ModelSerializer(Serializer): instance = ModelClass.objects.create(**validated_attrs) except TypeError as exc: msg = ( - 'The mentioned argument might be a field on the serializer ' - 'that is not part of the model. You need to override the ' - 'create() method in your ModelSerializer subclass to support ' - 'this.') - six.reraise( - type(exc), - type(exc)(str(exc) + '. ' + msg), - sys.exc_info()[2]) + 'Got a `TypeError` when calling `%s.objects.create()`. ' + 'This may be because you have a writable field on the ' + 'serializer class that is not a valid argument to ' + '`%s.objects.create()`. You may need to make the field ' + 'read-only, or override the %s.create() method to handle ' + 'this correctly.\nOriginal exception text was: %s.' % + ( + ModelClass.__name__, + ModelClass.__name__, + self.__class__.__name__, + exc + ) + ) + raise TypeError(msg) # Save many-to-many relationships after the instance is created. if many_to_many: diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 90767dac1..1bcd58e0d 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -10,7 +10,6 @@ from django.core.validators import MaxValueValidator, MinValueValidator, MinLeng from django.db import models from django.test import TestCase from rest_framework import serializers -import pytest def dedent(blocktext): @@ -87,13 +86,10 @@ class TestModelSerializer(TestCase): 'non_model_field': 'bar', }) serializer.is_valid() - with pytest.raises(TypeError): + with self.assertRaises(TypeError) as excinfo: serializer.save() - - try: - serializer.save() - except TypeError as exc: - assert 'ModelSerializer' in str(exc) + msginitial = 'Got a `TypeError` when calling `OneFieldModel.objects.create()`.' + assert str(excinfo.exception).startswith(msginitial) class TestRegularFieldMappings(TestCase): From e30e3f6dfc8cdb47c1048bbe497599d250d7bf75 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 2 Dec 2014 13:14:11 +0000 Subject: [PATCH 1218/1652] Update README with 3.0 info. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 31fe1e52e..95d05c9b5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Full documentation for the project is available at [http://www.django-rest-frame --- -**Note**: The incoming 3.0 version has now been merged to the `master` branch on GitHub. For the source of the currently available PyPI version, please see the `2.4.4` tag. +**Note**: We have now released Django REST framework 3.0. For older codebases you may want to refer to the version 2.4.4 [source code](https://github.com/tomchristie/django-rest-framework/tree/version-2.4.x), and [documentation](http://tomchristie.github.io/rest-framework-2-docs/). --- From 0359e9250d34e18aef2db6216f24c130a4f51fce Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 2 Dec 2014 13:52:46 +0000 Subject: [PATCH 1219/1652] FileUploadParser. Raising StopFutureHandlers removes any handlers not yet run for the active set. Closes #2109. --- rest_framework/parsers.py | 13 +++++++------ tests/test_parsers.py | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index ccb82f03b..d229abecc 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -256,23 +256,24 @@ class FileUploadParser(BaseParser): chunks = ChunkIter(stream, chunk_size) counters = [0] * len(upload_handlers) - for handler in upload_handlers: + for index, handler in enumerate(upload_handlers): try: handler.new_file(None, filename, content_type, content_length, encoding) except StopFutureHandlers: + upload_handlers = upload_handlers[:index + 1] break for chunk in chunks: - for i, handler in enumerate(upload_handlers): + for index, handler in enumerate(upload_handlers): chunk_length = len(chunk) - chunk = handler.receive_data_chunk(chunk, counters[i]) - counters[i] += chunk_length + chunk = handler.receive_data_chunk(chunk, counters[index]) + counters[index] += chunk_length if chunk is None: break - for i, handler in enumerate(upload_handlers): - file_obj = handler.file_complete(counters[i]) + for index, handler in enumerate(upload_handlers): + file_obj = handler.file_complete(counters[index]) if file_obj: return DataAndFiles(None, {'file': file_obj}) raise ParseError("FileUpload parse error - " diff --git a/tests/test_parsers.py b/tests/test_parsers.py index 3f2672df0..88eccef3a 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from rest_framework.compat import StringIO from django import forms from django.core.files.uploadhandler import MemoryFileUploadHandler from django.test import TestCase from django.utils import unittest from rest_framework.compat import etree +from rest_framework.compat import StringIO +from rest_framework.exceptions import ParseError from rest_framework.parsers import FormParser, FileUploadParser from rest_framework.parsers import XMLParser import datetime @@ -104,13 +105,40 @@ class TestFileUploadParser(TestCase): self.parser_context = {'request': request, 'kwargs': {}} def test_parse(self): - """ Make sure the `QueryDict` works OK """ + """ + Parse raw file upload. + """ parser = FileUploadParser() self.stream.seek(0) data_and_files = parser.parse(self.stream, None, self.parser_context) file_obj = data_and_files.files['file'] self.assertEqual(file_obj._size, 14) + def test_parse_missing_filename(self): + """ + Parse raw file upload when filename is missing. + """ + parser = FileUploadParser() + self.stream.seek(0) + self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = '' + with self.assertRaises(ParseError): + parser.parse(self.stream, None, self.parser_context) + + def test_parse_missing_filename_multiple_upload_handlers(self): + """ + Parse raw file upload with multiple handlers when filename is missing. + Regression test for #2109. + """ + parser = FileUploadParser() + self.stream.seek(0) + self.parser_context['request'].upload_handlers = ( + MemoryFileUploadHandler(), + MemoryFileUploadHandler() + ) + self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = '' + with self.assertRaises(ParseError): + parser.parse(self.stream, None, self.parser_context) + def test_get_filename(self): parser = FileUploadParser() filename = parser.get_filename(self.stream, None, self.parser_context) From 84cff98fbf72355cb5e8359aa1c9b5568c289cbf Mon Sep 17 00:00:00 2001 From: David Ray <davidray@gmail.com> Date: Tue, 2 Dec 2014 09:46:43 -0500 Subject: [PATCH 1220/1652] fix typo --- docs/api-guide/serializers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 4c78473e3..a011bb52e 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -96,7 +96,7 @@ If we want to be able to return complete object instances based on the validated If your object instances correspond to Django models you'll also want to ensure that these methods save the object to the database. For example, if `Comment` was a Django model, the methods might look like this: def create(self, validated_data): - return Comment.objcts.create(**validated_data) + return Comment.objects.create(**validated_data) def update(self, instance, validated_data): instance.email = validated_data.get('email', instance.email) From 33096a1de6c20581caab36bc1af0e686d47483e7 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 2 Dec 2014 15:15:21 +0000 Subject: [PATCH 1221/1652] BindingDict inherits from collections.MutableMapping. Closes #2135. --- rest_framework/utils/serializer_helpers.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py index 92d19857e..277cf6492 100644 --- a/rest_framework/utils/serializer_helpers.py +++ b/rest_framework/utils/serializer_helpers.py @@ -1,3 +1,4 @@ +import collections from rest_framework.compat import OrderedDict @@ -70,7 +71,7 @@ class NestedBoundField(BoundField): return BoundField(field, value, error, prefix=self.name + '.') -class BindingDict(object): +class BindingDict(collections.MutableMapping): """ This dict-like object is used to store fields on a serializer. @@ -92,11 +93,8 @@ class BindingDict(object): def __delitem__(self, key): del self.fields[key] - def items(self): - return self.fields.items() + def __iter__(self): + return iter(self.fields) - def keys(self): - return self.fields.keys() - - def values(self): - return self.fields.values() + def __len__(self): + return len(self.fields) From 5ad22aea605f888e06186d907674669c46a611ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Lang?= <shareman1204@gmail.com> Date: Tue, 2 Dec 2014 12:23:25 -0300 Subject: [PATCH 1222/1652] Updated serializers documentation There was an error in the docs: the field extra_field_kwargs of the serializer's Meta doesn't work. The field must be extra_kwargs instead. --- docs/api-guide/serializers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index a011bb52e..1779c863f 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -567,13 +567,13 @@ There needs to be a way of determining which views should be used for hyperlinki By default hyperlinks are expected to correspond to a view name that matches the style `'{model_name}-detail'`, and looks up the instance by a `pk` keyword argument. -You can override a URL field view name and lookup field by using either, or both of, the `view_name` and `lookup_field` options in the `extra_field_kwargs` setting, like so: +You can override a URL field view name and lookup field by using either, or both of, the `view_name` and `lookup_field` options in the `extra_kwargs` setting, like so: class AccountSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = Account fields = ('account_url', 'account_name', 'users', 'created') - extra_field_kwargs = { + extra_kwargs = { 'url': {'view_name': 'accounts', 'lookup_field': 'account_name'} 'users': {'lookup_field': 'username'} } From a17d5d2b0bff535dc1d7dcbd36947648e7a0511f Mon Sep 17 00:00:00 2001 From: phalt <paulandrewhallett@gmail.com> Date: Tue, 2 Dec 2014 16:11:43 +0000 Subject: [PATCH 1223/1652] remove unsused link --- docs/tutorial/1-serialization.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index dc4fddf91..ba2a0c328 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -390,4 +390,3 @@ We'll see how we can start to improve things in [part 2 of the tutorial][tut-2]. [virtualenv]: http://www.virtualenv.org/en/latest/index.html [tut-2]: 2-requests-and-responses.md [httpie]: https://github.com/jakubroztocil/httpie#installation -[brew]: http://brew.sh From 9397a653a4cfd6725616ea8e1b23093d3b0d59b5 Mon Sep 17 00:00:00 2001 From: eiriksm <eirik@morland.no> Date: Wed, 3 Dec 2014 09:22:42 +0100 Subject: [PATCH 1224/1652] Use svg version of travis build status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 95d05c9b5..b89575450 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -[build-status-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master +[build-status-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.svg?branch=master [travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master [pypi-version]: https://pypip.in/version/djangorestframework/badge.svg [pypi]: https://pypi.python.org/pypi/djangorestframework From 55528addf97c1d3ee24bb3332fb6dcb5496de158 Mon Sep 17 00:00:00 2001 From: Mark Hughes <markhughes@Marks-Second-Hand-iMac.local> Date: Wed, 3 Dec 2014 12:30:15 +0000 Subject: [PATCH 1225/1652] Added test to show potential issue with UniqueValidator being added to the underlying Django model. --- tests/test_validators.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/test_validators.py b/tests/test_validators.py index 1df0641c5..9226cc7a5 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -20,6 +20,15 @@ class UniquenessSerializer(serializers.ModelSerializer): model = UniquenessModel +class AnotherUniquenessModel(models.Model): + code = models.IntegerField(unique=True) + + +class AnotherUniquenessSerializer(serializers.ModelSerializer): + class Meta: + model = AnotherUniquenessModel + + class TestUniquenessValidation(TestCase): def setUp(self): self.instance = UniquenessModel.objects.create(username='existing') @@ -51,6 +60,17 @@ class TestUniquenessValidation(TestCase): assert serializer.is_valid() assert serializer.validated_data == {'username': 'existing'} + def test_doesnt_pollute_model(self): + instance = AnotherUniquenessModel.objects.create(code='100') + serializer = AnotherUniquenessSerializer(instance) + self.assertEqual( + AnotherUniquenessModel._meta.get_field('code').validators, []) + + # Accessing data shouldn't effect validators on the model + serializer.data + self.assertEqual( + AnotherUniquenessModel._meta.get_field('code').validators, []) + # Tests for `UniqueTogetherValidator` # ----------------------------------- From 74a9ece3dcf76372c26aaf3bdd6c48bbfbf45f99 Mon Sep 17 00:00:00 2001 From: eiriksm <eirik@morland.no> Date: Wed, 3 Dec 2014 13:37:56 +0100 Subject: [PATCH 1226/1652] Update build status icon on github pages page. --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index e0ba23328..52e42fc9a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -4,7 +4,7 @@ <a href="https://twitter.com/share" class="twitter-share-button" data-url="django-rest-framework.org" data-text="Checking out the totally awesome Django REST framework! http://www.django-rest-framework.org" data-count="none"></a> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="http://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> -<img src="https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master" class="travis-build-image"> +<img src="https://secure.travis-ci.org/tomchristie/django-rest-framework.svg?branch=master" class="travis-build-image"> </p> --- From 23fa6e54ce978055f7d4af5f5f99bc6f419f990b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 3 Dec 2014 22:33:34 +0000 Subject: [PATCH 1227/1652] Escape \u2028 and \u2029 in JSON output. Closes #2169. --- rest_framework/renderers.py | 5 +++++ tests/test_renderers.py | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index e87d16d0d..64ad5a065 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -102,6 +102,11 @@ class JSONRenderer(BaseRenderer): # and may (or may not) be unicode. # On python 3.x json.dumps() returns unicode strings. if isinstance(ret, six.text_type): + # We always fully escape \u2028 and \u2029 to ensure we output JSON + # that is a strict javascript subset. If bytes were returned + # by json.dumps() then we don't have these characters in any case. + # See: http://timelessrepo.com/json-isnt-a-javascript-subset + ret = ret.replace('\u2028', '\\u2028').replace('\u2029', '\\u2029') return bytes(ret.encode('utf-8')) return ret diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 416d7f224..61dd7c7af 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -384,6 +384,15 @@ class UnicodeJSONRendererTests(TestCase): content = renderer.render(obj, 'application/json') self.assertEqual(content, '{"countries":["United Kingdom","France","España"]}'.encode('utf-8')) + def test_u2028_u2029(self): + # The \u2028 and \u2029 characters should be escaped, + # even when the non-escaping unicode representation is used. + # Regression test for #2169 + obj = {'should_escape': '\u2028\u2029'} + renderer = JSONRenderer() + content = renderer.render(obj, 'application/json') + self.assertEqual(content, '{"should_escape":"\\u2028\\u2029"}'.encode('utf-8')) + class AsciiJSONRendererTests(TestCase): """ From f2dd05a6e661525908fe5ec99b52b5274b04a198 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 3 Dec 2014 22:43:40 +0000 Subject: [PATCH 1228/1652] Improved nested update test in update(). Closes #2194. --- rest_framework/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index d417ca806..b1175b5b1 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -681,8 +681,8 @@ class ModelSerializer(Serializer): def update(self, instance, validated_attrs): assert not any( - isinstance(field, BaseSerializer) and not field.read_only - for field in self.fields.values() + isinstance(field, BaseSerializer) and (key in validated_attrs) + for key, field in self.fields.values() ), ( 'The `.update()` method does not suport nested writable fields ' 'by default. Write an explicit `.update()` method for serializer ' From e1d98f77563abf49c4b19dcfb95f263515ae4087 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 3 Dec 2014 22:45:44 +0000 Subject: [PATCH 1229/1652] Improve nested update and create testing. --- rest_framework/serializers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b1175b5b1..c7f04b40c 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -633,8 +633,8 @@ class ModelSerializer(Serializer): # If we don't do this explicitly they'd likely get a confusing # error at the point of calling `Model.objects.create()`. assert not any( - isinstance(field, BaseSerializer) and not field.read_only - for field in self.fields.values() + isinstance(field, BaseSerializer) and (key in validated_attrs) + for key, field in self.fields.items() ), ( 'The `.create()` method does not suport nested writable fields ' 'by default. Write an explicit `.create()` method for serializer ' @@ -682,7 +682,7 @@ class ModelSerializer(Serializer): def update(self, instance, validated_attrs): assert not any( isinstance(field, BaseSerializer) and (key in validated_attrs) - for key, field in self.fields.values() + for key, field in self.fields.items() ), ( 'The `.update()` method does not suport nested writable fields ' 'by default. Write an explicit `.update()` method for serializer ' From ab25d706c78627dfd582fe9d142ada510c4d6d90 Mon Sep 17 00:00:00 2001 From: Martin Tschammer <martin@tschammer.dk> Date: Wed, 3 Dec 2014 23:52:35 +0100 Subject: [PATCH 1230/1652] Renamed validated_attrs to validated_data to be more in line with other similar code. --- docs/tutorial/1-serialization.md | 16 ++++++++-------- rest_framework/serializers.py | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index a3c19858d..52c75d2ca 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -110,21 +110,21 @@ The first thing we need to get started on our Web API is to provide a way of ser style = serializers.ChoiceField(choices=STYLE_CHOICES, default='friendly') - def create(self, validated_attrs): + def create(self, validated_data): """ Create and return a new `Snippet` instance, given the validated data. """ - return Snippet.objects.create(**validated_attrs) + return Snippet.objects.create(**validated_data) - def update(self, instance, validated_attrs): + def update(self, instance, validated_data): """ Update and return an existing `Snippet` instance, given the validated data. """ - instance.title = validated_attrs.get('title', instance.title) - instance.code = validated_attrs.get('code', instance.code) - instance.linenos = validated_attrs.get('linenos', instance.linenos) - instance.language = validated_attrs.get('language', instance.language) - instance.style = validated_attrs.get('style', instance.style) + instance.title = validated_data.get('title', instance.title) + instance.code = validated_data.get('code', instance.code) + instance.linenos = validated_data.get('linenos', instance.linenos) + instance.language = validated_data.get('language', instance.language) + instance.style = validated_data.get('style', instance.style) instance.save() return instance diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index d417ca806..a289b0211 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -608,20 +608,20 @@ class ModelSerializer(Serializer): }) _related_class = PrimaryKeyRelatedField - def create(self, validated_attrs): + def create(self, validated_data): """ We have a bit of extra checking around this in order to provide descriptive messages when something goes wrong, but this method is essentially just: - return ExampleModel.objects.create(**validated_attrs) + return ExampleModel.objects.create(**validated_data) If there are many to many fields present on the instance then they cannot be set until the model is instantiated, in which case the implementation is like so: - example_relationship = validated_attrs.pop('example_relationship') - instance = ExampleModel.objects.create(**validated_attrs) + example_relationship = validated_data.pop('example_relationship') + instance = ExampleModel.objects.create(**validated_data) instance.example_relationship = example_relationship return instance @@ -644,17 +644,17 @@ class ModelSerializer(Serializer): ModelClass = self.Meta.model - # Remove many-to-many relationships from validated_attrs. + # Remove many-to-many relationships from validated_data. # They are not valid arguments to the default `.create()` method, # as they require that the instance has already been saved. info = model_meta.get_field_info(ModelClass) many_to_many = {} for field_name, relation_info in info.relations.items(): - if relation_info.to_many and (field_name in validated_attrs): - many_to_many[field_name] = validated_attrs.pop(field_name) + if relation_info.to_many and (field_name in validated_data): + many_to_many[field_name] = validated_data.pop(field_name) try: - instance = ModelClass.objects.create(**validated_attrs) + instance = ModelClass.objects.create(**validated_data) except TypeError as exc: msg = ( 'Got a `TypeError` when calling `%s.objects.create()`. ' @@ -679,7 +679,7 @@ class ModelSerializer(Serializer): return instance - def update(self, instance, validated_attrs): + def update(self, instance, validated_data): assert not any( isinstance(field, BaseSerializer) and not field.read_only for field in self.fields.values() @@ -690,7 +690,7 @@ class ModelSerializer(Serializer): (self.__class__.__module__, self.__class__.__name__) ) - for attr, value in validated_attrs.items(): + for attr, value in validated_data.items(): setattr(instance, attr, value) instance.save() return instance From f8fdfe5a9379bd72066f7ac3a05198271a74088a Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Thu, 4 Dec 2014 00:03:08 +0100 Subject: [PATCH 1231/1652] Updated Django versions to match requirements --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index d5cb9ef94..933ee560e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py27-flake8, + py27-{flake8,docs}, {py26,py27}-django14, {py26,py27,py32,py33,py34}-django{15,16}, {py27,py32,py33,py34}-django{17,master} @@ -10,8 +10,8 @@ commands = ./runtests.py --fast setenv = PYTHONDONTWRITEBYTECODE=1 deps = - django14: Django==1.4.16 - django15: Django==1.5.11 + django14: Django==1.4.11 + django15: Django==1.5.5 django16: Django==1.6.8 django17: Django==1.7.1 djangomaster: https://github.com/django/django/zipball/master From 09e59f268619927dc22f15fed97c3ceac05ea306 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Thu, 4 Dec 2014 02:50:25 +0100 Subject: [PATCH 1232/1652] Removed custom python_2_unicode_compatible. Closes #2183 --- rest_framework/authtoken/models.py | 5 +++- rest_framework/compat.py | 42 +++++++++--------------------- rest_framework/utils/mediatypes.py | 5 ++-- tests/test_description.py | 5 ++-- tests/test_relations_generic.py | 2 +- 5 files changed, 21 insertions(+), 38 deletions(-) diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index db21d44c3..a1a9315fa 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -1,7 +1,9 @@ import binascii import os + from django.conf import settings from django.db import models +from django.utils.encoding import python_2_unicode_compatible # Prior to Django 1.5, the AUTH_USER_MODEL setting does not exist. @@ -11,6 +13,7 @@ from django.db import models AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User') +@python_2_unicode_compatible class Token(models.Model): """ The default authorization token model. @@ -35,5 +38,5 @@ class Token(models.Model): def generate_key(self): return binascii.hexlify(os.urandom(20)).decode() - def __unicode__(self): + def __str__(self): return self.key diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 5bd85e743..eefaf22e1 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -6,11 +6,12 @@ versions of django/python, and compatibility wrappers around optional packages. # flake8: noqa from __future__ import unicode_literals +import inspect + from django.core.exceptions import ImproperlyConfigured from django.conf import settings from django.utils import six import django -import inspect # Handle django.utils.encoding rename in 1.5 onwards. @@ -49,7 +50,6 @@ try: except ImportError: django_filters = None - if django.VERSION >= (1, 6): def clean_manytomany_helptext(text): return text @@ -123,7 +123,6 @@ else: return [m.upper() for m in self.http_method_names if hasattr(self, m)] - # MinValueValidator, MaxValueValidator et al. only accept `message` in 1.8+ if django.VERSION >= (1, 8): from django.core.validators import MinValueValidator, MaxValueValidator @@ -187,6 +186,7 @@ if 'patch' not in View.http_method_names: # RequestFactory only provides `generic` from 1.5 onwards from django.test.client import RequestFactory as DjangoRequestFactory from django.test.client import FakePayload + try: # In 1.5 the test client uses force_bytes from django.utils.encoding import force_bytes as force_bytes_or_smart_bytes @@ -194,21 +194,22 @@ except ImportError: # In 1.4 the test client just uses smart_str from django.utils.encoding import smart_str as force_bytes_or_smart_bytes + class RequestFactory(DjangoRequestFactory): def generic(self, method, path, data='', content_type='application/octet-stream', **extra): parsed = urlparse.urlparse(path) data = force_bytes_or_smart_bytes(data, settings.DEFAULT_CHARSET) r = { - 'PATH_INFO': self._get_path(parsed), - 'QUERY_STRING': force_text(parsed[4]), + 'PATH_INFO': self._get_path(parsed), + 'QUERY_STRING': force_text(parsed[4]), 'REQUEST_METHOD': six.text_type(method), } if data: r.update({ 'CONTENT_LENGTH': len(data), - 'CONTENT_TYPE': six.text_type(content_type), - 'wsgi.input': FakePayload(data), + 'CONTENT_TYPE': six.text_type(content_type), + 'wsgi.input': FakePayload(data), }) elif django.VERSION <= (1, 4): # For 1.3 we need an empty WSGI payload @@ -287,10 +288,12 @@ try: import provider as oauth2_provider from provider import scope as oauth2_provider_scope from provider import constants as oauth2_constants + if oauth2_provider.__version__ in ('0.2.3', '0.2.4'): # 0.2.3 and 0.2.4 are supported version that do not support # timezone aware datetimes import datetime + provider_now = datetime.datetime.now else: # Any other supported version does use timezone aware datetimes @@ -301,7 +304,7 @@ except ImportError: oauth2_constants = None provider_now = None -# `seperators` argument to `json.dumps()` differs between 2.x and 3.x +# `separators` argument to `json.dumps()` differs between 2.x and 3.x # See: http://bugs.python.org/issue22767 if six.PY3: SHORT_SEPARATORS = (',', ':') @@ -316,30 +319,9 @@ from django.utils.functional import Promise if six.PY3: def is_non_str_iterable(obj): - if (isinstance(obj, str) or - (isinstance(obj, Promise) and obj._delegate_text)): + if isinstance(obj, str) or (isinstance(obj, Promise) and obj._delegate_text): return False return hasattr(obj, '__iter__') else: def is_non_str_iterable(obj): return hasattr(obj, '__iter__') - - -try: - from django.utils.encoding import python_2_unicode_compatible -except ImportError: - def python_2_unicode_compatible(klass): - """ - A decorator that defines __unicode__ and __str__ methods under Python 2. - Under Python 3 it does nothing. - - To support Python 2 and 3 with a single code base, define a __str__ method - returning text and apply this decorator to the class. - """ - if '__str__' not in klass.__dict__: - raise ValueError("@python_2_unicode_compatible cannot be applied " - "to %s because it doesn't define __str__()." % - klass.__name__) - klass.__unicode__ = klass.__str__ - klass.__str__ = lambda self: self.__unicode__().encode('utf-8') - return klass diff --git a/rest_framework/utils/mediatypes.py b/rest_framework/utils/mediatypes.py index 87b3cc6a3..de2931c28 100644 --- a/rest_framework/utils/mediatypes.py +++ b/rest_framework/utils/mediatypes.py @@ -5,6 +5,7 @@ See http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7 """ from __future__ import unicode_literals from django.http.multipartparser import parse_header +from django.utils.encoding import python_2_unicode_compatible from rest_framework import HTTP_HEADER_ENCODING @@ -43,6 +44,7 @@ def order_by_precedence(media_type_lst): return [media_types for media_types in ret if media_types] +@python_2_unicode_compatible class _MediaType(object): def __init__(self, media_type_str): if media_type_str is None: @@ -79,9 +81,6 @@ class _MediaType(object): return 3 def __str__(self): - return self.__unicode__().encode('utf-8') - - def __unicode__(self): ret = "%s/%s" % (self.main_type, self.sub_type) for key, val in self.params.items(): ret += "; %s=%s" % (key, val) diff --git a/tests/test_description.py b/tests/test_description.py index 0675d209c..6cd871ed0 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals from django.test import TestCase +from django.utils.encoding import python_2_unicode_compatible from rest_framework.compat import apply_markdown, smart_text from rest_framework.views import APIView from .description import ViewWithNonASCIICharactersInDocstring @@ -107,6 +108,7 @@ class TestViewNamesAndDescriptions(TestCase): """ # use a mock object instead of gettext_lazy to ensure that we can't end # up with a test case string in our l10n catalog + @python_2_unicode_compatible class MockLazyStr(object): def __init__(self, string): self.s = string @@ -114,9 +116,6 @@ class TestViewNamesAndDescriptions(TestCase): def __str__(self): return self.s - def __unicode__(self): - return self.s - class MockView(APIView): __doc__ = MockLazyStr("a gettext string") diff --git a/tests/test_relations_generic.py b/tests/test_relations_generic.py index 380ad91db..b600b3333 100644 --- a/tests/test_relations_generic.py +++ b/tests/test_relations_generic.py @@ -3,8 +3,8 @@ from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.generic import GenericRelation, GenericForeignKey from django.db import models from django.test import TestCase +from django.utils.encoding import python_2_unicode_compatible from rest_framework import serializers -from rest_framework.compat import python_2_unicode_compatible @python_2_unicode_compatible From d54c67d79d0f5661ef33d860efe80a4272e22b3e Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Thu, 4 Dec 2014 03:11:42 +0100 Subject: [PATCH 1233/1652] Removed custom StringIO, force_text, smart_text compat --- rest_framework/compat.py | 34 ++----------------- rest_framework/exceptions.py | 2 +- rest_framework/fields.py | 4 +-- rest_framework/metadata.py | 7 ++-- rest_framework/parsers.py | 3 +- rest_framework/relations.py | 3 +- rest_framework/renderers.py | 6 ++-- rest_framework/request.py | 2 +- rest_framework/templatetags/rest_framework.py | 4 +-- rest_framework/utils/encoders.py | 3 +- rest_framework/utils/representation.py | 2 +- rest_framework/views.py | 3 +- tests/test_description.py | 4 +-- tests/test_parsers.py | 2 +- tests/test_renderers.py | 4 ++- 15 files changed, 31 insertions(+), 52 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index eefaf22e1..91723b45a 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -9,31 +9,19 @@ from __future__ import unicode_literals import inspect from django.core.exceptions import ImproperlyConfigured +from django.utils.encoding import force_text from django.conf import settings from django.utils import six import django -# Handle django.utils.encoding rename in 1.5 onwards. -# smart_unicode -> smart_text -# force_unicode -> force_text -try: - from django.utils.encoding import smart_text -except ImportError: - from django.utils.encoding import smart_unicode as smart_text -try: - from django.utils.encoding import force_text -except ImportError: - from django.utils.encoding import force_unicode as force_text - - # OrderedDict only available in Python 2.7. # This will always be the case in Django 1.7 and above, as these versions # no longer support Python 2.6. # For Django <= 1.6 and Python 2.6 fall back to OrderedDict. try: from collections import OrderedDict -except: +except ImportError: from django.utils.datastructures import SortedDict as OrderedDict @@ -72,21 +60,13 @@ if 'guardian' in settings.INSTALLED_APPS: pass -# cStringIO only if it's available, otherwise StringIO -try: - import cStringIO.StringIO as StringIO -except ImportError: - StringIO = six.StringIO - -BytesIO = six.BytesIO - - # urlparse compat import (Required because it changed in python 3.x) try: from urllib import parse as urlparse except ImportError: import urlparse + # UserDict moves in Python 3 try: from UserDict import UserDict @@ -104,14 +84,6 @@ def get_model_name(model_cls): return model_cls._meta.module_name -def get_concrete_model(model_cls): - try: - return model_cls._meta.concrete_model - except AttributeError: - # 1.3 does not include concrete model - return model_cls - - # View._allowed_methods only present from 1.5 onwards if django.VERSION >= (1, 5): from django.views.generic import View diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 906de3b04..be41d08d9 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -5,11 +5,11 @@ In addition Django's built in 403 and 404 exceptions are handled. (`django.http.Http404` and `django.core.exceptions.PermissionDenied`) """ from __future__ import unicode_literals +from django.utils.encoding import force_text from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy from rest_framework import status -from rest_framework.compat import force_text import math diff --git a/rest_framework/fields.py b/rest_framework/fields.py index ca9c479f0..37adbe16f 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -5,11 +5,11 @@ from django.core.validators import RegexValidator from django.forms import ImageField as DjangoImageField from django.utils import six, timezone from django.utils.dateparse import parse_date, parse_datetime, parse_time -from django.utils.encoding import is_protected_type +from django.utils.encoding import is_protected_type, smart_text from django.utils.translation import ugettext_lazy as _ from rest_framework import ISO_8601 from rest_framework.compat import ( - smart_text, EmailValidator, MinValueValidator, MaxValueValidator, + EmailValidator, MinValueValidator, MaxValueValidator, MinLengthValidator, MaxLengthValidator, URLValidator, OrderedDict ) from rest_framework.exceptions import ValidationError diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py index de829d003..3b058fabb 100644 --- a/rest_framework/metadata.py +++ b/rest_framework/metadata.py @@ -1,17 +1,18 @@ """ -The metadata API is used to allow cusomization of how `OPTIONS` requests +The metadata API is used to allow customization of how `OPTIONS` requests are handled. We currently provide a single default implementation that returns some fairly ad-hoc information about the view. -Future implementations might use JSON schema or other definations in order +Future implementations might use JSON schema or other definitions in order to return this information in a more standardized way. """ from __future__ import unicode_literals from django.core.exceptions import PermissionDenied from django.http import Http404 +from django.utils.encoding import force_text from rest_framework import exceptions, serializers -from rest_framework.compat import force_text, OrderedDict +from rest_framework.compat import OrderedDict from rest_framework.request import clone_request from rest_framework.utils.field_mapping import ClassLookupDict diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index d229abecc..7b9483624 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -12,7 +12,8 @@ from django.http import QueryDict from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter from django.utils import six -from rest_framework.compat import etree, yaml, force_text, urlparse +from django.utils.encoding import force_text +from rest_framework.compat import etree, yaml, urlparse from rest_framework.exceptions import ParseError from rest_framework import renderers import json diff --git a/rest_framework/relations.py b/rest_framework/relations.py index d1ea497aa..b889acc82 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -1,4 +1,5 @@ -from rest_framework.compat import smart_text, urlparse +from django.utils.encoding import smart_text +from rest_framework.compat import urlparse from rest_framework.fields import get_attribute, empty, Field from rest_framework.reverse import reverse from rest_framework.utils import html diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index e87d16d0d..ee34ffae1 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -16,11 +16,11 @@ from django.http.multipartparser import parse_header from django.template import Context, RequestContext, loader, Template from django.test.client import encode_multipart from django.utils import six +from django.utils.encoding import smart_text from django.utils.xmlutils import SimplerXMLGenerator +from django.utils.six.moves import StringIO from rest_framework import exceptions, serializers, status, VERSION -from rest_framework.compat import ( - SHORT_SEPARATORS, LONG_SEPARATORS, StringIO, smart_text, yaml -) +from rest_framework.compat import SHORT_SEPARATORS, LONG_SEPARATORS, yaml from rest_framework.exceptions import ParseError from rest_framework.settings import api_settings from rest_framework.request import is_form_media_type, override_method diff --git a/rest_framework/request.py b/rest_framework/request.py index d7e746743..20e049ed3 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -14,9 +14,9 @@ from django.http import QueryDict from django.http.multipartparser import parse_header from django.utils.datastructures import MultiValueDict from django.utils.datastructures import MergeDict as DjangoMergeDict +from django.utils.six import BytesIO from rest_framework import HTTP_HEADER_ENCODING from rest_framework import exceptions -from rest_framework.compat import BytesIO from rest_framework.settings import api_settings import warnings diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index f1825a24b..f86864391 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -3,11 +3,11 @@ from django import template from django.core.urlresolvers import reverse, NoReverseMatch from django.http import QueryDict from django.utils import six -from django.utils.encoding import iri_to_uri +from django.utils.encoding import iri_to_uri, force_text from django.utils.html import escape from django.utils.safestring import SafeData, mark_safe from django.utils.html import smart_urlquote -from rest_framework.compat import urlparse, force_text +from rest_framework.compat import urlparse from rest_framework.renderers import HTMLFormRenderer import re diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 4d6bb3a34..adc83e574 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -4,8 +4,9 @@ Helper classes for parsers. from __future__ import unicode_literals from django.db.models.query import QuerySet from django.utils import six, timezone +from django.utils.encoding import force_text from django.utils.functional import Promise -from rest_framework.compat import force_text, OrderedDict +from rest_framework.compat import OrderedDict import datetime import decimal import types diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py index 2a7c46753..3f17a8b9b 100644 --- a/rest_framework/utils/representation.py +++ b/rest_framework/utils/representation.py @@ -3,8 +3,8 @@ Helper functions for creating user-friendly representations of serializer classes and serializer fields. """ from django.db import models +from django.utils.encoding import force_text from django.utils.functional import Promise -from rest_framework.compat import force_text import re diff --git a/rest_framework/views.py b/rest_framework/views.py index 292431c8a..bc870417f 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -5,9 +5,10 @@ from __future__ import unicode_literals from django.core.exceptions import PermissionDenied from django.http import Http404 +from django.utils.encoding import smart_text from django.views.decorators.csrf import csrf_exempt from rest_framework import status, exceptions -from rest_framework.compat import smart_text, HttpResponseBase, View +from rest_framework.compat import HttpResponseBase, View from rest_framework.request import Request from rest_framework.response import Response from rest_framework.settings import api_settings diff --git a/tests/test_description.py b/tests/test_description.py index 6cd871ed0..78ce2350b 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals from django.test import TestCase -from django.utils.encoding import python_2_unicode_compatible -from rest_framework.compat import apply_markdown, smart_text +from django.utils.encoding import python_2_unicode_compatible, smart_text +from rest_framework.compat import apply_markdown from rest_framework.views import APIView from .description import ViewWithNonASCIICharactersInDocstring from .description import UTF8_TEST_DOCSTRING diff --git a/tests/test_parsers.py b/tests/test_parsers.py index 88eccef3a..d28d8bd43 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -5,8 +5,8 @@ from django import forms from django.core.files.uploadhandler import MemoryFileUploadHandler from django.test import TestCase from django.utils import unittest +from django.utils.six.moves import StringIO from rest_framework.compat import etree -from rest_framework.compat import StringIO from rest_framework.exceptions import ParseError from rest_framework.parsers import FormParser, FileUploadParser from rest_framework.parsers import XMLParser diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 416d7f224..22eb5459b 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -7,9 +7,11 @@ from django.core.cache import cache from django.db import models from django.test import TestCase from django.utils import six, unittest +from django.utils.six import BytesIO +from django.utils.six.moves import StringIO from django.utils.translation import ugettext_lazy as _ from rest_framework import status, permissions -from rest_framework.compat import yaml, etree, StringIO, BytesIO +from rest_framework.compat import yaml, etree from rest_framework.response import Response from rest_framework.views import APIView from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \ From 71e1a3942e7945fe4d8da4c44b4ba2100a2c67de Mon Sep 17 00:00:00 2001 From: Carlton Gibson <carlton.gibson@noumenal.co.uk> Date: Thu, 4 Dec 2014 12:15:14 +0100 Subject: [PATCH 1234/1652] Initial link from Serializers to Validators --- docs/api-guide/serializers.md | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 1779c863f..69fc18571 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -104,7 +104,7 @@ If your object instances correspond to Django models you'll also want to ensure instance.created = validated_data.get('created', instance.created) instance.save() return instance - + Now when deserializing data, we can call `.save()` to return an object instance, based on the validated data. comment = serializer.save() @@ -113,7 +113,7 @@ Calling `.save()` will either create a new instance, or update an existing insta # .save() will create a new instance. serializer = CommentSerializer(data=data) - + # .save() will update the existing `comment` instance. serializer = CommentSerializer(comment, data=data) @@ -140,7 +140,7 @@ For example: class ContactForm(serializers.Serializer): email = serializers.EmailField() message = serializers.CharField() - + def save(self): email = self.validated_data['email'] message = self.validated_data['message'] @@ -230,7 +230,7 @@ Serializer classes can also include reusable validators that are applied to the name = serializers.CharField() room_number = serializers.IntegerField(choices=[101, 102, 103, 201]) date = serializers.DateField() - + class Meta: # Each room only has one event per day. validators = UniqueTogetherValidator( @@ -448,7 +448,7 @@ To do so, open the Django shell, using `python manage.py shell`, then import the id = IntegerField(label='ID', read_only=True) name = CharField(allow_blank=True, max_length=100, required=False) owner = PrimaryKeyRelatedField(queryset=User.objects.all()) - + ## Specifying which fields should be included If you only want a subset of the default fields to be used in a model serializer, you can do so using `fields` or `exclude` options, just as you would with a `ModelForm`. @@ -505,6 +505,19 @@ This option should be a list or tuple of field names, and is declared as follows Model fields which have `editable=False` set, and `AutoField` fields will be set to read-only by default, and do not need to be added to the `read_only_fields` option. +--- + +**Note**: There is a special-case where a read-only field is part of a `unique_together` constraint at the model level. Here you **must** specify the field explicitly and provide a valid default value. + +A common example of this is a read-only relation to currently authenticated `User` which is `unique_together` with another identifier. In this case you would declare the user field like so: + + user = serializers.PrimaryKeyRelatedField(read_only=True, default=serializers.CurrentUserDefault()) + +Please review the [Validators Documentation](/api-guide/validators/) for details on the [UniqueTogetherValidator](/api-guide/validators/#uniquetogethervalidator) and [CurrentUserDefault](/api-guide/validators/#currentuserdefault) classes. + +--- + + ## Specifying additional keyword arguments for fields. There is also a shortcut allowing you to specify arbitrary additional keyword arguments on fields, using the `extra_kwargs` option. Similarly to `read_only_fields` this means you do not need to explicitly declare the field on the serializer. @@ -516,7 +529,7 @@ This option is a dictionary, mapping field names to a dictionary of keyword argu model = User fields = ('email', 'username', 'password') extra_kwargs = {'password': {'write_only': True}} - + def create(self, validated_data): user = User( email=validated_data['email'], @@ -656,7 +669,7 @@ To support multiple updates you'll need to do so explicitly. When writing your m * How do you determine which instance should be updated for each item in the list of data? * How should insertions be handled? Are they invalid, or do they create new objects? * How should removals be handled? Do they imply object deletion, or removing a relationship? Should they be silently ignored, or are they invalid? -* How should ordering be handled? Does changing the position of two items imply any state change or is it ignored? +* How should ordering be handled? Does changing the position of two items imply any state change or is it ignored? Here's an example of how you might choose to implement multiple updates: From fcbae5d99f93a28c9aac340bf2d4d2a3930e1a6a Mon Sep 17 00:00:00 2001 From: phalt <paulandrewhallett@gmail.com> Date: Thu, 4 Dec 2014 11:20:33 +0000 Subject: [PATCH 1235/1652] updates based on suggestions --- docs/tutorial/1-serialization.md | 9 ++++++--- docs/tutorial/2-requests-and-responses.md | 4 +++- docs/tutorial/quickstart.md | 11 +++++------ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index ba2a0c328..5b1ae6e80 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -332,9 +332,9 @@ Quit out of the shell... In another terminal window, we can test the server. -We can test our API using using `curl` or [httpie][httpie]. Httpie is a user friendly http client that's written in Python. Let's install that. +We can test our API using using [curl][curl] or [httpie][httpie]. Httpie is a user friendly http client that's written in Python. Let's install that. -You can install httpie on all operating systems using pip: +You can install httpie using pip: pip install httpie @@ -363,8 +363,10 @@ Finally, we can get a list of all of the snippets: Or we can get a particular snippet by referencing its id: - http http://127.0.0.1:8000/snippets/2/ --body + http http://127.0.0.1:8000/snippets/2/ + HTTP/1.1 200 OK + ... { "id": 2, "title": "", @@ -390,3 +392,4 @@ We'll see how we can start to improve things in [part 2 of the tutorial][tut-2]. [virtualenv]: http://www.virtualenv.org/en/latest/index.html [tut-2]: 2-requests-and-responses.md [httpie]: https://github.com/jakubroztocil/httpie#installation +[curl]: http://curl.haxx.se diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index dcaf7c0c2..08746cd78 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -127,8 +127,10 @@ Go ahead and test the API from the command line, as we did in [tutorial part 1][ We can get a list of all of the snippets, as before. - http http://127.0.0.1:8000/snippets/ --body + http http://127.0.0.1:8000/snippets/ + HTTP/1.1 200 OK + ... [ { "id": 1, diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 41e864ccd..43220ce8b 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -24,10 +24,6 @@ Create a new Django project named `tutorial`, then start a new app called `quick django-admin.py startapp quickstart cd .. -Optionally, install [httpie][httpie] for tastier HTTP requests: - - pip install httpie - Now sync your database for the first time: python manage.py migrate @@ -163,9 +159,12 @@ We can now access our API, both from the command-line, using tools like `curl`.. ] } -Or with [httpie][httpie], a tastier version of `curl`... +Or using the [httpie][httpie], command line tool... - bash: http -a username:password http://127.0.0.1:8000/users/ --body + bash: http -a username:password http://127.0.0.1:8000/users/ + + HTTP/1.1 200 OK + ... { "count": 2, "next": null, From 6ee361332b09f148f86149a7d9a6220bd61966e8 Mon Sep 17 00:00:00 2001 From: Carlton Gibson <carlton.gibson@noumenal.co.uk> Date: Thu, 4 Dec 2014 14:15:01 +0100 Subject: [PATCH 1236/1652] Add missing definite article --- docs/api-guide/serializers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 69fc18571..79db275fd 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -509,7 +509,7 @@ Model fields which have `editable=False` set, and `AutoField` fields will be set **Note**: There is a special-case where a read-only field is part of a `unique_together` constraint at the model level. Here you **must** specify the field explicitly and provide a valid default value. -A common example of this is a read-only relation to currently authenticated `User` which is `unique_together` with another identifier. In this case you would declare the user field like so: +A common example of this is a read-only relation to the currently authenticated `User` which is `unique_together` with another identifier. In this case you would declare the user field like so: user = serializers.PrimaryKeyRelatedField(read_only=True, default=serializers.CurrentUserDefault()) From 95af92ca01435c32f4374d26eb448f964d77c81a Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Thu, 4 Dec 2014 15:47:42 +0100 Subject: [PATCH 1237/1652] Removed custom urlparse compat --- rest_framework/compat.py | 8 +------- rest_framework/parsers.py | 3 ++- rest_framework/relations.py | 2 +- rest_framework/templatetags/rest_framework.py | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 91723b45a..c58aa4ce4 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -10,6 +10,7 @@ import inspect from django.core.exceptions import ImproperlyConfigured from django.utils.encoding import force_text +from django.utils.six.moves.urllib import parse as urlparse from django.conf import settings from django.utils import six import django @@ -60,13 +61,6 @@ if 'guardian' in settings.INSTALLED_APPS: pass -# urlparse compat import (Required because it changed in python 3.x) -try: - from urllib import parse as urlparse -except ImportError: - import urlparse - - # UserDict moves in Python 3 try: from UserDict import UserDict diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index 7b9483624..3e3395c0c 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -12,8 +12,9 @@ from django.http import QueryDict from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser from django.http.multipartparser import MultiPartParserError, parse_header, ChunkIter from django.utils import six +from django.utils.six.moves.urllib import parse as urlparse from django.utils.encoding import force_text -from rest_framework.compat import etree, yaml, urlparse +from rest_framework.compat import etree, yaml from rest_framework.exceptions import ParseError from rest_framework import renderers import json diff --git a/rest_framework/relations.py b/rest_framework/relations.py index b889acc82..d0cd3154e 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -1,5 +1,4 @@ from django.utils.encoding import smart_text -from rest_framework.compat import urlparse from rest_framework.fields import get_attribute, empty, Field from rest_framework.reverse import reverse from rest_framework.utils import html @@ -7,6 +6,7 @@ from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch, Resolver404 from django.db.models.query import QuerySet from django.utils import six +from django.utils.six.moves.urllib import parse as urlparse from django.utils.translation import ugettext_lazy as _ diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index f86864391..69e03af40 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -3,11 +3,11 @@ from django import template from django.core.urlresolvers import reverse, NoReverseMatch from django.http import QueryDict from django.utils import six +from django.utils.six.moves.urllib import parse as urlparse from django.utils.encoding import iri_to_uri, force_text from django.utils.html import escape from django.utils.safestring import SafeData, mark_safe from django.utils.html import smart_urlquote -from rest_framework.compat import urlparse from rest_framework.renderers import HTMLFormRenderer import re From 001884a1927f6ceaa60dcc2a4df3422f94455311 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Thu, 4 Dec 2014 16:06:43 +0100 Subject: [PATCH 1238/1652] Removed unused compat code --- rest_framework/compat.py | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index c58aa4ce4..71520b928 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -61,15 +61,6 @@ if 'guardian' in settings.INSTALLED_APPS: pass -# UserDict moves in Python 3 -try: - from UserDict import UserDict - from UserDict import DictMixin -except ImportError: - from collections import UserDict - from collections import MutableMapping as DictMixin - - def get_model_name(model_cls): try: return model_cls._meta.model_name @@ -177,11 +168,6 @@ class RequestFactory(DjangoRequestFactory): 'CONTENT_TYPE': six.text_type(content_type), 'wsgi.input': FakePayload(data), }) - elif django.VERSION <= (1, 4): - # For 1.3 we need an empty WSGI payload - r.update({ - 'wsgi.input': FakePayload('') - }) r.update(extra) return self.request(**r) @@ -278,16 +264,3 @@ if six.PY3: else: SHORT_SEPARATORS = (b',', b':') LONG_SEPARATORS = (b', ', b': ') - - -# Handle lazy strings across Py2/Py3 -from django.utils.functional import Promise - -if six.PY3: - def is_non_str_iterable(obj): - if isinstance(obj, str) or (isinstance(obj, Promise) and obj._delegate_text): - return False - return hasattr(obj, '__iter__') -else: - def is_non_str_iterable(obj): - return hasattr(obj, '__iter__') From 38e05e66c932fc2967cefbd88225bcdc2b0313a7 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Thu, 4 Dec 2014 23:22:00 +0100 Subject: [PATCH 1239/1652] print() function works from Python 2.6 to 3.X --- docs/tutorial/1-serialization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 52c75d2ca..b704996d1 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -210,7 +210,7 @@ One nice property that serializers have is that you can inspect all the fields i >>> from snippets.serializers import SnippetSerializer >>> serializer = SnippetSerializer() - >>> print repr(serializer) # In python 3 use `print(repr(serializer))` + >>> print(repr(serializer)) SnippetSerializer(): id = IntegerField(label='ID', read_only=True) title = CharField(allow_blank=True, max_length=100, required=False) From 9d078be59ca5067d098263b1892740b44f7c41ee Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Thu, 4 Dec 2014 23:34:55 +0100 Subject: [PATCH 1240/1652] Fix the tutorial against the v3.0 --- docs/tutorial/1-serialization.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index b704996d1..eb0a00c01 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -101,7 +101,7 @@ The first thing we need to get started on our Web API is to provide a way of ser class SnippetSerializer(serializers.Serializer): pk = serializers.IntegerField(read_only=True) - title = serializers.CharField(required=False, + title = serializers.CharField(required=False, allow_blank=True max_length=100) code = serializers.CharField(style={'type': 'textarea'}) linenos = serializers.BooleanField(required=False) @@ -181,7 +181,7 @@ Deserialization is similar. First we parse a stream into Python native datatype serializer = SnippetSerializer(data=data) serializer.is_valid() # True - serializer.object + serializer.save() # <Snippet: Snippet object> Notice how similar the API is to working with forms. The similarity should become even more apparent when we start writing views that use our serializer. @@ -301,7 +301,7 @@ We'll also need a view which corresponds to an individual snippet, and can be us Finally we need to wire these views up. Create the `snippets/urls.py` file: - from django.conf.urls import patterns, url + from django.conf.urls import url from snippets import views urlpatterns = [ From d9930181ee157f51e2fcea33a3af5ea397647324 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Fri, 5 Dec 2014 00:29:28 +0100 Subject: [PATCH 1241/1652] Removed unused imports, pep8 fixes, typo fixes --- CONTRIBUTING.md | 4 ++-- rest_framework/authentication.py | 2 +- rest_framework/permissions.py | 2 +- rest_framework/relations.py | 2 +- rest_framework/renderers.py | 4 +++- rest_framework/serializers.py | 33 +++++++++++++--------------- rest_framework/settings.py | 2 +- rest_framework/validators.py | 2 +- rest_framework/viewsets.py | 6 ++--- runtests.py | 5 +++++ tests/test_multitable_inheritance.py | 2 +- tests/test_request.py | 2 +- tests/test_validators.py | 2 +- 13 files changed, 36 insertions(+), 32 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 96e551617..b963a4993 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,7 +33,7 @@ Some tips on good issue reporting: * When describing issues try to phrase your ticket in terms of the *behavior* you think needs changing rather than the *code* you think need changing. * Search the issue list first for related items, and make sure you're running the latest version of REST framework before reporting an issue. * If reporting a bug, then try to include a pull request with a failing test case. This will help us quickly identify if there is a valid issue, and make sure that it gets fixed more quickly if there is one. -* Feature requests will often be closed with a recommendation that they be implemented outside of the core REST framework library. Keeping new feature requests implemented as third party libraries allows us to keep down the maintainence overhead of REST framework, so that the focus can be on continued stability, bugfixes, and great documentation. +* Feature requests will often be closed with a recommendation that they be implemented outside of the core REST framework library. Keeping new feature requests implemented as third party libraries allows us to keep down the maintenance overhead of REST framework, so that the focus can be on continued stability, bugfixes, and great documentation. * Closing an issue doesn't necessarily mean the end of a discussion. If you believe your issue has been closed incorrectly, explain why and we'll consider if it needs to be reopened. ## Triaging issues @@ -82,7 +82,7 @@ GitHub's documentation for working on pull requests is [available here][pull-req Always run the tests before submitting pull requests, and ideally run `tox` in order to check that your modifications are compatible with both Python 2 and Python 3, and that they run properly on all supported versions of Django. -Once you've made a pull request take a look at the travis build status in the GitHub interface and make sure the tests are runnning as you'd expect. +Once you've made a pull request take a look at the travis build status in the GitHub interface and make sure the tests are running as you'd expect. ![Travis status][travis-status] diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 36d74dd9b..4832ad33b 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -267,7 +267,7 @@ class OAuthAuthentication(BaseAuthentication): def authenticate_header(self, request): """ If permission is denied, return a '401 Unauthorized' response, - with an appropraite 'WWW-Authenticate' header. + with an appropriate 'WWW-Authenticate' header. """ return 'OAuth realm="%s"' % self.www_authenticate_realm diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 29f60d6de..3f6f59610 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -184,7 +184,7 @@ class DjangoObjectPermissions(DjangoModelPermissions): if not user.has_perms(perms, obj): # If the user does not have permissions we need to determine if # they have read permissions to see 403, or not, and simply see - # a 404 reponse. + # a 404 response. if request.method in ('GET', 'OPTIONS', 'HEAD'): # Read permissions already checked and failed, no need diff --git a/rest_framework/relations.py b/rest_framework/relations.py index d0cd3154e..178a8e2b0 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -142,7 +142,7 @@ class PrimaryKeyRelatedField(RelatedField): def get_iterable(self, instance, source_attrs): # For consistency with `get_attribute` we're using `serializable_value()` # here. Typically there won't be any difference, but some custom field - # types might return a non-primative value for the pk otherwise. + # types might return a non-primitive value for the pk otherwise. # # We could try to get smart with `values_list('pk', flat=True)`, which # would be better in some case, but would actually end up with *more* diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 4ffd46e39..46126d913 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -282,7 +282,9 @@ class TemplateHTMLRenderer(BaseRenderer): return view.get_template_names() elif hasattr(view, 'template_name'): return [view.template_name] - raise ImproperlyConfigured('Returned a template response with no `template_name` attribute set on either the view or response') + raise ImproperlyConfigured( + 'Returned a template response with no `template_name` attribute set on either the view or response' + ) def get_exception_template(self, response): template_names = [name % {'status_code': response.status_code} diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index af8aeb484..e1851ddd7 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -10,17 +10,13 @@ python primitives. 2. The process of marshalling between python primitives and request and response content is handled by parsers and renderers. """ -from django.core.exceptions import ImproperlyConfigured -from django.core.exceptions import ValidationError as DjangoValidationError +import warnings + from django.db import models from django.db.models.fields import FieldDoesNotExist -from django.utils import six from django.utils.translation import ugettext_lazy as _ -from rest_framework.compat import OrderedDict -from rest_framework.exceptions import ValidationError -from rest_framework.fields import empty, set_value, Field, SkipField -from rest_framework.settings import api_settings -from rest_framework.utils import html, model_meta, representation + +from rest_framework.utils import model_meta from rest_framework.utils.field_mapping import ( get_url_kwargs, get_field_kwargs, get_relation_kwargs, get_nested_relation_kwargs, @@ -33,9 +29,7 @@ from rest_framework.validators import ( UniqueForDateValidator, UniqueForMonthValidator, UniqueForYearValidator, UniqueTogetherValidator ) -import copy -import inspect -import warnings + # Note: We do the following so that users of the framework can use this style: # @@ -65,6 +59,7 @@ class BaseSerializer(Field): The BaseSerializer class provides a minimal class which may be used for writing custom serializer implementations. """ + def __init__(self, instance=None, data=None, **kwargs): self.instance = instance self._initial_data = data @@ -245,7 +240,7 @@ class Serializer(BaseSerializer): """ A dictionary of {field_name: field_instance}. """ - # `fields` is evalutated lazily. We do this to ensure that we don't + # `fields` is evaluated lazily. We do this to ensure that we don't # have issues importing modules that use ModelSerializers as fields, # even if Django's app-loading stage has not yet run. if not hasattr(self, '_fields'): @@ -343,7 +338,7 @@ class Serializer(BaseSerializer): # Normally you should raise `serializers.ValidationError` # inside your codebase, but we handle Django's validation # exception class as well for simpler compat. - # Eg. Calling Model.clean() explictily inside Serializer.validate() + # Eg. Calling Model.clean() explicitly inside Serializer.validate() raise ValidationError({ api_settings.NON_FIELD_ERRORS_KEY: list(exc.messages) }) @@ -576,7 +571,7 @@ class ModelSerializer(Serializer): The process of automatically determining a set of serializer fields based on the model fields is reasonably complex, but you almost certainly - don't need to dig into the implemention. + don't need to dig into the implementation. If the `ModelSerializer` class *doesn't* generate the set of fields that you need you should either declare the extra/differing fields explicitly on @@ -636,7 +631,7 @@ class ModelSerializer(Serializer): isinstance(field, BaseSerializer) and (key in validated_attrs) for key, field in self.fields.items() ), ( - 'The `.create()` method does not suport nested writable fields ' + 'The `.create()` method does not support nested writable fields ' 'by default. Write an explicit `.create()` method for serializer ' '`%s.%s`, or set `read_only=True` on nested serializer fields.' % (self.__class__.__module__, self.__class__.__name__) @@ -684,7 +679,7 @@ class ModelSerializer(Serializer): isinstance(field, BaseSerializer) and (key in validated_attrs) for key, field in self.fields.items() ), ( - 'The `.update()` method does not suport nested writable fields ' + 'The `.update()` method does not support nested writable fields ' 'by default. Write an explicit `.update()` method for serializer ' '`%s.%s`, or set `read_only=True` on nested serializer fields.' % (self.__class__.__module__, self.__class__.__name__) @@ -824,7 +819,7 @@ class ModelSerializer(Serializer): # applied, we can add the extra 'required=...' or 'default=...' # arguments that are appropriate to these fields, or add a `HiddenField` for it. for unique_constraint_name in unique_constraint_names: - # Get the model field that is refered too. + # Get the model field that is referred too. unique_constraint_field = model._meta.get_field(unique_constraint_name) if getattr(unique_constraint_field, 'auto_now_add', None): @@ -907,7 +902,7 @@ class ModelSerializer(Serializer): ) # Check that any fields declared on the class are - # also explicity included in `Meta.fields`. + # also explicitly included in `Meta.fields`. missing_fields = set(declared_fields.keys()) - set(fields) if missing_fields: missing_field = list(missing_fields)[0] @@ -1001,6 +996,7 @@ class ModelSerializer(Serializer): class Meta: model = relation_info.related depth = nested_depth + return NestedSerializer @@ -1027,4 +1023,5 @@ class HyperlinkedModelSerializer(ModelSerializer): class Meta: model = relation_info.related depth = nested_depth + return NestedSerializer diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 1e8c27fc3..79da23ca4 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -47,7 +47,7 @@ DEFAULTS = { 'DEFAULT_CONTENT_NEGOTIATION_CLASS': 'rest_framework.negotiation.DefaultContentNegotiation', 'DEFAULT_METADATA_CLASS': 'rest_framework.metadata.SimpleMetadata', - # Genric view behavior + # Generic view behavior 'DEFAULT_MODEL_SERIALIZER_CLASS': 'rest_framework.serializers.ModelSerializer', 'DEFAULT_PAGINATION_SERIALIZER_CLASS': 'rest_framework.pagination.PaginationSerializer', 'DEFAULT_FILTER_BACKENDS': (), diff --git a/rest_framework/validators.py b/rest_framework/validators.py index 7ca4e6a9b..63eb7b225 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -4,7 +4,7 @@ the using Django's `.full_clean()`. This gives us better separation of concerns, allows us to use single-step object creation, and makes it possible to switch between using the implicit -`ModelSerializer` class and an equivelent explicit `Serializer` class. +`ModelSerializer` class and an equivalent explicit `Serializer` class. """ from django.utils.translation import ugettext_lazy as _ from rest_framework.exceptions import ValidationError diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py index 70d14695b..88c763da4 100644 --- a/rest_framework/viewsets.py +++ b/rest_framework/viewsets.py @@ -44,7 +44,7 @@ class ViewSetMixin(object): instantiated view, we need to totally reimplement `.as_view`, and slightly modify the view function that is created and returned. """ - # The suffix initkwarg is reserved for identifing the viewset type + # The suffix initkwarg is reserved for identifying the viewset type # eg. 'List' or 'Instance'. cls.suffix = None @@ -98,12 +98,12 @@ class ViewSetMixin(object): view.suffix = initkwargs.get('suffix', None) return csrf_exempt(view) - def initialize_request(self, request, *args, **kargs): + def initialize_request(self, request, *args, **kwargs): """ Set the `.action` attribute on the view, depending on the request method. """ - request = super(ViewSetMixin, self).initialize_request(request, *args, **kargs) + request = super(ViewSetMixin, self).initialize_request(request, *args, **kwargs) self.action = self.action_map.get(request.method.lower()) return request diff --git a/runtests.py b/runtests.py index 4da05ac37..abf15a623 100755 --- a/runtests.py +++ b/runtests.py @@ -17,24 +17,29 @@ FLAKE8_ARGS = ['rest_framework', 'tests', '--ignore=E501'] sys.path.append(os.path.dirname(__file__)) + def exit_on_failure(ret, message=None): if ret: sys.exit(ret) + def flake8_main(args): print('Running flake8 code linting') ret = subprocess.call(['flake8'] + args) print('flake8 failed' if ret else 'flake8 passed') return ret + def split_class_and_function(string): class_string, function_string = string.split('.', 1) return "%s and %s" % (class_string, function_string) + def is_function(string): # `True` if it looks like a test function is included in the string. return string.startswith('test_') or '.test_' in string + def is_class(string): # `True` if first character is uppercase - assume it's a class name. return string[0] == string[0].upper() diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py index ce1bf3ea3..e1b40cc74 100644 --- a/tests/test_multitable_inheritance.py +++ b/tests/test_multitable_inheritance.py @@ -31,7 +31,7 @@ class AssociatedModelSerializer(serializers.ModelSerializer): # Tests -class IneritedModelSerializationTests(TestCase): +class InheritedModelSerializationTests(TestCase): def test_multitable_inherited_model_fields_as_expected(self): """ diff --git a/tests/test_request.py b/tests/test_request.py index 44afd2438..7cf8c3271 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -187,7 +187,7 @@ class MockView(APIView): if request.POST.get('example') is not None: return Response(status=status.HTTP_200_OK) - return Response(status=status.INTERNAL_SERVER_ERROR) + return Response(status=status.HTTP_500_INTERNAL_SERVER_ERROR) urlpatterns = patterns( '', diff --git a/tests/test_validators.py b/tests/test_validators.py index 1df0641c5..5d92b2841 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -148,7 +148,7 @@ class TestUniquenessTogetherValidation(TestCase): def test_ignore_excluded_fields(self): """ When model fields are not included in a serializer, then uniqueness - validtors should not be added for that field. + validators should not be added for that field. """ class ExcludedFieldSerializer(serializers.ModelSerializer): class Meta: From d68c61450440a522b08b64fdd21028cc739e6ead Mon Sep 17 00:00:00 2001 From: BrickXu <49068995@qq.com> Date: Fri, 5 Dec 2014 14:50:53 +0800 Subject: [PATCH 1242/1652] Add validation for fields & exclude type. --- rest_framework/serializers.py | 6 +++ tests/test_serializer_metaclass.py | 62 ++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 tests/test_serializer_metaclass.py diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index af8aeb484..96cd51e38 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -759,6 +759,12 @@ class ModelSerializer(Serializer): depth = getattr(self.Meta, 'depth', 0) extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) + if fields and not isinstance(fields, (list, tuple)): + raise TypeError('`fields` must be a list or tuple') + + if exclude and not isinstance(exclude, (list, tuple)): + raise TypeError('`exclude` must be a list or tuple') + assert not (fields and exclude), "Cannot set both 'fields' and 'exclude'." extra_kwargs = self._include_additional_options(extra_kwargs) diff --git a/tests/test_serializer_metaclass.py b/tests/test_serializer_metaclass.py new file mode 100644 index 000000000..bd2fbed7b --- /dev/null +++ b/tests/test_serializer_metaclass.py @@ -0,0 +1,62 @@ +from django.test import TestCase +from rest_framework import serializers +from .models import BasicModel + + +class TestSerializerMetaClass(TestCase): + def setUp(self): + class FieldsSerializer(serializers.ModelSerializer): + text = serializers.CharField() + + class Meta: + model = BasicModel + fields = ('text') + + class ExcludeSerializer(serializers.ModelSerializer): + text = serializers.CharField() + + class Meta: + model = BasicModel + exclude = ('text') + + class FieldsAndExcludeSerializer(serializers.ModelSerializer): + text = serializers.CharField() + + class Meta: + model = BasicModel + fields = ('text',) + exclude = ('text',) + + self.fields_serializer = FieldsSerializer + self.exclude_serializer = ExcludeSerializer + self.faeSerializer = FieldsAndExcludeSerializer + + def test_meta_class_fields(self): + object = BasicModel(text="Hello World.") + serializer = self.fields_serializer(instance=object) + + with self.assertRaises(TypeError) as result: + serializer.data + + exception = result.exception + self.assertEqual(str(exception), "`fields` must be a list or tuple") + + def test_meta_class_exclude(self): + object = BasicModel(text="Hello World.") + serializer = self.exclude_serializer(instance=object) + + with self.assertRaises(TypeError) as result: + serializer.data + + exception = result.exception + self.assertEqual(str(exception), "`exclude` must be a list or tuple") + + def test_meta_class_fields_and_exclude(self): + object = BasicModel(text="Hello World.") + serializer = self.faeSerializer(instance=object) + + with self.assertRaises(AssertionError) as result: + serializer.data + + exception = result.exception + self.assertEqual(str(exception), "Cannot set both 'fields' and 'exclude'.") From e2b39088345e564a06ce332b740215600c29e481 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 5 Dec 2014 09:44:01 +0000 Subject: [PATCH 1243/1652] Fix quickstart tutorial --- docs/tutorial/quickstart.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 3e1ce0a9b..d0703381b 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -19,10 +19,9 @@ Create a new Django project named `tutorial`, then start a new app called `quick pip install djangorestframework # Set up a new project with a single application - django-admin.py startproject tutorial + django-admin.py startproject tutorial . cd tutorial django-admin.py startapp quickstart - cd .. Now sync your database for the first time: From 1b8c06aefe33f178610d2c4195a72637757698e8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 5 Dec 2014 12:46:08 +0000 Subject: [PATCH 1244/1652] Style tweaks in examples --- docs/tutorial/1-serialization.md | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index eb0a00c01..fc1b87f92 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -16,7 +16,6 @@ The tutorial is fairly in-depth, so you should probably get a cookie and a cup o Before we do anything else we'll create a new virtual environment, using [virtualenv]. This will make sure our package configuration is kept nicely isolated from any other projects we're working on. - :::bash virtualenv env source env/bin/activate @@ -75,12 +74,8 @@ For the purposes of this tutorial we're going to start by creating a simple `Sni title = models.CharField(max_length=100, blank=True, default='') code = models.TextField() linenos = models.BooleanField(default=False) - language = models.CharField(choices=LANGUAGE_CHOICES, - default='python', - max_length=100) - style = models.CharField(choices=STYLE_CHOICES, - default='friendly', - max_length=100) + language = models.CharField(choices=LANGUAGE_CHOICES, default='python', max_length=100) + style = models.CharField(choices=STYLE_CHOICES, default='friendly', max_length=100) class Meta: ordering = ('created',) @@ -101,14 +96,11 @@ The first thing we need to get started on our Web API is to provide a way of ser class SnippetSerializer(serializers.Serializer): pk = serializers.IntegerField(read_only=True) - title = serializers.CharField(required=False, allow_blank=True - max_length=100) + title = serializers.CharField(required=False, allow_blank=True, max_length=100) code = serializers.CharField(style={'type': 'textarea'}) linenos = serializers.BooleanField(required=False) - language = serializers.ChoiceField(choices=LANGUAGE_CHOICES, - default='python') - style = serializers.ChoiceField(choices=STYLE_CHOICES, - default='friendly') + language = serializers.ChoiceField(choices=LANGUAGE_CHOICES, default='python') + style = serializers.ChoiceField(choices=STYLE_CHOICES, default='friendly') def create(self, validated_data): """ From b7b0fd3e146648ba2dc03621edd979abaebcb3b3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 5 Dec 2014 12:48:12 +0000 Subject: [PATCH 1245/1652] Added .validated_data usage. Closes #2214. --- docs/tutorial/1-serialization.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index fc1b87f92..3621f01b0 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -173,6 +173,8 @@ Deserialization is similar. First we parse a stream into Python native datatype serializer = SnippetSerializer(data=data) serializer.is_valid() # True + serializer.validated_data + # OrderedDict([('title', ''), ('code', 'print "hello, world"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]) serializer.save() # <Snippet: Snippet object> From 9fb1b396db751234a531dabacb6758ac2645776c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 5 Dec 2014 13:07:31 +0000 Subject: [PATCH 1246/1652] user in example should have been instance. Closees #2191. --- docs/api-guide/serializers.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 1779c863f..ab44839f3 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -326,9 +326,9 @@ Here's an example for an `update()` method on our previous `UserSerializer` clas # would need to be handled. profile = instance.profile - user.username = validated_data.get('username', instance.username) - user.email = validated_data.get('email', instance.email) - user.save() + instance.username = validated_data.get('username', instance.username) + instance.email = validated_data.get('email', instance.email) + instance.save() profile.is_premium_member = profile_data.get( 'is_premium_member', @@ -340,7 +340,7 @@ Here's an example for an `update()` method on our previous `UserSerializer` clas ) profile.save() - return user + return instance Because the behavior of nested creates and updates can be ambiguous, and may require complex dependancies between related models, REST framework 3 requires you to always write these methods explicitly. The default `ModelSerializer` `.create()` and `.update()` methods do not include support for writable nested representations. From 59b2ad542580eb93243c4403ded4c2b4dc8518c2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 5 Dec 2014 13:23:14 +0000 Subject: [PATCH 1247/1652] Minor docs tweaks --- docs/api-guide/serializers.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 1f97614dd..5fe6b4c29 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -507,9 +507,11 @@ Model fields which have `editable=False` set, and `AutoField` fields will be set --- -**Note**: There is a special-case where a read-only field is part of a `unique_together` constraint at the model level. Here you **must** specify the field explicitly and provide a valid default value. +**Note**: There is a special-case where a read-only field is part of a `unique_together` constraint at the model level. In this case the field is required by the serializer class in order to validate the constraint, but should also not be editable by the user. -A common example of this is a read-only relation to the currently authenticated `User` which is `unique_together` with another identifier. In this case you would declare the user field like so: +The right way to deal with this is to specify the field explicitly on the serializer, providing both the `read_only=True` and `default=…` keyword arguments. + +One example of this is a read-only relation to the currently authenticated `User` which is `unique_together` with another identifier. In this case you would declare the user field like so: user = serializers.PrimaryKeyRelatedField(read_only=True, default=serializers.CurrentUserDefault()) From ca74fa989dd5a3236894736c838fe0a21c312e2a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 5 Dec 2014 13:50:28 +0000 Subject: [PATCH 1248/1652] Better serializer errors for nested writes. Closes #2202 --- rest_framework/serializers.py | 81 ++++++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 21 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index e1851ddd7..68d0b8cce 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -561,6 +561,64 @@ class ListSerializer(BaseSerializer): # ModelSerializer & HyperlinkedModelSerializer # -------------------------------------------- +def raise_errors_on_nested_writes(method_name, serializer): + """ + Give explicit errors when users attempt to pass writable nested data. + + If we don't do this explicitly they'd get a less helpful error when + calling `.save()` on the serializer. + + We don't *automatically* support these sorts of nested writes brecause + there are too many ambiguities to define a default behavior. + + Eg. Suppose we have a `UserSerializer` with a nested profile. How should + we handle the case of an update, where the `profile` realtionship does + not exist? Any of the following might be valid: + + * Raise an application error. + * Silently ignore the nested part of the update. + * Automatically create a profile instance. + """ + + # Ensure we don't have a writable nested field. For example: + # + # class UserSerializer(ModelSerializer): + # ... + # profile = ProfileSerializer() + assert not any( + isinstance(field, BaseSerializer) and (key in validated_attrs) + for key, field in serializer.fields.items() + ), ( + 'The `.{method_name}()` method does not support nested writable ' + 'fields by default. Write an explicit `.{method_name}()` method for ' + 'serializer `{module}.{class_name}`, or set `read_only=True` on ' + 'nested serializer fields.'.format( + method_name=method_name, + module=serializer.__class__.__module__, + class_name=serializer.__class__.__name__ + ) + ) + + # Ensure we don't have a writable dotted-source field. For example: + # + # class UserSerializer(ModelSerializer): + # ... + # address = serializer.CharField('profile.address') + assert not any( + '.' in field.source and (key in validated_attrs) + for key, field in serializer.fields.items() + ), ( + 'The `.{method_name}()` method does not support writable dotted-source ' + 'fields by default. Write an explicit `.{method_name}()` method for ' + 'serializer `{module}.{class_name}`, or set `read_only=True` on ' + 'dotted-source serializer fields.'.format( + method_name=method_name, + module=serializer.__class__.__module__, + class_name=serializer.__class__.__name__ + ) + ) + + class ModelSerializer(Serializer): """ A `ModelSerializer` is just a regular `Serializer`, except that: @@ -624,18 +682,7 @@ class ModelSerializer(Serializer): If you want to support writable nested relationships you'll need to write an explicit `.create()` method. """ - # Check that the user isn't trying to handle a writable nested field. - # If we don't do this explicitly they'd likely get a confusing - # error at the point of calling `Model.objects.create()`. - assert not any( - isinstance(field, BaseSerializer) and (key in validated_attrs) - for key, field in self.fields.items() - ), ( - 'The `.create()` method does not support nested writable fields ' - 'by default. Write an explicit `.create()` method for serializer ' - '`%s.%s`, or set `read_only=True` on nested serializer fields.' % - (self.__class__.__module__, self.__class__.__name__) - ) + raise_errors_on_nested_writes('create', self) ModelClass = self.Meta.model @@ -675,15 +722,7 @@ class ModelSerializer(Serializer): return instance def update(self, instance, validated_data): - assert not any( - isinstance(field, BaseSerializer) and (key in validated_attrs) - for key, field in self.fields.items() - ), ( - 'The `.update()` method does not support nested writable fields ' - 'by default. Write an explicit `.update()` method for serializer ' - '`%s.%s`, or set `read_only=True` on nested serializer fields.' % - (self.__class__.__module__, self.__class__.__name__) - ) + raise_errors_on_nested_writes('update', self) for attr, value in validated_data.items(): setattr(instance, attr, value) From 88900a0844f1b0cd996235ae0f99105563ae6473 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 5 Dec 2014 13:58:39 +0000 Subject: [PATCH 1249/1652] Minor tweaks --- rest_framework/serializers.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 68d0b8cce..c022cad31 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -589,8 +589,8 @@ def raise_errors_on_nested_writes(method_name, serializer): isinstance(field, BaseSerializer) and (key in validated_attrs) for key, field in serializer.fields.items() ), ( - 'The `.{method_name}()` method does not support nested writable ' - 'fields by default. Write an explicit `.{method_name}()` method for ' + 'The `.{method_name}()` method does not support writable nested' + 'fields by default.\nWrite an explicit `.{method_name}()` method for ' 'serializer `{module}.{class_name}`, or set `read_only=True` on ' 'nested serializer fields.'.format( method_name=method_name, @@ -609,7 +609,7 @@ def raise_errors_on_nested_writes(method_name, serializer): for key, field in serializer.fields.items() ), ( 'The `.{method_name}()` method does not support writable dotted-source ' - 'fields by default. Write an explicit `.{method_name}()` method for ' + 'fields by default.\nWrite an explicit `.{method_name}()` method for ' 'serializer `{module}.{class_name}`, or set `read_only=True` on ' 'dotted-source serializer fields.'.format( method_name=method_name, @@ -727,6 +727,7 @@ class ModelSerializer(Serializer): for attr, value in validated_data.items(): setattr(instance, attr, value) instance.save() + return instance def get_validators(self): From 544967f36ed6e29819018428d48da00de74958b9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 5 Dec 2014 14:15:58 +0000 Subject: [PATCH 1250/1652] Test tweaks --- rest_framework/serializers.py | 10 ++++- tests/test_model_serializer.py | 50 ++++++++++++++++++++++++ tests/test_serializer_metaclass.py | 62 ------------------------------ 3 files changed, 58 insertions(+), 64 deletions(-) delete mode 100644 tests/test_serializer_metaclass.py diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 8784b303a..d8e544d47 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -795,10 +795,16 @@ class ModelSerializer(Serializer): extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) if fields and not isinstance(fields, (list, tuple)): - raise TypeError('`fields` must be a list or tuple') + raise TypeError( + 'The `fields` option must be a list or tuple. Got %s.' % + type(fields).__name__ + ) if exclude and not isinstance(exclude, (list, tuple)): - raise TypeError('`exclude` must be a list or tuple') + raise TypeError( + 'The `exclude` option must be a list or tuple. Got %s.' % + type(exclude).__name__ + ) assert not (fields and exclude), "Cannot set both 'fields' and 'exclude'." diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 1bcd58e0d..da79164af 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -559,3 +559,53 @@ class TestBulkCreate(TestCase): # Serializer returns correct data. assert serializer.data == data + + +class TestMetaClassModel(models.Model): + text = models.CharField(max_length=100) + + +class TestSerializerMetaClass(TestCase): + def test_meta_class_fields_option(self): + class ExampleSerializer(serializers.ModelSerializer): + class Meta: + model = TestMetaClassModel + fields = 'text' + + with self.assertRaises(TypeError) as result: + ExampleSerializer().fields + + exception = result.exception + assert str(exception).startswith( + "The `fields` option must be a list or tuple" + ) + + def test_meta_class_exclude_option(self): + class ExampleSerializer(serializers.ModelSerializer): + class Meta: + model = TestMetaClassModel + exclude = 'text' + + with self.assertRaises(TypeError) as result: + ExampleSerializer().fields + + exception = result.exception + assert str(exception).startswith( + "The `exclude` option must be a list or tuple" + ) + + def test_meta_class_fields_and_exclude_options(self): + class ExampleSerializer(serializers.ModelSerializer): + class Meta: + model = TestMetaClassModel + fields = ('text',) + exclude = ('text',) + + with self.assertRaises(AssertionError) as result: + ExampleSerializer().fields + + exception = result.exception + self.assertEqual( + str(exception), + "Cannot set both 'fields' and 'exclude'." + ) diff --git a/tests/test_serializer_metaclass.py b/tests/test_serializer_metaclass.py deleted file mode 100644 index bd2fbed7b..000000000 --- a/tests/test_serializer_metaclass.py +++ /dev/null @@ -1,62 +0,0 @@ -from django.test import TestCase -from rest_framework import serializers -from .models import BasicModel - - -class TestSerializerMetaClass(TestCase): - def setUp(self): - class FieldsSerializer(serializers.ModelSerializer): - text = serializers.CharField() - - class Meta: - model = BasicModel - fields = ('text') - - class ExcludeSerializer(serializers.ModelSerializer): - text = serializers.CharField() - - class Meta: - model = BasicModel - exclude = ('text') - - class FieldsAndExcludeSerializer(serializers.ModelSerializer): - text = serializers.CharField() - - class Meta: - model = BasicModel - fields = ('text',) - exclude = ('text',) - - self.fields_serializer = FieldsSerializer - self.exclude_serializer = ExcludeSerializer - self.faeSerializer = FieldsAndExcludeSerializer - - def test_meta_class_fields(self): - object = BasicModel(text="Hello World.") - serializer = self.fields_serializer(instance=object) - - with self.assertRaises(TypeError) as result: - serializer.data - - exception = result.exception - self.assertEqual(str(exception), "`fields` must be a list or tuple") - - def test_meta_class_exclude(self): - object = BasicModel(text="Hello World.") - serializer = self.exclude_serializer(instance=object) - - with self.assertRaises(TypeError) as result: - serializer.data - - exception = result.exception - self.assertEqual(str(exception), "`exclude` must be a list or tuple") - - def test_meta_class_fields_and_exclude(self): - object = BasicModel(text="Hello World.") - serializer = self.faeSerializer(instance=object) - - with self.assertRaises(AssertionError) as result: - serializer.data - - exception = result.exception - self.assertEqual(str(exception), "Cannot set both 'fields' and 'exclude'.") From e4820d611bb17e33bf466c2a6dedcce7548d8d21 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Sat, 6 Dec 2014 10:53:24 +0100 Subject: [PATCH 1251/1652] Fix the new Django default db name PrimaryKeyRelatedField now needs a queryset argument. urls now don't use urlpatterns. --- docs/tutorial/4-authentication-and-permissions.md | 4 ++-- docs/tutorial/5-relationships-and-hyperlinked-apis.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 4e4edeeac..43c1953eb 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -43,7 +43,7 @@ And now we can add a `.save()` method to our model class: When that's all done we'll need to update our database tables. Normally we'd create a database migration in order to do that, but for the purposes of this tutorial, let's just delete the database and start again. - rm tmp.db + rm -f tmp.db db.sqlite3 rm -r snippets/migrations python manage.py makemigrations snippets python manage.py migrate @@ -59,7 +59,7 @@ Now that we've got some users to work with, we'd better add representations of t from django.contrib.auth.models import User class UserSerializer(serializers.ModelSerializer): - snippets = serializers.PrimaryKeyRelatedField(many=True) + snippets = serializers.PrimaryKeyRelatedField(many=True, queryset=Snippet.objects.all()) class Meta: model = User diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 50552616b..58422929a 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -44,7 +44,7 @@ Instead of using a concrete generic view, we'll use the base class for represent As usual we need to add the new views that we've created in to our URLconf. We'll add a url pattern for our new API root in `snippets/urls.py`: - url(r'^$', 'api_root'), + url(r'^$', views.api_root), And then add a url pattern for the snippet highlights: From a257b04928f07656ac4541e0a3fae0afad2848bb Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Sun, 7 Dec 2014 12:12:40 +0100 Subject: [PATCH 1252/1652] Fix missing validated_data in `raise_errors_on_nested_writes` (#2221) --- rest_framework/serializers.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index d8e544d47..39523077a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -561,7 +561,7 @@ class ListSerializer(BaseSerializer): # ModelSerializer & HyperlinkedModelSerializer # -------------------------------------------- -def raise_errors_on_nested_writes(method_name, serializer): +def raise_errors_on_nested_writes(method_name, serializer, validated_data): """ Give explicit errors when users attempt to pass writable nested data. @@ -586,7 +586,7 @@ def raise_errors_on_nested_writes(method_name, serializer): # ... # profile = ProfileSerializer() assert not any( - isinstance(field, BaseSerializer) and (key in validated_attrs) + isinstance(field, BaseSerializer) and (key in validated_data) for key, field in serializer.fields.items() ), ( 'The `.{method_name}()` method does not support writable nested' @@ -605,7 +605,7 @@ def raise_errors_on_nested_writes(method_name, serializer): # ... # address = serializer.CharField('profile.address') assert not any( - '.' in field.source and (key in validated_attrs) + '.' in field.source and (key in validated_data) for key, field in serializer.fields.items() ), ( 'The `.{method_name}()` method does not support writable dotted-source ' @@ -682,7 +682,7 @@ class ModelSerializer(Serializer): If you want to support writable nested relationships you'll need to write an explicit `.create()` method. """ - raise_errors_on_nested_writes('create', self) + raise_errors_on_nested_writes('create', self, validated_data) ModelClass = self.Meta.model @@ -722,7 +722,7 @@ class ModelSerializer(Serializer): return instance def update(self, instance, validated_data): - raise_errors_on_nested_writes('update', self) + raise_errors_on_nested_writes('update', self, validated_data) for attr, value in validated_data.items(): setattr(instance, attr, value) From 9b468fba60def77144949628211aac95c6316c70 Mon Sep 17 00:00:00 2001 From: Mark Henwood <mcbhenwood@gmail.com> Date: Sun, 7 Dec 2014 11:57:07 +0000 Subject: [PATCH 1253/1652] Amend ViewSet docs to warn of potential problem I went through this exact problem and so thought the docs might benefit from a small hint at the appropriate point. --- docs/api-guide/viewsets.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 28186c643..3e37cef89 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -201,6 +201,8 @@ Note that you can use any of the standard attributes or method overrides provide def get_queryset(self): return self.request.user.accounts.all() +Note however that upon removal of the `queryset` property from your `ViewSet`, any associated [router][routers] will be unable to derive the base_name of your Model automatically, and so you you will have to specify the `base_name` kwarg as part of your [router registration][routers]. + Also note that although this class provides the complete set of create/list/retrieve/update/destroy actions by default, you can restrict the available operations by using the standard permission classes. ## ReadOnlyModelViewSet @@ -243,3 +245,4 @@ To create a base viewset class that provides `create`, `list` and `retrieve` ope By creating your own base `ViewSet` classes, you can provide common behavior that can be reused in multiple viewsets across your API. [cite]: http://guides.rubyonrails.org/routing.html +[routers]: routers.md From ff02a0af9c8d2dadebfadcc65e17adae3b0bd111 Mon Sep 17 00:00:00 2001 From: Loic Bistuer <loic.bistuer@gmail.com> Date: Wed, 3 Dec 2014 17:29:06 +0700 Subject: [PATCH 1254/1652] Fixed display issues with tooltips. --- rest_framework/static/rest_framework/js/default.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/static/rest_framework/js/default.js b/rest_framework/static/rest_framework/js/default.js index bcb1964db..c8812132c 100644 --- a/rest_framework/static/rest_framework/js/default.js +++ b/rest_framework/static/rest_framework/js/default.js @@ -24,7 +24,8 @@ prettyPrint(); // Bootstrap tooltips. $('.js-tooltip').tooltip({ - delay: 1000 + delay: 1000, + container: 'body' }); // Deal with rounded tab styling after tab clicks. From b90f4228b274abc3010b159d6abe7b2381067253 Mon Sep 17 00:00:00 2001 From: Loic Bistuer <loic.bistuer@gmail.com> Date: Wed, 3 Dec 2014 17:30:07 +0700 Subject: [PATCH 1255/1652] Ported a couple of templates to Bootstrap 3.x. --- .../templates/rest_framework/login_base.html | 23 +++++++++---------- .../rest_framework/raw_data_form.html | 8 +++---- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html index e050cbdc4..8e6240a68 100644 --- a/rest_framework/templates/rest_framework/login_base.html +++ b/rest_framework/templates/rest_framework/login_base.html @@ -21,11 +21,11 @@ {% csrf_token %} <div id="div_id_username" class="clearfix control-group {% if form.username.errors %}error{% endif %}"> - <div class="controls"> - <label class="span4">Username:</label> - <input style="height: 25px" type="text" name="username" maxlength="100" + <div class="form-group"> + <label for="id_username">Username:</label> + <input type="text" name="username" maxlength="100" autocapitalize="off" - autocorrect="off" class="span12 textinput textInput" + autocorrect="off" class="form-control textinput textInput" id="id_username" required {% if form.username.value %}value="{{ form.username.value }}"{% endif %}> {% if form.username.errors %} @@ -36,12 +36,11 @@ </div> </div> <div id="div_id_password" - class="clearfix control-group {% if form.password.errors %}error{% endif %}" - style="margin-top: 10px"> - <div class="controls"> - <label class="span4">Password:</label> - <input style="height: 25px" type="password" name="password" maxlength="100" - autocapitalize="off" autocorrect="off" class="span12 textinput textInput" + class="clearfix control-group {% if form.password.errors %}error{% endif %}"> + <div class="form-group"> + <label for="id_password">Password:</label> + <input type="password" name="password" maxlength="100" + autocapitalize="off" autocorrect="off" class="form-control textinput textInput" id="id_password" required> {% if form.password.errors %} <p class="text-error"> @@ -56,8 +55,8 @@ <div class="well well-small text-error" style="border: none">{{ error }}</div> {% endfor %} {% endif %} - <div class="form-actions-no-box" style="margin-top: 20px"> - <input type="submit" name="submit" value="Log in" class="btn btn-primary" id="submit-id-submit"> + <div class="form-actions-no-box"> + <input type="submit" name="submit" value="Log in" class="btn btn-primary form-control" id="submit-id-submit"> </div> </form> </div> diff --git a/rest_framework/templates/rest_framework/raw_data_form.html b/rest_framework/templates/rest_framework/raw_data_form.html index 075279f7e..b4c9f1a11 100644 --- a/rest_framework/templates/rest_framework/raw_data_form.html +++ b/rest_framework/templates/rest_framework/raw_data_form.html @@ -2,10 +2,10 @@ {% csrf_token %} {{ form.non_field_errors }} {% for field in form %} - <div class="control-group"> - {{ field.label_tag|add_class:"control-label" }} - <div class="controls"> - {{ field }} + <div class="form-group"> + {{ field.label_tag|add_class:"col-sm-2 control-label" }} + <div class="col-sm-10"> + {{ field|add_class:"form-control" }} <span class="help-block">{{ field.help_text }}</span> </div> </div> From 0c0d65d23294d6976a3d7f9d47eb4b67440e908e Mon Sep 17 00:00:00 2001 From: Victor Cabral <vccabral@gmail.com> Date: Sun, 7 Dec 2014 15:05:17 -0500 Subject: [PATCH 1256/1652] Fixed unit test for auth login --- tests/test_authentication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 28c3a8b35..44837c4ef 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -142,7 +142,7 @@ class SessionAuthTests(TestCase): cf. [#1810](https://github.com/tomchristie/django-rest-framework/pull/1810) """ response = self.csrf_client.get('/auth/login/') - self.assertContains(response, '<label class="span4">Username:</label>') + self.assertContains(response, '<label for="id_username">Username:</label>') def test_post_form_session_auth_failing_csrf(self): """ From 8ba4e7bafe07a3267fd8baedb3d94986c4f26af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Mon, 8 Dec 2014 09:18:37 -0400 Subject: [PATCH 1257/1652] Add misc note about localization --- docs/topics/3.0-announcement.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 8791ad089..adbe370c9 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -931,6 +931,7 @@ The default JSON renderer will return float objects for un-coerced `Decimal` ins * The serializer `ChoiceField` does not currently display nested choices, as was the case in 2.4. This will be address as part of 3.1. * Due to the new templated form rendering, the 'widget' option is no longer valid. This means there's no easy way of using third party "autocomplete" widgets for rendering select inputs that contain a large number of choices. You'll either need to use a regular select or a plain text input. We may consider addressing this in 3.1 or 3.2 if there's sufficient demand. +* Some of the default validation error messages were rewritten and might no longer be pre-translated. You can still [create language files with Django][django-localization] if you wish to localize them. --- @@ -952,3 +953,4 @@ You can follow development on the GitHub site, where we use [milestones to indic [kickstarter]: http://kickstarter.com/projects/tomchristie/django-rest-framework-3 [sponsors]: http://www.django-rest-framework.org/topics/kickstarter-announcement/#sponsors [mixins.py]: https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/mixins.py +[django-localization]: https://docs.djangoproject.com/en/dev/topics/i18n/translation/#localization-how-to-create-language-files From eee02a47d997bd4439fe5fbdc01979d8f372247a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 8 Dec 2014 14:56:45 +0000 Subject: [PATCH 1258/1652] Added ListSerializer.validate(). Closes #2168. --- rest_framework/fields.py | 46 ++++++++----- rest_framework/serializers.py | 114 ++++++++++++++++++++------------- tests/test_serializer_lists.py | 16 +++++ 3 files changed, 115 insertions(+), 61 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 37adbe16f..0c6c2d390 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -294,6 +294,34 @@ class Field(object): return self.default() return self.default + def validate_empty_values(self, data): + """ + Validate empty values, and either: + + * Raise `ValidationError`, indicating invalid data. + * Raise `SkipField`, indicating that the field should be ignored. + * Return (True, data), indicating an empty value that should be + returned without any furhter validation being applied. + * Return (False, data), indicating a non-empty value, that should + have validation applied as normal. + """ + if self.read_only: + return (True, self.get_default()) + + if data is empty: + if getattr(self.root, 'partial', False): + raise SkipField() + if self.required: + self.fail('required') + return (True, self.get_default()) + + if data is None: + if not self.allow_null: + self.fail('null') + return (True, None) + + return (False, data) + def run_validation(self, data=empty): """ Validate a simple representation and return the internal value. @@ -304,21 +332,9 @@ class Field(object): May raise `SkipField` if the field should not be included in the validated data. """ - if self.read_only: - return self.get_default() - - if data is empty: - if getattr(self.root, 'partial', False): - raise SkipField() - if self.required: - self.fail('required') - return self.get_default() - - if data is None: - if not self.allow_null: - self.fail('null') - return None - + (is_empty_value, data) = self.validate_empty_values(data) + if is_empty_value: + return data value = self.to_internal_value(data) self.run_validators(value) return value diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 39523077a..fb6c826b8 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -229,6 +229,35 @@ class SerializerMetaclass(type): return super(SerializerMetaclass, cls).__new__(cls, name, bases, attrs) +def get_validation_error_detail(exc): + assert isinstance(exc, (ValidationError, DjangoValidationError)) + + if isinstance(exc, DjangoValidationError): + # Normally you should raise `serializers.ValidationError` + # inside your codebase, but we handle Django's validation + # exception class as well for simpler compat. + # Eg. Calling Model.clean() explicitly inside Serializer.validate() + return { + api_settings.NON_FIELD_ERRORS_KEY: list(exc.messages) + } + elif isinstance(exc.detail, dict): + # If errors may be a dict we use the standard {key: list of values}. + # Here we ensure that all the values are *lists* of errors. + return dict([ + (key, value if isinstance(value, list) else [value]) + for key, value in exc.detail.items() + ]) + elif isinstance(exc.detail, list): + # Errors raised as a list are non-field errors. + return { + api_settings.NON_FIELD_ERRORS_KEY: exc.detail + } + # Errors raised as a string are non-field errors. + return { + api_settings.NON_FIELD_ERRORS_KEY: [exc.detail] + } + + @six.add_metaclass(SerializerMetaclass) class Serializer(BaseSerializer): default_error_messages = { @@ -293,18 +322,24 @@ class Serializer(BaseSerializer): performed by validators and the `.validate()` method should be coerced into an error dictionary with a 'non_fields_error' key. """ - if data is empty: - if getattr(self.root, 'partial', False): - raise SkipField() - if self.required: - self.fail('required') - return self.get_default() + (is_empty_value, data) = self.validate_empty_values(data) + if is_empty_value: + return data - if data is None: - if not self.allow_null: - self.fail('null') - return None + value = self.to_internal_value(data) + try: + self.run_validators(value) + value = self.validate(value) + assert value is not None, '.validate() should return the validated data' + except (ValidationError, DjangoValidationError) as exc: + raise ValidationError(detail=get_validation_error_detail(exc)) + return value + + def to_internal_value(self, data): + """ + Dict of native values <- Dict of primitive datatypes. + """ if not isinstance(data, dict): message = self.error_messages['invalid'].format( datatype=type(data).__name__ @@ -313,42 +348,6 @@ class Serializer(BaseSerializer): api_settings.NON_FIELD_ERRORS_KEY: [message] }) - value = self.to_internal_value(data) - try: - self.run_validators(value) - value = self.validate(value) - assert value is not None, '.validate() should return the validated data' - except ValidationError as exc: - if isinstance(exc.detail, dict): - # .validate() errors may be a dict, in which case, use - # standard {key: list of values} style. - raise ValidationError(dict([ - (key, value if isinstance(value, list) else [value]) - for key, value in exc.detail.items() - ])) - elif isinstance(exc.detail, list): - raise ValidationError({ - api_settings.NON_FIELD_ERRORS_KEY: exc.detail - }) - else: - raise ValidationError({ - api_settings.NON_FIELD_ERRORS_KEY: [exc.detail] - }) - except DjangoValidationError as exc: - # Normally you should raise `serializers.ValidationError` - # inside your codebase, but we handle Django's validation - # exception class as well for simpler compat. - # Eg. Calling Model.clean() explicitly inside Serializer.validate() - raise ValidationError({ - api_settings.NON_FIELD_ERRORS_KEY: list(exc.messages) - }) - - return value - - def to_internal_value(self, data): - """ - Dict of native values <- Dict of primitive datatypes. - """ ret = OrderedDict() errors = OrderedDict() fields = [ @@ -462,6 +461,26 @@ class ListSerializer(BaseSerializer): return html.parse_html_list(dictionary, prefix=self.field_name) return dictionary.get(self.field_name, empty) + def run_validation(self, data=empty): + """ + We override the default `run_validation`, because the validation + performed by validators and the `.validate()` method should + be coerced into an error dictionary with a 'non_fields_error' key. + """ + (is_empty_value, data) = self.validate_empty_values(data) + if is_empty_value: + return data + + value = self.to_internal_value(data) + try: + self.run_validators(value) + value = self.validate(value) + assert value is not None, '.validate() should return the validated data' + except (ValidationError, DjangoValidationError) as exc: + raise ValidationError(detail=get_validation_error_detail(exc)) + + return value + def to_internal_value(self, data): """ List of dicts of native values <- List of dicts of primitive datatypes. @@ -503,6 +522,9 @@ class ListSerializer(BaseSerializer): self.child.to_representation(item) for item in iterable ] + def validate(self, attrs): + return attrs + def update(self, instance, validated_data): raise NotImplementedError( "Serializers with many=True do not support multiple update by " diff --git a/tests/test_serializer_lists.py b/tests/test_serializer_lists.py index 640067e3a..35b68ae7d 100644 --- a/tests/test_serializer_lists.py +++ b/tests/test_serializer_lists.py @@ -272,3 +272,19 @@ class TestNestedListOfListsSerializer: serializer = self.Serializer(data=input_data) assert serializer.is_valid() assert serializer.validated_data == expected_output + + +class TestListSerializerClass: + """Tests for a custom list_serializer_class.""" + def test_list_serializer_class_validate(self): + class CustomListSerializer(serializers.ListSerializer): + def validate(self, attrs): + raise serializers.ValidationError('Non field error') + + class TestSerializer(serializers.Serializer): + class Meta: + list_serializer_class = CustomListSerializer + + serializer = TestSerializer(data=[], many=True) + assert not serializer.is_valid() + assert serializer.errors == {'non_field_errors': ['Non field error']} From 403479338380fd4853128f11b5f7055e925125a5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 8 Dec 2014 15:13:59 +0000 Subject: [PATCH 1259/1652] Added missing translation markers in realtions.py. Closes #2231. --- rest_framework/relations.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 178a8e2b0..75d68204b 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -115,9 +115,9 @@ class StringRelatedField(RelatedField): class PrimaryKeyRelatedField(RelatedField): default_error_messages = { - 'required': 'This field is required.', - 'does_not_exist': "Invalid pk '{pk_value}' - object does not exist.", - 'incorrect_type': 'Incorrect type. Expected pk value, received {data_type}.', + 'required': _('This field is required.'), + 'does_not_exist': _("Invalid pk '{pk_value}' - object does not exist."), + 'incorrect_type': _('Incorrect type. Expected pk value, received {data_type}.'), } def to_internal_value(self, data): @@ -162,11 +162,11 @@ class HyperlinkedRelatedField(RelatedField): lookup_field = 'pk' default_error_messages = { - 'required': 'This field is required.', - 'no_match': 'Invalid hyperlink - No URL match', - 'incorrect_match': 'Invalid hyperlink - Incorrect URL match.', - 'does_not_exist': 'Invalid hyperlink - Object does not exist.', - 'incorrect_type': 'Incorrect type. Expected URL string, received {data_type}.', + 'required': _('This field is required.'), + 'no_match': _('Invalid hyperlink - No URL match'), + 'incorrect_match': _('Invalid hyperlink - Incorrect URL match.'), + 'does_not_exist': _('Invalid hyperlink - Object does not exist.'), + 'incorrect_type': _('Incorrect type. Expected URL string, received {data_type}.'), } def __init__(self, view_name=None, **kwargs): From fd02d8266b3df2a5ed41f599eae6765631643da2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 8 Dec 2014 15:16:33 +0000 Subject: [PATCH 1260/1652] Added 3.0 to release notes. --- docs/topics/release-notes.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 19dfbb985..550fdf752 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -38,6 +38,16 @@ You can determine your currently installed version using `pip freeze`: --- +## 3.0.x series + +### 3.0.0 + +**Date**: 1st December 2014 + +For full details see the [3.0 release announcement](3.0-announcement.md). + +--- + ## 2.4.x series ### 2.4.4 From 8e9408115d0a3ab433078b82c9cc51f825eeac71 Mon Sep 17 00:00:00 2001 From: phalt <paulandrewhallett@gmail.com> Date: Mon, 8 Dec 2014 15:41:01 +0000 Subject: [PATCH 1261/1652] fixed indentations --- docs/tutorial/1-serialization.md | 8 +++++--- docs/tutorial/2-requests-and-responses.md | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 5b1ae6e80..5dcffcbdc 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -340,9 +340,11 @@ You can install httpie using pip: Finally, we can get a list of all of the snippets: - http http://127.0.0.1:8000/snippets/ --body + http http://127.0.0.1:8000/snippets/ - [ + HTTP/1.1 200 OK + ... + [ { "id": 1, "title": "", @@ -367,7 +369,7 @@ Or we can get a particular snippet by referencing its id: HTTP/1.1 200 OK ... - { + { "id": 2, "title": "", "code": "print \"hello, world\"\n", diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 08746cd78..49e96d030 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -127,7 +127,7 @@ Go ahead and test the API from the command line, as we did in [tutorial part 1][ We can get a list of all of the snippets, as before. - http http://127.0.0.1:8000/snippets/ + http http://127.0.0.1:8000/snippets/ HTTP/1.1 200 OK ... From f3ebac061e7b5a67afe1d9440876afa804d3995d Mon Sep 17 00:00:00 2001 From: phalt <paulandrewhallett@gmail.com> Date: Mon, 8 Dec 2014 15:47:49 +0000 Subject: [PATCH 1262/1652] one last tabs / spaces! --- docs/tutorial/1-serialization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 5dcffcbdc..538b0d93d 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -365,7 +365,7 @@ Finally, we can get a list of all of the snippets: Or we can get a particular snippet by referencing its id: - http http://127.0.0.1:8000/snippets/2/ + http http://127.0.0.1:8000/snippets/2/ HTTP/1.1 200 OK ... From 4e9ebb5fe9eee2ef6f21718d9becfb8e94bbbe98 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 8 Dec 2014 16:38:17 +0000 Subject: [PATCH 1263/1652] cd back to parent directory --- docs/tutorial/quickstart.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index d0703381b..f72fc7ddd 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -22,6 +22,7 @@ Create a new Django project named `tutorial`, then start a new app called `quick django-admin.py startproject tutorial . cd tutorial django-admin.py startapp quickstart + cd .. Now sync your database for the first time: From 41bfdc0732050d8b630eeae0a9c29a382ea33db5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 8 Dec 2014 21:56:06 +0000 Subject: [PATCH 1264/1652] Don't use 'instance' argument in rendering form for paginated data. Closes #2205. --- rest_framework/renderers.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 7c14ab8f2..cfcf1f5d0 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -12,6 +12,7 @@ import json import django from django import forms from django.core.exceptions import ImproperlyConfigured +from django.core.paginator import Page from django.http.multipartparser import parse_header from django.template import Context, RequestContext, loader, Template from django.test.client import encode_multipart @@ -533,6 +534,8 @@ class BrowsableAPIRenderer(BaseRenderer): serializer = getattr(data, 'serializer', None) if serializer and not getattr(serializer, 'many', False): instance = getattr(serializer, 'instance', None) + if isinstance(instance, Page): + instance = None else: instance = None @@ -591,6 +594,8 @@ class BrowsableAPIRenderer(BaseRenderer): serializer = getattr(data, 'serializer', None) if serializer and not getattr(serializer, 'many', False): instance = getattr(serializer, 'instance', None) + if isinstance(instance, Page): + instance = None else: instance = None From 0f080bc2932095bc6dd2c71f545f2b588985431d Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 9 Dec 2014 10:06:23 +0000 Subject: [PATCH 1265/1652] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b89575450..df0a4086a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Django REST framework +# [Django REST framework][docs] [![build-status-image]][travis] [![pypi-version]][pypi] From 4cdfb6adc2e33e277066a70dc6355085c05e01d4 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 9 Dec 2014 13:18:18 +0000 Subject: [PATCH 1266/1652] Add REST framework: Under the hood. video to the 3.0 announcement. --- docs/topics/3.0-announcement.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index adbe370c9..3dfa26e95 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -28,10 +28,18 @@ Notable features of this new release include: Significant new functionality continues to be planned for the 3.1 and 3.2 releases. These releases will correspond to the two [Kickstarter stretch goals](https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3) - "Feature improvements" and "Admin interface". Further 3.x releases will present simple upgrades, without the same level of fundamental API changes necessary for the 3.0 release. -Below is an in-depth guide to the API changes and migration notes for 3.0. +--- + +#### REST framework: Under the hood. + +This talk from the Django: Under the Hood event in Amsterdam, Nov 2014 gives some good background context on the design decisions behind 3.0. + +<iframe width="560" height="315" src="//www.youtube.com/embed/3cSsbe-tA0E" frameborder="0" allowfullscreen></iframe> --- +*Below is an in-depth guide to the API changes and migration notes for 3.0.* + ## Request objects #### The `.data` and `.query_params` properties. From cae19f8924c598cea93a546138757ff48eed9f75 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 9 Dec 2014 13:21:10 +0000 Subject: [PATCH 1267/1652] Minor docs tweaks --- docs/topics/3.0-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 3dfa26e95..8fa86b9a1 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -32,7 +32,7 @@ Significant new functionality continues to be planned for the 3.1 and 3.2 releas #### REST framework: Under the hood. -This talk from the Django: Under the Hood event in Amsterdam, Nov 2014 gives some good background context on the design decisions behind 3.0. +This talk from the [Django: Under the Hood](http://www.djangounderthehood.com/) event in Amsterdam, Nov 2014, gives some good background context on the design decisions behind 3.0. <iframe width="560" height="315" src="//www.youtube.com/embed/3cSsbe-tA0E" frameborder="0" allowfullscreen></iframe> From afe7ed9333e37384f8ddc57e891da9632c8714c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Tue, 9 Dec 2014 09:25:06 -0400 Subject: [PATCH 1268/1652] Add allow_blank for ChoiceField #2184 This makes a ChoiceField optional in HTML if model field has `blank=True` set. --- rest_framework/fields.py | 5 +++++ rest_framework/serializers.py | 2 +- .../rest_framework/horizontal/select.html | 2 +- .../templates/rest_framework/inline/select.html | 2 +- .../templates/rest_framework/vertical/select.html | 2 +- rest_framework/utils/field_mapping.py | 12 ++++++------ tests/test_fields.py | 15 +++++++++++++++ 7 files changed, 30 insertions(+), 10 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 0c6c2d390..99498da73 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -958,9 +958,14 @@ class ChoiceField(Field): (six.text_type(key), key) for key in self.choices.keys() ]) + self.allow_blank = kwargs.pop('allow_blank', False) + super(ChoiceField, self).__init__(**kwargs) def to_internal_value(self, data): + if data == '' and self.allow_blank: + return '' + try: return self.choice_strings_to_values[six.text_type(data)] except KeyError: diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index fb6c826b8..b0c0efa7c 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -942,7 +942,7 @@ class ModelSerializer(Serializer): # `ModelField`, which is used when no other typed field # matched to the model field. kwargs.pop('model_field', None) - if not issubclass(field_cls, CharField): + if not issubclass(field_cls, CharField) and not issubclass(field_cls, ChoiceField): # `allow_blank` is only valid for textual fields. kwargs.pop('allow_blank', None) diff --git a/rest_framework/templates/rest_framework/horizontal/select.html b/rest_framework/templates/rest_framework/horizontal/select.html index 380b38e94..8a7fca370 100644 --- a/rest_framework/templates/rest_framework/horizontal/select.html +++ b/rest_framework/templates/rest_framework/horizontal/select.html @@ -4,7 +4,7 @@ {% endif %} <div class="col-sm-10"> <select class="form-control" name="{{ field.name }}"> - {% if field.allow_null %} + {% if field.allow_null or field.allow_blank %} <option value="" {% if not field.value %}selected{% endif %}>--------</option> {% endif %} {% for key, text in field.choices.items %} diff --git a/rest_framework/templates/rest_framework/inline/select.html b/rest_framework/templates/rest_framework/inline/select.html index 53af2772b..6b30e4d6b 100644 --- a/rest_framework/templates/rest_framework/inline/select.html +++ b/rest_framework/templates/rest_framework/inline/select.html @@ -3,7 +3,7 @@ <label class="sr-only">{{ field.label }}</label> {% endif %} <select class="form-control" name="{{ field.name }}"> - {% if field.allow_null %} + {% if field.allow_null or field.allow_blank %} <option value="" {% if not field.value %}selected{% endif %}>--------</option> {% endif %} {% for key, text in field.choices.items %} diff --git a/rest_framework/templates/rest_framework/vertical/select.html b/rest_framework/templates/rest_framework/vertical/select.html index de72e1ddb..1d1109f6e 100644 --- a/rest_framework/templates/rest_framework/vertical/select.html +++ b/rest_framework/templates/rest_framework/vertical/select.html @@ -3,7 +3,7 @@ <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> {% endif %} <select class="form-control" name="{{ field.name }}"> - {% if field.allow_null %} + {% if field.allow_null or field.allow_blank %} <option value="" {% if not field.value %}selected{% endif %}>--------</option> {% endif %} {% for key, text in field.choices.items %} diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index 9c187176d..86ceff314 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -91,18 +91,18 @@ def get_field_kwargs(field_name, model_field): if model_field.has_default() or model_field.blank or model_field.null: kwargs['required'] = False - if model_field.flatchoices: - # If this model field contains choices, then return early. - # Further keyword arguments are not valid. - kwargs['choices'] = model_field.flatchoices - return kwargs - if model_field.null and not isinstance(model_field, models.NullBooleanField): kwargs['allow_null'] = True if model_field.blank: kwargs['allow_blank'] = True + if model_field.flatchoices: + # If this model field contains choices, then return early. + # Further keyword arguments are not valid. + kwargs['choices'] = model_field.flatchoices + return kwargs + # Ensure that max_length is passed explicitly as a keyword arg, # rather than as a validator. max_length = getattr(model_field, 'max_length', None) diff --git a/tests/test_fields.py b/tests/test_fields.py index 135256320..3f4e65f24 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -804,6 +804,21 @@ class TestChoiceField(FieldValues): ] ) + def test_allow_blank(self): + """ + If `allow_blank=True` then '' is a valid input. + """ + field = serializers.ChoiceField( + allow_blank=True, + choices=[ + ('poor', 'Poor quality'), + ('medium', 'Medium quality'), + ('good', 'Good quality'), + ] + ) + output = field.run_validation('') + assert output is '' + class TestChoiceFieldWithType(FieldValues): """ From f5b783af617f507efbc0d5ede0d27bd6be903d63 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 9 Dec 2014 14:21:31 +0000 Subject: [PATCH 1269/1652] allow_blank in ChoiceField. Refs #2239. --- docs/api-guide/fields.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index aa5cc84ea..e4ef1d4aa 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -310,6 +310,9 @@ Used by `ModelSerializer` to automatically generate fields if the corresponding **Signature:** `ChoiceField(choices)` - `choices` - A list of valid values, or a list of `(key, display_name)` tuples. +- `allow_blank` - If set to `True` then the empty string should be considered a valid value. If set to `False` then the empty string is considered invalid and will raise a validation error. Defaults to `False`. + +Both the `allow_blank` and `allow_null` are valid options on `ChoiceField`, although it is highly recommended that you only use one and not both. `allow_blank` should be preferred for textual choices, and `allow_null` should be preferred for numeric or other non-textual choices. ## MultipleChoiceField @@ -318,6 +321,9 @@ A field that can accept a set of zero, one or many values, chosen from a limited **Signature:** `MultipleChoiceField(choices)` - `choices` - A list of valid values, or a list of `(key, display_name)` tuples. +- `allow_blank` - If set to `True` then the empty string should be considered a valid value. If set to `False` then the empty string is considered invalid and will raise a validation error. Defaults to `False`. + +As with `ChoiceField`, both the `allow_blank` and `allow_null` options are valid, although it is highly recommended that you only use one and not both. `allow_blank` should be preferred for textual choices, and `allow_null` should be preferred for numeric or other non-textual choices. --- From 8d6b0b1f2d3a5014d43f1314d96bc9197709b542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Iv=C3=A1n=20Alegre?= <IvanAlegre@users.noreply.github.com> Date: Tue, 9 Dec 2014 16:13:18 +0100 Subject: [PATCH 1270/1652] Update serializers.py Treat the input queryset as it comes (maybe it has been changed in a higher level). Evaluating .all() does nothing if or if not is a queryset. --- rest_framework/serializers.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b0c0efa7c..5c73c5f25 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -517,9 +517,8 @@ class ListSerializer(BaseSerializer): """ List of object instances -> List of dicts of primitive datatypes. """ - iterable = data.all() if (hasattr(data, 'all')) else data return [ - self.child.to_representation(item) for item in iterable + self.child.to_representation(item) for item in data ] def validate(self, attrs): From 7d70e56ce378a7876a0fd7f29b52a492e46053b9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 9 Dec 2014 16:25:10 +0000 Subject: [PATCH 1271/1652] Copy model field validators, don't reuse the same list. --- rest_framework/utils/field_mapping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index 86ceff314..fca97b4b3 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -59,7 +59,7 @@ def get_field_kwargs(field_name, model_field): Creates a default instance of a basic non-relational field. """ kwargs = {} - validator_kwarg = model_field.validators + validator_kwarg = list(model_field.validators) # The following will only be used by ModelField classes. # Gets removed for everything else. From 59470667db1b95eef63ff4308c1b41561438bb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Iv=C3=A1n=20Alegre?= <desconocios@gmail.com> Date: Tue, 9 Dec 2014 17:49:07 +0100 Subject: [PATCH 1272/1652] Take in care that input data in serializer can be a Manager --- rest_framework/serializers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 5c73c5f25..9857995ae 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -517,8 +517,9 @@ class ListSerializer(BaseSerializer): """ List of object instances -> List of dicts of primitive datatypes. """ + iterable = data.all() if (isinstance(data, models.Manager) and hasattr(data, 'all')) else data return [ - self.child.to_representation(item) for item in data + self.child.to_representation(item) for item in iterable ] def validate(self, attrs): From 720a37d3dedc501968bebaca3a339c72392b9c81 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 9 Dec 2014 17:28:56 +0000 Subject: [PATCH 1273/1652] Hyperlinked PK optimization. Closes #1872. --- rest_framework/relations.py | 64 ++++++++++++++++++------------- tests/test_relations_hyperlink.py | 12 ++++-- 2 files changed, 45 insertions(+), 31 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 75d68204b..ae4086ecf 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -84,9 +84,34 @@ class RelatedField(Field): queryset = queryset.all() return queryset + def use_pk_only_optimization(self): + return False + + def get_attribute(self, instance): + if self.use_pk_only_optimization(): + try: + # Optimized case, return a mock object only containing the pk attribute. + instance = get_attribute(instance, self.source_attrs[:-1]) + return PKOnlyObject(pk=instance.serializable_value(self.source_attrs[-1])) + except AttributeError: + pass + + # Standard case, return the object instance. + return get_attribute(instance, self.source_attrs) + def get_iterable(self, instance, source_attrs): relationship = get_attribute(instance, source_attrs) - return relationship.all() if (hasattr(relationship, 'all')) else relationship + relationship = relationship.all() if (hasattr(relationship, 'all')) else relationship + + if self.use_pk_only_optimization(): + # Optimized case, return mock objects only containing the pk attribute. + return [ + PKOnlyObject(pk=pk) + for pk in relationship.values_list('pk', flat=True) + ] + + # Standard case, return the object instances. + return relationship @property def choices(self): @@ -120,6 +145,9 @@ class PrimaryKeyRelatedField(RelatedField): 'incorrect_type': _('Incorrect type. Expected pk value, received {data_type}.'), } + def use_pk_only_optimization(self): + return True + def to_internal_value(self, data): try: return self.get_queryset().get(pk=data) @@ -128,32 +156,6 @@ class PrimaryKeyRelatedField(RelatedField): except (TypeError, ValueError): self.fail('incorrect_type', data_type=type(data).__name__) - def get_attribute(self, instance): - # We customize `get_attribute` here for performance reasons. - # For relationships the instance will already have the pk of - # the related object. We return this directly instead of returning the - # object itself, which would require a database lookup. - try: - instance = get_attribute(instance, self.source_attrs[:-1]) - return PKOnlyObject(pk=instance.serializable_value(self.source_attrs[-1])) - except AttributeError: - return get_attribute(instance, self.source_attrs) - - def get_iterable(self, instance, source_attrs): - # For consistency with `get_attribute` we're using `serializable_value()` - # here. Typically there won't be any difference, but some custom field - # types might return a non-primitive value for the pk otherwise. - # - # We could try to get smart with `values_list('pk', flat=True)`, which - # would be better in some case, but would actually end up with *more* - # queries if the developer is using `prefetch_related` across the - # relationship. - relationship = super(PrimaryKeyRelatedField, self).get_iterable(instance, source_attrs) - return [ - PKOnlyObject(pk=item.serializable_value('pk')) - for item in relationship - ] - def to_representation(self, value): return value.pk @@ -184,6 +186,9 @@ class HyperlinkedRelatedField(RelatedField): super(HyperlinkedRelatedField, self).__init__(**kwargs) + def use_pk_only_optimization(self): + return self.lookup_field == 'pk' + def get_object(self, view_name, view_args, view_kwargs): """ Return the object corresponding to a matched URL. @@ -285,6 +290,11 @@ class HyperlinkedIdentityField(HyperlinkedRelatedField): kwargs['source'] = '*' super(HyperlinkedIdentityField, self).__init__(view_name, **kwargs) + def use_pk_only_optimization(self): + # We have the complete object instance already. We don't need + # to run the 'only get the pk for this relationship' code. + return False + class SlugRelatedField(RelatedField): """ diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py index b938e3857..e741e99be 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -89,7 +89,8 @@ class HyperlinkedManyToManyTests(TestCase): {'url': 'http://testserver/manytomanysource/2/', 'name': 'source-2', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/']}, {'url': 'http://testserver/manytomanysource/3/', 'name': 'source-3', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} ] - self.assertEqual(serializer.data, expected) + with self.assertNumQueries(4): + self.assertEqual(serializer.data, expected) def test_reverse_many_to_many_retrieve(self): queryset = ManyToManyTarget.objects.all() @@ -99,7 +100,8 @@ class HyperlinkedManyToManyTests(TestCase): {'url': 'http://testserver/manytomanytarget/2/', 'name': 'target-2', 'sources': ['http://testserver/manytomanysource/2/', 'http://testserver/manytomanysource/3/']}, {'url': 'http://testserver/manytomanytarget/3/', 'name': 'target-3', 'sources': ['http://testserver/manytomanysource/3/']} ] - self.assertEqual(serializer.data, expected) + with self.assertNumQueries(4): + self.assertEqual(serializer.data, expected) def test_many_to_many_update(self): data = {'url': 'http://testserver/manytomanysource/1/', 'name': 'source-1', 'targets': ['http://testserver/manytomanytarget/1/', 'http://testserver/manytomanytarget/2/', 'http://testserver/manytomanytarget/3/']} @@ -197,7 +199,8 @@ class HyperlinkedForeignKeyTests(TestCase): {'url': 'http://testserver/foreignkeysource/2/', 'name': 'source-2', 'target': 'http://testserver/foreignkeytarget/1/'}, {'url': 'http://testserver/foreignkeysource/3/', 'name': 'source-3', 'target': 'http://testserver/foreignkeytarget/1/'} ] - self.assertEqual(serializer.data, expected) + with self.assertNumQueries(1): + self.assertEqual(serializer.data, expected) def test_reverse_foreign_key_retrieve(self): queryset = ForeignKeyTarget.objects.all() @@ -206,7 +209,8 @@ class HyperlinkedForeignKeyTests(TestCase): {'url': 'http://testserver/foreignkeytarget/1/', 'name': 'target-1', 'sources': ['http://testserver/foreignkeysource/1/', 'http://testserver/foreignkeysource/2/', 'http://testserver/foreignkeysource/3/']}, {'url': 'http://testserver/foreignkeytarget/2/', 'name': 'target-2', 'sources': []}, ] - self.assertEqual(serializer.data, expected) + with self.assertNumQueries(3): + self.assertEqual(serializer.data, expected) def test_foreign_key_update(self): data = {'url': 'http://testserver/foreignkeysource/1/', 'name': 'source-1', 'target': 'http://testserver/foreignkeytarget/2/'} From 76956beab41cda7abdfb0aac714b35494f6ca3d5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 9 Dec 2014 19:53:27 +0000 Subject: [PATCH 1274/1652] snippets relationship in tutorial should be read_only --- docs/tutorial/5-relationships-and-hyperlinked-apis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 58422929a..57e3b6c59 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -85,7 +85,7 @@ We can easily re-write our existing serializers to use hyperlinking. In your `sn class UserSerializer(serializers.HyperlinkedModelSerializer): - snippets = serializers.HyperlinkedRelatedField(many=True, view_name='snippet-detail') + snippets = serializers.HyperlinkedRelatedField(many=True, view_name='snippet-detail', read_only=True) class Meta: model = User From 9161e5a9276b185375e9ab7ec188112f6fe49cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Iv=C3=A1n=20Alegre?= <desconocios@gmail.com> Date: Wed, 10 Dec 2014 09:19:27 +0100 Subject: [PATCH 1275/1652] Remove unnecessary hasattr all and add comment for nested relationships --- rest_framework/serializers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 9857995ae..e17112592 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -517,7 +517,9 @@ class ListSerializer(BaseSerializer): """ List of object instances -> List of dicts of primitive datatypes. """ - iterable = data.all() if (isinstance(data, models.Manager) and hasattr(data, 'all')) else data + # Dealing with nested relationships, data can be a Manager, + # so, first get a queryset from the Manager if needed + iterable = data.all() if isinstance(data, models.Manager) else data return [ self.child.to_representation(item) for item in iterable ] From 428630c19702172beba94a3381d91340aa5e3bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Iv=C3=A1n=20Alegre?= <desconocios@gmail.com> Date: Wed, 10 Dec 2014 10:13:15 +0100 Subject: [PATCH 1276/1652] Fix trailing space --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index e17112592..9226895e0 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -517,7 +517,7 @@ class ListSerializer(BaseSerializer): """ List of object instances -> List of dicts of primitive datatypes. """ - # Dealing with nested relationships, data can be a Manager, + # Dealing with nested relationships, data can be a Manager, # so, first get a queryset from the Manager if needed iterable = data.all() if isinstance(data, models.Manager) else data return [ From 81d0b748b400263114422c464f75357e24952ad6 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 10 Dec 2014 09:16:01 +0000 Subject: [PATCH 1277/1652] Improve field lookup behavior for dicts/mappings. Closes #2244. Closes #2243. --- rest_framework/fields.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 99498da73..15e59861b 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -15,6 +15,7 @@ from rest_framework.compat import ( from rest_framework.exceptions import ValidationError from rest_framework.settings import api_settings from rest_framework.utils import html, representation, humanize_datetime +import collections import copy import datetime import decimal @@ -60,14 +61,12 @@ def get_attribute(instance, attrs): # Break out early if we get `None` at any point in a nested lookup. return None try: - instance = getattr(instance, attr) + if isinstance(instance, collections.Mapping): + instance = instance[attr] + else: + instance = getattr(instance, attr) except ObjectDoesNotExist: return None - except AttributeError as exc: - try: - return instance[attr] - except (KeyError, TypeError, AttributeError): - raise exc if is_simple_callable(instance): instance = instance() return instance From 9883862576ebcc82d1dc5ba052376d0f9292f868 Mon Sep 17 00:00:00 2001 From: Dougal Matthews <dougal@redhat.com> Date: Wed, 10 Dec 2014 09:42:53 +0000 Subject: [PATCH 1278/1652] Move the static content into the docs theme --- {docs => docs_theme}/css/bootstrap-responsive.css | 0 {docs => docs_theme}/css/bootstrap.css | 0 {docs => docs_theme}/css/default.css | 0 {docs => docs_theme}/css/prettify.css | 0 {docs => docs_theme}/img/1-kuwaitnet.png | Bin {docs => docs_theme}/img/apiary.png | Bin {docs => docs_theme}/img/autocomplete.png | Bin {docs => docs_theme}/img/cerulean.png | Bin {docs => docs_theme}/img/django-rest-swagger.png | Bin {docs => docs_theme}/img/favicon.ico | Bin .../img/glyphicons-halflings-white.png | Bin {docs => docs_theme}/img/glyphicons-halflings.png | Bin {docs => docs_theme}/img/grid.png | Bin {docs => docs_theme}/img/labels-and-milestones.png | Bin {docs => docs_theme}/img/logo.png | Bin {docs => docs_theme}/img/quickstart.png | Bin {docs => docs_theme}/img/rest-framework-docs.png | Bin {docs => docs_theme}/img/self-describing.png | Bin {docs => docs_theme}/img/slate.png | Bin {docs => docs_theme}/img/sponsors/0-eventbrite.png | Bin {docs => docs_theme}/img/sponsors/1-cyan.png | Bin {docs => docs_theme}/img/sponsors/1-divio.png | Bin {docs => docs_theme}/img/sponsors/1-kuwaitnet.png | Bin {docs => docs_theme}/img/sponsors/1-lulu.png | Bin {docs => docs_theme}/img/sponsors/1-potato.png | Bin {docs => docs_theme}/img/sponsors/1-purplebit.png | Bin {docs => docs_theme}/img/sponsors/1-runscope.png | Bin .../img/sponsors/1-simple-energy.png | Bin .../img/sponsors/1-vokal_interactive.png | Bin {docs => docs_theme}/img/sponsors/1-wiredrive.png | Bin {docs => docs_theme}/img/sponsors/2-byte.png | Bin {docs => docs_theme}/img/sponsors/2-compile.png | Bin {docs => docs_theme}/img/sponsors/2-crate.png | Bin {docs => docs_theme}/img/sponsors/2-cryptico.png | Bin {docs => docs_theme}/img/sponsors/2-django.png | Bin .../img/sponsors/2-galileo_press.png | Bin {docs => docs_theme}/img/sponsors/2-heroku.png | Bin {docs => docs_theme}/img/sponsors/2-hipflask.png | Bin {docs => docs_theme}/img/sponsors/2-hipo.png | Bin {docs => docs_theme}/img/sponsors/2-koordinates.png | Bin {docs => docs_theme}/img/sponsors/2-laterpay.png | Bin .../img/sponsors/2-lightning_kite.png | Bin .../img/sponsors/2-mirus_research.png | Bin {docs => docs_theme}/img/sponsors/2-nexthub.png | Bin {docs => docs_theme}/img/sponsors/2-opbeat.png | Bin {docs => docs_theme}/img/sponsors/2-prorenata.png | Bin {docs => docs_theme}/img/sponsors/2-pulsecode.png | Bin {docs => docs_theme}/img/sponsors/2-rapasso.png | Bin .../img/sponsors/2-schuberg_philis.png | Bin .../img/sponsors/2-security_compass.png | Bin {docs => docs_theme}/img/sponsors/2-sga.png | Bin .../img/sponsors/2-singing-horse.png | Bin {docs => docs_theme}/img/sponsors/2-sirono.png | Bin {docs => docs_theme}/img/sponsors/2-vinta.png | Bin {docs => docs_theme}/img/sponsors/2-wusawork.png | Bin {docs => docs_theme}/img/sponsors/3-aba.png | Bin {docs => docs_theme}/img/sponsors/3-aditium.png | Bin {docs => docs_theme}/img/sponsors/3-alwaysdata.png | Bin .../img/sponsors/3-ax_semantics.png | Bin {docs => docs_theme}/img/sponsors/3-beefarm.png | Bin {docs => docs_theme}/img/sponsors/3-blimp.png | Bin {docs => docs_theme}/img/sponsors/3-brightloop.png | Bin {docs => docs_theme}/img/sponsors/3-cantemo.gif | Bin .../img/sponsors/3-crosswordtracker.png | Bin {docs => docs_theme}/img/sponsors/3-fluxility.png | Bin {docs => docs_theme}/img/sponsors/3-garfo.png | Bin {docs => docs_theme}/img/sponsors/3-gizmag.png | Bin {docs => docs_theme}/img/sponsors/3-holvi.png | Bin .../img/sponsors/3-imt_computer_services.png | Bin .../img/sponsors/3-infinite_code.png | Bin {docs => docs_theme}/img/sponsors/3-ipushpull.png | Bin {docs => docs_theme}/img/sponsors/3-isl.png | Bin .../img/sponsors/3-life_the_game.png | Bin {docs => docs_theme}/img/sponsors/3-makespace.png | Bin {docs => docs_theme}/img/sponsors/3-nephila.png | Bin {docs => docs_theme}/img/sponsors/3-openeye.png | Bin {docs => docs_theme}/img/sponsors/3-pathwright.png | Bin {docs => docs_theme}/img/sponsors/3-phurba.png | Bin {docs => docs_theme}/img/sponsors/3-pkgfarm.png | Bin {docs => docs_theme}/img/sponsors/3-providenz.png | Bin {docs => docs_theme}/img/sponsors/3-safari.png | Bin {docs => docs_theme}/img/sponsors/3-shippo.png | Bin {docs => docs_theme}/img/sponsors/3-teonite.png | Bin .../img/sponsors/3-thermondo-gmbh.png | Bin {docs => docs_theme}/img/sponsors/3-tivix.png | Bin {docs => docs_theme}/img/sponsors/3-trackmaven.png | Bin {docs => docs_theme}/img/sponsors/3-transcode.png | Bin .../img/sponsors/3-triggered_messaging.png | Bin {docs => docs_theme}/img/sponsors/3-vzzual.png | Bin {docs => docs_theme}/img/sponsors/3-wildfish.png | Bin {docs => docs_theme}/img/travis-status.png | Bin {docs => docs_theme}/js/bootstrap-2.1.1-min.js | 0 {docs => docs_theme}/js/jquery-1.8.1-min.js | 0 {docs => docs_theme}/js/prettify-1.0.js | 0 94 files changed, 0 insertions(+), 0 deletions(-) rename {docs => docs_theme}/css/bootstrap-responsive.css (100%) rename {docs => docs_theme}/css/bootstrap.css (100%) rename {docs => docs_theme}/css/default.css (100%) rename {docs => docs_theme}/css/prettify.css (100%) rename {docs => docs_theme}/img/1-kuwaitnet.png (100%) rename {docs => docs_theme}/img/apiary.png (100%) rename {docs => docs_theme}/img/autocomplete.png (100%) rename {docs => docs_theme}/img/cerulean.png (100%) rename {docs => docs_theme}/img/django-rest-swagger.png (100%) rename {docs => docs_theme}/img/favicon.ico (100%) rename {docs => docs_theme}/img/glyphicons-halflings-white.png (100%) rename {docs => docs_theme}/img/glyphicons-halflings.png (100%) rename {docs => docs_theme}/img/grid.png (100%) rename {docs => docs_theme}/img/labels-and-milestones.png (100%) rename {docs => docs_theme}/img/logo.png (100%) rename {docs => docs_theme}/img/quickstart.png (100%) rename {docs => docs_theme}/img/rest-framework-docs.png (100%) rename {docs => docs_theme}/img/self-describing.png (100%) rename {docs => docs_theme}/img/slate.png (100%) rename {docs => docs_theme}/img/sponsors/0-eventbrite.png (100%) rename {docs => docs_theme}/img/sponsors/1-cyan.png (100%) rename {docs => docs_theme}/img/sponsors/1-divio.png (100%) rename {docs => docs_theme}/img/sponsors/1-kuwaitnet.png (100%) rename {docs => docs_theme}/img/sponsors/1-lulu.png (100%) rename {docs => docs_theme}/img/sponsors/1-potato.png (100%) rename {docs => docs_theme}/img/sponsors/1-purplebit.png (100%) rename {docs => docs_theme}/img/sponsors/1-runscope.png (100%) rename {docs => docs_theme}/img/sponsors/1-simple-energy.png (100%) rename {docs => docs_theme}/img/sponsors/1-vokal_interactive.png (100%) rename {docs => docs_theme}/img/sponsors/1-wiredrive.png (100%) rename {docs => docs_theme}/img/sponsors/2-byte.png (100%) rename {docs => docs_theme}/img/sponsors/2-compile.png (100%) rename {docs => docs_theme}/img/sponsors/2-crate.png (100%) rename {docs => docs_theme}/img/sponsors/2-cryptico.png (100%) rename {docs => docs_theme}/img/sponsors/2-django.png (100%) rename {docs => docs_theme}/img/sponsors/2-galileo_press.png (100%) rename {docs => docs_theme}/img/sponsors/2-heroku.png (100%) rename {docs => docs_theme}/img/sponsors/2-hipflask.png (100%) rename {docs => docs_theme}/img/sponsors/2-hipo.png (100%) rename {docs => docs_theme}/img/sponsors/2-koordinates.png (100%) rename {docs => docs_theme}/img/sponsors/2-laterpay.png (100%) rename {docs => docs_theme}/img/sponsors/2-lightning_kite.png (100%) rename {docs => docs_theme}/img/sponsors/2-mirus_research.png (100%) rename {docs => docs_theme}/img/sponsors/2-nexthub.png (100%) rename {docs => docs_theme}/img/sponsors/2-opbeat.png (100%) rename {docs => docs_theme}/img/sponsors/2-prorenata.png (100%) rename {docs => docs_theme}/img/sponsors/2-pulsecode.png (100%) rename {docs => docs_theme}/img/sponsors/2-rapasso.png (100%) rename {docs => docs_theme}/img/sponsors/2-schuberg_philis.png (100%) rename {docs => docs_theme}/img/sponsors/2-security_compass.png (100%) rename {docs => docs_theme}/img/sponsors/2-sga.png (100%) rename {docs => docs_theme}/img/sponsors/2-singing-horse.png (100%) rename {docs => docs_theme}/img/sponsors/2-sirono.png (100%) rename {docs => docs_theme}/img/sponsors/2-vinta.png (100%) rename {docs => docs_theme}/img/sponsors/2-wusawork.png (100%) rename {docs => docs_theme}/img/sponsors/3-aba.png (100%) rename {docs => docs_theme}/img/sponsors/3-aditium.png (100%) rename {docs => docs_theme}/img/sponsors/3-alwaysdata.png (100%) rename {docs => docs_theme}/img/sponsors/3-ax_semantics.png (100%) rename {docs => docs_theme}/img/sponsors/3-beefarm.png (100%) rename {docs => docs_theme}/img/sponsors/3-blimp.png (100%) rename {docs => docs_theme}/img/sponsors/3-brightloop.png (100%) rename {docs => docs_theme}/img/sponsors/3-cantemo.gif (100%) rename {docs => docs_theme}/img/sponsors/3-crosswordtracker.png (100%) rename {docs => docs_theme}/img/sponsors/3-fluxility.png (100%) rename {docs => docs_theme}/img/sponsors/3-garfo.png (100%) rename {docs => docs_theme}/img/sponsors/3-gizmag.png (100%) rename {docs => docs_theme}/img/sponsors/3-holvi.png (100%) rename {docs => docs_theme}/img/sponsors/3-imt_computer_services.png (100%) rename {docs => docs_theme}/img/sponsors/3-infinite_code.png (100%) rename {docs => docs_theme}/img/sponsors/3-ipushpull.png (100%) rename {docs => docs_theme}/img/sponsors/3-isl.png (100%) rename {docs => docs_theme}/img/sponsors/3-life_the_game.png (100%) rename {docs => docs_theme}/img/sponsors/3-makespace.png (100%) rename {docs => docs_theme}/img/sponsors/3-nephila.png (100%) rename {docs => docs_theme}/img/sponsors/3-openeye.png (100%) rename {docs => docs_theme}/img/sponsors/3-pathwright.png (100%) rename {docs => docs_theme}/img/sponsors/3-phurba.png (100%) rename {docs => docs_theme}/img/sponsors/3-pkgfarm.png (100%) rename {docs => docs_theme}/img/sponsors/3-providenz.png (100%) rename {docs => docs_theme}/img/sponsors/3-safari.png (100%) rename {docs => docs_theme}/img/sponsors/3-shippo.png (100%) rename {docs => docs_theme}/img/sponsors/3-teonite.png (100%) rename {docs => docs_theme}/img/sponsors/3-thermondo-gmbh.png (100%) rename {docs => docs_theme}/img/sponsors/3-tivix.png (100%) rename {docs => docs_theme}/img/sponsors/3-trackmaven.png (100%) rename {docs => docs_theme}/img/sponsors/3-transcode.png (100%) rename {docs => docs_theme}/img/sponsors/3-triggered_messaging.png (100%) rename {docs => docs_theme}/img/sponsors/3-vzzual.png (100%) rename {docs => docs_theme}/img/sponsors/3-wildfish.png (100%) rename {docs => docs_theme}/img/travis-status.png (100%) rename {docs => docs_theme}/js/bootstrap-2.1.1-min.js (100%) rename {docs => docs_theme}/js/jquery-1.8.1-min.js (100%) rename {docs => docs_theme}/js/prettify-1.0.js (100%) diff --git a/docs/css/bootstrap-responsive.css b/docs_theme/css/bootstrap-responsive.css similarity index 100% rename from docs/css/bootstrap-responsive.css rename to docs_theme/css/bootstrap-responsive.css diff --git a/docs/css/bootstrap.css b/docs_theme/css/bootstrap.css similarity index 100% rename from docs/css/bootstrap.css rename to docs_theme/css/bootstrap.css diff --git a/docs/css/default.css b/docs_theme/css/default.css similarity index 100% rename from docs/css/default.css rename to docs_theme/css/default.css diff --git a/docs/css/prettify.css b/docs_theme/css/prettify.css similarity index 100% rename from docs/css/prettify.css rename to docs_theme/css/prettify.css diff --git a/docs/img/1-kuwaitnet.png b/docs_theme/img/1-kuwaitnet.png similarity index 100% rename from docs/img/1-kuwaitnet.png rename to docs_theme/img/1-kuwaitnet.png diff --git a/docs/img/apiary.png b/docs_theme/img/apiary.png similarity index 100% rename from docs/img/apiary.png rename to docs_theme/img/apiary.png diff --git a/docs/img/autocomplete.png b/docs_theme/img/autocomplete.png similarity index 100% rename from docs/img/autocomplete.png rename to docs_theme/img/autocomplete.png diff --git a/docs/img/cerulean.png b/docs_theme/img/cerulean.png similarity index 100% rename from docs/img/cerulean.png rename to docs_theme/img/cerulean.png diff --git a/docs/img/django-rest-swagger.png b/docs_theme/img/django-rest-swagger.png similarity index 100% rename from docs/img/django-rest-swagger.png rename to docs_theme/img/django-rest-swagger.png diff --git a/docs/img/favicon.ico b/docs_theme/img/favicon.ico similarity index 100% rename from docs/img/favicon.ico rename to docs_theme/img/favicon.ico diff --git a/docs/img/glyphicons-halflings-white.png b/docs_theme/img/glyphicons-halflings-white.png similarity index 100% rename from docs/img/glyphicons-halflings-white.png rename to docs_theme/img/glyphicons-halflings-white.png diff --git a/docs/img/glyphicons-halflings.png b/docs_theme/img/glyphicons-halflings.png similarity index 100% rename from docs/img/glyphicons-halflings.png rename to docs_theme/img/glyphicons-halflings.png diff --git a/docs/img/grid.png b/docs_theme/img/grid.png similarity index 100% rename from docs/img/grid.png rename to docs_theme/img/grid.png diff --git a/docs/img/labels-and-milestones.png b/docs_theme/img/labels-and-milestones.png similarity index 100% rename from docs/img/labels-and-milestones.png rename to docs_theme/img/labels-and-milestones.png diff --git a/docs/img/logo.png b/docs_theme/img/logo.png similarity index 100% rename from docs/img/logo.png rename to docs_theme/img/logo.png diff --git a/docs/img/quickstart.png b/docs_theme/img/quickstart.png similarity index 100% rename from docs/img/quickstart.png rename to docs_theme/img/quickstart.png diff --git a/docs/img/rest-framework-docs.png b/docs_theme/img/rest-framework-docs.png similarity index 100% rename from docs/img/rest-framework-docs.png rename to docs_theme/img/rest-framework-docs.png diff --git a/docs/img/self-describing.png b/docs_theme/img/self-describing.png similarity index 100% rename from docs/img/self-describing.png rename to docs_theme/img/self-describing.png diff --git a/docs/img/slate.png b/docs_theme/img/slate.png similarity index 100% rename from docs/img/slate.png rename to docs_theme/img/slate.png diff --git a/docs/img/sponsors/0-eventbrite.png b/docs_theme/img/sponsors/0-eventbrite.png similarity index 100% rename from docs/img/sponsors/0-eventbrite.png rename to docs_theme/img/sponsors/0-eventbrite.png diff --git a/docs/img/sponsors/1-cyan.png b/docs_theme/img/sponsors/1-cyan.png similarity index 100% rename from docs/img/sponsors/1-cyan.png rename to docs_theme/img/sponsors/1-cyan.png diff --git a/docs/img/sponsors/1-divio.png b/docs_theme/img/sponsors/1-divio.png similarity index 100% rename from docs/img/sponsors/1-divio.png rename to docs_theme/img/sponsors/1-divio.png diff --git a/docs/img/sponsors/1-kuwaitnet.png b/docs_theme/img/sponsors/1-kuwaitnet.png similarity index 100% rename from docs/img/sponsors/1-kuwaitnet.png rename to docs_theme/img/sponsors/1-kuwaitnet.png diff --git a/docs/img/sponsors/1-lulu.png b/docs_theme/img/sponsors/1-lulu.png similarity index 100% rename from docs/img/sponsors/1-lulu.png rename to docs_theme/img/sponsors/1-lulu.png diff --git a/docs/img/sponsors/1-potato.png b/docs_theme/img/sponsors/1-potato.png similarity index 100% rename from docs/img/sponsors/1-potato.png rename to docs_theme/img/sponsors/1-potato.png diff --git a/docs/img/sponsors/1-purplebit.png b/docs_theme/img/sponsors/1-purplebit.png similarity index 100% rename from docs/img/sponsors/1-purplebit.png rename to docs_theme/img/sponsors/1-purplebit.png diff --git a/docs/img/sponsors/1-runscope.png b/docs_theme/img/sponsors/1-runscope.png similarity index 100% rename from docs/img/sponsors/1-runscope.png rename to docs_theme/img/sponsors/1-runscope.png diff --git a/docs/img/sponsors/1-simple-energy.png b/docs_theme/img/sponsors/1-simple-energy.png similarity index 100% rename from docs/img/sponsors/1-simple-energy.png rename to docs_theme/img/sponsors/1-simple-energy.png diff --git a/docs/img/sponsors/1-vokal_interactive.png b/docs_theme/img/sponsors/1-vokal_interactive.png similarity index 100% rename from docs/img/sponsors/1-vokal_interactive.png rename to docs_theme/img/sponsors/1-vokal_interactive.png diff --git a/docs/img/sponsors/1-wiredrive.png b/docs_theme/img/sponsors/1-wiredrive.png similarity index 100% rename from docs/img/sponsors/1-wiredrive.png rename to docs_theme/img/sponsors/1-wiredrive.png diff --git a/docs/img/sponsors/2-byte.png b/docs_theme/img/sponsors/2-byte.png similarity index 100% rename from docs/img/sponsors/2-byte.png rename to docs_theme/img/sponsors/2-byte.png diff --git a/docs/img/sponsors/2-compile.png b/docs_theme/img/sponsors/2-compile.png similarity index 100% rename from docs/img/sponsors/2-compile.png rename to docs_theme/img/sponsors/2-compile.png diff --git a/docs/img/sponsors/2-crate.png b/docs_theme/img/sponsors/2-crate.png similarity index 100% rename from docs/img/sponsors/2-crate.png rename to docs_theme/img/sponsors/2-crate.png diff --git a/docs/img/sponsors/2-cryptico.png b/docs_theme/img/sponsors/2-cryptico.png similarity index 100% rename from docs/img/sponsors/2-cryptico.png rename to docs_theme/img/sponsors/2-cryptico.png diff --git a/docs/img/sponsors/2-django.png b/docs_theme/img/sponsors/2-django.png similarity index 100% rename from docs/img/sponsors/2-django.png rename to docs_theme/img/sponsors/2-django.png diff --git a/docs/img/sponsors/2-galileo_press.png b/docs_theme/img/sponsors/2-galileo_press.png similarity index 100% rename from docs/img/sponsors/2-galileo_press.png rename to docs_theme/img/sponsors/2-galileo_press.png diff --git a/docs/img/sponsors/2-heroku.png b/docs_theme/img/sponsors/2-heroku.png similarity index 100% rename from docs/img/sponsors/2-heroku.png rename to docs_theme/img/sponsors/2-heroku.png diff --git a/docs/img/sponsors/2-hipflask.png b/docs_theme/img/sponsors/2-hipflask.png similarity index 100% rename from docs/img/sponsors/2-hipflask.png rename to docs_theme/img/sponsors/2-hipflask.png diff --git a/docs/img/sponsors/2-hipo.png b/docs_theme/img/sponsors/2-hipo.png similarity index 100% rename from docs/img/sponsors/2-hipo.png rename to docs_theme/img/sponsors/2-hipo.png diff --git a/docs/img/sponsors/2-koordinates.png b/docs_theme/img/sponsors/2-koordinates.png similarity index 100% rename from docs/img/sponsors/2-koordinates.png rename to docs_theme/img/sponsors/2-koordinates.png diff --git a/docs/img/sponsors/2-laterpay.png b/docs_theme/img/sponsors/2-laterpay.png similarity index 100% rename from docs/img/sponsors/2-laterpay.png rename to docs_theme/img/sponsors/2-laterpay.png diff --git a/docs/img/sponsors/2-lightning_kite.png b/docs_theme/img/sponsors/2-lightning_kite.png similarity index 100% rename from docs/img/sponsors/2-lightning_kite.png rename to docs_theme/img/sponsors/2-lightning_kite.png diff --git a/docs/img/sponsors/2-mirus_research.png b/docs_theme/img/sponsors/2-mirus_research.png similarity index 100% rename from docs/img/sponsors/2-mirus_research.png rename to docs_theme/img/sponsors/2-mirus_research.png diff --git a/docs/img/sponsors/2-nexthub.png b/docs_theme/img/sponsors/2-nexthub.png similarity index 100% rename from docs/img/sponsors/2-nexthub.png rename to docs_theme/img/sponsors/2-nexthub.png diff --git a/docs/img/sponsors/2-opbeat.png b/docs_theme/img/sponsors/2-opbeat.png similarity index 100% rename from docs/img/sponsors/2-opbeat.png rename to docs_theme/img/sponsors/2-opbeat.png diff --git a/docs/img/sponsors/2-prorenata.png b/docs_theme/img/sponsors/2-prorenata.png similarity index 100% rename from docs/img/sponsors/2-prorenata.png rename to docs_theme/img/sponsors/2-prorenata.png diff --git a/docs/img/sponsors/2-pulsecode.png b/docs_theme/img/sponsors/2-pulsecode.png similarity index 100% rename from docs/img/sponsors/2-pulsecode.png rename to docs_theme/img/sponsors/2-pulsecode.png diff --git a/docs/img/sponsors/2-rapasso.png b/docs_theme/img/sponsors/2-rapasso.png similarity index 100% rename from docs/img/sponsors/2-rapasso.png rename to docs_theme/img/sponsors/2-rapasso.png diff --git a/docs/img/sponsors/2-schuberg_philis.png b/docs_theme/img/sponsors/2-schuberg_philis.png similarity index 100% rename from docs/img/sponsors/2-schuberg_philis.png rename to docs_theme/img/sponsors/2-schuberg_philis.png diff --git a/docs/img/sponsors/2-security_compass.png b/docs_theme/img/sponsors/2-security_compass.png similarity index 100% rename from docs/img/sponsors/2-security_compass.png rename to docs_theme/img/sponsors/2-security_compass.png diff --git a/docs/img/sponsors/2-sga.png b/docs_theme/img/sponsors/2-sga.png similarity index 100% rename from docs/img/sponsors/2-sga.png rename to docs_theme/img/sponsors/2-sga.png diff --git a/docs/img/sponsors/2-singing-horse.png b/docs_theme/img/sponsors/2-singing-horse.png similarity index 100% rename from docs/img/sponsors/2-singing-horse.png rename to docs_theme/img/sponsors/2-singing-horse.png diff --git a/docs/img/sponsors/2-sirono.png b/docs_theme/img/sponsors/2-sirono.png similarity index 100% rename from docs/img/sponsors/2-sirono.png rename to docs_theme/img/sponsors/2-sirono.png diff --git a/docs/img/sponsors/2-vinta.png b/docs_theme/img/sponsors/2-vinta.png similarity index 100% rename from docs/img/sponsors/2-vinta.png rename to docs_theme/img/sponsors/2-vinta.png diff --git a/docs/img/sponsors/2-wusawork.png b/docs_theme/img/sponsors/2-wusawork.png similarity index 100% rename from docs/img/sponsors/2-wusawork.png rename to docs_theme/img/sponsors/2-wusawork.png diff --git a/docs/img/sponsors/3-aba.png b/docs_theme/img/sponsors/3-aba.png similarity index 100% rename from docs/img/sponsors/3-aba.png rename to docs_theme/img/sponsors/3-aba.png diff --git a/docs/img/sponsors/3-aditium.png b/docs_theme/img/sponsors/3-aditium.png similarity index 100% rename from docs/img/sponsors/3-aditium.png rename to docs_theme/img/sponsors/3-aditium.png diff --git a/docs/img/sponsors/3-alwaysdata.png b/docs_theme/img/sponsors/3-alwaysdata.png similarity index 100% rename from docs/img/sponsors/3-alwaysdata.png rename to docs_theme/img/sponsors/3-alwaysdata.png diff --git a/docs/img/sponsors/3-ax_semantics.png b/docs_theme/img/sponsors/3-ax_semantics.png similarity index 100% rename from docs/img/sponsors/3-ax_semantics.png rename to docs_theme/img/sponsors/3-ax_semantics.png diff --git a/docs/img/sponsors/3-beefarm.png b/docs_theme/img/sponsors/3-beefarm.png similarity index 100% rename from docs/img/sponsors/3-beefarm.png rename to docs_theme/img/sponsors/3-beefarm.png diff --git a/docs/img/sponsors/3-blimp.png b/docs_theme/img/sponsors/3-blimp.png similarity index 100% rename from docs/img/sponsors/3-blimp.png rename to docs_theme/img/sponsors/3-blimp.png diff --git a/docs/img/sponsors/3-brightloop.png b/docs_theme/img/sponsors/3-brightloop.png similarity index 100% rename from docs/img/sponsors/3-brightloop.png rename to docs_theme/img/sponsors/3-brightloop.png diff --git a/docs/img/sponsors/3-cantemo.gif b/docs_theme/img/sponsors/3-cantemo.gif similarity index 100% rename from docs/img/sponsors/3-cantemo.gif rename to docs_theme/img/sponsors/3-cantemo.gif diff --git a/docs/img/sponsors/3-crosswordtracker.png b/docs_theme/img/sponsors/3-crosswordtracker.png similarity index 100% rename from docs/img/sponsors/3-crosswordtracker.png rename to docs_theme/img/sponsors/3-crosswordtracker.png diff --git a/docs/img/sponsors/3-fluxility.png b/docs_theme/img/sponsors/3-fluxility.png similarity index 100% rename from docs/img/sponsors/3-fluxility.png rename to docs_theme/img/sponsors/3-fluxility.png diff --git a/docs/img/sponsors/3-garfo.png b/docs_theme/img/sponsors/3-garfo.png similarity index 100% rename from docs/img/sponsors/3-garfo.png rename to docs_theme/img/sponsors/3-garfo.png diff --git a/docs/img/sponsors/3-gizmag.png b/docs_theme/img/sponsors/3-gizmag.png similarity index 100% rename from docs/img/sponsors/3-gizmag.png rename to docs_theme/img/sponsors/3-gizmag.png diff --git a/docs/img/sponsors/3-holvi.png b/docs_theme/img/sponsors/3-holvi.png similarity index 100% rename from docs/img/sponsors/3-holvi.png rename to docs_theme/img/sponsors/3-holvi.png diff --git a/docs/img/sponsors/3-imt_computer_services.png b/docs_theme/img/sponsors/3-imt_computer_services.png similarity index 100% rename from docs/img/sponsors/3-imt_computer_services.png rename to docs_theme/img/sponsors/3-imt_computer_services.png diff --git a/docs/img/sponsors/3-infinite_code.png b/docs_theme/img/sponsors/3-infinite_code.png similarity index 100% rename from docs/img/sponsors/3-infinite_code.png rename to docs_theme/img/sponsors/3-infinite_code.png diff --git a/docs/img/sponsors/3-ipushpull.png b/docs_theme/img/sponsors/3-ipushpull.png similarity index 100% rename from docs/img/sponsors/3-ipushpull.png rename to docs_theme/img/sponsors/3-ipushpull.png diff --git a/docs/img/sponsors/3-isl.png b/docs_theme/img/sponsors/3-isl.png similarity index 100% rename from docs/img/sponsors/3-isl.png rename to docs_theme/img/sponsors/3-isl.png diff --git a/docs/img/sponsors/3-life_the_game.png b/docs_theme/img/sponsors/3-life_the_game.png similarity index 100% rename from docs/img/sponsors/3-life_the_game.png rename to docs_theme/img/sponsors/3-life_the_game.png diff --git a/docs/img/sponsors/3-makespace.png b/docs_theme/img/sponsors/3-makespace.png similarity index 100% rename from docs/img/sponsors/3-makespace.png rename to docs_theme/img/sponsors/3-makespace.png diff --git a/docs/img/sponsors/3-nephila.png b/docs_theme/img/sponsors/3-nephila.png similarity index 100% rename from docs/img/sponsors/3-nephila.png rename to docs_theme/img/sponsors/3-nephila.png diff --git a/docs/img/sponsors/3-openeye.png b/docs_theme/img/sponsors/3-openeye.png similarity index 100% rename from docs/img/sponsors/3-openeye.png rename to docs_theme/img/sponsors/3-openeye.png diff --git a/docs/img/sponsors/3-pathwright.png b/docs_theme/img/sponsors/3-pathwright.png similarity index 100% rename from docs/img/sponsors/3-pathwright.png rename to docs_theme/img/sponsors/3-pathwright.png diff --git a/docs/img/sponsors/3-phurba.png b/docs_theme/img/sponsors/3-phurba.png similarity index 100% rename from docs/img/sponsors/3-phurba.png rename to docs_theme/img/sponsors/3-phurba.png diff --git a/docs/img/sponsors/3-pkgfarm.png b/docs_theme/img/sponsors/3-pkgfarm.png similarity index 100% rename from docs/img/sponsors/3-pkgfarm.png rename to docs_theme/img/sponsors/3-pkgfarm.png diff --git a/docs/img/sponsors/3-providenz.png b/docs_theme/img/sponsors/3-providenz.png similarity index 100% rename from docs/img/sponsors/3-providenz.png rename to docs_theme/img/sponsors/3-providenz.png diff --git a/docs/img/sponsors/3-safari.png b/docs_theme/img/sponsors/3-safari.png similarity index 100% rename from docs/img/sponsors/3-safari.png rename to docs_theme/img/sponsors/3-safari.png diff --git a/docs/img/sponsors/3-shippo.png b/docs_theme/img/sponsors/3-shippo.png similarity index 100% rename from docs/img/sponsors/3-shippo.png rename to docs_theme/img/sponsors/3-shippo.png diff --git a/docs/img/sponsors/3-teonite.png b/docs_theme/img/sponsors/3-teonite.png similarity index 100% rename from docs/img/sponsors/3-teonite.png rename to docs_theme/img/sponsors/3-teonite.png diff --git a/docs/img/sponsors/3-thermondo-gmbh.png b/docs_theme/img/sponsors/3-thermondo-gmbh.png similarity index 100% rename from docs/img/sponsors/3-thermondo-gmbh.png rename to docs_theme/img/sponsors/3-thermondo-gmbh.png diff --git a/docs/img/sponsors/3-tivix.png b/docs_theme/img/sponsors/3-tivix.png similarity index 100% rename from docs/img/sponsors/3-tivix.png rename to docs_theme/img/sponsors/3-tivix.png diff --git a/docs/img/sponsors/3-trackmaven.png b/docs_theme/img/sponsors/3-trackmaven.png similarity index 100% rename from docs/img/sponsors/3-trackmaven.png rename to docs_theme/img/sponsors/3-trackmaven.png diff --git a/docs/img/sponsors/3-transcode.png b/docs_theme/img/sponsors/3-transcode.png similarity index 100% rename from docs/img/sponsors/3-transcode.png rename to docs_theme/img/sponsors/3-transcode.png diff --git a/docs/img/sponsors/3-triggered_messaging.png b/docs_theme/img/sponsors/3-triggered_messaging.png similarity index 100% rename from docs/img/sponsors/3-triggered_messaging.png rename to docs_theme/img/sponsors/3-triggered_messaging.png diff --git a/docs/img/sponsors/3-vzzual.png b/docs_theme/img/sponsors/3-vzzual.png similarity index 100% rename from docs/img/sponsors/3-vzzual.png rename to docs_theme/img/sponsors/3-vzzual.png diff --git a/docs/img/sponsors/3-wildfish.png b/docs_theme/img/sponsors/3-wildfish.png similarity index 100% rename from docs/img/sponsors/3-wildfish.png rename to docs_theme/img/sponsors/3-wildfish.png diff --git a/docs/img/travis-status.png b/docs_theme/img/travis-status.png similarity index 100% rename from docs/img/travis-status.png rename to docs_theme/img/travis-status.png diff --git a/docs/js/bootstrap-2.1.1-min.js b/docs_theme/js/bootstrap-2.1.1-min.js similarity index 100% rename from docs/js/bootstrap-2.1.1-min.js rename to docs_theme/js/bootstrap-2.1.1-min.js diff --git a/docs/js/jquery-1.8.1-min.js b/docs_theme/js/jquery-1.8.1-min.js similarity index 100% rename from docs/js/jquery-1.8.1-min.js rename to docs_theme/js/jquery-1.8.1-min.js diff --git a/docs/js/prettify-1.0.js b/docs_theme/js/prettify-1.0.js similarity index 100% rename from docs/js/prettify-1.0.js rename to docs_theme/js/prettify-1.0.js From dbc5c066c2219a0ef8a0c2197b5f163b06cf57c2 Mon Sep 17 00:00:00 2001 From: Dougal Matthews <dougal@redhat.com> Date: Wed, 10 Dec 2014 11:33:30 +0000 Subject: [PATCH 1279/1652] Add a theme.js file to enable highlighing --- docs_theme/base.html | 1 + docs_theme/js/theme.js | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 docs_theme/js/theme.js diff --git a/docs_theme/base.html b/docs_theme/base.html index 25bd33ef0..b3066eb31 100644 --- a/docs_theme/base.html +++ b/docs_theme/base.html @@ -169,6 +169,7 @@ <script src="{{ base_url }}/js/jquery-1.8.1-min.js"></script> <script src="{{ base_url }}/js/prettify-1.0.js"></script> <script src="{{ base_url }}/js/bootstrap-2.1.1-min.js"></script> + <script src="{{ base_url }}/js/theme.js"></script> <script> //$('.side-nav').scrollspy() diff --git a/docs_theme/js/theme.js b/docs_theme/js/theme.js new file mode 100644 index 000000000..73607be5e --- /dev/null +++ b/docs_theme/js/theme.js @@ -0,0 +1,5 @@ +$(function(){ + + $('pre code').parent().addClass('prettyprint well'); + +}); From dafc5d45a01da2ba212eb89d4470405ea429ed2a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 10 Dec 2014 12:28:48 +0000 Subject: [PATCH 1280/1652] Minor docs tweaks to titles and citations --- docs/topics/2.2-announcement.md | 2 +- docs/topics/2.3-announcement.md | 2 +- docs/topics/2.4-announcement.md | 2 +- docs/topics/rest-framework-2-announcement.md | 4 +--- docs/topics/third-party-resources.md | 6 +++++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/topics/2.2-announcement.md b/docs/topics/2.2-announcement.md index 1df52cff2..e6220f427 100644 --- a/docs/topics/2.2-announcement.md +++ b/docs/topics/2.2-announcement.md @@ -1,4 +1,4 @@ -# REST framework 2.2 announcement +# Django REST framework 2.2 The 2.2 release represents an important point for REST framework, with the addition of Python 3 support, and the introduction of an official deprecation policy. diff --git a/docs/topics/2.3-announcement.md b/docs/topics/2.3-announcement.md index 66e468655..21d9f1dbc 100644 --- a/docs/topics/2.3-announcement.md +++ b/docs/topics/2.3-announcement.md @@ -1,4 +1,4 @@ -# REST framework 2.3 announcement +# Django REST framework 2.3 REST framework 2.3 makes it even quicker and easier to build your Web APIs. diff --git a/docs/topics/2.4-announcement.md b/docs/topics/2.4-announcement.md index f38c743c0..4ca35290c 100644 --- a/docs/topics/2.4-announcement.md +++ b/docs/topics/2.4-announcement.md @@ -1,4 +1,4 @@ -# REST framework 2.4 announcement +# Django REST framework 2.4 The 2.4 release is largely an intermediate step, tying up some outstanding issues prior to the 3.x series. diff --git a/docs/topics/rest-framework-2-announcement.md b/docs/topics/rest-framework-2-announcement.md index a7746932e..ed41bb486 100644 --- a/docs/topics/rest-framework-2-announcement.md +++ b/docs/topics/rest-framework-2-announcement.md @@ -1,6 +1,4 @@ -# Django REST framework 2 - -What it is, and why you should care. +# Django REST framework 2.0 > Most people just make the mistake that it should be simple to design simple things. In reality, the effort required to design something is inversely proportional to the simplicity of the result. > diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 0358d6148..6f4df2886 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -1,5 +1,9 @@ # Third Party Resources +> Software ecosystems […] establish a community that further accelerates the sharing of knowledge, content, issues, expertise and skills. +> +> — [Jan Bosch][cite]. + ## About Third Party Packages Third Party Packages allow developers to share code that extends the functionality of Django REST framework, in order to support additional use-cases. @@ -260,7 +264,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [Web API performance: profiling Django REST framework][web-api-performance-profiling-django-rest-framework] * [API Development with Django and Django REST Framework][api-development-with-django-and-django-rest-framework] - +[cite]: http://www.software-ecosystems.com/Software_Ecosystems/Ecosystems.html [cookiecutter]: https://github.com/jpadilla/cookiecutter-django-rest-framework [new-repo]: https://github.com/new [create-a-repo]: https://help.github.com/articles/create-a-repo/ From 1ea84c92a73e03984e4318955474d21140cdd9f7 Mon Sep 17 00:00:00 2001 From: Dougal Matthews <dougal@redhat.com> Date: Wed, 10 Dec 2014 13:42:08 +0000 Subject: [PATCH 1281/1652] Sorted the images Moved images referenced by the markdown back to the docs directory Deleted unused image autocomplete.png --- {docs_theme => docs}/img/apiary.png | Bin {docs_theme => docs}/img/cerulean.png | Bin .../img/django-rest-swagger.png | Bin .../img/labels-and-milestones.png | Bin {docs_theme => docs}/img/logo.png | Bin {docs_theme => docs}/img/quickstart.png | Bin .../img/rest-framework-docs.png | Bin {docs_theme => docs}/img/self-describing.png | Bin {docs_theme => docs}/img/slate.png | Bin .../img/sponsors/0-eventbrite.png | Bin {docs_theme => docs}/img/sponsors/1-cyan.png | Bin {docs_theme => docs}/img/sponsors/1-divio.png | Bin .../img/sponsors/1-kuwaitnet.png | Bin {docs_theme => docs}/img/sponsors/1-lulu.png | Bin {docs_theme => docs}/img/sponsors/1-potato.png | Bin .../img/sponsors/1-purplebit.png | Bin .../img/sponsors/1-runscope.png | Bin .../img/sponsors/1-simple-energy.png | Bin .../img/sponsors/1-vokal_interactive.png | Bin .../img/sponsors/1-wiredrive.png | Bin {docs_theme => docs}/img/sponsors/2-byte.png | Bin {docs_theme => docs}/img/sponsors/2-compile.png | Bin {docs_theme => docs}/img/sponsors/2-crate.png | Bin .../img/sponsors/2-cryptico.png | Bin {docs_theme => docs}/img/sponsors/2-django.png | Bin .../img/sponsors/2-galileo_press.png | Bin {docs_theme => docs}/img/sponsors/2-heroku.png | Bin .../img/sponsors/2-hipflask.png | Bin {docs_theme => docs}/img/sponsors/2-hipo.png | Bin .../img/sponsors/2-koordinates.png | Bin .../img/sponsors/2-laterpay.png | Bin .../img/sponsors/2-lightning_kite.png | Bin .../img/sponsors/2-mirus_research.png | Bin {docs_theme => docs}/img/sponsors/2-nexthub.png | Bin {docs_theme => docs}/img/sponsors/2-opbeat.png | Bin .../img/sponsors/2-prorenata.png | Bin .../img/sponsors/2-pulsecode.png | Bin {docs_theme => docs}/img/sponsors/2-rapasso.png | Bin .../img/sponsors/2-schuberg_philis.png | Bin .../img/sponsors/2-security_compass.png | Bin {docs_theme => docs}/img/sponsors/2-sga.png | Bin .../img/sponsors/2-singing-horse.png | Bin {docs_theme => docs}/img/sponsors/2-sirono.png | Bin {docs_theme => docs}/img/sponsors/2-vinta.png | Bin .../img/sponsors/2-wusawork.png | Bin {docs_theme => docs}/img/sponsors/3-aba.png | Bin {docs_theme => docs}/img/sponsors/3-aditium.png | Bin .../img/sponsors/3-alwaysdata.png | Bin .../img/sponsors/3-ax_semantics.png | Bin {docs_theme => docs}/img/sponsors/3-beefarm.png | Bin {docs_theme => docs}/img/sponsors/3-blimp.png | Bin .../img/sponsors/3-brightloop.png | Bin {docs_theme => docs}/img/sponsors/3-cantemo.gif | Bin .../img/sponsors/3-crosswordtracker.png | Bin .../img/sponsors/3-fluxility.png | Bin {docs_theme => docs}/img/sponsors/3-garfo.png | Bin {docs_theme => docs}/img/sponsors/3-gizmag.png | Bin {docs_theme => docs}/img/sponsors/3-holvi.png | Bin .../img/sponsors/3-imt_computer_services.png | Bin .../img/sponsors/3-infinite_code.png | Bin .../img/sponsors/3-ipushpull.png | Bin {docs_theme => docs}/img/sponsors/3-isl.png | Bin .../img/sponsors/3-life_the_game.png | Bin .../img/sponsors/3-makespace.png | Bin {docs_theme => docs}/img/sponsors/3-nephila.png | Bin {docs_theme => docs}/img/sponsors/3-openeye.png | Bin .../img/sponsors/3-pathwright.png | Bin {docs_theme => docs}/img/sponsors/3-phurba.png | Bin {docs_theme => docs}/img/sponsors/3-pkgfarm.png | Bin .../img/sponsors/3-providenz.png | Bin {docs_theme => docs}/img/sponsors/3-safari.png | Bin {docs_theme => docs}/img/sponsors/3-shippo.png | Bin {docs_theme => docs}/img/sponsors/3-teonite.png | Bin .../img/sponsors/3-thermondo-gmbh.png | Bin {docs_theme => docs}/img/sponsors/3-tivix.png | Bin .../img/sponsors/3-trackmaven.png | Bin .../img/sponsors/3-transcode.png | Bin .../img/sponsors/3-triggered_messaging.png | Bin {docs_theme => docs}/img/sponsors/3-vzzual.png | Bin .../img/sponsors/3-wildfish.png | Bin {docs_theme => docs}/img/travis-status.png | Bin docs_theme/img/autocomplete.png | Bin 58140 -> 0 bytes 82 files changed, 0 insertions(+), 0 deletions(-) rename {docs_theme => docs}/img/apiary.png (100%) rename {docs_theme => docs}/img/cerulean.png (100%) rename {docs_theme => docs}/img/django-rest-swagger.png (100%) rename {docs_theme => docs}/img/labels-and-milestones.png (100%) rename {docs_theme => docs}/img/logo.png (100%) rename {docs_theme => docs}/img/quickstart.png (100%) rename {docs_theme => docs}/img/rest-framework-docs.png (100%) rename {docs_theme => docs}/img/self-describing.png (100%) rename {docs_theme => docs}/img/slate.png (100%) rename {docs_theme => docs}/img/sponsors/0-eventbrite.png (100%) rename {docs_theme => docs}/img/sponsors/1-cyan.png (100%) rename {docs_theme => docs}/img/sponsors/1-divio.png (100%) rename {docs_theme => docs}/img/sponsors/1-kuwaitnet.png (100%) rename {docs_theme => docs}/img/sponsors/1-lulu.png (100%) rename {docs_theme => docs}/img/sponsors/1-potato.png (100%) rename {docs_theme => docs}/img/sponsors/1-purplebit.png (100%) rename {docs_theme => docs}/img/sponsors/1-runscope.png (100%) rename {docs_theme => docs}/img/sponsors/1-simple-energy.png (100%) rename {docs_theme => docs}/img/sponsors/1-vokal_interactive.png (100%) rename {docs_theme => docs}/img/sponsors/1-wiredrive.png (100%) rename {docs_theme => docs}/img/sponsors/2-byte.png (100%) rename {docs_theme => docs}/img/sponsors/2-compile.png (100%) rename {docs_theme => docs}/img/sponsors/2-crate.png (100%) rename {docs_theme => docs}/img/sponsors/2-cryptico.png (100%) rename {docs_theme => docs}/img/sponsors/2-django.png (100%) rename {docs_theme => docs}/img/sponsors/2-galileo_press.png (100%) rename {docs_theme => docs}/img/sponsors/2-heroku.png (100%) rename {docs_theme => docs}/img/sponsors/2-hipflask.png (100%) rename {docs_theme => docs}/img/sponsors/2-hipo.png (100%) rename {docs_theme => docs}/img/sponsors/2-koordinates.png (100%) rename {docs_theme => docs}/img/sponsors/2-laterpay.png (100%) rename {docs_theme => docs}/img/sponsors/2-lightning_kite.png (100%) rename {docs_theme => docs}/img/sponsors/2-mirus_research.png (100%) rename {docs_theme => docs}/img/sponsors/2-nexthub.png (100%) rename {docs_theme => docs}/img/sponsors/2-opbeat.png (100%) rename {docs_theme => docs}/img/sponsors/2-prorenata.png (100%) rename {docs_theme => docs}/img/sponsors/2-pulsecode.png (100%) rename {docs_theme => docs}/img/sponsors/2-rapasso.png (100%) rename {docs_theme => docs}/img/sponsors/2-schuberg_philis.png (100%) rename {docs_theme => docs}/img/sponsors/2-security_compass.png (100%) rename {docs_theme => docs}/img/sponsors/2-sga.png (100%) rename {docs_theme => docs}/img/sponsors/2-singing-horse.png (100%) rename {docs_theme => docs}/img/sponsors/2-sirono.png (100%) rename {docs_theme => docs}/img/sponsors/2-vinta.png (100%) rename {docs_theme => docs}/img/sponsors/2-wusawork.png (100%) rename {docs_theme => docs}/img/sponsors/3-aba.png (100%) rename {docs_theme => docs}/img/sponsors/3-aditium.png (100%) rename {docs_theme => docs}/img/sponsors/3-alwaysdata.png (100%) rename {docs_theme => docs}/img/sponsors/3-ax_semantics.png (100%) rename {docs_theme => docs}/img/sponsors/3-beefarm.png (100%) rename {docs_theme => docs}/img/sponsors/3-blimp.png (100%) rename {docs_theme => docs}/img/sponsors/3-brightloop.png (100%) rename {docs_theme => docs}/img/sponsors/3-cantemo.gif (100%) rename {docs_theme => docs}/img/sponsors/3-crosswordtracker.png (100%) rename {docs_theme => docs}/img/sponsors/3-fluxility.png (100%) rename {docs_theme => docs}/img/sponsors/3-garfo.png (100%) rename {docs_theme => docs}/img/sponsors/3-gizmag.png (100%) rename {docs_theme => docs}/img/sponsors/3-holvi.png (100%) rename {docs_theme => docs}/img/sponsors/3-imt_computer_services.png (100%) rename {docs_theme => docs}/img/sponsors/3-infinite_code.png (100%) rename {docs_theme => docs}/img/sponsors/3-ipushpull.png (100%) rename {docs_theme => docs}/img/sponsors/3-isl.png (100%) rename {docs_theme => docs}/img/sponsors/3-life_the_game.png (100%) rename {docs_theme => docs}/img/sponsors/3-makespace.png (100%) rename {docs_theme => docs}/img/sponsors/3-nephila.png (100%) rename {docs_theme => docs}/img/sponsors/3-openeye.png (100%) rename {docs_theme => docs}/img/sponsors/3-pathwright.png (100%) rename {docs_theme => docs}/img/sponsors/3-phurba.png (100%) rename {docs_theme => docs}/img/sponsors/3-pkgfarm.png (100%) rename {docs_theme => docs}/img/sponsors/3-providenz.png (100%) rename {docs_theme => docs}/img/sponsors/3-safari.png (100%) rename {docs_theme => docs}/img/sponsors/3-shippo.png (100%) rename {docs_theme => docs}/img/sponsors/3-teonite.png (100%) rename {docs_theme => docs}/img/sponsors/3-thermondo-gmbh.png (100%) rename {docs_theme => docs}/img/sponsors/3-tivix.png (100%) rename {docs_theme => docs}/img/sponsors/3-trackmaven.png (100%) rename {docs_theme => docs}/img/sponsors/3-transcode.png (100%) rename {docs_theme => docs}/img/sponsors/3-triggered_messaging.png (100%) rename {docs_theme => docs}/img/sponsors/3-vzzual.png (100%) rename {docs_theme => docs}/img/sponsors/3-wildfish.png (100%) rename {docs_theme => docs}/img/travis-status.png (100%) delete mode 100644 docs_theme/img/autocomplete.png diff --git a/docs_theme/img/apiary.png b/docs/img/apiary.png similarity index 100% rename from docs_theme/img/apiary.png rename to docs/img/apiary.png diff --git a/docs_theme/img/cerulean.png b/docs/img/cerulean.png similarity index 100% rename from docs_theme/img/cerulean.png rename to docs/img/cerulean.png diff --git a/docs_theme/img/django-rest-swagger.png b/docs/img/django-rest-swagger.png similarity index 100% rename from docs_theme/img/django-rest-swagger.png rename to docs/img/django-rest-swagger.png diff --git a/docs_theme/img/labels-and-milestones.png b/docs/img/labels-and-milestones.png similarity index 100% rename from docs_theme/img/labels-and-milestones.png rename to docs/img/labels-and-milestones.png diff --git a/docs_theme/img/logo.png b/docs/img/logo.png similarity index 100% rename from docs_theme/img/logo.png rename to docs/img/logo.png diff --git a/docs_theme/img/quickstart.png b/docs/img/quickstart.png similarity index 100% rename from docs_theme/img/quickstart.png rename to docs/img/quickstart.png diff --git a/docs_theme/img/rest-framework-docs.png b/docs/img/rest-framework-docs.png similarity index 100% rename from docs_theme/img/rest-framework-docs.png rename to docs/img/rest-framework-docs.png diff --git a/docs_theme/img/self-describing.png b/docs/img/self-describing.png similarity index 100% rename from docs_theme/img/self-describing.png rename to docs/img/self-describing.png diff --git a/docs_theme/img/slate.png b/docs/img/slate.png similarity index 100% rename from docs_theme/img/slate.png rename to docs/img/slate.png diff --git a/docs_theme/img/sponsors/0-eventbrite.png b/docs/img/sponsors/0-eventbrite.png similarity index 100% rename from docs_theme/img/sponsors/0-eventbrite.png rename to docs/img/sponsors/0-eventbrite.png diff --git a/docs_theme/img/sponsors/1-cyan.png b/docs/img/sponsors/1-cyan.png similarity index 100% rename from docs_theme/img/sponsors/1-cyan.png rename to docs/img/sponsors/1-cyan.png diff --git a/docs_theme/img/sponsors/1-divio.png b/docs/img/sponsors/1-divio.png similarity index 100% rename from docs_theme/img/sponsors/1-divio.png rename to docs/img/sponsors/1-divio.png diff --git a/docs_theme/img/sponsors/1-kuwaitnet.png b/docs/img/sponsors/1-kuwaitnet.png similarity index 100% rename from docs_theme/img/sponsors/1-kuwaitnet.png rename to docs/img/sponsors/1-kuwaitnet.png diff --git a/docs_theme/img/sponsors/1-lulu.png b/docs/img/sponsors/1-lulu.png similarity index 100% rename from docs_theme/img/sponsors/1-lulu.png rename to docs/img/sponsors/1-lulu.png diff --git a/docs_theme/img/sponsors/1-potato.png b/docs/img/sponsors/1-potato.png similarity index 100% rename from docs_theme/img/sponsors/1-potato.png rename to docs/img/sponsors/1-potato.png diff --git a/docs_theme/img/sponsors/1-purplebit.png b/docs/img/sponsors/1-purplebit.png similarity index 100% rename from docs_theme/img/sponsors/1-purplebit.png rename to docs/img/sponsors/1-purplebit.png diff --git a/docs_theme/img/sponsors/1-runscope.png b/docs/img/sponsors/1-runscope.png similarity index 100% rename from docs_theme/img/sponsors/1-runscope.png rename to docs/img/sponsors/1-runscope.png diff --git a/docs_theme/img/sponsors/1-simple-energy.png b/docs/img/sponsors/1-simple-energy.png similarity index 100% rename from docs_theme/img/sponsors/1-simple-energy.png rename to docs/img/sponsors/1-simple-energy.png diff --git a/docs_theme/img/sponsors/1-vokal_interactive.png b/docs/img/sponsors/1-vokal_interactive.png similarity index 100% rename from docs_theme/img/sponsors/1-vokal_interactive.png rename to docs/img/sponsors/1-vokal_interactive.png diff --git a/docs_theme/img/sponsors/1-wiredrive.png b/docs/img/sponsors/1-wiredrive.png similarity index 100% rename from docs_theme/img/sponsors/1-wiredrive.png rename to docs/img/sponsors/1-wiredrive.png diff --git a/docs_theme/img/sponsors/2-byte.png b/docs/img/sponsors/2-byte.png similarity index 100% rename from docs_theme/img/sponsors/2-byte.png rename to docs/img/sponsors/2-byte.png diff --git a/docs_theme/img/sponsors/2-compile.png b/docs/img/sponsors/2-compile.png similarity index 100% rename from docs_theme/img/sponsors/2-compile.png rename to docs/img/sponsors/2-compile.png diff --git a/docs_theme/img/sponsors/2-crate.png b/docs/img/sponsors/2-crate.png similarity index 100% rename from docs_theme/img/sponsors/2-crate.png rename to docs/img/sponsors/2-crate.png diff --git a/docs_theme/img/sponsors/2-cryptico.png b/docs/img/sponsors/2-cryptico.png similarity index 100% rename from docs_theme/img/sponsors/2-cryptico.png rename to docs/img/sponsors/2-cryptico.png diff --git a/docs_theme/img/sponsors/2-django.png b/docs/img/sponsors/2-django.png similarity index 100% rename from docs_theme/img/sponsors/2-django.png rename to docs/img/sponsors/2-django.png diff --git a/docs_theme/img/sponsors/2-galileo_press.png b/docs/img/sponsors/2-galileo_press.png similarity index 100% rename from docs_theme/img/sponsors/2-galileo_press.png rename to docs/img/sponsors/2-galileo_press.png diff --git a/docs_theme/img/sponsors/2-heroku.png b/docs/img/sponsors/2-heroku.png similarity index 100% rename from docs_theme/img/sponsors/2-heroku.png rename to docs/img/sponsors/2-heroku.png diff --git a/docs_theme/img/sponsors/2-hipflask.png b/docs/img/sponsors/2-hipflask.png similarity index 100% rename from docs_theme/img/sponsors/2-hipflask.png rename to docs/img/sponsors/2-hipflask.png diff --git a/docs_theme/img/sponsors/2-hipo.png b/docs/img/sponsors/2-hipo.png similarity index 100% rename from docs_theme/img/sponsors/2-hipo.png rename to docs/img/sponsors/2-hipo.png diff --git a/docs_theme/img/sponsors/2-koordinates.png b/docs/img/sponsors/2-koordinates.png similarity index 100% rename from docs_theme/img/sponsors/2-koordinates.png rename to docs/img/sponsors/2-koordinates.png diff --git a/docs_theme/img/sponsors/2-laterpay.png b/docs/img/sponsors/2-laterpay.png similarity index 100% rename from docs_theme/img/sponsors/2-laterpay.png rename to docs/img/sponsors/2-laterpay.png diff --git a/docs_theme/img/sponsors/2-lightning_kite.png b/docs/img/sponsors/2-lightning_kite.png similarity index 100% rename from docs_theme/img/sponsors/2-lightning_kite.png rename to docs/img/sponsors/2-lightning_kite.png diff --git a/docs_theme/img/sponsors/2-mirus_research.png b/docs/img/sponsors/2-mirus_research.png similarity index 100% rename from docs_theme/img/sponsors/2-mirus_research.png rename to docs/img/sponsors/2-mirus_research.png diff --git a/docs_theme/img/sponsors/2-nexthub.png b/docs/img/sponsors/2-nexthub.png similarity index 100% rename from docs_theme/img/sponsors/2-nexthub.png rename to docs/img/sponsors/2-nexthub.png diff --git a/docs_theme/img/sponsors/2-opbeat.png b/docs/img/sponsors/2-opbeat.png similarity index 100% rename from docs_theme/img/sponsors/2-opbeat.png rename to docs/img/sponsors/2-opbeat.png diff --git a/docs_theme/img/sponsors/2-prorenata.png b/docs/img/sponsors/2-prorenata.png similarity index 100% rename from docs_theme/img/sponsors/2-prorenata.png rename to docs/img/sponsors/2-prorenata.png diff --git a/docs_theme/img/sponsors/2-pulsecode.png b/docs/img/sponsors/2-pulsecode.png similarity index 100% rename from docs_theme/img/sponsors/2-pulsecode.png rename to docs/img/sponsors/2-pulsecode.png diff --git a/docs_theme/img/sponsors/2-rapasso.png b/docs/img/sponsors/2-rapasso.png similarity index 100% rename from docs_theme/img/sponsors/2-rapasso.png rename to docs/img/sponsors/2-rapasso.png diff --git a/docs_theme/img/sponsors/2-schuberg_philis.png b/docs/img/sponsors/2-schuberg_philis.png similarity index 100% rename from docs_theme/img/sponsors/2-schuberg_philis.png rename to docs/img/sponsors/2-schuberg_philis.png diff --git a/docs_theme/img/sponsors/2-security_compass.png b/docs/img/sponsors/2-security_compass.png similarity index 100% rename from docs_theme/img/sponsors/2-security_compass.png rename to docs/img/sponsors/2-security_compass.png diff --git a/docs_theme/img/sponsors/2-sga.png b/docs/img/sponsors/2-sga.png similarity index 100% rename from docs_theme/img/sponsors/2-sga.png rename to docs/img/sponsors/2-sga.png diff --git a/docs_theme/img/sponsors/2-singing-horse.png b/docs/img/sponsors/2-singing-horse.png similarity index 100% rename from docs_theme/img/sponsors/2-singing-horse.png rename to docs/img/sponsors/2-singing-horse.png diff --git a/docs_theme/img/sponsors/2-sirono.png b/docs/img/sponsors/2-sirono.png similarity index 100% rename from docs_theme/img/sponsors/2-sirono.png rename to docs/img/sponsors/2-sirono.png diff --git a/docs_theme/img/sponsors/2-vinta.png b/docs/img/sponsors/2-vinta.png similarity index 100% rename from docs_theme/img/sponsors/2-vinta.png rename to docs/img/sponsors/2-vinta.png diff --git a/docs_theme/img/sponsors/2-wusawork.png b/docs/img/sponsors/2-wusawork.png similarity index 100% rename from docs_theme/img/sponsors/2-wusawork.png rename to docs/img/sponsors/2-wusawork.png diff --git a/docs_theme/img/sponsors/3-aba.png b/docs/img/sponsors/3-aba.png similarity index 100% rename from docs_theme/img/sponsors/3-aba.png rename to docs/img/sponsors/3-aba.png diff --git a/docs_theme/img/sponsors/3-aditium.png b/docs/img/sponsors/3-aditium.png similarity index 100% rename from docs_theme/img/sponsors/3-aditium.png rename to docs/img/sponsors/3-aditium.png diff --git a/docs_theme/img/sponsors/3-alwaysdata.png b/docs/img/sponsors/3-alwaysdata.png similarity index 100% rename from docs_theme/img/sponsors/3-alwaysdata.png rename to docs/img/sponsors/3-alwaysdata.png diff --git a/docs_theme/img/sponsors/3-ax_semantics.png b/docs/img/sponsors/3-ax_semantics.png similarity index 100% rename from docs_theme/img/sponsors/3-ax_semantics.png rename to docs/img/sponsors/3-ax_semantics.png diff --git a/docs_theme/img/sponsors/3-beefarm.png b/docs/img/sponsors/3-beefarm.png similarity index 100% rename from docs_theme/img/sponsors/3-beefarm.png rename to docs/img/sponsors/3-beefarm.png diff --git a/docs_theme/img/sponsors/3-blimp.png b/docs/img/sponsors/3-blimp.png similarity index 100% rename from docs_theme/img/sponsors/3-blimp.png rename to docs/img/sponsors/3-blimp.png diff --git a/docs_theme/img/sponsors/3-brightloop.png b/docs/img/sponsors/3-brightloop.png similarity index 100% rename from docs_theme/img/sponsors/3-brightloop.png rename to docs/img/sponsors/3-brightloop.png diff --git a/docs_theme/img/sponsors/3-cantemo.gif b/docs/img/sponsors/3-cantemo.gif similarity index 100% rename from docs_theme/img/sponsors/3-cantemo.gif rename to docs/img/sponsors/3-cantemo.gif diff --git a/docs_theme/img/sponsors/3-crosswordtracker.png b/docs/img/sponsors/3-crosswordtracker.png similarity index 100% rename from docs_theme/img/sponsors/3-crosswordtracker.png rename to docs/img/sponsors/3-crosswordtracker.png diff --git a/docs_theme/img/sponsors/3-fluxility.png b/docs/img/sponsors/3-fluxility.png similarity index 100% rename from docs_theme/img/sponsors/3-fluxility.png rename to docs/img/sponsors/3-fluxility.png diff --git a/docs_theme/img/sponsors/3-garfo.png b/docs/img/sponsors/3-garfo.png similarity index 100% rename from docs_theme/img/sponsors/3-garfo.png rename to docs/img/sponsors/3-garfo.png diff --git a/docs_theme/img/sponsors/3-gizmag.png b/docs/img/sponsors/3-gizmag.png similarity index 100% rename from docs_theme/img/sponsors/3-gizmag.png rename to docs/img/sponsors/3-gizmag.png diff --git a/docs_theme/img/sponsors/3-holvi.png b/docs/img/sponsors/3-holvi.png similarity index 100% rename from docs_theme/img/sponsors/3-holvi.png rename to docs/img/sponsors/3-holvi.png diff --git a/docs_theme/img/sponsors/3-imt_computer_services.png b/docs/img/sponsors/3-imt_computer_services.png similarity index 100% rename from docs_theme/img/sponsors/3-imt_computer_services.png rename to docs/img/sponsors/3-imt_computer_services.png diff --git a/docs_theme/img/sponsors/3-infinite_code.png b/docs/img/sponsors/3-infinite_code.png similarity index 100% rename from docs_theme/img/sponsors/3-infinite_code.png rename to docs/img/sponsors/3-infinite_code.png diff --git a/docs_theme/img/sponsors/3-ipushpull.png b/docs/img/sponsors/3-ipushpull.png similarity index 100% rename from docs_theme/img/sponsors/3-ipushpull.png rename to docs/img/sponsors/3-ipushpull.png diff --git a/docs_theme/img/sponsors/3-isl.png b/docs/img/sponsors/3-isl.png similarity index 100% rename from docs_theme/img/sponsors/3-isl.png rename to docs/img/sponsors/3-isl.png diff --git a/docs_theme/img/sponsors/3-life_the_game.png b/docs/img/sponsors/3-life_the_game.png similarity index 100% rename from docs_theme/img/sponsors/3-life_the_game.png rename to docs/img/sponsors/3-life_the_game.png diff --git a/docs_theme/img/sponsors/3-makespace.png b/docs/img/sponsors/3-makespace.png similarity index 100% rename from docs_theme/img/sponsors/3-makespace.png rename to docs/img/sponsors/3-makespace.png diff --git a/docs_theme/img/sponsors/3-nephila.png b/docs/img/sponsors/3-nephila.png similarity index 100% rename from docs_theme/img/sponsors/3-nephila.png rename to docs/img/sponsors/3-nephila.png diff --git a/docs_theme/img/sponsors/3-openeye.png b/docs/img/sponsors/3-openeye.png similarity index 100% rename from docs_theme/img/sponsors/3-openeye.png rename to docs/img/sponsors/3-openeye.png diff --git a/docs_theme/img/sponsors/3-pathwright.png b/docs/img/sponsors/3-pathwright.png similarity index 100% rename from docs_theme/img/sponsors/3-pathwright.png rename to docs/img/sponsors/3-pathwright.png diff --git a/docs_theme/img/sponsors/3-phurba.png b/docs/img/sponsors/3-phurba.png similarity index 100% rename from docs_theme/img/sponsors/3-phurba.png rename to docs/img/sponsors/3-phurba.png diff --git a/docs_theme/img/sponsors/3-pkgfarm.png b/docs/img/sponsors/3-pkgfarm.png similarity index 100% rename from docs_theme/img/sponsors/3-pkgfarm.png rename to docs/img/sponsors/3-pkgfarm.png diff --git a/docs_theme/img/sponsors/3-providenz.png b/docs/img/sponsors/3-providenz.png similarity index 100% rename from docs_theme/img/sponsors/3-providenz.png rename to docs/img/sponsors/3-providenz.png diff --git a/docs_theme/img/sponsors/3-safari.png b/docs/img/sponsors/3-safari.png similarity index 100% rename from docs_theme/img/sponsors/3-safari.png rename to docs/img/sponsors/3-safari.png diff --git a/docs_theme/img/sponsors/3-shippo.png b/docs/img/sponsors/3-shippo.png similarity index 100% rename from docs_theme/img/sponsors/3-shippo.png rename to docs/img/sponsors/3-shippo.png diff --git a/docs_theme/img/sponsors/3-teonite.png b/docs/img/sponsors/3-teonite.png similarity index 100% rename from docs_theme/img/sponsors/3-teonite.png rename to docs/img/sponsors/3-teonite.png diff --git a/docs_theme/img/sponsors/3-thermondo-gmbh.png b/docs/img/sponsors/3-thermondo-gmbh.png similarity index 100% rename from docs_theme/img/sponsors/3-thermondo-gmbh.png rename to docs/img/sponsors/3-thermondo-gmbh.png diff --git a/docs_theme/img/sponsors/3-tivix.png b/docs/img/sponsors/3-tivix.png similarity index 100% rename from docs_theme/img/sponsors/3-tivix.png rename to docs/img/sponsors/3-tivix.png diff --git a/docs_theme/img/sponsors/3-trackmaven.png b/docs/img/sponsors/3-trackmaven.png similarity index 100% rename from docs_theme/img/sponsors/3-trackmaven.png rename to docs/img/sponsors/3-trackmaven.png diff --git a/docs_theme/img/sponsors/3-transcode.png b/docs/img/sponsors/3-transcode.png similarity index 100% rename from docs_theme/img/sponsors/3-transcode.png rename to docs/img/sponsors/3-transcode.png diff --git a/docs_theme/img/sponsors/3-triggered_messaging.png b/docs/img/sponsors/3-triggered_messaging.png similarity index 100% rename from docs_theme/img/sponsors/3-triggered_messaging.png rename to docs/img/sponsors/3-triggered_messaging.png diff --git a/docs_theme/img/sponsors/3-vzzual.png b/docs/img/sponsors/3-vzzual.png similarity index 100% rename from docs_theme/img/sponsors/3-vzzual.png rename to docs/img/sponsors/3-vzzual.png diff --git a/docs_theme/img/sponsors/3-wildfish.png b/docs/img/sponsors/3-wildfish.png similarity index 100% rename from docs_theme/img/sponsors/3-wildfish.png rename to docs/img/sponsors/3-wildfish.png diff --git a/docs_theme/img/travis-status.png b/docs/img/travis-status.png similarity index 100% rename from docs_theme/img/travis-status.png rename to docs/img/travis-status.png diff --git a/docs_theme/img/autocomplete.png b/docs_theme/img/autocomplete.png deleted file mode 100644 index 29075b257ccfc85c0939fd9ddcc000243c0ab4ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58140 zcmd3NWmuHm*DoLn5`t3F3Ifv79TFnlAPvIMFq8}(Dj<#Y(A_Z7F@)0H-Ho*55W{fh zdH#>_yze>Jbv~SPox_K@ZtmH8t-bbIYwzER306^(!NnrOLP0^nm3=LxhJu2ghJu0? zg^7lIqgu=WLqWm%VkIf5A}cBRM8yecZe<HVL3xc^8V}M?mnHAqT0DJ)-4wX!iT$MM zUeuyA-827>k0hU9PJiwodZQ|pQ;6O0JZrg#PzU?%w~+TV=XZ59#^06u-HmJVkF47g zT0+1S2m9g2{mx55`)Ma=;$;?C=%in8P{42slaDPVtZbtGfu86N-I18XU&DHOiQNJN z?tbuP9Rr~}qiO`OMVvuuZbhE-ZJJf0__ao@n7Q&Y6RfPgW;MJ2Q2-_5`=_#6PMIg0 zQXe-0y3rpJe-e0?7TTU7JT&2)R)7g?cg92!2KNx=p^5KExahJm69r2)gnl7PA6UC1 z-buUHxym_%iSfiX9$YWc{|WCg-7T%sj#y%kLVUX!r#hW*3-P+_dWUGE?aO;yz6V3M zl|B9VPp^5jxj)CJq*9T7Je4vVI)0<D)O~l;>G3L8^4MJg!-v@YeI`<@FSH5qo4#h9 zS`OV+GJ5#z=p;r`g2Y9uhOYv4!hv0<T8`bnd2zw^#X<UGdwME4;|O-$;#2H2Zu5+b z#;wgxLYh<RO|uL6Mdt4NG5s;=4{3DdLxz=CSIm5kfDicOynLKFoIk2QQpOsJEYENb zKz(Eo#R1CSf=j4=G^6H+TlP>@fJLL5?k+xgFpVN)d{_JdgR+;H9}Medb5ug_K&Cql zU%Kfl(;qs-=G^4WHhNDG5$#kciwmjOqEDpZpwfGnZ@qY;xP-0@oXJo!CQwmw`wx?- z$OKl~P+a88rCR4N-9DkC+|w!Kj>2FPC-{y=YaG!(fLe!ww~USU^7$vUBV$ryRJLw( zi7$^z?vaagJin{=?STsRxnI*V3O`Q7dnJcQDR)V}X*v+#_+uEOhkZyeex&e$6!X0U z{@pAIrYPbZJg@{WKBdzKuT10TXdyw-85*DPf-@$DUlkA*`B`V)D<Hih5=2c6V3WKv zEMiHR<hLl1ZbGOKxM6}jjZ*V*`wIgFy39BE6%BrDHowqiRtKJWOzQVS%auPg-7u;A zjat>8`_W_)s?I)lCZya5$C9SYP*af@*VVXRgf;QWTKZk~l}fD&ZGm=yvL#DWNM7c^ z2-|lQ7w)8hK?#U-LZ;0K#xUjglka-pRZpK?kq5q4?Mi%`!hxeeK~GfqNIk5umD^;N zgXD!|qGLZdaj0fH*;~qT)M+<cGFPG+94Pi&;QqG<#$8|3`6-m{T7)=v1gs|3QRs7& z-2-8Q?(uyh@A7Vs`JwAZ-bgKqI@Cq7TKog!DF5igg~bKwdz_c)%L<ruU+!OibZQlq z;9I$8lJY__mX7R^L9l8&_v*d3Jmqn2{ufaf5mGeUQ7Nxio>5te6ehWRbP48`yON5h zO^#~n2{wD^j_od1ALJDYkC4cGtRnpUek?^Vu^iV1#RkVlHlb#(M99;QcwGifhKZ*< z&(Cy|o|LlhGd3wSh&RYxC7$ALYjdKL-XR5&=Jo4>1;GTIZJg>A8ag&JDl-Z*oHHLP z5&-FaE9*GxUK`U+(oUWmgFWG@su~7Gd~wnXuNP#R#3>WHddYja*2mW6H}LvkeacMT zjMI$m&(|5p8B^3At4cAFJ?A9kBJ3lIWLi{(m*ixw7q+X;mW&s17o5J-QJj$kXX|Ip z=LzS)bprBMi=)db6m!)#J~Qb~Nb%^u%iXb`z%GJ}uTSWYzp<vXmYFyxZrh>XdAL(N z4l6QJPaho~|1pJcIc}LU=9XJnu$>9c(<yY<b(RP%+Q{n|D;gKfK6{@hev$(iF0$IP zikaP+MV+PDzqjwRPf977YMCmL%9|?FAZ5^CA7Y<t4>`z5i(h=(G~vPO0Xw^Y<>Fn2 zP`VMl!MhiDul!yzjv#ItITJZ24mOS+4mFu-*nD_J7+JVIxoP-z=XNJF44Cwl{+wPv zMlgmv?@Qqa#vzx4Z9me^{+=-4q$RJd5-*H<hzH0)U9D1uS@XQ=dzG7Ap#|8uexPFL zI61CKGjKw*7-Q0D(tk2wa$yo^r(pYr_Z@Go9b=78&8{ufc4-<s>$vASw@{rw%U-i& zwq$cV@onVg_u-uvD+ODL>u(PE6%z7;M*6-dq`XivRN75Z67+U*br^IM-GL{B*2_2a zy-e5&#UXJd-q+*aEL!Vzv2&nw%&w=azuDtmE!!V-0lN6EX6}AFw>);+wAur2x_6&c zC&VQT7ccC7sI7#N9a2%pMz$yiE4M&WfK|ZKLsK!z7L69-7Fl1<TTO%rYNB6;pB-u& z4(`3sk^V#+7aV;8H_=ZNgrpker_ZLJy?H#}^w^N1&h2_N=;_r{c+{W@elO+%)z$O< z7c9(swGOs!Z`=$n#xQq3O+57eJl?(W8G|-IyD_Ubn@WmYIyB4EG{^LjX_BdE`&GME zdqlfVXK65$3_>;(dMNjmuKgJ|odWBTL4|3LTbB1*$JNx_K>3q+L&LlV7Sox+jnO`E zUnHGL^xK#R^xh_coaA8jp0M?+b=i168-`uFxeo?CY0Gs^O#DM?`sz$-Y55I#_R6Wt z4bH`N5Vyrf-Noc8zbX+c>QTutSpJZCyLlC0l`Do*`Nzh^HvEK{TYJ6qF@7Re$X!~U zK^>tA`hb_MdA83ztz5MugrmRc6Oab`;D>KEY)o$W=#y3+ze%&D5<ApwmPKsBE$;f< zZ7Gp}ye-`^C~fj++Zo|Wvmu+5u!)&EFB>z^uCn)Py1lwX{)v2)PoKStspPp=3x}&I z=<}<QtE_TrxUVH+JQFc79?)r~YD?xcvXT0lZ_d7K244Enz$tgUsH*5xp0s$cS9wxQ z^OhS*2axxzm%KbEoi2r!f@<o4LMl)7R8=@?ypPT!<a7bD8`qS5ApNq6;@QfWI`t~& z9KpJV;#UxJn}Gyf`+b#EZ3Dd~kDJXaJm@s^9>{agej&R&-(_ek-Cb<S?g#L@CAVeC zZ0JHV6t>-*=<VGy>}zGOX2)cA)sWueyDr}De=-m;Fn}?E7hn68H7h<?GC0Vd>Re!c z!g_IbIB#0Z1D)a_rTdZ1C<GL7k8)q+mDr?*{;iw0P<2zzot^H(#JzRb2$v2JZVIOG z$lU(u0wTEsc&%)mULut1Pz2{bav9m4;ks*)=YcK)8O%$g+%;IdUe=$lpWA91f*D~p zIBaJvbvS#cd0Vj68w$G5TpkBApE9RvQ<k~vSGG+0EFe5QTO@tEaJ$G2_)_g%@mR?C zMZSx=oyQNAhSrkSLLLO*;LZm(JA?Qg-PYNz4^BKuVT<!aO=2g;H<JBr(K4KoMO4LN z_V9%ZSk1$r&+6Ht*;8p!qV6v`$viJ*&Z&($L(|mKv_!@{CgJm&mp%7ef|J?f8z1{J zx(S>VT`13p?HZ9ci6RoZjHc+<=)0CMm-?GoJ@b$4Z#|)~CUq0_$b7DR3(;6FjZ3#> zf*bXvt?8j5b1k25-h~Kjc=fg3aBWZ}xUv#0FG?T*J0pr%Nfvc^-v{OS5sC_shB0c~ zD@|z2Z`0ZNV~0RPT}Yqrkr$gV-}`myQp}I1D8`YerLTd0r-V6y?kM;hsK$DFveFuk zJxb-(;5(njgLCLLD=QD9=J73XzD}*o%zy`HW*~~MMSZCK(zY+*x_esu7=HGIE@q== z9(cf;`IB2q#64f*ABMQDO_3-lsA*OjZ(QCeDhQea?buArfNue8ZgvhxY>R>->?VkO zv;(-9JaMzLwRaYD6QTKggdp<yuh;A}PyQa_Vk1KHMp5O7B+v=)gollTjgv+c>&cTR z!cJ!9f@)H){+W*aPlU$O#l=C8ogD-Mv4ObQfKC?d90CFY>@PUkIXPL8BUqi??OjaV zSnZu@|3l;_9Vvjbsgsq1ixtrR$zOC$-U8pbh|tjd#pu`Hf7S_bv--`+-uWM~kOH#* z^$j}*+Y9zzw2@PV|9UH^V&w*~eIsRM2e5ZW@(|_V;O7+nd%}PF>Nm?jrt18j%FDz1 z=gdF8`Ddmu`(G0LA<=)f>+iS7{Sw6zX8*PKqF6T)uPabc#8G6WUTV0Z?k(Kck9~*u zdbETyl|k<orx8+cw;*_}G>)RWuu9J=pupX1-@1m;d_&d7-dC}APN8yOv==(=MC2^5 zDnG2&CFig9jer|Z<NZp~<!zdUF$LR3JgMkVF=d*2+R`Ng_rUA&CT(jZalrgrAPO4h z6Te>{#zSbjp7z3aGAO9%_~O4lRM0W^FDU*Phn(TcE^cW7lYEWw$2jB+2_exte^T`G zTfoMjow>mu{TD@Xzu}0XUu^$gfH4g1qpPdfN0(o0|6ah8sx_|P3;gS8x(OvSbph`w z<?jXl^@Lm^&j0--4!SPg5&YMB&KVuHM{}#Hs!~!Yu5EobYG-F=>J6JbaLIXDWJbs; zXY?a%&0hXXC?*<*<8@i2gQO~Lt*>i*cA{Ve+S}W|dKEZgX}j3yu5&GIsjbB^O8W;R zap}A3Ua2^yJCmh)Bkw6VZqt1cjBN`QgA0zOskA=C-wFQEB#)kWSzD~SD-Sfhw&a}? zz4}#bwTA?>BIGmGpK4%YdIEurS>JyZVu2jIQHQ`ESmhB2`Ila%KO=XW5|>y}`d=c1 zkUXhkUJS_ox2`GgBXvDuJfiWZ^@wM<p-Mnk4fy|W5Z+qFb0+*#Ci`+fjzN4N%kVt| zXQP%^2X`N69wcWU-P@=1VI}|0R6C6o8}Gx7NR-dkT2$P5gWWUmTGZ*Zw+Y50M&!#P zQ}-rP&$Xg5K=>Um;*D-iUlZ)Io`^ryo9U@2PoGm`Vl;NnfM*P1j=d$NK5BpI%s=m4 zsF0Cq#KYN%#LSGRe{9DzW@4D*(&?ck=NyF^NT^g9cifXuR9E0Id`YZ~WDSQ^=5DM? zn&U}-rVb2l)WYB;|5~LdNRgDmTxzgc#9=hd0y5=xwmvyi2~q+JsHXL@mbLb9F$_kg z+~nhXBLsvRooQ{N_d?5Wlgc$P6MS24)6Hk!%GKmm9Z*~yFFEt2#sJfsv&XXSia3jE zv~(6JC7{Q>pYeWgmVXh^uoX|%%E##+pHaa(>jt{L-`?S!3119_Q?^jMCg;iRxLVQm zH;^mN7%Wx|a<ASN<s7VHP4HtYhZh(*m@BQ(<PQm_>|C%KRy~)&1SOnyK*GhMu7^u> zBzM<y`rL&<3E5}dtICzrmlOW^g0~%HCvb|J@RD|x#&w%=Iua`h*ZFU;9xzd;gOkc< zb)Ey1so9CTr<pJR*v2<^Qx=2`0uFdnkJGh7sSNVZxl<L(OGbrbzL;(g8#;S&JA2Lg zaw9$vkaEU2u92JcEzN*)H^nNP2jQX*W!RX33Y|H*-k$ryZqg#oH*~wb--bHzRIu;Q zSMcx(-71W<0`B((x(fKp>0b?rE$$L97BeT&i-G8F$BA+FOEQyeC;?-2<5mSMaV2X9 zOyjgu>J}+iha(y`_+BR0@#>tZuikhvastOkD?^QZO?IuqIRI^S!J$Lu_XPqjE>nC( z`1I|4Z>PdGf(zv~Ph%Hi=)Ged_7VbOg2GcSq;~=qV!GH6+X<8eX_})=yrvr?l}FTy zl-cW-*E!+kjC@63-fm&;Gi}P)|KU?bYG2LNFE(Nmz13m-mo-rdsT=wNb$QCKXD=i6 ziDjzO2wmRYU_+;#VP@KR9fCuty`oD3-R~!NZqfHEb3R|0?;zmNUIpz6WA}IWSni8a z3L(lx2Q6M{BzKD*v7;M>5O7L7uW=|HtTfre*NNTa^^S=m-eeA3B{LqI@11LMSZUoj zWj@xlCxPUoL$mH_^062VZeHFM*(p`LIXsAo|Cm5fLpAu$+sil#r^`NZ!ejKTEWUJ{ z&k*Lp=St91c`L9nm#$om?NO!t<*@K0r8+Im5FohZbbWpO&;q`+mp<5Vb;&c-oalAl zyBJWJz=!K~6^y@ha(^yQF#<mF_=Veab~v{MpU;cikNOO{Jjpz(rAe!dM8Az26`kpc z17gYN1mT>%y~lnDm?t^yS$oH`8X4>M^xmnC*pPO8)9c~mp{2@ab?iSnyx;!l$)Q_B z^lb4mbw$HELYM8k&RGfH8txL`Jz#P&o61s%8HU_)ykU=oS?z9>9|V&C;`=&C4lbt? zFPUrDhH<=~3eUqLKWcXHejN>y^NM@eS5JM*b<iat%@oQ6Y^>+8zD<w;v0gaMO|*z= z8_~YauBqq2ZCP46od~Zq5SzOw-=fc@Bz3K_nZ~}On>NpN;!w6(?mKt@F>IWIUe7vm z)s!sxST8rp-GiB%R4!u0twnnX%Qo*5i*5vnvIbx_o4J|5CW1EmA2TVxYvyvE4{Kde z;nW^|WvMM2Mfl<Ou`W)8$$uGfMm7D-Ok>hG&(`f*;*Y*`r+~}^%T=KlG;9}L)40Vj z>3pv*;)`~<g}TrnkOL)y<EDz-V5;nP{T(<>a+h+LqBraEci(evcV|`F-Bl@`qx8aH ziLj<xN#t@_G9Z;&-R`Z?SP9so0MVFZrw`oLBXKaAttGN5O87C?e*f`eg45t|$A(jD zpg>=2ZXDkt=h$wQZ(X|iSbiYEkeJ)l=UcKWkyoxKE;r|$^;l_&d`SVarLf3#Z1a(u z6(x5*fYtK#)L_HF7F!NBPu2DAS7Xvfom#EZGMTjS2G^>T(YiWa0*#J{6nlW=AD5Ru z8IwcT50bRUyp6Zrs>dy=<dNOOyR{J9ic;TawuxJZXKj@?l>xp%k$i6?IIHmtVG(E0 zF9PQzl3|;JJ_a5zg16g;M}hJdQpMse5~(iHwS*51YfyuV$<kx>FV4{9Vm3W?LiQI% z8a27tA)7n&AYERdev))t=bmlCs|BImepR8>Aw<KC^2)=}LRI@fMRcurEdlKMXth@Z zQ?-Iq)LqLXgV3)7TocAG*a1y~Q;-{IT0PczVs$Z^Mu^mJQ8J>@oyHkC<xO-`hxYM4 zISZ{qn&?U13`P^!D^r2<I|(}pK=<ts02i3ZagmAAMZ{spKCqMTs4+Y3gx$0AteZ#i z2V)(Xdi-_?RQ*%1ObkuZ#d8ACHUrLfeO5C*-*bKXN)4Aa?)ZD!lf^irwxQ7{Zn<-2 zWrBEO8|0UlVN;+G4;Z4UzW6ok#f$r?@>XkXQ-a4@sdK)fLIqt0ayW6`j<<LT+^|?d z&uudOOpX3o%}<g2f1K_b*?tFu7+wQYB}9Xfb2j{Ggtr~!scgOE+V&A5`ST*u+{X_b z)mt|Cb|)n;hlp=~3@PH{(p<R{fg#qn-Id3eSR79Y&O7ODh+EcTq7ai=0neKqz{`<< zbSW9~(YVKj?cBT@8eL`jygH+<hc``ea~4=5u;2*kv1e5C4{vT@LdP|B&~qy0q)w-H zKFcrqgAMCvzS4)0k=KB0atO-+5tZ_3&Adf!j>3dT%5a%(eId^8Gsd6uKL6HGhmO<4 z(f7B4Lf0_Dk+bbcVR-vzi!<^MH|k0_M`Wksldv|t4vSthU4u}qZ1{$V(t$?)_QCd9 zqwsW=c2L%t^}DMd1+0U!mtr5U;I+U{eFR+khZ^)7a%}qf>0h4nt)$)=ifGye%FA1e zkAyHev`Y_uCgQ7g_2$W8X-q4g=`r`t@p@k0uQ?<M{yf%Dd$^!w7&6@y)beg1hYk`= z&jo;0M2hOB)t16tIz*+1&5P5GA}1God-aBR-ibi>nz}*ez8;J9mj!%_$0yv-x^BYD zV6%>1JymvJw&5Dp0JT{SH32ADW&Jv4ty573;U5<fe!(MuoNQIm)<H?{?hBsm@-iju z=0b9?c8#*A;80CmE@LCNm2F?u0kxP<qt#g6WUXseOj?<+&`VKeh}>LCbo6KippR4Y zDXk{&pJcztqk>Wg1&K7DzhGAP4H?i&YL$=4Q(!H;3@#QdV6GLv%(`;YmU;E(9B~x? zUL-0l_EMMo!$*+bQl#TIT$c2$@WF4*A)gAokf^kmFIVbcG%}LzV(u4_rtJJHtoi?j z@Rk!HI3^}0DJdx~4!{ZS{hZ43hc`V@>AUM9XuwKR=Li!K7Pe2x_&&oK<jPql1Ug8e z2);VowW(IPBBI;C{3BMte4_HyKP)V)Vw2t35_EYCAf2j*LKCX#{}p~9FAt5+;^6!R zPA;y6`T3#(9>UPy7s_8xDi8dTyeb|{n#A8p`q!%b#3$~@GE@~eOsa7Hi?N@$05WXr z^?ybDZylH;!-$EJqYR!uW&3|In18Bdb2w?1$(Wa9%30A7L*RG3Y|M_<;oUX%gA!sL z7&%;Kt<PBPg694(6@E7PDQhHkMq^&=UM@3O<F^R4`r_)(!eTIDfo?msjWi5Ech7w& z>POde5g*qD54!kDDHn6nDV;3-@QQ3zqqycH21+QE30dSn+gxoZeiM<8?q*&|wyD#+ z%eZv3emj2XU7c2NjDiG+L($Q_G#T)uV#idnajSKBif~plrhpCu-(?>pjY&Q;=Xd;8 zAd6<Lz|b<)BesAY4!_fkuWN^>N`=?t`;f;%Y~yIeEwvfL2-RFs&-irAV;-i;COU82 z_S0zJ-;7;yjR6}SRm4Q!`RPjq!DwWp13eHoG7~4YTeriUhrJI0s(FtV$~EIrG7SK- zYD%Q&<M#zg`xrm#mp$qZPSHP`$l(BwqbLg$4DQBdYDClg3UkM~Q7g5wKe`@kW)rdL z@)S6$WeGCm=DIJzFn=%srjcR>e3s~Ccrs<eR4doR8%z<?J;<?@$Spu$DSOZDSo&ry zLfEJ|t0&->X*$^4HG9FpUOUoz%dJ~FxmQ9|uUi>fsh`NGpAy>vc6xL;Su_02nxV@1 z3u<-DLAP`Qr-yp}9x~Jp+vThruqX>L^-W~Uo9T3_xpp1pNecc&If}vfhAn@OyD0w* z=47qb^-O<!1I*dL)%R7oV3+4<F*@>ikrU7P#CiXXmT50bZ$tx``ruS*eU^Z82mD7< z-jzLoDXjgsd7M9W;2Ash&Z6&ApX+a1Uyp`qs@!w$)#UHh1f7qBCe6!9K$C<8BNliC zNPzJ$MOAH6YafB+IWh6MIv+{_y~F8+JkU>a;`@XJ>Rp8EvGqJ`Q@gy1H9agXr-j9w z_qUn$*O2<PiY3(0MZLT(?w?}B=G?e>vC-jjeAN)f;=Fcc&&I}<%lgsfCoN>Ihi-X& zeY~!@E-^mM)X9m5QG1?o=^pD4l(xAzEYmD7hm(*on*uFf7Ify1aoo&UfwH;VoB8^e zSAUH_XIX-+gT(4x<m-j<=HGnMabJ_M)OL@L)v!k0D8$&wLlnM3eCzZGw)3ZHZEeMB z+`|2JQuy6qKL?Ge1M8x0<Axut&-ixPzr(}aw?D%iU%c9AQ;h8q+_=Q3Ch<@El`pAQ z68C|rryJY48w=QQFz?^_M`SJ3zJ;i9D>u;~KnJbJPY%Wqv}4rGWAY4JZ$#}&&;8em zHhe~fHnX3`JI`MLwaH~tMgO5JZb!5XH6jWZ&NLwUwz&G%c`O=_O4#k{tvPtsq_^>+ z?^|0Tpid)@tQX9`J6o8J+ma%zT@w%H9HK;QbW58GFqd-7I7P3X+b>jXx9BxrZhWsN z8)G7S|I4aWDv>9m^`x7ImQAw}B9g<j6YhM4H^axy;k?`G%Z6Bz1;5xI2W5AKT_I|# zk}ZlB39nlg9zog7=W3=$T^KxWDsY7&dhQtt9F5^|ERjb{)E&g$W#8($Wt*$H9_|_2 z8cGv=Sb0+%4poY!6S8{vD~V<uicIv}iKt@avN|IvtS}|<h4UZn3<$Zo)~>)p<v7EO zi@i$ql-)}Ok{M56O9&NUU9{urG&LV^DlSxKYBbJ_jDg{Dr^t0@bH>^%<aAvGV<>57 zY2u{bR~Q!Qi*s5;JJ?07utBfJ<MhRn@aN_u9n{V2vh)lRJv)SGJes07>_`vyy`AA8 z2c>)Mk8D;XRmDyx7+t(wzXpOD)Pv{CQsJ)S>viDJw5vU%Y=o!QT7&iR@~vy~l{uHY z_4U-QE0xjpg1>w%-{JLUzxHhLw)2=$i9y}+3F~!P68Ssa`{Y7CDkoPJ{RT0Myp8;b zZ;(y+NznX#BQ~!RrZj$^o#9M{6_;D12E=JgqU3et<(XBk3xj~`e%_MMDd})|{cI`$ zbkfJOaA+*`Ew7Y8^yeY)_gs101<&y~M&;Y9fg<W?2%zWnP<EdY)$Z`T0ad@E{A>dN z1|G+$Khzr9{nm17H`9JOyG`8;KaV`XtGYT1O6)T~%xv?7_KfYs$HUtiSQ#my9;9!5 z;)*5gLgfU`+aeZ@rYf8O5;_{)Mz@m+z0YocY{bXb7y!j62pGno<IwAG7<!b8mpAn; z;QopHn>OEVpIU|V<j+;_)D5|WlWIKofFcXni?mF9^7jhMM5wLv(F<2=h(UGF81gL4 zu#{7e({O(t>PVv~MyYhw!U~$HKi|({CqoajoRYYG{rVuU8&XyjBb-+iTZiq*-iyxw zgt{HKFS2M)@xojRAP)!6bV0kb^N$jxeUDz+_mSi&Q5K3&p7j>%P4Gln<cl5kXANAx zM;!ImsT!Qy83|vE_~t(j5ZH}gS#D?%<JxS&ND`iIvhwMPyFQuCG-9{X*So%)2Tj>+ zGBe=D3l#6!6bjI+S$i0QoSe%xHhY<|4MaqCdv<t~4xG9)Z(NM7X?5J(t`~N5dzy~d zZe4rC`%;{p7K-dR%T8=}7W(^WxmYjfaBX73Y4}cbwI(kO=1kcDAy>E}cD{TS5QDzK zraHb&?J4@ZA-&BPCsRw5N`3Eu+lNd2#c3?oTL(*Kcg(K(=R+~xuFl6X?Evyq7pbaG zyp(8-e1UwQ<1S8W84$6BgI<^QqhWcAiy&U7rs(6{r0}3vlo5020CY$U!O>Vx*4@+K zqtNeKG`HuvDo9S_`r8dz(E4WuW*MF`Z!C{yC*2Qi=#3EJ{!uM3XWoV2J$`7Ut+=8Y z-y0TNX?a@fi@4tL2S&o*wI?D5AgS}u@kFnV83?Yc<AqqOu7i|k-i=(mxk5zVCNLU; zVH0bqWLQTRAFgU{WCjs$VU=xO0H%?GzTM)@Q`ODZB4c@FgaDmPRYOZmO3lvb%=JY? zOyI|`Ct{#*!Ek_j=J8_Bc0>?0-u2a5BxGS`zeluGEz&LyLnH|U_q#J>-m2(^TMz-K ze)ajCLnIE!yFvJf<Yxc)BA~8x7nD9v;Jo@2;Hqx9(A1W;&Dv%#H=t%PlC_hY7FTKg zO&QPHz=&RX=|}odT$ExkYuwZ;nDD8Y1G77PH&RTw=ZNgZ9<XBi9As-ql1ei~6*<G& zHXh-fwmYvc>%H#F+^h`WK21km?A142VdYzcO&E1<V#0!M&ogvgSI`@O*E0$>kX43= zb5#D*HnN#qyCu5;k%MU0W4-zokA-HLMYoJ~A9M3$p8A=|8R3!A4`i#Dj-JKhPn)A` zh#>}Y#58-~A~?&`Yv}E$$d-9_PjeetvSk7_RP`BlL-?M@80W9KdOOcD3Q2~4!U@E< z@p!)fWyaQgI#vtp3>orSm?;9&nT$d0NscTkoI9#*DwM+oT~$^E>v_&wT1H?DT%#La zX%*E6qs1!v76NQWp~M?AMMKV@w3`n6rj@;!P?E9r6TUdvHu(NI^ss-4s7%p|r9-z2 zCAMqA9JB2_PDZM1M)q7uhcd~HX<%-s21g!MKupSR2!C*aigH{n`030aam{lU<hA&w zeQ+uL#%W}z0=sK+NUWfw&Gy+X?3&LeGSWRm_FDu%U+EDIy9Tq{D>I9p@87Q|()Dw< zY1opaX_NcD>hBt)>m1wfzY}rH%wj_D9#mC4;XWDNCP+BO>Z?z3ShbFnP;7~(U&~sx zsB}7M6D9@qDBkne4R`vMJOJ=lVpEa`E{+{2yiBFLS0o)OCsJd&4{GVNJtKF&tcIS{ z8u?a^XA#qtY;Wjo(SV#sm<T>7QKi-D=w=<+uCq8Lk2BVgkdm-l>nFQl*A-7!#?QL_ z0dpsis(!!&-@>!IeJZbT^L*#&QX@FshN1T3gS2u0u(uM%D5HOTC#>$Ug`l--)}0}N zJivlXn?3vu`~;leu#o$#uel1ez@Zok&pP(i#V+no6&q-UOl25e66k10+8Nv|$bMKk zHPU6mmP<`JPVzp!aCavlu<4itbL>8xqhz3SP>c|Zo6u~!D?fSp!D(R2ZfBo+g41qn z(M)U`X6ls1=JGuQ8n?SNddm;j^Y9Vi>tRgZrB6Px5bq{{6%jaAkQyDnw)gTZ_s_i+ z**_St)|b}iTCB=__UqQh|8fU4Il$I+SU1Vd)W3hBn7A)4=E@TS`3^004{E6kKEtjJ zy*J>U+F`+5L#3>=2z@t8UL2QC`=&O%S^puWC%^Azug9C2&z0uQFNb;>As<^RcE27T zVYE=5tnX?MESkj2k74DMhVX^YZUz-roL-e4oQ!|MKEiNLcIy$7hd29nji~3J+v%Nz zUb&##oNZh9T=^V+E_QM%>!!Du@S^_y?1ZeQ4303CfU`rj?SxrANO|XLNslhBizCnt zW+B&+DS~ld-1jYf6Qw=m-Z!Q|xb=$JD9yOCv?24<zD(P-O}oukN275#Tf0ZwXPgS) z;2@uy{bkXO%@o_;7!{L{8EMTdp$1gkfV5Au#rro-OM!RoQJuEbO@%Csbm6-J#HRG; zh?`_^TWhN!*axwlzu~RLqHbval08gLtbW4?GRU7$Na4u-0(VM<jbyx`IvMKaAs+Jq z5=nUk<G4kX`qYBcS+%y3%&sKlX_>(XHJdOVrr}g5T(A3n#d`Kuqfm80y7O84dBJl@ zwa)!svjjl-+f?5Dq$Fnug#e*xJx_tUzZLgJYK-R`qG_&INR#T)af@wZ1^s~Xefkd@ znv__9y;W`DqWtw|nfp2$3*LCb%PTBOR0vTf>#dp7&RS1?aHUdTP!5S4&~uE$hP8q; zQfz&TW%T?oWR}?byRvgrnYRSC>tqNx*_7Cv;BzX`N6KHZwSOxbS*1=BkI%{)U9*_? zl}lTo=CxgOdxL<g397pJX1b0}!`yM%A(M?exOWXz9|$e2E6i0(pc8YTkC`!>G}}tr z7+Xg4bLU%tZ%Ke;umq30rVI~>iECW<XUPduQo;89y{sV6=-37=L5e-JbP%`b`2eHo zRW-$mE+oRN=kg?JofYxE{!vJ;tnyGnta+@8Xwc8A&p(Og$)VH>n6H)Z(b%Np#Q3|h zI>GxS4B=X)lh!<U5s60Xv!2Xzj>uvw^iV79qyCj5IN!Kf1WlK(c5c3xI#H7aw7~_f zn{Z_G1xlp~)@sTnyG->tmU-&w_~xfD7n8<~l3@KV#C}mnB{rMg{wknR$wMX@^nfSB z<=#*HQ|Iq@wE(eY#sI32<(HrVQcb>?n_>8eV66{9`*^;=?X?MG;6H88uL(0TK$bT4 zZsO(Az5U!3o~G3P`0>++PV?tIeZp~{l*&pr)xXzeD-8WSdy$GbhNjaMsJGxAGay<; zH++Ul4C=SL-}s=0&yO2fT~6EA=WD))!e#DH$9k-J7EC`gBl)>D@vrvi$WUrylCc*i z-e=Co3R%GgH0K23MXm7;IoW81J49Ey>LPU4>h381=J@_Ej$ym&(Fz-pH-JV1-*3@w z+Q=$=843olNK!m}Z9UyGR%`;Z@|BJ2Bvxwi3v+^HO$@Pjzbfjra?5gog(e22@Pqs~ z--U#wI}`3gxg1`&C1FpWRu$t&_dbvGg9Ehk_VlaBE_WB|>rbYFIMumAbmDc=Dtdlb zA5_}V*ZG=&4=k$d$7FqA&T0wvJ>Me=${xuC+w3zvjLDLt%jj<`c0P2HK`?9`=%+}> zG;Eeo3|yrn8c!KU3<@91e*76OO(*!JKw=yXVg%_g7lvfL73v$;m3){rnh9pLm94F9 z?(bXgbo0AH`+N7GDV*^w6Rom{`d5LVEO7ozaWj3_x*4aHlVUx+meJg;#n(rjbG~BV zQU8fdVr9gA7Gj13qKqzMuk#9~micV}`uQc(POguR>%zXTgCqbu5z}SDUjt6?XNibc zym_#mYY+D>0Z16mNal1b70pRvI?c4ugf4r5?mQ9FaT>XB)6|xkgDvVchJSeQ*Z4Wz zPd(0I?z?#bkjkHUF3%A+SMa>nKt<cs@U~`ons{PZNCIjto)^-Jc4>4m0lcQaY<H@R z(Ru|sPMA+g1N$7z*Y_o`JJ;s4TA!aAMpWcmd=N_V*me=L(YIJAuU#BA{Kx;Fr~5ss zXH-q`xD_Uy>H%W*;*L&GUUrB#)73Di+m7gebd^@*S7Sx%O;YGvut$oDY!In8Kj|Tm zWgApNls1vO)j;B3smM-X=_@rkow`N$lvs^q1zZ7Z;rV)H`CHUKiU9d8|6yhw;dkY& zeCg|3pS@`MjRgWxZ^2rpG~+R+dqA9NK=)Qn1DO+Aat0fM^Z1fCcI0Eib`OrNcP36F zIAbM7lURqpj%CYt`L*W|<SWxxt7Hk04i(>4^ojh;5f>1l9rvYO`QDmuxH9gTUkX94 zly3BVON|TSl^)G%Vsph2vS+lr>`b_BmMCP;KP_Wk>=}%_s`}9!ZQb3|>i_~J+=e8t zx9r9HuI@J)aZ~@}T=q;EaK)*Ljs10M6+|O@3;ufQx=b!6{;VbzZ9uHf*Ax(IDxA?` zPr(;{)U^OwGT2n>HfBI`a!^-OTQ6=DiHDOIG>w%%TAYzRv7-NJNZR7KD_CYV{o_Zh z87OiajYxN)kdb2y@_RH<=$MMLzYg>9^}Tf>lpu!UTMlRVe>1K-859E809+WRmV4_W zd`I`+?pZ$j4>_Vo%eRNj?b<c{$L^18F*R!a!oHiuS)1iIt`{Z8#Hhck{cu$zFaDs6 z!i=;{4`bmNwV>>(5aZ|R;egC~3w2SiCCy0gYI|M2TdJ7ocO5P2eH4|g&)ra5(#rU2 z=-)j$Us(yhNP#Xtr+SGCB-3KQ!I<Sdh?v*B`jrTs$3o`0^fHxFcdQk9jBgs)K`M^6 zsC{qx>IOL{ow~}e<qv-yd)CCr^t`!4Q6IEjN#cz;kY(xYGVAb1I!>SXU&9Y3@%-9A zDGz?-11D&aSGvgHxZ0bHVVI``v{n28Y>{&{-oGZIx$P|a!PB3K!&(Ku;e+@Q^>V^5 zHw}27+OS{DKM-qo!T+h&Oq8K&XuySrx4~CVu=9;K7#1djb5sVps6HRnsZ3LPk<!A_ zh$iS(uNO(wV#=9^phzDdg-G7)*0VCky#>PdhcC?O2#pRDBgi7DLX@FC9pJKv{4(iK z;xfJ-&F?O8HD6Q=h&=RGo|dWXo4xv3p`$SL(-8`yUL{+2**E3gXQm`gX3g1oc9`Sq z?EStv>c*yv`(z9+)%mqHziuTxhkX+1d0EoNPVkvWljzRtyt5QQm)ai4F(8sePOG`L z;>Sw^v+Bu#rKzqi#S`1s4bE8YTvirIA-T`vg1zl-xx+N~|1r5ID&|P7aK?PjtUxbu zGyo75*le)bgNCrz&Pymq-M@O?<V#b(5i0S|YhR7wEfY#1kzphSGSg#fgs=+mvy`uo zrVjHs619<ZnkR9w%w>L;mS73hcNY<7l@`#PZB-jL>U<U__#IG^y#DJJltlJ<37r0z ztQgcG=JSEAjKT0O;JGl<7B7+Ein=4O)`(C3{$zmN7q)xR1f;EI3Q4?meTgD(`{1Ab zUmm8sU^-gj(-RARJZ(t7L&0wae7mTyK&|8ciL-CCr;R0`vE0o9VUk;r)ipM_|D6Or zC@SgVi$@n^=O56S^Ep4i7>8=2)O(qrjSOoGj#+7030N#<aK*t)zjbajnKf2~e&MMg z4bc6*^^94g0bC$e+F1<=3ilF%R38a#xjYE_(vQ_^u6!lG?2Bi}I8L?r%Lp;23z3Pj z)CUv;Y_BrPJ$KHPgM@{TLszhIv0s5IbGqxDzGx>$ommK$%{@As!SGLKd(2}8c(1iJ z(_r%nqE+X)bA5hPBjtzP*<yUa>3$L@J)79g5M)<%4`?mWqpo``EVeeB6;~WDwJ7B6 zG8{GI33L!<;BhxSZMVN#HV2k5WqxfuXQ0p3=gBM58=c(XiZ^=n4WYPE|2CO5GC8cr zW=abEV)wS1b2-?U4uFW~&&;)5$ya98N3Ny`z^BJck&u!J?Su6PLD=O7qYA?U71v;g zNz|o*&f3a*!Eo1vd<!26uo0HnPbh|pzNg_gS1`T(b!4v<&0dMd$pQBI?28G|Ycdoy z-j9`)j_n&E;+oG{kGWRjzMM|8xWVCfQc+h#N5S2e2c$fXUx3!Fa_;u6As5{*o1MC@ zLq+zfmXcC9GIS7c2iKsR3SzXb)O^Crv_nBKOMyJ^>5m{8nJvT{xFa68s1B_Odoe<~ z#{Gu;<?fP-`c@PAB1GFMVR)}miZZZdvB^tZBs}bNl_e<RP?wuor{v=4I~8THh;Wrm z&@0prq7fl(j6bBG-lJB6e}yU@M{LN=+HoAwN;cdy12geY1gjkSm_Jkhv|D6$n+@5? zxOM0C2{u;$EX5M-{>?SUN9BVBlSyMbrIS<2*yM*!#)p9d93#c~EEgPlQo_I<(^xU5 z*o4MX?I7a#CaBjn){%)T!twINNiNGPmD{8)ax!r(PpCoeel$)n7?j{3JS^Me^#Ltz zOu}q4WLTT8Sxiv;AUW(f5Ugr?uL&-GxY6Z`%UnMr*I7uA9_5(2pI7su0*EKC!bnzg z$kzmY-Dq2KNC}VZe0%*ZR^~wN>W9Qdk><d?2VpnPPU3qQ9Fk(X`UUuNXfwZ49bedy zNBuP!dyt)-Rz%@@?-&!c>5}QAOwJTfoAXgvr`Q@v7GGeEqrBqu@K;C+3%t6PM0u{p z1YvYNBMi(CPpv6W5nfSS&ha96JevJsBadal6FvM<=jMTgoeM`-Kts}r`CTTW3yg~% z465gz5>=-s*DN;5Q<-|o<~TN9$M*&v*zT&k)a;kwnA*+leJ0s($4y#=t!kG`9*S<d zFA;cOag(eDq_08kM4ok`U+e5_{O;fR`d33Ig)u&5CbkU>!Lhs@;+mtQu3U{d#9>nl zv43=IIag>gW|6YUr~c_v&T0M5+t+JD`yCv~yL}}vmU_np!PEqN8H}(nOLZA!{ff@K zGi>RK_Z?KD)zR^|b0f};S48ubC9D^7A4bkQ$NRA|cB9COuD!rJxJ^=*Nj2Se#q*ZH zmoh5_$8CM0&9t?xnNZpL@!__67qekdtIRq7<yL!SXfPgYz|rrvMq^*J`Bxo?&i*4^ z7T_n}Qw{5m>vwd%?{X_;e(V7Au^*C(0xaTn%Jfreg(jn730qv8^0iId4<K*ZpVtzp z)(ptU+lBJx1ivpPpHQ!Hwns#UVU~IpXu}*i9A&%KKw<86Td^Rub;*Zvf@Q=i7acX? zyY;0;b_>LmO_~d$UJNXj{b_~}oS~LykalyuN<GjlVt-?}VKq~$E&J_i<m0T?q@ZVs zXhF=*iCN8{PmM?B?`7fDGS~u@umnd01E`O5km2BY-q_^v^dEr|7t)S|$X^86mf`GI za5^(h^SH}D!b{$+i*GVC<f<Pi(|O5o2o~Bl;dmx>xV9z+`#xMxK+WH1f1$O(xZV&% z&nj3gQ~`2mcdt})|5o^dy-)A*yFh*R#J2X{(&+w0W15|p?qyKPK-eb{s;49t@m`JX zXm(J>IWIQ@sl(;v<{e(A)dr4AK6@WNmAviK)6uudrJ7gI^YJ0TN#ZiW#v7}fo#8Zu z-B~8IF-V5`vdG{L9aw8>wI>*HyvP&}NZCh=v%$qc2h|y(d;WI(bM}mK;g@x%lmdUp z!npG3X|b4ukD{mr>cI+m6z}>52M7E6_k><$Apm5SG~D_rUO1fLF?*B1+A@-hD~} zy;ZDTyq>aMc4M)oOEuGKNK29zur6s}A?LLn-aTX6*(|ZwE!FZ?dQusrnXlCI4{v0_ zDS^$P;ramDH||kZ%}hWNTr4FXepZxYW|N8Zy8ULJmy95}UcJ#HHDWzA&bhaCFnKxl z$OO(AT)E|6r4v6t5v(sy#;9Zl9?q4p1-rCIj4=EP_K|H5lF0B*Ft%_l56xTxnoRcj zCoDnYG5=^}n}b}<iUJQ-qEm4>XOYD3FTbw*<$Ct7_p2oPXJ?RifbB1${z*@fh>WW< zbF%jRU2rvm7UgFo_QX#-06C4RU1qcQ(TilJ;%B|TEl50r7YkX@?^K2Od-EbYWxuLs z%Ko7SB+9c8Gu;?w1xyZR1|<ysf_0c0^~e%(9D(}JnCw5%sLEf7Jxx}H%Upux2jE<1 z8ls=D2Z;wekerD6TEFcOFW0+Huqt`~W)wjuZn^bl&8oI(Wd*}k$c3BYCn^@tc!dP{ z6Q4{n9?riC_*Y{((L;x_*XGAGDmrLHY1Ld*9PQA>m8n^I3%k*6^tQ{sR_2Tk3DC1Q zM?&<bJ3~jZtT%$=Eosn;*f{TTw^J1_-EX@%)q?5gK2&rXIW8xzOAo?<li80doFD&U z{?+7eVzu*hW;G;2^M|fb3`dzS!%gxoK}pkMi>m^c*v+s&kPF=_n@&ZpwnfcKeUWlQ z$dn9aPn9_&jdErWi3$hq)}Y)@=+J4fkJV1>@^xr}gybzB{7S8$qFYBHHxidDY<4~t zYiM>`w?1@k;iR=r#3smv>WAU2)d<Gq1Dg!S5gx0xhPDJ&i@31bxX0-6ZzKYgzbDm& ztYDjR4UqEAy`Fm1JFx@DqZYm}Bd>il_=gY~=YOequ^iNxrl-aGU+~`}+EnG~ha4|d zvTZ2?!wsBhBoo7A$L@hhD`jlKVw^9&rxLuPLtLBhGCaI9*C&;Fhhbl_KbbU!F+qvS zyyv=eH8uXS>c7Cb$R*$AsbXsC3J<D_tLlu*K6N$MQ*0lL^rsCiLD6$H3N~_mO0>$# z+L@Izv2D_GEO<#_j7EbgBnc^C*RrYry`tqmuA3F4KT!C5+Ry$F=R_XYc~CefMtS_B zn>~=7o8|Gs!01T|GlpmNeI4JtwFXwzbZ`8N?f0r<TJ)Ch(n_I$7uEsL{AM6EP#(R` z7>>Qk7Q+X8lM^27<uv_@CqzDNbav~KG>EuVzxvtn;&%3j!2U(%P#)5lsj^_qA5*tB zfUgAKN*le|`#tQ_!X8hszPtGj-W1aPUiJ(amNu<OJ-;`gdAG0X85EI}80$2VXuV+8 z)KQ}|5LIrqaI8*B!%$rnU<3&i`Q@mnLBz|vOb<jF&&TRRf?WTBaMgW*O-DNH_uin@ zAnSMN>KDkemR;$*$Ft{vOSH51!b3mGPuO3vUcBor2>#%$PN3E6OrX^+^WZp6XwhiT z3U)EM9)?;kHVF24wI^!t_Em=J!QqIL!u6N?hY=Aq^XoZnQ4`Pvyn_6P+R6$fkh3L9 zz9DFKP|9$O4zJjp!6)`m)-mWZrHWbQRLjFE1TL5tcrCIpUw6T~Md#3?tW)(Z0BcCO zTlu#bT_nbngGXI;n=q9!?eTieK_gOgyNFwp0r|k8RtAU)E&o$tZ;TD|e#M1a6Q%X( zva$n6CnjlFVX|uT=5uy;J;(!A7EjRSIS~zq-lsms;N$L``)xsiL3m`m@cM6u_shqk zTC|*Z+8J1+CtwfKW+Yj3iJ1u)_L3Oe8x0Ze32j8IV`>3sJY3ozn;SSdeC1y&*dF+N z;MF@}6yjrT6t`adl_A6AuR;b2l6a6C7q$#L+1hJ%J8H8qLSAN9uL9uEms)c%8gsF= zTIr@WfOYFV1`vep<;@WICf{xjUss#ZW7@A8jkIsZ{xZhY|EY+e%idyBadR6Nwx~{n zTRBeCIO~_v$TL^^w41!<M<<IF1f+#}Mv<hq?&<LFs<A40b|S4}Um?;6S70cyQ$=~K z9h>6HUF+39+9=krGzK+-*RF;uckrVsT|ZD+y*Wxs;yKg6KBA~}z22dJ8d;O-!Ry_* z?d?RyO2g<~*6?QJ!r9ZYe^V)OkoQ`eJY&rLzN5?6?oYh$Vq*lf-<tPdlmgZH9M#;D zsjnHYMVsygOzvNtj|+(k6MbocR1{U7&JiVpCFRSOfYY0!2?}z*H0wW0`?bVipL92A zP95+v&xQ^j_l=BJz!M#UaBaZ<yrS-E4&J!xbBCJZ%E}(eGk~J8IYGWeo=*?s8Qz{m z1Lm@Dt!RMZd8MCI2u^&>q%0RCn;MXSOkR+x#k9XoB)>66ZSTWzmEcVQ-;J0T$meU6 zZ!NQc94q&bxt_u2n@4l{&j5@56@-Rrq!fQ(W^E+a@uU>Mu&E6@V49|N7efLa#{V6l zQ@HeRpi{rkl7eq|T#7TT^*;eQ)Uo-ROwj}$cWW@HJ*Ate`Ix$$u8DaRIRM1nv{ISo zdV{VW9#;45h>r!_tlMHgN|WmsIQ$Wlj#HtA*M|*-i2jXS=!WFRsRTT94N)&Y$0YZd z^{Up|z7ul$Vcg<#)2p{Wa6%g1TO@P2$A8HLV-?~XicfFl^+c4nisAX*s6o5NqDRFF zOXf6YwR9tRN$i(OeOgS~?ll=6X4wz!<V{!uUK<@1Ahcj%S3d(pWItq`%l7DB8L&Jj zW)mWP@D42pTCLPq-uTJ|c7UmU3f;bbe||A9+v668VF^h<$GZxXnz-46go=S@zk9I@ zG|^bPOElXQEsCYSnkneKKrB!}N(}i0Gvt^uRDRhCD!M)W*OG;SkNlBe2hevsVWC5s z>{C!3xxrrzKgjk&X=LGC^C3&e@4)>p&zxXD0v7Md@n0$9zui>>`J*Oe2ag)dAHV@g z!W)SzCM*;ce?tc3lQ<Ew8}a`T;SQ|CliIgKPQxbX$6a6y6v6(e(TD%YS)haD&SN8N z`P*gx0#_;zkeM8(jL&y}!G*t&+W&H}|M5px`j|orp3isviwIv(aXgNoC$}r+Pc`Pp zw|PDIMMMkU+>>bi;&B;qw}DqLjZA3al$iqO<JHR8oZcC1xjP{Tgp9#|{)DdpjdOX_ zx{snTPT)gwvYxp){U+x4bJX7`rF8Z;N)g;Gmk|0dIEC>918Uh+5mC%g^Zg9L!1Ymh zP7AU`m|!J)o;skEnfHVE57CPKMl4+%9m|_pH<ZAV(0jOKW(DNVpxkHlI@Orp|5v!B z9FY^g`@pCsMU!(;>n;A9xA!Fo3;4uR^YQ(UL8`?kVqQO%W9;Txdd8oq%NjXVfsIi9 zNOoA~`r%ZJj*S5<8QRJ!(D)MsK2$o7<tefoHG7@yXl6kxc0L<oy|I7KE+&lpC2M_s z{mc%s;#D28mQx6uxIJjgr>45>kU#8VLm~yW&C8FJK;=|H-!rzSXn_&#E2Z6^2e@T{ zVz64@{fFU@a2$Ba;rq)0KrgVyr(*w>c);jJKHrdF$%wZ)S-CTMi&|**qzO!m#<D?y z1U3mRme)%gZ97CbB&lY5TJz?dd0qm}i?n0$E=P}i3$VEXOuI^s0u+~t6szOo8kaDJ zdgK}fgoOG4_sHHkuiKCD{dA-Z7PMpRXn4i5J8YMLLYB+eD!^dIx}&T8XpXFo4UGsI zG3wl~(kqaTjt*y?kmtE=hc_8C-~QI+Q`qj`I4G4Q68Sr$>0-s#S2quLYZN%s!pJzS zV{NW8ZiPWIyJb(Ci+vSg<FNg;eWut9hi?}oo&AQ@?q4?wO|sJ|CRZ-XP(_<bUWxD> zrr!}ea!uG$pNdSgqIzubyex*{QH)v{+2M-~gQ9$)^rYyegfPY3`0JMD9C^g`EWFZj ztrN89o)6FOotV%>kkjx<Kxg6Z8HfM)s>(Ln#{GS!riX-|#5?ZJr%0_YAAGic`5(Mf zS9EQ~=y*Tx$5IP;PWS%Md$o9W7545E9BQH4x8v`Pg2Iycr}=nHa)tR!q`lUk7}c-c zbfmdP0u=`z4~y6~xRu@>)VVKGij<{IbKHbY!)-y;<Gbt?i)TReQs1?!hws?uubTUd zb4mqf{)~FY(E!bpW#e=)`2KoNUf4Lp@oWq^y@*BKr59N>|2uB^1h?V?#IrI0ixjP_ zk-#OET4H`<PFtx1fUUYD<YtanZmCluocP5i5C6pDlElyp3}%)vT1d34q?|`~eFu{K zR5bF0C{jiSe^(`ig>rYzJ`w%zVURa$J<PL@|H2?Uw#gPPg^>2f+C8aPJCjqUoxY0< zVk}jP&*69Ax`gu|U$aHM=lkQB)F?;6<}7}kxLT~5p`-3@BUkSpp#$}P7ZW8jrzDar zx^^lmFh~43R#dymaPSXI(NQy=Kb0}uK)ICW(G`@Bb`H~ww;^6An^w3X66yPSH2&4? zQ1sGI=kG$8^`kF=Zw9Hp6}Q9{)6ll%@AY%`&FKuzQQEwg3o#O`kI|2+zb<}r#<40_ z%*(D*!#W#9kF|KLW(NU0QZ62g^ccHs18rg8T!Ns16XOqy{!~~A@(2bH(R$+&Mb&a0 zeF49>nfV{wy=7QbZQJ&5VbF+xw19%Ngmei4k|Q9^fJnD=gQ$ckAkvK@-7$1Y!w|v% zLk`_B)X?!?c;7mBJ=eQ!@3#HlPtP|#EY@1H;yixGzVGL`R^}dujjqNLIcz0Xgi#So zi0_DqoZ5%rCJ1i&G_LsB1ciYZ;KJNyy_w^oHSg%Uvq1_EUFrzgS4Ph(`>yL)#yzN~ zCMK%xdCh@I4U3?Hj&ExGH^BqO19X)5jo5>mrn3o)%wO*YiY517X%;!2Oi%K1+v$~- z153pacC?Cg2nnF{r|c$*R63M#e^+hR5V40w^k0aGhpJue7rGN%_n+vKApR7^i2L;r zr-*AZ9FMhs73MnIY*=@*N2U49+fA$+tlSw<%j10fCcle1FbbC&0R_3*Xy=8_Himpl zIL6Gx+GfYH?*X1z{()7RFZzZ<RDioN!oR*#`Qi$y=BRn0=vBoFwfkrlp&SB~<8du- zb2M9>-$kY;z+-tEpYh6tAs;v_1i0>HgGnP7P6f~?WbpyJ=-SgjblBzmFYDY(U&nJ% z=}s4(c6_nq+vn=T<xtw+X49_&_-F&65NC^%Ov=BGm+?EB9eC4pt1R%2I3kw)vuJm0 z?8FPLfZvM7Pzpfv!og%#f9#xJyT$~B0;0*uzl-$C5a0*w@|l;A{&k#(_W<~K^N!bv z`K8dSM-&P?Bc*2!Z>Pj^X!sj<H4gSdTFJc><RSCCq+ysuUQ_R<7WVJcEF5Qv{ay<o zJW}U56J%Y3s}Sv<zY$YC2a*VuIkogR?RVjIVW(ZFTZ6KD`IN9ukf=j9O+vR@&d*?5 zSZ9H=RnZ**@J6of$;}f_R=D9D^~qH6j|8{H^qi8x=*s;ko-c=VQ#kT+b?X?}V13__ z)12G(8-(Z|;lp$XxCi1ofq7Dw!OYIKRqncX%S_fjcV9)Uh_W8mkLcsb*3udDwK)2- zM->HCP6n8~*Kp*t!F_~kW#4U!=a{(5@*}Z5x|~t+Q~VG({dXmP|2+1E-Am05H<>?1 zB0yT1z&(_0eo9+~|BQ>d>li4kNa~FPps;!!xFu(gtZ&~Eq`iJUi+2L~9}`KOEj|9C ziKG$Ck|5OiWj?4`Ft^x#Ft`kJk-4e6@k0lTPIp8(ULDblF1ee_xRhK$)M4CItL5gi zy)=4*jwr5$<_FB}r)}(W_3)3>$c*rD{zo2N!Gw{VM&yP;UW!`<eOXT*x5*2ZrRZ%4 z9%1*M2(v6Ptf^X*@VrCEYc5|4BmySINBX{VV*EKI?0A$eK?QKZhOZw+N|ol}XZyLA z`8+f$Jq|i$50;DZu84vknU8c_118xz!twQTU;npoDyNm~x_Y&Im1I_D{ZQ?ExR^{+ zyhlu%fy_m!>#d4J-w%OmaQxu5J#GqMW6R!a1&2ycV^iPaD9jCs&w&n=SRXLPVI6m` z$HA61dlixn?=zW4Aj}k8o_$<vHJXe9+@YLJSUPdu;p#g?kt!>Ba99+^{C9e^&=AMV z(%14-gx}J@>%B&XWHmZbCpKC6W*Y_G#V;_q%*#N)U+(^W1fvnLpF?t$Ma2nSVn@J< zSb!^Z?}^OJU#<{x6P&O3+xh|dqOBiyX3Z_0-0p?Y)~1GhY#Y2?;T_b<Wr<S6K)q;A zu|^%8nV9rM4fF1f%hH-4cf)sj=k}fl-ia~+1hg;P>V5F`%TY_P+~$DHJThAk_&3e= zSIu~t@7&zl$RykyOz%8eoXH3v8D-*U$O#Ccm}PdZt{Z}_Z|1g>UbWQz_WdQgBN0nZ z26E3B!Y(EYSBiOB&kE)rG@49>sb>(xf12|6r_d1K=BhrySO)7<LT0-1KTui+#Xj;d zb=gnWZ%iUTPSkNXdsuy2+4;<%heDUcor7-9--uRd45X_-vM(M2$-kRNMp$?B<h?LW z$erSYT{4=cuQ#-pWB15vH^L;|8MB9SBx)HLPEef(PW{%76p(CR*cQg8iUHGUS>HA) zUk4*L+RC+&`9c%(05D-AEE`FyZnt$3=@-9h^*`Lj2J9ZXSG!zZ+QAP=s#EDLU)$|1 z-|jz)ANC$8#rf*!JNKoUHUSHJsrReF-Z~gXnW(wZ-q-vwZd86)^R~NlgwJ60;^HFv zmpLOx#MY!R_>8fMVXG}tR5Bme`3|EB|MQ6|8*8bp?x5^M^N9Vv0AQhoO7H5EczhG1 zelx*}1;F`X)WmGID{T*l{gv1wc=^Pb;5P11u2^weqWP$BYtDFWrA%9jReGXAlC9f> zJPqxazJ)9cvLMkil2!+}`(n=eii55=1?3~oZwi!iFS;Y5Nx8gMMqlXislUv2_V?0| z;CSfpvhiqsd{m4-RrgKV_GYbMt~93M^NA*;&hbHLFiiI*66La=(=4-fyDGXVoDHRY zi^E)RdgF7XENfBA-YLVWz;{#YV6?1r?>W<D<NuCJ<zLR4>`X!?2PPCrXgNJPx><^K zy!maMb7&YDy_RMb?Vij7Zq9&oAhYL4wc&87sYJ1~)cZl<{_Laj=<@F~n}RJuWA+__ zjFL&(_t?v@R`X}wTr`}aS&FW+Hu{ltPYzauBFaiflNM^@L@JLyMF@s{`GUJTUMSN& zbPGIMSHrS^M{WLCh>89*fQBi@_1Rm-*De`$p5WfxpZ9fpuTfl}ne!!9-n_fnHk#ow zB;N{IMQz2lTRC-M3b^)+$>4pYp>d<8KC6)S?@rjSpK@$0V*=g22r_Xf=3Sd5ClB2o z9+BK*i9utjCaRE!>pm`(dEV}-ZYaD`T{RQozJ}$YCRL5d=UPqzzMdu13F!=YxLcc> zOSicjkj+LmI9mhDJK4B4-dc46CF$PUo{MbAsb1+?bGVr40NWiMpC#3eTnLrZg|c1F zmdp`1VB!N7ZJ@fM%6w1M&W<Zao_{$q*IM*sN5$0CbU@XTn~BR!z>!{YUE3*8%_J^o zaX65Yv37MjL@g&RHpU$q$(kVO?4-nN;s`T`bTl4uyOu#RW4h8*e=`h_+IyXwQ1j`| zTF&P;RxBn}dKo{-<C(&XR&74ASM8@5u_sXc-uBWJh|U|p?>N3Hws#Rx>Iu%B68$?% zS1-JRH~Z~?j$P~Ya`F-S|8L%#ya^ye@T0(;%joI~=<??V2kY6TpPm<K<~6`4g3@;- z4}a%de(eZ2ho5<o-j^0dE*_2VEr2O>pJ+WVQj(7r;AyKvMK3x0PB#6zz7zm`brVR1 zid=ZO--xlEPnw;hzEt^prs1!n1q1A|a5Lo@^@TelmK+I;F9Tb6m&X6XI%xpZfTcFS z<B8u5xr;3w7F2pCoe=xRE1Y)H(pK3K^&-88s<N7Izw9sUGnX30d}6#V;Sp)Km?k;S z?PK-BNY*kg6#e^sMgW^ey{ctY$=w1SmU(vs4>p@mrxsZFtY{*vX4+bAW;|47P8?J7 zi(QJJ2fmu<XlkrlzIrU|EnDk#`YT0q){bop`^KVhlGpFp?iIngi5e{M{|$Keo*x0X z&wL_U&^W{~cdU7B-Bo`q5h5Xg=aPR`vUt_P|MAc8p{ZZWf?Bt^<EcL$l}AyK_6HfP z_@CozdDTeXm#(qHZVf5{Vo}OOsoap+H!!VaqjdQXSaWl%e{PZ(>uulyOTJs%07I^6 zO?d9_oLm+0UOE|K*TZvAJ@OFImu{*T3o3HF%j493%gCD5Y-EznU^jquTl)I-nlKms zIcUuG^p^-tL09voS^dZ+8x}-nULlL_`p){)HgEhx2gSV365<H^2iEJ*t1Oa1@dYiF z+&dx1;znT3C+YPETQ6i#T7=a5Zkscd5e))2{PKsD$`RsSlNZj>iV!$QE4uZz6RXw4 z$`cq3UdZvQeeuS(z2hw4uK%lyixW``(6J{e=Ry9}@X!ut;Zm2^(I2Y*zCaEV@tRcr zx=nf@`Ji^FvI}ZYNSym=q{OY>AL-}3W+ez^uz#S4yAyhAo}GMd&MVBV=U;h74&qVr ze8vSm6L~V@N_X%G$D!)zwci>*8IJo*u`YIj{BUY&(}U;+AT(%gVMJu~ykiSv8N)Sk z%3wk7lh(${XC=ZLM;$8@v-}nDTl;zZu%3YNRvf(jwyRUZTES-2JX7Pny@+K@dB|#Y zlx4BWqNvF7o_XBYltBs&!TR0sG4+pHJ5v~&bEh>Yf*p>Dp24m$+8EXf9Jm&l1PVIM z5c?bH!E2k{wNs*rC&|T8+A=5}sGfowJ&jbr8=9*(L?&kj(?Mm#bZM3INlY&u+n`4p z^K@X8Sfg<EUqj_|Z3_1x>b%AFXAzXfIJ*%iJO7$cS*o=Y?25m#*MBEU<@VeU8A87! z(;$B9%9QL#XqjJ=Jd!qQ3e3?Fe~NX+dz5EA^|5r1bf80d9;FV+2slEy!jX{G$HO_g z(I%Xjq`tVfmT1Cu-HghC1hFD;-WD<H$u{`};_pR<l;NvC^z(&}nv#d*JjiAvJZfZj z(L;uL;raMR<<YuasdJz7mkfcufQYTxsoCt=_gxJ7YBi=z$iuy{!hUo(GWrqlLLQyv zpIEMYDziL!`78uCGA`c%Nx&_8H;yExsMxrwcx5ppiCT2}YXGjGn<n1KYDtF0c8e+Z za{p+0TUx2RTZ4V>?N-U_xunqo$tnJ^%TlPpz4f@b(Bl){UUFVGFSDn0QBnb^6RDqW zRy3x$T$p%e4gpRzm&)tLibrwU7EgrT_CH+_F5iG>vPs!&S=^^%x)jB(6mN^WYCAJ8 zm?CfO@|rrMH?=3yc%!LdI5CbdH@AX+{D970QGC#YQjmI2Aj%N3=9+G|xLR9=TrS<+ zb9kronX$}F<?O^IPR^D(7YE4=aX%c38zir@-&~LuP;{rMhR;kD6Ei57E)j-BbBg1S zFh*aXC}kk1wZZY4!iV`Fn>j)Ft-7}$IG}BVQLwm^Gcxv{Ig?xv!^D5MM61^4jE+ux zg=%@gQ%7E>Z*!m0fNGt8E+L#;G^2i4qHeV=f1c#^iHR7pcZ-KL1QoNRqSMzaq2!I{ zTJytmhK2CW0dLKY+rkl1krjK-uqzA*7VnMk^p2b4jKze9JG?{&D=ZjFVx;t~JTAU4 z=#m3YtNBcZpkdM+h9wox4@Iahdw$HAF+3+ZY_Bt6r=Yr2;h!mz4^wD!<*A*Y6k_Bl z;^=8MEPtpjb#&8JcyzyH3r{nSl)zo++hW+JAvnlV&8*aQHWx3kD%hN{V>m^6$0vey zhOVk)vm#w$k)4vEWtHM(Me)Z6KArdSua1>Yo&s8)WRjJNa!q7YLW79bW;ZPC#*Ksh zeTQ3QQ+v}zW!KwN(=S~2o3pn}J0sl%FTE9Wyww&GKPFGF5?pDNJqi*%xkE;#<*4u( zUeVsb8da&8?^^Z5v2@Aia}IZU$BX{1+Y_rEW@HW@`z(ixQUTrOPfTQydhf7WQbHW^ zUvQYzxT0eLBo<_BWbq5GIYx$+9zD3<gLOqtKs#+FHM3i5@_b*_kb4*K$vg&7;w*;W zz`%bI#nW@5pin*h%Ljn~vDv&x9KP`jE#9Te(m=~^-=vfZx`;2&q35;of5mPGMur$> z2;NPZ7WI~{pgARQf|pbU=X&G7m5Prb%|4|t4w*s6Lp#?%J}R4MEb1*^$Qo_`Tv8vc zhXABt-59@IWr>Cqn}3It$ZUqe71Ut{U5u}C_~}|1(${JE>)FbXO_6L81AFQwROE1z zIlrvB6XWwmIHUnqG`z#-_a-l*s(f6S{nKc%)3b%kNK_KB=gYN%>#?^5qf2bZr=XF= zvMr;s*jMCOe%Og$kEE9W7<S|@5_hDn>%-gr%Dpl;$@GQYCG)s1XvVsHO%`AhW*NVk zU53xbY9q(v{-6ob$?Yga$jKH;OdUeFK<M-o8@vCZw!gkXRD2u0-N|gp4{*yWf%bd| zHn!Wsd!-L&wZn%pP4&B+N(=Qe?u2vLy31b{+-nXuX&~5hfRd7rfdjVAY<7FTejhnn zFl9dJGjro;VB)~_1>#tHq=NF~?ZmK2z&i5li+H`XFYF5)KiX`shNr|P&nXqEE4cc$ ztFa~s$qOT<06B-1@C}evy^Ak$w&2oO@*~zs-(vR1RXujE>Xa{8_AmEiDH&K|SY1!z zXZ2G<KA69EeaADa+K%_<eqEL(03Pb_(C^gZ+)kkJ)1}Y;(q0@MU-f@1S`*(Ul}4Ep z7M;qsI%<CtIl8w2!$?WXmH)Xcr0tBeIe_U5@|+MsMBY3%G&;fbHi&{}<b(&a1won( zu-3hXoQ3)J=g-HL&%KP=6v>(f*qfFhn>xh&lC4`3uD&-35*uOq;lxfkj8_V@nuce+ zJI@ry8IiGd5J}0<C8trsxeQgU@%O(DI!$^GmH*eU$jU#$A__h03IC?=+=&JBoz9~r z6)bhn-6uA~t&upb?H{q_%-^MoR->I!zVJ6OI6link7DG{-K^nZQc_ZQ9=HndbSvx^ zcx(_lp=z_n6ie!7hwR4wG}&C+AFC+p!~-@aV5~?k<6Zn7?>jcG#RX+|Q58k`X#|97 zvy^A3Y?JqQ6T_`*zm(__9}b_sh-oRRJ1FS=0zZt6DFUZy*68tDGn%BtrhVtc^WM&q zKTD0(HJ0J2W}lE^2@);cCaNeta?$-En(rwSAU1qmj=xA6F5i*qnI!VyY5n?4q%lR( z?&|XjoA#>d8>tC)RW7EfEaoFoG7lg>zU0K}&EZ3RA{$w6fN^V%FSUjE96x$t&z13K z(Vy2ZfG&R4`6W*)K{SN_)c-L%sR&k5HLZ>Q_jF|P*r$rjBc9F=6r%$JCj)n(cVbqH z?0BIRaoSqD%Rd{g*hbmt@#96ZKJ`StB*kO{LLwo*Ln79Z+=FoHI?elgbt9Ep)_PB^ z!jGu4mRN5EM#hA?>G;|0t!#Igk^NM^o@)0E2_%F&In5e2zD`ZO^TYAB-f$OR<$ky# z9$|GJLMisGt&wW8IHa=7v_M$wH-K<)VrynEQ}aHy0fZo`$R?c8y*LE;{@jFPu_-xA z`-SPQukW7^@nl_E<58VD1pjxA&xe%2aYLZ@t$1i7bfn<<V7|tPfm6AxmWu0iTSQXL zfZj{s6f0)EzRnMif^P#k;}v$KZS3`$`|JZ&a|B};H-zPKgu9)E-HF0EtWj1uBeRej zoo_*rY`SA(<6rI<<bre`YW$z&A(esa+I?6d)ek|g+T!F}%3FVyl@Y7wIPa|uD3*L_ zf97PSV@~lKukEt2P4||n%%P0ykYUAE1a?L<f?-m^xBD5&YhIUD5T>np6$boDp@2_z z`!iJ(F|e0cv>z&Te9gdPzgZ#6B?9Lxw0RB}%R8k#Tc`K!gO;7ggbDHHL9L{qyN0(o zU%d!P$GuCcKP-i}BOEr1C^6H0YJxL5?aY?A)&4;@#J}gj(8OA5npu~Yo}*b6CL5r1 zv<2;~01`Q8@BI~cKk~ezLzhildZ34Xc~vXB%Km?*fDyZfh;<DKW#!|(_JrBDo#T4V zx@}3SqyNFP*oPh#ca}_JR{NHBQV=_58{-F;B~Hil^l5Yr`Wr}$ScL(?aXY+T=N0AR zJU#fOW5?U@J+>gA4RO%3Ex8;AD^VV4V@9+}`~tlAx&3H=cSTo*)I~0W)Bk~Kb}fpF zKvLL<pZwr?_LLIGrZl#aewV~;d7nlJtQ+4V12Gk*iI#6)=tzM10YAGHZv-2Y5Wlu( zdITCMf<rCn%Z48_FU|_vGYGTzy<hb7I9{Nl6mXut>JP`6AY;hahh6l^<hXOW49t6V z2g~q8(#9qY$1;*vuowpJ&>KvXWH;^iBt6_;6w3FqPpmkGX6SV@bA&_iEn+y;#&)5R zKP$K0N;l2ssJ{rfw7}e^(g?Tq15dOoDSHHKdAMkIUEZ^3X3N*Mf2gg_RT+|IM!33d zP2QuXPGWmPcdV<kJ9tko#(7|B4YZ=}zq@0TjW<3gEOgkWzDB08MGW&hZrDegbCY~m z$SOW{+PX=AR-e=t*(o8&IHbpC6K>D#!a$<Fetv4;?O&<j^zOIqKq#0oTkseqch-Zb z5tDQr|42RYDNv#hbDohGPHWmIk^Sk_ov^LIv%5=lp)a1`h`ZHz2UXDa-e)pXux6L~ zgm))M>I||;K*UkIjG<tia+mzcj6uPZWDd@GjFA^KQys}dr$_Nu8*g$21YS0-H8J`j za<qCf>h8^>37rry>Be@+YH*mN%s&LxLW(AEVl_eSm6<heD?D42kJPZtt6x=>Zo0Wg z78Mn}efzdDQ(7JMbID;jYJa%gXe5!)=ugr&*&fqjEgoh(cylcNjU$^0*qUFq**88& z+c~{Ui(fyr&}v(NKd;7YD7(%pt5kb9ucns4<idl`SbsGJw<4D%%j%kWSE^Yt0^5tx zbFSox6=CQ@^kz55NH4FCjFYN=6L>F%m(Q^^5QSTKhuG(jLNhseWej4!fn)4?;h*kJ zVqf|0)Lj70A-E`|QRuws@BYCXJ%^4D-+S|h>*nVX{zkUqzgCKS{ra-9;Ejowk?6Jr zP};ihiJ328S9Ox18*hBE`X3n2)+jvQX;S^sbAYqsdv_@_foql1;;)6~Zjjvj|9i3y zj((CwQVjTyk~oMfMHb;bDmI#{>XI!VqkI>V#X!7r32WlH6{`+k+gsTSqz!CFS=aiR zQbZ@oT_%FA7s0^UJV{;5IT^*=y%Td^k+Ad-3r|ToiLu>d)_2Nifp9SgxU4HVg00oL z80K9VN)p)lYb-@C65F0Fu9-xaaD!}kwYiXB?sWwS)Oo>~4BOAsB#UL-ChMLw(&o`B zYkBkfhz4id`>%Gyk&P4Z(W)w_y<}9x3M-y%+;&}Nb00d}oNR#kdBm~PQ(ujjIT^V^ zPxU$*G!tytbX_t(K(<>Xh5!z0wtfg(Upp|LzW=^&v(+g~tcsunOQ6R4G*hMLnnT@_ zDsr8{2_)0B`n=kJs=2i8E)&gQx~0<A06C7W_IBNm>he#29+;n`*Pg8jG_rBD4&E{a zae0+Ht)}!M6}_3ATeH88z&??D#HA0$b5shhFDJF=R_};=nKt`Df-pEBXHG@DkvNf; z`C#JcXhMcU^f?bEW`cW3`6+R{Wd$3f;>uCgfPY>V*TMSnkHzS@bgZCuLh$uZqsBZ@ z>l!6F$=|c48-8$1VTF(ur;J5V@qU7NXzsbWlw;O7VPks=tW))>D)3p5`+Wv0p1Pt` z-a+;`MsX9%u9@kddVvkyjn<k`dzTdIlJIL>P@`v5Uvqg+>p<XwrmtuX_$MjwEDFrz zahQx=*{g`49J(uL*Wtd&9ApObGYiUsf_$$%T|IW&*v;{bL*R}_^8oWSLKTs{$k3a5 z39q*wee&v)gI<Ce3+wT6Gup$Mz=|DQwp9Zxd4{^8$abtPHLKxD`njnCSi`F*iU@s+ zt_P%}w{IMfd(|2JgiY1F&ls!nY>bNdR+(eyyc@6Yw}HsFvQmhjhd$(q@G@aj!GoRR zVDaeOo;u~M6<YS+pC9U@0V%AY;+%KaM$H$CSn0p@_}HT~Gjb0|dUiv%C-&naw0UcU zW%I@t5=rEkB1{?1;y1TS7T7VmzSv$rLHg<8tVcLz_oQUOW^Vj>|HRy}`fcxRG-CD- z4i5JB>r^=@h&b(^>`mxZIxIE#V#UP7lyQBG?cg$S<36psb2m<R0Ds+X%9!SrNY%Fl zbv8`murrN}gdB<oX|>tm13a&G=MN7-dqT`ltCwWQ7yNa<Ji$xK4sjGPsKozTq-()0 zeNd}babKExL}9g?cfvCMuzWe6Ud~kG6K6aMzm?}yD&UEKPt1Vg!k47D`%u=9s)HF$ zi0!!Oc4=EdyP&*XPFt0)$4k|0xZ=BXWLdHq%IZkPx^T?2V%!ckHwdWo2PXH<?v6O! z`Sxe%Qe>_t=OjP9)n((4uMw|#S7&oDrI$k{<q8RCC&FTDBjLFUsqNNcUMm0a(srLn z1^sOX3%SQoy@8I9L%RC~A!=@I&L#L3`L~pGwOB0XyMy-zW3sDOdaTFqfr6S<zk<X4 z@_SqlrAtNH;D>y=aBrdfEUBlp)knEz?+iDziaqq_Yv14Eq9%t-ZHG*=oTVK49jgVj zB^@ogp9!r;EF>lt7zR1_tQ&Q-ZoW^jRgt<;#T?~ZZZa8t&?vb%cla1Y#-)=TMLp|o z<TDX{rk<6sg-#VDb75+nHV=_9^u!aG-udj>Ti#qzOlu^t=l@_ut<!Cgz2Rjr_Gh!6 zyhJahqH$)M9L3X@@GZUI!o#;dE$c=1?fF+yv`=JApT17sWs98pp|9e5z_3M*8}9#D z;>dl}%ceu2sgMf9dW5$XrstBZdbEFFRp~YxDsxnq@oC$vjmF(2C=bZLtsD(kIp-&y zj&i`fnFl>J$WWjA8VAcK+Qv%tX=KUw4p~6Q5=Z^X%IOr&t~)s@6Ax1U`WdiWz|dC7 zYS7?>;kLK+Jm2-cA;q&g(P@$sy|ej_xB0=Ww`qGF9t_B(88&#hCGU?dD@2dT$*xNF zuL%3{kqbZIm}E<padho|i{VW@o?W#s&JR(H3AaD;ALrYxGF8tDZy#ILU-7}j%k|pp zoSa=S5Kj!$tRA^9DjTJulQi-eZ+^K?Js`6+aE8t!oaIHgck@|*UJDb>+$bMj5~nax z^4QRwZ<ak{@%~bs&!NW`3PAXkYN=EeYx1yC#^;C)2P5^pjh(tq650pGh_Bg>TYm7O z#tNyh%-7()&r$YGQ^FM!O!>E!f;%6th_>;l1^C6i(#kzlL0sGRo-PY@Uhu{C=18x1 z$lG|?&_=LL9656KO(?rttvN2R*t_Qxuc&x0yLH5Orr~z*`|3OS^r<L<v%LoY?Q|Ty zg1OJ_h61iTlL)LL1e0ow*Vt)YETgE(p3B6(C%>=Br=ymW``<EnxOFQE87rL$<PuTZ z#mvZ$%CJb@Gvsl8^K7R6$ckaktLNxayvTiC-ng}!pK23-t_ZAB4W1$7wAb#NU*v75 z<+F2GZ__U%xISESHWc2^e|GXp_V|>aqX&0TRK$6}`@I4=QKJ2~mx0yhp7!!LL9SUa za-O8NSibvqPwP2{ClN^x<`d<@@l3qZvG3a~KBn5Dj~>y@H1mvaIW?DIqw#j1&R7c? zxFzS*<IV9x5bk%Eb3G(Zq4EP^<Cp%C^tAl5#%p@x&4gQ>^X1yxc=A+)1pKsMp7K4D z&Ee5VoJB^_Hip^l?5iy;si*X>&2w)rit>`DOA2L#^Py#Rf%G>YJ$&RB;`xi$bFPdC zew@uF$R3cWWmKYS4WSPC^r_ljjx#Po&~58zdKRQPh?z^>UFp8!{@7+%&9+~%Z6g;f z9cF9Mh0*AK?O6S*YdFZ+RVE#Nc4=?rZ#3+HZ&wTfY#1L*_D4(ciNq+kfEVGZQ$DR1 zxKYGbX6IV=v)OpIG!S<9T`|tD%eGEENe|-MK0ljz;ij}*@fggbL*m*?Oyb@uKQUkZ zBqEG_{<;CJN|e02<h(X=Ie~`2RPS;^Z4Z){If-f({nWm`3(z8er&<yIpK}2K@U<=g za|`3{YQcXf04SNbbO6jf(ry<=Uo-&bT!8`_?~K&s|5HrPVeS(EbB&e{ur7G#mo6_5 z0WgQCF`4^|JRbq%iCY}Oa_u5{#;XJ5>AIH~@h5o){Lh=lbMpLuaI%yZbMstMGsCxw zQQvBrI1@V`N50U453|8zp`WB?oZ+ZJEhhasRay<qQo547QePRwD~}_tGTszziZ)%o zWi-qR1YF7l-x$7`W~+S#GXFM%#t-g9tobee5B24j^*?5e-eV)%OB<Q1+7<-F&{{54 z1uav3QI?D^zNgn45pUCQVoPieN_=H11GPWd*v#)5ztRk?x!#Zd=?==5m8%phZRM*z zys6EPbE(f22@?E5Kz^r&mWlt!P)Y|BMbAnOQm86h&>K{Y2o^03y~d<(WS0RuT1XN= z$&2l^beAa?3AVeBTl3e}#Ei!2odm9e)6icoNe(+_%Dy0j5uR&I%i$e(@L*5w!|^4X zxpkMv{i;@ug^Mqz_n(u@-TV|+IPZ~~@i^`a1FixeZBZoX7LK+HB4^eciS%Z$Jr)~& z_|Rd!clwar;jBFCea7Q|W4YIZtVW%VGPbh0a+63kYUQKMM!mDf`TN?0b(Pik9F0qe zy*pN|2JvD?;wx$nOqrEQQssy8KXU4~E9)f9G4bVUwxOWY=w-u`6M(01#P#akS{#gZ zduG7`4yW00U|KX8EDZ-ns~(kvc`IP(05!R$dBjsgS;=8#z7<KEfJm93Bd8Uan%BR3 z@;xf@a$1*Lt+lE0e4c7$e7MQ9lU`Ds>iT%?6jW9TtX3rG-u+0z1qm<JohbS@x`R}3 z$A#UQ_S^iZw@C7c3t~DD>FEwjf!C65w`JgHMLv`+e7sHGo$gW^62H+hkuz4gw5If> z8NjpwhfP09E4Ggprt<6(XUvFA`V(d3=H_N*RyeI`85zy(O?Z0)OEqDUuo)T~Bf444 znR-4g_3oc3zqE8yl_-b$#`y*utOh#iRy@>@KQ;L3RAd((eVC`LHX1M-x3VHSzMX@= zna1qMx%$)km2>T|ashm6TY|lP3Scv8ltYUHjkwXZl@wo@QqI$0LSxp+1^;=AkCnp* z8rS>is{sOIojeDy0|w+Hh%wFJM{`fj|H)ih)IO2u_nY;mgVpiEqX*Xn>guOE8zuwG zsDgrJ$cV~azUAwD_D8;t?Fa}1zTnW+u9y_H+x|F|Pg6U6OT5!OyX=+UwcTDep;<w# z00_K<P+K&vjD?*w5@+F`<fU6Gk_h+sqHw*CP;^sC;>7>NL;TBfe>w=-pXf9)8V#~Z zI{eDUOsGgoxtf<S!S%ZHc<S4J(SaRGf#rL92|wDYF_i}1Gp8n##nL+&Sp+l03*CX? zOJmfLIocd6nsqnd@pC4-YxbTql-+lAghs;gkG#1$3Io^R!uAaXy9#RsHtmEFGg2}F zii{eFk<06$7y73k;#8?2rZ!&`MutC3ELdkd85e6#Z0v#r*R&IRcsbV~x+(6SkqoV- zz~t@w578sH!(HH9aEpoLXG?#fkb%qp358@zI@50i_T(bo4-aH{2+pja62;?#62IJi z9d$dcQpn`T+q#f-qnV&s9)^SD6SxacC(tEsI<$WxIQ#a(!+tf$-_OXyso6!ZagM&u zhL2i3s#aWHSdD^uDn(vd(d8Eab-;Z}ooE!KX3-x8O7_HX36ecJ<Z{!-4CfUB4-W_n zov?4gOc^=0alyG^X0U$(&vMykW(ku#&9f(^h2lfca%0CZE%d(?rJfPi1yu{O8}5JP z$4ImHy+J4y99>pWGL<&s2(|)kRnjYf43D3rq_s!Y9v`+>v|`DdZ10}9H)RWZ@4niu zdaKnl*qMHoZ!Cpir9zU|v8QhUUkNHtdU|KTuSNQ>)Qd*Jq#a$J#HxUy4#F(@t}H=p zkF8;RnK&NQ)@dbknVJ>%XgWR9UOI5-=DV^o@8w~cOnWNm1XZ2h!ItgGjJ>+2E1%H| zmuX3qy~QAi0dp!d0fA)7!4hx`m}hl#Yn&(4Z0u$wCzu?Ei_)eraqQ{5+RpDU=4}V3 z*TSzCk<?|ozus+U74c=1xLWN^cK4v{hrJ!HB$UK`#A2esgX}t|WtZrq!Ov9u4Rv)i zTXgyRt6c8acfv1gLq3;|^3wikWp0)P0kG06JNlFs^GYt^PsB2vUXVsE)t17CEk3Vf z7ehnCl`CVi%m?k<!wN^QV^Qh-)(_M^dgk0PFPvi4tsdUzwY16isX5e+FT)3>raXD_ zWV}Bm+ilT70A+D#ImTHtr?mJdwau4%DG6dflIxu3tBv5Jjj{q;+xrTV9TU@gHy#XG zyv(odYQFhr>w7=xuLyk}rvG&9uiAfYMCDC?o-m4({9>8MHzfp~avuHrf3KeZGZA2d zwalI&^gsgqB^C#if5<JmCl~qSlF#m)dk_ndXUpH2@{y;&;S}!PLN5b--t?EG1NGW{ znTzKltel_mcPFccXMZt}ShDbWO;JfIM3;Nuz&<<#z~Km`-d@amUAnTyC}s{%Jp2@N z5twe4d;ks?_vrRtXoGJG0)F#uzsYJTA)rZ-^+ZPJUiDHn6pFE6$t=k$2IoDFA`NOm z=B?yHUNm@(2Hq^4K_r*@@=x^I+B{-qyMP5!z>d1hEjlYQ#d0g|nFmZk5+ozB7&vdc z9g)(rcEMIy9ThO=Yd*HrWI6#Ni{iT<1xR_-Fk-DCJgnG3UNa|)bk@#c)jK=9cXtsn zwl-F!JLu^Ki<7`rq4anct;>wD<2l}R)f#0s7W!!@d67t|eVBo3+O2XZ=;cU_@L7?Q z>e9XexlHoyK`%Q~Ub_{xp@i)k>(hgDMPb69HIBBX=*8pTytxON38}X|rwoY4Us_V$ z@-!PUr91`o@;3?}Tdu+Q{5ue1m93_)x1^sAZZUq<$LfiTI7XhFAnylLKP1QS?H1P3 z@lIc-Rv*9@Un&9wC9Ew#P$J8+f~)KB@zHxsaTqv-SM@aty!0&h)8kptv0xhq=KDO6 zQN^;&f?_F~NM&!6p0(yKoly~-!TtDoo921{JQ!~XfmW2i*I4ja8Tn757}N%PG2OrS zY61QZNbZmBI4!o6WVUMuI=F>+g*@F~ejn$rzZ0gbbv>GA<)HGbOiY#9lAUtmhfymT zL_gny?L$|P?&mUd=-^{Uyq+Xt;;LCwEYyI}gR0^MY_9ivURK!&Z%|eG_TAzy{=*;o zqKcbXCs&Nqh;v71Nl^85pu1<S@5oPG(?tk1L{+`eBZGsXPadVKT_=vuAeIA?R+%0b zq$GGZgjm;8|8r!4YB=$offkQlFLO~|SJoT{iP%FQp^#`&=vf8(8f+-jp8hbB$SM?W zY{MoWGs%pli=-so=s*3^v53IIvrjxST>{#}Df^bz>N!;O%cS={GsboNtX1=bqp0<w zh}<{29Ta4E?)HOP4i=_E9<RWn!<D<*p)uav%C4r{GG~cVZ@*1gnReTtn++4-?X_<K zJ5N4l?`FZyb6M$KjQ+0V^O1qcHTGZe;OcYT08J~DTIc6_kr7{i4{5Bz-B_n@r`0-I zEZ#i{l*n8zb!T|ec;%BsvX9xP1B#xeB&ph1mm{D!(%byJI+<tVLfy^VXRJ-}G^Z%) zmK9OUxA@<k6o&Zza6r5q(0o+vj{2x;tJ1Zwb|(-q!YV{rG|OHM7JCs~FRsp1RV&F( z*8@IHgjP~|MG%AW4FXYN>a4t7WLkbw*KU}z8<A2`@Tf+6Pt%)6Snw?S9&#@PUBPs> zx4v6=>b%WYxqe0)rnXl4-O@o-!ze>Rz#hHu%_Ifz`gIrfbQg9YYJ~cI-TuA&t9st; z`z?fkb30h?EupJ_U)JyHKXCFT!EI9#>qlOdp?x<VkI+pwuu3+eI>~|ILcB`z2Lh3f zpsJqW^^(eGXak_06e#e4T<eu7c@@=D2-Uv@4Nj1j6Cd1^lPFJ)Y|Ac~ubKhA#X1{f zG3fo-DhHp(j&a4^=oEC!v$bCRd5V4hPINaBmHb`)SBM7XgVdY5%T}1$H%hn*giWAE z+8Ctg<r{a6o(d_*ke>X=8I-mAq{_IA)XFjKkJ&6%{{$G2DI5$EY&5qb?yswrO?rqM zTgzeYo7xVMh$<uqDmO{pt*$vy=~0wT*w#4R-9PCl^I4%zs#=CNGNv>TvS&@izV<Yq zJull?LNS@YR0uLB>*0V)$l6l^Qq>O?3%BPQV|G^}a0*C&x|ytYxxzD%<Sh_N>EI(c zdq_1t&B6@z@s6KlHnE0(Dq16-e1C<_(Q&!XJmK{cOGU!9*`#<Oa|?^?ftgr03Q;d1 zPR_0Ft~N`x^~I$D8|o;d+}Bu*nyrQF*7=A^1@g%J@Pv*bPp=m{u*79%-n!GpAa9(m z{m}<AZxXHeo{{@^baY^1VlJmqfd?egVVM(9lbJ{}@(=~S-|tcVt!w)^351rMa+c4Q zxj$%kuNXSJd#(*k(73Bd6)hx^+avp$P|y@GI~4`dw)t7%5}xy9^*Sy;K6;{XJuP4` z5o2QBbRfHYpx<Bz^NFH5n@<h>k@BjvrqcW@G^jU{#Mmj;=#kRz!(Q?!C7jFyk80k& z<wN~E*<XD>{>8yWDfMf4zYBGw{9HOJcW><cyKbwUW7zFL<G*WsE1(hlui4na%1AJl z=4T;Br^zSZJiJ5HcE9%gfokaHw9yp*!=JD&Ws|Ds7HooG)2&Uc)!rd(i_G_)^}HLk z<dOxHWsVS%kDt7SjgAL%kOSFKNqUowo<dsi5VZ?ej2rVcJg@hy@&ZxDW0I#h9Mz@8 zZAI@1NpIDhV24G{FU1*KMAHA003zmM)qXa3Y5Xjyl_?(OV?FXNzAm(A;$nPkZ<8AA zZSGK>@7yCJhX<|+3UK%{D&oIZJXeLroLjXa|1Lt1RDFEBhDh|*tjcmYE)2T={Fa3% ze+hX-1j#NN*`{~YeEyJrPF6M)nw_0lU2SkMq)^<TMp^!|<0kio=|W<J03opd_<u?W zIL<!}qX4}@>+?jeb#<X}aqVBu(%|I*Qby4%DBkH|#M>svma_n|?_DbCdjYZ<RkODW zE%d(fSZ>Eyj6<HBRJILu1O^UVgZMsKYc7=cyYdGZ#7qFMa%EMp?U?+3Y7lHM{#}EJ zd5Uts-=NMgCWM`mwA06#U830o$5H4QgUCjOZOM<V`^76_sc_~e?agAiW|vxm!?re# z&GZZ9g0o00;p$NltKErQo%o0&NUqbBKx8*b+f9()f!S5=<DKXOuko*vvdZT6^XA3V z!y<N^<le=0D`{oY?L-G-+plC&3wSe5_;3ui&`6%VjkQ4*(Ou`CBSy4{ko+!Bk@zh# zNE$1@_PIB6&bN}}44(PoJ(VNIeDPb%<Db*K?)A_aw`_T@%N=n$EysVTHImexg$&1G zsnG9tyoI|<Ul)SZednxnZfuNS5YZAiv#{Nd-{i1y6{a6z(4Q<Hwo!!U9W*)BR9PA^ zCr1seXo&O(K9o3cby6RV<$@X8h$yXReKI}mZR}xHAaiWq?QE_HQDbEzh!bUtdn6uA zNJvWIf=s^UJrcDq?mhaha`Zz=F!Vx3?FPYQUcx)e`_P})h)sySs;w$*Rpk4OAHO4P zXml1=Fft!51k0%y3r#QY+6C_`c{UhFg0mv1QPR&|Qs?e`Mw-$D=0EO-PDIIloa?D5 zo?&Qik`MTJR`!AUJ)a><UXgmfqZLiEWpdpqmj|2MoUJk*UI;Y3Yz?887QWW0L&<IA zP!K5^=zcvoMpP%74W9q~AbEG%G;H?wa>anEX>hJ;wulsAD*cx>mIPmoQO~vxL<+4$ zrPgj1<(R6I@b-MwS0Y(H4ig<B0<>X~FYx%zbJ(bQY()U*4SX*98`9W5J!v(?)~MyA z{)xB6>g-y$L+;7)_h7}Ki0qj~x-*-RNSu`@R_)z}{X?I%o@4TuJxx$gjR;glfQP!@ zEB?@D9}Vi0mw+~I=~7(V?PWlJ=&L2@rlXk=0~RT$TRc1DRVVgvv<$`nkj9+3-1vDO zcC~py&8A`1T-ExAQvTkZY0I7PrZ-jLY6ElpSj5Mk4*Ba*tNkC@wQj0;w>R?gtpmVq z+CivJtWoQVT=soe=dKzsB^%eX+Br6mnvbs%Lewg~{}9i<qdjMzdJ{TySkUD?{1I0D z;KJw264c*RIVCtFqg_>ew*1nWt1A7|&x~sE|0_TA=&=dLTX4r<!XMy-;u%sQ!j7zr zJSTqJEr%xDxpZ0+r(6H-wshQJS{u-AEey}SniYYtS#_6F+|pZjv({6bB1ug%K-O(* zAOk>ow?cFy6?u#iXX;#YHLa~jEl^#wy&|G~5dLyIMgKXuZ7grvpM}uHlDE&bRz!`# zJp5K0JfmED{O$Iw7+_i4$&_Y&y<=|2^=Aa+`Ww5uAYnm9$8Ljz(V0Ew3GqB{kM%5e zy!20)py~`Si?=AcU~w1o^t~!3kn!@4Ul&7>UxGFdZGBa~_fsj=SL+o|4}x3)l&KiT zHWgm-b~V)cV7s8vc-Tg8s+)*tOgy$iHtm3lqP$cx?q^E0<Q4PV^Dhn_Up2s4DpL2B zn3dMu95&g-USwo2aDVP@n`0u5o{61Yj8)!0ka?E1wz~52G(lSIw7os0w6s)9I4`qx zbEcJ!jt)6S+iCnjvk##|3sun7?>n^3ozd7UQnwjT^DP?Ip=Zc|yX%~p6Q%k)&eC(0 z)%J_OUi;!WLvL$6RHi^?Xk>(ef#IkUlDGU7w$zWjRbmS*QIJCG1d}fS@1r}jbkvo^ zA_1xyWuw-ltLKi&{ba+H2|Lu1E@gveD=2DHK`RR#E9P`{&}D3q<y@c8bP9Aui*4u4 zyc0l|t9`F8#)Yrp0~>#LN-#=~M!&D;9sbL6dx8yz<Zq(srUgWR|3y3gs&Xs3=WdXR zT<4(uX;zyHCtO3>3~W*b^wC^oK@(v3s1sB>TUg!nxTL(ZuWZoL9Ebw;kb_8KS#V;B z!UsG@1AVzyo?-kck#CC6hdQXD;I05*l>Ij&!?OKUO58@Y@q4PPTTN=7%#Uj4-g4dn zwuyuZvqyJ#6Ee;Fz6B|E33^-X$MlqD<4lPlxNV;m=p%@smQb~`F?@mbjMOI*jfWE> z%OWhFVHWZBVLb8Zd&^e=cu`?zm-#xkP=Jhaa_E=*do6%}lQh67W_!EG&=J+tnUFPl zA1At!^|vBIo0>GGUP|7hxvOD&!EM3(NOFiy-k?r(*$ep?uCW1YJ|jo1VDrZ&Rk;=C zI@5o|A)qVx?xa}0gj+QmC}3npokw|Ox>E(4=osHL&xm9Jvj{}<iS$eIUzst^;n!oF zr3-B*^rxpF(1fPH_hS{ZQQNB9+p7!X^Gde7b4Os$w9xJbvTFNAia}%&8#g`3f%MTj z$VLIz^#J7Bad+8vt0(`x!pL(ix7YIf4F)Z%51oxJ$xZmFbs%fsNnzPO)C<xC>lW;? zPdBU6&)H1mK5#ek=Jm2u5aIwPUk!U?X~lc%5J6PoJ(}R=%I|!2Y^W6`HCTTj7H?t* zaaa<XI)m>6M&PrmrB#cHp4`>?mZ4A;#78|d`8Xc=nG7~jqTBd|+bcgti+8Qu1RV@U z`e#`s1!|=0q-i}I8@d`F9m=q?UX_nSd5r)3-U-fj;AiY<T8k{}H~%{v<5}ZT2R^oe z8X9L%840GdX1N!H)K;ToGLUtP8dBkEYy-D|#&r22WqKP)h`n)_48;iR$<rqlIgF1^ zl>+!rYN|%#vmONJRUM)1dAfEt6RTg&*r-{L@9aLTU`uk>4X0+wVXNBoVBugyOL~04 zVw5+oh~|h{0cjkCE{Fx3iJ7_X?DR+uSY)*PH4PWnwv(}vimTMTVkF%oo|-J0vAKpW z@g@%^Nx^)bJ1q2Ph0g^w`DNuj)fuy`npV3|sHFAK9#BhMUOyaaIss=A?obe%!;e!8 z*X)QnFn0Hhzzvd~TQ-qAE9}TA(j|KLY7aiZ$VFN<^bkuf5&s9Q*ht%5B_f;rS6~Lp z6Up!GwfKNPri+?6EVT99m4VGtrVVyUuk5@#4cBJj)v_)dbErUV;fbA+wu$;tJKV<p zvn&K(9$*TyEM3BoJ`cj|Z<a2#C~(Nct>`IFPYHfa<AkgZ<)t!mQQ11W^GhFRoWh(t zusE`F5rL$)hotFT+SElvH9c~F%%J!|7GO6QU#N%Wz@d(7>S7A8ra9IoG7nM&FQf50 z?bQ>Fs}tT!ib$o-C*k1m5?_=^!s~XCsf{e&ZwzTJPd5rG5FPM)^v$*#;49x}=l%@1 z>Q~^!cggO=&6=B9P7D+M+~ES_>%u+qcFrvGS%rcz&Cpu9mXjxl8`@hrdXa}M(4uc( z@R*RlpCmYA8+7_oeRf>@=$WoPha6ivcv)?N_Js)3@XsNG&K35#91ZW<BFnRE{$hk@ z5slm(r$e3{!iE)s7&bOwiCVAxr(QYTa=QCVbZ0b8f<^Qz-jdHI-xZ~yR8(iY=)!*Z z$uJSEqcjthYo|QIr7lcr#=ZY@z-O>QIUbzs%#IgP|4(L;N9f9NgJn>5VI*DWrVT3S zIiT7ELEuq2Fb3r3TcOT)UNfj0a4-JFCew)(@=}N0lp8p<djYpXXOIWOMgHzgtOIzH zly2rbG;&=gtcnA-!Ewdea(XmrRLsF48%mr#%Ukh8XLMeq7G{#@T2^0it=wWk=V)yx zo7KjpvMAf#<xp=Px<F(wPg$wOkW{DhN6ew6ZWB5eb5Ik1#GG21ukAtXL5k_T@}6DZ zYjMyU&8G`*+*j>*kl8SIe<{W_=@uOLI;uTZF9>Gdz~X$S6`f`D$f{cx2%aFtL=e1Q z063A()Y^)Ec$kF~6jG94#gi2BfDGf0l5n{d9}ogRc^VRZb0?XycEsvtFq|*_{w9Rj z-*XezUqL5n`Tob~s3>andq023oK46?zQ;+~>1IWCtx!BClhEe3!`xeg&I|81!qWvF zB%2V9C7o%xdbfX6X)M_@&$4>DU8~^MK1Fpf04?HV8q1&hlA0Ex#$~uFAgDsLS7k1t z(KB4|_^e(-!fp2E*{NS!NcD7a&noFpl{kBgdDtT?FSPE?_a1OxBtA*7yq5&DlC{*Q zTLS?Dz?ZPXABN1dhDb|EAu1k6cXdz-*BnA7igJjot;&x@LDU;Be3v=|mkATgh*MH^ zc?DHhc3GRPkQRR%Fmu_Lz<>i|g>2{iGb#P&0U+;y7e={^J+Q6}R>V6Vq=~EQv<;U# zI*;T;5UP<OpX)L#7yw`GE2_yXO$(~2y$~J%vKV-V0zhiwvmhHFHYmiQj5p+#nA348 zXWnuAsZ~JL;-#wxSH<;y%eBYa*&tKVXuR6leIi}|C+^@A%mi!@T*=jm^|yxu0bGvk zOjEQ4bY21-UI6CA|CWu#;A&;xX|7Oe)_b&QEFLE7iGpg3BK3$!*>#B%-(3+NXK^gW zg3K4eeCes{>ZyWiAd#{|H$1K)tCX&d+S)v~5Q$UQP%<(5UI&$!NC#1?%QZXt3JQd+ zNKK=?At1vCh&f#AWcJofz>NwZd*xzf5<1uL;nRDBm!FK>_KrgFV>!ZYgyan3MHR6A zX8MnpL(XX(b_&eraS~IliSNU?2_2J!ejWO({&o3fz$aN20@+3b7|8bkgNKRBEWR|z z=>^&=;L8TcsCd0PC0Ba_t{^n2mefMo9)J_5OArz7$w`-&{&74t*2$(Pzb7U9znPLX z27f2Ivh}y8Ug`vOoMl;g%7R-(>bD9-jN}a7ntw?79XN5;G<a+Ub-XZmce4S5_p0~h z;1aL3sg}R;B`@5|H(&MsXxjYB)<JNW*P!b_R>^|r0f-{@^;1LEq}ybr8`YZaXNZY2 z#p!*YBBkexV=2uj=jBsdi0(5d&8R!+7zg9a5;z008S^M265QZhdM=&OlyiAI1-L`k zj&<?y)MJFQTI+wN&#V)G2e7yQhA8W}VVz2Y-Xaf`UPqW339a<r3hfQ0NHxoqV7)Mc z3-N&0&j10;e@u-5-0x{^bc3fQIDSj_Sk_>qL_b#C@gVc_n}7s8JVYYI1~&SY9F|6J z!`QbZd?<W-Dx1)n%C8sXW=8sQBxhm8kKSlqD-|l^N^f2Ez*S`?ymMti*!2k_i&Y!` zT}a4VOJns*3TyvA<efpJQeozfpnZ&6^sbFY!PJ+Vd&md*1F>?Pr4Mkoc#plH$?1(o z3Ui1x^4dHr;FEZk)cn~&b($59u+fy+K96<R!tX^QoOS4?C0;H$_^J=JS~AeOrKQb} zKrFTxn~(tK^rgy?u<5jQc2*~7_P<CZg{5qsjnxnBWcj_0!s5ju*d8WYtF}`rh(2x= zUo)J0$bkZ<=9Cf?^TOfYl?$3Q(+cX#hC^S+o7O$H&(puXK*9vi?LX;XpBgv!%PU9O zb+Mfl`n$3kuBHUD;<fpzimY6rM$i&SFR!;wT1iIskqLsB^uDXVjNqE7=o~RLC~}mQ z7i?W~eD$;U^{tSvDP3U)e~2yN#T#Bjp5u?P6Sy=5e8rE-r*oxK48BNVuq7@s!)JeC z&Gc+9SkAr(wvg&+r*L0!Fw#7-?r*JUP}d?Os*XL17@A~n((1m_IWUegDYO2Z-ZGu# z4N;*Ukz5)R7n>`>SA9&oH8*afKz<(zF+OPM^t?rAEW%^nxIo>U32$DpPdrtE^<eTS zYA2|6EWUKk-4wps+DXk8$ga&QQ&kT_S3QRFs`pmGDfmGLx7pY<z%-l*M~z<`nT>^4 zNc0~`Uw2?<9vOhK%aT=ZwJgu#IkBG2-OWalmj|~1>JLdJ*jXv@{r|9<cz#<=ObI79 z4%*p;p392wUrg*)fiiEdA#<yFn@=}`<iWWMOS(yO!^j^*=rg-<9@hIA<k(?^TA%xx zH~LSK`LFt;+u;n00pZ<A(yqCs;%?H81KDu{(R53JWU$NS%(TIY#V>zMNbfCswJX-_ zPy5kW@s=yo7eoA6hhtNJeuwZ_T}Yc4zOhqdK9xS^ES1q#M7!?s;&0#?e9b(9?X*yG zD#_Jls>IW%1M%-ooq`S!MUmd})z^8whD<t9+_Q5Owl1LcG8`mXyH4@xJ4*v!)5HFh zJH@pN^Jh&qbjWTj($iOpK1(`NKi-GZ&9kyZ=moyaN6?o$ipjk@ao_d+oKT}DJjg~t z68ZZ6Y^uv+EC_d@($BOtRCY|L^G877K|&dY490lZ83-gHUpG5E<#5rLEFCaI5@1#p zDQxAx7)J0v4Aa$X^WM{Tc5y7U@f97m-PB2I+V}1QB#FxOUe5<tr-E~cIi<54$=HY| z#88<XSg{FpHBaBlUNC%;&TA<W`q=i_Y``0%qPZGTxlZAz454_l^ix4cdY-FVM^OF+ z8xRGgrjSj)ef@ylufsm!_7en?rBF#s8x1S$bX9g2kaWUYpFRzK7PYp1qUo_)YIN0& z$LTA2*7~H-6}BxDdv~#x+6ck55?<VPbvm_de-D*!Lc!FcRHUS?3uz`i%+5QrWv%T= z=RBj&x576#4hUpr74~zxlr<46|8%GbO#z3B*`N;{(F5!yupkx&hBR?O_goH?w+d)_ z0E5c%SleQvHf3TYehIBT{wzHYwps~)_|vlddeMO}YbIDQnd`rw?fP$H0Bj7TH&$f0 z(KiD4E143Qwel<YiVnL1>5Wq0skYDtp=SmB+Q}L)P3iwD?>mE{+O}>LK|n-Al4Jw{ zNunYk83jag&NL{JbI$RofRZHVAW=et<j_E)<eWh=l2el#Xi~q8=Sbr@_kQ=Q`s%%U z^`1W{3cGsm?!DHUV~#n-oWnPkuA>}kX9%VQ3|wx^_147^&geIdF#%lTC~WlN_sdzF ziA9FOjZxVO@S8B-nPTM%uLz2bIQt+LEWqW;l0+{QJ%A>RqfY_F3S|%Jt>3|w7I3*T z_+7GJq{7*q(e&Iv1C70s_7zQmU92tXd8z1EJ8L-KxVCFwJTP*9Ag*1OB+mU9&F%4C z*+ic#_|f5&TA%$1V;a7RQq!H0>Te&aniyO?*r}m9`I2Js4OW5D*yoq8+d9h`oZVIe zS#nUtr2|xP31(>akJ3`ckqpt?(h06_4MzEQ5V_RV*aym8sau=-`@0ks)#-{Q636kH z_(7=M&6@~(%UNTO7|fM~{|yT1+>^}sjg-+OhX^^iB9E1_lCYO7%f)i<FKsvxZL!$p zt}qYI+IFpHM4v`g=o=}JH(CweHAXG<9tq$v@h&$#v>-<VtV_Q$GKY`TD%9;C*tmZV zutjg`RJYTq#50skdh+;(e~YFd{bTbVF2!NU8YnWcVe5)PT1ro)c)+UF*Vd@ju$hut zDA0#1hj-0s5$}03s}RUoI%(<A%W<yaO8e$i0}OhV-*8FAtAqu!P3s+NB3Jn4?bCsN zfW)vZPJji?a_hd{nI1TgYgkXd02u9xRenDkOt8G@3i)esSr>NCjE5GZ4=hdw=d+%n z(K>nxIJ*ti%2@eXO2@}li%nwgEbYH|TOeEEa{IZ^a)yDoNpVsEd0a%LS>%1j`PhmH zQ)0D$RZ?pEQo0ZpXz~8dF)noK(bDp!&M*DRZ~E6V2H73T6+MT=jTMak*lXZc+?g@$ zf82F}g3WZNLw<(CUm_F|3w}*!_`9c?-&7Se<(0{IMvk&iBAgQ5Mq0j568gA^&+!@| zw4dQY#^=x_I#ra)wmrJm`HqRe-QeqL4c(QbQC&q+&`xU~LN}m(F)+lXeFY^z83QF@ z<KK?=bQakS(T?c;*4l4rnsMBF=E8wGirs%z|800z7hN@)<sk{%)V(w|ybZbr9u4C= zwGbF*o9u=3{fxm~WaWe1UDf{GA*8(h7;g%jGZLRMWL+~ZJW-Gx7H&psQ{?;VpBRE5 zwYo%osN?TalxL88xVp(ZB^|54oUoAD!L?bJsZ;Q#x%aK@6^w^Wuf7gscViye7nH`O zR}b*lo^Wy{Q(h={1Op1Q#h9a&x4Ak0wKVnCTqL(Dqt_QR1bef(*H>@Oh>rQZ5MPM? zC;YEIqY!mpOg|Z-h2$13i?;f>PbW3tq@<D+7Xq6+*Va_+Zv#%{U{#L3)dFp&A%4%* zVP_DHEDA7Eya0G_AFlr8=srlapXqeyM;n@xQ-9rEuakHdoLb(p7yhFCk;?F8@ttL# z8M|EWSB|C3-243~bI!cpZ{{3}mXiqEcEFs|S*0;0X71Q)*=WR;-)qTz|H2mdcnMfc zDV_F*87<KgrsBWrP_{p{8u-}-F)010O25Ot=wI(<3kBy{#a0@gV2(6hdo}x2(#5U= z`F`s8WFpC<<HiKE{>pD}u<67*wA4+J0o&$Q!di`mlpw%><Lo$WTtEj$9pS%-&H=N~ z4H}#BDvZT5(~DxActCyafyv5vC@t5wX&5Zo)lqRJp?SN!c|)yMM;m!CuA)mNOG=dF zTqyeqa(X`@i+^w#H(pL3m#^Gh)Z0lH=^vQWFmCsL`-gPmqmR{}hMijq(v`+oIKd(P z-*wqIHU5APM$O`pLb|%hz^~;|%0_Gb%h6T5aNW}2>gPj4h5u4#A~SHNGiluj2p2NY zU@7r@vbql57_2tXYBZtJ7*fZCzT+GX9Py3(opylZT(JOHhk6_A^DzA6{h97FEXZ-s zKy%S{XkN8y{257n=ooVs?whGzAM;>Y`tzV9d~|J7*boo{^Pd0dXPmlv7Ms0aVErB} zJ<fvVaB?py3II#YhYP^MW>-X?p`QHNZ?LmqS$i7zn-vAC#0Q8P<TST_Z+Z-PTmWSy z+~}{7sei586x=f?a4GaA>cO7H=A$$HNr6xriq|>2oW&Uwxa$A*B5D9)Gf?lz_c$T_ zz2~v<72tAQ!gtYs|ID?(XNIkIFa3TwazF|H=Js3Rl#`1Qdtv*c8f3Wbk6W<IQ*}o` zQ?Z}}U84C@xbiEF*orK*<WHaKYuvcHdY-Rls#x%ZXBP6H+67wEoSArf40*Q{QP$(z zC=-emcle{9*5lm!QMHdWz23aCdK#Irpo&9pf?VhuV|PA2SX3?WyzeSq(Jf%fC0;@T zg&FEup`SB9m(eKzIc?WduD<2yPyfbooFDWvM04e@?EWSEoM<YI|NJNmy35XSdiQkq z)hiVcNJj@GW3V+EdtxLsyMJ0a#1LfhI6OY)u?%V{@MZ&#mT}@qriDmKs%-YLHSD{1 z+En7H>Uyx62xw6CZ+_zsn#D{mGd*wVXw482Jzw5=vGCreEIzjX^w1@>-P>lYW1){S zAc`nLS>>W8l;=;6N?x8z2LnNs>yPOJdcd>#ZIRZ!)MRPb<J97GZ|VlVOH<!QmoE2= z${q8oc@{D6uj_zxKJs#C#`?7%2wBP?_x%r`T+*4XJr~POpMZc(U|CgvAMuZXo%k;U zcE*dW{fhy6a8Nt0kj>^J^vAx|RRPLLDgU;bF>ZGarkr+3N26|1L#&OH(IHgj#3ZIO zMn;`IlDH*K_v(IOezen%A<6<b`nKF5Z9M@!hu9#A9LiNAT2YjQRBh{ALaJdx8UN^f z0edR}0uZ9CNl$T2_x<~{1~Z$44iZgi@6>c}r%$lt-ebF$6NFeh8Srf5Q}`yyot{nI zvg03Hc$|FHCm58-Ym{oG(M#;Y_JHeT(|3uwvc=6+QguiMm)@&|&+7MB4zuJl6v2e= zM`zi+^<SRI&B)?qqie(d9;fdi%oAQ9G<vQamEQeJIa*`Me<2nnXaV*At{UWx^25g1 zchpw#mg9usB^sU6Z#U1pys?^&=EHpvq#+emH3@Y3+nH2`h+<8If>*WR;<B$4uFA^B znSvA{QkynEQEbN6XukHjeCITZ#UNuUc2&GI(AX;sei_PxoO;$lI-{F>Z;zVmlg(Yp z3%eTYscEyW&l@b|L4TV7J0r2f;M;)TR?eTk`_Ld!L6AfZP>BY_FZO)-jN@?HO1<`> zTFaQa)vRo-=XA1c<4db{*Wt(g9!-Mcec@QlOzQjh%GX&oFntB4dA8WtVCEECzLy;) zkYa`rqaH6vH*>y7N`Ns_E{G2E&J-GXd>j6&>l5uFpeXTYO+LFvbe_FPxK%#u!OC~q zJGW%i6l)?dAN?#gfNO7j%2gTJMqj|S5Hx$3IaK2p{Yo0|A)P1S+b~q0>@(plTMakU z^RTAAvu(i9?$3RFX@%BEXi?cl?`=q!m#3qB7T3j*rZ;<l453-~k6Ek;?(w#jza{2g zmFJ1MsNhGJpNTm;&9B7#3lbN*)0xb2W+X@h35}XWLb*<wGobW0fEEFp%AZ>G4_}V` zQTwT2a;Mm!8y&(Oz|5j~?K>c}@N*;x*-s2tl8=EfsvM;x(sPs$1@WQ+%;GJ8xX3?o zoE~iZ?}{sQ#eWl5xSRcv#o2X|-^Rw7NVa)+y-g|U1`vy7rB`pKA`8^!3<|1NXCwT- zo=#3qrs;*H>c}E@m#!n;3v$}d`m>>%$GrbhpiAX)M-LE|BB!&sSv5<it3sck{1Dcz zKf^erE`bWon_Bu`swXHqR^p{f)Z$x;YMc_r2hcSs``t4-SfN1s(c%3sJC;Ni<HTq> zOni}rN5`L+vIHWVCFgNCrVfUC0->NsH<nzKlq|cO{uboT4lQS*Ox*5!pPL$dg4ybf zV7z;$4<KB(erD$71e3hM4wV|xCm^arNZcS-!Iv9)peQyFs4dCOvZF?d08qj@);L=$ zcjN+8hS0dncGW^a#sz(g1%@+C@mcm>M~VM2nTnO0(s_ByN{5V;pV@FMH+PSE<hF&& zs|8BZuoTp8N|Zd4^O!<n@(6(P!?omaX5`pH!&O#P$gMjoTmJv2(C8^GmX2_t?Md}U z1QzzdpF%y8T&0Q&J_M4m<8(juNwSQpQYDTs#yhw=>C{ijwiSt`#%2_R;US!oY&Oe8 zkJ=dMqt5{pV?pu0ul7%~>KngwQf}yj7xAq?i2<;6oHXYPRkQVUjd!?_$S^M*=@y70 zxJ+o$;M~_w`>}WI-axo32ilY@1jS0Z;=CL)@~6N?fm~>c=ZFyyvk^}FNS|J(5cw;Y z_iA5%@jS0%H8reQ&aeS)UkDLCYfKVtp*^^KvLl!1$}mm5!%M1=#eExDu1LihNpE#b zy;UIObwsVU60y@Jxy?&HbD?B0UUn&a!h+ydN<EhH0Fx5pH*ioYPR;&b8%U6<_78Xs z5zEhBZ;M7>o-K>*%-|ztW4V`|Q(=9sn#i#GSzu5ZwT*8!|CXYL2N*>c-=xYq?^+XR z2AMO6>qZkU4rh1@HsUU4bRH5f^yrITq$@Q5s1)lo)jQ;wtTo~jR7jUqO#<zU;j)M+ zt6tewx^o$y4@y-nU^bOmF2bEDBQvRZmm~k8Zv@nt@t?bdbpDcvS|YG{;~#2)HTcJx z-M0TYC;Z)i68?&NWgsi78(^wnU({Zcy#ws|1ikpgSD_OS|A_bXN&^{We|kh5+w;$5 zo`Z~c>VX(f#ALy*XUK|NtSymyoz)e)q@`LSri#&&Nj-V<gpR~T4J@4Gs1(Q4{4-yV z=$>_{ani3-I+9{eo3LnB)|y&sz98EC2J(+-nXYrglsV|HZP?l$$@lsMy;X>ys6MEh z4EkJoj`N>H0^2>o6hi4$7{GxeG|4ql!Ng!v9QU=AqU#^h&5y0|t}*l7rt{(_TZai* z<o7w1v!NnrN5+eIh~TLGq5M+9ovL6ix%<(?IH8Yt)fXJvY`W_n?)c&K8x+^Lf;Dz{ zjN!*9YrXJaD&(i=Ii?Lidue!x2Li-AV?&tHNm19m<Ny|cmv8K}GgcpX$BP7rd0_rf zNyr?hmZPzk)!2qiXk`NY&c;G1Z>EEg6oNdKT+<S}O%v#U(XCU{2Yg!AANMZgIW#~* zbie_0oISI8G@dy<Z;#3xry^IkIn0wOweE_h0&P^jRVpQ8xjk}ESsFbUbQ+EX_k*Jp zG=oQMb^qkhhc<bm{w)5F!@ucxwD(q^+$7%K48j0d`5CEySv7a&?Lz*vYW@qYBzSxD z)_lufB>Gvb*5u1g#^vr=Ybr4{OFN6h^NIEU;KM^}0b|EoV@HB+Lvm&mq)(6pwgjNn z3ngLEO{3lL(72KOF?K8rO;D3!uTf5EF_;i&9${sL94HP~T;z{}3V3??xT`8%NTd}I zL+El+x*8QzDlS1EWO1EOCivxCc+blB55cboq9Ln*6=>P8{tk58((Kfy(03P*IiBE# zQoA%7C692VWNoWBJFY|~buRYY44Fdh1gv{MjT=rrpM2`@=xLC1a|&8oT41W-f!Twt z+0f8XC(CPw#kS&dp2Z2rOzoOKxcnfUF+&qzBfT^0h7qgLZ$ib00v!9w_ga~WHa|Mf z)shFV&=0oXP&dUYjB3>JMi<|o>MF^bRgcyp?FU9!z`@t0I8cZ5;@JTTi0oB=a}wU5 z2go1!u~t146$7+h-~m=mg58t`=Q(@_a_%P)K>i_O!5Dyo8$d3*cxJQe@-P~_@X=|e z<$+A~Mrk4|Ds}@rbOK=1?Bdx^RJoWKdyAa8;RYOwZli7$=o9gmBjEqg&4MURIa!-r zF6PhIf%XkL)vWxO7_L<sE9NAood#JrGJ>8y0%UGumL|n}V>{2&3O568?SQCiu3je> ztQ)I0<j{(2E1}-Rt?oAUE$1QCN|Q%5Et@_#Ymas;;OI*<6o-@Qds}BrLtkSJRfBgd z=KMzmzOM%UE`+;ja;kaLD~Sr~4z~kzAg8f%-3ZlwW1ipy$Fr2%hoanqp?}-@f)v&I z<yq6TN$o7nxPRxUxRE(Aw!?0wcGlD(9(@#$3wdr9RyZZ=hJjSnqNCN+lr)MQGY=*> zl)6+$VR{}<v-Z1%99Ckz*Ne9I7++JyUdZi=&z|8}FyFQ-%L<^*{G0jG_CLhVf0{2@ zH_{`)u@u|e$=d_B+d{&<Jn7B*u38X+i&9I}iJ#T`nq67mtw|-gA?k+_*O>}fE@C#{ zQ74a*%;#S}w*Te}jlb4^$|f3xiTh#1akF|&{ZD^pZT4rP@ZPHzB=VQg%7CSA4v`-t z{in4e3iwL?J7!G1sK1#pJye{Xk31m<Q&FwT@&av+vRcafFO#V?Ca$jiFz~O|YPjCp zEh8gj$a>smzW#$K$<unoJL#-bm)2fF^HuSy>E;u=j^C1qwrVF&&7fX}-L>FaP+6mB zheEyTnQe1*bVxdr!xGC5#orxV##niB^WYT*U=A}gH3igesu~)If755nir{wq{p61W z!RL(~RR2R`hxyFJM@yLm21P-tT^-zJ9&AGGGMJv+p56v)lR|RiUPS}9I9&XQixq<h zcZ{sObaQth+7+^sE8$!7B|usQ8I0jh2sCJr)%^HR1)*#eMdtaLWd9gooHR~lWWVBH z^i?bzs^vHz$bQb2X5%X}GieJH*PhVn!pAM2=&=3zdmpXF;kO^lr}ddDOg-}R*bj|E zZ?-=>j_hvKpf2k4vOs7V%+DVy@x)Jh&gX|j3-DA7`_j#8lE2ZVmYNlx_2s@kajfLQ zofJra<AQ_?Jr3vNC@1%)Or>l8Dkaahs%HIL&~9C11Piem)hNfdYfw)_5QID|fJPMS zogmtZP6`$}T=!dj$Mb4m{rHs8-8pHef>kp~M`L|ZtVHbTy6jIeQ-Hw$e&^7kL)FPq zb@-&yOT#HbZLsyRmDt5mW^gq30!puI!E`;4=)HHgRM@1LeH$SMV#r}=Wzlr*>upOd zAiC#7Z%^3#>7yW3Rm&}s!TN_9kip_~|63^Bs_R3dUhrl%G=6xnX81&M>$y!lx}u!b z6H=|j&lgIH!hrRK(hD<~?q7AIDrIcHu}CJ9`OQH>WbR6=-~OEE*ycR?FU6l~!E=+% zp7r?UUEk~iM1hALBIP@h!dkAr)OX5P7s@Qe3N({?W#(vroY3ce-En$?o{Ssa@cOid zEN;AEgIsojL9Z9pDWa|wAYc>B>nWWoCm>i(xmpH-cR0%FG2Ba@tOX=zc2P0`b@9o` z(`+Ngj4l^eFSldQd982okZurs{zrtukM|^lRx%Z*pTy<bm%F`A!t~v2Ok?(FWz3$% z9-Pb<Utt%WlL@-E58qq2!jhXLi}S1_<o*WAl5M(`-hL8vG9Z;Sia5z1t&ajHO1~z& z$l$1BSG4R`sV6FmP6y){7u*Ufc%G+<hsYFl`Q_RSvWS{`oaIg{+gh#<u<5oJm3(xG zWqhqMn&0C;nDa%w88ZAE6gajkv}qrBimOiiD?VFeVjSd6P&UxpH{*Zls>o|+>;5wH ztg8tO={E!?eChlCOo#DJOAHuqY&+#bm=K;OMt7#!A?{h4VFfa`z7h?qtI&vA+ff=L z4USb5XkAJ;b6O@GHRXBT^r6yuea*~S4}n=|i0W(LGX_W$CSZtOl;sPE_&1j>0YHHA zB|!|z&34A#Te|^&E?*SCVAlqsf65i0sO{h_^YVhY3qTchFd({2BvIF(VBZ<3f8&f# zzs%)xL0o-?d&?PxO`Y64cTq><8R5?B4N$+B-_bLF7P-%Vj3)s}-~afg?O~VffO{UV zy_iSmUCg6--7qqaeiq0pG6G-zDcQr$IG5~UTs&$#t$`EpWP0wpGbYfE^_Q2SK`=D5 zXRP~yiAhrJ!{K7>fnVJhLMM*Mue;&o#Fcz;VJ4TmZTf}x*rTQf0^wJ)A2GDMfR%3^ z+yQorCze4|#SYqGt>w(+^25hK5^XNO`{DE4S~#hV0BG%oCD3<4x3k$ERRmvlAlcoA zd^m`#RB?zL4UMjm^oKKPkrA}7#@StHf>D<UxD+8fO@W&t*v5Dgf9vKc680b1^~Pu^ zCss{W`PA{!@aQ4>Mw1|~^1~h#zHsPpeZ9(3>FbwE{eW6IUs6Y-%+R)_-K(wGo)@vG z_Km^fBY~NLx|I0ERWlA?)d?A!-U<<%@kLd~m#^1am^K;<9%sssXLgoW9V@>OZs;n& zwCWx$UxxJrnJ9&q6E5#kolw2s9K`0vt6yTQ(SGN$v4^Xx+D7${whDX5F$l@$&-q8a zvzYD=?q=&*$$Y7N{#1)f(_ldKag<v1!@fx}8KMZ9<M8o}Qtr3LfgiF95oUFa9}1Sh zL2(E9Ap<OAYN@x8_$7i@3H1H1`WmC#$p~jWxEBKH=CP)D<?EOFfMcqrs7c^xZP7?> zXr_EGmZMinRvl!Ql)dR&sV<TEhMa)=^zOSu7s)Wc=<d?Sg8Kx$X<;9n<TR8|M7x`{ z<3_=Qh4)ZfSU5%Da`egyU&tHd5-y^f6<(LOLJ6{Sa&n$Ylt<dH3}kO^Zn~{&yCY#C zat9lg3jI%ocgqOkX$R;aGYM=U_kGa4iBT<2(GM<L^7{#DLC8fF>Mg@Tocp@s<inx} z{{^4KV<YkoXyu-4!E|G@ZLXh7E6AgiBY&#GF0-$Mia10qn<GkFPWG#5DLKN8cb{UX zcX=in(_VGwsJNq6W=R#+=%cHoq=bn}Ht<ve7CE=Fl9LcTT5B-m!=rvKQt9bK<G)j! zA+}tgf<e5&eS=8@ZZ4|-&ELCG!S;CJ2gj!(*0qlJ0#g0`Wt|d;VGE{HPKOVMTXOG? zZ5fG(7T$9g8#cIB#<7gslayN$TH(6P3#^}#>9}MN3VLkhFr73GG8a3)T=1#DR`Lt_ zegGqRnCSZUJ{c`|^5fRFH$IOpYgoF$Q%_4CzW4!HqRYn%VKF5Z7#h}zp604Wbo0kh zMI&kdH?b%ClVNa{%$hawOm4p;2+`u&@(kbejzie~a0g$B5n@AJ>)6s~uo2x47h9gX z_STcT`bGMlZ8I&hX4At{YRA()heKn-`)OLu$+6CxkfNB$b*i+*T27A!-(!q7cwMr| zds}`XgA|gS*;-()M;CIi$5Oz!5Djf*%YL*80f7jFO9SjlHQ4O?#$iW|Vw^J~{RwXX zcO(M~w@O?$JiNB_fCqhkgwcsOqu(JsJpey^=7c&Fhb2FYk-?LruXu~mD2iA&G+oz8 z-gWz0+|AP^@BKx=!gWPtKizzIz1zC#a>&Jr#$+VZ51E6=73y`+^M@xvBeix*W!(!> zii&dyY2`VM*&{`-Nw0>tRtUbD-nC!;&PY0JN@Yh2(}nzykNcGF_|CH%dh68KP<}do zc_dSNHnif0$Rg{#lEZdqOd%fUdu*_jupzeFB)6RSm%!?97MFb9lR2l8AvWzvp~C_X zulr6DyOw5*-=G)25IJup$byRkr1M%uX*jPIMY9X0%tX=`o|%)68^OsjobJ~4F*+U9 z-QUyaVv+lu>EGXQ(CJd8xLFRZASoXih#FUIW#Ki*4Zi2##*efROeEuc;Qkr;NC62w zVGyL_u03U+eP3AQ*c9^J1(VLQbrNB9)ojD-$ge!TT-U?S*8lKcG=pO<C*#HGuyz>E z&kXGvKYKyZ@Mf@MgSuMHqvUoQx_jQMg{pDjmK5bp33F;i7o8$prxfTj`|#MP!Pz(1 zbjT?uRLdPfT?CI{u17Kaf5CtfkIS;K(Nn62^~5*71ZJ}ClvP<uQs!Dn<!4%rR&g7Q zwqdj2I?V7YAd?`ayu=qq1Y;Saxev>x(Yz7H!BURJQOaba*d8j2Y?Gra5e~6O_4xJ{ zCP05uYKC@8<)(3wa28csP~@OYzO2}V++FiI@I6P_q+eVPKx`)hCJAZcCx7}qh(`gF zKFmnPU4Nq#&@~l+wM(=`N_MUoJHryjq`;`Y|I6RF3In5K5!W{W!?2x-eerge{_SgR ztnGP=xgCvH-~4C-fx*M(Da!V=zL24}KUN%Q<!W_Aa^Jz@6we_Ez;x3J8#iMD`A<&A z$m^>sQxl14Yzw==73;N!@1-~#c)@wHP1RPt74Ia&$q^8^>xs|Kyo2fERq&Gj^v#pS zk<N9|ME6AB)Gr}A&;mpar&*UW3Jd{lIiK<QjYu-;`sYVOb}QUuZacY)@22<zew~cO z5&Ztf#>_yIjjlXec+U8y5!V~xc!6<`r<PWHVbzdz(8gTru*p)+PCKvL9=%sNgn9cS z!$S@nfLt%{m5KO-nY#2P7my#BH#8R%w0-B~t4J&QKy4e`5Q66zswCV&Zno2&&RlGw zGth6-oG~yT{)Y(hT>SjOMn6Djg={b~<6cVwz8#8Mq5=;#<HISANWr;i4x~Gu{>*a+ zLU51i^IfRmo#&KWiJanAOp%iLRHT$u)9H6Cq>T`guzTC3$gH7{bMNWpf^OfgK0ZqQ z1`3EWAc^4aS?LfO4kSx)B&s}lQ9BqbkFu6b-v#bowy0OOutT?kgnE)tz`ajMPmN45 z^SbJ=w#|w8N3ZYe8<=a-0-L><U*i=Sy2rw1b9R<aq+>#I=hi<_Bc9=LqDjZ@Wvyfp z>}_bk;*xe1J0`Wx!}F&URCqS0zB0s2(y<JKYw9hm0OEXx6W7y-k4yB74H+M1{-`nG zz+4r9Kp}&A5u?wyp)S~8b(F&GqO4-ZJ8R6Rx`LwH%*(25ZI|m5l=zVcKYXre!C__M zzHt78u{F1+Y|RX)@sKZv(O@vwJ!z`TGIij@2tuNm^lI*e2a|_(UYsvkm^!+$KU8m; z*jhQ+u%%nSmJHTzrrQph7ovKB;C0>ZxR(q>|5W29!`FT2)S=5;A+sLhl&tpxuqe27 zUEMkg*9-)%+Si79>7VZRog%R!w76qzq3X=0RPCJCcW%LH{hXWO<lL`+M3i(%<{qZm zJB3y`Mp)_y@a+fP!I5n`U2VgBQ&p+L)NQ{k&nJJPDm0farHEYGn)P$3tl9iFom9{P z`|jMKF-D0*NnM{LT*`91QJ&FNlhSw;q-*Ilv8kZ{&5-^Nf`<v+Z`+FIX2RW~7;3hp z#rKz&6=8+(6#Odc{6rl0QnEhmr+2@w@pjY-<Aq~^9*b($+!2XbbT51n7KMS}Je@C3 z{l>50H5B;$eP}3wo}O-y<{b%f+-=Gv+Z>?}_XurF?7x46dNN?t5V6egX3T)t;aUjv z8d`~1D11nOh!C<}-+?VP^x^hKK36sBP_t$LcAe3vg`bX@OU7eMo2C-$<WIAcTHDnn za|Tn&^Y5b@dE7=To!of!I|famE`ED&g_uVUixT|jS;KAh79P5;Yb~>I%|#PYCnO5O zW=TxzpOvQaIDp0n203*zip^OhzP=JcyNZ5QFbxlwL0Jzs8{(%=CT(jSy%!eaK2^vO zW)ys+XVbFBF+3O-RRGs=Sb11flsCOJ3HDlx+&^SVtMOVt-LF?;i~o2*{=<CPvc*0J z=D6ADxW6l}x`baoyIGe13cAX%FKIF}A3jsUHmMvpE^;HkWARX8N|PVExJGO;Cs?iL z?WQ<pwb1^1hv>s(s%53DV4L9&xELN`ndoNov@`?DRT6!T{t{cKAuWwW!~FyVP}1dP z29K=4qOe%*{erY(ueQ^%;1(adD^lT&pg3H{*<McSWa<YSa-mPtXh{klc5d!TcC)yP zxu*V5y^zoXbAx1I6b?p-HlSg%jePSd9{Vw)9eO4v+pb=%LE0CZj;!@BACV3-UMJ+% zr#iYTa^$gjV#ZA&$r15F6^#j=(xH--e4Ia3^{)L$99g>2z502@bH{BewSa+rB+R8z zUmc+n@g(o4G&+82r{Jwn94X;}p=%k_u=8EZgB~87Ypcg)K0~3rk}!ft5VnJYPQ5av zXsSVG^-h0PWbGm1n91k8R&X4^-Z2KRh0Cpx1t@{{#P0k`<GsB_fQj`y4O~T7^Q)$b zY|qFyQnJSgjvG&crcRh$hOD<_xN4%Kb+;Sew{rLyzybyCAqgwiD>ZW2DW%Bp$&hch zbFtefW5^7+VK6J?X4Ji(z(boD?AyY>54~}`h|Y9}d0K+~M7Qik?tTFgo*91c^g@63 z8@p&+`2NZ~Nm&{{fMs-!tCMmc34paSlH(K_UMmmSZgtj)Fm<ncGR}Qjj?y&F9jvqQ z8moS3{!H0FI(oSOPQk&cOTAkg$4k~Maa8l)Iu~^9oZLvDdzDdRUP&oNgSc!ukaAq3 zpHS_~R?7NTUr#+g&|!!WmCH&<d|w@BGGncQbg$X?d`oHBuZ=BHl`N8&Bw#9|f0=)U zqEq9BX@*8Sp+Lk_O}(7#?CdvJaaU5(_ato{98^3HyW2udq^`f9{ssBG?XWjNe2b%2 zSs<_ht5K}g?esa*!%VQ7Qsx;W@{%Q=K!AVd$0zsPd`lx4>d%(#hSgs8-aLLSsElgq zU`z?@0CP&G=cPD4%yzHZO5TY~j+WU<dO>0ygrkxxYfWI;B{;5XIM1Rbx(0Ho_CMcG zymX0JLqhbavTd{Nto#5<_Gjz>yjar%C+3U^LB)M*C=h@4SzfqZz)}Ei8a%^I|F66l zwo!g%l&*&X9RNv9!Ey(C>zVzTc0A3SBB29dFJW#caEEJVo3?wG@%A3>l6_VwJdR6p zzL$C*`#|jVl@VjltOL#3uP+~Xs=f4Vs4w1_uB+9da>@_AkcHKi0kNUXqC!syO=V&2 z;T8DCdRK3zyQ{dilkQ1FMl5f9Z=B0istryg1NXKQFzN5gVteUAXPbZT(GvWqXrr)_ zYbZKC6=<W03?XS|*WIB8DlW%CPSFTrmcE=&)R``vQVYx=^&pU3QxG0*2f2>dFa+|| z(z(hve0aFi*R|%qJfmmFlUc)8{9z#1wmx~}I-12^ijMUl!XQ!LC=9Aa2Pdlra7D|P zm=I*iU2t_3FGq1zQQpf5<>ka^1`w;+7gCZ7XjvW@v2{QL^be3It&Zv*4)WldnH^R$ zSc{_^SI`*8;}M@}#)Pym(JTa&A`BEGM;^1UELY4bu53$uy@RveX?wiC{1tDud7mKi zDn>VNsG1!*qiMdJzrt8;@xl^YMm;$~oR&5^nS*RWta6vKe8T+xc&V|5<5QQ`LAo>% zl7z?ULCdV=#wFAl#c|PL-}pmuZeS}fuI20m`twoX-+IZ_PLwAr5}~Fo6u)cu_EF8p zAk4lYM$tTh1oq5_rowq;Z^;pue~3hpL`XPfvJENfKBo#q`6ph6pbg$dr^**rQBeUJ zQp3i|+uPbKC#w;_*d|bos{``%WS=9Tt!U>*h$IKMk$dfy!4~w@n&g|IG1v@;V7}u1 zRMW;!Xl66BV&=u6szzb~BF>6pWUv&l`ks2)O<u0QdMc2cyiOy47_*q!&8s?WTVrgD zJk2dP2gN^Dodeo2-pmkd>NNGRG1*%wDJt4YZ3QOAt4=m}mPmY%HW(o-L=QE*KjAuK zz6URQ6p%ZVrJxZ-vSZi#OnRd(AH0#PbSqaWtB|`rZ%<xdn_aI7C&MA@WP>*M5pjK) zv8s9DcjLkdz5d3b06g!5+x~bW0XLqVk74rOx%Q$9Vy`+WiH3KtgnU8**J5ti+nDn~ zxZ39io>1B^3W_7CcT9~Lp;|o8;*JZkc1-n>NaN?LU+8+#&eW?bnZV1%r*73ywyOl> zcEg-O4KGr)gAyC=aYxpPqDRq|5PXWzoZR&^Jp`XDRxNMx%^sPy-~6%kmE+w^D%eEd zgBPSc=}^V+mgPa-Evwn#VLX^9jj6#XZp%Q|XL=-kiJ64V;d$%573|Ho(l9)eN5M2- zoS`-^T62u(XbGO9vj%VDOKoq)%4-liE;J-%ESroiq#v)A5hCNN6cMt`*XA9?;U4nB za-2H=43p4w(hAFG;g;x%!(W{@&A09cjaMlsKbVWeEDvYtN<_@O9;$5_-t}}HKY>@v z3OqyFwW}2)b%5qeAF#XQi#Fd~Zs&5>7$0tWeClSCk2Rk(IPBisU5tEzKb7N@k%Los zm?JY*7C7igh{BE~CO{U+RU;sszl=5?xjhl~Z&{k%oxLNo1<KLl<NY)X3?bU6Vrfd# z$)8M3a^qi2jpXq+pW{f#w4lyVa(rK)Cu<W26{w1)ba)ga&7Kzz=`Fmat3MZzmPB!= zJCa!|6z-QR6vSLvnRPh9Uz(LqNuMF_p|+#xS|cA;HAp-W>)3B#I=0Pz9vFnjh=2qc z0<<`cW9gYtIw5)zQbFlg?tps)O0HCsBw$b0z8hR7ozW^VN1e!#yvpcdwsp5-j~H=S zzidxSTXp*((<Blfq1OoCZD_E1?ph@=)oNw-T8L-Lx@aUstk_Fe04PG0EJ-Xp*ogBl z^f2nqw^cRDMaXUM8YXoHsKv+Z;I8INY~2sbmDS1NswoILm2sz*BbQ`>_M`-=CSO0l zQ*RI!uqGhi85l<H`mB~Zsg-R|RKbc7VG)Epi%VcroBp|faz0)PFOj3Tetp;J!y?I9 z8h`v7P-TIXPl8Ku6;hv28wRki2@IQUjtZDe#YivWns~)d*K9GG#3W~dP5f;$TBRLa z!!cX@!f6He-WE91w&&owi3ypEO;K$*mT6kT1~UUo+agd-^%4-U9LgZv9eEmPmaz0L zVsY!qr%L6F2VR9w<{-NC-DLO0{FZB~kHgqyrIUDA&5YKbA{HARx;r&Jmeu?Gdk&~0 zbY*&iiz93x@5=!i>R*7V@q}e&y!45gduk+3&zRx!?)^uhX2T2*hm1&WAbD8rwqxX} z*$V^@dt9{Mlv8pwUWb{xksXTYX7~zea@5Rx7KK9`XPovXkB)W+#6nY(ds?JgTYL2i z^%8jdsh&92;Kq*fY@ybS_X$>oKW6UtZu8h|I;_v#+xXqBdGcY-ShX**WD~F9;dxoN zbFc{EF<M#>iuePd>(Dx?Gk!A1vomv-ZpHtup}JRCs`jo)nl@p)TFtblZJy0+?hKCK zOx9+{42w@bZ{mFP7FkjlujL6Zn_^g89ItUt$_+`=g1c&JYV#zBJc`(|7JvKm(f}a0 znkuyevWUq>O<$2H1jC1M5rSL+?hI;$X4TT??YWkdE(=*$E3C2)!Ls7_OY#h2%SXI% zP}s;q5uk%)EOEl0O(&td*500Igfd;85P-|lokJxbE>>aVVP9^)>^nXDmnV=3wb?Fg zpU<nxG}HIc_@6f_IEFb~KwRG51ULZN-dZUB&DLQ}2qbIbBN9UwXs=6XvcLrv8{)hB zE`(&^I)$^jmj;X)sDW2!LK$F=dLn_9pcE>T0?^-|Lv0iFDN!E`i)OmvjC80*To9uI zR2PL9FtG7|cC$T`?}xkkC?)FLCtt1|ytUe}<h4+Vw!1DwC^2z}X>T{&W^ORI5ORcm zoVpd4in-G${aON^m~YQ3XQkU6>~xK+RV6l{n^b19_HyF7bXh2aHi|<MPI(0&ShBqz zIUWF6SloPl01Dv~k6&M=w3+aL6GR)XnET2tcmy=DDaZLQc<df}jLd89Tz!<f{Wc38 z)!JR4Rqol2(?(`&Kb!$DSYkU@7ULg}gV<ayFr(hMz(XK^KsXlb{qK0H1xaZ)CqtrE zHIRd+hEaFz+=gNC3W&rW#3xzE!qJx79-$mj>$EJV+sIys#k!GWIUmH|ojelA1Ad%> zg<=+cd;x@g_F)9DKXXfX)>^I=<5NRxnO_gDy@WHg{wLCkh-h82gcTwz_?#emh_T^w z<dlZpZWQh%Jg1Q0Fj)yIpEMnc35hDpsN5lHDZ<GXp<DQs#|ga;*xNETDq!VzdB%@- zr~S5OkKX(Ih0Fdh0><$S(uID)spWTjDQ)DU!`@_Z+@vq<!uewEXg_4!^R6yc3<^3; zj{|E6uqy<Y9{z*4B2oKq5m&&ix}32}b9~G=3%h%+Y!B_=QDC!hPXRB<7rS8us-dGA z37ZpDro6he!$rJN_X-}7tbM1Nnvz3Cvz_Q(hb!~_o%qth7a29xQPBP(V6pJ!@{dyq zEull2^>Cs>K^@Ok%i7&mAF$vVWz|XemHC1*xD~@W@I$!QB?==1a2%(9uDfgS)R&-1 z%WJ)WY9x}-a8X%I=iqT=`LTb*$8SMQJhqe}E!<H^XPWudrB;qK_lDs`Q3XtiwiCVO z<Bg2hmA<cZQfX}cowT7g9K^B`t2X<yDh=x7B-Ob`_fux7u*Ql2<K|scc08DdVnzF? z`b=s9T537v*zK*D0Of>YvFgOak(kF{#r0i}XPu`MFmc*wd9{*r##Pf@Ac4ir{)g;3 zQ{mguEY$ku$#<)+Z8J|SvxLZ=1ErhRwr82)@s(-gcHQc!gZaH-Txu}}b5+_W`1J_s z&#Y4S1uKnA`pCQO?UR%4zxRJ3v5gx+)CP)(d#3Ozsiiv(pYP!#+h@{ixe6?Imp^~n zvy=eGwP+u;IX~<Nh>ZJ&QF4J&{GPSWZ_DFhg>#v9Mz!jECC6L<)pZ<lS74b#F>KqC z`>{%8++;cMm$0ND>^#^9tF^(@&GU!>ETDu@p8Zq4o|Sf%44VLs%y$8H;QgpP-G?xP zsRuPY<5S=#Msg%m5A{A-L7~9ZF@bh3q0wz8oV?4w7p_*;>G*m@133}1FtgM-4(|4W zY4xuj)#I!z0qR|k-gDGnjhBjo3kdixv2L}XRDdtuI=W*~h^IiZ{EBY>6W~Z}W%lXM zXG-o=diIqQzfy1us5Z{MP^NOrsYptSIp}=R4SDv+z`v^5!}Q0ytIfB*YSm}|Simix zXGWova2#uq%(L}nidf-bZVVfBx-qdg;w~ZiA;E4}wX_0hJ5qSvW+&ao<D0OJ$U>pq zqx?ZZC;dNBN*jl~{x#^LF1FWWj(eM(yXH#yTQ9~pKiLrzj-DFu=elw=7ins-<OxJT znin*M^ii5hK>FANNFOIItFcj8^o`75b@3Um?4cvsiT&L7bLTYbGnO9wo!H^6L=ii> z@(Z+{IkE{kl`FgPa#=UJKwJY;xzW1cgSQU?#}5vnfoevqGIrD7;i}EHk&FyoSIok; zRjImY9SE$*%{{X`A^A?DgUg663|mzAk!6@x1c6}sQij0rR~kWES|ImQxwl*vCY#7h zL`8KvZD`2V-YtbMB*Lg8rqlWOL4v`_)f|l){gE=J*MrM*g7L%4U|6+`j11*tV|h&a zQnj$$+}vY6kNcb<r6znz1`NNh<t=ax;9}gyITyywFSi3r!74W`bHGG$%x$T;=)J+@ zkaYxVHPFzYSKJ8?xqSZ6&UliS`@kXR2z|$TRtZ9JDKsUs94HFq?6>bVK=7Tgx`Tsy z(b;c6?tJ}X=m)xTvI`p<?Q6B5U3fd-mCyJDul&00p9GEf1OO67PKZZ0&<3V*RCNXT z`7OsQUO~-XE#TrDAIyg61&C3$%UD%ltD&Gl96bO>Sno5JfAQY)JDm*?N{Wvk`&QEr zipM|L8?zD+5GaLNa_s2Q{<@U+>>2Ubr85ebq;i=Hjpw$~sdXR8SNl2#zBV^M9~m9J zYR{Xi#)RUWjPZT;*!pl1X{@c#W^Rj1$qB#*-T@PwKvlqiqGaF^PH6d+m@1*oFpTBp zu@;Z4!C+vEl9rNeiASWrzCvJbH^9&3Qog3o`=)~quyZnzk_RTiO=Qc?xlm5R#B z=|lJdw@BSI$aV<POy@GM+JdU=5%cU`Ou_nm>Hzs>I-H+Ky!HdtPs18{#$#E%!0RNw z*{c~DHqawmZTdB_CE%mn-O}KtxSsrxTJWeaE=(H)5_{fYMf+a9i?(PrCCdMrX`*T( z>znhH5KLEx8yj34y;pjR?UFpQfuvxD-4lO3JNKrVm=0l%4P|d)jd^|*ct+)}gHb65 zFC46SKZ@?rUeUdU^L`uO-vP@3WFG!nR`GNP%5~|cO``u)$xT^-{$f@eX*5ibN@5~W zd@ci96#)^2{W9x$12SVyATdx)bK3S9gq{xe$R1A=U^tj!18?TVKhUXig@^MqfsvD@ zeU?QHs35fU{H85r0I&*%`73pZAKS3&@xbKV@vrzpj|L+Ho^7eVbzBLh#B_4p_vtB9 znUHj_12;LO{xJa##zwt?D)0uKmO-;}(m|ISl22C@OUt9g9Y;-)X6>HzTpI)v7U<ax z-hBoc%{z7`3Z*cvWX1TkCyWVz@7_X>Ji+?bOo$tNS~d@K+{>;LDReNOmE~^>8<35> zQ&$`<=TBUm4PkOr)gMTa?fg8y;yBixifTmrlH_c!70LwjNNlOqmOa=ShLSC3lZL8= zYd)PTjnf}3@-E9V#Tu?N)6&7PJLlfk6uhTOi<?1qpLud$Y02EpI;M-tA~Kaykt!+I zA5HNl9)4e$?E+H?*ea2-us%ig1NmYG>^jJ#AZBbeaT!x6sPl57>Jm+WeXW6UXcF0Q z_9e|vJ1$@Jel6PRuh(vl3aIP4T2*=fBz9f#2F%USqI?nzYQYy<H{GDAbAnO4B%svC zK3?9SAvY<!zBhpOhV|FMviTC@NvYeH+TC+!$j=jkAKfP|na~Z3?&0tDYwx-%w`fY- zgumDa{5%+b{ov;ZR*Iid=Zjx^`R9N9Z+-CrQtURq+voCmp-aF&2{BpG{AVx!_+OsO B?_&S} From 5fe5a9364466ad6696729c0a43ec88c568d113e9 Mon Sep 17 00:00:00 2001 From: Dougal Matthews <dougal@redhat.com> Date: Wed, 10 Dec 2014 14:09:47 +0000 Subject: [PATCH 1282/1652] Move remaining sponsor --- {docs_theme => docs}/img/1-kuwaitnet.png | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename {docs_theme => docs}/img/1-kuwaitnet.png (100%) diff --git a/docs_theme/img/1-kuwaitnet.png b/docs/img/1-kuwaitnet.png similarity index 100% rename from docs_theme/img/1-kuwaitnet.png rename to docs/img/1-kuwaitnet.png From 8ad0b83148fbb64c6ae91ba970ccd6e26a483a1e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 10 Dec 2014 14:29:21 +0000 Subject: [PATCH 1283/1652] Minor docs tweaks --- docs/img/1-kuwaitnet.png | Bin 12302 -> 0 bytes docs/topics/3.0-announcement.md | 2 +- docs/topics/kickstarter-announcement.md | 144 ++++++++++++------------ 3 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 docs/img/1-kuwaitnet.png diff --git a/docs/img/1-kuwaitnet.png b/docs/img/1-kuwaitnet.png deleted file mode 100644 index c73b68154dd3768118d5f623f21a4231f78d0da3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12302 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 JDrX$@e*g+EQ#b$s diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 8fa86b9a1..0710766f7 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -34,7 +34,7 @@ Significant new functionality continues to be planned for the 3.1 and 3.2 releas This talk from the [Django: Under the Hood](http://www.djangounderthehood.com/) event in Amsterdam, Nov 2014, gives some good background context on the design decisions behind 3.0. -<iframe width="560" height="315" src="//www.youtube.com/embed/3cSsbe-tA0E" frameborder="0" allowfullscreen></iframe> +<iframe style="display: block; margin: 0 auto 0 auto" width="560" height="315" src="//www.youtube.com/embed/3cSsbe-tA0E" frameborder="0" allowfullscreen></iframe> --- diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 91ead751b..9f99e3e6e 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -2,7 +2,7 @@ --- -<iframe width="480" height="360" src="https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3/widget/video.html" frameborder="0" scrolling="no"> </iframe> +<iframe style="display: block; margin: 0 auto 0 auto" width="480" height="360" src="https://www.kickstarter.com/projects/tomchristie/django-rest-framework-3/widget/video.html" frameborder="0" scrolling="no"> </iframe> --- @@ -43,20 +43,20 @@ We've now blazed way past all our goals, with a staggering £30,000 (~$50,000), Our platinum sponsors have each made a hugely substantial contribution to the future development of Django REST framework, and I simply can't thank them enough. <ul class="sponsor diamond"> -<li><a href="https://www.eventbrite.com/" rel="nofollow" style="background-image:url(../../img/sponsors//0-eventbrite.png);">Eventbrite</a></li> +<li><a href="https://www.eventbrite.com/" rel="nofollow" style="background-image:url(../../img/sponsors/0-eventbrite.png);">Eventbrite</a></li> </ul> <ul class="sponsor platinum"> -<li><a href="https://www.divio.ch/" rel="nofollow" style="background-image:url(../../img/sponsors//1-divio.png);">Divio</a></li> -<li><a href="http://company.onlulu.com/en/" rel="nofollow" style="background-image:url(../../img/sponsors//1-lulu.png);">Lulu</a></li> -<li><a href="https://p.ota.to/" rel="nofollow" style="background-image:url(../../img/sponsors//1-potato.png);">Potato</a></li> -<li><a href="http://www.wiredrive.com/" rel="nofollow" style="background-image:url(../../img/sponsors//1-wiredrive.png);">Wiredrive</a></li> -<li><a href="http://www.cyaninc.com/" rel="nofollow" style="background-image:url(../../img/sponsors//1-cyan.png);">Cyan</a></li> -<li><a href="https://www.runscope.com/" rel="nofollow" style="background-image:url(../../img/sponsors//1-runscope.png);">Runscope</a></li> -<li><a href="http://simpleenergy.com/" rel="nofollow" style="background-image:url(../../img/sponsors//1-simple-energy.png);">Simple Energy</a></li> -<li><a href="http://vokalinteractive.com/" rel="nofollow" style="background-image:url(../../img/sponsors//1-vokal_interactive.png);">VOKAL Interactive</a></li> -<li><a href="http://www.purplebit.com/" rel="nofollow" style="background-image:url(../../img/sponsors//1-purplebit.png);">Purple Bit</a></li> -<li><a href="http://www.kuwaitnet.net/" rel="nofollow" style="background-image:url(../../img/sponsors//1-kuwaitnet.png);">KuwaitNET</a></li> +<li><a href="https://www.divio.ch/" rel="nofollow" style="background-image:url(../../img/sponsors/1-divio.png);">Divio</a></li> +<li><a href="http://company.onlulu.com/en/" rel="nofollow" style="background-image:url(../../img/sponsors/1-lulu.png);">Lulu</a></li> +<li><a href="https://p.ota.to/" rel="nofollow" style="background-image:url(../../img/sponsors/1-potato.png);">Potato</a></li> +<li><a href="http://www.wiredrive.com/" rel="nofollow" style="background-image:url(../../img/sponsors/1-wiredrive.png);">Wiredrive</a></li> +<li><a href="http://www.cyaninc.com/" rel="nofollow" style="background-image:url(../../img/sponsors/1-cyan.png);">Cyan</a></li> +<li><a href="https://www.runscope.com/" rel="nofollow" style="background-image:url(../../img/sponsors/1-runscope.png);">Runscope</a></li> +<li><a href="http://simpleenergy.com/" rel="nofollow" style="background-image:url(../../img/sponsors/1-simple-energy.png);">Simple Energy</a></li> +<li><a href="http://vokalinteractive.com/" rel="nofollow" style="background-image:url(../../img/sponsors/1-vokal_interactive.png);">VOKAL Interactive</a></li> +<li><a href="http://www.purplebit.com/" rel="nofollow" style="background-image:url(../../img/sponsors/1-purplebit.png);">Purple Bit</a></li> +<li><a href="http://www.kuwaitnet.net/" rel="nofollow" style="background-image:url(../../img/sponsors/1-kuwaitnet.png);">KuwaitNET</a></li> </ul> <div style="clear: both"></div> @@ -68,31 +68,31 @@ Our platinum sponsors have each made a hugely substantial contribution to the fu Our gold sponsors include companies large and small. Many thanks for their significant funding of the project and their commitment to sustainable open-source development. <ul class="sponsor gold"> -<li><a href="https://laterpay.net/" rel="nofollow" style="background-image:url(../../img/sponsors//2-laterpay.png);">LaterPay</a></li> -<li><a href="https://www.schubergphilis.com/" rel="nofollow" style="background-image:url(../../img/sponsors//2-schuberg_philis.png);">Schuberg Philis</a></li> -<li><a href="http://prorenata.se/" rel="nofollow" style="background-image:url(../../img/sponsors//2-prorenata.png);">ProReNata AB</a></li> -<li><a href="https://www.sgawebsites.com/" rel="nofollow" style="background-image:url(../../img/sponsors//2-sga.png);">SGA Websites</a></li> -<li><a href="http://www.sirono.com/" rel="nofollow" style="background-image:url(../../img/sponsors//2-sirono.png);">Sirono</a></li> -<li><a href="http://www.vinta.com.br/" rel="nofollow" style="background-image:url(../../img/sponsors//2-vinta.png);">Vinta Software Studio</a></li> -<li><a href="http://www.rapasso.nl/index.php/en" rel="nofollow" style="background-image:url(../../img/sponsors//2-rapasso.png);">Rapasso</a></li> -<li><a href="https://mirusresearch.com/" rel="nofollow" style="background-image:url(../../img/sponsors//2-mirus_research.png);">Mirus Research</a></li> -<li><a href="http://hipolabs.com" rel="nofollow" style="background-image:url(../../img/sponsors//2-hipo.png);">Hipo</a></li> -<li><a href="http://www.byte.nl" rel="nofollow" style="background-image:url(../../img/sponsors//2-byte.png);">Byte</a></li> -<li><a href="http://lightningkite.com/" rel="nofollow" style="background-image:url(../../img/sponsors//2-lightning_kite.png);">Lightning Kite</a></li> -<li><a href="https://opbeat.com/" rel="nofollow" style="background-image:url(../../img/sponsors//2-opbeat.png);">Opbeat</a></li> -<li><a href="https://koordinates.com" rel="nofollow" style="background-image:url(../../img/sponsors//2-koordinates.png);">Koordinates</a></li> -<li><a href="http://pulsecode.ca" rel="nofollow" style="background-image:url(../../img/sponsors//2-pulsecode.png);">Pulsecode Inc.</a></li> -<li><a href="http://singinghorsestudio.com" rel="nofollow" style="background-image:url(../../img/sponsors//2-singing-horse.png);">Singing Horse Studio Ltd.</a></li> -<li><a href="https://www.heroku.com/" rel="nofollow" style="background-image:url(../../img/sponsors//2-heroku.png);">Heroku</a></li> -<li><a href="https://www.galileo-press.de/" rel="nofollow" style="background-image:url(../../img/sponsors//2-galileo_press.png);">Galileo Press</a></li> -<li><a href="http://www.securitycompass.com/" rel="nofollow" style="background-image:url(../../img/sponsors//2-security_compass.png);">Security Compass</a></li> -<li><a href="https://www.djangoproject.com/foundation/" rel="nofollow" style="background-image:url(../../img/sponsors//2-django.png);">Django Software Foundation</a></li> -<li><a href="http://www.hipflaskapp.com" rel="nofollow" style="background-image:url(../../img/sponsors//2-hipflask.png);">Hipflask</a></li> -<li><a href="http://www.crate.io/" rel="nofollow" style="background-image:url(../../img/sponsors//2-crate.png);">Crate</a></li> -<li><a href="http://crypticocorp.com/" rel="nofollow" style="background-image:url(../../img/sponsors//2-cryptico.png);">Cryptico Corp</a></li> -<li><a href="http://www.nexthub.com/" rel="nofollow" style="background-image:url(../../img/sponsors//2-nexthub.png);">NextHub</a></li> -<li><a href="https://www.compile.com/" rel="nofollow" style="background-image:url(../../img/sponsors//2-compile.png);">Compile</a></li> -<li><a href="http://wusawork.org" rel="nofollow" style="background-image:url(../../img/sponsors//2-wusawork.png);">WusaWork</a></li> +<li><a href="https://laterpay.net/" rel="nofollow" style="background-image:url(../../img/sponsors/2-laterpay.png);">LaterPay</a></li> +<li><a href="https://www.schubergphilis.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-schuberg_philis.png);">Schuberg Philis</a></li> +<li><a href="http://prorenata.se/" rel="nofollow" style="background-image:url(../../img/sponsors/2-prorenata.png);">ProReNata AB</a></li> +<li><a href="https://www.sgawebsites.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-sga.png);">SGA Websites</a></li> +<li><a href="http://www.sirono.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-sirono.png);">Sirono</a></li> +<li><a href="http://www.vinta.com.br/" rel="nofollow" style="background-image:url(../../img/sponsors/2-vinta.png);">Vinta Software Studio</a></li> +<li><a href="http://www.rapasso.nl/index.php/en" rel="nofollow" style="background-image:url(../../img/sponsors/2-rapasso.png);">Rapasso</a></li> +<li><a href="https://mirusresearch.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-mirus_research.png);">Mirus Research</a></li> +<li><a href="http://hipolabs.com" rel="nofollow" style="background-image:url(../../img/sponsors/2-hipo.png);">Hipo</a></li> +<li><a href="http://www.byte.nl" rel="nofollow" style="background-image:url(../../img/sponsors/2-byte.png);">Byte</a></li> +<li><a href="http://lightningkite.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-lightning_kite.png);">Lightning Kite</a></li> +<li><a href="https://opbeat.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-opbeat.png);">Opbeat</a></li> +<li><a href="https://koordinates.com" rel="nofollow" style="background-image:url(../../img/sponsors/2-koordinates.png);">Koordinates</a></li> +<li><a href="http://pulsecode.ca" rel="nofollow" style="background-image:url(../../img/sponsors/2-pulsecode.png);">Pulsecode Inc.</a></li> +<li><a href="http://singinghorsestudio.com" rel="nofollow" style="background-image:url(../../img/sponsors/2-singing-horse.png);">Singing Horse Studio Ltd.</a></li> +<li><a href="https://www.heroku.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-heroku.png);">Heroku</a></li> +<li><a href="https://www.galileo-press.de/" rel="nofollow" style="background-image:url(../../img/sponsors/2-galileo_press.png);">Galileo Press</a></li> +<li><a href="http://www.securitycompass.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-security_compass.png);">Security Compass</a></li> +<li><a href="https://www.djangoproject.com/foundation/" rel="nofollow" style="background-image:url(../../img/sponsors/2-django.png);">Django Software Foundation</a></li> +<li><a href="http://www.hipflaskapp.com" rel="nofollow" style="background-image:url(../../img/sponsors/2-hipflask.png);">Hipflask</a></li> +<li><a href="http://www.crate.io/" rel="nofollow" style="background-image:url(../../img/sponsors/2-crate.png);">Crate</a></li> +<li><a href="http://crypticocorp.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-cryptico.png);">Cryptico Corp</a></li> +<li><a href="http://www.nexthub.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-nexthub.png);">NextHub</a></li> +<li><a href="https://www.compile.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-compile.png);">Compile</a></li> +<li><a href="http://wusawork.org" rel="nofollow" style="background-image:url(../../img/sponsors/2-wusawork.png);">WusaWork</a></li> <li><a href="http://envisionlinux.org/blog" rel="nofollow">Envision Linux</a></li> </ul> @@ -105,41 +105,41 @@ Our gold sponsors include companies large and small. Many thanks for their signi The serious financial contribution that our silver sponsors have made is very much appreciated. I'd like to say a particular thank you to individuals who have choosen to privately support the project at this level. <ul class="sponsor silver"> -<li><a href="http://www.imtapps.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-imt_computer_services.png);">IMT Computer Services</a></li> -<li><a href="http://wildfish.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-wildfish.png);">Wildfish</a></li> -<li><a href="http://www.thermondo.de/" rel="nofollow" style="background-image:url(../../img/sponsors//3-thermondo-gmbh.png);">Thermondo GmbH</a></li> -<li><a href="http://providenz.fr/" rel="nofollow" style="background-image:url(../../img/sponsors//3-providenz.png);">Providenz</a></li> -<li><a href="https://www.alwaysdata.com" rel="nofollow" style="background-image:url(../../img/sponsors//3-alwaysdata.png);">alwaysdata.com</a></li> -<li><a href="http://www.triggeredmessaging.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-triggered_messaging.png);">Triggered Messaging</a></li> -<li><a href="https://www.ipushpull.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-ipushpull.png);">PushPull Technology Ltd</a></li> -<li><a href="http://www.transcode.de/" rel="nofollow" style="background-image:url(../../img/sponsors//3-transcode.png);">Transcode</a></li> -<li><a href="https://garfo.io/" rel="nofollow" style="background-image:url(../../img/sponsors//3-garfo.png);">Garfo</a></li> -<li><a href="https://goshippo.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-shippo.png);">Shippo</a></li> -<li><a href="http://www.gizmag.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-gizmag.png);">Gizmag</a></li> -<li><a href="http://www.tivix.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-tivix.png);">Tivix</a></li> -<li><a href="http://www.safaribooksonline.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-safari.png);">Safari</a></li> -<li><a href="http://brightloop.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-brightloop.png);">Bright Loop</a></li> -<li><a href="http://www.aba-systems.com.au/" rel="nofollow" style="background-image:url(../../img/sponsors//3-aba.png);">ABA Systems</a></li> -<li><a href="http://beefarm.ru/" rel="nofollow" style="background-image:url(../../img/sponsors//3-beefarm.png);">beefarm.ru</a></li> -<li><a href="http://www.vzzual.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-vzzual.png);">Vzzual.com</a></li> -<li><a href="http://infinite-code.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-infinite_code.png);">Infinite Code</a></li> -<li><a href="http://crosswordtracker.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-crosswordtracker.png);">Crossword Tracker</a></li> -<li><a href="https://www.pkgfarm.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-pkgfarm.png);">PkgFarm</a></li> -<li><a href="http://life.tl/" rel="nofollow" style="background-image:url(../../img/sponsors//3-life_the_game.png);">Life. The Game.</a></li> -<li><a href="http://blimp.io/" rel="nofollow" style="background-image:url(../../img/sponsors//3-blimp.png);">Blimp</a></li> -<li><a href="http://pathwright.com" rel="nofollow" style="background-image:url(../../img/sponsors//3-pathwright.png);">Pathwright</a></li> -<li><a href="http://fluxility.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-fluxility.png);">Fluxility</a></li> -<li><a href="http://teonite.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-teonite.png);">Teonite</a></li> -<li><a href="http://trackmaven.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-trackmaven.png);">TrackMaven</a></li> -<li><a href="http://www.phurba.net/" rel="nofollow" style="background-image:url(../../img/sponsors//3-phurba.png);">Phurba</a></li> -<li><a href="http://www.nephila.co.uk/" rel="nofollow" style="background-image:url(../../img/sponsors//3-nephila.png);">Nephila</a></li> -<li><a href="http://www.aditium.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-aditium.png);">Aditium</a></li> -<li><a href="http://www.eyesopen.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-openeye.png);">OpenEye Scientific Software</a></li> -<li><a href="https://holvi.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-holvi.png);">Holvi</a></li> -<li><a href="http://cantemo.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-cantemo.gif);">Cantemo</a></li> -<li><a href="https://www.makespace.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-makespace.png);">MakeSpace</a></li> -<li><a href="https://www.ax-semantics.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-ax_semantics.png);">AX Semantics</a></li> -<li><a href="http://istrategylabs.com/" rel="nofollow" style="background-image:url(../../img/sponsors//3-isl.png);">ISL</a></li> +<li><a href="http://www.imtapps.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-imt_computer_services.png);">IMT Computer Services</a></li> +<li><a href="http://wildfish.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-wildfish.png);">Wildfish</a></li> +<li><a href="http://www.thermondo.de/" rel="nofollow" style="background-image:url(../../img/sponsors/3-thermondo-gmbh.png);">Thermondo GmbH</a></li> +<li><a href="http://providenz.fr/" rel="nofollow" style="background-image:url(../../img/sponsors/3-providenz.png);">Providenz</a></li> +<li><a href="https://www.alwaysdata.com" rel="nofollow" style="background-image:url(../../img/sponsors/3-alwaysdata.png);">alwaysdata.com</a></li> +<li><a href="http://www.triggeredmessaging.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-triggered_messaging.png);">Triggered Messaging</a></li> +<li><a href="https://www.ipushpull.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-ipushpull.png);">PushPull Technology Ltd</a></li> +<li><a href="http://www.transcode.de/" rel="nofollow" style="background-image:url(../../img/sponsors/3-transcode.png);">Transcode</a></li> +<li><a href="https://garfo.io/" rel="nofollow" style="background-image:url(../../img/sponsors/3-garfo.png);">Garfo</a></li> +<li><a href="https://goshippo.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-shippo.png);">Shippo</a></li> +<li><a href="http://www.gizmag.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-gizmag.png);">Gizmag</a></li> +<li><a href="http://www.tivix.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-tivix.png);">Tivix</a></li> +<li><a href="http://www.safaribooksonline.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-safari.png);">Safari</a></li> +<li><a href="http://brightloop.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-brightloop.png);">Bright Loop</a></li> +<li><a href="http://www.aba-systems.com.au/" rel="nofollow" style="background-image:url(../../img/sponsors/3-aba.png);">ABA Systems</a></li> +<li><a href="http://beefarm.ru/" rel="nofollow" style="background-image:url(../../img/sponsors/3-beefarm.png);">beefarm.ru</a></li> +<li><a href="http://www.vzzual.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-vzzual.png);">Vzzual.com</a></li> +<li><a href="http://infinite-code.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-infinite_code.png);">Infinite Code</a></li> +<li><a href="http://crosswordtracker.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-crosswordtracker.png);">Crossword Tracker</a></li> +<li><a href="https://www.pkgfarm.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-pkgfarm.png);">PkgFarm</a></li> +<li><a href="http://life.tl/" rel="nofollow" style="background-image:url(../../img/sponsors/3-life_the_game.png);">Life. The Game.</a></li> +<li><a href="http://blimp.io/" rel="nofollow" style="background-image:url(../../img/sponsors/3-blimp.png);">Blimp</a></li> +<li><a href="http://pathwright.com" rel="nofollow" style="background-image:url(../../img/sponsors/3-pathwright.png);">Pathwright</a></li> +<li><a href="http://fluxility.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-fluxility.png);">Fluxility</a></li> +<li><a href="http://teonite.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-teonite.png);">Teonite</a></li> +<li><a href="http://trackmaven.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-trackmaven.png);">TrackMaven</a></li> +<li><a href="http://www.phurba.net/" rel="nofollow" style="background-image:url(../../img/sponsors/3-phurba.png);">Phurba</a></li> +<li><a href="http://www.nephila.co.uk/" rel="nofollow" style="background-image:url(../../img/sponsors/3-nephila.png);">Nephila</a></li> +<li><a href="http://www.aditium.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-aditium.png);">Aditium</a></li> +<li><a href="http://www.eyesopen.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-openeye.png);">OpenEye Scientific Software</a></li> +<li><a href="https://holvi.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-holvi.png);">Holvi</a></li> +<li><a href="http://cantemo.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-cantemo.gif);">Cantemo</a></li> +<li><a href="https://www.makespace.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-makespace.png);">MakeSpace</a></li> +<li><a href="https://www.ax-semantics.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-ax_semantics.png);">AX Semantics</a></li> +<li><a href="http://istrategylabs.com/" rel="nofollow" style="background-image:url(../../img/sponsors/3-isl.png);">ISL</a></li> </ul> <div style="clear: both; padding-bottom: 40px;"></div> From ca7b1f6d5189398be8a0d24b1e01577281b1b187 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 10 Dec 2014 21:09:45 +0000 Subject: [PATCH 1284/1652] Optimizations play nicely with select_related, prefetch_related --- rest_framework/relations.py | 12 +----------- tests/test_relations_hyperlink.py | 6 ++++++ tests/test_relations_pk.py | 12 ++++++++++++ tests/test_relations_slug.py | 15 ++++++++++++++- 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index ae4086ecf..6b693e4b2 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -101,17 +101,7 @@ class RelatedField(Field): def get_iterable(self, instance, source_attrs): relationship = get_attribute(instance, source_attrs) - relationship = relationship.all() if (hasattr(relationship, 'all')) else relationship - - if self.use_pk_only_optimization(): - # Optimized case, return mock objects only containing the pk attribute. - return [ - PKOnlyObject(pk=pk) - for pk in relationship.values_list('pk', flat=True) - ] - - # Standard case, return the object instances. - return relationship + return relationship.all() if (hasattr(relationship, 'all')) else relationship @property def choices(self): diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py index e741e99be..f1b882edf 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -92,6 +92,12 @@ class HyperlinkedManyToManyTests(TestCase): with self.assertNumQueries(4): self.assertEqual(serializer.data, expected) + def test_many_to_many_retrieve_prefetch_related(self): + queryset = ManyToManySource.objects.all().prefetch_related('targets') + serializer = ManyToManySourceSerializer(queryset, many=True, context={'request': request}) + with self.assertNumQueries(2): + serializer.data + def test_reverse_many_to_many_retrieve(self): queryset = ManyToManyTarget.objects.all() serializer = ManyToManyTargetSerializer(queryset, many=True, context={'request': request}) diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index e95a877e1..f872a8dc5 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -71,6 +71,12 @@ class PKManyToManyTests(TestCase): with self.assertNumQueries(4): self.assertEqual(serializer.data, expected) + def test_many_to_many_retrieve_prefetch_related(self): + queryset = ManyToManySource.objects.all().prefetch_related('targets') + serializer = ManyToManySourceSerializer(queryset, many=True) + with self.assertNumQueries(2): + serializer.data + def test_reverse_many_to_many_retrieve(self): queryset = ManyToManyTarget.objects.all() serializer = ManyToManyTargetSerializer(queryset, many=True) @@ -188,6 +194,12 @@ class PKForeignKeyTests(TestCase): with self.assertNumQueries(3): self.assertEqual(serializer.data, expected) + def test_reverse_foreign_key_retrieve_prefetch_related(self): + queryset = ForeignKeyTarget.objects.all().prefetch_related('sources') + serializer = ForeignKeyTargetSerializer(queryset, many=True) + with self.assertNumQueries(2): + serializer.data + def test_foreign_key_update(self): data = {'id': 1, 'name': 'source-1', 'target': 2} instance = ForeignKeySource.objects.get(pk=1) diff --git a/tests/test_relations_slug.py b/tests/test_relations_slug.py index 7bac90460..cd2cb1ed6 100644 --- a/tests/test_relations_slug.py +++ b/tests/test_relations_slug.py @@ -54,7 +54,14 @@ class SlugForeignKeyTests(TestCase): {'id': 2, 'name': 'source-2', 'target': 'target-1'}, {'id': 3, 'name': 'source-3', 'target': 'target-1'} ] - self.assertEqual(serializer.data, expected) + with self.assertNumQueries(4): + self.assertEqual(serializer.data, expected) + + def test_foreign_key_retrieve_select_related(self): + queryset = ForeignKeySource.objects.all().select_related('target') + serializer = ForeignKeySourceSerializer(queryset, many=True) + with self.assertNumQueries(1): + serializer.data def test_reverse_foreign_key_retrieve(self): queryset = ForeignKeyTarget.objects.all() @@ -65,6 +72,12 @@ class SlugForeignKeyTests(TestCase): ] self.assertEqual(serializer.data, expected) + def test_reverse_foreign_key_retrieve_prefetch_related(self): + queryset = ForeignKeyTarget.objects.all().prefetch_related('sources') + serializer = ForeignKeyTargetSerializer(queryset, many=True) + with self.assertNumQueries(2): + serializer.data + def test_foreign_key_update(self): data = {'id': 1, 'name': 'source-1', 'target': 'target-2'} instance = ForeignKeySource.objects.get(pk=1) From 9d3810f313123ce48dea48f3c3f0f2cae5816bde Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 10 Dec 2014 22:09:24 +0000 Subject: [PATCH 1285/1652] Drop get_iterable() --- rest_framework/relations.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 6b693e4b2..a5f975967 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -88,7 +88,7 @@ class RelatedField(Field): return False def get_attribute(self, instance): - if self.use_pk_only_optimization(): + if self.use_pk_only_optimization() and self.source_attrs: try: # Optimized case, return a mock object only containing the pk attribute. instance = get_attribute(instance, self.source_attrs[:-1]) @@ -99,10 +99,6 @@ class RelatedField(Field): # Standard case, return the object instance. return get_attribute(instance, self.source_attrs) - def get_iterable(self, instance, source_attrs): - relationship = get_attribute(instance, source_attrs) - return relationship.all() if (hasattr(relationship, 'all')) else relationship - @property def choices(self): return dict([ @@ -349,7 +345,8 @@ class ManyRelatedField(Field): ] def get_attribute(self, instance): - return self.child_relation.get_iterable(instance, self.source_attrs) + relationship = get_attribute(instance, self.source_attrs) + return relationship.all() if (hasattr(relationship, 'all')) else relationship def to_representation(self, iterable): return [ From 1e336ef30da9f7366fc68185016c4011c25e1199 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 10 Dec 2014 22:10:45 +0000 Subject: [PATCH 1286/1652] Move comment --- rest_framework/relations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index a5f975967..892ce6c19 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -89,8 +89,8 @@ class RelatedField(Field): def get_attribute(self, instance): if self.use_pk_only_optimization() and self.source_attrs: + # Optimized case, return a mock object only containing the pk attribute. try: - # Optimized case, return a mock object only containing the pk attribute. instance = get_attribute(instance, self.source_attrs[:-1]) return PKOnlyObject(pk=instance.serializable_value(self.source_attrs[-1])) except AttributeError: From 0188ca730674e41717ba914d38c8bf9582abdb0c Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Thu, 11 Dec 2014 00:02:13 +0100 Subject: [PATCH 1287/1652] Release notes for 3.0.1 --- docs/topics/release-notes.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 550fdf752..0a8f713a9 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,32 @@ You can determine your currently installed version using `pip freeze`: ## 3.0.x series +### 3.0.1 + +**Date**: [December 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22) + +* Documentation improvements +* More helpful error message when the default `.create` fails (#2013) +* Raise error when attempting to save serializer if data is not valid. (#2098) +* Fix `FileUploadParser` breaks with empty file names and multiple upload handlers (#2109) +* Imporve BindingDict to support standard dict-functions (#2135, #2163) +* Add `validate` to `ListSerializer` (#2168, #2225, #2232) +* Fix JSONP renderer failing to escape some characters (#2169, #2195) +* Add missing default style for FileField (#2172) +* Actions are required when calling viewset.as_view() (#2175) +* Add allow_blank to ChoiceField (#2184, #2239) +* Cosmetic fixes in the HTML renderer (#2187) +* Raise error if `fields` on serializer is not a list of strings. (#2193, #2213) +* Improve checks for nested creates and updates. (#2194, #2196) +* `validated_attrs` argument renamed to `validated_data` in Serializer's `create`/`update` (#2197) +* Remove deprecated code to reflect the droped Django versions (#2200) +* Better serializer errors for nested writes. (#2202, #2215) +* Fix Pagination and custom permissions incompatibility (#2205) +* Raise error if `fields` on serializer is not a list of strings. (#2213) +* Add missing translation markers for relational fields. (#2231) +* Improve field lookup behavior for dicts/mappings. (#2244, #2243) +* Optimized hyperlinked PK (#2242) + ### 3.0.0 **Date**: 1st December 2014 From 4aaab08e13de8c34c7b084c3c35724c18eb3e4ba Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Thu, 11 Dec 2014 00:09:11 +0100 Subject: [PATCH 1288/1652] Version 3.0.1 --- rest_framework/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 261c9c984..f30f781a6 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.0.0' +__version__ = '3.0.1' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2014 Tom Christie' From 9b88b5db694b4cc68b87c87d967f912a47fa5817 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 11 Dec 2014 09:54:55 +0000 Subject: [PATCH 1289/1652] Field->ReadOnlyField in tutorial docs --- docs/tutorial/5-relationships-and-hyperlinked-apis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 57e3b6c59..c21efd7f6 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -75,7 +75,7 @@ The `HyperlinkedModelSerializer` has the following differences from `ModelSerial We can easily re-write our existing serializers to use hyperlinking. In your `snippets/serializers.py` add: class SnippetSerializer(serializers.HyperlinkedModelSerializer): - owner = serializers.Field(source='owner.username') + owner = serializers.ReadOnlyField(source='owner.username') highlight = serializers.HyperlinkedIdentityField(view_name='snippet-highlight', format='html') class Meta: From ab801bb01fbae56c5f71882e5620a65619c92f7d Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Thu, 11 Dec 2014 14:53:48 +0100 Subject: [PATCH 1290/1652] Release note corrections --- docs/topics/release-notes.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 0a8f713a9..a5162e81e 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,25 +42,24 @@ You can determine your currently installed version using `pip freeze`: ### 3.0.1 -**Date**: [December 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22) +**Date**: [December 2014][3.0.1-milestone] -* Documentation improvements -* More helpful error message when the default `.create` fails (#2013) +* More helpful error message when the default Serializer `create()` fails (#2013) * Raise error when attempting to save serializer if data is not valid. (#2098) * Fix `FileUploadParser` breaks with empty file names and multiple upload handlers (#2109) -* Imporve BindingDict to support standard dict-functions (#2135, #2163) -* Add `validate` to `ListSerializer` (#2168, #2225, #2232) +* Improve BindingDict` to support standard dict-functions (#2135, #2163) +* Add `validate()` to `ListSerializer` (#2168, #2225, #2232) * Fix JSONP renderer failing to escape some characters (#2169, #2195) -* Add missing default style for FileField (#2172) -* Actions are required when calling viewset.as_view() (#2175) -* Add allow_blank to ChoiceField (#2184, #2239) +* Add missing default style for `FileField` (#2172) +* Actions are required when calling `ViewSet.as_view()` (#2175) +* Add `allow_blank` to `ChoiceField (#2184, #2239) * Cosmetic fixes in the HTML renderer (#2187) * Raise error if `fields` on serializer is not a list of strings. (#2193, #2213) * Improve checks for nested creates and updates. (#2194, #2196) -* `validated_attrs` argument renamed to `validated_data` in Serializer's `create`/`update` (#2197) +* `validated_attrs` argument renamed to `validated_data` in `Serializer` `create()`/`update()` (#2197) * Remove deprecated code to reflect the droped Django versions (#2200) * Better serializer errors for nested writes. (#2202, #2215) -* Fix Pagination and custom permissions incompatibility (#2205) +* Fix pagination and custom permissions incompatibility (#2205) * Raise error if `fields` on serializer is not a list of strings. (#2213) * Add missing translation markers for relational fields. (#2231) * Improve field lookup behavior for dicts/mappings. (#2244, #2243) @@ -666,3 +665,4 @@ For older release notes, [please see the GitHub repo](old-release-notes). [ticket-582]: https://github.com/tomchristie/django-rest-framework/issues/582 [rfc-6266]: http://tools.ietf.org/html/rfc6266#section-4.3 [old-release-notes]: https://github.com/tomchristie/django-rest-framework/blob/2.4.4/docs/topics/release-notes.md#04x-series +[3.0.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22 From 9a7b0755eb3332d73874246e38b12738ffa3f568 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Thu, 11 Dec 2014 15:06:10 +0100 Subject: [PATCH 1291/1652] Add links to the issue id. --- docs/topics/release-notes.md | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index a5162e81e..988bfe55f 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -44,26 +44,26 @@ You can determine your currently installed version using `pip freeze`: **Date**: [December 2014][3.0.1-milestone] -* More helpful error message when the default Serializer `create()` fails (#2013) -* Raise error when attempting to save serializer if data is not valid. (#2098) -* Fix `FileUploadParser` breaks with empty file names and multiple upload handlers (#2109) -* Improve BindingDict` to support standard dict-functions (#2135, #2163) -* Add `validate()` to `ListSerializer` (#2168, #2225, #2232) -* Fix JSONP renderer failing to escape some characters (#2169, #2195) -* Add missing default style for `FileField` (#2172) -* Actions are required when calling `ViewSet.as_view()` (#2175) -* Add `allow_blank` to `ChoiceField (#2184, #2239) -* Cosmetic fixes in the HTML renderer (#2187) -* Raise error if `fields` on serializer is not a list of strings. (#2193, #2213) -* Improve checks for nested creates and updates. (#2194, #2196) -* `validated_attrs` argument renamed to `validated_data` in `Serializer` `create()`/`update()` (#2197) -* Remove deprecated code to reflect the droped Django versions (#2200) -* Better serializer errors for nested writes. (#2202, #2215) -* Fix pagination and custom permissions incompatibility (#2205) -* Raise error if `fields` on serializer is not a list of strings. (#2213) -* Add missing translation markers for relational fields. (#2231) -* Improve field lookup behavior for dicts/mappings. (#2244, #2243) -* Optimized hyperlinked PK (#2242) +* More helpful error message when the default Serializer `create()` fails ([#2013](https://github.com/tomchristie/django-rest-framework/issues/2013)) +* Raise error when attempting to save serializer if data is not valid. ([#2098](https://github.com/tomchristie/django-rest-framework/issues/2098)) +* Fix `FileUploadParser` breaks with empty file names and multiple upload handlers ([#2109](https://github.com/tomchristie/django-rest-framework/issues/2109)) +* Improve BindingDict` to support standard dict-functions ([#2135](https://github.com/tomchristie/django-rest-framework/issues/2135), [#2163](https://github.com/tomchristie/django-rest-framework/issues/2163)) +* Add `validate()` to `ListSerializer` ([#2168](https://github.com/tomchristie/django-rest-framework/issues/2168), [#2225](https://github.com/tomchristie/django-rest-framework/issues/2225), [#2232](https://github.com/tomchristie/django-rest-framework/issues/2232)) +* Fix JSONP renderer failing to escape some characters ([#2169](https://github.com/tomchristie/django-rest-framework/issues/2169), [#2195](https://github.com/tomchristie/django-rest-framework/issues/2195)) +* Add missing default style for `FileField` ([#2172](https://github.com/tomchristie/django-rest-framework/issues/2172)) +* Actions are required when calling `ViewSet.as_view()` ([#2175](https://github.com/tomchristie/django-rest-framework/issues/2175)) +* Add `allow_blank` to `ChoiceField ([#2184](https://github.com/tomchristie/django-rest-framework/issues/2184), [#2239](https://github.com/tomchristie/django-rest-framework/issues/2239)) +* Cosmetic fixes in the HTML renderer ([#2187](https://github.com/tomchristie/django-rest-framework/issues/2187)) +* Raise error if `fields` on serializer is not a list of strings. ([#2193](https://github.com/tomchristie/django-rest-framework/issues/2193), [#2213](https://github.com/tomchristie/django-rest-framework/issues/2213)) +* Improve checks for nested creates and updates. ([#2194](https://github.com/tomchristie/django-rest-framework/issues/2194), [#2196](https://github.com/tomchristie/django-rest-framework/issues/2196)) +* `validated_attrs` argument renamed to `validated_data` in `Serializer` `create()`/`update()` ([#2197](https://github.com/tomchristie/django-rest-framework/issues/2197)) +* Remove deprecated code to reflect the droped Django versions ([#2200](https://github.com/tomchristie/django-rest-framework/issues/2200)) +* Better serializer errors for nested writes. ([#2202](https://github.com/tomchristie/django-rest-framework/issues/2202), [#2215](https://github.com/tomchristie/django-rest-framework/issues/2215)) +* Fix pagination and custom permissions incompatibility ([#2205](https://github.com/tomchristie/django-rest-framework/issues/2205)) +* Raise error if `fields` on serializer is not a list of strings. ([#2213](https://github.com/tomchristie/django-rest-framework/issues/2213)) +* Add missing translation markers for relational fields. ([#2231](https://github.com/tomchristie/django-rest-framework/issues/2231)) +* Improve field lookup behavior for dicts/mappings. ([#2244](https://github.com/tomchristie/django-rest-framework/issues/2244), [#2243](https://github.com/tomchristie/django-rest-framework/issues/2243)) +* Optimized hyperlinked PK ([#2242](https://github.com/tomchristie/django-rest-framework/issues/2242)) ### 3.0.0 From 99423defd826b09d9bf37bf942c2682b90ea8b42 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Thu, 11 Dec 2014 15:11:37 +0100 Subject: [PATCH 1292/1652] Add full stop to the release note items. Add link to the issues Fix the milestone link --- docs/topics/release-notes.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 988bfe55f..dc7b7b03b 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,28 +42,28 @@ You can determine your currently installed version using `pip freeze`: ### 3.0.1 -**Date**: [December 2014][3.0.1-milestone] +**Date**: [December 2014][3.0.1][3.0.1-milestone]: -* More helpful error message when the default Serializer `create()` fails ([#2013](https://github.com/tomchristie/django-rest-framework/issues/2013)) +* More helpful error message when the default Serializer `create()` fails. ([#2013](https://github.com/tomchristie/django-rest-framework/issues/2013)) * Raise error when attempting to save serializer if data is not valid. ([#2098](https://github.com/tomchristie/django-rest-framework/issues/2098)) -* Fix `FileUploadParser` breaks with empty file names and multiple upload handlers ([#2109](https://github.com/tomchristie/django-rest-framework/issues/2109)) -* Improve BindingDict` to support standard dict-functions ([#2135](https://github.com/tomchristie/django-rest-framework/issues/2135), [#2163](https://github.com/tomchristie/django-rest-framework/issues/2163)) -* Add `validate()` to `ListSerializer` ([#2168](https://github.com/tomchristie/django-rest-framework/issues/2168), [#2225](https://github.com/tomchristie/django-rest-framework/issues/2225), [#2232](https://github.com/tomchristie/django-rest-framework/issues/2232)) -* Fix JSONP renderer failing to escape some characters ([#2169](https://github.com/tomchristie/django-rest-framework/issues/2169), [#2195](https://github.com/tomchristie/django-rest-framework/issues/2195)) -* Add missing default style for `FileField` ([#2172](https://github.com/tomchristie/django-rest-framework/issues/2172)) -* Actions are required when calling `ViewSet.as_view()` ([#2175](https://github.com/tomchristie/django-rest-framework/issues/2175)) -* Add `allow_blank` to `ChoiceField ([#2184](https://github.com/tomchristie/django-rest-framework/issues/2184), [#2239](https://github.com/tomchristie/django-rest-framework/issues/2239)) -* Cosmetic fixes in the HTML renderer ([#2187](https://github.com/tomchristie/django-rest-framework/issues/2187)) +* Fix `FileUploadParser` breaks with empty file names and multiple upload handlers. ([#2109](https://github.com/tomchristie/django-rest-framework/issues/2109)) +* Improve BindingDict` to support standard dict-functions. ([#2135](https://github.com/tomchristie/django-rest-framework/issues/2135), [#2163](https://github.com/tomchristie/django-rest-framework/issues/2163)) +* Add `validate()` to `ListSerializer`. ([#2168](https://github.com/tomchristie/django-rest-framework/issues/2168), [#2225](https://github.com/tomchristie/django-rest-framework/issues/2225), [#2232](https://github.com/tomchristie/django-rest-framework/issues/2232)) +* Fix JSONP renderer failing to escape some characters. ([#2169](https://github.com/tomchristie/django-rest-framework/issues/2169), [#2195](https://github.com/tomchristie/django-rest-framework/issues/2195)) +* Add missing default style for `FileField`. ([#2172](https://github.com/tomchristie/django-rest-framework/issues/2172)) +* Actions are required when calling `ViewSet.as_view()`. ([#2175](https://github.com/tomchristie/django-rest-framework/issues/2175)) +* Add `allow_blank` to `ChoiceField`. ([#2184](https://github.com/tomchristie/django-rest-framework/issues/2184), [#2239](https://github.com/tomchristie/django-rest-framework/issues/2239)) +* Cosmetic fixes in the HTML renderer. ([#2187](https://github.com/tomchristie/django-rest-framework/issues/2187)) * Raise error if `fields` on serializer is not a list of strings. ([#2193](https://github.com/tomchristie/django-rest-framework/issues/2193), [#2213](https://github.com/tomchristie/django-rest-framework/issues/2213)) * Improve checks for nested creates and updates. ([#2194](https://github.com/tomchristie/django-rest-framework/issues/2194), [#2196](https://github.com/tomchristie/django-rest-framework/issues/2196)) -* `validated_attrs` argument renamed to `validated_data` in `Serializer` `create()`/`update()` ([#2197](https://github.com/tomchristie/django-rest-framework/issues/2197)) -* Remove deprecated code to reflect the droped Django versions ([#2200](https://github.com/tomchristie/django-rest-framework/issues/2200)) +* `validated_attrs` argument renamed to `validated_data` in `Serializer` `create()`/`update()`. ([#2197](https://github.com/tomchristie/django-rest-framework/issues/2197)) +* Remove deprecated code to reflect the droped Django versions. ([#2200](https://github.com/tomchristie/django-rest-framework/issues/2200)) * Better serializer errors for nested writes. ([#2202](https://github.com/tomchristie/django-rest-framework/issues/2202), [#2215](https://github.com/tomchristie/django-rest-framework/issues/2215)) -* Fix pagination and custom permissions incompatibility ([#2205](https://github.com/tomchristie/django-rest-framework/issues/2205)) +* Fix pagination and custom permissions incompatibility. ([#2205](https://github.com/tomchristie/django-rest-framework/issues/2205)) * Raise error if `fields` on serializer is not a list of strings. ([#2213](https://github.com/tomchristie/django-rest-framework/issues/2213)) * Add missing translation markers for relational fields. ([#2231](https://github.com/tomchristie/django-rest-framework/issues/2231)) * Improve field lookup behavior for dicts/mappings. ([#2244](https://github.com/tomchristie/django-rest-framework/issues/2244), [#2243](https://github.com/tomchristie/django-rest-framework/issues/2243)) -* Optimized hyperlinked PK ([#2242](https://github.com/tomchristie/django-rest-framework/issues/2242)) +* Optimized hyperlinked PK. ([#2242](https://github.com/tomchristie/django-rest-framework/issues/2242)) ### 3.0.0 From 75acdc93bc837b6f7a724c0cec081e8faf36cbfa Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Thu, 11 Dec 2014 15:13:15 +0100 Subject: [PATCH 1293/1652] Fix the milestone link again. --- docs/topics/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index dc7b7b03b..8faa19a8a 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,7 +42,7 @@ You can determine your currently installed version using `pip freeze`: ### 3.0.1 -**Date**: [December 2014][3.0.1][3.0.1-milestone]: +**Date**: [December 2014][3.0.1-milestone]. * More helpful error message when the default Serializer `create()` fails. ([#2013](https://github.com/tomchristie/django-rest-framework/issues/2013)) * Raise error when attempting to save serializer if data is not valid. ([#2098](https://github.com/tomchristie/django-rest-framework/issues/2098)) From 3a69182cc93956787ad6864258372cff68404a48 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Thu, 11 Dec 2014 15:32:52 +0100 Subject: [PATCH 1294/1652] Better link representation for the issues. --- docs/topics/release-notes.md | 71 ++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 20 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 8faa19a8a..0b24546b0 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -44,26 +44,26 @@ You can determine your currently installed version using `pip freeze`: **Date**: [December 2014][3.0.1-milestone]. -* More helpful error message when the default Serializer `create()` fails. ([#2013](https://github.com/tomchristie/django-rest-framework/issues/2013)) -* Raise error when attempting to save serializer if data is not valid. ([#2098](https://github.com/tomchristie/django-rest-framework/issues/2098)) -* Fix `FileUploadParser` breaks with empty file names and multiple upload handlers. ([#2109](https://github.com/tomchristie/django-rest-framework/issues/2109)) -* Improve BindingDict` to support standard dict-functions. ([#2135](https://github.com/tomchristie/django-rest-framework/issues/2135), [#2163](https://github.com/tomchristie/django-rest-framework/issues/2163)) -* Add `validate()` to `ListSerializer`. ([#2168](https://github.com/tomchristie/django-rest-framework/issues/2168), [#2225](https://github.com/tomchristie/django-rest-framework/issues/2225), [#2232](https://github.com/tomchristie/django-rest-framework/issues/2232)) -* Fix JSONP renderer failing to escape some characters. ([#2169](https://github.com/tomchristie/django-rest-framework/issues/2169), [#2195](https://github.com/tomchristie/django-rest-framework/issues/2195)) -* Add missing default style for `FileField`. ([#2172](https://github.com/tomchristie/django-rest-framework/issues/2172)) -* Actions are required when calling `ViewSet.as_view()`. ([#2175](https://github.com/tomchristie/django-rest-framework/issues/2175)) -* Add `allow_blank` to `ChoiceField`. ([#2184](https://github.com/tomchristie/django-rest-framework/issues/2184), [#2239](https://github.com/tomchristie/django-rest-framework/issues/2239)) -* Cosmetic fixes in the HTML renderer. ([#2187](https://github.com/tomchristie/django-rest-framework/issues/2187)) -* Raise error if `fields` on serializer is not a list of strings. ([#2193](https://github.com/tomchristie/django-rest-framework/issues/2193), [#2213](https://github.com/tomchristie/django-rest-framework/issues/2213)) -* Improve checks for nested creates and updates. ([#2194](https://github.com/tomchristie/django-rest-framework/issues/2194), [#2196](https://github.com/tomchristie/django-rest-framework/issues/2196)) -* `validated_attrs` argument renamed to `validated_data` in `Serializer` `create()`/`update()`. ([#2197](https://github.com/tomchristie/django-rest-framework/issues/2197)) -* Remove deprecated code to reflect the droped Django versions. ([#2200](https://github.com/tomchristie/django-rest-framework/issues/2200)) -* Better serializer errors for nested writes. ([#2202](https://github.com/tomchristie/django-rest-framework/issues/2202), [#2215](https://github.com/tomchristie/django-rest-framework/issues/2215)) -* Fix pagination and custom permissions incompatibility. ([#2205](https://github.com/tomchristie/django-rest-framework/issues/2205)) -* Raise error if `fields` on serializer is not a list of strings. ([#2213](https://github.com/tomchristie/django-rest-framework/issues/2213)) -* Add missing translation markers for relational fields. ([#2231](https://github.com/tomchristie/django-rest-framework/issues/2231)) -* Improve field lookup behavior for dicts/mappings. ([#2244](https://github.com/tomchristie/django-rest-framework/issues/2244), [#2243](https://github.com/tomchristie/django-rest-framework/issues/2243)) -* Optimized hyperlinked PK. ([#2242](https://github.com/tomchristie/django-rest-framework/issues/2242)) +* More helpful error message when the default Serializer `create()` fails. ([#2013][gh2013]) +* Raise error when attempting to save serializer if data is not valid. ([#2098][gh2098]) +* Fix `FileUploadParser` breaks with empty file names and multiple upload handlers. ([#2109][gh2109]) +* Improve BindingDict` to support standard dict-functions. ([#2135][gh2135], [#2163][gh2163]) +* Add `validate()` to `ListSerializer`. ([#2168][gh2168], [#2225][gh2225], [#2232][gh2232]) +* Fix JSONP renderer failing to escape some characters. ([#2169][gh2169], [#2195][gh2195]) +* Add missing default style for `FileField`. ([#2172][gh2172]) +* Actions are required when calling `ViewSet.as_view()`. ([#2175][gh2175]) +* Add `allow_blank` to `ChoiceField`. ([#2184][gh2184], [#2239][gh2239]) +* Cosmetic fixes in the HTML renderer. ([#2187][gh2187]) +* Raise error if `fields` on serializer is not a list of strings. ([#2193][gh2193], [#2213][gh2213]) +* Improve checks for nested creates and updates. ([#2194][gh2194], [#2196][gh2196]) +* `validated_attrs` argument renamed to `validated_data` in `Serializer` `create()`/`update()`. ([#2197][gh2197]) +* Remove deprecated code to reflect the dropped Django versions. ([#2200][gh2200]) +* Better serializer errors for nested writes. ([#2202][gh2202], [#2215][gh2215]) +* Fix pagination and custom permissions incompatibility. ([#2205][gh2205]) +* Raise error if `fields` on serializer is not a list of strings. ([#2213][gh2213]) +* Add missing translation markers for relational fields. ([#2231][gh2231]) +* Improve field lookup behavior for dicts/mappings. ([#2244][gh2244], [#2243][gh2243]) +* Optimized hyperlinked PK. ([#2242][gh2242]) ### 3.0.0 @@ -666,3 +666,34 @@ For older release notes, [please see the GitHub repo](old-release-notes). [rfc-6266]: http://tools.ietf.org/html/rfc6266#section-4.3 [old-release-notes]: https://github.com/tomchristie/django-rest-framework/blob/2.4.4/docs/topics/release-notes.md#04x-series [3.0.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22 + + +[gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 +[gh2098]: https://github.com/tomchristie/django-rest-framework/issues/2098 +[gh2109]: https://github.com/tomchristie/django-rest-framework/issues/2109 +[gh2135]: https://github.com/tomchristie/django-rest-framework/issues/2135 +[gh2163]: https://github.com/tomchristie/django-rest-framework/issues/2163 +[gh2168]: https://github.com/tomchristie/django-rest-framework/issues/2168 +[gh2169]: https://github.com/tomchristie/django-rest-framework/issues/2169 +[gh2172]: https://github.com/tomchristie/django-rest-framework/issues/2172 +[gh2175]: https://github.com/tomchristie/django-rest-framework/issues/2175 +[gh2184]: https://github.com/tomchristie/django-rest-framework/issues/2184 +[gh2187]: https://github.com/tomchristie/django-rest-framework/issues/2187 +[gh2193]: https://github.com/tomchristie/django-rest-framework/issues/2193 +[gh2194]: https://github.com/tomchristie/django-rest-framework/issues/2194 +[gh2195]: https://github.com/tomchristie/django-rest-framework/issues/2195 +[gh2196]: https://github.com/tomchristie/django-rest-framework/issues/2196 +[gh2197]: https://github.com/tomchristie/django-rest-framework/issues/2197 +[gh2200]: https://github.com/tomchristie/django-rest-framework/issues/2200 +[gh2202]: https://github.com/tomchristie/django-rest-framework/issues/2202 +[gh2205]: https://github.com/tomchristie/django-rest-framework/issues/2205 +[gh2213]: https://github.com/tomchristie/django-rest-framework/issues/2213 +[gh2213]: https://github.com/tomchristie/django-rest-framework/issues/2213 +[gh2215]: https://github.com/tomchristie/django-rest-framework/issues/2215 +[gh2225]: https://github.com/tomchristie/django-rest-framework/issues/2225 +[gh2231]: https://github.com/tomchristie/django-rest-framework/issues/2231 +[gh2232]: https://github.com/tomchristie/django-rest-framework/issues/2232 +[gh2239]: https://github.com/tomchristie/django-rest-framework/issues/2239 +[gh2242]: https://github.com/tomchristie/django-rest-framework/issues/2242 +[gh2243]: https://github.com/tomchristie/django-rest-framework/issues/2243 +[gh2244]: https://github.com/tomchristie/django-rest-framework/issues/2244 From 9c37174768c4295aaa9bd0c90bfed63942c24203 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Thu, 11 Dec 2014 15:58:02 +0100 Subject: [PATCH 1295/1652] Fix the ghost backtick. --- docs/topics/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 0b24546b0..f00d3c54e 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -47,7 +47,7 @@ You can determine your currently installed version using `pip freeze`: * More helpful error message when the default Serializer `create()` fails. ([#2013][gh2013]) * Raise error when attempting to save serializer if data is not valid. ([#2098][gh2098]) * Fix `FileUploadParser` breaks with empty file names and multiple upload handlers. ([#2109][gh2109]) -* Improve BindingDict` to support standard dict-functions. ([#2135][gh2135], [#2163][gh2163]) +* Improve `BindingDict` to support standard dict-functions. ([#2135][gh2135], [#2163][gh2163]) * Add `validate()` to `ListSerializer`. ([#2168][gh2168], [#2225][gh2225], [#2232][gh2232]) * Fix JSONP renderer failing to escape some characters. ([#2169][gh2169], [#2195][gh2195]) * Add missing default style for `FileField`. ([#2172][gh2172]) From dbd057b9a9b9be846220bb2f0200eee122f91db9 Mon Sep 17 00:00:00 2001 From: Martin Maillard <self@martin-maillard.com> Date: Thu, 11 Dec 2014 20:20:46 +0100 Subject: [PATCH 1296/1652] Add test --- tests/test_request.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/test_request.py b/tests/test_request.py index 44afd2438..dd910c96e 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -224,7 +224,8 @@ class TestUserSetter(TestCase): def setUp(self): # Pass request object through session middleware so session is # available to login and logout functions - self.request = Request(factory.get('/')) + self.wrapped_request = factory.get('/') + self.request = Request(self.wrapped_request) SessionMiddleware().process_request(self.request) User.objects.create_user('ringo', 'starr@thebeatles.com', 'yellow') @@ -244,6 +245,10 @@ class TestUserSetter(TestCase): logout(self.request) self.assertTrue(self.request.user.is_anonymous()) + def test_logged_in_user_is_set_on_wrapped_request(self): + login(self.request, self.user) + self.assertEqual(self.wrapped_request.user, self.user) + class TestAuthSetter(TestCase): From fa1ef33bfc5d3790845771db2d00a2fa38bcbdb8 Mon Sep 17 00:00:00 2001 From: Peter Schmidt <peter@peterjs.com> Date: Fri, 12 Dec 2014 11:16:29 +1100 Subject: [PATCH 1297/1652] Update CharField default min_length message. --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 15e59861b..25122e141 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -509,7 +509,7 @@ class CharField(Field): default_error_messages = { 'blank': _('This field may not be blank.'), 'max_length': _('Ensure this field has no more than {max_length} characters.'), - 'min_length': _('Ensure this field has no more than {min_length} characters.') + 'min_length': _('Ensure this field has at least {min_length} characters.') } initial = '' coerce_blank_to_null = False From 78312d44d1e1a7f43daacd1614be2008eb77a0de Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Dec 2014 13:13:08 +0000 Subject: [PATCH 1298/1652] Client.logout() also clears any force_authenticate --- rest_framework/test.py | 5 +++++ tests/test_testing.py | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/rest_framework/test.py b/rest_framework/test.py index 74d2c868f..4f4b7c201 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -204,6 +204,11 @@ class APIClient(APIRequestFactory, DjangoClient): def logout(self): self._credentials = {} + + # Also clear any `force_authenticate` + self.handler._force_user = None + self.handler._force_token = None + return super(APIClient, self).logout() diff --git a/tests/test_testing.py b/tests/test_testing.py index 9fd5966eb..f5d2cbcd6 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -109,7 +109,7 @@ class TestAPITestClient(TestCase): def test_can_logout(self): """ - `logout()` reset stored credentials + `logout()` resets stored credentials """ self.client.credentials(HTTP_AUTHORIZATION='example') response = self.client.get('/view/') @@ -118,6 +118,18 @@ class TestAPITestClient(TestCase): response = self.client.get('/view/') self.assertEqual(response.data['auth'], b'') + def test_logout_resets_force_authenticate(self): + """ + `logout()` resets any `force_authenticate` + """ + user = User.objects.create_user('example', 'example@example.com', 'password') + self.client.force_authenticate(user) + response = self.client.get('/view/') + self.assertEqual(response.data['user'], 'example') + self.client.logout() + response = self.client.get('/view/') + self.assertEqual(response.data['user'], b'') + def test_follow_redirect(self): """ Follow redirect by setting follow argument. From e3b16c8bc631d5be599776c483ee0488cef9c288 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Dec 2014 13:16:18 +0000 Subject: [PATCH 1299/1652] Python 3 test fix --- tests/test_testing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_testing.py b/tests/test_testing.py index f5d2cbcd6..6fce84645 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -128,7 +128,7 @@ class TestAPITestClient(TestCase): self.assertEqual(response.data['user'], 'example') self.client.logout() response = self.client.get('/view/') - self.assertEqual(response.data['user'], b'') + self.assertEqual(response.data['user'], '') def test_follow_redirect(self): """ From 8825b258caa0c51d6dcdb3529dc433c75a76339d Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Dec 2014 13:22:24 +0000 Subject: [PATCH 1300/1652] Clean up import ordering --- tests/test_testing.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/test_testing.py b/tests/test_testing.py index 6fce84645..87d2b61fa 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -1,15 +1,13 @@ -# -- coding: utf-8 -- - +# encoding: utf-8 from __future__ import unicode_literals from django.conf.urls import patterns, url -from io import BytesIO - from django.contrib.auth.models import User from django.shortcuts import redirect from django.test import TestCase from rest_framework.decorators import api_view from rest_framework.response import Response from rest_framework.test import APIClient, APIRequestFactory, force_authenticate +from io import BytesIO @api_view(['GET', 'POST']) From 26131a7aea39bb517393b3b6774372d6aebd6885 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 12 Dec 2014 15:59:11 +0000 Subject: [PATCH 1301/1652] Fix dependancies --- requirements.txt | 5 ----- tox.ini | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index f282d3baf..474df7168 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,10 +9,5 @@ flake8==2.2.2 # Optional packages markdown>=2.1.0 -PyYAML>=3.10 -defusedxml>=0.3 django-guardian==1.2.4 django-filter>=0.5.4 -django-oauth-plus>=2.2.1 -oauth2>=1.5.211 -django-oauth2-provider>=0.2.4 diff --git a/tox.ini b/tox.ini index f129ff3ab..9fb8586c6 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,8 @@ envlist = py27-{flake8,docs}, {py26,py27}-django14, {py26,py27,py32,py33,py34}-django{15,16}, - {py27,py32,py33,py34}-django{17,master} + {py27,py32,py33,py34}-django17, + {py27,py32,py33,py34}-djangomaster [testenv] commands = ./runtests.py --fast @@ -15,10 +16,9 @@ deps = django16: Django==1.6.8 django17: Django==1.7.1 djangomaster: https://github.com/django/django/zipball/master - {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 + django-guardian==1.2.4 pytest-django==2.6.1 - django-filter==0.7 - defusedxml==0.3 + django-filter==0.9.1 markdown>=2.1.0 [testenv:py27-flake8] From 00da2414827987e9934ebe7bf2f9a3afea1cdb13 Mon Sep 17 00:00:00 2001 From: Jeff Fein-Worton <jeff@fein-worton.com> Date: Fri, 12 Dec 2014 22:14:22 -0800 Subject: [PATCH 1302/1652] documentation typo base-name -> base_name --- docs/api-guide/routers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 080230faf..929a1710c 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -41,7 +41,7 @@ The example above would generate the following URL patterns: **Note**: The `base_name` argument is used to specify the initial part of the view name pattern. In the example above, that's the `user` or `account` part. -Typically you won't *need* to specify the `base-name` argument, but if you have a viewset where you've defined a custom `get_queryset` method, then the viewset may not have a `.queryset` attribute set. If you try to register that viewset you'll see an error like this: +Typically you won't *need* to specify the `base_name` argument, but if you have a viewset where you've defined a custom `get_queryset` method, then the viewset may not have a `.queryset` attribute set. If you try to register that viewset you'll see an error like this: 'base_name' argument not specified, and could not automatically determine the name from the viewset, as it does not have a '.queryset' attribute. From c0b9115beca00fda36a50532fbe62e3b39b4e972 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sat, 13 Dec 2014 14:17:24 +0000 Subject: [PATCH 1303/1652] Improve check for nested writes --- rest_framework/serializers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 9226895e0..5adbca3bd 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -611,6 +611,7 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data): # profile = ProfileSerializer() assert not any( isinstance(field, BaseSerializer) and (key in validated_data) + and isinstance(validated_data[key], (list, dict)) for key, field in serializer.fields.items() ), ( 'The `.{method_name}()` method does not support writable nested' @@ -630,6 +631,7 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data): # address = serializer.CharField('profile.address') assert not any( '.' in field.source and (key in validated_data) + and isinstance(validated_data[key], (list, dict)) for key, field in serializer.fields.items() ), ( 'The `.{method_name}()` method does not support writable dotted-source ' From aa571abb2089aedb5902a8f1670e59b4df99f3e9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sat, 13 Dec 2014 14:58:04 +0000 Subject: [PATCH 1304/1652] Better errors when serializer has incorrectly named field. --- rest_framework/fields.py | 18 +++++++++++++++++- tests/test_serializer.py | 21 +++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 25122e141..205efd2f8 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -274,7 +274,23 @@ class Field(object): Given the *outgoing* object instance, return the primitive value that should be used for this field. """ - return get_attribute(instance, self.source_attrs) + try: + return get_attribute(instance, self.source_attrs) + except (KeyError, AttributeError) as exc: + msg = ( + 'Got {exc_type} when attempting to get a value for field ' + '`{field}` on serializer `{serializer}`.\nThe serializer ' + 'field might be named incorrectly and not match ' + 'any attribute or key on the `{instance}` instance.\n' + 'Original exception text was: {exc}.'.format( + exc_type=type(exc).__name__, + field=self.field_name, + serializer=self.parent.__class__.__name__, + instance=instance.__class__.__name__, + exc=exc + ) + ) + raise type(exc)(msg) def get_default(self): """ diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 6dabaf42e..9d47b0aaa 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from rest_framework import serializers import pytest @@ -175,3 +176,23 @@ class TestStarredSource: instance = {'a': 1, 'b': 2, 'c': 3, 'd': 4} serializer = self.Serializer(instance) assert serializer.data == self.data + + +class TestIncorrectlyConfigured: + def test_incorrect_field_name(self): + class ExampleSerializer(serializers.Serializer): + incorrect_name = serializers.IntegerField() + + class ExampleObject: + def __init__(self): + self.correct_name = 123 + + instance = ExampleObject() + serializer = ExampleSerializer(instance) + with pytest.raises(AttributeError) as exc_info: + serializer.data + assert str(exc_info.value) == ( + "Got AttributeError when attempting to get a value for field `incorrect_name` on serializer `ExampleSerializer`.\n" + "The serializer field might be named incorrectly and not match any attribute or key on the `ExampleObject` instance.\n" + "Original exception text was: ExampleObject instance has no attribute 'incorrect_name'." + ) From 4fb757146af8e805e30cfe4a8914c9fb7251b3fc Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sat, 13 Dec 2014 15:04:39 +0000 Subject: [PATCH 1305/1652] Fix test for python2/3 compat --- tests/test_serializer.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 9d47b0aaa..56b390956 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -191,8 +191,9 @@ class TestIncorrectlyConfigured: serializer = ExampleSerializer(instance) with pytest.raises(AttributeError) as exc_info: serializer.data - assert str(exc_info.value) == ( + msg = str(exc_info.value) + assert msg.startswith( "Got AttributeError when attempting to get a value for field `incorrect_name` on serializer `ExampleSerializer`.\n" "The serializer field might be named incorrectly and not match any attribute or key on the `ExampleObject` instance.\n" - "Original exception text was: ExampleObject instance has no attribute 'incorrect_name'." + "Original exception text was:" ) From 2d470eef809b119c8c72009c81d652ddbf895e0b Mon Sep 17 00:00:00 2001 From: Brian Jacobel <bjacobel@gmail.com> Date: Sat, 13 Dec 2014 14:47:11 -0500 Subject: [PATCH 1306/1652] Change serializers.Field to serializers.ReadOnlyField for 3.x compatibility Using this code snippet as-is on DRF 3.0.1 results in a NotImplementedError being raised for to_representation due to 3.0's changed behavior with serializers.Field. The code snippet should be updated to use serializers.ReadOnlyField instead. Further discussion here: https://groups.google.com/forum/?fromgroups=#!topic/django-rest-framework/aX8mLT_v3yc --- docs/api-guide/pagination.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 9b7086c54..834292920 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -128,7 +128,7 @@ For example, to nest a pair of links labelled 'prev' and 'next', and set the nam class CustomPaginationSerializer(pagination.BasePaginationSerializer): links = LinksSerializer(source='*') # Takes the page object as the source - total_results = serializers.Field(source='paginator.count') + total_results = serializers.ReadOnlyField(source='paginator.count') results_field = 'objects' From 0d109c90a74bc575efa6d497a6501aef2b837983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sat, 13 Dec 2014 18:18:00 -0400 Subject: [PATCH 1307/1652] Add context to exception handler #2236 Same context as renderers which include: the view, args, kwargs, and request. This provides enough contextual information to the exception handlers to handle errors better. In a use case like #1671, a custom handler would allow Sentry to log the request properly. --- rest_framework/views.py | 5 +++-- tests/test_views.py | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index bc870417f..07e713939 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -46,7 +46,7 @@ def get_view_description(view_cls, html=False): return description -def exception_handler(exc): +def exception_handler(exc, context=None): """ Returns the response that should be used for any given exception. @@ -369,7 +369,8 @@ class APIView(View): else: exc.status_code = status.HTTP_403_FORBIDDEN - response = self.settings.EXCEPTION_HANDLER(exc) + context = self.get_renderer_context() + response = self.settings.EXCEPTION_HANDLER(exc, context) if response is None: raise diff --git a/tests/test_views.py b/tests/test_views.py index 77b113ee5..e9b75f065 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -121,7 +121,12 @@ class TestCustomExceptionHandler(TestCase): def setUp(self): self.DEFAULT_HANDLER = api_settings.EXCEPTION_HANDLER - def exception_handler(exc): + def exception_handler(exc, context=None): + self.assertTrue('args' in context) + self.assertTrue('kwargs' in context) + self.assertTrue('request' in context) + self.assertTrue('view' in context) + return Response('Error!', status=status.HTTP_400_BAD_REQUEST) api_settings.EXCEPTION_HANDLER = exception_handler From e8c0766568cb20a5357c5e6823283f0c187b35b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sat, 13 Dec 2014 20:54:35 -0400 Subject: [PATCH 1308/1652] Support handlers with and without context --- rest_framework/views.py | 10 ++++++++-- tests/test_views.py | 27 +++++++++++++++++++++------ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index 07e713939..3ece66e68 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -2,6 +2,7 @@ Provides an APIView class that is the base of all views in REST framework. """ from __future__ import unicode_literals +import inspect from django.core.exceptions import PermissionDenied from django.http import Http404 @@ -369,8 +370,13 @@ class APIView(View): else: exc.status_code = status.HTTP_403_FORBIDDEN - context = self.get_renderer_context() - response = self.settings.EXCEPTION_HANDLER(exc, context) + exception_handler = self.settings.EXCEPTION_HANDLER + + if 'context' in inspect.getargspec(exception_handler).args: + context = self.get_renderer_context() + response = exception_handler(exc, context) + else: + response = exception_handler(exc) if response is None: raise diff --git a/tests/test_views.py b/tests/test_views.py index e9b75f065..9952248fc 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -6,6 +6,7 @@ from django.test import TestCase from rest_framework import status from rest_framework.decorators import api_view from rest_framework.response import Response +from rest_framework.request import Request from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory from rest_framework.views import APIView @@ -121,12 +122,7 @@ class TestCustomExceptionHandler(TestCase): def setUp(self): self.DEFAULT_HANDLER = api_settings.EXCEPTION_HANDLER - def exception_handler(exc, context=None): - self.assertTrue('args' in context) - self.assertTrue('kwargs' in context) - self.assertTrue('request' in context) - self.assertTrue('view' in context) - + def exception_handler(exc): return Response('Error!', status=status.HTTP_400_BAD_REQUEST) api_settings.EXCEPTION_HANDLER = exception_handler @@ -151,3 +147,22 @@ class TestCustomExceptionHandler(TestCase): expected = 'Error!' self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertEqual(response.data, expected) + + def test_context_exception_handler(self): + def exception_handler(exc, context=None): + self.assertEqual(context['args'], ()) + self.assertEqual(context['kwargs'], {}) + self.assertTrue(isinstance(context['request'], Request)) + self.assertTrue(isinstance(context['view'], ErrorView)) + + return Response('Error!', status=status.HTTP_400_BAD_REQUEST) + + api_settings.EXCEPTION_HANDLER = exception_handler + + view = ErrorView.as_view() + + request = factory.get('/', content_type='application/json') + response = view(request) + expected = 'Error!' + self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) + self.assertEqual(response.data, expected) From 3f85b476fa2ddb8a205c03cea6684fca257dbd02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sun, 14 Dec 2014 10:15:13 -0400 Subject: [PATCH 1309/1652] Remove test --- tests/test_views.py | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/tests/test_views.py b/tests/test_views.py index 9952248fc..77b113ee5 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -6,7 +6,6 @@ from django.test import TestCase from rest_framework import status from rest_framework.decorators import api_view from rest_framework.response import Response -from rest_framework.request import Request from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory from rest_framework.views import APIView @@ -147,22 +146,3 @@ class TestCustomExceptionHandler(TestCase): expected = 'Error!' self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertEqual(response.data, expected) - - def test_context_exception_handler(self): - def exception_handler(exc, context=None): - self.assertEqual(context['args'], ()) - self.assertEqual(context['kwargs'], {}) - self.assertTrue(isinstance(context['request'], Request)) - self.assertTrue(isinstance(context['view'], ErrorView)) - - return Response('Error!', status=status.HTTP_400_BAD_REQUEST) - - api_settings.EXCEPTION_HANDLER = exception_handler - - view = ErrorView.as_view() - - request = factory.get('/', content_type='application/json') - response = view(request) - expected = 'Error!' - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(response.data, expected) From 478c8d724b846b370c897548f8ee89f1128e12c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sun, 14 Dec 2014 10:16:52 -0400 Subject: [PATCH 1310/1652] Update docs --- docs/api-guide/exceptions.md | 4 ++-- docs/api-guide/settings.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index 467ad9709..31a8431bc 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -51,10 +51,10 @@ In order to alter the style of the response, you could write the following custo from rest_framework.views import exception_handler - def custom_exception_handler(exc): + def custom_exception_handler(exc, context): # Call REST framework's default exception handler first, # to get the standard error response. - response = exception_handler(exc) + response = exception_handler(exc, context) # Now add the HTTP status code to the response. if response is not None: diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 9005511b7..2c4f84237 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -393,7 +393,7 @@ This setting can be changed to support error responses other than the default `{ This should be a function with the following signature: - exception_handler(exc) + exception_handler(exc, context) * `exc`: The exception. From fd003fcefaee964e744ded0aec1ae76715889378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sun, 14 Dec 2014 15:03:20 -0400 Subject: [PATCH 1311/1652] Add pending deprecation warning message --- rest_framework/views.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index 3ece66e68..37889d1b4 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -3,6 +3,7 @@ Provides an APIView class that is the base of all views in REST framework. """ from __future__ import unicode_literals import inspect +import warnings from django.core.exceptions import PermissionDenied from django.http import Http404 @@ -370,13 +371,16 @@ class APIView(View): else: exc.status_code = status.HTTP_403_FORBIDDEN - exception_handler = self.settings.EXCEPTION_HANDLER - - if 'context' in inspect.getargspec(exception_handler).args: - context = self.get_renderer_context() - response = exception_handler(exc, context) + if len(inspect.getargspec(self.settings.EXCEPTION_HANDLER).args) == 1: + warnings.warn( + 'The `exception_handler(exc)` call signature is deprecated. ' + 'Use `exception_handler(exc, context) instead.', + PendingDeprecationWarning + ) + response = self.settings.EXCEPTION_HANDLER(exc) else: - response = exception_handler(exc) + context = self.get_renderer_context() + response = self.settings.EXCEPTION_HANDLER(exc, context) if response is None: raise From 89e9fc98d6e7407e6f7715fa2680df7c94221105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sun, 14 Dec 2014 15:20:44 -0400 Subject: [PATCH 1312/1652] Reuse exception_handler variable throughout --- rest_framework/views.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index 37889d1b4..c2e19bf42 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -371,16 +371,18 @@ class APIView(View): else: exc.status_code = status.HTTP_403_FORBIDDEN - if len(inspect.getargspec(self.settings.EXCEPTION_HANDLER).args) == 1: + exception_handler = self.settings.EXCEPTION_HANDLER + + if len(inspect.getargspec(exception_handler).args) == 1: warnings.warn( 'The `exception_handler(exc)` call signature is deprecated. ' 'Use `exception_handler(exc, context) instead.', PendingDeprecationWarning ) - response = self.settings.EXCEPTION_HANDLER(exc) + response = exception_handler(exc) else: context = self.get_renderer_context() - response = self.settings.EXCEPTION_HANDLER(exc, context) + response = exception_handler(exc, context) if response is None: raise From 26c223a34f7e0cc21d37c6302e53d547dae252dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sun, 14 Dec 2014 16:43:58 -0400 Subject: [PATCH 1313/1652] Add get_exception_handler_context() --- rest_framework/views.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index c2e19bf42..80a13a1a9 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -186,6 +186,18 @@ class APIView(View): 'request': getattr(self, 'request', None) } + def get_exception_handler_context(self): + """ + Returns a dict that is passed through to EXCEPTION_HANDLER, + as the `context` argument. + """ + return { + 'view': self, + 'args': getattr(self, 'args', ()), + 'kwargs': getattr(self, 'kwargs', {}), + 'request': getattr(self, 'request', None) + } + def get_view_name(self): """ Return the view name, as used in OPTIONS responses and in the @@ -381,7 +393,7 @@ class APIView(View): ) response = exception_handler(exc) else: - context = self.get_renderer_context() + context = self.get_exception_handler_context() response = exception_handler(exc, context) if response is None: From 4ebd8770b94ecb8fe8fb41fe8daa4309b33b9952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sun, 14 Dec 2014 20:47:33 -0400 Subject: [PATCH 1314/1652] Update excepteion_handler signature --- rest_framework/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index 80a13a1a9..b39724c2f 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -48,7 +48,7 @@ def get_view_description(view_cls, html=False): return description -def exception_handler(exc, context=None): +def exception_handler(exc, context): """ Returns the response that should be used for any given exception. From 5e7c9687c7e11b6adfe2fc534eb0504e67ca9fc9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 15 Dec 2014 09:13:02 +0000 Subject: [PATCH 1315/1652] First pass at serializer repr bug --- rest_framework/utils/representation.py | 3 ++- tests/test_serializer.py | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py index 3f17a8b9b..0fdb4775d 100644 --- a/rest_framework/utils/representation.py +++ b/rest_framework/utils/representation.py @@ -2,6 +2,7 @@ Helper functions for creating user-friendly representations of serializer classes and serializer fields. """ +from __future__ import unicode_literals from django.db import models from django.utils.encoding import force_text from django.utils.functional import Promise @@ -24,7 +25,7 @@ def smart_repr(value): if isinstance(value, Promise) and value._delegate_text: value = force_text(value) - value = repr(value) + value = repr(value).decode('utf-8') # Representations like u'help text' # should simply be presented as 'help text' diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 56b390956..48fcc83bb 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -1,3 +1,4 @@ +# coding: utf-8 from __future__ import unicode_literals from rest_framework import serializers import pytest @@ -197,3 +198,19 @@ class TestIncorrectlyConfigured: "The serializer field might be named incorrectly and not match any attribute or key on the `ExampleObject` instance.\n" "Original exception text was:" ) + + +class TestUnicodeRepr: + def test_unicode_repr(self): + class ExampleSerializer(serializers.Serializer): + example = serializers.CharField() + + class ExampleObject: + def __init__(self): + self.example = '한국' + def __repr__(self): + return self.example.encode('utf8') + + instance = ExampleObject() + serializer = ExampleSerializer(instance) + repr(serializer) From b951c74df2d10a7497152144baf5d105e804162f Mon Sep 17 00:00:00 2001 From: Jason Spafford <nullprogrammer@gmail.com> Date: Mon, 15 Dec 2014 01:24:12 -0800 Subject: [PATCH 1316/1652] Made docs consistent --- docs/tutorial/2-requests-and-responses.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 49e96d030..c04269695 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -181,7 +181,7 @@ Similarly, we can control the format of the request that we send, using the `Con "id": 4, "title": "", "code": "print 456", - "linenos": true, + "linenos": false, "language": "python", "style": "friendly" } From 488b13e7b8591f667a01c01f3f0aa09749627831 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 15 Dec 2014 09:29:54 +0000 Subject: [PATCH 1317/1652] Better messaging for 'Field.to_representation'. Closes #2271. --- rest_framework/fields.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 205efd2f8..21a1effde 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -382,13 +382,23 @@ class Field(object): """ Transform the *incoming* primitive data into a native value. """ - raise NotImplementedError('to_internal_value() must be implemented.') + raise NotImplementedError( + '{cls}.to_internal_value() must be implemented.'.format( + cls=self.__class__.__name__ + ) + ) def to_representation(self, value): """ Transform the *outgoing* native value into primitive data. """ - raise NotImplementedError('to_representation() must be implemented.') + raise NotImplementedError( + '{cls}.to_representation() must be implemented.\n' + 'If you are upgrading from REST framework version 2 ' + 'you might want `ReadOnlyField`.'.format( + cls=self.__class__.__name__ + ) + ) def fail(self, key, **kwargs): """ From 56c09cc1f2bdd22d1a5465ad618a86b04a8b1d6a Mon Sep 17 00:00:00 2001 From: Jason Spafford <nullprogrammer@gmail.com> Date: Mon, 15 Dec 2014 02:41:39 -0800 Subject: [PATCH 1318/1652] Doc typo --- docs/api-guide/permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index f068f0f72..ddcefadbc 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -104,7 +104,7 @@ This permission is suitable if you want your API to only be accessible to regist The `IsAdminUser` permission class will deny permission to any user, unless `user.is_staff` is `True` in which case permission will be allowed. -This permission is suitable is you want your API to only be accessible to a subset of trusted administrators. +This permission is suitable if you want your API to only be accessible to a subset of trusted administrators. ## IsAuthenticatedOrReadOnly From 72e08a3e8b6427cb93f0f98b42724e31e5b3d8f9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 15 Dec 2014 11:55:17 +0000 Subject: [PATCH 1319/1652] Use unicode internally everywhere for 'repr' --- rest_framework/compat.py | 17 +++++++++++++++++ rest_framework/fields.py | 12 ++++++++---- rest_framework/serializers.py | 10 +++++----- rest_framework/utils/representation.py | 5 ++++- rest_framework/utils/serializer_helpers.py | 7 ++++--- rest_framework/validators.py | 14 ++++++++------ tests/test_fields.py | 4 ++-- tests/test_serializer.py | 19 +++++++++++++++++++ 8 files changed, 67 insertions(+), 21 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 71520b928..69fdd7936 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -16,6 +16,23 @@ from django.utils import six import django +def unicode_repr(instance): + # Get the repr of an instance, but ensure it is a unicode string + # on both python 3 (already the case) and 2 (not the case). + if six.PY2: + repr(instance).decode('utf-8') + return repr(instance) + + +def unicode_to_repr(value): + # Coerce a unicode string to the correct repr return type, depending on + # the Python version. We wrap all our `__repr__` implementations with + # this and then use unicode throughout internally. + if six.PY2: + return value.encode('utf-8') + return value + + # OrderedDict only available in Python 2.7. # This will always be the case in Django 1.7 and above, as these versions # no longer support Python 2.6. diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 205efd2f8..1a4712d84 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from django.conf import settings from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ValidationError as DjangoValidationError @@ -10,7 +11,8 @@ from django.utils.translation import ugettext_lazy as _ from rest_framework import ISO_8601 from rest_framework.compat import ( EmailValidator, MinValueValidator, MaxValueValidator, - MinLengthValidator, MaxLengthValidator, URLValidator, OrderedDict + MinLengthValidator, MaxLengthValidator, URLValidator, OrderedDict, + unicode_repr, unicode_to_repr ) from rest_framework.exceptions import ValidationError from rest_framework.settings import api_settings @@ -113,7 +115,9 @@ class CreateOnlyDefault: return self.default def __repr__(self): - return '%s(%s)' % (self.__class__.__name__, repr(self.default)) + return unicode_to_repr( + '%s(%s)' % (self.__class__.__name__, unicode_repr(self.default)) + ) class CurrentUserDefault: @@ -124,7 +128,7 @@ class CurrentUserDefault: return self.user def __repr__(self): - return '%s()' % self.__class__.__name__ + return unicode_to_repr('%s()' % self.__class__.__name__) class SkipField(Exception): @@ -453,7 +457,7 @@ class Field(object): This allows us to create descriptive representations for serializer instances that show all the declared fields on the serializer. """ - return representation.field_repr(self) + return unicode_to_repr(representation.field_repr(self)) # Boolean types... diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 5adbca3bd..e9860a2fc 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -10,12 +10,11 @@ python primitives. 2. The process of marshalling between python primitives and request and response content is handled by parsers and renderers. """ -import warnings - +from __future__ import unicode_literals from django.db import models from django.db.models.fields import FieldDoesNotExist from django.utils.translation import ugettext_lazy as _ - +from rest_framework.compat import unicode_to_repr from rest_framework.utils import model_meta from rest_framework.utils.field_mapping import ( get_url_kwargs, get_field_kwargs, @@ -29,6 +28,7 @@ from rest_framework.validators import ( UniqueForDateValidator, UniqueForMonthValidator, UniqueForYearValidator, UniqueTogetherValidator ) +import warnings # Note: We do the following so that users of the framework can use this style: @@ -396,7 +396,7 @@ class Serializer(BaseSerializer): return attrs def __repr__(self): - return representation.serializer_repr(self, indent=1) + return unicode_to_repr(representation.serializer_repr(self, indent=1)) # The following are used for accessing `BoundField` instances on the # serializer, for the purposes of presenting a form-like API onto the @@ -564,7 +564,7 @@ class ListSerializer(BaseSerializer): return self.instance def __repr__(self): - return representation.list_repr(self, indent=1) + return unicode_to_repr(representation.list_repr(self, indent=1)) # Include a backlink to the serializer class on return objects. # Allows renderers such as HTMLFormRenderer to get the full field info. diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py index 3f17a8b9b..0d829a83b 100644 --- a/rest_framework/utils/representation.py +++ b/rest_framework/utils/representation.py @@ -2,9 +2,11 @@ Helper functions for creating user-friendly representations of serializer classes and serializer fields. """ +from __future__ import unicode_literals from django.db import models from django.utils.encoding import force_text from django.utils.functional import Promise +from rest_framework.compat import unicode_repr import re @@ -24,10 +26,11 @@ def smart_repr(value): if isinstance(value, Promise) and value._delegate_text: value = force_text(value) - value = repr(value) + value = unicode_repr(value) # Representations like u'help text' # should simply be presented as 'help text' + print type(value), value if value.startswith("u'") and value.endswith("'"): return value[1:] diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py index 277cf6492..65a04d06b 100644 --- a/rest_framework/utils/serializer_helpers.py +++ b/rest_framework/utils/serializer_helpers.py @@ -1,5 +1,6 @@ +from __future__ import unicode_literals import collections -from rest_framework.compat import OrderedDict +from rest_framework.compat import OrderedDict, unicode_to_repr class ReturnDict(OrderedDict): @@ -47,9 +48,9 @@ class BoundField(object): return self._field.__class__ def __repr__(self): - return '<%s value=%s errors=%s>' % ( + return unicode_to_repr('<%s value=%s errors=%s>' % ( self.__class__.__name__, self.value, self.errors - ) + )) class NestedBoundField(BoundField): diff --git a/rest_framework/validators.py b/rest_framework/validators.py index 63eb7b225..e3719b8d5 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -6,7 +6,9 @@ This gives us better separation of concerns, allows us to use single-step object creation, and makes it possible to switch between using the implicit `ModelSerializer` class and an equivalent explicit `Serializer` class. """ +from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ +from rest_framework.compat import unicode_to_repr from rest_framework.exceptions import ValidationError from rest_framework.utils.representation import smart_repr @@ -59,10 +61,10 @@ class UniqueValidator: raise ValidationError(self.message) def __repr__(self): - return '<%s(queryset=%s)>' % ( + return unicode_to_repr('<%s(queryset=%s)>' % ( self.__class__.__name__, smart_repr(self.queryset) - ) + )) class UniqueTogetherValidator: @@ -141,11 +143,11 @@ class UniqueTogetherValidator: raise ValidationError(self.message.format(field_names=field_names)) def __repr__(self): - return '<%s(queryset=%s, fields=%s)>' % ( + return unicode_to_repr('<%s(queryset=%s, fields=%s)>' % ( self.__class__.__name__, smart_repr(self.queryset), smart_repr(self.fields) - ) + )) class BaseUniqueForValidator: @@ -205,12 +207,12 @@ class BaseUniqueForValidator: raise ValidationError({self.field: message}) def __repr__(self): - return '<%s(queryset=%s, field=%s, date_field=%s)>' % ( + return unicode_to_repr('<%s(queryset=%s, field=%s, date_field=%s)>' % ( self.__class__.__name__, smart_repr(self.queryset), smart_repr(self.field), smart_repr(self.date_field) - ) + )) class UniqueForDateValidator(BaseUniqueForValidator): diff --git a/tests/test_fields.py b/tests/test_fields.py index 3f4e65f24..c20bdd8c2 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -62,7 +62,7 @@ class TestEmpty: """ field = serializers.CharField(allow_blank=True) output = field.run_validation('') - assert output is '' + assert output == '' def test_default(self): """ @@ -817,7 +817,7 @@ class TestChoiceField(FieldValues): ] ) output = field.run_validation('') - assert output is '' + assert output == '' class TestChoiceFieldWithType(FieldValues): diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 56b390956..c17b6d8c5 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -1,5 +1,7 @@ +# coding: utf-8 from __future__ import unicode_literals from rest_framework import serializers +from rest_framework.compat import unicode_repr import pytest @@ -197,3 +199,20 @@ class TestIncorrectlyConfigured: "The serializer field might be named incorrectly and not match any attribute or key on the `ExampleObject` instance.\n" "Original exception text was:" ) + + +class TestUnicodeRepr: + def test_unicode_repr(self): + class ExampleSerializer(serializers.Serializer): + example = serializers.CharField() + + class ExampleObject: + def __init__(self): + self.example = '한국' + + def __repr__(self): + return unicode_repr(self.example) + + instance = ExampleObject() + serializer = ExampleSerializer(instance) + repr(serializer) # Should not error. From dc66cce16da6793efe4a4a4dcdd18db62c859abb Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 15 Dec 2014 12:01:29 +0000 Subject: [PATCH 1320/1652] Remove erronous print --- rest_framework/utils/representation.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py index 0d829a83b..1bfc64c1f 100644 --- a/rest_framework/utils/representation.py +++ b/rest_framework/utils/representation.py @@ -30,7 +30,6 @@ def smart_repr(value): # Representations like u'help text' # should simply be presented as 'help text' - print type(value), value if value.startswith("u'") and value.endswith("'"): return value[1:] From a15db353bf3eea625a97cb9eb942829172f2ab9f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 15 Dec 2014 13:18:39 +0000 Subject: [PATCH 1321/1652] Minor test cleanup --- rest_framework/settings.py | 6 ++---- tests/extras/__init__.py | 0 tests/extras/bad_import.py | 1 - tests/test_settings.py | 27 +++++++++++---------------- 4 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 tests/extras/__init__.py delete mode 100644 tests/extras/bad_import.py diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 79da23ca4..33f848138 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -48,7 +48,6 @@ DEFAULTS = { 'DEFAULT_METADATA_CLASS': 'rest_framework.metadata.SimpleMetadata', # Generic view behavior - 'DEFAULT_MODEL_SERIALIZER_CLASS': 'rest_framework.serializers.ModelSerializer', 'DEFAULT_PAGINATION_SERIALIZER_CLASS': 'rest_framework.pagination.PaginationSerializer', 'DEFAULT_FILTER_BACKENDS': (), @@ -124,7 +123,6 @@ IMPORT_STRINGS = ( 'DEFAULT_THROTTLE_CLASSES', 'DEFAULT_CONTENT_NEGOTIATION_CLASS', 'DEFAULT_METADATA_CLASS', - 'DEFAULT_MODEL_SERIALIZER_CLASS', 'DEFAULT_PAGINATION_SERIALIZER_CLASS', 'DEFAULT_FILTER_BACKENDS', 'EXCEPTION_HANDLER', @@ -176,8 +174,8 @@ class APISettings(object): """ def __init__(self, user_settings=None, defaults=None, import_strings=None): self.user_settings = user_settings or {} - self.defaults = defaults or {} - self.import_strings = import_strings or () + self.defaults = defaults or DEFAULTS + self.import_strings = import_strings or IMPORT_STRINGS def __getattr__(self, attr): if attr not in self.defaults.keys(): diff --git a/tests/extras/__init__.py b/tests/extras/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/extras/bad_import.py b/tests/extras/bad_import.py deleted file mode 100644 index 68263d947..000000000 --- a/tests/extras/bad_import.py +++ /dev/null @@ -1 +0,0 @@ -raise ValueError diff --git a/tests/test_settings.py b/tests/test_settings.py index e29fc34aa..f2ff4ca14 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -1,22 +1,17 @@ -"""Tests for the settings module""" from __future__ import unicode_literals from django.test import TestCase - -from rest_framework.settings import APISettings, DEFAULTS, IMPORT_STRINGS +from rest_framework.settings import APISettings class TestSettings(TestCase): - """Tests relating to the api settings""" - - def test_non_import_errors(self): - """Make sure other errors aren't suppressed.""" - settings = APISettings({'DEFAULT_MODEL_SERIALIZER_CLASS': 'tests.extras.bad_import.ModelSerializer'}, DEFAULTS, IMPORT_STRINGS) - with self.assertRaises(ValueError): - settings.DEFAULT_MODEL_SERIALIZER_CLASS - def test_import_error_message_maintained(self): - """Make sure real import errors are captured and raised sensibly.""" - settings = APISettings({'DEFAULT_MODEL_SERIALIZER_CLASS': 'tests.extras.not_here.ModelSerializer'}, DEFAULTS, IMPORT_STRINGS) - with self.assertRaises(ImportError) as cm: - settings.DEFAULT_MODEL_SERIALIZER_CLASS - self.assertTrue('ImportError' in str(cm.exception)) + """ + Make sure import errors are captured and raised sensibly. + """ + settings = APISettings({ + 'DEFAULT_RENDERER_CLASSES': [ + 'tests.invalid_module.InvalidClassName' + ] + }) + with self.assertRaises(ImportError): + settings.DEFAULT_RENDERER_CLASSES From d71ef9c6d810115bfe0de6327139c6886932cdb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Mon, 15 Dec 2014 21:48:31 -0400 Subject: [PATCH 1322/1652] Closes #2281 --- docs/api-guide/relations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index a79b6ea5a..e56db229a 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -397,7 +397,7 @@ We could define a custom field that could be used to serialize tagged instances, return 'Note: ' + value.text raise Exception('Unexpected type of tagged object') -If you need the target of the relationship to have a nested representation, you can use the required serializers inside the `.to_native()` method: +If you need the target of the relationship to have a nested representation, you can use the required serializers inside the `.to_representation()` method: def to_representation(self, value): """ From a68e78bd0b5174d2c8a40497d3d5842f66c65a34 Mon Sep 17 00:00:00 2001 From: Martin Maillard <self@martin-maillard.com> Date: Tue, 16 Dec 2014 15:41:16 +0100 Subject: [PATCH 1323/1652] Add test integrated with middleware --- tests/test_middleware.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tests/test_middleware.py diff --git a/tests/test_middleware.py b/tests/test_middleware.py new file mode 100644 index 000000000..4c099fca1 --- /dev/null +++ b/tests/test_middleware.py @@ -0,0 +1,37 @@ + +from django.conf.urls import patterns, url +from django.contrib.auth.models import User +from rest_framework.authentication import TokenAuthentication +from rest_framework.authtoken.models import Token +from rest_framework.test import APITestCase +from rest_framework.views import APIView + + +urlpatterns = patterns( + '', + url(r'^$', APIView.as_view(authentication_classes=(TokenAuthentication,))), +) + + +class MyMiddleware(object): + + def process_response(self, request, response): + assert hasattr(request, 'user'), '`user` is not set on request' + assert request.user.is_authenticated(), '`user` is not authenticated' + return response + + +class TestMiddleware(APITestCase): + + urls = 'tests.test_middleware' + + def test_middleware_can_access_user_when_processing_response(self): + user = User.objects.create_user('john', 'john@example.com', 'password') + key = 'abcd1234' + Token.objects.create(key=key, user=user) + + with self.settings( + MIDDLEWARE_CLASSES=('tests.test_middleware.MyMiddleware',) + ): + auth = 'Token ' + key + self.client.get('/', HTTP_AUTHORIZATION=auth) From 6e51e4f5cdec4f4580360a487d7bf5ebdef08709 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 16 Dec 2014 15:34:19 +0000 Subject: [PATCH 1324/1652] Versioning first pass --- docs/api-guide/versioning.md | 9 +++ rest_framework/reverse.py | 12 ++++ rest_framework/settings.py | 7 ++- rest_framework/versioning.py | 96 ++++++++++++++++++++++++++++++++ rest_framework/views.py | 27 +++++++-- tests/test_versioning.py | 104 +++++++++++++++++++++++++++++++++++ 6 files changed, 248 insertions(+), 7 deletions(-) create mode 100644 docs/api-guide/versioning.md create mode 100644 rest_framework/versioning.py create mode 100644 tests/test_versioning.py diff --git a/docs/api-guide/versioning.md b/docs/api-guide/versioning.md new file mode 100644 index 000000000..df8148941 --- /dev/null +++ b/docs/api-guide/versioning.md @@ -0,0 +1,9 @@ +source: versioning.py + +# Versioning + +> Versioning an interface is just a "polite" way to kill deployed clients. +> +> — [Roy Fielding][cite]. + +[cite]: http://www.slideshare.net/evolve_conference/201308-fielding-evolve/31 \ No newline at end of file diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py index a74e8aa2d..8fcca55ba 100644 --- a/rest_framework/reverse.py +++ b/rest_framework/reverse.py @@ -8,6 +8,18 @@ from django.utils.functional import lazy def reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra): + """ + If versioning is being used then we pass any `reverse` calls through + to the versioning scheme instance, so that the resulting URL + can be modified if needed. + """ + scheme = getattr(request, 'versioning_scheme', None) + if scheme is not None: + return scheme.reverse(viewname, args, kwargs, request, format, **extra) + return _reverse(viewname, args, kwargs, request, format, **extra) + + +def _reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra): """ Same as `django.core.urlresolvers.reverse`, but optionally takes a request and returns a fully qualified URL, using the request to get the base URL. diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 0aac6d43e..b17f5fccf 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -46,6 +46,7 @@ DEFAULTS = { 'DEFAULT_THROTTLE_CLASSES': (), 'DEFAULT_CONTENT_NEGOTIATION_CLASS': 'rest_framework.negotiation.DefaultContentNegotiation', 'DEFAULT_METADATA_CLASS': 'rest_framework.metadata.SimpleMetadata', + 'DEFAULT_VERSIONING_CLASS': None, # Generic view behavior 'DEFAULT_MODEL_SERIALIZER_CLASS': 'rest_framework.serializers.ModelSerializer', @@ -124,7 +125,7 @@ IMPORT_STRINGS = ( 'DEFAULT_THROTTLE_CLASSES', 'DEFAULT_CONTENT_NEGOTIATION_CLASS', 'DEFAULT_METADATA_CLASS', - 'DEFAULT_MODEL_SERIALIZER_CLASS', + 'DEFAULT_VERSIONING_CLASS', 'DEFAULT_PAGINATION_SERIALIZER_CLASS', 'DEFAULT_FILTER_BACKENDS', 'EXCEPTION_HANDLER', @@ -141,7 +142,9 @@ def perform_import(val, setting_name): If the given setting is a string import notation, then perform the necessary import or imports. """ - if isinstance(val, six.string_types): + if val is None: + return None + elif isinstance(val, six.string_types): return import_from_string(val, setting_name) elif isinstance(val, (list, tuple)): return [import_from_string(item, setting_name) for item in val] diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py new file mode 100644 index 000000000..2ca8efff4 --- /dev/null +++ b/rest_framework/versioning.py @@ -0,0 +1,96 @@ +# coding: utf-8 +from __future__ import unicode_literals +from rest_framework.reverse import _reverse +from rest_framework.utils.mediatypes import _MediaType +import re + + +class BaseVersioning(object): + def determine_version(self, request, *args, **kwargs): + msg = '{cls}.determine_version() must be implemented.' + raise NotImplemented(msg.format( + cls=self.__class__.__name__ + )) + + def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): + return _reverse(viewname, args, kwargs, request, format, **extra) + + +class QueryParameterVersioning(BaseVersioning): + """ + GET /something/?version=0.1 HTTP/1.1 + Host: example.com + Accept: application/json + """ + default_version = None + version_param = 'version' + + def determine_version(self, request, *args, **kwargs): + return request.query_params.get(self.version_param) + + def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): + url = super(QueryParameterVersioning, self).reverse( + viewname, args, kwargs, request, format, **kwargs + ) + if request.version is not None: + return replace_query_param(url, self.version_param, request.version) + return url + + +class HostNameVersioning(BaseVersioning): + """ + GET /something/ HTTP/1.1 + Host: v1.example.com + Accept: application/json + """ + default_version = None + hostname_regex = re.compile(r'^([a-zA-Z0-9]+)\.[a-zA-Z0-9]+\.[a-zA-Z0-9]+$') + + def determine_version(self, request, *args, **kwargs): + hostname, seperator, port = request.get_host().partition(':') + match = self.hostname_regex.match(hostname) + if not match: + return self.default_version + return match.group(1) + + # We don't need to implement `reverse`, as the hostname will already be + # preserved as part of the standard `reverse` implementation. + + +class AcceptHeaderVersioning(BaseVersioning): + """ + GET /something/ HTTP/1.1 + Host: example.com + Accept: application/json; version=1.0 + """ + default_version = None + version_param = 'version' + + def determine_version(self, request, *args, **kwargs): + media_type = _MediaType(request.accepted_media_type) + return media_type.params.get(self.version_param, self.default_version) + + # We don't need to implement `reverse`, as the versioning is based + # on the `Accept` header, not on the request URL. + + +class URLPathVersioning(BaseVersioning): + """ + GET /1.0/something/ HTTP/1.1 + Host: example.com + Accept: application/json + """ + default_version = None + version_param = 'version' + + def determine_version(self, request, *args, **kwargs): + return kwargs.get(self.version_param, self.default_version) + + def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): + if request.version is not None: + kwargs = {} if (kwargs is None) else kwargs + kwargs[self.version_param] = request.version + + return super(URLPathVersioning, self).reverse( + viewname, args, kwargs, request, format, **kwargs + ) diff --git a/rest_framework/views.py b/rest_framework/views.py index b39724c2f..12bb78bd9 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -95,6 +95,7 @@ class APIView(View): permission_classes = api_settings.DEFAULT_PERMISSION_CLASSES content_negotiation_class = api_settings.DEFAULT_CONTENT_NEGOTIATION_CLASS metadata_class = api_settings.DEFAULT_METADATA_CLASS + versioning_class = api_settings.DEFAULT_VERSIONING_CLASS # Allow dependency injection of other settings to make testing easier. settings = api_settings @@ -314,6 +315,16 @@ class APIView(View): if not throttle.allow_request(request, self): self.throttled(request, throttle.wait()) + def determine_version(self, request, *args, **kwargs): + """ + If versioning is being used, then determine any API version for the + incoming request. Returns a two-tuple of (version, versioning_scheme) + """ + if self.versioning_class is None: + return (None, None) + scheme = self.versioning_class() + return (scheme.determine_version(request, *args, **kwargs), scheme) + # Dispatch methods def initialize_request(self, request, *args, **kwargs): @@ -322,11 +333,13 @@ class APIView(View): """ parser_context = self.get_parser_context(request) - return Request(request, - parsers=self.get_parsers(), - authenticators=self.get_authenticators(), - negotiator=self.get_content_negotiator(), - parser_context=parser_context) + return Request( + request, + parsers=self.get_parsers(), + authenticators=self.get_authenticators(), + negotiator=self.get_content_negotiator(), + parser_context=parser_context + ) def initial(self, request, *args, **kwargs): """ @@ -343,6 +356,10 @@ class APIView(View): neg = self.perform_content_negotiation(request) request.accepted_renderer, request.accepted_media_type = neg + # Determine the API version, if versioning is in use. + version, scheme = self.determine_version(request, *args, **kwargs) + request.version, request.versioning_scheme = version, scheme + def finalize_response(self, request, response, *args, **kwargs): """ Returns the final response object. diff --git a/tests/test_versioning.py b/tests/test_versioning.py new file mode 100644 index 000000000..d90b29a1b --- /dev/null +++ b/tests/test_versioning.py @@ -0,0 +1,104 @@ +from django.conf.urls import url +from rest_framework import versioning +from rest_framework.decorators import APIView +from rest_framework.response import Response +from rest_framework.reverse import reverse +from rest_framework.test import APIRequestFactory, APITestCase + + +class RequestVersionView(APIView): + def get(self, request, *args, **kwargs): + return Response({'version': request.version}) + +class ReverseView(APIView): + def get(self, request, *args, **kwargs): + return Response({'url': reverse('another', request=request)}) + + +factory = APIRequestFactory() + +mock_view = lambda request: None + +urlpatterns = [ + url(r'^another/$', mock_view, name='another') +] + + +class TestRequestVersion: + def test_unversioned(self): + view = RequestVersionView.as_view() + + request = factory.get('/endpoint/') + response = view(request) + assert response.data == {'version': None} + + def test_query_param_versioning(self): + scheme = versioning.QueryParameterVersioning + view = RequestVersionView.as_view(versioning_class=scheme) + + request = factory.get('/endpoint/?version=1.2.3') + response = view(request) + assert response.data == {'version': '1.2.3'} + + request = factory.get('/endpoint/') + response = view(request) + assert response.data == {'version': None} + + def test_host_name_versioning(self): + scheme = versioning.HostNameVersioning + view = RequestVersionView.as_view(versioning_class=scheme) + + request = factory.get('/endpoint/', HTTP_HOST='v1.example.org') + response = view(request) + assert response.data == {'version': 'v1'} + + request = factory.get('/endpoint/') + response = view(request) + assert response.data == {'version': None} + + def test_accept_header_versioning(self): + scheme = versioning.AcceptHeaderVersioning + view = RequestVersionView.as_view(versioning_class=scheme) + + request = factory.get('/endpoint/', HTTP_ACCEPT='application/json; version=1.2.3') + response = view(request) + assert response.data == {'version': '1.2.3'} + + request = factory.get('/endpoint/', HTTP_ACCEPT='application/json') + response = view(request) + assert response.data == {'version': None} + + def test_url_path_versioning(self): + scheme = versioning.URLPathVersioning + view = RequestVersionView.as_view(versioning_class=scheme) + + request = factory.get('/1.2.3/endpoint/') + response = view(request, version='1.2.3') + assert response.data == {'version': '1.2.3'} + + request = factory.get('/endpoint/') + response = view(request) + assert response.data == {'version': None} + + +class TestURLReversing(APITestCase): + urls = 'tests.test_versioning' + + def test_reverse_unversioned(self): + view = ReverseView.as_view() + + request = factory.get('/endpoint/') + response = view(request) + assert response.data == {'url': 'http://testserver/another/'} + + def test_reverse_host_name_versioning(self): + scheme = versioning.HostNameVersioning + view = ReverseView.as_view(versioning_class=scheme) + + request = factory.get('/endpoint/', HTTP_HOST='v1.example.org') + response = view(request) + assert response.data == {'url': 'http://v1.example.org/another/'} + + request = factory.get('/endpoint/') + response = view(request) + assert response.data == {'url': 'http://testserver/another/'} From 4e91ec61339838426e246e20ef062c963a78c4e1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 16 Dec 2014 16:14:08 +0000 Subject: [PATCH 1325/1652] Added NamespaceVersioning --- rest_framework/versioning.py | 31 +++++++++++++++-- tests/test_versioning.py | 67 ++++++++++++++++++++++++++++++++++-- 2 files changed, 94 insertions(+), 4 deletions(-) diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index 2ca8efff4..42df8b2c0 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -1,6 +1,7 @@ # coding: utf-8 from __future__ import unicode_literals from rest_framework.reverse import _reverse +from rest_framework.templatetags.rest_framework import replace_query_param from rest_framework.utils.mediatypes import _MediaType import re @@ -30,7 +31,7 @@ class QueryParameterVersioning(BaseVersioning): def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): url = super(QueryParameterVersioning, self).reverse( - viewname, args, kwargs, request, format, **kwargs + viewname, args, kwargs, request, format, **extra ) if request.version is not None: return replace_query_param(url, self.version_param, request.version) @@ -92,5 +93,31 @@ class URLPathVersioning(BaseVersioning): kwargs[self.version_param] = request.version return super(URLPathVersioning, self).reverse( - viewname, args, kwargs, request, format, **kwargs + viewname, args, kwargs, request, format, **extra + ) + + +class NamespaceVersioning(BaseVersioning): + """ + To the client this is the same style as `URLPathVersioning`. + The difference is in the backend - this implementation uses + Django's URL namespaces to determine the version. + + GET /1.0/something/ HTTP/1.1 + Host: example.com + Accept: application/json + """ + default_version = None + + def determine_version(self, request, *args, **kwargs): + resolver_match = getattr(request, 'resolver_match', None) + if (resolver_match is None or not resolver_match.namespace): + return self.default_version + return resolver_match.namespace + + def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): + if request.version is not None: + viewname = request.version + ':' + viewname + return super(NamespaceVersioning, self).reverse( + viewname, args, kwargs, request, format, **extra ) diff --git a/tests/test_versioning.py b/tests/test_versioning.py index d90b29a1b..eaac5dfb3 100644 --- a/tests/test_versioning.py +++ b/tests/test_versioning.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.conf.urls import include, url from rest_framework import versioning from rest_framework.decorators import APIView from rest_framework.response import Response @@ -10,6 +10,7 @@ class RequestVersionView(APIView): def get(self, request, *args, **kwargs): return Response({'version': request.version}) + class ReverseView(APIView): def get(self, request, *args, **kwargs): return Response({'url': reverse('another', request=request)}) @@ -19,8 +20,14 @@ factory = APIRequestFactory() mock_view = lambda request: None +included_patterns = [ + url(r'^namespaced/$', mock_view, name='another'), +] + urlpatterns = [ - url(r'^another/$', mock_view, name='another') + url(r'^v1/', include(included_patterns, namespace='v1')), + url(r'^another/$', mock_view, name='another'), + url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another') ] @@ -80,6 +87,22 @@ class TestRequestVersion: response = view(request) assert response.data == {'version': None} + def test_namespace_versioning(self): + class FakeResolverMatch: + namespace = 'v1' + + scheme = versioning.NamespaceVersioning + view = RequestVersionView.as_view(versioning_class=scheme) + + request = factory.get('/v1/endpoint/') + request.resolver_match = FakeResolverMatch + response = view(request, version='v1') + assert response.data == {'version': 'v1'} + + request = factory.get('/endpoint/') + response = view(request) + assert response.data == {'version': None} + class TestURLReversing(APITestCase): urls = 'tests.test_versioning' @@ -91,6 +114,18 @@ class TestURLReversing(APITestCase): response = view(request) assert response.data == {'url': 'http://testserver/another/'} + def test_reverse_query_param_versioning(self): + scheme = versioning.QueryParameterVersioning + view = ReverseView.as_view(versioning_class=scheme) + + request = factory.get('/endpoint/?version=v1') + response = view(request) + assert response.data == {'url': 'http://testserver/another/?version=v1'} + + request = factory.get('/endpoint/') + response = view(request) + assert response.data == {'url': 'http://testserver/another/'} + def test_reverse_host_name_versioning(self): scheme = versioning.HostNameVersioning view = ReverseView.as_view(versioning_class=scheme) @@ -102,3 +137,31 @@ class TestURLReversing(APITestCase): request = factory.get('/endpoint/') response = view(request) assert response.data == {'url': 'http://testserver/another/'} + + def test_reverse_url_path_versioning(self): + scheme = versioning.URLPathVersioning + view = ReverseView.as_view(versioning_class=scheme) + + request = factory.get('/v1/endpoint/') + response = view(request, version='v1') + assert response.data == {'url': 'http://testserver/v1/another/'} + + request = factory.get('/endpoint/') + response = view(request) + assert response.data == {'url': 'http://testserver/another/'} + + def test_namespace_versioning(self): + class FakeResolverMatch: + namespace = 'v1' + + scheme = versioning.NamespaceVersioning + view = ReverseView.as_view(versioning_class=scheme) + + request = factory.get('/v1/endpoint/') + request.resolver_match = FakeResolverMatch + response = view(request, version='v1') + assert response.data == {'url': 'http://testserver/v1/namespaced/'} + + request = factory.get('/endpoint/') + response = view(request) + assert response.data == {'url': 'http://testserver/another/'} From fe9647ce92b61b57dc64604241352bf269d65af7 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 16 Dec 2014 16:37:32 +0000 Subject: [PATCH 1326/1652] AcceptHeaderVersioning to return unicode strings. --- rest_framework/compat.py | 13 +++++++++---- rest_framework/versioning.py | 29 ++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index c5242343e..3c8fb0da4 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -5,15 +5,13 @@ versions of django/python, and compatibility wrappers around optional packages. # flake8: noqa from __future__ import unicode_literals - -import inspect - from django.core.exceptions import ImproperlyConfigured +from django.conf import settings from django.utils.encoding import force_text from django.utils.six.moves.urllib import parse as urlparse -from django.conf import settings from django.utils import six import django +import inspect def unicode_repr(instance): @@ -33,6 +31,13 @@ def unicode_to_repr(value): return value +def unicode_http_header(value): + # Coerce HTTP header value to unicode. + if isinstance(value, six.binary_type): + return value.decode('iso-8859-1') + return value + + # OrderedDict only available in Python 2.7. # This will always be the case in Django 1.7 and above, as these versions # no longer support Python 2.6. diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index 42df8b2c0..9a27cb081 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -1,5 +1,6 @@ # coding: utf-8 from __future__ import unicode_literals +from rest_framework.compat import unicode_http_header from rest_framework.reverse import _reverse from rest_framework.templatetags.rest_framework import replace_query_param from rest_framework.utils.mediatypes import _MediaType @@ -69,7 +70,8 @@ class AcceptHeaderVersioning(BaseVersioning): def determine_version(self, request, *args, **kwargs): media_type = _MediaType(request.accepted_media_type) - return media_type.params.get(self.version_param, self.default_version) + version = media_type.params.get(self.version_param, self.default_version) + return unicode_http_header(version) # We don't need to implement `reverse`, as the versioning is based # on the `Accept` header, not on the request URL. @@ -77,6 +79,17 @@ class AcceptHeaderVersioning(BaseVersioning): class URLPathVersioning(BaseVersioning): """ + To the client this is the same style as `NamespaceVersioning`. + The difference is in the backend - this implementation uses + Django's URL keyword arguments to determine the version. + + An example URL conf for two views that accept two different versions. + + urlpatterns = [ + url(r'^(?P<version>{v1,v2})/users/$', users_list, name='users-list'), + url(r'^(?P<version>{v1,v2})/users/(?P<pk>[0-9]+)/$', users_detail, name='users-detail') + ] + GET /1.0/something/ HTTP/1.1 Host: example.com Accept: application/json @@ -103,6 +116,20 @@ class NamespaceVersioning(BaseVersioning): The difference is in the backend - this implementation uses Django's URL namespaces to determine the version. + An example URL conf that is namespaced into two seperate versions + + # users/urls.py + urlpatterns = [ + url(r'^/users/$', users_list, name='users-list'), + url(r'^/users/(?P<pk>[0-9]+)/$', users_detail, name='users-detail') + ] + + # urls.py + urlpatterns = [ + url(r'^v1/', include('users.urls', namespace='v1')), + url(r'^v2/', include('users.urls', namespace='v2')) + ] + GET /1.0/something/ HTTP/1.1 Host: example.com Accept: application/json From 70bd3a32f7cf57543e8ec08fddf001a718e40c7f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 16 Dec 2014 20:01:01 +0000 Subject: [PATCH 1327/1652] Minor comment tweak --- rest_framework/versioning.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index 9a27cb081..223d0f613 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -56,7 +56,7 @@ class HostNameVersioning(BaseVersioning): return match.group(1) # We don't need to implement `reverse`, as the hostname will already be - # preserved as part of the standard `reverse` implementation. + # preserved as part of the REST framework `reverse` implementation. class AcceptHeaderVersioning(BaseVersioning): From 05a6eaec8aebdca2248b9e1069a15769fd85a480 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 12:41:46 +0000 Subject: [PATCH 1328/1652] More docs, plus 'ALLOWED_VERSIONS' setting. --- docs/api-guide/exceptions.md | 16 +++ docs/api-guide/settings.md | 22 ++++ docs/api-guide/versioning.md | 195 ++++++++++++++++++++++++++++++++++- docs/index.md | 2 + mkdocs.yml | 1 + rest_framework/exceptions.py | 5 + rest_framework/settings.py | 5 + rest_framework/versioning.py | 120 ++++++++++++--------- tests/test_versioning.py | 60 ++++++++++- 9 files changed, 375 insertions(+), 51 deletions(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index 31a8431bc..50bd14dd2 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -128,6 +128,14 @@ Raised when an authenticated request fails the permission checks. By default this exception results in a response with the HTTP status code "403 Forbidden". +## NotFound + +**Signature:** `NotFound(detail=None)` + +Raised when a resource does not exists at the given URL. This exception is equivalent to the standard `Http404` Django exception. + +By default this exception results in a response with the HTTP status code "404 Not Found". + ## MethodNotAllowed **Signature:** `MethodNotAllowed(method, detail=None)` @@ -136,6 +144,14 @@ Raised when an incoming request occurs that does not map to a handler method on By default this exception results in a response with the HTTP status code "405 Method Not Allowed". +## NotAcceptable + +**Signature:** `NotAcceptable(detail=None)` + +Raised when an incoming request occurs with an `Accept` header that cannot be satisfied by any of the available renderers. + +By default this exception results in a response with the HTTP status code "406 Not Acceptable". + ## UnsupportedMediaType **Signature:** `UnsupportedMediaType(media_type, detail=None)` diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 9efeda7fa..5af429d16 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -166,6 +166,28 @@ Default: `ordering` --- +## Versioning settings + +#### DEFAULT_VERSION + +The value that should be used for `request.version` when no versioning information is present. + +Default: `None` + +#### ALLOWED_VERSIONS + +If set, this value will restrict the set of versions that may be returned by the versioning scheme, and will raise an error if the provided version if not in this set. + +Default: `None` + +#### VERSION_PARAMETER + +The string that should used for any versioning parameters, such as in the media type or URL query parameters. + +Default: `'version'` + +--- + ## Authentication settings *The following settings control the behavior of unauthenticated requests.* diff --git a/docs/api-guide/versioning.md b/docs/api-guide/versioning.md index df8148941..92380cc0e 100644 --- a/docs/api-guide/versioning.md +++ b/docs/api-guide/versioning.md @@ -6,4 +6,197 @@ source: versioning.py > > — [Roy Fielding][cite]. -[cite]: http://www.slideshare.net/evolve_conference/201308-fielding-evolve/31 \ No newline at end of file +API versioning allows you to alter behavior between different clients. REST framework provides for a number of different versioning schemes. + +Versioning is determined by the incoming client request, and may either be based on the request URL, or based on the request headers. + +## Versioning with REST framework + +When API versioning is enabled, the `request.version` attribute will contain a string that corresponds to the version requested in the incoming client request. + +By default, versioning is not enabled, and `request.version` will always return `None`. + +#### Varying behavior based on the version + +How you vary the API behavior is up to you, but one example you might typically want is to switch to a different serialization style in a newer version. For example: + + def get_serializer_class(self): + if self.request.version == 'v1': + return AccountSerializerVersion1 + return AccountSerializer + +#### Reversing URLs for versioned APIs + +The `reverse` function included by REST framework ties in with the versioning scheme. You need to make sure to include the current `request` as a keyword argument, like so. + + reverse('bookings-list', request=request) + +The above function will apply any URL transformations appropriate to the request version. For example: + +* If `NamespacedVersioning` was being used, and the API version was 'v1', then the URL lookup used would be `'v1:bookings-list'`, which might resolve to a URL like `http://example.org/v1/bookings/`. +* If `QueryParameterVersioning` was being used, and the API version was `1.0`, then the returned URL might be something like `http://example.org/bookings/?version=1.0` + +#### Versioned APIs and hyperlinked serializers + +When using hyperlinked serialization styles together with a URL based versioning scheme make sure to include the request as context to the serializer. + + def get(self, request): + queryset = Booking.objects.all() + serializer = BookingsSerializer(queryset, many=True, context={'request': request}) + return Response({'all_bookings': serializer.data}) + +Doing so will allow any returned URLs to include the appropriate versioning. + +## Configuring the versioning scheme + +The versioning scheme is defined by the `DEFAULT_VERSIONING_CLASS` settings key. + + REST_FRAMEWORK = { + 'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.NamespaceVersioning' + } + +Unless it is explicitly set, the value for `DEFAULT_VERSIONING_CLASS` will be `None`. In this case the `request.version` attribute will always return `None`. + +You can also set the versioning scheme on an individual view. Typically you won't need to do this, as it makes more sense to have a single versioning scheme used globally. If you do need to do so, use the `versioning_class` attribute. + + class ProfileList(APIView): + versioning_class = versioning.QueryParameterVersioning + +#### Other versioning settings + +The following settings keys are also used to control versioning: + +* `DEFAULT_VERSION`. The value that should be used for `request.version` when no versioning information is present. Defaults to `None`. +* `ALLOWED_VERSIONS`. If set, this value will restrict the set of versions that may be returned by the versioning scheme, and will raise an error if the provided version if not in this set. Defaults to `None`. +* `VERSION_PARAMETER`. The string that should used for any versioning parameters, such as in the media type or URL query parameters. Defaults to `'version'`. + +--- + +# API Reference + +## AcceptHeaderVersioning + +This scheme requires the client to specify the version as part of the media type in the `Accept` header. The version is included as a media type parameter, that supplements the main media type. + +Here's an example HTTP request using the accept header versioning style. + + GET /bookings/ HTTP/1.1 + Host: example.com + Accept: application/json; version=1.0 + +In the example request above `request.version` attribute would return the string `'1.0'`. + +Versioning based on accept headers is [generally considered][klabnik-guidelines] as [best practice][heroku-guidelines], although other styles may be suitable depending on your client requirements. + +#### Using accept headers with vendor media types + +Strictly speaking the `json` media type is not specified as [including additional parameters][json-parameters]. If you are building a well-specified public API you might consider using a [vendor media type][vendor-media-type]. To do so, configure your renderers to use a JSON based renderer with a custom media type: + + class BookingsAPIRenderer(JSONRenderer): + media_type = 'application/vnd.megacorp.bookings+json' + +Your client requests would now look like this: + + GET /bookings/ HTTP/1.1 + Host: example.com + Accept: application/vnd.megacorp.bookings+json; version=1.0 + +## URLParameterVersioning + +This scheme requires the client to specify the version as part of the URL path. + + GET /v1/bookings/ HTTP/1.1 + Host: example.com + Accept: application/json + +Your URL conf must include a pattern that matches the version with a `'version'` keyword argument, so that this information is available to the versioning scheme. + + urlpatterns = [ + url( + r'^(?P<version>{v1,v2})/bookings/$', + bookings_list, + name='bookings-list' + ), + url( + r'^(?P<version>{v1,v2})/bookings/(?P<pk>[0-9]+)/$', + bookings_detail, + name='bookings-detail' + ) + ] + +## NamespaceVersioning + +To the client, this scheme is the same as `URLParameterVersioning`. The only difference is how it is configured in your Django application, as it uses URL namespacing, instead of URL keyword arguments. + + GET /v1/something/ HTTP/1.1 + Host: example.com + Accept: application/json + +With this scheme the `request.version` attribute is determined based on the `namespace` that matches the incoming request path. + +In the following example we're giving a set of views two different possible URL prefixes, each under a different namespace: + + # bookings/urls.py + urlpatterns = [ + url(r'^$', bookings_list, name='bookings-list'), + url(r'^(?P<pk>[0-9]+)/$', bookings_detail, name='bookings-detail') + ] + + # urls.py + urlpatterns = [ + url(r'^v1/bookings/', include('bookings.urls', namespace='v1')), + url(r'^v2/bookings/', include('bookings.urls', namespace='v2')) + ] + +Both `URLParameterVersioning` and `NamespaceVersioning` are reasonable if you just need a simple versioning scheme. The `URLParameterVersioning` approach might be better suitable for small ad-hoc projects, and the `NaemspaceVersioning` is probably easier to manage for larger projects. + +## HostNameVersioning + +The hostname versioning scheme requires the client to specify the requested version as part of the hostname in the URL. + +For example the following is an HTTP request to the `http://v1.example.com/bookings/` URL: + + GET /bookings/ HTTP/1.1 + Host: v1.example.com + Accept: application/json + +By default this implementation expects the hostname to match this simple regular expression: + + ^([a-zA-Z0-9]+)\.[a-zA-Z0-9]+\.[a-zA-Z0-9]+$ + +Note that the first group is enclosed in brackets, indicating that this is the matched portion of the hostname. + +The `HostNameVersioning` scheme can be awkward to use in debug mode as you will typically be accessing a raw IP address such as `127.0.0.1`. There are various online services which you to [access localhost with a custom subdomain][lvh] which you may find helpful in this case. + +Hostname based versioning can be particularly useful if you have requirements to route incoming requests to different servers based on the version, as you can configure different DNS records for different API versions. + +## QueryParameterVersioning + +This scheme is a simple style that includes the version as a query parameter in the URL. For example: + + GET /something/?version=0.1 HTTP/1.1 + Host: example.com + Accept: application/json + +--- + +# Custom versioning schemes + +To implement a custom versioning scheme, subclass `BaseVersioning` and override the `.determine_version` method. + +## Example + +The following example uses a custom `X-API-Version` header to determine the requested version. + + class XAPIVersionScheme(versioning.BaseVersioning): + def determine_version(self, request, *args, **kwargs): + return request.META.get('HTTP_X_API_VERSION', None) + +If your versioning scheme is based on the request URL, you will also want to alter how versioned URLs are determined. In order to do so you should override the `.reverse()` method on the class. See the source code for examples. + +[cite]: http://www.slideshare.net/evolve_conference/201308-fielding-evolve/31 +[klabnik-guidelines]: http://blog.steveklabnik.com/posts/2011-07-03-nobody-understands-rest-or-http#i_want_my_api_to_be_versioned +[heroku-guidelines]: https://github.com/interagent/http-api-design#version-with-accepts-header +[json-parameters]: http://tools.ietf.org/html/rfc4627#section-6 +[vendor-media-type]: http://en.wikipedia.org/wiki/Internet_media_type#Vendor_tree +[lvh]: https://reinteractive.net/posts/199-developing-and-testing-rails-applications-with-subdomains diff --git a/docs/index.md b/docs/index.md index 502d352cb..14cf30acb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -175,6 +175,7 @@ The API guide is your complete reference manual to all the functionality provide * [Throttling][throttling] * [Filtering][filtering] * [Pagination][pagination] +* [Versioning][versioning] * [Content negotiation][contentnegotiation] * [Format suffixes][formatsuffixes] * [Returning URLs][reverse] @@ -294,6 +295,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [throttling]: api-guide/throttling.md [filtering]: api-guide/filtering.md [pagination]: api-guide/pagination.md +[versioning]: api-guide/versioning.md [contentnegotiation]: api-guide/content-negotiation.md [formatsuffixes]: api-guide/format-suffixes.md [reverse]: api-guide/reverse.md diff --git a/mkdocs.yml b/mkdocs.yml index 9513f04f7..c2d6bb524 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -32,6 +32,7 @@ pages: - ['api-guide/throttling.md', 'API Guide', 'Throttling'] - ['api-guide/filtering.md', 'API Guide', 'Filtering'] - ['api-guide/pagination.md', 'API Guide', 'Pagination'] + - ['api-guide/versioning.md', 'API Guide', 'Versioning'] - ['api-guide/content-negotiation.md', 'API Guide', 'Content negotiation'] - ['api-guide/format-suffixes.md', 'API Guide', 'Format suffixes'] - ['api-guide/reverse.md', 'API Guide', 'Returning URLs'] diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index be41d08d9..238934dbe 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -89,6 +89,11 @@ class PermissionDenied(APIException): default_detail = _('You do not have permission to perform this action.') +class NotFound(APIException): + status_code = status.HTTP_404_NOT_FOUND + default_detail = _('Not found') + + class MethodNotAllowed(APIException): status_code = status.HTTP_405_METHOD_NOT_ALLOWED default_detail = _("Method '%s' not allowed.") diff --git a/rest_framework/settings.py b/rest_framework/settings.py index da3be38dd..877d461be 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -68,6 +68,11 @@ DEFAULTS = { 'SEARCH_PARAM': 'search', 'ORDERING_PARAM': 'ordering', + # Versioning + 'DEFAULT_VERSION': None, + 'ALLOWED_VERSIONS': None, + 'VERSION_PARAM': 'version', + # Authentication 'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser', 'UNAUTHENTICATED_TOKEN': None, diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index 223d0f613..440efd139 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -1,13 +1,20 @@ # coding: utf-8 from __future__ import unicode_literals +from django.utils.translation import ugettext_lazy as _ +from rest_framework import exceptions from rest_framework.compat import unicode_http_header from rest_framework.reverse import _reverse +from rest_framework.settings import api_settings from rest_framework.templatetags.rest_framework import replace_query_param from rest_framework.utils.mediatypes import _MediaType import re class BaseVersioning(object): + default_version = api_settings.DEFAULT_VERSION + allowed_versions = api_settings.ALLOWED_VERSIONS + version_param = api_settings.VERSION_PARAM + def determine_version(self, request, *args, **kwargs): msg = '{cls}.determine_version() must be implemented.' raise NotImplemented(msg.format( @@ -17,46 +24,10 @@ class BaseVersioning(object): def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): return _reverse(viewname, args, kwargs, request, format, **extra) - -class QueryParameterVersioning(BaseVersioning): - """ - GET /something/?version=0.1 HTTP/1.1 - Host: example.com - Accept: application/json - """ - default_version = None - version_param = 'version' - - def determine_version(self, request, *args, **kwargs): - return request.query_params.get(self.version_param) - - def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): - url = super(QueryParameterVersioning, self).reverse( - viewname, args, kwargs, request, format, **extra - ) - if request.version is not None: - return replace_query_param(url, self.version_param, request.version) - return url - - -class HostNameVersioning(BaseVersioning): - """ - GET /something/ HTTP/1.1 - Host: v1.example.com - Accept: application/json - """ - default_version = None - hostname_regex = re.compile(r'^([a-zA-Z0-9]+)\.[a-zA-Z0-9]+\.[a-zA-Z0-9]+$') - - def determine_version(self, request, *args, **kwargs): - hostname, seperator, port = request.get_host().partition(':') - match = self.hostname_regex.match(hostname) - if not match: - return self.default_version - return match.group(1) - - # We don't need to implement `reverse`, as the hostname will already be - # preserved as part of the REST framework `reverse` implementation. + def is_allowed_version(self, version): + if not self.allowed_versions: + return True + return (version == self.default_version) or (version in self.allowed_versions) class AcceptHeaderVersioning(BaseVersioning): @@ -65,13 +36,15 @@ class AcceptHeaderVersioning(BaseVersioning): Host: example.com Accept: application/json; version=1.0 """ - default_version = None - version_param = 'version' + invalid_version_message = _("Invalid version in 'Accept' header.") def determine_version(self, request, *args, **kwargs): media_type = _MediaType(request.accepted_media_type) version = media_type.params.get(self.version_param, self.default_version) - return unicode_http_header(version) + version = unicode_http_header(version) + if not self.is_allowed_version(version): + raise exceptions.NotAcceptable(self.invalid_version_message) + return version # We don't need to implement `reverse`, as the versioning is based # on the `Accept` header, not on the request URL. @@ -94,11 +67,13 @@ class URLPathVersioning(BaseVersioning): Host: example.com Accept: application/json """ - default_version = None - version_param = 'version' + invalid_version_message = _('Invalid version in URL path.') def determine_version(self, request, *args, **kwargs): - return kwargs.get(self.version_param, self.default_version) + version = kwargs.get(self.version_param, self.default_version) + if not self.is_allowed_version(version): + raise exceptions.NotFound(self.invalid_version_message) + return version def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): if request.version is not None: @@ -134,13 +109,16 @@ class NamespaceVersioning(BaseVersioning): Host: example.com Accept: application/json """ - default_version = None + invalid_version_message = _('Invalid version in URL path.') def determine_version(self, request, *args, **kwargs): resolver_match = getattr(request, 'resolver_match', None) if (resolver_match is None or not resolver_match.namespace): return self.default_version - return resolver_match.namespace + version = resolver_match.namespace + if not self.is_allowed_version(version): + raise exceptions.NotFound(self.invalid_version_message) + return version def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): if request.version is not None: @@ -148,3 +126,49 @@ class NamespaceVersioning(BaseVersioning): return super(NamespaceVersioning, self).reverse( viewname, args, kwargs, request, format, **extra ) + + +class HostNameVersioning(BaseVersioning): + """ + GET /something/ HTTP/1.1 + Host: v1.example.com + Accept: application/json + """ + hostname_regex = re.compile(r'^([a-zA-Z0-9]+)\.[a-zA-Z0-9]+\.[a-zA-Z0-9]+$') + invalid_version_message = _('Invalid version in hostname.') + + def determine_version(self, request, *args, **kwargs): + hostname, seperator, port = request.get_host().partition(':') + match = self.hostname_regex.match(hostname) + if not match: + return self.default_version + version = match.group(1) + if not self.is_allowed_version(version): + raise exceptions.NotFound(self.invalid_version_message) + return version + + # We don't need to implement `reverse`, as the hostname will already be + # preserved as part of the REST framework `reverse` implementation. + + +class QueryParameterVersioning(BaseVersioning): + """ + GET /something/?version=0.1 HTTP/1.1 + Host: example.com + Accept: application/json + """ + invalid_version_message = _('Invalid version in query parameter.') + + def determine_version(self, request, *args, **kwargs): + version = request.query_params.get(self.version_param) + if not self.is_allowed_version(version): + raise exceptions.NotFound(self.invalid_version_message) + return version + + def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): + url = super(QueryParameterVersioning, self).reverse( + viewname, args, kwargs, request, format, **extra + ) + if request.version is not None: + return replace_query_param(url, self.version_param, request.version) + return url diff --git a/tests/test_versioning.py b/tests/test_versioning.py index eaac5dfb3..c44f727d2 100644 --- a/tests/test_versioning.py +++ b/tests/test_versioning.py @@ -1,5 +1,5 @@ from django.conf.urls import include, url -from rest_framework import versioning +from rest_framework import status, versioning from rest_framework.decorators import APIView from rest_framework.response import Response from rest_framework.reverse import reverse @@ -16,6 +16,16 @@ class ReverseView(APIView): return Response({'url': reverse('another', request=request)}) +class RequestInvalidVersionView(APIView): + def determine_version(self, request, *args, **kwargs): + scheme = self.versioning_class() + scheme.allowed_versions = ('v1', 'v2') + return (scheme.determine_version(request, *args, **kwargs), scheme) + + def get(self, request, *args, **kwargs): + return Response({'version': request.version}) + + factory = APIRequestFactory() mock_view = lambda request: None @@ -150,7 +160,7 @@ class TestURLReversing(APITestCase): response = view(request) assert response.data == {'url': 'http://testserver/another/'} - def test_namespace_versioning(self): + def test_reverse_namespace_versioning(self): class FakeResolverMatch: namespace = 'v1' @@ -165,3 +175,49 @@ class TestURLReversing(APITestCase): request = factory.get('/endpoint/') response = view(request) assert response.data == {'url': 'http://testserver/another/'} + + +class TestInvalidVersion: + def test_invalid_query_param_versioning(self): + scheme = versioning.QueryParameterVersioning + view = RequestInvalidVersionView.as_view(versioning_class=scheme) + + request = factory.get('/endpoint/?version=v3') + response = view(request) + assert response.status_code == status.HTTP_404_NOT_FOUND + + def test_invalid_host_name_versioning(self): + scheme = versioning.HostNameVersioning + view = RequestInvalidVersionView.as_view(versioning_class=scheme) + + request = factory.get('/endpoint/', HTTP_HOST='v3.example.org') + response = view(request) + assert response.status_code == status.HTTP_404_NOT_FOUND + + def test_invalid_accept_header_versioning(self): + scheme = versioning.AcceptHeaderVersioning + view = RequestInvalidVersionView.as_view(versioning_class=scheme) + + request = factory.get('/endpoint/', HTTP_ACCEPT='application/json; version=v3') + response = view(request) + assert response.status_code == status.HTTP_406_NOT_ACCEPTABLE + + def test_invalid_url_path_versioning(self): + scheme = versioning.URLPathVersioning + view = RequestInvalidVersionView.as_view(versioning_class=scheme) + + request = factory.get('/v3/endpoint/') + response = view(request, version='v3') + assert response.status_code == status.HTTP_404_NOT_FOUND + + def test_invalid_namespace_versioning(self): + class FakeResolverMatch: + namespace = 'v3' + + scheme = versioning.NamespaceVersioning + view = RequestInvalidVersionView.as_view(versioning_class=scheme) + + request = factory.get('/v3/endpoint/') + request.resolver_match = FakeResolverMatch + response = view(request, version='v3') + assert response.status_code == status.HTTP_404_NOT_FOUND From 65fc0d0f77c8882481ef37a68294f98879d3f8d5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 13:22:52 +0000 Subject: [PATCH 1329/1652] Ensure request.auth is available to response middleware. --- rest_framework/request.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index 8248cbd40..cfbbdeccd 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -278,7 +278,8 @@ class Request(object): compatibility with django.contrib.auth where the user property is set in the login and logout functions. - Sets the user on the wrapped original request as well. + Note that we also set the user on Django's underlying `HttpRequest` + instance, ensuring that it is available to any middleware in the stack. """ self._user = value self._request.user = value @@ -300,6 +301,7 @@ class Request(object): request, such as an authentication token. """ self._auth = value + self._request.auth = value @property def successful_authenticator(self): @@ -459,7 +461,7 @@ class Request(object): if user_auth_tuple is not None: self._authenticator = authenticator - self.user, self._auth = user_auth_tuple + self.user, self.auth = user_auth_tuple return self._not_authenticated() @@ -479,9 +481,9 @@ class Request(object): self.user = None if api_settings.UNAUTHENTICATED_TOKEN: - self._auth = api_settings.UNAUTHENTICATED_TOKEN() + self.auth = api_settings.UNAUTHENTICATED_TOKEN() else: - self._auth = None + self.auth = None def __getattr__(self, attr): """ From 426547c61c725ca7dc47671c084d1a2805c92305 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 13:39:35 +0000 Subject: [PATCH 1330/1652] str() -> six.text_type(). Closes #2290. --- rest_framework/exceptions.py | 4 ++-- rest_framework/relations.py | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index be41d08d9..1f381e4ef 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -5,8 +5,8 @@ In addition Django's built in 403 and 404 exceptions are handled. (`django.http.Http404` and `django.core.exceptions.PermissionDenied`) """ from __future__ import unicode_literals +from django.utils import six from django.utils.encoding import force_text - from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy from rest_framework import status @@ -66,7 +66,7 @@ class ValidationError(APIException): self.detail = _force_text_recursive(detail) def __str__(self): - return str(self.detail) + return six.text_type(self.detail) class ParseError(APIException): diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 892ce6c19..7b119291d 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -1,13 +1,15 @@ -from django.utils.encoding import smart_text -from rest_framework.fields import get_attribute, empty, Field -from rest_framework.reverse import reverse -from rest_framework.utils import html +# coding: utf-8 +from __future__ import unicode_literals from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch, Resolver404 from django.db.models.query import QuerySet from django.utils import six +from django.utils.encoding import smart_text from django.utils.six.moves.urllib import parse as urlparse from django.utils.translation import ugettext_lazy as _ +from rest_framework.fields import get_attribute, empty, Field +from rest_framework.reverse import reverse +from rest_framework.utils import html class PKOnlyObject(object): @@ -103,8 +105,8 @@ class RelatedField(Field): def choices(self): return dict([ ( - str(self.to_representation(item)), - str(item) + six.text_type(self.to_representation(item)), + six.text_type(item) ) for item in self.queryset.all() ]) @@ -364,8 +366,8 @@ class ManyRelatedField(Field): ] return dict([ ( - str(item_representation), - str(item) + ' - ' + str(item_representation) + six.text_type(item_representation), + six.text_type(item) + ' - ' + six.text_type(item_representation) ) for item, item_representation in items_and_representations ]) From c6137bbf5aa7ca800e4afc06657e5196b2e0e481 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 14:14:51 +0000 Subject: [PATCH 1331/1652] Serializer API restrictions. --- docs/api-guide/serializers.md | 6 +++++ rest_framework/generics.py | 8 +++--- rest_framework/renderers.py | 16 ++++++----- rest_framework/serializers.py | 51 +++++++++++++++++++++++++++++------ tests/test_bound_fields.py | 2 +- 5 files changed, 62 insertions(+), 21 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 5fe6b4c29..137cc9d5f 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -240,6 +240,12 @@ Serializer classes can also include reusable validators that are applied to the For more information see the [validators documentation](validators.md). +## Accessing the initial data and instance + +When passing an initial object or queryset to a serializer instance, the object will be made available as `.instance`. If no initial object is passed then the `.instance` attribute will be `None`. + +When passing data to a serializer instance, the unmodified data will be made available as `.initial_data`. If the data keyword argument is not passed then the `.initial_data` attribute will not exist. + ## Partial updates By default, serializers must be passed values for all required fields or they will raise validation errors. You can use the `partial` argument in order to allow partial updates. diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 3d6cf1684..e6db155e7 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -79,16 +79,14 @@ class GenericAPIView(views.APIView): 'view': self } - def get_serializer(self, instance=None, data=None, many=False, partial=False): + def get_serializer(self, *args, **kwargs): """ Return the serializer instance that should be used for validating and deserializing input, and for serializing output. """ serializer_class = self.get_serializer_class() - context = self.get_serializer_context() - return serializer_class( - instance, data=data, many=many, partial=partial, context=context - ) + kwargs['context'] = self.get_serializer_context() + return serializer_class(*args, **kwargs) def get_pagination_serializer(self, page): """ diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index cfcf1f5d0..634338e9e 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -544,12 +544,12 @@ class BrowsableAPIRenderer(BaseRenderer): # serializer instance, rather than dynamically creating a new one. if request.method == method and serializer is not None: try: - data = request.data + kwargs = {'data': request.data} except ParseError: - data = None + kwargs = {} existing_serializer = serializer else: - data = None + kwargs = {} existing_serializer = None with override_method(view, request, method) as request: @@ -569,11 +569,13 @@ class BrowsableAPIRenderer(BaseRenderer): serializer = existing_serializer else: if method in ('PUT', 'PATCH'): - serializer = view.get_serializer(instance=instance, data=data) + serializer = view.get_serializer(instance=instance, **kwargs) else: - serializer = view.get_serializer(data=data) - if data is not None: - serializer.is_valid() + serializer = view.get_serializer(**kwargs) + + if hasattr(serializer, 'initial_data'): + serializer.is_valid() + form_renderer = self.form_renderer_class() return form_renderer.render( serializer.data, diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index e9860a2fc..8de22f4b9 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -58,11 +58,31 @@ class BaseSerializer(Field): """ The BaseSerializer class provides a minimal class which may be used for writing custom serializer implementations. + + Note that we strongly restrict the ordering of operations/properties + that may be used on the serializer in order to enforce correct usage. + + In particular, if a `data=` argument is passed then: + + .is_valid() - Available. + .initial_data - Available. + .validated_data - Only available after calling `is_valid()` + .errors - Only available after calling `is_valid()` + .data - Only available after calling `is_valid()` + + If a `data=` argument is not passed then: + + .is_valid() - Not available. + .initial_data - Not available. + .validated_data - Not available. + .errors - Not available. + .data - Available. """ - def __init__(self, instance=None, data=None, **kwargs): + def __init__(self, instance=None, data=empty, **kwargs): self.instance = instance - self._initial_data = data + if data is not empty: + self.initial_data = data self.partial = kwargs.pop('partial', False) self._context = kwargs.pop('context', {}) kwargs.pop('many', None) @@ -156,9 +176,14 @@ class BaseSerializer(Field): (self.__class__.__module__, self.__class__.__name__) ) + assert hasattr(self, 'initial_data'), ( + 'Cannot call `.is_valid()` as no `data=` keyword argument was' + 'passed when instantiating the serializer instance.' + ) + if not hasattr(self, '_validated_data'): try: - self._validated_data = self.run_validation(self._initial_data) + self._validated_data = self.run_validation(self.initial_data) except ValidationError as exc: self._validated_data = {} self._errors = exc.detail @@ -172,6 +197,16 @@ class BaseSerializer(Field): @property def data(self): + if hasattr(self, 'initial_data') and not hasattr(self, '_validated_data'): + msg = ( + 'When a serializer is passed a `data` keyword argument you ' + 'must call `.is_valid()` before attempting to access the ' + 'serialized `.data` representation.\n' + 'You should either call `.is_valid()` first, ' + 'or access `.initial_data` instead.' + ) + raise AssertionError(msg) + if not hasattr(self, '_data'): if self.instance is not None and not getattr(self, '_errors', None): self._data = self.to_representation(self.instance) @@ -295,11 +330,11 @@ class Serializer(BaseSerializer): return getattr(getattr(self, 'Meta', None), 'validators', []) def get_initial(self): - if self._initial_data is not None: + if hasattr(self, 'initial_data'): return OrderedDict([ - (field_name, field.get_value(self._initial_data)) + (field_name, field.get_value(self.initial_data)) for field_name, field in self.fields.items() - if field.get_value(self._initial_data) is not empty + if field.get_value(self.initial_data) is not empty and not field.read_only ]) @@ -447,8 +482,8 @@ class ListSerializer(BaseSerializer): self.child.bind(field_name='', parent=self) def get_initial(self): - if self._initial_data is not None: - return self.to_representation(self._initial_data) + if hasattr(self, 'initial_data'): + return self.to_representation(self.initial_data) return [] def get_value(self, dictionary): diff --git a/tests/test_bound_fields.py b/tests/test_bound_fields.py index 469437e4b..bfc54b233 100644 --- a/tests/test_bound_fields.py +++ b/tests/test_bound_fields.py @@ -22,7 +22,7 @@ class TestSimpleBoundField: amount = serializers.IntegerField() serializer = ExampleSerializer(data={'text': 'abc', 'amount': 123}) - + assert serializer.is_valid() assert serializer['text'].value == 'abc' assert serializer['text'].errors is None assert serializer['text'].name == 'text' From 3fff5cb6e0960b7ff8abd9f13a075f1f057de0a7 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 15:13:48 +0000 Subject: [PATCH 1332/1652] Fix empty HTML values when a default is provided. --- docs/api-guide/fields.md | 2 ++ rest_framework/fields.py | 5 +++++ tests/test_fields.py | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index e4ef1d4aa..f06db56cf 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -112,6 +112,8 @@ Two options are currently used in HTML form generation, `'input_type'` and `'bas A boolean representation. +When using HTML encoded form input be aware that omitting a value will always be treated as setting a field to `False`, even if it has a `default=True` option specified. This is because HTML checkbox inputs represent the unchecked state by omitting the value, so REST framework treats omission as if it is an empty checkbox input. + Corresponds to `django.db.models.fields.BooleanField`. **Signature:** `BooleanField()` diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f3e17b18d..5be2a21bb 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -185,8 +185,13 @@ class Field(object): self.allow_null = allow_null if allow_null and self.default_empty_html is empty: + # HTML input cannot represent `None` values, so we need to + # forcibly coerce empty HTML values to `None` if `allow_null=True`. self.default_empty_html = None + if default is not empty: + self.default_empty_html = default + if validators is not None: self.validators = validators[:] diff --git a/tests/test_fields.py b/tests/test_fields.py index c20bdd8c2..7f7af5cc0 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -215,6 +215,26 @@ class TestBooleanHTMLInput: assert serializer.validated_data == {'archived': False} +class TestCharHTMLInput: + def setup(self): + class TestSerializer(serializers.Serializer): + message = serializers.CharField(default='happy') + self.Serializer = TestSerializer + + def test_empty_html_checkbox(self): + """ + HTML checkboxes do not send any value, but should be treated + as `False` by BooleanField. + """ + # This class mocks up a dictionary like object, that behaves + # as if it was returned for multipart or urlencoded data. + class MockHTMLDict(dict): + getlist = None + serializer = self.Serializer(data=MockHTMLDict()) + assert serializer.is_valid() + assert serializer.validated_data == {'message': 'happy'} + + class TestCreateOnlyDefault: def setup(self): default = serializers.CreateOnlyDefault('2001-01-01') From 1ba822010d0943c67c127f3f62e873b64348ef87 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 15:22:27 +0000 Subject: [PATCH 1333/1652] Highlight trailing '.' in command so it wont be missed. --- docs/tutorial/quickstart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index c3f959946..a4474c34e 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -19,7 +19,7 @@ Create a new Django project named `tutorial`, then start a new app called `quick pip install djangorestframework # Set up a new project with a single application - django-admin.py startproject tutorial . + django-admin.py startproject tutorial . # Note the trailing '.' character cd tutorial django-admin.py startapp quickstart cd .. From bbd55fafc5e29d9984ca87297a6487cacfa71083 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 15:58:30 +0000 Subject: [PATCH 1334/1652] Version 3.0.2 --- docs/topics/release-notes.md | 37 ++++++++++++++++++++++++++++++++++-- rest_framework/__init__.py | 2 +- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index f00d3c54e..aaaaeb584 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,9 +40,22 @@ You can determine your currently installed version using `pip freeze`: ## 3.0.x series +### 3.0.2 + +**Date**: [December 2014][3.0.2-milestone]. + + +* Ensure `request.user` is made available to response middleware. ([#2155][gh2155]) +* `Client.logout()` also cancels any existing `force_authenticate`. ([#2218][gh2218], [#2259][gh2259]) +* Extra assertions and better checks to preventing incorrect serializer API use. ([#2228][gh2228], [#2234][gh2234], [#2262][gh2262], [#2263][gh2263], [#2266][gh2266], [#2267][gh2267], [#2289][gh2289], [#2291][gh2291]) +* Fixed `min_length` message for `CharField`. ([#2255][gh2255]) +* Fix `UnicodeDecodeError`, which can occur on serializer `repr`. ([#2270][gh2270], [#2279][gh2279]) +* Fix empty HTML values when a default is provided. ([#2280][gh2280], [#2294][gh2294]) +* Fix `SlugRelatedField` raising `UnicodeEncodeError` when used as a multiple choice input. ([#2290][gh2290]) + ### 3.0.1 -**Date**: [December 2014][3.0.1-milestone]. +**Date**: [11th December 2014][3.0.1-milestone]. * More helpful error message when the default Serializer `create()` fails. ([#2013][gh2013]) * Raise error when attempting to save serializer if data is not valid. ([#2098][gh2098]) @@ -665,9 +678,11 @@ For older release notes, [please see the GitHub repo](old-release-notes). [ticket-582]: https://github.com/tomchristie/django-rest-framework/issues/582 [rfc-6266]: http://tools.ietf.org/html/rfc6266#section-4.3 [old-release-notes]: https://github.com/tomchristie/django-rest-framework/blob/2.4.4/docs/topics/release-notes.md#04x-series + [3.0.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22 +[3.0.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.2+Release%22 - +<!-- 3.0.1 --> [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 [gh2098]: https://github.com/tomchristie/django-rest-framework/issues/2098 [gh2109]: https://github.com/tomchristie/django-rest-framework/issues/2109 @@ -697,3 +712,21 @@ For older release notes, [please see the GitHub repo](old-release-notes). [gh2242]: https://github.com/tomchristie/django-rest-framework/issues/2242 [gh2243]: https://github.com/tomchristie/django-rest-framework/issues/2243 [gh2244]: https://github.com/tomchristie/django-rest-framework/issues/2244 +<!-- 3.0.2 --> +[gh2155]: https://github.com/tomchristie/django-rest-framework/issues/2155 +[gh2218]: https://github.com/tomchristie/django-rest-framework/issues/2218 +[gh2228]: https://github.com/tomchristie/django-rest-framework/issues/2228 +[gh2234]: https://github.com/tomchristie/django-rest-framework/issues/2234 +[gh2255]: https://github.com/tomchristie/django-rest-framework/issues/2255 +[gh2259]: https://github.com/tomchristie/django-rest-framework/issues/2259 +[gh2262]: https://github.com/tomchristie/django-rest-framework/issues/2262 +[gh2263]: https://github.com/tomchristie/django-rest-framework/issues/2263 +[gh2266]: https://github.com/tomchristie/django-rest-framework/issues/2266 +[gh2267]: https://github.com/tomchristie/django-rest-framework/issues/2267 +[gh2270]: https://github.com/tomchristie/django-rest-framework/issues/2270 +[gh2279]: https://github.com/tomchristie/django-rest-framework/issues/2279 +[gh2280]: https://github.com/tomchristie/django-rest-framework/issues/2280 +[gh2289]: https://github.com/tomchristie/django-rest-framework/issues/2289 +[gh2290]: https://github.com/tomchristie/django-rest-framework/issues/2290 +[gh2291]: https://github.com/tomchristie/django-rest-framework/issues/2291 +[gh2294]: https://github.com/tomchristie/django-rest-framework/issues/2294 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index f30f781a6..6808b74b0 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.0.1' +__version__ = '3.0.2' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2014 Tom Christie' From 2adfb6c3aa072867981d9bdc06e81ada632e0c4c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 16:00:49 +0000 Subject: [PATCH 1335/1652] Cleanup extra newline --- docs/topics/release-notes.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index aaaaeb584..00759479e 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -44,7 +44,6 @@ You can determine your currently installed version using `pip freeze`: **Date**: [December 2014][3.0.2-milestone]. - * Ensure `request.user` is made available to response middleware. ([#2155][gh2155]) * `Client.logout()` also cancels any existing `force_authenticate`. ([#2218][gh2218], [#2259][gh2259]) * Extra assertions and better checks to preventing incorrect serializer API use. ([#2228][gh2228], [#2234][gh2234], [#2262][gh2262], [#2263][gh2263], [#2266][gh2266], [#2267][gh2267], [#2289][gh2289], [#2291][gh2291]) From c9a2ce07037475359712104a8a68624e99bdfeb1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 16:19:02 +0000 Subject: [PATCH 1336/1652] Expand permissions docs. Closes #2223. --- docs/api-guide/permissions.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index ddcefadbc..743ca435c 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -10,12 +10,24 @@ Together with [authentication] and [throttling], permissions determine whether a Permission checks are always run at the very start of the view, before any other code is allowed to proceed. Permission checks will typically use the authentication information in the `request.user` and `request.auth` properties to determine if the incoming request should be permitted. +Permissions are used to grant or deny access different classes of users to different parts of the API. + +The simplest style of permission would be to allow access to any authenticated user, and deny access to any unauthenticated user. This corresponds the `IsAuthenticated` class in REST framework. + +A slightly less strict style of permission would be to allow full access to authenticated users, but allow read-only access to unauthenticated users. This corresponds to the `IsAuthenticatedOrReadOnly` class in REST framework. + ## How permissions are determined Permissions in REST framework are always defined as a list of permission classes. Before running the main body of the view each permission in the list is checked. -If any permission check fails an `exceptions.PermissionDenied` exception will be raised, and the main body of the view will not run. +If any permission check fails an `exceptions.PermissionDenied` or `exceptions.NotAuthenticated` exception will be raised, and the main body of the view will not run. + +When the permissions checks fail either a "403 Forbidden" or a "401 Unauthorized" response will be returned, according to the following rules: + +* The request was successfully authenticated, but permission was denied. *— An HTTP 403 Forbidden response will be returned.* +* The request was not successfully authenticated, and the highest priority authentication class *does not* use `WWW-Authenticate` headers. *— An HTTP 403 Forbidden response will be returned.* +* The request was not successfully authenticated, and the highest priority authentication class *does* use `WWW-Authenticate` headers. *— An HTTP 401 Unauthorized response, with an appropriate `WWW-Authenticate` header will be returned.* ## Object level permissions From 530f7a21b3d28ddb24da036e0af6fd7b0a9a2304 Mon Sep 17 00:00:00 2001 From: Brent O'Connor <epicserve@gmail.com> Date: Wed, 17 Dec 2014 10:19:15 -0600 Subject: [PATCH 1337/1652] Fixed a typo --- docs/tutorial/1-serialization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index dea43cc0f..20b9d889d 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -200,7 +200,7 @@ Open the file `snippets/serializers.py` again, and edit the `SnippetSerializer` model = Snippet fields = ('id', 'title', 'code', 'linenos', 'language', 'style') -One nice property that serializers have is that you can inspect all the fields in a serializer instance, by printing it's representation. Open the Django shell with `python manange.py shell`, then try the following: +One nice property that serializers have is that you can inspect all the fields in a serializer instance, by printing it's representation. Open the Django shell with `python manage.py shell`, then try the following: >>> from snippets.serializers import SnippetSerializer >>> serializer = SnippetSerializer() From 90b8f9221e633797c5ab6a25e6c2a14805d459af Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 16:23:00 +0000 Subject: [PATCH 1338/1652] Use six.BytesIO in tutorial. Closes #2296. --- docs/tutorial/1-serialization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index dea43cc0f..aab5ce71b 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -163,7 +163,7 @@ Deserialization is similar. First we parse a stream into Python native datatype # This import will use either `StringIO.StringIO` or `io.BytesIO` # as appropriate, depending on if we're running Python 2 or Python 3. - from rest_framework.compat import BytesIO + from django.utils.six import BytesIO stream = BytesIO(content) data = JSONParser().parse(stream) From eeb6e340644eba70b2fd41100db34b159ae6f091 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Wed, 17 Dec 2014 17:28:11 +0100 Subject: [PATCH 1339/1652] Docs/tutorial import fixes. Refs #2296 --- docs/api-guide/serializers.md | 8 +++++--- docs/tutorial/1-serialization.md | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 137cc9d5f..b9f0e7bc0 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -22,11 +22,13 @@ The serializers in REST framework work very similarly to Django's `Form` and `Mo Let's start by creating a simple object we can use for example purposes: + from datetime import datetime + class Comment(object): def __init__(self, email, content, created=None): self.email = email self.content = content - self.created = created or datetime.datetime.now() + self.created = created or datetime.now() comment = Comment(email='leila@example.com', content='foo bar') @@ -61,10 +63,10 @@ At this point we've translated the model instance into Python native datatypes. Deserialization is similar. First we parse a stream into Python native datatypes... - from StringIO import StringIO + from django.utils.six import BytesIO from rest_framework.parsers import JSONParser - stream = StringIO(json) + stream = BytesIO(json) data = JSONParser().parse(stream) ...then we restore those native datatypes into a dictionary of validated data. diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index b1baf0dd4..ff507a2b8 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -161,8 +161,6 @@ At this point we've translated the model instance into Python native datatypes. Deserialization is similar. First we parse a stream into Python native datatypes... - # This import will use either `StringIO.StringIO` or `io.BytesIO` - # as appropriate, depending on if we're running Python 2 or Python 3. from django.utils.six import BytesIO stream = BytesIO(content) From 4f33cfe1a00b410553ad9705354ada7ee8b52c01 Mon Sep 17 00:00:00 2001 From: Brent O'Connor <epicserve@gmail.com> Date: Wed, 17 Dec 2014 14:38:01 -0600 Subject: [PATCH 1340/1652] With httpie 0.8.0 the HTTP method has to come after the auth argument. --- docs/tutorial/4-authentication-and-permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index a6d27bf7e..592c77e81 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -206,7 +206,7 @@ If we try to create a snippet without authenticating, we'll get an error: We can make a successful request by including the username and password of one of the users we created earlier. - http POST -a tom:password http://127.0.0.1:8000/snippets/ code="print 789" + http -a tom:password POST http://127.0.0.1:8000/snippets/ code="print 789" { "id": 5, From c87e95c23942d2b9c38784a4ad3e9a6d043a4977 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 21:11:06 +0000 Subject: [PATCH 1341/1652] Add missing date --- docs/topics/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 00759479e..b9216e36f 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -42,7 +42,7 @@ You can determine your currently installed version using `pip freeze`: ### 3.0.2 -**Date**: [December 2014][3.0.2-milestone]. +**Date**: [17th December 2014][3.0.2-milestone]. * Ensure `request.user` is made available to response middleware. ([#2155][gh2155]) * `Client.logout()` also cancels any existing `force_authenticate`. ([#2218][gh2218], [#2259][gh2259]) From 39766bcc0ee5149a98ea11a79270609a5ec99d87 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 21:18:06 +0000 Subject: [PATCH 1342/1652] Enforce wheel check before allowing 'setup.pu publish' --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 2c56cd758..e64346d45 100755 --- a/setup.py +++ b/setup.py @@ -59,6 +59,9 @@ version = get_version('rest_framework') if sys.argv[-1] == 'publish': + if os.system("pip freeze | grep wheel"): + print "wheel not installed.\nUse `pip install wheel`.\nExiting." + sys.exit() os.system("python setup.py sdist upload") os.system("python setup.py bdist_wheel upload") print("You probably want to also tag the version now:") From b8af83493fa8d8b404174e67c3e21e7c05e9fc25 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 17 Dec 2014 21:33:27 +0000 Subject: [PATCH 1343/1652] Wheel check was breaking tests. Removed it. --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py index e64346d45..2c56cd758 100755 --- a/setup.py +++ b/setup.py @@ -59,9 +59,6 @@ version = get_version('rest_framework') if sys.argv[-1] == 'publish': - if os.system("pip freeze | grep wheel"): - print "wheel not installed.\nUse `pip install wheel`.\nExiting." - sys.exit() os.system("python setup.py sdist upload") os.system("python setup.py bdist_wheel upload") print("You probably want to also tag the version now:") From 7e9aac98fe2dca54778470030bf71b73b565f50d Mon Sep 17 00:00:00 2001 From: Brent O'Connor <epicserve@gmail.com> Date: Wed, 17 Dec 2014 16:54:04 -0600 Subject: [PATCH 1344/1652] The pre_save method no longer works. This resolved issue #2306 --- docs/tutorial/6-viewsets-and-routers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index 816e9da69..d55a60dee 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -44,8 +44,8 @@ Next we're going to replace the `SnippetList`, `SnippetDetail` and `SnippetHighl snippet = self.get_object() return Response(snippet.highlighted) - def pre_save(self, obj): - obj.owner = self.request.user + def perform_create(self, serializer): + serializer.save(owner=self.request.user) This time we've used the `ModelViewSet` class in order to get the complete set of default read and write operations. From 87ac64e41b60a26e6711648b9935c70dc35738a8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Dec 2014 10:36:52 +0000 Subject: [PATCH 1345/1652] Fixes for behavior with empty HTML fields. --- rest_framework/fields.py | 17 ++++++++------ tests/test_fields.py | 48 ++++++++++++++++++++++++++++++---------- 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 5be2a21bb..c40dc3fb3 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -184,13 +184,11 @@ class Field(object): self.style = {} if style is None else style self.allow_null = allow_null - if allow_null and self.default_empty_html is empty: - # HTML input cannot represent `None` values, so we need to - # forcibly coerce empty HTML values to `None` if `allow_null=True`. - self.default_empty_html = None - - if default is not empty: - self.default_empty_html = default + if self.default_empty_html is not empty: + if not required: + self.default_empty_html = empty + elif default is not empty: + self.default_empty_html = default if validators is not None: self.validators = validators[:] @@ -562,6 +560,11 @@ class CharField(Field): message = self.error_messages['min_length'].format(min_length=min_length) self.validators.append(MinLengthValidator(min_length, message=message)) + if self.allow_null and (not self.allow_blank) and (self.default is empty): + # HTML input cannot represent `None` values, so we need to + # forcibly coerce empty HTML values to `None` if `allow_null=True`. + self.default_empty_html = None + def run_validation(self, data=empty): # Test for the empty string here so that it does not get validated, # and so that subclasses do not need to handle it explicitly diff --git a/tests/test_fields.py b/tests/test_fields.py index 7f7af5cc0..2888df83e 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -215,25 +215,49 @@ class TestBooleanHTMLInput: assert serializer.validated_data == {'archived': False} +class MockHTMLDict(dict): + """ + This class mocks up a dictionary like object, that behaves + as if it was returned for multipart or urlencoded data. + """ + getlist = None + + class TestCharHTMLInput: - def setup(self): + def test_empty_html_checkbox(self): class TestSerializer(serializers.Serializer): message = serializers.CharField(default='happy') - self.Serializer = TestSerializer - def test_empty_html_checkbox(self): - """ - HTML checkboxes do not send any value, but should be treated - as `False` by BooleanField. - """ - # This class mocks up a dictionary like object, that behaves - # as if it was returned for multipart or urlencoded data. - class MockHTMLDict(dict): - getlist = None - serializer = self.Serializer(data=MockHTMLDict()) + serializer = TestSerializer(data=MockHTMLDict()) assert serializer.is_valid() assert serializer.validated_data == {'message': 'happy'} + def test_empty_html_checkbox_allow_null(self): + class TestSerializer(serializers.Serializer): + message = serializers.CharField(allow_null=True) + + serializer = TestSerializer(data=MockHTMLDict()) + assert serializer.is_valid() + assert serializer.validated_data == {'message': None} + + def test_empty_html_checkbox_allow_null_allow_blank(self): + class TestSerializer(serializers.Serializer): + message = serializers.CharField(allow_null=True, allow_blank=True) + + serializer = TestSerializer(data=MockHTMLDict({})) + print serializer.is_valid() + print serializer.errors + assert serializer.is_valid() + assert serializer.validated_data == {'message': ''} + + def test_empty_html_required_false(self): + class TestSerializer(serializers.Serializer): + message = serializers.CharField(required=False) + + serializer = TestSerializer(data=MockHTMLDict()) + assert serializer.is_valid() + assert serializer.validated_data == {} + class TestCreateOnlyDefault: def setup(self): From 1087ccbb258ca79ee42509abc4bb17b6c277f9ce Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Dec 2014 10:39:00 +0000 Subject: [PATCH 1346/1652] Drop print statements in tests --- tests/test_fields.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_fields.py b/tests/test_fields.py index 2888df83e..04c721d36 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -245,8 +245,6 @@ class TestCharHTMLInput: message = serializers.CharField(allow_null=True, allow_blank=True) serializer = TestSerializer(data=MockHTMLDict({})) - print serializer.is_valid() - print serializer.errors assert serializer.is_valid() assert serializer.validated_data == {'message': ''} From 725bde29c777038cae83a3e5de2b4b1919a35143 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Dec 2014 10:40:40 +0000 Subject: [PATCH 1347/1652] Check for wheel install before allowing setup.py publish. --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 2c56cd758..50bac0461 100755 --- a/setup.py +++ b/setup.py @@ -59,6 +59,9 @@ version = get_version('rest_framework') if sys.argv[-1] == 'publish': + if os.system("pip freeze | grep wheel"): + print("wheel not installed.\nUse `pip install wheel`.\nExiting.") + sys.exit() os.system("python setup.py sdist upload") os.system("python setup.py bdist_wheel upload") print("You probably want to also tag the version now:") From 6909e92d22520fa9717507e9b9bd7db8601c17cd Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Dec 2014 10:58:08 +0000 Subject: [PATCH 1348/1652] Drop 'setup.py test'. Just use 'runtests.py'. --- setup.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/setup.py b/setup.py index 50bac0461..1e54836c1 100755 --- a/setup.py +++ b/setup.py @@ -8,20 +8,6 @@ import os import sys -# This command has been borrowed from -# https://github.com/getsentry/sentry/blob/master/setup.py -class PyTest(TestCommand): - def finalize_options(self): - TestCommand.finalize_options(self) - self.test_args = ['tests'] - self.test_suite = True - - def run_tests(self): - import pytest - errno = pytest.main(self.test_args) - sys.exit(errno) - - def get_version(package): """ Return package version as listed in `__version__` in `init.py`. @@ -80,7 +66,6 @@ setup( author_email='tom@tomchristie.com', # SEE NOTE BELOW (*) packages=get_packages('rest_framework'), package_data=get_package_data('rest_framework'), - cmdclass={'test': PyTest}, install_requires=[], classifiers=[ 'Development Status :: 5 - Production/Stable', From af0f04246204767312ee82219e4e44c9f9b6ea53 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Dec 2014 11:53:11 +0000 Subject: [PATCH 1349/1652] Add pinned versions of wheels and mkdocs to our dev requirements. --- requirements.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/requirements.txt b/requirements.txt index f282d3baf..48b29e61f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,3 +16,9 @@ django-filter>=0.5.4 django-oauth-plus>=2.2.1 oauth2>=1.5.211 django-oauth2-provider>=0.2.4 + +# wheel for PyPI installs +wheel==0.24.0 + +# MkDocs for documentation previews/deploys +mkdocs==0.11.1 From a68d9331fcb0d461ee3dfd4e3e6cf9f0f6b7b988 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Dec 2014 12:17:46 +0000 Subject: [PATCH 1350/1652] YAML encoder fix for 3.0 serializers. --- rest_framework/utils/encoders.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index adc83e574..73cbe5d8a 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -7,6 +7,7 @@ from django.utils import six, timezone from django.utils.encoding import force_text from django.utils.functional import Promise from rest_framework.compat import OrderedDict +from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList import datetime import decimal import types @@ -107,14 +108,14 @@ else: OrderedDict, yaml.representer.SafeRepresenter.represent_dict ) - # SafeDumper.add_representer( - # DictWithMetadata, - # yaml.representer.SafeRepresenter.represent_dict - # ) - # SafeDumper.add_representer( - # OrderedDictWithMetadata, - # yaml.representer.SafeRepresenter.represent_dict - # ) + SafeDumper.add_representer( + ReturnDict, + yaml.representer.SafeRepresenter.represent_dict + ) + SafeDumper.add_representer( + ReturnList, + yaml.representer.SafeRepresenter.represent_list + ) SafeDumper.add_representer( types.GeneratorType, yaml.representer.SafeRepresenter.represent_list From 9c9d5bd859d4da0c7191525d77e57debd5c8d23c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Dec 2014 13:35:42 +0000 Subject: [PATCH 1351/1652] Added project management docs. --- docs/index.md | 2 + docs/topics/project-management.md | 134 ++++++++++++++++++++++++++++++ mkdocs.yml | 1 + 3 files changed, 137 insertions(+) create mode 100644 docs/topics/project-management.md diff --git a/docs/index.md b/docs/index.md index 52e42fc9a..ba915459c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -199,6 +199,7 @@ General guides to using REST framework. * [REST, Hypermedia & HATEOAS][rest-hypermedia-hateoas] * [Third Party Resources][third-party-resources] * [Contributing to REST framework][contributing] +* [Project management][project-management] * [2.0 Announcement][rest-framework-2-announcement] * [2.2 Announcement][2.2-announcement] * [2.3 Announcement][2.3-announcement] @@ -317,6 +318,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [browsableapi]: topics/browsable-api.md [rest-hypermedia-hateoas]: topics/rest-hypermedia-hateoas.md [contributing]: topics/contributing.md +[project-management]: topics/project-management.md [third-party-resources]: topics/third-party-resources.md [rest-framework-2-announcement]: topics/rest-framework-2-announcement.md [2.2-announcement]: topics/2.2-announcement.md diff --git a/docs/topics/project-management.md b/docs/topics/project-management.md new file mode 100644 index 000000000..f581cabd3 --- /dev/null +++ b/docs/topics/project-management.md @@ -0,0 +1,134 @@ +# Project management + +> "No one can whistle a symphony; it takes a whole orchestra to play it" +> +> — Halford E. Luccock + +This document outlines our project management processes for REST framework. + +The aim is to ensure that the project has a high +["bus factor"][bus-factor], and can continue to remain well supported for the foreseeable future. Suggestions for improvements to our process are welcome. + +--- + +## Maintenance team + +We have a quarterly maintenance cycle where new members may join the maintenance team. We currently cap the size of the team at 5 members, and may encourage folks to step out of the team for a cycle to allow new members to participate. + +#### Current team + +The [maintenance team for Q1 2015](https://github.com/tomchristie/django-rest-framework/issues/2190): + +* [@tomchristie](https://github.com/tomchristie/) +* [@xordoquy](https://github.com/xordoquy/) (Release manager.) +* [@carltongibson](https://github.com/carltongibson/) +* [@kevin-brown](https://github.com/kevin-brown/) +* [@jpadilla](https://github.com/jpadilla/) + +#### Maintenance cycles + +Each maintenance cycle is initiated by an issue being opened with the `Process` label. + +* To be considered for a maintainer role simply comment against the issue. +* Existing members must explicitly opt-in to the next cycle by check-marking their name. +* The final decision on the incoming team will be made by `@tomchristie`. + +Members of the maintenance team will be added as collaborators to the repository. + +The following template should be used for the description of the issue, and serves as the formal process for selecting the team. + + This issue is for determining the maintenance team for the *** period. + + Please see the [Project management](http://www.django-rest-framework.org/topics/project-management/) section of our documentation for more details. + + --- + + #### Renewing existing members. + + The following people are the current maintenance team. Please checkmark your name if you wish to continue to have write permission on the repository for the *** period. + + - [ ] @*** + - [ ] @*** + - [ ] @*** + - [ ] @*** + - [ ] @*** + + --- + + #### New members. + + If you wish to be considered for this or a future date, please comment against this or subsequent issues. + +#### Responsibilities of team members + +Team members have the following responsibilities. + +* Add triage labels and milestones to tickets. +* Close invalid or resolved tickets. +* Merge finalized pull requests. +* Build and deploy the documentation, using `mkdocs gh-deploy`. + +Further notes for maintainers: + +* Code changes should come in the form of a pull request - do not push directly to master. +* Maintainers should typically not merge their own pull requests. +* Each issue/pull request should have exactly one label once triaged. +* Search for un-triaged issues with [is:open no:label][un-triaged]. + +It should be noted that participating actively in the REST framework project clearly **does not require being part of the maintenance team**. Almost every import part of issue triage and project improvement can be actively worked on regardless of your collaborator status on the repository. + +--- + +## Release process + +The release manager is selected on every quarterly maintenance cycle. + +* The manager should be selected by `@tomchristie`. +* The manager will then have the maintainer role added to PyPI package. +* The previous manager will then have the maintainer role removed from the PyPI package. + +Our PyPI releases will be handled by either the current release manager, or by `@tomchristie`. Every release should have an open issue tagged with the `Release` label and marked against the appropriate milestone. + +The following template should be used for the description of the issue, and serves as a release checklist. + + Release manager is @***. + Pull request is #***. + + Checklist: + + - [ ] Create pull request for [release notes](https://github.com/tomchristie/django-rest-framework/blob/master/docs/topics/release-notes.md) based on the [*.*.* milestone](https://github.com/tomchristie/django-rest-framework/milestones/***). + - [ ] Ensure the pull request increments the version to `*.*.*` in [`restframework/__init__.py`](https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/__init__.py). + - [ ] Confirm with @tomchristie that release is finalized and ready to go. + - [ ] Ensure that release date is included in pull request. + - [ ] Merge the release pull request. + - [ ] Push the package to PyPI with `./setup.py publish`. + - [ ] Tag the release, with `git tag -a *.*.* -m 'version *.*.*'; git push --tags`. + - [ ] Deploy the documentation with `mkdocs gh-deploy`. + - [ ] Make a release announcement on the [discussion group](https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework). + - [ ] Make a release announcement on twitter. + - [ ] Close the milestone on GitHub. + +When pushing the release to PyPI ensure that your environment has been installed from our development `requirement.txt`, so that documentation and PyPI installs are consistently being built against a pinned set of packages. + +--- + +## Project ownership + +The PyPI package is owned by `@tomchristie`. As a backup `@j4mie` also has ownership of the package. + +If `@tomchristie` ceases to participate in the project then `@j4mie` has responsibility for handing over ownership duties. + +#### Outstanding management & ownership issues + +The following issues still need to be addressed: + +* [Consider moving the repo into a proper GitHub organization][github-org]. +* Ensure `@jamie` has back-up access to the `django-rest-framework.org` domain setup and admin. +* Document ownership of the [live example][sandbox] API. +* Document ownership of the [mailing list][mailing-list] and IRC channel. + +[bus-factor]: http://en.wikipedia.org/wiki/Bus_factor +[un-triaged]: https://github.com/tomchristie/django-rest-framework/issues?q=is%3Aopen+no%3Alabel +[github-org]: https://github.com/tomchristie/django-rest-framework/issues/2162 +[sandbox]: http://restframework.herokuapp.com/ +[mailing-list]: https://groups.google.com/forum/#!forum/django-rest-framework diff --git a/mkdocs.yml b/mkdocs.yml index 9513f04f7..d16a2a595 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -46,6 +46,7 @@ pages: - ['topics/rest-hypermedia-hateoas.md', 'Topics', 'REST, Hypermedia & HATEOAS'] - ['topics/third-party-resources.md', 'Topics', 'Third Party Resources'] - ['topics/contributing.md', 'Topics', 'Contributing to REST framework'] + - ['topics/project-management.md', 'Topics', 'Project management'] - ['topics/rest-framework-2-announcement.md', 'Topics', '2.0 Announcement'] - ['topics/2.2-announcement.md', 'Topics', '2.2 Announcement'] - ['topics/2.3-announcement.md', 'Topics', '2.3 Announcement'] From d60ecfc4982ff5ccfacd285404fc54e3e0fd6567 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Thu, 18 Dec 2014 16:03:15 +0100 Subject: [PATCH 1352/1652] Assert fields in `exclude` are model fields --- rest_framework/serializers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 8de22f4b9..ed709d848 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -880,6 +880,10 @@ class ModelSerializer(Serializer): exclude = getattr(self.Meta, 'exclude', None) if exclude is not None: for field_name in exclude: + assert field_name in fields, ( + 'The field in the `exclude` option must be a model field. Got %s.' % + field_name + ) fields.remove(field_name) # Determine the set of model fields, and the fields that they map to. From 7105c1308e08a756fcb4131168e3187b0bc1ddee Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 18 Dec 2014 15:42:27 +0000 Subject: [PATCH 1353/1652] Add OPTIONS/metadata to docs index --- docs/api-guide/metadata.md | 2 +- docs/index.md | 2 ++ mkdocs.yml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/metadata.md b/docs/api-guide/metadata.md index c3e511487..247ae988f 100644 --- a/docs/api-guide/metadata.md +++ b/docs/api-guide/metadata.md @@ -1,4 +1,4 @@ -<a class="github" href="metadata.py"></a> +source: metadata.py --- diff --git a/docs/index.md b/docs/index.md index ba915459c..8a96fc9fb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -181,6 +181,7 @@ The API guide is your complete reference manual to all the functionality provide * [Filtering][filtering] * [Pagination][pagination] * [Content negotiation][contentnegotiation] +* [Metadata][metadata] * [Format suffixes][formatsuffixes] * [Returning URLs][reverse] * [Exceptions][exceptions] @@ -305,6 +306,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [filtering]: api-guide/filtering.md [pagination]: api-guide/pagination.md [contentnegotiation]: api-guide/content-negotiation.md +[metadata]: api-guide/metadata.md [formatsuffixes]: api-guide/format-suffixes.md [reverse]: api-guide/reverse.md [exceptions]: api-guide/exceptions.md diff --git a/mkdocs.yml b/mkdocs.yml index d16a2a595..85f4d2443 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -33,6 +33,7 @@ pages: - ['api-guide/filtering.md', 'API Guide', 'Filtering'] - ['api-guide/pagination.md', 'API Guide', 'Pagination'] - ['api-guide/content-negotiation.md', 'API Guide', 'Content negotiation'] + - ['api-guide/metadata.md', 'API Guide', 'Metadata'] - ['api-guide/format-suffixes.md', 'API Guide', 'Format suffixes'] - ['api-guide/reverse.md', 'API Guide', 'Returning URLs'] - ['api-guide/exceptions.md', 'API Guide', 'Exceptions'] From 5830f7e13817210f5c6d955ad4fedfaa492aa209 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Dec 2014 10:15:36 +0000 Subject: [PATCH 1354/1652] get_unique_together_validators and get_unique_for_date_validators --- rest_framework/serializers.py | 51 ++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 8de22f4b9..55828b03e 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -792,14 +792,33 @@ class ModelSerializer(Serializer): return instance def get_validators(self): + """ + Determine the set of validators to use when instantiating serializer. + """ # If the validators have been declared explicitly then use that. validators = getattr(getattr(self, 'Meta', None), 'validators', None) if validators is not None: return validators - # Determine the default set of validators. - validators = [] - model_class = self.Meta.model + # Otherwise use the default set of validators. + return ( + self.get_unique_together_validators() + + self.get_unique_for_date_validators() + ) + + def get_unique_together_validators(self): + """ + Determine a default set of validators for any unique_together contraints. + """ + model_class_inheritance_tree = ( + [self.Meta.model] + + list(self.Meta.model._meta.parents.keys()) + ) + + # The field names we're passing though here only include fields + # which may map onto a model field. Any dotted field name lookups + # cannot map to a field, and must be a traversal, so we're not + # including those. field_names = set([ field.source for field in self.fields.values() if (field.source != '*') and ('.' not in field.source) @@ -807,7 +826,8 @@ class ModelSerializer(Serializer): # Note that we make sure to check `unique_together` both on the # base model class, but also on any parent classes. - for parent_class in [model_class] + list(model_class._meta.parents.keys()): + validators = [] + for parent_class in model_class_inheritance_tree: for unique_together in parent_class._meta.unique_together: if field_names.issuperset(set(unique_together)): validator = UniqueTogetherValidator( @@ -815,13 +835,26 @@ class ModelSerializer(Serializer): fields=unique_together ) validators.append(validator) + return validators + + def get_unique_for_date_validators(self): + """ + Determine a default set of validators for the following contraints: + + * unique_for_date + * unique_for_month + * unique_for_year + """ + info = model_meta.get_field_info(self.Meta.model) + default_manager = self.Meta.model._default_manager + field_names = [field.source for field in self.fields.values()] + + validators = [] - # Add any unique_for_date/unique_for_month/unique_for_year constraints. - info = model_meta.get_field_info(model_class) for field_name, field in info.fields_and_pk.items(): if field.unique_for_date and field_name in field_names: validator = UniqueForDateValidator( - queryset=model_class._default_manager, + queryset=default_manager, field=field_name, date_field=field.unique_for_date ) @@ -829,7 +862,7 @@ class ModelSerializer(Serializer): if field.unique_for_month and field_name in field_names: validator = UniqueForMonthValidator( - queryset=model_class._default_manager, + queryset=default_manager, field=field_name, date_field=field.unique_for_month ) @@ -837,7 +870,7 @@ class ModelSerializer(Serializer): if field.unique_for_year and field_name in field_names: validator = UniqueForYearValidator( - queryset=model_class._default_manager, + queryset=default_manager, field=field_name, date_field=field.unique_for_year ) From 6d907cde9a90aad76acb00482a1d70550bb95ccd Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Dec 2014 12:18:40 +0000 Subject: [PATCH 1355/1652] get_field_names, get_default_field_names --- rest_framework/serializers.py | 102 +++++++++++++++++++++++---------- tests/test_model_serializer.py | 8 +-- 2 files changed, 76 insertions(+), 34 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 52ea5b0b6..b391a94eb 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -883,41 +883,14 @@ class ModelSerializer(Serializer): ret = OrderedDict() model = getattr(self.Meta, 'model') - fields = getattr(self.Meta, 'fields', None) - exclude = getattr(self.Meta, 'exclude', None) depth = getattr(self.Meta, 'depth', 0) extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) - - if fields and not isinstance(fields, (list, tuple)): - raise TypeError( - 'The `fields` option must be a list or tuple. Got %s.' % - type(fields).__name__ - ) - - if exclude and not isinstance(exclude, (list, tuple)): - raise TypeError( - 'The `exclude` option must be a list or tuple. Got %s.' % - type(exclude).__name__ - ) - - assert not (fields and exclude), "Cannot set both 'fields' and 'exclude'." - extra_kwargs = self._include_additional_options(extra_kwargs) # Retrieve metadata about fields & relationships on the model class. info = model_meta.get_field_info(model) - # Use the default set of field names if none is supplied explicitly. - if fields is None: - fields = self._get_default_field_names(declared_fields, info) - exclude = getattr(self.Meta, 'exclude', None) - if exclude is not None: - for field_name in exclude: - assert field_name in fields, ( - 'The field in the `exclude` option must be a model field. Got %s.' % - field_name - ) - fields.remove(field_name) + fields = self.get_field_names(declared_fields, info) # Determine the set of model fields, and the fields that they map to. # We actually only need this to deal with the slightly awkward case @@ -1133,7 +1106,72 @@ class ModelSerializer(Serializer): return extra_kwargs - def _get_default_field_names(self, declared_fields, model_info): + def get_field_names(self, declared_fields, info): + """ + Returns the list of all field names that should be created when + instantiating this serializer class. This is based on the default + set of fields, but also takes into account the `Meta.fields` or + `Meta.exclude` options if they have been specified. + """ + fields = getattr(self.Meta, 'fields', None) + exclude = getattr(self.Meta, 'exclude', None) + + if fields and not isinstance(fields, (list, tuple)): + raise TypeError( + 'The `fields` option must be a list or tuple. Got %s.' % + type(fields).__name__ + ) + + if exclude and not isinstance(exclude, (list, tuple)): + raise TypeError( + 'The `exclude` option must be a list or tuple. Got %s.' % + type(exclude).__name__ + ) + + assert not (fields and exclude), ( + "Cannot set both 'fields' and 'exclude' options on " + "serializer {serializer_class}.".format( + serializer_class=self.__class__.__name__ + ) + ) + + if fields is not None: + # Ensure that all declared fields have also been included in the + # `Meta.fields` option. + for field_name in declared_fields: + assert field_name in fields, ( + "The field '{field_name}' was declared on serializer " + "{serializer_class}, but has not been included in the " + "'fields' option.".format( + field_name=field_name, + serializer_class=self.__class__.__name__ + ) + ) + return fields + + # Use the default set of field names if `Meta.fields` is not specified. + fields = self.get_default_field_names(declared_fields, info) + + if exclude is not None: + # If `Meta.exclude` is included, then remove those fields. + for field_name in exclude: + assert field_name in fields, ( + "The field '{field_name}' was include on serializer " + "{serializer_class} in the 'exclude' option, but does " + "not match any model field.".format( + field_name=field_name, + serializer_class=self.__class__.__name__ + ) + ) + fields.remove(field_name) + + return fields + + def get_default_field_names(self, declared_fields, model_info): + """ + Return the default list of field names that will be used if the + `Meta.fields` option is not specified. + """ return ( [model_info.pk.name] + list(declared_fields.keys()) + @@ -1160,7 +1198,11 @@ class HyperlinkedModelSerializer(ModelSerializer): """ _related_class = HyperlinkedRelatedField - def _get_default_field_names(self, declared_fields, model_info): + def get_default_field_names(self, declared_fields, model_info): + """ + Return the default list of field names that will be used if the + `Meta.fields` option is not specified. + """ return ( [api_settings.URL_FIELD_NAME] + list(declared_fields.keys()) + diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index da79164af..5c56c8dbb 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -221,11 +221,11 @@ class TestRegularFieldMappings(TestCase): model = RegularFieldsModel fields = ('auto_field',) - with self.assertRaises(ImproperlyConfigured) as excinfo: + with self.assertRaises(AssertionError) as excinfo: TestSerializer().fields expected = ( - 'Field `missing` has been declared on serializer ' - '`TestSerializer`, but is missing from `Meta.fields`.' + "The field 'missing' was declared on serializer TestSerializer, " + "but has not been included in the 'fields' option." ) assert str(excinfo.exception) == expected @@ -607,5 +607,5 @@ class TestSerializerMetaClass(TestCase): exception = result.exception self.assertEqual( str(exception), - "Cannot set both 'fields' and 'exclude'." + "Cannot set both 'fields' and 'exclude' options on serializer ExampleSerializer." ) From 1a84943a006abffb7e1b3b3ff55441c7a1132fa2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Dec 2014 12:27:50 +0000 Subject: [PATCH 1356/1652] get_extra_kwargs --- rest_framework/serializers.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b391a94eb..d4b0926e6 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -884,13 +884,12 @@ class ModelSerializer(Serializer): ret = OrderedDict() model = getattr(self.Meta, 'model') depth = getattr(self.Meta, 'depth', 0) - extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) - extra_kwargs = self._include_additional_options(extra_kwargs) # Retrieve metadata about fields & relationships on the model class. info = model_meta.get_field_info(model) fields = self.get_field_names(declared_fields, info) + extra_kwargs = self.get_extra_kwargs() # Determine the set of model fields, and the fields that they map to. # We actually only need this to deal with the slightly awkward case @@ -1024,17 +1023,6 @@ class ModelSerializer(Serializer): (field_name, model.__class__.__name__) ) - # Check that any fields declared on the class are - # also explicitly included in `Meta.fields`. - missing_fields = set(declared_fields.keys()) - set(fields) - if missing_fields: - missing_field = list(missing_fields)[0] - raise ImproperlyConfigured( - 'Field `%s` has been declared on serializer `%s`, but ' - 'is missing from `Meta.fields`.' % - (missing_field, self.__class__.__name__) - ) - # Populate any kwargs defined in `Meta.extra_kwargs` extras = extra_kwargs.get(field_name, {}) if extras.get('read_only', False): @@ -1058,7 +1046,13 @@ class ModelSerializer(Serializer): return ret - def _include_additional_options(self, extra_kwargs): + def get_extra_kwargs(self): + """ + Return a dictionary mapping field names to a dictionary of + additional keyword arguments. + """ + extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) + read_only_fields = getattr(self.Meta, 'read_only_fields', None) if read_only_fields is not None: for field_name in read_only_fields: From caa13181244ce3c074f647510bb38d7b0c8b4c70 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Dec 2014 13:13:20 +0000 Subject: [PATCH 1357/1652] get_uniqueness_field_options first pass --- rest_framework/serializers.py | 174 +++++++++++++++++++--------------- 1 file changed, 96 insertions(+), 78 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index d4b0926e6..5e9cbe361 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -888,89 +888,19 @@ class ModelSerializer(Serializer): # Retrieve metadata about fields & relationships on the model class. info = model_meta.get_field_info(model) - fields = self.get_field_names(declared_fields, info) + field_names = self.get_field_names(declared_fields, info) extra_kwargs = self.get_extra_kwargs() - # Determine the set of model fields, and the fields that they map to. - # We actually only need this to deal with the slightly awkward case - # of supporting `unique_for_date`/`unique_for_month`/`unique_for_year`. - model_field_mapping = {} - for field_name in fields: - if field_name in declared_fields: - field = declared_fields[field_name] - source = field.source or field_name + model_fields = self.get_model_fields(field_names, declared_fields, extra_kwargs) + uniqueness_extra_kwargs, hidden_fields = self.get_uniqueness_field_options(field_names, model_fields) + for key, value in uniqueness_extra_kwargs.items(): + if key in extra_kwargs: + extra_kwargs[key].update(value) else: - try: - source = extra_kwargs[field_name]['source'] - except KeyError: - source = field_name - # Model fields will always have a simple source mapping, - # they can't be nested attribute lookups. - if '.' not in source and source != '*': - model_field_mapping[source] = field_name - - # Determine if we need any additional `HiddenField` or extra keyword - # arguments to deal with `unique_for` dates that are required to - # be in the input data in order to validate it. - hidden_fields = {} - unique_constraint_names = set() - - for model_field_name, field_name in model_field_mapping.items(): - try: - model_field = model._meta.get_field(model_field_name) - except FieldDoesNotExist: - continue - - # Include each of the `unique_for_*` field names. - unique_constraint_names |= set([ - model_field.unique_for_date, - model_field.unique_for_month, - model_field.unique_for_year - ]) - - unique_constraint_names -= set([None]) - - # Include each of the `unique_together` field names, - # so long as all the field names are included on the serializer. - for parent_class in [model] + list(model._meta.parents.keys()): - for unique_together_list in parent_class._meta.unique_together: - if set(fields).issuperset(set(unique_together_list)): - unique_constraint_names |= set(unique_together_list) - - # Now we have all the field names that have uniqueness constraints - # applied, we can add the extra 'required=...' or 'default=...' - # arguments that are appropriate to these fields, or add a `HiddenField` for it. - for unique_constraint_name in unique_constraint_names: - # Get the model field that is referred too. - unique_constraint_field = model._meta.get_field(unique_constraint_name) - - if getattr(unique_constraint_field, 'auto_now_add', None): - default = CreateOnlyDefault(timezone.now) - elif getattr(unique_constraint_field, 'auto_now', None): - default = timezone.now - elif unique_constraint_field.has_default(): - default = unique_constraint_field.default - else: - default = empty - - if unique_constraint_name in model_field_mapping: - # The corresponding field is present in the serializer - if unique_constraint_name not in extra_kwargs: - extra_kwargs[unique_constraint_name] = {} - if default is empty: - if 'required' not in extra_kwargs[unique_constraint_name]: - extra_kwargs[unique_constraint_name]['required'] = True - else: - if 'default' not in extra_kwargs[unique_constraint_name]: - extra_kwargs[unique_constraint_name]['default'] = default - elif default is not empty: - # The corresponding field is not present in the, - # serializer. We have a default to use for it, so - # add in a hidden field that populates it. - hidden_fields[unique_constraint_name] = HiddenField(default=default) + extra_kwargs[key] = value # Now determine the fields that should be included on the serializer. - for field_name in fields: + for field_name in field_names: if field_name in declared_fields: # Field is explicitly declared on the class, use that. ret[field_name] = declared_fields[field_name] @@ -1046,6 +976,94 @@ class ModelSerializer(Serializer): return ret + def get_model_fields(self, field_names, declared_fields, extra_kwargs): + # Returns all the model fields that are being mapped to by fields + # on the serializer class. + # Returned as a dict of 'model field name' -> 'model field' + model = getattr(self.Meta, 'model') + model_fields = {} + + for field_name in field_names: + if field_name in declared_fields: + # If the field is declared on the serializer + field = declared_fields[field_name] + source = field.source or field_name + else: + try: + source = extra_kwargs[field_name]['source'] + except KeyError: + source = field_name + + if '.' in source or source == '*': + # Model fields will always have a simple source mapping, + # they can't be nested attribute lookups. + continue + + try: + model_fields[source] = model._meta.get_field(source) + except FieldDoesNotExist: + pass + + return model_fields + + def get_uniqueness_field_options(self, field_names, model_fields): + model = getattr(self.Meta, 'model') + + # Determine if we need any additional `HiddenField` or extra keyword + # arguments to deal with `unique_for` dates that are required to + # be in the input data in order to validate it. + unique_constraint_names = set() + + for model_field in model_fields.values(): + # Include each of the `unique_for_*` field names. + unique_constraint_names |= set([ + model_field.unique_for_date, + model_field.unique_for_month, + model_field.unique_for_year + ]) + + unique_constraint_names -= set([None]) + + # Include each of the `unique_together` field names, + # so long as all the field names are included on the serializer. + for parent_class in [model] + list(model._meta.parents.keys()): + for unique_together_list in parent_class._meta.unique_together: + if set(field_names).issuperset(set(unique_together_list)): + unique_constraint_names |= set(unique_together_list) + + # Now we have all the field names that have uniqueness constraints + # applied, we can add the extra 'required=...' or 'default=...' + # arguments that are appropriate to these fields, or add a `HiddenField` for it. + hidden_fields = {} + extra_kwargs = {} + + for unique_constraint_name in unique_constraint_names: + # Get the model field that is referred too. + unique_constraint_field = model._meta.get_field(unique_constraint_name) + + if getattr(unique_constraint_field, 'auto_now_add', None): + default = CreateOnlyDefault(timezone.now) + elif getattr(unique_constraint_field, 'auto_now', None): + default = timezone.now + elif unique_constraint_field.has_default(): + default = unique_constraint_field.default + else: + default = empty + + if unique_constraint_name in model_fields: + # The corresponding field is present in the serializer + if default is empty: + extra_kwargs[unique_constraint_name] = {'required': True} + else: + extra_kwargs[unique_constraint_name] = {'default': default} + elif default is not empty: + # The corresponding field is not present in the, + # serializer. We have a default to use for it, so + # add in a hidden field that populates it. + hidden_fields[unique_constraint_name] = HiddenField(default=default) + + return extra_kwargs, hidden_fields + def get_extra_kwargs(self): """ Return a dictionary mapping field names to a dictionary of From 92ebeaa040f75dbc6142355fa25d89b4c990685b Mon Sep 17 00:00:00 2001 From: tanwanirahul <tanwanirahul@gmail.com> Date: Fri, 19 Dec 2014 19:52:59 +0530 Subject: [PATCH 1358/1652] Change decorator attribute name to url_path per suggestions --- rest_framework/routers.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index d1c9fa1b9..a213f62c7 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -177,26 +177,26 @@ class SimpleRouter(BaseRouter): # Dynamic detail routes (@detail_route decorator) for httpmethods, methodname in detail_routes: method_kwargs = getattr(viewset, methodname).kwargs - custom_method_name = method_kwargs.pop("custom_method_name", None) or methodname + url_path = method_kwargs.pop("url_path", None) or methodname initkwargs = route.initkwargs.copy() initkwargs.update(method_kwargs) ret.append(Route( - url=replace_methodname(route.url, custom_method_name), + url=replace_methodname(route.url, url_path), mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), - name=replace_methodname(route.name, custom_method_name), + name=replace_methodname(route.name, url_path), initkwargs=initkwargs, )) elif isinstance(route, DynamicListRoute): # Dynamic list routes (@list_route decorator) for httpmethods, methodname in list_routes: method_kwargs = getattr(viewset, methodname).kwargs - custom_method_name = method_kwargs.pop("custom_method_name", None) or methodname + url_path = method_kwargs.pop("url_path", None) or methodname initkwargs = route.initkwargs.copy() initkwargs.update(method_kwargs) ret.append(Route( - url=replace_methodname(route.url, custom_method_name), + url=replace_methodname(route.url, url_path), mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), - name=replace_methodname(route.name, custom_method_name), + name=replace_methodname(route.name, url_path), initkwargs=initkwargs, )) else: From 2448cc8e856369ca6fb99b848e10f8ff0105e925 Mon Sep 17 00:00:00 2001 From: tanwanirahul <tanwanirahul@gmail.com> Date: Fri, 19 Dec 2014 19:53:48 +0530 Subject: [PATCH 1359/1652] Updated tests to use url_path attribute in list and detail decorators --- tests/test_routers.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_routers.py b/tests/test_routers.py index d426f8320..73d10822a 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -261,11 +261,11 @@ class DynamicListAndDetailViewSet(viewsets.ViewSet): def detail_route_get(self, request, *args, **kwargs): return Response({'method': 'link2'}) - @list_route(custom_method_name="list_custom-route") + @list_route(url_path="list_custom-route") def list_custom_route_get(self, request, *args, **kwargs): return Response({'method': 'link1'}) - @detail_route(custom_method_name="detail_custom-route") + @detail_route(url_path="detail_custom-route") def detail_custom_route_get(self, request, *args, **kwargs): return Response({'method': 'link2'}) @@ -278,7 +278,7 @@ class TestDynamicListAndDetailRouter(TestCase): routes = self.router.get_routes(DynamicListAndDetailViewSet) decorator_routes = [r for r in routes if not (r.name.endswith('-list') or r.name.endswith('-detail'))] - MethodNamesMap = namedtuple('MethodNamesMap', 'method_name custom_method_name') + MethodNamesMap = namedtuple('MethodNamesMap', 'method_name url_path') # Make sure all these endpoints exist and none have been clobbered for i, endpoint in enumerate([MethodNamesMap('list_custom_route_get', 'list_custom-route'), MethodNamesMap('list_route_get', 'list_route_get'), @@ -290,14 +290,14 @@ class TestDynamicListAndDetailRouter(TestCase): route = decorator_routes[i] # check url listing method_name = endpoint.method_name - custom_method_name = endpoint.custom_method_name + url_path = endpoint.url_path if method_name.startswith('list_'): self.assertEqual(route.url, - '^{{prefix}}/{0}{{trailing_slash}}$'.format(custom_method_name)) + '^{{prefix}}/{0}{{trailing_slash}}$'.format(url_path)) else: self.assertEqual(route.url, - '^{{prefix}}/{{lookup}}/{0}{{trailing_slash}}$'.format(custom_method_name)) + '^{{prefix}}/{{lookup}}/{0}{{trailing_slash}}$'.format(url_path)) # check method to function mapping if method_name.endswith('_post'): method_map = 'post' From a8a3fedb5c52cc62c6ecf59c4138e9a6ecf04806 Mon Sep 17 00:00:00 2001 From: tanwanirahul <tanwanirahul@gmail.com> Date: Fri, 19 Dec 2014 20:16:46 +0530 Subject: [PATCH 1360/1652] Add url_path documention for detail_route decorator --- docs/tutorial/6-viewsets-and-routers.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index cf37a2601..8e4e22f05 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -53,6 +53,8 @@ Notice that we've also used the `@detail_route` decorator to create a custom act Custom actions which use the `@detail_route` decorator will respond to `GET` requests. We can use the `methods` argument if we wanted an action that responded to `POST` requests. +The URLs for custom actions by default depends on the method name itself. If you want to change the way url should be constructed, you can use `url_path` parameter of `@detail_route` and provide the string value for the same. + ## Binding ViewSets to URLs explicitly The handler methods only get bound to the actions when we define the URLConf. From 4a112fc3a616238b7995b3a442ae236116364ceb Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Dec 2014 14:51:45 +0000 Subject: [PATCH 1361/1652] Clean up --- rest_framework/serializers.py | 63 +++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 5e9cbe361..093b0eb51 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -722,6 +722,8 @@ class ModelSerializer(Serializer): }) _related_class = PrimaryKeyRelatedField + # Default `create` and `update` behavior... + def create(self, validated_data): """ We have a bit of extra checking around this in order to provide @@ -791,6 +793,8 @@ class ModelSerializer(Serializer): return instance + # Determine the validators to apply... + def get_validators(self): """ Determine the set of validators to use when instantiating serializer. @@ -878,28 +882,26 @@ class ModelSerializer(Serializer): return validators + # Determine the fields to apply... + def get_fields(self): declared_fields = copy.deepcopy(self._declared_fields) - - ret = OrderedDict() model = getattr(self.Meta, 'model') depth = getattr(self.Meta, 'depth', 0) # Retrieve metadata about fields & relationships on the model class. info = model_meta.get_field_info(model) - field_names = self.get_field_names(declared_fields, info) - extra_kwargs = self.get_extra_kwargs() - model_fields = self.get_model_fields(field_names, declared_fields, extra_kwargs) - uniqueness_extra_kwargs, hidden_fields = self.get_uniqueness_field_options(field_names, model_fields) - for key, value in uniqueness_extra_kwargs.items(): - if key in extra_kwargs: - extra_kwargs[key].update(value) - else: - extra_kwargs[key] = value + # Determine any extra field arguments and hidden fields that + # should be included + extra_kwargs = self.get_extra_kwargs() + extra_kwargs, hidden_fields = self.get_uniqueness_extra_kwargs( + field_names, declared_fields, extra_kwargs + ) # Now determine the fields that should be included on the serializer. + ret = OrderedDict() for field_name in field_names: if field_name in declared_fields: # Field is explicitly declared on the class, use that. @@ -971,15 +973,17 @@ class ModelSerializer(Serializer): # Create the serializer field. ret[field_name] = field_cls(**kwargs) - for field_name, field in hidden_fields.items(): - ret[field_name] = field + ret.update(hidden_fields) return ret - def get_model_fields(self, field_names, declared_fields, extra_kwargs): - # Returns all the model fields that are being mapped to by fields - # on the serializer class. - # Returned as a dict of 'model field name' -> 'model field' + def _get_model_fields(self, field_names, declared_fields, extra_kwargs): + """ + Returns all the model fields that are being mapped to by fields + on the serializer class. + Returned as a dict of 'model field name' -> 'model field'. + Used internally by `get_uniqueness_field_options`. + """ model = getattr(self.Meta, 'model') model_fields = {} @@ -1006,8 +1010,18 @@ class ModelSerializer(Serializer): return model_fields - def get_uniqueness_field_options(self, field_names, model_fields): + def get_uniqueness_extra_kwargs(self, field_names, declared_fields, extra_kwargs): + """ + Return any additional field options that need to be included as a + result of uniqueness constraints on the model. This is returned as + a two-tuple of: + + ('dict of updated extra kwargs', 'mapping of hidden fields') + """ model = getattr(self.Meta, 'model') + model_fields = self._get_model_fields( + field_names, declared_fields, extra_kwargs + ) # Determine if we need any additional `HiddenField` or extra keyword # arguments to deal with `unique_for` dates that are required to @@ -1035,7 +1049,7 @@ class ModelSerializer(Serializer): # applied, we can add the extra 'required=...' or 'default=...' # arguments that are appropriate to these fields, or add a `HiddenField` for it. hidden_fields = {} - extra_kwargs = {} + uniqueness_extra_kwargs = {} for unique_constraint_name in unique_constraint_names: # Get the model field that is referred too. @@ -1053,15 +1067,22 @@ class ModelSerializer(Serializer): if unique_constraint_name in model_fields: # The corresponding field is present in the serializer if default is empty: - extra_kwargs[unique_constraint_name] = {'required': True} + uniqueness_extra_kwargs[unique_constraint_name] = {'required': True} else: - extra_kwargs[unique_constraint_name] = {'default': default} + uniqueness_extra_kwargs[unique_constraint_name] = {'default': default} elif default is not empty: # The corresponding field is not present in the, # serializer. We have a default to use for it, so # add in a hidden field that populates it. hidden_fields[unique_constraint_name] = HiddenField(default=default) + # Update `extra_kwargs` with any new options. + for key, value in uniqueness_extra_kwargs.items(): + if key in extra_kwargs: + extra_kwargs[key].update(value) + else: + extra_kwargs[key] = value + return extra_kwargs, hidden_fields def get_extra_kwargs(self): From 80bacc5fb00682b589b3280c7082af73e3aaa8f8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Dec 2014 14:52:53 +0000 Subject: [PATCH 1362/1652] depth should reduce by one on each nesting level. Closes #2287. --- rest_framework/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index ed709d848..6f89df0db 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1112,7 +1112,7 @@ class ModelSerializer(Serializer): class NestedSerializer(ModelSerializer): class Meta: model = relation_info.related - depth = nested_depth + depth = nested_depth - 1 return NestedSerializer @@ -1139,6 +1139,6 @@ class HyperlinkedModelSerializer(ModelSerializer): class NestedSerializer(HyperlinkedModelSerializer): class Meta: model = relation_info.related - depth = nested_depth + depth = nested_depth - 1 return NestedSerializer From 6aa0e307c99d0c17d7c48f2416472c7dbdcbbf8f Mon Sep 17 00:00:00 2001 From: Rahul <tanwanirahul@gmail.com> Date: Fri, 19 Dec 2014 20:31:21 +0530 Subject: [PATCH 1363/1652] Added documentation about url_path parameter for custom actions. --- docs/api-guide/routers.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 61a476b8b..63b8b59a8 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -68,6 +68,24 @@ The following URL pattern would additionally be generated: * URL pattern: `^users/{pk}/set_password/$` Name: `'user-set-password'` +If you did not like the default URL generated for your custom action, you could use `url_path` parameter with `@detail_route` or `@list_route` to customize it. + +For example, if you want to change the URL for our custom action to `^users/{pk}/change-password/$`, you could write: + + from myapp.permissions import IsAdminOrIsSelf + from rest_framework.decorators import detail_route + + class UserViewSet(ModelViewSet): + ... + + @detail_route(methods=['post'], permission_classes=[IsAdminOrIsSelf], url_path='change-password') + def set_password(self, request, pk=None): + ... + +Above example would instead generate following URL pattern: + +* URL pattern: `^users/{pk}/change-password/$` Name: `'user-change-password'` + For more information see the viewset documentation on [marking extra actions for routing][route-decorators]. # API Guide From f72928ea982cfe2127288dd6dc52f8006638b0c3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Dec 2014 15:09:57 +0000 Subject: [PATCH 1364/1652] build_field, build_final_kwargs --- rest_framework/serializers.py | 135 +++++++++++++++++++--------------- 1 file changed, 76 insertions(+), 59 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 1f76c4c19..80ad10f0a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -908,75 +908,92 @@ class ModelSerializer(Serializer): ret[field_name] = declared_fields[field_name] continue - elif field_name in info.fields_and_pk: - # Create regular model fields. - model_field = info.fields_and_pk[field_name] - field_cls = self._field_mapping[model_field] - kwargs = get_field_kwargs(field_name, model_field) - if 'choices' in kwargs: - # Fields with choices get coerced into `ChoiceField` - # instead of using their regular typed field. - field_cls = ChoiceField - if not issubclass(field_cls, ModelField): - # `model_field` is only valid for the fallback case of - # `ModelField`, which is used when no other typed field - # matched to the model field. - kwargs.pop('model_field', None) - if not issubclass(field_cls, CharField) and not issubclass(field_cls, ChoiceField): - # `allow_blank` is only valid for textual fields. - kwargs.pop('allow_blank', None) - - elif field_name in info.relations: - # Create forward and reverse relationships. - relation_info = info.relations[field_name] - if depth: - field_cls = self._get_nested_class(depth, relation_info) - kwargs = get_nested_relation_kwargs(relation_info) - else: - field_cls = self._related_class - kwargs = get_relation_kwargs(field_name, relation_info) - # `view_name` is only valid for hyperlinked relationships. - if not issubclass(field_cls, HyperlinkedRelatedField): - kwargs.pop('view_name', None) - - elif hasattr(model, field_name): - # Create a read only field for model methods and properties. - field_cls = ReadOnlyField - kwargs = {} - - elif field_name == api_settings.URL_FIELD_NAME: - # Create the URL field. - field_cls = HyperlinkedIdentityField - kwargs = get_url_kwargs(model) - - else: - raise ImproperlyConfigured( - 'Field name `%s` is not valid for model `%s`.' % - (field_name, model.__class__.__name__) - ) + # Determine the serializer field class and keyword arguments. + field_cls, kwargs = self.build_field(field_name, info, model, depth) # Populate any kwargs defined in `Meta.extra_kwargs` - extras = extra_kwargs.get(field_name, {}) - if extras.get('read_only', False): - for attr in [ - 'required', 'default', 'allow_blank', 'allow_null', - 'min_length', 'max_length', 'min_value', 'max_value', - 'validators', 'queryset' - ]: - kwargs.pop(attr, None) - - if extras.get('default') and kwargs.get('required') is False: - kwargs.pop('required') - - kwargs.update(extras) + kwargs = self.build_final_kwargs(kwargs, extra_kwargs, field_name) # Create the serializer field. ret[field_name] = field_cls(**kwargs) + # Add in any hidden fields. ret.update(hidden_fields) return ret + def build_field(self, field_name, info, model, depth): + if field_name in info.fields_and_pk: + # Create regular model fields. + model_field = info.fields_and_pk[field_name] + field_cls = self._field_mapping[model_field] + kwargs = get_field_kwargs(field_name, model_field) + if 'choices' in kwargs: + # Fields with choices get coerced into `ChoiceField` + # instead of using their regular typed field. + field_cls = ChoiceField + if not issubclass(field_cls, ModelField): + # `model_field` is only valid for the fallback case of + # `ModelField`, which is used when no other typed field + # matched to the model field. + kwargs.pop('model_field', None) + if not issubclass(field_cls, CharField) and not issubclass(field_cls, ChoiceField): + # `allow_blank` is only valid for textual fields. + kwargs.pop('allow_blank', None) + + elif field_name in info.relations: + # Create forward and reverse relationships. + relation_info = info.relations[field_name] + if depth: + field_cls = self._get_nested_class(depth, relation_info) + kwargs = get_nested_relation_kwargs(relation_info) + else: + field_cls = self._related_class + kwargs = get_relation_kwargs(field_name, relation_info) + # `view_name` is only valid for hyperlinked relationships. + if not issubclass(field_cls, HyperlinkedRelatedField): + kwargs.pop('view_name', None) + + elif hasattr(model, field_name): + # Create a read only field for model methods and properties. + field_cls = ReadOnlyField + kwargs = {} + + elif field_name == api_settings.URL_FIELD_NAME: + # Create the URL field. + field_cls = HyperlinkedIdentityField + kwargs = get_url_kwargs(model) + + else: + raise ImproperlyConfigured( + 'Field name `%s` is not valid for model `%s`.' % + (field_name, model.__class__.__name__) + ) + + return field_cls, kwargs + + def build_final_kwargs(self, kwargs, extra_kwargs, field_name): + """ + Include an 'extra_kwargs' that have been included for this field, + possibly removing any incompatible existing keyword arguments. + """ + extras = extra_kwargs.get(field_name, {}) + + if extras.get('read_only', False): + for attr in [ + 'required', 'default', 'allow_blank', 'allow_null', + 'min_length', 'max_length', 'min_value', 'max_value', + 'validators', 'queryset' + ]: + kwargs.pop(attr, None) + + if extras.get('default') and kwargs.get('required') is False: + kwargs.pop('required') + + kwargs.update(extras) + + return kwargs + def _get_model_fields(self, field_names, declared_fields, extra_kwargs): """ Returns all the model fields that are being mapped to by fields From 75e81b82545704bac8afdf3270ba9f6c8da09c27 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Dec 2014 15:35:52 +0000 Subject: [PATCH 1365/1652] build_*_field methods --- rest_framework/serializers.py | 785 ++++++++++++++++++---------------- 1 file changed, 424 insertions(+), 361 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 80ad10f0a..a983d3fc7 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -696,7 +696,7 @@ class ModelSerializer(Serializer): you need you should either declare the extra/differing fields explicitly on the serializer class, or simply use a `Serializer` class. """ - _field_mapping = ClassLookupDict({ + serializer_field_mapping = { models.AutoField: IntegerField, models.BigIntegerField: IntegerField, models.BooleanField: BooleanField, @@ -719,8 +719,8 @@ class ModelSerializer(Serializer): models.TextField: CharField, models.TimeField: TimeField, models.URLField: URLField, - }) - _related_class = PrimaryKeyRelatedField + } + serializer_related_class = PrimaryKeyRelatedField # Default `create` and `update` behavior... @@ -793,6 +793,417 @@ class ModelSerializer(Serializer): return instance + # Determine the fields to apply... + + def get_fields(self): + """ + Return the dict of field names -> field instances that should be + used for `self.fields` when instantiating the serializer. + """ + declared_fields = copy.deepcopy(self._declared_fields) + model = getattr(self.Meta, 'model') + depth = getattr(self.Meta, 'depth', 0) + + # Retrieve metadata about fields & relationships on the model class. + info = model_meta.get_field_info(model) + field_names = self.get_field_names(declared_fields, info) + + # Determine any extra field arguments and hidden fields that + # should be included + extra_kwargs = self.get_extra_kwargs() + extra_kwargs, hidden_fields = self.get_uniqueness_extra_kwargs( + field_names, declared_fields, extra_kwargs + ) + + # Now determine the fields that should be included on the serializer. + ret = OrderedDict() + for field_name in field_names: + if field_name in declared_fields: + # Field is explicitly declared on the class, use that. + ret[field_name] = declared_fields[field_name] + continue + + # Determine the serializer field class and keyword arguments. + field_cls, kwargs = self.build_field(field_name, info, model, depth) + + # Populate any kwargs defined in `Meta.extra_kwargs` + kwargs = self.build_field_kwargs(kwargs, extra_kwargs, field_name) + + # Create the serializer field. + ret[field_name] = field_cls(**kwargs) + + # Add in any hidden fields. + ret.update(hidden_fields) + + return ret + + # Methods for determining the set of field names to include... + + def get_field_names(self, declared_fields, info): + """ + Returns the list of all field names that should be created when + instantiating this serializer class. This is based on the default + set of fields, but also takes into account the `Meta.fields` or + `Meta.exclude` options if they have been specified. + """ + fields = getattr(self.Meta, 'fields', None) + exclude = getattr(self.Meta, 'exclude', None) + + if fields and not isinstance(fields, (list, tuple)): + raise TypeError( + 'The `fields` option must be a list or tuple. Got %s.' % + type(fields).__name__ + ) + + if exclude and not isinstance(exclude, (list, tuple)): + raise TypeError( + 'The `exclude` option must be a list or tuple. Got %s.' % + type(exclude).__name__ + ) + + assert not (fields and exclude), ( + "Cannot set both 'fields' and 'exclude' options on " + "serializer {serializer_class}.".format( + serializer_class=self.__class__.__name__ + ) + ) + + if fields is not None: + # Ensure that all declared fields have also been included in the + # `Meta.fields` option. + for field_name in declared_fields: + assert field_name in fields, ( + "The field '{field_name}' was declared on serializer " + "{serializer_class}, but has not been included in the " + "'fields' option.".format( + field_name=field_name, + serializer_class=self.__class__.__name__ + ) + ) + return fields + + # Use the default set of field names if `Meta.fields` is not specified. + fields = self.get_default_field_names(declared_fields, info) + + if exclude is not None: + # If `Meta.exclude` is included, then remove those fields. + for field_name in exclude: + assert field_name in fields, ( + "The field '{field_name}' was include on serializer " + "{serializer_class} in the 'exclude' option, but does " + "not match any model field.".format( + field_name=field_name, + serializer_class=self.__class__.__name__ + ) + ) + fields.remove(field_name) + + return fields + + def get_default_field_names(self, declared_fields, model_info): + """ + Return the default list of field names that will be used if the + `Meta.fields` option is not specified. + """ + return ( + [model_info.pk.name] + + list(declared_fields.keys()) + + list(model_info.fields.keys()) + + list(model_info.forward_relations.keys()) + ) + + # Methods for constructing serializer fields... + + def build_field(self, field_name, info, model, nested_depth): + """ + Return a two tuple of (cls, kwargs) to build a serializer field with. + """ + if field_name in info.fields_and_pk: + return self.build_standard_field(field_name, info, model) + + elif field_name in info.relations: + if not nested_depth: + return self.build_relational_field(field_name, info, model) + else: + return self.build_nested_field(field_name, info, model, nested_depth) + + elif hasattr(model, field_name): + return self.build_property_field(field_name, info, model) + + elif field_name == api_settings.URL_FIELD_NAME: + return self.build_url_field(field_name, info, model) + + return self.build_unknown_field(field_name, info, model) + + def build_standard_field(self, field_name, info, model): + """ + Create regular model fields. + """ + field_mapping = ClassLookupDict(self.serializer_field_mapping) + model_field = info.fields_and_pk[field_name] + + field_cls = field_mapping[model_field] + kwargs = get_field_kwargs(field_name, model_field) + + if 'choices' in kwargs: + # Fields with choices get coerced into `ChoiceField` + # instead of using their regular typed field. + field_cls = ChoiceField + if not issubclass(field_cls, ModelField): + # `model_field` is only valid for the fallback case of + # `ModelField`, which is used when no other typed field + # matched to the model field. + kwargs.pop('model_field', None) + if not issubclass(field_cls, CharField) and not issubclass(field_cls, ChoiceField): + # `allow_blank` is only valid for textual fields. + kwargs.pop('allow_blank', None) + + return field_cls, kwargs + + def build_relational_field(self, field_name, info, model): + """ + Create fields for forward and reverse relationships. + """ + relation_info = info.relations[field_name] + + field_cls = self.serializer_related_class + kwargs = get_relation_kwargs(field_name, relation_info) + + # `view_name` is only valid for hyperlinked relationships. + if not issubclass(field_cls, HyperlinkedRelatedField): + kwargs.pop('view_name', None) + + return field_cls, kwargs + + def build_nested_field(self, field_name, info, model, nested_depth): + """ + Create nested fields for forward and reverse relationships. + """ + relation_info = info.relations[field_name] + + class NestedSerializer(ModelSerializer): + class Meta: + model = relation_info.related + depth = nested_depth - 1 + + field_cls = NestedSerializer + kwargs = get_nested_relation_kwargs(relation_info) + + return field_cls, kwargs + + def build_property_field(self, field_name, info, model): + """ + Create a read only field for model methods and properties. + """ + field_cls = ReadOnlyField + kwargs = {} + + return field_cls, kwargs + + def build_url_field(self, field_name, info, model): + """ + Create a field representing the object's own URL. + """ + field_cls = HyperlinkedIdentityField + kwargs = get_url_kwargs(model) + + return field_cls, kwargs + + def build_unknown_field(self, field_name, info, model): + """ + Raise an error on any unknown fields. + """ + raise ImproperlyConfigured( + 'Field name `%s` is not valid for model `%s`.' % + (field_name, model.__class__.__name__) + ) + + def build_field_kwargs(self, kwargs, extra_kwargs, field_name): + """ + Include an 'extra_kwargs' that have been included for this field, + possibly removing any incompatible existing keyword arguments. + """ + extras = extra_kwargs.get(field_name, {}) + + if extras.get('read_only', False): + for attr in [ + 'required', 'default', 'allow_blank', 'allow_null', + 'min_length', 'max_length', 'min_value', 'max_value', + 'validators', 'queryset' + ]: + kwargs.pop(attr, None) + + if extras.get('default') and kwargs.get('required') is False: + kwargs.pop('required') + + kwargs.update(extras) + + return kwargs + + # Methods for determining additional keyword arguments to apply... + + def get_extra_kwargs(self): + """ + Return a dictionary mapping field names to a dictionary of + additional keyword arguments. + """ + extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) + + read_only_fields = getattr(self.Meta, 'read_only_fields', None) + if read_only_fields is not None: + for field_name in read_only_fields: + kwargs = extra_kwargs.get(field_name, {}) + kwargs['read_only'] = True + extra_kwargs[field_name] = kwargs + + # These are all pending deprecation. + write_only_fields = getattr(self.Meta, 'write_only_fields', None) + if write_only_fields is not None: + warnings.warn( + "The `Meta.write_only_fields` option is pending deprecation. " + "Use `Meta.extra_kwargs={<field_name>: {'write_only': True}}` instead.", + PendingDeprecationWarning, + stacklevel=3 + ) + for field_name in write_only_fields: + kwargs = extra_kwargs.get(field_name, {}) + kwargs['write_only'] = True + extra_kwargs[field_name] = kwargs + + view_name = getattr(self.Meta, 'view_name', None) + if view_name is not None: + warnings.warn( + "The `Meta.view_name` option is pending deprecation. " + "Use `Meta.extra_kwargs={'url': {'view_name': ...}}` instead.", + PendingDeprecationWarning, + stacklevel=3 + ) + kwargs = extra_kwargs.get(api_settings.URL_FIELD_NAME, {}) + kwargs['view_name'] = view_name + extra_kwargs[api_settings.URL_FIELD_NAME] = kwargs + + lookup_field = getattr(self.Meta, 'lookup_field', None) + if lookup_field is not None: + warnings.warn( + "The `Meta.lookup_field` option is pending deprecation. " + "Use `Meta.extra_kwargs={'url': {'lookup_field': ...}}` instead.", + PendingDeprecationWarning, + stacklevel=3 + ) + kwargs = extra_kwargs.get(api_settings.URL_FIELD_NAME, {}) + kwargs['lookup_field'] = lookup_field + extra_kwargs[api_settings.URL_FIELD_NAME] = kwargs + + return extra_kwargs + + def get_uniqueness_extra_kwargs(self, field_names, declared_fields, extra_kwargs): + """ + Return any additional field options that need to be included as a + result of uniqueness constraints on the model. This is returned as + a two-tuple of: + + ('dict of updated extra kwargs', 'mapping of hidden fields') + """ + model = getattr(self.Meta, 'model') + model_fields = self._get_model_fields( + field_names, declared_fields, extra_kwargs + ) + + # Determine if we need any additional `HiddenField` or extra keyword + # arguments to deal with `unique_for` dates that are required to + # be in the input data in order to validate it. + unique_constraint_names = set() + + for model_field in model_fields.values(): + # Include each of the `unique_for_*` field names. + unique_constraint_names |= set([ + model_field.unique_for_date, + model_field.unique_for_month, + model_field.unique_for_year + ]) + + unique_constraint_names -= set([None]) + + # Include each of the `unique_together` field names, + # so long as all the field names are included on the serializer. + for parent_class in [model] + list(model._meta.parents.keys()): + for unique_together_list in parent_class._meta.unique_together: + if set(field_names).issuperset(set(unique_together_list)): + unique_constraint_names |= set(unique_together_list) + + # Now we have all the field names that have uniqueness constraints + # applied, we can add the extra 'required=...' or 'default=...' + # arguments that are appropriate to these fields, or add a `HiddenField` for it. + hidden_fields = {} + uniqueness_extra_kwargs = {} + + for unique_constraint_name in unique_constraint_names: + # Get the model field that is referred too. + unique_constraint_field = model._meta.get_field(unique_constraint_name) + + if getattr(unique_constraint_field, 'auto_now_add', None): + default = CreateOnlyDefault(timezone.now) + elif getattr(unique_constraint_field, 'auto_now', None): + default = timezone.now + elif unique_constraint_field.has_default(): + default = unique_constraint_field.default + else: + default = empty + + if unique_constraint_name in model_fields: + # The corresponding field is present in the serializer + if default is empty: + uniqueness_extra_kwargs[unique_constraint_name] = {'required': True} + else: + uniqueness_extra_kwargs[unique_constraint_name] = {'default': default} + elif default is not empty: + # The corresponding field is not present in the, + # serializer. We have a default to use for it, so + # add in a hidden field that populates it. + hidden_fields[unique_constraint_name] = HiddenField(default=default) + + # Update `extra_kwargs` with any new options. + for key, value in uniqueness_extra_kwargs.items(): + if key in extra_kwargs: + extra_kwargs[key].update(value) + else: + extra_kwargs[key] = value + + return extra_kwargs, hidden_fields + + def _get_model_fields(self, field_names, declared_fields, extra_kwargs): + """ + Returns all the model fields that are being mapped to by fields + on the serializer class. + Returned as a dict of 'model field name' -> 'model field'. + Used internally by `get_uniqueness_field_options`. + """ + model = getattr(self.Meta, 'model') + model_fields = {} + + for field_name in field_names: + if field_name in declared_fields: + # If the field is declared on the serializer + field = declared_fields[field_name] + source = field.source or field_name + else: + try: + source = extra_kwargs[field_name]['source'] + except KeyError: + source = field_name + + if '.' in source or source == '*': + # Model fields will always have a simple source mapping, + # they can't be nested attribute lookups. + continue + + try: + model_fields[source] = model._meta.get_field(source) + except FieldDoesNotExist: + pass + + return model_fields + # Determine the validators to apply... def get_validators(self): @@ -882,361 +1293,6 @@ class ModelSerializer(Serializer): return validators - # Determine the fields to apply... - - def get_fields(self): - declared_fields = copy.deepcopy(self._declared_fields) - model = getattr(self.Meta, 'model') - depth = getattr(self.Meta, 'depth', 0) - - # Retrieve metadata about fields & relationships on the model class. - info = model_meta.get_field_info(model) - field_names = self.get_field_names(declared_fields, info) - - # Determine any extra field arguments and hidden fields that - # should be included - extra_kwargs = self.get_extra_kwargs() - extra_kwargs, hidden_fields = self.get_uniqueness_extra_kwargs( - field_names, declared_fields, extra_kwargs - ) - - # Now determine the fields that should be included on the serializer. - ret = OrderedDict() - for field_name in field_names: - if field_name in declared_fields: - # Field is explicitly declared on the class, use that. - ret[field_name] = declared_fields[field_name] - continue - - # Determine the serializer field class and keyword arguments. - field_cls, kwargs = self.build_field(field_name, info, model, depth) - - # Populate any kwargs defined in `Meta.extra_kwargs` - kwargs = self.build_final_kwargs(kwargs, extra_kwargs, field_name) - - # Create the serializer field. - ret[field_name] = field_cls(**kwargs) - - # Add in any hidden fields. - ret.update(hidden_fields) - - return ret - - def build_field(self, field_name, info, model, depth): - if field_name in info.fields_and_pk: - # Create regular model fields. - model_field = info.fields_and_pk[field_name] - field_cls = self._field_mapping[model_field] - kwargs = get_field_kwargs(field_name, model_field) - if 'choices' in kwargs: - # Fields with choices get coerced into `ChoiceField` - # instead of using their regular typed field. - field_cls = ChoiceField - if not issubclass(field_cls, ModelField): - # `model_field` is only valid for the fallback case of - # `ModelField`, which is used when no other typed field - # matched to the model field. - kwargs.pop('model_field', None) - if not issubclass(field_cls, CharField) and not issubclass(field_cls, ChoiceField): - # `allow_blank` is only valid for textual fields. - kwargs.pop('allow_blank', None) - - elif field_name in info.relations: - # Create forward and reverse relationships. - relation_info = info.relations[field_name] - if depth: - field_cls = self._get_nested_class(depth, relation_info) - kwargs = get_nested_relation_kwargs(relation_info) - else: - field_cls = self._related_class - kwargs = get_relation_kwargs(field_name, relation_info) - # `view_name` is only valid for hyperlinked relationships. - if not issubclass(field_cls, HyperlinkedRelatedField): - kwargs.pop('view_name', None) - - elif hasattr(model, field_name): - # Create a read only field for model methods and properties. - field_cls = ReadOnlyField - kwargs = {} - - elif field_name == api_settings.URL_FIELD_NAME: - # Create the URL field. - field_cls = HyperlinkedIdentityField - kwargs = get_url_kwargs(model) - - else: - raise ImproperlyConfigured( - 'Field name `%s` is not valid for model `%s`.' % - (field_name, model.__class__.__name__) - ) - - return field_cls, kwargs - - def build_final_kwargs(self, kwargs, extra_kwargs, field_name): - """ - Include an 'extra_kwargs' that have been included for this field, - possibly removing any incompatible existing keyword arguments. - """ - extras = extra_kwargs.get(field_name, {}) - - if extras.get('read_only', False): - for attr in [ - 'required', 'default', 'allow_blank', 'allow_null', - 'min_length', 'max_length', 'min_value', 'max_value', - 'validators', 'queryset' - ]: - kwargs.pop(attr, None) - - if extras.get('default') and kwargs.get('required') is False: - kwargs.pop('required') - - kwargs.update(extras) - - return kwargs - - def _get_model_fields(self, field_names, declared_fields, extra_kwargs): - """ - Returns all the model fields that are being mapped to by fields - on the serializer class. - Returned as a dict of 'model field name' -> 'model field'. - Used internally by `get_uniqueness_field_options`. - """ - model = getattr(self.Meta, 'model') - model_fields = {} - - for field_name in field_names: - if field_name in declared_fields: - # If the field is declared on the serializer - field = declared_fields[field_name] - source = field.source or field_name - else: - try: - source = extra_kwargs[field_name]['source'] - except KeyError: - source = field_name - - if '.' in source or source == '*': - # Model fields will always have a simple source mapping, - # they can't be nested attribute lookups. - continue - - try: - model_fields[source] = model._meta.get_field(source) - except FieldDoesNotExist: - pass - - return model_fields - - def get_uniqueness_extra_kwargs(self, field_names, declared_fields, extra_kwargs): - """ - Return any additional field options that need to be included as a - result of uniqueness constraints on the model. This is returned as - a two-tuple of: - - ('dict of updated extra kwargs', 'mapping of hidden fields') - """ - model = getattr(self.Meta, 'model') - model_fields = self._get_model_fields( - field_names, declared_fields, extra_kwargs - ) - - # Determine if we need any additional `HiddenField` or extra keyword - # arguments to deal with `unique_for` dates that are required to - # be in the input data in order to validate it. - unique_constraint_names = set() - - for model_field in model_fields.values(): - # Include each of the `unique_for_*` field names. - unique_constraint_names |= set([ - model_field.unique_for_date, - model_field.unique_for_month, - model_field.unique_for_year - ]) - - unique_constraint_names -= set([None]) - - # Include each of the `unique_together` field names, - # so long as all the field names are included on the serializer. - for parent_class in [model] + list(model._meta.parents.keys()): - for unique_together_list in parent_class._meta.unique_together: - if set(field_names).issuperset(set(unique_together_list)): - unique_constraint_names |= set(unique_together_list) - - # Now we have all the field names that have uniqueness constraints - # applied, we can add the extra 'required=...' or 'default=...' - # arguments that are appropriate to these fields, or add a `HiddenField` for it. - hidden_fields = {} - uniqueness_extra_kwargs = {} - - for unique_constraint_name in unique_constraint_names: - # Get the model field that is referred too. - unique_constraint_field = model._meta.get_field(unique_constraint_name) - - if getattr(unique_constraint_field, 'auto_now_add', None): - default = CreateOnlyDefault(timezone.now) - elif getattr(unique_constraint_field, 'auto_now', None): - default = timezone.now - elif unique_constraint_field.has_default(): - default = unique_constraint_field.default - else: - default = empty - - if unique_constraint_name in model_fields: - # The corresponding field is present in the serializer - if default is empty: - uniqueness_extra_kwargs[unique_constraint_name] = {'required': True} - else: - uniqueness_extra_kwargs[unique_constraint_name] = {'default': default} - elif default is not empty: - # The corresponding field is not present in the, - # serializer. We have a default to use for it, so - # add in a hidden field that populates it. - hidden_fields[unique_constraint_name] = HiddenField(default=default) - - # Update `extra_kwargs` with any new options. - for key, value in uniqueness_extra_kwargs.items(): - if key in extra_kwargs: - extra_kwargs[key].update(value) - else: - extra_kwargs[key] = value - - return extra_kwargs, hidden_fields - - def get_extra_kwargs(self): - """ - Return a dictionary mapping field names to a dictionary of - additional keyword arguments. - """ - extra_kwargs = getattr(self.Meta, 'extra_kwargs', {}) - - read_only_fields = getattr(self.Meta, 'read_only_fields', None) - if read_only_fields is not None: - for field_name in read_only_fields: - kwargs = extra_kwargs.get(field_name, {}) - kwargs['read_only'] = True - extra_kwargs[field_name] = kwargs - - # These are all pending deprecation. - write_only_fields = getattr(self.Meta, 'write_only_fields', None) - if write_only_fields is not None: - warnings.warn( - "The `Meta.write_only_fields` option is pending deprecation. " - "Use `Meta.extra_kwargs={<field_name>: {'write_only': True}}` instead.", - PendingDeprecationWarning, - stacklevel=3 - ) - for field_name in write_only_fields: - kwargs = extra_kwargs.get(field_name, {}) - kwargs['write_only'] = True - extra_kwargs[field_name] = kwargs - - view_name = getattr(self.Meta, 'view_name', None) - if view_name is not None: - warnings.warn( - "The `Meta.view_name` option is pending deprecation. " - "Use `Meta.extra_kwargs={'url': {'view_name': ...}}` instead.", - PendingDeprecationWarning, - stacklevel=3 - ) - kwargs = extra_kwargs.get(api_settings.URL_FIELD_NAME, {}) - kwargs['view_name'] = view_name - extra_kwargs[api_settings.URL_FIELD_NAME] = kwargs - - lookup_field = getattr(self.Meta, 'lookup_field', None) - if lookup_field is not None: - warnings.warn( - "The `Meta.lookup_field` option is pending deprecation. " - "Use `Meta.extra_kwargs={'url': {'lookup_field': ...}}` instead.", - PendingDeprecationWarning, - stacklevel=3 - ) - kwargs = extra_kwargs.get(api_settings.URL_FIELD_NAME, {}) - kwargs['lookup_field'] = lookup_field - extra_kwargs[api_settings.URL_FIELD_NAME] = kwargs - - return extra_kwargs - - def get_field_names(self, declared_fields, info): - """ - Returns the list of all field names that should be created when - instantiating this serializer class. This is based on the default - set of fields, but also takes into account the `Meta.fields` or - `Meta.exclude` options if they have been specified. - """ - fields = getattr(self.Meta, 'fields', None) - exclude = getattr(self.Meta, 'exclude', None) - - if fields and not isinstance(fields, (list, tuple)): - raise TypeError( - 'The `fields` option must be a list or tuple. Got %s.' % - type(fields).__name__ - ) - - if exclude and not isinstance(exclude, (list, tuple)): - raise TypeError( - 'The `exclude` option must be a list or tuple. Got %s.' % - type(exclude).__name__ - ) - - assert not (fields and exclude), ( - "Cannot set both 'fields' and 'exclude' options on " - "serializer {serializer_class}.".format( - serializer_class=self.__class__.__name__ - ) - ) - - if fields is not None: - # Ensure that all declared fields have also been included in the - # `Meta.fields` option. - for field_name in declared_fields: - assert field_name in fields, ( - "The field '{field_name}' was declared on serializer " - "{serializer_class}, but has not been included in the " - "'fields' option.".format( - field_name=field_name, - serializer_class=self.__class__.__name__ - ) - ) - return fields - - # Use the default set of field names if `Meta.fields` is not specified. - fields = self.get_default_field_names(declared_fields, info) - - if exclude is not None: - # If `Meta.exclude` is included, then remove those fields. - for field_name in exclude: - assert field_name in fields, ( - "The field '{field_name}' was include on serializer " - "{serializer_class} in the 'exclude' option, but does " - "not match any model field.".format( - field_name=field_name, - serializer_class=self.__class__.__name__ - ) - ) - fields.remove(field_name) - - return fields - - def get_default_field_names(self, declared_fields, model_info): - """ - Return the default list of field names that will be used if the - `Meta.fields` option is not specified. - """ - return ( - [model_info.pk.name] + - list(declared_fields.keys()) + - list(model_info.fields.keys()) + - list(model_info.forward_relations.keys()) - ) - - def _get_nested_class(self, nested_depth, relation_info): - class NestedSerializer(ModelSerializer): - class Meta: - model = relation_info.related - depth = nested_depth - 1 - - return NestedSerializer - class HyperlinkedModelSerializer(ModelSerializer): """ @@ -1246,7 +1302,7 @@ class HyperlinkedModelSerializer(ModelSerializer): * A 'url' field is included instead of the 'id' field. * Relationships to other instances are hyperlinks, instead of primary keys. """ - _related_class = HyperlinkedRelatedField + serializer_related_class = HyperlinkedRelatedField def get_default_field_names(self, declared_fields, model_info): """ @@ -1260,10 +1316,17 @@ class HyperlinkedModelSerializer(ModelSerializer): list(model_info.forward_relations.keys()) ) - def _get_nested_class(self, nested_depth, relation_info): + def build_nested_field(self, field_name, info, model, nested_depth): + """ + Create nested fields for forward and reverse relationships. + """ + relation_info = info.relations[field_name] + class NestedSerializer(HyperlinkedModelSerializer): class Meta: model = relation_info.related depth = nested_depth - 1 - return NestedSerializer + field_cls = NestedSerializer + kwargs = get_nested_relation_kwargs(relation_info) + return field_cls, kwargs From b4a3e7f64096ea7106ff0d622bdf1c6e2e4e2895 Mon Sep 17 00:00:00 2001 From: Rahul <tanwanirahul@gmail.com> Date: Fri, 19 Dec 2014 21:20:19 +0530 Subject: [PATCH 1366/1652] Updates url_path info per suggestion --- docs/api-guide/routers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 63b8b59a8..87b6f15ac 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -68,7 +68,7 @@ The following URL pattern would additionally be generated: * URL pattern: `^users/{pk}/set_password/$` Name: `'user-set-password'` -If you did not like the default URL generated for your custom action, you could use `url_path` parameter with `@detail_route` or `@list_route` to customize it. +If you do not want to use the default URL generated for your custom action, you can instead use the url_path parameter to customize it. For example, if you want to change the URL for our custom action to `^users/{pk}/change-password/$`, you could write: @@ -82,7 +82,7 @@ For example, if you want to change the URL for our custom action to `^users/{pk} def set_password(self, request, pk=None): ... -Above example would instead generate following URL pattern: +The above example would now generate the following URL pattern: * URL pattern: `^users/{pk}/change-password/$` Name: `'user-change-password'` From 62f78dfbf1b1dfa2d6406a4be5b83bc69267e851 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Dec 2014 15:50:29 +0000 Subject: [PATCH 1367/1652] Copy validators lists on instantiation. --- rest_framework/serializers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index a983d3fc7..8adbafe45 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -327,7 +327,9 @@ class Serializer(BaseSerializer): Returns a list of validator callables. """ # Used by the lazily-evaluated `validators` property. - return getattr(getattr(self, 'Meta', None), 'validators', []) + meta = getattr(self, 'Meta', None) + validators = getattr(meta, 'validators', None) + return validators[:] if validators else [] def get_initial(self): if hasattr(self, 'initial_data'): @@ -1213,7 +1215,7 @@ class ModelSerializer(Serializer): # If the validators have been declared explicitly then use that. validators = getattr(getattr(self, 'Meta', None), 'validators', None) if validators is not None: - return validators + return validators[:] # Otherwise use the default set of validators. return ( From 8f0fef4b75f5c999c13b5d37a263da3a3388142e Mon Sep 17 00:00:00 2001 From: Rahul <tanwanirahul@gmail.com> Date: Fri, 19 Dec 2014 21:22:10 +0530 Subject: [PATCH 1368/1652] Updated documentation on url_path per suggestions. --- docs/tutorial/6-viewsets-and-routers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index 8e4e22f05..d2ee11028 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -53,7 +53,7 @@ Notice that we've also used the `@detail_route` decorator to create a custom act Custom actions which use the `@detail_route` decorator will respond to `GET` requests. We can use the `methods` argument if we wanted an action that responded to `POST` requests. -The URLs for custom actions by default depends on the method name itself. If you want to change the way url should be constructed, you can use `url_path` parameter of `@detail_route` and provide the string value for the same. +The URLs for custom actions by default depend on the method name itself. If you want to change the way url should be constructed, you can include url_path as a decorator keyword argument. ## Binding ViewSets to URLs explicitly From 48d15f6ff8a13aafd5b4977c8d1b4b7fe70b4f6a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Dec 2014 16:58:35 +0000 Subject: [PATCH 1369/1652] Stub out the documentation --- docs/api-guide/serializers.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index b9f0e7bc0..4d3dfa31b 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -567,6 +567,32 @@ The inner `Meta` class on serializers is not inherited from parent classes by de Typically we would recommend *not* using inheritance on inner Meta classes, but instead declaring all options explicitly. +## Advanced `ModelSerializer` usage + +The ModelSerializer class also exposes an API that you can override in order to alter how serializer fields are automatically determined when instantiating the serializer. + +#### `.serializer_field_mapping` + +A mapping of Django model classes to REST framework serializer classes. You can override this mapping to alter the default serializer classes that should be used for each model class. + +#### `.serializer_relational_field` + +This property should be the serializer field class, that is used for relational fields by default. For `ModelSerializer` this defaults to `PrimaryKeyRelatedField`. For `HyperlinkedModelSerializer` this defaults to `HyperlinkedRelatedField`. + +#### The build field methods + +#### `build_standard_field(**kwargs)` + +#### `build_relational_field(**kwargs)` + +#### `build_nested_field(**kwargs)` + +#### `build_property_field(**kwargs)` + +#### `build_url_field(**kwargs)` + +#### `build_unknown_field(**kwargs)` + --- # HyperlinkedModelSerializer From 2a1485e00943b8280245d19e1e1f8514b1ef18ea Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 19 Dec 2014 21:32:43 +0000 Subject: [PATCH 1370/1652] Final bits of docs for ModelSerializer fields API --- docs/api-guide/serializers.md | 57 +++++++++--- docs_theme/css/default.css | 4 + rest_framework/serializers.py | 140 ++++++++++++++++------------- rest_framework/utils/model_meta.py | 10 +-- tests/test_model_serializer.py | 2 +- 5 files changed, 132 insertions(+), 81 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 4d3dfa31b..dcbbd5f21 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -457,7 +457,7 @@ To do so, open the Django shell, using `python manage.py shell`, then import the name = CharField(allow_blank=True, max_length=100, required=False) owner = PrimaryKeyRelatedField(queryset=User.objects.all()) -## Specifying which fields should be included +## Specifying which fields to include If you only want a subset of the default fields to be used in a model serializer, you can do so using `fields` or `exclude` options, just as you would with a `ModelForm`. @@ -499,7 +499,7 @@ You can add extra fields to a `ModelSerializer` or override the default fields b Extra fields can correspond to any property or callable on the model. -## Specifying which fields should be read-only +## Specifying read only fields You may wish to specify multiple fields as read-only. Instead of adding each field explicitly with the `read_only=True` attribute, you may use the shortcut Meta option, `read_only_fields`. @@ -528,7 +528,7 @@ Please review the [Validators Documentation](/api-guide/validators/) for details --- -## Specifying additional keyword arguments for fields. +## Additional keyword arguments There is also a shortcut allowing you to specify arbitrary additional keyword arguments on fields, using the `extra_kwargs` option. Similarly to `read_only_fields` this means you do not need to explicitly declare the field on the serializer. @@ -567,31 +567,62 @@ The inner `Meta` class on serializers is not inherited from parent classes by de Typically we would recommend *not* using inheritance on inner Meta classes, but instead declaring all options explicitly. -## Advanced `ModelSerializer` usage +## Customizing field mappings The ModelSerializer class also exposes an API that you can override in order to alter how serializer fields are automatically determined when instantiating the serializer. -#### `.serializer_field_mapping` +Normally if a `ModelSerializer` does not generate the fields you need by default the you should either add them to the class explicitly, or simply use a regular `Serializer` class instead. However in some cases you may want to create a new base class that defines how the serializer fields are created for any given model. + +### `.serializer_field_mapping` A mapping of Django model classes to REST framework serializer classes. You can override this mapping to alter the default serializer classes that should be used for each model class. -#### `.serializer_relational_field` +### `.serializer_relational_field` This property should be the serializer field class, that is used for relational fields by default. For `ModelSerializer` this defaults to `PrimaryKeyRelatedField`. For `HyperlinkedModelSerializer` this defaults to `HyperlinkedRelatedField`. -#### The build field methods +### The field_class and field_kwargs API -#### `build_standard_field(**kwargs)` +The following methods are called to determine the class and keyword arguments for each field that should be automatically included on the serializer. Each of these methods should return a two tuple of `(field_class, field_kwargs)`. -#### `build_relational_field(**kwargs)` +### `.build_standard_field(self, field_name, model_field)` -#### `build_nested_field(**kwargs)` +Called to generate a serializer field that maps to a standard model field. -#### `build_property_field(**kwargs)` +The default implementation returns a serializer class based on the `serializer_field_mapping` attribute. -#### `build_url_field(**kwargs)` +### `.build_relational_field(self, field_name, relation_info)` -#### `build_unknown_field(**kwargs)` +Called to generate a serializer field that maps to a relational model field. + +The default implementation returns a serializer class based on the `serializer_relational_field` attribute. + +The `relation_info` argument is a named tuple, that contains `model_field`, `related_model`, `to_many` and `has_through_model` properties. + +### `.build_nested_field(self, field_name, relation_info, nested_depth)` + +Called to generate a serializer field that maps to a relational model field, when the `depth` option has been set. + +The default implementation dynamically creates a nested serializer class based on either `ModelSerializer` or `HyperlinkedModelSerializer`. + +The `nested_depth` will be the value of the `depth` option, minus one. + +The `relation_info` argument is a named tuple, that contains `model_field`, `related_model`, `to_many` and `has_through_model` properties. + +### `.build_property_field(self, field_name, model_class)` + +Called to generate a serializer field that maps to a property or zero-argument method on the model class. + +The default implementation returns a `ReadOnlyField` class. + +### `.build_url_field(self, field_name, model_class)` + +Called to generate a serializer field for the serializer's own `url` field. The default implementation returns a `HyperlinkedIdentityField` class. + +### `.build_unknown_field(self, field_name, model_class)` + +Called when the field name did not map to any model field or model property. +The default implementation raises an error, although subclasses may customize this behavior. --- diff --git a/docs_theme/css/default.css b/docs_theme/css/default.css index 8c9cd5363..48d00366b 100644 --- a/docs_theme/css/default.css +++ b/docs_theme/css/default.css @@ -239,6 +239,10 @@ body a:hover{ } } +h1 code, h2 code, h3 code, h4 code, h5 code { + color: #333; +} + /* sticky footer and footer */ html, body { height: 100%; diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 8adbafe45..623ed5865 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -802,10 +802,25 @@ class ModelSerializer(Serializer): Return the dict of field names -> field instances that should be used for `self.fields` when instantiating the serializer. """ + assert hasattr(self, 'Meta'), ( + 'Class {serializer_class} missing "Meta" attribute'.format( + serializer_class=self.__class__.__name__ + ) + ) + assert hasattr(self.Meta, 'model'), ( + 'Class {serializer_class} missing "Meta.model" attribute'.format( + serializer_class=self.__class__.__name__ + ) + ) + declared_fields = copy.deepcopy(self._declared_fields) model = getattr(self.Meta, 'model') depth = getattr(self.Meta, 'depth', 0) + if depth is not None: + assert depth >= 0, "'depth' may not be negative." + assert depth <= 10, "'depth' may not be greater than 10." + # Retrieve metadata about fields & relationships on the model class. info = model_meta.get_field_info(model) field_names = self.get_field_names(declared_fields, info) @@ -817,27 +832,32 @@ class ModelSerializer(Serializer): field_names, declared_fields, extra_kwargs ) - # Now determine the fields that should be included on the serializer. - ret = OrderedDict() + # Determine the fields that should be included on the serializer. + fields = OrderedDict() + for field_name in field_names: + # If the field is explicitly declared on the class then use that. if field_name in declared_fields: - # Field is explicitly declared on the class, use that. - ret[field_name] = declared_fields[field_name] + fields[field_name] = declared_fields[field_name] continue # Determine the serializer field class and keyword arguments. - field_cls, kwargs = self.build_field(field_name, info, model, depth) + field_class, field_kwargs = self.build_field( + field_name, info, model, depth + ) - # Populate any kwargs defined in `Meta.extra_kwargs` - kwargs = self.build_field_kwargs(kwargs, extra_kwargs, field_name) + # Include any kwargs defined in `Meta.extra_kwargs` + field_kwargs = self.build_field_kwargs( + field_kwargs, extra_kwargs, field_name + ) # Create the serializer field. - ret[field_name] = field_cls(**kwargs) + fields[field_name] = field_class(**field_kwargs) # Add in any hidden fields. - ret.update(hidden_fields) + fields.update(hidden_fields) - return ret + return fields # Methods for determining the set of field names to include... @@ -916,108 +936,105 @@ class ModelSerializer(Serializer): # Methods for constructing serializer fields... - def build_field(self, field_name, info, model, nested_depth): + def build_field(self, field_name, info, model_class, nested_depth): """ Return a two tuple of (cls, kwargs) to build a serializer field with. """ if field_name in info.fields_and_pk: - return self.build_standard_field(field_name, info, model) + model_field = info.fields_and_pk[field_name] + return self.build_standard_field(field_name, model_field) elif field_name in info.relations: + relation_info = info.relations[field_name] if not nested_depth: - return self.build_relational_field(field_name, info, model) + return self.build_relational_field(field_name, relation_info) else: - return self.build_nested_field(field_name, info, model, nested_depth) + return self.build_nested_field(field_name, relation_info, nested_depth) - elif hasattr(model, field_name): - return self.build_property_field(field_name, info, model) + elif hasattr(model_class, field_name): + return self.build_property_field(field_name, model_class) elif field_name == api_settings.URL_FIELD_NAME: - return self.build_url_field(field_name, info, model) + return self.build_url_field(field_name, model_class) - return self.build_unknown_field(field_name, info, model) + return self.build_unknown_field(field_name, model_class) - def build_standard_field(self, field_name, info, model): + def build_standard_field(self, field_name, model_field): """ Create regular model fields. """ field_mapping = ClassLookupDict(self.serializer_field_mapping) - model_field = info.fields_and_pk[field_name] - field_cls = field_mapping[model_field] - kwargs = get_field_kwargs(field_name, model_field) + field_class = field_mapping[model_field] + field_kwargs = get_field_kwargs(field_name, model_field) - if 'choices' in kwargs: + if 'choices' in field_kwargs: # Fields with choices get coerced into `ChoiceField` # instead of using their regular typed field. - field_cls = ChoiceField - if not issubclass(field_cls, ModelField): + field_class = ChoiceField + if not issubclass(field_class, ModelField): # `model_field` is only valid for the fallback case of # `ModelField`, which is used when no other typed field # matched to the model field. - kwargs.pop('model_field', None) - if not issubclass(field_cls, CharField) and not issubclass(field_cls, ChoiceField): + field_kwargs.pop('model_field', None) + if not issubclass(field_class, CharField) and not issubclass(field_class, ChoiceField): # `allow_blank` is only valid for textual fields. - kwargs.pop('allow_blank', None) + field_kwargs.pop('allow_blank', None) - return field_cls, kwargs + return field_class, field_kwargs - def build_relational_field(self, field_name, info, model): + def build_relational_field(self, field_name, relation_info): """ Create fields for forward and reverse relationships. """ - relation_info = info.relations[field_name] - - field_cls = self.serializer_related_class - kwargs = get_relation_kwargs(field_name, relation_info) + field_class = self.serializer_related_class + field_kwargs = get_relation_kwargs(field_name, relation_info) # `view_name` is only valid for hyperlinked relationships. - if not issubclass(field_cls, HyperlinkedRelatedField): - kwargs.pop('view_name', None) + if not issubclass(field_class, HyperlinkedRelatedField): + field_kwargs.pop('view_name', None) - return field_cls, kwargs + return field_class, field_kwargs - def build_nested_field(self, field_name, info, model, nested_depth): + def build_nested_field(self, field_name, relation_info, nested_depth): """ Create nested fields for forward and reverse relationships. """ - relation_info = info.relations[field_name] - class NestedSerializer(ModelSerializer): class Meta: - model = relation_info.related - depth = nested_depth - 1 + model = relation_info.related_model + depth = nested_depth - field_cls = NestedSerializer - kwargs = get_nested_relation_kwargs(relation_info) + field_class = NestedSerializer + field_kwargs = get_nested_relation_kwargs(relation_info) - return field_cls, kwargs + return field_class, field_kwargs - def build_property_field(self, field_name, info, model): + def build_property_field(self, field_name, model_class): """ Create a read only field for model methods and properties. """ - field_cls = ReadOnlyField - kwargs = {} + field_class = ReadOnlyField + field_kwargs = {} - return field_cls, kwargs + return field_class, field_kwargs - def build_url_field(self, field_name, info, model): + def build_url_field(self, field_name, model_class): """ Create a field representing the object's own URL. """ - field_cls = HyperlinkedIdentityField - kwargs = get_url_kwargs(model) + field_class = HyperlinkedIdentityField + field_kwargs = get_url_kwargs(model_class) - return field_cls, kwargs + return field_class, field_kwargs - def build_unknown_field(self, field_name, info, model): + def build_unknown_field(self, field_name, model_class): """ Raise an error on any unknown fields. """ raise ImproperlyConfigured( 'Field name `%s` is not valid for model `%s`.' % - (field_name, model.__class__.__name__) + (field_name, model_class.__name__) ) def build_field_kwargs(self, kwargs, extra_kwargs, field_name): @@ -1318,17 +1335,16 @@ class HyperlinkedModelSerializer(ModelSerializer): list(model_info.forward_relations.keys()) ) - def build_nested_field(self, field_name, info, model, nested_depth): + def build_nested_field(self, field_name, relation_info, nested_depth): """ Create nested fields for forward and reverse relationships. """ - relation_info = info.relations[field_name] - class NestedSerializer(HyperlinkedModelSerializer): class Meta: - model = relation_info.related + model = relation_info.related_model depth = nested_depth - 1 - field_cls = NestedSerializer - kwargs = get_nested_relation_kwargs(relation_info) - return field_cls, kwargs + field_class = NestedSerializer + field_kwargs = get_nested_relation_kwargs(relation_info) + + return field_class, field_kwargs diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py index c98725c66..dfc387ca5 100644 --- a/rest_framework/utils/model_meta.py +++ b/rest_framework/utils/model_meta.py @@ -24,7 +24,7 @@ FieldInfo = namedtuple('FieldResult', [ RelationInfo = namedtuple('RelationInfo', [ 'model_field', - 'related', + 'related_model', 'to_many', 'has_through_model' ]) @@ -77,7 +77,7 @@ def get_field_info(model): for field in [field for field in opts.fields if field.serialize and field.rel]: forward_relations[field.name] = RelationInfo( model_field=field, - related=_resolve_model(field.rel.to), + related_model=_resolve_model(field.rel.to), to_many=False, has_through_model=False ) @@ -86,7 +86,7 @@ def get_field_info(model): for field in [field for field in opts.many_to_many if field.serialize]: forward_relations[field.name] = RelationInfo( model_field=field, - related=_resolve_model(field.rel.to), + related_model=_resolve_model(field.rel.to), to_many=True, has_through_model=( not field.rel.through._meta.auto_created @@ -99,7 +99,7 @@ def get_field_info(model): accessor_name = relation.get_accessor_name() reverse_relations[accessor_name] = RelationInfo( model_field=None, - related=relation.model, + related_model=relation.model, to_many=relation.field.rel.multiple, has_through_model=False ) @@ -109,7 +109,7 @@ def get_field_info(model): accessor_name = relation.get_accessor_name() reverse_relations[accessor_name] = RelationInfo( model_field=None, - related=relation.model, + related_model=relation.model, to_many=True, has_through_model=( (getattr(relation.field.rel, 'through', None) is not None) diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 5c56c8dbb..603faf477 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -206,7 +206,7 @@ class TestRegularFieldMappings(TestCase): with self.assertRaises(ImproperlyConfigured) as excinfo: TestSerializer().fields - expected = 'Field name `invalid` is not valid for model `ModelBase`.' + expected = 'Field name `invalid` is not valid for model `RegularFieldsModel`.' assert str(excinfo.exception) == expected def test_missing_field(self): From 77e3021fea3e30382b9770eac25371495e0b156b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sat, 20 Dec 2014 16:26:51 +0000 Subject: [PATCH 1371/1652] Better behaviour with null and '' for blank HTML fields. --- rest_framework/fields.py | 13 +++++-------- tests/test_fields.py | 22 +++++++++++++++------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index c40dc3fb3..aab80982a 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -273,7 +273,11 @@ class Field(object): return empty return self.default_empty_html ret = dictionary[self.field_name] - return self.default_empty_html if (ret == '') else ret + if ret == '' and self.allow_null: + # If the field is blank, and null is a valid value then + # determine if we should use null instead. + return '' if getattr(self, 'allow_blank', False) else None + return ret return dictionary.get(self.field_name, empty) def get_attribute(self, instance): @@ -545,8 +549,6 @@ class CharField(Field): 'min_length': _('Ensure this field has at least {min_length} characters.') } initial = '' - coerce_blank_to_null = False - default_empty_html = '' def __init__(self, **kwargs): self.allow_blank = kwargs.pop('allow_blank', False) @@ -560,11 +562,6 @@ class CharField(Field): message = self.error_messages['min_length'].format(min_length=min_length) self.validators.append(MinLengthValidator(min_length, message=message)) - if self.allow_null and (not self.allow_blank) and (self.default is empty): - # HTML input cannot represent `None` values, so we need to - # forcibly coerce empty HTML values to `None` if `allow_null=True`. - self.default_empty_html = None - def run_validation(self, data=empty): # Test for the empty string here so that it does not get validated, # and so that subclasses do not need to handle it explicitly diff --git a/tests/test_fields.py b/tests/test_fields.py index 04c721d36..775d46184 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -223,8 +223,8 @@ class MockHTMLDict(dict): getlist = None -class TestCharHTMLInput: - def test_empty_html_checkbox(self): +class TestHTMLInput: + def test_empty_html_charfield(self): class TestSerializer(serializers.Serializer): message = serializers.CharField(default='happy') @@ -232,23 +232,31 @@ class TestCharHTMLInput: assert serializer.is_valid() assert serializer.validated_data == {'message': 'happy'} - def test_empty_html_checkbox_allow_null(self): + def test_empty_html_charfield_allow_null(self): class TestSerializer(serializers.Serializer): message = serializers.CharField(allow_null=True) - serializer = TestSerializer(data=MockHTMLDict()) + serializer = TestSerializer(data=MockHTMLDict({'message': ''})) assert serializer.is_valid() assert serializer.validated_data == {'message': None} - def test_empty_html_checkbox_allow_null_allow_blank(self): + def test_empty_html_datefield_allow_null(self): + class TestSerializer(serializers.Serializer): + expiry = serializers.DateField(allow_null=True) + + serializer = TestSerializer(data=MockHTMLDict({'expiry': ''})) + assert serializer.is_valid() + assert serializer.validated_data == {'expiry': None} + + def test_empty_html_charfield_allow_null_allow_blank(self): class TestSerializer(serializers.Serializer): message = serializers.CharField(allow_null=True, allow_blank=True) - serializer = TestSerializer(data=MockHTMLDict({})) + serializer = TestSerializer(data=MockHTMLDict({'message': ''})) assert serializer.is_valid() assert serializer.validated_data == {'message': ''} - def test_empty_html_required_false(self): + def test_empty_html_charfield_required_false(self): class TestSerializer(serializers.Serializer): message = serializers.CharField(required=False) From 03c4eb11305dcc9f366cdd008a5985bcf47c13ce Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sat, 20 Dec 2014 16:32:07 +0000 Subject: [PATCH 1372/1652] Use custom ListSerializer for pagination if one is specified on the serializer. --- rest_framework/pagination.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index fb4512854..f46b0dfa1 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -68,7 +68,12 @@ class BasePaginationSerializer(serializers.Serializer): except AttributeError: object_serializer = DefaultObjectSerializer - self.fields[results_field] = serializers.ListSerializer( + try: + list_serializer_class = object_serializer.Meta.list_serializer_class + except AttributeError: + list_serializer_class = serializers.ListSerializer + + self.fields[results_field] = list_serializer_class( child=object_serializer(), source='object_list' ) From 35696748603665526be7947e918d41856644ec52 Mon Sep 17 00:00:00 2001 From: Brian Stearns <BWStearns@users.noreply.github.com> Date: Sun, 21 Dec 2014 18:53:35 -0500 Subject: [PATCH 1373/1652] use of double quotes broke the code highlighting. --- docs/api-guide/fields.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index f06db56cf..946e355da 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -480,7 +480,7 @@ Let's look at an example of serializing a class that represents an RGB color val class ColorField(serializers.Field): """ - Color objects are serialized into "rgb(#, #, #)" notation. + Color objects are serialized into 'rgb(#, #, #)' notation. """ def to_representation(self, obj): return "rgb(%d, %d, %d)" % (obj.red, obj.green, obj.blue) From 6c5ff712783ae7e6edebb52508f1d43249f1aa00 Mon Sep 17 00:00:00 2001 From: Remi Paulmier <remi.paulmier@gmail.com> Date: Mon, 22 Dec 2014 18:05:07 +0100 Subject: [PATCH 1374/1652] fix the way to use textarea rather than input with models.TextField --- rest_framework/utils/field_mapping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index fca97b4b3..b16e9df08 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -80,7 +80,7 @@ def get_field_kwargs(field_name, model_field): kwargs['decimal_places'] = decimal_places if isinstance(model_field, models.TextField): - kwargs['style'] = {'type': 'textarea'} + kwargs['style'] = {'base_template': 'textarea.html'} if isinstance(model_field, models.AutoField) or not model_field.editable: # If this field is read-only, then return early. From 18687f075d9fb998b82c6fb8f6cb37eb1ed7e5bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Lang?= <shareman1204@gmail.com> Date: Tue, 23 Dec 2014 12:22:10 -0300 Subject: [PATCH 1375/1652] Documented an optional argument of HyperlinkedIdentityField lookup_url_kwarg argument of HyperlinkedIdentityField wasn't documented --- docs/api-guide/relations.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index e56db229a..50e3b7b59 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -231,6 +231,7 @@ This field is always read-only. * `view_name` - The view name that should be used as the target of the relationship. If you're using [the standard router classes][routers] this will be a string with the format `<model_name>-detail`. **required**. * `lookup_field` - The field on the target that should be used for the lookup. Should correspond to a URL keyword argument on the referenced view. Default is `'pk'`. +* `lookup_url_kwarg` - The name of the keyword argument defined in the URL conf that corresponds to the lookup field. Defaults to using the same value as `lookup_field`. * `format` - If using format suffixes, hyperlinked fields will use the same format suffix for the target unless overridden by using the `format` argument. --- From 399cb165b0ba26df6052c114eb77961dc578e686 Mon Sep 17 00:00:00 2001 From: Andrew Seier <andseier@gmail.com> Date: Tue, 23 Dec 2014 12:11:45 -0800 Subject: [PATCH 1376/1652] Remove commented code (warning during compression) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit manage.py compress —force causes a warning here. --- .../templates/rest_framework/vertical/list_fieldset.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rest_framework/templates/rest_framework/vertical/list_fieldset.html b/rest_framework/templates/rest_framework/vertical/list_fieldset.html index 1d86c7f2b..82d7b5f41 100644 --- a/rest_framework/templates/rest_framework/vertical/list_fieldset.html +++ b/rest_framework/templates/rest_framework/vertical/list_fieldset.html @@ -1,8 +1,4 @@ <fieldset> {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} -<!-- {% if field.label %}<legend {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</legend>{% endif %} - {% for field_item in field.value.field_items.values() %} - {{ renderer.render_field(field_item, layout=layout) }} - {% endfor %} --> <p>Lists are not currently supported in HTML input.</p> </fieldset> From 35768344db45b9fa6bd94c3fd48d5e232027434e Mon Sep 17 00:00:00 2001 From: Andrew Seier <andseier@gmail.com> Date: Tue, 23 Dec 2014 12:12:22 -0800 Subject: [PATCH 1377/1652] =?UTF-8?q?Remove=20=E2=80=98/=E2=80=98=20from?= =?UTF-8?q?=20inside=20variable=20block=20{{=20}}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit manage.py compress —force causes a warning here. --- .../templates/rest_framework/inline/checkbox_multiple.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html index 6caf64403..093496862 100644 --- a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html +++ b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html @@ -5,7 +5,7 @@ {% for key, text in field.choices.items %} <div class="checkbox"> <label> - <input type="checkbox" name="{{ rest_framework/field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> + <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}> {{ text }} </label> </div> From b32ecdefbace063c5b9b465af608ac6404795dd4 Mon Sep 17 00:00:00 2001 From: Remi Paulmier <remi.paulmier@gmail.com> Date: Wed, 24 Dec 2014 14:07:28 +0100 Subject: [PATCH 1378/1652] modified the tests accordingly --- tests/test_model_serializer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index da79164af..ee556dbcb 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -119,7 +119,7 @@ class TestRegularFieldMappings(TestCase): positive_small_integer_field = IntegerField() slug_field = SlugField(max_length=100) small_integer_field = IntegerField() - text_field = CharField(style={'type': 'textarea'}) + text_field = CharField(style={'base_template': 'textarea.html'}) time_field = TimeField() url_field = URLField(max_length=100) custom_field = ModelField(model_field=<tests.test_model_serializer.CustomField: custom_field>) From c2e00a075cb4b44c644ad5d62f2be0fd19e62c5f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Dec 2014 15:25:13 +0000 Subject: [PATCH 1379/1652] Paginated serializers should get context. --- rest_framework/pagination.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index f46b0dfa1..f31e5fa4c 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -77,6 +77,7 @@ class BasePaginationSerializer(serializers.Serializer): child=object_serializer(), source='object_list' ) + self.fields[results_field].bind(field_name=results_field, parent=self) class PaginationSerializer(BasePaginationSerializer): From 00531ec937206e7e0af949c67872c915d0752b5a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 26 Dec 2014 15:48:16 +0000 Subject: [PATCH 1380/1652] Release notes on non-text detail arguments. Closes #2341. --- docs/topics/3.0-announcement.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 0710766f7..68d247827 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -940,6 +940,7 @@ The default JSON renderer will return float objects for un-coerced `Decimal` ins * The serializer `ChoiceField` does not currently display nested choices, as was the case in 2.4. This will be address as part of 3.1. * Due to the new templated form rendering, the 'widget' option is no longer valid. This means there's no easy way of using third party "autocomplete" widgets for rendering select inputs that contain a large number of choices. You'll either need to use a regular select or a plain text input. We may consider addressing this in 3.1 or 3.2 if there's sufficient demand. * Some of the default validation error messages were rewritten and might no longer be pre-translated. You can still [create language files with Django][django-localization] if you wish to localize them. +* `APIException` subclasses could previously take could previously take any arbitrary type in the `detail` argument. These exceptions now use translatable text strings, and as a result call `force_text` on the `detail` argument, which *must be a string*. If you need complex arguments to an `APIException` class, you should subclass it and override the `__init__()` method. Typically you'll instead want to use a custom exception handler to provide for non-standard error responses. --- From 5b5652594a9c000d8e925d35efa03be27c28c077 Mon Sep 17 00:00:00 2001 From: Rocky Meza <rocky@fusionbox.com> Date: Fri, 26 Dec 2014 22:24:31 -0700 Subject: [PATCH 1381/1652] Typo manger => manager --- docs/api-guide/serializers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index b9f0e7bc0..f88ec51f2 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -384,7 +384,7 @@ This manager class now more nicely encapsulates that user instances and profile has_support_contract=validated_data['profile']['has_support_contract'] ) -For more details on this approach see the Django documentation on [model managers](model-managers), and [this blogpost on using model and manger classes](encapsulation-blogpost). +For more details on this approach see the Django documentation on [model managers](model-managers), and [this blogpost on using model and manager classes](encapsulation-blogpost). ## Dealing with multiple objects From a636320ff3b381a6d7d8685f1b4fba8bdd6c8b94 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sun, 28 Dec 2014 11:02:19 +0000 Subject: [PATCH 1382/1652] Add import notes in docs. Closes #2357 --- docs/api-guide/generic-views.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index f5bbdfdda..6374e3052 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -214,6 +214,8 @@ You won't typically need to override the following methods, although you might n The mixin classes provide the actions that are used to provide the basic view behavior. Note that the mixin classes provide action methods rather than defining the handler methods, such as `.get()` and `.post()`, directly. This allows for more flexible composition of behavior. +The mixin classes can be imported from `rest_framework.mixins`. + ## ListModelMixin Provides a `.list(request, *args, **kwargs)` method, that implements listing a queryset. @@ -258,6 +260,8 @@ If an object is deleted this returns a `204 No Content` response, otherwise it w The following classes are the concrete generic views. If you're using generic views this is normally the level you'll be working at unless you need heavily customized behavior. +The view classes can be imported from `rest_framework.generics`. + ## CreateAPIView Used for **create-only** endpoints. From ef2eff2abac64ffbed621bb9a72a2229841a1db1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sun, 28 Dec 2014 11:07:38 +0000 Subject: [PATCH 1383/1652] Only pass max_length for CharField. Closes #2317. --- rest_framework/utils/field_mapping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index b16e9df08..b2f4dd80e 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -106,7 +106,7 @@ def get_field_kwargs(field_name, model_field): # Ensure that max_length is passed explicitly as a keyword arg, # rather than as a validator. max_length = getattr(model_field, 'max_length', None) - if max_length is not None: + if max_length is not None and isinstance(model_field, models.CharField): kwargs['max_length'] = max_length validator_kwarg = [ validator for validator in validator_kwarg From 7b42c5ed17a2430d66da88932ad4e81492d9b914 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sun, 28 Dec 2014 11:14:32 +0000 Subject: [PATCH 1384/1652] Remove broken test. Closes #2359. --- tests/test_routers.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tests/test_routers.py b/tests/test_routers.py index 06ab8103a..2b6cd7d28 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -305,19 +305,3 @@ class TestDynamicListAndDetailRouter(TestCase): else: method_map = 'get' self.assertEqual(route.mapping[method_map], method_name) - - -class TestRootWithAListlessViewset(TestCase): - def setUp(self): - class NoteViewSet(mixins.RetrieveModelMixin, - viewsets.GenericViewSet): - model = RouterTestModel - - self.router = DefaultRouter() - self.router.register(r'notes', NoteViewSet) - self.view = self.router.urls[0].callback - - def test_api_root(self): - request = factory.get('/') - response = self.view(request) - self.assertEqual(response.data, {}) From 8dc95ee22181de6e38c7187426bca9fcee9d7927 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sun, 28 Dec 2014 11:24:49 +0000 Subject: [PATCH 1385/1652] Add notes on include and namespacing. Closes #2335. --- docs/api-guide/routers.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 6819adb6a..3a8a8f6cd 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -49,6 +49,38 @@ This means you'll need to explicitly set the `base_name` argument when registeri --- +### Using `include` with routers + +The `.urls` attribute on a router instance is simply a standard list of URL patterns. There are a number of different styles for how you can include these URLs. + +For example, you can append `router.urls` to a list of existing views… + + router = routers.SimpleRouter() + router.register(r'users', UserViewSet) + router.register(r'accounts', AccountViewSet) + + urlpatterns = [ + url(r'^forgot-password/$, ForgotPasswordFormView.as_view(), + ] + + urlpatterns += router.urls + +Alternatively you can use Django's `include` function, like so… + + urlpatterns = [ + url(r'^forgot-password/$, ForgotPasswordFormView.as_view(), + url(r'^', include(router.urls)) + ] + +Router URL patterns can also be namespaces. + + urlpatterns = [ + url(r'^forgot-password/$, ForgotPasswordFormView.as_view(), + url(r'^api/', include(router.urls, namespace='api')) + ] + +If using namespacing with hyperlinked serializers you'll also need to ensure that any `view_name` parameters on the serializers correctly reflect the namespace. In the example above you'd need to include a parameter such as `view_name='api:user-detail'` for serializer fields hyperlinked to the user detail view. + ### Extra link and actions Any methods on the viewset decorated with `@detail_route` or `@list_route` will also be routed. From 67fc002f91e5dc617dab45895ded32d6be6c2a40 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sun, 28 Dec 2014 11:26:38 +0000 Subject: [PATCH 1386/1652] Drop unused import --- tests/test_routers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_routers.py b/tests/test_routers.py index 2b6cd7d28..fc22a8d95 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -3,7 +3,7 @@ from django.conf.urls import patterns, url, include from django.db import models from django.test import TestCase from django.core.exceptions import ImproperlyConfigured -from rest_framework import serializers, viewsets, mixins, permissions +from rest_framework import serializers, viewsets, permissions from rest_framework.decorators import detail_route, list_route from rest_framework.response import Response from rest_framework.routers import SimpleRouter, DefaultRouter From efa5942ce1c5d2286fd91994b52fb73a5690426c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sun, 28 Dec 2014 12:02:52 +0000 Subject: [PATCH 1387/1652] Support namespaced router URLs with DefaultRouter. --- rest_framework/compat.py | 10 +++++ rest_framework/routers.py | 5 ++- tests/test_routers.py | 94 ++++++++++++++++++++++++++------------- 3 files changed, 76 insertions(+), 33 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 69fdd7936..ba26a3cd7 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -50,6 +50,16 @@ except ImportError: from django.http import HttpResponse as HttpResponseBase +# request only provides `resolver_match` from 1.5 onwards. +def get_resolver_match(request): + try: + return request.resolver_match + except AttributeError: + # Django < 1.5 + from django.core.urlresolvers import resolve + return resolve(request.path_info) + + # django-filter is optional try: import django_filters diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 1cb65b1c0..61f3ccab0 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -21,7 +21,7 @@ from django.conf.urls import patterns, url from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import NoReverseMatch from rest_framework import views -from rest_framework.compat import OrderedDict +from rest_framework.compat import get_resolver_match, OrderedDict from rest_framework.response import Response from rest_framework.reverse import reverse from rest_framework.urlpatterns import format_suffix_patterns @@ -292,7 +292,10 @@ class DefaultRouter(SimpleRouter): def get(self, request, *args, **kwargs): ret = OrderedDict() + namespace = get_resolver_match(request).namespace for key, url_name in api_root_dict.items(): + if namespace: + url_name = namespace + ':' + url_name try: ret[key] = reverse( url_name, diff --git a/tests/test_routers.py b/tests/test_routers.py index fc22a8d95..86113f5d7 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -1,5 +1,5 @@ from __future__ import unicode_literals -from django.conf.urls import patterns, url, include +from django.conf.urls import url, include from django.db import models from django.test import TestCase from django.core.exceptions import ImproperlyConfigured @@ -12,7 +12,42 @@ from collections import namedtuple factory = APIRequestFactory() -urlpatterns = patterns('',) + +class RouterTestModel(models.Model): + uuid = models.CharField(max_length=20) + text = models.CharField(max_length=200) + + +class NoteSerializer(serializers.HyperlinkedModelSerializer): + url = serializers.HyperlinkedIdentityField(view_name='routertestmodel-detail', lookup_field='uuid') + + class Meta: + model = RouterTestModel + fields = ('url', 'uuid', 'text') + + +class NoteViewSet(viewsets.ModelViewSet): + queryset = RouterTestModel.objects.all() + serializer_class = NoteSerializer + lookup_field = 'uuid' + + +class MockViewSet(viewsets.ModelViewSet): + queryset = None + serializer_class = None + + +notes_router = SimpleRouter() +notes_router.register(r'notes', NoteViewSet) + +namespaced_router = DefaultRouter() +namespaced_router.register(r'example', MockViewSet, base_name='example') + +urlpatterns = [ + url(r'^non-namespaced/', include(namespaced_router.urls)), + url(r'^namespaced/', include(namespaced_router.urls, namespace='example')), + url(r'^example/', include(notes_router.urls)), +] class BasicViewSet(viewsets.ViewSet): @@ -64,9 +99,26 @@ class TestSimpleRouter(TestCase): self.assertEqual(route.mapping[method], endpoint) -class RouterTestModel(models.Model): - uuid = models.CharField(max_length=20) - text = models.CharField(max_length=200) +class TestRootView(TestCase): + urls = 'tests.test_routers' + + def test_retrieve_namespaced_root(self): + response = self.client.get('/namespaced/') + self.assertEqual( + response.data, + { + "example": "http://testserver/namespaced/example/", + } + ) + + def test_retrieve_non_namespaced_root(self): + response = self.client.get('/non-namespaced/') + self.assertEqual( + response.data, + { + "example": "http://testserver/non-namespaced/example/", + } + ) class TestCustomLookupFields(TestCase): @@ -76,51 +128,29 @@ class TestCustomLookupFields(TestCase): urls = 'tests.test_routers' def setUp(self): - class NoteSerializer(serializers.HyperlinkedModelSerializer): - url = serializers.HyperlinkedIdentityField(view_name='routertestmodel-detail', lookup_field='uuid') - - class Meta: - model = RouterTestModel - fields = ('url', 'uuid', 'text') - - class NoteViewSet(viewsets.ModelViewSet): - queryset = RouterTestModel.objects.all() - serializer_class = NoteSerializer - lookup_field = 'uuid' - - self.router = SimpleRouter() - self.router.register(r'notes', NoteViewSet) - - from tests import test_routers - urls = getattr(test_routers, 'urlpatterns') - urls += patterns( - '', - url(r'^', include(self.router.urls)), - ) - RouterTestModel.objects.create(uuid='123', text='foo bar') def test_custom_lookup_field_route(self): - detail_route = self.router.urls[-1] + detail_route = notes_router.urls[-1] detail_url_pattern = detail_route.regex.pattern self.assertIn('<uuid>', detail_url_pattern) def test_retrieve_lookup_field_list_view(self): - response = self.client.get('/notes/') + response = self.client.get('/example/notes/') self.assertEqual( response.data, [{ - "url": "http://testserver/notes/123/", + "url": "http://testserver/example/notes/123/", "uuid": "123", "text": "foo bar" }] ) def test_retrieve_lookup_field_detail_view(self): - response = self.client.get('/notes/123/') + response = self.client.get('/example/notes/123/') self.assertEqual( response.data, { - "url": "http://testserver/notes/123/", + "url": "http://testserver/example/notes/123/", "uuid": "123", "text": "foo bar" } ) From d8e66970a11ec2d4b66f0cf56950f2cc83e83224 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sun, 28 Dec 2014 12:14:07 +0000 Subject: [PATCH 1388/1652] Note on using i18n_patterns with format_suffix_patterns. Closes #2278. --- docs/api-guide/format-suffixes.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/api-guide/format-suffixes.md b/docs/api-guide/format-suffixes.md index 20c1e9952..35dbcd39c 100644 --- a/docs/api-guide/format-suffixes.md +++ b/docs/api-guide/format-suffixes.md @@ -55,6 +55,18 @@ The name of the kwarg used may be modified by using the `FORMAT_SUFFIX_KWARG` se Also note that `format_suffix_patterns` does not support descending into `include` URL patterns. +### Using with `i18n_patterns` + +If using the `i18n_patterns` function provided by Django, as well as `format_suffix_patterns` you should make sure that the `i18n_patterns` function is applied as the final, or outermost function. For example: + + url patterns = [ + … + ] + + urlpatterns = i18n_patterns( + format_suffix_patterns(urlpatterns, allowed=['json', 'html']) + ) + --- ## Accept headers vs. format suffixes From 5d8c45681a945b955d9336b0fd1e4ebccf0df895 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sun, 28 Dec 2014 18:48:42 +0000 Subject: [PATCH 1389/1652] Update copryright for 2015. Closes #2247. --- README.md | 2 +- docs/index.md | 2 +- rest_framework/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index df0a4086a..8fc11c30f 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,7 @@ Send a description of the issue via email to [rest-framework-security@googlegrou # License -Copyright (c) 2011-2014, Tom Christie +Copyright (c) 2011-2015, Tom Christie All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/docs/index.md b/docs/index.md index 8a96fc9fb..55129df18 100644 --- a/docs/index.md +++ b/docs/index.md @@ -235,7 +235,7 @@ Send a description of the issue via email to [rest-framework-security@googlegrou ## License -Copyright (c) 2011-2014, Tom Christie +Copyright (c) 2011-2015, Tom Christie All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 6808b74b0..dec89b3e9 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -11,7 +11,7 @@ __title__ = 'Django REST framework' __version__ = '3.0.2' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' -__copyright__ = 'Copyright 2011-2014 Tom Christie' +__copyright__ = 'Copyright 2011-2015 Tom Christie' # Version synonym VERSION = __version__ From a7479721c844926f377085d8c336a2f60b7b2a38 Mon Sep 17 00:00:00 2001 From: Kyle Valade <kylevalade@gmail.com> Date: Mon, 29 Dec 2014 00:35:00 -0800 Subject: [PATCH 1390/1652] First pass at refactoring get_field_info in utils.model_meta --- rest_framework/utils/model_meta.py | 57 ++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py index c98725c66..375d2e8c6 100644 --- a/rest_framework/utils/model_meta.py +++ b/rest_framework/utils/model_meta.py @@ -35,7 +35,7 @@ def _resolve_model(obj): Resolve supplied `obj` to a Django model class. `obj` must be a Django model class itself, or a string - representation of one. Useful in situtations like GH #1225 where + representation of one. Useful in situations like GH #1225 where Django may not have resolved a string-based reference to a model in another model's foreign key definition. @@ -56,23 +56,44 @@ def _resolve_model(obj): def get_field_info(model): """ - Given a model class, returns a `FieldInfo` instance containing metadata - about the various field types on the model. + Given a model class, returns a `FieldInfo` instance, which is a + `namedtuple`, containing metadata about the various field types on the model + including information about their relationships. """ opts = model._meta.concrete_model._meta - # Deal with the primary key. + pk = _get_pk(opts) + fields = _get_fields(opts) + forward_relations = _get_forward_relationships(opts) + reverse_relations = _get_reverse_relationships(opts) + fields_and_pk = _merge_fields_and_pk(pk, fields) + relationships = _merge_relationships(forward_relations, reverse_relations) + + return FieldInfo(pk, fields, forward_relations, reverse_relations, + fields_and_pk, relationships) + + +def _get_pk(opts): pk = opts.pk while pk.rel and pk.rel.parent_link: - # If model is a child via multitable inheritance, use parent's pk. + # If model is a child via multi-table inheritance, use parent's pk. pk = pk.rel.to._meta.pk - # Deal with regular fields. + return pk + + +def _get_fields(opts): fields = OrderedDict() for field in [field for field in opts.fields if field.serialize and not field.rel]: fields[field.name] = field - # Deal with forward relationships. + return fields + + +def _get_forward_relationships(opts): + """ + Returns an `OrderedDict` of field names to `RelationInfo`. + """ forward_relations = OrderedDict() for field in [field for field in opts.fields if field.serialize and field.rel]: forward_relations[field.name] = RelationInfo( @@ -93,7 +114,13 @@ def get_field_info(model): ) ) - # Deal with reverse relationships. + return forward_relations + + +def _get_reverse_relationships(opts): + """ + Returns an `OrderedDict` of field names to `RelationInfo`. + """ reverse_relations = OrderedDict() for relation in opts.get_all_related_objects(): accessor_name = relation.get_accessor_name() @@ -117,18 +144,20 @@ def get_field_info(model): ) ) - # Shortcut that merges both regular fields and the pk, - # for simplifying regular field lookup. + return reverse_relations + + +def _merge_fields_and_pk(pk, fields): fields_and_pk = OrderedDict() fields_and_pk['pk'] = pk fields_and_pk[pk.name] = pk fields_and_pk.update(fields) - # Shortcut that merges both forward and reverse relationships + return fields_and_pk - relations = OrderedDict( + +def _merge_relationships(forward_relations, reverse_relations): + return OrderedDict( list(forward_relations.items()) + list(reverse_relations.items()) ) - - return FieldInfo(pk, fields, forward_relations, reverse_relations, fields_and_pk, relations) From 336faf5a861fad2e4364a68fbf0747bef4457358 Mon Sep 17 00:00:00 2001 From: Rob Terhaar <robbyt@robbyt.net> Date: Thu, 1 Jan 2015 21:01:16 -0500 Subject: [PATCH 1391/1652] fix widget style formatting --- docs/tutorial/1-serialization.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index ff507a2b8..60a3d9897 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -124,7 +124,7 @@ The first part of the serializer class defines the fields that get serialized/de A serializer class is very similar to a Django `Form` class, and includes similar validation flags on the various fields, such as `required`, `max_length` and `default`. -The field flags can also control how the serializer should be displayed in certain circumstances, such as when rendering to HTML. The `style={'type': 'textarea'}` flag above is equivelent to using `widget=widgets.Textarea` on a Django `Form` class. This is particularly useful for controlling how the browsable API should be displayed, as we'll see later in the tutorial. +The field flags can also control how the serializer should be displayed in certain circumstances, such as when rendering to HTML. The `{'base_template': 'textarea.html'}` flag above is equivelent to using `widget=widgets.Textarea` on a Django `Form` class. This is particularly useful for controlling how the browsable API should be displayed, as we'll see later in the tutorial. We can actually also save ourselves some time by using the `ModelSerializer` class, as we'll see later, but for now we'll keep our serializer definition explicit. @@ -206,7 +206,7 @@ One nice property that serializers have is that you can inspect all the fields i SnippetSerializer(): id = IntegerField(label='ID', read_only=True) title = CharField(allow_blank=True, max_length=100, required=False) - code = CharField(style={'type': 'textarea'}) + code = CharField(style={'base_template': 'textarea.html'}) linenos = BooleanField(required=False) language = ChoiceField(choices=[('Clipper', 'FoxPro'), ('Cucumber', 'Gherkin'), ('RobotFramework', 'RobotFramework'), ('abap', 'ABAP'), ('ada', 'Ada')... style = ChoiceField(choices=[('autumn', 'autumn'), ('borland', 'borland'), ('bw', 'bw'), ('colorful', 'colorful')... From 309b5d264166e07510d6cbc54d681268d07957aa Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Fri, 2 Jan 2015 11:07:35 +0000 Subject: [PATCH 1392/1652] instructions on how to translate REST framework error messages --- docs/topics/internationalisation.md | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 docs/topics/internationalisation.md diff --git a/docs/topics/internationalisation.md b/docs/topics/internationalisation.md new file mode 100644 index 000000000..01f968915 --- /dev/null +++ b/docs/topics/internationalisation.md @@ -0,0 +1,34 @@ +# Internationalisation +REST framework ships with translatable error messages. You can make these appear in your language enabling [Django's standard translation mechanisms](https://docs.djangoproject.com/en/1.7/topics/i18n/translation) and by translating the messages into your language. + +## How to translate REST Framework errors + + +This guide assumes you are already familiar with how to translate a Django app. If you're not, start by reading [Django's translation docs](https://docs.djangoproject.com/en/1.7/topics/i18n/translation). + + +#### To translate REST framework error messages: + +1. Pick an app where you want the translations to be, for example `myapp` + +2. Add a symlink from that app to the installed `rest_framework` + ``` + ln -s /home/user/.virtualenvs/myproject/lib/python2.7/site-packages/rest_framework/ rest_framework + ``` + + To find out where `rest_framework` is installed, run + + ``` + python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())" + ``` + +3. Run Django's `makemessages` command in the normal way, but add the `--symlink` option. For example, if you want to translate into Brazilian Portuguese you would run + ``` + manage.py makemessages --symlink -l pt_BR + ``` + +4. Translate the `django.po` file which is created as normal. This will be in the folder `myapp/locale/pt_BR/LC_MESSAGES`. + +5. Run `manage.py compilemessages` as normal + +6. Restart your server From 7ad7dd6a4292157ed5bcbaacb60b6ccc93fcf201 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 24 Dec 2014 18:26:17 +0000 Subject: [PATCH 1393/1652] match DRF style guide --- docs/topics/internationalisation.md | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/docs/topics/internationalisation.md b/docs/topics/internationalisation.md index 01f968915..552fdd273 100644 --- a/docs/topics/internationalisation.md +++ b/docs/topics/internationalisation.md @@ -1,10 +1,10 @@ # Internationalisation -REST framework ships with translatable error messages. You can make these appear in your language enabling [Django's standard translation mechanisms](https://docs.djangoproject.com/en/1.7/topics/i18n/translation) and by translating the messages into your language. +REST framework ships with translatable error messages. You can make these appear in your language enabling [Django's standard translation mechanisms][django-translation] and by translating the messages into your language. ## How to translate REST Framework errors -This guide assumes you are already familiar with how to translate a Django app. If you're not, start by reading [Django's translation docs](https://docs.djangoproject.com/en/1.7/topics/i18n/translation). +This guide assumes you are already familiar with how to translate a Django app. If you're not, start by reading [Django's translation docs][django-translation]. #### To translate REST framework error messages: @@ -16,19 +16,28 @@ This guide assumes you are already familiar with how to translate a Django app. ln -s /home/user/.virtualenvs/myproject/lib/python2.7/site-packages/rest_framework/ rest_framework ``` - To find out where `rest_framework` is installed, run + --- + + **Note:** To find out where `rest_framework` is installed, run ``` python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())" ``` -3. Run Django's `makemessages` command in the normal way, but add the `--symlink` option. For example, if you want to translate into Brazilian Portuguese you would run + --- + + + +3. Run Django's `makemessages` command in the normal way, but add the `--symlink` option. For example, if you want to translate into Brazilian Portuguese you would run ``` manage.py makemessages --symlink -l pt_BR ``` -4. Translate the `django.po` file which is created as normal. This will be in the folder `myapp/locale/pt_BR/LC_MESSAGES`. +4. Translate the `django.po` file which is created as normal. This will be in the folder `myapp/locale/pt_BR/LC_MESSAGES`. 5. Run `manage.py compilemessages` as normal 6. Restart your server + + +[django-translation]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation From 2781903a5a0be7f5314de54ff2dbc8ef393eab0a Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Fri, 26 Dec 2014 12:52:17 +0000 Subject: [PATCH 1394/1652] Add info about how django chooses which language to use --- docs/topics/internationalisation.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/topics/internationalisation.md b/docs/topics/internationalisation.md index 552fdd273..a0aab7533 100644 --- a/docs/topics/internationalisation.md +++ b/docs/topics/internationalisation.md @@ -40,4 +40,22 @@ This guide assumes you are already familiar with how to translate a Django app. 6. Restart your server + +## How Django chooses which language to use +REST framework will use the same preferences to select which language to display as Django does. You can find more info in the [django docs on discovering language preferences][django-language-preference]. For reference, these are + +1. First, it looks for the language prefix in the requested URL +2. Failing that, it looks for the `LANGUAGE_SESSION_KEY` key in the current user’s session. +3. Failing that, it looks for a cookie +4. Failing that, it looks at the `Accept-Language` HTTP header. +5. Failing that, it uses the global `LANGUAGE_CODE` setting. + +--- + +**Note:** You'll need to include the `django.middleware.locale.LocaleMiddleware` to enable any of the per-request language preferences. + +--- + + [django-translation]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation +[django-language-preference]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation/#how-django-discovers-language-preference From 0b8a83bd624673cb0a05e01c691729ccee3a8782 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Sun, 28 Dec 2014 18:20:41 +0000 Subject: [PATCH 1395/1652] update internationalisation instructions to prevent symlinking; add base .po file --- docs/topics/internationalisation.md | 52 +++- .../locale/en_US/LC_MESSAGES/django.po | 277 ++++++++++++++++++ 2 files changed, 318 insertions(+), 11 deletions(-) create mode 100644 rest_framework/locale/en_US/LC_MESSAGES/django.po diff --git a/docs/topics/internationalisation.md b/docs/topics/internationalisation.md index a0aab7533..6470ee033 100644 --- a/docs/topics/internationalisation.md +++ b/docs/topics/internationalisation.md @@ -9,12 +9,40 @@ This guide assumes you are already familiar with how to translate a Django app. #### To translate REST framework error messages: -1. Pick an app where you want the translations to be, for example `myapp` +1. Make a new folder where you want to store the translated errors. Add this +path to your [`LOCALE_PATHS`][django-locale-paths] setting. + + --- + + **Note:** For the rest of +this document we will assume the path you created was +`/home/www/project/conf/locale/`, and that you have updated your `settings.py` to include the setting: -2. Add a symlink from that app to the installed `rest_framework` ``` - ln -s /home/user/.virtualenvs/myproject/lib/python2.7/site-packages/rest_framework/ rest_framework + LOCALE_PATHS = ( + '/home/www/project/conf/locale/', + ) ``` + + --- + +2. Now create a subfolder for the language you want to translate. The folder should be named using [locale +name][django-locale-name] notation. E.g. `de`, `pt_BR`, `es_AR`, etc. + + ``` + mkdir /home/www/project/conf/locale/pt_BR/LC_MESSAGES + ``` + +3. Now copy the base translations file from the REST framework source code +into your translations folder + + ``` + cp /home/user/.virtualenvs/myproject/lib/python2.7/site-packages/rest_framework/locale/en_US/LC_MESSAGES/django.po + /home/www/project/conf/locale/pt_BR/LC_MESSAGES + ``` + + This should create the file + `/home/www/project/conf/locale/pt_BR/LC_MESSAGES/django.po` --- @@ -27,17 +55,17 @@ This guide assumes you are already familiar with how to translate a Django app. --- +4. Edit `/home/www/project/conf/locale/pt_BR/LC_MESSAGES/django.po` and +translate all the error messages. -3. Run Django's `makemessages` command in the normal way, but add the `--symlink` option. For example, if you want to translate into Brazilian Portuguese you would run - ``` - manage.py makemessages --symlink -l pt_BR - ``` - -4. Translate the `django.po` file which is created as normal. This will be in the folder `myapp/locale/pt_BR/LC_MESSAGES`. +5. Run `manage.py compilemessages -l pt_BR` to make the translations +available for Django to use. You should see a message -5. Run `manage.py compilemessages` as normal + ``` + processing file django.po in /home/www/project/conf/locale/pt_BR/LC_MESSAGES + ``` -6. Restart your server +6. Restart your server. @@ -59,3 +87,5 @@ REST framework will use the same preferences to select which language to display [django-translation]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation [django-language-preference]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation/#how-django-discovers-language-preference +[django-locale-paths]: https://docs.djangoproject.com/en/1.7/ref/settings/#std:setting-LOCALE_PATHS +[django-locale-name]: https://docs.djangoproject.com/en/1.7/topics/i18n/#term-locale-name \ No newline at end of file diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po new file mode 100644 index 000000000..510ce0aad --- /dev/null +++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po @@ -0,0 +1,277 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-12-28 17:49+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: rest_framework/authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "" + +#: rest_framework/authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "" + +#: rest_framework/authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"" +msgstr "" + +#: rest_framework/exceptions.py:39 +msgid "A server error occured" +msgstr "" + +#: rest_framework/exceptions.py:74 +msgid "Malformed request." +msgstr "" + +#: rest_framework/exceptions.py:79 +msgid "Incorrect authentication credentials." +msgstr "" + +#: rest_framework/exceptions.py:84 +msgid "Authentication credentials were not provided." +msgstr "" + +#: rest_framework/exceptions.py:89 +msgid "You do not have permission to perform this action." +msgstr "" + +#: rest_framework/exceptions.py:94 +#, python-format +msgid "Method '%s' not allowed." +msgstr "" + +#: rest_framework/exceptions.py:105 +msgid "Could not satisfy the request Accept header" +msgstr "" + +#: rest_framework/exceptions.py:117 +#, python-format +msgid "Unsupported media type '%s' in request." +msgstr "" + +#: rest_framework/exceptions.py:128 +msgid "Request was throttled." +msgstr "" + +#: rest_framework/exceptions.py:130 +#, python-format +msgid "Expected available in %(wait)d second." +msgid_plural "Expected available in %(wait)d seconds." +msgstr[0] "" +msgstr[1] "" + +#: rest_framework/fields.py:152 rest_framework/relations.py:131 +#: rest_framework/relations.py:155 rest_framework/validators.py:77 +#: rest_framework/validators.py:155 +msgid "This field is required." +msgstr "" + +#: rest_framework/fields.py:153 +msgid "This field may not be null." +msgstr "" + +#: rest_framework/fields.py:484 rest_framework/fields.py:512 +msgid "`{input}` is not a valid boolean." +msgstr "" + +#: rest_framework/fields.py:547 +msgid "This field may not be blank." +msgstr "" + +#: rest_framework/fields.py:548 rest_framework/fields.py:1250 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "" + +#: rest_framework/fields.py:549 +msgid "Ensure this field has at least {min_length} characters." +msgstr "" + +#: rest_framework/fields.py:584 +msgid "Enter a valid email address." +msgstr "" + +#: rest_framework/fields.py:601 +msgid "This value does not match the required pattern." +msgstr "" + +#: rest_framework/fields.py:612 +msgid "" +"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." +msgstr "" + +#: rest_framework/fields.py:624 +msgid "Enter a valid URL." +msgstr "" + +#: rest_framework/fields.py:637 +msgid "A valid integer is required." +msgstr "" + +#: rest_framework/fields.py:638 rest_framework/fields.py:672 +#: rest_framework/fields.py:705 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "" + +#: rest_framework/fields.py:639 rest_framework/fields.py:673 +#: rest_framework/fields.py:706 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "" + +#: rest_framework/fields.py:640 rest_framework/fields.py:674 +#: rest_framework/fields.py:710 +msgid "String value too large" +msgstr "" + +#: rest_framework/fields.py:671 rest_framework/fields.py:704 +msgid "A valid number is required." +msgstr "" + +#: rest_framework/fields.py:707 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "" + +#: rest_framework/fields.py:708 +msgid "Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "" + +#: rest_framework/fields.py:709 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "" + +#: rest_framework/fields.py:793 +msgid "Datetime has wrong format. Use one of these formats instead: {format}" +msgstr "" + +#: rest_framework/fields.py:794 +msgid "Expected a datetime but got a date." +msgstr "" + +#: rest_framework/fields.py:858 +msgid "Date has wrong format. Use one of these formats instead: {format}" +msgstr "" + +#: rest_framework/fields.py:859 +msgid "Expected a date but got a datetime." +msgstr "" + +#: rest_framework/fields.py:916 +msgid "Time has wrong format. Use one of these formats instead: {format}" +msgstr "" + +#: rest_framework/fields.py:972 rest_framework/fields.py:1016 +msgid "`{input}` is not a valid choice." +msgstr "" + +#: rest_framework/fields.py:1017 rest_framework/serializers.py:474 +msgid "Expected a list of items but got type `{input_type}`." +msgstr "" + +#: rest_framework/fields.py:1047 +msgid "No file was submitted." +msgstr "" + +#: rest_framework/fields.py:1048 +msgid "The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: rest_framework/fields.py:1049 +msgid "No filename could be determined." +msgstr "" + +#: rest_framework/fields.py:1050 +msgid "The submitted file is empty." +msgstr "" + +#: rest_framework/fields.py:1051 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: rest_framework/fields.py:1093 +msgid "Upload a valid image. The file you uploaded was either not an " +msgstr "" + +#: rest_framework/fields.py:1119 +msgid "Expected a list of items but got type `{input_type}`" +msgstr "" + +#: rest_framework/generics.py:122 +msgid "Page is not 'last', nor can it be converted to an int." +msgstr "" + +#: rest_framework/generics.py:126 +#, python-format +msgid "Invalid page (%(page_number)s): %(message)s" +msgstr "" + +#: rest_framework/relations.py:132 +msgid "Invalid pk '{pk_value}' - object does not exist." +msgstr "" + +#: rest_framework/relations.py:133 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: rest_framework/relations.py:156 +msgid "Invalid hyperlink - No URL match" +msgstr "" + +#: rest_framework/relations.py:157 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: rest_framework/relations.py:158 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: rest_framework/relations.py:159 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: rest_framework/relations.py:294 +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: rest_framework/relations.py:295 +msgid "Invalid value." +msgstr "" + +#: rest_framework/serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: rest_framework/validators.py:22 +msgid "This field must be unique." +msgstr "" + +#: rest_framework/validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: rest_framework/validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: rest_framework/validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: rest_framework/validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" From faf76a4b75f12f3fa9de4e3ec455daa239af4d89 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 31 Dec 2014 12:49:20 +0000 Subject: [PATCH 1396/1652] fix spelling & grammar errors --- rest_framework/exceptions.py | 2 +- rest_framework/generics.py | 2 +- rest_framework/locale/en_US/LC_MESSAGES/django.po | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index bcfd8961b..2586fc332 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -36,7 +36,7 @@ class APIException(Exception): Subclasses should provide `.status_code` and `.default_detail` properties. """ status_code = status.HTTP_500_INTERNAL_SERVER_ERROR - default_detail = _('A server error occured') + default_detail = _('A server error occurred') def __init__(self, detail=None): if detail is not None: diff --git a/rest_framework/generics.py b/rest_framework/generics.py index e6db155e7..bdbc19a75 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -119,7 +119,7 @@ class GenericAPIView(views.APIView): if page == 'last': page_number = paginator.num_pages else: - raise Http404(_("Page is not 'last', nor can it be converted to an int.")) + raise Http404(_("Page is not 'last', and cannot be converted to an int.")) try: page = paginator.page(page_number) except InvalidPage as exc: diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index 510ce0aad..3bed91430 100644 --- a/rest_framework/locale/en_US/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-28 17:49+0000\n" +"POT-Creation-Date: 2014-12-31 12:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -30,7 +30,7 @@ msgid "Must include \"username\" and \"password\"" msgstr "" #: rest_framework/exceptions.py:39 -msgid "A server error occured" +msgid "A server error occurred" msgstr "" #: rest_framework/exceptions.py:74 @@ -212,7 +212,7 @@ msgid "Expected a list of items but got type `{input_type}`" msgstr "" #: rest_framework/generics.py:122 -msgid "Page is not 'last', nor can it be converted to an int." +msgid "Page is not 'last', and cannot be converted to an int." msgstr "" #: rest_framework/generics.py:126 From a90ba2bc11de5fb391b95d4fce84f87ae7f88eff Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 31 Dec 2014 13:03:16 +0000 Subject: [PATCH 1397/1652] update error messages for language and consistency --- rest_framework/exceptions.py | 4 +-- rest_framework/fields.py | 17 +++++----- rest_framework/generics.py | 2 +- .../locale/en_US/LC_MESSAGES/django.po | 33 ++++++++++--------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 2586fc332..d78b7e975 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -36,7 +36,7 @@ class APIException(Exception): Subclasses should provide `.status_code` and `.default_detail` properties. """ status_code = status.HTTP_500_INTERNAL_SERVER_ERROR - default_detail = _('A server error occurred') + default_detail = _('A server error occurred.') def __init__(self, detail=None): if detail is not None: @@ -107,7 +107,7 @@ class MethodNotAllowed(APIException): class NotAcceptable(APIException): status_code = status.HTTP_406_NOT_ACCEPTABLE - default_detail = _('Could not satisfy the request Accept header') + default_detail = _('Could not satisfy the request Accept header.') def __init__(self, detail=None, available_renderers=None): if detail is not None: diff --git a/rest_framework/fields.py b/rest_framework/fields.py index c40dc3fb3..0ff2b0733 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -640,7 +640,7 @@ class IntegerField(Field): 'invalid': _('A valid integer is required.'), 'max_value': _('Ensure this value is less than or equal to {max_value}.'), 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), - 'max_string_length': _('String value too large') + 'max_string_length': _('String value too large.') } MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. @@ -674,7 +674,7 @@ class FloatField(Field): 'invalid': _("A valid number is required."), 'max_value': _('Ensure this value is less than or equal to {max_value}.'), 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), - 'max_string_length': _('String value too large') + 'max_string_length': _('String value too large.') } MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. @@ -710,7 +710,7 @@ class DecimalField(Field): 'max_digits': _('Ensure that there are no more than {max_digits} digits in total.'), 'max_decimal_places': _('Ensure that there are no more than {max_decimal_places} decimal places.'), 'max_whole_digits': _('Ensure that there are no more than {max_whole_digits} digits before the decimal point.'), - 'max_string_length': _('String value too large') + 'max_string_length': _('String value too large.') } MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. @@ -793,7 +793,7 @@ class DecimalField(Field): class DateTimeField(Field): default_error_messages = { - 'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}'), + 'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}.'), 'date': _('Expected a datetime but got a date.'), } format = api_settings.DATETIME_FORMAT @@ -858,7 +858,7 @@ class DateTimeField(Field): class DateField(Field): default_error_messages = { - 'invalid': _('Date has wrong format. Use one of these formats instead: {format}'), + 'invalid': _('Date has wrong format. Use one of these formats instead: {format}.'), 'datetime': _('Expected a date but got a datetime.'), } format = api_settings.DATE_FORMAT @@ -916,7 +916,7 @@ class DateField(Field): class TimeField(Field): default_error_messages = { - 'invalid': _('Time has wrong format. Use one of these formats instead: {format}'), + 'invalid': _('Time has wrong format. Use one of these formats instead: {format}.'), } format = api_settings.TIME_FORMAT input_formats = api_settings.TIME_INPUT_FORMATS @@ -1093,8 +1093,7 @@ class FileField(Field): class ImageField(FileField): default_error_messages = { 'invalid_image': _( - 'Upload a valid image. The file you uploaded was either not an ' - 'image or a corrupted image.' + 'Upload a valid image. The file you uploaded was either not an image or a corrupted image.' ), } @@ -1119,7 +1118,7 @@ class ListField(Field): child = None initial = [] default_error_messages = { - 'not_a_list': _('Expected a list of items but got type `{input_type}`') + 'not_a_list': _('Expected a list of items but got type `{input_type}`.') } def __init__(self, *args, **kwargs): diff --git a/rest_framework/generics.py b/rest_framework/generics.py index bdbc19a75..680992d75 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -119,7 +119,7 @@ class GenericAPIView(views.APIView): if page == 'last': page_number = paginator.num_pages else: - raise Http404(_("Page is not 'last', and cannot be converted to an int.")) + raise Http404(_("Choose a valid page number. Page numbers must be a whole number, or must be the string 'last'.")) try: page = paginator.page(page_number) except InvalidPage as exc: diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index 3bed91430..18f5fe18d 100644 --- a/rest_framework/locale/en_US/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po @@ -2,13 +2,13 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-31 12:48+0000\n" +"POT-Creation-Date: 2014-12-31 13:02+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -30,7 +30,7 @@ msgid "Must include \"username\" and \"password\"" msgstr "" #: rest_framework/exceptions.py:39 -msgid "A server error occurred" +msgid "A server error occurred." msgstr "" #: rest_framework/exceptions.py:74 @@ -55,7 +55,7 @@ msgid "Method '%s' not allowed." msgstr "" #: rest_framework/exceptions.py:105 -msgid "Could not satisfy the request Accept header" +msgid "Could not satisfy the request Accept header." msgstr "" #: rest_framework/exceptions.py:117 @@ -92,7 +92,7 @@ msgstr "" msgid "This field may not be blank." msgstr "" -#: rest_framework/fields.py:548 rest_framework/fields.py:1250 +#: rest_framework/fields.py:548 rest_framework/fields.py:1249 msgid "Ensure this field has no more than {max_length} characters." msgstr "" @@ -133,7 +133,7 @@ msgstr "" #: rest_framework/fields.py:640 rest_framework/fields.py:674 #: rest_framework/fields.py:710 -msgid "String value too large" +msgid "String value too large." msgstr "" #: rest_framework/fields.py:671 rest_framework/fields.py:704 @@ -155,7 +155,7 @@ msgid "" msgstr "" #: rest_framework/fields.py:793 -msgid "Datetime has wrong format. Use one of these formats instead: {format}" +msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" #: rest_framework/fields.py:794 @@ -163,7 +163,7 @@ msgid "Expected a datetime but got a date." msgstr "" #: rest_framework/fields.py:858 -msgid "Date has wrong format. Use one of these formats instead: {format}" +msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" #: rest_framework/fields.py:859 @@ -171,14 +171,15 @@ msgid "Expected a date but got a datetime." msgstr "" #: rest_framework/fields.py:916 -msgid "Time has wrong format. Use one of these formats instead: {format}" +msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" #: rest_framework/fields.py:972 rest_framework/fields.py:1016 msgid "`{input}` is not a valid choice." msgstr "" -#: rest_framework/fields.py:1017 rest_framework/serializers.py:474 +#: rest_framework/fields.py:1017 rest_framework/fields.py:1118 +#: rest_framework/serializers.py:474 msgid "Expected a list of items but got type `{input_type}`." msgstr "" @@ -204,15 +205,15 @@ msgid "" msgstr "" #: rest_framework/fields.py:1093 -msgid "Upload a valid image. The file you uploaded was either not an " -msgstr "" - -#: rest_framework/fields.py:1119 -msgid "Expected a list of items but got type `{input_type}`" +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." msgstr "" #: rest_framework/generics.py:122 -msgid "Page is not 'last', and cannot be converted to an int." +msgid "" +"Choose a valid page number. Page numbers must be a whole number, or must be " +"the string 'last'." msgstr "" #: rest_framework/generics.py:126 From 32506e20756c84677abb5ae49706446a0d250371 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 31 Dec 2014 13:14:09 +0000 Subject: [PATCH 1398/1652] update expected error messages in tests --- tests/test_fields.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/test_fields.py b/tests/test_fields.py index 04c721d36..61d39aff6 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -640,8 +640,8 @@ class TestDateField(FieldValues): datetime.date(2001, 1, 1): datetime.date(2001, 1, 1), } invalid_inputs = { - 'abc': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]'], - '2001-99-99': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]]'], + 'abc': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]].'], + '2001-99-99': ['Date has wrong format. Use one of these formats instead: YYYY[-MM[-DD]].'], datetime.datetime(2001, 1, 1, 12, 00): ['Expected a date but got a datetime.'], } outputs = { @@ -658,7 +658,7 @@ class TestCustomInputFormatDateField(FieldValues): '1 Jan 2001': datetime.date(2001, 1, 1), } invalid_inputs = { - '2001-01-01': ['Date has wrong format. Use one of these formats instead: DD [Jan-Dec] YYYY'] + '2001-01-01': ['Date has wrong format. Use one of these formats instead: DD [Jan-Dec] YYYY.'] } outputs = {} field = serializers.DateField(input_formats=['%d %b %Y']) @@ -702,8 +702,8 @@ class TestDateTimeField(FieldValues): '2001-01-01T14:00+01:00' if (django.VERSION > (1, 4)) else '2001-01-01T13:00Z': datetime.datetime(2001, 1, 1, 13, 00, tzinfo=timezone.UTC()) } invalid_inputs = { - 'abc': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]'], - '2001-99-99T99:00': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z]'], + 'abc': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z].'], + '2001-99-99T99:00': ['Datetime has wrong format. Use one of these formats instead: YYYY-MM-DDThh:mm[:ss[.uuuuuu]][+HH:MM|-HH:MM|Z].'], datetime.date(2001, 1, 1): ['Expected a datetime but got a date.'], } outputs = { @@ -721,7 +721,7 @@ class TestCustomInputFormatDateTimeField(FieldValues): '1:35pm, 1 Jan 2001': datetime.datetime(2001, 1, 1, 13, 35, tzinfo=timezone.UTC()), } invalid_inputs = { - '2001-01-01T20:50': ['Datetime has wrong format. Use one of these formats instead: hh:mm[AM|PM], DD [Jan-Dec] YYYY'] + '2001-01-01T20:50': ['Datetime has wrong format. Use one of these formats instead: hh:mm[AM|PM], DD [Jan-Dec] YYYY.'] } outputs = {} field = serializers.DateTimeField(default_timezone=timezone.UTC(), input_formats=['%I:%M%p, %d %b %Y']) @@ -773,8 +773,8 @@ class TestTimeField(FieldValues): datetime.time(13, 00): datetime.time(13, 00), } invalid_inputs = { - 'abc': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]]'], - '99:99': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]]'], + 'abc': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]].'], + '99:99': ['Time has wrong format. Use one of these formats instead: hh:mm[:ss[.uuuuuu]].'], } outputs = { datetime.time(13, 00): '13:00:00' @@ -790,7 +790,7 @@ class TestCustomInputFormatTimeField(FieldValues): '1:00pm': datetime.time(13, 00), } invalid_inputs = { - '13:00': ['Time has wrong format. Use one of these formats instead: hh:mm[AM|PM]'], + '13:00': ['Time has wrong format. Use one of these formats instead: hh:mm[AM|PM].'], } outputs = {} field = serializers.TimeField(input_formats=['%I:%M%p']) @@ -1028,7 +1028,7 @@ class TestListField(FieldValues): (['1', '2', '3'], [1, 2, 3]) ] invalid_inputs = [ - ('not a list', ['Expected a list of items but got type `str`']), + ('not a list', ['Expected a list of items but got type `str`.']), ([1, 2, 'error'], ['A valid integer is required.']) ] outputs = [ From 9f169acb62a6223a5add0fee7f6d53108e42f207 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 31 Dec 2014 14:56:23 +0000 Subject: [PATCH 1399/1652] capitalise Django --- docs/topics/internationalisation.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/topics/internationalisation.md b/docs/topics/internationalisation.md index 6470ee033..fac3bdb7a 100644 --- a/docs/topics/internationalisation.md +++ b/docs/topics/internationalisation.md @@ -70,7 +70,8 @@ available for Django to use. You should see a message ## How Django chooses which language to use -REST framework will use the same preferences to select which language to display as Django does. You can find more info in the [django docs on discovering language preferences][django-language-preference]. For reference, these are +REST framework will use the same preferences to select which language to +display as Django does. You can find more info in the [Django docs on discovering language preferences][django-language-preference]. For reference, these are 1. First, it looks for the language prefix in the requested URL 2. Failing that, it looks for the `LANGUAGE_SESSION_KEY` key in the current user’s session. From 6fb37207d18949031fb7203d6fd67ee503df0a34 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Fri, 2 Jan 2015 11:11:13 +0000 Subject: [PATCH 1400/1652] add missing period; update generated translations --- rest_framework/exceptions.py | 2 +- .../locale/en_US/LC_MESSAGES/django.po | 96 +++++++++++-------- 2 files changed, 59 insertions(+), 39 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index d78b7e975..c8cedfceb 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -91,7 +91,7 @@ class PermissionDenied(APIException): class NotFound(APIException): status_code = status.HTTP_404_NOT_FOUND - default_detail = _('Not found') + default_detail = _('Not found.') class MethodNotAllowed(APIException): diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index 18f5fe18d..569020739 100644 --- a/rest_framework/locale/en_US/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-31 13:02+0000\n" +"POT-Creation-Date: 2015-01-02 11:10+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -50,24 +50,28 @@ msgid "You do not have permission to perform this action." msgstr "" #: rest_framework/exceptions.py:94 +msgid "Not found." +msgstr "" + +#: rest_framework/exceptions.py:99 #, python-format msgid "Method '%s' not allowed." msgstr "" -#: rest_framework/exceptions.py:105 +#: rest_framework/exceptions.py:110 msgid "Could not satisfy the request Accept header." msgstr "" -#: rest_framework/exceptions.py:117 +#: rest_framework/exceptions.py:122 #, python-format msgid "Unsupported media type '%s' in request." msgstr "" -#: rest_framework/exceptions.py:128 +#: rest_framework/exceptions.py:133 msgid "Request was throttled." msgstr "" -#: rest_framework/exceptions.py:130 +#: rest_framework/exceptions.py:135 #, python-format msgid "Expected available in %(wait)d second." msgid_plural "Expected available in %(wait)d seconds." @@ -84,127 +88,127 @@ msgstr "" msgid "This field may not be null." msgstr "" -#: rest_framework/fields.py:484 rest_framework/fields.py:512 +#: rest_framework/fields.py:480 rest_framework/fields.py:508 msgid "`{input}` is not a valid boolean." msgstr "" -#: rest_framework/fields.py:547 +#: rest_framework/fields.py:543 msgid "This field may not be blank." msgstr "" -#: rest_framework/fields.py:548 rest_framework/fields.py:1249 +#: rest_framework/fields.py:544 rest_framework/fields.py:1252 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: rest_framework/fields.py:549 +#: rest_framework/fields.py:545 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: rest_framework/fields.py:584 +#: rest_framework/fields.py:587 msgid "Enter a valid email address." msgstr "" -#: rest_framework/fields.py:601 +#: rest_framework/fields.py:604 msgid "This value does not match the required pattern." msgstr "" -#: rest_framework/fields.py:612 +#: rest_framework/fields.py:615 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" -#: rest_framework/fields.py:624 +#: rest_framework/fields.py:627 msgid "Enter a valid URL." msgstr "" -#: rest_framework/fields.py:637 +#: rest_framework/fields.py:640 msgid "A valid integer is required." msgstr "" -#: rest_framework/fields.py:638 rest_framework/fields.py:672 -#: rest_framework/fields.py:705 +#: rest_framework/fields.py:641 rest_framework/fields.py:675 +#: rest_framework/fields.py:708 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: rest_framework/fields.py:639 rest_framework/fields.py:673 -#: rest_framework/fields.py:706 +#: rest_framework/fields.py:642 rest_framework/fields.py:676 +#: rest_framework/fields.py:709 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: rest_framework/fields.py:640 rest_framework/fields.py:674 -#: rest_framework/fields.py:710 +#: rest_framework/fields.py:643 rest_framework/fields.py:677 +#: rest_framework/fields.py:713 msgid "String value too large." msgstr "" -#: rest_framework/fields.py:671 rest_framework/fields.py:704 +#: rest_framework/fields.py:674 rest_framework/fields.py:707 msgid "A valid number is required." msgstr "" -#: rest_framework/fields.py:707 +#: rest_framework/fields.py:710 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: rest_framework/fields.py:708 +#: rest_framework/fields.py:711 msgid "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: rest_framework/fields.py:709 +#: rest_framework/fields.py:712 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: rest_framework/fields.py:793 +#: rest_framework/fields.py:796 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: rest_framework/fields.py:794 +#: rest_framework/fields.py:797 msgid "Expected a datetime but got a date." msgstr "" -#: rest_framework/fields.py:858 +#: rest_framework/fields.py:861 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: rest_framework/fields.py:859 +#: rest_framework/fields.py:862 msgid "Expected a date but got a datetime." msgstr "" -#: rest_framework/fields.py:916 +#: rest_framework/fields.py:919 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: rest_framework/fields.py:972 rest_framework/fields.py:1016 +#: rest_framework/fields.py:975 rest_framework/fields.py:1019 msgid "`{input}` is not a valid choice." msgstr "" -#: rest_framework/fields.py:1017 rest_framework/fields.py:1118 -#: rest_framework/serializers.py:474 +#: rest_framework/fields.py:1020 rest_framework/fields.py:1121 +#: rest_framework/serializers.py:476 msgid "Expected a list of items but got type `{input_type}`." msgstr "" -#: rest_framework/fields.py:1047 +#: rest_framework/fields.py:1050 msgid "No file was submitted." msgstr "" -#: rest_framework/fields.py:1048 +#: rest_framework/fields.py:1051 msgid "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: rest_framework/fields.py:1049 +#: rest_framework/fields.py:1052 msgid "No filename could be determined." msgstr "" -#: rest_framework/fields.py:1050 +#: rest_framework/fields.py:1053 msgid "The submitted file is empty." msgstr "" -#: rest_framework/fields.py:1051 +#: rest_framework/fields.py:1054 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: rest_framework/fields.py:1093 +#: rest_framework/fields.py:1096 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -276,3 +280,19 @@ msgstr "" #: rest_framework/validators.py:247 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" + +#: rest_framework/versioning.py:39 +msgid "Invalid version in 'Accept' header." +msgstr "" + +#: rest_framework/versioning.py:70 rest_framework/versioning.py:112 +msgid "Invalid version in URL path." +msgstr "" + +#: rest_framework/versioning.py:138 +msgid "Invalid version in hostname." +msgstr "" + +#: rest_framework/versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "" From 8cf37449715c32c4a692667814466c7f32e8734f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 5 Jan 2015 10:52:18 +0000 Subject: [PATCH 1401/1652] Ensure no invalid min_length/min_value/max_value arguments. Closes #2369. --- rest_framework/utils/field_mapping.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index b2f4dd80e..cba40d318 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -10,6 +10,11 @@ from rest_framework.validators import UniqueValidator import inspect +NUMERIC_FIELD_TYPES = ( + models.IntegerField, models.FloatField, models.DecimalField +) + + class ClassLookupDict(object): """ Takes a dictionary with classes as keys. @@ -119,7 +124,7 @@ def get_field_kwargs(field_name, model_field): validator.limit_value for validator in validator_kwarg if isinstance(validator, validators.MinLengthValidator) ), None) - if min_length is not None: + if min_length is not None and isinstance(model_field, models.CharField): kwargs['min_length'] = min_length validator_kwarg = [ validator for validator in validator_kwarg @@ -132,7 +137,7 @@ def get_field_kwargs(field_name, model_field): validator.limit_value for validator in validator_kwarg if isinstance(validator, validators.MaxValueValidator) ), None) - if max_value is not None: + if max_value is not None and isinstance(model_field, NUMERIC_FIELD_TYPES): kwargs['max_value'] = max_value validator_kwarg = [ validator for validator in validator_kwarg @@ -145,7 +150,7 @@ def get_field_kwargs(field_name, model_field): validator.limit_value for validator in validator_kwarg if isinstance(validator, validators.MinValueValidator) ), None) - if min_value is not None: + if min_value is not None and isinstance(model_field, NUMERIC_FIELD_TYPES): kwargs['min_value'] = min_value validator_kwarg = [ validator for validator in validator_kwarg From 17665aa52a9cd5599099c19fd8f54540a5d436ce Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 5 Jan 2015 12:26:15 +0000 Subject: [PATCH 1402/1652] Add docs for OAuth, XML, YAML, JSONP packages. Closes #2179. --- README.md | 4 +- docs/api-guide/authentication.md | 47 +++++++++++++++++-- docs/api-guide/parsers.md | 51 ++++++++++++++++++-- docs/api-guide/renderers.md | 80 +++++++++++++++++++++++++++++++- docs/index.md | 9 ++-- 5 files changed, 174 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 4c9d765ea..6742a7b1d 100644 --- a/README.md +++ b/README.md @@ -190,8 +190,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [sandbox]: http://restframework.herokuapp.com/ [index]: http://www.django-rest-framework.org/ -[oauth1-section]: http://www.django-rest-framework.org/api-guide/authentication.html#oauthauthentication -[oauth2-section]: http://www.django-rest-framework.org/api-guide/authentication.html#oauth2authentication +[oauth1-section]: http://www.django-rest-framework.org/api-guide/authentication/#django-rest-framework-oauth +[oauth2-section]: http://www.django-rest-framework.org/api-guide/authentication/#django-oauth-toolkit [serializer-section]: http://www.django-rest-framework.org/api-guide/serializers.html#serializers [modelserializer-section]: http://www.django-rest-framework.org/api-guide/serializers.html#modelserializer [functionview-section]: http://www.django-rest-framework.org/api-guide/views.html#function-based-views diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 2074f1bfc..bb7318177 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -293,14 +293,49 @@ The following example will authenticate any incoming request as the user given b The following third party packages are also available. +## Django OAuth Toolkit + +The [Django OAuth Toolkit][django-oauth-toolkit] package provides OAuth 2.0 support, and works with Python 2.7 and Python 3.3+. The package is maintained by [Evonove][evonove] and uses the excellent [OAuthLib][oauthlib]. The package is well documented, and well supported and is currently our **recommended package for OAuth 2.0 support**. + +#### Installation & configuration + +Install using `pip`. + + pip install django-oauth-toolkit + +Add the package to your `INSTALLED_APPS` and modify your REST framework settings. + + INSTALLED_APPS = ( + ... + 'oauth2_provider', + ) + + REST_FRAMEWORK = { + 'DEFAULT_AUTHENTICATION_CLASSES': ( + 'oauth2_provider.ext.rest_framework.OAuth2Authentication', + ) + } + +For more details see the [Django REST framework - Getting started][django-oauth-toolkit-getting-started] documentation. + +## Django REST framework OAuth + +The [Django REST framework OAuth][django-rest-framework-oauth] package provides both OAuth1 and OAuth2 support for REST framework. + +This package was previously included directly in REST framework but is now supported and maintained as a third party package. + +#### Installation & configuration + +Install the package using `pip`. + + pip install djangorestframework-oauth + +For details on configuration and usage see the Django REST framework OAuth documentation for [authentication][django-rest-framework-oauth-authentication] and [permissions][django-rest-framework-oauth-permissions]. + ## Digest Authentication HTTP digest authentication is a widely implemented scheme that was intended to replace HTTP basic authentication, and which provides a simple encrypted authentication mechanism. [Juan Riaza][juanriaza] maintains the [djangorestframework-digestauth][djangorestframework-digestauth] package which provides HTTP digest authentication support for REST framework. -## Django OAuth Toolkit - -The [Django OAuth Toolkit][django-oauth-toolkit] package provides OAuth 2.0 support, and works with Python 2.7 and Python 3.3+. The package is maintained by [Evonove][evonove] and uses the excellent [OAuthLib][oauthlib]. The package is well documented, and comes as a recommended alternative for OAuth 2.0 support. - ## Django OAuth2 Consumer The [Django OAuth2 Consumer][doac] library from [Rediker Software][rediker] is another package that provides [OAuth 2.0 support for REST framework][doac-rest-framework]. The package includes token scoping permissions on tokens, which allows finer-grained access to your API. @@ -332,6 +367,10 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a [mod_wsgi_official]: http://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIPassAuthorization [custom-user-model]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#specifying-a-custom-user-model [south-dependencies]: http://south.readthedocs.org/en/latest/dependencies.html +[django-oauth-toolkit-getting-started]: https://django-oauth-toolkit.readthedocs.org/en/latest/rest-framework/getting_started.html +[django-rest-framework-oauth]: http://jpadilla.github.io/django-rest-framework-oauth/ +[django-rest-framework-oauth-authentication]: http://jpadilla.github.io/django-rest-framework-oauth/authentication/ +[django-rest-framework-oauth-permissions]: http://jpadilla.github.io/django-rest-framework-oauth/permissions/ [juanriaza]: https://github.com/juanriaza [djangorestframework-digestauth]: https://github.com/juanriaza/django-rest-framework-digestauth [oauth-1.0a]: http://oauth.net/core/1.0a diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index 9323d3822..b68b33be9 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -26,7 +26,7 @@ As an example, if you are sending `json` encoded data using jQuery with the [.aj ## Setting the parsers -The default set of parsers may be set globally, using the `DEFAULT_PARSER_CLASSES` setting. For example, the following settings would allow requests with `JSON` content. +The default set of parsers may be set globally, using the `DEFAULT_PARSER_CLASSES` setting. For example, the following settings would allow only requests with `JSON` content, instead of the default of JSON or form data. REST_FRAMEWORK = { 'DEFAULT_PARSER_CLASSES': ( @@ -37,8 +37,8 @@ The default set of parsers may be set globally, using the `DEFAULT_PARSER_CLASSE You can also set the parsers used for an individual view, or viewset, using the `APIView` class based views. - from rest_framework.parsers import JSONParser - from rest_framework.response import Response + from rest_framework.parsers import JSONParser + from rest_framework.response import Response from rest_framework.views import APIView class ExampleView(APIView): @@ -162,6 +162,48 @@ The following is an example plaintext parser that will populate the `request.dat The following third party packages are also available. +## YAML + +[REST framework YAML][rest-framework-yaml] provides [YAML][yaml] parsing and rendering support. It was previously included directly in the REST framework package, and is now instead supported as a third-party package. + +#### Installation & configuration + +Install using pip. + + $ pip install djangorestframework-yaml + +Modify your REST framework settings. + + REST_FRAMEWORK = { + 'DEFAULT_PARSER_CLASSES': ( + 'rest_framework_yaml.parsers.YAMLParser', + ), + 'DEFAULT_RENDERER_CLASSES': ( + 'rest_framework_yaml.renderers.YAMLRenderer', + ), + } + +## XML + +[REST Framework XML][rest-framework-xml] provides a simple informal XML format. It was previously included directly in the REST framework package, and is now instead supported as a third-party package. + +#### Installation & configuration + +Install using pip. + + $ pip install djangorestframework-xml + +Modify your REST framework settings. + + REST_FRAMEWORK = { + 'DEFAULT_PARSER_CLASSES': ( + 'rest_framework_xml.parsers.XMLParser', + ), + 'DEFAULT_RENDERER_CLASSES': ( + 'rest_framework_xml.renderers.XMLRenderer', + ), + } + ## MessagePack [MessagePack][messagepack] is a fast, efficient binary serialization format. [Juan Riaza][juanriaza] maintains the [djangorestframework-msgpack][djangorestframework-msgpack] package which provides MessagePack renderer and parser support for REST framework. @@ -173,6 +215,9 @@ The following third party packages are also available. [jquery-ajax]: http://api.jquery.com/jQuery.ajax/ [cite]: https://groups.google.com/d/topic/django-developers/dxI4qVzrBY4/discussion [upload-handlers]: https://docs.djangoproject.com/en/dev/topics/http/file-uploads/#upload-handlers +[rest-framework-yaml]: http://jpadilla.github.io/django-rest-framework-yaml/ +[rest-framework-xml]: http://jpadilla.github.io/django-rest-framework-xml/ +[yaml]: http://www.yaml.org/ [messagepack]: https://github.com/juanriaza/django-rest-framework-msgpack [juanriaza]: https://github.com/juanriaza [vbabiy]: https://github.com/vbabiy diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index 69460dbc5..83ded849d 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -342,13 +342,81 @@ Templates will render with a `RequestContext` which includes the `status_code` a The following third party packages are also available. +## YAML + +[REST framework YAML][rest-framework-yaml] provides [YAML][yaml] parsing and rendering support. It was previously included directly in the REST framework package, and is now instead supported as a third-party package. + +#### Installation & configuration + +Install using pip. + + $ pip install djangorestframework-yaml + +Modify your REST framework settings. + + REST_FRAMEWORK = { + 'DEFAULT_PARSER_CLASSES': ( + 'rest_framework_yaml.parsers.YAMLParser', + ), + 'DEFAULT_RENDERER_CLASSES': ( + 'rest_framework_yaml.renderers.YAMLRenderer', + ), + } + +## XML + +[REST Framework XML][rest-framework-xml] provides a simple informal XML format. It was previously included directly in the REST framework package, and is now instead supported as a third-party package. + +#### Installation & configuration + +Install using pip. + + $ pip install djangorestframework-xml + +Modify your REST framework settings. + + REST_FRAMEWORK = { + 'DEFAULT_PARSER_CLASSES': ( + 'rest_framework_xml.parsers.XMLParser', + ), + 'DEFAULT_RENDERER_CLASSES': ( + 'rest_framework_xml.renderers.XMLRenderer', + ), + } + +## JSONP + +[REST framework JSONP][rest-framework-jsonp] provides JSONP rendering support. It was previously included directly in the REST framework package, and is now instead supported as a third-party package. + +--- + +**Warning**: If you require cross-domain AJAX requests, you should generally be using the more modern approach of [CORS][cors] as an alternative to `JSONP`. See the [CORS documentation][cors-docs] for more details. + +The `jsonp` approach is essentially a browser hack, and is [only appropriate for globally readable API endpoints][jsonp-security], where `GET` requests are unauthenticated and do not require any user permissions. + +--- + +#### Installation & configuration + +Install using pip. + + $ pip install djangorestframework-jsonp + +Modify your REST framework settings. + + REST_FRAMEWORK = { + 'DEFAULT_RENDERER_CLASSES': ( + 'rest_framework_yaml.renderers.JSONPRenderer', + ), + } + ## MessagePack [MessagePack][messagepack] is a fast, efficient binary serialization format. [Juan Riaza][juanriaza] maintains the [djangorestframework-msgpack][djangorestframework-msgpack] package which provides MessagePack renderer and parser support for REST framework. ## CSV -Comma-separated values are a plain-text tabular data format, that can be easily imported into spreadsheet applications. [Mjumbe Poe][mjumbewu] maintains the [djangorestframework-csv][djangorestframework-csv] package which provides CSV renderer support for REST framework. +Comma-separated values are a plain-text tabular data format, that can be easily imported into spreadsheet applications. [Mjumbe Poe][mjumbewu] maintains the [djangorestframework-csv][djangorestframework-csv] package which provides CSV renderer support for REST framework. ## UltraJSON @@ -358,7 +426,6 @@ Comma-separated values are a plain-text tabular data format, that can be easily [djangorestframework-camel-case] provides camel case JSON renderers and parsers for REST framework. This allows serializers to use Python-style underscored field names, but be exposed in the API as Javascript-style camel case field names. It is maintained by [Vitaly Babiy][vbabiy]. - ## Pandas (CSV, Excel, PNG) [Django REST Pandas] provides a serializer and renderers that support additional data processing and output via the [Pandas] DataFrame API. Django REST Pandas includes renderers for Pandas-style CSV files, Excel workbooks (both `.xls` and `.xlsx`), and a number of [other formats]. It is maintained by [S. Andrew Sheppard][sheppard] as part of the [wq Project][wq]. @@ -373,10 +440,19 @@ Comma-separated values are a plain-text tabular data format, that can be easily [application/vnd.github+json]: http://developer.github.com/v3/media/ [application/vnd.collection+json]: http://www.amundsen.com/media-types/collection/ [django-error-views]: https://docs.djangoproject.com/en/dev/topics/http/views/#customizing-error-views +[rest-framework-jsonp]: http://jpadilla.github.io/django-rest-framework-jsonp/ +[cors]: http://www.w3.org/TR/cors/ +[cors-docs]: http://www.django-rest-framework.org/topics/ajax-csrf-cors/ +[jsonp-security]: http://stackoverflow.com/questions/613962/is-jsonp-safe-to-use +[rest-framework-yaml]: http://jpadilla.github.io/django-rest-framework-yaml/ +[rest-framework-xml]: http://jpadilla.github.io/django-rest-framework-xml/ [messagepack]: http://msgpack.org/ [juanriaza]: https://github.com/juanriaza [mjumbewu]: https://github.com/mjumbewu [vbabiy]: https://github.com/vbabiy +[rest-framework-yaml]: http://jpadilla.github.io/django-rest-framework-yaml/ +[rest-framework-xml]: http://jpadilla.github.io/django-rest-framework-xml/ +[yaml]: http://www.yaml.org/ [djangorestframework-msgpack]: https://github.com/juanriaza/django-rest-framework-msgpack [djangorestframework-csv]: https://github.com/mjumbewu/django-rest-framework-csv [ultrajson]: https://github.com/esnme/ultrajson diff --git a/docs/index.md b/docs/index.md index 7ccec12fe..544204c65 100644 --- a/docs/index.md +++ b/docs/index.md @@ -28,13 +28,12 @@ For more details see the [3.0 release notes][3.0-announcement]. <img alt="Django REST Framework" title="Logo by Jake 'Sid' Smith" src="img/logo.png" width="600px" style="display: block; margin: 0 auto 0 auto"> </p> - Django REST framework is a powerful and flexible toolkit that makes it easy to build Web APIs. Some reasons you might want to use REST framework: * The [Web browsable API][sandbox] is a huge usability win for your developers. -* [Authentication policies][authentication] including optional packages for [OAuth1a][oauth1-section] and [OAuth2][oauth2-section]. +* [Authentication policies][authentication] including packages for [OAuth1a][oauth1-section] and [OAuth2][oauth2-section]. * [Serialization][serializers] that supports both [ORM][modelserializer-section] and [non-ORM][serializer-section] data sources. * Customizable all the way down - just use [regular function-based views][functionview-section] if you don't need the [more][generic-views] [powerful][viewsets] [features][routers]. * [Extensive documentation][index], and [great community support][group]. @@ -57,7 +56,6 @@ The following packages are optional: * [Markdown][markdown] (2.1.0+) - Markdown support for the browsable API. * [django-filter][django-filter] (0.5.4+) - Filtering support. -* [django-restframework-oauth][django-restframework-oauth] package for OAuth 1.0a and 2.0 support. * [django-guardian][django-guardian] (1.1.1+) - Object level permissions support. ## Installation @@ -260,13 +258,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [eventbrite]: https://www.eventbrite.co.uk/about/ [markdown]: http://pypi.python.org/pypi/Markdown/ [django-filter]: http://pypi.python.org/pypi/django-filter -[django-restframework-oauth]: https://github.com/jlafon/django-rest-framework-oauth [django-guardian]: https://github.com/lukaszb/django-guardian [0.4]: https://github.com/tomchristie/django-rest-framework/tree/0.4.X [image]: img/quickstart.png [index]: . -[oauth1-section]: api-guide/authentication#oauthauthentication -[oauth2-section]: api-guide/authentication#oauth2authentication +[oauth1-section]: api-guide/authentication/#django-rest-framework-oauth +[oauth2-section]: api-guide/authentication/#django-oauth-toolkit [serializer-section]: api-guide/serializers#serializers [modelserializer-section]: api-guide/serializers#modelserializer [functionview-section]: api-guide/views#function-based-views From b6ca7248ebcf95a95e1911aa0b130f653b8bf690 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 5 Jan 2015 14:32:12 +0000 Subject: [PATCH 1403/1652] required=False allows omission of value for output. Closes #2342 --- docs/api-guide/fields.md | 2 ++ rest_framework/fields.py | 2 ++ rest_framework/serializers.py | 8 ++++- tests/test_serializer.py | 62 +++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 946e355da..b3d274ddb 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -41,6 +41,8 @@ Defaults to `False` Normally an error will be raised if a field is not supplied during deserialization. Set to false if this field is not required to be present during deserialization. +Setting this to `False` also allows the object attribute or dictionary key to be omitted from output when serializing the instance. If the key is not present it will simply not be included in the output representation. + Defaults to `True`. ### `allow_null` diff --git a/rest_framework/fields.py b/rest_framework/fields.py index aab80982a..cc9410aa7 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -288,6 +288,8 @@ class Field(object): try: return get_attribute(instance, self.source_attrs) except (KeyError, AttributeError) as exc: + if not self.required and self.default is empty: + raise SkipField() msg = ( 'Got {exc_type} when attempting to get a value for field ' '`{field}` on serializer `{serializer}`.\nThe serializer ' diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 6f89df0db..53f092d7a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -419,8 +419,14 @@ class Serializer(BaseSerializer): fields = [field for field in self.fields.values() if not field.write_only] for field in fields: - attribute = field.get_attribute(instance) + try: + attribute = field.get_attribute(instance) + except SkipField: + continue + if attribute is None: + # We skip `to_representation` for `None` values so that + # fields do not have to explicitly deal with that case. ret[field.field_name] = None else: ret[field.field_name] = field.to_representation(attribute) diff --git a/tests/test_serializer.py b/tests/test_serializer.py index c17b6d8c5..68bbbe983 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -1,5 +1,6 @@ # coding: utf-8 from __future__ import unicode_literals +from .utils import MockObject from rest_framework import serializers from rest_framework.compat import unicode_repr import pytest @@ -216,3 +217,64 @@ class TestUnicodeRepr: instance = ExampleObject() serializer = ExampleSerializer(instance) repr(serializer) # Should not error. + + +class TestNotRequiredOutput: + def test_not_required_output_for_dict(self): + """ + 'required=False' should allow a dictionary key to be missing in output. + """ + class ExampleSerializer(serializers.Serializer): + omitted = serializers.CharField(required=False) + included = serializers.CharField() + + serializer = ExampleSerializer(data={'included': 'abc'}) + serializer.is_valid() + assert serializer.data == {'included': 'abc'} + + def test_not_required_output_for_object(self): + """ + 'required=False' should allow an object attribute to be missing in output. + """ + class ExampleSerializer(serializers.Serializer): + omitted = serializers.CharField(required=False) + included = serializers.CharField() + + def create(self, validated_data): + return MockObject(**validated_data) + + serializer = ExampleSerializer(data={'included': 'abc'}) + serializer.is_valid() + serializer.save() + assert serializer.data == {'included': 'abc'} + + def test_default_required_output_for_dict(self): + """ + 'default="something"' should require dictionary key. + + We need to handle this as the field will have an implicit + 'required=False', but it should still have a value. + """ + class ExampleSerializer(serializers.Serializer): + omitted = serializers.CharField(default='abc') + included = serializers.CharField() + + serializer = ExampleSerializer({'included': 'abc'}) + with pytest.raises(KeyError): + serializer.data + + def test_default_required_output_for_object(self): + """ + 'default="something"' should require object attribute. + + We need to handle this as the field will have an implicit + 'required=False', but it should still have a value. + """ + class ExampleSerializer(serializers.Serializer): + omitted = serializers.CharField(default='abc') + included = serializers.CharField() + + instance = MockObject(included='abc') + serializer = ExampleSerializer(instance) + with pytest.raises(AttributeError): + serializer.data From 49dc037a961b618baf8eb189b094633238867b41 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 5 Jan 2015 15:03:09 +0000 Subject: [PATCH 1404/1652] Update docstring --- rest_framework/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 623ed5865..08a584333 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -236,11 +236,11 @@ class BaseSerializer(Field): class SerializerMetaclass(type): """ - This metaclass sets a dictionary named `base_fields` on the class. + This metaclass sets a dictionary named `_declared_fields` on the class. Any instances of `Field` included as attributes on either the class or on any of its superclasses will be include in the - `base_fields` dictionary. + `_declared_fields` dictionary. """ @classmethod From 6fd33ddea9e5b8f9e979e573a27873131846ea48 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 5 Jan 2015 15:04:01 +0000 Subject: [PATCH 1405/1652] Udpate docstring --- rest_framework/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 53f092d7a..e373cd107 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -236,11 +236,11 @@ class BaseSerializer(Field): class SerializerMetaclass(type): """ - This metaclass sets a dictionary named `base_fields` on the class. + This metaclass sets a dictionary named `_declared_fields` on the class. Any instances of `Field` included as attributes on either the class or on any of its superclasses will be include in the - `base_fields` dictionary. + `_declared_fields` dictionary. """ @classmethod From 26ac2656e5e0b3d01a67551910113a305d2a2820 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 5 Jan 2015 16:20:15 +0000 Subject: [PATCH 1406/1652] Pass init arguments through to serializer from pagination serializer. Closes #2355. Normally a serializer won't need these arguments on __init__, but if a user has customized __init__ they may expect them to be available. --- rest_framework/pagination.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index f31e5fa4c..9c8dda8f9 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -37,16 +37,13 @@ class PreviousPageField(serializers.Field): return replace_query_param(url, self.page_field, page) -class DefaultObjectSerializer(serializers.ReadOnlyField): +class DefaultObjectSerializer(serializers.Serializer): """ If no object serializer is specified, then this serializer will be applied as the default. """ - - def __init__(self, source=None, many=None, context=None): - # Note: Swallow context and many kwargs - only required for - # eg. ModelSerializer. - super(DefaultObjectSerializer, self).__init__(source=source) + def to_representation(self, value): + return value class BasePaginationSerializer(serializers.Serializer): @@ -74,10 +71,9 @@ class BasePaginationSerializer(serializers.Serializer): list_serializer_class = serializers.ListSerializer self.fields[results_field] = list_serializer_class( - child=object_serializer(), + child=object_serializer(*args, **kwargs), source='object_list' ) - self.fields[results_field].bind(field_name=results_field, parent=self) class PaginationSerializer(BasePaginationSerializer): From d3b2302588f333b22d5e4aa2be6eca0e944e9494 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 5 Jan 2015 16:31:52 +0000 Subject: [PATCH 1407/1652] Minor docs update. Refs #2375. --- docs/topics/3.0-announcement.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 68d247827..5dbc5600a 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -87,12 +87,12 @@ The resulting API changes are further detailed below. #### The `.create()` and `.update()` methods. -The `.restore_object()` method is now replaced with two separate methods, `.create()` and `.update()`. - -These methods also replace the optional `.save_object()` method, which no longer exists. +The `.restore_object()` method is now removed, and we instead have two separate methods, `.create()` and `.update()`. These methods work slightly different to the previous `.restore_object()`. When using the `.create()` and `.update()` methods you should both create *and save* the object instance. This is in contrast to the previous `.restore_object()` behavior that would instantiate the object but not save it. +These methods also replace the optional `.save_object()` method, which no longer exists. + The following example from the tutorial previously used `restore_object()` to handle both creating and updating object instances. def restore_object(self, attrs, instance=None): From 271b638df10c0cf498cbc69847f388e978c4da78 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 6 Jan 2015 11:21:58 +0000 Subject: [PATCH 1408/1652] Update exception docs. Closes #2378. --- docs/api-guide/exceptions.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index 467ad9709..993134f7f 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -18,7 +18,7 @@ The handled exceptions are: In each case, REST framework will return a response with an appropriate status code and content-type. The body of the response will include any additional details regarding the nature of the error. -By default all error responses will include a key `detail` in the body of the response, but other keys may also be included. +Most error responses will include a key `detail` in the body of the response. For example, the following request: @@ -33,6 +33,16 @@ Might receive an error response indicating that the `DELETE` method is not allow {"detail": "Method 'DELETE' not allowed."} +Validation errors are handled slightly differently, and will include the field names as the keys in the response. If the validation error was not specific to a particular field then it will use the "non_field_errors" key, or whatever string value has been set for the `NON_FIELD_ERRORS_KEY` setting. + +Any example validation error might look like this: + + HTTP/1.1 400 Bad Request + Content-Type: application/json + Content-Length: 94 + + {"amount": ["A valid integer is required."], "description": ["This field may not be blank."]} + ## Custom exception handling You can implement custom exception handling by creating a handler function that converts exceptions raised in your API views into response objects. This allows you to control the style of error responses used by your API. From 07ad0474c0cef8f8e88d299eca9dffbe6d01c10d Mon Sep 17 00:00:00 2001 From: Ryan Gaffney <ryanmgaffney@gmail.com> Date: Tue, 6 Jan 2015 14:34:36 -0800 Subject: [PATCH 1409/1652] Fix compatibility comment regarding OrderedDict --- rest_framework/compat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index ba26a3cd7..b1f6f2fa6 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -36,7 +36,7 @@ def unicode_to_repr(value): # OrderedDict only available in Python 2.7. # This will always be the case in Django 1.7 and above, as these versions # no longer support Python 2.6. -# For Django <= 1.6 and Python 2.6 fall back to OrderedDict. +# For Django <= 1.6 and Python 2.6 fall back to SortedDict. try: from collections import OrderedDict except ImportError: From fe92a2cfee9e3a20e913500802d98a15e8b70780 Mon Sep 17 00:00:00 2001 From: JocelynDelalande <JocelynDelalande@users.noreply.github.com> Date: Wed, 7 Jan 2015 10:42:11 +0100 Subject: [PATCH 1410/1652] fixed doc : DEFAULT_AUTHENTICATION_CLASSES -> DEFAULT_AUTHENTICATION + It is consistent with docs about DEFAULT_PERMISSION_CLASSES --- docs/api-guide/authentication.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index b04858e39..1222dbf04 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -34,7 +34,7 @@ The value of `request.user` and `request.auth` for unauthenticated requests can ## Setting the authentication scheme -The default authentication schemes may be set globally, using the `DEFAULT_AUTHENTICATION` setting. For example. +The default authentication schemes may be set globally, using the `DEFAULT_AUTHENTICATION_CLASSES` setting. For example. REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': ( @@ -282,7 +282,7 @@ This authentication class depends on the optional [django-oauth2-provider][djang 'provider.oauth2', ) -Then add `OAuth2Authentication` to your global `DEFAULT_AUTHENTICATION` setting: +Then add `OAuth2Authentication` to your global `DEFAULT_AUTHENTICATION_CLASSES` setting: 'DEFAULT_AUTHENTICATION_CLASSES': ( 'rest_framework.authentication.OAuth2Authentication', From 7913947757b0e6bd1b8828db81933c32c498e20a Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 7 Jan 2015 11:13:03 +0000 Subject: [PATCH 1411/1652] add config and documentation about uploading/downloading translations from Transifex --- .tx/config | 9 +++++ CONTRIBUTING.md | 54 +++++++++++++++++++++++++++++ docs/topics/internationalisation.md | 11 +++--- 3 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 .tx/config diff --git a/.tx/config b/.tx/config new file mode 100644 index 000000000..271fa1e35 --- /dev/null +++ b/.tx/config @@ -0,0 +1,9 @@ +[main] +host = https://www.transifex.com + +[django-rest-framework.djangopo] +file_filter = rest_framework/locale/<lang>/LC_MESSAGES/django.po +source_file = rest_framework/locale/en_US/LC_MESSAGES/django.po +source_lang = en_US +type = PO + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b963a4993..d94eb87e0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -177,6 +177,57 @@ We recommend the [`django-reusable-app`][django-reusable-app] template as a good Once your package is decently documented and available on PyPI open a pull request or issue, and we'll add a link to it from the main REST framework documentation. +# Translations + +If REST framework isn't translated into your language you can request that it is at the [Transifex project][transifex]. + +## Managing Transfiex +The [official Transifex client][transifex-client] is used to upload and download translations to Transifex. The client is installed using pip: + +``` +pip install transifex-client +``` + +To use it you'll need a login to Transifex which has a password, and you'll need to have administrative access to the Transifex project. You'll need to create a `~/.transifexrc` file which contains your authentication information: + +``` +[https://www.transifex.com] +username = user +token = +password = p@ssw0rd +hostname = https://www.transifex.com +``` + +## Upload new source translations +When any user-visible strings are changed, they should be uploaded to Transifex so that the translators can start to translate them. To do this, just run: + +``` +cd rest_framework +django-admin.py makemessages -l en_US +cd .. +tx push -s +``` + +When pushing source files, Transifex will update the source strings of a resource to match those from the new source file. + +Here's how differences between the old and new source files will be handled: + +* New strings will be added. +* Modified strings will be added as well. +* Strings which do not exist in the new source file will be removed from the database, along with their translations. If that source strings gets re-added later then [Transifex Translation Memory][translation-memory] will automatically restore the translated string too. + + +## Get translations +When a translator has finished translating their work needs to be downloaded from Transifex into the source repo. To do this, run: + +``` +tx pull -a +cd rest_framework +django-admin.py compilemessages +``` + +You can then commit as normal. + [cite]: http://www.w3.org/People/Berners-Lee/FAQ.html [code-of-conduct]: https://www.djangoproject.com/conduct/ [google-group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework @@ -190,3 +241,6 @@ Once your package is decently documented and available on PyPI open a pull reque [docs]: https://github.com/tomchristie/django-rest-framework/tree/master/docs [mou]: http://mouapp.com/ [django-reusable-app]: https://github.com/dabapps/django-reusable-app +[transifex]: https://www.transifex.com/projects/p/django-rest-framework/ +[transifex-client]: https://pypi.python.org/pypi/transifex-client +[translation-memory]: http://docs.transifex.com/guides/tm#let-tm-automatically-populate-translations \ No newline at end of file diff --git a/docs/topics/internationalisation.md b/docs/topics/internationalisation.md index fac3bdb7a..2a476c864 100644 --- a/docs/topics/internationalisation.md +++ b/docs/topics/internationalisation.md @@ -3,12 +3,14 @@ REST framework ships with translatable error messages. You can make these appea ## How to translate REST Framework errors +REST framework translations are managed online using [Transifex.com][transifex]. To get started, checkout the guide in the [CONTRIBUTING.md guide][contributing]. + +Sometimes you may want to use REST Framework in a language which has not been translated yet on Transifex. If that is the case then you should translate the error messages locally. + +#### How to translate REST Framework error messages locally: This guide assumes you are already familiar with how to translate a Django app. If you're not, start by reading [Django's translation docs][django-translation]. - -#### To translate REST framework error messages: - 1. Make a new folder where you want to store the translated errors. Add this path to your [`LOCALE_PATHS`][django-locale-paths] setting. @@ -89,4 +91,5 @@ display as Django does. You can find more info in the [Django docs on discoveri [django-translation]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation [django-language-preference]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation/#how-django-discovers-language-preference [django-locale-paths]: https://docs.djangoproject.com/en/1.7/ref/settings/#std:setting-LOCALE_PATHS -[django-locale-name]: https://docs.djangoproject.com/en/1.7/topics/i18n/#term-locale-name \ No newline at end of file +[django-locale-name]: https://docs.djangoproject.com/en/1.7/topics/i18n/#term-locale-name +[contributing]: ../../CONTRIBUTING.md From 9b4177b6ea38de6e86b0fe723834b6ef36af15b3 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 7 Jan 2015 11:41:06 +0000 Subject: [PATCH 1412/1652] switch to using format strings in error messages; raise NotFound when pagination fails to provide a more useful error message --- rest_framework/exceptions.py | 28 ++++++++++++++-------------- rest_framework/generics.py | 14 ++++++++------ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index c8cedfceb..dfc57293e 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -7,8 +7,7 @@ In addition Django's built in 403 and 404 exceptions are handled. from __future__ import unicode_literals from django.utils import six from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import ungettext_lazy +from django.utils.translation import ugettext_lazy as _, ungettext from rest_framework import status import math @@ -96,13 +95,13 @@ class NotFound(APIException): class MethodNotAllowed(APIException): status_code = status.HTTP_405_METHOD_NOT_ALLOWED - default_detail = _("Method '%s' not allowed.") + default_detail = _("Method {method} not allowed.") def __init__(self, method, detail=None): if detail is not None: self.detail = force_text(detail) else: - self.detail = force_text(self.default_detail) % method + self.detail = force_text(self.default_detail).format(method=method) class NotAcceptable(APIException): @@ -119,23 +118,22 @@ class NotAcceptable(APIException): class UnsupportedMediaType(APIException): status_code = status.HTTP_415_UNSUPPORTED_MEDIA_TYPE - default_detail = _("Unsupported media type '%s' in request.") + default_detail = _("Unsupported media type '{media_type}' in request.") def __init__(self, media_type, detail=None): if detail is not None: self.detail = force_text(detail) else: - self.detail = force_text(self.default_detail) % media_type + self.detail = force_text(self.default_detail).format( + media_type=media_type + ) class Throttled(APIException): status_code = status.HTTP_429_TOO_MANY_REQUESTS default_detail = _('Request was throttled.') - extra_detail = ungettext_lazy( - 'Expected available in %(wait)d second.', - 'Expected available in %(wait)d seconds.', - 'wait' - ) + extra_detail_singular = 'Expected available in {wait} second.' + extra_detail_plural = 'Expected available in {wait} seconds.' def __init__(self, wait=None, detail=None): if detail is not None: @@ -147,6 +145,8 @@ class Throttled(APIException): self.wait = None else: self.wait = math.ceil(wait) - self.detail += ' ' + force_text( - self.extra_detail % {'wait': self.wait} - ) + self.detail += ' ' + force_text(ungettext( + self.extra_detail_singular.format(wait=self.wait), + self.extra_detail_plural.format(wait=self.wait), + self.wait + )) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 680992d75..fe92355d9 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -10,6 +10,7 @@ from django.shortcuts import get_object_or_404 as _get_object_or_404 from django.utils import six from django.utils.translation import ugettext as _ from rest_framework import views, mixins +from rest_framework.exceptions import NotFound from rest_framework.settings import api_settings @@ -119,15 +120,16 @@ class GenericAPIView(views.APIView): if page == 'last': page_number = paginator.num_pages else: - raise Http404(_("Choose a valid page number. Page numbers must be a whole number, or must be the string 'last'.")) + raise NotFound(_("Choose a valid page number. Page numbers must be a whole number, or must be the string 'last'.")) + + page_number = -1 try: page = paginator.page(page_number) except InvalidPage as exc: - error_format = _('Invalid page (%(page_number)s): %(message)s') - raise Http404(error_format % { - 'page_number': page_number, - 'message': six.text_type(exc) - }) + error_format = _('Invalid page ({page_number}): {message}') + raise NotFound(error_format.format( + page_number=page_number, message=six.text_type(exc) + )) return page From 3819ae35ac70ef25804f285b7b59edf2f67ea915 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 7 Jan 2015 11:42:36 +0000 Subject: [PATCH 1413/1652] recompile pofile with new python format strings --- .../locale/en_US/LC_MESSAGES/django.po | 153 ++++++++---------- 1 file changed, 69 insertions(+), 84 deletions(-) diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index 569020739..7c5a6c02b 100644 --- a/rest_framework/locale/en_US/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-02 11:10+0000\n" +"POT-Creation-Date: 2015-01-07 11:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,282 +17,267 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: rest_framework/authtoken/serializers.py:20 +#: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" -#: rest_framework/authtoken/serializers.py:23 +#: authtoken/serializers.py:23 msgid "Unable to log in with provided credentials." msgstr "" -#: rest_framework/authtoken/serializers.py:26 +#: authtoken/serializers.py:26 msgid "Must include \"username\" and \"password\"" msgstr "" -#: rest_framework/exceptions.py:39 +#: exceptions.py:38 msgid "A server error occurred." msgstr "" -#: rest_framework/exceptions.py:74 +#: exceptions.py:73 msgid "Malformed request." msgstr "" -#: rest_framework/exceptions.py:79 +#: exceptions.py:78 msgid "Incorrect authentication credentials." msgstr "" -#: rest_framework/exceptions.py:84 +#: exceptions.py:83 msgid "Authentication credentials were not provided." msgstr "" -#: rest_framework/exceptions.py:89 +#: exceptions.py:88 msgid "You do not have permission to perform this action." msgstr "" -#: rest_framework/exceptions.py:94 +#: exceptions.py:93 msgid "Not found." msgstr "" -#: rest_framework/exceptions.py:99 -#, python-format -msgid "Method '%s' not allowed." +#: exceptions.py:98 +msgid "Method {method} not allowed." msgstr "" -#: rest_framework/exceptions.py:110 +#: exceptions.py:109 msgid "Could not satisfy the request Accept header." msgstr "" -#: rest_framework/exceptions.py:122 -#, python-format -msgid "Unsupported media type '%s' in request." +#: exceptions.py:121 +msgid "Unsupported media type '{media_type}' in request." msgstr "" -#: rest_framework/exceptions.py:133 +#: exceptions.py:134 msgid "Request was throttled." msgstr "" -#: rest_framework/exceptions.py:135 -#, python-format -msgid "Expected available in %(wait)d second." -msgid_plural "Expected available in %(wait)d seconds." -msgstr[0] "" -msgstr[1] "" - -#: rest_framework/fields.py:152 rest_framework/relations.py:131 -#: rest_framework/relations.py:155 rest_framework/validators.py:77 -#: rest_framework/validators.py:155 +#: fields.py:152 relations.py:131 relations.py:155 validators.py:77 +#: validators.py:155 msgid "This field is required." msgstr "" -#: rest_framework/fields.py:153 +#: fields.py:153 msgid "This field may not be null." msgstr "" -#: rest_framework/fields.py:480 rest_framework/fields.py:508 +#: fields.py:480 fields.py:508 msgid "`{input}` is not a valid boolean." msgstr "" -#: rest_framework/fields.py:543 +#: fields.py:543 msgid "This field may not be blank." msgstr "" -#: rest_framework/fields.py:544 rest_framework/fields.py:1252 +#: fields.py:544 fields.py:1252 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: rest_framework/fields.py:545 +#: fields.py:545 msgid "Ensure this field has at least {min_length} characters." msgstr "" -#: rest_framework/fields.py:587 +#: fields.py:587 msgid "Enter a valid email address." msgstr "" -#: rest_framework/fields.py:604 +#: fields.py:604 msgid "This value does not match the required pattern." msgstr "" -#: rest_framework/fields.py:615 +#: fields.py:615 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" -#: rest_framework/fields.py:627 +#: fields.py:627 msgid "Enter a valid URL." msgstr "" -#: rest_framework/fields.py:640 +#: fields.py:640 msgid "A valid integer is required." msgstr "" -#: rest_framework/fields.py:641 rest_framework/fields.py:675 -#: rest_framework/fields.py:708 +#: fields.py:641 fields.py:675 fields.py:708 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: rest_framework/fields.py:642 rest_framework/fields.py:676 -#: rest_framework/fields.py:709 +#: fields.py:642 fields.py:676 fields.py:709 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: rest_framework/fields.py:643 rest_framework/fields.py:677 -#: rest_framework/fields.py:713 +#: fields.py:643 fields.py:677 fields.py:713 msgid "String value too large." msgstr "" -#: rest_framework/fields.py:674 rest_framework/fields.py:707 +#: fields.py:674 fields.py:707 msgid "A valid number is required." msgstr "" -#: rest_framework/fields.py:710 +#: fields.py:710 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: rest_framework/fields.py:711 +#: fields.py:711 msgid "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: rest_framework/fields.py:712 +#: fields.py:712 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: rest_framework/fields.py:796 +#: fields.py:796 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: rest_framework/fields.py:797 +#: fields.py:797 msgid "Expected a datetime but got a date." msgstr "" -#: rest_framework/fields.py:861 +#: fields.py:861 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: rest_framework/fields.py:862 +#: fields.py:862 msgid "Expected a date but got a datetime." msgstr "" -#: rest_framework/fields.py:919 +#: fields.py:919 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: rest_framework/fields.py:975 rest_framework/fields.py:1019 +#: fields.py:975 fields.py:1019 msgid "`{input}` is not a valid choice." msgstr "" -#: rest_framework/fields.py:1020 rest_framework/fields.py:1121 -#: rest_framework/serializers.py:476 +#: fields.py:1020 fields.py:1121 serializers.py:476 msgid "Expected a list of items but got type `{input_type}`." msgstr "" -#: rest_framework/fields.py:1050 +#: fields.py:1050 msgid "No file was submitted." msgstr "" -#: rest_framework/fields.py:1051 +#: fields.py:1051 msgid "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: rest_framework/fields.py:1052 +#: fields.py:1052 msgid "No filename could be determined." msgstr "" -#: rest_framework/fields.py:1053 +#: fields.py:1053 msgid "The submitted file is empty." msgstr "" -#: rest_framework/fields.py:1054 +#: fields.py:1054 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: rest_framework/fields.py:1096 +#: fields.py:1096 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: rest_framework/generics.py:122 +#: generics.py:123 msgid "" "Choose a valid page number. Page numbers must be a whole number, or must be " "the string 'last'." msgstr "" -#: rest_framework/generics.py:126 -#, python-format -msgid "Invalid page (%(page_number)s): %(message)s" +#: generics.py:129 +msgid "Invalid page ({page_number}): {message}" msgstr "" -#: rest_framework/relations.py:132 +#: relations.py:132 msgid "Invalid pk '{pk_value}' - object does not exist." msgstr "" -#: rest_framework/relations.py:133 +#: relations.py:133 msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: rest_framework/relations.py:156 +#: relations.py:156 msgid "Invalid hyperlink - No URL match" msgstr "" -#: rest_framework/relations.py:157 +#: relations.py:157 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: rest_framework/relations.py:158 +#: relations.py:158 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: rest_framework/relations.py:159 +#: relations.py:159 msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: rest_framework/relations.py:294 +#: relations.py:294 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: rest_framework/relations.py:295 +#: relations.py:295 msgid "Invalid value." msgstr "" -#: rest_framework/serializers.py:299 +#: serializers.py:299 msgid "Invalid data. Expected a dictionary, but got {datatype}." msgstr "" -#: rest_framework/validators.py:22 +#: validators.py:22 msgid "This field must be unique." msgstr "" -#: rest_framework/validators.py:76 +#: validators.py:76 msgid "The fields {field_names} must make a unique set." msgstr "" -#: rest_framework/validators.py:219 +#: validators.py:219 msgid "This field must be unique for the \"{date_field}\" date." msgstr "" -#: rest_framework/validators.py:234 +#: validators.py:234 msgid "This field must be unique for the \"{date_field}\" month." msgstr "" -#: rest_framework/validators.py:247 +#: validators.py:247 msgid "This field must be unique for the \"{date_field}\" year." msgstr "" -#: rest_framework/versioning.py:39 +#: versioning.py:39 msgid "Invalid version in 'Accept' header." msgstr "" -#: rest_framework/versioning.py:70 rest_framework/versioning.py:112 +#: versioning.py:70 versioning.py:112 msgid "Invalid version in URL path." msgstr "" -#: rest_framework/versioning.py:138 +#: versioning.py:138 msgid "Invalid version in hostname." msgstr "" -#: rest_framework/versioning.py:160 +#: versioning.py:160 msgid "Invalid version in query parameter." msgstr "" From fe5d93c8cbc5f3a9b1b6715208c70f485be68bdf Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 7 Jan 2015 11:44:18 +0000 Subject: [PATCH 1414/1652] remove hardcoded page number --- rest_framework/generics.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index fe92355d9..7c4d5e958 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -122,7 +122,6 @@ class GenericAPIView(views.APIView): else: raise NotFound(_("Choose a valid page number. Page numbers must be a whole number, or must be the string 'last'.")) - page_number = -1 try: page = paginator.page(page_number) except InvalidPage as exc: From 4c32083b8b59a50877633910055313dad7bb117e Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 7 Jan 2015 12:01:11 +0000 Subject: [PATCH 1415/1652] use double quotes for user visible strings; end user visible strings in full stops; add some missing translation tags --- rest_framework/authentication.py | 17 ++++--- rest_framework/authtoken/serializers.py | 6 +-- rest_framework/exceptions.py | 24 ++++----- rest_framework/fields.py | 68 ++++++++++++------------- rest_framework/generics.py | 2 +- rest_framework/relations.py | 16 +++--- rest_framework/serializers.py | 4 +- rest_framework/validators.py | 14 ++--- rest_framework/versioning.py | 8 +-- 9 files changed, 80 insertions(+), 79 deletions(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 124ef68ac..7e86a7b9f 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import base64 from django.contrib.auth import authenticate from django.middleware.csrf import CsrfViewMiddleware +from django.utils.translation import ugettext_lazy as _ from rest_framework import exceptions, HTTP_HEADER_ENCODING from rest_framework.authtoken.models import Token @@ -65,16 +66,16 @@ class BasicAuthentication(BaseAuthentication): return None if len(auth) == 1: - msg = 'Invalid basic header. No credentials provided.' + msg = _("Invalid basic header. No credentials provided.") raise exceptions.AuthenticationFailed(msg) elif len(auth) > 2: - msg = 'Invalid basic header. Credentials string should not contain spaces.' + msg = _("Invalid basic header. Credentials string should not contain spaces.") raise exceptions.AuthenticationFailed(msg) try: auth_parts = base64.b64decode(auth[1]).decode(HTTP_HEADER_ENCODING).partition(':') except (TypeError, UnicodeDecodeError): - msg = 'Invalid basic header. Credentials not correctly base64 encoded' + msg = _("Invalid basic header. Credentials not correctly base64 encoded.") raise exceptions.AuthenticationFailed(msg) userid, password = auth_parts[0], auth_parts[2] @@ -86,7 +87,7 @@ class BasicAuthentication(BaseAuthentication): """ user = authenticate(username=userid, password=password) if user is None or not user.is_active: - raise exceptions.AuthenticationFailed('Invalid username/password') + raise exceptions.AuthenticationFailed(_("Invalid username/password.")) return (user, None) def authenticate_header(self, request): @@ -152,10 +153,10 @@ class TokenAuthentication(BaseAuthentication): return None if len(auth) == 1: - msg = 'Invalid token header. No credentials provided.' + msg = _("Invalid token header. No credentials provided.") raise exceptions.AuthenticationFailed(msg) elif len(auth) > 2: - msg = 'Invalid token header. Token string should not contain spaces.' + msg = _("Invalid token header. Token string should not contain spaces.") raise exceptions.AuthenticationFailed(msg) return self.authenticate_credentials(auth[1]) @@ -164,10 +165,10 @@ class TokenAuthentication(BaseAuthentication): try: token = self.model.objects.get(key=key) except self.model.DoesNotExist: - raise exceptions.AuthenticationFailed('Invalid token') + raise exceptions.AuthenticationFailed(_("Invalid token")) if not token.user.is_active: - raise exceptions.AuthenticationFailed('User inactive or deleted') + raise exceptions.AuthenticationFailed(_("User inactive or deleted")) return (token.user, token) diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py index f31dded17..78fe6a117 100644 --- a/rest_framework/authtoken/serializers.py +++ b/rest_framework/authtoken/serializers.py @@ -17,13 +17,13 @@ class AuthTokenSerializer(serializers.Serializer): if user: if not user.is_active: - msg = _('User account is disabled.') + msg = _("User account is disabled.") raise exceptions.ValidationError(msg) else: - msg = _('Unable to log in with provided credentials.') + msg = _("Unable to log in with provided credentials.") raise exceptions.ValidationError(msg) else: - msg = _('Must include "username" and "password"') + msg = _("Must include \"username\" and \"password\"") raise exceptions.ValidationError(msg) attrs['user'] = user diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index dfc57293e..3ca8e5380 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -35,7 +35,7 @@ class APIException(Exception): Subclasses should provide `.status_code` and `.default_detail` properties. """ status_code = status.HTTP_500_INTERNAL_SERVER_ERROR - default_detail = _('A server error occurred.') + default_detail = _("A server error occurred.") def __init__(self, detail=None): if detail is not None: @@ -52,7 +52,7 @@ class APIException(Exception): # built in `ValidationError`. For example: # # from rest_framework import serializers -# raise serializers.ValidationError('Value was invalid') +# raise serializers.ValidationError("Value was invalid") class ValidationError(APIException): status_code = status.HTTP_400_BAD_REQUEST @@ -70,32 +70,32 @@ class ValidationError(APIException): class ParseError(APIException): status_code = status.HTTP_400_BAD_REQUEST - default_detail = _('Malformed request.') + default_detail = _("Malformed request.") class AuthenticationFailed(APIException): status_code = status.HTTP_401_UNAUTHORIZED - default_detail = _('Incorrect authentication credentials.') + default_detail = _("Incorrect authentication credentials.") class NotAuthenticated(APIException): status_code = status.HTTP_401_UNAUTHORIZED - default_detail = _('Authentication credentials were not provided.') + default_detail = _("Authentication credentials were not provided.") class PermissionDenied(APIException): status_code = status.HTTP_403_FORBIDDEN - default_detail = _('You do not have permission to perform this action.') + default_detail = _("You do not have permission to perform this action.") class NotFound(APIException): status_code = status.HTTP_404_NOT_FOUND - default_detail = _('Not found.') + default_detail = _("Not found.") class MethodNotAllowed(APIException): status_code = status.HTTP_405_METHOD_NOT_ALLOWED - default_detail = _("Method {method} not allowed.") + default_detail = _("Method '{method}' not allowed.") def __init__(self, method, detail=None): if detail is not None: @@ -106,7 +106,7 @@ class MethodNotAllowed(APIException): class NotAcceptable(APIException): status_code = status.HTTP_406_NOT_ACCEPTABLE - default_detail = _('Could not satisfy the request Accept header.') + default_detail = _("Could not satisfy the request Accept header.") def __init__(self, detail=None, available_renderers=None): if detail is not None: @@ -131,9 +131,9 @@ class UnsupportedMediaType(APIException): class Throttled(APIException): status_code = status.HTTP_429_TOO_MANY_REQUESTS - default_detail = _('Request was throttled.') - extra_detail_singular = 'Expected available in {wait} second.' - extra_detail_plural = 'Expected available in {wait} seconds.' + default_detail = _("Request was throttled.") + extra_detail_singular = "Expected available in {wait} second." + extra_detail_plural = "Expected available in {wait} seconds." def __init__(self, wait=None, detail=None): if detail is not None: diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 0ff2b0733..8a781b356 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -149,8 +149,8 @@ class Field(object): _creation_counter = 0 default_error_messages = { - 'required': _('This field is required.'), - 'null': _('This field may not be null.') + 'required': _("This field is required."), + 'null': _("This field may not be null.") } default_validators = [] default_empty_html = empty @@ -477,7 +477,7 @@ class Field(object): class BooleanField(Field): default_error_messages = { - 'invalid': _('`{input}` is not a valid boolean.') + 'invalid': _("`{input}` is not a valid boolean.") } default_empty_html = False initial = False @@ -505,7 +505,7 @@ class BooleanField(Field): class NullBooleanField(Field): default_error_messages = { - 'invalid': _('`{input}` is not a valid boolean.') + 'invalid': _("`{input}` is not a valid boolean.") } initial = None TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True)) @@ -540,9 +540,9 @@ class NullBooleanField(Field): class CharField(Field): default_error_messages = { - 'blank': _('This field may not be blank.'), - 'max_length': _('Ensure this field has no more than {max_length} characters.'), - 'min_length': _('Ensure this field has at least {min_length} characters.') + 'blank': _("This field may not be blank."), + 'max_length': _("Ensure this field has no more than {max_length} characters."), + 'min_length': _("Ensure this field has at least {min_length} characters.") } initial = '' coerce_blank_to_null = False @@ -584,7 +584,7 @@ class CharField(Field): class EmailField(CharField): default_error_messages = { - 'invalid': _('Enter a valid email address.') + 'invalid': _("Enter a valid email address.") } def __init__(self, **kwargs): @@ -601,7 +601,7 @@ class EmailField(CharField): class RegexField(CharField): default_error_messages = { - 'invalid': _('This value does not match the required pattern.') + 'invalid': _("This value does not match the required pattern.") } def __init__(self, regex, **kwargs): @@ -637,10 +637,10 @@ class URLField(CharField): class IntegerField(Field): default_error_messages = { - 'invalid': _('A valid integer is required.'), - 'max_value': _('Ensure this value is less than or equal to {max_value}.'), - 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), - 'max_string_length': _('String value too large.') + 'invalid': _("A valid integer is required."), + 'max_value': _("Ensure this value is less than or equal to {max_value}."), + 'min_value': _("Ensure this value is greater than or equal to {min_value}."), + 'max_string_length': _("String value too large.") } MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. @@ -672,9 +672,9 @@ class IntegerField(Field): class FloatField(Field): default_error_messages = { 'invalid': _("A valid number is required."), - 'max_value': _('Ensure this value is less than or equal to {max_value}.'), - 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), - 'max_string_length': _('String value too large.') + 'max_value': _("Ensure this value is less than or equal to {max_value}."), + 'min_value': _("Ensure this value is greater than or equal to {min_value}."), + 'max_string_length': _("String value too large.") } MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. @@ -704,13 +704,13 @@ class FloatField(Field): class DecimalField(Field): default_error_messages = { - 'invalid': _('A valid number is required.'), - 'max_value': _('Ensure this value is less than or equal to {max_value}.'), - 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), - 'max_digits': _('Ensure that there are no more than {max_digits} digits in total.'), - 'max_decimal_places': _('Ensure that there are no more than {max_decimal_places} decimal places.'), - 'max_whole_digits': _('Ensure that there are no more than {max_whole_digits} digits before the decimal point.'), - 'max_string_length': _('String value too large.') + 'invalid': _("A valid number is required."), + 'max_value': _("Ensure this value is less than or equal to {max_value}."), + 'min_value': _("Ensure this value is greater than or equal to {min_value}."), + 'max_digits': _("Ensure that there are no more than {max_digits} digits in total."), + 'max_decimal_places': _("Ensure that there are no more than {max_decimal_places} decimal places."), + 'max_whole_digits': _("Ensure that there are no more than {max_whole_digits} digits before the decimal point."), + 'max_string_length': _("String value too large.") } MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. @@ -793,8 +793,8 @@ class DecimalField(Field): class DateTimeField(Field): default_error_messages = { - 'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}.'), - 'date': _('Expected a datetime but got a date.'), + 'invalid': _("Datetime has wrong format. Use one of these formats instead: {format}."), + 'date': _("Expected a datetime but got a date."), } format = api_settings.DATETIME_FORMAT input_formats = api_settings.DATETIME_INPUT_FORMATS @@ -858,8 +858,8 @@ class DateTimeField(Field): class DateField(Field): default_error_messages = { - 'invalid': _('Date has wrong format. Use one of these formats instead: {format}.'), - 'datetime': _('Expected a date but got a datetime.'), + 'invalid': _("Date has wrong format. Use one of these formats instead: {format}."), + 'datetime': _("Expected a date but got a datetime."), } format = api_settings.DATE_FORMAT input_formats = api_settings.DATE_INPUT_FORMATS @@ -916,7 +916,7 @@ class DateField(Field): class TimeField(Field): default_error_messages = { - 'invalid': _('Time has wrong format. Use one of these formats instead: {format}.'), + 'invalid': _("Time has wrong format. Use one of these formats instead: {format}."), } format = api_settings.TIME_FORMAT input_formats = api_settings.TIME_INPUT_FORMATS @@ -972,7 +972,7 @@ class TimeField(Field): class ChoiceField(Field): default_error_messages = { - 'invalid_choice': _('`{input}` is not a valid choice.') + 'invalid_choice': _("`{input}` is not a valid choice.") } def __init__(self, choices, **kwargs): @@ -1016,8 +1016,8 @@ class ChoiceField(Field): class MultipleChoiceField(ChoiceField): default_error_messages = { - 'invalid_choice': _('`{input}` is not a valid choice.'), - 'not_a_list': _('Expected a list of items but got type `{input_type}`.') + 'invalid_choice': _("`{input}` is not a valid choice."), + 'not_a_list': _("Expected a list of items but got type `{input_type}`.") } default_empty_html = [] @@ -1051,7 +1051,7 @@ class FileField(Field): 'invalid': _("The submitted data was not a file. Check the encoding type on the form."), 'no_name': _("No filename could be determined."), 'empty': _("The submitted file is empty."), - 'max_length': _('Ensure this filename has at most {max_length} characters (it has {length}).'), + 'max_length': _("Ensure this filename has at most {max_length} characters (it has {length})."), } use_url = api_settings.UPLOADED_FILES_USE_URL @@ -1118,7 +1118,7 @@ class ListField(Field): child = None initial = [] default_error_messages = { - 'not_a_list': _('Expected a list of items but got type `{input_type}`.') + 'not_a_list': _("Expected a list of items but got type `{input_type}`.") } def __init__(self, *args, **kwargs): @@ -1249,7 +1249,7 @@ class ModelField(Field): that do not have a serializer field to be mapped to. """ default_error_messages = { - 'max_length': _('Ensure this field has no more than {max_length} characters.'), + 'max_length': _("Ensure this field has no more than {max_length} characters."), } def __init__(self, model_field, **kwargs): diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 7c4d5e958..c7053d8f3 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -125,7 +125,7 @@ class GenericAPIView(views.APIView): try: page = paginator.page(page_number) except InvalidPage as exc: - error_format = _('Invalid page ({page_number}): {message}') + error_format = _("Invalid page ({page_number}): {message}.") raise NotFound(error_format.format( page_number=page_number, message=six.text_type(exc) )) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 7b119291d..3737b21fa 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -128,9 +128,9 @@ class StringRelatedField(RelatedField): class PrimaryKeyRelatedField(RelatedField): default_error_messages = { - 'required': _('This field is required.'), + 'required': _("This field is required."), 'does_not_exist': _("Invalid pk '{pk_value}' - object does not exist."), - 'incorrect_type': _('Incorrect type. Expected pk value, received {data_type}.'), + 'incorrect_type': _("Incorrect type. Expected pk value, received {data_type}."), } def use_pk_only_optimization(self): @@ -152,11 +152,11 @@ class HyperlinkedRelatedField(RelatedField): lookup_field = 'pk' default_error_messages = { - 'required': _('This field is required.'), - 'no_match': _('Invalid hyperlink - No URL match'), - 'incorrect_match': _('Invalid hyperlink - Incorrect URL match.'), - 'does_not_exist': _('Invalid hyperlink - Object does not exist.'), - 'incorrect_type': _('Incorrect type. Expected URL string, received {data_type}.'), + 'required': _("This field is required."), + 'no_match': _("Invalid hyperlink - No URL match."), + 'incorrect_match': _("Invalid hyperlink - Incorrect URL match."), + 'does_not_exist': _("Invalid hyperlink - Object does not exist."), + 'incorrect_type': _("Incorrect type. Expected URL string, received {data_type}."), } def __init__(self, view_name=None, **kwargs): @@ -292,7 +292,7 @@ class SlugRelatedField(RelatedField): default_error_messages = { 'does_not_exist': _("Object with {slug_name}={value} does not exist."), - 'invalid': _('Invalid value.'), + 'invalid': _("Invalid value."), } def __init__(self, slug_field=None, **kwargs): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 623ed5865..9d7c8884a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -296,7 +296,7 @@ def get_validation_error_detail(exc): @six.add_metaclass(SerializerMetaclass) class Serializer(BaseSerializer): default_error_messages = { - 'invalid': _('Invalid data. Expected a dictionary, but got {datatype}.') + 'invalid': _("Invalid data. Expected a dictionary, but got {datatype}.") } @property @@ -473,7 +473,7 @@ class ListSerializer(BaseSerializer): many = True default_error_messages = { - 'not_a_list': _('Expected a list of items but got type `{input_type}`.') + 'not_a_list': _("Expected a list of items but got type `{input_type}`.") } def __init__(self, *args, **kwargs): diff --git a/rest_framework/validators.py b/rest_framework/validators.py index e3719b8d5..cf6f07180 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -19,7 +19,7 @@ class UniqueValidator: Should be applied to an individual field on the serializer. """ - message = _('This field must be unique.') + message = _("This field must be unique.") def __init__(self, queryset, message=None): self.queryset = queryset @@ -73,8 +73,8 @@ class UniqueTogetherValidator: Should be applied to the serializer class, not to an individual field. """ - message = _('The fields {field_names} must make a unique set.') - missing_message = _('This field is required.') + message = _("The fields {field_names} must make a unique set.") + missing_message = _("This field is required.") def __init__(self, queryset, fields, message=None): self.queryset = queryset @@ -152,7 +152,7 @@ class UniqueTogetherValidator: class BaseUniqueForValidator: message = None - missing_message = _('This field is required.') + missing_message = _("This field is required.") def __init__(self, queryset, field, date_field, message=None): self.queryset = queryset @@ -216,7 +216,7 @@ class BaseUniqueForValidator: class UniqueForDateValidator(BaseUniqueForValidator): - message = _('This field must be unique for the "{date_field}" date.') + message = _("This field must be unique for the \"{date_field}\" date.") def filter_queryset(self, attrs, queryset): value = attrs[self.field] @@ -231,7 +231,7 @@ class UniqueForDateValidator(BaseUniqueForValidator): class UniqueForMonthValidator(BaseUniqueForValidator): - message = _('This field must be unique for the "{date_field}" month.') + message = _("This field must be unique for the \"{date_field}\" month.") def filter_queryset(self, attrs, queryset): value = attrs[self.field] @@ -244,7 +244,7 @@ class UniqueForMonthValidator(BaseUniqueForValidator): class UniqueForYearValidator(BaseUniqueForValidator): - message = _('This field must be unique for the "{date_field}" year.') + message = _("This field must be unique for the \"{date_field}\" year.") def filter_queryset(self, attrs, queryset): value = attrs[self.field] diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index 440efd139..587ba9f13 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -67,7 +67,7 @@ class URLPathVersioning(BaseVersioning): Host: example.com Accept: application/json """ - invalid_version_message = _('Invalid version in URL path.') + invalid_version_message = _("Invalid version in URL path.") def determine_version(self, request, *args, **kwargs): version = kwargs.get(self.version_param, self.default_version) @@ -109,7 +109,7 @@ class NamespaceVersioning(BaseVersioning): Host: example.com Accept: application/json """ - invalid_version_message = _('Invalid version in URL path.') + invalid_version_message = _("Invalid version in URL path.") def determine_version(self, request, *args, **kwargs): resolver_match = getattr(request, 'resolver_match', None) @@ -135,7 +135,7 @@ class HostNameVersioning(BaseVersioning): Accept: application/json """ hostname_regex = re.compile(r'^([a-zA-Z0-9]+)\.[a-zA-Z0-9]+\.[a-zA-Z0-9]+$') - invalid_version_message = _('Invalid version in hostname.') + invalid_version_message = _("Invalid version in hostname.") def determine_version(self, request, *args, **kwargs): hostname, seperator, port = request.get_host().partition(':') @@ -157,7 +157,7 @@ class QueryParameterVersioning(BaseVersioning): Host: example.com Accept: application/json """ - invalid_version_message = _('Invalid version in query parameter.') + invalid_version_message = _("Invalid version in query parameter.") def determine_version(self, request, *args, **kwargs): version = request.query_params.get(self.version_param) From 662a907bdf821c29b42b60ce2b44eb8149a85bd7 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 7 Jan 2015 12:02:04 +0000 Subject: [PATCH 1416/1652] update source strings --- .../locale/en_US/LC_MESSAGES/django.po | 42 ++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index 7c5a6c02b..5d0d3a045 100644 --- a/rest_framework/locale/en_US/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-07 11:40+0000\n" +"POT-Creation-Date: 2015-01-07 11:58+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,6 +17,38 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "" + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:168 +msgid "Invalid token" +msgstr "" + +#: authentication.py:171 +msgid "User inactive or deleted" +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" @@ -54,7 +86,7 @@ msgid "Not found." msgstr "" #: exceptions.py:98 -msgid "Method {method} not allowed." +msgid "Method '{method}' not allowed." msgstr "" #: exceptions.py:109 @@ -206,8 +238,8 @@ msgid "" "the string 'last'." msgstr "" -#: generics.py:129 -msgid "Invalid page ({page_number}): {message}" +#: generics.py:128 +msgid "Invalid page ({page_number}): {message}." msgstr "" #: relations.py:132 @@ -219,7 +251,7 @@ msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" #: relations.py:156 -msgid "Invalid hyperlink - No URL match" +msgid "Invalid hyperlink - No URL match." msgstr "" #: relations.py:157 From 9a4267049ba37883e3e0c21b5d453b9551343b8d Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 7 Jan 2015 12:33:37 +0000 Subject: [PATCH 1417/1652] use double quotes in user messages --- rest_framework/exceptions.py | 4 ++-- rest_framework/fields.py | 2 +- rest_framework/generics.py | 4 ++-- rest_framework/relations.py | 2 +- rest_framework/versioning.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index 3ca8e5380..f8a43871b 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -95,7 +95,7 @@ class NotFound(APIException): class MethodNotAllowed(APIException): status_code = status.HTTP_405_METHOD_NOT_ALLOWED - default_detail = _("Method '{method}' not allowed.") + default_detail = _("Method \"{method}\" not allowed.") def __init__(self, method, detail=None): if detail is not None: @@ -118,7 +118,7 @@ class NotAcceptable(APIException): class UnsupportedMediaType(APIException): status_code = status.HTTP_415_UNSUPPORTED_MEDIA_TYPE - default_detail = _("Unsupported media type '{media_type}' in request.") + default_detail = _("Unsupported media type \"{media_type}\" in request.") def __init__(self, media_type, detail=None): if detail is not None: diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 8a781b356..279446088 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -612,7 +612,7 @@ class RegexField(CharField): class SlugField(CharField): default_error_messages = { - 'invalid': _("Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.") + 'invalid': _("Enter a valid \"slug\" consisting of letters, numbers, underscores or hyphens.") } def __init__(self, **kwargs): diff --git a/rest_framework/generics.py b/rest_framework/generics.py index c7053d8f3..738ba544a 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -120,12 +120,12 @@ class GenericAPIView(views.APIView): if page == 'last': page_number = paginator.num_pages else: - raise NotFound(_("Choose a valid page number. Page numbers must be a whole number, or must be the string 'last'.")) + raise NotFound(_("Choose a valid page number. Page numbers must be a whole number, or must be the string \"last\".")) try: page = paginator.page(page_number) except InvalidPage as exc: - error_format = _("Invalid page ({page_number}): {message}.") + error_format = _("Invalid page \"{page_number}\": {message}.") raise NotFound(error_format.format( page_number=page_number, message=six.text_type(exc) )) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 3737b21fa..42b624e7d 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -129,7 +129,7 @@ class StringRelatedField(RelatedField): class PrimaryKeyRelatedField(RelatedField): default_error_messages = { 'required': _("This field is required."), - 'does_not_exist': _("Invalid pk '{pk_value}' - object does not exist."), + 'does_not_exist': _("Invalid pk \"{pk_value}\" - object does not exist."), 'incorrect_type': _("Incorrect type. Expected pk value, received {data_type}."), } diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index 587ba9f13..819c32df8 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -36,7 +36,7 @@ class AcceptHeaderVersioning(BaseVersioning): Host: example.com Accept: application/json; version=1.0 """ - invalid_version_message = _("Invalid version in 'Accept' header.") + invalid_version_message = _("Invalid version in \"Accept\" header.") def determine_version(self, request, *args, **kwargs): media_type = _MediaType(request.accepted_media_type) From 91e316f7810157474d6246cd0024bd7f7cc31ff7 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 7 Jan 2015 12:46:23 +0000 Subject: [PATCH 1418/1652] prefer single quotes in source and double quotes in user visible strings; add some missing full stops to user visible strings --- rest_framework/authentication.py | 16 ++-- rest_framework/authtoken/serializers.py | 6 +- rest_framework/exceptions.py | 24 +++--- rest_framework/fields.py | 82 +++++++++---------- rest_framework/generics.py | 4 +- .../locale/en_US/LC_MESSAGES/django.po | 23 +++--- rest_framework/relations.py | 20 ++--- rest_framework/serializers.py | 4 +- rest_framework/validators.py | 14 ++-- rest_framework/versioning.py | 10 +-- tests/test_fields.py | 2 +- tests/test_generics.py | 6 +- tests/test_relations.py | 2 +- 13 files changed, 107 insertions(+), 106 deletions(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 7e86a7b9f..11db05855 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -66,16 +66,16 @@ class BasicAuthentication(BaseAuthentication): return None if len(auth) == 1: - msg = _("Invalid basic header. No credentials provided.") + msg = _('Invalid basic header. No credentials provided.') raise exceptions.AuthenticationFailed(msg) elif len(auth) > 2: - msg = _("Invalid basic header. Credentials string should not contain spaces.") + msg = _('Invalid basic header. Credentials string should not contain spaces.') raise exceptions.AuthenticationFailed(msg) try: auth_parts = base64.b64decode(auth[1]).decode(HTTP_HEADER_ENCODING).partition(':') except (TypeError, UnicodeDecodeError): - msg = _("Invalid basic header. Credentials not correctly base64 encoded.") + msg = _('Invalid basic header. Credentials not correctly base64 encoded.') raise exceptions.AuthenticationFailed(msg) userid, password = auth_parts[0], auth_parts[2] @@ -87,7 +87,7 @@ class BasicAuthentication(BaseAuthentication): """ user = authenticate(username=userid, password=password) if user is None or not user.is_active: - raise exceptions.AuthenticationFailed(_("Invalid username/password.")) + raise exceptions.AuthenticationFailed(_('Invalid username/password.')) return (user, None) def authenticate_header(self, request): @@ -153,10 +153,10 @@ class TokenAuthentication(BaseAuthentication): return None if len(auth) == 1: - msg = _("Invalid token header. No credentials provided.") + msg = _('Invalid token header. No credentials provided.') raise exceptions.AuthenticationFailed(msg) elif len(auth) > 2: - msg = _("Invalid token header. Token string should not contain spaces.") + msg = _('Invalid token header. Token string should not contain spaces.') raise exceptions.AuthenticationFailed(msg) return self.authenticate_credentials(auth[1]) @@ -165,10 +165,10 @@ class TokenAuthentication(BaseAuthentication): try: token = self.model.objects.get(key=key) except self.model.DoesNotExist: - raise exceptions.AuthenticationFailed(_("Invalid token")) + raise exceptions.AuthenticationFailed(_('Invalid token.')) if not token.user.is_active: - raise exceptions.AuthenticationFailed(_("User inactive or deleted")) + raise exceptions.AuthenticationFailed(_('User inactive or deleted.')) return (token.user, token) diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py index 78fe6a117..37ade255d 100644 --- a/rest_framework/authtoken/serializers.py +++ b/rest_framework/authtoken/serializers.py @@ -17,13 +17,13 @@ class AuthTokenSerializer(serializers.Serializer): if user: if not user.is_active: - msg = _("User account is disabled.") + msg = _('User account is disabled.') raise exceptions.ValidationError(msg) else: - msg = _("Unable to log in with provided credentials.") + msg = _('Unable to log in with provided credentials.') raise exceptions.ValidationError(msg) else: - msg = _("Must include \"username\" and \"password\"") + msg = _('Must include "username" and "password".') raise exceptions.ValidationError(msg) attrs['user'] = user diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index f8a43871b..f62c9fe39 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -35,7 +35,7 @@ class APIException(Exception): Subclasses should provide `.status_code` and `.default_detail` properties. """ status_code = status.HTTP_500_INTERNAL_SERVER_ERROR - default_detail = _("A server error occurred.") + default_detail = _('A server error occurred.') def __init__(self, detail=None): if detail is not None: @@ -70,32 +70,32 @@ class ValidationError(APIException): class ParseError(APIException): status_code = status.HTTP_400_BAD_REQUEST - default_detail = _("Malformed request.") + default_detail = _('Malformed request.') class AuthenticationFailed(APIException): status_code = status.HTTP_401_UNAUTHORIZED - default_detail = _("Incorrect authentication credentials.") + default_detail = _('Incorrect authentication credentials.') class NotAuthenticated(APIException): status_code = status.HTTP_401_UNAUTHORIZED - default_detail = _("Authentication credentials were not provided.") + default_detail = _('Authentication credentials were not provided.') class PermissionDenied(APIException): status_code = status.HTTP_403_FORBIDDEN - default_detail = _("You do not have permission to perform this action.") + default_detail = _('You do not have permission to perform this action.') class NotFound(APIException): status_code = status.HTTP_404_NOT_FOUND - default_detail = _("Not found.") + default_detail = _('Not found.') class MethodNotAllowed(APIException): status_code = status.HTTP_405_METHOD_NOT_ALLOWED - default_detail = _("Method \"{method}\" not allowed.") + default_detail = _('Method "{method}" not allowed.') def __init__(self, method, detail=None): if detail is not None: @@ -106,7 +106,7 @@ class MethodNotAllowed(APIException): class NotAcceptable(APIException): status_code = status.HTTP_406_NOT_ACCEPTABLE - default_detail = _("Could not satisfy the request Accept header.") + default_detail = _('Could not satisfy the request Accept header.') def __init__(self, detail=None, available_renderers=None): if detail is not None: @@ -118,7 +118,7 @@ class NotAcceptable(APIException): class UnsupportedMediaType(APIException): status_code = status.HTTP_415_UNSUPPORTED_MEDIA_TYPE - default_detail = _("Unsupported media type \"{media_type}\" in request.") + default_detail = _('Unsupported media type "{media_type}" in request.') def __init__(self, media_type, detail=None): if detail is not None: @@ -131,9 +131,9 @@ class UnsupportedMediaType(APIException): class Throttled(APIException): status_code = status.HTTP_429_TOO_MANY_REQUESTS - default_detail = _("Request was throttled.") - extra_detail_singular = "Expected available in {wait} second." - extra_detail_plural = "Expected available in {wait} seconds." + default_detail = _('Request was throttled.') + extra_detail_singular = 'Expected available in {wait} second.' + extra_detail_plural = 'Expected available in {wait} seconds.' def __init__(self, wait=None, detail=None): if detail is not None: diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 279446088..76101608e 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -149,8 +149,8 @@ class Field(object): _creation_counter = 0 default_error_messages = { - 'required': _("This field is required."), - 'null': _("This field may not be null.") + 'required': _('This field is required.'), + 'null': _('This field may not be null.') } default_validators = [] default_empty_html = empty @@ -477,7 +477,7 @@ class Field(object): class BooleanField(Field): default_error_messages = { - 'invalid': _("`{input}` is not a valid boolean.") + 'invalid': _('`{input}` is not a valid boolean.') } default_empty_html = False initial = False @@ -505,7 +505,7 @@ class BooleanField(Field): class NullBooleanField(Field): default_error_messages = { - 'invalid': _("`{input}` is not a valid boolean.") + 'invalid': _('`{input}` is not a valid boolean.') } initial = None TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True)) @@ -540,9 +540,9 @@ class NullBooleanField(Field): class CharField(Field): default_error_messages = { - 'blank': _("This field may not be blank."), - 'max_length': _("Ensure this field has no more than {max_length} characters."), - 'min_length': _("Ensure this field has at least {min_length} characters.") + 'blank': _('This field may not be blank.'), + 'max_length': _('Ensure this field has no more than {max_length} characters.'), + 'min_length': _('Ensure this field has at least {min_length} characters.') } initial = '' coerce_blank_to_null = False @@ -584,7 +584,7 @@ class CharField(Field): class EmailField(CharField): default_error_messages = { - 'invalid': _("Enter a valid email address.") + 'invalid': _('Enter a valid email address.') } def __init__(self, **kwargs): @@ -601,7 +601,7 @@ class EmailField(CharField): class RegexField(CharField): default_error_messages = { - 'invalid': _("This value does not match the required pattern.") + 'invalid': _('This value does not match the required pattern.') } def __init__(self, regex, **kwargs): @@ -612,7 +612,7 @@ class RegexField(CharField): class SlugField(CharField): default_error_messages = { - 'invalid': _("Enter a valid \"slug\" consisting of letters, numbers, underscores or hyphens.") + 'invalid': _('Enter a valid "slug" consisting of letters, numbers, underscores or hyphens.') } def __init__(self, **kwargs): @@ -624,7 +624,7 @@ class SlugField(CharField): class URLField(CharField): default_error_messages = { - 'invalid': _("Enter a valid URL.") + 'invalid': _('Enter a valid URL.') } def __init__(self, **kwargs): @@ -637,10 +637,10 @@ class URLField(CharField): class IntegerField(Field): default_error_messages = { - 'invalid': _("A valid integer is required."), - 'max_value': _("Ensure this value is less than or equal to {max_value}."), - 'min_value': _("Ensure this value is greater than or equal to {min_value}."), - 'max_string_length': _("String value too large.") + 'invalid': _('A valid integer is required.'), + 'max_value': _('Ensure this value is less than or equal to {max_value}.'), + 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), + 'max_string_length': _('String value too large.') } MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. @@ -671,10 +671,10 @@ class IntegerField(Field): class FloatField(Field): default_error_messages = { - 'invalid': _("A valid number is required."), - 'max_value': _("Ensure this value is less than or equal to {max_value}."), - 'min_value': _("Ensure this value is greater than or equal to {min_value}."), - 'max_string_length': _("String value too large.") + 'invalid': _('A valid number is required.'), + 'max_value': _('Ensure this value is less than or equal to {max_value}.'), + 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), + 'max_string_length': _('String value too large.') } MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. @@ -704,13 +704,13 @@ class FloatField(Field): class DecimalField(Field): default_error_messages = { - 'invalid': _("A valid number is required."), - 'max_value': _("Ensure this value is less than or equal to {max_value}."), - 'min_value': _("Ensure this value is greater than or equal to {min_value}."), - 'max_digits': _("Ensure that there are no more than {max_digits} digits in total."), - 'max_decimal_places': _("Ensure that there are no more than {max_decimal_places} decimal places."), - 'max_whole_digits': _("Ensure that there are no more than {max_whole_digits} digits before the decimal point."), - 'max_string_length': _("String value too large.") + 'invalid': _('A valid number is required.'), + 'max_value': _('Ensure this value is less than or equal to {max_value}.'), + 'min_value': _('Ensure this value is greater than or equal to {min_value}.'), + 'max_digits': _('Ensure that there are no more than {max_digits} digits in total.'), + 'max_decimal_places': _('Ensure that there are no more than {max_decimal_places} decimal places.'), + 'max_whole_digits': _('Ensure that there are no more than {max_whole_digits} digits before the decimal point.'), + 'max_string_length': _('String value too large.') } MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. @@ -793,8 +793,8 @@ class DecimalField(Field): class DateTimeField(Field): default_error_messages = { - 'invalid': _("Datetime has wrong format. Use one of these formats instead: {format}."), - 'date': _("Expected a datetime but got a date."), + 'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}.'), + 'date': _('Expected a datetime but got a date.'), } format = api_settings.DATETIME_FORMAT input_formats = api_settings.DATETIME_INPUT_FORMATS @@ -858,8 +858,8 @@ class DateTimeField(Field): class DateField(Field): default_error_messages = { - 'invalid': _("Date has wrong format. Use one of these formats instead: {format}."), - 'datetime': _("Expected a date but got a datetime."), + 'invalid': _('Date has wrong format. Use one of these formats instead: {format}.'), + 'datetime': _('Expected a date but got a datetime.'), } format = api_settings.DATE_FORMAT input_formats = api_settings.DATE_INPUT_FORMATS @@ -916,7 +916,7 @@ class DateField(Field): class TimeField(Field): default_error_messages = { - 'invalid': _("Time has wrong format. Use one of these formats instead: {format}."), + 'invalid': _('Time has wrong format. Use one of these formats instead: {format}.'), } format = api_settings.TIME_FORMAT input_formats = api_settings.TIME_INPUT_FORMATS @@ -972,7 +972,7 @@ class TimeField(Field): class ChoiceField(Field): default_error_messages = { - 'invalid_choice': _("`{input}` is not a valid choice.") + 'invalid_choice': _('`{input}` is not a valid choice.') } def __init__(self, choices, **kwargs): @@ -1016,8 +1016,8 @@ class ChoiceField(Field): class MultipleChoiceField(ChoiceField): default_error_messages = { - 'invalid_choice': _("`{input}` is not a valid choice."), - 'not_a_list': _("Expected a list of items but got type `{input_type}`.") + 'invalid_choice': _('`{input}` is not a valid choice.'), + 'not_a_list': _('Expected a list of items but got type `{input_type}`.') } default_empty_html = [] @@ -1047,11 +1047,11 @@ class MultipleChoiceField(ChoiceField): class FileField(Field): default_error_messages = { - 'required': _("No file was submitted."), - 'invalid': _("The submitted data was not a file. Check the encoding type on the form."), - 'no_name': _("No filename could be determined."), - 'empty': _("The submitted file is empty."), - 'max_length': _("Ensure this filename has at most {max_length} characters (it has {length})."), + 'required': _('No file was submitted.'), + 'invalid': _('The submitted data was not a file. Check the encoding type on the form.'), + 'no_name': _('No filename could be determined.'), + 'empty': _('The submitted file is empty.'), + 'max_length': _('Ensure this filename has at most {max_length} characters (it has {length}).'), } use_url = api_settings.UPLOADED_FILES_USE_URL @@ -1118,7 +1118,7 @@ class ListField(Field): child = None initial = [] default_error_messages = { - 'not_a_list': _("Expected a list of items but got type `{input_type}`.") + 'not_a_list': _('Expected a list of items but got type `{input_type}`.') } def __init__(self, *args, **kwargs): @@ -1249,7 +1249,7 @@ class ModelField(Field): that do not have a serializer field to be mapped to. """ default_error_messages = { - 'max_length': _("Ensure this field has no more than {max_length} characters."), + 'max_length': _('Ensure this field has no more than {max_length} characters.'), } def __init__(self, model_field, **kwargs): diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 738ba544a..7ebed0327 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -120,12 +120,12 @@ class GenericAPIView(views.APIView): if page == 'last': page_number = paginator.num_pages else: - raise NotFound(_("Choose a valid page number. Page numbers must be a whole number, or must be the string \"last\".")) + raise NotFound(_('Choose a valid page number. Page numbers must be a whole number, or must be the string "last".')) try: page = paginator.page(page_number) except InvalidPage as exc: - error_format = _("Invalid page \"{page_number}\": {message}.") + error_format = _('Invalid page "{page_number}": {message}.') raise NotFound(error_format.format( page_number=page_number, message=six.text_type(exc) )) diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index 5d0d3a045..c8fc7f4d7 100644 --- a/rest_framework/locale/en_US/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-07 11:58+0000\n" +"POT-Creation-Date: 2015-01-07 12:28+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -42,11 +42,11 @@ msgid "Invalid token header. Token string should not contain spaces." msgstr "" #: authentication.py:168 -msgid "Invalid token" +msgid "Invalid token." msgstr "" #: authentication.py:171 -msgid "User inactive or deleted" +msgid "User inactive or deleted." msgstr "" #: authtoken/serializers.py:20 @@ -58,7 +58,7 @@ msgid "Unable to log in with provided credentials." msgstr "" #: authtoken/serializers.py:26 -msgid "Must include \"username\" and \"password\"" +msgid "Must include \"username\" and \"password\"." msgstr "" #: exceptions.py:38 @@ -86,7 +86,7 @@ msgid "Not found." msgstr "" #: exceptions.py:98 -msgid "Method '{method}' not allowed." +msgid "Method \"{method}\" not allowed." msgstr "" #: exceptions.py:109 @@ -94,7 +94,7 @@ msgid "Could not satisfy the request Accept header." msgstr "" #: exceptions.py:121 -msgid "Unsupported media type '{media_type}' in request." +msgid "Unsupported media type \"{media_type}\" in request." msgstr "" #: exceptions.py:134 @@ -136,7 +136,8 @@ msgstr "" #: fields.py:615 msgid "" -"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." msgstr "" #: fields.py:627 @@ -235,15 +236,15 @@ msgstr "" #: generics.py:123 msgid "" "Choose a valid page number. Page numbers must be a whole number, or must be " -"the string 'last'." +"the string \"last\"." msgstr "" #: generics.py:128 -msgid "Invalid page ({page_number}): {message}." +msgid "Invalid page \"{page_number}\": {message}." msgstr "" #: relations.py:132 -msgid "Invalid pk '{pk_value}' - object does not exist." +msgid "Invalid pk \"{pk_value}\" - object does not exist." msgstr "" #: relations.py:133 @@ -299,7 +300,7 @@ msgid "This field must be unique for the \"{date_field}\" year." msgstr "" #: versioning.py:39 -msgid "Invalid version in 'Accept' header." +msgid "Invalid version in \"Accept\" header." msgstr "" #: versioning.py:70 versioning.py:112 diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 42b624e7d..05ac3d1c6 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -128,9 +128,9 @@ class StringRelatedField(RelatedField): class PrimaryKeyRelatedField(RelatedField): default_error_messages = { - 'required': _("This field is required."), - 'does_not_exist': _("Invalid pk \"{pk_value}\" - object does not exist."), - 'incorrect_type': _("Incorrect type. Expected pk value, received {data_type}."), + 'required': _('This field is required.'), + 'does_not_exist': _('Invalid pk "{pk_value}" - object does not exist.'), + 'incorrect_type': _('Incorrect type. Expected pk value, received {data_type}.'), } def use_pk_only_optimization(self): @@ -152,11 +152,11 @@ class HyperlinkedRelatedField(RelatedField): lookup_field = 'pk' default_error_messages = { - 'required': _("This field is required."), - 'no_match': _("Invalid hyperlink - No URL match."), - 'incorrect_match': _("Invalid hyperlink - Incorrect URL match."), - 'does_not_exist': _("Invalid hyperlink - Object does not exist."), - 'incorrect_type': _("Incorrect type. Expected URL string, received {data_type}."), + 'required': _('This field is required.'), + 'no_match': _('Invalid hyperlink - No URL match.'), + 'incorrect_match': _('Invalid hyperlink - Incorrect URL match.'), + 'does_not_exist': _('Invalid hyperlink - Object does not exist.'), + 'incorrect_type': _('Incorrect type. Expected URL string, received {data_type}.'), } def __init__(self, view_name=None, **kwargs): @@ -291,8 +291,8 @@ class SlugRelatedField(RelatedField): """ default_error_messages = { - 'does_not_exist': _("Object with {slug_name}={value} does not exist."), - 'invalid': _("Invalid value."), + 'does_not_exist': _('Object with {slug_name}={value} does not exist.'), + 'invalid': _('Invalid value.'), } def __init__(self, slug_field=None, **kwargs): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 9d7c8884a..623ed5865 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -296,7 +296,7 @@ def get_validation_error_detail(exc): @six.add_metaclass(SerializerMetaclass) class Serializer(BaseSerializer): default_error_messages = { - 'invalid': _("Invalid data. Expected a dictionary, but got {datatype}.") + 'invalid': _('Invalid data. Expected a dictionary, but got {datatype}.') } @property @@ -473,7 +473,7 @@ class ListSerializer(BaseSerializer): many = True default_error_messages = { - 'not_a_list': _("Expected a list of items but got type `{input_type}`.") + 'not_a_list': _('Expected a list of items but got type `{input_type}`.') } def __init__(self, *args, **kwargs): diff --git a/rest_framework/validators.py b/rest_framework/validators.py index cf6f07180..e3719b8d5 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -19,7 +19,7 @@ class UniqueValidator: Should be applied to an individual field on the serializer. """ - message = _("This field must be unique.") + message = _('This field must be unique.') def __init__(self, queryset, message=None): self.queryset = queryset @@ -73,8 +73,8 @@ class UniqueTogetherValidator: Should be applied to the serializer class, not to an individual field. """ - message = _("The fields {field_names} must make a unique set.") - missing_message = _("This field is required.") + message = _('The fields {field_names} must make a unique set.') + missing_message = _('This field is required.') def __init__(self, queryset, fields, message=None): self.queryset = queryset @@ -152,7 +152,7 @@ class UniqueTogetherValidator: class BaseUniqueForValidator: message = None - missing_message = _("This field is required.") + missing_message = _('This field is required.') def __init__(self, queryset, field, date_field, message=None): self.queryset = queryset @@ -216,7 +216,7 @@ class BaseUniqueForValidator: class UniqueForDateValidator(BaseUniqueForValidator): - message = _("This field must be unique for the \"{date_field}\" date.") + message = _('This field must be unique for the "{date_field}" date.') def filter_queryset(self, attrs, queryset): value = attrs[self.field] @@ -231,7 +231,7 @@ class UniqueForDateValidator(BaseUniqueForValidator): class UniqueForMonthValidator(BaseUniqueForValidator): - message = _("This field must be unique for the \"{date_field}\" month.") + message = _('This field must be unique for the "{date_field}" month.') def filter_queryset(self, attrs, queryset): value = attrs[self.field] @@ -244,7 +244,7 @@ class UniqueForMonthValidator(BaseUniqueForValidator): class UniqueForYearValidator(BaseUniqueForValidator): - message = _("This field must be unique for the \"{date_field}\" year.") + message = _('This field must be unique for the "{date_field}" year.') def filter_queryset(self, attrs, queryset): value = attrs[self.field] diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index 819c32df8..e31c71e9b 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -36,7 +36,7 @@ class AcceptHeaderVersioning(BaseVersioning): Host: example.com Accept: application/json; version=1.0 """ - invalid_version_message = _("Invalid version in \"Accept\" header.") + invalid_version_message = _('Invalid version in "Accept" header.') def determine_version(self, request, *args, **kwargs): media_type = _MediaType(request.accepted_media_type) @@ -67,7 +67,7 @@ class URLPathVersioning(BaseVersioning): Host: example.com Accept: application/json """ - invalid_version_message = _("Invalid version in URL path.") + invalid_version_message = _('Invalid version in URL path.') def determine_version(self, request, *args, **kwargs): version = kwargs.get(self.version_param, self.default_version) @@ -109,7 +109,7 @@ class NamespaceVersioning(BaseVersioning): Host: example.com Accept: application/json """ - invalid_version_message = _("Invalid version in URL path.") + invalid_version_message = _('Invalid version in URL path.') def determine_version(self, request, *args, **kwargs): resolver_match = getattr(request, 'resolver_match', None) @@ -135,7 +135,7 @@ class HostNameVersioning(BaseVersioning): Accept: application/json """ hostname_regex = re.compile(r'^([a-zA-Z0-9]+)\.[a-zA-Z0-9]+\.[a-zA-Z0-9]+$') - invalid_version_message = _("Invalid version in hostname.") + invalid_version_message = _('Invalid version in hostname.') def determine_version(self, request, *args, **kwargs): hostname, seperator, port = request.get_host().partition(':') @@ -157,7 +157,7 @@ class QueryParameterVersioning(BaseVersioning): Host: example.com Accept: application/json """ - invalid_version_message = _("Invalid version in query parameter.") + invalid_version_message = _('Invalid version in query parameter.') def determine_version(self, request, *args, **kwargs): version = request.query_params.get(self.version_param) diff --git a/tests/test_fields.py b/tests/test_fields.py index 61d39aff6..5ecb98573 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -439,7 +439,7 @@ class TestSlugField(FieldValues): 'slug-99': 'slug-99', } invalid_inputs = { - 'slug 99': ["Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."] + 'slug 99': ['Enter a valid "slug" consisting of letters, numbers, underscores or hyphens.'] } outputs = {} field = serializers.SlugField() diff --git a/tests/test_generics.py b/tests/test_generics.py index 94023c30a..fba8718f5 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -117,7 +117,7 @@ class TestRootView(TestCase): with self.assertNumQueries(0): response = self.view(request).render() self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) - self.assertEqual(response.data, {"detail": "Method 'PUT' not allowed."}) + self.assertEqual(response.data, {"detail": 'Method "PUT" not allowed.'}) def test_delete_root_view(self): """ @@ -127,7 +127,7 @@ class TestRootView(TestCase): with self.assertNumQueries(0): response = self.view(request).render() self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) - self.assertEqual(response.data, {"detail": "Method 'DELETE' not allowed."}) + self.assertEqual(response.data, {"detail": 'Method "DELETE" not allowed.'}) def test_post_cannot_set_id(self): """ @@ -181,7 +181,7 @@ class TestInstanceView(TestCase): with self.assertNumQueries(0): response = self.view(request).render() self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) - self.assertEqual(response.data, {"detail": "Method 'POST' not allowed."}) + self.assertEqual(response.data, {"detail": 'Method "POST" not allowed.'}) def test_put_instance_view(self): """ diff --git a/tests/test_relations.py b/tests/test_relations.py index 62353dc25..08c92242b 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -33,7 +33,7 @@ class TestPrimaryKeyRelatedField(APISimpleTestCase): with pytest.raises(serializers.ValidationError) as excinfo: self.field.to_internal_value(4) msg = excinfo.value.detail[0] - assert msg == "Invalid pk '4' - object does not exist." + assert msg == 'Invalid pk "4" - object does not exist.' def test_pk_related_lookup_invalid_type(self): with pytest.raises(serializers.ValidationError) as excinfo: From 42f1932b520a90ae6f8e11246a0992e5f8983bd7 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Wed, 7 Jan 2015 19:10:22 +0100 Subject: [PATCH 1419/1652] Release notes for 3.0.3 --- docs/topics/release-notes.md | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index b9216e36f..18a47b71b 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,26 @@ You can determine your currently installed version using `pip freeze`: ## 3.0.x series + +### 3.0.3 + +**Date**: [8th January 2015][3.0.3-milestone]. + +* Fix `MinValueValidator` on `models.DateField`. ([#2369][gh2369]) +* Fix serializer missing context when pagination is used. ([#2355][gh2355]) +* Namespaced router URLs are now supported by the `DefaultRouter`. ([#2351][gh2351]) +* `required=False` allows omission of value for output. ([#2342][gh2342]) +* Use textarea input for `models.TextField`. ([#2340][gh2340]) +* Use custom `ListSerializer` for pagination if required. ([#2331][gh2331], [#2327][gh2327]) +* Better behavior with null and '' for blank HTML fields. ([#2330][gh2330]) +* Ensure fields in `exclude` are model fields. ([#2319][gh2319]) +* Fix `IntegerField` and `max_length` argument incompatibility. ([#2317][gh2317]) +* Fix the YAML encoder for 3.0 serializers. ([#2315][gh2315], [#2283][gh2283]) +* Fix the behavior of empty HTML fields. ([#2311][gh2311], [#1101][gh1101]) +* Fix Metaclass attribute depth ignoring fields attribute. ([#2287][gh2287]) +* Fix `format_suffix_patterns` to work with Django's `i18n_patterns`. ([#2278][gh2278]) +* Ability to customize router URLs for custom actions, using `url_path`. ([#2010][gh2010]) + ### 3.0.2 **Date**: [17th December 2014][3.0.2-milestone]. @@ -729,3 +749,21 @@ For older release notes, [please see the GitHub repo](old-release-notes). [gh2290]: https://github.com/tomchristie/django-rest-framework/issues/2290 [gh2291]: https://github.com/tomchristie/django-rest-framework/issues/2291 [gh2294]: https://github.com/tomchristie/django-rest-framework/issues/2294 +<!-- 3.0.3 --> +[gh1101]: https://github.com/tomchristie/django-rest-framework/issues/1101 +[gh2010]: https://github.com/tomchristie/django-rest-framework/issues/2010 +[gh2278]: https://github.com/tomchristie/django-rest-framework/issues/2278 +[gh2283]: https://github.com/tomchristie/django-rest-framework/issues/2283 +[gh2287]: https://github.com/tomchristie/django-rest-framework/issues/2287 +[gh2311]: https://github.com/tomchristie/django-rest-framework/issues/2311 +[gh2315]: https://github.com/tomchristie/django-rest-framework/issues/2315 +[gh2317]: https://github.com/tomchristie/django-rest-framework/issues/2317 +[gh2319]: https://github.com/tomchristie/django-rest-framework/issues/2319 +[gh2327]: https://github.com/tomchristie/django-rest-framework/issues/2327 +[gh2330]: https://github.com/tomchristie/django-rest-framework/issues/2330 +[gh2331]: https://github.com/tomchristie/django-rest-framework/issues/2331 +[gh2340]: https://github.com/tomchristie/django-rest-framework/issues/2340 +[gh2342]: https://github.com/tomchristie/django-rest-framework/issues/2342 +[gh2351]: https://github.com/tomchristie/django-rest-framework/issues/2351 +[gh2355]: https://github.com/tomchristie/django-rest-framework/issues/2355 +[gh2369]: https://github.com/tomchristie/django-rest-framework/issues/2369 From b7015ea8989d67617d276829ccb6a192362ee01f Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Wed, 7 Jan 2015 19:11:17 +0100 Subject: [PATCH 1420/1652] Bumped the version to 3.0.3. --- rest_framework/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index dec89b3e9..fdcebb7b7 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.0.2' +__version__ = '3.0.3' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2015 Tom Christie' From 60f5b5d9f364c383662fb6ae8d210f31e9621c09 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Wed, 7 Jan 2015 19:19:33 +0100 Subject: [PATCH 1421/1652] Make Django REST Framework as zip unsafe. --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 1e54836c1..efe39d8d4 100755 --- a/setup.py +++ b/setup.py @@ -67,6 +67,7 @@ setup( packages=get_packages('rest_framework'), package_data=get_package_data('rest_framework'), install_requires=[], + zip_safe=False, classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', From 58ec7669aed9ebd58fd6095c6a6437bf9f3cf7f1 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 7 Jan 2015 18:22:30 +0000 Subject: [PATCH 1422/1652] swap backticks for double quotes --- rest_framework/exceptions.py | 2 +- rest_framework/fields.py | 12 ++++++------ rest_framework/locale/en_US/LC_MESSAGES/django.po | 8 ++++---- rest_framework/serializers.py | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index f62c9fe39..f954c13e5 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -52,7 +52,7 @@ class APIException(Exception): # built in `ValidationError`. For example: # # from rest_framework import serializers -# raise serializers.ValidationError("Value was invalid") +# raise serializers.ValidationError('Value was invalid') class ValidationError(APIException): status_code = status.HTTP_400_BAD_REQUEST diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 76101608e..b80dea603 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -477,7 +477,7 @@ class Field(object): class BooleanField(Field): default_error_messages = { - 'invalid': _('`{input}` is not a valid boolean.') + 'invalid': _('"{input}" is not a valid boolean.') } default_empty_html = False initial = False @@ -505,7 +505,7 @@ class BooleanField(Field): class NullBooleanField(Field): default_error_messages = { - 'invalid': _('`{input}` is not a valid boolean.') + 'invalid': _('"{input}" is not a valid boolean.') } initial = None TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True)) @@ -972,7 +972,7 @@ class TimeField(Field): class ChoiceField(Field): default_error_messages = { - 'invalid_choice': _('`{input}` is not a valid choice.') + 'invalid_choice': _('"{input}" is not a valid choice.') } def __init__(self, choices, **kwargs): @@ -1016,8 +1016,8 @@ class ChoiceField(Field): class MultipleChoiceField(ChoiceField): default_error_messages = { - 'invalid_choice': _('`{input}` is not a valid choice.'), - 'not_a_list': _('Expected a list of items but got type `{input_type}`.') + 'invalid_choice': _('"{input}" is not a valid choice.'), + 'not_a_list': _('Expected a list of items but got type "{input_type}".') } default_empty_html = [] @@ -1118,7 +1118,7 @@ class ListField(Field): child = None initial = [] default_error_messages = { - 'not_a_list': _('Expected a list of items but got type `{input_type}`.') + 'not_a_list': _('Expected a list of items but got type "{input_type}".') } def __init__(self, *args, **kwargs): diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index c8fc7f4d7..d98225ce9 100644 --- a/rest_framework/locale/en_US/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-07 12:28+0000\n" +"POT-Creation-Date: 2015-01-07 18:21+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -111,7 +111,7 @@ msgid "This field may not be null." msgstr "" #: fields.py:480 fields.py:508 -msgid "`{input}` is not a valid boolean." +msgid "\"{input}\" is not a valid boolean." msgstr "" #: fields.py:543 @@ -199,11 +199,11 @@ msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" #: fields.py:975 fields.py:1019 -msgid "`{input}` is not a valid choice." +msgid "\"{input}\" is not a valid choice." msgstr "" #: fields.py:1020 fields.py:1121 serializers.py:476 -msgid "Expected a list of items but got type `{input_type}`." +msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" #: fields.py:1050 diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 623ed5865..5bfbd2351 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -473,7 +473,7 @@ class ListSerializer(BaseSerializer): many = True default_error_messages = { - 'not_a_list': _('Expected a list of items but got type `{input_type}`.') + 'not_a_list': _('Expected a list of items but got type "{input_type}".') } def __init__(self, *args, **kwargs): From 734f8f26678d3bd28f04bc44b0fabd146b97ddb0 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Wed, 7 Jan 2015 18:22:40 +0000 Subject: [PATCH 1423/1652] restore Django 404 --- rest_framework/generics.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 7ebed0327..d52f2b6c0 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -120,13 +120,13 @@ class GenericAPIView(views.APIView): if page == 'last': page_number = paginator.num_pages else: - raise NotFound(_('Choose a valid page number. Page numbers must be a whole number, or must be the string "last".')) + raise Http404(_('Choose a valid page number. Page numbers must be a whole number, or must be the string "last".')) try: page = paginator.page(page_number) except InvalidPage as exc: error_format = _('Invalid page "{page_number}": {message}.') - raise NotFound(error_format.format( + raise Http404(error_format.format( page_number=page_number, message=six.text_type(exc) )) From 1102e22cb407b9069ce3301bd578ba45a775a89e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 7 Jan 2015 21:02:42 +0000 Subject: [PATCH 1424/1652] Update project-management.md --- docs/topics/project-management.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/topics/project-management.md b/docs/topics/project-management.md index f581cabd3..037b71827 100644 --- a/docs/topics/project-management.md +++ b/docs/topics/project-management.md @@ -58,6 +58,8 @@ The following template should be used for the description of the issue, and serv #### New members. If you wish to be considered for this or a future date, please comment against this or subsequent issues. + + To modify this process for future releases make a pull request to the [project management](http://www.django-rest-framework.org/topics/project-management/) documentation. #### Responsibilities of team members @@ -107,6 +109,8 @@ The following template should be used for the description of the issue, and serv - [ ] Make a release announcement on the [discussion group](https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework). - [ ] Make a release announcement on twitter. - [ ] Close the milestone on GitHub. + + To modify this process for future releases make a pull request to the [project management](http://www.django-rest-framework.org/topics/project-management/) documentation. When pushing the release to PyPI ensure that your environment has been installed from our development `requirement.txt`, so that documentation and PyPI installs are consistently being built against a pinned set of packages. From 18cefad3abfa6e6a7bbd278e8d54eef66a1d1e53 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 7 Jan 2015 21:03:50 +0000 Subject: [PATCH 1425/1652] Update project-management.md --- docs/topics/project-management.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/project-management.md b/docs/topics/project-management.md index 037b71827..bcc0330e5 100644 --- a/docs/topics/project-management.md +++ b/docs/topics/project-management.md @@ -59,7 +59,7 @@ The following template should be used for the description of the issue, and serv If you wish to be considered for this or a future date, please comment against this or subsequent issues. - To modify this process for future releases make a pull request to the [project management](http://www.django-rest-framework.org/topics/project-management/) documentation. + To modify this process for future maintenance cycles make a pull request to the [project management](http://www.django-rest-framework.org/topics/project-management/) documentation. #### Responsibilities of team members From e61ef3d39f301bc62323b47af5080877e273c395 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 8 Jan 2015 11:07:47 +0000 Subject: [PATCH 1426/1652] Minor docs updates --- docs/api-guide/filtering.md | 1 + docs/topics/project-management.md | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 83977048f..3eb1538f1 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -316,6 +316,7 @@ Typically you'd instead control this by setting `order_by` on the initial querys queryset = User.objects.all() serializer_class = UserSerializer filter_backends = (filters.OrderingFilter,) + ordering_fields = ('username', 'email') ordering = ('username',) The `ordering` attribute may be either a string or a list/tuple of strings. diff --git a/docs/topics/project-management.md b/docs/topics/project-management.md index f581cabd3..f052aa83a 100644 --- a/docs/topics/project-management.md +++ b/docs/topics/project-management.md @@ -126,6 +126,7 @@ The following issues still need to be addressed: * Ensure `@jamie` has back-up access to the `django-rest-framework.org` domain setup and admin. * Document ownership of the [live example][sandbox] API. * Document ownership of the [mailing list][mailing-list] and IRC channel. +* Document ownership and management of the security mailing list. [bus-factor]: http://en.wikipedia.org/wiki/Bus_factor [un-triaged]: https://github.com/tomchristie/django-rest-framework/issues?q=is%3Aopen+no%3Alabel From f0ad0a88c49f1fef473ef1fbf965bcaa974ee062 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 8 Jan 2015 12:31:51 +0000 Subject: [PATCH 1427/1652] Link to Roy Fielding versioning interview. --- docs/api-guide/versioning.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/api-guide/versioning.md b/docs/api-guide/versioning.md index 92380cc0e..7463f190b 100644 --- a/docs/api-guide/versioning.md +++ b/docs/api-guide/versioning.md @@ -10,6 +10,8 @@ API versioning allows you to alter behavior between different clients. REST fram Versioning is determined by the incoming client request, and may either be based on the request URL, or based on the request headers. +There are a number of valid approaches to approaching versioning. [Non-versioned systems can also be appropriate][roy-fielding-on-versioning], particularly if you're engineering for very long-term systems with multiple clients outside of your control. + ## Versioning with REST framework When API versioning is enabled, the `request.version` attribute will contain a string that corresponds to the version requested in the incoming client request. @@ -195,6 +197,7 @@ The following example uses a custom `X-API-Version` header to determine the requ If your versioning scheme is based on the request URL, you will also want to alter how versioned URLs are determined. In order to do so you should override the `.reverse()` method on the class. See the source code for examples. [cite]: http://www.slideshare.net/evolve_conference/201308-fielding-evolve/31 +[roy-fielding-on-versioning]: http://www.infoq.com/articles/roy-fielding-on-versioning [klabnik-guidelines]: http://blog.steveklabnik.com/posts/2011-07-03-nobody-understands-rest-or-http#i_want_my_api_to_be_versioned [heroku-guidelines]: https://github.com/interagent/http-api-design#version-with-accepts-header [json-parameters]: http://tools.ietf.org/html/rfc4627#section-6 From b33a6cbff16e5a28a1a696e2ac617303da181720 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 8 Jan 2015 14:16:58 +0000 Subject: [PATCH 1428/1652] Ensure urlparse is not publically exposed in compat.py - less chance of accidental conflict. --- rest_framework/compat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index b1f6f2fa6..971dee9cf 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -10,7 +10,7 @@ import inspect from django.core.exceptions import ImproperlyConfigured from django.utils.encoding import force_text -from django.utils.six.moves.urllib import parse as urlparse +from django.utils.six.moves.urllib.parse import urlparse as _urlparse from django.conf import settings from django.utils import six import django @@ -182,7 +182,7 @@ except ImportError: class RequestFactory(DjangoRequestFactory): def generic(self, method, path, data='', content_type='application/octet-stream', **extra): - parsed = urlparse.urlparse(path) + parsed = _urlparse(path) data = force_bytes_or_smart_bytes(data, settings.DEFAULT_CHARSET) r = { 'PATH_INFO': self._get_path(parsed), From f529f83d3c96ca1957d7a8bfc74bd33151cc8d86 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 8 Jan 2015 14:38:23 +0000 Subject: [PATCH 1429/1652] Minimum Django 1.5 version issue 1.5.6 --- README.md | 2 +- docs/index.md | 2 +- tox.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8fc11c30f..428a2e56b 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ There is a live example API for testing purposes, [available here][sandbox]. # Requirements * Python (2.6.5+, 2.7, 3.2, 3.3, 3.4) -* Django (1.4.11+, 1.5.5+, 1.6, 1.7) +* Django (1.4.11+, 1.5.6+, 1.6, 1.7) # Installation diff --git a/docs/index.md b/docs/index.md index 55129df18..a621e3ecb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -51,7 +51,7 @@ Some reasons you might want to use REST framework: REST framework requires the following: * Python (2.6.5+, 2.7, 3.2, 3.3, 3.4) -* Django (1.4.11+, 1.5.5+, 1.6, 1.7) +* Django (1.4.11+, 1.5.6+, 1.6, 1.7) The following packages are optional: diff --git a/tox.ini b/tox.ini index 933ee560e..ab258f2ee 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ setenv = PYTHONDONTWRITEBYTECODE=1 deps = django14: Django==1.4.11 - django15: Django==1.5.5 + django15: Django==1.5.6 django16: Django==1.6.8 django17: Django==1.7.1 djangomaster: https://github.com/django/django/zipball/master From 42c913334b0b4cd731011a07a49ff08aa03d7768 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 8 Jan 2015 14:51:08 +0000 Subject: [PATCH 1430/1652] Minimum 1.6.x version is 1.6.3 --- README.md | 2 +- docs/index.md | 2 +- tox.ini | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 428a2e56b..cf3dc8576 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ There is a live example API for testing purposes, [available here][sandbox]. # Requirements * Python (2.6.5+, 2.7, 3.2, 3.3, 3.4) -* Django (1.4.11+, 1.5.6+, 1.6, 1.7) +* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7) # Installation diff --git a/docs/index.md b/docs/index.md index a621e3ecb..d40f8972f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -51,7 +51,7 @@ Some reasons you might want to use REST framework: REST framework requires the following: * Python (2.6.5+, 2.7, 3.2, 3.3, 3.4) -* Django (1.4.11+, 1.5.6+, 1.6, 1.7) +* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7) The following packages are optional: diff --git a/tox.ini b/tox.ini index ab258f2ee..db2b5d13e 100644 --- a/tox.ini +++ b/tox.ini @@ -10,10 +10,10 @@ commands = ./runtests.py --fast setenv = PYTHONDONTWRITEBYTECODE=1 deps = - django14: Django==1.4.11 - django15: Django==1.5.6 - django16: Django==1.6.8 - django17: Django==1.7.1 + django14: Django==1.4.11 # Should track minimum supported + django15: Django==1.5.6 # Should track minimum supported + django16: Django==1.6.3 # Should track minimum supported + django17: Django==1.7.3 # Should track maximum supported djangomaster: https://github.com/django/django/zipball/master {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 {py26,py27}-django{14,15,16}: oauth2==1.5.211 From 08008669886f682ba62c4d377f4d96f64808d4a5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 8 Jan 2015 14:54:54 +0000 Subject: [PATCH 1431/1652] Fix broken 1.7.3. It's 1.7.2 - 1.7.3 is documented but not yet on PyPI. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index db2b5d13e..4b90c3929 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ deps = django14: Django==1.4.11 # Should track minimum supported django15: Django==1.5.6 # Should track minimum supported django16: Django==1.6.3 # Should track minimum supported - django17: Django==1.7.3 # Should track maximum supported + django17: Django==1.7.2 # Should track maximum supported djangomaster: https://github.com/django/django/zipball/master {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 {py26,py27}-django{14,15,16}: oauth2==1.5.211 From 4d9e7a53565f6301b87999e6bafdb1c2c3c2af3b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 8 Jan 2015 15:38:27 +0000 Subject: [PATCH 1432/1652] Ammend docstring to use python2/3 compatible example. --- rest_framework/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 33f848138..fc6dfecda 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -167,7 +167,7 @@ class APISettings(object): For example: from rest_framework.settings import api_settings - print api_settings.DEFAULT_RENDERER_CLASSES + print(api_settings.DEFAULT_RENDERER_CLASSES) Any setting with string import paths will be automatically resolved and return the class, rather than the string literal. From 1368c31a705a4892995f42cf5e0dcdcbfa13a1ce Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Thu, 8 Jan 2015 17:16:15 +0000 Subject: [PATCH 1433/1652] remove unused import --- rest_framework/generics.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index d52f2b6c0..0d709c37a 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -10,7 +10,6 @@ from django.shortcuts import get_object_or_404 as _get_object_or_404 from django.utils import six from django.utils.translation import ugettext as _ from rest_framework import views, mixins -from rest_framework.exceptions import NotFound from rest_framework.settings import api_settings From 7f8d314101c4e6e059b00ac12658f0e1055da8f7 Mon Sep 17 00:00:00 2001 From: Craig Blaszczyk <masterjakul@gmail.com> Date: Thu, 8 Jan 2015 17:16:47 +0000 Subject: [PATCH 1434/1652] update tests to expect new error messages --- tests/test_fields.py | 18 +++++++++--------- tests/test_serializer_bulk_update.py | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/test_fields.py b/tests/test_fields.py index 5ecb98573..240827eea 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -338,7 +338,7 @@ class TestBooleanField(FieldValues): False: False, } invalid_inputs = { - 'foo': ['`foo` is not a valid boolean.'], + 'foo': ['"foo" is not a valid boolean.'], None: ['This field may not be null.'] } outputs = { @@ -368,7 +368,7 @@ class TestNullBooleanField(FieldValues): None: None } invalid_inputs = { - 'foo': ['`foo` is not a valid boolean.'], + 'foo': ['"foo" is not a valid boolean.'], } outputs = { 'true': True, @@ -832,7 +832,7 @@ class TestChoiceField(FieldValues): 'good': 'good', } invalid_inputs = { - 'amazing': ['`amazing` is not a valid choice.'] + 'amazing': ['"amazing" is not a valid choice.'] } outputs = { 'good': 'good', @@ -872,8 +872,8 @@ class TestChoiceFieldWithType(FieldValues): 3: 3, } invalid_inputs = { - 5: ['`5` is not a valid choice.'], - 'abc': ['`abc` is not a valid choice.'] + 5: ['"5" is not a valid choice.'], + 'abc': ['"abc" is not a valid choice.'] } outputs = { '1': 1, @@ -899,7 +899,7 @@ class TestChoiceFieldWithListChoices(FieldValues): 'good': 'good', } invalid_inputs = { - 'awful': ['`awful` is not a valid choice.'] + 'awful': ['"awful" is not a valid choice.'] } outputs = { 'good': 'good' @@ -917,8 +917,8 @@ class TestMultipleChoiceField(FieldValues): ('aircon', 'manual'): set(['aircon', 'manual']), } invalid_inputs = { - 'abc': ['Expected a list of items but got type `str`.'], - ('aircon', 'incorrect'): ['`incorrect` is not a valid choice.'] + 'abc': ['Expected a list of items but got type "str".'], + ('aircon', 'incorrect'): ['"incorrect" is not a valid choice.'] } outputs = [ (['aircon', 'manual'], set(['aircon', 'manual'])) @@ -1028,7 +1028,7 @@ class TestListField(FieldValues): (['1', '2', '3'], [1, 2, 3]) ] invalid_inputs = [ - ('not a list', ['Expected a list of items but got type `str`.']), + ('not a list', ['Expected a list of items but got type "str".']), ([1, 2, 'error'], ['A valid integer is required.']) ] outputs = [ diff --git a/tests/test_serializer_bulk_update.py b/tests/test_serializer_bulk_update.py index fb881a755..bc955b2ef 100644 --- a/tests/test_serializer_bulk_update.py +++ b/tests/test_serializer_bulk_update.py @@ -101,7 +101,7 @@ class BulkCreateSerializerTests(TestCase): serializer = self.BookSerializer(data=data, many=True) self.assertEqual(serializer.is_valid(), False) - expected_errors = {'non_field_errors': ['Expected a list of items but got type `int`.']} + expected_errors = {'non_field_errors': ['Expected a list of items but got type "int".']} self.assertEqual(serializer.errors, expected_errors) @@ -118,6 +118,6 @@ class BulkCreateSerializerTests(TestCase): serializer = self.BookSerializer(data=data, many=True) self.assertEqual(serializer.is_valid(), False) - expected_errors = {'non_field_errors': ['Expected a list of items but got type `dict`.']} + expected_errors = {'non_field_errors': ['Expected a list of items but got type "dict".']} self.assertEqual(serializer.errors, expected_errors) From ef16c546d77d36bbddacf9b66626f7eaf9f4ff17 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Thu, 8 Jan 2015 23:29:51 +0100 Subject: [PATCH 1435/1652] Update the release note with latest fixes. Add the link to the 3.0.3 milestone. --- docs/topics/release-notes.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 18a47b71b..c49dd62c9 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -59,6 +59,7 @@ You can determine your currently installed version using `pip freeze`: * Fix Metaclass attribute depth ignoring fields attribute. ([#2287][gh2287]) * Fix `format_suffix_patterns` to work with Django's `i18n_patterns`. ([#2278][gh2278]) * Ability to customize router URLs for custom actions, using `url_path`. ([#2010][gh2010]) +* Don't install Django REST Framework as egg. ([#2386][gh2386]) ### 3.0.2 @@ -700,6 +701,7 @@ For older release notes, [please see the GitHub repo](old-release-notes). [3.0.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22 [3.0.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.2+Release%22 +[3.0.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.3+Release%22 <!-- 3.0.1 --> [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -767,3 +769,4 @@ For older release notes, [please see the GitHub repo](old-release-notes). [gh2351]: https://github.com/tomchristie/django-rest-framework/issues/2351 [gh2355]: https://github.com/tomchristie/django-rest-framework/issues/2355 [gh2369]: https://github.com/tomchristie/django-rest-framework/issues/2369 +[gh2386]: https://github.com/tomchristie/django-rest-framework/issues/2386 From 73feaf6299827607eab94ce96b77b73671880626 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 9 Jan 2015 15:30:36 +0000 Subject: [PATCH 1436/1652] First pass at 3.1 pagination API --- rest_framework/generics.py | 220 +++++++++++---------------------- rest_framework/mixins.py | 13 +- rest_framework/pagination.py | 231 +++++++++++++++++++++++++---------- rest_framework/settings.py | 4 +- tests/test_pagination.py | 216 +------------------------------- 5 files changed, 248 insertions(+), 436 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 0d709c37a..12fb64138 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -2,29 +2,13 @@ Generic views that provide commonly needed behaviour. """ from __future__ import unicode_literals - -from django.core.paginator import Paginator, InvalidPage from django.db.models.query import QuerySet from django.http import Http404 from django.shortcuts import get_object_or_404 as _get_object_or_404 -from django.utils import six -from django.utils.translation import ugettext as _ from rest_framework import views, mixins from rest_framework.settings import api_settings -def strict_positive_int(integer_string, cutoff=None): - """ - Cast a string to a strictly positive integer. - """ - ret = int(integer_string) - if ret <= 0: - raise ValueError() - if cutoff: - ret = min(ret, cutoff) - return ret - - def get_object_or_404(queryset, *filter_args, **filter_kwargs): """ Same as Django's standard shortcut, but make sure to also raise 404 @@ -40,7 +24,6 @@ class GenericAPIView(views.APIView): """ Base class for all other generic views. """ - # You'll need to either set these attributes, # or override `get_queryset()`/`get_serializer_class()`. # If you are overriding a view method, it is important that you call @@ -50,146 +33,16 @@ class GenericAPIView(views.APIView): queryset = None serializer_class = None - # If you want to use object lookups other than pk, set this attribute. + # If you want to use object lookups other than pk, set 'lookup_field'. # For more complex lookup requirements override `get_object()`. lookup_field = 'pk' lookup_url_kwarg = None - # Pagination settings - paginate_by = api_settings.PAGINATE_BY - paginate_by_param = api_settings.PAGINATE_BY_PARAM - max_paginate_by = api_settings.MAX_PAGINATE_BY - pagination_serializer_class = api_settings.DEFAULT_PAGINATION_SERIALIZER_CLASS - page_kwarg = 'page' - # The filter backend classes to use for queryset filtering filter_backends = api_settings.DEFAULT_FILTER_BACKENDS - # The following attribute may be subject to change, - # and should be considered private API. - paginator_class = Paginator - - def get_serializer_context(self): - """ - Extra context provided to the serializer class. - """ - return { - 'request': self.request, - 'format': self.format_kwarg, - 'view': self - } - - def get_serializer(self, *args, **kwargs): - """ - Return the serializer instance that should be used for validating and - deserializing input, and for serializing output. - """ - serializer_class = self.get_serializer_class() - kwargs['context'] = self.get_serializer_context() - return serializer_class(*args, **kwargs) - - def get_pagination_serializer(self, page): - """ - Return a serializer instance to use with paginated data. - """ - class SerializerClass(self.pagination_serializer_class): - class Meta: - object_serializer_class = self.get_serializer_class() - - pagination_serializer_class = SerializerClass - context = self.get_serializer_context() - return pagination_serializer_class(instance=page, context=context) - - def paginate_queryset(self, queryset): - """ - Paginate a queryset if required, either returning a page object, - or `None` if pagination is not configured for this view. - """ - page_size = self.get_paginate_by() - if not page_size: - return None - - paginator = self.paginator_class(queryset, page_size) - page_kwarg = self.kwargs.get(self.page_kwarg) - page_query_param = self.request.query_params.get(self.page_kwarg) - page = page_kwarg or page_query_param or 1 - try: - page_number = paginator.validate_number(page) - except InvalidPage: - if page == 'last': - page_number = paginator.num_pages - else: - raise Http404(_('Choose a valid page number. Page numbers must be a whole number, or must be the string "last".')) - - try: - page = paginator.page(page_number) - except InvalidPage as exc: - error_format = _('Invalid page "{page_number}": {message}.') - raise Http404(error_format.format( - page_number=page_number, message=six.text_type(exc) - )) - - return page - - def filter_queryset(self, queryset): - """ - Given a queryset, filter it with whichever filter backend is in use. - - You are unlikely to want to override this method, although you may need - to call it either from a list view, or from a custom `get_object` - method if you want to apply the configured filtering backend to the - default queryset. - """ - for backend in self.get_filter_backends(): - queryset = backend().filter_queryset(self.request, queryset, self) - return queryset - - def get_filter_backends(self): - """ - Returns the list of filter backends that this view requires. - """ - return list(self.filter_backends) - - # The following methods provide default implementations - # that you may want to override for more complex cases. - - def get_paginate_by(self): - """ - Return the size of pages to use with pagination. - - If `PAGINATE_BY_PARAM` is set it will attempt to get the page size - from a named query parameter in the url, eg. ?page_size=100 - - Otherwise defaults to using `self.paginate_by`. - """ - if self.paginate_by_param: - try: - return strict_positive_int( - self.request.query_params[self.paginate_by_param], - cutoff=self.max_paginate_by - ) - except (KeyError, ValueError): - pass - - return self.paginate_by - - def get_serializer_class(self): - """ - Return the class to use for the serializer. - Defaults to using `self.serializer_class`. - - You may want to override this if you need to provide different - serializations depending on the incoming request. - - (Eg. admins get full serialization, others get basic serialization) - """ - assert self.serializer_class is not None, ( - "'%s' should either include a `serializer_class` attribute, " - "or override the `get_serializer_class()` method." - % self.__class__.__name__ - ) - - return self.serializer_class + # The style to use for queryset pagination. + pagination_class = api_settings.DEFAULT_PAGINATION_CLASS def get_queryset(self): """ @@ -246,6 +99,73 @@ class GenericAPIView(views.APIView): return obj + def get_serializer(self, *args, **kwargs): + """ + Return the serializer instance that should be used for validating and + deserializing input, and for serializing output. + """ + serializer_class = self.get_serializer_class() + kwargs['context'] = self.get_serializer_context() + return serializer_class(*args, **kwargs) + + def get_serializer_class(self): + """ + Return the class to use for the serializer. + Defaults to using `self.serializer_class`. + + You may want to override this if you need to provide different + serializations depending on the incoming request. + + (Eg. admins get full serialization, others get basic serialization) + """ + assert self.serializer_class is not None, ( + "'%s' should either include a `serializer_class` attribute, " + "or override the `get_serializer_class()` method." + % self.__class__.__name__ + ) + + return self.serializer_class + + def get_serializer_context(self): + """ + Extra context provided to the serializer class. + """ + return { + 'request': self.request, + 'format': self.format_kwarg, + 'view': self + } + + def filter_queryset(self, queryset): + """ + Given a queryset, filter it with whichever filter backend is in use. + + You are unlikely to want to override this method, although you may need + to call it either from a list view, or from a custom `get_object` + method if you want to apply the configured filtering backend to the + default queryset. + """ + for backend in list(self.filter_backends): + queryset = backend().filter_queryset(self.request, queryset, self) + return queryset + + @property + def pager(self): + if not hasattr(self, '_pager'): + if self.pagination_class is None: + self._pager = None + else: + self._pager = self.pagination_class() + return self._pager + + def paginate_queryset(self, queryset): + if self.pager is None: + return None + return self.pager.paginate_queryset(queryset, self.request, view=self) + + def get_paginated_response(self, objects): + return self.pager.get_paginated_response(objects) + # Concrete view classes that provide method handlers # by composing the mixin classes with the base view. diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 2074a1072..c34cfcee1 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -5,7 +5,6 @@ We don't bind behaviour to http method handlers yet, which allows mixin classes to be composed in interesting ways. """ from __future__ import unicode_literals - from rest_framework import status from rest_framework.response import Response from rest_framework.settings import api_settings @@ -37,12 +36,14 @@ class ListModelMixin(object): List a queryset. """ def list(self, request, *args, **kwargs): - instance = self.filter_queryset(self.get_queryset()) - page = self.paginate_queryset(instance) + queryset = self.filter_queryset(self.get_queryset()) + + page = self.paginate_queryset(queryset) if page is not None: - serializer = self.get_pagination_serializer(page) - else: - serializer = self.get_serializer(instance, many=True) + serializer = self.get_serializer(page, many=True) + return self.get_paginated_response(serializer.data) + + serializer = self.get_serializer(queryset, many=True) return Response(serializer.data) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index f31e5fa4c..da2d60a44 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -3,87 +3,192 @@ Pagination serializers determine the structure of the output that should be used for paginated responses. """ from __future__ import unicode_literals -from rest_framework import serializers +from django.core.paginator import InvalidPage, Paginator as DjangoPaginator +from django.utils import six +from django.utils.translation import ugettext as _ +from rest_framework.compat import OrderedDict +from rest_framework.exceptions import NotFound +from rest_framework.response import Response +from rest_framework.settings import api_settings from rest_framework.templatetags.rest_framework import replace_query_param -class NextPageField(serializers.Field): +def _strict_positive_int(integer_string, cutoff=None): """ - Field that returns a link to the next page in paginated results. + Cast a string to a strictly positive integer. """ - page_field = 'page' - - def to_representation(self, value): - if not value.has_next(): - return None - page = value.next_page_number() - request = self.context.get('request') - url = request and request.build_absolute_uri() or '' - return replace_query_param(url, self.page_field, page) + ret = int(integer_string) + if ret <= 0: + raise ValueError() + if cutoff: + ret = min(ret, cutoff) + return ret -class PreviousPageField(serializers.Field): +class BasePagination(object): + def paginate_queryset(self, queryset, request): + raise NotImplemented('paginate_queryset() must be implemented.') + + def get_paginated_response(self, data, page, request): + raise NotImplemented('get_paginated_response() must be implemented.') + + +class PageNumberPagination(BasePagination): """ - Field that returns a link to the previous page in paginated results. + A simple page number based style that supports page numbers as + query parameters. For example: + + http://api.example.org/accounts/?page=4 + http://api.example.org/accounts/?page=4&page_size=100 """ - page_field = 'page' + # The default page size. + # Defaults to `None`, meaning pagination is disabled. + paginate_by = api_settings.PAGINATE_BY - def to_representation(self, value): - if not value.has_previous(): - return None - page = value.previous_page_number() - request = self.context.get('request') - url = request and request.build_absolute_uri() or '' - return replace_query_param(url, self.page_field, page) + # Client can control the page using this query parameter. + page_query_param = 'page' + # Client can control the page size using this query parameter. + # Default is 'None'. Set to eg 'page_size' to enable usage. + paginate_by_param = api_settings.PAGINATE_BY_PARAM -class DefaultObjectSerializer(serializers.ReadOnlyField): - """ - If no object serializer is specified, then this serializer will be applied - as the default. - """ + # Set to an integer to limit the maximum page size the client may request. + # Only relevant if 'paginate_by_param' has also been set. + max_paginate_by = api_settings.MAX_PAGINATE_BY - def __init__(self, source=None, many=None, context=None): - # Note: Swallow context and many kwargs - only required for - # eg. ModelSerializer. - super(DefaultObjectSerializer, self).__init__(source=source) - - -class BasePaginationSerializer(serializers.Serializer): - """ - A base class for pagination serializers to inherit from, - to make implementing custom serializers more easy. - """ - results_field = 'results' - - def __init__(self, *args, **kwargs): + def paginate_queryset(self, queryset, request, view): """ - Override init to add in the object serializer field on-the-fly. + Paginate a queryset if required, either returning a page object, + or `None` if pagination is not configured for this view. """ - super(BasePaginationSerializer, self).__init__(*args, **kwargs) - results_field = self.results_field + for attr in ( + 'paginate_by', 'page_query_param', + 'paginate_by_param', 'max_paginate_by' + ): + if hasattr(view, attr): + setattr(self, attr, getattr(view, attr)) + + page_size = self.get_page_size(request) + if not page_size: + return None + + paginator = DjangoPaginator(queryset, page_size) + page_string = request.query_params.get(self.page_query_param, 1) + try: + page_number = paginator.validate_number(page_string) + except InvalidPage: + if page_string == 'last': + page_number = paginator.num_pages + else: + msg = _( + 'Choose a valid page number. Page numbers must be a ' + 'whole number, or must be the string "last".' + ) + raise NotFound(msg) try: - object_serializer = self.Meta.object_serializer_class - except AttributeError: - object_serializer = DefaultObjectSerializer + self.page = paginator.page(page_number) + except InvalidPage as exc: + msg = _('Invalid page "{page_number}": {message}.').format( + page_number=page_number, message=six.text_type(exc) + ) + raise NotFound(msg) + self.request = request + return self.page + + def get_paginated_response(self, objects): + return Response(OrderedDict([ + ('count', self.page.paginator.count), + ('next', self.get_next_link()), + ('previous', self.get_previous_link()), + ('results', objects) + ])) + + def get_page_size(self, request): + if self.paginate_by_param: + try: + return _strict_positive_int( + request.query_params[self.paginate_by_param], + cutoff=self.max_paginate_by + ) + except (KeyError, ValueError): + pass + + return self.paginate_by + + def get_next_link(self): + if not self.page.has_next(): + return None + url = self.request.build_absolute_uri() + page_number = self.page.next_page_number() + return replace_query_param(url, self.page_query_param, page_number) + + def get_previous_link(self): + if not self.page.has_previous(): + return None + url = self.request.build_absolute_uri() + page_number = self.page.previous_page_number() + return replace_query_param(url, self.page_query_param, page_number) + + +class LimitOffsetPagination(BasePagination): + """ + A limit/offset based style. For example: + + http://api.example.org/accounts/?limit=100 + http://api.example.org/accounts/?offset=400&limit=100 + """ + default_limit = api_settings.PAGINATE_BY + limit_query_param = 'limit' + offset_query_param = 'offset' + max_limit = None + + def paginate_queryset(self, queryset, request, view): + self.limit = self.get_limit(request) + self.offset = self.get_offset(request) + self.count = queryset.count() + self.request = request + return queryset[self.offset:self.offset + self.limit] + + def get_paginated_response(self, objects): + return Response(OrderedDict([ + ('count', self.count), + ('next', self.get_next_link()), + ('previous', self.get_previous_link()), + ('results', objects) + ])) + + def get_limit(self, request): + if self.limit_query_param: + try: + return _strict_positive_int( + request.query_params[self.limit_query_param], + cutoff=self.max_limit + ) + except (KeyError, ValueError): + pass + + return self.default_limit + + def get_offset(self, request): try: - list_serializer_class = object_serializer.Meta.list_serializer_class - except AttributeError: - list_serializer_class = serializers.ListSerializer + return _strict_positive_int( + request.query_params[self.offset_query_param], + ) + except (KeyError, ValueError): + return 0 - self.fields[results_field] = list_serializer_class( - child=object_serializer(), - source='object_list' - ) - self.fields[results_field].bind(field_name=results_field, parent=self) + def get_next_link(self, page): + if self.offset + self.limit >= self.count: + return None + url = self.request.build_absolute_uri() + offset = self.offset + self.limit + return replace_query_param(url, self.offset_query_param, offset) - -class PaginationSerializer(BasePaginationSerializer): - """ - A default implementation of a pagination serializer. - """ - count = serializers.ReadOnlyField(source='paginator.count') - next = NextPageField(source='*') - previous = PreviousPageField(source='*') + def get_previous_link(self, page): + if self.offset - self.limit < 0: + return None + url = self.request.build_absolute_uri() + offset = self.offset - self.limit + return replace_query_param(url, self.offset_query_param, offset) diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 877d461be..3cce26b1c 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -49,7 +49,7 @@ DEFAULTS = { 'DEFAULT_VERSIONING_CLASS': None, # Generic view behavior - 'DEFAULT_PAGINATION_SERIALIZER_CLASS': 'rest_framework.pagination.PaginationSerializer', + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', 'DEFAULT_FILTER_BACKENDS': (), # Throttling @@ -130,7 +130,7 @@ IMPORT_STRINGS = ( 'DEFAULT_CONTENT_NEGOTIATION_CLASS', 'DEFAULT_METADATA_CLASS', 'DEFAULT_VERSIONING_CLASS', - 'DEFAULT_PAGINATION_SERIALIZER_CLASS', + 'DEFAULT_PAGINATION_CLASS', 'DEFAULT_FILTER_BACKENDS', 'EXCEPTION_HANDLER', 'TEST_REQUEST_RENDERER_CLASSES', diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 1fd9cf9c4..d410cd5eb 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -1,10 +1,9 @@ from __future__ import unicode_literals import datetime from decimal import Decimal -from django.core.paginator import Paginator from django.test import TestCase from django.utils import unittest -from rest_framework import generics, serializers, status, pagination, filters +from rest_framework import generics, serializers, status, filters from rest_framework.compat import django_filters from rest_framework.test import APIRequestFactory from .models import BasicModel, FilterableItem @@ -238,45 +237,6 @@ class IntegrationTestPaginationAndFiltering(TestCase): self.assertEqual(response.data['previous'], None) -class PassOnContextPaginationSerializer(pagination.PaginationSerializer): - class Meta: - object_serializer_class = serializers.Serializer - - -class UnitTestPagination(TestCase): - """ - Unit tests for pagination of primitive objects. - """ - - def setUp(self): - self.objects = [char * 3 for char in 'abcdefghijklmnopqrstuvwxyz'] - paginator = Paginator(self.objects, 10) - self.first_page = paginator.page(1) - self.last_page = paginator.page(3) - - def test_native_pagination(self): - serializer = pagination.PaginationSerializer(self.first_page) - self.assertEqual(serializer.data['count'], 26) - self.assertEqual(serializer.data['next'], '?page=2') - self.assertEqual(serializer.data['previous'], None) - self.assertEqual(serializer.data['results'], self.objects[:10]) - - serializer = pagination.PaginationSerializer(self.last_page) - self.assertEqual(serializer.data['count'], 26) - self.assertEqual(serializer.data['next'], None) - self.assertEqual(serializer.data['previous'], '?page=2') - self.assertEqual(serializer.data['results'], self.objects[20:]) - - def test_context_available_in_result(self): - """ - Ensure context gets passed through to the object serializer. - """ - serializer = PassOnContextPaginationSerializer(self.first_page, context={'foo': 'bar'}) - serializer.data - results = serializer.fields[serializer.results_field] - self.assertEqual(serializer.context, results.context) - - class TestUnpaginated(TestCase): """ Tests for list views without pagination. @@ -377,177 +337,3 @@ class TestMaxPaginateByParam(TestCase): request = factory.get('/') response = self.view(request).render() self.assertEqual(response.data['results'], self.data[:3]) - - -# Tests for context in pagination serializers - -class CustomField(serializers.ReadOnlyField): - def to_native(self, value): - if 'view' not in self.context: - raise RuntimeError("context isn't getting passed into custom field") - return "value" - - -class BasicModelSerializer(serializers.Serializer): - text = CustomField() - - def to_native(self, value): - if 'view' not in self.context: - raise RuntimeError("context isn't getting passed into serializer") - return super(BasicSerializer, self).to_native(value) - - -class TestContextPassedToCustomField(TestCase): - def setUp(self): - BasicModel.objects.create(text='ala ma kota') - - def test_with_pagination(self): - class ListView(generics.ListCreateAPIView): - queryset = BasicModel.objects.all() - serializer_class = BasicModelSerializer - paginate_by = 1 - - self.view = ListView.as_view() - request = factory.get('/') - response = self.view(request).render() - - self.assertEqual(response.status_code, status.HTTP_200_OK) - - -# Tests for custom pagination serializers - -class LinksSerializer(serializers.Serializer): - next = pagination.NextPageField(source='*') - prev = pagination.PreviousPageField(source='*') - - -class CustomPaginationSerializer(pagination.BasePaginationSerializer): - links = LinksSerializer(source='*') # Takes the page object as the source - total_results = serializers.ReadOnlyField(source='paginator.count') - - results_field = 'objects' - - -class CustomFooSerializer(serializers.Serializer): - foo = serializers.CharField() - - -class CustomFooPaginationSerializer(pagination.PaginationSerializer): - class Meta: - object_serializer_class = CustomFooSerializer - - -class TestCustomPaginationSerializer(TestCase): - def setUp(self): - objects = ['john', 'paul', 'george', 'ringo'] - paginator = Paginator(objects, 2) - self.page = paginator.page(1) - - def test_custom_pagination_serializer(self): - request = APIRequestFactory().get('/foobar') - serializer = CustomPaginationSerializer( - instance=self.page, - context={'request': request} - ) - expected = { - 'links': { - 'next': 'http://testserver/foobar?page=2', - 'prev': None - }, - 'total_results': 4, - 'objects': ['john', 'paul'] - } - self.assertEqual(serializer.data, expected) - - def test_custom_pagination_serializer_with_custom_object_serializer(self): - objects = [ - {'foo': 'bar'}, - {'foo': 'spam'} - ] - paginator = Paginator(objects, 1) - page = paginator.page(1) - serializer = CustomFooPaginationSerializer(page) - serializer.data - - -class NonIntegerPage(object): - - def __init__(self, paginator, object_list, prev_token, token, next_token): - self.paginator = paginator - self.object_list = object_list - self.prev_token = prev_token - self.token = token - self.next_token = next_token - - def has_next(self): - return not not self.next_token - - def next_page_number(self): - return self.next_token - - def has_previous(self): - return not not self.prev_token - - def previous_page_number(self): - return self.prev_token - - -class NonIntegerPaginator(object): - - def __init__(self, object_list, per_page): - self.object_list = object_list - self.per_page = per_page - - def count(self): - # pretend like we don't know how many pages we have - return None - - def page(self, token=None): - if token: - try: - first = self.object_list.index(token) - except ValueError: - first = 0 - else: - first = 0 - n = len(self.object_list) - last = min(first + self.per_page, n) - prev_token = self.object_list[last - (2 * self.per_page)] if first else None - next_token = self.object_list[last] if last < n else None - return NonIntegerPage(self, self.object_list[first:last], prev_token, token, next_token) - - -class TestNonIntegerPagination(TestCase): - def test_custom_pagination_serializer(self): - objects = ['john', 'paul', 'george', 'ringo'] - paginator = NonIntegerPaginator(objects, 2) - - request = APIRequestFactory().get('/foobar') - serializer = CustomPaginationSerializer( - instance=paginator.page(), - context={'request': request} - ) - expected = { - 'links': { - 'next': 'http://testserver/foobar?page={0}'.format(objects[2]), - 'prev': None - }, - 'total_results': None, - 'objects': objects[:2] - } - self.assertEqual(serializer.data, expected) - - request = APIRequestFactory().get('/foobar') - serializer = CustomPaginationSerializer( - instance=paginator.page('george'), - context={'request': request} - ) - expected = { - 'links': { - 'next': None, - 'prev': 'http://testserver/foobar?page={0}'.format(objects[0]), - }, - 'total_results': None, - 'objects': objects[2:] - } - self.assertEqual(serializer.data, expected) From 8ccf5bcc0bb3455c0d71a0e0d845ef54489bb28e Mon Sep 17 00:00:00 2001 From: Travis Swientek <travis@tswientek.com> Date: Fri, 9 Jan 2015 11:36:21 -0800 Subject: [PATCH 1437/1652] Tweaked a few issues in the tutorial documentation. --- docs/tutorial/1-serialization.md | 2 +- docs/tutorial/3-class-based-views.md | 2 +- docs/tutorial/4-authentication-and-permissions.md | 2 +- docs/tutorial/5-relationships-and-hyperlinked-apis.md | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 60a3d9897..41ff4d073 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -191,7 +191,7 @@ Our `SnippetSerializer` class is replicating a lot of information that's also co In the same way that Django provides both `Form` classes and `ModelForm` classes, REST framework includes both `Serializer` classes, and `ModelSerializer` classes. Let's look at refactoring our serializer using the `ModelSerializer` class. -Open the file `snippets/serializers.py` again, and edit the `SnippetSerializer` class. +Open the file `snippets/serializers.py` again, and replace the `SnippetSerializer` class with the following. class SnippetSerializer(serializers.ModelSerializer): class Meta: diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md index 0a9ea3f15..abf82e495 100644 --- a/docs/tutorial/3-class-based-views.md +++ b/docs/tutorial/3-class-based-views.md @@ -64,7 +64,7 @@ That's looking good. Again, it's still pretty similar to the function based vie We'll also need to refactor our `urls.py` slightly now we're using class based views. - from django.conf.urls import patterns, url + from django.conf.urls import url from rest_framework.urlpatterns import format_suffix_patterns from snippets import views diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 592c77e81..887d1e56f 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -177,7 +177,7 @@ In the snippets app, create a new file, `permissions.py` # Write permissions are only allowed to the owner of the snippet. return obj.owner == request.user -Now we can add that custom permission to our snippet instance endpoint, by editing the `permission_classes` property on the `SnippetDetail` class: +Now we can add that custom permission to our snippet instance endpoint, by editing the `permission_classes` property on the `SnippetDetail` view class: permission_classes = (permissions.IsAuthenticatedOrReadOnly, IsOwnerOrReadOnly,) diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index c21efd7f6..2841f03e9 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -106,6 +106,8 @@ If we're going to have a hyperlinked API, we need to make sure we name our URL p After adding all those names into our URLconf, our final `snippets/urls.py` file should look something like this: + from django.conf.urls import url, include + # API endpoints urlpatterns = format_suffix_patterns([ url(r'^$', views.api_root), From 50b206d3739660cdf089b0a3f8a5bb21d6970e00 Mon Sep 17 00:00:00 2001 From: Steven Loria <sloria1@gmail.com> Date: Sat, 10 Jan 2015 10:17:37 -0600 Subject: [PATCH 1438/1652] Fix broken links in README --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index cf3dc8576..74bcaeefa 100644 --- a/README.md +++ b/README.md @@ -190,18 +190,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [sandbox]: http://restframework.herokuapp.com/ [index]: http://www.django-rest-framework.org/ -[oauth1-section]: http://www.django-rest-framework.org/api-guide/authentication.html#oauthauthentication -[oauth2-section]: http://www.django-rest-framework.org/api-guide/authentication.html#oauth2authentication -[serializer-section]: http://www.django-rest-framework.org/api-guide/serializers.html#serializers -[modelserializer-section]: http://www.django-rest-framework.org/api-guide/serializers.html#modelserializer -[functionview-section]: http://www.django-rest-framework.org/api-guide/views.html#function-based-views -[generic-views]: http://www.django-rest-framework.org/api-guide/generic-views.html -[viewsets]: http://www.django-rest-framework.org/api-guide/viewsets.html -[routers]: http://www.django-rest-framework.org/api-guide/routers.html -[serializers]: http://www.django-rest-framework.org/api-guide/serializers.html -[authentication]: http://www.django-rest-framework.org/api-guide/authentication.html +[oauth1-section]: http://www.django-rest-framework.org/api-guide/authentication/#oauthauthentication +[oauth2-section]: http://www.django-rest-framework.org/api-guide/authentication/#oauth2authentication +[serializer-section]: http://www.django-rest-framework.org/api-guide/serializers/#serializers +[modelserializer-section]: http://www.django-rest-framework.org/api-guide/serializers/#modelserializer +[functionview-section]: http://www.django-rest-framework.org/api-guide/views/#function-based-views +[generic-views]: http://www.django-rest-framework.org/api-guide/generic-views/ +[viewsets]: http://www.django-rest-framework.org/api-guide/viewsets/ +[routers]: http://www.django-rest-framework.org/api-guide/routers/ +[serializers]: http://www.django-rest-framework.org/api-guide/serializers/ +[authentication]: http://www.django-rest-framework.org/api-guide/authentication/ -[rest-framework-2-announcement]: http://www.django-rest-framework.org/topics/rest-framework-2-announcement.html +[rest-framework-2-announcement]: http://www.django-rest-framework.org/topics/rest-framework-2-announcement [2.1.0-notes]: https://groups.google.com/d/topic/django-rest-framework/Vv2M0CMY9bg/discussion [image]: http://www.django-rest-framework.org/img/quickstart.png From d6bff10f9829b3cef1c2773c303b172a8c7ec525 Mon Sep 17 00:00:00 2001 From: Ask Holme <ask@askholme.dk> Date: Sat, 10 Jan 2015 18:15:21 +0100 Subject: [PATCH 1439/1652] Make FileUploadParser work with standard django API Output from parsers ends up in a Django MergeDict and they exists elements to be dicts - not None --- rest_framework/parsers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index 3e3395c0c..401856ec4 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -277,7 +277,7 @@ class FileUploadParser(BaseParser): for index, handler in enumerate(upload_handlers): file_obj = handler.file_complete(counters[index]) if file_obj: - return DataAndFiles(None, {'file': file_obj}) + return DataAndFiles({}, {'file': file_obj}) raise ParseError("FileUpload parse error - " "none of upload handlers can handle the stream") From d6d08db0dd16f4a4a93b69ecf1c5948f375335b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20Padilla?= <jpadilla@webapplicate.com> Date: Sun, 11 Jan 2015 10:55:56 -0400 Subject: [PATCH 1440/1652] Fix ident format when using HTTP_X_FORWARDED_FOR If NUM_PROXIES setting is set to None, HTTP_X_FORWARDED_FOR might be used as is, which might contain spaces and cause errors on cache backends like memcached. --- rest_framework/throttling.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index 361dbddf0..7dfe2f967 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -35,7 +35,7 @@ class BaseThrottle(object): client_addr = addrs[-min(num_proxies, len(xff))] return client_addr.strip() - return xff if xff else remote_addr + return ''.join(xff.split()) if xff else remote_addr def wait(self): """ @@ -173,12 +173,6 @@ class AnonRateThrottle(SimpleRateThrottle): if request.user.is_authenticated(): return None # Only throttle unauthenticated requests. - ident = request.META.get('HTTP_X_FORWARDED_FOR') - if ident is None: - ident = request.META.get('REMOTE_ADDR') - else: - ident = ''.join(ident.split()) - return self.cache_format % { 'scope': self.scope, 'ident': self.get_ident(request) From cc13ee0577fb3de9602da634ab9c835749da49c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Mon, 12 Jan 2015 08:12:24 -0400 Subject: [PATCH 1441/1652] Fix error when NUM_PROXIES is greater than one --- rest_framework/throttling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index 7dfe2f967..0f10136d6 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -32,7 +32,7 @@ class BaseThrottle(object): if num_proxies == 0 or xff is None: return remote_addr addrs = xff.split(',') - client_addr = addrs[-min(num_proxies, len(xff))] + client_addr = addrs[-min(num_proxies, len(addrs))] return client_addr.strip() return ''.join(xff.split()) if xff else remote_addr From 7f9a62a5bf6a86c4d0a96e5f00d7e96b22d3337f Mon Sep 17 00:00:00 2001 From: Philip Neustrom <philipn@gmail.com> Date: Tue, 13 Jan 2015 15:19:52 +0800 Subject: [PATCH 1442/1652] Fix link to `django-rest-framework-filters` (formerly `django-rest-framework-chain`) --- docs/api-guide/filtering.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 07420d842..2b6d54492 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -388,9 +388,9 @@ We could achieve the same behavior by overriding `get_queryset()` on the views, The following third party packages provide additional filter implementations. -## Django REST framework chain +## Django REST framework filters package -The [django-rest-framework-chain package][django-rest-framework-chain] works together with the `DjangoFilterBackend` class, and allows you to easily create filters across relationships, or create multiple filter lookup types for a given field. +The [django-rest-framework-filters package][django-rest-framework-filters] works together with the `DjangoFilterBackend` class, and allows you to easily create filters across relationships, or create multiple filter lookup types for a given field. [cite]: https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-specific-objects-with-filters [django-filter]: https://github.com/alex/django-filter @@ -400,4 +400,4 @@ The [django-rest-framework-chain package][django-rest-framework-chain] works tog [view-permissions-blogpost]: http://blog.nyaruka.com/adding-a-view-permission-to-django-models [nullbooleanselect]: https://github.com/django/django/blob/master/django/forms/widgets.py [search-django-admin]: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#django.contrib.admin.ModelAdmin.search_fields -[django-rest-framework-chain]: https://github.com/philipn/django-rest-framework-chain +[django-rest-framework-filters]: https://github.com/philipn/django-rest-framework-filters From 2b28026fc10c2a8d3e4c9ef1f11b2f802a40ec77 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 13 Jan 2015 10:44:40 +0000 Subject: [PATCH 1443/1652] Translation info -> project management --- CONTRIBUTING.md | 125 +++++++++++------------------- docs/topics/project-management.md | 55 ++++++++++++- 2 files changed, 99 insertions(+), 81 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d94eb87e0..c9626ebff 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,9 +10,9 @@ There are many ways you can contribute to Django REST framework. We'd like it t The most important thing you can do to help push the REST framework project forward is to be actively involved wherever possible. Code contributions are often overvalued as being the primary way to get involved in a project, we don't believe that needs to be the case. -If you use REST framework, we'd love you to be vocal about your experiences with it - you might consider writing a blog post about using REST framework, or publishing a tutorial about building a project with a particular Javascript framework. Experiences from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are more difficult to understand and work with. +If you use REST framework, we'd love you to be vocal about your experiences with it - you might consider writing a blog post about using REST framework, or publishing a tutorial about building a project with a particular JavaScript framework. Experiences from beginners can be particularly helpful because you'll be in the best position to assess which bits of REST framework are more difficult to understand and work with. -Other really great ways you can help move the community forward include helping answer questions on the [discussion group][google-group], or setting up an [email alert on StackOverflow][so-filter] so that you get notified of any new questions with the `django-rest-framework` tag. +Other really great ways you can help move the community forward include helping to answer questions on the [discussion group][google-group], or setting up an [email alert on StackOverflow][so-filter] so that you get notified of any new questions with the `django-rest-framework` tag. When answering questions make sure to help future contributors find their way around by hyperlinking wherever possible to related threads and tickets, and include backlinks from those items if relevant. @@ -52,7 +52,7 @@ To start developing on Django REST framework, clone the repo: git clone git@github.com:tomchristie/django-rest-framework.git -Changes should broadly follow the [PEP 8][pep-8] style conventions, and we recommend you setup your editor to automatically indicated non-conforming styles. +Changes should broadly follow the [PEP 8][pep-8] style conventions, and we recommend you set up your editor to automatically indicate non-conforming styles. ## Testing @@ -60,13 +60,47 @@ To run the tests, clone the repository, and then: # Setup the virtual environment virtualenv env - env/bin/activate + source env/bin/activate pip install -r requirements.txt # Run the tests ./runtests.py -You can also use the excellent [`tox`][tox] testing tool to run the tests against all supported versions of Python and Django. Install `tox` globally, and then simply run: +### Test options + +Run using a more concise output style. + + ./runtests.py -q + +Run the tests using a more concise output style, no coverage, no flake8. + + ./runtests.py --fast + +Don't run the flake8 code linting. + + ./runtests.py --nolint + +Only run the flake8 code linting, don't run the tests. + + ./runtests.py --lintonly + +Run the tests for a given test case. + + ./runtests.py MyTestCase + +Run the tests for a given test method. + + ./runtests.py MyTestCase.test_this_method + +Shorter form to run the tests for a given test method. + + ./runtests.py test_this_method + +Note: The test case and test method matching is fuzzy and will sometimes run other tests that contain a partial string match to the given command line input. + +### Running against multiple environments + +You can also use the excellent [tox][tox] testing tool to run the tests against all supported versions of Python and Django. Install `tox` globally, and then simply run: tox @@ -82,7 +116,7 @@ GitHub's documentation for working on pull requests is [available here][pull-req Always run the tests before submitting pull requests, and ideally run `tox` in order to check that your modifications are compatible with both Python 2 and Python 3, and that they run properly on all supported versions of Django. -Once you've made a pull request take a look at the travis build status in the GitHub interface and make sure the tests are running as you'd expect. +Once you've made a pull request take a look at the Travis build status in the GitHub interface and make sure the tests are running as you'd expect. ![Travis status][travis-status] @@ -96,7 +130,7 @@ Sometimes, in order to ensure your code works on various different versions of D The documentation for REST framework is built from the [Markdown][markdown] source files in [the docs directory][docs]. -There are many great markdown editors that make working with the documentation really easy. The [Mou editor for Mac][mou] is one such editor that comes highly recommended. +There are many great Markdown editors that make working with the documentation really easy. The [Mou editor for Mac][mou] is one such editor that comes highly recommended. ## Building the documentation @@ -104,7 +138,7 @@ To build the documentation, install MkDocs with `pip install mkdocs` and then ru mkdocs build -This will build the html output into the `html` directory. +This will build the documentation into the `site` directory. You can build the documentation and open a preview in a browser window by using the `serve` command. @@ -117,8 +151,7 @@ Documentation should be in American English. The tone of the documentation is v Some other tips: * Keep paragraphs reasonably short. -* Use double spacing after the end of sentences. -* Don't use the abbreviations such as 'e.g.' but instead use long form, such as 'For example'. +* Don't use abbreviations such as 'e.g.' but instead use the long form, such as 'For example'. ## Markdown style @@ -151,7 +184,7 @@ If you are hyperlinking to another REST framework document, you should use a rel [authentication]: ../api-guide/authentication.md -Linking in this style means you'll be able to click the hyperlink in your markdown editor to open the referenced document. When the documentation is built, these links will be converted into regular links to HTML pages. +Linking in this style means you'll be able to click the hyperlink in your Markdown editor to open the referenced document. When the documentation is built, these links will be converted into regular links to HTML pages. ##### 3. Notes @@ -163,70 +196,6 @@ If you want to draw attention to a note or warning, use a pair of enclosing line --- -# Third party packages - -New features to REST framework are generally recommended to be implemented as third party libraries that are developed outside of the core framework. Ideally third party libraries should be properly documented and packaged, and made available on PyPI. - -## Getting started - -If you have some functionality that you would like to implement as a third party package it's worth contacting the [discussion group][google-group] as others may be willing to get involved. We strongly encourage third party package development and will always try to prioritize time spent helping their development, documentation and packaging. - -We recommend the [`django-reusable-app`][django-reusable-app] template as a good resource for getting up and running with implementing a third party Django package. - -## Linking to your package - -Once your package is decently documented and available on PyPI open a pull request or issue, and we'll add a link to it from the main REST framework documentation. - -# Translations - -If REST framework isn't translated into your language you can request that it is at the [Transifex project][transifex]. - -## Managing Transfiex -The [official Transifex client][transifex-client] is used to upload and download translations to Transifex. The client is installed using pip: - -``` -pip install transifex-client -``` - -To use it you'll need a login to Transifex which has a password, and you'll need to have administrative access to the Transifex project. You'll need to create a `~/.transifexrc` file which contains your authentication information: - -``` -[https://www.transifex.com] -username = user -token = -password = p@ssw0rd -hostname = https://www.transifex.com -``` - -## Upload new source translations -When any user-visible strings are changed, they should be uploaded to Transifex so that the translators can start to translate them. To do this, just run: - -``` -cd rest_framework -django-admin.py makemessages -l en_US -cd .. -tx push -s -``` - -When pushing source files, Transifex will update the source strings of a resource to match those from the new source file. - -Here's how differences between the old and new source files will be handled: - -* New strings will be added. -* Modified strings will be added as well. -* Strings which do not exist in the new source file will be removed from the database, along with their translations. If that source strings gets re-added later then [Transifex Translation Memory][translation-memory] will automatically restore the translated string too. - - -## Get translations -When a translator has finished translating their work needs to be downloaded from Transifex into the source repo. To do this, run: - -``` -tx pull -a -cd rest_framework -django-admin.py compilemessages -``` - -You can then commit as normal. [cite]: http://www.w3.org/People/Berners-Lee/FAQ.html [code-of-conduct]: https://www.djangoproject.com/conduct/ @@ -234,13 +203,9 @@ You can then commit as normal. [so-filter]: http://stackexchange.com/filters/66475/rest-framework [issues]: https://github.com/tomchristie/django-rest-framework/issues?state=open [pep-8]: http://www.python.org/dev/peps/pep-0008/ -[travis-status]: https://raw.github.com/tomchristie/django-rest-framework/master/docs/img/travis-status.png +[travis-status]: ../img/travis-status.png [pull-requests]: https://help.github.com/articles/using-pull-requests [tox]: http://tox.readthedocs.org/en/latest/ [markdown]: http://daringfireball.net/projects/markdown/basics [docs]: https://github.com/tomchristie/django-rest-framework/tree/master/docs [mou]: http://mouapp.com/ -[django-reusable-app]: https://github.com/dabapps/django-reusable-app -[transifex]: https://www.transifex.com/projects/p/django-rest-framework/ -[transifex-client]: https://pypi.python.org/pypi/transifex-client -[translation-memory]: http://docs.transifex.com/guides/tm#let-tm-automatically-populate-translations \ No newline at end of file diff --git a/docs/topics/project-management.md b/docs/topics/project-management.md index f581cabd3..7f7051966 100644 --- a/docs/topics/project-management.md +++ b/docs/topics/project-management.md @@ -63,10 +63,11 @@ The following template should be used for the description of the issue, and serv Team members have the following responsibilities. -* Add triage labels and milestones to tickets. * Close invalid or resolved tickets. +* Add triage labels and milestones to tickets. * Merge finalized pull requests. * Build and deploy the documentation, using `mkdocs gh-deploy`. +* Build and update the included translation packs. Further notes for maintainers: @@ -112,6 +113,55 @@ When pushing the release to PyPI ensure that your environment has been installed --- +## Translations + +The maintenance team are responsible for managing the translation packs include in REST framework. Translating the source strings into multiple languages is managed through the [transifex service][transifex-project]. + +### Managing Transifex + +The [official Transifex client][transifex-client] is used to upload and download translations to Transifex. The client is installed using pip: + + pip install transifex-client + +To use it you'll need a login to Transifex which has a password, and you'll need to have administrative access to the Transifex project. You'll need to create a `~/.transifexrc` file which contains your credentials. + + [https://www.transifex.com] + username = *** + token = *** + password = *** + hostname = https://www.transifex.com + +### Upload new source files + +When any user visible strings are changed, they should be uploaded to Transifex so that the translators can start to translate them. To do this, just run: + + # 1. Update the source django.po file, which is the US English version. + cd rest_framework + django-admin.py makemessages -l en_US + # 2. Push the source django.po file to Transifex. + cd .. + tx push -s + +When pushing source files, Transifex will update the source strings of a resource to match those from the new source file. + +Here's how differences between the old and new source files will be handled: + +* New strings will be added. +* Modified strings will be added as well. +* Strings which do not exist in the new source file will be removed from the database, along with their translations. If that source strings gets re-added later then [Transifex Translation Memory][translation-memory] will automatically include the translation string. + +### Download translations + +When a translator has finished translating their work needs to be downloaded from Transifex into the REST framework repository. To do this, run: + + # 3. Pull the translated django.po files from Transifex. + tx pull -a + cd rest_framework + # 4. Compile the binary .mo files for all supported languages. + django-admin.py compilemessages + +--- + ## Project ownership The PyPI package is owned by `@tomchristie`. As a backup `@j4mie` also has ownership of the package. @@ -129,6 +179,9 @@ The following issues still need to be addressed: [bus-factor]: http://en.wikipedia.org/wiki/Bus_factor [un-triaged]: https://github.com/tomchristie/django-rest-framework/issues?q=is%3Aopen+no%3Alabel +[transifex-project]: https://www.transifex.com/projects/p/django-rest-framework/ +[transifex-client]: https://pypi.python.org/pypi/transifex-client +[translation-memory]: http://docs.transifex.com/guides/tm#let-tm-automatically-populate-translations [github-org]: https://github.com/tomchristie/django-rest-framework/issues/2162 [sandbox]: http://restframework.herokuapp.com/ [mailing-list]: https://groups.google.com/forum/#!forum/django-rest-framework From 8e2dc6b26dd546f6b31aa6d1feb881b181f3ea21 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 13 Jan 2015 12:07:25 +0000 Subject: [PATCH 1444/1652] Update internationalization docs --- docs/index.md | 1 + docs/topics/internationalisation.md | 95 ----------------------------- docs/topics/internationalization.md | 72 ++++++++++++++++++++++ mkdocs.yml | 1 + 4 files changed, 74 insertions(+), 95 deletions(-) delete mode 100644 docs/topics/internationalisation.md create mode 100644 docs/topics/internationalization.md diff --git a/docs/index.md b/docs/index.md index 544204c65..163769851 100644 --- a/docs/index.md +++ b/docs/index.md @@ -305,6 +305,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [settings]: api-guide/settings.md [documenting-your-api]: topics/documenting-your-api.md +[internationalization]: topics/documenting-your-api.md [ajax-csrf-cors]: topics/ajax-csrf-cors.md [browser-enhancements]: topics/browser-enhancements.md [browsableapi]: topics/browsable-api.md diff --git a/docs/topics/internationalisation.md b/docs/topics/internationalisation.md deleted file mode 100644 index 2a476c864..000000000 --- a/docs/topics/internationalisation.md +++ /dev/null @@ -1,95 +0,0 @@ -# Internationalisation -REST framework ships with translatable error messages. You can make these appear in your language enabling [Django's standard translation mechanisms][django-translation] and by translating the messages into your language. - -## How to translate REST Framework errors - -REST framework translations are managed online using [Transifex.com][transifex]. To get started, checkout the guide in the [CONTRIBUTING.md guide][contributing]. - -Sometimes you may want to use REST Framework in a language which has not been translated yet on Transifex. If that is the case then you should translate the error messages locally. - -#### How to translate REST Framework error messages locally: - -This guide assumes you are already familiar with how to translate a Django app. If you're not, start by reading [Django's translation docs][django-translation]. - -1. Make a new folder where you want to store the translated errors. Add this -path to your [`LOCALE_PATHS`][django-locale-paths] setting. - - --- - - **Note:** For the rest of -this document we will assume the path you created was -`/home/www/project/conf/locale/`, and that you have updated your `settings.py` to include the setting: - - ``` - LOCALE_PATHS = ( - '/home/www/project/conf/locale/', - ) - ``` - - --- - -2. Now create a subfolder for the language you want to translate. The folder should be named using [locale -name][django-locale-name] notation. E.g. `de`, `pt_BR`, `es_AR`, etc. - - ``` - mkdir /home/www/project/conf/locale/pt_BR/LC_MESSAGES - ``` - -3. Now copy the base translations file from the REST framework source code -into your translations folder - - ``` - cp /home/user/.virtualenvs/myproject/lib/python2.7/site-packages/rest_framework/locale/en_US/LC_MESSAGES/django.po - /home/www/project/conf/locale/pt_BR/LC_MESSAGES - ``` - - This should create the file - `/home/www/project/conf/locale/pt_BR/LC_MESSAGES/django.po` - - --- - - **Note:** To find out where `rest_framework` is installed, run - - ``` - python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())" - ``` - - --- - - -4. Edit `/home/www/project/conf/locale/pt_BR/LC_MESSAGES/django.po` and -translate all the error messages. - -5. Run `manage.py compilemessages -l pt_BR` to make the translations -available for Django to use. You should see a message - - ``` - processing file django.po in /home/www/project/conf/locale/pt_BR/LC_MESSAGES - ``` - -6. Restart your server. - - - -## How Django chooses which language to use -REST framework will use the same preferences to select which language to -display as Django does. You can find more info in the [Django docs on discovering language preferences][django-language-preference]. For reference, these are - -1. First, it looks for the language prefix in the requested URL -2. Failing that, it looks for the `LANGUAGE_SESSION_KEY` key in the current user’s session. -3. Failing that, it looks for a cookie -4. Failing that, it looks at the `Accept-Language` HTTP header. -5. Failing that, it uses the global `LANGUAGE_CODE` setting. - ---- - -**Note:** You'll need to include the `django.middleware.locale.LocaleMiddleware` to enable any of the per-request language preferences. - ---- - - -[django-translation]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation -[django-language-preference]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation/#how-django-discovers-language-preference -[django-locale-paths]: https://docs.djangoproject.com/en/1.7/ref/settings/#std:setting-LOCALE_PATHS -[django-locale-name]: https://docs.djangoproject.com/en/1.7/topics/i18n/#term-locale-name -[contributing]: ../../CONTRIBUTING.md diff --git a/docs/topics/internationalization.md b/docs/topics/internationalization.md new file mode 100644 index 000000000..fdde6c43a --- /dev/null +++ b/docs/topics/internationalization.md @@ -0,0 +1,72 @@ +# Internationalization + +> Supporting internationalization is not optional. It must be a core feature. +> +> — [Jannis Leidel, speaking at Django Under the Hood, 2015][cite]. + +REST framework ships with translatable error messages. You can make these appear in your language enabling [Django's standard translation mechanisms][django-translation]. + +Doing so will allow you to: + +* Select a language other than English as the default, using the standard `LANGUAGE_CODE` Django setting. +* Allow clients to choose a language themselves, using the `LocaleMiddleware` included with Django. A typical usage for API clients would be to include an `Accept-Language` request header. + +Note that the translations only apply to the error strings themselves. The format of error messages, and the keys of field names will remain the same. An example `400 Bad Request` response body might look like this: + + {"detail": {"username": ["Esse campo deve ser unico."]}} + +If you want to use different string for parts of the response such as `detail` and `non_field_errors` then you can modify this behavior by using a [custom exception handler][custom-exception-handler]. + +## Adding new translations + +REST framework translations are managed online using [Transifex][transifex-project]. You can use the Transifex service to add new translation languages. The maintenance team will then ensure that these translation strings are included in the REST framework package. + +Sometimes you may need to add translation strings to your project locally. You may need to do this if: + +* You want to use REST Framework in a language which has not been translated yet on Transifex. +* Your project includes custom error messages, which are not part of REST framework's default translation strings. + +#### Translating a new language locally + +This guide assumes you are already familiar with how to translate a Django app. If you're not, start by reading [Django's translation docs][django-translation]. + +If you're translating a new language you'll need to translate the existing REST framework error messages: + +1. Make a new folder where you want to store the internationalization resources. Add this path to your [`LOCALE_PATHS`][django-locale-paths] setting. + +2. Now create a subfolder for the language you want to translate. The folder should be named using [locale name][django-locale-name] notation. For example: `de`, `pt_BR`, `es_AR`. + +3. Now copy the [base translations file][django-po-source] from the REST framework source code into your translations folder. + +4. Edit the `django.po` file you've just copied, translating all the error messages. + +5. Run `manage.py compilemessages -l pt_BR` to make the translations +available for Django to use. You should see a message like `processing file django.po in <...>/locale/pt_BR/LC_MESSAGES`. + +6. Restart your development server to see the changes take effect. + +If you're only translating custom error messages that exist inside your project codebase you don't need to copy the REST framework source `django.po` file into a `LOCALE_PATHS` folder, and can instead simply run Django's standard `makemessages` process. + +## How the language is determined + +If you want to allow per-request language preferences you'll need to include `django.middleware.locale.LocaleMiddleware` in your `MIDDLEWARE_CLASSES` setting. + +You can find more information on how the language preference is determined in the [Django documentation][django-language-preference]. For reference, the method is: + +1. First, it looks for the language prefix in the requested URL. +2. Failing that, it looks for the `LANGUAGE_SESSION_KEY` key in the current user’s session. +3. Failing that, it looks for a cookie. +4. Failing that, it looks at the `Accept-Language` HTTP header. +5. Failing that, it uses the global `LANGUAGE_CODE` setting. + +For API clients the most appropriate of these will typically be to use the `Accept-Language` header; Sessions and cookies will not be available unless using session authentication, and generally better practice to prefer an `Accept-Language` header for API clients rather than using language URL prefixes. + +[cite]: http://youtu.be/Wa0VfS2q94Y +[django-translation]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation +[custom-exception-handler]: ../api-guide/exceptions.md#custom-exception-handling +[transifex-project]: https://www.transifex.com/projects/p/django-rest-framework/ +[django-po-source]: https://raw.githubusercontent.com/tomchristie/django-rest-framework/master/rest_framework/locale/en_US/LC_MESSAGES/django.po +[django-language-preference]: https://docs.djangoproject.com/en/1.7/topics/i18n/translation/#how-django-discovers-language-preference +[django-locale-paths]: https://docs.djangoproject.com/en/1.7/ref/settings/#std:setting-LOCALE_PATHS +[django-locale-name]: https://docs.djangoproject.com/en/1.7/topics/i18n/#term-locale-name +[contributing]: ../../CONTRIBUTING.md diff --git a/mkdocs.yml b/mkdocs.yml index b394a827d..89df4cea5 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -42,6 +42,7 @@ pages: - ['api-guide/testing.md', 'API Guide', 'Testing'] - ['api-guide/settings.md', 'API Guide', 'Settings'] - ['topics/documenting-your-api.md', 'Topics', 'Documenting your API'] + - ['topics/internationalization.md', 'Topics', 'Internationalization'] - ['topics/ajax-csrf-cors.md', 'Topics', 'AJAX, CSRF & CORS'] - ['topics/browser-enhancements.md', 'Topics',] - ['topics/browsable-api.md', 'Topics', 'The Browsable API'] From 564f845e21cd55669311db9491b85dc86a5ff628 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 13 Jan 2015 12:21:03 +0000 Subject: [PATCH 1445/1652] Lower header font weights for nicer docs style --- docs/topics/3.1-announcement.md | 7 +++++++ docs_theme/css/default.css | 15 +++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 docs/topics/3.1-announcement.md diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md new file mode 100644 index 000000000..a0ad98299 --- /dev/null +++ b/docs/topics/3.1-announcement.md @@ -0,0 +1,7 @@ +# Versioning + +# Pagination + +# Internationalization + +# ModelSerializer API diff --git a/docs_theme/css/default.css b/docs_theme/css/default.css index 48d00366b..3feff0bad 100644 --- a/docs_theme/css/default.css +++ b/docs_theme/css/default.css @@ -171,6 +171,21 @@ body{ background-attachment: fixed; } + +#main-content h1:first-of-type { + margin-top: 0 +} + +#main-content h1, #main-content h2 { + font-weight: 300; + margin-top: 20px +} + +#main-content h3, #main-content h4, #main-content h5 { + font-weight: 500; + margin-top: 15px +} + /* custom navigation styles */ .navbar .navbar-inner{ From 1bcec3a0ac4346b31b655a08505d3e3dc2156604 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 13 Jan 2015 17:14:13 +0000 Subject: [PATCH 1446/1652] API tweaks and pagination documentation --- docs/api-guide/pagination.md | 174 +++++++++++++---------------------- rest_framework/generics.py | 6 +- rest_framework/pagination.py | 28 ++++-- 3 files changed, 86 insertions(+), 122 deletions(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 834292920..9fbeb22a0 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -6,148 +6,101 @@ source: pagination.py > > — [Django documentation][cite] -REST framework includes a `PaginationSerializer` class that makes it easy to return paginated data in a way that can then be rendered to arbitrary media types. +REST framework includes support for customizable pagination styles. This allows you to modify how large result sets are split into individual pages of data. -## Paginating basic data +The pagination API can support either: -Let's start by taking a look at an example from the Django documentation. +* Pagination links that are provided as part of the content of the response. +* Pagination links that are included in response headers, such as `Content-Range` or `Link`. - from django.core.paginator import Paginator +The built-in styles currently all use links included as part of the content of the response. This style is more accessible when using the browsable API. - objects = ['john', 'paul', 'george', 'ringo'] - paginator = Paginator(objects, 2) - page = paginator.page(1) - page.object_list - # ['john', 'paul'] +Pagination is only performed automatically if you're using the generic views or viewsets. If you're using a regular `APIView`, you'll need to call into the pagination API yourself to ensure you return a paginated response. See the source code for the `mixins.ListMixin` and `generics.GenericAPIView` classes for an example. -At this point we've got a page object. If we wanted to return this page object as a JSON response, we'd need to provide the client with context such as next and previous links, so that it would be able to page through the remaining results. +## Setting the pagination style - from rest_framework.pagination import PaginationSerializer - - serializer = PaginationSerializer(instance=page) - serializer.data - # {'count': 4, 'next': '?page=2', 'previous': None, 'results': [u'john', u'paul']} - -The `context` argument of the `PaginationSerializer` class may optionally include the request. If the request is included in the context then the next and previous links returned by the serializer will use absolute URLs instead of relative URLs. - - request = RequestFactory().get('/foobar') - serializer = PaginationSerializer(instance=page, context={'request': request}) - serializer.data - # {'count': 4, 'next': 'http://testserver/foobar?page=2', 'previous': None, 'results': [u'john', u'paul']} - -We could now return that data in a `Response` object, and it would be rendered into the correct media type. - -## Paginating QuerySets - -Our first example worked because we were using primitive objects. If we wanted to paginate a queryset or other complex data, we'd need to specify a serializer to use to serialize the result set itself. - -We can do this using the `object_serializer_class` attribute on the inner `Meta` class of the pagination serializer. For example. - - class UserSerializer(serializers.ModelSerializer): - """ - Serializes user querysets. - """ - class Meta: - model = User - fields = ('username', 'email') - - class PaginatedUserSerializer(pagination.PaginationSerializer): - """ - Serializes page objects of user querysets. - """ - class Meta: - object_serializer_class = UserSerializer - -We could now use our pagination serializer in a view like this. - - @api_view('GET') - def user_list(request): - queryset = User.objects.all() - paginator = Paginator(queryset, 20) - - page = request.QUERY_PARAMS.get('page') - try: - users = paginator.page(page) - except PageNotAnInteger: - # If page is not an integer, deliver first page. - users = paginator.page(1) - except EmptyPage: - # If page is out of range (e.g. 9999), - # deliver last page of results. - users = paginator.page(paginator.num_pages) - - serializer_context = {'request': request} - serializer = PaginatedUserSerializer(users, - context=serializer_context) - return Response(serializer.data) - -## Pagination in the generic views - -The generic class based views `ListAPIView` and `ListCreateAPIView` provide pagination of the returned querysets by default. You can customise this behaviour by altering the pagination style, by modifying the default number of results, by allowing clients to override the page size using a query parameter, or by turning pagination off completely. - -The default pagination style may be set globally, using the `DEFAULT_PAGINATION_SERIALIZER_CLASS`, `PAGINATE_BY`, `PAGINATE_BY_PARAM`, and `MAX_PAGINATE_BY` settings. For example. +The default pagination style may be set globally, using the `DEFAULT_PAGINATION_CLASS` settings key. For example, to use the built-in limit/offset pagination, you would do: REST_FRAMEWORK = { - 'PAGINATE_BY': 10, # Default to 10 - 'PAGINATE_BY_PARAM': 'page_size', # Allow client to override, using `?page_size=xxx`. - 'MAX_PAGINATE_BY': 100 # Maximum limit allowed when using `?page_size=xxx`. + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination' } -You can also set the pagination style on a per-view basis, using the `ListAPIView` generic class-based view. +You can also set the pagination class on an individual view by using the `pagination_class` attribute. Typically you'll want to use the same pagination style throughout your API, although you might want to vary individual aspects of the pagination, such as default or maximum page size, on a per-view basis. - class PaginatedListView(ListAPIView): - queryset = ExampleModel.objects.all() - serializer_class = ExampleModelSerializer - paginate_by = 10 +## Modifying the pagination style + +If you want to modify particular aspects of the pagination style, you'll want to override one of the pagination classes, and set the attributes that you want to change. + + class LargeResultsSetPagination(PageNumberPagination): + paginate_by = 1000 paginate_by_param = 'page_size' - max_paginate_by = 100 + max_paginate_by = 10000 -Note that using a `paginate_by` value of `None` will turn off pagination for the view. -Note if you use the `PAGINATE_BY_PARAM` settings, you also have to set the `paginate_by_param` attribute in your view to `None` in order to turn off pagination for those requests that contain the `paginate_by_param` parameter. + class StandardResultsSetPagination(PageNumberPagination): + paginate_by = 100 + paginate_by_param = 'page_size' + max_paginate_by = 1000 -For more complex requirements such as serialization that differs depending on the requested media type you can override the `.get_paginate_by()` and `.get_pagination_serializer_class()` methods. +You can then apply your new style to a view using the `.pagination_class` attribute: + + class BillingRecordsView(generics.ListAPIView): + queryset = Billing.objects.all() + serializer = BillingRecordsSerializer + pagination_class = LargeResultsSetPagination + +Or apply the style globally, using the `DEFAULT_PAGINATION_CLASS` settings key. For example: + + REST_FRAMEWORK = { + 'DEFAULT_PAGINATION_CLASS': 'apps.core.pagination.StandardResultsSetPagination' } + +# API Reference + +## PageNumberPagination + +## LimitOffsetPagination --- -# Custom pagination serializers +# Custom pagination styles -To create a custom pagination serializer class you should override `pagination.BasePaginationSerializer` and set the fields that you want the serializer to return. +To create a custom pagination serializer class you should subclass `pagination.BasePagination` and override the `paginate_queryset(self, queryset, request, view)` and `get_paginated_response(self, data)` methods: -You can also override the name used for the object list field, by setting the `results_field` attribute, which defaults to `'results'`. +* The `paginate_queryset` method is passed the initial queryset and should return an iterable object that contains only the data in the requested page. +* The `get_paginated_response` method is passed the serialized page data and should return a `Response` instance. + +Note that the `paginate_queryset` method may set state on the pagination instance, that may later be used by the `get_paginated_response` method. ## Example -For example, to nest a pair of links labelled 'prev' and 'next', and set the name for the results field to 'objects', you might use something like this. +Let's modify the built-in `PageNumberPagination` style, so that instead of include the pagination links in the body of the response, we'll instead include a `Link` header, in a [similar style to the GitHub API][github-link-pagination]. - from rest_framework import pagination - from rest_framework import serializers + class LinkHeaderPagination(PageNumberPagination) + def get_paginated_response(self, data): + next_url = self.get_next_link() previous_url = self.get_previous_link() - class LinksSerializer(serializers.Serializer): - next = pagination.NextPageField(source='*') - prev = pagination.PreviousPageField(source='*') + if next_url is not None and previous_url is not None: + link = '<{next_url}; rel="next">, <{previous_url}; rel="prev">' + elif next_url is not None: + link = '<{next_url}; rel="next">' + elif prev_url is not None: + link = '<{previous_url}; rel="prev">' + else: + link = '' - class CustomPaginationSerializer(pagination.BasePaginationSerializer): - links = LinksSerializer(source='*') # Takes the page object as the source - total_results = serializers.ReadOnlyField(source='paginator.count') + link = link.format(next_url=next_url, previous_url=previous_url) + headers = {'Link': link} if link else {} - results_field = 'objects' + return Response(data, headers=headers) -## Using your custom pagination serializer +## Using your custom pagination class -To have your custom pagination serializer be used by default, use the `DEFAULT_PAGINATION_SERIALIZER_CLASS` setting: +To have your custom pagination class be used by default, use the `DEFAULT_PAGINATION_CLASS` setting: REST_FRAMEWORK = { - 'DEFAULT_PAGINATION_SERIALIZER_CLASS': - 'example_app.pagination.CustomPaginationSerializer', + 'DEFAULT_PAGINATION_CLASS': + 'my_project.apps.core.pagination.LinkHeaderPagination', } -Alternatively, to set your custom pagination serializer on a per-view basis, use the `pagination_serializer_class` attribute on a generic class based view: - - class PaginatedListView(generics.ListAPIView): - model = ExampleModel - pagination_serializer_class = CustomPaginationSerializer - paginate_by = 10 - # Third party packages The following third party packages are also available. @@ -157,5 +110,6 @@ The following third party packages are also available. The [`DRF-extensions` package][drf-extensions] includes a [`PaginateByMaxMixin` mixin class][paginate-by-max-mixin] that allows your API clients to specify `?page_size=max` to obtain the maximum allowed page size. [cite]: https://docs.djangoproject.com/en/dev/topics/pagination/ +[github-link-pagination]: https://developer.github.com/guides/traversing-with-pagination/ [drf-extensions]: http://chibisov.github.io/drf-extensions/docs/ [paginate-by-max-mixin]: http://chibisov.github.io/drf-extensions/docs/#paginatebymaxmixin diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 12fb64138..cdf6ece08 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -160,11 +160,11 @@ class GenericAPIView(views.APIView): def paginate_queryset(self, queryset): if self.pager is None: - return None + return queryset return self.pager.paginate_queryset(queryset, self.request, view=self) - def get_paginated_response(self, objects): - return self.pager.get_paginated_response(objects) + def get_paginated_response(self, data): + return self.pager.get_paginated_response(data) # Concrete view classes that provide method handlers diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index da2d60a44..b9d487968 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -25,11 +25,21 @@ def _strict_positive_int(integer_string, cutoff=None): return ret +def _get_count(queryset): + """ + Determine an object count, supporting either querysets or regular lists. + """ + try: + return queryset.count() + except AttributeError: + return len(queryset) + + class BasePagination(object): - def paginate_queryset(self, queryset, request): + def paginate_queryset(self, queryset, request, view): raise NotImplemented('paginate_queryset() must be implemented.') - def get_paginated_response(self, data, page, request): + def get_paginated_response(self, data): raise NotImplemented('get_paginated_response() must be implemented.') @@ -58,8 +68,8 @@ class PageNumberPagination(BasePagination): def paginate_queryset(self, queryset, request, view): """ - Paginate a queryset if required, either returning a page object, - or `None` if pagination is not configured for this view. + Paginate a queryset if required, either returning a + page object, or `None` if pagination is not configured for this view. """ for attr in ( 'paginate_by', 'page_query_param', @@ -97,12 +107,12 @@ class PageNumberPagination(BasePagination): self.request = request return self.page - def get_paginated_response(self, objects): + def get_paginated_response(self, data): return Response(OrderedDict([ ('count', self.page.paginator.count), ('next', self.get_next_link()), ('previous', self.get_previous_link()), - ('results', objects) + ('results', data) ])) def get_page_size(self, request): @@ -147,16 +157,16 @@ class LimitOffsetPagination(BasePagination): def paginate_queryset(self, queryset, request, view): self.limit = self.get_limit(request) self.offset = self.get_offset(request) - self.count = queryset.count() + self.count = _get_count(queryset) self.request = request return queryset[self.offset:self.offset + self.limit] - def get_paginated_response(self, objects): + def get_paginated_response(self, data): return Response(OrderedDict([ ('count', self.count), ('next', self.get_next_link()), ('previous', self.get_previous_link()), - ('results', objects) + ('results', data) ])) def get_limit(self, request): From 4ce4132e08ba7764f120c71eeebdbaefee281689 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 14 Jan 2015 12:56:03 +0000 Subject: [PATCH 1447/1652] Preserve ordering on relationship drop-down choices. Closes #2408. --- rest_framework/relations.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 7b119291d..aa0c2defe 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -7,6 +7,7 @@ from django.utils import six from django.utils.encoding import smart_text from django.utils.six.moves.urllib import parse as urlparse from django.utils.translation import ugettext_lazy as _ +from rest_framework.compat import OrderedDict from rest_framework.fields import get_attribute, empty, Field from rest_framework.reverse import reverse from rest_framework.utils import html @@ -103,7 +104,7 @@ class RelatedField(Field): @property def choices(self): - return dict([ + return OrderedDict([ ( six.text_type(self.to_representation(item)), six.text_type(item) @@ -364,7 +365,7 @@ class ManyRelatedField(Field): (item, self.child_relation.to_representation(item)) for item in iterable ] - return dict([ + return OrderedDict([ ( six.text_type(item_representation), six.text_type(item) + ' - ' + six.text_type(item_representation) From 4d287c7aef7b12086930eeb7a05cadb7e8b2cc48 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 14 Jan 2015 13:19:56 +0000 Subject: [PATCH 1448/1652] Include paragraph around view description in browable API --- rest_framework/utils/formatting.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index 470af51b0..173848df7 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -59,4 +59,5 @@ def markup_description(description): description = apply_markdown(description) else: description = escape(description).replace('\n', '<br />') + description = '<p>' + description + '</p>' return mark_safe(description) From f13fcba9a9f41f7e00e0ea8956fcc65ca168c76c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 14 Jan 2015 13:20:02 +0000 Subject: [PATCH 1449/1652] Include paragraph around view description in browable API --- rest_framework/utils/formatting.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index 173848df7..8b6f005e1 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -2,12 +2,10 @@ Utility functions to return a formatted name and description for a given view. """ from __future__ import unicode_literals -import re - from django.utils.html import escape from django.utils.safestring import mark_safe - from rest_framework.compat import apply_markdown, force_text +import re def remove_trailing_string(content, trailing): From 3833a5bb8a9174e5fb09dac59a964eff24b6065e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 14 Jan 2015 16:51:26 +0000 Subject: [PATCH 1450/1652] Include pagination control in browsable API --- rest_framework/pagination.py | 90 ++++++++++++++++++- rest_framework/renderers.py | 1 + .../rest_framework/css/bootstrap-tweaks.css | 4 - .../templates/rest_framework/base.html | 9 ++ .../rest_framework/pagination/numbers.html | 27 ++++++ rest_framework/templatetags/rest_framework.py | 17 ++++ 6 files changed, 143 insertions(+), 5 deletions(-) create mode 100644 rest_framework/templates/rest_framework/pagination/numbers.html diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index b9d487968..bd343c0dd 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -3,14 +3,18 @@ Pagination serializers determine the structure of the output that should be used for paginated responses. """ from __future__ import unicode_literals +from collections import namedtuple from django.core.paginator import InvalidPage, Paginator as DjangoPaginator +from django.template import Context, loader from django.utils import six from django.utils.translation import ugettext as _ from rest_framework.compat import OrderedDict from rest_framework.exceptions import NotFound from rest_framework.response import Response from rest_framework.settings import api_settings -from rest_framework.templatetags.rest_framework import replace_query_param +from rest_framework.templatetags.rest_framework import ( + replace_query_param, remove_query_param +) def _strict_positive_int(integer_string, cutoff=None): @@ -35,6 +39,49 @@ def _get_count(queryset): return len(queryset) +def _get_displayed_page_numbers(current, final): + """ + This utility function determines a list of page numbers to display. + This gives us a nice contextually relevant set of page numbers. + + For example: + current=14, final=16 -> [1, None, 13, 14, 15, 16] + """ + assert current >= 1 + assert final >= current + + # We always include the first two pages, last two pages, and + # two pages either side of the current page. + included = set(( + 1, + current - 1, current, current + 1, + final + )) + + # If the break would only exclude a single page number then we + # may as well include the page number instead of the break. + if current == 4: + included.add(2) + if current == final - 3: + included.add(final - 1) + + # Now sort the page numbers and drop anything outside the limits. + included = [ + idx for idx in sorted(list(included)) + if idx > 0 and idx <= final + ] + + # Finally insert any `...` breaks + if current > 4: + included.insert(1, None) + if current < final - 3: + included.insert(len(included) - 1, None) + return included + + +PageLink = namedtuple('PageLink', ['url', 'number', 'is_active', 'is_break']) + + class BasePagination(object): def paginate_queryset(self, queryset, request, view): raise NotImplemented('paginate_queryset() must be implemented.') @@ -66,6 +113,8 @@ class PageNumberPagination(BasePagination): # Only relevant if 'paginate_by_param' has also been set. max_paginate_by = api_settings.MAX_PAGINATE_BY + template = 'rest_framework/pagination/numbers.html' + def paginate_queryset(self, queryset, request, view): """ Paginate a queryset if required, either returning a @@ -104,6 +153,8 @@ class PageNumberPagination(BasePagination): ) raise NotFound(msg) + # Indicate that the browsable API should display pagination controls. + self.mark_as_used = True self.request = request return self.page @@ -139,8 +190,45 @@ class PageNumberPagination(BasePagination): return None url = self.request.build_absolute_uri() page_number = self.page.previous_page_number() + if page_number == 1: + return remove_query_param(url, self.page_query_param) return replace_query_param(url, self.page_query_param, page_number) + def to_html(self): + current = self.page.number + final = self.page.paginator.num_pages + + page_links = [] + base_url = self.request.build_absolute_uri() + for page_number in _get_displayed_page_numbers(current, final): + if page_number is None: + page_link = PageLink( + url=None, + number=None, + is_active=False, + is_break=True + ) + else: + if page_number == 1: + url = remove_query_param(base_url, self.page_query_param) + else: + url = replace_query_param(url, self.page_query_param, page_number) + page_link = PageLink( + url=url, + number=page_number, + is_active=(page_number == current), + is_break=False + ) + page_links.append(page_link) + + template = loader.get_template(self.template) + context = Context({ + 'previous_url': self.get_previous_link(), + 'next_url': self.get_next_link(), + 'page_links': page_links + }) + return template.render(context) + class LimitOffsetPagination(BasePagination): """ diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index c4de30db7..4c002b168 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -592,6 +592,7 @@ class BrowsableAPIRenderer(BaseRenderer): 'description': self.get_description(view), 'name': self.get_name(view), 'version': VERSION, + 'pager': getattr(view, 'pager', None), 'breadcrumblist': self.get_breadcrumbs(request), 'allowed_methods': view.allowed_methods, 'available_formats': [renderer_cls.format for renderer_cls in view.renderer_classes], diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css index 36c7be481..d4a7d31a2 100644 --- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css @@ -185,10 +185,6 @@ body a:hover { color: #c20000; } -#content a span { - text-decoration: underline; - } - .request-info { clear:both; } diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index e96681932..e00309811 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -119,9 +119,18 @@ <div class="page-header"> <h1>{{ name }}</h1> </div> + <div style="float:left"> {% block description %} {{ description }} {% endblock %} + </div> + + {% if pager.mark_as_used %} + <nav style="float: right"> + {% get_pagination_html pager %} + </nav> + {% endif %} + <div class="request-info" style="clear: both" > <pre class="prettyprint"><b>{{ request.method }}</b> {{ request.get_full_path }}</pre> </div> diff --git a/rest_framework/templates/rest_framework/pagination/numbers.html b/rest_framework/templates/rest_framework/pagination/numbers.html new file mode 100644 index 000000000..040458104 --- /dev/null +++ b/rest_framework/templates/rest_framework/pagination/numbers.html @@ -0,0 +1,27 @@ +<ul class="pagination" style="margin: 5px 0 10px 0"> + {% if previous_url %} + <li><a href="{{ previous_url }}" aria-label="Previous"><span aria-hidden="true">«</span></a></li> + {% else %} + <li class="disabled"><a href="#" aria-label="Previous"><span aria-hidden="true">«</span></a></li> + {% endif %} + + {% for page_link in page_links %} + {% if page_link.is_break %} + <li class="disabled"> + <a href="#"><span aria-hidden="true">…</span></a> + </li> + {% else %} + {% if page_link.is_active %} + <li class="active"><a href="{{ page_link.url }}">{{ page_link.number }}</a></li> + {% else %} + <li><a href="{{ page_link.url }}">{{ page_link.number }}</a></li> + {% endif %} + {% endif %} + {% endfor %} + + {% if next_url %} + <li><a href="{{ next_url }}" aria-label="Next"><span aria-hidden="true">»</span></a></li> + {% else %} + <li class="disabled"><a href="#" aria-label="Next"><span aria-hidden="true">»</span></a></li> + {% endif %} +</ul> diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 69e03af40..bf159d8b1 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -26,6 +26,23 @@ def replace_query_param(url, key, val): return urlparse.urlunsplit((scheme, netloc, path, query, fragment)) +def remove_query_param(url, key): + """ + Given a URL and a key/val pair, set or replace an item in the query + parameters of the URL, and return the new URL. + """ + (scheme, netloc, path, query, fragment) = urlparse.urlsplit(url) + query_dict = QueryDict(query).copy() + query_dict.pop(key, None) + query = query_dict.urlencode() + return urlparse.urlunsplit((scheme, netloc, path, query, fragment)) + + +@register.simple_tag +def get_pagination_html(pager): + return pager.to_html() + + # Regex for adding classes to html snippets class_re = re.compile(r'(?<=class=["\'])(.*)(?=["\'])') From 313aa727e3c44016e531a7af75051fc6e6d7cb96 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 14 Jan 2015 17:46:41 +0000 Subject: [PATCH 1451/1652] Tweaks --- docs/api-guide/pagination.md | 19 +++++++++++++++---- docs/img/link-header-pagination.png | Bin 0 -> 35799 bytes rest_framework/pagination.py | 12 ++++++++++-- 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 docs/img/link-header-pagination.png diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 9fbeb22a0..ba71a3032 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -74,7 +74,7 @@ Note that the `paginate_queryset` method may set state on the pagination instanc Let's modify the built-in `PageNumberPagination` style, so that instead of include the pagination links in the body of the response, we'll instead include a `Link` header, in a [similar style to the GitHub API][github-link-pagination]. - class LinkHeaderPagination(PageNumberPagination) + class LinkHeaderPagination(pagination.PageNumberPagination): def get_paginated_response(self, data): next_url = self.get_next_link() previous_url = self.get_previous_link() @@ -82,7 +82,7 @@ Let's modify the built-in `PageNumberPagination` style, so that instead of inclu link = '<{next_url}; rel="next">, <{previous_url}; rel="prev">' elif next_url is not None: link = '<{next_url}; rel="next">' - elif prev_url is not None: + elif previous_url is not None: link = '<{previous_url}; rel="prev">' else: link = '' @@ -97,10 +97,20 @@ Let's modify the built-in `PageNumberPagination` style, so that instead of inclu To have your custom pagination class be used by default, use the `DEFAULT_PAGINATION_CLASS` setting: REST_FRAMEWORK = { - 'DEFAULT_PAGINATION_CLASS': - 'my_project.apps.core.pagination.LinkHeaderPagination', + 'DEFAULT_PAGINATION_CLASS': 'my_project.apps.core.pagination.LinkHeaderPagination', + 'PAGINATE_BY': 10 } +API responses for list endpoints will now include a `Link` header, instead of including the pagination links as part of the body of the response, for example: + +--- + +![Link Header][link-header] + +*A custom pagination style, using the 'Link' header'* + +--- + # Third party packages The following third party packages are also available. @@ -111,5 +121,6 @@ The [`DRF-extensions` package][drf-extensions] includes a [`PaginateByMaxMixin` [cite]: https://docs.djangoproject.com/en/dev/topics/pagination/ [github-link-pagination]: https://developer.github.com/guides/traversing-with-pagination/ +[link-header]: ../img/link-header-pagination.png [drf-extensions]: http://chibisov.github.io/drf-extensions/docs/ [paginate-by-max-mixin]: http://chibisov.github.io/drf-extensions/docs/#paginatebymaxmixin diff --git a/docs/img/link-header-pagination.png b/docs/img/link-header-pagination.png new file mode 100644 index 0000000000000000000000000000000000000000..d3c556a4d6aebc3dc1575c43eced4059d864bab2 GIT binary patch literal 35799 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 Hu0mjfzM=e` literal 0 HcmV?d00001 diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index bd343c0dd..69d0f77d3 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -46,6 +46,12 @@ def _get_displayed_page_numbers(current, final): For example: current=14, final=16 -> [1, None, 13, 14, 15, 16] + + This implementation gives one page to each side of the cursor, + for an implementation which gives two pages to each side of the cursor, + which is a copy of how GitHub treat pagination in their issue lists, see: + + https://gist.github.com/tomchristie/321140cebb1c4a558b15 """ assert current >= 1 assert final >= current @@ -60,10 +66,12 @@ def _get_displayed_page_numbers(current, final): # If the break would only exclude a single page number then we # may as well include the page number instead of the break. - if current == 4: + if current <= 4: included.add(2) - if current == final - 3: + included.add(3) + if current >= final - 3: included.add(final - 1) + included.add(final - 2) # Now sort the page numbers and drop anything outside the limits. included = [ From d76e83dd78627a0cf4bcd4b28a7710fb678d8d4e Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 15 Jan 2015 16:52:07 +0000 Subject: [PATCH 1452/1652] Tweaks, and add pagination controls for offset/limit. --- rest_framework/generics.py | 16 +-- rest_framework/pagination.py | 126 +++++++++++++----- rest_framework/renderers.py | 7 +- .../rest_framework/css/bootstrap-tweaks.css | 7 + .../templates/rest_framework/base.html | 4 +- 5 files changed, 119 insertions(+), 41 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index cdf6ece08..4cc4c64d2 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -150,21 +150,21 @@ class GenericAPIView(views.APIView): return queryset @property - def pager(self): - if not hasattr(self, '_pager'): + def paginator(self): + if not hasattr(self, '_paginator'): if self.pagination_class is None: - self._pager = None + self._paginator = None else: - self._pager = self.pagination_class() - return self._pager + self._paginator = self.pagination_class() + return self._paginator def paginate_queryset(self, queryset): - if self.pager is None: + if self.paginator is None: return queryset - return self.pager.paginate_queryset(queryset, self.request, view=self) + return self.paginator.paginate_queryset(queryset, self.request, view=self) def get_paginated_response(self, data): - return self.pager.get_paginated_response(data) + return self.paginator.get_paginated_response(data) # Concrete view classes that provide method handlers diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 69d0f77d3..2b78f1f7f 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -29,6 +29,15 @@ def _strict_positive_int(integer_string, cutoff=None): return ret +def _divide_with_ceil(a, b): + """ + Returns 'a' divded by 'b', with any remainder rounded up. + """ + if a % b: + return (a / b) + 1 + return a / b + + def _get_count(queryset): """ Determine an object count, supporting either querysets or regular lists. @@ -48,14 +57,21 @@ def _get_displayed_page_numbers(current, final): current=14, final=16 -> [1, None, 13, 14, 15, 16] This implementation gives one page to each side of the cursor, - for an implementation which gives two pages to each side of the cursor, - which is a copy of how GitHub treat pagination in their issue lists, see: + or two pages to the side when the cursor is at the edge, then + ensures that any breaks between non-continous page numbers never + remove only a single page. + + For an alernativative implementation which gives two pages to each side of + the cursor, eg. as in GitHub issue list pagination, see: https://gist.github.com/tomchristie/321140cebb1c4a558b15 """ assert current >= 1 assert final >= current + if final <= 5: + return range(1, final + 1) + # We always include the first two pages, last two pages, and # two pages either side of the current page. included = set(( @@ -87,16 +103,46 @@ def _get_displayed_page_numbers(current, final): return included +def _get_page_links(page_numbers, current, url_func): + """ + Given a list of page numbers and `None` page breaks, + return a list of `PageLink` objects. + """ + page_links = [] + for page_number in page_numbers: + if page_number is None: + page_link = PageLink( + url=None, + number=None, + is_active=False, + is_break=True + ) + else: + page_link = PageLink( + url=url_func(page_number), + number=page_number, + is_active=(page_number == current), + is_break=False + ) + page_links.append(page_link) + return page_links + + PageLink = namedtuple('PageLink', ['url', 'number', 'is_active', 'is_break']) class BasePagination(object): + display_page_controls = False + def paginate_queryset(self, queryset, request, view): raise NotImplemented('paginate_queryset() must be implemented.') def get_paginated_response(self, data): raise NotImplemented('get_paginated_response() must be implemented.') + def to_html(self): + raise NotImplemented('to_html() must be implemented to display page controls.') + class PageNumberPagination(BasePagination): """ @@ -161,8 +207,9 @@ class PageNumberPagination(BasePagination): ) raise NotFound(msg) - # Indicate that the browsable API should display pagination controls. - self.mark_as_used = True + if paginator.count > 1: + # The browsable API should display pagination controls. + self.display_page_controls = True self.request = request return self.page @@ -203,31 +250,17 @@ class PageNumberPagination(BasePagination): return replace_query_param(url, self.page_query_param, page_number) def to_html(self): + base_url = self.request.build_absolute_uri() + def page_number_to_url(page_number): + if page_number == 1: + return remove_query_param(base_url, self.page_query_param) + else: + return replace_query_param(base_url, self.page_query_param, page_number) + current = self.page.number final = self.page.paginator.num_pages - - page_links = [] - base_url = self.request.build_absolute_uri() - for page_number in _get_displayed_page_numbers(current, final): - if page_number is None: - page_link = PageLink( - url=None, - number=None, - is_active=False, - is_break=True - ) - else: - if page_number == 1: - url = remove_query_param(base_url, self.page_query_param) - else: - url = replace_query_param(url, self.page_query_param, page_number) - page_link = PageLink( - url=url, - number=page_number, - is_active=(page_number == current), - is_break=False - ) - page_links.append(page_link) + page_numbers = _get_displayed_page_numbers(current, final) + page_links = _get_page_links(page_numbers, current, page_number_to_url) template = loader.get_template(self.template) context = Context({ @@ -250,11 +283,15 @@ class LimitOffsetPagination(BasePagination): offset_query_param = 'offset' max_limit = None + template = 'rest_framework/pagination/numbers.html' + def paginate_queryset(self, queryset, request, view): self.limit = self.get_limit(request) self.offset = self.get_offset(request) self.count = _get_count(queryset) self.request = request + if self.count > self.limit: + self.display_page_controls = True return queryset[self.offset:self.offset + self.limit] def get_paginated_response(self, data): @@ -285,16 +322,45 @@ class LimitOffsetPagination(BasePagination): except (KeyError, ValueError): return 0 - def get_next_link(self, page): + def get_next_link(self): if self.offset + self.limit >= self.count: return None + url = self.request.build_absolute_uri() offset = self.offset + self.limit return replace_query_param(url, self.offset_query_param, offset) - def get_previous_link(self, page): - if self.offset - self.limit < 0: + def get_previous_link(self): + if self.offset <= 0: return None + url = self.request.build_absolute_uri() + + if self.offset - self.limit <= 0: + return remove_query_param(url, self.offset_query_param) + offset = self.offset - self.limit return replace_query_param(url, self.offset_query_param, offset) + + def to_html(self): + base_url = self.request.build_absolute_uri() + current = _divide_with_ceil(self.offset, self.limit) + 1 + final = _divide_with_ceil(self.count, self.limit) + + def page_number_to_url(page_number): + if page_number == 1: + return remove_query_param(base_url, self.offset_query_param) + else: + offset = self.offset + ((page_number - current) * self.limit) + return replace_query_param(base_url, self.offset_query_param, offset) + + page_numbers = _get_displayed_page_numbers(current, final) + page_links = _get_page_links(page_numbers, current, page_number_to_url) + + template = loader.get_template(self.template) + context = Context({ + 'previous_url': self.get_previous_link(), + 'next_url': self.get_next_link(), + 'page_links': page_links + }) + return template.render(context) \ No newline at end of file diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 4c002b168..4c46b049f 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -584,6 +584,11 @@ class BrowsableAPIRenderer(BaseRenderer): renderer_content_type += ' ;%s' % renderer.charset response_headers['Content-Type'] = renderer_content_type + if hasattr(view, 'paginator') and view.paginator.display_page_controls: + paginator = view.paginator + else: + paginator = None + context = { 'content': self.get_content(renderer, data, accepted_media_type, renderer_context), 'view': view, @@ -592,7 +597,7 @@ class BrowsableAPIRenderer(BaseRenderer): 'description': self.get_description(view), 'name': self.get_name(view), 'version': VERSION, - 'pager': getattr(view, 'pager', None), + 'paginator': paginator, 'breadcrumblist': self.get_breadcrumbs(request), 'allowed_methods': view.allowed_methods, 'available_formats': [renderer_cls.format for renderer_cls in view.renderer_classes], diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css index d4a7d31a2..15b42178f 100644 --- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css @@ -60,6 +60,13 @@ a single block in the template. color: #C20000; } +.pagination>.disabled>a, +.pagination>.disabled>a:hover, +.pagination>.disabled>a:focus { + cursor: default; + pointer-events: none; +} + /*=== dabapps bootstrap styles ====*/ html { diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index e00309811..877387f28 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -125,9 +125,9 @@ {% endblock %} </div> - {% if pager.mark_as_used %} + {% if paginator %} <nav style="float: right"> - {% get_pagination_html pager %} + {% get_pagination_html paginator %} </nav> {% endif %} From 68dfa369b5ca877643b41c8df7c5fc0c786a9f08 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 15 Jan 2015 16:55:04 +0000 Subject: [PATCH 1453/1652] Flake 8 fixes --- rest_framework/pagination.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 2b78f1f7f..61b8e07ac 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -251,6 +251,7 @@ class PageNumberPagination(BasePagination): def to_html(self): base_url = self.request.build_absolute_uri() + def page_number_to_url(page_number): if page_number == 1: return remove_query_param(base_url, self.page_query_param) @@ -363,4 +364,4 @@ class LimitOffsetPagination(BasePagination): 'next_url': self.get_next_link(), 'page_links': page_links }) - return template.render(context) \ No newline at end of file + return template.render(context) From 53edd37df5aa0ac29dbe7824db2e33da1d901f98 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 15 Jan 2015 21:07:05 +0000 Subject: [PATCH 1454/1652] Tests for LimitOffsetPagination --- docs/api-guide/pagination.md | 2 +- rest_framework/pagination.py | 57 ++++++++--------- tests/test_pagination.py | 117 ++++++++++++++++++++++++++++++++++- 3 files changed, 144 insertions(+), 32 deletions(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index ba71a3032..8ab2edd53 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -63,7 +63,7 @@ Or apply the style globally, using the `DEFAULT_PAGINATION_CLASS` settings key. # Custom pagination styles -To create a custom pagination serializer class you should subclass `pagination.BasePagination` and override the `paginate_queryset(self, queryset, request, view)` and `get_paginated_response(self, data)` methods: +To create a custom pagination serializer class you should subclass `pagination.BasePagination` and override the `paginate_queryset(self, queryset, request, view=None)` and `get_paginated_response(self, data)` methods: * The `paginate_queryset` method is passed the initial queryset and should return an iterable object that contains only the data in the requested page. * The `get_paginated_response` method is passed the serialized page data and should return a `Response` instance. diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 61b8e07ac..0dac56830 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -44,7 +44,7 @@ def _get_count(queryset): """ try: return queryset.count() - except AttributeError: + except (AttributeError, TypeError): return len(queryset) @@ -111,12 +111,7 @@ def _get_page_links(page_numbers, current, url_func): page_links = [] for page_number in page_numbers: if page_number is None: - page_link = PageLink( - url=None, - number=None, - is_active=False, - is_break=True - ) + page_link = PAGE_BREAK else: page_link = PageLink( url=url_func(page_number), @@ -130,11 +125,13 @@ def _get_page_links(page_numbers, current, url_func): PageLink = namedtuple('PageLink', ['url', 'number', 'is_active', 'is_break']) +PAGE_BREAK = PageLink(url=None, number=None, is_active=False, is_break=True) + class BasePagination(object): display_page_controls = False - def paginate_queryset(self, queryset, request, view): + def paginate_queryset(self, queryset, request, view=None): raise NotImplemented('paginate_queryset() must be implemented.') def get_paginated_response(self, data): @@ -167,9 +164,11 @@ class PageNumberPagination(BasePagination): # Only relevant if 'paginate_by_param' has also been set. max_paginate_by = api_settings.MAX_PAGINATE_BY + last_page_strings = ('last',) + template = 'rest_framework/pagination/numbers.html' - def paginate_queryset(self, queryset, request, view): + def paginate_queryset(self, queryset, request, view=None): """ Paginate a queryset if required, either returning a page object, or `None` if pagination is not configured for this view. @@ -186,18 +185,9 @@ class PageNumberPagination(BasePagination): return None paginator = DjangoPaginator(queryset, page_size) - page_string = request.query_params.get(self.page_query_param, 1) - try: - page_number = paginator.validate_number(page_string) - except InvalidPage: - if page_string == 'last': - page_number = paginator.num_pages - else: - msg = _( - 'Choose a valid page number. Page numbers must be a ' - 'whole number, or must be the string "last".' - ) - raise NotFound(msg) + page_number = request.query_params.get(self.page_query_param, 1) + if page_number in self.last_page_strings: + page_number = paginator.num_pages try: self.page = paginator.page(page_number) @@ -210,6 +200,7 @@ class PageNumberPagination(BasePagination): if paginator.count > 1: # The browsable API should display pagination controls. self.display_page_controls = True + self.request = request return self.page @@ -249,7 +240,7 @@ class PageNumberPagination(BasePagination): return remove_query_param(url, self.page_query_param) return replace_query_param(url, self.page_query_param, page_number) - def to_html(self): + def get_html_context(self): base_url = self.request.build_absolute_uri() def page_number_to_url(page_number): @@ -263,12 +254,15 @@ class PageNumberPagination(BasePagination): page_numbers = _get_displayed_page_numbers(current, final) page_links = _get_page_links(page_numbers, current, page_number_to_url) - template = loader.get_template(self.template) - context = Context({ + return { 'previous_url': self.get_previous_link(), 'next_url': self.get_next_link(), 'page_links': page_links - }) + } + + def to_html(self): + template = loader.get_template(self.template) + context = Context(self.get_html_context()) return template.render(context) @@ -286,7 +280,7 @@ class LimitOffsetPagination(BasePagination): template = 'rest_framework/pagination/numbers.html' - def paginate_queryset(self, queryset, request, view): + def paginate_queryset(self, queryset, request, view=None): self.limit = self.get_limit(request) self.offset = self.get_offset(request) self.count = _get_count(queryset) @@ -343,7 +337,7 @@ class LimitOffsetPagination(BasePagination): offset = self.offset - self.limit return replace_query_param(url, self.offset_query_param, offset) - def to_html(self): + def get_html_context(self): base_url = self.request.build_absolute_uri() current = _divide_with_ceil(self.offset, self.limit) + 1 final = _divide_with_ceil(self.count, self.limit) @@ -358,10 +352,13 @@ class LimitOffsetPagination(BasePagination): page_numbers = _get_displayed_page_numbers(current, final) page_links = _get_page_links(page_numbers, current, page_number_to_url) - template = loader.get_template(self.template) - context = Context({ + return { 'previous_url': self.get_previous_link(), 'next_url': self.get_next_link(), 'page_links': page_links - }) + } + + def to_html(self): + template = loader.get_template(self.template) + context = Context(self.get_html_context()) return template.render(context) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index d410cd5eb..32fe7a66f 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -3,8 +3,10 @@ import datetime from decimal import Decimal from django.test import TestCase from django.utils import unittest -from rest_framework import generics, serializers, status, filters +from rest_framework import generics, pagination, serializers, status, filters from rest_framework.compat import django_filters +from rest_framework.request import Request +from rest_framework.pagination import PageLink, PAGE_BREAK from rest_framework.test import APIRequestFactory from .models import BasicModel, FilterableItem @@ -337,3 +339,116 @@ class TestMaxPaginateByParam(TestCase): request = factory.get('/') response = self.view(request).render() self.assertEqual(response.data['results'], self.data[:3]) + + +class TestLimitOffset: + def setup(self): + self.pagination = pagination.LimitOffsetPagination() + self.queryset = range(1, 101) + + def paginate_queryset(self, request): + return self.pagination.paginate_queryset(self.queryset, request) + + def get_paginated_content(self, queryset): + response = self.pagination.get_paginated_response(queryset) + return response.data + + def get_html_context(self): + return self.pagination.get_html_context() + + def test_no_offset(self): + request = Request(factory.get('/', {'limit': 5})) + queryset = self.paginate_queryset(request) + content = self.get_paginated_content(queryset) + context = self.get_html_context() + assert queryset == [1, 2, 3, 4, 5] + assert content == { + 'results': [1, 2, 3, 4, 5], + 'previous': None, + 'next': 'http://testserver/?limit=5&offset=5', + 'count': 100 + } + assert context == { + 'previous_url': None, + 'next_url': 'http://testserver/?limit=5&offset=5', + 'page_links': [ + PageLink('http://testserver/?limit=5', 1, True, False), + PageLink('http://testserver/?limit=5&offset=5', 2, False, False), + PageLink('http://testserver/?limit=5&offset=10', 3, False, False), + PAGE_BREAK, + PageLink('http://testserver/?limit=5&offset=95', 20, False, False), + ] + } + + def test_first_offset(self): + request = Request(factory.get('/', {'limit': 5, 'offset': 5})) + queryset = self.paginate_queryset(request) + content = self.get_paginated_content(queryset) + context = self.get_html_context() + assert queryset == [6, 7, 8, 9, 10] + assert content == { + 'results': [6, 7, 8, 9, 10], + 'previous': 'http://testserver/?limit=5', + 'next': 'http://testserver/?limit=5&offset=10', + 'count': 100 + } + assert context == { + 'previous_url': 'http://testserver/?limit=5', + 'next_url': 'http://testserver/?limit=5&offset=10', + 'page_links': [ + PageLink('http://testserver/?limit=5', 1, False, False), + PageLink('http://testserver/?limit=5&offset=5', 2, True, False), + PageLink('http://testserver/?limit=5&offset=10', 3, False, False), + PAGE_BREAK, + PageLink('http://testserver/?limit=5&offset=95', 20, False, False), + ] + } + + def test_middle_offset(self): + request = Request(factory.get('/', {'limit': 5, 'offset': 10})) + queryset = self.paginate_queryset(request) + content = self.get_paginated_content(queryset) + context = self.get_html_context() + assert queryset == [11, 12, 13, 14, 15] + assert content == { + 'results': [11, 12, 13, 14, 15], + 'previous': 'http://testserver/?limit=5&offset=5', + 'next': 'http://testserver/?limit=5&offset=15', + 'count': 100 + } + assert context == { + 'previous_url': 'http://testserver/?limit=5&offset=5', + 'next_url': 'http://testserver/?limit=5&offset=15', + 'page_links': [ + PageLink('http://testserver/?limit=5', 1, False, False), + PageLink('http://testserver/?limit=5&offset=5', 2, False, False), + PageLink('http://testserver/?limit=5&offset=10', 3, True, False), + PageLink('http://testserver/?limit=5&offset=15', 4, False, False), + PAGE_BREAK, + PageLink('http://testserver/?limit=5&offset=95', 20, False, False), + ] + } + + def test_ending_offset(self): + request = Request(factory.get('/', {'limit': 5, 'offset': 95})) + queryset = self.paginate_queryset(request) + content = self.get_paginated_content(queryset) + context = self.get_html_context() + assert queryset == [96, 97, 98, 99, 100] + assert content == { + 'results': [96, 97, 98, 99, 100], + 'previous': 'http://testserver/?limit=5&offset=90', + 'next': None, + 'count': 100 + } + assert context == { + 'previous_url': 'http://testserver/?limit=5&offset=90', + 'next_url': None, + 'page_links': [ + PageLink('http://testserver/?limit=5', 1, False, False), + PAGE_BREAK, + PageLink('http://testserver/?limit=5&offset=85', 18, False, False), + PageLink('http://testserver/?limit=5&offset=90', 19, False, False), + PageLink('http://testserver/?limit=5&offset=95', 20, True, False), + ] + } From 50db8c092ab51a5eb94e2bb495c317097fceeb59 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 16 Jan 2015 16:55:28 +0000 Subject: [PATCH 1455/1652] Minor test cleanup --- tests/test_metadata.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 5ff59c723..972a896a4 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -1,9 +1,7 @@ from __future__ import unicode_literals - -from rest_framework import exceptions, serializers, views +from rest_framework import exceptions, serializers, status, views from rest_framework.request import Request from rest_framework.test import APIRequestFactory -import pytest request = Request(APIRequestFactory().options('/')) @@ -17,7 +15,8 @@ class TestMetadata: """Example view.""" pass - response = ExampleView().options(request=request) + view = ExampleView.as_view() + response = view(request=request) expected = { 'name': 'Example', 'description': 'Example view.', @@ -31,7 +30,7 @@ class TestMetadata: 'multipart/form-data' ] } - assert response.status_code == 200 + assert response.status_code == status.HTTP_200_OK assert response.data == expected def test_none_metadata(self): @@ -42,8 +41,10 @@ class TestMetadata: class ExampleView(views.APIView): metadata_class = None - with pytest.raises(exceptions.MethodNotAllowed): - ExampleView().options(request=request) + view = ExampleView.as_view() + response = view(request=request) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + assert response.data == {'detail': 'Method "OPTIONS" not allowed.'} def test_actions(self): """ @@ -63,7 +64,8 @@ class TestMetadata: def get_serializer(self): return ExampleSerializer() - response = ExampleView().options(request=request) + view = ExampleView.as_view() + response = view(request=request) expected = { 'name': 'Example', 'description': 'Example view.', @@ -104,7 +106,7 @@ class TestMetadata: } } } - assert response.status_code == 200 + assert response.status_code == status.HTTP_200_OK assert response.data == expected def test_global_permissions(self): @@ -132,8 +134,9 @@ class TestMetadata: if request.method == 'POST': raise exceptions.PermissionDenied() - response = ExampleView().options(request=request) - assert response.status_code == 200 + view = ExampleView.as_view() + response = view(request=request) + assert response.status_code == status.HTTP_200_OK assert list(response.data['actions'].keys()) == ['PUT'] def test_object_permissions(self): @@ -161,6 +164,7 @@ class TestMetadata: if self.request.method == 'PUT': raise exceptions.PermissionDenied() - response = ExampleView().options(request=request) - assert response.status_code == 200 + view = ExampleView.as_view() + response = view(request=request) + assert response.status_code == status.HTTP_200_OK assert list(response.data['actions'].keys()) == ['POST'] From 8b0f25aa0a91cb7b56f9ce4dde4330fe5daaad9b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 16 Jan 2015 16:55:46 +0000 Subject: [PATCH 1456/1652] More pagination tests & cleanup --- rest_framework/generics.py | 12 +- rest_framework/pagination.py | 31 +- tests/test_pagination.py | 643 ++++++++++++++++++----------------- 3 files changed, 366 insertions(+), 320 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 4cc4c64d2..61dcb84a4 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -151,6 +151,9 @@ class GenericAPIView(views.APIView): @property def paginator(self): + """ + The paginator instance associated with the view, or `None`. + """ if not hasattr(self, '_paginator'): if self.pagination_class is None: self._paginator = None @@ -159,11 +162,18 @@ class GenericAPIView(views.APIView): return self._paginator def paginate_queryset(self, queryset): + """ + Return a single page of results, or `None` if pagination is disabled. + """ if self.paginator is None: - return queryset + return None return self.paginator.paginate_queryset(queryset, self.request, view=self) def get_paginated_response(self, data): + """ + Return a paginated style `Response` object for the given output data. + """ + assert self.paginator is not None return self.paginator.get_paginated_response(data) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 0dac56830..c5a364f0a 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -131,13 +131,13 @@ PAGE_BREAK = PageLink(url=None, number=None, is_active=False, is_break=True) class BasePagination(object): display_page_controls = False - def paginate_queryset(self, queryset, request, view=None): + def paginate_queryset(self, queryset, request, view=None): # pragma: no cover raise NotImplemented('paginate_queryset() must be implemented.') - def get_paginated_response(self, data): + def get_paginated_response(self, data): # pragma: no cover raise NotImplemented('get_paginated_response() must be implemented.') - def to_html(self): + def to_html(self): # pragma: no cover raise NotImplemented('to_html() must be implemented to display page controls.') @@ -168,10 +168,11 @@ class PageNumberPagination(BasePagination): template = 'rest_framework/pagination/numbers.html' - def paginate_queryset(self, queryset, request, view=None): + def _handle_backwards_compat(self, view): """ - Paginate a queryset if required, either returning a - page object, or `None` if pagination is not configured for this view. + Prior to version 3.1, pagination was handled in the view, and the + attributes were set there. The attributes should now be set on + the pagination class, but the old style is still pending deprecation. """ for attr in ( 'paginate_by', 'page_query_param', @@ -180,6 +181,13 @@ class PageNumberPagination(BasePagination): if hasattr(view, attr): setattr(self, attr, getattr(view, attr)) + def paginate_queryset(self, queryset, request, view=None): + """ + Paginate a queryset if required, either returning a + page object, or `None` if pagination is not configured for this view. + """ + self._handle_backwards_compat(view) + page_size = self.get_page_size(request) if not page_size: return None @@ -277,7 +285,6 @@ class LimitOffsetPagination(BasePagination): limit_query_param = 'limit' offset_query_param = 'offset' max_limit = None - template = 'rest_framework/pagination/numbers.html' def paginate_queryset(self, queryset, request, view=None): @@ -340,7 +347,15 @@ class LimitOffsetPagination(BasePagination): def get_html_context(self): base_url = self.request.build_absolute_uri() current = _divide_with_ceil(self.offset, self.limit) + 1 - final = _divide_with_ceil(self.count, self.limit) + # The number of pages is a little bit fiddly. + # We need to sum both the number of pages from current offset to end + # plus the number of pages up to the current offset. + # When offset is not strictly divisible by the limit then we may + # end up introducing an extra page as an artifact. + final = ( + _divide_with_ceil(self.count - self.offset, self.limit) + + _divide_with_ceil(self.offset, self.limit) + ) def page_number_to_url(page_number): if page_number == 1: diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 32fe7a66f..b3436b359 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -1,349 +1,270 @@ from __future__ import unicode_literals -import datetime -from decimal import Decimal -from django.test import TestCase -from django.utils import unittest -from rest_framework import generics, pagination, serializers, status, filters -from rest_framework.compat import django_filters +from rest_framework import exceptions, generics, pagination, serializers, status, filters from rest_framework.request import Request from rest_framework.pagination import PageLink, PAGE_BREAK from rest_framework.test import APIRequestFactory -from .models import BasicModel, FilterableItem +import pytest factory = APIRequestFactory() -# Helper function to split arguments out of an url -def split_arguments_from_url(url): - if '?' not in url: - return url - - path, args = url.split('?') - args = dict(r.split('=') for r in args.split('&')) - return path, args - - -class BasicSerializer(serializers.ModelSerializer): - class Meta: - model = BasicModel - - -class FilterableItemSerializer(serializers.ModelSerializer): - class Meta: - model = FilterableItem - - -class RootView(generics.ListCreateAPIView): +class TestPaginationIntegration: """ - Example description for OPTIONS. - """ - queryset = BasicModel.objects.all() - serializer_class = BasicSerializer - paginate_by = 10 - - -class DefaultPageSizeKwargView(generics.ListAPIView): - """ - View for testing default paginate_by_param usage - """ - queryset = BasicModel.objects.all() - serializer_class = BasicSerializer - - -class PaginateByParamView(generics.ListAPIView): - """ - View for testing custom paginate_by_param usage - """ - queryset = BasicModel.objects.all() - serializer_class = BasicSerializer - paginate_by_param = 'page_size' - - -class MaxPaginateByView(generics.ListAPIView): - """ - View for testing custom max_paginate_by usage - """ - queryset = BasicModel.objects.all() - serializer_class = BasicSerializer - paginate_by = 3 - max_paginate_by = 5 - paginate_by_param = 'page_size' - - -class IntegrationTestPagination(TestCase): - """ - Integration tests for paginated list views. + Integration tests. """ - def setUp(self): - """ - Create 26 BasicModel instances. - """ - for char in 'abcdefghijklmnopqrstuvwxyz': - BasicModel(text=char * 3).save() - self.objects = BasicModel.objects - self.data = [ - {'id': obj.id, 'text': obj.text} - for obj in self.objects.all() - ] - self.view = RootView.as_view() + def setup(self): + class PassThroughSerializer(serializers.BaseSerializer): + def to_representation(self, item): + return item - def test_get_paginated_root_view(self): - """ - GET requests to paginated ListCreateAPIView should return paginated results. - """ - request = factory.get('/') - # Note: Database queries are a `SELECT COUNT`, and `SELECT <fields>` - with self.assertNumQueries(2): - response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['count'], 26) - self.assertEqual(response.data['results'], self.data[:10]) - self.assertNotEqual(response.data['next'], None) - self.assertEqual(response.data['previous'], None) - - request = factory.get(*split_arguments_from_url(response.data['next'])) - with self.assertNumQueries(2): - response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['count'], 26) - self.assertEqual(response.data['results'], self.data[10:20]) - self.assertNotEqual(response.data['next'], None) - self.assertNotEqual(response.data['previous'], None) - - request = factory.get(*split_arguments_from_url(response.data['next'])) - with self.assertNumQueries(2): - response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['count'], 26) - self.assertEqual(response.data['results'], self.data[20:]) - self.assertEqual(response.data['next'], None) - self.assertNotEqual(response.data['previous'], None) - - -class IntegrationTestPaginationAndFiltering(TestCase): - - def setUp(self): - """ - Create 50 FilterableItem instances. - """ - base_data = ('a', Decimal('0.25'), datetime.date(2012, 10, 8)) - for i in range(26): - text = chr(i + ord(base_data[0])) * 3 # Produces string 'aaa', 'bbb', etc. - decimal = base_data[1] + i - date = base_data[2] - datetime.timedelta(days=i * 2) - FilterableItem(text=text, decimal=decimal, date=date).save() - - self.objects = FilterableItem.objects - self.data = [ - {'id': obj.id, 'text': obj.text, 'decimal': str(obj.decimal), 'date': obj.date.isoformat()} - for obj in self.objects.all() - ] - - @unittest.skipUnless(django_filters, 'django-filter not installed') - def test_get_django_filter_paginated_filtered_root_view(self): - """ - GET requests to paginated filtered ListCreateAPIView should return - paginated results. The next and previous links should preserve the - filtered parameters. - """ - class DecimalFilter(django_filters.FilterSet): - decimal = django_filters.NumberFilter(lookup_type='lt') - - class Meta: - model = FilterableItem - fields = ['text', 'decimal', 'date'] - - class FilterFieldsRootView(generics.ListCreateAPIView): - queryset = FilterableItem.objects.all() - serializer_class = FilterableItemSerializer - paginate_by = 10 - filter_class = DecimalFilter - filter_backends = (filters.DjangoFilterBackend,) - - view = FilterFieldsRootView.as_view() - - EXPECTED_NUM_QUERIES = 2 - - request = factory.get('/', {'decimal': '15.20'}) - with self.assertNumQueries(EXPECTED_NUM_QUERIES): - response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['count'], 15) - self.assertEqual(response.data['results'], self.data[:10]) - self.assertNotEqual(response.data['next'], None) - self.assertEqual(response.data['previous'], None) - - request = factory.get(*split_arguments_from_url(response.data['next'])) - with self.assertNumQueries(EXPECTED_NUM_QUERIES): - response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['count'], 15) - self.assertEqual(response.data['results'], self.data[10:15]) - self.assertEqual(response.data['next'], None) - self.assertNotEqual(response.data['previous'], None) - - request = factory.get(*split_arguments_from_url(response.data['previous'])) - with self.assertNumQueries(EXPECTED_NUM_QUERIES): - response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['count'], 15) - self.assertEqual(response.data['results'], self.data[:10]) - self.assertNotEqual(response.data['next'], None) - self.assertEqual(response.data['previous'], None) - - def test_get_basic_paginated_filtered_root_view(self): - """ - Same as `test_get_django_filter_paginated_filtered_root_view`, - except using a custom filter backend instead of the django-filter - backend, - """ - - class DecimalFilterBackend(filters.BaseFilterBackend): + class EvenItemsOnly(filters.BaseFilterBackend): def filter_queryset(self, request, queryset, view): - return queryset.filter(decimal__lt=Decimal(request.GET['decimal'])) + return [item for item in queryset if item % 2 == 0] - class BasicFilterFieldsRootView(generics.ListCreateAPIView): - queryset = FilterableItem.objects.all() - serializer_class = FilterableItemSerializer - paginate_by = 10 - filter_backends = (DecimalFilterBackend,) + class BasicPagination(pagination.PageNumberPagination): + paginate_by = 5 + paginate_by_param = 'page_size' + max_paginate_by = 20 - view = BasicFilterFieldsRootView.as_view() + self.view = generics.ListAPIView.as_view( + serializer_class=PassThroughSerializer, + queryset=range(1, 101), + filter_backends=[EvenItemsOnly], + pagination_class=BasicPagination + ) - request = factory.get('/', {'decimal': '15.20'}) - with self.assertNumQueries(2): - response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['count'], 15) - self.assertEqual(response.data['results'], self.data[:10]) - self.assertNotEqual(response.data['next'], None) - self.assertEqual(response.data['previous'], None) - - request = factory.get(*split_arguments_from_url(response.data['next'])) - with self.assertNumQueries(2): - response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['count'], 15) - self.assertEqual(response.data['results'], self.data[10:15]) - self.assertEqual(response.data['next'], None) - self.assertNotEqual(response.data['previous'], None) - - request = factory.get(*split_arguments_from_url(response.data['previous'])) - with self.assertNumQueries(2): - response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['count'], 15) - self.assertEqual(response.data['results'], self.data[:10]) - self.assertNotEqual(response.data['next'], None) - self.assertEqual(response.data['previous'], None) - - -class TestUnpaginated(TestCase): - """ - Tests for list views without pagination. - """ - - def setUp(self): - """ - Create 13 BasicModel instances. - """ - for i in range(13): - BasicModel(text=i).save() - self.objects = BasicModel.objects - self.data = [ - {'id': obj.id, 'text': obj.text} - for obj in self.objects.all() - ] - self.view = DefaultPageSizeKwargView.as_view() - - def test_unpaginated(self): - """ - Tests the default page size for this view. - no page size --> no limit --> no meta data - """ - request = factory.get('/') + def test_filtered_items_are_paginated(self): + request = factory.get('/', {'page': 2}) response = self.view(request) - self.assertEqual(response.data, self.data) + assert response.status_code == status.HTTP_200_OK + assert response.data == { + 'results': [12, 14, 16, 18, 20], + 'previous': 'http://testserver/', + 'next': 'http://testserver/?page=3', + 'count': 50 + } + + def test_setting_page_size(self): + """ + When 'paginate_by_param' is set, the client may choose a page size. + """ + request = factory.get('/', {'page_size': 10}) + response = self.view(request) + assert response.status_code == status.HTTP_200_OK + assert response.data == { + 'results': [2, 4, 6, 8, 10, 12, 14, 16, 18, 20], + 'previous': None, + 'next': 'http://testserver/?page=2&page_size=10', + 'count': 50 + } + + def test_setting_page_size_over_maximum(self): + """ + When page_size parameter exceeds maxiumum allowable, + then it should be capped to the maxiumum. + """ + request = factory.get('/', {'page_size': 1000}) + response = self.view(request) + assert response.status_code == status.HTTP_200_OK + assert response.data == { + 'results': [ + 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, + 22, 24, 26, 28, 30, 32, 34, 36, 38, 40 + ], + 'previous': None, + 'next': 'http://testserver/?page=2&page_size=1000', + 'count': 50 + } + + def test_additional_query_params_are_preserved(self): + request = factory.get('/', {'page': 2, 'filter': 'even'}) + response = self.view(request) + assert response.status_code == status.HTTP_200_OK + assert response.data == { + 'results': [12, 14, 16, 18, 20], + 'previous': 'http://testserver/?filter=even', + 'next': 'http://testserver/?filter=even&page=3', + 'count': 50 + } + + def test_404_not_found_for_invalid_page(self): + request = factory.get('/', {'page': 'invalid'}) + response = self.view(request) + assert response.status_code == status.HTTP_404_NOT_FOUND + assert response.data == { + 'detail': 'Invalid page "invalid": That page number is not an integer.' + } -class TestCustomPaginateByParam(TestCase): +class TestPaginationDisabledIntegration: """ - Tests for list views with default page size kwarg + Integration tests for disabled pagination. """ - def setUp(self): - """ - Create 13 BasicModel instances. - """ - for i in range(13): - BasicModel(text=i).save() - self.objects = BasicModel.objects - self.data = [ - {'id': obj.id, 'text': obj.text} - for obj in self.objects.all() - ] - self.view = PaginateByParamView.as_view() + def setup(self): + class PassThroughSerializer(serializers.BaseSerializer): + def to_representation(self, item): + return item - def test_default_page_size(self): - """ - Tests the default page size for this view. - no page size --> no limit --> no meta data - """ - request = factory.get('/') - response = self.view(request).render() - self.assertEqual(response.data, self.data) + self.view = generics.ListAPIView.as_view( + serializer_class=PassThroughSerializer, + queryset=range(1, 101), + pagination_class=None + ) - def test_paginate_by_param(self): - """ - If paginate_by_param is set, the new kwarg should limit per view requests. - """ - request = factory.get('/', {'page_size': 5}) - response = self.view(request).render() - self.assertEqual(response.data['count'], 13) - self.assertEqual(response.data['results'], self.data[:5]) + def test_unpaginated_list(self): + request = factory.get('/', {'page': 2}) + response = self.view(request) + assert response.status_code == status.HTTP_200_OK + assert response.data == range(1, 101) -class TestMaxPaginateByParam(TestCase): +class TestDeprecatedStylePagination: """ - Tests for list views with max_paginate_by kwarg + Integration tests for deprecated style of setting pagination + attributes on the view. """ - def setUp(self): - """ - Create 13 BasicModel instances. - """ - for i in range(13): - BasicModel(text=i).save() - self.objects = BasicModel.objects - self.data = [ - {'id': obj.id, 'text': obj.text} - for obj in self.objects.all() - ] - self.view = MaxPaginateByView.as_view() + def setup(self): + class PassThroughSerializer(serializers.BaseSerializer): + def to_representation(self, item): + return item - def test_max_paginate_by(self): - """ - If max_paginate_by is set, it should limit page size for the view. - """ - request = factory.get('/', data={'page_size': 10}) - response = self.view(request).render() - self.assertEqual(response.data['count'], 13) - self.assertEqual(response.data['results'], self.data[:5]) + class ExampleView(generics.ListAPIView): + serializer_class = PassThroughSerializer + queryset = range(1, 101) + pagination_class = pagination.PageNumberPagination + paginate_by = 20 + page_query_param = 'page_number' - def test_max_paginate_by_without_page_size_param(self): - """ - If max_paginate_by is set, but client does not specifiy page_size, - standard `paginate_by` behavior should be used. - """ - request = factory.get('/') - response = self.view(request).render() - self.assertEqual(response.data['results'], self.data[:3]) + self.view = ExampleView.as_view() + + def test_paginate_by_attribute_on_view(self): + request = factory.get('/?page_number=2') + response = self.view(request) + assert response.status_code == status.HTTP_200_OK + assert response.data == { + 'results': [ + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 + ], + 'previous': 'http://testserver/', + 'next': 'http://testserver/?page_number=3', + 'count': 100 + } + + +class TestPageNumberPagination: + """ + Unit tests for `pagination.PageNumberPagination`. + """ + + def setup(self): + class ExamplePagination(pagination.PageNumberPagination): + paginate_by = 5 + self.pagination = ExamplePagination() + self.queryset = range(1, 101) + + def paginate_queryset(self, request): + return list(self.pagination.paginate_queryset(self.queryset, request)) + + def get_paginated_content(self, queryset): + response = self.pagination.get_paginated_response(queryset) + return response.data + + def get_html_context(self): + return self.pagination.get_html_context() + + def test_no_page_number(self): + request = Request(factory.get('/')) + queryset = self.paginate_queryset(request) + content = self.get_paginated_content(queryset) + context = self.get_html_context() + assert queryset == [1, 2, 3, 4, 5] + assert content == { + 'results': [1, 2, 3, 4, 5], + 'previous': None, + 'next': 'http://testserver/?page=2', + 'count': 100 + } + assert context == { + 'previous_url': None, + 'next_url': 'http://testserver/?page=2', + 'page_links': [ + PageLink('http://testserver/', 1, True, False), + PageLink('http://testserver/?page=2', 2, False, False), + PageLink('http://testserver/?page=3', 3, False, False), + PAGE_BREAK, + PageLink('http://testserver/?page=20', 20, False, False), + ] + } + assert self.pagination.display_page_controls + assert isinstance(self.pagination.to_html(), type('')) + + def test_second_page(self): + request = Request(factory.get('/', {'page': 2})) + queryset = self.paginate_queryset(request) + content = self.get_paginated_content(queryset) + context = self.get_html_context() + assert queryset == [6, 7, 8, 9, 10] + assert content == { + 'results': [6, 7, 8, 9, 10], + 'previous': 'http://testserver/', + 'next': 'http://testserver/?page=3', + 'count': 100 + } + assert context == { + 'previous_url': 'http://testserver/', + 'next_url': 'http://testserver/?page=3', + 'page_links': [ + PageLink('http://testserver/', 1, False, False), + PageLink('http://testserver/?page=2', 2, True, False), + PageLink('http://testserver/?page=3', 3, False, False), + PAGE_BREAK, + PageLink('http://testserver/?page=20', 20, False, False), + ] + } + + def test_last_page(self): + request = Request(factory.get('/', {'page': 'last'})) + queryset = self.paginate_queryset(request) + content = self.get_paginated_content(queryset) + context = self.get_html_context() + assert queryset == [96, 97, 98, 99, 100] + assert content == { + 'results': [96, 97, 98, 99, 100], + 'previous': 'http://testserver/?page=19', + 'next': None, + 'count': 100 + } + assert context == { + 'previous_url': 'http://testserver/?page=19', + 'next_url': None, + 'page_links': [ + PageLink('http://testserver/', 1, False, False), + PAGE_BREAK, + PageLink('http://testserver/?page=18', 18, False, False), + PageLink('http://testserver/?page=19', 19, False, False), + PageLink('http://testserver/?page=20', 20, True, False), + ] + } + + def test_invalid_page(self): + request = Request(factory.get('/', {'page': 'invalid'})) + with pytest.raises(exceptions.NotFound): + self.paginate_queryset(request) class TestLimitOffset: + """ + Unit tests for `pagination.LimitOffsetPagination`. + """ + def setup(self): - self.pagination = pagination.LimitOffsetPagination() + class ExamplePagination(pagination.LimitOffsetPagination): + default_limit = 10 + self.pagination = ExamplePagination() self.queryset = range(1, 101) def paginate_queryset(self, request): @@ -379,6 +300,37 @@ class TestLimitOffset: PageLink('http://testserver/?limit=5&offset=95', 20, False, False), ] } + assert self.pagination.display_page_controls + assert isinstance(self.pagination.to_html(), type('')) + + def test_single_offset(self): + """ + When the offset is not a multiple of the limit we get some edge cases: + * The first page should still be offset zero. + * We may end up displaying an extra page in the pagination control. + """ + request = Request(factory.get('/', {'limit': 5, 'offset': 1})) + queryset = self.paginate_queryset(request) + content = self.get_paginated_content(queryset) + context = self.get_html_context() + assert queryset == [2, 3, 4, 5, 6] + assert content == { + 'results': [2, 3, 4, 5, 6], + 'previous': 'http://testserver/?limit=5', + 'next': 'http://testserver/?limit=5&offset=6', + 'count': 100 + } + assert context == { + 'previous_url': 'http://testserver/?limit=5', + 'next_url': 'http://testserver/?limit=5&offset=6', + 'page_links': [ + PageLink('http://testserver/?limit=5', 1, False, False), + PageLink('http://testserver/?limit=5&offset=1', 2, True, False), + PageLink('http://testserver/?limit=5&offset=6', 3, False, False), + PAGE_BREAK, + PageLink('http://testserver/?limit=5&offset=96', 21, False, False), + ] + } def test_first_offset(self): request = Request(factory.get('/', {'limit': 5, 'offset': 5})) @@ -452,3 +404,72 @@ class TestLimitOffset: PageLink('http://testserver/?limit=5&offset=95', 20, True, False), ] } + + def test_invalid_offset(self): + """ + An invalid offset query param should be treated as 0. + """ + request = Request(factory.get('/', {'limit': 5, 'offset': 'invalid'})) + queryset = self.paginate_queryset(request) + assert queryset == [1, 2, 3, 4, 5] + + def test_invalid_limit(self): + """ + An invalid limit query param should be ignored in favor of the default. + """ + request = Request(factory.get('/', {'limit': 'invalid', 'offset': 0})) + queryset = self.paginate_queryset(request) + assert queryset == [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] + + +def test_get_displayed_page_numbers(): + """ + Test our contextual page display function. + + This determines which pages to display in a pagination control, + given the current page and the last page. + """ + displayed_page_numbers = pagination._get_displayed_page_numbers + + # At five pages or less, all pages are displayed, always. + assert displayed_page_numbers(1, 5) == [1, 2, 3, 4, 5] + assert displayed_page_numbers(2, 5) == [1, 2, 3, 4, 5] + assert displayed_page_numbers(3, 5) == [1, 2, 3, 4, 5] + assert displayed_page_numbers(4, 5) == [1, 2, 3, 4, 5] + assert displayed_page_numbers(5, 5) == [1, 2, 3, 4, 5] + + # Between six and either pages we may have a single page break. + assert displayed_page_numbers(1, 6) == [1, 2, 3, None, 6] + assert displayed_page_numbers(2, 6) == [1, 2, 3, None, 6] + assert displayed_page_numbers(3, 6) == [1, 2, 3, 4, 5, 6] + assert displayed_page_numbers(4, 6) == [1, 2, 3, 4, 5, 6] + assert displayed_page_numbers(5, 6) == [1, None, 4, 5, 6] + assert displayed_page_numbers(6, 6) == [1, None, 4, 5, 6] + + assert displayed_page_numbers(1, 7) == [1, 2, 3, None, 7] + assert displayed_page_numbers(2, 7) == [1, 2, 3, None, 7] + assert displayed_page_numbers(3, 7) == [1, 2, 3, 4, None, 7] + assert displayed_page_numbers(4, 7) == [1, 2, 3, 4, 5, 6, 7] + assert displayed_page_numbers(5, 7) == [1, None, 4, 5, 6, 7] + assert displayed_page_numbers(6, 7) == [1, None, 5, 6, 7] + assert displayed_page_numbers(7, 7) == [1, None, 5, 6, 7] + + assert displayed_page_numbers(1, 8) == [1, 2, 3, None, 8] + assert displayed_page_numbers(2, 8) == [1, 2, 3, None, 8] + assert displayed_page_numbers(3, 8) == [1, 2, 3, 4, None, 8] + assert displayed_page_numbers(4, 8) == [1, 2, 3, 4, 5, None, 8] + assert displayed_page_numbers(5, 8) == [1, None, 4, 5, 6, 7, 8] + assert displayed_page_numbers(6, 8) == [1, None, 5, 6, 7, 8] + assert displayed_page_numbers(7, 8) == [1, None, 6, 7, 8] + assert displayed_page_numbers(8, 8) == [1, None, 6, 7, 8] + + # At nine or more pages we may have two page breaks, one on each side. + assert displayed_page_numbers(1, 9) == [1, 2, 3, None, 9] + assert displayed_page_numbers(2, 9) == [1, 2, 3, None, 9] + assert displayed_page_numbers(3, 9) == [1, 2, 3, 4, None, 9] + assert displayed_page_numbers(4, 9) == [1, 2, 3, 4, 5, None, 9] + assert displayed_page_numbers(5, 9) == [1, None, 4, 5, 6, None, 9] + assert displayed_page_numbers(6, 9) == [1, None, 5, 6, 7, 8, 9] + assert displayed_page_numbers(7, 9) == [1, None, 6, 7, 8, 9] + assert displayed_page_numbers(8, 9) == [1, None, 7, 8, 9] + assert displayed_page_numbers(9, 9) == [1, None, 7, 8, 9] From 86d2774cf30351fd4174e97501532056ed0d8f95 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 16 Jan 2015 20:30:46 +0000 Subject: [PATCH 1457/1652] Fix compat issues --- rest_framework/pagination.py | 8 ++--- rest_framework/templatetags/rest_framework.py | 34 ++----------------- rest_framework/utils/urls.py | 25 ++++++++++++++ tests/test_pagination.py | 4 +-- 4 files changed, 34 insertions(+), 37 deletions(-) create mode 100644 rest_framework/utils/urls.py diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index c5a364f0a..1b7524c6c 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -12,7 +12,7 @@ from rest_framework.compat import OrderedDict from rest_framework.exceptions import NotFound from rest_framework.response import Response from rest_framework.settings import api_settings -from rest_framework.templatetags.rest_framework import ( +from rest_framework.utils.urls import ( replace_query_param, remove_query_param ) @@ -34,8 +34,8 @@ def _divide_with_ceil(a, b): Returns 'a' divded by 'b', with any remainder rounded up. """ if a % b: - return (a / b) + 1 - return a / b + return (a // b) + 1 + return a // b def _get_count(queryset): @@ -70,7 +70,7 @@ def _get_displayed_page_numbers(current, final): assert final >= current if final <= 5: - return range(1, final + 1) + return list(range(1, final + 1)) # We always include the first two pages, last two pages, and # two pages either side of the current page. diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index bf159d8b1..a969836fd 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -1,41 +1,19 @@ from __future__ import unicode_literals, absolute_import from django import template from django.core.urlresolvers import reverse, NoReverseMatch -from django.http import QueryDict from django.utils import six -from django.utils.six.moves.urllib import parse as urlparse from django.utils.encoding import iri_to_uri, force_text from django.utils.html import escape from django.utils.safestring import SafeData, mark_safe from django.utils.html import smart_urlquote from rest_framework.renderers import HTMLFormRenderer +from rest_framework.utils.urls import replace_query_param import re register = template.Library() - -def replace_query_param(url, key, val): - """ - Given a URL and a key/val pair, set or replace an item in the query - parameters of the URL, and return the new URL. - """ - (scheme, netloc, path, query, fragment) = urlparse.urlsplit(url) - query_dict = QueryDict(query).copy() - query_dict[key] = val - query = query_dict.urlencode() - return urlparse.urlunsplit((scheme, netloc, path, query, fragment)) - - -def remove_query_param(url, key): - """ - Given a URL and a key/val pair, set or replace an item in the query - parameters of the URL, and return the new URL. - """ - (scheme, netloc, path, query, fragment) = urlparse.urlsplit(url) - query_dict = QueryDict(query).copy() - query_dict.pop(key, None) - query = query_dict.urlencode() - return urlparse.urlunsplit((scheme, netloc, path, query, fragment)) +# Regex for adding classes to html snippets +class_re = re.compile(r'(?<=class=["\'])(.*)(?=["\'])') @register.simple_tag @@ -43,12 +21,6 @@ def get_pagination_html(pager): return pager.to_html() -# Regex for adding classes to html snippets -class_re = re.compile(r'(?<=class=["\'])(.*)(?=["\'])') - - -# And the template tags themselves... - @register.simple_tag def render_field(field, style=None): style = style or {} diff --git a/rest_framework/utils/urls.py b/rest_framework/utils/urls.py new file mode 100644 index 000000000..880ef9ed7 --- /dev/null +++ b/rest_framework/utils/urls.py @@ -0,0 +1,25 @@ +from django.utils.six.moves.urllib import parse as urlparse + + +def replace_query_param(url, key, val): + """ + Given a URL and a key/val pair, set or replace an item in the query + parameters of the URL, and return the new URL. + """ + (scheme, netloc, path, query, fragment) = urlparse.urlsplit(url) + query_dict = urlparse.parse_qs(query) + query_dict[key] = [val] + query = urlparse.urlencode(sorted(list(query_dict.items())), doseq=True) + return urlparse.urlunsplit((scheme, netloc, path, query, fragment)) + + +def remove_query_param(url, key): + """ + Given a URL and a key/val pair, remove an item in the query + parameters of the URL, and return the new URL. + """ + (scheme, netloc, path, query, fragment) = urlparse.urlsplit(url) + query_dict = urlparse.parse_qs(query) + query_dict.pop(key, None) + query = urlparse.urlencode(sorted(list(query_dict.items())), doseq=True) + return urlparse.urlunsplit((scheme, netloc, path, query, fragment)) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index b3436b359..7cc923472 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -117,7 +117,7 @@ class TestPaginationDisabledIntegration: request = factory.get('/', {'page': 2}) response = self.view(request) assert response.status_code == status.HTTP_200_OK - assert response.data == range(1, 101) + assert response.data == list(range(1, 101)) class TestDeprecatedStylePagination: @@ -268,7 +268,7 @@ class TestLimitOffset: self.queryset = range(1, 101) def paginate_queryset(self, request): - return self.pagination.paginate_queryset(self.queryset, request) + return list(self.pagination.paginate_queryset(self.queryset, request)) def get_paginated_content(self, queryset): response = self.pagination.get_paginated_response(queryset) From 4919492582547d227a22852ad2339fa73739cc94 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sat, 17 Jan 2015 00:10:43 +0000 Subject: [PATCH 1458/1652] First pass at cursor pagination --- rest_framework/pagination.py | 51 +++++++++++++++++++++ tests/test_pagination.py | 88 ++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 1b7524c6c..89d6f9f4f 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -3,10 +3,12 @@ Pagination serializers determine the structure of the output that should be used for paginated responses. """ from __future__ import unicode_literals +from base64 import b64encode, b64decode from collections import namedtuple from django.core.paginator import InvalidPage, Paginator as DjangoPaginator from django.template import Context, loader from django.utils import six +from django.utils.six.moves.urllib import parse as urlparse from django.utils.translation import ugettext as _ from rest_framework.compat import OrderedDict from rest_framework.exceptions import NotFound @@ -377,3 +379,52 @@ class LimitOffsetPagination(BasePagination): template = loader.get_template(self.template) context = Context(self.get_html_context()) return template.render(context) + + +class CursorPagination(BasePagination): + # reverse + # limit + # multiple orderings + cursor_query_param = 'cursor' + page_size = 5 + + def paginate_queryset(self, queryset, request, view=None): + self.base_url = request.build_absolute_uri() + self.ordering = self.get_ordering() + encoded = request.query_params.get(self.cursor_query_param) + + if encoded is None: + cursor = None + else: + cursor = self.decode_cursor(encoded, self.ordering) + + if cursor is not None: + kwargs = {self.ordering + '__gt': cursor} + queryset = queryset.filter(**kwargs) + + results = list(queryset[:self.page_size + 1]) + self.page = results[:self.page_size] + self.has_next = len(results) > len(self.page) + return self.page + + def get_next_link(self): + if not self.has_next: + return None + last_item = self.page[-1] + cursor = self.get_cursor_from_instance(last_item, self.ordering) + encoded = self.encode_cursor(cursor, self.ordering) + return replace_query_param(self.base_url, self.cursor_query_param, encoded) + + def get_ordering(self): + return 'created' + + def get_cursor_from_instance(self, instance, ordering): + return getattr(instance, ordering) + + def decode_cursor(self, encoded, ordering): + items = urlparse.parse_qs(b64decode(encoded)) + return items.get(ordering)[0] + + def encode_cursor(self, cursor, ordering): + items = [(ordering, cursor)] + return b64encode(urlparse.urlencode(items, doseq=True)) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 7cc923472..7f18b446b 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -422,6 +422,94 @@ class TestLimitOffset: assert queryset == [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] +class TestCursorPagination: + """ + Unit tests for `pagination.CursorPagination`. + """ + + def setup(self): + class MockObject(object): + def __init__(self, idx): + self.created = idx + + class MockQuerySet(object): + def __init__(self, items): + self.items = items + + def filter(self, created__gt): + return [ + item for item in self.items + if item.created > int(created__gt) + ] + + def __getitem__(self, sliced): + return self.items[sliced] + + self.pagination = pagination.CursorPagination() + self.queryset = MockQuerySet( + [MockObject(idx) for idx in range(1, 21)] + ) + + def paginate_queryset(self, request): + return list(self.pagination.paginate_queryset(self.queryset, request)) + + # def get_paginated_content(self, queryset): + # response = self.pagination.get_paginated_response(queryset) + # return response.data + + # def get_html_context(self): + # return self.pagination.get_html_context() + + def test_following_cursor(self): + request = Request(factory.get('/')) + queryset = self.paginate_queryset(request) + assert [item.created for item in queryset] == [1, 2, 3, 4, 5] + + next_url = self.pagination.get_next_link() + assert next_url + + request = Request(factory.get(next_url)) + queryset = self.paginate_queryset(request) + assert [item.created for item in queryset] == [6, 7, 8, 9, 10] + + next_url = self.pagination.get_next_link() + assert next_url + + request = Request(factory.get(next_url)) + queryset = self.paginate_queryset(request) + assert [item.created for item in queryset] == [11, 12, 13, 14, 15] + + next_url = self.pagination.get_next_link() + assert next_url + + request = Request(factory.get(next_url)) + queryset = self.paginate_queryset(request) + assert [item.created for item in queryset] == [16, 17, 18, 19, 20] + + next_url = self.pagination.get_next_link() + assert next_url is None + + # assert content == { + # 'results': [1, 2, 3, 4, 5], + # 'previous': None, + # 'next': 'http://testserver/?limit=5&offset=5', + # 'count': 100 + # } + # assert context == { + # 'previous_url': None, + # 'next_url': 'http://testserver/?limit=5&offset=5', + # 'page_links': [ + # PageLink('http://testserver/?limit=5', 1, True, False), + # PageLink('http://testserver/?limit=5&offset=5', 2, False, False), + # PageLink('http://testserver/?limit=5&offset=10', 3, False, False), + # PAGE_BREAK, + # PageLink('http://testserver/?limit=5&offset=95', 20, False, False), + # ] + # } + # assert self.pagination.display_page_controls + # assert isinstance(self.pagination.to_html(), type('')) + + def test_get_displayed_page_numbers(): """ Test our contextual page display function. From 492f3c410d3a91a3f37218e93485a693d9078000 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sat, 17 Jan 2015 00:59:02 +0000 Subject: [PATCH 1459/1652] Cleaning up cursor implementation --- rest_framework/pagination.py | 51 +++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 89d6f9f4f..3984da13e 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -381,10 +381,33 @@ class LimitOffsetPagination(BasePagination): return template.render(context) +Cursor = namedtuple('Cursor', ['offset', 'reverse', 'position']) + + +def decode_cursor(encoded): + tokens = urlparse.parse_qs(b64decode(encoded)) + try: + offset = int(tokens['offset'][0]) + reverse = bool(int(tokens['reverse'][0])) + position = tokens['position'][0] + except (TypeError, ValueError): + return None + + return Cursor(offset=offset, reverse=reverse, position=position) + + +def encode_cursor(cursor): + tokens = { + 'offset': str(cursor.offset), + 'reverse': '1' if cursor.reverse else '0', + 'position': cursor.position + } + return b64encode(urlparse.urlencode(tokens, doseq=True)) + + class CursorPagination(BasePagination): # reverse # limit - # multiple orderings cursor_query_param = 'cursor' page_size = 5 @@ -396,10 +419,11 @@ class CursorPagination(BasePagination): if encoded is None: cursor = None else: - cursor = self.decode_cursor(encoded, self.ordering) + cursor = decode_cursor(encoded) + # TODO: Invalid cursors should 404 if cursor is not None: - kwargs = {self.ordering + '__gt': cursor} + kwargs = {self.ordering + '__gt': cursor.position} queryset = queryset.filter(**kwargs) results = list(queryset[:self.page_size + 1]) @@ -411,20 +435,21 @@ class CursorPagination(BasePagination): if not self.has_next: return None last_item = self.page[-1] - cursor = self.get_cursor_from_instance(last_item, self.ordering) - encoded = self.encode_cursor(cursor, self.ordering) + position = self.get_position_from_instance(last_item, self.ordering) + cursor = Cursor(offset=0, reverse=False, position=position) + encoded = encode_cursor(cursor) return replace_query_param(self.base_url, self.cursor_query_param, encoded) def get_ordering(self): return 'created' - def get_cursor_from_instance(self, instance, ordering): - return getattr(instance, ordering) + def get_position_from_instance(self, instance, ordering): + return str(getattr(instance, ordering)) - def decode_cursor(self, encoded, ordering): - items = urlparse.parse_qs(b64decode(encoded)) - return items.get(ordering)[0] + # def decode_cursor(self, encoded, ordering): + # items = urlparse.parse_qs(b64decode(encoded)) + # return items.get(ordering)[0] - def encode_cursor(self, cursor, ordering): - items = [(ordering, cursor)] - return b64encode(urlparse.urlencode(items, doseq=True)) + # def encode_cursor(self, cursor, ordering): + # items = [(ordering, cursor)] + # return b64encode(urlparse.urlencode(items, doseq=True)) From 7c0d14a6d56a0813a8abf6da53622c323a77bca8 Mon Sep 17 00:00:00 2001 From: David Muller <dmuller@guidebook.com> Date: Sun, 18 Jan 2015 13:55:53 -0800 Subject: [PATCH 1460/1652] Bump pytest-django version to 2.8.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 48b29e61f..d5b32bfa4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ Django>=1.4.11 # Test requirements -pytest-django==2.6 +pytest-django==2.8.0 pytest==2.5.2 pytest-cov==1.6 flake8==2.2.2 From 00449dc42c11b5795b05885c7a1160dd36501668 Mon Sep 17 00:00:00 2001 From: David Muller <dmuller@guidebook.com> Date: Sun, 18 Jan 2015 13:56:52 -0800 Subject: [PATCH 1461/1652] Bump pytest version to 2.6.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d5b32bfa4..43e947c43 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ Django>=1.4.11 # Test requirements pytest-django==2.8.0 -pytest==2.5.2 +pytest==2.6.4 pytest-cov==1.6 flake8==2.2.2 From eb91076886466af9376da753b34883b9dc2a1705 Mon Sep 17 00:00:00 2001 From: David Muller <dmuller@guidebook.com> Date: Sun, 18 Jan 2015 14:45:01 -0800 Subject: [PATCH 1462/1652] Bump pytest-django version in tox.ini to 2.8.0 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 4b90c3929..9018b0404 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ deps = {py26,py27}-django{14,15,16}: django-oauth-plus==2.2.1 {py26,py27}-django{14,15}: django-oauth2-provider==0.2.3 {py26,py27}-django16: django-oauth2-provider==0.2.4 - pytest-django==2.6.1 + pytest-django==2.8.0 django-filter==0.7 defusedxml==0.3 markdown>=2.1.0 From 1421b057f7ccf496c0e65e89aa3882d614aa7030 Mon Sep 17 00:00:00 2001 From: David Muller <dmuller@guidebook.com> Date: Sun, 18 Jan 2015 14:48:23 -0800 Subject: [PATCH 1463/1652] Bump pytest version in tox.ini to 2.6.4 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9018b0404..f30b44ffb 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,7 @@ deps = [testenv:py27-flake8] deps = - pytest==2.5.2 + pytest==2.6.4 flake8==2.2.2 commands = ./runtests.py --lintonly From a82a4d0a099eea74832ce3d8de376e4dbeb4b266 Mon Sep 17 00:00:00 2001 From: David Muller <dmuller@guidebook.com> Date: Sun, 18 Jan 2015 15:04:50 -0800 Subject: [PATCH 1464/1652] Add Django 1.8 alpha to test matrix --- .travis.yml | 8 ++++++++ tox.ini | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6191e7e26..996c3ae80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,10 @@ env: - TOX_ENV=py26-django15 - TOX_ENV=py27-django14 - TOX_ENV=py26-django14 + - TOX_ENV=py34-django18alpha + - TOX_ENV=py33-django18alpha + - TOX_ENV=py32-django18alpha + - TOX_ENV=py27-django18alpha - TOX_ENV=py34-djangomaster - TOX_ENV=py33-djangomaster - TOX_ENV=py32-djangomaster @@ -29,6 +33,10 @@ env: matrix: fast_finish: true allow_failures: + - env: TOX_ENV=py34-django18alpha + - env: TOX_ENV=py33-django18alpha + - env: TOX_ENV=py32-django18alpha + - env: TOX_ENV=py27-django18alpha - env: TOX_ENV=py34-djangomaster - env: TOX_ENV=py33-djangomaster - env: TOX_ENV=py32-djangomaster diff --git a/tox.ini b/tox.ini index f30b44ffb..e43a9234f 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist = py27-{flake8,docs}, {py26,py27}-django14, {py26,py27,py32,py33,py34}-django{15,16}, - {py27,py32,py33,py34}-django{17,master} + {py27,py32,py33,py34}-django{17,18alpha,master} [testenv] commands = ./runtests.py --fast @@ -14,6 +14,7 @@ deps = django15: Django==1.5.6 # Should track minimum supported django16: Django==1.6.3 # Should track minimum supported django17: Django==1.7.2 # Should track maximum supported + django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/ djangomaster: https://github.com/django/django/zipball/master {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 {py26,py27}-django{14,15,16}: oauth2==1.5.211 From b5128ca574d03ea590a198b04043142a3fc7163e Mon Sep 17 00:00:00 2001 From: David Muller <dmuller@guidebook.com> Date: Sun, 18 Jan 2015 15:19:11 -0800 Subject: [PATCH 1465/1652] Save objects before assigning them in InheritedModelSerializationTests; Django 1.8 now throws an error when assigning unsaved objects to Foreign Key, GenericForeignKey, and OneToOneFields --- tests/test_multitable_inheritance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py index e1b40cc74..15627e1dd 100644 --- a/tests/test_multitable_inheritance.py +++ b/tests/test_multitable_inheritance.py @@ -48,8 +48,8 @@ class InheritedModelSerializationTests(TestCase): Assert that a model with a onetoone field that is the primary key is not treated like a derived model """ - parent = ParentModel(name1='parent name') - associate = AssociatedModel(name='hello', ref=parent) + parent = ParentModel.objects.create(name1='parent name') + associate = AssociatedModel.objects.create(name='hello', ref=parent) serializer = AssociatedModelSerializer(associate) self.assertEqual(set(serializer.data.keys()), set(['name', 'ref'])) From dbb684117f6fe0f9c34f98d5e914fc106090cdbc Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 19 Jan 2015 09:24:42 +0000 Subject: [PATCH 1466/1652] Add offset support for cursor pagination --- rest_framework/pagination.py | 67 ++++++++++++++++++++++++++---------- tests/test_pagination.py | 64 ++++++++++++++++++++++++++++++++-- 2 files changed, 109 insertions(+), 22 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 3984da13e..f56f55ce1 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -1,3 +1,4 @@ +# coding: utf-8 """ Pagination serializers determine the structure of the output that should be used for paginated responses. @@ -385,7 +386,7 @@ Cursor = namedtuple('Cursor', ['offset', 'reverse', 'position']) def decode_cursor(encoded): - tokens = urlparse.parse_qs(b64decode(encoded)) + tokens = urlparse.parse_qs(b64decode(encoded), keep_blank_values=True) try: offset = int(tokens['offset'][0]) reverse = bool(int(tokens['reverse'][0])) @@ -406,8 +407,7 @@ def encode_cursor(cursor): class CursorPagination(BasePagination): - # reverse - # limit + # TODO: reverse cursors cursor_query_param = 'cursor' page_size = 5 @@ -417,26 +417,63 @@ class CursorPagination(BasePagination): encoded = request.query_params.get(self.cursor_query_param) if encoded is None: - cursor = None + self.cursor = None else: - cursor = decode_cursor(encoded) + self.cursor = decode_cursor(encoded) # TODO: Invalid cursors should 404 - if cursor is not None: - kwargs = {self.ordering + '__gt': cursor.position} + if self.cursor is not None and self.cursor.position != '': + kwargs = {self.ordering + '__gt': self.cursor.position} queryset = queryset.filter(**kwargs) - results = list(queryset[:self.page_size + 1]) + # The offset is used in order to deal with cases where we have + # items with an identical position. This allows the cursors + # to gracefully deal with non-unique fields as the ordering. + offset = 0 if (self.cursor is None) else self.cursor.offset + + # We fetch an extra item in order to determine if there is a next page. + results = list(queryset[offset:offset + self.page_size + 1]) self.page = results[:self.page_size] self.has_next = len(results) > len(self.page) + self.next_item = results[-1] if self.has_next else None return self.page def get_next_link(self): if not self.has_next: return None - last_item = self.page[-1] - position = self.get_position_from_instance(last_item, self.ordering) - cursor = Cursor(offset=0, reverse=False, position=position) + + compare = self.get_position_from_instance(self.next_item, self.ordering) + offset = 0 + for item in reversed(self.page): + position = self.get_position_from_instance(item, self.ordering) + if position != compare: + # The item in this position and the item following it + # have different positions. We can use this position as + # our marker. + break + + # The item in this postion has the same position as the item + # following it, we can't use it as a marker position, so increment + # the offset and keep seeking to the previous item. + compare = position + offset += 1 + + else: + if self.cursor is None: + # There were no unique positions in the page, and we were + # on the first page, ie. there was no existing cursor. + # Our cursor will have an offset equal to the page size, + # but no position to filter against yet. + offset = self.page_size + position = '' + else: + # There were no unique positions in the page. + # Use the position from the existing cursor and increment + # it's offset by the page size. + offset = self.cursor.offset + self.page_size + position = self.cursor.position + + cursor = Cursor(offset=offset, reverse=False, position=position) encoded = encode_cursor(cursor) return replace_query_param(self.base_url, self.cursor_query_param, encoded) @@ -445,11 +482,3 @@ class CursorPagination(BasePagination): def get_position_from_instance(self, instance, ordering): return str(getattr(instance, ordering)) - - # def decode_cursor(self, encoded, ordering): - # items = urlparse.parse_qs(b64decode(encoded)) - # return items.get(ordering)[0] - - # def encode_cursor(self, cursor, ordering): - # items = [(ordering, cursor)] - # return b64encode(urlparse.urlencode(items, doseq=True)) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 7f18b446b..f04079a72 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -447,7 +447,7 @@ class TestCursorPagination: self.pagination = pagination.CursorPagination() self.queryset = MockQuerySet( - [MockObject(idx) for idx in range(1, 21)] + [MockObject(idx) for idx in range(1, 16)] ) def paginate_queryset(self, request): @@ -479,16 +479,74 @@ class TestCursorPagination: queryset = self.paginate_queryset(request) assert [item.created for item in queryset] == [11, 12, 13, 14, 15] + next_url = self.pagination.get_next_link() + assert next_url is None + + +class TestCrazyCursorPagination: + """ + Unit tests for `pagination.CursorPagination`. + """ + + def setup(self): + class MockObject(object): + def __init__(self, idx): + self.created = idx + + class MockQuerySet(object): + def __init__(self, items): + self.items = items + + def filter(self, created__gt): + return [ + item for item in self.items + if item.created > int(created__gt) + ] + + def __getitem__(self, sliced): + return self.items[sliced] + + self.pagination = pagination.CursorPagination() + self.queryset = MockQuerySet([ + MockObject(idx) for idx in [ + 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, + 1, 1, 2, 3, 4, + 5, 6, 7, 8, 9 + ] + ]) + + def paginate_queryset(self, request): + return list(self.pagination.paginate_queryset(self.queryset, request)) + + def test_following_cursor_identical_items(self): + request = Request(factory.get('/')) + queryset = self.paginate_queryset(request) + assert [item.created for item in queryset] == [1, 1, 1, 1, 1] + next_url = self.pagination.get_next_link() assert next_url request = Request(factory.get(next_url)) queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [16, 17, 18, 19, 20] + assert [item.created for item in queryset] == [1, 1, 1, 1, 1] + + next_url = self.pagination.get_next_link() + assert next_url + + request = Request(factory.get(next_url)) + queryset = self.paginate_queryset(request) + assert [item.created for item in queryset] == [1, 1, 2, 3, 4] + + next_url = self.pagination.get_next_link() + assert next_url + + request = Request(factory.get(next_url)) + queryset = self.paginate_queryset(request) + assert [item.created for item in queryset] == [5, 6, 7, 8, 9] next_url = self.pagination.get_next_link() assert next_url is None - # assert content == { # 'results': [1, 2, 3, 4, 5], # 'previous': None, From 5484d570cb8214c776273b45320e7d1c73b85a34 Mon Sep 17 00:00:00 2001 From: Fabien Bochu <fabien.bochu@polyconseil.fr> Date: Mon, 19 Jan 2015 10:57:26 +0100 Subject: [PATCH 1467/1652] Fix timedelta JSON serialization on Python 2.6. --- rest_framework/compat.py | 8 ++++++++ rest_framework/utils/encoders.py | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 971dee9cf..17814136b 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -33,6 +33,14 @@ def unicode_to_repr(value): return value +def total_seconds(timedelta): + # TimeDelta.total_seconds() is only available in Python 2.7 + if hasattr(timedelta, 'total_seconds'): + return timedelta.total_seconds() + else: + return (timedelta.days * 86400.0) + float(timedelta.seconds) + (timedelta.microseconds / 1000000.0) + + # OrderedDict only available in Python 2.7. # This will always be the case in Django 1.7 and above, as these versions # no longer support Python 2.6. diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 73cbe5d8a..104343a44 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -6,7 +6,7 @@ from django.db.models.query import QuerySet from django.utils import six, timezone from django.utils.encoding import force_text from django.utils.functional import Promise -from rest_framework.compat import OrderedDict +from rest_framework.compat import OrderedDict, total_seconds from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList import datetime import decimal @@ -41,7 +41,7 @@ class JSONEncoder(json.JSONEncoder): representation = representation[:12] return representation elif isinstance(obj, datetime.timedelta): - return six.text_type(obj.total_seconds()) + return six.text_type(total_seconds(obj)) elif isinstance(obj, decimal.Decimal): # Serializers will coerce decimals to strings by default. return float(obj) From da1db34a36f6f0cb8722acbbf7c3182e32995ae3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 19 Jan 2015 14:18:02 +0000 Subject: [PATCH 1468/1652] Handle UUID objects in JSONEncoder. Closes #2433. --- rest_framework/utils/encoders.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 104343a44..bf7532711 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -12,6 +12,7 @@ import datetime import decimal import types import json +import uuid class JSONEncoder(json.JSONEncoder): @@ -45,6 +46,8 @@ class JSONEncoder(json.JSONEncoder): elif isinstance(obj, decimal.Decimal): # Serializers will coerce decimals to strings by default. return float(obj) + elif isinstance(obj, uuid.UUID): + return six.text_type(obj) elif isinstance(obj, QuerySet): return tuple(obj) elif hasattr(obj, 'tolist'): From 0dffc46cb71ec868cdbb37187ba03dea7bac4e7a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 19 Jan 2015 14:21:09 +0000 Subject: [PATCH 1469/1652] ReturnDict and ReturnList repr as standard dict/list. Closes #2421. --- rest_framework/utils/serializer_helpers.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py index 65a04d06b..f99606039 100644 --- a/rest_framework/utils/serializer_helpers.py +++ b/rest_framework/utils/serializer_helpers.py @@ -16,6 +16,9 @@ class ReturnDict(OrderedDict): def copy(self): return ReturnDict(self, serializer=self.serializer) + def __repr__(self): + return dict.__repr__(self) + class ReturnList(list): """ @@ -27,6 +30,9 @@ class ReturnList(list): self.serializer = kwargs.pop('serializer') super(ReturnList, self).__init__(*args, **kwargs) + def __repr__(self): + return list.__repr__(self) + class BoundField(object): """ From af05820b1bfc60ceb7cbb35566588a732938cae2 Mon Sep 17 00:00:00 2001 From: Alexander Dutton <dev@alexdutton.co.uk> Date: Mon, 19 Jan 2015 14:23:13 +0000 Subject: [PATCH 1470/1652] NotImplemented is not an exception `NotImplemented` is a singleton object, not an exception. You should be raising `NotImplementedError` here instead. --- rest_framework/renderers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 634338e9e..ba6c9cc15 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -46,7 +46,7 @@ class BaseRenderer(object): render_style = 'text' def render(self, data, accepted_media_type=None, renderer_context=None): - raise NotImplemented('Renderer class requires .render() to be implemented') + raise NotImplementedError('Renderer class requires .render() to be implemented') class JSONRenderer(BaseRenderer): From 4f3c3a06cfc0ea2dfbf46da2d98546664343ce93 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 19 Jan 2015 14:41:10 +0000 Subject: [PATCH 1471/1652] Drop trailing whitespace on indented JSON output. Closes #2429. --- rest_framework/compat.py | 2 ++ rest_framework/renderers.py | 8 ++++++-- tests/test_renderers.py | 24 +++++++++++++++++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 7241da279..ea3429942 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -227,6 +227,8 @@ except ImportError: if six.PY3: SHORT_SEPARATORS = (',', ':') LONG_SEPARATORS = (', ', ': ') + INDENT_SEPARATORS = (',', ': ') else: SHORT_SEPARATORS = (b',', b':') LONG_SEPARATORS = (b', ', b': ') + INDENT_SEPARATORS = (b',', b': ') diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 4c46b049f..7af03c674 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -18,7 +18,7 @@ from django.template import Context, RequestContext, loader, Template from django.test.client import encode_multipart from django.utils import six from rest_framework import exceptions, serializers, status, VERSION -from rest_framework.compat import SHORT_SEPARATORS, LONG_SEPARATORS +from rest_framework.compat import SHORT_SEPARATORS, LONG_SEPARATORS, INDENT_SEPARATORS from rest_framework.exceptions import ParseError from rest_framework.settings import api_settings from rest_framework.request import is_form_media_type, override_method @@ -87,7 +87,11 @@ class JSONRenderer(BaseRenderer): renderer_context = renderer_context or {} indent = self.get_indent(accepted_media_type, renderer_context) - separators = SHORT_SEPARATORS if (indent is None and self.compact) else LONG_SEPARATORS + + if indent is None: + separators = SHORT_SEPARATORS if self.compact else LONG_SEPARATORS + else: + separators = INDENT_SEPARATORS ret = json.dumps( data, cls=self.encoder_class, diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 7b78f7baf..3e64d8fec 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals - from django.conf.urls import patterns, url, include from django.core.cache import cache from django.db import models @@ -8,6 +7,7 @@ from django.test import TestCase from django.utils import six from django.utils.translation import ugettext_lazy as _ from rest_framework import status, permissions +from rest_framework.compat import OrderedDict from rest_framework.response import Response from rest_framework.views import APIView from rest_framework.renderers import BaseRenderer, JSONRenderer, BrowsableAPIRenderer @@ -489,3 +489,25 @@ class CacheRenderTest(TestCase): cached_resp = cache.get(self.cache_key) self.assertIsInstance(cached_resp, Response) self.assertEqual(cached_resp.content, resp.content) + + +class TestJSONIndentationStyles: + def test_indented(self): + renderer = JSONRenderer() + data = OrderedDict([('a', 1), ('b', 2)]) + assert renderer.render(data) == b'{"a":1,"b":2}' + + def test_compact(self): + renderer = JSONRenderer() + data = OrderedDict([('a', 1), ('b', 2)]) + context = {'indent': 4} + assert ( + renderer.render(data, renderer_context=context) == + b'{\n "a": 1,\n "b": 2\n}' + ) + + def test_long_form(self): + renderer = JSONRenderer() + renderer.compact = False + data = OrderedDict([('a', 1), ('b', 2)]) + assert renderer.render(data) == b'{"a": 1, "b": 2}' From 46a3eda08d519c6908ecd1b9c2e13e5fdb773b0c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 19 Jan 2015 14:48:13 +0000 Subject: [PATCH 1472/1652] NotImplemented -> NotImplementedError --- rest_framework/routers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 61f3ccab0..827da0340 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -65,13 +65,13 @@ class BaseRouter(object): If `base_name` is not specified, attempt to automatically determine it from the viewset. """ - raise NotImplemented('get_default_base_name must be overridden') + raise NotImplementedError('get_default_base_name must be overridden') def get_urls(self): """ Return a list of URL patterns, given the registered viewsets. """ - raise NotImplemented('get_urls must be overridden') + raise NotImplementedError('get_urls must be overridden') @property def urls(self): From 3cc39ffbceffc5fdbb511d9a10e7732329e8baa4 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 19 Jan 2015 15:22:38 +0000 Subject: [PATCH 1473/1652] NotImplemented -> NotImplementedError --- rest_framework/pagination.py | 6 +++--- rest_framework/versioning.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 1b7524c6c..55c173df4 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -132,13 +132,13 @@ class BasePagination(object): display_page_controls = False def paginate_queryset(self, queryset, request, view=None): # pragma: no cover - raise NotImplemented('paginate_queryset() must be implemented.') + raise NotImplementedError('paginate_queryset() must be implemented.') def get_paginated_response(self, data): # pragma: no cover - raise NotImplemented('get_paginated_response() must be implemented.') + raise NotImplementedError('get_paginated_response() must be implemented.') def to_html(self): # pragma: no cover - raise NotImplemented('to_html() must be implemented to display page controls.') + raise NotImplementedError('to_html() must be implemented to display page controls.') class PageNumberPagination(BasePagination): diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index e31c71e9b..a07b629fe 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -17,7 +17,7 @@ class BaseVersioning(object): def determine_version(self, request, *args, **kwargs): msg = '{cls}.determine_version() must be implemented.' - raise NotImplemented(msg.format( + raise NotImplementedError(msg.format( cls=self.__class__.__name__ )) From b0bc79ed4dade0636fc45bc001ef659aa664cd4a Mon Sep 17 00:00:00 2001 From: Eric Theise <erictheise@gmail.com> Date: Mon, 19 Jan 2015 14:49:36 -0800 Subject: [PATCH 1474/1652] correcting "it's" to "its" in Tutorial 1 --- docs/tutorial/1-serialization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 41ff4d073..80e869ea6 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -198,7 +198,7 @@ Open the file `snippets/serializers.py` again, and replace the `SnippetSerialize model = Snippet fields = ('id', 'title', 'code', 'linenos', 'language', 'style') -One nice property that serializers have is that you can inspect all the fields in a serializer instance, by printing it's representation. Open the Django shell with `python manage.py shell`, then try the following: +One nice property that serializers have is that you can inspect all the fields in a serializer instance, by printing its representation. Open the Django shell with `python manage.py shell`, then try the following: >>> from snippets.serializers import SnippetSerializer >>> serializer = SnippetSerializer() From 3ca8f85a5b54e6f78fac273732b6c5be2ad25ae4 Mon Sep 17 00:00:00 2001 From: soooooot <sooooootZHOU@gmail.com> Date: Tue, 20 Jan 2015 22:24:58 +0800 Subject: [PATCH 1475/1652] correcting unclosed quote in routers.md correcting unclosed quote in routers.md --- docs/api-guide/routers.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 3a8a8f6cd..9c9bfb505 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -60,7 +60,7 @@ For example, you can append `router.urls` to a list of existing views… router.register(r'accounts', AccountViewSet) urlpatterns = [ - url(r'^forgot-password/$, ForgotPasswordFormView.as_view(), + url(r'^forgot-password/$', ForgotPasswordFormView.as_view(), ] urlpatterns += router.urls @@ -68,14 +68,14 @@ For example, you can append `router.urls` to a list of existing views… Alternatively you can use Django's `include` function, like so… urlpatterns = [ - url(r'^forgot-password/$, ForgotPasswordFormView.as_view(), + url(r'^forgot-password/$', ForgotPasswordFormView.as_view(), url(r'^', include(router.urls)) ] Router URL patterns can also be namespaces. urlpatterns = [ - url(r'^forgot-password/$, ForgotPasswordFormView.as_view(), + url(r'^forgot-password/$', ForgotPasswordFormView.as_view(), url(r'^api/', include(router.urls, namespace='api')) ] From da6ef3d0b0f3a8e688524bbd446d4350a74fd05a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 21 Jan 2015 13:03:37 +0000 Subject: [PATCH 1476/1652] Allow missing fields option for inherited serializers. Closes #2388. --- rest_framework/compat.py | 2 +- rest_framework/serializers.py | 32 +++++++------ rest_framework/utils/serializer_helpers.py | 3 ++ tests/test_model_serializer.py | 52 +++++++++++++++++----- 4 files changed, 64 insertions(+), 25 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 17814136b..766afaec2 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -20,7 +20,7 @@ def unicode_repr(instance): # Get the repr of an instance, but ensure it is a unicode string # on both python 3 (already the case) and 2 (not the case). if six.PY2: - repr(instance).decode('utf-8') + return repr(instance).decode('utf-8') return repr(instance) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index e373cd107..6320a0751 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -253,7 +253,7 @@ class SerializerMetaclass(type): # If this class is subclassing another Serializer, add that Serializer's # fields. Note that we loop over the bases in *reverse*. This is necessary # in order to maintain the correct order of fields. - for base in bases[::-1]: + for base in reversed(bases): if hasattr(base, '_declared_fields'): fields = list(base._declared_fields.items()) + fields @@ -880,8 +880,8 @@ class ModelSerializer(Serializer): # Retrieve metadata about fields & relationships on the model class. info = model_meta.get_field_info(model) - # Use the default set of field names if none is supplied explicitly. if fields is None: + # Use the default set of field names if none is supplied explicitly. fields = self._get_default_field_names(declared_fields, info) exclude = getattr(self.Meta, 'exclude', None) if exclude is not None: @@ -891,6 +891,23 @@ class ModelSerializer(Serializer): field_name ) fields.remove(field_name) + else: + # Check that any fields declared on the class are + # also explicitly included in `Meta.fields`. + + # Note that we ignore any fields that were declared on a parent + # class, in order to support only including a subset of fields + # when subclassing serializers. + declared_field_names = set(declared_fields.keys()) + for cls in self.__class__.__bases__: + declared_field_names -= set(getattr(cls, '_declared_fields', [])) + + missing_fields = declared_field_names - set(fields) + assert not missing_fields, ( + 'Field `%s` has been declared on serializer `%s`, but ' + 'is missing from `Meta.fields`.' % + (list(missing_fields)[0], self.__class__.__name__) + ) # Determine the set of model fields, and the fields that they map to. # We actually only need this to deal with the slightly awkward case @@ -1024,17 +1041,6 @@ class ModelSerializer(Serializer): (field_name, model.__class__.__name__) ) - # Check that any fields declared on the class are - # also explicitly included in `Meta.fields`. - missing_fields = set(declared_fields.keys()) - set(fields) - if missing_fields: - missing_field = list(missing_fields)[0] - raise ImproperlyConfigured( - 'Field `%s` has been declared on serializer `%s`, but ' - 'is missing from `Meta.fields`.' % - (missing_field, self.__class__.__name__) - ) - # Populate any kwargs defined in `Meta.extra_kwargs` extras = extra_kwargs.get(field_name, {}) if extras.get('read_only', False): diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py index f99606039..ab0578620 100644 --- a/rest_framework/utils/serializer_helpers.py +++ b/rest_framework/utils/serializer_helpers.py @@ -105,3 +105,6 @@ class BindingDict(collections.MutableMapping): def __len__(self): return len(self.fields) + + def __repr__(self): + return dict.__repr__(self.fields) diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index ee556dbcb..247b309a1 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -5,11 +5,14 @@ shortcuts for automatically creating serializers based on a given model class. These tests deal with ensuring that we correctly map the model fields onto an appropriate set of serializer fields for each case. """ +from __future__ import unicode_literals from django.core.exceptions import ImproperlyConfigured from django.core.validators import MaxValueValidator, MinValueValidator, MinLengthValidator from django.db import models from django.test import TestCase +from django.utils import six from rest_framework import serializers +from rest_framework.compat import unicode_repr def dedent(blocktext): @@ -124,7 +127,7 @@ class TestRegularFieldMappings(TestCase): url_field = URLField(max_length=100) custom_field = ModelField(model_field=<tests.test_model_serializer.CustomField: custom_field>) """) - self.assertEqual(repr(TestSerializer()), expected) + self.assertEqual(unicode_repr(TestSerializer()), expected) def test_field_options(self): class TestSerializer(serializers.ModelSerializer): @@ -142,7 +145,14 @@ class TestRegularFieldMappings(TestCase): descriptive_field = IntegerField(help_text='Some help text', label='A label') choices_field = ChoiceField(choices=[('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')]) """) - self.assertEqual(repr(TestSerializer()), expected) + if six.PY2: + # This particular case is too awkward to resolve fully across + # both py2 and py3. + expected = expected.replace( + "('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')", + "(u'red', u'Red'), (u'blue', u'Blue'), (u'green', u'Green')" + ) + self.assertEqual(unicode_repr(TestSerializer()), expected) def test_method_field(self): """ @@ -221,7 +231,7 @@ class TestRegularFieldMappings(TestCase): model = RegularFieldsModel fields = ('auto_field',) - with self.assertRaises(ImproperlyConfigured) as excinfo: + with self.assertRaises(AssertionError) as excinfo: TestSerializer().fields expected = ( 'Field `missing` has been declared on serializer ' @@ -229,6 +239,26 @@ class TestRegularFieldMappings(TestCase): ) assert str(excinfo.exception) == expected + def test_missing_superclass_field(self): + """ + Fields that have been declared on a parent of the serializer class may + be excluded from the `Meta.fields` option. + """ + class TestSerializer(serializers.ModelSerializer): + missing = serializers.ReadOnlyField() + + class Meta: + model = RegularFieldsModel + + class ChildSerializer(TestSerializer): + missing = serializers.ReadOnlyField() + + class Meta: + model = RegularFieldsModel + fields = ('auto_field',) + + ChildSerializer().fields + # Tests for relational field mappings. # ------------------------------------ @@ -276,7 +306,7 @@ class TestRelationalFieldMappings(TestCase): many_to_many = PrimaryKeyRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all()) through = PrimaryKeyRelatedField(many=True, read_only=True) """) - self.assertEqual(repr(TestSerializer()), expected) + self.assertEqual(unicode_repr(TestSerializer()), expected) def test_nested_relations(self): class TestSerializer(serializers.ModelSerializer): @@ -300,7 +330,7 @@ class TestRelationalFieldMappings(TestCase): id = IntegerField(label='ID', read_only=True) name = CharField(max_length=100) """) - self.assertEqual(repr(TestSerializer()), expected) + self.assertEqual(unicode_repr(TestSerializer()), expected) def test_hyperlinked_relations(self): class TestSerializer(serializers.HyperlinkedModelSerializer): @@ -315,7 +345,7 @@ class TestRelationalFieldMappings(TestCase): many_to_many = HyperlinkedRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all(), view_name='manytomanytargetmodel-detail') through = HyperlinkedRelatedField(many=True, read_only=True, view_name='throughtargetmodel-detail') """) - self.assertEqual(repr(TestSerializer()), expected) + self.assertEqual(unicode_repr(TestSerializer()), expected) def test_nested_hyperlinked_relations(self): class TestSerializer(serializers.HyperlinkedModelSerializer): @@ -339,7 +369,7 @@ class TestRelationalFieldMappings(TestCase): url = HyperlinkedIdentityField(view_name='throughtargetmodel-detail') name = CharField(max_length=100) """) - self.assertEqual(repr(TestSerializer()), expected) + self.assertEqual(unicode_repr(TestSerializer()), expected) def test_pk_reverse_foreign_key(self): class TestSerializer(serializers.ModelSerializer): @@ -353,7 +383,7 @@ class TestRelationalFieldMappings(TestCase): name = CharField(max_length=100) reverse_foreign_key = PrimaryKeyRelatedField(many=True, queryset=RelationalModel.objects.all()) """) - self.assertEqual(repr(TestSerializer()), expected) + self.assertEqual(unicode_repr(TestSerializer()), expected) def test_pk_reverse_one_to_one(self): class TestSerializer(serializers.ModelSerializer): @@ -367,7 +397,7 @@ class TestRelationalFieldMappings(TestCase): name = CharField(max_length=100) reverse_one_to_one = PrimaryKeyRelatedField(queryset=RelationalModel.objects.all()) """) - self.assertEqual(repr(TestSerializer()), expected) + self.assertEqual(unicode_repr(TestSerializer()), expected) def test_pk_reverse_many_to_many(self): class TestSerializer(serializers.ModelSerializer): @@ -381,7 +411,7 @@ class TestRelationalFieldMappings(TestCase): name = CharField(max_length=100) reverse_many_to_many = PrimaryKeyRelatedField(many=True, queryset=RelationalModel.objects.all()) """) - self.assertEqual(repr(TestSerializer()), expected) + self.assertEqual(unicode_repr(TestSerializer()), expected) def test_pk_reverse_through(self): class TestSerializer(serializers.ModelSerializer): @@ -395,7 +425,7 @@ class TestRelationalFieldMappings(TestCase): name = CharField(max_length=100) reverse_through = PrimaryKeyRelatedField(many=True, read_only=True) """) - self.assertEqual(repr(TestSerializer()), expected) + self.assertEqual(unicode_repr(TestSerializer()), expected) class TestIntegration(TestCase): From e59b3d1718de549d0e165d03aeea1488ddfe20ee Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 21 Jan 2015 14:18:13 +0000 Subject: [PATCH 1477/1652] Make ReturnDict cachable. Closes #2360. --- rest_framework/utils/serializer_helpers.py | 10 ++++++++++ tests/test_serializer.py | 17 +++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py index ab0578620..87bb3ac08 100644 --- a/rest_framework/utils/serializer_helpers.py +++ b/rest_framework/utils/serializer_helpers.py @@ -19,6 +19,11 @@ class ReturnDict(OrderedDict): def __repr__(self): return dict.__repr__(self) + def __reduce__(self): + # Pickling these objects will drop the .serializer backlink, + # but preserve the raw data. + return (dict, (dict(self),)) + class ReturnList(list): """ @@ -33,6 +38,11 @@ class ReturnList(list): def __repr__(self): return list.__repr__(self) + def __reduce__(self): + # Pickling these objects will drop the .serializer backlink, + # but preserve the raw data. + return (list, (list(self),)) + class BoundField(object): """ diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 68bbbe983..b7a0484bc 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals from .utils import MockObject from rest_framework import serializers from rest_framework.compat import unicode_repr +import pickle import pytest @@ -278,3 +279,19 @@ class TestNotRequiredOutput: serializer = ExampleSerializer(instance) with pytest.raises(AttributeError): serializer.data + + +class TestCacheSerializerData: + def test_cache_serializer_data(self): + """ + Caching serializer data with pickle will drop the serializer info, + but does preserve the data itself. + """ + class ExampleSerializer(serializers.Serializer): + field1 = serializers.CharField() + field2 = serializers.CharField() + + serializer = ExampleSerializer({'field1': 'a', 'field2': 'b'}) + pickled = pickle.dumps(serializer.data) + data = pickle.loads(pickled) + assert data == {'field1': 'a', 'field2': 'b'} From 4cf03e30ff765dda2899048725da4d85ebd8af52 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 21 Jan 2015 14:26:25 +0000 Subject: [PATCH 1478/1652] Do not render HTML output for hidden fields. Closes #2410. --- rest_framework/renderers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index ba6c9cc15..584332e66 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -410,6 +410,9 @@ class HTMLFormRenderer(BaseRenderer): }) def render_field(self, field, parent_style): + if isinstance(field, serializers.HiddenField): + return '' + style = dict(self.default_style[field]) style.update(field.style) if 'template_pack' not in style: From a7567efa8d6fd008ba0a48f0e8fa7028703af386 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Wed, 21 Jan 2015 19:26:57 +0100 Subject: [PATCH 1479/1652] Use compact traceback for errors reporting. --- runtests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtests.py b/runtests.py index abf15a623..0008bfae5 100755 --- a/runtests.py +++ b/runtests.py @@ -8,8 +8,8 @@ import subprocess PYTEST_ARGS = { - 'default': ['tests'], - 'fast': ['tests', '-q'], + 'default': ['tests', '--tb=short'], + 'fast': ['tests', '--tb=short', '-q'], } FLAKE8_ARGS = ['rest_framework', 'tests', '--ignore=E501'] From 857185cf07bb539083a90bc75a6dd951da8e2206 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Wed, 21 Jan 2015 19:29:40 +0100 Subject: [PATCH 1480/1652] Workaround Django issue 24198. --- rest_framework/serializers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 6320a0751..b1474562b 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -12,7 +12,7 @@ response content is handled by parsers and renderers. """ from __future__ import unicode_literals from django.db import models -from django.db.models.fields import FieldDoesNotExist +from django.db.models.fields import FieldDoesNotExist, Field from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import unicode_to_repr from rest_framework.utils import model_meta @@ -939,6 +939,9 @@ class ModelSerializer(Serializer): except FieldDoesNotExist: continue + if not isinstance(model_field, Field): + continue + # Include each of the `unique_for_*` field names. unique_constraint_names |= set([ model_field.unique_for_date, From 15f797fd3ec61947aaecc05e6fd040e1e3e8776a Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Wed, 21 Jan 2015 19:46:31 +0100 Subject: [PATCH 1481/1652] Owned by import * --- rest_framework/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b1474562b..cf797bdcb 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -12,7 +12,7 @@ response content is handled by parsers and renderers. """ from __future__ import unicode_literals from django.db import models -from django.db.models.fields import FieldDoesNotExist, Field +from django.db.models.fields import FieldDoesNotExist, Field as DjangoField from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import unicode_to_repr from rest_framework.utils import model_meta @@ -939,7 +939,7 @@ class ModelSerializer(Serializer): except FieldDoesNotExist: continue - if not isinstance(model_field, Field): + if not isinstance(model_field, DjangoField): continue # Include each of the `unique_for_*` field names. From 6e471ad8f41dda11365080ca583a0ccbf37de55e Mon Sep 17 00:00:00 2001 From: Duncan Maitland <me@duncm.com> Date: Thu, 22 Jan 2015 18:29:20 +1100 Subject: [PATCH 1482/1652] fix link to Django CSRF docs --- docs/api-guide/authentication.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 1222dbf04..0d53de70a 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -427,7 +427,7 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a [oauth]: http://oauth.net/2/ [permission]: permissions.md [throttling]: throttling.md -[csrf-ajax]: https://docs.djangoproject.com/en/dev/ref/contrib/csrf/#ajax +[csrf-ajax]: https://docs.djangoproject.com/en/dev/ref/csrf/#ajax [mod_wsgi_official]: http://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIPassAuthorization [custom-user-model]: https://docs.djangoproject.com/en/dev/topics/auth/customizing/#specifying-a-custom-user-model [south-dependencies]: http://south.readthedocs.org/en/latest/dependencies.html From cae9528c54ea13863ea056d40168e8d8df68b276 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 22 Jan 2015 10:28:19 +0000 Subject: [PATCH 1483/1652] Add support for reverse cursors --- rest_framework/pagination.py | 126 +++++++++++++++++++++++++++++------ tests/test_pagination.py | 6 ++ 2 files changed, 112 insertions(+), 20 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 5482788a3..9e22a8bf3 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -407,45 +407,84 @@ def encode_cursor(cursor): class CursorPagination(BasePagination): - # TODO: reverse cursors + # TODO: handle queries with '' as a legitimate position cursor_query_param = 'cursor' page_size = 5 def paginate_queryset(self, queryset, request, view=None): self.base_url = request.build_absolute_uri() self.ordering = self.get_ordering() - encoded = request.query_params.get(self.cursor_query_param) + # Determine if we have a cursor, and if so then decode it. + encoded = request.query_params.get(self.cursor_query_param) if encoded is None: self.cursor = None + (offset, reverse, current_position) = (0, False, '') else: self.cursor = decode_cursor(encoded) + (offset, reverse, current_position) = self.cursor # TODO: Invalid cursors should 404 - if self.cursor is not None and self.cursor.position != '': - kwargs = {self.ordering + '__gt': self.cursor.position} + # Cursor pagination always enforces an ordering. + if reverse: + queryset = queryset.order_by('-' + self.ordering) + else: + queryset = queryset.order_by(self.ordering) + + # If we have a cursor with a fixed position then filter by that. + if current_position != '': + if self.cursor.reverse: + kwargs = {self.ordering + '__lt': current_position} + else: + kwargs = {self.ordering + '__gt': current_position} queryset = queryset.filter(**kwargs) - # The offset is used in order to deal with cases where we have - # items with an identical position. This allows the cursors - # to gracefully deal with non-unique fields as the ordering. - offset = 0 if (self.cursor is None) else self.cursor.offset - - # We fetch an extra item in order to determine if there is a next page. + # If we have an offset cursor then offset the entire page by that amount. + # We also always fetch an extra item in order to determine if there is a + # page following on from this one. results = list(queryset[offset:offset + self.page_size + 1]) self.page = results[:self.page_size] - self.has_next = len(results) > len(self.page) - self.next_item = results[-1] if self.has_next else None + + # Determine the position of the final item following the page. + if len(results) > len(self.page): + has_following_postion = True + following_position = self._get_position_from_instance(results[-1], self.ordering) + else: + has_following_postion = False + following_position = None + + # If we have a reverse queryset, then the query ordering was in reverse + # so we need to reverse the items again before returning them to the user. + if reverse: + self.page = reversed(self.page) + + if reverse: + # Determine next and previous positions for reverse cursors. + self.has_next = current_position != '' or offset > 0 + self.has_previous = has_following_postion + if self.has_next: + self.next_position = current_position + if self.has_previous: + self.previous_position = following_position + else: + # Determine next and previous positions for forward cursors. + self.has_next = has_following_postion + self.has_previous = current_position != '' or offset > 0 + if self.has_next: + self.next_position = following_position + if self.has_previous: + self.previous_position = current_position + return self.page def get_next_link(self): if not self.has_next: return None - compare = self.get_position_from_instance(self.next_item, self.ordering) + compare = self.next_position offset = 0 for item in reversed(self.page): - position = self.get_position_from_instance(item, self.ordering) + position = self._get_position_from_instance(item, self.ordering) if position != compare: # The item in this position and the item following it # have different positions. We can use this position as @@ -459,26 +498,73 @@ class CursorPagination(BasePagination): offset += 1 else: - if self.cursor is None: - # There were no unique positions in the page, and we were - # on the first page, ie. there was no existing cursor. + # There were no unique positions in the page. + if not self.has_previous: + # We are on the first page. # Our cursor will have an offset equal to the page size, # but no position to filter against yet. offset = self.page_size position = '' + elif self.cursor.reverse: + # The change in direction will introduce a paging artifact, + # where we end up skipping forward a few extra items. + offset = 0 + position = self.previous_position else: - # There were no unique positions in the page. # Use the position from the existing cursor and increment # it's offset by the page size. offset = self.cursor.offset + self.page_size - position = self.cursor.position + position = self.previous_position cursor = Cursor(offset=offset, reverse=False, position=position) encoded = encode_cursor(cursor) return replace_query_param(self.base_url, self.cursor_query_param, encoded) + def get_previous_link(self): + if not self.has_previous: + return None + + compare = self.previous_position + offset = 0 + for item in self.page: + position = self._get_position_from_instance(item, self.ordering) + if position != compare: + # The item in this position and the item following it + # have different positions. We can use this position as + # our marker. + break + + # The item in this postion has the same position as the item + # following it, we can't use it as a marker position, so increment + # the offset and keep seeking to the previous item. + compare = position + offset += 1 + + else: + # There were no unique positions in the page. + if not self.has_next: + # We are on the final page. + # Our cursor will have an offset equal to the page size, + # but no position to filter against yet. + offset = self.page_size + position = '' + elif self.cursor.reverse: + # Use the position from the existing cursor and increment + # it's offset by the page size. + offset = self.cursor.offset + self.page_size + position = self.next_position + else: + # The change in direction will introduce a paging artifact, + # where we end up skipping back a few extra items. + offset = 0 + position = self.next_position + + cursor = Cursor(offset=offset, reverse=True, position=position) + encoded = encode_cursor(cursor) + return replace_query_param(self.base_url, self.cursor_query_param, encoded) + def get_ordering(self): return 'created' - def get_position_from_instance(self, instance, ordering): + def _get_position_from_instance(self, instance, ordering): return str(getattr(instance, ordering)) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index f04079a72..47019671f 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -442,6 +442,9 @@ class TestCursorPagination: if item.created > int(created__gt) ] + def order_by(self, ordering): + return self + def __getitem__(self, sliced): return self.items[sliced] @@ -503,6 +506,9 @@ class TestCrazyCursorPagination: if item.created > int(created__gt) ] + def order_by(self, ordering): + return self + def __getitem__(self, sliced): return self.items[sliced] From f1af603fb05fce236a4258e18df8af8888043247 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 22 Jan 2015 10:51:04 +0000 Subject: [PATCH 1484/1652] Tests for reverse pagination --- rest_framework/pagination.py | 2 + tests/test_pagination.py | 98 ++++++++++++++++++++++++++---------- 2 files changed, 73 insertions(+), 27 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 9e22a8bf3..d5af2ac81 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -408,6 +408,8 @@ def encode_cursor(cursor): class CursorPagination(BasePagination): # TODO: handle queries with '' as a legitimate position + # Support case where ordering is already negative + # Support tuple orderings cursor_query_param = 'cursor' page_size = 5 diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 47019671f..4907a0807 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -436,13 +436,22 @@ class TestCursorPagination: def __init__(self, items): self.items = items - def filter(self, created__gt): - return [ + def filter(self, created__gt=None, created__lt=None): + if created__gt is not None: + return MockQuerySet([ + item for item in self.items + if item.created > int(created__gt) + ]) + + assert created__lt is not None + return MockQuerySet([ item for item in self.items - if item.created > int(created__gt) - ] + if item.created < int(created__lt) + ]) def order_by(self, ordering): + if ordering.startswith('-'): + return MockQuerySet(reversed(self.items)) return self def __getitem__(self, sliced): @@ -485,6 +494,25 @@ class TestCursorPagination: next_url = self.pagination.get_next_link() assert next_url is None + # Now page back again + + previous_url = self.pagination.get_previous_link() + assert previous_url + + request = Request(factory.get(previous_url)) + queryset = self.paginate_queryset(request) + assert [item.created for item in queryset] == [6, 7, 8, 9, 10] + + previous_url = self.pagination.get_previous_link() + assert previous_url + + request = Request(factory.get(previous_url)) + queryset = self.paginate_queryset(request) + assert [item.created for item in queryset] == [1, 2, 3, 4, 5] + + previous_url = self.pagination.get_previous_link() + assert previous_url is None + class TestCrazyCursorPagination: """ @@ -500,13 +528,22 @@ class TestCrazyCursorPagination: def __init__(self, items): self.items = items - def filter(self, created__gt): - return [ + def filter(self, created__gt=None, created__lt=None): + if created__gt is not None: + return MockQuerySet([ + item for item in self.items + if item.created > int(created__gt) + ]) + + assert created__lt is not None + return MockQuerySet([ item for item in self.items - if item.created > int(created__gt) - ] + if item.created < int(created__lt) + ]) def order_by(self, ordering): + if ordering.startswith('-'): + return MockQuerySet(reversed(self.items)) return self def __getitem__(self, sliced): @@ -553,25 +590,32 @@ class TestCrazyCursorPagination: next_url = self.pagination.get_next_link() assert next_url is None - # assert content == { - # 'results': [1, 2, 3, 4, 5], - # 'previous': None, - # 'next': 'http://testserver/?limit=5&offset=5', - # 'count': 100 - # } - # assert context == { - # 'previous_url': None, - # 'next_url': 'http://testserver/?limit=5&offset=5', - # 'page_links': [ - # PageLink('http://testserver/?limit=5', 1, True, False), - # PageLink('http://testserver/?limit=5&offset=5', 2, False, False), - # PageLink('http://testserver/?limit=5&offset=10', 3, False, False), - # PAGE_BREAK, - # PageLink('http://testserver/?limit=5&offset=95', 20, False, False), - # ] - # } - # assert self.pagination.display_page_controls - # assert isinstance(self.pagination.to_html(), type('')) + + # Now page back again + + previous_url = self.pagination.get_previous_link() + assert previous_url + + request = Request(factory.get(previous_url)) + queryset = self.paginate_queryset(request) + assert [item.created for item in queryset] == [1, 1, 2, 3, 4] + + previous_url = self.pagination.get_previous_link() + assert previous_url + + request = Request(factory.get(previous_url)) + queryset = self.paginate_queryset(request) + assert [item.created for item in queryset] == [1, 1, 1, 1, 1] + + previous_url = self.pagination.get_previous_link() + assert previous_url + + request = Request(factory.get(previous_url)) + queryset = self.paginate_queryset(request) + assert [item.created for item in queryset] == [1, 1, 1, 1, 1] + + previous_url = self.pagination.get_previous_link() + assert previous_url is None def test_get_displayed_page_numbers(): From 94b5f7a86e401e46f14fb8982afaa7a8c61847c9 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 22 Jan 2015 12:14:52 +0000 Subject: [PATCH 1485/1652] Tidy up cursor tests and make more comprehensive --- rest_framework/pagination.py | 30 ++++- tests/test_pagination.py | 242 ++++++++++++++--------------------- 2 files changed, 122 insertions(+), 150 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index d5af2ac81..618352391 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -171,6 +171,8 @@ class PageNumberPagination(BasePagination): template = 'rest_framework/pagination/numbers.html' + invalid_page_message = _('Invalid page "{page_number}": {message}.') + def _handle_backwards_compat(self, view): """ Prior to version 3.1, pagination was handled in the view, and the @@ -203,7 +205,7 @@ class PageNumberPagination(BasePagination): try: self.page = paginator.page(page_number) except InvalidPage as exc: - msg = _('Invalid page "{page_number}": {message}.').format( + msg = self.invalid_page_message.format( page_number=page_number, message=six.text_type(exc) ) raise NotFound(msg) @@ -386,8 +388,8 @@ Cursor = namedtuple('Cursor', ['offset', 'reverse', 'position']) def decode_cursor(encoded): - tokens = urlparse.parse_qs(b64decode(encoded), keep_blank_values=True) try: + tokens = urlparse.parse_qs(b64decode(encoded), keep_blank_values=True) offset = int(tokens['offset'][0]) reverse = bool(int(tokens['reverse'][0])) position = tokens['position'][0] @@ -411,7 +413,8 @@ class CursorPagination(BasePagination): # Support case where ordering is already negative # Support tuple orderings cursor_query_param = 'cursor' - page_size = 5 + page_size = api_settings.PAGINATE_BY + invalid_cursor_message = _('Invalid cursor') def paginate_queryset(self, queryset, request, view=None): self.base_url = request.build_absolute_uri() @@ -424,8 +427,9 @@ class CursorPagination(BasePagination): (offset, reverse, current_position) = (0, False, '') else: self.cursor = decode_cursor(encoded) + if self.cursor is None: + raise NotFound(self.invalid_cursor_message) (offset, reverse, current_position) = self.cursor - # TODO: Invalid cursors should 404 # Cursor pagination always enforces an ordering. if reverse: @@ -458,7 +462,7 @@ class CursorPagination(BasePagination): # If we have a reverse queryset, then the query ordering was in reverse # so we need to reverse the items again before returning them to the user. if reverse: - self.page = reversed(self.page) + self.page = list(reversed(self.page)) if reverse: # Determine next and previous positions for reverse cursors. @@ -483,8 +487,14 @@ class CursorPagination(BasePagination): if not self.has_next: return None - compare = self.next_position + if self.cursor and self.cursor.reverse and self.cursor.offset != 0: + # If we're reversing direction and we have an offset cursor + # then we cannot use the first position we find as a marker. + compare = self._get_position_from_instance(self.page[-1], self.ordering) + else: + compare = self.next_position offset = 0 + for item in reversed(self.page): position = self._get_position_from_instance(item, self.ordering) if position != compare: @@ -526,8 +536,14 @@ class CursorPagination(BasePagination): if not self.has_previous: return None - compare = self.previous_position + if self.cursor and not self.cursor.reverse and self.cursor.offset != 0: + # If we're reversing direction and we have an offset cursor + # then we cannot use the first position we find as a marker. + compare = self._get_position_from_instance(self.page[0], self.ordering) + else: + compare = self.previous_position offset = 0 + for item in self.page: position = self._get_position_from_instance(item, self.ordering) if position != compare: diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 4907a0807..e32dd0288 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -451,171 +451,127 @@ class TestCursorPagination: def order_by(self, ordering): if ordering.startswith('-'): - return MockQuerySet(reversed(self.items)) + return MockQuerySet(list(reversed(self.items))) return self def __getitem__(self, sliced): return self.items[sliced] - self.pagination = pagination.CursorPagination() - self.queryset = MockQuerySet( - [MockObject(idx) for idx in range(1, 16)] - ) + class ExamplePagination(pagination.CursorPagination): + page_size = 5 - def paginate_queryset(self, request): - return list(self.pagination.paginate_queryset(self.queryset, request)) - - # def get_paginated_content(self, queryset): - # response = self.pagination.get_paginated_response(queryset) - # return response.data - - # def get_html_context(self): - # return self.pagination.get_html_context() - - def test_following_cursor(self): - request = Request(factory.get('/')) - queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [1, 2, 3, 4, 5] - - next_url = self.pagination.get_next_link() - assert next_url - - request = Request(factory.get(next_url)) - queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [6, 7, 8, 9, 10] - - next_url = self.pagination.get_next_link() - assert next_url - - request = Request(factory.get(next_url)) - queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [11, 12, 13, 14, 15] - - next_url = self.pagination.get_next_link() - assert next_url is None - - # Now page back again - - previous_url = self.pagination.get_previous_link() - assert previous_url - - request = Request(factory.get(previous_url)) - queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [6, 7, 8, 9, 10] - - previous_url = self.pagination.get_previous_link() - assert previous_url - - request = Request(factory.get(previous_url)) - queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [1, 2, 3, 4, 5] - - previous_url = self.pagination.get_previous_link() - assert previous_url is None - - -class TestCrazyCursorPagination: - """ - Unit tests for `pagination.CursorPagination`. - """ - - def setup(self): - class MockObject(object): - def __init__(self, idx): - self.created = idx - - class MockQuerySet(object): - def __init__(self, items): - self.items = items - - def filter(self, created__gt=None, created__lt=None): - if created__gt is not None: - return MockQuerySet([ - item for item in self.items - if item.created > int(created__gt) - ]) - - assert created__lt is not None - return MockQuerySet([ - item for item in self.items - if item.created < int(created__lt) - ]) - - def order_by(self, ordering): - if ordering.startswith('-'): - return MockQuerySet(reversed(self.items)) - return self - - def __getitem__(self, sliced): - return self.items[sliced] - - self.pagination = pagination.CursorPagination() + self.pagination = ExamplePagination() self.queryset = MockQuerySet([ MockObject(idx) for idx in [ 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, - 1, 1, 2, 3, 4, - 5, 6, 7, 8, 9 + 1, 2, 3, 4, 4, + 4, 4, 5, 6, 7, + 7, 7, 7, 7, 7, + 7, 7, 7, 8, 9, + 9, 9, 9, 9, 9 ] ]) - def paginate_queryset(self, request): - return list(self.pagination.paginate_queryset(self.queryset, request)) + def get_pages(self, url): + """ + Given a URL return a tuple of: - def test_following_cursor_identical_items(self): - request = Request(factory.get('/')) - queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [1, 1, 1, 1, 1] + (previous page, current page, next page, previous url, next url) + """ + request = Request(factory.get(url)) + queryset = self.pagination.paginate_queryset(self.queryset, request) + current = [item.created for item in queryset] next_url = self.pagination.get_next_link() - assert next_url - - request = Request(factory.get(next_url)) - queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [1, 1, 1, 1, 1] - - next_url = self.pagination.get_next_link() - assert next_url - - request = Request(factory.get(next_url)) - queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [1, 1, 2, 3, 4] - - next_url = self.pagination.get_next_link() - assert next_url - - request = Request(factory.get(next_url)) - queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [5, 6, 7, 8, 9] - - next_url = self.pagination.get_next_link() - assert next_url is None - - # Now page back again - previous_url = self.pagination.get_previous_link() - assert previous_url - request = Request(factory.get(previous_url)) - queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [1, 1, 2, 3, 4] + if next_url is not None: + request = Request(factory.get(next_url)) + queryset = self.pagination.paginate_queryset(self.queryset, request) + next = [item.created for item in queryset] + else: + next = None - previous_url = self.pagination.get_previous_link() - assert previous_url + if previous_url is not None: + request = Request(factory.get(previous_url)) + queryset = self.pagination.paginate_queryset(self.queryset, request) + previous = [item.created for item in queryset] + else: + previous = None - request = Request(factory.get(previous_url)) - queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [1, 1, 1, 1, 1] + return (previous, current, next, previous_url, next_url) - previous_url = self.pagination.get_previous_link() - assert previous_url + def test_invalid_cursor(self): + request = Request(factory.get('/', {'cursor': '123'})) + with pytest.raises(exceptions.NotFound): + self.pagination.paginate_queryset(self.queryset, request) - request = Request(factory.get(previous_url)) - queryset = self.paginate_queryset(request) - assert [item.created for item in queryset] == [1, 1, 1, 1, 1] + def test_cursor_pagination(self): + (previous, current, next, previous_url, next_url) = self.get_pages('/') - previous_url = self.pagination.get_previous_link() - assert previous_url is None + assert previous is None + assert current == [1, 1, 1, 1, 1] + assert next == [1, 2, 3, 4, 4] + + (previous, current, next, previous_url, next_url) = self.get_pages(next_url) + + assert previous == [1, 1, 1, 1, 1] + assert current == [1, 2, 3, 4, 4] + assert next == [4, 4, 5, 6, 7] + + (previous, current, next, previous_url, next_url) = self.get_pages(next_url) + + assert previous == [1, 2, 3, 4, 4] + assert current == [4, 4, 5, 6, 7] + assert next == [7, 7, 7, 7, 7] + + (previous, current, next, previous_url, next_url) = self.get_pages(next_url) + + assert previous == [4, 4, 4, 5, 6] # Paging artifact + assert current == [7, 7, 7, 7, 7] + assert next == [7, 7, 7, 8, 9] + + (previous, current, next, previous_url, next_url) = self.get_pages(next_url) + + assert previous == [7, 7, 7, 7, 7] + assert current == [7, 7, 7, 8, 9] + assert next == [9, 9, 9, 9, 9] + + (previous, current, next, previous_url, next_url) = self.get_pages(next_url) + + assert previous == [7, 7, 7, 8, 9] + assert current == [9, 9, 9, 9, 9] + assert next is None + + (previous, current, next, previous_url, next_url) = self.get_pages(previous_url) + + assert previous == [7, 7, 7, 7, 7] + assert current == [7, 7, 7, 8, 9] + assert next == [9, 9, 9, 9, 9] + + (previous, current, next, previous_url, next_url) = self.get_pages(previous_url) + + assert previous == [4, 4, 5, 6, 7] + assert current == [7, 7, 7, 7, 7] + assert next == [8, 9, 9, 9, 9] # Paging artifact + + (previous, current, next, previous_url, next_url) = self.get_pages(previous_url) + + assert previous == [1, 2, 3, 4, 4] + assert current == [4, 4, 5, 6, 7] + assert next == [7, 7, 7, 7, 7] + + (previous, current, next, previous_url, next_url) = self.get_pages(previous_url) + + assert previous == [1, 1, 1, 1, 1] + assert current == [1, 2, 3, 4, 4] + assert next == [4, 4, 5, 6, 7] + + (previous, current, next, previous_url, next_url) = self.get_pages(previous_url) + + assert previous is None + assert current == [1, 1, 1, 1, 1] + assert next == [1, 2, 3, 4, 4] def test_get_displayed_page_numbers(): From ca372ef6ef1cf95eb9282a484782e1a3721cb72b Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 22 Jan 2015 13:50:51 +0000 Subject: [PATCH 1486/1652] Fix for python 3 --- rest_framework/pagination.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 618352391..0c5abccb7 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -389,7 +389,7 @@ Cursor = namedtuple('Cursor', ['offset', 'reverse', 'position']) def decode_cursor(encoded): try: - tokens = urlparse.parse_qs(b64decode(encoded), keep_blank_values=True) + tokens = urlparse.parse_qs(b64decode(encoded).decode('ascii'), keep_blank_values=True) offset = int(tokens['offset'][0]) reverse = bool(int(tokens['reverse'][0])) position = tokens['position'][0] @@ -405,7 +405,7 @@ def encode_cursor(cursor): 'reverse': '1' if cursor.reverse else '0', 'position': cursor.position } - return b64encode(urlparse.urlencode(tokens, doseq=True)) + return b64encode(urlparse.urlencode(tokens, doseq=True).encode('ascii')) class CursorPagination(BasePagination): From 38a2ed6f62adcdcb2eba94f6133d4dd976a53af1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 22 Jan 2015 14:04:25 +0000 Subject: [PATCH 1487/1652] Python 3 fixes for cursor pagination --- rest_framework/pagination.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 0c5abccb7..cf1f1afa1 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -389,7 +389,8 @@ Cursor = namedtuple('Cursor', ['offset', 'reverse', 'position']) def decode_cursor(encoded): try: - tokens = urlparse.parse_qs(b64decode(encoded).decode('ascii'), keep_blank_values=True) + querystring = b64decode(encoded.encode('ascii')).decode('ascii') + tokens = urlparse.parse_qs(querystring, keep_blank_values=True) offset = int(tokens['offset'][0]) reverse = bool(int(tokens['reverse'][0])) position = tokens['position'][0] @@ -405,7 +406,8 @@ def encode_cursor(cursor): 'reverse': '1' if cursor.reverse else '0', 'position': cursor.position } - return b64encode(urlparse.urlencode(tokens, doseq=True).encode('ascii')) + querystring = urlparse.urlencode(tokens, doseq=True) + return b64encode(querystring.encode('ascii')).decode('ascii') class CursorPagination(BasePagination): From 83a82b44a56a303d43a16dd675fae116e51b9d85 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 22 Jan 2015 15:07:01 +0000 Subject: [PATCH 1488/1652] Support for tuple ordering in cursor pagination --- rest_framework/pagination.py | 113 +++++++++++++++++++++-------------- tests/test_pagination.py | 2 +- 2 files changed, 68 insertions(+), 47 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index cf1f1afa1..58223f49b 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -20,12 +20,12 @@ from rest_framework.utils.urls import ( ) -def _strict_positive_int(integer_string, cutoff=None): +def _positive_int(integer_string, strict=False, cutoff=None): """ Cast a string to a strictly positive integer. """ ret = int(integer_string) - if ret <= 0: + if ret < 0 or (ret == 0 and strict): raise ValueError() if cutoff: ret = min(ret, cutoff) @@ -126,6 +126,47 @@ def _get_page_links(page_numbers, current, url_func): return page_links +def _decode_cursor(encoded): + """ + Given a string representing an encoded cursor, return a `Cursor` instance. + """ + try: + querystring = b64decode(encoded.encode('ascii')).decode('ascii') + tokens = urlparse.parse_qs(querystring, keep_blank_values=True) + offset = _positive_int(tokens['offset'][0]) + reverse = bool(int(tokens['reverse'][0])) + position = tokens.get('position', [None])[0] + except (TypeError, ValueError): + return None + + return Cursor(offset=offset, reverse=reverse, position=position) + + +def _encode_cursor(cursor): + """ + Given a Cursor instance, return an encoded string representation. + """ + tokens = { + 'offset': str(cursor.offset), + 'reverse': '1' if cursor.reverse else '0', + } + if cursor.position is not None: + tokens['position'] = cursor.position + + querystring = urlparse.urlencode(tokens, doseq=True) + return b64encode(querystring.encode('ascii')).decode('ascii') + + +def _reverse_ordering(ordering_tuple): + """ + Given an order_by tuple such as `('-created', 'uuid')` reverse the + ordering and return a new tuple, eg. `('created', '-uuid')`. + """ + invert = lambda x: x[1:] if (x.startswith('-')) else '-' + x + return tuple([invert(item) for item in ordering_tuple]) + + +Cursor = namedtuple('Cursor', ['offset', 'reverse', 'position']) PageLink = namedtuple('PageLink', ['url', 'number', 'is_active', 'is_break']) PAGE_BREAK = PageLink(url=None, number=None, is_active=False, is_break=True) @@ -228,8 +269,9 @@ class PageNumberPagination(BasePagination): def get_page_size(self, request): if self.paginate_by_param: try: - return _strict_positive_int( + return _positive_int( request.query_params[self.paginate_by_param], + strict=True, cutoff=self.max_paginate_by ) except (KeyError, ValueError): @@ -312,7 +354,7 @@ class LimitOffsetPagination(BasePagination): def get_limit(self, request): if self.limit_query_param: try: - return _strict_positive_int( + return _positive_int( request.query_params[self.limit_query_param], cutoff=self.max_limit ) @@ -323,7 +365,7 @@ class LimitOffsetPagination(BasePagination): def get_offset(self, request): try: - return _strict_positive_int( + return _positive_int( request.query_params[self.offset_query_param], ) except (KeyError, ValueError): @@ -384,36 +426,10 @@ class LimitOffsetPagination(BasePagination): return template.render(context) -Cursor = namedtuple('Cursor', ['offset', 'reverse', 'position']) - - -def decode_cursor(encoded): - try: - querystring = b64decode(encoded.encode('ascii')).decode('ascii') - tokens = urlparse.parse_qs(querystring, keep_blank_values=True) - offset = int(tokens['offset'][0]) - reverse = bool(int(tokens['reverse'][0])) - position = tokens['position'][0] - except (TypeError, ValueError): - return None - - return Cursor(offset=offset, reverse=reverse, position=position) - - -def encode_cursor(cursor): - tokens = { - 'offset': str(cursor.offset), - 'reverse': '1' if cursor.reverse else '0', - 'position': cursor.position - } - querystring = urlparse.urlencode(tokens, doseq=True) - return b64encode(querystring.encode('ascii')).decode('ascii') - - class CursorPagination(BasePagination): - # TODO: handle queries with '' as a legitimate position # Support case where ordering is already negative # Support tuple orderings + # Determine how/if True, False and None positions work cursor_query_param = 'cursor' page_size = api_settings.PAGINATE_BY invalid_cursor_message = _('Invalid cursor') @@ -426,25 +442,26 @@ class CursorPagination(BasePagination): encoded = request.query_params.get(self.cursor_query_param) if encoded is None: self.cursor = None - (offset, reverse, current_position) = (0, False, '') + (offset, reverse, current_position) = (0, False, None) else: - self.cursor = decode_cursor(encoded) + self.cursor = _decode_cursor(encoded) if self.cursor is None: raise NotFound(self.invalid_cursor_message) (offset, reverse, current_position) = self.cursor # Cursor pagination always enforces an ordering. if reverse: - queryset = queryset.order_by('-' + self.ordering) + queryset = queryset.order_by(_reverse_ordering(self.ordering)) else: queryset = queryset.order_by(self.ordering) # If we have a cursor with a fixed position then filter by that. - if current_position != '': + if current_position is not None: + primary_ordering_attr = self.ordering[0].lstrip('-') if self.cursor.reverse: - kwargs = {self.ordering + '__lt': current_position} + kwargs = {primary_ordering_attr + '__lt': current_position} else: - kwargs = {self.ordering + '__gt': current_position} + kwargs = {primary_ordering_attr + '__gt': current_position} queryset = queryset.filter(**kwargs) # If we have an offset cursor then offset the entire page by that amount. @@ -468,7 +485,7 @@ class CursorPagination(BasePagination): if reverse: # Determine next and previous positions for reverse cursors. - self.has_next = current_position != '' or offset > 0 + self.has_next = (current_position is not None) or (offset > 0) self.has_previous = has_following_postion if self.has_next: self.next_position = current_position @@ -477,7 +494,7 @@ class CursorPagination(BasePagination): else: # Determine next and previous positions for forward cursors. self.has_next = has_following_postion - self.has_previous = current_position != '' or offset > 0 + self.has_previous = (current_position is not None) or (offset > 0) if self.has_next: self.next_position = following_position if self.has_previous: @@ -518,7 +535,7 @@ class CursorPagination(BasePagination): # Our cursor will have an offset equal to the page size, # but no position to filter against yet. offset = self.page_size - position = '' + position = None elif self.cursor.reverse: # The change in direction will introduce a paging artifact, # where we end up skipping forward a few extra items. @@ -531,7 +548,7 @@ class CursorPagination(BasePagination): position = self.previous_position cursor = Cursor(offset=offset, reverse=False, position=position) - encoded = encode_cursor(cursor) + encoded = _encode_cursor(cursor) return replace_query_param(self.base_url, self.cursor_query_param, encoded) def get_previous_link(self): @@ -567,7 +584,7 @@ class CursorPagination(BasePagination): # Our cursor will have an offset equal to the page size, # but no position to filter against yet. offset = self.page_size - position = '' + position = None elif self.cursor.reverse: # Use the position from the existing cursor and increment # it's offset by the page size. @@ -580,11 +597,15 @@ class CursorPagination(BasePagination): position = self.next_position cursor = Cursor(offset=offset, reverse=True, position=position) - encoded = encode_cursor(cursor) + encoded = _encode_cursor(cursor) return replace_query_param(self.base_url, self.cursor_query_param, encoded) def get_ordering(self): - return 'created' + """ + Return a tuple of strings, that may be used in an `order_by` method. + """ + return ('created',) def _get_position_from_instance(self, instance, ordering): - return str(getattr(instance, ordering)) + attr = getattr(instance, ordering[0]) + return six.text_type(attr) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index e32dd0288..fffdcbe92 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -450,7 +450,7 @@ class TestCursorPagination: ]) def order_by(self, ordering): - if ordering.startswith('-'): + if ordering[0].startswith('-'): return MockQuerySet(list(reversed(self.items))) return self From 408261ee02b176732b7f840f7042e7c24f3ecd27 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 22 Jan 2015 15:15:52 +0000 Subject: [PATCH 1489/1652] Support ordering attribute either on view or on pagination class for CursorPagination --- rest_framework/pagination.py | 24 +++++++++++++++++++----- tests/test_pagination.py | 1 + 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 58223f49b..7b28b47f0 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -427,16 +427,16 @@ class LimitOffsetPagination(BasePagination): class CursorPagination(BasePagination): - # Support case where ordering is already negative - # Support tuple orderings + # Support usage with OrderingFilter # Determine how/if True, False and None positions work cursor_query_param = 'cursor' page_size = api_settings.PAGINATE_BY invalid_cursor_message = _('Invalid cursor') + ordering = None def paginate_queryset(self, queryset, request, view=None): self.base_url = request.build_absolute_uri() - self.ordering = self.get_ordering() + self.ordering = self.get_ordering(view) # Determine if we have a cursor, and if so then decode it. encoded = request.query_params.get(self.cursor_query_param) @@ -600,11 +600,25 @@ class CursorPagination(BasePagination): encoded = _encode_cursor(cursor) return replace_query_param(self.base_url, self.cursor_query_param, encoded) - def get_ordering(self): + def get_ordering(self, view): """ Return a tuple of strings, that may be used in an `order_by` method. """ - return ('created',) + ordering = getattr(view, 'ordering', getattr(self, 'ordering', None)) + + assert ordering is not None, ( + 'Using cursor pagination, but no ordering attribute was declared ' + 'on the view or on the pagination class.' + ) + assert isinstance(ordering, (six.string_types, list, tuple)), ( + 'Invalid ordering. Expected string or tuple, but got {type}'.format( + type=type(ordering).__name__ + ) + ) + + if isinstance(ordering, six.string_types): + return (ordering,) + return ordering def _get_position_from_instance(self, instance, ordering): attr = getattr(instance, ordering[0]) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index fffdcbe92..c05b4abab 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -459,6 +459,7 @@ class TestCursorPagination: class ExamplePagination(pagination.CursorPagination): page_size = 5 + ordering = 'created' self.pagination = ExamplePagination() self.queryset = MockQuerySet([ From 0822c9e55820f8e4737329e38abc2e21718af9e5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 22 Jan 2015 16:12:05 +0000 Subject: [PATCH 1490/1652] Cursor pagination now works with OrderingFilter --- rest_framework/filters.py | 24 ++++++++++----------- rest_framework/pagination.py | 41 +++++++++++++++++++++++++++--------- tests/test_pagination.py | 40 +++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 23 deletions(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index d188a2d1e..2bcf36991 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -114,7 +114,7 @@ class OrderingFilter(BaseFilterBackend): ordering_param = api_settings.ORDERING_PARAM ordering_fields = None - def get_ordering(self, request): + def get_ordering(self, request, queryset, view): """ Ordering is set by a comma delimited ?ordering=... query parameter. @@ -124,7 +124,13 @@ class OrderingFilter(BaseFilterBackend): """ params = request.query_params.get(self.ordering_param) if params: - return [param.strip() for param in params.split(',')] + fields = [param.strip() for param in params.split(',')] + ordering = self.remove_invalid_fields(queryset, fields, view) + if ordering: + return ordering + + # No ordering was included, or all the ordering fields were invalid + return self.get_default_ordering(view) def get_default_ordering(self, view): ordering = getattr(view, 'ordering', None) @@ -132,7 +138,7 @@ class OrderingFilter(BaseFilterBackend): return (ordering,) return ordering - def remove_invalid_fields(self, queryset, ordering, view): + def remove_invalid_fields(self, queryset, fields, view): valid_fields = getattr(view, 'ordering_fields', self.ordering_fields) if valid_fields is None: @@ -152,18 +158,10 @@ class OrderingFilter(BaseFilterBackend): valid_fields = [field.name for field in queryset.model._meta.fields] valid_fields += queryset.query.aggregates.keys() - return [term for term in ordering if term.lstrip('-') in valid_fields] + return [term for term in fields if term.lstrip('-') in valid_fields] def filter_queryset(self, request, queryset, view): - ordering = self.get_ordering(request) - - if ordering: - # Skip any incorrect parameters - ordering = self.remove_invalid_fields(queryset, ordering, view) - - if not ordering: - # Use 'ordering' attribute by default - ordering = self.get_default_ordering(view) + ordering = self.get_ordering(request, queryset, view) if ordering: return queryset.order_by(*ordering) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 7b28b47f0..1b4174bc6 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -427,8 +427,9 @@ class LimitOffsetPagination(BasePagination): class CursorPagination(BasePagination): - # Support usage with OrderingFilter - # Determine how/if True, False and None positions work + # Determine how/if True, False and None positions work - do the string + # encodings work with Django queryset filters? + # Consider a max offset cap. cursor_query_param = 'cursor' page_size = api_settings.PAGINATE_BY invalid_cursor_message = _('Invalid cursor') @@ -436,7 +437,7 @@ class CursorPagination(BasePagination): def paginate_queryset(self, queryset, request, view=None): self.base_url = request.build_absolute_uri() - self.ordering = self.get_ordering(view) + self.ordering = self.get_ordering(request, queryset, view) # Determine if we have a cursor, and if so then decode it. encoded = request.query_params.get(self.cursor_query_param) @@ -600,16 +601,36 @@ class CursorPagination(BasePagination): encoded = _encode_cursor(cursor) return replace_query_param(self.base_url, self.cursor_query_param, encoded) - def get_ordering(self, view): + def get_ordering(self, request, queryset, view): """ Return a tuple of strings, that may be used in an `order_by` method. """ - ordering = getattr(view, 'ordering', getattr(self, 'ordering', None)) + ordering_filters = [ + filter_cls for filter_cls in getattr(view, 'filter_backends', []) + if hasattr(filter_cls, 'get_ordering') + ] + + if ordering_filters: + # If a filter exists on the view that implements `get_ordering` + # then we defer to that filter to determine the ordering. + filter_cls = ordering_filters[0] + filter_instance = filter_cls() + ordering = filter_instance.get_ordering(request, queryset, view) + assert ordering is not None, ( + 'Using cursor pagination, but filter class {filter_cls} ' + 'returned a `None` ordering.'.format( + filter_cls=filter_cls.__name__ + ) + ) + else: + # The default case is to check for an `ordering` attribute, + # first on the view instance, and then on this pagination instance. + ordering = getattr(view, 'ordering', getattr(self, 'ordering', None)) + assert ordering is not None, ( + 'Using cursor pagination, but no ordering attribute was declared ' + 'on the view or on the pagination class.' + ) - assert ordering is not None, ( - 'Using cursor pagination, but no ordering attribute was declared ' - 'on the view or on the pagination class.' - ) assert isinstance(ordering, (six.string_types, list, tuple)), ( 'Invalid ordering. Expected string or tuple, but got {type}'.format( type=type(ordering).__name__ @@ -618,7 +639,7 @@ class CursorPagination(BasePagination): if isinstance(ordering, six.string_types): return (ordering,) - return ordering + return tuple(ordering) def _get_position_from_instance(self, instance, ordering): attr = getattr(instance, ordering[0]) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index c05b4abab..338be610c 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -77,6 +77,20 @@ class TestPaginationIntegration: 'count': 50 } + def test_setting_page_size_to_zero(self): + """ + When page_size parameter is invalid it should return to the default. + """ + request = factory.get('/', {'page_size': 0}) + response = self.view(request) + assert response.status_code == status.HTTP_200_OK + assert response.data == { + 'results': [2, 4, 6, 8, 10], + 'previous': None, + 'next': 'http://testserver/?page=2&page_size=0', + 'count': 50 + } + def test_additional_query_params_are_preserved(self): request = factory.get('/', {'page': 2, 'filter': 'even'}) response = self.view(request) @@ -88,6 +102,14 @@ class TestPaginationIntegration: 'count': 50 } + def test_404_not_found_for_zero_page(self): + request = factory.get('/', {'page': '0'}) + response = self.view(request) + assert response.status_code == status.HTTP_404_NOT_FOUND + assert response.data == { + 'detail': 'Invalid page "0": That page number is less than 1.' + } + def test_404_not_found_for_invalid_page(self): request = factory.get('/', {'page': 'invalid'}) response = self.view(request) @@ -507,6 +529,24 @@ class TestCursorPagination: with pytest.raises(exceptions.NotFound): self.pagination.paginate_queryset(self.queryset, request) + def test_use_with_ordering_filter(self): + class MockView: + filter_backends = (filters.OrderingFilter,) + ordering_fields = ['username', 'created'] + ordering = 'created' + + request = Request(factory.get('/', {'ordering': 'username'})) + ordering = self.pagination.get_ordering(request, [], MockView()) + assert ordering == ('username',) + + request = Request(factory.get('/', {'ordering': '-username'})) + ordering = self.pagination.get_ordering(request, [], MockView()) + assert ordering == ('-username',) + + request = Request(factory.get('/', {'ordering': 'invalid'})) + ordering = self.pagination.get_ordering(request, [], MockView()) + assert ordering == ('created',) + def test_cursor_pagination(self): (previous, current, next, previous_url, next_url) = self.get_pages('/') From 43d983fae82ab23ca94f52deb29e938eb2a40e88 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 22 Jan 2015 17:25:12 +0000 Subject: [PATCH 1491/1652] Add paging controls --- rest_framework/pagination.py | 66 ++++++++++++++----- .../rest_framework/css/bootstrap-tweaks.css | 12 +++- .../pagination/previous_and_next.html | 12 ++++ tests/test_pagination.py | 5 +- 4 files changed, 78 insertions(+), 17 deletions(-) create mode 100644 rest_framework/templates/rest_framework/pagination/previous_and_next.html diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 1b4174bc6..b3658acad 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -133,9 +133,14 @@ def _decode_cursor(encoded): try: querystring = b64decode(encoded.encode('ascii')).decode('ascii') tokens = urlparse.parse_qs(querystring, keep_blank_values=True) - offset = _positive_int(tokens['offset'][0]) - reverse = bool(int(tokens['reverse'][0])) - position = tokens.get('position', [None])[0] + + offset = tokens.get('o', ['0'])[0] + offset = _positive_int(offset) + + reverse = tokens.get('r', ['0'])[0] + reverse = bool(int(reverse)) + + position = tokens.get('p', [None])[0] except (TypeError, ValueError): return None @@ -146,12 +151,13 @@ def _encode_cursor(cursor): """ Given a Cursor instance, return an encoded string representation. """ - tokens = { - 'offset': str(cursor.offset), - 'reverse': '1' if cursor.reverse else '0', - } + tokens = {} + if cursor.offset != 0: + tokens['o'] = str(cursor.offset) + if cursor.reverse: + tokens['r'] = '1' if cursor.position is not None: - tokens['position'] = cursor.position + tokens['p'] = cursor.position querystring = urlparse.urlencode(tokens, doseq=True) return b64encode(querystring.encode('ascii')).decode('ascii') @@ -430,10 +436,12 @@ class CursorPagination(BasePagination): # Determine how/if True, False and None positions work - do the string # encodings work with Django queryset filters? # Consider a max offset cap. + # Tidy up the `get_ordering` API (eg remove queryset from it) cursor_query_param = 'cursor' page_size = api_settings.PAGINATE_BY invalid_cursor_message = _('Invalid cursor') ordering = None + template = 'rest_framework/pagination/previous_and_next.html' def paginate_queryset(self, queryset, request, view=None): self.base_url = request.build_absolute_uri() @@ -452,17 +460,22 @@ class CursorPagination(BasePagination): # Cursor pagination always enforces an ordering. if reverse: - queryset = queryset.order_by(_reverse_ordering(self.ordering)) + queryset = queryset.order_by(*_reverse_ordering(self.ordering)) else: - queryset = queryset.order_by(self.ordering) + queryset = queryset.order_by(*self.ordering) # If we have a cursor with a fixed position then filter by that. if current_position is not None: - primary_ordering_attr = self.ordering[0].lstrip('-') - if self.cursor.reverse: - kwargs = {primary_ordering_attr + '__lt': current_position} + order = self.ordering[0] + is_reversed = order.startswith('-') + order_attr = order.lstrip('-') + + # Test for: (cursor reversed) XOR (queryset reversed) + if self.cursor.reverse != is_reversed: + kwargs = {order_attr + '__lt': current_position} else: - kwargs = {primary_ordering_attr + '__gt': current_position} + kwargs = {order_attr + '__gt': current_position} + queryset = queryset.filter(**kwargs) # If we have an offset cursor then offset the entire page by that amount. @@ -501,6 +514,11 @@ class CursorPagination(BasePagination): if self.has_previous: self.previous_position = current_position + # Display page controls in the browsable API if there is more + # than one page. + if self.has_previous or self.has_next: + self.display_page_controls = True + return self.page def get_next_link(self): @@ -642,5 +660,23 @@ class CursorPagination(BasePagination): return tuple(ordering) def _get_position_from_instance(self, instance, ordering): - attr = getattr(instance, ordering[0]) + attr = getattr(instance, ordering[0].lstrip('-')) return six.text_type(attr) + + def get_paginated_response(self, data): + return Response(OrderedDict([ + ('next', self.get_next_link()), + ('previous', self.get_previous_link()), + ('results', data) + ])) + + def get_html_context(self): + return { + 'previous_url': self.get_previous_link(), + 'next_url': self.get_next_link() + } + + def to_html(self): + template = loader.get_template(self.template) + context = Context(self.get_html_context()) + return template.render(context) diff --git a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css index 15b42178f..04f12ed3d 100644 --- a/rest_framework/static/rest_framework/css/bootstrap-tweaks.css +++ b/rest_framework/static/rest_framework/css/bootstrap-tweaks.css @@ -63,10 +63,20 @@ a single block in the template. .pagination>.disabled>a, .pagination>.disabled>a:hover, .pagination>.disabled>a:focus { - cursor: default; + cursor: not-allowed; pointer-events: none; } +.pager>.disabled>a, +.pager>.disabled>a:hover, +.pager>.disabled>a:focus { + pointer-events: none; +} + +.pager .next { + margin-left: 10px; +} + /*=== dabapps bootstrap styles ====*/ html { diff --git a/rest_framework/templates/rest_framework/pagination/previous_and_next.html b/rest_framework/templates/rest_framework/pagination/previous_and_next.html new file mode 100644 index 000000000..eacbfff45 --- /dev/null +++ b/rest_framework/templates/rest_framework/pagination/previous_and_next.html @@ -0,0 +1,12 @@ +<ul class="pager"> +{% if previous_url %} + <li class="previous"><a href="{{ previous_url }}">« Previous</a></li> +{% else %} + <li class="previous disabled"><a href="#">« Previous</a></li> +{% endif %} +{% if next_url %} + <li class="next"><a href="{{ next_url }}">Next »</a></li> +{% else %} + <li class="next disabled"><a href="#">Next »</li> +{% endif %} +</ul> diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 338be610c..13bfb6272 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -1,3 +1,4 @@ +# coding: utf-8 from __future__ import unicode_literals from rest_framework import exceptions, generics, pagination, serializers, status, filters from rest_framework.request import Request @@ -471,7 +472,7 @@ class TestCursorPagination: if item.created < int(created__lt) ]) - def order_by(self, ordering): + def order_by(self, *ordering): if ordering[0].startswith('-'): return MockQuerySet(list(reversed(self.items))) return self @@ -614,6 +615,8 @@ class TestCursorPagination: assert current == [1, 1, 1, 1, 1] assert next == [1, 2, 3, 4, 4] + assert isinstance(self.pagination.to_html(), type('')) + def test_get_displayed_page_numbers(): """ From 25a703b42c030f712734ed56b8f1996f8d13ac0c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 11:15:11 +0000 Subject: [PATCH 1492/1652] Work around meta API differences --- rest_framework/utils/model_meta.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py index 375d2e8c6..6a5835f54 100644 --- a/rest_framework/utils/model_meta.py +++ b/rest_framework/utils/model_meta.py @@ -121,12 +121,17 @@ def _get_reverse_relationships(opts): """ Returns an `OrderedDict` of field names to `RelationInfo`. """ + # Note that we have a hack here to handle internal API differences for + # this internal API across Django 1.7 -> Django 1.8. + # See: https://code.djangoproject.com/ticket/24208 + reverse_relations = OrderedDict() for relation in opts.get_all_related_objects(): accessor_name = relation.get_accessor_name() + related = getattr(relation, 'related_model', relation.model) reverse_relations[accessor_name] = RelationInfo( model_field=None, - related=relation.model, + related=related, to_many=relation.field.rel.multiple, has_through_model=False ) @@ -134,9 +139,10 @@ def _get_reverse_relationships(opts): # Deal with reverse many-to-many relationships. for relation in opts.get_all_related_many_to_many_objects(): accessor_name = relation.get_accessor_name() + related = getattr(relation, 'related_model', relation.model) reverse_relations[accessor_name] = RelationInfo( model_field=None, - related=relation.model, + related=related, to_many=True, has_through_model=( (getattr(relation.field.rel, 'through', None) is not None) From 5eb6949e9f24dd5e94aa5eb50fd6ccaf34b21878 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 11:32:04 +0000 Subject: [PATCH 1493/1652] Drop django-filter from 1.8 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index e43a9234f..75ebe1345 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ deps = {py26,py27}-django{14,15}: django-oauth2-provider==0.2.3 {py26,py27}-django16: django-oauth2-provider==0.2.4 pytest-django==2.8.0 - django-filter==0.7 + {py27,py32,py32,py33,py34}-django{14,15,16,17}: django-filter==0.7 defusedxml==0.3 markdown>=2.1.0 PyYAML>=3.10 From e307fd289c52a9bb97a567cff314a479bbdd21df Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 11:38:58 +0000 Subject: [PATCH 1494/1652] Fix test matrix --- env/pip-selfcheck.json | 1 + tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 env/pip-selfcheck.json diff --git a/env/pip-selfcheck.json b/env/pip-selfcheck.json new file mode 100644 index 000000000..50cde9566 --- /dev/null +++ b/env/pip-selfcheck.json @@ -0,0 +1 @@ +{"last_check":"2015-01-23T11:37:11Z","pypi_version":"6.0.6"} \ No newline at end of file diff --git a/tox.ini b/tox.ini index 75ebe1345..193b5813f 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ deps = {py26,py27}-django{14,15}: django-oauth2-provider==0.2.3 {py26,py27}-django16: django-oauth2-provider==0.2.4 pytest-django==2.8.0 - {py27,py32,py32,py33,py34}-django{14,15,16,17}: django-filter==0.7 + {py26,py27,py32,py33,py34}-django{14,15,16,17}: django-filter==0.7 defusedxml==0.3 markdown>=2.1.0 PyYAML>=3.10 From e988d578535fcc820d30dc7c59f1e24f5c911d3c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 11:47:01 +0000 Subject: [PATCH 1495/1652] Fix template loader monkey patching to also support 1.8 --- tests/test_htmlrenderer.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/test_htmlrenderer.py b/tests/test_htmlrenderer.py index 2edc6b4bd..a33b832f5 100644 --- a/tests/test_htmlrenderer.py +++ b/tests/test_htmlrenderer.py @@ -56,7 +56,13 @@ class TemplateHTMLRendererTests(TestCase): return Template("example: {{ object }}") raise TemplateDoesNotExist(template_name) + def select_template(template_name_list, dirs=None, using=None): + if template_name_list == ['example.html']: + return Template("example: {{ object }}") + raise TemplateDoesNotExist(template_name_list[0]) + django.template.loader.get_template = get_template + django.template.loader.select_template = select_template def tearDown(self): """ From 4cb164b66c0784ce79054925d4744deb5b18d8b2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 11:49:57 +0000 Subject: [PATCH 1496/1652] Add missing skipUnless(django_filters) --- tests/test_filters.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_filters.py b/tests/test_filters.py index dc84dcbd0..5b1b6ca52 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -467,6 +467,7 @@ class DjangoFilterOrderingTests(TestCase): for d in data: DjangoFilterOrderingModel.objects.create(**d) + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_default_ordering(self): class DjangoFilterOrderingView(generics.ListAPIView): serializer_class = DjangoFilterOrderingSerializer From f1ac9d3f9b6c306b7fa48381006d8259c1642a99 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 12:26:44 +0000 Subject: [PATCH 1497/1652] More graceful handling of malformed Content-Disposition --- rest_framework/parsers.py | 2 +- tests/test_parsers.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index 401856ec4..ef72677ce 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -298,7 +298,7 @@ class FileUploadParser(BaseParser): if 'filename*' in filename_parm: return self.get_encoded_filename(filename_parm) return force_text(filename_parm['filename']) - except (AttributeError, KeyError): + except (AttributeError, KeyError, ValueError): pass def get_encoded_filename(self, filename_parm): diff --git a/tests/test_parsers.py b/tests/test_parsers.py index d28d8bd43..1d2054aca 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -161,7 +161,9 @@ class TestFileUploadParser(TestCase): self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8--ÀĥƦ.txt') filename = parser.get_filename(self.stream, None, self.parser_context) - self.assertEqual(filename, 'fallback.txt') + # Malformed. Either None or 'fallback.txt' will be acceptable. + # See also https://code.djangoproject.com/ticket/24209 + self.assertIn(filename, ('fallback.txt', None)) def __replace_content_disposition(self, disposition): self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition From f3b6eedb8aeaa23f4b48551356814837973db31c Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 12:56:55 +0000 Subject: [PATCH 1498/1652] More sensible response caching. --- rest_framework/response.py | 7 +++- tests/test_renderers.py | 85 ++++++-------------------------------- 2 files changed, 17 insertions(+), 75 deletions(-) diff --git a/rest_framework/response.py b/rest_framework/response.py index d6ca1aad4..7f90bae10 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -81,10 +81,13 @@ class Response(SimpleTemplateResponse): def __getstate__(self): """ - Remove attributes from the response that shouldn't be cached + Remove attributes from the response that shouldn't be cached. """ state = super(Response, self).__getstate__() - for key in ('accepted_renderer', 'renderer_context', 'data'): + for key in ( + 'accepted_renderer', 'renderer_context', 'resolver_match', + 'client', 'request', 'wsgi_request', '_closable_objects' + ): if key in state: del state[key] return state diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 00a24fb12..54eea8ceb 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -22,7 +22,6 @@ from rest_framework.test import APIRequestFactory from collections import MutableMapping import datetime import json -import pickle import re @@ -618,84 +617,24 @@ class CacheRenderTest(TestCase): urls = 'tests.test_renderers' - cache_key = 'just_a_cache_key' - - @classmethod - def _get_pickling_errors(cls, obj, seen=None): - """ Return any errors that would be raised if `obj' is pickled - Courtesy of koffie @ http://stackoverflow.com/a/7218986/109897 - """ - if seen is None: - seen = [] - try: - state = obj.__getstate__() - except AttributeError: - return - if state is None: - return - if isinstance(state, tuple): - if not isinstance(state[0], dict): - state = state[1] - else: - state = state[0].update(state[1]) - result = {} - for i in state: - try: - pickle.dumps(state[i], protocol=2) - except pickle.PicklingError: - if not state[i] in seen: - seen.append(state[i]) - result[i] = cls._get_pickling_errors(state[i], seen) - return result - - def http_resp(self, http_method, url): - """ - Simple wrapper for Client http requests - Removes the `client' and `request' attributes from as they are - added by django.test.client.Client and not part of caching - responses outside of tests. - """ - method = getattr(self.client, http_method) - resp = method(url) - resp._closable_objects = [] - del resp.client, resp.request - try: - del resp.wsgi_request - except AttributeError: - pass - return resp - - def test_obj_pickling(self): - """ - Test that responses are properly pickled - """ - resp = self.http_resp('get', '/cache') - - # Make sure that no pickling errors occurred - self.assertEqual(self._get_pickling_errors(resp), {}) - - # Unfortunately LocMem backend doesn't raise PickleErrors but returns - # None instead. - cache.set(self.cache_key, resp) - self.assertTrue(cache.get(self.cache_key) is not None) - def test_head_caching(self): """ Test caching of HEAD requests """ - resp = self.http_resp('head', '/cache') - cache.set(self.cache_key, resp) - - cached_resp = cache.get(self.cache_key) - self.assertIsInstance(cached_resp, Response) + response = self.client.head('/cache') + cache.set('key', response) + cached_response = cache.get('key') + assert isinstance(cached_response, Response) + assert cached_response.content == response.content + assert cached_response.status_code == response.status_code def test_get_caching(self): """ Test caching of GET requests """ - resp = self.http_resp('get', '/cache') - cache.set(self.cache_key, resp) - - cached_resp = cache.get(self.cache_key) - self.assertIsInstance(cached_resp, Response) - self.assertEqual(cached_resp.content, resp.content) + response = self.client.get('/cache') + cache.set('key', response) + cached_response = cache.get('key') + assert isinstance(cached_response, Response) + assert cached_response.content == response.content + assert cached_response.status_code == response.status_code From 04a5f7bf0a268d24656ef3659f85aec95fd7590a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 13:04:29 +0000 Subject: [PATCH 1499/1652] Move 1.8-alpha out of 'expected failures' --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 996c3ae80..28ebfc00f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,10 +33,6 @@ env: matrix: fast_finish: true allow_failures: - - env: TOX_ENV=py34-django18alpha - - env: TOX_ENV=py33-django18alpha - - env: TOX_ENV=py32-django18alpha - - env: TOX_ENV=py27-django18alpha - env: TOX_ENV=py34-djangomaster - env: TOX_ENV=py33-djangomaster - env: TOX_ENV=py32-djangomaster From 4201c9fb01beae84fc34a5b74e138e721de42de1 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 13:42:56 +0000 Subject: [PATCH 1500/1652] Drop erronous check-in --- env/pip-selfcheck.json | 1 - 1 file changed, 1 deletion(-) delete mode 100644 env/pip-selfcheck.json diff --git a/env/pip-selfcheck.json b/env/pip-selfcheck.json deleted file mode 100644 index 50cde9566..000000000 --- a/env/pip-selfcheck.json +++ /dev/null @@ -1 +0,0 @@ -{"last_check":"2015-01-23T11:37:11Z","pypi_version":"6.0.6"} \ No newline at end of file From bf0b331e8f3d03d995d87a6f71fea2dc05880509 Mon Sep 17 00:00:00 2001 From: Carlton Gibson <carlton.gibson@noumenal.co.uk> Date: Fri, 23 Jan 2015 15:21:51 +0100 Subject: [PATCH 1501/1652] Restore DF for Django 1.8 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 193b5813f..8e0369643 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ deps = {py26,py27}-django{14,15}: django-oauth2-provider==0.2.3 {py26,py27}-django16: django-oauth2-provider==0.2.4 pytest-django==2.8.0 - {py26,py27,py32,py33,py34}-django{14,15,16,17}: django-filter==0.7 + django-filter==0.9.2 defusedxml==0.3 markdown>=2.1.0 PyYAML>=3.10 From 790c92d438f85c93d8c3cf626347915c65c8384d Mon Sep 17 00:00:00 2001 From: Carlton Gibson <carlton.gibson@noumenal.co.uk> Date: Fri, 23 Jan 2015 15:22:20 +0100 Subject: [PATCH 1502/1652] Update Django-Filter references in docs and requirements. --- docs/index.md | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.md b/docs/index.md index d40f8972f..c11107883 100644 --- a/docs/index.md +++ b/docs/index.md @@ -58,7 +58,7 @@ The following packages are optional: * [Markdown][markdown] (2.1.0+) - Markdown support for the browsable API. * [PyYAML][yaml] (3.10+) - YAML content-type support. * [defusedxml][defusedxml] (0.3+) - XML content-type support. -* [django-filter][django-filter] (0.5.4+) - Filtering support. +* [django-filter][django-filter] (0.9.2+) - Filtering support. * [django-oauth-plus][django-oauth-plus] (2.0+) and [oauth2][oauth2] (1.5.211+) - OAuth 1.0a support. * [django-oauth2-provider][django-oauth2-provider] (0.2.3+) - OAuth 2.0 support. * [django-guardian][django-guardian] (1.1.1+) - Object level permissions support. diff --git a/requirements.txt b/requirements.txt index 43e947c43..00d973cdf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ markdown>=2.1.0 PyYAML>=3.10 defusedxml>=0.3 django-guardian==1.2.4 -django-filter>=0.5.4 +django-filter>=0.9.2 django-oauth-plus>=2.2.1 oauth2>=1.5.211 django-oauth2-provider>=0.2.4 From 8f25c0c53c24c88afc86d99bbb3ca4edc3a4e0a2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 14:56:15 +0000 Subject: [PATCH 1503/1652] Add 1.8 support --- rest_framework/serializers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b91ecebc3..d9a67441d 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -12,7 +12,7 @@ response content is handled by parsers and renderers. """ from __future__ import unicode_literals from django.db import models -from django.db.models.fields import FieldDoesNotExist +from django.db.models.fields import FieldDoesNotExist, Field as DjangoModelField from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import unicode_to_repr from rest_framework.utils import model_meta @@ -1231,7 +1231,9 @@ class ModelSerializer(Serializer): continue try: - model_fields[source] = model._meta.get_field(source) + field = model._meta.get_field(source) + if isinstance(field, DjangoModelField): + model_fields[source] = field except FieldDoesNotExist: pass From e8db1834d3a3f6ba05276b64e5681288aa8f9820 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 15:24:06 +0000 Subject: [PATCH 1504/1652] Added UUIDField. --- rest_framework/fields.py | 18 ++++++++++++++++++ rest_framework/serializers.py | 8 +++++++- tests/test_fields.py | 18 ++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index cc9410aa7..5e3f7ce4f 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -23,6 +23,7 @@ import datetime import decimal import inspect import re +import uuid class empty: @@ -632,6 +633,23 @@ class URLField(CharField): self.validators.append(validator) +class UUIDField(Field): + default_error_messages = { + 'invalid': _('"{value}" is not a valid UUID.'), + } + + def to_internal_value(self, data): + if not isinstance(data, uuid.UUID): + try: + return uuid.UUID(data) + except (ValueError, TypeError): + self.fail('invalid', value=data) + return data + + def to_representation(self, value): + return str(value) + + # Number types... class IntegerField(Field): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index cf797bdcb..dca612cad 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -702,6 +702,7 @@ class ModelSerializer(Serializer): you need you should either declare the extra/differing fields explicitly on the serializer class, or simply use a `Serializer` class. """ + _field_mapping = ClassLookupDict({ models.AutoField: IntegerField, models.BigIntegerField: IntegerField, @@ -724,7 +725,8 @@ class ModelSerializer(Serializer): models.SmallIntegerField: IntegerField, models.TextField: CharField, models.TimeField: TimeField, - models.URLField: URLField, + models.URLField: URLField + # Note: Some version-specific mappings also defined below. }) _related_class = PrimaryKeyRelatedField @@ -1132,6 +1134,10 @@ class ModelSerializer(Serializer): return NestedSerializer +if hasattr(models, 'UUIDField'): + ModelSerializer._field_mapping[models.UUIDField] = UUIDField + + class HyperlinkedModelSerializer(ModelSerializer): """ A type of `ModelSerializer` that uses hyperlinked relationships instead diff --git a/tests/test_fields.py b/tests/test_fields.py index 775d46184..a46cc2052 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -4,6 +4,7 @@ from rest_framework import serializers import datetime import django import pytest +import uuid # Tests for field keyword arguments and core functionality. @@ -467,6 +468,23 @@ class TestURLField(FieldValues): field = serializers.URLField() +class TestUUIDField(FieldValues): + """ + Valid and invalid values for `UUIDField`. + """ + valid_inputs = { + '825d7aeb-05a9-45b5-a5b7-05df87923cda': uuid.UUID('825d7aeb-05a9-45b5-a5b7-05df87923cda'), + '825d7aeb05a945b5a5b705df87923cda': uuid.UUID('825d7aeb-05a9-45b5-a5b7-05df87923cda') + } + invalid_inputs = { + '825d7aeb-05a9-45b5-a5b7': ['"825d7aeb-05a9-45b5-a5b7" is not a valid UUID.'] + } + outputs = { + uuid.UUID('825d7aeb-05a9-45b5-a5b7-05df87923cda'): '825d7aeb-05a9-45b5-a5b7-05df87923cda' + } + field = serializers.UUIDField() + + # Number types... class TestIntegerField(FieldValues): From 5bb348605e5dad3b58495b1fc56ea393194b89fb Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 15:31:08 +0000 Subject: [PATCH 1505/1652] UUIDField docs --- docs/api-guide/fields.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index b3d274ddb..64ec902b4 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -182,6 +182,12 @@ Corresponds to `django.db.models.fields.URLField`. Uses Django's `django.core.v **Signature:** `URLField(max_length=200, min_length=None, allow_blank=False)` +## UUIDField + +A field that ensures the input is a valid UUID string. The `to_internal_value` method will return a `uuid.UUID` instance. On output the field will return a string in the canonical hyphenated format, for example: + + "de305d54-75b4-431b-adb2-eb6b9e546013" + --- # Numeric fields @@ -320,7 +326,7 @@ Both the `allow_blank` and `allow_null` are valid options on `ChoiceField`, alth ## MultipleChoiceField -A field that can accept a set of zero, one or many values, chosen from a limited set of choices. Takes a single mandatory argument. `to_internal_representation` returns a `set` containing the selected values. +A field that can accept a set of zero, one or many values, chosen from a limited set of choices. Takes a single mandatory argument. `to_internal_value` returns a `set` containing the selected values. **Signature:** `MultipleChoiceField(choices)` From 889a07f5563a0f970639a0958c0dcbc26e82919f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 15:32:21 +0000 Subject: [PATCH 1506/1652] Support assignment in ClassLookupDict --- rest_framework/utils/field_mapping.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index cba40d318..c97ec5d0e 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -38,6 +38,9 @@ class ClassLookupDict(object): return self.mapping[cls] raise KeyError('Class %s not found in lookup.', cls.__name__) + def __setitem__(self, key, value): + self.mapping[key] = value + def needs_label(model_field, field_name): """ From 35f6a8246299d31ecce4f791f9527bf34cebe6e2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 23 Jan 2015 16:27:23 +0000 Subject: [PATCH 1507/1652] Added DictField and support for HStoreField. --- docs/api-guide/fields.md | 19 ++++++++++- rest_framework/compat.py | 7 +++++ rest_framework/fields.py | 59 +++++++++++++++++++++++++++++++++-- rest_framework/serializers.py | 8 ++++- tests/test_fields.py | 51 +++++++++++++++++++++++++++++- 5 files changed, 139 insertions(+), 5 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 64ec902b4..1c78a42b6 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -380,7 +380,7 @@ A field class that validates a list of objects. **Signature**: `ListField(child)` -- `child` - A field instance that should be used for validating the objects in the list. +- `child` - A field instance that should be used for validating the objects in the list. If this argument is not provided then objects in the list will not be validated. For example, to validate a list of integers you might use something like the following: @@ -395,6 +395,23 @@ The `ListField` class also supports a declarative style that allows you to write We can now reuse our custom `StringListField` class throughout our application, without having to provide a `child` argument to it. +## DictField + +A field class that validates a dictionary of objects. The keys in `DictField` are always assumed to be string values. + +**Signature**: `DictField(child)` + +- `child` - A field instance that should be used for validating the values in the dictionary. If this argument is not provided then values in the mapping will not be validated. + +For example, to create a field that validates a mapping of strings to strings, you would write something like this: + + document = DictField(child=CharField()) + +You can also use the declarative style, as with `ListField`. For example: + + class DocumentField(DictField): + child = CharField() + --- # Miscellaneous fields diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 766afaec2..364133940 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -58,6 +58,13 @@ except ImportError: from django.http import HttpResponse as HttpResponseBase +# contrib.postgres only supported from 1.8 onwards. +try: + from django.contrib.postgres import fields as postgres_fields +except ImportError: + postgres_fields = None + + # request only provides `resolver_match` from 1.5 onwards. def get_resolver_match(request): try: diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 5e3f7ce4f..71a9f1938 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1132,8 +1132,21 @@ class ImageField(FileField): # Composite field types... +class _UnvalidatedField(Field): + def __init__(self, *args, **kwargs): + super(_UnvalidatedField, self).__init__(*args, **kwargs) + self.allow_blank = True + self.allow_null = True + + def to_internal_value(self, data): + return data + + def to_representation(self, value): + return value + + class ListField(Field): - child = None + child = _UnvalidatedField() initial = [] default_error_messages = { 'not_a_list': _('Expected a list of items but got type `{input_type}`') @@ -1141,7 +1154,6 @@ class ListField(Field): def __init__(self, *args, **kwargs): self.child = kwargs.pop('child', copy.deepcopy(self.child)) - assert self.child is not None, '`child` is a required argument.' assert not inspect.isclass(self.child), '`child` has not been instantiated.' super(ListField, self).__init__(*args, **kwargs) self.child.bind(field_name='', parent=self) @@ -1170,6 +1182,49 @@ class ListField(Field): return [self.child.to_representation(item) for item in data] +class DictField(Field): + child = _UnvalidatedField() + initial = [] + default_error_messages = { + 'not_a_dict': _('Expected a dictionary of items but got type `{input_type}`') + } + + def __init__(self, *args, **kwargs): + self.child = kwargs.pop('child', copy.deepcopy(self.child)) + assert not inspect.isclass(self.child), '`child` has not been instantiated.' + super(DictField, self).__init__(*args, **kwargs) + self.child.bind(field_name='', parent=self) + + def get_value(self, dictionary): + # We override the default field access in order to support + # lists in HTML forms. + if html.is_html_input(dictionary): + return html.parse_html_list(dictionary, prefix=self.field_name) + return dictionary.get(self.field_name, empty) + + def to_internal_value(self, data): + """ + Dicts of native values <- Dicts of primitive datatypes. + """ + if html.is_html_input(data): + data = html.parse_html_dict(data) + if not isinstance(data, dict): + self.fail('not_a_dict', input_type=type(data).__name__) + return dict([ + (six.text_type(key), self.child.run_validation(value)) + for key, value in data.items() + ]) + + def to_representation(self, value): + """ + List of object instances -> List of dicts of primitive datatypes. + """ + return dict([ + (six.text_type(key), self.child.to_representation(val)) + for key, val in value.items() + ]) + + # Miscellaneous field types... class ReadOnlyField(Field): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index dca612cad..42d1e3700 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -14,7 +14,7 @@ from __future__ import unicode_literals from django.db import models from django.db.models.fields import FieldDoesNotExist, Field as DjangoField from django.utils.translation import ugettext_lazy as _ -from rest_framework.compat import unicode_to_repr +from rest_framework.compat import postgres_fields, unicode_to_repr from rest_framework.utils import model_meta from rest_framework.utils.field_mapping import ( get_url_kwargs, get_field_kwargs, @@ -1137,6 +1137,12 @@ class ModelSerializer(Serializer): if hasattr(models, 'UUIDField'): ModelSerializer._field_mapping[models.UUIDField] = UUIDField +if postgres_fields: + class CharMappingField(DictField): + child = CharField() + + ModelSerializer._field_mapping[postgres_fields.HStoreField] = CharMappingField + class HyperlinkedModelSerializer(ModelSerializer): """ diff --git a/tests/test_fields.py b/tests/test_fields.py index a46cc2052..6744cf645 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1047,7 +1047,7 @@ class TestValidImageField(FieldValues): class TestListField(FieldValues): """ - Values for `ListField`. + Values for `ListField` with IntegerField as child. """ valid_inputs = [ ([1, 2, 3], [1, 2, 3]), @@ -1064,6 +1064,55 @@ class TestListField(FieldValues): field = serializers.ListField(child=serializers.IntegerField()) +class TestUnvalidatedListField(FieldValues): + """ + Values for `ListField` with no `child` argument. + """ + valid_inputs = [ + ([1, '2', True, [4, 5, 6]], [1, '2', True, [4, 5, 6]]), + ] + invalid_inputs = [ + ('not a list', ['Expected a list of items but got type `str`']), + ] + outputs = [ + ([1, '2', True, [4, 5, 6]], [1, '2', True, [4, 5, 6]]), + ] + field = serializers.ListField() + + +class TestDictField(FieldValues): + """ + Values for `ListField` with CharField as child. + """ + valid_inputs = [ + ({'a': 1, 'b': '2', 3: 3}, {'a': '1', 'b': '2', '3': '3'}), + ] + invalid_inputs = [ + ({'a': 1, 'b': None}, ['This field may not be null.']), + ('not a dict', ['Expected a dictionary of items but got type `str`']), + ] + outputs = [ + ({'a': 1, 'b': '2', 3: 3}, {'a': '1', 'b': '2', '3': '3'}), + ] + field = serializers.DictField(child=serializers.CharField()) + + +class TestUnvalidatedDictField(FieldValues): + """ + Values for `ListField` with no `child` argument. + """ + valid_inputs = [ + ({'a': 1, 'b': [4, 5, 6], 1: 123}, {'a': 1, 'b': [4, 5, 6], '1': 123}), + ] + invalid_inputs = [ + ('not a dict', ['Expected a dictionary of items but got type `str`']), + ] + outputs = [ + ({'a': 1, 'b': [4, 5, 6]}, {'a': 1, 'b': [4, 5, 6]}), + ] + field = serializers.DictField() + + # Tests for FieldField. # --------------------- From a1fa7218ebc4a77a3912c42221927b1846f555fd Mon Sep 17 00:00:00 2001 From: Alexander Dutton <alexander.dutton@it.ox.ac.uk> Date: Fri, 23 Jan 2015 16:48:23 +0000 Subject: [PATCH 1508/1652] Pass {} as data to DataAndFiles, as it ends up in a MergeDict In the same vein as #2399. --- rest_framework/parsers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py index ef72677ce..1efab85ba 100644 --- a/rest_framework/parsers.py +++ b/rest_framework/parsers.py @@ -250,7 +250,7 @@ class FileUploadParser(BaseParser): None, encoding) if result is not None: - return DataAndFiles(None, {'file': result[1]}) + return DataAndFiles({}, {'file': result[1]}) # This is the standard case. possible_sizes = [x.chunk_size for x in upload_handlers if x.chunk_size] From b09ef28959fe63351f0dd24564b7d2d344b44fa3 Mon Sep 17 00:00:00 2001 From: Brandon Cazander <brandon@bcdynamic.com> Date: Sat, 24 Jan 2015 01:37:23 -0800 Subject: [PATCH 1509/1652] Add failing test for request.version AttributeError in BrowsableAPI. --- tests/browsable_api/auth_urls.py | 9 +++++++- tests/browsable_api/test_browsable_api.py | 10 +++++++++ tests/browsable_api/views.py | 27 +++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/tests/browsable_api/auth_urls.py b/tests/browsable_api/auth_urls.py index bce7dcf91..098a99acc 100644 --- a/tests/browsable_api/auth_urls.py +++ b/tests/browsable_api/auth_urls.py @@ -1,10 +1,17 @@ from __future__ import unicode_literals from django.conf.urls import patterns, url, include +from rest_framework import routers -from .views import MockView +from .views import MockView, FooViewSet, BarViewSet + +router = routers.SimpleRouter() +router.register(r'foo', FooViewSet) +router.register(r'bar', BarViewSet) urlpatterns = patterns( '', (r'^$', MockView.as_view()), + url(r'^', include(router.urls)), + url(r'^bar/(?P<pk>\d+)/$', BarViewSet, name='bar-list'), url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')), ) diff --git a/tests/browsable_api/test_browsable_api.py b/tests/browsable_api/test_browsable_api.py index 5f2647838..31907f84e 100644 --- a/tests/browsable_api/test_browsable_api.py +++ b/tests/browsable_api/test_browsable_api.py @@ -3,6 +3,7 @@ from django.contrib.auth.models import User from django.test import TestCase from rest_framework.test import APIClient +from .models import Foo, Bar class DropdownWithAuthTests(TestCase): @@ -16,6 +17,8 @@ class DropdownWithAuthTests(TestCase): self.email = 'lennon@thebeatles.com' self.password = 'password' self.user = User.objects.create_user(self.username, self.email, self.password) + foo = Foo.objects.create(name='Foo') + Bar.objects.create(foo=foo) def tearDown(self): self.client.logout() @@ -25,6 +28,13 @@ class DropdownWithAuthTests(TestCase): response = self.client.get('/') self.assertContains(response, 'john') + def test_bug_2455_clone_request(self): + self.client.login(username=self.username, password=self.password) + json_response = self.client.get('/foo/1/?format=json') + self.assertEqual(json_response.status_code, 200) + browsable_api_response = self.client.get('/foo/1/') + self.assertEqual(browsable_api_response.status_code, 200) + def test_logout_shown_when_logged_in(self): self.client.login(username=self.username, password=self.password) response = self.client.get('/') diff --git a/tests/browsable_api/views.py b/tests/browsable_api/views.py index 000f4e804..f06f7c40a 100644 --- a/tests/browsable_api/views.py +++ b/tests/browsable_api/views.py @@ -1,9 +1,14 @@ from __future__ import unicode_literals from rest_framework.views import APIView +from rest_framework.viewsets import ModelViewSet from rest_framework import authentication from rest_framework import renderers from rest_framework.response import Response +from rest_framework.renderers import BrowsableAPIRenderer, JSONRenderer +from rest_framework.versioning import NamespaceVersioning +from .models import Foo, Bar +from .serializers import FooSerializer, BarSerializer class MockView(APIView): @@ -13,3 +18,25 @@ class MockView(APIView): def get(self, request): return Response({'a': 1, 'b': 2, 'c': 3}) + + +class SerializerClassMixin(object): + def get_serializer_class(self): + # Get base name of serializer + self.request.version + return self.serializer_class + + +class FooViewSet(SerializerClassMixin, ModelViewSet): + versioning_class = NamespaceVersioning + model = Foo + queryset = Foo.objects.all() + serializer_class = FooSerializer + renderer_classes = (BrowsableAPIRenderer, JSONRenderer) + + +class BarViewSet(SerializerClassMixin, ModelViewSet): + model = Bar + queryset = Bar.objects.all() + serializer_class = BarSerializer + renderer_classes = (BrowsableAPIRenderer, ) From 0ee2edc0a14c4d14b8aa6e4b63ccbd0c2cc78024 Mon Sep 17 00:00:00 2001 From: Brandon Cazander <brandon@bcdynamic.com> Date: Sat, 24 Jan 2015 01:44:09 -0800 Subject: [PATCH 1510/1652] Add missed files for test. --- tests/browsable_api/models.py | 9 +++++++++ tests/browsable_api/serializers.py | 14 ++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 tests/browsable_api/models.py create mode 100644 tests/browsable_api/serializers.py diff --git a/tests/browsable_api/models.py b/tests/browsable_api/models.py new file mode 100644 index 000000000..05c6c23b4 --- /dev/null +++ b/tests/browsable_api/models.py @@ -0,0 +1,9 @@ +from django.db import models + + +class Foo(models.Model): + name = models.CharField(max_length=30) + + +class Bar(models.Model): + foo = models.ForeignKey("Foo", editable=False) diff --git a/tests/browsable_api/serializers.py b/tests/browsable_api/serializers.py new file mode 100644 index 000000000..e83645404 --- /dev/null +++ b/tests/browsable_api/serializers.py @@ -0,0 +1,14 @@ +from .models import Foo, Bar +from rest_framework.serializers import HyperlinkedModelSerializer, HyperlinkedIdentityField + + +class FooSerializer(HyperlinkedModelSerializer): + bar = HyperlinkedIdentityField(view_name='bar-list') + + class Meta: + model = Foo + + +class BarSerializer(HyperlinkedModelSerializer): + class Meta: + model = Bar From ed04725822d5dc9a90c9c6e5c14d85083ae6ff28 Mon Sep 17 00:00:00 2001 From: Brandon Cazander <brandon@bcdynamic.com> Date: Sat, 24 Jan 2015 01:44:40 -0800 Subject: [PATCH 1511/1652] Use enhanced request when cloning requests for checking permissions on other methods. Fixes #2455 --- rest_framework/request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index cfbbdeccd..d5b56ada1 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -86,7 +86,7 @@ def clone_request(request, method): Internal helper method to clone a request, replacing with a different HTTP method. Used for checking permissions against other methods. """ - ret = Request(request=request._request, + ret = Request(request=request, parsers=request.parsers, authenticators=request.authenticators, negotiator=request.negotiator, From 6c083b12a1162bf8e0f51e6c52ff13a1bd621cf2 Mon Sep 17 00:00:00 2001 From: Brandon Cazander <brandon@bcdynamic.com> Date: Sat, 24 Jan 2015 11:00:36 -0800 Subject: [PATCH 1512/1652] Streamline test for #2455 --- tests/browsable_api/auth_urls.py | 8 +------ tests/browsable_api/models.py | 9 -------- tests/browsable_api/serializers.py | 14 ------------ tests/browsable_api/test_browsable_api.py | 10 --------- tests/browsable_api/views.py | 27 ----------------------- tests/test_metadata.py | 15 +++++++++++++ 6 files changed, 16 insertions(+), 67 deletions(-) delete mode 100644 tests/browsable_api/models.py delete mode 100644 tests/browsable_api/serializers.py diff --git a/tests/browsable_api/auth_urls.py b/tests/browsable_api/auth_urls.py index 098a99acc..97bc10360 100644 --- a/tests/browsable_api/auth_urls.py +++ b/tests/browsable_api/auth_urls.py @@ -1,17 +1,11 @@ from __future__ import unicode_literals from django.conf.urls import patterns, url, include -from rest_framework import routers -from .views import MockView, FooViewSet, BarViewSet +from .views import MockView -router = routers.SimpleRouter() -router.register(r'foo', FooViewSet) -router.register(r'bar', BarViewSet) urlpatterns = patterns( '', (r'^$', MockView.as_view()), - url(r'^', include(router.urls)), - url(r'^bar/(?P<pk>\d+)/$', BarViewSet, name='bar-list'), url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')), ) diff --git a/tests/browsable_api/models.py b/tests/browsable_api/models.py deleted file mode 100644 index 05c6c23b4..000000000 --- a/tests/browsable_api/models.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.db import models - - -class Foo(models.Model): - name = models.CharField(max_length=30) - - -class Bar(models.Model): - foo = models.ForeignKey("Foo", editable=False) diff --git a/tests/browsable_api/serializers.py b/tests/browsable_api/serializers.py deleted file mode 100644 index e83645404..000000000 --- a/tests/browsable_api/serializers.py +++ /dev/null @@ -1,14 +0,0 @@ -from .models import Foo, Bar -from rest_framework.serializers import HyperlinkedModelSerializer, HyperlinkedIdentityField - - -class FooSerializer(HyperlinkedModelSerializer): - bar = HyperlinkedIdentityField(view_name='bar-list') - - class Meta: - model = Foo - - -class BarSerializer(HyperlinkedModelSerializer): - class Meta: - model = Bar diff --git a/tests/browsable_api/test_browsable_api.py b/tests/browsable_api/test_browsable_api.py index 31907f84e..5f2647838 100644 --- a/tests/browsable_api/test_browsable_api.py +++ b/tests/browsable_api/test_browsable_api.py @@ -3,7 +3,6 @@ from django.contrib.auth.models import User from django.test import TestCase from rest_framework.test import APIClient -from .models import Foo, Bar class DropdownWithAuthTests(TestCase): @@ -17,8 +16,6 @@ class DropdownWithAuthTests(TestCase): self.email = 'lennon@thebeatles.com' self.password = 'password' self.user = User.objects.create_user(self.username, self.email, self.password) - foo = Foo.objects.create(name='Foo') - Bar.objects.create(foo=foo) def tearDown(self): self.client.logout() @@ -28,13 +25,6 @@ class DropdownWithAuthTests(TestCase): response = self.client.get('/') self.assertContains(response, 'john') - def test_bug_2455_clone_request(self): - self.client.login(username=self.username, password=self.password) - json_response = self.client.get('/foo/1/?format=json') - self.assertEqual(json_response.status_code, 200) - browsable_api_response = self.client.get('/foo/1/') - self.assertEqual(browsable_api_response.status_code, 200) - def test_logout_shown_when_logged_in(self): self.client.login(username=self.username, password=self.password) response = self.client.get('/') diff --git a/tests/browsable_api/views.py b/tests/browsable_api/views.py index f06f7c40a..000f4e804 100644 --- a/tests/browsable_api/views.py +++ b/tests/browsable_api/views.py @@ -1,14 +1,9 @@ from __future__ import unicode_literals from rest_framework.views import APIView -from rest_framework.viewsets import ModelViewSet from rest_framework import authentication from rest_framework import renderers from rest_framework.response import Response -from rest_framework.renderers import BrowsableAPIRenderer, JSONRenderer -from rest_framework.versioning import NamespaceVersioning -from .models import Foo, Bar -from .serializers import FooSerializer, BarSerializer class MockView(APIView): @@ -18,25 +13,3 @@ class MockView(APIView): def get(self, request): return Response({'a': 1, 'b': 2, 'c': 3}) - - -class SerializerClassMixin(object): - def get_serializer_class(self): - # Get base name of serializer - self.request.version - return self.serializer_class - - -class FooViewSet(SerializerClassMixin, ModelViewSet): - versioning_class = NamespaceVersioning - model = Foo - queryset = Foo.objects.all() - serializer_class = FooSerializer - renderer_classes = (BrowsableAPIRenderer, JSONRenderer) - - -class BarViewSet(SerializerClassMixin, ModelViewSet): - model = Bar - queryset = Bar.objects.all() - serializer_class = BarSerializer - renderer_classes = (BrowsableAPIRenderer, ) diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 972a896a4..bdc84edf1 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals from rest_framework import exceptions, serializers, status, views from rest_framework.request import Request +from rest_framework.renderers import BrowsableAPIRenderer from rest_framework.test import APIRequestFactory request = Request(APIRequestFactory().options('/')) @@ -168,3 +169,17 @@ class TestMetadata: response = view(request=request) assert response.status_code == status.HTTP_200_OK assert list(response.data['actions'].keys()) == ['POST'] + + def test_bug_2455_clone_request(self): + class ExampleView(views.APIView): + renderer_classes = (BrowsableAPIRenderer,) + + def post(self, request): + pass + + def get_serializer(self): + assert hasattr(self.request, 'version') + return serializers.Serializer() + + view = ExampleView.as_view() + view(request=request) From 39da9c7c865533d580ea410458aeb366835b18cc Mon Sep 17 00:00:00 2001 From: Jeff Fein-Worton <jeff@fein-worton.com> Date: Sat, 24 Jan 2015 12:53:21 -0800 Subject: [PATCH 1513/1652] minor typo in viewsets docs --- docs/api-guide/viewsets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index 3e37cef89..b09dfc9e9 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -146,7 +146,7 @@ The decorators can additionally take extra arguments that will be set for the ro def set_password(self, request, pk=None): ... -Theses decorators will route `GET` requests by default, but may also accept other HTTP methods, by using the `methods` argument. For example: +These decorators will route `GET` requests by default, but may also accept other HTTP methods, by using the `methods` argument. For example: @detail_route(methods=['post', 'delete']) def unset_password(self, request, pk=None): From 0a65913fea471e7545896bd88760be8b26a3225e Mon Sep 17 00:00:00 2001 From: Jeff Fein-Worton <jeff@fein-worton.com> Date: Sat, 24 Jan 2015 18:34:16 -0800 Subject: [PATCH 1514/1652] typo in fields.md --- docs/api-guide/fields.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 1c78a42b6..10291c12a 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -461,7 +461,7 @@ This is a read-only field. It gets its value by calling a method on the serializ **Signature**: `SerializerMethodField(method_name=None)` -- `method-name` - The name of the method on the serializer to be called. If not included this defaults to `get_<field_name>`. +- `method_name` - The name of the method on the serializer to be called. If not included this defaults to `get_<field_name>`. The serializer method referred to by the `method_name` argument should accept a single argument (in addition to `self`), which is the object being serialized. It should return whatever you want to be included in the serialized representation of the object. For example: From 90c9968a70e0a3d14cf4433cd356bcbdd30fce1b Mon Sep 17 00:00:00 2001 From: Michael Marvick <mmarvick@gmail.com> Date: Sun, 25 Jan 2015 23:45:56 -0800 Subject: [PATCH 1515/1652] tutorial #1 incorrectly showed string of json instead of ReturnDict type from 'serializer.data', and also has a third item in the second usage --- docs/tutorial/1-serialization.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 80e869ea6..458161d07 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -151,7 +151,7 @@ We've now got a few snippet instances to play with. Let's take a look at serial serializer = SnippetSerializer(snippet) serializer.data - # {'pk': 2, 'title': u'', 'code': u'print "hello, world"\n', 'linenos': False, 'language': u'python', 'style': u'friendly'} + # ReturnDict([('pk', 2), ('title', u''), ('code', u'print "hello, world"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]) At this point we've translated the model instance into Python native datatypes. To finalize the serialization process we render the data into `json`. @@ -182,7 +182,8 @@ We can also serialize querysets instead of model instances. To do so we simply serializer = SnippetSerializer(Snippet.objects.all(), many=True) serializer.data - # [{'pk': 1, 'title': u'', 'code': u'foo = "bar"\n', 'linenos': False, 'language': u'python', 'style': u'friendly'}, {'pk': 2, 'title': u'', 'code': u'print "hello, world"\n', 'linenos': False, 'language': u'python', 'style': u'friendly'}] + # [OrderedDict([('pk', 1), ('title', u''), ('code', u'foo = "bar"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]), OrderedDict([('pk', 2), ('title', u''), ('code', u'print "hello, world"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]), OrderedDict([('pk', 3), ('title', u''), ('code', u'print "hello, world"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')])] + ## Using ModelSerializers From 2a6937f381fe514e6cc9165c0aee200bf145788f Mon Sep 17 00:00:00 2001 From: Michael Marvick <mmarvick@gmail.com> Date: Sun, 25 Jan 2015 23:46:27 -0800 Subject: [PATCH 1516/1652] tutorial #2 incorrectly showed /item.json instead of /item/.json for format suffixes --- docs/tutorial/2-requests-and-responses.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index c04269695..9315a6644 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -96,7 +96,7 @@ Notice that we're no longer explicitly tying our requests or responses to a give ## Adding optional format suffixes to our URLs -To take advantage of the fact that our responses are no longer hardwired to a single content type let's add support for format suffixes to our API endpoints. Using format suffixes gives us URLs that explicitly refer to a given format, and means our API will be able to handle URLs such as [http://example.com/api/items/4.json][json-url]. +To take advantage of the fact that our responses are no longer hardwired to a single content type let's add support for format suffixes to our API endpoints. Using format suffixes gives us URLs that explicitly refer to a given format, and means our API will be able to handle URLs such as [http://example.com/api/items/4/.json][json-url]. Start by adding a `format` keyword argument to both of the views, like so. From 73bd0d539f24d45695615c25a072175c58a4cf98 Mon Sep 17 00:00:00 2001 From: Michael Marvick <mmarvick@gmail.com> Date: Sun, 25 Jan 2015 23:47:01 -0800 Subject: [PATCH 1517/1652] tutorial #5 incorrectly referenced 'settings.py' instead of 'tutorial/settings.py' --- docs/tutorial/5-relationships-and-hyperlinked-apis.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 2841f03e9..740a4ce21 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -138,7 +138,7 @@ After adding all those names into our URLconf, our final `snippets/urls.py` file The list views for users and code snippets could end up returning quite a lot of instances, so really we'd like to make sure we paginate the results, and allow the API client to step through each of the individual pages. -We can change the default list style to use pagination, by modifying our `settings.py` file slightly. Add the following setting: +We can change the default list style to use pagination, by modifying our `tutorial/settings.py` file slightly. Add the following setting: REST_FRAMEWORK = { 'PAGINATE_BY': 10 From fc70c0862ff3e6183b79adc4675a63874261ddf0 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 26 Jan 2015 14:07:21 +0000 Subject: [PATCH 1518/1652] Galileo Press -> Rheinwerk Verlag --- docs/img/sponsors/2-galileo_press.png | Bin 11451 -> 0 bytes docs/img/sponsors/2-rheinwerk_verlag.png | Bin 0 -> 1562 bytes docs/topics/kickstarter-announcement.md | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 docs/img/sponsors/2-galileo_press.png create mode 100644 docs/img/sponsors/2-rheinwerk_verlag.png diff --git a/docs/img/sponsors/2-galileo_press.png b/docs/img/sponsors/2-galileo_press.png deleted file mode 100644 index f77e6c0a86cc502d25718545d7a19f4db8427045..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11451 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 diff --git a/docs/img/sponsors/2-rheinwerk_verlag.png b/docs/img/sponsors/2-rheinwerk_verlag.png new file mode 100644 index 0000000000000000000000000000000000000000..ad454e1774ec77d69e3895dcf95c4edf87a04081 GIT binary patch literal 1562 zcmbu9X*ARe6u|$MFvCc;5jA<%EZJk8tYaodvJ9RPO}2?FO~kXOB$9}-FGHnJmf=wz zW8ZgWCs{)>W9-Xdo_Egc%RBGeyXV~dyXV~d;odL5Xme9T2v`^l000DSgv1;({O{yo zIj%L6(|yM{?Tf<tS`u#h`aAmI0eu&O6J8YU<>-pX;2m88y*uz)$4m9*CRV8OmT3_7 zrAJaDAQ$<(u-`VSn!#WwdA$cPnQg<1vp+UoRSp^kl>-I|6Z4e*i6y`!jma_-z@)8j zY_|6;@Y!U4U)=_blI9nv>zlhwRvD|*O@3T1ppyU?BttNnhkLuhS<S=4tIU>}+k5** zM|38eY``Mrgf)@Af3Ul~4_M_e=sN&Bmen$6ZgLCe@MdRon+=l=n5Bb^)0nM@EY=w( zQOO5~M-jQ*jNOBk?=*7vbl;~RfO+=u6KAnXipS9N#h6+iU;cjrXbdhz0sw0+8mVs; zFupRzNq7zC0USD=MVX`{BQ(89)rrYE*gw?x)$Lz=VK8hoB(x`q)P&_+OTWC*@$)A{ zbhPG_F-6(BHMU4m=2MULSjBiAaQwTa=}I(bfBk33P)6L>)u#nUyo!<hQ2YY5hK?wn z02d`Le4BGUm1`dBI`L_kw*Ild+$;D=x9-!v8{Bk01T;g+9{7;fGdjlO3*tkZ7wC#B z$f1{pwfM;^f{&C|2pp)A0|@!!p`4tzgN4>$lZz&2s5Qr>ka=BhH`ThD^F~P6Fohjd z;Z6mphV|T#W%yfzHp_!rRvLeXp42`5e306{lh7bnaWgx}up)|1=bM2+hz)3N3Eu6v zTf}=+%7V>tj?qsgZ7x?R??e{jO@zc}aRtSm0*Y6PoVZ}H7uV}qf6r_Za1EfburAEi zto9Aur(AX56*L;X;5Un%o+CIf))og<RIr;pcAmQn+v{=ASP?>zLpN1=LsyMSZtWrh zo`-6}x3_6-A@p}i>tYRDc@wKNXTb$(_lSzZ@_;<t30wf0`6k!P?R<2RT#rlD&UN1^ z-vfJ01y(P%viOHAi3l`8M^SMnJ$8MZAFMfUbn2Sc_Zv3Cd(}BxueA(psr4=1@OlJ= zS#6McO8iGO;@E#Rz4FdgsFWj#dMkY)z3I#8`rmOjik(p!H}X3)!^dKm=G&MbczMZ1 z?OD7&x3B7W5!REXXIn4u^)fO(jDR5z8DYD*Ec@<CBRYe&-*nKnV^HHE{!DZ(?wg~0 z*lQ_e)h79=AHyF_z-4`QqVN*)X{3yhXGB+-0YMkxv)z$Hn-q%78IY%{K&GOU6x#?p zqa`jUFyLB=Iw1o(U-=d<sJEn*h&Q*F*i33T@XqwCteLc%vR{L7jEaP`MmKoinQb5& z^`@b9=rK5_bYmAXts^9if>re>lEcO>s!|@lXIB3c7SG!buQZBBx5gT4b226SiA2ll z<jrBuDQ}1^W|6#FS^b1Y>cmF@g_|4^Y;?5%Tz*1)eg}7os=^wE4a(9WGIF+XLXx?V z@Q}Lf?H;c*0K!pv$DBpG&!|X86;!kL+0H(>pT%?LH)9Q;7Tp%qnC?Mp+~T!Cy2;94 zMU?#VdGecp#h{p`C%5?YolE2=yrAn-x0~!)4YjdFP+Wy);b+<Ll0}2JE2NR)E<WnQ zZ2Kfhds)k50+%<lrS=pl98@LDS-y6`3_65Dj6pSfikfCfT&1+cNtw`nz3)}aa)tL0 z70zq#JN0B<daL4%lfjH+<CM^r(bBeoHXl3iMXIMH^-d)Z$v!!J<|r)9JTWyyK8D;r zRhCm6b5tHo#EI|M2IbEo1^ph~vfDui7k0Ku<d>S+jOcG+q1K=MMr#z?6etGPP?h|5 zw?(X41Y<Ob<W$bxeqO$C$00(g0&yy%s#5Ox&ed~WcINzLkEb@kb<Y%S1MVDXK{#gb zLK0OH%7iav2Jyocs5+aS2txl)O&l2KFbw}g8$V^zSl55=lmo!*4(~EH<VibrAAm-g KB8w3Y;eP=P`2_I* literal 0 HcmV?d00001 diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 9f99e3e6e..78c5cce6f 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -84,7 +84,7 @@ Our gold sponsors include companies large and small. Many thanks for their signi <li><a href="http://pulsecode.ca" rel="nofollow" style="background-image:url(../../img/sponsors/2-pulsecode.png);">Pulsecode Inc.</a></li> <li><a href="http://singinghorsestudio.com" rel="nofollow" style="background-image:url(../../img/sponsors/2-singing-horse.png);">Singing Horse Studio Ltd.</a></li> <li><a href="https://www.heroku.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-heroku.png);">Heroku</a></li> -<li><a href="https://www.galileo-press.de/" rel="nofollow" style="background-image:url(../../img/sponsors/2-galileo_press.png);">Galileo Press</a></li> +<li><a href="https://www.rheinwerk-verlag.de/" rel="nofollow" style="background-image:url(../../img/sponsors/2-rheinwerk_verlag.png);">Rheinwerk Verlag</a></li> <li><a href="http://www.securitycompass.com/" rel="nofollow" style="background-image:url(../../img/sponsors/2-security_compass.png);">Security Compass</a></li> <li><a href="https://www.djangoproject.com/foundation/" rel="nofollow" style="background-image:url(../../img/sponsors/2-django.png);">Django Software Foundation</a></li> <li><a href="http://www.hipflaskapp.com" rel="nofollow" style="background-image:url(../../img/sponsors/2-hipflask.png);">Hipflask</a></li> From bf58c1265ddf06deb435d049fae01ed324a310e0 Mon Sep 17 00:00:00 2001 From: Brandon Cazander <brandon@bcdynamic.com> Date: Mon, 26 Jan 2015 22:56:57 -0800 Subject: [PATCH 1519/1652] Set a version attribute on cloned requests if necessary. --- rest_framework/request.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index d5b56ada1..ce2fcb476 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -86,7 +86,7 @@ def clone_request(request, method): Internal helper method to clone a request, replacing with a different HTTP method. Used for checking permissions against other methods. """ - ret = Request(request=request, + ret = Request(request=request._request, parsers=request.parsers, authenticators=request.authenticators, negotiator=request.negotiator, @@ -107,6 +107,8 @@ def clone_request(request, method): ret.accepted_renderer = request.accepted_renderer if hasattr(request, 'accepted_media_type'): ret.accepted_media_type = request.accepted_media_type + if hasattr(request, 'version'): + ret.version = request.version return ret From 65bca59ea548dc5e2222be06ca20b3d3fa151cf0 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 27 Jan 2015 13:51:30 +0000 Subject: [PATCH 1520/1652] Reload api_settings when using Django's 'override_settings' --- rest_framework/settings.py | 11 +++++++++++ tests/test_filters.py | 16 +++++++++++++--- tests/utils.py | 25 ------------------------- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/rest_framework/settings.py b/rest_framework/settings.py index fc6dfecda..e5e5edafe 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -18,6 +18,7 @@ REST framework settings, checking for user settings first, then falling back to the defaults. """ from __future__ import unicode_literals +from django.test.signals import setting_changed from django.conf import settings from django.utils import importlib, six from rest_framework import ISO_8601 @@ -198,3 +199,13 @@ class APISettings(object): api_settings = APISettings(USER_SETTINGS, DEFAULTS, IMPORT_STRINGS) + + +def reload_api_settings(*args, **kwargs): + global api_settings + setting, value = kwargs['setting'], kwargs['value'] + if setting == 'REST_FRAMEWORK': + api_settings = APISettings(value, DEFAULTS, IMPORT_STRINGS) + + +setting_changed.connect(reload_api_settings) diff --git a/tests/test_filters.py b/tests/test_filters.py index 5b1b6ca52..355f02cef 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -5,13 +5,15 @@ from django.db import models from django.conf.urls import patterns, url from django.core.urlresolvers import reverse from django.test import TestCase +from django.test.utils import override_settings from django.utils import unittest from django.utils.dateparse import parse_date +from django.utils.six.moves import reload_module from rest_framework import generics, serializers, status, filters from rest_framework.compat import django_filters from rest_framework.test import APIRequestFactory from .models import BaseFilterableItem, FilterableItem, BasicModel -from .utils import temporary_setting + factory = APIRequestFactory() @@ -404,7 +406,9 @@ class SearchFilterTests(TestCase): ) def test_search_with_nonstandard_search_param(self): - with temporary_setting('SEARCH_PARAM', 'query', module=filters): + with override_settings(REST_FRAMEWORK={'SEARCH_PARAM': 'query'}): + reload_module(filters) + class SearchListView(generics.ListAPIView): queryset = SearchFilterModel.objects.all() serializer_class = SearchFilterSerializer @@ -422,6 +426,8 @@ class SearchFilterTests(TestCase): ] ) + reload_module(filters) + class OrderingFilterModel(models.Model): title = models.CharField(max_length=20) @@ -642,7 +648,9 @@ class OrderingFilterTests(TestCase): ) def test_ordering_with_nonstandard_ordering_param(self): - with temporary_setting('ORDERING_PARAM', 'order', filters): + with override_settings(REST_FRAMEWORK={'ORDERING_PARAM': 'order'}): + reload_module(filters) + class OrderingListView(generics.ListAPIView): queryset = OrderingFilterModel.objects.all() serializer_class = OrderingFilterSerializer @@ -662,6 +670,8 @@ class OrderingFilterTests(TestCase): ] ) + reload_module(filters) + class SensitiveOrderingFilterModel(models.Model): username = models.CharField(max_length=20) diff --git a/tests/utils.py b/tests/utils.py index 5e902ba94..5b2d75864 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,30 +1,5 @@ -from contextlib import contextmanager from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import NoReverseMatch -from django.utils import six -from rest_framework.settings import api_settings - - -@contextmanager -def temporary_setting(setting, value, module=None): - """ - Temporarily change value of setting for test. - - Optionally reload given module, useful when module uses value of setting on - import. - """ - original_value = getattr(api_settings, setting) - setattr(api_settings, setting, value) - - if module is not None: - six.moves.reload_module(module) - - yield - - setattr(api_settings, setting, original_value) - - if module is not None: - six.moves.reload_module(module) class MockObject(object): From 925ea4bdc6d40a1e118087f28a09c86977dc5532 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Tue, 27 Jan 2015 19:43:38 +0100 Subject: [PATCH 1521/1652] Release notes for 3.0.4 --- docs/topics/release-notes.md | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index c49dd62c9..e0894d2d9 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -41,6 +41,24 @@ You can determine your currently installed version using `pip freeze`: ## 3.0.x series +### 3.0.4 + +**Date**: [28th January 2015][3.0.4-milestone]. + +* Django 1.8a1 support. ([#2425][gh2425], [#2446][gh2446], [#2441][gh2441]) +* Add `DictField` and support Django 1.8 `HStoreField`. ([#2451][gh2451], [#2106][gh2106]) +* Add `UUIDField` and support Django 1.8 `UUIDField`. ([#2448][gh2448], [#2433][gh2433], [#2432][gh2432]) +* `BaseRenderer.render` now raises `NotImplementedError`. ([#2434][gh2434]) +* Fix timedelta JSON serialization on Python 2.6. ([#2430][gh2430]) +* `ResultDict` and `ResultList` now appear as standard dict/list. ([#2421][gh2421]) +* Fix visible `HiddenField` in the HTML form of the web browsable API page. ([#2410][gh2410]) +* Use `OrderedDict` for `RelatedField.choices`. ([#2408][gh2408]) +* Fix ident format when using `HTTP_X_FORWARDED_FOR`. ([#2401][gh2401]) +* Fix invalid key with memcached while using throttling. ([#2400][gh2400]) +* Fix `FileUploadParser` with version 3.x. ([#2399][gh2399]) +* Fix the serializer inheritance. ([#2388][gh2388]) +* Fix caching issues with `ReturnDict`. ([#2360][gh2360]) + ### 3.0.3 **Date**: [8th January 2015][3.0.3-milestone]. @@ -702,6 +720,7 @@ For older release notes, [please see the GitHub repo](old-release-notes). [3.0.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22 [3.0.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.2+Release%22 [3.0.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.3+Release%22 +[3.0.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.4+Release%22 <!-- 3.0.1 --> [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -770,3 +789,22 @@ For older release notes, [please see the GitHub repo](old-release-notes). [gh2355]: https://github.com/tomchristie/django-rest-framework/issues/2355 [gh2369]: https://github.com/tomchristie/django-rest-framework/issues/2369 [gh2386]: https://github.com/tomchristie/django-rest-framework/issues/2386 +<!-- 3.0.4 --> +[gh2425]: https://github.com/tomchristie/django-rest-framework/issues/2425 +[gh2446]: https://github.com/tomchristie/django-rest-framework/issues/2446 +[gh2441]: https://github.com/tomchristie/django-rest-framework/issues/2441 +[gh2451]: https://github.com/tomchristie/django-rest-framework/issues/2451 +[gh2106]: https://github.com/tomchristie/django-rest-framework/issues/2106 +[gh2448]: https://github.com/tomchristie/django-rest-framework/issues/2448 +[gh2433]: https://github.com/tomchristie/django-rest-framework/issues/2433 +[gh2432]: https://github.com/tomchristie/django-rest-framework/issues/2432 +[gh2434]: https://github.com/tomchristie/django-rest-framework/issues/2434 +[gh2430]: https://github.com/tomchristie/django-rest-framework/issues/2430 +[gh2421]: https://github.com/tomchristie/django-rest-framework/issues/2421 +[gh2410]: https://github.com/tomchristie/django-rest-framework/issues/2410 +[gh2408]: https://github.com/tomchristie/django-rest-framework/issues/2408 +[gh2401]: https://github.com/tomchristie/django-rest-framework/issues/2401 +[gh2400]: https://github.com/tomchristie/django-rest-framework/issues/2400 +[gh2399]: https://github.com/tomchristie/django-rest-framework/issues/2399 +[gh2388]: https://github.com/tomchristie/django-rest-framework/issues/2388 +[gh2360]: https://github.com/tomchristie/django-rest-framework/issues/2360 From 5b369bf5fe3e5e8af3a73055b3a6ebda1e88f68e Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Tue, 27 Jan 2015 19:45:37 +0100 Subject: [PATCH 1522/1652] Bumped the version. --- rest_framework/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index fdcebb7b7..57e5421b8 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.0.3' +__version__ = '3.0.4' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2015 Tom Christie' From 8c3f82fb18a58b8e0983612ef3cc35b3c3950b66 Mon Sep 17 00:00:00 2001 From: Susan Dreher <sdreher@columbia.edu> Date: Tue, 27 Jan 2015 16:18:51 -0500 Subject: [PATCH 1523/1652] :bug: ManyRelatedField get_value clearing field on partial update A PATCH to a serializer's non-related CharField was clearing an ancillary StringRelatedField(many=True) field. The issue appears to be in the ManyRelatedField's get_value method, which was returning a [] instead of empty when the request data was a MultiDict. This fix mirrors code in fields.py, class Field, get_value, Ln. 272, which explicitly returns empty on a partial update. Tests added to demonstrate the issue. --- rest_framework/relations.py | 5 +++++ tests/test_relations.py | 44 +++++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index aa0c2defe..13793f375 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -338,7 +338,12 @@ class ManyRelatedField(Field): # We override the default field access in order to support # lists in HTML forms. if html.is_html_input(dictionary): + # Don't return [] if the update is partial + if self.field_name not in dictionary: + if getattr(self.root, 'partial', False): + return empty return dictionary.getlist(self.field_name) + return dictionary.get(self.field_name, empty) def to_internal_value(self, data): diff --git a/tests/test_relations.py b/tests/test_relations.py index 62353dc25..143e835ca 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -1,9 +1,14 @@ -from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset -from django.core.exceptions import ImproperlyConfigured -from rest_framework import serializers -from rest_framework.test import APISimpleTestCase import pytest +from django.core.exceptions import ImproperlyConfigured +from django.utils.datastructures import MultiValueDict + +from rest_framework import serializers +from rest_framework.fields import empty +from rest_framework.test import APISimpleTestCase + +from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset + class TestStringRelatedField(APISimpleTestCase): def setUp(self): @@ -134,3 +139,34 @@ class TestSlugRelatedField(APISimpleTestCase): def test_representation(self): representation = self.field.to_representation(self.instance) assert representation == self.instance.name + + +class TestManyRelatedField(APISimpleTestCase): + def setUp(self): + self.instance = MockObject(pk=1, name='foo') + self.field = serializers.StringRelatedField(many=True) + self.field.field_name = 'foo' + + def test_get_value_regular_dictionary_full(self): + assert 'bar' == self.field.get_value({'foo': 'bar'}) + assert empty == self.field.get_value({'baz': 'bar'}) + + def test_get_value_regular_dictionary_partial(self): + setattr(self.field.root, 'partial', True) + assert 'bar' == self.field.get_value({'foo': 'bar'}) + assert empty == self.field.get_value({'baz': 'bar'}) + + def test_get_value_multi_dictionary_full(self): + mvd = MultiValueDict({'foo': ['bar1', 'bar2']}) + assert ['bar1', 'bar2'] == self.field.get_value(mvd) + + mvd = MultiValueDict({'baz': ['bar1', 'bar2']}) + assert [] == self.field.get_value(mvd) + + def test_get_value_multi_dictionary_partial(self): + setattr(self.field.root, 'partial', True) + mvd = MultiValueDict({'foo': ['bar1', 'bar2']}) + assert ['bar1', 'bar2'] == self.field.get_value(mvd) + + mvd = MultiValueDict({'baz': ['bar1', 'bar2']}) + assert empty == self.field.get_value(mvd) From 1714ceae9f468bc1479f0d7a32b0bf26ae9cf15f Mon Sep 17 00:00:00 2001 From: Susan Dreher <sdreher@columbia.edu> Date: Tue, 27 Jan 2015 16:31:25 -0500 Subject: [PATCH 1524/1652] reorganize imports --- tests/test_relations.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_relations.py b/tests/test_relations.py index 143e835ca..67f49c6b0 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -1,13 +1,13 @@ -import pytest +from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset from django.core.exceptions import ImproperlyConfigured from django.utils.datastructures import MultiValueDict from rest_framework import serializers from rest_framework.fields import empty -from rest_framework.test import APISimpleTestCase -from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset +from rest_framework.test import APISimpleTestCase +import pytest class TestStringRelatedField(APISimpleTestCase): From e7da266a866adddd5c37453fab33812ee412752b Mon Sep 17 00:00:00 2001 From: Susan Dreher <sdreher@columbia.edu> Date: Tue, 27 Jan 2015 16:32:15 -0500 Subject: [PATCH 1525/1652] reorganize imports --- tests/test_relations.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/test_relations.py b/tests/test_relations.py index 67f49c6b0..d478d8550 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -1,11 +1,8 @@ from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset - from django.core.exceptions import ImproperlyConfigured from django.utils.datastructures import MultiValueDict - from rest_framework import serializers from rest_framework.fields import empty - from rest_framework.test import APISimpleTestCase import pytest From 0daf160946db4f2fed6a237136d738d954b841c0 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Wed, 28 Jan 2015 00:06:34 +0100 Subject: [PATCH 1526/1652] Fix #2476 --- docs/api-guide/routers.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 9c9bfb505..a9f911a98 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -60,7 +60,7 @@ For example, you can append `router.urls` to a list of existing views… router.register(r'accounts', AccountViewSet) urlpatterns = [ - url(r'^forgot-password/$', ForgotPasswordFormView.as_view(), + url(r'^forgot-password/$', ForgotPasswordFormView.as_view()), ] urlpatterns += router.urls @@ -68,15 +68,15 @@ For example, you can append `router.urls` to a list of existing views… Alternatively you can use Django's `include` function, like so… urlpatterns = [ - url(r'^forgot-password/$', ForgotPasswordFormView.as_view(), - url(r'^', include(router.urls)) + url(r'^forgot-password/$', ForgotPasswordFormView.as_view()), + url(r'^', include(router.urls)), ] Router URL patterns can also be namespaces. urlpatterns = [ - url(r'^forgot-password/$', ForgotPasswordFormView.as_view(), - url(r'^api/', include(router.urls, namespace='api')) + url(r'^forgot-password/$', ForgotPasswordFormView.as_view()), + url(r'^api/', include(router.urls, namespace='api')), ] If using namespacing with hyperlinked serializers you'll also need to ensure that any `view_name` parameters on the serializers correctly reflect the namespace. In the example above you'd need to include a parameter such as `view_name='api:user-detail'` for serializer fields hyperlinked to the user detail view. From ac87490b91e3405d497da360afed10842a73dfd0 Mon Sep 17 00:00:00 2001 From: Brandon Cazander <brandon.cazander@multapplied.net> Date: Tue, 27 Jan 2015 17:10:17 -0800 Subject: [PATCH 1527/1652] Clone the versioning_scheme when necessary. Fixes #2477 --- rest_framework/request.py | 2 ++ tests/test_metadata.py | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index ce2fcb476..bf6ff6706 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -109,6 +109,8 @@ def clone_request(request, method): ret.accepted_media_type = request.accepted_media_type if hasattr(request, 'version'): ret.version = request.version + if hasattr(request, 'versioning_scheme'): + ret.versioning_scheme = request.versioning_scheme return ret diff --git a/tests/test_metadata.py b/tests/test_metadata.py index bdc84edf1..5031c0f30 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -1,5 +1,5 @@ from __future__ import unicode_literals -from rest_framework import exceptions, serializers, status, views +from rest_framework import exceptions, serializers, status, views, versioning from rest_framework.request import Request from rest_framework.renderers import BrowsableAPIRenderer from rest_framework.test import APIRequestFactory @@ -183,3 +183,18 @@ class TestMetadata: view = ExampleView.as_view() view(request=request) + + def test_bug_2477_clone_request(self): + class ExampleView(views.APIView): + renderer_classes = (BrowsableAPIRenderer,) + + def post(self, request): + pass + + def get_serializer(self): + assert hasattr(self.request, 'versioning_scheme') + return serializers.Serializer() + + scheme = versioning.QueryParameterVersioning + view = ExampleView.as_view(versioning_class=scheme) + view(request=request) From a1eba885e287f59dd269441dfebb3b3de3eea692 Mon Sep 17 00:00:00 2001 From: Lucas Wiman <lucaswiman@counsyl.com> Date: Tue, 27 Jan 2015 19:01:40 -0800 Subject: [PATCH 1528/1652] Use the proper db_table argument when constructing meta --- rest_framework/authtoken/south_migrations/0001_initial.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/authtoken/south_migrations/0001_initial.py b/rest_framework/authtoken/south_migrations/0001_initial.py index 926de02b1..5b927f3e5 100644 --- a/rest_framework/authtoken/south_migrations/0001_initial.py +++ b/rest_framework/authtoken/south_migrations/0001_initial.py @@ -40,7 +40,7 @@ class Migration(SchemaMigration): 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, "%s.%s" % (User._meta.app_label, User._meta.module_name): { - 'Meta': {'object_name': User._meta.module_name}, + 'Meta': {'object_name': User._meta.module_name, 'db_table': repr(User._meta.db_table)}, }, 'authtoken.token': { 'Meta': {'object_name': 'Token'}, From 4a2a36ef828ce0e687c48fdb597d343df65f0e2b Mon Sep 17 00:00:00 2001 From: mareknaskret <mareknaskret@gmail.com> Date: Wed, 28 Jan 2015 15:17:56 +0100 Subject: [PATCH 1529/1652] Update filtering.md Updated links for django-guardian package. --- docs/api-guide/filtering.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index e00560c7e..b16b6be55 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -398,8 +398,8 @@ The [django-rest-framework-filters package][django-rest-framework-filters] works [cite]: https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-specific-objects-with-filters [django-filter]: https://github.com/alex/django-filter [django-filter-docs]: https://django-filter.readthedocs.org/en/latest/index.html -[guardian]: http://pythonhosted.org/django-guardian/ -[view-permissions]: http://pythonhosted.org/django-guardian/userguide/assign.html +[guardian]: https://django-guardian.readthedocs.org/ +[view-permissions]: https://django-guardian.readthedocs.org/en/latest/userguide/assign.html [view-permissions-blogpost]: http://blog.nyaruka.com/adding-a-view-permission-to-django-models [nullbooleanselect]: https://github.com/django/django/blob/master/django/forms/widgets.py [search-django-admin]: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#django.contrib.admin.ModelAdmin.search_fields From ba7dca893cd55a1d5ee928c4b10878c92c44c4f5 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Thu, 29 Jan 2015 17:28:03 +0100 Subject: [PATCH 1530/1652] Removed router check for deprecated '.model' attribute --- rest_framework/routers.py | 10 ++-------- tests/test_routers.py | 7 ++++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 827da0340..6a4184e20 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -130,19 +130,13 @@ class SimpleRouter(BaseRouter): If `base_name` is not specified, attempt to automatically determine it from the viewset. """ - # Note that `.model` attribute on views is deprecated, although we - # enforce the deprecation on the view `get_serializer_class()` and - # `get_queryset()` methods, rather than here. - model_cls = getattr(viewset, 'model', None) queryset = getattr(viewset, 'queryset', None) - if model_cls is None and queryset is not None: - model_cls = queryset.model - assert model_cls, '`base_name` argument not specified, and could ' \ + assert queryset is not None, '`base_name` argument not specified, and could ' \ 'not automatically determine the name from the viewset, as ' \ 'it does not have a `.queryset` attribute.' - return model_cls._meta.object_name.lower() + return queryset.model._meta.object_name.lower() def get_routes(self, viewset): """ diff --git a/tests/test_routers.py b/tests/test_routers.py index 86113f5d7..948c69bbf 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -180,7 +180,7 @@ class TestLookupValueRegex(TestCase): class TestTrailingSlashIncluded(TestCase): def setUp(self): class NoteViewSet(viewsets.ModelViewSet): - model = RouterTestModel + queryset = RouterTestModel.objects.all() self.router = SimpleRouter() self.router.register(r'notes', NoteViewSet) @@ -195,7 +195,7 @@ class TestTrailingSlashIncluded(TestCase): class TestTrailingSlashRemoved(TestCase): def setUp(self): class NoteViewSet(viewsets.ModelViewSet): - model = RouterTestModel + queryset = RouterTestModel.objects.all() self.router = SimpleRouter(trailing_slash=False) self.router.register(r'notes', NoteViewSet) @@ -210,7 +210,8 @@ class TestTrailingSlashRemoved(TestCase): class TestNameableRoot(TestCase): def setUp(self): class NoteViewSet(viewsets.ModelViewSet): - model = RouterTestModel + queryset = RouterTestModel.objects.all() + self.router = DefaultRouter() self.router.root_view_name = 'nameable-root' self.router.register(r'notes', NoteViewSet) From e720927b78a31999f03bfa248329d623ce2c045c Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Thu, 29 Jan 2015 17:28:18 +0100 Subject: [PATCH 1531/1652] Removed deprecated '.model' docs --- docs/api-guide/generic-views.md | 8 ++------ docs/api-guide/routers.md | 2 +- docs/topics/3.0-announcement.md | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 6374e3052..61c8e8d88 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -93,17 +93,13 @@ The following attributes are used to control pagination when used with list view * `filter_backends` - A list of filter backend classes that should be used for filtering the queryset. Defaults to the same value as the `DEFAULT_FILTER_BACKENDS` setting. -**Deprecated attributes**: - -* `model` - This shortcut may be used instead of setting either (or both) of the `queryset`/`serializer_class` attributes. The explicit style is preferred over the `.model` shortcut, and usage of this attribute is now deprecated. - ### Methods **Base methods**: #### `get_queryset(self)` -Returns the queryset that should be used for list views, and that should be used as the base for lookups in detail views. Defaults to returning the queryset specified by the `queryset` attribute, or the default queryset for the model if the `model` shortcut is being used. +Returns the queryset that should be used for list views, and that should be used as the base for lookups in detail views. Defaults to returning the queryset specified by the `queryset` attribute. This method should always be used rather than accessing `self.queryset` directly, as `self.queryset` gets evaluated only once, and those results are cached for all subsequent requests. @@ -153,7 +149,7 @@ For example: #### `get_serializer_class(self)` -Returns the class that should be used for the serializer. Defaults to returning the `serializer_class` attribute, or dynamically generating a serializer class if the `model` shortcut is being used. +Returns the class that should be used for the serializer. Defaults to returning the `serializer_class` attribute. May be overridden to provide dynamic behavior, such as using different serializers for read and write operations, or providing different serializers to different types of users. diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index a9f911a98..592f7d66f 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -28,7 +28,7 @@ There are two mandatory arguments to the `register()` method: Optionally, you may also specify an additional argument: -* `base_name` - The base to use for the URL names that are created. If unset the basename will be automatically generated based on the `model` or `queryset` attribute on the viewset, if it has one. Note that if the viewset does not include a `model` or `queryset` attribute then you must set `base_name` when registering the viewset. +* `base_name` - The base to use for the URL names that are created. If unset the basename will be automatically generated based on the `queryset` attribute of the viewset, if it has one. Note that if the viewset does not include a `queryset` attribute then you must set `base_name` when registering the viewset. The example above would generate the following URL patterns: diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 5dbc5600a..24e69c2de 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -665,7 +665,7 @@ This code *would be valid* in `2.4.3`: class Meta: model = Account -However this code *would not be valid* in `2.4.3`: +However this code *would not be valid* in `3.0`: # Missing `queryset` class AccountSerializer(serializers.Serializer): From 7cf9dea7f905ea6869148a68b4fa96cad0a347e8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 30 Jan 2015 11:00:29 +0000 Subject: [PATCH 1532/1652] Docs typo. Closes #2491. --- docs/api-guide/parsers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index 73e3a7057..3d44fe56e 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -128,7 +128,7 @@ If the view used with `FileUploadParser` is called with a `filename` URL keyword def put(self, request, filename, format=None): file_obj = request.data['file'] # ... - # do some staff with uploaded file + # do some stuff with uploaded file # ... return Response(status=204) From 760b25bc20a1434cbdd69dc0b13bacdc3bbedd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 30 Jan 2015 11:36:03 -0400 Subject: [PATCH 1533/1652] Fix AttributeError on renamed _field_mapping --- rest_framework/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index a3b8196bd..a91fe23e0 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1330,13 +1330,13 @@ class ModelSerializer(Serializer): if hasattr(models, 'UUIDField'): - ModelSerializer._field_mapping[models.UUIDField] = UUIDField + ModelSerializer.serializer_field_mapping[models.UUIDField] = UUIDField if postgres_fields: class CharMappingField(DictField): child = CharField() - ModelSerializer._field_mapping[postgres_fields.HStoreField] = CharMappingField + ModelSerializer.serializer_field_mapping[postgres_fields.HStoreField] = CharMappingField class HyperlinkedModelSerializer(ModelSerializer): From ee2f2d6baa786e711b8b9707fc5218711c8ddc33 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 30 Jan 2015 15:58:33 +0000 Subject: [PATCH 1534/1652] Added 1.8-alpha to supported list. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 74bcaeefa..53140e556 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ There is a live example API for testing purposes, [available here][sandbox]. # Requirements * Python (2.6.5+, 2.7, 3.2, 3.3, 3.4) -* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7) +* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-alpha) # Installation From 0d96cf2ca2e3298ed38e81482bcdc2664d060735 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 30 Jan 2015 16:27:49 +0000 Subject: [PATCH 1535/1652] Latest translation source messages. --- docs/topics/3.1-announcement.md | 16 ++- .../locale/en_US/LC_MESSAGES/django.po | 112 +++++++++--------- 2 files changed, 71 insertions(+), 57 deletions(-) diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index a0ad98299..3eb52f4cf 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -1,7 +1,15 @@ -# Versioning +# Django REST framework 3.1 -# Pagination +## Pagination -# Internationalization +#### Pagination controls in the browsable API. -# ModelSerializer API +#### New pagination schemes. + +#### Support for header-based pagination. + +## Versioning + +## Internationalization + +## ModelSerializer API diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index d98225ce9..23f76ff7f 100644 --- a/rest_framework/locale/en_US/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-07 18:21+0000\n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -49,18 +49,6 @@ msgstr "" msgid "User inactive or deleted." msgstr "" -#: authtoken/serializers.py:20 -msgid "User account is disabled." -msgstr "" - -#: authtoken/serializers.py:23 -msgid "Unable to log in with provided credentials." -msgstr "" - -#: authtoken/serializers.py:26 -msgid "Must include \"username\" and \"password\"." -msgstr "" - #: exceptions.py:38 msgid "A server error occurred." msgstr "" @@ -101,28 +89,28 @@ msgstr "" msgid "Request was throttled." msgstr "" -#: fields.py:152 relations.py:131 relations.py:155 validators.py:77 +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 #: validators.py:155 msgid "This field is required." msgstr "" -#: fields.py:153 +#: fields.py:154 msgid "This field may not be null." msgstr "" -#: fields.py:480 fields.py:508 +#: fields.py:487 fields.py:515 msgid "\"{input}\" is not a valid boolean." msgstr "" -#: fields.py:543 +#: fields.py:550 msgid "This field may not be blank." msgstr "" -#: fields.py:544 fields.py:1252 +#: fields.py:551 fields.py:1324 msgid "Ensure this field has no more than {max_length} characters." msgstr "" -#: fields.py:545 +#: fields.py:552 msgid "Ensure this field has at least {min_length} characters." msgstr "" @@ -144,134 +132,140 @@ msgstr "" msgid "Enter a valid URL." msgstr "" -#: fields.py:640 +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 msgid "A valid integer is required." msgstr "" -#: fields.py:641 fields.py:675 fields.py:708 +#: fields.py:658 fields.py:692 fields.py:725 msgid "Ensure this value is less than or equal to {max_value}." msgstr "" -#: fields.py:642 fields.py:676 fields.py:709 +#: fields.py:659 fields.py:693 fields.py:726 msgid "Ensure this value is greater than or equal to {min_value}." msgstr "" -#: fields.py:643 fields.py:677 fields.py:713 +#: fields.py:660 fields.py:694 fields.py:730 msgid "String value too large." msgstr "" -#: fields.py:674 fields.py:707 +#: fields.py:691 fields.py:724 msgid "A valid number is required." msgstr "" -#: fields.py:710 +#: fields.py:727 msgid "Ensure that there are no more than {max_digits} digits in total." msgstr "" -#: fields.py:711 +#: fields.py:728 msgid "Ensure that there are no more than {max_decimal_places} decimal places." msgstr "" -#: fields.py:712 +#: fields.py:729 msgid "" "Ensure that there are no more than {max_whole_digits} digits before the " "decimal point." msgstr "" -#: fields.py:796 +#: fields.py:813 msgid "Datetime has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:797 +#: fields.py:814 msgid "Expected a datetime but got a date." msgstr "" -#: fields.py:861 +#: fields.py:878 msgid "Date has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:862 +#: fields.py:879 msgid "Expected a date but got a datetime." msgstr "" -#: fields.py:919 +#: fields.py:936 msgid "Time has wrong format. Use one of these formats instead: {format}." msgstr "" -#: fields.py:975 fields.py:1019 +#: fields.py:992 fields.py:1036 msgid "\"{input}\" is not a valid choice." msgstr "" -#: fields.py:1020 fields.py:1121 serializers.py:476 +#: fields.py:1037 fields.py:1151 serializers.py:482 msgid "Expected a list of items but got type \"{input_type}\"." msgstr "" -#: fields.py:1050 +#: fields.py:1067 msgid "No file was submitted." msgstr "" -#: fields.py:1051 +#: fields.py:1068 msgid "The submitted data was not a file. Check the encoding type on the form." msgstr "" -#: fields.py:1052 +#: fields.py:1069 msgid "No filename could be determined." msgstr "" -#: fields.py:1053 +#: fields.py:1070 msgid "The submitted file is empty." msgstr "" -#: fields.py:1054 +#: fields.py:1071 msgid "" "Ensure this filename has at most {max_length} characters (it has {length})." msgstr "" -#: fields.py:1096 +#: fields.py:1113 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: generics.py:123 -msgid "" -"Choose a valid page number. Page numbers must be a whole number, or must be " -"the string \"last\"." +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." msgstr "" -#: generics.py:128 +#: pagination.py:221 msgid "Invalid page \"{page_number}\": {message}." msgstr "" -#: relations.py:132 -msgid "Invalid pk \"{pk_value}\" - object does not exist." +#: pagination.py:442 +msgid "Invalid cursor" msgstr "" #: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:134 msgid "Incorrect type. Expected pk value, received {data_type}." msgstr "" -#: relations.py:156 +#: relations.py:157 msgid "Invalid hyperlink - No URL match." msgstr "" -#: relations.py:157 +#: relations.py:158 msgid "Invalid hyperlink - Incorrect URL match." msgstr "" -#: relations.py:158 +#: relations.py:159 msgid "Invalid hyperlink - Object does not exist." msgstr "" -#: relations.py:159 +#: relations.py:160 msgid "Incorrect type. Expected URL string, received {data_type}." msgstr "" -#: relations.py:294 +#: relations.py:295 msgid "Object with {slug_name}={value} does not exist." msgstr "" -#: relations.py:295 +#: relations.py:296 msgid "Invalid value." msgstr "" @@ -314,3 +308,15 @@ msgstr "" #: versioning.py:160 msgid "Invalid version in query parameter." msgstr "" + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "" + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "" + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "" From 6838f17325c2149e432e4a40b945695b765f35a2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 30 Jan 2015 16:40:54 +0000 Subject: [PATCH 1536/1652] Add built-in translations. --- .../locale/ar/LC_MESSAGES/django.mo | Bin 0 -> 4875 bytes .../locale/ar/LC_MESSAGES/django.po | 325 +++++++++++++++++ .../locale/cs/LC_MESSAGES/django.mo | Bin 0 -> 8848 bytes .../locale/cs/LC_MESSAGES/django.po | 325 +++++++++++++++++ .../locale/da/LC_MESSAGES/django.mo | Bin 0 -> 8452 bytes .../locale/da/LC_MESSAGES/django.po | 325 +++++++++++++++++ .../locale/de/LC_MESSAGES/django.mo | Bin 0 -> 6575 bytes .../locale/de/LC_MESSAGES/django.po | 325 +++++++++++++++++ .../locale/en/LC_MESSAGES/django.mo | Bin 0 -> 8553 bytes .../locale/en/LC_MESSAGES/django.po | 324 +++++++++++++++++ .../locale/en_US/LC_MESSAGES/django.mo | Bin 0 -> 378 bytes .../locale/en_US/LC_MESSAGES/django.po | 8 +- .../locale/es/LC_MESSAGES/django.mo | Bin 0 -> 8906 bytes .../locale/es/LC_MESSAGES/django.po | 327 +++++++++++++++++ .../locale/et/LC_MESSAGES/django.mo | Bin 0 -> 2018 bytes .../locale/et/LC_MESSAGES/django.po | 325 +++++++++++++++++ .../locale/fr/LC_MESSAGES/django.mo | Bin 0 -> 6975 bytes .../locale/fr/LC_MESSAGES/django.po | 326 +++++++++++++++++ .../locale/hu/LC_MESSAGES/django.mo | Bin 0 -> 9215 bytes .../locale/hu/LC_MESSAGES/django.po | 325 +++++++++++++++++ .../locale/id/LC_MESSAGES/django.mo | Bin 0 -> 497 bytes .../locale/id/LC_MESSAGES/django.po | 324 +++++++++++++++++ .../locale/it/LC_MESSAGES/django.mo | Bin 0 -> 5334 bytes .../locale/it/LC_MESSAGES/django.po | 325 +++++++++++++++++ .../locale/ko_KR/LC_MESSAGES/django.mo | Bin 0 -> 8555 bytes .../locale/ko_KR/LC_MESSAGES/django.po | 325 +++++++++++++++++ .../locale/mk/LC_MESSAGES/django.mo | Bin 0 -> 10731 bytes .../locale/mk/LC_MESSAGES/django.po | 325 +++++++++++++++++ .../locale/nl/LC_MESSAGES/django.mo | Bin 0 -> 499 bytes .../locale/nl/LC_MESSAGES/django.po | 324 +++++++++++++++++ .../locale/pl/LC_MESSAGES/django.mo | Bin 0 -> 8981 bytes .../locale/pl/LC_MESSAGES/django.po | 326 +++++++++++++++++ .../locale/pt_BR/LC_MESSAGES/django.mo | Bin 0 -> 8729 bytes .../locale/pt_BR/LC_MESSAGES/django.po | 326 +++++++++++++++++ .../locale/ru/LC_MESSAGES/django.mo | Bin 0 -> 9778 bytes .../locale/ru/LC_MESSAGES/django.po | 325 +++++++++++++++++ .../locale/sk/LC_MESSAGES/django.mo | Bin 0 -> 2748 bytes .../locale/sk/LC_MESSAGES/django.po | 325 +++++++++++++++++ .../locale/sv/LC_MESSAGES/django.mo | Bin 0 -> 8647 bytes .../locale/sv/LC_MESSAGES/django.po | 325 +++++++++++++++++ .../locale/tr/LC_MESSAGES/django.mo | Bin 0 -> 7946 bytes .../locale/tr/LC_MESSAGES/django.po | 328 ++++++++++++++++++ .../locale/uk/LC_MESSAGES/django.mo | Bin 0 -> 577 bytes .../locale/uk/LC_MESSAGES/django.po | 324 +++++++++++++++++ .../locale/zh_CN/LC_MESSAGES/django.mo | Bin 0 -> 8383 bytes .../locale/zh_CN/LC_MESSAGES/django.po | 325 +++++++++++++++++ rest_framework/views.py | 10 +- 47 files changed, 7165 insertions(+), 7 deletions(-) create mode 100644 rest_framework/locale/ar/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/ar/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/cs/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/cs/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/da/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/da/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/de/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/de/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/en/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/en/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/en_US/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/es/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/es/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/et/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/et/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/fr/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/fr/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/hu/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/hu/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/id/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/id/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/it/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/it/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/ko_KR/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/ko_KR/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/mk/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/mk/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/nl/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/nl/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/pl/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/pl/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/pt_BR/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/pt_BR/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/ru/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/ru/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/sk/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/sk/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/sv/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/sv/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/tr/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/tr/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/uk/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/uk/LC_MESSAGES/django.po create mode 100644 rest_framework/locale/zh_CN/LC_MESSAGES/django.mo create mode 100644 rest_framework/locale/zh_CN/LC_MESSAGES/django.po diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.mo b/rest_framework/locale/ar/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..fe1b676c6db0f4d0f3af1253068c558259334fbb GIT binary patch literal 4875 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 literal 0 HcmV?d00001 diff --git a/rest_framework/locale/ar/LC_MESSAGES/django.po b/rest_framework/locale/ar/LC_MESSAGES/django.po new file mode 100644 index 000000000..a910a7c99 --- /dev/null +++ b/rest_framework/locale/ar/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Eyad Toma <d.eyad.t@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Arabic (http://www.transifex.com/projects/p/django-rest-framework/language/ar/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "اسم المستخدم/كلمة السر غير صحيحين." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:168 +msgid "Invalid token." +msgstr "" + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "المستخدم غير مفعل او تم حذفه." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "حدث خطأ في المخدم." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "" + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "بيانات الدخول غير صحيحة." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "لم يتم تزويد بيانات الدخول." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "ليس لديك صلاحية للقيام بهذا الإجراء." + +#: exceptions.py:93 +msgid "Not found." +msgstr "غير موجود." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "" + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "" + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "" + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "هذا الحقل مطلوب." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "لا يمكن لهذا الحقل ان يكون فارغاً null." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" ليس قيمة منطقية." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "لا يمكن لهذا الحقل ان يكون فارغاً." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "تأكد ان الحقل لا يزيد عن {max_length} محرف." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "تأكد ان الحقل {min_length} محرف على الاقل." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "عليك ان تدخل بريد إلكتروني صالح." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "هذه القيمة لا تطابق النمط المطلوب." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "" + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "الرجاء إدخال رابط إلكتروني صالح." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "الرجاء إدخال رقم صحيح صالح." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "تأكد ان القيمة أقل أو تساوي {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "تأكد ان القيمة أكبر أو تساوي {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "" + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "الرجاء إدخال رقم صالح." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "تأكد ان القيمة لا تحوي أكثر من {max_digits} رقم." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "" + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "" + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "صيغة التاريخ و الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "" + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "صيغة التاريخ غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "" + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "صيغة الوقت غير صحيحة. عليك أن تستخدم واحدة من هذه الصيغ التالية: {format}." + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" ليست واحدة من الخيارات الصالحة." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "لم يتم إرسال أي ملف." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "" + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "الملف الذي تم إرساله فارغ." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "تأكد ان اسم الملف لا يحوي أكثر من {max_length} محرف (الإسم المرسل يحوي {length} محرف)." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "رقم الصفحة \"{page_number}\" غير صالح : {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "معرف العنصر \"{pk_value}\" غير صالح - العنصر غير موجود." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:296 +msgid "Invalid value." +msgstr "قيمة غير صالحة." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: validators.py:22 +msgid "This field must be unique." +msgstr "" + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "" + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "حساب المستخدم غير مفعل." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "تعذر تسجيل الدخول بالبيانات التي ادخلتها." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "يجب أن تتضمن \"اسم المستخدم\" و \"كلمة المرور\"." diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.mo b/rest_framework/locale/cs/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..a5e67713ae21550f7f98eca77362383d2e830151 GIT binary patch literal 8848 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 literal 0 HcmV?d00001 diff --git a/rest_framework/locale/cs/LC_MESSAGES/django.po b/rest_framework/locale/cs/LC_MESSAGES/django.po new file mode 100644 index 000000000..50e7034bd --- /dev/null +++ b/rest_framework/locale/cs/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Jirka Vejrazka <Jirka.Vejrazka@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Czech (http://www.transifex.com/projects/p/django-rest-framework/language/cs/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "Chybná hlavička. Nebyly poskytnuty přihlašovací údaje." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Chybná hlavička. Přihlašovací údaje by neměly obsahovat mezery." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Chybná hlavička. Přihlašovací údaje nebyly správně zakódovány pomocí base64." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Chybné uživatelské jméno nebo heslo." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Chybná hlavička tokenu. Nebyly zadány přihlašovací údaje." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Chybná hlavička tokenu. Přihlašovací údaje by neměly obsahovat mezery." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Chybný token." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Uživatelský účet je neaktivní nebo byl smazán." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Chyba na straně serveru." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Neplatný formát požadavku." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Chybné přihlašovací údaje." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Přihlašovací údaje nebyly zadány." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "K této akci nemáte oprávnění." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Nenalezeno." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Metoda \"{method}\" není povolena." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "Nelze vyhovět požadavku v hlavičce Accept." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Nepodporovaný media type \"{media_type}\" v požadavku." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "Pořadavek byl limitován kvůli omezení počtu požadavků za časovou periodu." + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Toto pole je vyžadováno." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Toto pole nesmí být prázdné (null)." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" nelze použít jako typ boolean." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "Toto pole nesmí být prázdné.." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Zkontrolujte, že toto pole není delší než {max_length} znaků." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Zkontrolujte, že toto obsahuje alespoň {min_length} znaků" + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Vložte platnou e-mailovou adresu." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Hodnota v tomto poli neodpovídá požadovanému formátu." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Vložte platnou \"zkrácenou formu\" obsahující pouze malá písmena, čísla, spojovník nebo podtržítko." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Vložte platný odkaz." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "Je vyžadováno číslo." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Zkontrolujte, že hodnota je menší nebo rovna {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Zkontrolujte, že hodnota je větší nebo rovna {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "Řetězec je příliš dlouhý" + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "Je vyžadováno číslo." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Zkontrolujte, že číslo neobsahuje více než {max_digits} čislic." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Zkontrolujte, že číslo nemá více než {max_decimal_places} desetinných míst." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Zkontrolujte, že číslo neobsahuje více než {max_whole_digits} čislic před desetinnou čárkou." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Chybný formát data a času. Použijte jeden z těchto formátů: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Bylo zadáno pouze datum místo data a času." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Chybný formát data. Použijte jeden z těchto formátů: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Bylo zadáno datum a čas, místo samotného data." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Chybný formát času. Použijte jeden z těchto formátů: {format}." + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" není platnou možností." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Byl očekáván seznam položek ale nalezen \"{input_type}\"." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "Nebyl zaslán žádný soubor." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Zaslaná data neobsahují soubor. Zkontrolujte typ kódování ve formuláři." + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "Nebylo možno zjistit jméno souboru." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "Zaslaný soubor je prázdný." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Zajistěte, aby jméno souboru obsahovalo maximálně {max_length} znaků (teď má {length} znaků)." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Nahrajte platný obrázek. Nahraný soubor buď není obrázkem, nebo je poškozen." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "Chybné čislo stránky \"{page_number}\": {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Chybný primární klíč \"{pk_value}\" - objekt neexistuje." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Chybný typ. Byl přijat typ {data_type} místo hodnoty primárního klíče." + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "Chybný odkaz - nebyla nalezena žádní shoda." + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Chybný odkaz - byla nalezena neplatná shoda." + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Chybný odkaz - objekt neexistuje." + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Chybný typ. Byl přijat typ {data_type} místo očekávaného odkazu." + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Objekt s {slug_name}={value} neexistuje." + +#: relations.py:296 +msgid "Invalid value." +msgstr "Chybná hodnota." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Chybná data. Byl přijat typ {datatype} místo očakávaného slovníku." + +#: validators.py:22 +msgid "This field must be unique." +msgstr "Tato položka musí být unikátní." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "Položka {field_names} musí tvořit unikátní množinu." + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "Tato položka musí být pro datum \"{date_field}\" unikátní." + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "Tato položka musí být pro měsíc \"{date_field}\" unikátní." + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "Tato položka musí být pro rok \"{date_field}\" unikátní." + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "Chybné číslo verze v hlavičce Accept" + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "Chybné číslo verze v odkazu." + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "Chybné číslo verze v hostname." + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "Chybné čislo verze v URL parametru." + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Uživatelský účet je zamčen." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Se zadanými údaji nebylo možné se přihlásit." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Musí obsahovat \"uživatelské jméno! a \"heslo\"." diff --git a/rest_framework/locale/da/LC_MESSAGES/django.mo b/rest_framework/locale/da/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..f947f90713f9a6f079c361caa166ebb0a82909d0 GIT binary patch literal 8452 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 SI`tVz<v$<j1HNF=ocs@!lr+i! literal 0 HcmV?d00001 diff --git a/rest_framework/locale/da/LC_MESSAGES/django.po b/rest_framework/locale/da/LC_MESSAGES/django.po new file mode 100644 index 000000000..e00ffadff --- /dev/null +++ b/rest_framework/locale/da/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Mikkel Munch Mortensen <3xm@detfalskested.dk>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Danish (http://www.transifex.com/projects/p/django-rest-framework/language/da/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: da\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "Ugyldig basic header. Ingen legitimation angivet." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Ugyldig basic header. Legitimationsstrenge må ikke indeholde mellemrum." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Ugyldig basic header. Legitimationen er ikke base64 encoded på korrekt vis." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Ugyldigt brugernavn/kodeord." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Ugyldig token header." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Ugyldig token header. Token-strenge må ikke indeholde mellemrum." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Ugyldigt token." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Inaktiv eller slettet bruger." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Der er sket en serverfejl." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Misdannet forespørgsel." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Ugyldig legitimation til autentificering." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Legitimation til autentificering blev ikke angivet." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "Du har ikke lov til at udføre denne handling." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Ikke fundet." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Metoden \"{method}\" er ikke tilladt." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "Kunne ikke efterkomme forespørgslens Accept header." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Forespørgslens media type, \"{media_type}\", er ikke understøttet." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "Forespørgslen blev neddroslet." + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Dette felt er påkrævet." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Dette felt må ikke være null." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" er ikke en tilladt boolsk værdi." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "Dette felt må ikke være tomt." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Tjek at dette felt ikke indeholder flere end {max_length} tegn." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Tjek at dette felt indeholder mindst {min_length} tegn." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Angiv en gyldig e-mailadresse." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Denne værdi passer ikke med det påkrævede mønster." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Indtast en gyldig \"slug\", bestående af bogstaver, tal, bund- og bindestreger." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Indtast en gyldig URL." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "Et gyldigt heltal er påkrævet." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Tjek at værdien er mindre end eller lig med {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Tjek at værdien er større end eller lig med {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "Strengværdien er for stor." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "Et gyldigt tal er påkrævet." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Tjek at der ikke er flere end {max_digits} cifre i alt." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Tjek at der ikke er flere end {max_decimal_places} cifre efter kommaet." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Tjek at der ikke er flere end {max_whole_digits} cifre før kommaet." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Datotid har et forkert format. Brug i stedet et af disse formater: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Forventede en datotid, men fik en dato." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Dato har et forkert format. Brug i stedet et af disse formater: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Forventede en dato men fik en datotid." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Klokkeslæt har forkert format. Brug i stedet et af disse formater: {format}. " + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" er ikke et gyldigt valg." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Forventede en liste, men fik noget af typen \"{input_type}\"." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "Ingen medsendt fil." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Det medsendte data var ikke en fil. Tjek typen af indkodning på formularen." + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "Filnavnet kunne ikke afgøres." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "Den medsendte fil er tom." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Sørg for at filnavnet er højst {max_length} langt (det er {length})." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Medsend et gyldigt billede. Den medsendte fil var enten ikke et billede eller billedfilen var ødelagt." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "Ugyldig side \"{page_number}\": {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Ugyldig primærnøgle \"{pk_value}\" - objektet findes ikke." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Ugyldig type. Forventet værdi er primærnøgle, fik {data_type}." + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "Ugyldigt hyperlink - intet URL match." + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Ugyldigt hyperlink - forkert URL match." + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Ugyldigt hyperlink - objektet findes ikke." + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Forkert type. Forventede en URL-streng, fik {data_type}." + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Object med {slug_name}={value} findes ikke." + +#: relations.py:296 +msgid "Invalid value." +msgstr "Ugyldig værdi." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Ugyldig data. Forventede en dictionary, men fik {datatype}." + +#: validators.py:22 +msgid "This field must be unique." +msgstr "Dette felt skal være unikt." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "Felterne {field_names} skal udgøre et unikt sæt." + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "Dette felt skal være unikt for \"{date_field}\"-datoen." + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "Dette felt skal være unikt for \"{date_field}\"-måneden." + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "Dette felt skal være unikt for \"{date_field}\"-året." + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "Ugyldig version i \"Accept\" headeren." + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "Ugyldig version i URL-stien." + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "Ugyldig version i hostname." + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "Ugyldig version i forespørgselsparameteren." + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Brugerkontoen er deaktiveret." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Kunne ikke logge ind med den angivne legitimation." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Skal indeholde \"username\" og \"password\"." diff --git a/rest_framework/locale/de/LC_MESSAGES/django.mo b/rest_framework/locale/de/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..48245c6095528c08ac4ffc8593e2dd3fba459c65 GIT binary patch literal 6575 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 Im`iy6AMeugEdT%j literal 0 HcmV?d00001 diff --git a/rest_framework/locale/de/LC_MESSAGES/django.po b/rest_framework/locale/de/LC_MESSAGES/django.po new file mode 100644 index 000000000..74bee4167 --- /dev/null +++ b/rest_framework/locale/de/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Thomas Tanner, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: German (http://www.transifex.com/projects/p/django-rest-framework/language/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "Ungültiger basic header. Keine Zugangsdaten angegeben." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Ungültiger basic header. Zugangsdaten sollen keine Leerzeichen enthalten." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Ungültiger basic header. Zugangsdaten sind nicht korrekt mit base64 kodiert." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Ungültiger Benutzername/Passwort" + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Ungültiger token header. Keine Zugangsdaten angegeben." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Ungültiger token header. Zugangsdaten sollen keine Leerzeichen enthalten." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Ungültiges Token" + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Benutzer inaktiv oder gelöscht." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Ein Serverfehler ist aufgetreten." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Fehlerhafte Anfrage." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Falsche Anmeldedaten." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Anmeldedaten fehlen." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "Sie sind nicht berechtigt, diese Aktion durchzuführen." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Nicht gefunden." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Methode \"{method}\" nicht erlaubt." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "Kann den Accept header der Anfrage nicht erfüllen." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Nicht unterstützter Medientyp \"{media_type}\" in der Anfrage." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "Die Anfrage wurde gedrosselt." + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Dieses Feld ist erforderlich." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Dieses Feld darf nicht Null sein." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" ist kein gültiger Boole'scher Wert." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "Dieses Feld darf nicht leer sein." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Stelle sicher, dass dieses Feld nicht mehr als {max_length} Zeichen lang ist." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Stelle sicher, dass dieses Feld mindestens {min_length} Zeichen lang ist." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Gebe eine gültige E-Mail Adresse an." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Dieser Wert passt nicht zu dem erforderlichen Muster." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Gebe ein gültiges \"slug\" aus Buchstaben, Ziffern, Unterstrichen und Minuszeichen ein." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Gebe eine gültige URL ein." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "Eine gültige Ganzzahl ist erforderlich." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Stelle sicher, dass dieser Wert kleiner oder gleich {max_value} ist." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Stelle sicher, dass dieser Wert größer oder gleich {max_value} ist." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "Zeichenkette zu lang." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "Eine gültige Zahl ist erforderlich." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Stelle sicher, dass es insgesamt nicht mehr als {max_digits} Ziffern lang ist." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Stelle sicher, dass es nicht mehr als {max_decimal_places} Nachkommastellen lang ist." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Stelle sicher, dass es nicht mehr als {max_whole_places} Stellen vor dem Komma lang ist." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Datum- und Zeitangabe hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Erwarte eine Datum- und Zeitangabe, erhielt aber ein Datum." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Datum hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Erwarte ein Datum, erhielt aber eine Datum- und Zeitangabe." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Zeitangabe hat das falsche Format. Nutze stattdessen eines dieser Formate: {format}." + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" ist keine gültige Option." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Erwarte eine Liste von Elementen, erhielt aber den Typ \"{input_type}\"." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "Es wurde keine Datei übermittelt." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Die übermittelten Daten sind keine Datei. Prüfe den Kodierungstyp im Formular." + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "Der Dateiname konnte nicht ermittelt werden." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "Die übermittelte Datei ist leer." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "" + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:296 +msgid "Invalid value." +msgstr "Ungültiger Wert." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Ungültige Daten. Dictionary erwartet, aber {datatype} erhalten." + +#: validators.py:22 +msgid "This field must be unique." +msgstr "Dieses Feld muss eineindeutig sein." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "" + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Benutzerkonto ist gesperrt." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Kann nicht mit den angegeben Zugangsdaten anmelden." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "\"username\" und \"password\" sind erforderlich." diff --git a/rest_framework/locale/en/LC_MESSAGES/django.mo b/rest_framework/locale/en/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..746915ff11f3b04ac4d13877a632c754d53f8f8e GIT binary patch literal 8553 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 MEzy5r-t>j}KVJtP)c^nh literal 0 HcmV?d00001 diff --git a/rest_framework/locale/en/LC_MESSAGES/django.po b/rest_framework/locale/en/LC_MESSAGES/django.po new file mode 100644 index 000000000..f3db69e5e --- /dev/null +++ b/rest_framework/locale/en/LC_MESSAGES/django.po @@ -0,0 +1,324 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: English (http://www.transifex.com/projects/p/django-rest-framework/language/en/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "Invalid basic header. No credentials provided." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Invalid basic header. Credentials string should not contain spaces." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Invalid basic header. Credentials not correctly base64 encoded." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Invalid username/password." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Invalid token header. No credentials provided." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Invalid token header. Token string should not contain spaces." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Invalid token." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "User inactive or deleted." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "A server error occurred." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Malformed request." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Incorrect authentication credentials." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Authentication credentials were not provided." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "You do not have permission to perform this action." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Not found." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Method \"{method}\" not allowed." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "Could not satisfy the request Accept header." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Unsupported media type \"{media_type}\" in request." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "Request was throttled." + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "This field is required." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "This field may not be null." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" is not a valid boolean." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "This field may not be blank." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Ensure this field has no more than {max_length} characters." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Ensure this field has at least {min_length} characters." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Enter a valid email address." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "This value does not match the required pattern." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Enter a valid \"slug\" consisting of letters, numbers, underscores or hyphens." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Enter a valid URL." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "\"{value}\" is not a valid UUID." + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "A valid integer is required." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Ensure this value is less than or equal to {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Ensure this value is greater than or equal to {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "String value too large." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "A valid number is required." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Ensure that there are no more than {max_digits} digits in total." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Ensure that there are no more than {max_decimal_places} decimal places." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Ensure that there are no more than {max_whole_digits} digits before the decimal point." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Datetime has wrong format. Use one of these formats instead: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Expected a datetime but got a date." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Date has wrong format. Use one of these formats instead: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Expected a date but got a datetime." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Time has wrong format. Use one of these formats instead: {format}." + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" is not a valid choice." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Expected a list of items but got type \"{input_type}\"." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "No file was submitted." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "The submitted data was not a file. Check the encoding type on the form." + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "No filename could be determined." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "The submitted file is empty." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Ensure this filename has at most {max_length} characters (it has {length})." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Upload a valid image. The file you uploaded was either not an image or a corrupted image." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "Expected a dictionary of items but got type \"{input_type}\"." + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "Invalid page \"{page_number}\": {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "Invalid cursor" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Invalid pk \"{pk_value}\" - object does not exist." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Incorrect type. Expected pk value, received {data_type}." + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "Invalid hyperlink - No URL match." + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Invalid hyperlink - Incorrect URL match." + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Invalid hyperlink - Object does not exist." + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Incorrect type. Expected URL string, received {data_type}." + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Object with {slug_name}={value} does not exist." + +#: relations.py:296 +msgid "Invalid value." +msgstr "Invalid value." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Invalid data. Expected a dictionary, but got {datatype}." + +#: validators.py:22 +msgid "This field must be unique." +msgstr "This field must be unique." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "The fields {field_names} must make a unique set." + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "This field must be unique for the \"{date_field}\" date." + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "This field must be unique for the \"{date_field}\" month." + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "This field must be unique for the \"{date_field}\" year." + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "Invalid version in \"Accept\" header." + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "Invalid version in URL path." + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "Invalid version in hostname." + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "Invalid version in query parameter." + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "User account is disabled." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Unable to log in with provided credentials." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Must include \"username\" and \"password\"." diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.mo b/rest_framework/locale/en_US/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..eb60d9d7e1123950e713bfcb32e08531629dca0f GIT binary patch literal 378 zcmYL^K~KUk7=|%=+R?Lz9=zd)8$^Q@4V4vKTsJZXiQX#IS%dA;6{A1Izvpl9TVmu* zp7hY?Yv1qZ_~^TXIY3U3Q{)giL)r|HF<xHb**gE3JNu^A9+C~Llxws#l+4-Wfz3Es z@nVtWSx~6jIuD|$^ak#BRRg7^B$($VOq`M)hai?-QPK~i3kV|^ge1D8{XsXxpa_Nf z(Cy=Y-XmuPh#X=@?sF=V?o*!eAeD`W(n-^7rMHff=`u}8#snuLE?AO|SsWL9vA9Lm zR6AKID3yGtBxTub*;XE<>3FMq)>V54tBOSM{eDp|3?|liW$?SN8hd;7>Cfw})aIJ3 gU!`l5zgd=381B8c){An$&Dw6XsVEsfYaeue0Zr^?I{*Lx literal 0 HcmV?d00001 diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po index 23f76ff7f..11d94e9ca 100644 --- a/rest_framework/locale/en_US/LC_MESSAGES/django.po +++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"POT-Creation-Date: 2015-01-30 16:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -69,7 +69,7 @@ msgstr "" msgid "You do not have permission to perform this action." msgstr "" -#: exceptions.py:93 +#: exceptions.py:93 views.py:77 msgid "Not found." msgstr "" @@ -309,6 +309,10 @@ msgstr "" msgid "Invalid version in query parameter." msgstr "" +#: views.py:81 +msgid "Permission denied." +msgstr "" + #: authtoken/serializers.py:20 msgid "User account is disabled." msgstr "" diff --git a/rest_framework/locale/es/LC_MESSAGES/django.mo b/rest_framework/locale/es/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..814db7be9869ad30aab02fc08c8b1bec51921dc1 GIT binary patch literal 8906 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 bUU$}juqdxl3dikFi@i#n#VLk_(z^Fw@*D2A literal 0 HcmV?d00001 diff --git a/rest_framework/locale/es/LC_MESSAGES/django.po b/rest_framework/locale/es/LC_MESSAGES/django.po new file mode 100644 index 000000000..28ef893d4 --- /dev/null +++ b/rest_framework/locale/es/LC_MESSAGES/django.po @@ -0,0 +1,327 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# José Padilla <jpadilla@webapplicate.com>, 2015 +# Miguel González <migonzalvar@activitycentral.com>, 2015 +# Sergio Infante <rsinfante@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/django-rest-framework/language/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "Cabecera básica inválida. Las credenciales no fueron suministradas." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Cabecera básica inválida. La cadena con las credenciales no debe contener espacios." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Cabecera básica inválida. Las credenciales incorrectamente codificadas en base64." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Nombre de usuario/contraseña inválidos." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Cabecera token inválida. Las credenciales no fueron suministradas." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Cabecera token inválida. La cadena token no debe contener espacios." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Token inválido." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Usuario inactivo o borrado." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Se ha producido un error en el servidor." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Solicitud con formato incorrecto." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Credenciales de autenticación incorrectas." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Las credenciales de autenticación no se proveyeron." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "Usted no tiene permiso para realizar esta acción." + +#: exceptions.py:93 +msgid "Not found." +msgstr "No encontrado." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Método \"{method}\" no permitido." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "No se ha podido satisfacer la solicitud de cabecera de Accept." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Tipo de medio \"{media_type}\" incompatible en la solicitud." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "Solicitud fue regulada (throttled)." + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Este campo es requerido." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Este campo no puede ser nulo." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" no es un booleano válido." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "Este campo no puede estar en blanco." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Asegúrese de que este campo no tenga más de {max_length} caracteres." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Asegúrese de que este campo tenga al menos {min_length} caracteres." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Introduzca una dirección de correo electrónico válida." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Este valor no coincide con el patrón requerido." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Introduzca un \"slug\" válido consistente en letras, números, guiones o guiones bajos." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Introduzca una URL válida." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "Introduzca un número entero válido." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Asegúrese de que este valor es menor o igual a {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Asegúrese de que este valor es mayor o igual a {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "Cadena demasiado larga." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "Se requiere un número válido." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Asegúrese de que no haya más de {max_digits} dígitos en total." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Asegúrese de que no haya más de {max_decimal_places} decimales." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Asegúrese de que no haya más de {max_whole_digits} dígitos en la parte entera." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Fecha/hora con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Se esperaba un fecha/hora en vez de una fecha." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Fecha con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Se esperaba una fecha en vez de una fecha/hora." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Hora con formato erróneo. Use uno de los siguientes formatos en su lugar: {format}." + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" no es una elección válida." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Se esperaba una lista de elementos en vez del tipo \"{input_type}\"." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "No se envió ningún archivo." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "La información enviada no era un archivo. Compruebe el tipo de codificación del formulario." + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "No se pudo determinar un nombre de archivo." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "El archivo enviado está vació." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Asegúrese de que el nombre de archivo no tenga más de {max_length} caracteres (tiene {length})." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Adjunte una imagen válida. El archivo adjunto o bien no es una imagen o bien está dañado." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "Página \"{page_number}\" inválida: {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Clave primaria \"{pk_value}\" inválida - objeto no existe." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Tipo incorrecto. Se esperaba valor de clave primaria y se recibió {data_type}." + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "Hiperenlace inválido - No hay URL coincidentes." + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Hiperenlace inválido - Coincidencia incorrecta de la URL." + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Hiperenlace inválido - Objeto no existe." + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Tipo incorrecto. Se esperaba una URL y se recibió {data_type}." + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Objeto con {slug_name}={value} no existe." + +#: relations.py:296 +msgid "Invalid value." +msgstr "Valor inválido." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Datos inválidos. Se esperaba un diccionario pero es un {datatype}." + +#: validators.py:22 +msgid "This field must be unique." +msgstr "Este campo debe ser único." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "Los campos {field_names} deben formar un conjunto único." + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "Este campo debe ser único para el día \"{date_field}\"." + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "Este campo debe ser único para el mes \"{date_field}\"." + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "Este campo debe ser único para el año \"{date_field}\"." + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "Versión inválida en la cabecera \"Accept\"." + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "Versión inválida en la ruta de la URL." + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "Versión inválida en el nombre de host." + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "Versión inválida en el parámetro de consulta." + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Cuenta de usuario está deshabilitada." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "No puede iniciar sesión con las credenciales proporcionadas." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Debe incluir \"username\" y \"password\"." diff --git a/rest_framework/locale/et/LC_MESSAGES/django.mo b/rest_framework/locale/et/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..ca9b6ec4b7616e9efccc29ae0a2b604aa476aef8 GIT binary patch literal 2018 zcma)+OK%)S5XYMk9$B7>c!Y;Su?LbU%&zT(BwAw>;W)^O4VJz3)hf@lciYp`z4T*k z3*~^gaOA=TaX~T{?zu!k0+}ztg);{}1pl60uN}#eGE&cPrn??pRo(T^`LjO?Jg;NC zkMT3c+v)omyzuOSUx54IZSYU91D-h}#7%GxJP$@N>3<Kt3;qgT0{;M$y?@6P&kFG# z{x5)S@H%)EEWmfbAIAI*d<0*AfwP$Z_BkP1;P2of_#e0g-gsV!x4`ef55S+mi{L{r z+5a1S13dSF5O0DP!Q|&U_!0OenEXfZ0{9Df3492`y*P*QGR7+y*ot@wqk(~N1VqHE z7)MXaVR~L1LA(aSef^xp8(Thp7L1QhQs{HQOX8C;jHSwsrVV{l@!n=3b5*h49B9s^ zzfa?T8vVD#Q`=EJ6_S2UQig&JtWOwFo`$TWBz*Lo<RD$zo+0Z<ejQmu1A9_tvlhGm z1XV4)KTQv@9P1_9oZP8`)>oI3sgqN(Vx@_T!ogTeESiyI^wJrwWP8Bg?^;*1#B%fj z!Q?s?lA1>XO=43}^GK}O5^KRJ(;EjEtR>B^CtIT1N3`2Y>LP{h5T|kyc2CS#ypOsB z+Cq7vM#k#3Iu<Id^z~xJA@8R`PHfPC17b2Qv2J)vqttL}dnxm~D)edK>`)c5pd1dR z35qpBT}Oz-d2XXYTps1}Nf|q;SCrvAsG&?XDWsMmt*kh^BlD0g7TJb$URl$jJ3DN8 zmR1+my0q<(Go-6*tjd9PAzSu6Rb-#Xp3l0rLyeWMy4ifHI8?JcD13)zrlvp1rlzxN zQ#5^}Gjr|g6dnj>t8%E4i__(9j^viuhpg+^c+J7O4t4vsVo&pZr+iS7J`J|IjggNh zTDh%0Yb;^Uk$W=hO0GJz;Da>^2k>$~gh8j>-re18g=AH2%e|!1MiNu#zCCCcb;KD? zOvok?xAoX$TZZ<P#`5Cw!f}qKTT_jBi-Tvd+5G{c4stKFakG?}rM%D1%P_azy_?-S zmP_uprOOsfZVMc#4&B;PVY2lO$<SEQ(Xr0%T37iFnL+*Q=VoScYtzcyWkVm%(e#zs zhS-qO6!BxIQHdOtwjUG?EY6Fw{Zdv`Ms;c@Xwl=kWf`BKH@f+)lj6g}gTn(Cq9<#} zM|7f*qv7ELMR>WwNN_A9d;IvtKe6eFP_l#{Rr;r}b=(X{tSOJ0F~WCFmI03Ijxd>) z$jFdnHn2E4#5`^a8;l&4>|@{^4$+wC+nzQ1!v}_ODI{-^$L-MtS4_>vB}0>TFp1+? zi>C$wHC!u0S}BA(P-TgX9Uf?vCQ%kNn&`Ef%u0nD-N&ldOyTfRU)A#Cv|<%g*snwr zU=w0N6)ZT|hA-v4L@!Wirs(_i>L`MgX}QJNi$P8z8p6GCge4BD9aRh0J{FUOG>5iO T2Bn5|(NMuMZ8jh)=nnq_MD1-c literal 0 HcmV?d00001 diff --git a/rest_framework/locale/et/LC_MESSAGES/django.po b/rest_framework/locale/et/LC_MESSAGES/django.po new file mode 100644 index 000000000..dec03d4d8 --- /dev/null +++ b/rest_framework/locale/et/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Tõnis Kärdi <tonis.kardi@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Estonian (http://www.transifex.com/projects/p/django-rest-framework/language/et/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: et\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Vale kasutajatunnus/salasõna." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:168 +msgid "Invalid token." +msgstr "" + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Kasutaja on inaktiivne või kustutatud." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "" + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "" + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "" + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "" + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "" + +#: exceptions.py:93 +msgid "Not found." +msgstr "" + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "" + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "" + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "" + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Väli on kohustuslik." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Väli ei tohi olla tühi." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "" + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "" + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "" + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "" + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Sisesta kehtiv e-posti aadress." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Väärtus ei ühti etteantud mustriga." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "" + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Sisesta korrektne URL." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "" + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Veendu, et väärtus on väiksem kui või võrdne väärtusega {max_value}. " + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Veendu, et väärtus on suurem kui või võrdne väärtusega {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "Sõne on liiga pikk." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "" + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Veendu, et kokku pole rohkem kui {max_digits}." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Veendu, et komakohti pole rohkem kui {max_decimal_places}. " + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "" + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "" + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "" + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "" + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "" + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "" + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "" + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "" + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:296 +msgid "Invalid value." +msgstr "" + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: validators.py:22 +msgid "This field must be unique." +msgstr "" + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "" + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Kasutajakonto on suletud" + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Sisselogimine antud tunnusega ebaõnnestus." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Peab sisaldama \"kasutajatunnust\" ja \"slasõna\"." diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.mo b/rest_framework/locale/fr/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..68519d4539c4e2c1b67a343c83889ea9cadc74df GIT binary patch literal 6975 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 literal 0 HcmV?d00001 diff --git a/rest_framework/locale/fr/LC_MESSAGES/django.po b/rest_framework/locale/fr/LC_MESSAGES/django.po new file mode 100644 index 000000000..e8597c305 --- /dev/null +++ b/rest_framework/locale/fr/LC_MESSAGES/django.po @@ -0,0 +1,326 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Etienne Desgagné <etienne.desgagne@evimbec.ca>, 2015 +# Martin Maillard <martin.maillard@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: French (http://www.transifex.com/projects/p/django-rest-framework/language/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "En-tête « basic » non valide. Informations d'identification non fournies." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "En-tête « basic » non valide. Les informations d'identification ne doivent pas contenir d'espaces." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "En-tête « basic » non valide. Encodage base64 des informations d'identification incorrect." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Nom d'utilisateur et/ou mot de passe non valide(s)." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "En-tête « token » non valide. Informations d'identification non fournies." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "En-tête « token » non valide. Un token ne doit pas contenir d'espaces." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Token non valide." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Utilisateur inactif ou supprimé." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Une erreur du serveur est survenue." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Requête malformée" + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Informations d'authentification incorrectes." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Informations d'authentification non fournies." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "Vous n'avez pas la permission d'effectuer cette action." + +#: exceptions.py:93 +msgid "Not found." +msgstr "" + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Méthode \"{method}\" non autorisée." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "" + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "" + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Ce champ est obligatoire." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Ce champ ne peut être null." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" n'est pas un booléen valide." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "Ce champ ne peut être vide." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Assurez-vous que ce champ comporte au plus {max_length} caractères." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Assurez-vous que ce champ comporte au moins {min_length} caractères." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Saisissez une adresse email valable." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Cette valeur ne satisfait pas le motif imposé." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _ et des traits d'union." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Saisissez une URL valide." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "Saisissez un nombre entier valide." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Assurez-vous que cette valeur est inférieure ou égale à {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Assurez-vous que cette valeur est supérieure ou égale à {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "Chaîne de caractères trop longue." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "Un nombre valide est requis." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Assurez-vous qu'il n'y a pas plus de {max_digits} chiffres au total." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Assurez-vous qu'il n'y a pas plus de {max_decimal_places} chiffres après la virgule." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Assurez-vous qu'il n'y a pas plus de {max_whole_digits} chiffres avant la virgule." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "" + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "" + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" n'est pas un choix valide." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "Aucun fichier n'a été soumis." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "La donnée soumise n'est pas un fichier. Vérifiez le type d'encodage du formulaire." + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "Le nom de fichier n'a pu être déterminé." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "Le fichier soumis est vide." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Assurez-vous que le nom de fichier comporte au plus {max_length} caractères (il en comporte {length})." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Transférez une image valide. Le fichier que vous avez transféré n'est pas une image, ou il est corrompu." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "Page \"{page_number}\" non valide : {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Clé primaire \"{pk_value}\" non valide - l'objet n'existe pas." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "L'object avec {slug_name}={value} n'existe pas." + +#: relations.py:296 +msgid "Invalid value." +msgstr "Valeur non valide." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: validators.py:22 +msgid "This field must be unique." +msgstr "Ce champ doit être unique." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "Les champs {field_names} doivent former un ensemble unique." + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "Ce champ doit être unique pour la date \"{date_field}\"." + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "Ce champ doit être unique pour le mois \"{date_field}\"." + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "Ce champ doit être unique pour l'année \"{date_field}\"." + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "Version non valide dans l'en-tête « Accept »." + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "Version non valide dans l'URL." + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "Version non valide dans le nom d'hôte." + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "Version non valide dans le paramètre de requête." + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Ce compte est désactivé." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Impossible de se connecter avec les informations d'identification fournies." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "\"username\" et \"password\" doivent être inclus." diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.mo b/rest_framework/locale/hu/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..451b0b9ad2aa949c517f7f00a846a35397bf7bcd GIT binary patch literal 9215 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 literal 0 HcmV?d00001 diff --git a/rest_framework/locale/hu/LC_MESSAGES/django.po b/rest_framework/locale/hu/LC_MESSAGES/django.po new file mode 100644 index 000000000..14fb6544d --- /dev/null +++ b/rest_framework/locale/hu/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Zoltan Szalai <defaultdict@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/django-rest-framework/language/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "Érvénytelen basic fejlécmező. Nem voltak megadva azonosítók." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Érvénytelen basic fejlécmező. Az azonosító karakterlánc nem tartalmazhat szóközöket." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Érvénytelen basic fejlécmező. Az azonosítók base64 kódolása nem megfelelő." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Érvénytelen felhasználónév/jelszó." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Érvénytelen token fejlécmező. Nem voltak megadva azonosítók." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Érvénytelen token fejlécmező. A token karakterlánc nem tartalmazhat szóközöket." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Érvénytelen token." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "A felhasználó nincs aktiválva vagy törölve lett." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Szerver oldali hiba történt." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Hibás kérés." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Hibás azonosítók." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Nem voltak megadva azonosítók." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "Nincs jogosultsága a művelet végrehajtásához." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Nem található." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "A \"{method}\" metódus nem megengedett." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "A kérés Accept fejlécmezőjét nem lehetett kiszolgálni." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Nem támogatott média típus \"{media_type}\" a kérésben." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "A kérés korlátozva lett." + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Ennek a mezőnek a megadása kötelező." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Ez a mező nem lehet null értékű." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "Az \"{input}\" nem egy érvényes logikai érték." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "Ez a mező nem lehet üres." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Bizonyosodjon meg arról, hogy ez a mező legfeljebb {max_length} karakterből áll." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Bizonyosodjon meg arról, hogy ez a mező legalább {min_length} karakterből áll." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Adjon meg egy érvényes e-mail címet!" + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Ez az érték nem illeszkedik a szükséges mintázatra." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Az URL barát cím csak betűket, számokat, aláhúzásokat és kötőjeleket tartalmazhat." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Adjon meg egy érvényes URL-t!" + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "Egy érvényes egész szám megadása szükséges." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Bizonyosodjon meg arról, hogy ez az érték legfeljebb {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Bizonyosodjon meg arról, hogy ez az érték legalább {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "A karakterlánc túl hosszú." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "Egy érvényes szám megadása szükséges." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Bizonyosodjon meg arról, hogy a számjegyek száma összesen legfeljebb {max_digits}." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Bizonyosodjon meg arról, hogy a tizedes tört törtrészében levő számjegyek száma összesen legfeljebb {max_decimal_places}." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Bizonyosodjon meg arról, hogy a tizedes tört egész részében levő számjegyek száma összesen legfeljebb {max_whole_digits}." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "A dátum formátuma hibás. Használja ezek valamelyikét helyette: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Időt is tartalmazó dátum helyett egy időt nem tartalmazó dátum lett elküldve." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "A dátum formátuma hibás. Használja ezek valamelyikét helyette: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Időt nem tartalmazó dátum helyett egy időt is tartalmazó dátum lett elküldve." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Az idő formátuma hibás. Használja ezek valamelyikét helyette: {format}." + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "Az \"{input}\" nem egy érvényes elem." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Elemek listája helyett \"{input_type}\" lett elküldve." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "Semmilyen fájl sem került feltöltésre." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Az elküldött adat nem egy fájl volt. Ellenőrizze a kódolás típusát az űrlapon!" + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "A fájlnév nem megállapítható." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "A küldött fájl üres." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Bizonyosodjon meg arról, hogy a fájlnév legfeljebb {max_length} karakterből áll (jelenlegi hossza: {length})." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Töltsön fel egy érvényes képfájlt! A feltöltött fájl nem kép volt, vagy megsérült." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "Érvénytelen oldal \"{page_number}\": {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Érvénytelen pk \"{pk_value}\" - az objektum nem létezik." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Helytelen típus. pk érték helyett {data_type} lett elküldve." + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "Érvénytelen link - Nem illeszkedő URL." + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Érvénytelen link. - Eltérő URL illeszkedés." + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Érvénytelen link - Az objektum nem létezik." + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Helytelen típus. URL karakterlánc helyett {data_type} lett elküldve." + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Nem létezik olyan objektum, amelynél {slug_name}={value}." + +#: relations.py:296 +msgid "Invalid value." +msgstr "Érvénytelen érték." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Érvénytelen adat. Egy dictionary helyett {datatype} lett elküldve." + +#: validators.py:22 +msgid "This field must be unique." +msgstr "Ennek a mezőnek egyedinek kell lennie." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "A {field_names} mezőnevek nem tartalmazhatnak duplikátumot." + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" dátumra." + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" hónapra." + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "A mezőnek egyedinek kell lennie a \"{date_field}\" évre." + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "Érvénytelen verzió az \"Accept\" fejlécmezőben." + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "Érvénytelen verzió az URL elérési útban." + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "Érvénytelen verzió a hosztnévben." + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "Érvénytelen verzió a lekérdezési paraméterben." + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "A felhasználó tiltva van." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "A megadott azonosítókkal nem lehet bejelentkezni." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Tartalmaznia kell a \"felhasználónevet\" és a \"jelszót\"." diff --git a/rest_framework/locale/id/LC_MESSAGES/django.mo b/rest_framework/locale/id/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..7fc98bdaa21e378da8d522b30e9e9ea1ca6cb2b1 GIT binary patch literal 497 zcmZut%T59@6xHZzmabjgg$s?A&OlTwVvIZz5{Lvx_jTqn6ldB=TLeGEZ}D&Z7ViLo zjVC$j>)d<p>F>$$_W|LMcuG7Y9ucpI6`I5!dc32x((Ev{W{!zxgOt6Yb;@V~-MQ46 zfl2QrhN+bWE{**NCRiHl*~n!oWlxLDvDgR*#?LY9Sd^YhSyy@#P!FSP7DlWQLUbeQ zjmwZgLN>uqRayM6yWQx9(s>qJsa-C;u>#_mDWrqW%qr&<!o4@eBQe=t)DlxX1Vfs6 zAv0t#%0j?Er$(bwQp5So`%-YeTrO+A>Z_)>s)~5I3GaBx({*NMk<53QdA@DRRmv}d z(O}fu|58*7gO1T2HI4gKQf`kc&&ymY-GXE$twY~_jr****H!jYw5+ESlPaAFXud1I g8(x4)gK@sFGG~2b3nxIA>!WK&E!b?^VJkTJ11ofv761SM literal 0 HcmV?d00001 diff --git a/rest_framework/locale/id/LC_MESSAGES/django.po b/rest_framework/locale/id/LC_MESSAGES/django.po new file mode 100644 index 000000000..99b705467 --- /dev/null +++ b/rest_framework/locale/id/LC_MESSAGES/django.po @@ -0,0 +1,324 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Indonesian (http://www.transifex.com/projects/p/django-rest-framework/language/id/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: id\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "" + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:168 +msgid "Invalid token." +msgstr "" + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "" + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "" + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "" + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "" + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "" + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "" + +#: exceptions.py:93 +msgid "Not found." +msgstr "" + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "" + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "" + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "" + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "" + +#: fields.py:154 +msgid "This field may not be null." +msgstr "" + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "" + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "" + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "" + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "" + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "" + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "" + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "" + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "" + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "" + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "" + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "" + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "" + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "" + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "" + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "" + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "" + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "" + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "" + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "" + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "" + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "" + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "" + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "" + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:296 +msgid "Invalid value." +msgstr "" + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: validators.py:22 +msgid "This field must be unique." +msgstr "" + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "" + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "" + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "" + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "" diff --git a/rest_framework/locale/it/LC_MESSAGES/django.mo b/rest_framework/locale/it/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..82ceb810ee45de6ce8cb4e6aa3258d2e98ffd69d GIT binary patch literal 5334 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 literal 0 HcmV?d00001 diff --git a/rest_framework/locale/it/LC_MESSAGES/django.po b/rest_framework/locale/it/LC_MESSAGES/django.po new file mode 100644 index 000000000..2cdfb8779 --- /dev/null +++ b/rest_framework/locale/it/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Mattia Procopio <promat85@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Italian (http://www.transifex.com/projects/p/django-rest-framework/language/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Nome utente/password non validi" + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Header del token non valido. Credenziali non fornite." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Header del token non valido. Il contenuto del token non dovrebbe contenere spazi." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Token invalido." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Utente inattivo o eliminato." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Errore del server." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Richiesta malformata." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Credenziali di autenticazione incorrette." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Non sono state immesse le credenziali di autenticazione." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "Non hai l'autorizzazione per eseguire questa azione." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Non trovato." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Metodo \"{method}\" non consentito" + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "Impossibile soddisfare l'header \"Accept\" presente nella richiesta." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Tipo di media \"{media_type}\"non supportato." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "" + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Campo obbligatorio." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Il campo non puà essere nullo." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" non è un valido valore booleano." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "Questo campo non può essere omesso." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Assicurati che questo campo non abbia più di {max_length} caratteri." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Assicurati che questo campo abbia almeno {max_length} caratteri." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Inserisci un indirizzo email valido." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "" + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Immetti uno \"slug\" valido che consista di lettere, numeri, underscore o trattini." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Inserisci un URL valido" + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "È richiesto un numero intero valido." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Assicurati che il valore sia minore o uguale a {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Assicurati che il valore sia maggiore o uguale a {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "" + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "È richiesto un numero valido." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Assicurati che non ci siano più di {max_digits} cifre in totale." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Assicurati che non ci siano più di {max_decimal_places} cifre decimali." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Assicurati che non ci siano più di {max_whole_digits} cifre prima del separatore decimale." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "L'oggetto di tipo datetime è in un formato errato. Usa uno dei seguenti formati: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Atteso un oggetto di tipo datetime ma l'oggetto ricevuto è di tipo date." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "La data è in un formato errato. Usa uno dei seguenti formati: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Atteso un oggetto di tipo date ma l'oggetto ricevuto è di tipo datetime." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" non è una scelta valida." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Attesa una lista di oggetti ma l'oggetto ricevuto è di tipo \"{input_type}\"." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "Non è stato inviato alcun file." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "Il nome del file non può essere determinato." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "Il file inviato è vuoto." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "" + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:296 +msgid "Invalid value." +msgstr "Valore non valido." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: validators.py:22 +msgid "This field must be unique." +msgstr "Questo campo deve essere unico." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "" + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "L'account dell'utente è disabilitato" + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Impossibile eseguire il log in con le credenziali immesse." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Deve includere \"nome utente\" e \"password\"." diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo b/rest_framework/locale/ko_KR/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..457bb53c2dd4b75e2b03631039ab60c71f64e3e1 GIT binary patch literal 8555 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 literal 0 HcmV?d00001 diff --git a/rest_framework/locale/ko_KR/LC_MESSAGES/django.po b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po new file mode 100644 index 000000000..963fe89a5 --- /dev/null +++ b/rest_framework/locale/ko_KR/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# SUN CHOI <best2378@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/django-rest-framework/language/ko_KR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ko_KR\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials) 문자열은 빈칸(spaces)을 포함하지 않아야 합니다." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "기본 헤더(basic header)가 유효하지 않습니다. 인증데이터(credentials)가 base64로 적절히 부호화(encode)되지 않았습니다." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "아이디/비밀번호가 유효하지 않습니다." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "토큰 헤더가 유효하지 않습니다. 인증데이터(credentials)가 제공되지 않았습니다." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "토큰 헤더가 유효하지 않습니다. 토큰 문자열은 빈칸(spaces)를 포함하지 않아야 합니다." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "토큰이 유효하지 않습니다." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "계정이 중지되었거나 삭제되었습니다." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "서버 장애가 발생했습니다." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "잘못된 요청입니다." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "자격 인증데이터(authentication credentials)가 정확하지 않습니다." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "자격 인증데이터(authentication credentials)가 제공되지 않았습니다." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "이 작업을 " + +#: exceptions.py:93 +msgid "Not found." +msgstr "찾을 수 없습니다." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "메소드(Method) \"{method}\"는 허용되지 않습니다." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "요청된 \"{media_type}\"가 지원되지 않는 미디어 형태입니다." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "요청이 지연(throttled)되었습니다." + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "이 항목을 채워주십시오." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "" + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\"이 유효하지 않은 부울(boolean)입니다." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "" + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "이 칸이 글자 수가 {max_length} 이하인지 확인하십시오." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "이 칸이 글자 수가 적어도 {min_length} 이상인지 확인하십시오." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "유효한 이메일 주소를 입력하십시오." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "형식에 맞지 않는 값입니다." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "문자, 숫자, 밑줄( _ ) 또는 하이픈( - )으로 이루어진 유효한 \"slug\"를 입력하십시오." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "유효한 URL을 입력하십시오." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "유효한 정수(integer)를 넣어주세요." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "이 값이 {max_value}보다 작거나 같은지 확인하십시오." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "이 값이 {min_value}보다 크거나 같은지 확인하십시오." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "문자열 값이 너무 큽니다." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "유효한 숫자를 넣어주세요." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "전체 숫자(digits)가 {max_digits} 이하인지 확인하십시오." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "소수점 자릿수가 {max_decimal_places} 이하인지 확인하십시오." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "소수점 자리 앞에 숫자(digits)가 {max_whole_digits} 이하인지 확인하십시오." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Datetime의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "예상된 datatime 대신 date를 받았습니다." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Date의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "예상된 date 대신 datetime을 받았습니다." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Time의 포멧이 잘못되었습니다. 이 형식들 중 한가지를 사용하세요: {format}." + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\"이 유효하지 않은 선택(choice)입니다." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "아이템 리스트가 예상되었으나 \"{input_type}\"를 받았습니다." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "파일이 제출되지 않았습니다." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "제출된 데이터는 파일이 아닙니다. 제출된 서식의 인코딩 형식을 확인하세요." + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "파일명을 알 수 없습니다." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "제출된 파일이 비어있습니다." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "이 파일명의 글자수가 최대 {max_length}를 넘지 않는지 확인하십시오. (이것은 {length}가 있습니다)." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "유효한 이미지 파일을 업로드 하십시오. 업로드 하신 파일은 이미지 파일이 아니거나 손상된 이미지 파일입니다." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "유효하지 않은 page \"{page_number}\": {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "유효하지 않은 pk \"{pk_value}\" - 객체가 존재하지 않습니다." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "잘못된 형식입니다. pk 값 대신 {data_type}를 받았습니다." + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "유효하지 않은 하이퍼링크 - 일치하는 URL이 없습니다." + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "유효하지 않은 하이퍼링크 - URL이 일치하지 않습니다." + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "유효하지 않은 하이퍼링크 - 객체가 존재하지 않습니다." + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "잘못된 형식입니다. URL 문자열을 예상했으나 {data_type}을 받았습니다." + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "{slug_name}={value} 객체가 존재하지 않습니다." + +#: relations.py:296 +msgid "Invalid value." +msgstr "값이 유효하지 않습니다." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "유효하지 않은 데이터. 딕셔너리(dictionary)대신 {datatype}를 받았습니다." + +#: validators.py:22 +msgid "This field must be unique." +msgstr "" + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "" + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "사용자 계정을 사용할 수 없습니다." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "제공된 인증데이터(credentials)로는 로그인할 수 없습니다." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "\"아이디\"와 \"비밀번호\"를 포함해야 합니다." diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.mo b/rest_framework/locale/mk/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..fc58662692761e907d5ab84799e84626140826fd GIT binary patch literal 10731 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 Y*bRCrQdv<^CG;J{)>&26*$N^4A3<t!bN~PV literal 0 HcmV?d00001 diff --git a/rest_framework/locale/mk/LC_MESSAGES/django.po b/rest_framework/locale/mk/LC_MESSAGES/django.po new file mode 100644 index 000000000..d9a469531 --- /dev/null +++ b/rest_framework/locale/mk/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Filip Dimitrovski <filipdimitrovski22@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Macedonian (http://www.transifex.com/projects/p/django-rest-framework/language/mk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: mk\n" +"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "Невалиден основен header. Не се внесени податоци за автентикација." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Невалиден основен header. Автентикационата низа не треба да содржи празни места." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Невалиден основен header. Податоците за автентикација не се енкодирани со base64." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Невалидно корисничко име/лозинка." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Невалиден токен header. Не се внесени податоци за најава." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Невалиден токен во header. Токенот не треба да содржи празни места." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Невалиден токен." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Корисникот е деактивиран или избришан." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Настана серверска грешка." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Неправилен request." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Неточни податоци за најава." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Не се внесени податоци за најава." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "Немате дозвола да го сторите ова." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Не е пронајдено ништо." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Методата \"{method}\" не е дозволена." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "Не може да се исполни барањето на Accept header-от." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Media типот „{media_type}“ не е поддржан." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "Request-от е забранет заради ограничувања." + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Ова поле е задолжително." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Ова поле не смее да биде недефинирано." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" не е валиден boolean." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "Ова поле не смее да биде празно." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Ова поле не смее да има повеќе од {max_length} знаци." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Ова поле мора да има барем {min_length} знаци." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Внесете валидна email адреса." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Ова поле не е по правилната шема/барање." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Внесете валидно име што содржи букви, бројки, долни црти или црти." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Внесете валиден URL." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "Задолжителен е валиден цел број." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Вредноста треба да биде помала или еднаква на {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Вредноста треба да биде поголема или еднаква на {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "Вредноста е преголема." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "Задолжителен е валиден број." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Не смее да има повеќе од {max_digits} цифри вкупно." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Не смее да има повеќе од {max_decimal_places} децимални места." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Не смее да има повеќе од {max_whole_digits} цифри пред децималната точка." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Датата и времето се со погрешен формат. Користете го овој формат: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Очекувано беше дата и време, а внесено беше само дата." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Датата е со погрешен формат. Користете го овој формат: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Очекувана беше дата, а внесени беа и дата и време." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Времето е со погрешен формат. Користете го овој формат: {format}." + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "„{input}“ не е валиден избор." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Очекувана беше листа, а внесено беше „{input_type}“." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "Ниеден фајл не е качен (upload-иран)." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Испратените податоци не се фајл. Проверете го encoding-от на формата." + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "Не може да се открие име на фајлот." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "Качениот (upload-иран) фајл е празен." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Името на фајлот треба да има највеќе {max_length} знаци (а има {length})." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Качете (upload-ирајте) валидна слика. Фајлот што го качивте не е валидна слика или е расипан." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "Невалидна страна „{page_number}“: {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Невалиден pk „{pk_value}“ - објектот не постои." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Неточен тип. Очекувано беше pk, а внесено {data_type}." + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "Невалиден хиперлинк - не е внесен URL." + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Невалиден хиперлинк - внесен е неправилен URL." + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Невалиден хиперлинк - Објектот не постои." + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Неточен тип. Очекувано беше URL, a внесено {data_type}." + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Објектот со {slug_name}={value} не постои." + +#: relations.py:296 +msgid "Invalid value." +msgstr "Невалидна вредност." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Невалидни податоци. Очекуван беше dictionary, а внесен {datatype}." + +#: validators.py:22 +msgid "This field must be unique." +msgstr "Ова поле мора да биде уникатно." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "Полињата {field_names} заедно мора да формираат уникатен збир." + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "Ова поле мора да биде уникатно за „{date_field}“ датата." + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "Ова поле мора да биде уникатно за „{date_field}“ месецот." + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "Ова поле мора да биде уникатно за „{date_field}“ годината." + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "Невалидна верзија во „Accept“ header-от." + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "Невалидна верзија во URL патеката." + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "Невалидна верзија во hostname-от." + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "Невалидна верзија во query параметарот." + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Сметката на корисникот е деактивирана." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Не може да се најавите со податоците за најава." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Мора да се внесе „username“ и „password“." diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.mo b/rest_framework/locale/nl/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..b0e1ad77f0b8bf6b03341992ca76fcef6e3eb52f GIT binary patch literal 499 zcmZut%TB{E5G;aIj+{9di9;)JowNc<N)VzCsZuMd61bbhO<WQ?vNxoB2p_}G@GWfG zs=YAM$o6`?v*X{>lkW!N2ziFQKprEnkTrV9AH2N7wbtx0H+m%^pp%%s31g*JJ{hjK zN;FxFUP7`oJQtNVAI?G)+5nx|M8@=~Oe_txPn`L4NC!r6z^8P`LHMNOde_wTXxAm) zjo;~Bx(F1~h4_@U#s9k7t!~OK(9m#YGY;DLBusVAEg7UnT9AU=gU%n3(XP;rbpGH> zapsaIf`)?Un4yFyCCwC|@ENPBstt8ZxfJVK&x&ns%L*26;!-2fcORE!yM9b%tmVum zv(e#$yteBMv;v`U(ysy|gIEJAGA>o0L@75`K=2xlY44z`?U%yPk&1LIRpOK0yM+DR jK2e!7&q~8HI@Tt)SSU6}8+7_)yA7I(oCm~f^_|8a9wC*1 literal 0 HcmV?d00001 diff --git a/rest_framework/locale/nl/LC_MESSAGES/django.po b/rest_framework/locale/nl/LC_MESSAGES/django.po new file mode 100644 index 000000000..a12155124 --- /dev/null +++ b/rest_framework/locale/nl/LC_MESSAGES/django.po @@ -0,0 +1,324 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Dutch (http://www.transifex.com/projects/p/django-rest-framework/language/nl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "" + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:168 +msgid "Invalid token." +msgstr "" + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "" + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "" + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "" + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "" + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "" + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "" + +#: exceptions.py:93 +msgid "Not found." +msgstr "" + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "" + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "" + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "" + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "" + +#: fields.py:154 +msgid "This field may not be null." +msgstr "" + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "" + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "" + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "" + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "" + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "" + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "" + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "" + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "" + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "" + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "" + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "" + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "" + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "" + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "" + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "" + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "" + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "" + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "" + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "" + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "" + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "" + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "" + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "" + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:296 +msgid "Invalid value." +msgstr "" + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: validators.py:22 +msgid "This field must be unique." +msgstr "" + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "" + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "" + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "" + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "" diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.mo b/rest_framework/locale/pl/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..9db72cfb3535780580d2702aae172af4eed6c5d8 GIT binary patch literal 8981 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 KICfQd)B6jfv12a) literal 0 HcmV?d00001 diff --git a/rest_framework/locale/pl/LC_MESSAGES/django.po b/rest_framework/locale/pl/LC_MESSAGES/django.po new file mode 100644 index 000000000..8e51d7545 --- /dev/null +++ b/rest_framework/locale/pl/LC_MESSAGES/django.po @@ -0,0 +1,326 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Janusz Harkot <jh@blueice.pl>, 2015 +# Maciek Olko <maciej.olko@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Polish (http://www.transifex.com/projects/p/django-rest-framework/language/pl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "Niepoprawny podstawowy nagłówek. Brak danych uwierzytelniających." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Niepoprawny podstawowy nagłówek. Ciąg znaków danych uwierzytelniających nie powinien zawierać spacji." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Niepoprawny podstawowy nagłówek. Niewłaściwe kodowanie base64 danych uwierzytelniających." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Niepoprawna nazwa użytkownika lub hasło." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Niepoprawny nagłówek tokena. Brak danych uwierzytelniających." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Niepoprawny nagłówek tokena. Token nie może zawierać odstępów." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Niepoprawny token." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Użytkownik nieaktywny lub usunięty." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Wystąpił błąd serwera." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Zniekształcone żądanie." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Błędne dane uwierzytelniające." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Nie podano danych uwierzytelniających." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "Nie masz uprawnień, by wykonać tę czynność." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Nie znaleziono." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Niedozwolona metoda \"{method}\"." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "Nie można zaspokoić nagłówka Accept żądania." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Brak wsparcia dla żądanego typu danych \"{media_type}\"." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "Żądanie zostało zdławione." + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "To pole jest wymagane." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Pole nie może mieć wartości null." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" nie jest poprawną wartością logiczną." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "To pole nie może być puste." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Upewnij się, że to pole ma nie więcej niż {max_length} znaków." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Upewnij się, że pole ma co najmniej {min_length} znaków." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Podaj poprawny adres e-mail." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Ta wartość nie pasuje do wymaganego wzorca." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Wprowadź poprawną wartość pola typu \"slug\", składającą się ze znaków łacińskich, cyfr, podkreślenia lub myślnika." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Wprowadź poprawny adres URL." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "Wymagana poprawna liczba całkowita." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Upewnij się, że ta wartość jest mniejsza lub równa {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Upewnij się, że ta wartość jest większa lub równa {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "Za długi ciąg znaków." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "Wymagana poprawna liczba." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Upewnij się, że liczba ma nie więcej niż {max_digits} cyfr." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Upewnij się, że liczba ma nie więcej niż {max_decimal_places} cyfr dziesiętnych." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Upewnij się, że liczba ma nie więcej niż {max_whole_digits} cyfr całkowitych." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Wartość daty z czasem ma zły format. Użyj jednego z dostępnych formatów: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Oczekiwano datę z czasem, otrzymano tylko datę." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Data ma zły format. Użyj jednego z tych formatów: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Oczekiwano daty a otrzymano datę z czasem." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Błędny format czasu. Użyj jednego z dostępnych formatów: {format}" + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" nie jest poprawnym wyborem." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Oczekiwano listy elementów, a otrzymano dane typu \"{input_type}\"." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "Nie przesłano pliku." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Przesłane dane nie były plikiem. Sprawdź typ kodowania formatki." + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "Nie można określić nazwy pliku." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "Przesłany plik jest pusty." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Upewnij się, że nazwa pliku ma długość co najwyżej {max_length} znaków (aktualnie ma {length})." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Prześlij poprawny plik graficzny. Przesłany plik albo nie jest grafiką lub jest uszkodzony." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "Niepoprawna strona \"{page_number}\": {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Błędny klucz główny \"{pk_value}\" - obiekt nie istnieje." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Błędny typ danych. Oczekiwano wartość klucza głównego, otrzymano {data_type}." + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "Błędny hyperlink - nie znaleziono pasującego adresu URL." + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Błędny hyperlink - błędne dopasowanie adresu URL." + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Błędny hyperlink - obiekt nie istnieje." + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Błędny typ danych. Oczekiwano adresu URL, otrzymano {data_type}" + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Obiekt z polem {slug_name}={value} nie istnieje" + +#: relations.py:296 +msgid "Invalid value." +msgstr "Niepoprawna wartość." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Niepoprawne dane. Oczekiwano słownika, otrzymano {datatype}." + +#: validators.py:22 +msgid "This field must be unique." +msgstr "Wartość dla tego pola musi być unikalna." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "Pola {field_names} muszą tworzyć unikalny zestaw." + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "To pole musi mieć unikalną wartość dla jednej daty z pola \"{date_field}\"." + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "To pole musi mieć unikalną wartość dla konkretnego miesiąca z pola \"{date_field}\"." + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "To pole musi mieć unikalną wartość dla konkretnego roku z pola \"{date_field}\"." + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "Błędna wersja w nagłówku \"Accept\"." + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "Błędna wersja w ścieżce URL." + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "Błędna wersja w nazwie hosta." + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "Błędna wersja w parametrach zapytania." + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Konto użytkownika jest nieaktywne." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Podane dane uwierzytelniające nie pozwalają na zalogowanie." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Musi zawierać \"username\" i \"password\"." diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo b/rest_framework/locale/pt_BR/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..49f019294e3fc9e303cb056b1cc156ba926e54fb GIT binary patch literal 8729 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 QevuP7@-wP(Gg009AM>EdnE(I) literal 0 HcmV?d00001 diff --git a/rest_framework/locale/pt_BR/LC_MESSAGES/django.po b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po new file mode 100644 index 000000000..3f272f714 --- /dev/null +++ b/rest_framework/locale/pt_BR/LC_MESSAGES/django.po @@ -0,0 +1,326 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Craig Blaszczyk <masterjakul@gmail.com>, 2015 +# Filipe Rinaldi <filipe.rinaldi@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/django-rest-framework/language/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "Cabeçalho básico inválido. Credenciais não fornecidas." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Cabeçalho básico inválido. String de credenciais não deve incluir espaços." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Cabeçalho básico inválido. Credenciais codificadas em base64 incorretamente." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Usário ou senha inválido." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Cabeçalho de token inválido. Credenciais não fornecidas." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Cabeçalho de token inválido. String de token não deve incluir espaços." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Token inválido." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Usuário inativo ou removido." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Ocorreu um erro de servidor." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Pedido malformado." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Credenciais de autenticação incorretas." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "As credenciais de autenticação não foram fornecidas." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "Você não tem persmissao para executar essa ação." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Não encontrado." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Método \"{method}\" não é permitido." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "Não foi possível satisfazer a requisição do cabeçalho Accept." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Media type \"{media_type}\" no pedido não é suportado." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "Pedido foi limitado." + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Este campo é obrigatório." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Este campo não pode ser nulo." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" não é um valor boleano válido." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "Este campo não pode ser em branco." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Certifique-se de que este campo não tenha mais de {max_length} caracteres." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Certifique-se de que este campo tenha mais de {min_length} caracteres." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Insira um endereço de email válido." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Este valor não corresponde ao padrão exigido." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Entrar um \"slug\" válido que consista de letras, números, sublinhados ou hífens." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Entrar um URL válido." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "Um número inteiro válido é exigido." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Certifique-se de que este valor seja inferior ou igual a {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Certifque-se de que este valor seja maior ou igual a {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "Valor da string é muito grande." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "Um número válido é necessário." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Certifique-se de que não haja mais de {max_digits} dígitos no total." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Certifique-se de que não haja mais de {max_decimal_places} casas decimais." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Certifique-se de que não haja mais de {max_whole_digits} dígitos antes do ponto decimal." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Formato inválido para data e hora. Use um dos formatos a seguir: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Data e hora são necessários mas apenas data foi encontrada." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Formato inválido para data. Use um dos formatos a seguir: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Necessário uma data mas recebeu uma data e hora." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Tempo tem formato errado. Usa um desses em vez disso: {format}." + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" não é um escolha válido." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Necessário uma lista de itens, mas recebeu tipo \"{input_type}\"." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "Ficheiro não foi submetido." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Os dados submetidos nao foram um ficheiro. Certifique-se do tipo de codificação no formulário." + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "Nome do arquivo não pode ser determinado." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "O arquivo submetido ésta vázio." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Certifique-se de que o nome do ficheiro tem menos de {max_length} caracteres (tem {length})." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Fazer upload de um imagem válido. O arquivo mandou não foi um imagem ou foi corrupto." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "Página inválido \"{page_number}\": {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Pk inválido \"{pk_value}\" - objeto não existe." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Tipo incorreto. Necessário valor pk, recebeu {data_type}." + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "Hyperlink inválido - URL não combinou." + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Hyperlink inválido - URL combinou errado." + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Hyperlink inválido - objeto não existe." + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Tipo incorreto. Necessário string URL, recebeu {data_type}." + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Objeto com {slug_name}={value} não existe." + +#: relations.py:296 +msgid "Invalid value." +msgstr "Valor inválido." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Data inválido. Necessário um dicionário mas recebeu {datatype}." + +#: validators.py:22 +msgid "This field must be unique." +msgstr "Esse campo deve ser unico." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "Os campos {field_names} devem criar um set unico." + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "O campo deve ser unico pela data \"{date_field}\"." + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "O campo deve ser unico pelo anô \"{date_field}\"." + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "O campo deve ser unico pela mês \"{date_field}\"." + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "Versão inválido no cabeçalho \"Accept\"." + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "Versão inválido no caminho de URL." + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "Versão inválido no hostname." + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "Versão inválida no parâmetro de query." + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Conta de usário desabilitada." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Impossível fazer login com as credenciais fornecidas." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Obrigatório incluir \"usuário\" e \"senha\"." diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.mo b/rest_framework/locale/ru/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..d1555f1fbccfba1f8931089d25d9481707249c12 GIT binary patch literal 9778 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 B1PK5D literal 0 HcmV?d00001 diff --git a/rest_framework/locale/ru/LC_MESSAGES/django.po b/rest_framework/locale/ru/LC_MESSAGES/django.po new file mode 100644 index 000000000..38489747b --- /dev/null +++ b/rest_framework/locale/ru/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Mikhail Dmitriev <mktums@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Russian (http://www.transifex.com/projects/p/django-rest-framework/language/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "Недопустимый заголовок. Не предоставлены учетные данные." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Недопустимый заголовок. Учетные данные не должны содержать пробелов." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Недопустимый заголовок. Учетные данные некорректно закодированны в base64." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Недопустимые имя пользователя или пароль." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Недопустимый заголовок токена. Не предоставлены учетные данные." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Недопустимый заголовок токена. Токен не должен содержать пробелов." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Недопустимый токен." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Пользователь неактивен или удален." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Произошла ошибка сервера." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Искаженный запрос." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Некорректные учетные данные." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Учетные данные не были предоставлены." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "У вас нет прав для выполнения этой операции." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Не найдено." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Метод \"{method}\" не разрешен." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "Невозможно удовлетворить \"Accept\" заголовок запроса." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Неподдерживаемый тип данных \"{media_type}\" в запросе." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "Запрос был проигнорирован." + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Это поле обязательно." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Это поле не может быть null." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" не является корректным булевым значением." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "Это поле не может быть пустым." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Убедитесь что в этом поле не больше {max_length} символов." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Убедитесь что в этом поле как минимум {min_length} символов." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Введите корректный адрес электронной почты." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Значение не соответствует требуемому паттерну." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Введите корректный \"slug\", состоящий из букв, цифр, знаков подчеркивания или дефисов." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Введите корректный URL." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "Требуется целочисленное значение." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Убедитесь что значение меньше или равно {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Убедитесь что значение больше или равно {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "Слишком длинное значение." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "Требуется численное значение." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Убедитесь что в числе не больше {max_digits} знаков." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Убедитесь что в числе не больше {max_decimal_places} знаков в дробной части." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Убедитесь что в цисле не больше {max_whole_digits} знаков в целой части." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Неправильный формат datetime. Используйте один из этих форматов: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Ожидался datetime, но был получен date." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Неправильный формат date. Используйте один из этих форматов: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Ожидался date, но был получен datetime." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Неправильный формат времени. Используйте один из этих форматов: {format}." + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" не является корректным значением." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Ожидался list со значениями, но был получен \"{input_type}\"." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "Не был загружен файл." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Загруженный файл не является корректным файлом. " + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "Невозможно определить имя файла." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "Загруженный файл пуст." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Убедитесь что имя файла меньше {max_length} символов (сейчас {length})." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Загрузите корректное изображение. Загруженный файл не является изображением, либо является испорченным." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "Недопустимая страница \"{page_number}\": {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Недопустимый первичный ключ \"{pk_value}\" - объект не существует." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Некорректный тип. Ожилалось значение первичного ключа, получен {data_type}." + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "Недопустимая ссылка - нет совпадения по URL." + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Недопустимая ссылка - некорректное совпадение по URL," + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Недопустимая ссылка - объект не существует." + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Некорректный тип. Ожидался URL, получен {data_type}." + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Объект с {slug_name}={value} не существует." + +#: relations.py:296 +msgid "Invalid value." +msgstr "Недопустимое значение." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Недопустимые данные. Ожидался dictionary, но был получен {datatype}." + +#: validators.py:22 +msgid "This field must be unique." +msgstr "" + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "" + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Учетная запись пользователя отключена." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Невозможно войти с предоставленными учетными данными." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Должен включать \"username\" и \"password\"." diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.mo b/rest_framework/locale/sk/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..53bb95d84305891cb378d69a6f9936e7022ec7f2 GIT binary patch literal 2748 zcmb`ION<mn7{?pM*Z2TY6E!}*OcWQPdv+E?Y#3nOT@sMR6$TOyMr*rkc51u3s;#P? zVU~FJ;!zXhX-zn2f){Tn#AMi;R}(K9y?Wtj;zj?}^Vq?#Dv6!+{HAKEzWRTU`sU|d z+dua3Jc0Kayf^SZi#Oed4?MqsPlCUKKKKW?51hKo^IincgU7&2;2ii37=V8c8Qkr8 z4UFFb9|1oDp9a4KcYzz=bKsBQOW^Nd1$=(H=j{bw2J7Gj@G0=aAwLIaF#Z<&0h(@t zFJQcJ?|{F7A;vrI^E?7if$xC{xBz|+9tC&Z?|Jj!Ti^-s6Yx>+Cy>CK;A`N{2L^Ue zfo`7y-MX*9<KTCoi^DdEcRFT4r>_N8!B0WR^d84MdLF`;2Zsa5@$SL<@Nn#aqdkPN zj0fB)9~VOxx5x0pWe?#hpPl%0Idl)Cl-hQ<!7LfBJ6sdjT4_>IRA|lPz?&^>n@cMq zW`&XzVbTp*YN*RKC#fvuT6IM1R?n#-jmtTM^`_M$>?Y0MFSxNZ8$~>~)aESaI`B@) zNa2vk65H|+x2nTZ5z{g=A{y<bxd|Ok!q8IMbL;rQ1H@sxl=ScWjnzV~kZF&_M@m{I zB$=E=+-#-cjJhQpn^71YX;s4ISn?e%Z<d??ySDPMO{oR)DOtvAIWwlKG?KH((w5R0 zk4Fi?6t`^^Q}t3-e)*tU=8mPQ>bi6;7RZ{AQCh^Dsw0zCViJ2shO2>h1{r9nLSoB# z$(B=2R#B=}u$Q{Rw#OAR88Elj6nU<+g(S!ljBGE*K~RIiyKVqQurVwk?0{Fqq6lX} zn4wr0cbq%d{URibtmtq;3CBF;FdTSqtAb)xI@V_RE$2ED#<*&RN{n1kP^U2Gb}Jcp zOIod>F8!0Se}QYaG^F`eCRY@lT{zdImPTX|)TDBjJN^EmSrM`Sda+{srV6RD^k&mX ziI#W9pJ$ebG&5a)#h<SG`=_aXFr3-HcNz~C`e%7ZxFc@A?$yD%)67`EshKn>vr325 zY^#hJnrmxetl)ISs_Z!4XgCo>Dmz*^4b25x;eL~|ETnU(>ac{S+ScY_t=8>!1M6&x z7Qg5=)KJ6DaZ}4{ap|wGadG{zzqNE|ux66lp336M#f8lX)r0BE9BvN!gWp8%LbCj# zt>r1M(qW3)OdD<+=bI<|L!0Z|@hz_X1$SR@4MRG#EbLf#NG7Q)rG;jxe*$?jA<4WP zn#TUaH2B(>l8r`v4;`av3Ta9nZOqW_-6W4R4!FrWCT9*;ybC>(^lZw=FsSJ*Gm`l3 z0>FpekGa%~cFGLm6d|hpt1(+eljF-O6|}};Ci`EY-tiNrGqrIYW9szUXn=g<GUb>N zSk*}i>JSWd#Ep*<l=PtWxvRoWuKVj9oSEO|sEGw^yq^Vhds&cS`d87Wh8EXY(*HV! zcBd*=nZiZE&9ayrHO4zTfSU~V)v{smkikLR%r&liTUj|X2vn|Iq-9~9jDPcT*d>Rt zg0KIJkwN<$WdNy$D+t#=x`KZz*K{YG+bT&*qdcpGvi`cWKFC22eNbb@?jx2W7_LlE z6zd88jAZ{>*>RB#c1z10R8y`xD#fDpvhVh<Olr-U>o^wwx7Az~8`t|+I%q04uA2lA z&bU<Q$y9A~ld7`DP_F2B{q<FMDhl=-xyrqkiOF>IuV7qOI9Qgr8kaP#NSV0)x)B?f zaV;hsE@N1f*CJOj`d?Xa*Ctwc__rP&c=PUfL}Eg_3(Xq3w@L>4w_GGSODsH=y-`rt eGPdRn2HqRaF}_MHiG*{)g&tWRUI;08;Qa-SD|_7l literal 0 HcmV?d00001 diff --git a/rest_framework/locale/sk/LC_MESSAGES/django.po b/rest_framework/locale/sk/LC_MESSAGES/django.po new file mode 100644 index 000000000..9dd378c05 --- /dev/null +++ b/rest_framework/locale/sk/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Stanislav Komanec <stano@videoflot.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/django-rest-framework/language/sk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "Nesprávna hlavička. Neboli poskytnuté prihlasovacie údaje." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Nesprávna hlavička. Prihlasovacie údaje nesmú obsahovať medzery." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Nesprávna hlavička. Prihlasovacie údaje nie sú správne zakódované pomocou metódy base64." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Nesprávne prihlasovacie údaje." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Nesprávna token hlavička. Neboli poskytnuté prihlasovacie údaje." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Nesprávna token hlavička. Token hlavička nesmie obsahovať medzery." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Nesprávny token." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Daný používateľ je neaktívny, alebo zmazaný." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Vyskytla sa chyba na strane servera." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Požiadavok má nesprávny formát, alebo je poškodený." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Nesprávne prihlasovacie údaje." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Prihlasovacie údaje neboli zadané." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "K danej akcii nemáte oprávnenie." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Nebolo nájdené." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Metóda \"{method}\" nie je povolená." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "Nie je možné vyhovieť požiadavku v hlavičke \"Accept\"." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Požiadavok obsahuje nepodporovaný media type: \"{media_type}\"." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "" + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "" + +#: fields.py:154 +msgid "This field may not be null." +msgstr "" + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "" + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "" + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "" + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "" + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "" + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "" + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "" + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "" + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "" + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "" + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "" + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "" + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "" + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "" + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "" + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "" + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "" + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "" + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "" + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "" + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "" + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "" + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "" + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:296 +msgid "Invalid value." +msgstr "" + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: validators.py:22 +msgid "This field must be unique." +msgstr "" + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "" + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Daný používateľ je zablokovaný." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "S danými prihlasovacími údajmi nebolo možné sa prihlásiť." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Musí obsahovať parametre \"používateľské meno\" a \"heslo\"." diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.mo b/rest_framework/locale/sv/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..a33b0cc58b80ad6844df00c4ef6885d4ce87a0fe GIT binary patch literal 8647 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 literal 0 HcmV?d00001 diff --git a/rest_framework/locale/sv/LC_MESSAGES/django.po b/rest_framework/locale/sv/LC_MESSAGES/django.po new file mode 100644 index 000000000..1602bf55f --- /dev/null +++ b/rest_framework/locale/sv/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Joakim Soderlund, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Swedish (http://www.transifex.com/projects/p/django-rest-framework/language/sv/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "Ogiltig \"basic\"-header. Inga användaruppgifter tillhandahölls." + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "Ogiltig \"basic\"-header. Strängen för användaruppgifterna ska inte innehålla mellanslag." + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "Ogiltig \"basic\"-header. Användaruppgifterna är inte korrekt base64-kodade." + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Ogiltigt användarnamn/lösenord." + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Ogiltig \"token\"-header. Inga användaruppgifter tillhandahölls." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Ogiltig \"token\"-header. Strängen för referensen ska inte innehålla mellanslag." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Ogiltig \"token\"." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Användaren borttagen eller inaktiv." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Ett serverfel inträffade." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Ogiltig förfrågan." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Ogiltiga inloggningsuppgifter. " + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Autentiseringsuppgifter ej tillhandahållna." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "Du har inte tillåtelse att utföra denna förfrågan." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Hittades inte." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "Metoden \"{method}\" tillåts inte." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "Kunde inte tillfredsställa förfrågans \"Accept\"-header." + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "Medietypen \"{media_type}\" stöds inte." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "Förfrågan stoppades eftersom du har skickat för många." + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Det här fältet är obligatoriskt." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Det här fältet får inte vara null." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" är inte ett giltigt booleskt värde." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "Det här fältet får inte vara blankt." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Se till att detta fält inte har fler än {max_length} tecken." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Se till att detta fält har minst {min_length} tecken." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Ange en giltig mejladress." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Det här värdet matchar inte mallen." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Ange en giltig \"slug\" bestående av bokstäver, nummer, understreck eller bindestreck." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Ange en giltig URL." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "Ett giltigt heltal krävs." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Se till att detta värde är mindre än eller lika med {max_value}." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Se till att detta värde är större än eller lika med {min_value}." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "Textvärdet är för långt." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "Ett giltigt nummer krävs." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Se till att det inte finns fler än totalt {max_digits} siffror." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Se till att det inte finns fler än {max_decimal_places} decimaler." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Se till att det inte finns fler än {max_whole_digits} siffror före decimalpunkten." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Datumtiden har fel format. Använd ett av dessa format istället: {format}." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Förväntade en datumtid men fick ett datum." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Datumet har fel format. Använde ett av dessa format istället: {format}." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Förväntade ett datum men fick en datumtid." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Tiden har fel format. Använd ett av dessa format istället: {format}." + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" är inte ett giltigt val." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Förväntade en lista med element men fick typen \"{input_type}\"." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "Ingen fil skickades." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Den skickade informationen var inte en fil. Kontrollera formulärets kodningstyp." + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "Inget filnamn kunde bestämmas." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "Den skickade filen var tom." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Se till att det här filnamnet har högst {max_length} tecken (det har {length})." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Ladda upp en giltig bild. Filen du laddade upp var antingen inte en bild eller en skadad bild." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "Ogiltigt sida \"{page_number}\": {message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Ogiltigt pk \"{pk_value}\" - Objektet finns inte." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Felaktig typ. Förväntade pk-värde, fick {data_type}." + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "Ogiltig hyperlänk - Ingen URL matchade." + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Ogiltig hyperlänk - Felaktig URL-matching." + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Ogiltig hyperlänk - Objektet finns inte." + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Felaktig typ. Förväntade URL-sträng, fick {data_type}." + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "Objekt med {slug_name}={value} finns inte." + +#: relations.py:296 +msgid "Invalid value." +msgstr "Ogiltigt värde." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Ogiltig data. Förväntade en dictionary, men fick {datatype}." + +#: validators.py:22 +msgid "This field must be unique." +msgstr "Det här fältet måste vara unikt." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "Fälten {field_names} måste skapa ett unikt set." + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "Det här fältet måste vara unikt för datumet \"{date_field}\"." + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "Det här fältet måste vara unikt för månaden \"{date_field}\"." + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "Det här fältet måste vara unikt för året \"{date_field}\"." + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "Ogiltig version i \"Accept\"-headern." + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "Ogiltig version i URL-resursen." + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "Ogiltig version i värdnamnet." + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "Ogiltig version i förfrågningsparametern." + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Användarkontot är borttaget." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Kunde inte logga in med de angivna inloggningsuppgifterna." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "Användarnamn och lösenord måste anges." diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.mo b/rest_framework/locale/tr/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..e6b848cf5b75a891dcca8c469cb348e197915c78 GIT binary patch literal 7946 zcmbuDON<;x8OPfskYtk(5+DQ;l41zNPCT==6DQ6(Hhw>3n^^X4z(}yFnXa9wOg|?5 z@OsuV2M**GE(r&OSP+j035hJAAc1eYmN+6IB|Ib}A#nhS8;Qgv;`dc|&-B>4aUiYj z{ZDn*_tjV5yZY)qH^1U>9prw1`-u;D-Z}8(&HUqf?Sr288E^$u;2*&Iz<+}>|IQD2 z-u>XCU=ut79so1&2>5I8DEJPz4?J><=RF6$2tEZ~1$Tq@-s*WLz%$?s_&reG{|P(^ z-hG?r-2;9NlyzSKKMTH8;xE9RjNbr12i`GN@Yw<GVjPzE6L2%*zk;%_TW?2p@KI2n z&w<;(uY)b{=inajD)?dWfjd0!Q{ZEujE{gK#~dhf4NLrX`TUol$o(exAox%45%9J< z*)zBuRNyfXkvt1dgBkb<@JFD?a~V7e{tJ|KcCxs<KLg76c~I=|BKRcuLs0bh=W=|{ zU4`7oLE-O%VyBnE$G|ti?chxxDeS)!{3PRVmH1O|2jf-nH=8`~ZSeDqSJ<5B`;VZ= z^A7lF@ZOIW`+Wiwxz2+7!5BOVu7Kia?||ZaU;bDz{w^r{d>fnt_kP^-67Xg41b7Qd z6Z*5@G4T7KtoskJ0d8XO1o&`?=fI~KzXZyDeg}#_{H=U`KhC_D@f^4fd>It|Tmi)& z-U7ux9)!3F9tVa0BDf3u8Hg&pzk}jWZ-aM(_u(X4!AC)P{v}X>Ls0mB2gDV;Rq$c( z_uv-rEs!O>hftc(?E+=qSHP#iF31wz4?ywD--3t0|A1`C+lw=ZJkNpRZ`~5V2}*qY z7<?T3OF6y^V+q}1@G0=C;6CsbQ1<->DDyYLO!U4J6hHX}DDwUa6#uyjZUS*Pw}0_v z;V0J)?wh#xa_{Gs>jT^(=N=hwNeqb}2`|wPZtnDpTaK=M<*$cIyd9KS68S`j&v28L zoWF^V<WlZ`@lW(BX-)Jh*9<rA=Pt1+Da!ex#D!e9aLXP=Ke(6o1#Y=;MHkcZ`&MqT zvs|du`Ht90F43RZPV^<dCD(3lQk1*IpCpE=OZ*pgd$_)fVN~iau^VpT@{!lLXrn=% zU1}(sswmEsR_AqKebtWR!04#8@r+I{wjI;*_N&w+=S`walEjIMJDog9j4v+=RyN8^ zm-noYm=|(8@iNN8_I2;_tY@Okc64UrNOd5Pp$<~DXcFV(93=61>&r5SbY@gf^Dc>_ zu3CtbP-iVQml_pE+zSeB42l=2vQe5D?a!!-#gj_~i_C`am(AfQ%@Hr_=}gw-r*_h+ zFfJZP>SCxb%=@NeLmkWy0^Kp`B~^}9F>ZP9nUC$-Oz0i5F_p!c4&FP1#U4hUFUUu1 z+6KMIF3ec47#r5uV#x(-0^g~f&EhF(#@=i+ADF0{^)9JSPba#QnIzqaE{d<!%Z+K7 zp-VHdY#6&$(dhM*YO~Fpco)leTPEeeHFF~_*-Z=%l!(<Lh5zEAIzW-dcHA^PWMmR3 zMx=pB)Ai^OXiO)(tDtJ6LEdesP8_8+%`D!EcLpXCHEmTzDDWeXd>(YLLMjsVh6BRE z>9Nji?#xM%tNzG@+6GGdK9n;5!oXkxpY?qSl6Ib{u8VOQio;(w$3?;9yoosha*NP5 zGhsSnm<<O;m8oQ22A3Kw?|8%x5(H3s!+5UG61tWe$;|dtnk6V{D`}%+?0GhF5y5q_ z!n=?T`h|@)Cd54CIAK;>5iQw{WE`Cgw~qGamUMfP6$?TvVv@i{ebrRsZHmOCo=$K5 ziC>J>4Q4#seqPk&$JkwRvAKY@$IJ%0D_RzqFMQ=vgDe(eYaZdGm3Zu*Y5md(8weS{ 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 F{$KQm6!!oC literal 0 HcmV?d00001 diff --git a/rest_framework/locale/tr/LC_MESSAGES/django.po b/rest_framework/locale/tr/LC_MESSAGES/django.po new file mode 100644 index 000000000..5aabbebad --- /dev/null +++ b/rest_framework/locale/tr/LC_MESSAGES/django.po @@ -0,0 +1,328 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Ertaç Paprat <epaprat@gmail.com>, 2015 +# Mesut Can Gürle <mesutcang@gmail.com>, 2015 +# Recep KIRMIZI <rkirmizi@gmail.com>, 2015 +# Ülgen Sarıkavak <ulgensrkvk@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/django-rest-framework/language/tr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "Geçersiz kullanıcı adı/parola" + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "Geçersiz token başlığı. Kimlik bilgileri eksik." + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "Geçersiz token başlığı. Token'da boşluk olmamalı." + +#: authentication.py:168 +msgid "Invalid token." +msgstr "Geçersiz token." + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "Kullanıcı aktif değil ya da silinmiş." + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "Sunucu hatası oluştu." + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "Bozuk istek." + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "Giriş bilgileri hatalı." + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "Giriş bilgileri verilmedi." + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "Bu işlemi yapmak için izniniz bulunmuyor." + +#: exceptions.py:93 +msgid "Not found." +msgstr "Bulunamadı." + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "\"{method}\" metoduna izin verilmiyor." + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "İstekte desteklenmeyen medya tipi: \"{media_type}\"." + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "" + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "Bu alan zorunlu." + +#: fields.py:154 +msgid "This field may not be null." +msgstr "Bu alan boş bırakılmamalı." + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "\"{input}\" geçerli bir boolean değil." + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "Bu alan boş bırakılmamalı." + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "Bu alanın {max_length} karakterden fazla karakter barındırmadığından emin olun." + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "Bu alanın en az {min_length} karakter barındırdığından emin olun." + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "Geçerli bir e-posta adresi girin." + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "Bu değer gereken düzenli ifade deseni ile uyuşmuyor." + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "Harf, rakam, altçizgi veya tireden oluşan geçerli bir \"slug\" giriniz." + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "Geçerli bir URL girin." + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "Geçerli bir tam sayı girin." + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "Değerin {max_value} değerinden küçük ya da eşit olduğundan emin olun." + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "Değerin {min_value} değerinden büyük ya da eşit olduğundan emin olun." + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "String değeri çok uzun." + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "Geçerli bir numara gerekiyor." + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "Toplamda {max_digits} haneden fazla hane olmadığından emin olun." + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "Ondalık basamak değerinin {max_decimal_places} haneden fazla olmadığından emin olun." + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "Ondalık ayracından önce {max_whole_digits} basamaktan fazla olmadığından emin olun." + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "Datetime alanı yanlış biçimde. {format} biçimlerinden birini kullanın." + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "Datetime değeri bekleniyor, ama date değeri geldi." + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "Tarih biçimi yanlış. {format} biçimlerinden birini kullanın." + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "Date tipi beklenmekteydi, fakat datetime tipi geldi." + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "Time biçimi yanlış. {format} biçimlerinden birini kullanın." + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "\"{input}\" geçerli bir seçim değil." + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "Elemanların listesi beklenirken \"{input_type}\" alındı." + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "Hiçbir dosya verilmedi." + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "Gönderilen veri dosya değil. Formdaki kodlama tipini kontrol edin." + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "Hiçbir dosya adı belirlenemedi." + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "Gönderilen dosya boş." + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "Bu dosya adının en fazla {max_length} karakter uzunluğunda olduğundan emin olun. (şu anda {length} karakter)." + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "Geçerli bir resim yükleyin. Yüklediğiniz dosya resim değil ya da bozuk." + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "Geçersiz sayfa \"{page_number}\":{message}." + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "Geçersiz pk \"{pk_value}\" - obje bulunamadı." + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "Hatalı tip. Pk değeri beklenirken, alınan {data_type}." + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "Geçersiz bağlantı - Hiçbir URL eşleşmedi." + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "Geçersiz bağlantı - Yanlış URL eşleşmesi." + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "Geçersiz bağlantı - Obje bulunamadı." + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "Hatalı tip. URL metni bekleniyor, {data_type} alındı." + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "{slug_name}={value} değerini taşıyan obje bulunamadı." + +#: relations.py:296 +msgid "Invalid value." +msgstr "Geçersiz değer." + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "Geçersiz veri. Sözlük bekleniyordu fakat {datatype} geldi. " + +#: validators.py:22 +msgid "This field must be unique." +msgstr "Bu alan eşsiz olmalı." + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "{field_names} hep birlikte eşsiz bir küme oluşturmalılar." + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "Bu alan \"{date_field}\" tarihine göre eşsiz olmalı." + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "Bu alan \"{date_field}\" ayına göre eşsiz olmalı." + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "Bu alan \"{date_field}\" yılına göre eşsiz olmalı." + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "\"Accept\" başlığındaki sürüm geçersiz." + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "URL dizininde geçersiz versiyon." + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "Host adında geçersiz versiyon." + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "Sorgu parametresinde geçersiz versiyon." + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "Kullanıcı hesabı devre dışı bırakılmış." + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "Verilen bilgiler ile giriş sağlanamadı." + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "\"Kullanıcı Adı\" ve \"Parola\" eklenmeli." diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.mo b/rest_framework/locale/uk/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..fc3350548aab3ae1539d04b74be5daabe929dc1a GIT binary patch literal 577 zcmZut!A=`75Df(hX^%Z~7^H%TsAD^!ZR%txYDgp`BBFHR?rxlo$*#S!y$wkGMt_fQ zVKzy_r6WCg#(r<!j9)(<{B2<DA&wBA5c`PFh&sB6!w-$dcRXv(E+)=Csx*+B8F^67 zYik5tKT4BXm=1p>Fn6+0E9;igRF&2RGWMCCk)KuONn!;=le>froRR^h<XQ$Lpw0Lf z!Z_(L;9o_%bIvf3NT%wKt}Xu0`?lfTN*_q#r17~7)(J=!wvZkM3#Wb13i`noSBP|b z(MoM`8QtQ{mCO`Llq>|?FP+pzO9N+%5K2MmYPD*Gx~-n8r&>eH&F-F-bhciZIECK3 zm1(~1NvkDoM&q0D@col`i$w!#f-*SmbBSvQ^%Q8Cqiqk;g>+tp_&ynt?mMrxpDRa( zCbctdG6CJ+I_zc_P%WcLUOAbQk#&U^V9Isr<4zAYX?$i*IE!Nrr>9V->^SBeegFfc iV|^L7|2_5Ni#lB^Sf4X^dD%#i!<wk!sA)HQQR59u@}+|S literal 0 HcmV?d00001 diff --git a/rest_framework/locale/uk/LC_MESSAGES/django.po b/rest_framework/locale/uk/LC_MESSAGES/django.po new file mode 100644 index 000000000..93fc2bf93 --- /dev/null +++ b/rest_framework/locale/uk/LC_MESSAGES/django.po @@ -0,0 +1,324 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Ukrainian (http://www.transifex.com/projects/p/django-rest-framework/language/uk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: uk\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "" + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "" + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "" + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "" + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "" + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "" + +#: authentication.py:168 +msgid "Invalid token." +msgstr "" + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "" + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "" + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "" + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "" + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "" + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "" + +#: exceptions.py:93 +msgid "Not found." +msgstr "" + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "" + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "" + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "" + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "" + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "" + +#: fields.py:154 +msgid "This field may not be null." +msgstr "" + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "" + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "" + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "" + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "" + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "" + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "" + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "" + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "" + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "" + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "" + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "" + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "" + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "" + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "" + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "" + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "" + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "" + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "" + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "" + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "" + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "" + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "" + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "" + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "" + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "" + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "" + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "" + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "" + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "" + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "" + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "" + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "" + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "" + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "" + +#: relations.py:296 +msgid "Invalid value." +msgstr "" + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "" + +#: validators.py:22 +msgid "This field must be unique." +msgstr "" + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "" + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "" + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "" + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "" + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "" + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "" + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "" + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "" + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "" + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "" + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "" diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo b/rest_framework/locale/zh_CN/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..6e7073bd7acb840a4c73c55518e1fac4addf4c31 GIT binary patch literal 8383 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 literal 0 HcmV?d00001 diff --git a/rest_framework/locale/zh_CN/LC_MESSAGES/django.po b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po new file mode 100644 index 000000000..011288591 --- /dev/null +++ b/rest_framework/locale/zh_CN/LC_MESSAGES/django.po @@ -0,0 +1,325 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Lele Long <schemacs@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: Django REST framework\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-01-30 16:23+0000\n" +"PO-Revision-Date: 2015-01-30 16:27+0000\n" +"Last-Translator: Thomas Christie <tom@tomchristie.com>\n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django-rest-framework/language/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: authentication.py:69 +msgid "Invalid basic header. No credentials provided." +msgstr "没有提供认证信息（基本认证HTTP头无效）。" + +#: authentication.py:72 +msgid "Invalid basic header. Credentials string should not contain spaces." +msgstr "认证字符串不应该包含空格（基本认证HTTP头无效）。" + +#: authentication.py:78 +msgid "Invalid basic header. Credentials not correctly base64 encoded." +msgstr "认证字符串base64编码错误（基本认证HTTP头无效）。" + +#: authentication.py:90 +msgid "Invalid username/password." +msgstr "用户名或者密码错误。" + +#: authentication.py:156 +msgid "Invalid token header. No credentials provided." +msgstr "没有提供认证信息（认证令牌HTTP头无效）。" + +#: authentication.py:159 +msgid "Invalid token header. Token string should not contain spaces." +msgstr "认证令牌字符串不应该包含空格（无效的认证令牌HTTP头）。" + +#: authentication.py:168 +msgid "Invalid token." +msgstr "认证令牌无效。" + +#: authentication.py:171 +msgid "User inactive or deleted." +msgstr "用户未激活或者已删除。" + +#: exceptions.py:38 +msgid "A server error occurred." +msgstr "服务器出现了错误。" + +#: exceptions.py:73 +msgid "Malformed request." +msgstr "畸形的请求。" + +#: exceptions.py:78 +msgid "Incorrect authentication credentials." +msgstr "不正确的身份认证凭据。" + +#: exceptions.py:83 +msgid "Authentication credentials were not provided." +msgstr "身份认证凭据未提供。" + +#: exceptions.py:88 +msgid "You do not have permission to perform this action." +msgstr "您没有执行该操作的权限。" + +#: exceptions.py:93 +msgid "Not found." +msgstr "未找到。" + +#: exceptions.py:98 +msgid "Method \"{method}\" not allowed." +msgstr "方法 “{method}” 不被允许。" + +#: exceptions.py:109 +msgid "Could not satisfy the request Accept header." +msgstr "无法满足Accept HTTP头的请求。" + +#: exceptions.py:121 +msgid "Unsupported media type \"{media_type}\" in request." +msgstr "不支持请求中的媒体类型 “{media_type}”。" + +#: exceptions.py:134 +msgid "Request was throttled." +msgstr "请求被限速。" + +#: fields.py:153 relations.py:132 relations.py:156 validators.py:77 +#: validators.py:155 +msgid "This field is required." +msgstr "这个字段是必填项。" + +#: fields.py:154 +msgid "This field may not be null." +msgstr "这个值不能为 null。" + +#: fields.py:487 fields.py:515 +msgid "\"{input}\" is not a valid boolean." +msgstr "“{input}” 不是合法的布尔值。" + +#: fields.py:550 +msgid "This field may not be blank." +msgstr "此字段不能为空。" + +#: fields.py:551 fields.py:1324 +msgid "Ensure this field has no more than {max_length} characters." +msgstr "请确保这个字段不能超过 {max_length} 个字符。" + +#: fields.py:552 +msgid "Ensure this field has at least {min_length} characters." +msgstr "请确保这个字段至少包含 {min_length} 个字符。" + +#: fields.py:587 +msgid "Enter a valid email address." +msgstr "请输入合法的邮件地址。" + +#: fields.py:604 +msgid "This value does not match the required pattern." +msgstr "输入值不匹配要求的模式。" + +#: fields.py:615 +msgid "" +"Enter a valid \"slug\" consisting of letters, numbers, underscores or " +"hyphens." +msgstr "请输入合法的“短语“，只能包含字母，数字，下划线或者中划线。" + +#: fields.py:627 +msgid "Enter a valid URL." +msgstr "请输入合法的URL。" + +#: fields.py:638 +msgid "\"{value}\" is not a valid UUID." +msgstr "" + +#: fields.py:657 +msgid "A valid integer is required." +msgstr "请填写合法的整数值。" + +#: fields.py:658 fields.py:692 fields.py:725 +msgid "Ensure this value is less than or equal to {max_value}." +msgstr "请确保该值小于或者等于 {max_value}。" + +#: fields.py:659 fields.py:693 fields.py:726 +msgid "Ensure this value is greater than or equal to {min_value}." +msgstr "请确保该值大于或者等于 {min_value}。" + +#: fields.py:660 fields.py:694 fields.py:730 +msgid "String value too large." +msgstr "字符值太长。" + +#: fields.py:691 fields.py:724 +msgid "A valid number is required." +msgstr "请填写合法的数字。" + +#: fields.py:727 +msgid "Ensure that there are no more than {max_digits} digits in total." +msgstr "请确保总计不超过 {max_digits} 个数字。" + +#: fields.py:728 +msgid "" +"Ensure that there are no more than {max_decimal_places} decimal places." +msgstr "请确保总计不超过 {max_decimal_places} 个小数位。" + +#: fields.py:729 +msgid "" +"Ensure that there are no more than {max_whole_digits} digits before the " +"decimal point." +msgstr "请确保小数点前不超过 {max_whole_digits} 个数字。" + +#: fields.py:813 +msgid "Datetime has wrong format. Use one of these formats instead: {format}." +msgstr "日期时间格式错误。请从这些格式中选择：{format}。" + +#: fields.py:814 +msgid "Expected a datetime but got a date." +msgstr "期望为日期时间，得到的是日期。" + +#: fields.py:878 +msgid "Date has wrong format. Use one of these formats instead: {format}." +msgstr "日期格式错误。请从这些格式中选择：{format}。" + +#: fields.py:879 +msgid "Expected a date but got a datetime." +msgstr "期望为日期，得到的是日期时间。" + +#: fields.py:936 +msgid "Time has wrong format. Use one of these formats instead: {format}." +msgstr "时间格式错误。请从这些格式中选择：{format}。" + +#: fields.py:992 fields.py:1036 +msgid "\"{input}\" is not a valid choice." +msgstr "“{input}” 不是合法选项。" + +#: fields.py:1037 fields.py:1151 serializers.py:482 +msgid "Expected a list of items but got type \"{input_type}\"." +msgstr "期望为一个包含物件的列表，得到的类型是“{input_type}”。" + +#: fields.py:1067 +msgid "No file was submitted." +msgstr "没有提交任何文件。" + +#: fields.py:1068 +msgid "" +"The submitted data was not a file. Check the encoding type on the form." +msgstr "提交的数据不是一个文件。请检查表单的编码类型。" + +#: fields.py:1069 +msgid "No filename could be determined." +msgstr "无法检测到文件名。" + +#: fields.py:1070 +msgid "The submitted file is empty." +msgstr "提交的是空文件。" + +#: fields.py:1071 +msgid "" +"Ensure this filename has at most {max_length} characters (it has {length})." +msgstr "确保该文件名最多包含 {max_length} 个字符 ( 当前长度为{length} ) 。" + +#: fields.py:1113 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "请上传有效图片。您上传的该文件不是图片或者图片已经损坏。" + +#: fields.py:1188 +msgid "Expected a dictionary of items but got type \"{input_type}\"." +msgstr "" + +#: pagination.py:221 +msgid "Invalid page \"{page_number}\": {message}." +msgstr "无效页面 “{page_number}”：{message}。" + +#: pagination.py:442 +msgid "Invalid cursor" +msgstr "" + +#: relations.py:133 +msgid "Invalid pk \"{pk_value}\" - object does not exist." +msgstr "无效主键 “{pk_value}” － 对象不存在。" + +#: relations.py:134 +msgid "Incorrect type. Expected pk value, received {data_type}." +msgstr "类型错误。期望为主键，得到的类型为 {data_type}。" + +#: relations.py:157 +msgid "Invalid hyperlink - No URL match." +msgstr "无效超链接 －没有匹配的URL。" + +#: relations.py:158 +msgid "Invalid hyperlink - Incorrect URL match." +msgstr "无效超链接 －错误的URL匹配。" + +#: relations.py:159 +msgid "Invalid hyperlink - Object does not exist." +msgstr "无效超链接 －对象不存在。" + +#: relations.py:160 +msgid "Incorrect type. Expected URL string, received {data_type}." +msgstr "类型错误。期望为URL字符串，得到的类型是 {data_type}。" + +#: relations.py:295 +msgid "Object with {slug_name}={value} does not exist." +msgstr "属性 {slug_name} 为 {value} 的对象不存在。" + +#: relations.py:296 +msgid "Invalid value." +msgstr "无效值。" + +#: serializers.py:299 +msgid "Invalid data. Expected a dictionary, but got {datatype}." +msgstr "无效数据。期待为字典类型，得到的是 {datatype} 。" + +#: validators.py:22 +msgid "This field must be unique." +msgstr "该字段必须唯一。" + +#: validators.py:76 +msgid "The fields {field_names} must make a unique set." +msgstr "字段 {field_names} 必须能构成唯一集合。" + +#: validators.py:219 +msgid "This field must be unique for the \"{date_field}\" date." +msgstr "该字段必须在日期 “{date_field}” 唯一。" + +#: validators.py:234 +msgid "This field must be unique for the \"{date_field}\" month." +msgstr "该字段必须在月份 “{date_field}” 唯一。" + +#: validators.py:247 +msgid "This field must be unique for the \"{date_field}\" year." +msgstr "该字段必须在年 “{date_field}” 唯一。" + +#: versioning.py:39 +msgid "Invalid version in \"Accept\" header." +msgstr "“Accept” HTTP头包含无效版本。" + +#: versioning.py:70 versioning.py:112 +msgid "Invalid version in URL path." +msgstr "URl路径包含无效版本。" + +#: versioning.py:138 +msgid "Invalid version in hostname." +msgstr "主机名包含无效版本。" + +#: versioning.py:160 +msgid "Invalid version in query parameter." +msgstr "请求参数里包含无效版本。" + +#: authtoken/serializers.py:20 +msgid "User account is disabled." +msgstr "用户账户已禁用。" + +#: authtoken/serializers.py:23 +msgid "Unable to log in with provided credentials." +msgstr "无法使用提供的认证信息登录。" + +#: authtoken/serializers.py:26 +msgid "Must include \"username\" and \"password\"." +msgstr "必须包含 “用户名” 和 “密码”。" diff --git a/rest_framework/views.py b/rest_framework/views.py index 12bb78bd9..995ddd0f6 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -2,12 +2,10 @@ Provides an APIView class that is the base of all views in REST framework. """ from __future__ import unicode_literals -import inspect -import warnings - from django.core.exceptions import PermissionDenied from django.http import Http404 from django.utils.encoding import smart_text +from django.utils.translation import ugettext_lazy as _ from django.views.decorators.csrf import csrf_exempt from rest_framework import status, exceptions from rest_framework.compat import HttpResponseBase, View @@ -15,6 +13,8 @@ from rest_framework.request import Request from rest_framework.response import Response from rest_framework.settings import api_settings from rest_framework.utils import formatting +import inspect +import warnings def get_view_name(view_cls, suffix=None): @@ -74,11 +74,11 @@ def exception_handler(exc, context): return Response(data, status=exc.status_code, headers=headers) elif isinstance(exc, Http404): - data = {'detail': 'Not found'} + data = {'detail': _('Not found.')} return Response(data, status=status.HTTP_404_NOT_FOUND) elif isinstance(exc, PermissionDenied): - data = {'detail': 'Permission denied'} + data = {'detail': _('Permission denied.')} return Response(data, status=status.HTTP_403_FORBIDDEN) # Note: Unhandled exceptions will raise a 500 error. From 53b29f0902a52f7020c95ab7488a61208b8ee8a2 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sat, 31 Jan 2015 08:27:17 +0000 Subject: [PATCH 1537/1652] _closable_objects as an empty list, not deleted --- rest_framework/response.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/response.py b/rest_framework/response.py index 7f90bae10..c21c60a2e 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -86,8 +86,9 @@ class Response(SimpleTemplateResponse): state = super(Response, self).__getstate__() for key in ( 'accepted_renderer', 'renderer_context', 'resolver_match', - 'client', 'request', 'wsgi_request', '_closable_objects' + 'client', 'request', 'wsgi_request' ): if key in state: del state[key] + state['_closable_objects'] = [] return state From 2cc4cb24652366c6622af08370a0c04b429aa4b8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sat, 31 Jan 2015 08:53:40 +0000 Subject: [PATCH 1538/1652] Fix error text in test. --- docs/topics/3.1-announcement.md | 4 +++- rest_framework/views.py | 7 +++++-- tests/test_generics.py | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 3eb52f4cf..5f4a8d45c 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -4,7 +4,7 @@ #### Pagination controls in the browsable API. -#### New pagination schemes. +#### New schemes, including cursor pagination. #### Support for header-based pagination. @@ -12,4 +12,6 @@ ## Internationalization +## New fields + ## ModelSerializer API diff --git a/rest_framework/views.py b/rest_framework/views.py index 995ddd0f6..9445c840c 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -4,6 +4,7 @@ Provides an APIView class that is the base of all views in REST framework. from __future__ import unicode_literals from django.core.exceptions import PermissionDenied from django.http import Http404 +from django.utils import six from django.utils.encoding import smart_text from django.utils.translation import ugettext_lazy as _ from django.views.decorators.csrf import csrf_exempt @@ -74,11 +75,13 @@ def exception_handler(exc, context): return Response(data, status=exc.status_code, headers=headers) elif isinstance(exc, Http404): - data = {'detail': _('Not found.')} + msg = _('Not found.') + data = {'detail': six.text_type(msg)} return Response(data, status=status.HTTP_404_NOT_FOUND) elif isinstance(exc, PermissionDenied): - data = {'detail': _('Permission denied.')} + msg = _('Permission denied.') + data = {'detail': six.text_type(msg)} return Response(data, status=status.HTTP_403_FORBIDDEN) # Note: Unhandled exceptions will raise a 500 error. diff --git a/tests/test_generics.py b/tests/test_generics.py index fba8718f5..88e792cea 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -483,7 +483,7 @@ class TestFilterBackendAppliedToViews(TestCase): request = factory.get('/1') response = instance_view(request, pk=1).render() self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) - self.assertEqual(response.data, {'detail': 'Not found'}) + self.assertEqual(response.data, {'detail': 'Not found.'}) def test_get_instance_view_will_return_single_object_when_filter_does_not_exclude_it(self): """ From e63f49bd1d55501f766ca2e3f9c0c9fa3cfa19ab Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Sat, 31 Jan 2015 19:59:52 +0000 Subject: [PATCH 1539/1652] Fix field mappings for 1.8 fields --- rest_framework/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index a3b8196bd..a91fe23e0 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1330,13 +1330,13 @@ class ModelSerializer(Serializer): if hasattr(models, 'UUIDField'): - ModelSerializer._field_mapping[models.UUIDField] = UUIDField + ModelSerializer.serializer_field_mapping[models.UUIDField] = UUIDField if postgres_fields: class CharMappingField(DictField): child = CharField() - ModelSerializer._field_mapping[postgres_fields.HStoreField] = CharMappingField + ModelSerializer.serializer_field_mapping[postgres_fields.HStoreField] = CharMappingField class HyperlinkedModelSerializer(ModelSerializer): From 37dce89354ab2c94fefeb0a20b6265fef98caddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sun, 1 Feb 2015 15:33:34 -0400 Subject: [PATCH 1540/1652] =?UTF-8?q?Add=20support=20for=20Django=201.8?= =?UTF-8?q?=E2=80=99s=20ArrayField?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rest_framework/serializers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index a91fe23e0..520b97748 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1337,6 +1337,7 @@ if postgres_fields: child = CharField() ModelSerializer.serializer_field_mapping[postgres_fields.HStoreField] = CharMappingField + ModelSerializer.serializer_field_mapping[postgres_fields.ArrayField] = ListField class HyperlinkedModelSerializer(ModelSerializer): From aaa1fcd5d1137a8a32d4923a331032ffd9877975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sun, 1 Feb 2015 16:18:02 -0400 Subject: [PATCH 1541/1652] Fixes #2493 --- docs/tutorial/1-serialization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 80e869ea6..ceb23a020 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -97,7 +97,7 @@ The first thing we need to get started on our Web API is to provide a way of ser class SnippetSerializer(serializers.Serializer): pk = serializers.IntegerField(read_only=True) title = serializers.CharField(required=False, allow_blank=True, max_length=100) - code = serializers.CharField(style={'type': 'textarea'}) + code = serializers.CharField(style={'base_template': 'textarea.html'}) linenos = serializers.BooleanField(required=False) language = serializers.ChoiceField(choices=LANGUAGE_CHOICES, default='python') style = serializers.ChoiceField(choices=STYLE_CHOICES, default='friendly') From 9437d9b8eef9ef2b0f5f69257c8515416527c5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sun, 1 Feb 2015 16:18:40 -0400 Subject: [PATCH 1542/1652] Fix base_template name in example --- docs/topics/3.0-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index 24e69c2de..59fe779ca 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -826,7 +826,7 @@ The `style` keyword argument can be used to pass through additional information For example, to use a `textarea` control instead of the default `input` control, you would use the following… additional_notes = serializers.CharField( - style={'base_template': 'text_area.html'} + style={'base_template': 'textarea.html'} ) Similarly, to use a radio button control instead of the default `select` control, you would use the following… From 2111a99b320c546045f4660dec05f17b931935ca Mon Sep 17 00:00:00 2001 From: Dustin Farris <dustin@dustinfarris.com> Date: Sun, 1 Feb 2015 16:00:24 -0500 Subject: [PATCH 1543/1652] Update link for ember-django-adapter --- docs/topics/third-party-resources.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 6f4df2886..e26e3a2fa 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -237,7 +237,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [django-rest-framework-proxy][django-rest-framework-proxy] - Proxy to redirect incoming request to another API server. * [gaiarestframework][gaiarestframework] - Utils for django-rest-framewok * [drf-extensions][drf-extensions] - A collection of custom extensions -* [ember-data-django-rest-adapter][ember-data-django-rest-adapter] - An ember-data adapter +* [ember-django-adapter][ember-django-adapter] - An adapter for working with Ember.js ## Other Resources @@ -309,7 +309,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-rest-framework-proxy]: https://github.com/eofs/django-rest-framework-proxy [gaiarestframework]: https://github.com/AppsFuel/gaiarestframework [drf-extensions]: https://github.com/chibisov/drf-extensions -[ember-data-django-rest-adapter]: https://github.com/toranb/ember-data-django-rest-adapter +[ember-django-adapter]: https://github.com/dustinfarris/ember-django-adapter [beginners-guide-to-the-django-rest-framework]: http://code.tutsplus.com/tutorials/beginners-guide-to-the-django-rest-framework--cms-19786 [getting-started-with-django-rest-framework-and-angularjs]: http://blog.kevinastone.com/getting-started-with-django-rest-framework-and-angularjs.html [end-to-end-web-app-with-django-rest-framework-angularjs]: http://blog.mourafiq.com/post/55034504632/end-to-end-web-app-with-django-rest-framework From 8f1d42e7d5146e19842d2837259284f8730b451d Mon Sep 17 00:00:00 2001 From: Omer Katz <omer.drow@gmail.com> Date: Mon, 2 Feb 2015 10:50:54 +0200 Subject: [PATCH 1544/1652] Fixed typos in docstrings. --- rest_framework/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 42d1e3700..2fd907ecd 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -633,11 +633,11 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data): If we don't do this explicitly they'd get a less helpful error when calling `.save()` on the serializer. - We don't *automatically* support these sorts of nested writes brecause + We don't *automatically* support these sorts of nested writes because there are too many ambiguities to define a default behavior. Eg. Suppose we have a `UserSerializer` with a nested profile. How should - we handle the case of an update, where the `profile` realtionship does + we handle the case of an update, where the `profile` relationship does not exist? Any of the following might be valid: * Raise an application error. From 4b65e9e42be068ad3e742692262451f8836f09d3 Mon Sep 17 00:00:00 2001 From: Jason Yan <tailofthesun@gmail.com> Date: Mon, 2 Feb 2015 16:14:34 -0800 Subject: [PATCH 1545/1652] Fixed missing whitespace in error string. --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 2fd907ecd..d76658b03 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -177,7 +177,7 @@ class BaseSerializer(Field): ) assert hasattr(self, 'initial_data'), ( - 'Cannot call `.is_valid()` as no `data=` keyword argument was' + 'Cannot call `.is_valid()` as no `data=` keyword argument was ' 'passed when instantiating the serializer instance.' ) From 77d061d234e03004f34058028707ecddfc730fae Mon Sep 17 00:00:00 2001 From: Brandon Cazander <brandon.cazander@multapplied.net> Date: Wed, 28 Jan 2015 17:08:34 -0800 Subject: [PATCH 1546/1652] Provide rest_framework.resolve. Fixes #2489 --- rest_framework/relations.py | 7 ++--- rest_framework/reverse.py | 15 ++++++++++- rest_framework/versioning.py | 16 ++++++++++++ tests/test_relations.py | 50 ++++++++++++++++++++++++++++++++++-- tests/urls.py | 4 +-- 5 files changed, 84 insertions(+), 8 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 66857a413..809d3db9e 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -1,7 +1,7 @@ # coding: utf-8 from __future__ import unicode_literals from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured -from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch, Resolver404 +from django.core.urlresolvers import get_script_prefix, NoReverseMatch, Resolver404 from django.db.models.query import QuerySet from django.utils import six from django.utils.encoding import smart_text @@ -9,7 +9,7 @@ from django.utils.six.moves.urllib import parse as urlparse from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import OrderedDict from rest_framework.fields import get_attribute, empty, Field -from rest_framework.reverse import reverse +from rest_framework.reverse import reverse, resolve from rest_framework.utils import html @@ -205,6 +205,7 @@ class HyperlinkedRelatedField(RelatedField): return self.reverse(view_name, kwargs=kwargs, request=request, format=format) def to_internal_value(self, data): + request = self.context.get('request', None) try: http_prefix = data.startswith(('http:', 'https:')) except AttributeError: @@ -218,7 +219,7 @@ class HyperlinkedRelatedField(RelatedField): data = '/' + data[len(prefix):] try: - match = self.resolve(data) + match = self.resolve(data, request=request) except Resolver404: self.fail('no_match') diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py index 8fcca55ba..0d1d94a7b 100644 --- a/rest_framework/reverse.py +++ b/rest_framework/reverse.py @@ -1,12 +1,25 @@ """ -Provide reverse functions that return fully qualified URLs +Provide urlresolver functions that return fully qualified URLs or view names """ from __future__ import unicode_literals from django.core.urlresolvers import reverse as django_reverse +from django.core.urlresolvers import resolve as django_resolve from django.utils import six from django.utils.functional import lazy +def resolve(path, urlconf=None, request=None): + """ + If versioning is being used then we pass any `resolve` calls through + to the versioning scheme instance, so that the resulting view name + can be modified if needed. + """ + scheme = getattr(request, 'versioning_scheme', None) + if scheme is not None: + return scheme.resolve(path, urlconf, request) + return django_resolve(path, urlconf) + + def reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra): """ If versioning is being used then we pass any `reverse` calls through diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index a07b629fe..a76da17a7 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -1,6 +1,8 @@ # coding: utf-8 from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ +from django.core.urlresolvers import resolve as django_resolve +from django.core.urlresolvers import ResolverMatch from rest_framework import exceptions from rest_framework.compat import unicode_http_header from rest_framework.reverse import _reverse @@ -24,6 +26,9 @@ class BaseVersioning(object): def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): return _reverse(viewname, args, kwargs, request, format, **extra) + def resolve(self, path, urlconf=None): + return django_resolve(path, urlconf) + def is_allowed_version(self, version): if not self.allowed_versions: return True @@ -127,6 +132,17 @@ class NamespaceVersioning(BaseVersioning): viewname, args, kwargs, request, format, **extra ) + def resolve(self, path, urlconf=None, request=None): + match = django_resolve(path, urlconf) + if match.namespace: + _, view_name = match.view_name.split(':') + return ResolverMatch(func=match.func, + args=match.args, + kwargs=match.kwargs, + url_name=view_name, + app_name=match.app_name) + return match + class HostNameVersioning(BaseVersioning): """ diff --git a/tests/test_relations.py b/tests/test_relations.py index fbe176e24..b82a1f2a5 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -1,11 +1,28 @@ from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset -from django.core.exceptions import ImproperlyConfigured +from django.conf.urls import patterns, url, include +from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist from django.utils.datastructures import MultiValueDict from rest_framework import serializers from rest_framework.fields import empty -from rest_framework.test import APISimpleTestCase +from rest_framework.test import APISimpleTestCase, APIRequestFactory +from rest_framework.versioning import NamespaceVersioning import pytest +factory = APIRequestFactory() +request = factory.get('/') # Just to ensure we have a request in the serializer context + +dummy_view = lambda request, pk: None + +included_patterns = [ + url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail') +] + +urlpatterns = patterns( + '', + url(r'^v1/', include(included_patterns, namespace='v1')), + url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail') +) + class TestStringRelatedField(APISimpleTestCase): def setUp(self): @@ -48,6 +65,35 @@ class TestPrimaryKeyRelatedField(APISimpleTestCase): assert representation == self.instance.pk +class TestHyperlinkedRelatedField(APISimpleTestCase): + urls = 'tests.test_relations' + + def setUp(self): + class HyperlinkedMockQueryset(MockQueryset): + def get(self, **lookup): + for item in self.items: + if item.pk == int(lookup.get('pk', -1)): + return item + raise ObjectDoesNotExist() + + self.queryset = HyperlinkedMockQueryset([ + MockObject(pk=1, name='foo'), + MockObject(pk=2, name='bar'), + MockObject(pk=3, name='baz') + ]) + self.field = serializers.HyperlinkedRelatedField( + view_name='example-detail', + queryset=self.queryset + ) + request = factory.post('/') + request.versioning_scheme = NamespaceVersioning() + self.field._context = {'request': request} + + def test_bug_2489(self): + self.field.to_internal_value('/example/3/') + self.field.to_internal_value('/v1/example/3/') + + class TestHyperlinkedIdentityField(APISimpleTestCase): def setUp(self): self.instance = MockObject(pk=1, name='foo') diff --git a/tests/urls.py b/tests/urls.py index 41f527dfd..742e361d7 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -1,6 +1,6 @@ """ Blank URLConf just to keep the test suite happy """ -from django.conf.urls import patterns +from tests import test_relations -urlpatterns = patterns('') +urlpatterns = test_relations.urlpatterns From f3067a7fabdd0edb5bc5f48cfdadd2850866c189 Mon Sep 17 00:00:00 2001 From: Brandon Cazander <brandon@bcdynamic.com> Date: Mon, 2 Feb 2015 20:41:06 -0800 Subject: [PATCH 1547/1652] Remove unnecessary APIRequestFactory get from tests. --- tests/test_relations.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_relations.py b/tests/test_relations.py index b82a1f2a5..ff377d383 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -9,7 +9,6 @@ from rest_framework.versioning import NamespaceVersioning import pytest factory = APIRequestFactory() -request = factory.get('/') # Just to ensure we have a request in the serializer context dummy_view = lambda request, pk: None From d015534d530dfdc2bbd7e301ec79fed533d55032 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 3 Feb 2015 09:15:42 +0000 Subject: [PATCH 1548/1652] Fleshing out 3.1 announcement --- docs/topics/3.1-announcement.md | 69 ++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 5f4a8d45c..73cccb1c3 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -1,17 +1,82 @@ # Django REST framework 3.1 +The 3.1 release is an intermediate step in the Kickstarter project releases, and includes a range of new functionality. + ## Pagination +The pagination API has been improved, making it both easier to use, and more powerful. + +#### New pagination schemes. + +Until now, there has only been a single built-in pagination style in REST framework. We now have page, limit/offset and cursor based schemes included by default. + +The cursor based pagination scheme is particularly smart, and is a better approach for clients iterating through large or frequently changing result sets. The scheme supports paging against non-unique indexes, by using both cursor and limit/offset information. Credit to David Cramer for [this blog post](http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/) on the subject. + #### Pagination controls in the browsable API. -#### New schemes, including cursor pagination. +Paginated results now include controls that render directly in the browsable API. If you're using the page or limit/offset style, then you'll see a page based control displayed in the browsable API. + +**IMAGE** + +The cursor based pagination renders a more simple 'Previous'/'Next' control. + +**IMAGE** #### Support for header-based pagination. +The pagination API was previously only able to alter the pagination style in the body of the response. The API now supports being able to write pagination information in response headers, making it possible to use pagination schemes that use the `Link` or `Content-Range` headers. + +**TODO**: Link to docs. + ## Versioning +We've made it easier to build versioned APIs. Built-in schemes for versioning include both URL based and Accept header based variations. + +When using a URL based scheme, hyperlinked serializers will resolve relationships to the same API version as used on the incoming request. + +**TODO**: Example. + ## Internationalization -## New fields +REST framework now includes a built-in set of translations, and supports internationalized error responses. This allows you to either change the default language, or to allow clients to specify the language via the `Accept-Language` header. + +**TODO**: Example. + +**TODO**: Credit. + +## New field types + +Django 1.8's new `ArrayField`, `HStoreField` and `UUIDField` are now all fully supported. + +This work also means that we now have both `serializers.DictField()`, and `serializers.ListField()` types, allowing you to express and validate a wider set of representations. ## ModelSerializer API + +The serializer redesign in 3.0 did not include any public API for modifying how ModelSerializer classes automatically generate a set of fields from a given mode class. We've now re-introduced an API for this, allowing you to create new ModelSerializer base classes that behave differently, such as using a different default style for relationships. + +**TODO**: Link to docs. + +## Moving packages out of core + +We've now moved a number of packages out of the core of REST framework, and into separately installable packages. If you're currently using these you don't need to worry, you simply need to `pip install` the new packages, and change any import paths. + +We're making this change in order to distribute the maintainance workload, and keep better focus of the core essentials of the framework. + +The change also means we can be more flexible with which external packages we recommend. For example, the excellently maintained [Django OAuth toolkit](https://github.com/evonove/django-oauth-toolkit) is now our recommended option for integrating OAuth support. + +**TODO** Links and package names + +* XML +* YAML +* JSONP +* OAuth + +# What's next? + +The next focus will be on HTML renderings of API output and will include: + +* HTML form rendering of serializers. +* Filtering controls built-in to the browsable API. +* An alternative admin-style interface. + +This will either be made as a single 3.2 release, or split across two separate releases, with the HTML forms and filter controls coming in 3.2, and the admin-style interface coming in a 3.3 release. \ No newline at end of file From 030f01afdbcd4018a288250ef1f4c12de28e63bb Mon Sep 17 00:00:00 2001 From: Brandon Cazander <brandon@bcdynamic.com> Date: Tue, 3 Feb 2015 02:14:38 -0800 Subject: [PATCH 1549/1652] Reorganize tests. --- tests/test_relations.py | 49 ++-------------------------------------- tests/test_versioning.py | 41 +++++++++++++++++++++++++++++++-- tests/urls.py | 4 ++-- 3 files changed, 43 insertions(+), 51 deletions(-) diff --git a/tests/test_relations.py b/tests/test_relations.py index ff377d383..fbe176e24 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -1,27 +1,11 @@ from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset -from django.conf.urls import patterns, url, include -from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist +from django.core.exceptions import ImproperlyConfigured from django.utils.datastructures import MultiValueDict from rest_framework import serializers from rest_framework.fields import empty -from rest_framework.test import APISimpleTestCase, APIRequestFactory -from rest_framework.versioning import NamespaceVersioning +from rest_framework.test import APISimpleTestCase import pytest -factory = APIRequestFactory() - -dummy_view = lambda request, pk: None - -included_patterns = [ - url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail') -] - -urlpatterns = patterns( - '', - url(r'^v1/', include(included_patterns, namespace='v1')), - url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail') -) - class TestStringRelatedField(APISimpleTestCase): def setUp(self): @@ -64,35 +48,6 @@ class TestPrimaryKeyRelatedField(APISimpleTestCase): assert representation == self.instance.pk -class TestHyperlinkedRelatedField(APISimpleTestCase): - urls = 'tests.test_relations' - - def setUp(self): - class HyperlinkedMockQueryset(MockQueryset): - def get(self, **lookup): - for item in self.items: - if item.pk == int(lookup.get('pk', -1)): - return item - raise ObjectDoesNotExist() - - self.queryset = HyperlinkedMockQueryset([ - MockObject(pk=1, name='foo'), - MockObject(pk=2, name='bar'), - MockObject(pk=3, name='baz') - ]) - self.field = serializers.HyperlinkedRelatedField( - view_name='example-detail', - queryset=self.queryset - ) - request = factory.post('/') - request.versioning_scheme = NamespaceVersioning() - self.field._context = {'request': request} - - def test_bug_2489(self): - self.field.to_internal_value('/example/3/') - self.field.to_internal_value('/v1/example/3/') - - class TestHyperlinkedIdentityField(APISimpleTestCase): def setUp(self): self.instance = MockObject(pk=1, name='foo') diff --git a/tests/test_versioning.py b/tests/test_versioning.py index c44f727d2..e7c8485ee 100644 --- a/tests/test_versioning.py +++ b/tests/test_versioning.py @@ -1,9 +1,13 @@ +from .utils import MockObject, MockQueryset from django.conf.urls import include, url +from django.core.exceptions import ObjectDoesNotExist +from rest_framework import serializers from rest_framework import status, versioning from rest_framework.decorators import APIView from rest_framework.response import Response from rest_framework.reverse import reverse -from rest_framework.test import APIRequestFactory, APITestCase +from rest_framework.test import APIRequestFactory, APITestCase, APISimpleTestCase +from rest_framework.versioning import NamespaceVersioning class RequestVersionView(APIView): @@ -29,15 +33,18 @@ class RequestInvalidVersionView(APIView): factory = APIRequestFactory() mock_view = lambda request: None +dummy_view = lambda request, pk: None included_patterns = [ url(r'^namespaced/$', mock_view, name='another'), + url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail') ] urlpatterns = [ url(r'^v1/', include(included_patterns, namespace='v1')), url(r'^another/$', mock_view, name='another'), - url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another') + url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another'), + url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail') ] @@ -221,3 +228,33 @@ class TestInvalidVersion: request.resolver_match = FakeResolverMatch response = view(request, version='v3') assert response.status_code == status.HTTP_404_NOT_FOUND + + +class TestHyperlinkedRelatedField(APISimpleTestCase): + urls = 'tests.test_versioning' + + def setUp(self): + + class HyperlinkedMockQueryset(MockQueryset): + def get(self, **lookup): + for item in self.items: + if item.pk == int(lookup.get('pk', -1)): + return item + raise ObjectDoesNotExist() + + self.queryset = HyperlinkedMockQueryset([ + MockObject(pk=1, name='foo'), + MockObject(pk=2, name='bar'), + MockObject(pk=3, name='baz') + ]) + self.field = serializers.HyperlinkedRelatedField( + view_name='example-detail', + queryset=self.queryset + ) + request = factory.post('/', urlconf='tests.test_versioning') + request.versioning_scheme = NamespaceVersioning() + self.field._context = {'request': request} + + def test_bug_2489(self): + self.field.to_internal_value('/example/3/') + self.field.to_internal_value('/v1/example/3/') diff --git a/tests/urls.py b/tests/urls.py index 742e361d7..41f527dfd 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -1,6 +1,6 @@ """ Blank URLConf just to keep the test suite happy """ -from tests import test_relations +from django.conf.urls import patterns -urlpatterns = test_relations.urlpatterns +urlpatterns = patterns('') From f6765696610a0de3cf7d9986a2dfab40ca37e88b Mon Sep 17 00:00:00 2001 From: James Cooke <jamescooke@users.noreply.github.com> Date: Tue, 3 Feb 2015 13:43:03 +0000 Subject: [PATCH 1550/1652] Small documentation fixes * Remove "you you" from viewsets API-guide * Fix link from routers API-guide to viewsets API-guide --- docs/api-guide/routers.md | 2 +- docs/api-guide/viewsets.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/routers.md b/docs/api-guide/routers.md index 592f7d66f..222b6cd25 100644 --- a/docs/api-guide/routers.md +++ b/docs/api-guide/routers.md @@ -304,7 +304,7 @@ The [wq.db package][wq.db] provides an advanced [Router][wq.db-router] class (an The [`DRF-extensions` package][drf-extensions] provides [routers][drf-extensions-routers] for creating [nested viewsets][drf-extensions-nested-viewsets], [collection level controllers][drf-extensions-collection-level-controllers] with [customizable endpoint names][drf-extensions-customizable-endpoint-names]. [cite]: http://guides.rubyonrails.org/routing.html -[route-decorators]: viewsets.html#marking-extra-actions-for-routing +[route-decorators]: viewsets.md#marking-extra-actions-for-routing [drf-nested-routers]: https://github.com/alanjds/drf-nested-routers [wq.db]: http://wq.io/wq.db [wq.db-router]: http://wq.io/docs/app.py diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index b09dfc9e9..bbf92c6ce 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -201,7 +201,7 @@ Note that you can use any of the standard attributes or method overrides provide def get_queryset(self): return self.request.user.accounts.all() -Note however that upon removal of the `queryset` property from your `ViewSet`, any associated [router][routers] will be unable to derive the base_name of your Model automatically, and so you you will have to specify the `base_name` kwarg as part of your [router registration][routers]. +Note however that upon removal of the `queryset` property from your `ViewSet`, any associated [router][routers] will be unable to derive the base_name of your Model automatically, and so you will have to specify the `base_name` kwarg as part of your [router registration][routers]. Also note that although this class provides the complete set of create/list/retrieve/update/destroy actions by default, you can restrict the available operations by using the standard permission classes. From 76efbdddb69d0e7279c1b9de066e829f34019609 Mon Sep 17 00:00:00 2001 From: Warren Jin <jinwarren@gmail.com> Date: Tue, 3 Feb 2015 17:18:54 -0500 Subject: [PATCH 1551/1652] docs --- docs/api-guide/fields.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index b3d274ddb..f379ac720 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -567,6 +567,10 @@ The [drf-compound-fields][drf-compound-fields] package provides "compound" seria The [drf-extra-fields][drf-extra-fields] package provides extra serializer fields for REST framework, including `Base64ImageField` and `PointField` classes. +## djangrestframework-recursive + +the [djangorestframework-recursive][djangorestframework-recursive] package provides a `RecursiveField` for serializing and deserializing recursive structures + ## django-rest-framework-gis The [django-rest-framework-gis][django-rest-framework-gis] package provides geographic addons for django rest framework like a `GeometryField` field and a GeoJSON serializer. @@ -583,6 +587,7 @@ The [django-rest-framework-hstore][django-rest-framework-hstore] package provide [iso8601]: http://www.w3.org/TR/NOTE-datetime [drf-compound-fields]: http://drf-compound-fields.readthedocs.org [drf-extra-fields]: https://github.com/Hipo/drf-extra-fields +[djangorestframework-recursive]: https://github.com/heywbj/django-rest-framework-recursive [django-rest-framework-gis]: https://github.com/djangonauts/django-rest-framework-gis [django-rest-framework-hstore]: https://github.com/djangonauts/django-rest-framework-hstore [django-hstore]: https://github.com/djangonauts/django-hstore From 8b4ce5c636a9abb33029e48f969bbdf38f97ca1f Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 4 Feb 2015 09:07:10 +0000 Subject: [PATCH 1552/1652] Minor authentication message improvement. --- env/pip-selfcheck.json | 1 + rest_framework/authentication.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 env/pip-selfcheck.json diff --git a/env/pip-selfcheck.json b/env/pip-selfcheck.json new file mode 100644 index 000000000..ad56313b1 --- /dev/null +++ b/env/pip-selfcheck.json @@ -0,0 +1 @@ +{"last_check":"2015-02-04T09:06:02Z","pypi_version":"6.0.7"} \ No newline at end of file diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 11db05855..a75cd30cd 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -86,8 +86,13 @@ class BasicAuthentication(BaseAuthentication): Authenticate the userid and password against username and password. """ user = authenticate(username=userid, password=password) - if user is None or not user.is_active: + + if user is None: raise exceptions.AuthenticationFailed(_('Invalid username/password.')) + + if not user.is_active: + raise exceptions.AuthenticationFailed(_('User inactive or deleted.')) + return (user, None) def authenticate_header(self, request): From a0374e44985172e4b8f6dc91fbc22897d2b06767 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 4 Feb 2015 09:08:43 +0000 Subject: [PATCH 1553/1652] Remove erronous checkin --- env/pip-selfcheck.json | 1 - 1 file changed, 1 deletion(-) delete mode 100644 env/pip-selfcheck.json diff --git a/env/pip-selfcheck.json b/env/pip-selfcheck.json deleted file mode 100644 index ad56313b1..000000000 --- a/env/pip-selfcheck.json +++ /dev/null @@ -1 +0,0 @@ -{"last_check":"2015-02-04T09:06:02Z","pypi_version":"6.0.7"} \ No newline at end of file From 7bb5fd270da98d8957efb4bf0e4bd4679ddbcf5f Mon Sep 17 00:00:00 2001 From: Greg Kempe <greg@kempe.net> Date: Wed, 4 Feb 2015 16:03:03 +0200 Subject: [PATCH 1554/1652] FIX: Don't default to list in method args Fixes @list_route and @detail_route so that they don't initialize their `methods` parameter as a list. In some cases the list gets cleared, and the result is that default parameter is now empty, and may get reused unexpectedly. --- rest_framework/decorators.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index 325435b3f..a68227c14 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -109,10 +109,12 @@ def permission_classes(permission_classes): return decorator -def detail_route(methods=['get'], **kwargs): +def detail_route(methods=None, **kwargs): """ Used to mark a method on a ViewSet that should be routed for detail requests. """ + if methods is None: + methods = ['get'] def decorator(func): func.bind_to_methods = methods func.detail = True @@ -121,10 +123,12 @@ def detail_route(methods=['get'], **kwargs): return decorator -def list_route(methods=['get'], **kwargs): +def list_route(methods=None, **kwargs): """ Used to mark a method on a ViewSet that should be routed for list requests. """ + if methods is None: + methods = ['get'] def decorator(func): func.bind_to_methods = methods func.detail = False From 58e7bbc8ecad8016cc18f7dbd31b235cb515b785 Mon Sep 17 00:00:00 2001 From: Ofir Ovadia <ofir@purplebit.com> Date: Wed, 4 Feb 2015 16:08:41 +0200 Subject: [PATCH 1555/1652] Prefetching the user object when getting the token in TokenAuthentication. Since the user object is fetched 4 lines after getting Token from the database, this removes a DB query for each token-authenticated request. --- rest_framework/authentication.py | 2 +- tests/test_authentication.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py index 4832ad33b..f7601fb12 100644 --- a/rest_framework/authentication.py +++ b/rest_framework/authentication.py @@ -167,7 +167,7 @@ class TokenAuthentication(BaseAuthentication): def authenticate_credentials(self, key): try: - token = self.model.objects.get(key=key) + token = self.model.objects.select_related('user').get(key=key) except self.model.DoesNotExist: raise exceptions.AuthenticationFailed('Invalid token') diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 44837c4ef..caabcc214 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -202,6 +202,12 @@ class TokenAuthTests(TestCase): response = self.csrf_client.post('/token/', {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth) self.assertEqual(response.status_code, status.HTTP_200_OK) + def test_post_json_makes_one_db_query(self): + """Ensure that authenticating a user using a token performs only one DB query""" + auth = "Token " + self.key + func_to_test = lambda: self.csrf_client.post('/token/', {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth) + self.assertNumQueries(1, func_to_test) + def test_post_form_failing_token_auth(self): """Ensure POSTing form over token auth without correct credentials fails""" response = self.csrf_client.post('/token/', {'example': 'example'}) From d920683237bd2eb17d110a80fc09708a67340f01 Mon Sep 17 00:00:00 2001 From: Greg Kempe <greg@kempe.net> Date: Wed, 4 Feb 2015 16:13:30 +0200 Subject: [PATCH 1556/1652] Use inline if --- rest_framework/decorators.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index a68227c14..7604eae13 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -18,8 +18,7 @@ def api_view(http_method_names=None): Decorator that converts a function-based view into an APIView subclass. Takes a list of allowed methods for the view as an argument. """ - if http_method_names is None: - http_method_names = ['GET'] + http_method_names = ['GET'] if http_method_names is None else http_method_names def decorator(func): @@ -113,8 +112,8 @@ def detail_route(methods=None, **kwargs): """ Used to mark a method on a ViewSet that should be routed for detail requests. """ - if methods is None: - methods = ['get'] + methods = ['get'] if methods is None else methods + def decorator(func): func.bind_to_methods = methods func.detail = True @@ -127,8 +126,8 @@ def list_route(methods=None, **kwargs): """ Used to mark a method on a ViewSet that should be routed for list requests. """ - if methods is None: - methods = ['get'] + methods = ['get'] if methods is None else methods + def decorator(func): func.bind_to_methods = methods func.detail = False From e13d2af1374c8a2b2146e1126d9406bfb4bbd9ec Mon Sep 17 00:00:00 2001 From: Greg Kempe <greg@kempe.net> Date: Wed, 4 Feb 2015 16:26:23 +0200 Subject: [PATCH 1557/1652] Parens around if clause --- rest_framework/decorators.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index 7604eae13..21de1acf4 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -18,7 +18,7 @@ def api_view(http_method_names=None): Decorator that converts a function-based view into an APIView subclass. Takes a list of allowed methods for the view as an argument. """ - http_method_names = ['GET'] if http_method_names is None else http_method_names + http_method_names = ['GET'] if (http_method_names is None) else http_method_names def decorator(func): @@ -112,7 +112,7 @@ def detail_route(methods=None, **kwargs): """ Used to mark a method on a ViewSet that should be routed for detail requests. """ - methods = ['get'] if methods is None else methods + methods = ['get'] if (methods is None) else methods def decorator(func): func.bind_to_methods = methods @@ -126,7 +126,7 @@ def list_route(methods=None, **kwargs): """ Used to mark a method on a ViewSet that should be routed for list requests. """ - methods = ['get'] if methods is None else methods + methods = ['get'] if (methods is None) else methods def decorator(func): func.bind_to_methods = methods From 41b213414df57d7e39f1bbf3aaa35a1b033e89a3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 4 Feb 2015 23:32:25 +0000 Subject: [PATCH 1558/1652] Updating release notes --- docs/topics/3.1-announcement.md | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 73cccb1c3..d59863602 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -60,16 +60,30 @@ The serializer redesign in 3.0 did not include any public API for modifying how We've now moved a number of packages out of the core of REST framework, and into separately installable packages. If you're currently using these you don't need to worry, you simply need to `pip install` the new packages, and change any import paths. -We're making this change in order to distribute the maintainance workload, and keep better focus of the core essentials of the framework. +We're making this change in order to help distribute the maintainance workload, and keep better focus of the core essentials of the framework. -The change also means we can be more flexible with which external packages we recommend. For example, the excellently maintained [Django OAuth toolkit](https://github.com/evonove/django-oauth-toolkit) is now our recommended option for integrating OAuth support. +The change also means we can be more flexible with which external packages we recommend. For example, the excellently maintained [Django OAuth toolkit](https://github.com/evonove/django-oauth-toolkit) has now been promoted as our recommended option for integrating OAuth support. -**TODO** Links and package names +The following packages are now moved out of core and should be separately installed: -* XML -* YAML -* JSONP -* OAuth +* OAuth - [djangorestframework-oauth](http://jpadilla.github.io/django-rest-framework-oauth/) +* XML - [djangorestframework-xml](http://jpadilla.github.io/django-rest-framework-xml) +* YAML - [djangorestframework-yaml](http://jpadilla.github.io/django-rest-framework-yaml) +* JSONP - [djangorestframework-jsonp](http://jpadilla.github.io/django-rest-framework-jsonp) + +It's worth reiterating that this change in policy shouldn't mean any work in your codebase other than adding a new requirement and modifying some import paths. For example to install XML rendering, you would now do: + + pip install djangorestframework-xml + +And modify your settings, like so: + + REST_FRAMEWORK = { + 'DEFAULT_RENDERER_CLASSES': [ + 'rest_framework.renderers.JSONRenderer', + 'rest_framework.renderers.BrowsableAPIRenderer', + 'rest_framework_xml.renderers.XMLRenderer' + ] + } # What's next? From e1c45133126e0c47b8470b4cf7a43c6a7f4fca43 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 5 Feb 2015 00:58:09 +0000 Subject: [PATCH 1559/1652] Fix NamespaceVersioning with hyperlinked serializer fields --- rest_framework/relations.py | 20 ++++++++----- rest_framework/reverse.py | 13 -------- rest_framework/versioning.py | 19 ++---------- tests/test_relations_hyperlink.py | 7 ++--- tests/test_versioning.py | 50 ++++++++++++++++++------------- tests/utils.py | 24 +++++++++++++++ 6 files changed, 72 insertions(+), 61 deletions(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 809d3db9e..0b7c9d864 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -1,7 +1,7 @@ # coding: utf-8 from __future__ import unicode_literals from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured -from django.core.urlresolvers import get_script_prefix, NoReverseMatch, Resolver404 +from django.core.urlresolvers import get_script_prefix, resolve, NoReverseMatch, Resolver404 from django.db.models.query import QuerySet from django.utils import six from django.utils.encoding import smart_text @@ -9,7 +9,7 @@ from django.utils.six.moves.urllib import parse as urlparse from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import OrderedDict from rest_framework.fields import get_attribute, empty, Field -from rest_framework.reverse import reverse, resolve +from rest_framework.reverse import reverse from rest_framework.utils import html @@ -167,11 +167,10 @@ class HyperlinkedRelatedField(RelatedField): self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field) self.format = kwargs.pop('format', None) - # We include these simply for dependency injection in tests. - # We can't add them as class attributes or they would expect an + # We include this simply for dependency injection in tests. + # We can't add it as a class attributes or it would expect an # implicit `self` argument to be passed. self.reverse = reverse - self.resolve = resolve super(HyperlinkedRelatedField, self).__init__(**kwargs) @@ -219,11 +218,18 @@ class HyperlinkedRelatedField(RelatedField): data = '/' + data[len(prefix):] try: - match = self.resolve(data, request=request) + match = resolve(data) except Resolver404: self.fail('no_match') - if match.view_name != self.view_name: + try: + expected_viewname = request.versioning_scheme.get_versioned_viewname( + self.view_name, request + ) + except AttributeError: + expected_viewname = self.view_name + + if match.view_name != expected_viewname: self.fail('incorrect_match') try: diff --git a/rest_framework/reverse.py b/rest_framework/reverse.py index 0d1d94a7b..a251d99d6 100644 --- a/rest_framework/reverse.py +++ b/rest_framework/reverse.py @@ -3,23 +3,10 @@ Provide urlresolver functions that return fully qualified URLs or view names """ from __future__ import unicode_literals from django.core.urlresolvers import reverse as django_reverse -from django.core.urlresolvers import resolve as django_resolve from django.utils import six from django.utils.functional import lazy -def resolve(path, urlconf=None, request=None): - """ - If versioning is being used then we pass any `resolve` calls through - to the versioning scheme instance, so that the resulting view name - can be modified if needed. - """ - scheme = getattr(request, 'versioning_scheme', None) - if scheme is not None: - return scheme.resolve(path, urlconf, request) - return django_resolve(path, urlconf) - - def reverse(viewname, args=None, kwargs=None, request=None, format=None, **extra): """ If versioning is being used then we pass any `reverse` calls through diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py index a76da17a7..51b886f38 100644 --- a/rest_framework/versioning.py +++ b/rest_framework/versioning.py @@ -1,8 +1,6 @@ # coding: utf-8 from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from django.core.urlresolvers import resolve as django_resolve -from django.core.urlresolvers import ResolverMatch from rest_framework import exceptions from rest_framework.compat import unicode_http_header from rest_framework.reverse import _reverse @@ -26,9 +24,6 @@ class BaseVersioning(object): def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): return _reverse(viewname, args, kwargs, request, format, **extra) - def resolve(self, path, urlconf=None): - return django_resolve(path, urlconf) - def is_allowed_version(self, version): if not self.allowed_versions: return True @@ -127,21 +122,13 @@ class NamespaceVersioning(BaseVersioning): def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra): if request.version is not None: - viewname = request.version + ':' + viewname + viewname = self.get_versioned_viewname(viewname, request) return super(NamespaceVersioning, self).reverse( viewname, args, kwargs, request, format, **extra ) - def resolve(self, path, urlconf=None, request=None): - match = django_resolve(path, urlconf) - if match.namespace: - _, view_name = match.view_name.split(':') - return ResolverMatch(func=match.func, - args=match.args, - kwargs=match.kwargs, - url_name=view_name, - app_name=match.app_name) - return match + def get_versioned_viewname(self, viewname, request): + return request.version + ':' + viewname class HostNameVersioning(BaseVersioning): diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py index f1b882edf..aede61d2b 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -1,5 +1,5 @@ from __future__ import unicode_literals -from django.conf.urls import patterns, url +from django.conf.urls import url from django.test import TestCase from rest_framework import serializers from rest_framework.test import APIRequestFactory @@ -14,8 +14,7 @@ request = factory.get('/') # Just to ensure we have a request in the serializer dummy_view = lambda request, pk: None -urlpatterns = patterns( - '', +urlpatterns = [ url(r'^dummyurl/(?P<pk>[0-9]+)/$', dummy_view, name='dummy-url'), url(r'^manytomanysource/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanysource-detail'), url(r'^manytomanytarget/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanytarget-detail'), @@ -24,7 +23,7 @@ urlpatterns = patterns( url(r'^nullableforeignkeysource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableforeignkeysource-detail'), url(r'^onetoonetarget/(?P<pk>[0-9]+)/$', dummy_view, name='onetoonetarget-detail'), url(r'^nullableonetoonesource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableonetoonesource-detail'), -) +] # ManyToMany diff --git a/tests/test_versioning.py b/tests/test_versioning.py index e7c8485ee..cdd100656 100644 --- a/tests/test_versioning.py +++ b/tests/test_versioning.py @@ -1,4 +1,4 @@ -from .utils import MockObject, MockQueryset +from .utils import MockObject, MockQueryset, UsingURLPatterns from django.conf.urls import include, url from django.core.exceptions import ObjectDoesNotExist from rest_framework import serializers @@ -6,8 +6,9 @@ from rest_framework import status, versioning from rest_framework.decorators import APIView from rest_framework.response import Response from rest_framework.reverse import reverse -from rest_framework.test import APIRequestFactory, APITestCase, APISimpleTestCase +from rest_framework.test import APIRequestFactory, APITestCase from rest_framework.versioning import NamespaceVersioning +import pytest class RequestVersionView(APIView): @@ -35,18 +36,6 @@ factory = APIRequestFactory() mock_view = lambda request: None dummy_view = lambda request, pk: None -included_patterns = [ - url(r'^namespaced/$', mock_view, name='another'), - url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail') -] - -urlpatterns = [ - url(r'^v1/', include(included_patterns, namespace='v1')), - url(r'^another/$', mock_view, name='another'), - url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another'), - url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail') -] - class TestRequestVersion: def test_unversioned(self): @@ -121,8 +110,17 @@ class TestRequestVersion: assert response.data == {'version': None} -class TestURLReversing(APITestCase): - urls = 'tests.test_versioning' +class TestURLReversing(UsingURLPatterns, APITestCase): + included = [ + url(r'^namespaced/$', mock_view, name='another'), + url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail') + ] + + urlpatterns = [ + url(r'^v1/', include(included, namespace='v1')), + url(r'^another/$', mock_view, name='another'), + url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another'), + ] def test_reverse_unversioned(self): view = ReverseView.as_view() @@ -230,10 +228,18 @@ class TestInvalidVersion: assert response.status_code == status.HTTP_404_NOT_FOUND -class TestHyperlinkedRelatedField(APISimpleTestCase): - urls = 'tests.test_versioning' +class TestHyperlinkedRelatedField(UsingURLPatterns, APITestCase): + included = [ + url(r'^namespaced/(?P<pk>\d+)/$', mock_view, name='namespaced'), + ] + + urlpatterns = [ + url(r'^v1/', include(included, namespace='v1')), + url(r'^v2/', include(included, namespace='v2')) + ] def setUp(self): + super(TestHyperlinkedRelatedField, self).setUp() class HyperlinkedMockQueryset(MockQueryset): def get(self, **lookup): @@ -248,13 +254,15 @@ class TestHyperlinkedRelatedField(APISimpleTestCase): MockObject(pk=3, name='baz') ]) self.field = serializers.HyperlinkedRelatedField( - view_name='example-detail', + view_name='namespaced', queryset=self.queryset ) request = factory.post('/', urlconf='tests.test_versioning') request.versioning_scheme = NamespaceVersioning() + request.version = 'v1' self.field._context = {'request': request} def test_bug_2489(self): - self.field.to_internal_value('/example/3/') - self.field.to_internal_value('/v1/example/3/') + self.field.to_internal_value('/v1/namespaced/3/') + with pytest.raises(serializers.ValidationError): + self.field.to_internal_value('/v2/namespaced/3/') diff --git a/tests/utils.py b/tests/utils.py index 5b2d75864..b90349967 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -2,6 +2,30 @@ from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import NoReverseMatch +class UsingURLPatterns(object): + """ + Isolates URL patterns used during testing on the test class itself. + For example: + + class MyTestCase(UsingURLPatterns, TestCase): + urlpatterns = [ + ... + ] + + def test_something(self): + ... + """ + urls = __name__ + + def setUp(self): + global urlpatterns + urlpatterns = self.urlpatterns + + def tearDown(self): + global urlpatterns + urlpatterns = [] + + class MockObject(object): def __init__(self, **kwargs): self._kwargs = kwargs From f98f842827c6e79bbaa196482e3c3c549e8999c8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 5 Feb 2015 01:24:55 +0000 Subject: [PATCH 1560/1652] Minor bits of test cleanup --- tests/test_versioning.py | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/tests/test_versioning.py b/tests/test_versioning.py index cdd100656..553463d19 100644 --- a/tests/test_versioning.py +++ b/tests/test_versioning.py @@ -1,6 +1,5 @@ -from .utils import MockObject, MockQueryset, UsingURLPatterns +from .utils import UsingURLPatterns from django.conf.urls import include, url -from django.core.exceptions import ObjectDoesNotExist from rest_framework import serializers from rest_framework import status, versioning from rest_framework.decorators import APIView @@ -33,8 +32,8 @@ class RequestInvalidVersionView(APIView): factory = APIRequestFactory() -mock_view = lambda request: None -dummy_view = lambda request, pk: None +dummy_view = lambda request: None +dummy_pk_view = lambda request, pk: None class TestRequestVersion: @@ -112,14 +111,14 @@ class TestRequestVersion: class TestURLReversing(UsingURLPatterns, APITestCase): included = [ - url(r'^namespaced/$', mock_view, name='another'), - url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail') + url(r'^namespaced/$', dummy_view, name='another'), + url(r'^example/(?P<pk>\d+)/$', dummy_pk_view, name='example-detail') ] urlpatterns = [ url(r'^v1/', include(included, namespace='v1')), - url(r'^another/$', mock_view, name='another'), - url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another'), + url(r'^another/$', dummy_view, name='another'), + url(r'^(?P<version>[^/]+)/another/$', dummy_view, name='another'), ] def test_reverse_unversioned(self): @@ -230,7 +229,7 @@ class TestInvalidVersion: class TestHyperlinkedRelatedField(UsingURLPatterns, APITestCase): included = [ - url(r'^namespaced/(?P<pk>\d+)/$', mock_view, name='namespaced'), + url(r'^namespaced/(?P<pk>\d+)/$', dummy_view, name='namespaced'), ] urlpatterns = [ @@ -241,28 +240,20 @@ class TestHyperlinkedRelatedField(UsingURLPatterns, APITestCase): def setUp(self): super(TestHyperlinkedRelatedField, self).setUp() - class HyperlinkedMockQueryset(MockQueryset): - def get(self, **lookup): - for item in self.items: - if item.pk == int(lookup.get('pk', -1)): - return item - raise ObjectDoesNotExist() + class MockQueryset(object): + def get(self, pk): + return 'object %s' % pk - self.queryset = HyperlinkedMockQueryset([ - MockObject(pk=1, name='foo'), - MockObject(pk=2, name='bar'), - MockObject(pk=3, name='baz') - ]) self.field = serializers.HyperlinkedRelatedField( view_name='namespaced', - queryset=self.queryset + queryset=MockQueryset() ) - request = factory.post('/', urlconf='tests.test_versioning') + request = factory.get('/') request.versioning_scheme = NamespaceVersioning() request.version = 'v1' self.field._context = {'request': request} def test_bug_2489(self): - self.field.to_internal_value('/v1/namespaced/3/') + assert self.field.to_internal_value('/v1/namespaced/3/') == 'object 3' with pytest.raises(serializers.ValidationError): self.field.to_internal_value('/v2/namespaced/3/') From 48fa77c09e2198c7877a724a46230caedcc7b529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Wed, 4 Feb 2015 23:33:59 -0400 Subject: [PATCH 1561/1652] Add child to ListField when using ArrayField --- rest_framework/serializers.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 520b97748..84e4961b9 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -986,15 +986,25 @@ class ModelSerializer(Serializer): # Fields with choices get coerced into `ChoiceField` # instead of using their regular typed field. field_class = ChoiceField + if not issubclass(field_class, ModelField): # `model_field` is only valid for the fallback case of # `ModelField`, which is used when no other typed field # matched to the model field. field_kwargs.pop('model_field', None) + if not issubclass(field_class, CharField) and not issubclass(field_class, ChoiceField): # `allow_blank` is only valid for textual fields. field_kwargs.pop('allow_blank', None) + if postgres_fields and isinstance(model_field, postgres_fields.ArrayField): + child_model_field = model_field.base_field.base_field + child_field_class, child_field_kwargs = self.build_standard_field( + 'child', child_model_field + ) + + field_kwargs['child'] = child_field_class(**child_field_kwargs) + return field_class, field_kwargs def build_relational_field(self, field_name, relation_info): From c696b0ba0ced9527c8f4ad1bf6f71546d8fa65c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Thu, 5 Feb 2015 10:12:14 -0400 Subject: [PATCH 1562/1652] Fix possible nested array fields --- rest_framework/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 84e4961b9..188219583 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -998,7 +998,7 @@ class ModelSerializer(Serializer): field_kwargs.pop('allow_blank', None) if postgres_fields and isinstance(model_field, postgres_fields.ArrayField): - child_model_field = model_field.base_field.base_field + child_model_field = model_field.base_field child_field_class, child_field_kwargs = self.build_standard_field( 'child', child_model_field ) From fffde8a63be7660e716672c500f0f2bd66c7d345 Mon Sep 17 00:00:00 2001 From: Kaptian <ken.montero@gmail.com> Date: Thu, 5 Feb 2015 13:27:26 -0800 Subject: [PATCH 1563/1652] Update throttling.py Use pk pseudo attribute for identifying the user (in case the user model is not the default and has a different column name for the unique id) --- rest_framework/throttling.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index 0f10136d6..261fc2463 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -191,7 +191,7 @@ class UserRateThrottle(SimpleRateThrottle): def get_cache_key(self, request, view): if request.user.is_authenticated(): - ident = request.user.id + ident = request.user.pk else: ident = self.get_ident(request) @@ -239,7 +239,7 @@ class ScopedRateThrottle(SimpleRateThrottle): with the '.throttle_scope` property of the view. """ if request.user.is_authenticated(): - ident = request.user.id + ident = request.user.pk else: ident = self.get_ident(request) From 6c63ef13cd9ff8432f15d55a7268f2d402ae38e8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Feb 2015 00:04:20 +0000 Subject: [PATCH 1564/1652] Drop 2.x announcements --- docs/index.md | 10 +- docs/topics/3.1-announcement.md | 2 +- docs/topics/release-notes.md | 583 +------------------------------- env/pip-selfcheck.json | 1 + mkdocs.yml | 5 +- 5 files changed, 7 insertions(+), 594 deletions(-) create mode 100644 env/pip-selfcheck.json diff --git a/docs/index.md b/docs/index.md index c3a9c2d4f..cd243f357 100644 --- a/docs/index.md +++ b/docs/index.md @@ -195,11 +195,8 @@ General guides to using REST framework. * [Third Party Resources][third-party-resources] * [Contributing to REST framework][contributing] * [Project management][project-management] -* [2.0 Announcement][rest-framework-2-announcement] -* [2.2 Announcement][2.2-announcement] -* [2.3 Announcement][2.3-announcement] -* [2.4 Announcement][2.4-announcement] * [3.0 Announcement][3.0-announcement] +* [3.1 Announcement][3.1-announcement] * [Kickstarter Announcement][kickstarter-announcement] * [Release Notes][release-notes] * [Credits][credits] @@ -313,11 +310,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [contributing]: topics/contributing.md [project-management]: topics/project-management.md [third-party-resources]: topics/third-party-resources.md -[rest-framework-2-announcement]: topics/rest-framework-2-announcement.md -[2.2-announcement]: topics/2.2-announcement.md -[2.3-announcement]: topics/2.3-announcement.md -[2.4-announcement]: topics/2.4-announcement.md [3.0-announcement]: topics/3.0-announcement.md +[3.1-announcement]: topics/3.1-announcement.md [kickstarter-announcement]: topics/kickstarter-announcement.md [release-notes]: topics/release-notes.md [credits]: topics/credits.md diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index d59863602..89e99f82a 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -26,7 +26,7 @@ The cursor based pagination renders a more simple 'Previous'/'Next' control. The pagination API was previously only able to alter the pagination style in the body of the response. The API now supports being able to write pagination information in response headers, making it possible to use pagination schemes that use the `Link` or `Content-Range` headers. -**TODO**: Link to docs. +For more information, see the [custom pagination styles](../api-guide/pagination/#custom-pagination-styles) documentation. ## Versioning diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index e0894d2d9..88732df80 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -124,598 +124,19 @@ For full details see the [3.0 release announcement](3.0-announcement.md). --- -## 2.4.x series - -### 2.4.4 - -**Date**: [3rd November 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.4+Release%22+). - -* **Security fix**: Escape URLs when replacing `format=` query parameter, as used in dropdown on `GET` button in browsable API to allow explicit selection of JSON vs HTML output. -* Maintain ordering of URLs in API root view for `DefaultRouter`. -* Fix `follow=True` in `APIRequestFactory` -* Resolve issue with invalid `read_only=True`, `required=True` fields being automatically generated by `ModelSerializer` in some cases. -* Resolve issue with `OPTIONS` requests returning incorrect information for views using `get_serializer_class` to dynamically determine serializer based on request method. - -### 2.4.3 - -**Date**: [19th September 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.3+Release%22+). - -* Support translatable view docstrings being displayed in the browsable API. -* Support [encoded `filename*`][rfc-6266] in raw file uploads with `FileUploadParser`. -* Allow routers to support viewsets that don't include any list routes or that don't include any detail routes. -* Don't render an empty login control in browsable API if `login` view is not included. -* CSRF exemption performed in `.as_view()` to prevent accidental omission if overriding `.dispatch()`. -* Login on browsable API now displays validation errors. -* Bugfix: Fix migration in `authtoken` application. -* Bugfix: Allow selection of integer keys in nested choices. -* Bugfix: Return `None` instead of `'None'` in `CharField` with `allow_none=True`. -* Bugfix: Ensure custom model fields map to equivelent serializer fields more reliably. -* Bugfix: `DjangoFilterBackend` no longer quietly changes queryset ordering. - -### 2.4.2 - -**Date**: [3rd September 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.2+Release%22+). - -* Bugfix: Fix broken pagination for 2.4.x series. - -### 2.4.1 - -**Date**: [1st September 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.1+Release%22+). - -* Bugfix: Fix broken login template for browsable API. - -### 2.4.0 - -**Date**: [29th August 2014](https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%222.4.0+Release%22+). - -**Django version requirements**: The lowest supported version of Django is now 1.4.2. - -**South version requirements**: This note applies to any users using the optional `authtoken` application, which includes an associated database migration. You must now *either* upgrade your `south` package to version 1.0, *or* instead use the built-in migration support available with Django 1.7. - -* Added compatibility with Django 1.7's database migration support. -* New test runner, using `py.test`. -* Deprecated `.model` view attribute in favor of explicit `.queryset` and `.serializer_class` attributes. The `DEFAULT_MODEL_SERIALIZER_CLASS` setting is also deprecated. -* `@detail_route` and `@list_route` decorators replace `@action` and `@link`. -* Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. -* Added `NUM_PROXIES` setting for smarter client IP identification. -* Added `MAX_PAGINATE_BY` setting and `max_paginate_by` generic view attribute. -* Added `Retry-After` header to throttled responses, as per [RFC 6585](http://tools.ietf.org/html/rfc6585). This should now be used in preference to the custom `X-Trottle-Wait-Seconds` header which will be fully deprecated in 3.0. -* Added `cache` attribute to throttles to allow overriding of default cache. -* Added `lookup_value_regex` attribute to routers, to allow the URL argument matching to be constrainted by the user. -* Added `allow_none` option to `CharField`. -* Support Django's standard `status_code` class attribute on responses. -* More intuitive behavior on the test client, as `client.logout()` now also removes any credentials that have been set. -* Bugfix: `?page_size=0` query parameter now falls back to default page size for view, instead of always turning pagination off. -* Bugfix: Always uppercase `X-Http-Method-Override` methods. -* Bugfix: Copy `filter_backends` list before returning it, in order to prevent view code from mutating the class attribute itself. -* Bugfix: Set the `.action` attribute on viewsets when introspected by `OPTIONS` for testing permissions on the view. -* Bugfix: Ensure `ValueError` raised during deserialization results in a error list rather than a single error. This is now consistent with other validation errors. -* Bugfix: Fix `cache_format` typo on throttle classes, was `"throtte_%(scope)s_%(ident)s"`. Note that this will invalidate existing throttle caches. - ---- - -## 2.3.x series - -### 2.3.14 - -**Date**: 12th June 2014 - -* **Security fix**: Escape request path when it is include as part of the login and logout links in the browsable API. -* `help_text` and `verbose_name` automatically set for related fields on `ModelSerializer`. -* Fix nested serializers linked through a backward foreign key relation. -* Fix bad links for the `BrowsableAPIRenderer` with `YAMLRenderer`. -* Add `UnicodeYAMLRenderer` that extends `YAMLRenderer` with unicode. -* Fix `parse_header` argument convertion. -* Fix mediatype detection under Python 3. -* Web browsable API now offers blank option on dropdown when the field is not required. -* `APIException` representation improved for logging purposes. -* Allow source="*" within nested serializers. -* Better support for custom oauth2 provider backends. -* Fix field validation if it's optional and has no value. -* Add `SEARCH_PARAM` and `ORDERING_PARAM`. -* Fix `APIRequestFactory` to support arguments within the url string for GET. -* Allow three transport modes for access tokens when accessing a protected resource. -* Fix `QueryDict` encoding on request objects. -* Ensure throttle keys do not contain spaces, as those are invalid if using `memcached`. -* Support `blank_display_value` on `ChoiceField`. - -### 2.3.13 - -**Date**: 6th March 2014 - -* Django 1.7 Support. -* Fix `default` argument when used with serializer relation fields. -* Display the media type of the content that is being displayed in the browsable API, rather than 'text/html'. -* Bugfix for `urlize` template failure when URL regex is matched, but value does not `urlparse`. -* Use `urandom` for token generation. -* Only use `Vary: Accept` when more than one renderer exists. - -### 2.3.12 - -**Date**: 15th January 2014 - -* **Security fix**: `OrderingField` now only allows ordering on readable serializer fields, or on fields explicitly specified using `ordering_fields`. This prevents users being able to order by fields that are not visible in the API, and exploiting the ordering of sensitive data such as password hashes. -* Bugfix: `write_only = True` fields now display in the browsable API. - -### 2.3.11 - -**Date**: 14th January 2014 - -* Added `write_only` serializer field argument. -* Added `write_only_fields` option to `ModelSerializer` classes. -* JSON renderer now deals with objects that implement a dict-like interface. -* Fix compatiblity with newer versions of `django-oauth-plus`. -* Bugfix: Refine behavior that calls model manager `all()` across nested serializer relationships, preventing erronous behavior with some non-ORM objects, and preventing unnecessary queryset re-evaluations. -* Bugfix: Allow defaults on BooleanFields to be properly honored when values are not supplied. -* Bugfix: Prevent double-escaping of non-latin1 URL query params when appending `format=json` params. - -### 2.3.10 - -**Date**: 6th December 2013 - -* Add in choices information for ChoiceFields in response to `OPTIONS` requests. -* Added `pre_delete()` and `post_delete()` method hooks. -* Added status code category helper functions. -* Bugfix: Partial updates which erronously set a related field to `None` now correctly fail validation instead of raising an exception. -* Bugfix: Responses without any content no longer include an HTTP `'Content-Type'` header. -* Bugfix: Correctly handle validation errors in PUT-as-create case, responding with 400. - -### 2.3.9 - -**Date**: 15th November 2013 - -* Fix Django 1.6 exception API compatibility issue caused by `ValidationError`. -* Include errors in HTML forms in browsable API. -* Added JSON renderer support for numpy scalars. -* Added `transform_<fieldname>` hooks on serializers for easily modifying field output. -* Added `get_context` hook in `BrowsableAPIRenderer`. -* Allow serializers to be passed `files` but no `data`. -* `HTMLFormRenderer` now renders serializers directly to HTML without needing to create an intermediate form object. -* Added `get_filter_backends` hook. -* Added queryset aggregates to allowed fields in `OrderingFilter`. -* Bugfix: Fix decimal suppoprt with `YAMLRenderer`. -* Bugfix: Fix submission of unicode in browsable API through raw data form. - -### 2.3.8 - -**Date**: 11th September 2013 - -* Added `DjangoObjectPermissions`, and `DjangoObjectPermissionsFilter`. -* Support customizable exception handling, using the `EXCEPTION_HANDLER` setting. -* Support customizable view name and description functions, using the `VIEW_NAME_FUNCTION` and `VIEW_DESCRIPTION_FUNCTION` settings. -* Added `MAX_PAGINATE_BY` setting and `max_paginate_by` generic view attribute. -* Added `cache` attribute to throttles to allow overriding of default cache. -* 'Raw data' tab in browsable API now contains pre-populated data. -* 'Raw data' and 'HTML form' tab preference in browsable API now saved between page views. -* Bugfix: `required=True` argument fixed for boolean serializer fields. -* Bugfix: `client.force_authenticate(None)` should also clear session info if it exists. -* Bugfix: Client sending empty string instead of file now clears `FileField`. -* Bugfix: Empty values on ChoiceFields with `required=False` now consistently return `None`. -* Bugfix: Clients setting `page_size=0` now simply returns the default page size, instead of disabling pagination. [*] - ---- - -[*] Note that the change in `page_size=0` behaviour fixes what is considered to be a bug in how clients can effect the pagination size. However if you were relying on this behavior you will need to add the following mixin to your list views in order to preserve the existing behavior. - - class DisablePaginationMixin(object): - def get_paginate_by(self, queryset=None): - if self.request.QUERY_PARAMS[self.paginate_by_param] == '0': - return None - return super(DisablePaginationMixin, self).get_paginate_by(queryset) - ---- - -### 2.3.7 - -**Date**: 16th August 2013 - -* Added `APITestClient`, `APIRequestFactory` and `APITestCase` etc... -* Refactor `SessionAuthentication` to allow esier override for CSRF exemption. -* Remove 'Hold down "Control" message from help_text' widget messaging when not appropriate. -* Added admin configuration for auth tokens. -* Bugfix: `AnonRateThrottle` fixed to not throttle authenticated users. -* Bugfix: Don't set `X-Throttle-Wait-Seconds` when throttle does not have `wait` value. -* Bugfix: Fixed `PATCH` button title in browsable API. -* Bugfix: Fix issue with OAuth2 provider naive datetimes. - -### 2.3.6 - -**Date**: 27th June 2013 - -* Added `trailing_slash` option to routers. -* Include support for `HttpStreamingResponse`. -* Support wider range of default serializer validation when used with custom model fields. -* UTF-8 Support for browsable API descriptions. -* OAuth2 provider uses timezone aware datetimes when supported. -* Bugfix: Return error correctly when OAuth non-existent consumer occurs. -* Bugfix: Allow `FileUploadParser` to correctly filename if provided as URL kwarg. -* Bugfix: Fix `ScopedRateThrottle`. - -### 2.3.5 - -**Date**: 3rd June 2013 - -* Added `get_url` hook to `HyperlinkedIdentityField`. -* Serializer field `default` argument may be a callable. -* `@action` decorator now accepts a `methods` argument. -* Bugfix: `request.user` should be still be accessible in renderer context if authentication fails. -* Bugfix: The `lookup_field` option on `HyperlinkedIdentityField` should apply by default to the url field on the serializer. -* Bugfix: `HyperlinkedIdentityField` should continue to support `pk_url_kwarg`, `slug_url_kwarg`, `slug_field`, in a pending deprecation state. -* Bugfix: Ensure we always return 404 instead of 500 if a lookup field cannot be converted to the correct lookup type. (Eg non-numeric `AutoInteger` pk lookup) - -### 2.3.4 - -**Date**: 24th May 2013 - -* Serializer fields now support `label` and `help_text`. -* Added `UnicodeJSONRenderer`. -* `OPTIONS` requests now return metadata about fields for `POST` and `PUT` requests. -* Bugfix: `charset` now properly included in `Content-Type` of responses. -* Bugfix: Blank choice now added in browsable API on nullable relationships. -* Bugfix: Many to many relationships with `through` tables are now read-only. -* Bugfix: Serializer fields now respect model field args such as `max_length`. -* Bugfix: SlugField now performs slug validation. -* Bugfix: Lazy-translatable strings now properly serialized. -* Bugfix: Browsable API now supports bootswatch styles properly. -* Bugfix: HyperlinkedIdentityField now uses `lookup_field` kwarg. - -**Note**: Responses now correctly include an appropriate charset on the `Content-Type` header. For example: `application/json; charset=utf-8`. If you have tests that check the content type of responses, you may need to update these accordingly. - -### 2.3.3 - -**Date**: 16th May 2013 - -* Added SearchFilter -* Added OrderingFilter -* Added GenericViewSet -* Bugfix: Multiple `@action` and `@link` methods now allowed on viewsets. -* Bugfix: Fix API Root view issue with DjangoModelPermissions - -### 2.3.2 - -**Date**: 8th May 2013 - -* Bugfix: Fix `TIME_FORMAT`, `DATETIME_FORMAT` and `DATE_FORMAT` settings. -* Bugfix: Fix `DjangoFilterBackend` issue, failing when used on view with queryset attribute. - -### 2.3.1 - -**Date**: 7th May 2013 - -* Bugfix: Fix breadcrumb rendering issue. - -### 2.3.0 - -**Date**: 7th May 2013 - -* ViewSets and Routers. -* ModelSerializers support reverse relations in 'fields' option. -* HyperLinkedModelSerializers support 'id' field in 'fields' option. -* Cleaner generic views. -* Support for multiple filter classes. -* FileUploadParser support for raw file uploads. -* DecimalField support. -* Made Login template easier to restyle. -* Bugfix: Fix issue with depth>1 on ModelSerializer. - -**Note**: See the [2.3 announcement][2.3-announcement] for full details. - ---- - -## 2.2.x series - -### 2.2.7 - -**Date**: 17th April 2013 - -* Loud failure when view does not return a `Response` or `HttpResponse`. -* Bugfix: Fix for Django 1.3 compatibility. -* Bugfix: Allow overridden `get_object()` to work correctly. - -### 2.2.6 - -**Date**: 4th April 2013 - -* OAuth2 authentication no longer requires unnecessary URL parameters in addition to the token. -* URL hyperlinking in browsable API now handles more cases correctly. -* Long HTTP headers in browsable API are broken in multiple lines when possible. -* Bugfix: Fix regression with DjangoFilterBackend not worthing correctly with single object views. -* Bugfix: OAuth should fail hard when invalid token used. -* Bugfix: Fix serializer potentially returning `None` object for models that define `__bool__` or `__len__`. - -### 2.2.5 - -**Date**: 26th March 2013 - -* Serializer support for bulk create and bulk update operations. -* Regression fix: Date and time fields return date/time objects by default. Fixes regressions caused by 2.2.2. See [#743][743] for more details. -* Bugfix: Fix 500 error is OAuth not attempted with OAuthAuthentication class installed. -* `Serializer.save()` now supports arbitrary keyword args which are passed through to the object `.save()` method. Mixins use `force_insert` and `force_update` where appropriate, resulting in one less database query. - -### 2.2.4 - -**Date**: 13th March 2013 - -* OAuth 2 support. -* OAuth 1.0a support. -* Support X-HTTP-Method-Override header. -* Filtering backends are now applied to the querysets for object lookups as well as lists. (Eg you can use a filtering backend to control which objects should 404) -* Deal with error data nicely when deserializing lists of objects. -* Extra override hook to configure `DjangoModelPermissions` for unauthenticated users. -* Bugfix: Fix regression which caused extra database query on paginated list views. -* Bugfix: Fix pk relationship bug for some types of 1-to-1 relations. -* Bugfix: Workaround for Django bug causing case where `Authtoken` could be registered for cascade delete from `User` even if not installed. - -### 2.2.3 - -**Date**: 7th March 2013 - -* Bugfix: Fix None values for for `DateField`, `DateTimeField` and `TimeField`. - -### 2.2.2 - -**Date**: 6th March 2013 - -* Support for custom input and output formats for `DateField`, `DateTimeField` and `TimeField`. -* Cleanup: Request authentication is no longer lazily evaluated, instead authentication is always run, which results in more consistent, obvious behavior. Eg. Supplying bad auth credentials will now always return an error response, even if no permissions are set on the view. -* Bugfix for serializer data being uncacheable with pickle protocol 0. -* Bugfixes for model field validation edge-cases. -* Bugfix for authtoken migration while using a custom user model and south. - -### 2.2.1 - -**Date**: 22nd Feb 2013 - -* Security fix: Use `defusedxml` package to address XML parsing vulnerabilities. -* Raw data tab added to browsable API. (Eg. Allow for JSON input.) -* Added TimeField. -* Serializer fields can be mapped to any method that takes no args, or only takes kwargs which have defaults. -* Unicode support for view names/descriptions in browsable API. -* Bugfix: request.DATA should return an empty `QueryDict` with no data, not `None`. -* Bugfix: Remove unneeded field validation, which caused extra queries. - -**Security note**: Following the [disclosure of security vulnerabilities][defusedxml-announce] in Python's XML parsing libraries, use of the `XMLParser` class now requires the `defusedxml` package to be installed. - -The security vulnerabilities only affect APIs which use the `XMLParser` class, by enabling it in any views, or by having it set in the `DEFAULT_PARSER_CLASSES` setting. Note that the `XMLParser` class is not enabled by default, so this change should affect a minority of users. - -### 2.2.0 - -**Date**: 13th Feb 2013 - -* Python 3 support. -* Added a `post_save()` hook to the generic views. -* Allow serializers to handle dicts as well as objects. -* Deprecate `ManyRelatedField()` syntax in favor of `RelatedField(many=True)` -* Deprecate `null=True` on relations in favor of `required=False`. -* Deprecate `blank=True` on CharFields, just use `required=False`. -* Deprecate optional `obj` argument in permissions checks in favor of `has_object_permission`. -* Deprecate implicit hyperlinked relations behavior. -* Bugfix: Fix broken DjangoModelPermissions. -* Bugfix: Allow serializer output to be cached. -* Bugfix: Fix styling on browsable API login. -* Bugfix: Fix issue with deserializing empty to-many relations. -* Bugfix: Ensure model field validation is still applied for ModelSerializer subclasses with an custom `.restore_object()` method. - -**Note**: See the [2.2 announcement][2.2-announcement] for full details. - ---- - -## 2.1.x series - -### 2.1.17 - -**Date**: 26th Jan 2013 - -* Support proper 401 Unauthorized responses where appropriate, instead of always using 403 Forbidden. -* Support json encoding of timedelta objects. -* `format_suffix_patterns()` now supports `include` style URL patterns. -* Bugfix: Fix issues with custom pagination serializers. -* Bugfix: Nested serializers now accept `source='*'` argument. -* Bugfix: Return proper validation errors when incorrect types supplied for relational fields. -* Bugfix: Support nullable FKs with `SlugRelatedField`. -* Bugfix: Don't call custom validation methods if the field has an error. - -**Note**: If the primary authentication class is `TokenAuthentication` or `BasicAuthentication`, a view will now correctly return 401 responses to unauthenticated access, with an appropriate `WWW-Authenticate` header, instead of 403 responses. - -### 2.1.16 - -**Date**: 14th Jan 2013 - -* Deprecate `django.utils.simplejson` in favor of Python 2.6's built-in json module. -* Bugfix: `auto_now`, `auto_now_add` and other `editable=False` fields now default to read-only. -* Bugfix: PK fields now only default to read-only if they are an AutoField or if `editable=False`. -* Bugfix: Validation errors instead of exceptions when serializers receive incorrect types. -* Bugfix: Validation errors instead of exceptions when related fields receive incorrect types. -* Bugfix: Handle ObjectDoesNotExist exception when serializing null reverse one-to-one - -**Note**: Prior to 2.1.16, The Decimals would render in JSON using floating point if `simplejson` was installed, but otherwise render using string notation. Now that use of `simplejson` has been deprecated, Decimals will consistently render using string notation. See [ticket 582](ticket-582) for more details. - -### 2.1.15 - -**Date**: 3rd Jan 2013 - -* Added `PATCH` support. -* Added `RetrieveUpdateAPIView`. -* Remove unused internal `save_m2m` flag on `ModelSerializer.save()`. -* Tweak behavior of hyperlinked fields with an explicit format suffix. -* Relation changes are now persisted in `.save()` instead of in `.restore_object()`. -* Bugfix: Fix issue with FileField raising exception instead of validation error when files=None. -* Bugfix: Partial updates should not set default values if field is not included. - -### 2.1.14 - -**Date**: 31st Dec 2012 - -* Bugfix: ModelSerializers now include reverse FK fields on creation. -* Bugfix: Model fields with `blank=True` are now `required=False` by default. -* Bugfix: Nested serializers now support nullable relationships. - -**Note**: From 2.1.14 onwards, relational fields move out of the `fields.py` module and into the new `relations.py` module, in order to separate them from regular data type fields, such as `CharField` and `IntegerField`. - -This change will not affect user code, so long as it's following the recommended import style of `from rest_framework import serializers` and referring to fields using the style `serializers.PrimaryKeyRelatedField`. - - -### 2.1.13 - -**Date**: 28th Dec 2012 - -* Support configurable `STATICFILES_STORAGE` storage. -* Bugfix: Related fields now respect the required flag, and may be required=False. - -### 2.1.12 - -**Date**: 21st Dec 2012 - -* Bugfix: Fix bug that could occur using ChoiceField. -* Bugfix: Fix exception in browsable API on DELETE. -* Bugfix: Fix issue where pk was was being set to a string if set by URL kwarg. - -### 2.1.11 - -**Date**: 17th Dec 2012 - -* Bugfix: Fix issue with M2M fields in browsable API. - -### 2.1.10 - -**Date**: 17th Dec 2012 - -* Bugfix: Ensure read-only fields don't have model validation applied. -* Bugfix: Fix hyperlinked fields in paginated results. - -### 2.1.9 - -**Date**: 11th Dec 2012 - -* Bugfix: Fix broken nested serialization. -* Bugfix: Fix `Meta.fields` only working as tuple not as list. -* Bugfix: Edge case if unnecessarily specifying `required=False` on read only field. - -### 2.1.8 - -**Date**: 8th Dec 2012 - -* Fix for creating nullable Foreign Keys with `''` as well as `None`. -* Added `null=<bool>` related field option. - -### 2.1.7 - -**Date**: 7th Dec 2012 - -* Serializers now properly support nullable Foreign Keys. -* Serializer validation now includes model field validation, such as uniqueness constraints. -* Support 'true' and 'false' string values for BooleanField. -* Added pickle support for serialized data. -* Support `source='dotted.notation'` style for nested serializers. -* Make `Request.user` settable. -* Bugfix: Fix `RegexField` to work with `BrowsableAPIRenderer`. - -### 2.1.6 - -**Date**: 23rd Nov 2012 - -* Bugfix: Unfix DjangoModelPermissions. (I am a doofus.) - -### 2.1.5 - -**Date**: 23rd Nov 2012 - -* Bugfix: Fix DjangoModelPermissions. - -### 2.1.4 - -**Date**: 22nd Nov 2012 - -* Support for partial updates with serializers. -* Added `RegexField`. -* Added `SerializerMethodField`. -* Serializer performance improvements. -* Added `obtain_token_view` to get tokens when using `TokenAuthentication`. -* Bugfix: Django 1.5 configurable user support for `TokenAuthentication`. - -### 2.1.3 - -**Date**: 16th Nov 2012 - -* Added `FileField` and `ImageField`. For use with `MultiPartParser`. -* Added `URLField` and `SlugField`. -* Support for `read_only_fields` on `ModelSerializer` classes. -* Support for clients overriding the pagination page sizes. Use the `PAGINATE_BY_PARAM` setting or set the `paginate_by_param` attribute on a generic view. -* 201 Responses now return a 'Location' header. -* Bugfix: Serializer fields now respect `max_length`. - -### 2.1.2 - -**Date**: 9th Nov 2012 - -* **Filtering support.** -* Bugfix: Support creation of objects with reverse M2M relations. - -### 2.1.1 - -**Date**: 7th Nov 2012 - -* Support use of HTML exception templates. Eg. `403.html` -* Hyperlinked fields take optional `slug_field`, `slug_url_kwarg` and `pk_url_kwarg` arguments. -* Bugfix: Deal with optional trailing slashes properly when generating breadcrumbs. -* Bugfix: Make textareas same width as other fields in browsable API. -* Private API change: `.get_serializer` now uses same `instance` and `data` ordering as serializer initialization. - -### 2.1.0 - -**Date**: 5th Nov 2012 - -* **Serializer `instance` and `data` keyword args have their position swapped.** -* `queryset` argument is now optional on writable model fields. -* Hyperlinked related fields optionally take `slug_field` and `slug_url_kwarg` arguments. -* Support Django's cache framework. -* Minor field improvements. (Don't stringify dicts, more robust many-pk fields.) -* Bugfix: Support choice field in Browsable API. -* Bugfix: Related fields with `read_only=True` do not require a `queryset` argument. - -**API-incompatible changes**: Please read [this thread][2.1.0-notes] regarding the `instance` and `data` keyword args before updating to 2.1.0. - ---- - -## 2.0.x series - -### 2.0.2 - -**Date**: 2nd Nov 2012 - -* Fix issues with pk related fields in the browsable API. - -### 2.0.1 - -**Date**: 1st Nov 2012 - -* Add support for relational fields in the browsable API. -* Added SlugRelatedField and ManySlugRelatedField. -* If PUT creates an instance return '201 Created', instead of '200 OK'. - -### 2.0.0 - -**Date**: 30th Oct 2012 - -* **Fix all of the things.** (Well, almost.) -* For more information please see the [2.0 announcement][announcement]. - -For older release notes, [please see the GitHub repo](old-release-notes). +For older release notes, [please see the version 2.x documentation](old-release-notes). [cite]: http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/ar01s04.html [deprecation-policy]: #deprecation-policy [django-deprecation-policy]: https://docs.djangoproject.com/en/dev/internals/release-process/#internal-release-deprecation-policy [defusedxml-announce]: http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html -[2.2-announcement]: 2.2-announcement.md -[2.3-announcement]: 2.3-announcement.md [743]: https://github.com/tomchristie/django-rest-framework/pull/743 [staticfiles14]: https://docs.djangoproject.com/en/1.4/howto/static-files/#with-a-template-tag [staticfiles13]: https://docs.djangoproject.com/en/1.3/howto/static-files/#with-a-template-tag [2.1.0-notes]: https://groups.google.com/d/topic/django-rest-framework/Vv2M0CMY9bg/discussion -[announcement]: rest-framework-2-announcement.md [ticket-582]: https://github.com/tomchristie/django-rest-framework/issues/582 [rfc-6266]: http://tools.ietf.org/html/rfc6266#section-4.3 -[old-release-notes]: https://github.com/tomchristie/django-rest-framework/blob/2.4.4/docs/topics/release-notes.md#04x-series +[old-release-notes]: http://tomchristie.github.io/rest-framework-2-docs/topics/release-notes#24x-series [3.0.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22 [3.0.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.2+Release%22 diff --git a/env/pip-selfcheck.json b/env/pip-selfcheck.json new file mode 100644 index 000000000..77237c3c5 --- /dev/null +++ b/env/pip-selfcheck.json @@ -0,0 +1 @@ +{"last_check":"2015-02-05T23:51:53Z","pypi_version":"6.0.8"} \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index 89df4cea5..57b450545 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -50,11 +50,8 @@ pages: - ['topics/third-party-resources.md', 'Topics', 'Third Party Resources'] - ['topics/contributing.md', 'Topics', 'Contributing to REST framework'] - ['topics/project-management.md', 'Topics', 'Project management'] - - ['topics/rest-framework-2-announcement.md', 'Topics', '2.0 Announcement'] - - ['topics/2.2-announcement.md', 'Topics', '2.2 Announcement'] - - ['topics/2.3-announcement.md', 'Topics', '2.3 Announcement'] - - ['topics/2.4-announcement.md', 'Topics', '2.4 Announcement'] - ['topics/3.0-announcement.md', 'Topics', '3.0 Announcement'] + - ['topics/3.1-announcement.md', 'Topics', '3.1 Announcement'] - ['topics/kickstarter-announcement.md', 'Topics', 'Kickstarter Announcement'] - ['topics/release-notes.md', 'Topics', 'Release Notes'] - ['topics/credits.md', 'Topics', 'Credits'] From b11a98f1e765b0b3c11cd353405bde8379057194 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Feb 2015 00:05:42 +0000 Subject: [PATCH 1565/1652] Tweak gitignore --- .gitignore | 1 + env/pip-selfcheck.json | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 env/pip-selfcheck.json diff --git a/.gitignore b/.gitignore index 2bdf8f7eb..4f2b0ddf4 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ bin/ include/ lib/ local/ +env/ !.gitignore !.travis.yml diff --git a/env/pip-selfcheck.json b/env/pip-selfcheck.json deleted file mode 100644 index 77237c3c5..000000000 --- a/env/pip-selfcheck.json +++ /dev/null @@ -1 +0,0 @@ -{"last_check":"2015-02-05T23:51:53Z","pypi_version":"6.0.8"} \ No newline at end of file From 09488ad4da321f5f15d6e3df348869b8f2116b4a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Feb 2015 00:25:03 +0000 Subject: [PATCH 1566/1652] Link to ModelSerializer API --- docs/topics/3.1-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 89e99f82a..d0975f5b8 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -54,7 +54,7 @@ This work also means that we now have both `serializers.DictField()`, and `seria The serializer redesign in 3.0 did not include any public API for modifying how ModelSerializer classes automatically generate a set of fields from a given mode class. We've now re-introduced an API for this, allowing you to create new ModelSerializer base classes that behave differently, such as using a different default style for relationships. -**TODO**: Link to docs. +For more information, see the documentation on [customizing field mappings](../api-guide/serializers/#customizing-field-mappings) for ModelSerializer classes. ## Moving packages out of core From 5bf803b6ed260d9afde47400b7d5e8912a16ecf6 Mon Sep 17 00:00:00 2001 From: Michael Marvick <mmarvick@gmail.com> Date: Thu, 5 Feb 2015 19:42:36 -0800 Subject: [PATCH 1567/1652] Revert some of the changes made in 1-serialization.md --- docs/tutorial/1-serialization.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 458161d07..80e869ea6 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -151,7 +151,7 @@ We've now got a few snippet instances to play with. Let's take a look at serial serializer = SnippetSerializer(snippet) serializer.data - # ReturnDict([('pk', 2), ('title', u''), ('code', u'print "hello, world"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]) + # {'pk': 2, 'title': u'', 'code': u'print "hello, world"\n', 'linenos': False, 'language': u'python', 'style': u'friendly'} At this point we've translated the model instance into Python native datatypes. To finalize the serialization process we render the data into `json`. @@ -182,8 +182,7 @@ We can also serialize querysets instead of model instances. To do so we simply serializer = SnippetSerializer(Snippet.objects.all(), many=True) serializer.data - # [OrderedDict([('pk', 1), ('title', u''), ('code', u'foo = "bar"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]), OrderedDict([('pk', 2), ('title', u''), ('code', u'print "hello, world"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')]), OrderedDict([('pk', 3), ('title', u''), ('code', u'print "hello, world"\n'), ('linenos', False), ('language', 'python'), ('style', 'friendly')])] - + # [{'pk': 1, 'title': u'', 'code': u'foo = "bar"\n', 'linenos': False, 'language': u'python', 'style': u'friendly'}, {'pk': 2, 'title': u'', 'code': u'print "hello, world"\n', 'linenos': False, 'language': u'python', 'style': u'friendly'}] ## Using ModelSerializers From 7f801b9a01fa7df3b081ddec803bd0d34cc3b35b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 6 Feb 2015 01:09:19 -0400 Subject: [PATCH 1568/1652] Add trim_whitespace to CharField #2517 If set to `True` then leading and trailing whitespace is trimmed. Defaults to `True`. --- docs/api-guide/fields.md | 5 +++-- rest_framework/fields.py | 15 +++++++++++++-- tests/test_fields.py | 8 ++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 10291c12a..9c33974f9 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -138,11 +138,12 @@ A text representation. Optionally validates the text to be shorter than `max_len Corresponds to `django.db.models.fields.CharField` or `django.db.models.fields.TextField`. -**Signature:** `CharField(max_length=None, min_length=None, allow_blank=False)` +**Signature:** `CharField(max_length=None, min_length=None, allow_blank=False, trim_whitespace=True)` - `max_length` - Validates that the input contains no more than this number of characters. - `min_length` - Validates that the input contains no fewer than this number of characters. - `allow_blank` - If set to `True` then the empty string should be considered a valid value. If set to `False` then the empty string is considered invalid and will raise a validation error. Defaults to `False`. +- `trim_whitespace` - If set to `True` then leading and trailing whitespace is trimmed. Defaults to `True`. The `allow_null` option is also available for string fields, although its usage is discouraged in favor of `allow_blank`. It is valid to set both `allow_blank=True` and `allow_null=True`, but doing so means that there will be two differing types of empty value permissible for string representations, which can lead to data inconsistencies and subtle application bugs. @@ -524,7 +525,7 @@ As an example, let's create a field that can be used represent the class name of # We pass the object instance onto `to_representation`, # not just the field attribute. return obj - + def to_representation(self, obj): """ Serialize the object's class name. diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 02d2adeff..ecf0dc47b 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -555,6 +555,7 @@ class CharField(Field): def __init__(self, **kwargs): self.allow_blank = kwargs.pop('allow_blank', False) + self.trim_whitespace = kwargs.pop('trim_whitespace', True) max_length = kwargs.pop('max_length', None) min_length = kwargs.pop('min_length', None) super(CharField, self).__init__(**kwargs) @@ -576,10 +577,20 @@ class CharField(Field): return super(CharField, self).run_validation(data) def to_internal_value(self, data): - return six.text_type(data) + value = six.text_type(data) + + if self.trim_whitespace: + return value.strip() + + return value def to_representation(self, value): - return six.text_type(value) + representation = six.text_type(value) + + if self.trim_whitespace: + return representation.strip() + + return representation class EmailField(CharField): diff --git a/tests/test_fields.py b/tests/test_fields.py index 48ada7804..5a5418e65 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -410,6 +410,14 @@ class TestCharField(FieldValues): } field = serializers.CharField() + def test_trim_whitespace_default(self): + field = serializers.CharField() + assert field.to_representation(' abc ') == 'abc' + + def test_trim_whitespace_disabled(self): + field = serializers.CharField(trim_whitespace=False) + assert field.to_representation(' abc ') == ' abc ' + class TestEmailField(FieldValues): """ From 75ff754517c30df043de906b0a6fb0e1777570b7 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Fri, 6 Feb 2015 10:12:57 +0100 Subject: [PATCH 1569/1652] Use twine to upload to pypi. --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index efe39d8d4..391987bc9 100755 --- a/setup.py +++ b/setup.py @@ -48,8 +48,11 @@ if sys.argv[-1] == 'publish': if os.system("pip freeze | grep wheel"): print("wheel not installed.\nUse `pip install wheel`.\nExiting.") sys.exit() - os.system("python setup.py sdist upload") - os.system("python setup.py bdist_wheel upload") + if os.system("pip freeze | grep twine") + print("twine not installed.\nUse `pip install twine`.\nExiting.") + sys.exit() + os.system("python setup.py sdist bdist_wheel") + os.system("twine upload dist/*") print("You probably want to also tag the version now:") print(" git tag -a %s -m 'version %s'" % (version, version)) print(" git push --tags") From 9dd97a0ee515089a1f818007f23460cf83159e71 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Fri, 6 Feb 2015 10:23:58 +0100 Subject: [PATCH 1570/1652] Fixed a typo. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 391987bc9..4cdcfa86e 100755 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ if sys.argv[-1] == 'publish': if os.system("pip freeze | grep wheel"): print("wheel not installed.\nUse `pip install wheel`.\nExiting.") sys.exit() - if os.system("pip freeze | grep twine") + if os.system("pip freeze | grep twine"): print("twine not installed.\nUse `pip install twine`.\nExiting.") sys.exit() os.system("python setup.py sdist bdist_wheel") From 53716f61527266159c285b903da98ec432e52564 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Feb 2015 11:37:29 +0000 Subject: [PATCH 1571/1652] Internationalization docs --- docs/index.md | 2 - docs/topics/3.1-announcement.md | 77 +++++- docs/topics/credits.md | 404 ---------------------------- docs/topics/internationalization.md | 41 +++ mkdocs.yml | 1 - 5 files changed, 113 insertions(+), 412 deletions(-) delete mode 100644 docs/topics/credits.md diff --git a/docs/index.md b/docs/index.md index cd243f357..23781419f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -199,7 +199,6 @@ General guides to using REST framework. * [3.1 Announcement][3.1-announcement] * [Kickstarter Announcement][kickstarter-announcement] * [Release Notes][release-notes] -* [Credits][credits] ## Development @@ -314,7 +313,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [3.1-announcement]: topics/3.1-announcement.md [kickstarter-announcement]: topics/kickstarter-announcement.md [release-notes]: topics/release-notes.md -[credits]: topics/credits.md [tox]: http://testrun.org/tox/latest/ diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index d0975f5b8..080ef1d81 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -10,7 +10,7 @@ The pagination API has been improved, making it both easier to use, and more pow Until now, there has only been a single built-in pagination style in REST framework. We now have page, limit/offset and cursor based schemes included by default. -The cursor based pagination scheme is particularly smart, and is a better approach for clients iterating through large or frequently changing result sets. The scheme supports paging against non-unique indexes, by using both cursor and limit/offset information. Credit to David Cramer for [this blog post](http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/) on the subject. +The cursor based pagination scheme is particularly smart, and is a better approach for clients iterating through large or frequently changing result sets. The scheme supports paging against non-unique indexes, by using both cursor and limit/offset information. It also allows for both forward and reverse cursor pagination. Much credit goes to David Cramer for [this blog post](http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/) on the subject. #### Pagination controls in the browsable API. @@ -34,15 +34,74 @@ We've made it easier to build versioned APIs. Built-in schemes for versioning in When using a URL based scheme, hyperlinked serializers will resolve relationships to the same API version as used on the incoming request. -**TODO**: Example. +For example, when using `NamespaceVersioning`, and the following hyperlinked serializer: + + class AccountsSerializer(serializer.HyperlinkedModelSerializer): + class Meta: + model = Accounts + fields = ('account_name', 'users') + +The output representation would match the version used on the incoming request. Like so: + + GET http://example.org/v2/accounts/10 # Version 'v2' + + { + "account_name": "europa", + "users": [ + "http://example.org/v2/users/12", # Version 'v2' + "http://example.org/v2/users/54", + "http://example.org/v2/users/87" + ] + } ## Internationalization REST framework now includes a built-in set of translations, and supports internationalized error responses. This allows you to either change the default language, or to allow clients to specify the language via the `Accept-Language` header. -**TODO**: Example. +You can change the default language by using the standard Django `LANGUAGE_CODE` setting: -**TODO**: Credit. + LANGUAGE_CODE = "es-es" + +You can turn on per-request language requests by adding `LocalMiddleware` to your `MIDDLEWARE_CLASSES` setting: + + MIDDLEWARE_CLASSES = [ + ... + 'django.middleware.locale.LocaleMiddleware' + ] + +When per-request internationalization is enabled, client requests will respect the `Accept-Language` header where possible. For example, let's make a request for an unsupported media type: + +**Request** + + GET /api/users HTTP/1.1 + Accept: application/xml + Accept-Language: es-es + Host: example.org + +**Response** + + HTTP/1.0 406 NOT ACCEPTABLE + + { + "detail": "No se ha podido satisfacer la solicitud de cabecera de Accept." + } + +Note that the structure of the error responses is still the same. We still have a `details` key in the response. If needed you can modify this behavior too, by using a [custom exception handler][custom-exception-handler]. + +We include built-in translations both for standard exception cases, and for serializer validation errors. + +The full list of supported languages can be found on our [Transifex project page](https://www.transifex.com/projects/p/django-rest-framework/). + +If you only wish to support a subset of the supported languages, use Django's standard `LANGUAGES` setting: + + LANGUAGES = [ + ('de', _('German')), + ('en', _('English')), + ] + +For more details, see the [internationalization documentation](internationalization.md). + +Many thanks to [Craig Blaszczyk](https://github.com/jakul) for helping push this through. ## New field types @@ -50,6 +109,10 @@ Django 1.8's new `ArrayField`, `HStoreField` and `UUIDField` are now all fully s This work also means that we now have both `serializers.DictField()`, and `serializers.ListField()` types, allowing you to express and validate a wider set of representations. +If you're building a new 1.8 project, then you should probably consider using `UUIDField` as the primary keys for all your models. This style will work automatically with hyperlinked serializers, returning URLs in the following style: + + http://example.org/api/purchases/9b1a433f-e90d-4948-848b-300fdc26365d + ## ModelSerializer API The serializer redesign in 3.0 did not include any public API for modifying how ModelSerializer classes automatically generate a set of fields from a given mode class. We've now re-introduced an API for this, allowing you to create new ModelSerializer base classes that behave differently, such as using a different default style for relationships. @@ -85,6 +148,8 @@ And modify your settings, like so: ] } +Thanks go to the latest member of our maintenance team, [José Padilla](https://github.com/jpadilla/), for handling this work and taking on ownership of these packages. + # What's next? The next focus will be on HTML renderings of API output and will include: @@ -93,4 +158,6 @@ The next focus will be on HTML renderings of API output and will include: * Filtering controls built-in to the browsable API. * An alternative admin-style interface. -This will either be made as a single 3.2 release, or split across two separate releases, with the HTML forms and filter controls coming in 3.2, and the admin-style interface coming in a 3.3 release. \ No newline at end of file +This will either be made as a single 3.2 release, or split across two separate releases, with the HTML forms and filter controls coming in 3.2, and the admin-style interface coming in a 3.3 release. + +[custom-exception-handler]: ../api-guide/exceptions.md#custom-exception-handling diff --git a/docs/topics/credits.md b/docs/topics/credits.md deleted file mode 100644 index 5f0dc7522..000000000 --- a/docs/topics/credits.md +++ /dev/null @@ -1,404 +0,0 @@ -# Credits - -The following people have helped make REST framework great. - -* Tom Christie - [tomchristie] -* Marko Tibold - [markotibold] -* Paul Miller - [paulmillr] -* Sébastien Piquemal - [sebpiq] -* Carmen Wick - [cwick] -* Alex Ehlke - [aehlke] -* Alen Mujezinovic - [flashingpumpkin] -* Carles Barrobés - [txels] -* Michael Fötsch - [mfoetsch] -* David Larlet - [david] -* Andrew Straw - [astraw] -* Zeth - [zeth] -* Fernando Zunino - [fzunino] -* Jens Alm - [ulmus] -* Craig Blaszczyk - [jakul] -* Garcia Solero - [garciasolero] -* Tom Drummond - [devioustree] -* Danilo Bargen - [dbrgn] -* Andrew McCloud - [amccloud] -* Thomas Steinacher - [thomasst] -* Meurig Freeman - [meurig] -* Anthony Nemitz - [anemitz] -* Ewoud Kohl van Wijngaarden - [ekohl] -* Michael Ding - [yandy] -* Mjumbe Poe - [mjumbewu] -* Natim - [natim] -* Sebastian Żurek - [sebzur] -* Benoit C - [dzen] -* Chris Pickett - [bunchesofdonald] -* Ben Timby - [btimby] -* Michele Lazzeri - [michelelazzeri-nextage] -* Camille Harang - [mammique] -* Paul Oswald - [poswald] -* Sean C. Farley - [scfarley] -* Daniel Izquierdo - [izquierdo] -* Can Yavuz - [tschan] -* Shawn Lewis - [shawnlewis] -* Alec Perkins - [alecperkins] -* Michael Barrett - [phobologic] -* Mathieu Dhondt - [laundromat] -* Johan Charpentier - [cyberj] -* Jamie Matthews - [j4mie] -* Mattbo - [mattbo] -* Max Hurl - [maximilianhurl] -* Tomi Pajunen - [eofs] -* Rob Dobson - [rdobson] -* Daniel Vaca Araujo - [diviei] -* Madis Väin - [madisvain] -* Stephan Groß - [minddust] -* Pavel Savchenko - [asfaltboy] -* Otto Yiu - [ottoyiu] -* Jacob Magnusson - [jmagnusson] -* Osiloke Harold Emoekpere - [osiloke] -* Michael Shepanski - [mjs7231] -* Toni Michel - [tonimichel] -* Ben Konrath - [benkonrath] -* Marc Aymerich - [glic3rinu] -* Ludwig Kraatz - [ludwigkraatz] -* Rob Romano - [robromano] -* Eugene Mechanism - [mechanism] -* Jonas Liljestrand - [jonlil] -* Justin Davis - [irrelative] -* Dustin Bachrach - [dbachrach] -* Mark Shirley - [maspwr] -* Olivier Aubert - [oaubert] -* Yuri Prezument - [yprez] -* Fabian Buechler - [fabianbuechler] -* Mark Hughes - [mhsparks] -* Michael van de Waeter - [mvdwaeter] -* Reinout van Rees - [reinout] -* Michael Richards - [justanotherbody] -* Ben Roberts - [roberts81] -* Venkata Subramanian Mahalingam - [annacoder] -* George Kappel - [gkappel] -* Colin Murtaugh - [cmurtaugh] -* Simon Pantzare - [pilt] -* Szymon Teżewski - [sunscrapers] -* Joel Marcotte - [joual] -* Trey Hunner - [treyhunner] -* Roman Akinfold - [akinfold] -* Toran Billups - [toranb] -* Sébastien Béal - [sebastibe] -* Andrew Hankinson - [ahankinson] -* Juan Riaza - [juanriaza] -* Michael Mior - [michaelmior] -* Marc Tamlyn - [mjtamlyn] -* Richard Wackerbarth - [wackerbarth] -* Johannes Spielmann - [shezi] -* James Cleveland - [radiosilence] -* Steve Gregory - [steve-gregory] -* Federico Capoano - [nemesisdesign] -* Bruno Renié - [brutasse] -* Kevin Stone - [kevinastone] -* Guglielmo Celata - [guglielmo] -* Mike Tums - [mktums] -* Michael Elovskikh - [wronglink] -* Michał Jaworski - [swistakm] -* Andrea de Marco - [z4r] -* Fernando Rocha - [fernandogrd] -* Xavier Ordoquy - [xordoquy] -* Adam Wentz - [floppya] -* Andreas Pelme - [pelme] -* Ryan Detzel - [ryanrdetzel] -* Omer Katz - [thedrow] -* Wiliam Souza - [waa] -* Jonas Braun - [iekadou] -* Ian Dash - [bitmonkey] -* Bouke Haarsma - [bouke] -* Pierre Dulac - [dulaccc] -* Dave Kuhn - [kuhnza] -* Sitong Peng - [stoneg] -* Victor Shih - [vshih] -* Atle Frenvik Sveen - [atlefren] -* J Paul Reed - [preed] -* Matt Majewski - [forgingdestiny] -* Jerome Chen - [chenjyw] -* Andrew Hughes - [eyepulp] -* Daniel Hepper - [dhepper] -* Hamish Campbell - [hamishcampbell] -* Marlon Bailey - [avinash240] -* James Summerfield - [jsummerfield] -* Andy Freeland - [rouge8] -* Craig de Stigter - [craigds] -* Pablo Recio - [pyriku] -* Brian Zambrano - [brianz] -* Òscar Vilaplana - [grimborg] -* Ryan Kaskel - [ryankask] -* Andy McKay - [andymckay] -* Matteo Suppo - [matteosuppo] -* Karol Majta - [lolek09] -* David Jones - [commonorgarden] -* Andrew Tarzwell - [atarzwell] -* Michal Dvořák - [mikee2185] -* Markus Törnqvist - [mjtorn] -* Pascal Borreli - [pborreli] -* Alex Burgel - [aburgel] -* David Medina - [copitux] -* Areski Belaid - [areski] -* Ethan Freman - [mindlace] -* David Sanders - [davesque] -* Philip Douglas - [freakydug] -* Igor Kalat - [trwired] -* Rudolf Olah - [omouse] -* Gertjan Oude Lohuis - [gertjanol] -* Matthias Jacob - [cyroxx] -* Pavel Zinovkin - [pzinovkin] -* Will Kahn-Greene - [willkg] -* Kevin Brown - [kevin-brown] -* Rodrigo Martell - [coderigo] -* James Rutherford - [jimr] -* Ricky Rosario - [rlr] -* Veronica Lynn - [kolvia] -* Dan Stephenson - [etos] -* Martin Clement - [martync] -* Jeremy Satterfield - [jsatt] -* Christopher Paolini - [chrispaolini] -* Filipe A Ximenes - [filipeximenes] -* Ramiro Morales - [ramiro] -* Krzysztof Jurewicz - [krzysiekj] -* Eric Buehl - [ericbuehl] -* Kristian Øllegaard - [kristianoellegaard] -* Alexander Akhmetov - [alexander-akhmetov] -* Andrey Antukh - [niwibe] -* Mathieu Pillard - [diox] -* Edmond Wong - [edmondwong] -* Ben Reilly - [bwreilly] -* Tai Lee - [mrmachine] -* Markus Kaiserswerth - [mkai] -* Henry Clifford - [hcliff] -* Thomas Badaud - [badale] -* Colin Huang - [tamakisquare] -* Ross McFarland - [ross] -* Jacek Bzdak - [jbzdak] -* Alexander Lukanin - [alexanderlukanin13] -* Yamila Moreno - [yamila-moreno] -* Rob Hudson - [robhudson] -* Alex Good - [alexjg] -* Ian Foote - [ian-foote] -* Chuck Harmston - [chuckharmston] -* Philip Forget - [philipforget] -* Artem Mezhenin - [amezhenin] - -Many thanks to everyone who's contributed to the project. - -## Additional thanks - -The documentation is built with [Bootstrap] and [Markdown]. - -Project hosting is with [GitHub]. - -Continuous integration testing is managed with [Travis CI][travis-ci]. - -The [live sandbox][sandbox] is hosted on [Heroku]. - -Various inspiration taken from the [Rails], [Piston], [Tastypie], [Dagny] and [django-viewsets] projects. - -Development of REST framework 2.0 was sponsored by [DabApps]. - -## Contact - -For usage questions please see the [REST framework discussion group][group]. - -You can also contact [@_tomchristie][twitter] directly on twitter. - -[twitter]: http://twitter.com/_tomchristie -[bootstrap]: http://twitter.github.com/bootstrap/ -[markdown]: http://daringfireball.net/projects/markdown/ -[github]: https://github.com/tomchristie/django-rest-framework -[travis-ci]: https://secure.travis-ci.org/tomchristie/django-rest-framework -[rails]: http://rubyonrails.org/ -[piston]: https://bitbucket.org/jespern/django-piston -[tastypie]: https://github.com/toastdriven/django-tastypie -[dagny]: https://github.com/zacharyvoase/dagny -[django-viewsets]: https://github.com/BertrandBordage/django-viewsets -[dabapps]: http://lab.dabapps.com -[sandbox]: http://restframework.herokuapp.com/ -[heroku]: http://www.heroku.com/ -[group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework - -[tomchristie]: https://github.com/tomchristie -[markotibold]: https://github.com/markotibold -[paulmillr]: https://github.com/paulmillr -[sebpiq]: https://github.com/sebpiq -[cwick]: https://github.com/cwick -[aehlke]: https://github.com/aehlke -[flashingpumpkin]: https://github.com/flashingpumpkin -[txels]: https://github.com/txels -[mfoetsch]: https://github.com/mfoetsch -[david]: https://github.com/david -[astraw]: https://github.com/astraw -[zeth]: https://github.com/zeth -[fzunino]: https://github.com/fzunino -[ulmus]: https://github.com/ulmus -[jakul]: https://github.com/jakul -[garciasolero]: https://github.com/garciasolero -[devioustree]: https://github.com/devioustree -[dbrgn]: https://github.com/dbrgn -[amccloud]: https://github.com/amccloud -[thomasst]: https://github.com/thomasst -[meurig]: https://github.com/meurig -[anemitz]: https://github.com/anemitz -[ekohl]: https://github.com/ekohl -[yandy]: https://github.com/yandy -[mjumbewu]: https://github.com/mjumbewu -[natim]: https://github.com/natim -[sebzur]: https://github.com/sebzur -[dzen]: https://github.com/dzen -[bunchesofdonald]: https://github.com/bunchesofdonald -[btimby]: https://github.com/btimby -[michelelazzeri-nextage]: https://github.com/michelelazzeri-nextage -[mammique]: https://github.com/mammique -[poswald]: https://github.com/poswald -[scfarley]: https://github.com/scfarley -[izquierdo]: https://github.com/izquierdo -[tschan]: https://github.com/tschan -[shawnlewis]: https://github.com/shawnlewis -[alecperkins]: https://github.com/alecperkins -[phobologic]: https://github.com/phobologic -[laundromat]: https://github.com/laundromat -[cyberj]: https://github.com/cyberj -[j4mie]: https://github.com/j4mie -[mattbo]: https://github.com/mattbo -[maximilianhurl]: https://github.com/maximilianhurl -[eofs]: https://github.com/eofs -[rdobson]: https://github.com/rdobson -[diviei]: https://github.com/diviei -[madisvain]: https://github.com/madisvain -[minddust]: https://github.com/minddust -[asfaltboy]: https://github.com/asfaltboy -[ottoyiu]: https://github.com/OttoYiu -[jmagnusson]: https://github.com/jmagnusson -[osiloke]: https://github.com/osiloke -[mjs7231]: https://github.com/mjs7231 -[tonimichel]: https://github.com/tonimichel -[benkonrath]: https://github.com/benkonrath -[glic3rinu]: https://github.com/glic3rinu -[ludwigkraatz]: https://github.com/ludwigkraatz -[robromano]: https://github.com/robromano -[mechanism]: https://github.com/mechanism -[jonlil]: https://github.com/jonlil -[irrelative]: https://github.com/irrelative -[dbachrach]: https://github.com/dbachrach -[maspwr]: https://github.com/maspwr -[oaubert]: https://github.com/oaubert -[yprez]: https://github.com/yprez -[fabianbuechler]: https://github.com/fabianbuechler -[mhsparks]: https://github.com/mhsparks -[mvdwaeter]: https://github.com/mvdwaeter -[reinout]: https://github.com/reinout -[justanotherbody]: https://github.com/justanotherbody -[roberts81]: https://github.com/roberts81 -[annacoder]: https://github.com/annacoder -[gkappel]: https://github.com/gkappel -[cmurtaugh]: https://github.com/cmurtaugh -[pilt]: https://github.com/pilt -[sunscrapers]: https://github.com/sunscrapers -[joual]: https://github.com/joual -[treyhunner]: https://github.com/treyhunner -[akinfold]: https://github.com/akinfold -[toranb]: https://github.com/toranb -[sebastibe]: https://github.com/sebastibe -[ahankinson]: https://github.com/ahankinson -[juanriaza]: https://github.com/juanriaza -[michaelmior]: https://github.com/michaelmior -[mjtamlyn]: https://github.com/mjtamlyn -[wackerbarth]: https://github.com/wackerbarth -[shezi]: https://github.com/shezi -[radiosilence]: https://github.com/radiosilence -[steve-gregory]: https://github.com/steve-gregory -[nemesisdesign]: https://github.com/nemesisdesign -[brutasse]: https://github.com/brutasse -[kevinastone]: https://github.com/kevinastone -[guglielmo]: https://github.com/guglielmo -[mktums]: https://github.com/mktums -[wronglink]: https://github.com/wronglink -[swistakm]: https://github.com/swistakm -[z4r]: https://github.com/z4r -[fernandogrd]: https://github.com/fernandogrd -[xordoquy]: https://github.com/xordoquy -[floppya]: https://github.com/floppya -[pelme]: https://github.com/pelme -[ryanrdetzel]: https://github.com/ryanrdetzel -[thedrow]: https://github.com/thedrow -[waa]: https://github.com/wiliamsouza -[iekadou]: https://github.com/iekadou -[bitmonkey]: https://github.com/bitmonkey -[bouke]: https://github.com/bouke -[dulaccc]: https://github.com/dulaccc -[kuhnza]: https://github.com/kuhnza -[stoneg]: https://github.com/stoneg -[vshih]: https://github.com/vshih -[atlefren]: https://github.com/atlefren -[preed]: https://github.com/preed -[forgingdestiny]: https://github.com/forgingdestiny -[chenjyw]: https://github.com/chenjyw -[eyepulp]: https://github.com/eyepulp -[dhepper]: https://github.com/dhepper -[hamishcampbell]: https://github.com/hamishcampbell -[avinash240]: https://github.com/avinash240 -[jsummerfield]: https://github.com/jsummerfield -[rouge8]: https://github.com/rouge8 -[craigds]: https://github.com/craigds -[pyriku]: https://github.com/pyriku -[brianz]: https://github.com/brianz -[grimborg]: https://github.com/grimborg -[ryankask]: https://github.com/ryankask -[andymckay]: https://github.com/andymckay -[matteosuppo]: https://github.com/matteosuppo -[lolek09]: https://github.com/lolek09 -[commonorgarden]: https://github.com/commonorgarden -[atarzwell]: https://github.com/atarzwell -[mikee2185]: https://github.com/mikee2185 -[mjtorn]: https://github.com/mjtorn -[pborreli]: https://github.com/pborreli -[aburgel]: https://github.com/aburgel -[copitux]: https://github.com/copitux -[areski]: https://github.com/areski -[mindlace]: https://github.com/mindlace -[davesque]: https://github.com/davesque -[freakydug]: https://github.com/freakydug -[trwired]: https://github.com/trwired -[omouse]: https://github.com/omouse -[gertjanol]: https://github.com/gertjanol -[cyroxx]: https://github.com/cyroxx -[pzinovkin]: https://github.com/pzinovkin -[coderigo]: https://github.com/coderigo -[willkg]: https://github.com/willkg -[kevin-brown]: https://github.com/kevin-brown -[jimr]: https://github.com/jimr -[rlr]: https://github.com/rlr -[kolvia]: https://github.com/kolvia -[etos]: https://github.com/etos -[martync]: https://github.com/martync -[jsatt]: https://github.com/jsatt -[chrispaolini]: https://github.com/chrispaolini -[filipeximenes]: https://github.com/filipeximenes -[ramiro]: https://github.com/ramiro -[krzysiekj]: https://github.com/krzysiekj -[ericbuehl]: https://github.com/ericbuehl -[kristianoellegaard]: https://github.com/kristianoellegaard -[alexander-akhmetov]: https://github.com/alexander-akhmetov -[niwibe]: https://github.com/niwibe -[diox]: https://github.com/diox -[edmondwong]: https://github.com/edmondwong -[bwreilly]: https://github.com/bwreilly -[mrmachine]: https://github.com/mrmachine -[mkai]: https://github.com/mkai -[hcliff]: https://github.com/hcliff -[badale]: https://github.com/badale -[tamakisquare]: https://github.com/tamakisquare -[ross]: https://github.com/ross -[jbzdak]: https://github.com/jbzdak -[alexanderlukanin13]: https://github.com/alexanderlukanin13 -[yamila-moreno]: https://github.com/yamila-moreno -[robhudson]: https://github.com/robhudson -[alexjg]: https://github.com/alexjg -[ian-foote]: https://github.com/ian-foote -[chuckharmston]: https://github.com/chuckharmston -[philipforget]: https://github.com/philipforget -[amezhenin]: https://github.com/amezhenin diff --git a/docs/topics/internationalization.md b/docs/topics/internationalization.md index fdde6c43a..3968e23d1 100644 --- a/docs/topics/internationalization.md +++ b/docs/topics/internationalization.md @@ -11,12 +11,53 @@ Doing so will allow you to: * Select a language other than English as the default, using the standard `LANGUAGE_CODE` Django setting. * Allow clients to choose a language themselves, using the `LocaleMiddleware` included with Django. A typical usage for API clients would be to include an `Accept-Language` request header. +## Enabling internationalized APIs + +You can change the default language by using the standard Django `LANGUAGE_CODE` setting: + + LANGUAGE_CODE = "es-es" + +You can turn on per-request language requests by adding `LocalMiddleware` to your `MIDDLEWARE_CLASSES` setting: + + MIDDLEWARE_CLASSES = [ + ... + 'django.middleware.locale.LocaleMiddleware' + ] + +When per-request internationalization is enabled, client requests will respect the `Accept-Language` header where possible. For example, let's make a request for an unsupported media type: + +**Request** + + GET /api/users HTTP/1.1 + Accept: application/xml + Accept-Language: es-es + Host: example.org + +**Response** + + HTTP/1.0 406 NOT ACCEPTABLE + + {"detail": "No se ha podido satisfacer la solicitud de cabecera de Accept."} + +REST framework includes these built-in translations both for standard exception cases, and for serializer validation errors. + Note that the translations only apply to the error strings themselves. The format of error messages, and the keys of field names will remain the same. An example `400 Bad Request` response body might look like this: {"detail": {"username": ["Esse campo deve ser unico."]}} If you want to use different string for parts of the response such as `detail` and `non_field_errors` then you can modify this behavior by using a [custom exception handler][custom-exception-handler]. +#### Specifying the set of supported languages. + +By default all available languages will be supported. + +If you only wish to support a subset of the available languages, use Django's standard `LANGUAGES` setting: + + LANGUAGES = [ + ('de', _('German')), + ('en', _('English')), + ] + ## Adding new translations REST framework translations are managed online using [Transifex][transifex-project]. You can use the Transifex service to add new translation languages. The maintenance team will then ensure that these translation strings are included in the REST framework package. diff --git a/mkdocs.yml b/mkdocs.yml index 57b450545..8aacc2dfc 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -54,4 +54,3 @@ pages: - ['topics/3.1-announcement.md', 'Topics', '3.1 Announcement'] - ['topics/kickstarter-announcement.md', 'Topics', 'Kickstarter Announcement'] - ['topics/release-notes.md', 'Topics', 'Release Notes'] - - ['topics/credits.md', 'Topics', 'Credits'] From 238a3b507baa4543e3bae82a6fc9d88a0aadc5ea Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Fri, 6 Feb 2015 13:50:40 +0100 Subject: [PATCH 1572/1652] Add Twine to the requirements. --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 00d973cdf..e5f555f5e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,6 +19,7 @@ django-oauth2-provider>=0.2.4 # wheel for PyPI installs wheel==0.24.0 +twine==1.4.0 # MkDocs for documentation previews/deploys mkdocs==0.11.1 From 750d0c9f2b994af2ba92d2d470bbe079f9d9847c Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Fri, 6 Feb 2015 13:57:08 +0100 Subject: [PATCH 1573/1652] Add Twine to the requirements. --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index e5f555f5e..32938ab23 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,6 +19,7 @@ django-oauth2-provider>=0.2.4 # wheel for PyPI installs wheel==0.24.0 +# twine for secured PyPI uploads twine==1.4.0 # MkDocs for documentation previews/deploys From 1d4956f61615ed32f52b2f92bb8ae31b09279a34 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Feb 2015 13:08:04 +0000 Subject: [PATCH 1574/1652] Pagination images --- docs/img/cursor-pagination.png | Bin 0 -> 12221 bytes docs/img/pages-pagination.png | Bin 0 -> 10229 bytes docs/topics/3.1-announcement.md | 33 +++++++++++++++++++++++++++----- docs_theme/css/default.css | 4 ++++ 4 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 docs/img/cursor-pagination.png create mode 100644 docs/img/pages-pagination.png diff --git a/docs/img/cursor-pagination.png b/docs/img/cursor-pagination.png new file mode 100644 index 0000000000000000000000000000000000000000..1c9c99b684564b1c4af278f96f0e016de8a28ca9 GIT binary patch literal 12221 zcmZX)19Toyy9OHDHXGZv&BnI*#m*O_X>2=b)YxW|G)@}ZwsX_|=brPgduOegwefoP z%-YX06RE5yg$RcS2Lb|uC?hSd3IYNe^4T_rf%?2E%p?hefWXySi-{@Ah>4LXyEs}{ z+nIxaNF!FIc&MXm;}2cPdly2Ikx<-z1As}_fYQu}sEeY(FboM>xtlpdYG7cZDr*3a zf-6<+BOq4_mTH+s$nt(fL(-R>LI`f>T=>3hc>HdCc;D~*-Ql{Dbps+?Z3YWLQ;Psn z{t7UzZN?X1rOo*ELMRLZ4kL`KtaZvBWUD;IdRb%sELb2pMu_fQ9gzHX0jiC}6^jUh z5rQ!6JhM~|lPhk+s7oRb4KgUay_|jo#xhJo&m>M6Q7b$Sdy_@A-{QrXIU54iPM$#t za%qMomj(h-4jwtnwgf9pGy@(o@t7qp2x7+Hr)WnM4Xj1(8!9ii9f&y$^j{Ua{_+ac z{=qGyh(#yTcVjEEE-rW)pGGNdZ2nu|RVZ@~1NEn&s|2F;sP!nRzqFG0J$>}VHG;Mg zQ7VmKeQOKJ8iQvL`fPeW{5bkk2tzG3&$wGq;^L#s?Q2V5PbfFv1mT~Tr!1b1sR+n@ zCjowJtrkkH0;OLt@dK`&=b-QzUs7rwI}Y}T(8z9y_e(tGy6B{l6UGyB(MYuAI;P|b zwo3dA9eJ75ef?c|W<&GQ6nqP?T}da=pQX2hlUn%%O0lDYDPDT^!e#Ei_g{ZMWrzU5 z>Os>Y#Vm5IA9w(7sX;Y^M@RQO0%-2;yT%^L3$DziIT%|wAP#)QYk~K)L%V)Ji}we_ zndd_H>|wY_VRj9ZDS%q3LI>`D2$TrGfqcadoV2xzXEqfi)>$?Fo-7OQl?O2wh&2UG zIdW<j2<`-$(}N8Wtc(Jw0m``<q)q~nZX~b-b}d4>1bZLsq6~=y<aNRzfIiz~=SF4( zo@`>ZKobE)n86H!WS9{xNMQOzFe2b+M2^2BnL%g^BaFaahop$~Dq~>4QwaM?LsW$~ ziH0h}sv{8wALkq9D<1L#FptBDM8&4KZ?T>c3XNFlkt_S!F459J+xz^Ts5{UU0~h;v zoQOKW8G)5slr4yY$cEt;y}(O4PdG^BFBpi$L98My%I9Um>g=>c6yo;cn0c})^JNz5 z*cI4r&>RsN!hWKr)9UPm_QCGLFM0h_cDFjWk^s~;0{w6YF+=eU5#)TT=?!L#7`P!A z(>P-jG8Wi0d3nJS3^kzjpkCi<e~eK{ofbV}Wq9M@vr%EK%#zy@*(s<Ud=vgk9O01S zmJ>Hc7V0D_c7*BHjPp~=TMOkX&#L_@%sF{Zh~}{FX6NO!r=TFVVU%M}?%>8y+_ohQ zD+FP%0O|K0QZw`@SSc9&kjxO&J_MDNGAY29Fto%7-3apmi*1T+^ld)0$Re4a<P204 z37m;z(!<i4(qctQW;{Ph|6~)0Va0oVw;f&E4d3;^fRjkw7L6<^Qgc^6ropEEO-)=} zrdpyZPxEb#vK+3QvwTIhrWkgHccyx#vdFbau2@NWBPr)Q>B!+&%dc89&N1~7z!<`a z{HUt=ggLmmnt8MtzFE!Kx6!R#z#jh|w~Loc_#Wd3qMC|2Lj_;5!kVmrXs0+~{P5Vx zDBE7*F8p5H*u$t2?Ffw)O$ePCjXHIf3QkeJRU11cL#T#4pJKbxONX>u{0Z54!C7<$ z_L{-1h;v;*G?`|daGk_e&bB2*TSBSo&l$#I_u|qqD|4~Ey|MH$=wv1uCHfS@)7rGo z7Ne`H!8mmzOtEC6WH;LIuMTDM<rU@Lm2m10l?KY$%7x{vWfbLSDtwik)rwy|RF%{> z3jGz|DD;EQWtH+%r<rD`IMmsF*~Rg~*`L`h*zef;*<Cqw*>i1B8*y~5bbK1T8z>v+ z8{ZliZMkfOW=Id20iL`s0B<+J!{Z~#Lx)-WMZ#INIn(34LylvC>C!{KlbZROg>KtG z4kMf|_yo)?<}mm=_}2(@2#$EYlAMx}lF%{Fu`EOGL%usUJD})4BP(UXWC};W(@X%; zt*fouk4`9-<qA?yb!OUkGt(QjqyC`Q5AVC|ckQ?C>+d@<ATTUpVPbhO(4-ioWYY7| zZ)o9aJ69p;2-KG7yy!aCpVz(HnA(yzSU2G|&o{+3Ry7bBjj#pdNW{>&<M45{E4Y`Q z3I17GDqSIN{`l29K>8=Y*VwLnUG;p1TrQlDgHZchI01C_p<<n)5FaA1Eq8rZWp-}6 zRjZSpjh>`FqF$n2rk-JYdMoUj&YED$O1q=e#l5hXrw@kbt=E`Wm{*FA;LXgf?4`|Z z#%<HR!NJ-Y@apR3&mLQky7|xayKxyq-3`Pp?6(nrQvW^w->JBa=!_@V;ctF#9xp<$ zQ?Q%R4bZ{D7Mtfir6S%Uwm?OOVMb&fgSuCVTCdCJ&2<!;k>l@S-;b1=r?#htjh~GR zYIB^9F4HcbFOgA+P$^J>@p5Eb;s$Z5-(+KsBZefxr544NsxI~FJO-s>+~obo-;%xQ z>NO1Xi#uq|=hNqBDzz(>224!IP4G>+Yr(YVf0T1u=$Ws6S;_8<dyCrX`_qqm!0RH{ zQh4?4isH%?_8V+F`jFRThw8d`fscvTcIKDdqKYEq(V)@B(RvzG8iw-6xurS9E&`$S z0O#1{j2|3tVB{iQMov|4%bm7Vq5gdt?9}$=I#O-?CRz>=w-Q1TVXRrKw5);_VU{@~ z2@~6vYa^WF>p21$JIOb{cyD>{+j8#kPMUuZFK@POO-Wjrt`6lW=wx1V#@gMl>oteA zP<Z`vY_({mXuW8bv^yJ9n^?)>dIdfp$3Ce(^}Pn!Bdt{Ui+`j&nr^uNI(umjpxeaI zqhqI|XLwZ|U~Icjd{QzOnmCWxnAWsY^L3(frwTZD)1PcVmNk=ekqz^Bxo}t!+fb`L zcw3+MsY%gE);J?SM?b@-*VS04GxYhGd@~&L+Iyf~rPZPRO53dI&)vi0^pf|hcb|5? zqOan&5Y_wZ=J$vECY!b6nf|4I+;BqzSfQC0_?^^eyuFORjGD&R<=(c<w&=U2yE{Z$ z#KBmn!ZPO$nv$ahmAFE}3Cf9Z9V>>=;U1Rhy43EWckhpujjJ5=81xA$H${ymRbBYy zyr$EpQFntEBPn&MfKo?GrBpG^6Pj7I#!?PN%`6peHQy9Z&WqF2)+|@Gwczu}8`y(z zAB_k8E)=h=^T9pr7se<3HkUsq*P#ZB>#mvvHCbIY0gX3!J323JnJ4yKKO7t0E#7o( za}^9%6jm|`n@=6w?wHPmd{&<BpZJJ87&pw<JN=n94L;s#Uyz|pprDAIh++ify&m^f zh6>Y%Gjok{F!+<bbe`q+wC^sUx|<P}5pr;^aoVo<cb|5Q?=LHbX5JrJ6CQ%E3jpeV z4gTXMr?)MOk5#F32H!f+Ix^BnKGg1ik1ameD827pFUF3JjK*{Ian(CUuhVo^`Z?Zp zS<+e^{{bA|j)w=w$r7IkvIyS!e|zNTO?-lUC_b(1U95KW-^dv+nVf{v5?#o`7A9pN zAV%(4(E*`WiO_5b)gmeP%H=B!-0$S+Gl^rY-o7^EzX&~$v;!$yM-YZk^=k($6Za-8 zN(BdjXazwz1~ZbAlaVOcPQY@sW`Ra2C#<6^uCKp9ag1OC**xhvJ(YhsJzc~bIN=A& z^YLCcjGniNSd0q<0X_3M@}6Ej`LKJ3>h`(x;IY^9``p69I!SB0f`GuI|2;uLGO}<! zcevTs>RJFT1$kamM|(zNGe;A1Mo)XEPiYVkeox-droB19n8efG&cT(}Q-JKB1n+12 z?=TY?$v+W*tpJ&pf-;Giql-BS2O|q3E14i12?+_mi<t$ls<`C;sDJhZ$gBVWCtfBd z4-XGU4>m?e7fU7<9v&VhW>zLvR)$Xr23Ic!fUzfogDd%ejQqcL#LZnzU96n|){YJ& zf9)EZIJyA@$jJUW`rqR}ahiKt|DPuZ*Z)cDGeM@mGfXUu%uN4l`%{(w?<lXbwWqnA zmbkUOxr6Jc4?#9=ZvKDr|G%04^Y~wy+W)7?!o~65n*TNPKbrhZe-rqxg#J^lf1{t} z5`^Pt`rpzE!u3YXVuFB>!^wz?sC$B*Wh3h)eeL=XiUMw$A*EP}Lbj4ZaP{iS2+{Pu z6*t&u0xqJs=o(+(ygQ$Fa@S%FJnUCay9V56_53<#47lp>+ehEkJBqo=^n2%Js}OHR z$$Ze|r3vID?TsL&Hy&Qb`TG&Z5!lB2Va6XW@%FtYT_+#1ZUim6Hf}Dwa!40Pdf`2u zuFVmM1y`fL=Kv8jcv2bl`$po)1+dqnD}l*z8hdDyIr#BTNC>&TV_s#JzAj&3U_ePp zAc8{!aYBsBt!YY8P{2g<putQ~yg|OCh6a9idqss2L~G|7lGOgnPJx56zzBdO{1O$0 zfeA7qWv17Hqus**3nDY(%$#0chFgzxxjX*a(A*47YppQL<8hu<at+`m3_~KUIMqNv zMh-WqSyb<8?t9jK^Zdnw@;X4`xf1my3*}Ncudomtn^8|$Fh4&(>ZfTam)#QcC9*cb zDO3XD-qX#2F*_cM%^dX}IvUzcX#|wmTNxpO=4(SR6_f~F0vVMRtX_vF>PEmvrwK$s zVc{T1i#6=ApFBS=GY-PoNO@~3?uPFT;!q4O5Z|GtS3&-x16uCQb9<P7{^WfM&!kSP zqm5-ES3H>1L01>Q#ge+(5%!jAk}?rCt8`>UTEYLjpIl9V>;aLZni_gvUmu28zBwZ> z-@jp(OZ;4YVIRq^6}WKoI}N`IOCariAib2|)6ZzN#rg1r2KhGt`u%IpjB#PltgW41 zd)s<Lu2Ds9&ZFDj(YbHWIV&EkSwuT)WOo=uNWE>^hTlWB2|__Z!2nK+<ZdDpzPiOI zRLY;{li(`<hHY#oU|w?Y)itX8dlOyFj_p^*8uU}rJdG#R$u*IiEcOes?f4*Wdst?* zb;#R(WFc<Y`(goT*SD6P1BlsvnI6R8@Qz2oXe!ipq7m$=xG*>076|f$7ifAZhgrr* zdMuXZcv3Q+<Dl6>SDR4{aljLz7I4#6EdEkd7#^&nF{wGxrjDpU!XK&-!Qxj;dSi{^ zF|_Q;DT7cAVxQ3&&3&`WUGwYXGZ28?)ty|~{A3)8j*7Zfowi+r3Tm;c3naM%FOIzr z%Uuo6Qvt_f0p^1Iw!K-{?&_L81t?HV>VVv7Fc8`gn{iQ65}8(oXY>gg8UodD!jo`- zB`$BMLorV!f)?jzZ?NwRzyCbTW^v+vPa^<2m5%Ewf7J#~Uyb5yK)+@u%p4YRy>eUE zNWtLksSUscfyxD*|4}JneQpB5QnxJ4qojbGZ&ETB1$(@4_T)vHODvvR%3jV6JYKTr zuBp=t7`%cnO>1qQ?0&AxGhuX%laTRBbWKRXQ&-hjpYzPcwgk<#Y@~R4G&O+r%|$p# z+B%D`dDW`Mfp9#MZONmW%Iv)C48lTFsw=@X;yp9V5X*hKZS5|=;XNHL?^w&AOI)ds zBY*egl)R&?_rnQaMEmP(;~7?_sl;qjD-4cmjac&3dZ1+Rutz<(l7bRq8%x9R$@yrI zL~AAR6&p+dt;J<8iZyoHR9FElL_|qVqVN!1F&B2!mF3<GO+H(*Efn6T9=ouk1S(+k zx8&CM!7>v_i}K-NujnIR7{7!%Q`gp+6UQnhDHWHdo5McUNW#&hNBBGMOk3GYH!p!@ zyQgY~jc*0FW|ag{&CNw&GiH_|JjDmA{f(Py*L3UpH6f2pE?n+rmCmy&9aSBRP%*?I z!^qIL3s3q&?&QiLHmn_0NU$Dj7e&mn7L&K5ll`D8hxsNitQaLs{l<xSt*{i)vzQjS zQ;p>C58zTaDp@(P-M76~N(#x{etV?@&KM-apYNC!svcduHyt68(6^&}Z;GIW5?O+C z5mN34vJ>aJtiptapJ|t3(|lHW)<tYgSRxPNw0GQ@m;RpglhsuNu@{};nTrGc*8r&Z zmsl|vLQCP{X|gQJ;+nSE@TPtj3>-}Ku%?nVs|~$E>YmxXC+>tglr!n!rR|5jI404X zepvU=4FlDX%5Zs3aN}f)bpwd{$ZK=j;jSe5F=Nglf327ZKu^aPa0*V-{F1XXt_LSS zFV!C#cm23N1vsPTCqanXk7;8^V}6yavIcQ=7ns7D4OpdUs#i3S-F&W$wE^Jof*zSB zFm#-jJMA9#rsLb{2z4<)hm5Z#RyH=NZg7<!SJy6C8VHH7xha~wxD=XRSGxyvLMar{ zV>uCH9He=uK}c#8>v7USPZMzR%%?-cu-YwkeRaso6!~xPSN;Y9G~Vb8jJlWo%ZQs@ zKdZS33;$44pL>02>I%Zh7~|H@36I{z*4K=@#pz0mT~2eJBcJHMT6I~KEsR!^lf69K z_KYcg<j7o1xPC#2#Awa|lE=)H4`bsp%>d>z(+qOtwnio<28JVg{`}xl_F*7yxc?EO zItS^91O{}g$WM+1YsGi1ze2GLPTC1_{^c|+9EpIT>DU``tCyu+OJI3n7*?@hFYPkc z9y@(QY_f%)z7YD+TE2vu6ZpKw@hHTOm!=41Za9Q?sxLn)W`+Q`ARHFEf}jyZZZuBj zHpz(AX0LEDXxSI1=We72-yqZn?zYL#Sr%>X!Vjk92rcShD?S}&qO-vG^?xmb1Em5R z_FxLbWirxn;QvNZ3c}<YVLh6IvG)ZqRgLY2M`hM~gOivUee}bMfg|cPAF?%yWit_8 z;V#M$Tmcuet~bxR<eSHO-E(|GyW>?RcjK1z94AA+rx@ZSX8d;b;f!1{q@JSE$In7A z)=lD@^??9v`|v*%7nteQ@1b$g(A`^`CX)1UEQrr{(JcPwztRTBoIqMRS-&CMzaxZ7 zJQQB<4N8xFu9L@tuMV~~equ!KX-#VS%qMtwD)B2CkvDcu)?<g?INF^PBprJ)J*oND z4ZL&CO^37E@k5x+h$_TbVsB}G9hmsL;<`(k<&m{x?g%ttN)%Ck43Jm_tAxOS{)Q0k z*P{6$VXwd#MtNfltGI7YHke(Vl@k8rtlB$1`zWU1EWV=ten|$ll+uH?W)6U7tc8LK zwal6>V}rykr>0?PI%eH)1#u22EEDrPo=yy2RSL$QrJ{$@Uer->ix_M2;bLSo4DP<M ze6!SQp>Jd}#Aw*y6Qez+^Cyz}X*EVy|3lY3TrfWJa@U#jLp?^e)S8F3`|BurB4t?L zIZ9XKt_gepLtl0^k2oPT9&Fe&b#;e$B<iub9@D@Bj+s>)>6gFT5;#zQ`amYv<!?*d zKbyBExk|SX&X}LBn%E-J8bC|S56(xu(v(&AF9|(5L&EA@SdD$pS^0mC-{<F8>vn?f zSZ9Moh>SnWSOs{oA$8YfNm570Z%R(HJM!%|NGjL+u??0!IX>6yn2r2d<g%iTDXmx{ zx!S(_X1>D0>&8elx)CN}M&J+-#AsJ}G~dU1fp={_F_in9ujlUS%-$B6$MbQ)%9?~4 zXaca_9o*2gu3MW-_moopEyO-#gJR=xur&^a7j*Ruwk~4s@Q`in?yp#`<3w*x8iu95 z8Q&`GwxF~6`Uf||!9`6)(YZbMaV(Bv1SX$P>IxN%5%w}xwIgv5n_`}Z8bQs9@k24k zB(LlF$CyS|v*&w09bB1O;BX;qdh`{f6$_giF0U2WFD)Hp?v!j$wh1Zn4Lpu`484hK zdOd!)7=fH+eWF+sG<d8$m(l(uRJE9aaZg_<_%cLWnm+FgIVy8cem77&&fOg&FV=G$ zOVycL_@C^(KaF9>Xja!+8>Z~@r==tBDwxbw_O6h~*J*aDZfg8_)s9wG%!K!wkgp6* z`^O|I0}!?`C25w7sl{Y15GGR`hej!E^O<zzXMHKyD@bf>OAzABN_T8^*dFQW;9q{8 ze3vlhYk7`y7<x}|ZUIU<IV+NjZ)+^Z=$bCg2EY7nFzMs|ZC}K;xEANTH;gtw0yv-+ z6z!n^bu;AZzN&0?V5gC*gm>kOWmZSrCXIK1<D|z$Cj9u0RY^QF8iL3@>P#gN$9J5v zrIDF+nFc5xUa`{wdX^d-aGM*a0Vx>P!z`8&U5}6G)ft;5=c+zXj(#O1C$^09t1HR& z{)vIeqR7o>`ayNmL_o+sfkBiTJMeI<(&<D>yQs5cg12X^dvWf3dDjKTa11>PRoeRY zJx%^g_X7kic9&`HwTa|Ldf${VUzuP%Cfkp^m<11nrPO!kC;qqqy_9ObbY?DMs@$c( zdgO!r0yn<xSwl$<tF6Z^1i(~Da0{a?xQ1zuighK+*Jz<hP5-O~6z{E(#&yBP!Q64A zxt4c+Bpq%a!;`moHlgc`0JGQC_xDpq>Oz!dRU0nB&Jl*umOSwtAJVpA$HwB`2k90U zo!zb5qgkV!lPXXoz#Cu*C-nQZ```#>s_^sESlkWg_{u?u)!lJlFYR!uWwoab#y=p@ zmXq}ao8ac=HpVM@Q4-5P-{HRa$_in_DLoyh8mI5u&IVzl9B|WP%fT<;aWlb1N7iXA z6jYsyV#2P&;3V{NKK6U%)JsU@ph_H;3Id8HNTpCR$Pj_)bJxvmYH?PX_*{o}!XU%~ z)78YywPnsbf`}8_S;J+i!Tl=9l*5a*$OVzcz;<3G0(1X-6`qR|(q%nM=Jp+Jvntkf zC`QEqW+Ri!8&Q=$12a0ElY@ii?@pC*>15c@-vq_i-Wg5s5caYS|F>rSHd-k|kYo3o zhVjYSa!KVJu+{%{j|!^yYc!hBU$kRzy6bll8ynl{{osha4LoOkuuG@t4wTlHzK0gA zosZM_L@<xD$6p+j(Q)|Pf0$sjXj0n3bvnY0SLf%8{4p4lZ*-xLzEHq9y(|3G+ej;! zFUZqyX|VBqQ~0Lg+mJB3@o1HtJ6$M6HzZ70ar5H)a+9K7HC7c$u#Pv{ZtRJgwrI|; zfPU9Rcr6{&Op849?7TaCHfiM4cGjx-6~hTQRjDWYg>)(oww7!sv-Giee|2`R{ENRI z>4W0aH2f<AQq<P&FpX1OibKTLbGFTF@#ZymeDC_eQ-;}IRiW_-LZKYinZ8Joso;VU z7;ms2Q=Sby#OLwXFMh2Dzl4m=M<WZNca8w=;G+UMO5|WwUgdZFVHubw!as<WUcnqt zy!p&#+e{i$7B|M`H?9jYFWxn(yT*~}cny;Y@evtHG8z*4hhjWbpH3Ra;<}%lVm30L zonw9v>m<w3P3kmSYO9~?%(^f_gao3%sD2{P;D+turGN0U8shWGrXV}`*CC-Gfg+Wr zGl*jND|smUiApue{!5L$!m~=_iDPUs50g9#T&=N>hnojEA6rQeUVa+dgSG=P)=@fv zSaoBe-sxPos{*j~BjIr6;(f>~t=T7+XJ<X^F2srX*A}$v(+LzCan*91ll#V4gPl+x z&m%Xq@0fHYQG<rds^(KqR{<t*)h>cv#<^?F-&V`-qyHWwb^>k+(z!_d2U%BBed6WC z#IB<ML@o81(QV<__aFaYcQsW|9v2L2DNfoxRaU605ex)na_@3ZCnpRLQ`jgY?x7sU z@<RIwU6uPq?DtDc-ya{1_mH`$`bDVT+;LgGPvHKy5+9#7t<<G-w5?))vRMtn9Q3GH zIUy-dnxKHGT_i;PL-ZTyD8Q+UN@-T=e`Q7p3dDz~3M<eVg+<u!DgBoaM2@hL>ReQu zh6|Y5@qdpIxWs0a7FFxD2HzYoP0N+9@Ixlr{=FriY=9C>NNA|Z?P2^FIG5jOf)uc4 zXmdRMg2hCfyRTo21z^<!jnS1P(FX_mmu1N5nXlCRBnhDETQPTrH+B<MF0D{vhAcut zLWFCO;k`$|{#j-I4wE*41poj@SXui{?0inIZ`e`e5C&lX8VTv?A?s;dSuFRDg9?gf zniU7HM3r{<$5hDYakcs2)SyS8gZ*1Ey)uENu^n!=3&Y0iVaZPa37NSE=90Izxq6s} z+!0cS`>(}76r82c8X}xNC$7T(^}$X~0wuzhL?-<=N9J1C2oap6JE~Ufzh<o@h1Gyl z7M!zd&K47_*z&>E4F&_n`_bP849{({FFFWF>?=DVQ*{})ezq4xbfX-WLa;BJm<>#7 z8i*T*j%tik^S57lq!F!s%l<_yW$c$aBP9^k=jQx4A8c57LV?8Nco(o;_r)(&nn*D- zu3&R#CqnTZmME%yTCC^YsT`MrPu94D1~Sf49)cH7`TAXiy`j<zzQ0q=(nM9g<(Orp zdt%aF92;27)EUSl6Myf*rFqsj^EIG0o67WV;j8rV*8VSaK0{FhV+O3f?${^vat03K zAvQTfF;j%b&O0`h?IlM2BG|O6bGA5BO;ZF7>@K869s|J}%=c#@x1I<qd4<nUboY8Q zB0hu~Lb_34(A|qUudx2!7xsX&fU9WBkC^NxTiEIN$Ftdbr$vQ+LeXFOC@ozO>^P)p zSH0Jz_Cq~^NlD_gD&#f_oQRe$Gq?y51#!K3K+=R{Kk9-%Ok*I~u|bn4kic(!k4Es^ zHfI}(dEn$MtsD5@d3%r8RxNPyvR_PlCVf#E+A=RU=Z;1)@WSzpdJpD{oPtLhorK8F zXzW&7pyXzk>)hsNJ>LSSWqb5OG0hMPEZ)&VL-Cnsl_S5>!O7@9Y+~e}QPWm^1>+=m zMQ@aKne(wcU{OGt(hEgSg1KArC`k7k@m$P*>|wz{{U)a{ta5u$^W*(EV9kl2`+?E- z^_sj)?*-<aTY#Y3w;jWfPR5;@Jk0P_4(k2+7fsrR!@y|(T~GdnxqR7n;>C$l&j)Jo z6-m>At4P^_hO_{e#{NE3mecc~DpTdA+mbp7w8rXKaPv_+B44g{MBfl~N5kHO^!1$# zZWWc&;p^9!E>l(q)gsQ#2RQ?=Q#o5^sub2)jqpX+1#;&*JTu7~FK~AUU&K)8WJ5jx zOMR{Nn`+tHbQ`$tRbN}D5noAkdeD5$ejs1k=`!A!G!NmxxR=UOqZ<>3!2K!Ik1V2C zPE$zEu4`I56I3xcJNt7CR-bR@WP;`IL^wR4iE|K+9q>068|KIu-*jH{imJV*BTR0* z?P#hr_z@ztwO)?N#vGCNzEr;$eDK`kT97o=;rMvomSjf7hSH%ZI18|pEw>_7!U?I& zM9b<1r)o?#-CPX_Pt>(v>{qCET#xCNY4XBCjq5f-#VIuPap0Js5)y_V9{3{ztpykC z>4#>ZU8dgmqz3*3CJ(484Q++6!Y~xxH^QKwz}4-#v2kMVF5L{11HWRbT{+ezMVH~^ z*&)aL9?ZAX?BvizI-AkY;D2P+P{t=Qs4pex&CyTxbZ~)cJh7<AjMri|<?V|*8*Ivu zY}jNpPjU)%c*n(JC7NX&)}77&C>JV`KYf8i#AY%D<Ct{aeK5MMis&+hNO`xQXFTYN zo2M`|z9{rq*%=8!X~}_j<%F>y=W?Clps~I;=D3~aq^Nj*K2~Y)qBC(TQkTK~GNBtn z6JJr$fJmwZLtL@$dmdUTq%Kk6_~pF&0L#{@9u~7iQkAG_<jg{Sx-|$>hW%{{xl3XQ zWJLFYa&I^S+~-@*xYB(IAU2%KWU$R;+@KEXhVr=9a^iP<vv^#e5Cd3cmAflBo<j0c z+Z}<6#v9c1z77GW>qA`91s*F@n^c{H93E_i#8GdG!(i*{9X7W_A#h-K6r;4VJp$-+ zPb0f?KES;)$eHwdY*<&!3&&F#5I(A2rtgT|FKr(Eh2y9^3!%QX8g)Jv(rVljuJWeP zsUT)dHYPTFjm_%arO*Vyf)yxDzOY**g*24sxrafabdKZuc92cYccGkWa}_4JZRpQS z*pGKV)u04gK+S|-uV(c86Q{kx8iP5VgNv^kqB4`;5lYz^B6gnu@BORV&KL+f%@d{q z%g`4wO~c42UN#AZu=QKp(+Zssy<)1FKo9sz)YKacQM`|kvLuR;Df_<m3#<Y-wK{-1 zc~eS7`DOD7JNd0WcSj{&TY9(1{pX_pu?*xjBe@^ab%Mt|Eg<AWb!j9l99oNoZwyxv zC2zYSTyXi8_chP8(F}qy&FS#N4-z4IK!3+dM_R&FqSH1hW*D6G@yxQ+IUNBk6om?+ znh&%aF_?D)9T#6Lw0w|Fn@J~pzo}KHF$A;NN5z<rrIf*m8OA2Uz}MrI2`Srl7;%Sc z7I}Vu<WTD+EBoM>;+>PL-h4`=ba7S<B#~K&Yt;Qu4ERL~UFTs^1m_&?3QB4U0!B*y zH}Aq@0#;~)hI5aR7z+5{FVCiyLp)gc64ob(5%RL+ki~jVkBd>i<Kn>(+7TbtXWk}z z*`Oct!|dc<J3m5R=I(%;s)9wxme+?vDM726_Q5i#UbIwH<0Wt`a<zM{=~3AV8CJ2n z2Pq=>NUXr5y%E2_uTBI8zD)=`_(G!KxDY=}-4~NZe&G_bGP==f`3SGY$}StGVkR!q z|0wQo>MCS&Jv}`&wuk1`w;Tn;@VG$WRW_N(`LV`2VQt<?Brkk_{z9(+y3px|(%Qgi zRJ|N+gQxJrKhUKu+lGQ24cTlXyzey*rSXs}0^Tia%|mgXMd5q?#yrfpb~=Q>yeo!a zUl%P~j(i(rz5hMB`rDnF@48uEXo>04N>Trr$0|_!;dP{BZbiB7Ky7zHXOD`XIexs{ zmdh8S8F+5r>t=O@3FfEN696<idBQ2@8iV`7C>uT`dCg99JfZ;xt}#W%_8Tc}WhMW? zExrdaoK3323WhlB!>4=sS5aURyIWqiUa2>zNvTk1gFyGtan^7$Gt{v}wO_fbEX0}A z<+(d8JUnS(e3~cmEw7X_lzc;+gL;5~MU7st-yHa)_AT@vTPVhq+znq<U-A%>vY1yp z8xQ1Ke)IN;D^`ZAtgz0Hev_X^1hL=%=|~s)AchH|vGR}tR-74=HpI47HmmSRgiK?X zA{}NN6ZE6Bl3{7A-!0nu9#HvaFo>i{<<*MVB}t1~Qo(GhS+QD+wM{qfc=P4eov~=e z>+ext&&+T>(5KsY%_|fYtjA2_!06zV=Tn0A&xmP;V(cw3VK)_I;%V5V^ND*qpru=h zl}*cM___&a?F6qP6NV!Fd}^7-q-~+{Pz@P!<e4|SqmXw9Vy}l{BKu&XQA-&ccjiV5 zANk49tkFHiK0j4y#YZOs08eJPXa;<NgmZ!c-nN!H$J2XQL=0u*Q1hByp*?rxQ~F#_ zY1n?dI24jTkP|0O#apckw#un@u5&BN(1s=Jo`8@7gscuf`CmMq;7B=5B!F>&2<KC? zBl0Q%rFJxAH%=5(87=KvbUGQ`xv!X}68@kHJZ97a&sfiUCl=kocS<f7OI+CT?D&v_ z^)j%yDvh@2*YJylv^VxEBL(1w8sFomW5p^8`<kgxqee0vL{DH&Xd~8ig~FcO&&mp> z$C6;qY57`m#*R=LR`Q{t$f;|~Th&N2WAAoN4^1%IWd=sYiXZ9X654pcv0mxXQ5(EK z8jxo0^<=rg=Q+kw+okJ(7(5&)_boWQ4k3)Ok_<&hD~js8xT8}`2pQu~;GB-DV6Gfz z%D+lUfoszd6zs5>QPwTO=i+jft*0V((BG^z&hl^FRD{=1eT7e6R!7Sj8GtMghVe<B z$PO}(sO4`^uUks75xLJw(#+>lR~tyC*CF8}-Lr_@ru^AiAg8n90A6|f9~&kgK}cU# z11jaQ-N+IPPvm<Xfq^6J^ilad))|Wvx|al=i7EovQAt{*wgVLuzeWD&i68$Vcw)2j z9_4kL!X0WR-@%r04)XquT=HHfC(bHphTuNEEPOvu&V6-GS=?L-#p<seg`OYTKu&|l zKQZVoR*HixFhdlbKe*jUo&FPQcITG)N=G;y_l8LBB;Rr+j7f-E>@evC1shk!Hr?*a zC`j4lBjmT~z$14ZJ|_XqRj9<ln3Q~WStr1=R#80BT4Fb(+5$r{4Kf?8ED{;3E0KxU z*e@|2!a;z*{eaO}usDXppAbJ+|G1-uu*>t4+^L3HwY+rnIL7ngkC>Gef|FG&es*;l z*VCkO_3tKj>mI~8MJmzhNoSzT(#!#EZtNx{)8FGgiPyVeb*&v(>?N?0vWpwiY<sAf z)x1`gV;Zm|)Rfw^kyaGRnVG0?e>>1nec+}EOusOOpRk|QM$ahu-fMc!r*PrO#V6lj zA#w2odCU+n7LBVak)k2($7a8XIkg_4L<ybrG(cNtP<MbECMS@%^xI!xY-u>3pIT?l z>JLGGT+#T;9RvWDlzWT^VS`R&K3`YD6)x|~h|HbWuBYV=;*fVUhpCb2zb&|FrrmXx z>>D0Pez#KB7bNRHwqLVu-z27@us%Bs@Ql}Li5=6N;Vv~gpkooP7TNfOEDvPj3-z{D zIsOU7Qza^fG^<35%)WusVDAcXYdCX`W(Z;2qoG%h6KnlAklku1yt>qFSX!k?EsdFT z3$N(D;+&B#YFoov`38^8z|GZADLTI+gXf%{>xEjGlCt6wALHh_PxExCu873n_f=zb z108rczNh8AYi*}@#m)H>h475X$BmMhM)BYqsDO&Ir)Tq+a-m3W1I81N#jd?Cs(F-= zYMWd@_!EW+1a7B$MP(KcP!Qc)@YT_zi`Twbsdu?Udt@{K6Fv!Y3uo6}`&b=*TFnZ2 zDn<5-AZNdgxK@mSc{n(fiRm_@!cC;;@zh~$-<BXuh6k8EX5OTTz&^hPzChS3jGCiB zkkCgJM!>N0>J#$A%wZl>0R0<WrR>LW&LPt~54fvCu>;72hO^~n^F<O(Sm1@&(#=IW zfH)XRNW{m+g#_Z2eDex3W5d^Vp>(n4D!b^%%<Wv}Nxs;TW;GKborp>-tQzr{WbjNZ zfb`pSA38)<>iM?|@4Y88LVb_;S<WcARIjZ+gY)Ox>cqPIQ84XG`%G8F#EaW0kLhV{ z&F$kAV4u&b$B{c-+^|bq>M)-j|K~5ByrqYzj89$(EBzdrG2RgcdL^FxiN$e;22>V0 zP6iFf<h%B3ifXp&FefX_sk)wTF$++VF#tBQ)0JC^HWX#pOWW^`?e;&smv@>=pz??3 z8sMg;qf(lbV_-B7OdHWwv0ZqlT<Q?X9RM3X=h5mwQOY&7pHHENg$+4jISoU~9SJX2 z+n=ym8TQczC5)#_!E)p~X+_ri8zGwFP+ov#9h(QK2?DRNl@CV6upe7MSW5)8eELjl zq1=kNc*b9}U2RZo?`+U!+|{8lESHWZ4+9Y)3_)q>UhN1$ts)}{gFp?|)uF2mw8TZE z=1kE34@!3u6GjNeXWsrtrND6hrHZPCiaY+{dah3Z-vUa${tx&Yed2f0B^$jly1(H5 z|Enf|2Vr<$3x&^5Q}d4-=|($@J-@d?>FX2y<R<Q(c;6Zy6PW(vQW>_PK@aN0$uLU_ z$n1S9?Y*u*=SP1S+jvDmj;8S+iszN8r|mhM`0z@Q0jn12VbIGr1r@%{We;vLw;Li_ zLK3bkFuC?$TqhENQc!jXVTd<p)@`3*Gzu?P>jSZV^Wyz*S#o-YGc-SW6wrFI`pUR< zx}?)a41aJgPvF<EU6`EpzK|oJh|3e4Wcr`La8~~^7U$2&GyhnT4oVWJUR!lE<$sJt z%U{M~^^UIi9}(iI@L9ISvM+gmvo&%;#}RduZ!Z}<&+m;buLpFr_ayIhb_;Yyh;p}+ z9V{zxx9=A;);KL>l-YWLhu+lYB&F%_Gk(W{v(NkGJlum1%=>wJD=_ucLYG<d`9I0I mwD&#s<npyMm3^(t`v*uHC4QGchziK(AtRwEUM*@A{Qm$Lj3T}O literal 0 HcmV?d00001 diff --git a/docs/img/pages-pagination.png b/docs/img/pages-pagination.png new file mode 100644 index 0000000000000000000000000000000000000000..4ce1a09a837fdf59dc087fac697514eda7d49003 GIT binary patch literal 10229 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 DtsoG7 literal 0 HcmV?d00001 diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 080ef1d81..fb4fa0839 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -2,6 +2,17 @@ The 3.1 release is an intermediate step in the Kickstarter project releases, and includes a range of new functionality. +Some highlights include: + +* A super-smart cursor pagination scheme. +* An improved pagination API, supporting header or in-body pagination styles. +* Pagination controls rendering in the browsable API. +* Better support for API versioning. +* Built-in internalization support. +* Support for Django 1.8's `HStoreField` and `ArrayField`. + +--- + ## Pagination The pagination API has been improved, making it both easier to use, and more powerful. @@ -14,13 +25,13 @@ The cursor based pagination scheme is particularly smart, and is a better approa #### Pagination controls in the browsable API. -Paginated results now include controls that render directly in the browsable API. If you're using the page or limit/offset style, then you'll see a page based control displayed in the browsable API. +Paginated results now include controls that render directly in the browsable API. If you're using the page or limit/offset style, then you'll see a page based control displayed in the browsable API: -**IMAGE** +![page number based pagination](../img/pages-pagination.png ) -The cursor based pagination renders a more simple 'Previous'/'Next' control. +The cursor based pagination renders a more simple style of control: -**IMAGE** +![cursor based pagination](../img/cursor-pagination.png ) #### Support for header-based pagination. @@ -28,6 +39,8 @@ The pagination API was previously only able to alter the pagination style in the For more information, see the [custom pagination styles](../api-guide/pagination/#custom-pagination-styles) documentation. +--- + ## Versioning We've made it easier to build versioned APIs. Built-in schemes for versioning include both URL based and Accept header based variations. @@ -54,6 +67,8 @@ The output representation would match the version used on the incoming request. ] } +--- + ## Internationalization REST framework now includes a built-in set of translations, and supports internationalized error responses. This allows you to either change the default language, or to allow clients to specify the language via the `Accept-Language` header. @@ -103,6 +118,8 @@ For more details, see the [internationalization documentation](internationalizat Many thanks to [Craig Blaszczyk](https://github.com/jakul) for helping push this through. +--- + ## New field types Django 1.8's new `ArrayField`, `HStoreField` and `UUIDField` are now all fully supported. @@ -113,12 +130,16 @@ If you're building a new 1.8 project, then you should probably consider using `U http://example.org/api/purchases/9b1a433f-e90d-4948-848b-300fdc26365d +--- + ## ModelSerializer API The serializer redesign in 3.0 did not include any public API for modifying how ModelSerializer classes automatically generate a set of fields from a given mode class. We've now re-introduced an API for this, allowing you to create new ModelSerializer base classes that behave differently, such as using a different default style for relationships. For more information, see the documentation on [customizing field mappings](../api-guide/serializers/#customizing-field-mappings) for ModelSerializer classes. +--- + ## Moving packages out of core We've now moved a number of packages out of the core of REST framework, and into separately installable packages. If you're currently using these you don't need to worry, you simply need to `pip install` the new packages, and change any import paths. @@ -150,7 +171,9 @@ And modify your settings, like so: Thanks go to the latest member of our maintenance team, [José Padilla](https://github.com/jpadilla/), for handling this work and taking on ownership of these packages. -# What's next? +--- + +## What's next? The next focus will be on HTML renderings of API output and will include: diff --git a/docs_theme/css/default.css b/docs_theme/css/default.css index 3feff0bad..d998fbeed 100644 --- a/docs_theme/css/default.css +++ b/docs_theme/css/default.css @@ -186,6 +186,10 @@ body{ margin-top: 15px } +#main-content img { + display: block; + margin: 40px auto; +} /* custom navigation styles */ .navbar .navbar-inner{ From 1f996128458570a909d13f15c3d739fb12111984 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Feb 2015 13:21:35 +0000 Subject: [PATCH 1575/1652] Upgrade pending deprecations to deprecations --- docs/topics/3.1-announcement.md | 10 ++++++++++ rest_framework/request.py | 12 ++++++------ rest_framework/serializers.py | 12 ++++++------ rest_framework/views.py | 2 +- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index fb4fa0839..7242a032a 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -173,6 +173,16 @@ Thanks go to the latest member of our maintenance team, [José Padilla](https:// --- +## Deprecations + +The `request.DATA`, `request.FILES` and `request.QUERY_PARAMS` attributes move from pending deprecation, to deprecated. Use `request.data` and `request.query_params` instead, as discussed in the 3.0 release notes. + +The ModelSerializer Meta options for `write_only_fields`, `view_name` and `lookup_field` are also moved from pending deprecation, to deprecated. Use `extra_kwargs` instead, as discussed in the 3.0 release notes. + +All these attributes and options will still work in 3.1, but their usage will raise a warning. They will be fully removed in 3.2. + +--- + ## What's next? The next focus will be on HTML renderings of API output and will include: diff --git a/rest_framework/request.py b/rest_framework/request.py index bf6ff6706..86fb1ef12 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -219,8 +219,8 @@ class Request(object): Synonym for `.query_params`, for backwards compatibility. """ warnings.warn( - "`request.QUERY_PARAMS` is pending deprecation. Use `request.query_params` instead.", - PendingDeprecationWarning, + "`request.QUERY_PARAMS` is deprecated. Use `request.query_params` instead.", + DeprecationWarning, stacklevel=1 ) return self._request.GET @@ -240,8 +240,8 @@ class Request(object): arbitrary parsers, and also works on methods other than POST (eg PUT). """ warnings.warn( - "`request.DATA` is pending deprecation. Use `request.data` instead.", - PendingDeprecationWarning, + "`request.DATA` is deprecated. Use `request.data` instead.", + DeprecationWarning, stacklevel=1 ) if not _hasattr(self, '_data'): @@ -257,8 +257,8 @@ class Request(object): arbitrary parsers, and also works on methods other than POST (eg PUT). """ warnings.warn( - "`request.FILES` is pending deprecation. Use `request.data` instead.", - PendingDeprecationWarning, + "`request.FILES` is deprecated. Use `request.data` instead.", + DeprecationWarning, stacklevel=1 ) if not _hasattr(self, '_files'): diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 188219583..18b810dfe 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1103,9 +1103,9 @@ class ModelSerializer(Serializer): write_only_fields = getattr(self.Meta, 'write_only_fields', None) if write_only_fields is not None: warnings.warn( - "The `Meta.write_only_fields` option is pending deprecation. " + "The `Meta.write_only_fields` option is deprecated. " "Use `Meta.extra_kwargs={<field_name>: {'write_only': True}}` instead.", - PendingDeprecationWarning, + DeprecationWarning, stacklevel=3 ) for field_name in write_only_fields: @@ -1116,9 +1116,9 @@ class ModelSerializer(Serializer): view_name = getattr(self.Meta, 'view_name', None) if view_name is not None: warnings.warn( - "The `Meta.view_name` option is pending deprecation. " + "The `Meta.view_name` option is deprecated. " "Use `Meta.extra_kwargs={'url': {'view_name': ...}}` instead.", - PendingDeprecationWarning, + DeprecationWarning, stacklevel=3 ) kwargs = extra_kwargs.get(api_settings.URL_FIELD_NAME, {}) @@ -1128,9 +1128,9 @@ class ModelSerializer(Serializer): lookup_field = getattr(self.Meta, 'lookup_field', None) if lookup_field is not None: warnings.warn( - "The `Meta.lookup_field` option is pending deprecation. " + "The `Meta.lookup_field` option is deprecated. " "Use `Meta.extra_kwargs={'url': {'lookup_field': ...}}` instead.", - PendingDeprecationWarning, + DeprecationWarning, stacklevel=3 ) kwargs = extra_kwargs.get(api_settings.URL_FIELD_NAME, {}) diff --git a/rest_framework/views.py b/rest_framework/views.py index 9445c840c..b4abc4d95 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -409,7 +409,7 @@ class APIView(View): warnings.warn( 'The `exception_handler(exc)` call signature is deprecated. ' 'Use `exception_handler(exc, context) instead.', - PendingDeprecationWarning + DeprecationWarning ) response = exception_handler(exc) else: From dec3493d7c3ea630a4d51b21bb7e793f0e97ae99 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Feb 2015 14:43:43 +0000 Subject: [PATCH 1576/1652] Minor cleanup --- rest_framework/fields.py | 19 ++----------------- tests/test_fields.py | 4 ++-- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index ecf0dc47b..382fd2dd4 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -578,19 +578,10 @@ class CharField(Field): def to_internal_value(self, data): value = six.text_type(data) - - if self.trim_whitespace: - return value.strip() - - return value + return value.strip() if self.trim_whitespace else value def to_representation(self, value): - representation = six.text_type(value) - - if self.trim_whitespace: - return representation.strip() - - return representation + return six.text_type(value) class EmailField(CharField): @@ -603,12 +594,6 @@ class EmailField(CharField): validator = EmailValidator(message=self.error_messages['invalid']) self.validators.append(validator) - def to_internal_value(self, data): - return six.text_type(data).strip() - - def to_representation(self, value): - return six.text_type(value).strip() - class RegexField(CharField): default_error_messages = { diff --git a/tests/test_fields.py b/tests/test_fields.py index 5a5418e65..ab3418bd6 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -412,11 +412,11 @@ class TestCharField(FieldValues): def test_trim_whitespace_default(self): field = serializers.CharField() - assert field.to_representation(' abc ') == 'abc' + assert field.to_internal_value(' abc ') == 'abc' def test_trim_whitespace_disabled(self): field = serializers.CharField(trim_whitespace=False) - assert field.to_representation(' abc ') == ' abc ' + assert field.to_internal_value(' abc ') == ' abc ' class TestEmailField(FieldValues): From 5d8c3abe726768d30619f7596fb863b4f83719ee Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Feb 2015 15:27:35 +0000 Subject: [PATCH 1577/1652] Fix typo --- docs/api-guide/versioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/versioning.md b/docs/api-guide/versioning.md index 7463f190b..30dfeb2c0 100644 --- a/docs/api-guide/versioning.md +++ b/docs/api-guide/versioning.md @@ -150,7 +150,7 @@ In the following example we're giving a set of views two different possible URL url(r'^v2/bookings/', include('bookings.urls', namespace='v2')) ] -Both `URLParameterVersioning` and `NamespaceVersioning` are reasonable if you just need a simple versioning scheme. The `URLParameterVersioning` approach might be better suitable for small ad-hoc projects, and the `NaemspaceVersioning` is probably easier to manage for larger projects. +Both `URLParameterVersioning` and `NamespaceVersioning` are reasonable if you just need a simple versioning scheme. The `URLParameterVersioning` approach might be better suitable for small ad-hoc projects, and the `NamespaceVersioning` is probably easier to manage for larger projects. ## HostNameVersioning From 670723f0216e5aea3aa133c99703949900be3d20 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Feb 2015 15:45:02 +0000 Subject: [PATCH 1578/1652] Minor cleanups/improvements to ModelSerializer API --- docs/api-guide/serializers.md | 20 ++++++++++++++++++-- rest_framework/serializers.py | 15 +++++++++------ 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 9a9d5032d..940eb4249 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -577,9 +577,25 @@ Normally if a `ModelSerializer` does not generate the fields you need by default A mapping of Django model classes to REST framework serializer classes. You can override this mapping to alter the default serializer classes that should be used for each model class. -### `.serializer_relational_field` +### `.serializer_related_field` -This property should be the serializer field class, that is used for relational fields by default. For `ModelSerializer` this defaults to `PrimaryKeyRelatedField`. For `HyperlinkedModelSerializer` this defaults to `HyperlinkedRelatedField`. +This property should be the serializer field class, that is used for relational fields by default. + +For `ModelSerializer` this defaults to `PrimaryKeyRelatedField`. + +For `HyperlinkedModelSerializer` this defaults to `serializers.HyperlinkedRelatedField`. + +### `serializer_url_field` + +The serializer field class that should be used for any `url` field on the serializer. + +Defaults to `serializers.HyperlinkedIdentityField` + +### `serializer_choice_field` + +The serializer field class that should be used for any choice fields on the serializer. + +Defaults to `serializers.ChoiceField` ### The field_class and field_kwargs API diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 18b810dfe..7f3fd078c 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -728,7 +728,9 @@ class ModelSerializer(Serializer): models.TimeField: TimeField, models.URLField: URLField, } - serializer_related_class = PrimaryKeyRelatedField + serializer_related_field = PrimaryKeyRelatedField + serializer_url_field = HyperlinkedIdentityField + serializer_choice_field = ChoiceField # Default `create` and `update` behavior... @@ -985,7 +987,7 @@ class ModelSerializer(Serializer): if 'choices' in field_kwargs: # Fields with choices get coerced into `ChoiceField` # instead of using their regular typed field. - field_class = ChoiceField + field_class = self.serializer_choice_field if not issubclass(field_class, ModelField): # `model_field` is only valid for the fallback case of @@ -998,11 +1000,12 @@ class ModelSerializer(Serializer): field_kwargs.pop('allow_blank', None) if postgres_fields and isinstance(model_field, postgres_fields.ArrayField): + # Populate the `child` argument on `ListField` instances generated + # for the PostgrSQL specfic `ArrayField`. child_model_field = model_field.base_field child_field_class, child_field_kwargs = self.build_standard_field( 'child', child_model_field ) - field_kwargs['child'] = child_field_class(**child_field_kwargs) return field_class, field_kwargs @@ -1011,7 +1014,7 @@ class ModelSerializer(Serializer): """ Create fields for forward and reverse relationships. """ - field_class = self.serializer_related_class + field_class = self.serializer_related_field field_kwargs = get_relation_kwargs(field_name, relation_info) # `view_name` is only valid for hyperlinked relationships. @@ -1047,7 +1050,7 @@ class ModelSerializer(Serializer): """ Create a field representing the object's own URL. """ - field_class = HyperlinkedIdentityField + field_class = self.serializer_url_field field_kwargs = get_url_kwargs(model_class) return field_class, field_kwargs @@ -1358,7 +1361,7 @@ class HyperlinkedModelSerializer(ModelSerializer): * A 'url' field is included instead of the 'id' field. * Relationships to other instances are hyperlinks, instead of primary keys. """ - serializer_related_class = HyperlinkedRelatedField + serializer_related_field = HyperlinkedRelatedField def get_default_field_names(self, declared_fields, model_info): """ From 0240df1a383342aa6fbb8ea3effa0482ae213d76 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Feb 2015 16:15:10 +0000 Subject: [PATCH 1579/1652] Minor internal API cleanpu --- rest_framework/serializers.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 7f3fd078c..7235d8c51 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -855,8 +855,9 @@ class ModelSerializer(Serializer): ) # Include any kwargs defined in `Meta.extra_kwargs` - field_kwargs = self.build_field_kwargs( - field_kwargs, extra_kwargs, field_name + extra_field_kwargs = extra_kwargs.get(field_name, {}) + field_kwargs = self.include_extra_kwargs( + field_kwargs, extra_field_kwargs ) # Create the serializer field. @@ -1064,14 +1065,12 @@ class ModelSerializer(Serializer): (field_name, model_class.__name__) ) - def build_field_kwargs(self, kwargs, extra_kwargs, field_name): + def include_extra_kwargs(self, kwargs, extra_kwargs): """ - Include an 'extra_kwargs' that have been included for this field, + Include any 'extra_kwargs' that have been included for this field, possibly removing any incompatible existing keyword arguments. """ - extras = extra_kwargs.get(field_name, {}) - - if extras.get('read_only', False): + if extra_kwargs.get('read_only', False): for attr in [ 'required', 'default', 'allow_blank', 'allow_null', 'min_length', 'max_length', 'min_value', 'max_value', @@ -1079,10 +1078,10 @@ class ModelSerializer(Serializer): ]: kwargs.pop(attr, None) - if extras.get('default') and kwargs.get('required') is False: + if extra_kwargs.get('default') and kwargs.get('required') is False: kwargs.pop('required') - kwargs.update(extras) + kwargs.update(extra_kwargs) return kwargs From 407480b4840990ff17f9a33b293cfcf15bb6f7c5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 9 Feb 2015 17:01:41 +0000 Subject: [PATCH 1580/1652] Minor docs work --- docs/api-guide/pagination.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 8ab2edd53..bae579a6d 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -53,12 +53,22 @@ Or apply the style globally, using the `DEFAULT_PAGINATION_CLASS` settings key. REST_FRAMEWORK = { 'DEFAULT_PAGINATION_CLASS': 'apps.core.pagination.StandardResultsSetPagination' } +--- + # API Reference ## PageNumberPagination +**TODO** + ## LimitOffsetPagination +**TODO** + +## CursorPagination + +**TODO** + --- # Custom pagination styles @@ -111,6 +121,12 @@ API responses for list endpoints will now include a `Link` header, instead of in --- +# HTML pagination controls + +## Customizing the controls + +--- + # Third party packages The following third party packages are also available. From d13c807616030b285589cec2fddf4e34a8e22b4a Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 9 Feb 2015 17:02:54 +0000 Subject: [PATCH 1581/1652] Fix misleading AttributeErrors --- rest_framework/request.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index cfbbdeccd..38fcf9c0a 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -18,6 +18,7 @@ from django.utils.six import BytesIO from rest_framework import HTTP_HEADER_ENCODING from rest_framework import exceptions from rest_framework.settings import api_settings +import sys import warnings @@ -485,8 +486,16 @@ class Request(object): else: self.auth = None - def __getattr__(self, attr): + def __getattribute__(self, attr): """ - Proxy other attributes to the underlying HttpRequest object. + If an attribute does not exist on this instance, then we also attempt + to proxy it to the underlying HttpRequest object. """ - return getattr(self._request, attr) + try: + return super(Request, self).__getattribute__(attr) + except AttributeError: + info = sys.exc_info() + try: + return getattr(self._request, attr) + except AttributeError: + raise info[0], info[1], info[2].tb_next From 54d82f59ed8a5d2ad4c679680dc52b8a94831d50 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 9 Feb 2015 17:19:22 +0000 Subject: [PATCH 1582/1652] Py3 compat fix --- rest_framework/request.py | 8 ++++---- tests/test_request.py | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index 38fcf9c0a..c4de9424a 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -12,9 +12,9 @@ from __future__ import unicode_literals from django.conf import settings from django.http import QueryDict from django.http.multipartparser import parse_header +from django.utils import six from django.utils.datastructures import MultiValueDict from django.utils.datastructures import MergeDict as DjangoMergeDict -from django.utils.six import BytesIO from rest_framework import HTTP_HEADER_ENCODING from rest_framework import exceptions from rest_framework.settings import api_settings @@ -363,7 +363,7 @@ class Request(object): elif hasattr(self._request, 'read'): self._stream = self._request else: - self._stream = BytesIO(self.raw_post_data) + self._stream = six.BytesIO(self.raw_post_data) def _perform_form_overloading(self): """ @@ -405,7 +405,7 @@ class Request(object): self._CONTENTTYPE_PARAM in self._data ): self._content_type = self._data[self._CONTENTTYPE_PARAM] - self._stream = BytesIO(self._data[self._CONTENT_PARAM].encode(self.parser_context['encoding'])) + self._stream = six.BytesIO(self._data[self._CONTENT_PARAM].encode(self.parser_context['encoding'])) self._data, self._files, self._full_data = (Empty, Empty, Empty) def _parse(self): @@ -498,4 +498,4 @@ class Request(object): try: return getattr(self._request, attr) except AttributeError: - raise info[0], info[1], info[2].tb_next + six.reraise(info[0], info[1], info[2].tb_next) diff --git a/tests/test_request.py b/tests/test_request.py index 02a9b1e27..06ad8e937 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -249,6 +249,26 @@ class TestUserSetter(TestCase): login(self.request, self.user) self.assertEqual(self.wrapped_request.user, self.user) + def test_calling_user_fails_when_attribute_error_is_raised(self): + """ + This proves that when an AttributeError is raised inside of the request.user + property, that we can handle this and report the true, underlying error. + """ + class AuthRaisesAttributeError(object): + def authenticate(self, request): + import rest_framework + rest_framework.MISSPELLED_NAME_THAT_DOESNT_EXIST + + self.request = Request(factory.get('/'), authenticators=(AuthRaisesAttributeError(),)) + SessionMiddleware().process_request(self.request) + + login(self.request, self.user) + try: + self.request.user + except AttributeError as error: + self.assertEqual(str(error), "'module' object has no attribute 'MISSPELLED_NAME_THAT_DOESNT_EXIST'") + else: + assert False, 'AttributeError not raised' class TestAuthSetter(TestCase): From 0669f507b3a63114cf429f0662b1781f0e1fa5f8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 9 Feb 2015 17:22:13 +0000 Subject: [PATCH 1583/1652] pep8 fix --- tests/test_request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_request.py b/tests/test_request.py index 06ad8e937..c274ab69d 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -270,8 +270,8 @@ class TestUserSetter(TestCase): else: assert False, 'AttributeError not raised' -class TestAuthSetter(TestCase): +class TestAuthSetter(TestCase): def test_auth_can_be_set(self): request = Request(factory.get('/')) request.auth = 'DUMMY' From b2939c157d32e604e10099be891e382d8c54bbec Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 9 Feb 2015 17:43:20 +0000 Subject: [PATCH 1584/1652] Fixes for latest version of pep8 --- env/pip-selfcheck.json | 1 + rest_framework/templatetags/rest_framework.py | 4 +++- tests/test_authentication.py | 5 ++++- tests/test_relations_hyperlink.py | 4 +++- tests/test_renderers.py | 9 +++++++-- tests/test_response.py | 9 +++++++-- tests/test_throttling.py | 8 ++++++-- 7 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 env/pip-selfcheck.json diff --git a/env/pip-selfcheck.json b/env/pip-selfcheck.json new file mode 100644 index 000000000..db1087af9 --- /dev/null +++ b/env/pip-selfcheck.json @@ -0,0 +1 @@ +{"last_check":"2015-02-09T17:34:33Z","pypi_version":"6.0.8"} \ No newline at end of file diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 69e03af40..d66ffb330 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -154,7 +154,9 @@ def urlize_quoted_links(text, trim_url_limit=None, nofollow=True, autoescape=Tru If autoescape is True, the link text and URLs will get autoescaped. """ - trim_url = lambda x, limit=trim_url_limit: limit is not None and (len(x) > limit and ('%s...' % x[:max(0, limit - 3)])) or x + def trim_url(x, limit=trim_url_limit): + return limit is not None and (len(x) > limit and ('%s...' % x[:max(0, limit - 3)])) or x + safe_input = isinstance(text, SafeData) words = word_split_re.split(force_text(text)) for i, word in enumerate(words): diff --git a/tests/test_authentication.py b/tests/test_authentication.py index caabcc214..19fe6043f 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -205,7 +205,10 @@ class TokenAuthTests(TestCase): def test_post_json_makes_one_db_query(self): """Ensure that authenticating a user using a token performs only one DB query""" auth = "Token " + self.key - func_to_test = lambda: self.csrf_client.post('/token/', {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth) + + def func_to_test(): + return self.csrf_client.post('/token/', {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth) + self.assertNumQueries(1, func_to_test) def test_post_form_failing_token_auth(self): diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py index f1b882edf..2230c275c 100644 --- a/tests/test_relations_hyperlink.py +++ b/tests/test_relations_hyperlink.py @@ -12,7 +12,9 @@ factory = APIRequestFactory() request = factory.get('/') # Just to ensure we have a request in the serializer context -dummy_view = lambda request, pk: None +def dummy_view(request, pk): + pass + urlpatterns = patterns( '', diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 54eea8ceb..4f41144e5 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -28,8 +28,13 @@ import re DUMMYSTATUS = status.HTTP_200_OK DUMMYCONTENT = 'dummycontent' -RENDERER_A_SERIALIZER = lambda x: ('Renderer A: %s' % x).encode('ascii') -RENDERER_B_SERIALIZER = lambda x: ('Renderer B: %s' % x).encode('ascii') + +def RENDERER_A_SERIALIZER(x): + return ('Renderer A: %s' % x).encode('ascii') + + +def RENDERER_B_SERIALIZER(x): + return ('Renderer B: %s' % x).encode('ascii') expected_results = [ diff --git a/tests/test_response.py b/tests/test_response.py index f233ae332..4a9deaa29 100644 --- a/tests/test_response.py +++ b/tests/test_response.py @@ -38,8 +38,13 @@ class MockTextMediaRenderer(BaseRenderer): DUMMYSTATUS = status.HTTP_200_OK DUMMYCONTENT = 'dummycontent' -RENDERER_A_SERIALIZER = lambda x: ('Renderer A: %s' % x).encode('ascii') -RENDERER_B_SERIALIZER = lambda x: ('Renderer B: %s' % x).encode('ascii') + +def RENDERER_A_SERIALIZER(x): + return ('Renderer A: %s' % x).encode('ascii') + + +def RENDERER_B_SERIALIZER(x): + return ('Renderer B: %s' % x).encode('ascii') class RendererA(BaseRenderer): diff --git a/tests/test_throttling.py b/tests/test_throttling.py index cc36a004c..50a53b3eb 100644 --- a/tests/test_throttling.py +++ b/tests/test_throttling.py @@ -188,7 +188,9 @@ class ScopedRateThrottleTests(TestCase): class XYScopedRateThrottle(ScopedRateThrottle): TIMER_SECONDS = 0 THROTTLE_RATES = {'x': '3/min', 'y': '1/min'} - timer = lambda self: self.TIMER_SECONDS + + def timer(self): + return self.TIMER_SECONDS class XView(APIView): throttle_classes = (XYScopedRateThrottle,) @@ -290,7 +292,9 @@ class XffTestingBase(TestCase): class Throttle(ScopedRateThrottle): THROTTLE_RATES = {'test_limit': '1/day'} TIMER_SECONDS = 0 - timer = lambda self: self.TIMER_SECONDS + + def timer(self): + return self.TIMER_SECONDS class View(APIView): throttle_classes = (Throttle,) From 1a087c8c5bac6f157979ef9ff540c0eb23848fb4 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 9 Feb 2015 17:47:59 +0000 Subject: [PATCH 1585/1652] Fix .gitignore --- .gitignore | 18 +++++++----------- env/pip-selfcheck.json | 1 - 2 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 env/pip-selfcheck.json diff --git a/.gitignore b/.gitignore index 2bdf8f7eb..3d5f1043d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,18 +3,14 @@ *~ .* -site/ -htmlcov/ -coverage/ -build/ -dist/ -*.egg-info/ +/site/ +/htmlcov/ +/coverage/ +/build/ +/dist/ +/*.egg-info/ +/env/ MANIFEST -bin/ -include/ -lib/ -local/ - !.gitignore !.travis.yml diff --git a/env/pip-selfcheck.json b/env/pip-selfcheck.json deleted file mode 100644 index db1087af9..000000000 --- a/env/pip-selfcheck.json +++ /dev/null @@ -1 +0,0 @@ -{"last_check":"2015-02-09T17:34:33Z","pypi_version":"6.0.8"} \ No newline at end of file From 7b639c0cd0676172cc8502e833f5b708f39f9a83 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Mon, 9 Feb 2015 17:57:08 +0000 Subject: [PATCH 1586/1652] Drop django master from the build matrix. Currently always going to be a know failure case. We can add it back when we start to consdier Django 1.9 support. --- .travis.yml | 12 ------------ tox.ini | 3 +-- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28ebfc00f..4f9297853 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,18 +25,6 @@ env: - TOX_ENV=py33-django18alpha - TOX_ENV=py32-django18alpha - TOX_ENV=py27-django18alpha - - TOX_ENV=py34-djangomaster - - TOX_ENV=py33-djangomaster - - TOX_ENV=py32-djangomaster - - TOX_ENV=py27-djangomaster - -matrix: - fast_finish: true - allow_failures: - - env: TOX_ENV=py34-djangomaster - - env: TOX_ENV=py33-djangomaster - - env: TOX_ENV=py32-djangomaster - - env: TOX_ENV=py27-djangomaster install: - pip install tox diff --git a/tox.ini b/tox.ini index 8e0369643..eda92c19b 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist = py27-{flake8,docs}, {py26,py27}-django14, {py26,py27,py32,py33,py34}-django{15,16}, - {py27,py32,py33,py34}-django{17,18alpha,master} + {py27,py32,py33,py34}-django{17,18alpha} [testenv] commands = ./runtests.py --fast @@ -15,7 +15,6 @@ deps = django16: Django==1.6.3 # Should track minimum supported django17: Django==1.7.2 # Should track maximum supported django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/ - djangomaster: https://github.com/django/django/zipball/master {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3 {py26,py27}-django{14,15,16}: oauth2==1.5.211 {py26,py27}-django{14,15,16}: django-oauth-plus==2.2.1 From b18d773b517a93528fbdba043b9da8d7bc2cf5b4 Mon Sep 17 00:00:00 2001 From: Joar Leth <joar.leth@gmail.com> Date: Mon, 9 Feb 2015 22:51:49 +0100 Subject: [PATCH 1587/1652] Fix typo in 3.1 announcement --- docs/topics/3.1-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 7242a032a..f500101c5 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -8,7 +8,7 @@ Some highlights include: * An improved pagination API, supporting header or in-body pagination styles. * Pagination controls rendering in the browsable API. * Better support for API versioning. -* Built-in internalization support. +* Built-in internationalization support. * Support for Django 1.8's `HStoreField` and `ArrayField`. --- From d87bb67d11918683425af1c1d56c0c57f50e81b3 Mon Sep 17 00:00:00 2001 From: Carlton Gibson <carlton.gibson@noumenal.co.uk> Date: Tue, 10 Feb 2015 10:50:35 +0100 Subject: [PATCH 1588/1652] Failing test case for #1488 --- tests/test_filters.py | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/tests/test_filters.py b/tests/test_filters.py index 355f02cef..e7cb0c795 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -429,6 +429,56 @@ class SearchFilterTests(TestCase): reload_module(filters) +class AttributeModel(models.Model): + label = models.CharField(max_length=32) + + +class SearchFilterModelM2M(models.Model): + title = models.CharField(max_length=20) + text = models.CharField(max_length=100) + attributes = models.ManyToManyField(AttributeModel) + + +class SearchFilterM2MSerializer(serializers.ModelSerializer): + class Meta: + model = SearchFilterModelM2M + + +class SearchFilterM2MTests(TestCase): + def setUp(self): + # Sequence of title/text/attributes is: + # + # z abc [1, 2, 3] + # zz bcd [1, 2, 3] + # zzz cde [1, 2, 3] + # ... + for idx in range(3): + label = 'w' * (idx + 1) + AttributeModel(label=label) + + for idx in range(10): + title = 'z' * (idx + 1) + text = ( + chr(idx + ord('a')) + + chr(idx + ord('b')) + + chr(idx + ord('c')) + ) + SearchFilterModelM2M(title=title, text=text).save() + SearchFilterModelM2M.objects.get(title='zz').attributes.add(1, 2, 3) + + def test_m2m_search(self): + class SearchListView(generics.ListAPIView): + queryset = SearchFilterModelM2M.objects.all() + serializer_class = SearchFilterM2MSerializer + filter_backends = (filters.SearchFilter,) + search_fields = ('=title', 'text', 'attributes__label') + + view = SearchListView.as_view() + request = factory.get('/', {'search': 'zz'}) + response = view(request) + self.assertEqual(len(response.data), 1) + + class OrderingFilterModel(models.Model): title = models.CharField(max_length=20) text = models.CharField(max_length=100) From 3522b69394d932c8bf8028a456b6d9b64c38b54e Mon Sep 17 00:00:00 2001 From: Carlton Gibson <carlton.gibson@noumenal.co.uk> Date: Tue, 10 Feb 2015 10:51:38 +0100 Subject: [PATCH 1589/1652] Add `distinct` call in `filter_queryset` --- rest_framework/filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index d188a2d1e..d3f55a447 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -104,7 +104,7 @@ class SearchFilter(BaseFilterBackend): for search_term in self.get_search_terms(request): or_queries = [models.Q(**{orm_lookup: search_term}) for orm_lookup in orm_lookups] - queryset = queryset.filter(reduce(operator.or_, or_queries)) + queryset = queryset.filter(reduce(operator.or_, or_queries)).distinct() return queryset From f6033cee87e367ec3a6ffcdd6897656b3e3c0493 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Tue, 10 Feb 2015 22:36:41 +0100 Subject: [PATCH 1590/1652] Add release notes for 3.0.5. --- docs/topics/release-notes.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index e0894d2d9..e74dc803f 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -41,6 +41,19 @@ You can determine your currently installed version using `pip freeze`: ## 3.0.x series +### 3.0.5 + +**Date**: [10th February 2015][3.0.5-milestone]. + +* Fix a bug where `_closable_objects` breaks pickling. ([#1850][gh1850], [#2492][gh2492]) +* Allow non-standard `User` models with `Throttling`. ([#2524][gh2524]) +* Support custom `User.db_table` in TokenAuthentication migration. ([#2479][gh2479]) +* Fix misleading `AttributeError` tracebacks on `Request` objects. ([#2530][gh2530], [#2108][gh2108]) +* `ManyRelatedField.get_value` clearing field on partial update. ([#2475][gh2475]) +* Removed '.model' shortcut from code. ([#2486][gh2486]) +* Fix `detail_route` and `list_route` mutable argument. ([#2518][gh2518]) +* Prefetching the user object when getting the token in `TokenAuthentication`. ([#2519][gh2519]) + ### 3.0.4 **Date**: [28th January 2015][3.0.4-milestone]. @@ -721,6 +734,7 @@ For older release notes, [please see the GitHub repo](old-release-notes). [3.0.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.2+Release%22 [3.0.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.3+Release%22 [3.0.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.4+Release%22 +[3.0.5-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.5+Release%22 <!-- 3.0.1 --> [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -808,3 +822,14 @@ For older release notes, [please see the GitHub repo](old-release-notes). [gh2399]: https://github.com/tomchristie/django-rest-framework/issues/2399 [gh2388]: https://github.com/tomchristie/django-rest-framework/issues/2388 [gh2360]: https://github.com/tomchristie/django-rest-framework/issues/2360 +<!-- 3.0.5 --> +[gh1850]: https://github.com/tomchristie/django-rest-framework/issues/1850 +[gh2108]: https://github.com/tomchristie/django-rest-framework/issues/2108 +[gh2475]: https://github.com/tomchristie/django-rest-framework/issues/2475 +[gh2479]: https://github.com/tomchristie/django-rest-framework/issues/2479 +[gh2486]: https://github.com/tomchristie/django-rest-framework/issues/2486 +[gh2492]: https://github.com/tomchristie/django-rest-framework/issues/2492 +[gh2518]: https://github.com/tomchristie/django-rest-framework/issues/2518 +[gh2519]: https://github.com/tomchristie/django-rest-framework/issues/2519 +[gh2524]: https://github.com/tomchristie/django-rest-framework/issues/2524 +[gh2530]: https://github.com/tomchristie/django-rest-framework/issues/2530 From 59b3fe8f395b2d6ee4091df81f9dbbc7e47cf84e Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Tue, 10 Feb 2015 22:48:04 +0100 Subject: [PATCH 1591/1652] Bumped the version to 3.0.5 --- rest_framework/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 57e5421b8..9b58f09f4 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.0.4' +__version__ = '3.0.5' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2015 Tom Christie' From c3425accdedb64e99238619f8f740bb547b2ecef Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 11 Feb 2015 14:19:07 +0000 Subject: [PATCH 1592/1652] Fix incorrect HTML parsing for DictField --- rest_framework/fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 382fd2dd4..a5348922a 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1192,9 +1192,9 @@ class DictField(Field): def get_value(self, dictionary): # We override the default field access in order to support - # lists in HTML forms. + # dictionaries in HTML forms. if html.is_html_input(dictionary): - return html.parse_html_list(dictionary, prefix=self.field_name) + return html.parse_html_dict(dictionary, prefix=self.field_name) return dictionary.get(self.field_name, empty) def to_internal_value(self, data): From 9d80335ac86076f75c81de02abc0cda8f98916d7 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Thu, 12 Feb 2015 01:10:03 +0100 Subject: [PATCH 1593/1652] Remove '.model' shortcut from viewset docs. Refs #2486. Closes #2549. --- docs/api-guide/viewsets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/viewsets.md b/docs/api-guide/viewsets.md index bbf92c6ce..4fd7aa84c 100644 --- a/docs/api-guide/viewsets.md +++ b/docs/api-guide/viewsets.md @@ -178,7 +178,7 @@ The actions provided by the `ModelViewSet` class are `.list()`, `.retrieve()`, #### Example -Because `ModelViewSet` extends `GenericAPIView`, you'll normally need to provide at least the `queryset` and `serializer_class` attributes, or the `model` attribute shortcut. For example: +Because `ModelViewSet` extends `GenericAPIView`, you'll normally need to provide at least the `queryset` and `serializer_class` attributes. For example: class AccountViewSet(viewsets.ModelViewSet): """ From daf1d59d0f41d2ea89e0b996d22b5d4e84914fb5 Mon Sep 17 00:00:00 2001 From: Carlton Gibson <carlton.gibson@noumenal.co.uk> Date: Tue, 17 Feb 2015 11:22:37 +0100 Subject: [PATCH 1594/1652] Adjust importlib import --- rest_framework/settings.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 7331f2655..8ccfd3ed0 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -20,7 +20,11 @@ back to the defaults. from __future__ import unicode_literals from django.test.signals import setting_changed from django.conf import settings -from django.utils import importlib, six +try: + import importlib +except ImportError: + from django.utils import importlib +from django.utils import six from rest_framework import ISO_8601 From c5eb5b22018e55bffe080bb3f14e34ab6b493073 Mon Sep 17 00:00:00 2001 From: Carlton Gibson <carlton.gibson@noumenal.co.uk> Date: Tue, 17 Feb 2015 11:55:15 +0100 Subject: [PATCH 1595/1652] Move `importlib` fallback into compat. --- rest_framework/compat.py | 5 ++++- rest_framework/settings.py | 6 +----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 50f370143..c6a4a8698 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -12,7 +12,10 @@ from django.utils.six.moves.urllib.parse import urlparse as _urlparse from django.utils import six import django import inspect - +try: + import importlib +except ImportError: + from django.utils import importlib def unicode_repr(instance): # Get the repr of an instance, but ensure it is a unicode string diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 8ccfd3ed0..394b12622 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -20,13 +20,9 @@ back to the defaults. from __future__ import unicode_literals from django.test.signals import setting_changed from django.conf import settings -try: - import importlib -except ImportError: - from django.utils import importlib from django.utils import six from rest_framework import ISO_8601 - +from rest_framework.compat import importlib USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None) From dbd23521656b366cbaa1382a0d222f8fe4e3a326 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 17 Feb 2015 10:58:00 +0000 Subject: [PATCH 1596/1652] Fixes for latest pep8 updates. Refs #2563. --- rest_framework/renderers.py | 8 ++++---- rest_framework/request.py | 6 +++--- rest_framework/serializers.py | 14 ++++++++------ rest_framework/templatetags/rest_framework.py | 4 ++-- rest_framework/utils/model_meta.py | 4 ++-- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 6256acdd7..339bd0d17 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -458,8 +458,8 @@ class BrowsableAPIRenderer(BaseRenderer): return True # Don't actually need to return a form if ( - not getattr(view, 'get_serializer', None) - or not any(is_form_media_type(parser.media_type) for parser in view.parser_classes) + not getattr(view, 'get_serializer', None) or + not any(is_form_media_type(parser.media_type) for parser in view.parser_classes) ): return @@ -503,8 +503,8 @@ class BrowsableAPIRenderer(BaseRenderer): # If we're not using content overloading there's no point in # supplying a generic form, as the view won't treat the form's # value as the content of the request. - if not (api_settings.FORM_CONTENT_OVERRIDE - and api_settings.FORM_CONTENTTYPE_OVERRIDE): + if not (api_settings.FORM_CONTENT_OVERRIDE and + api_settings.FORM_CONTENTTYPE_OVERRIDE): return None # Check permissions diff --git a/rest_framework/request.py b/rest_framework/request.py index 081ace236..fd4f6a3e2 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -383,9 +383,9 @@ class Request(object): # We only need to use form overloading on form POST requests. if ( - not USE_FORM_OVERLOADING - or self._request.method != 'POST' - or not is_form_media_type(self._content_type) + self._request.method != 'POST' or + not USE_FORM_OVERLOADING or + not is_form_media_type(self._content_type) ): return diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index c60574d4f..9475e119b 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -336,8 +336,8 @@ class Serializer(BaseSerializer): return OrderedDict([ (field_name, field.get_value(self.initial_data)) for field_name, field in self.fields.items() - if field.get_value(self.initial_data) is not empty - and not field.read_only + if (field.get_value(self.initial_data) is not empty) and + not field.read_only ]) return OrderedDict([ @@ -653,8 +653,9 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data): # ... # profile = ProfileSerializer() assert not any( - isinstance(field, BaseSerializer) and (key in validated_data) - and isinstance(validated_data[key], (list, dict)) + isinstance(field, BaseSerializer) and + (key in validated_data) and + isinstance(validated_data[key], (list, dict)) for key, field in serializer.fields.items() ), ( 'The `.{method_name}()` method does not support writable nested' @@ -673,8 +674,9 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data): # ... # address = serializer.CharField('profile.address') assert not any( - '.' in field.source and (key in validated_data) - and isinstance(validated_data[key], (list, dict)) + '.' in field.source and + (key in validated_data) and + isinstance(validated_data[key], (list, dict)) for key, field in serializer.fields.items() ), ( 'The `.{method_name}()` method does not support writable dotted-source ' diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py index 699ea897f..bf0dc7b8f 100644 --- a/rest_framework/templatetags/rest_framework.py +++ b/rest_framework/templatetags/rest_framework.py @@ -162,8 +162,8 @@ def urlize_quoted_links(text, trim_url_limit=None, nofollow=True, autoescape=Tru lead = lead + opening # Keep parentheses at the end only if they're balanced. if ( - middle.endswith(closing) - and middle.count(closing) == middle.count(opening) + 1 + middle.endswith(closing) and + middle.count(closing) == middle.count(opening) + 1 ): middle = middle[:-len(closing)] trail = closing + trail diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py index dd92f8b67..d92bceb98 100644 --- a/rest_framework/utils/model_meta.py +++ b/rest_framework/utils/model_meta.py @@ -145,8 +145,8 @@ def _get_reverse_relationships(opts): related_model=related, to_many=True, has_through_model=( - (getattr(relation.field.rel, 'through', None) is not None) - and not relation.field.rel.through._meta.auto_created + (getattr(relation.field.rel, 'through', None) is not None) and + not relation.field.rel.through._meta.auto_created ) ) From 9f4f9c9c9f09f46776e75435f4fe727789721e81 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 17 Feb 2015 12:46:55 +0000 Subject: [PATCH 1597/1652] Single source of truth for requirements --- requirements.txt | 30 ++++++++------------- requirements/requirements-codestyle.txt | 3 +++ requirements/requirements-documentation.txt | 2 ++ requirements/requirements-optionals.txt | 4 +++ requirements/requirements-packaging.txt | 11 ++++++++ requirements/requirements-testing.txt | 3 +++ tox.ini | 13 +++++---- 7 files changed, 40 insertions(+), 26 deletions(-) create mode 100644 requirements/requirements-codestyle.txt create mode 100644 requirements/requirements-documentation.txt create mode 100644 requirements/requirements-optionals.txt create mode 100644 requirements/requirements-packaging.txt create mode 100644 requirements/requirements-testing.txt diff --git a/requirements.txt b/requirements.txt index bf4611792..4ec84f684 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,21 +1,13 @@ -# Minimum Django version -Django>=1.4.11 +# The base set of requirements for REST framework is actually +# just Django, but for the purposes of development and testing +# there are a number of packages that it is useful to install. -# Test requirements -pytest-django==2.8.0 -pytest==2.6.4 -pytest-cov==1.6 -flake8==2.2.2 +# Laying these out as seperate requirements files, allows us to +# only included the relevent sets when running tox, and ensures +# we are only ever declaring out dependancies in one place. -# Optional packages -markdown>=2.1.0 -django-guardian==1.2.4 -django-filter>=0.9.2 - -# wheel for PyPI installs -wheel==0.24.0 -# twine for secured PyPI uploads -twine==1.4.0 - -# MkDocs for documentation previews/deploys -mkdocs==0.11.1 +-r requirements/requirements-optionals.txt +-r requirements/requirements-testing.txt +-r requirements/requirements-documentation.txt +-r requirements/requirements-codestyle.txt +-r requirements/requirements-packaging.txt diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt new file mode 100644 index 000000000..4e2be24c3 --- /dev/null +++ b/requirements/requirements-codestyle.txt @@ -0,0 +1,3 @@ +# PEP8 code linting, which we run on all commits. +flake8==2.3.0 +pep8==1.6.2 diff --git a/requirements/requirements-documentation.txt b/requirements/requirements-documentation.txt new file mode 100644 index 000000000..5009436e4 --- /dev/null +++ b/requirements/requirements-documentation.txt @@ -0,0 +1,2 @@ +# MkDocs to build our documentation. +mkdocs==0.11.1 diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt new file mode 100644 index 000000000..af9937cfa --- /dev/null +++ b/requirements/requirements-optionals.txt @@ -0,0 +1,4 @@ +# Optional packages which may be used with REST framework. +markdown==2.5.2 +django-guardian==1.2.5 +django-filter==0.9.2 diff --git a/requirements/requirements-packaging.txt b/requirements/requirements-packaging.txt new file mode 100644 index 000000000..e4ac77403 --- /dev/null +++ b/requirements/requirements-packaging.txt @@ -0,0 +1,11 @@ +# Wheel for PyPI installs. +wheel==0.24.0 + +# Twine for secured PyPI uploads. +twine==1.4.0 + +# Transifex client for managing translation resources. +transifex-client==0.10 + +# The pip-review and pip-dump tools for package upgrades. +pip-tools==0.3.5 diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt new file mode 100644 index 000000000..a8d5d3229 --- /dev/null +++ b/requirements/requirements-testing.txt @@ -0,0 +1,3 @@ +# PyTest for running the tests. +pytest==2.6.4 +pytest-django==2.8.0 diff --git a/tox.ini b/tox.ini index 76f4f09b3..b96b4939b 100644 --- a/tox.ini +++ b/tox.ini @@ -15,18 +15,17 @@ deps = django16: Django==1.6.3 # Should track minimum supported django17: Django==1.7.2 # Should track maximum supported django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/ - django-guardian==1.2.4 - pytest-django==2.8.0 - django-filter==0.9.2 - markdown>=2.1.0 + -rrequirements/requirements-testing.txt + -rrequirements/requirements-optionals.txt [testenv:py27-flake8] deps = - pytest==2.6.4 - flake8==2.2.2 + -rrequirements/requirements-testing.txt + -rrequirements/requirements-codestyle.txt commands = ./runtests.py --lintonly [testenv:py27-docs] deps = - mkdocs>=0.11.1 + -rrequirements/requirements-testing.txt + -rrequirements/requirements-documentation.txt commands = mkdocs build From 028c477c2242e7c322b68c4730ed1868008c37d8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 17 Feb 2015 12:56:19 +0000 Subject: [PATCH 1598/1652] Note on using pip-review in docs. --- docs/topics/project-management.md | 10 ++++++++++ requirements/requirements-packaging.txt | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/topics/project-management.md b/docs/topics/project-management.md index 2a54fb94e..dfe0d6357 100644 --- a/docs/topics/project-management.md +++ b/docs/topics/project-management.md @@ -166,6 +166,16 @@ When a translator has finished translating their work needs to be downloaded fro --- +## Project requirements + +All our test requirements are pinned to exact versions, in order to ensure that our test runs are reproducible. We maintain the requirements in the `requirements` directory. The requirements files are referenced from the `tox.ini` configuration file, ensuring we have a single source of truth for package versions used in testing. + +You can check if there are any packages available at a newer version, by using the `pip-review` tool. + +Package upgrades should generally be treated as isolated pull requests. Also note that the `pip-dump` command does not work gracefully with our requirements layout style, so any edits should be made manually. + +--- + ## Project ownership The PyPI package is owned by `@tomchristie`. As a backup `@j4mie` also has ownership of the package. diff --git a/requirements/requirements-packaging.txt b/requirements/requirements-packaging.txt index e4ac77403..7782d63a7 100644 --- a/requirements/requirements-packaging.txt +++ b/requirements/requirements-packaging.txt @@ -7,5 +7,5 @@ twine==1.4.0 # Transifex client for managing translation resources. transifex-client==0.10 -# The pip-review and pip-dump tools for package upgrades. +# The pip-review tool for checking package upgrades. pip-tools==0.3.5 From 691ae5b646ab1ef7f965ffc239777134153948b6 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 17 Feb 2015 13:40:59 +0000 Subject: [PATCH 1599/1652] Recommend 'pip list --outdated' instead of using pip-review --- docs/topics/project-management.md | 2 +- requirements/requirements-packaging.txt | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/topics/project-management.md b/docs/topics/project-management.md index dfe0d6357..c9ecc1ed5 100644 --- a/docs/topics/project-management.md +++ b/docs/topics/project-management.md @@ -170,7 +170,7 @@ When a translator has finished translating their work needs to be downloaded fro All our test requirements are pinned to exact versions, in order to ensure that our test runs are reproducible. We maintain the requirements in the `requirements` directory. The requirements files are referenced from the `tox.ini` configuration file, ensuring we have a single source of truth for package versions used in testing. -You can check if there are any packages available at a newer version, by using the `pip-review` tool. +You can check if there are any packages available at a newer version, by using the `pip list --outdated`. Package upgrades should generally be treated as isolated pull requests. Also note that the `pip-dump` command does not work gracefully with our requirements layout style, so any edits should be made manually. diff --git a/requirements/requirements-packaging.txt b/requirements/requirements-packaging.txt index 7782d63a7..1efb2f836 100644 --- a/requirements/requirements-packaging.txt +++ b/requirements/requirements-packaging.txt @@ -6,6 +6,3 @@ twine==1.4.0 # Transifex client for managing translation resources. transifex-client==0.10 - -# The pip-review tool for checking package upgrades. -pip-tools==0.3.5 From f1e517449a68d2d67181781bc070d525ad2e3815 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 17 Feb 2015 13:41:59 +0000 Subject: [PATCH 1600/1652] Minor docs tweak --- docs/topics/project-management.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/topics/project-management.md b/docs/topics/project-management.md index c9ecc1ed5..4926f3554 100644 --- a/docs/topics/project-management.md +++ b/docs/topics/project-management.md @@ -170,9 +170,7 @@ When a translator has finished translating their work needs to be downloaded fro All our test requirements are pinned to exact versions, in order to ensure that our test runs are reproducible. We maintain the requirements in the `requirements` directory. The requirements files are referenced from the `tox.ini` configuration file, ensuring we have a single source of truth for package versions used in testing. -You can check if there are any packages available at a newer version, by using the `pip list --outdated`. - -Package upgrades should generally be treated as isolated pull requests. Also note that the `pip-dump` command does not work gracefully with our requirements layout style, so any edits should be made manually. +Package upgrades should generally be treated as isolated pull requests. You can check if there are any packages available at a newer version, by using the `pip list --outdated`. --- From e45e0f056782cf6406a106add5c11803dcb24e30 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Tue, 17 Feb 2015 13:44:42 +0000 Subject: [PATCH 1601/1652] Update version --- rest_framework/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 9b58f09f4..f8bbeee36 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.0.5' +__version__ = '3.1.0' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2015 Tom Christie' From 30e6f32f6fbe20eafe949017cd62aed5d15529d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannick=20P=C3=89ROUX?= <yannick.peroux@gmail.com> Date: Tue, 17 Feb 2015 17:08:30 +0100 Subject: [PATCH 1602/1652] Fix typo in requests.md --- docs/api-guide/requests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/requests.md b/docs/api-guide/requests.md index 77000ffa2..c993dfae5 100644 --- a/docs/api-guide/requests.md +++ b/docs/api-guide/requests.md @@ -38,7 +38,7 @@ For clarity inside your code, we recommend using `request.query_params` instead ## .DATA and .FILES -The old-style version 2.x `request.data` and `request.FILES` attributes are still available, but are now pending deprecation in favor of the unified `request.data` attribute. +The old-style version 2.x `request.DATA` and `request.FILES` attributes are still available, but are now pending deprecation in favor of the unified `request.data` attribute. ## .QUERY_PARAMS From d9c652813d3ab0ddebbb5503ce8ed57c49e1d0d2 Mon Sep 17 00:00:00 2001 From: Paul Hallett <paul.hallett@lyst.com> Date: Mon, 16 Feb 2015 16:07:08 +0000 Subject: [PATCH 1603/1652] add missing import in tests --- docs/api-guide/testing.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index cd8c7820a..d9a1696dd 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -65,6 +65,8 @@ When testing views directly using a request factory, it's often convenient to be To forcibly authenticate a request, use the `force_authenticate()` method. + from rest_framework.tests import force_authenticate + factory = APIRequestFactory() user = User.objects.get(username='olivia') view = AccountDetail.as_view() From 3d85473edf847ba64aa499b336ca21f6b3d3c6b8 Mon Sep 17 00:00:00 2001 From: Aider Ibragimov <aider.ibragimov@gmail.com> Date: Wed, 18 Feb 2015 21:00:12 +0300 Subject: [PATCH 1604/1652] Fix UniqueTogetherValidator for NULL values --- rest_framework/validators.py | 4 +++- tests/test_validators.py | 20 +++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/rest_framework/validators.py b/rest_framework/validators.py index e3719b8d5..c030abdba 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -138,7 +138,9 @@ class UniqueTogetherValidator: queryset = self.queryset queryset = self.filter_queryset(attrs, queryset) queryset = self.exclude_current_instance(attrs, queryset) - if queryset.exists(): + + # Ignore validation if any field is None + if None not in attrs.values() and queryset.exists(): field_names = ', '.join(self.fields) raise ValidationError(self.message.format(field_names=field_names)) diff --git a/tests/test_validators.py b/tests/test_validators.py index 072cec360..185febf83 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -76,8 +76,8 @@ class TestUniquenessValidation(TestCase): # ----------------------------------- class UniquenessTogetherModel(models.Model): - race_name = models.CharField(max_length=100) - position = models.IntegerField() + race_name = models.CharField(max_length=100, null=True) + position = models.IntegerField(null=True) class Meta: unique_together = ('race_name', 'position') @@ -108,8 +108,8 @@ class TestUniquenessTogetherValidation(TestCase): expected = dedent(""" UniquenessTogetherSerializer(): id = IntegerField(label='ID', read_only=True) - race_name = CharField(max_length=100, required=True) - position = IntegerField(required=True) + race_name = CharField(allow_null=True, max_length=100, required=True) + position = IntegerField(allow_null=True, required=True) class Meta: validators = [<UniqueTogetherValidator(queryset=UniquenessTogetherModel.objects.all(), fields=('race_name', 'position'))>] """) @@ -178,10 +178,20 @@ class TestUniquenessTogetherValidation(TestCase): expected = dedent(""" ExcludedFieldSerializer(): id = IntegerField(label='ID', read_only=True) - race_name = CharField(max_length=100) + race_name = CharField(allow_null=True, max_length=100, required=False) """) assert repr(serializer) == expected + def test_ignore_validation_for_null_fields(self): + UniquenessTogetherModel.objects.create( + race_name=None, + position=None + ) + data = {'race_name': None, 'position': None} + serializer = UniquenessTogetherSerializer(data=data) + + assert serializer.is_valid() + # Tests for `UniqueForDateValidator` # ---------------------------------- From fe8d95f93e11d801d07c8852b12abb4f6b21e1e6 Mon Sep 17 00:00:00 2001 From: Aider Ibragimov <aider.ibragimov@gmail.com> Date: Thu, 19 Feb 2015 18:03:44 +0300 Subject: [PATCH 1605/1652] Skip validation of NULL field only if it part of unique_together --- rest_framework/validators.py | 5 +++- tests/test_validators.py | 54 ++++++++++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/rest_framework/validators.py b/rest_framework/validators.py index c030abdba..ab3616149 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -140,7 +140,10 @@ class UniqueTogetherValidator: queryset = self.exclude_current_instance(attrs, queryset) # Ignore validation if any field is None - if None not in attrs.values() and queryset.exists(): + checked_values = [ + value for field, value in attrs.items() if field in self.fields + ] + if None not in checked_values and queryset.exists(): field_names = ', '.join(self.fields) raise ValidationError(self.message.format(field_names=field_names)) diff --git a/tests/test_validators.py b/tests/test_validators.py index 185febf83..c4c60b7fe 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -83,11 +83,37 @@ class UniquenessTogetherModel(models.Model): unique_together = ('race_name', 'position') +class NullUniquenessTogetherModel(models.Model): + """ + Used to ensure that null values are not included when checking + unique_together constraints. + + Ignoring items which have a null in any of the validated fields is the same + behavior that database backends will use when they have the + unique_together constraint added. + + Example case: a null position could indicate a non-finisher in the race, + there could be many non-finishers in a race, but all non-NULL + values *should* be unique against the given `race_name`. + """ + date_of_birth = models.DateField(null=True) # Not part of the uniqueness constraint + race_name = models.CharField(max_length=100) + position = models.IntegerField(null=True) + + class Meta: + unique_together = ('race_name', 'position') + + class UniquenessTogetherSerializer(serializers.ModelSerializer): class Meta: model = UniquenessTogetherModel +class NullUniquenessTogetherSerializer(serializers.ModelSerializer): + class Meta: + model = NullUniquenessTogetherModel + + class TestUniquenessTogetherValidation(TestCase): def setUp(self): self.instance = UniquenessTogetherModel.objects.create( @@ -183,15 +209,33 @@ class TestUniquenessTogetherValidation(TestCase): assert repr(serializer) == expected def test_ignore_validation_for_null_fields(self): - UniquenessTogetherModel.objects.create( - race_name=None, + # None values that are on fields which are part of the uniqueness + # constraint cause the instance to ignore uniqueness validation. + NullUniquenessTogetherModel.objects.create( + date_of_birth=datetime.date(2000, 1, 1), + race_name='Paris Marathon', position=None ) - data = {'race_name': None, 'position': None} - serializer = UniquenessTogetherSerializer(data=data) - + data = { + 'date': datetime.date(2000, 1, 1), + 'race_name': 'Paris Marathon', + 'position': None + } + serializer = NullUniquenessTogetherSerializer(data=data) assert serializer.is_valid() + def test_do_not_ignore_validation_for_null_fields(self): + # None values that are not on fields part of the uniqueness constraint + # do not cause the instance to skip validation. + NullUniquenessTogetherModel.objects.create( + date_of_birth=datetime.date(2000, 1, 1), + race_name='Paris Marathon', + position=1 + ) + data = {'date': None, 'race_name': 'Paris Marathon', 'position': 1} + serializer = NullUniquenessTogetherSerializer(data=data) + assert not serializer.is_valid() + # Tests for `UniqueForDateValidator` # ---------------------------------- From aa7ed316d842c06d7eb6907d4481d72c747991d7 Mon Sep 17 00:00:00 2001 From: Aider Ibragimov <aider.ibragimov@gmail.com> Date: Thu, 19 Feb 2015 18:09:04 +0300 Subject: [PATCH 1606/1652] Return UniquenessTogetherModel to previous state --- tests/test_validators.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_validators.py b/tests/test_validators.py index c4c60b7fe..127ec6f8b 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -76,8 +76,8 @@ class TestUniquenessValidation(TestCase): # ----------------------------------- class UniquenessTogetherModel(models.Model): - race_name = models.CharField(max_length=100, null=True) - position = models.IntegerField(null=True) + race_name = models.CharField(max_length=100) + position = models.IntegerField() class Meta: unique_together = ('race_name', 'position') @@ -134,8 +134,8 @@ class TestUniquenessTogetherValidation(TestCase): expected = dedent(""" UniquenessTogetherSerializer(): id = IntegerField(label='ID', read_only=True) - race_name = CharField(allow_null=True, max_length=100, required=True) - position = IntegerField(allow_null=True, required=True) + race_name = CharField(max_length=100, required=True) + position = IntegerField(required=True) class Meta: validators = [<UniqueTogetherValidator(queryset=UniquenessTogetherModel.objects.all(), fields=('race_name', 'position'))>] """) @@ -204,7 +204,7 @@ class TestUniquenessTogetherValidation(TestCase): expected = dedent(""" ExcludedFieldSerializer(): id = IntegerField(label='ID', read_only=True) - race_name = CharField(allow_null=True, max_length=100, required=False) + race_name = CharField(max_length=100) """) assert repr(serializer) == expected From 777f4e8212e76f63f474d5d7e089de69dda022a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Thu, 19 Feb 2015 12:23:44 -0400 Subject: [PATCH 1607/1652] Failing test for #2552 --- tests/test_renderers.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tests/test_renderers.py b/tests/test_renderers.py index 60a082250..cb76f6830 100644 --- a/tests/test_renderers.py +++ b/tests/test_renderers.py @@ -10,7 +10,10 @@ from rest_framework import status, permissions from rest_framework.compat import OrderedDict from rest_framework.response import Response from rest_framework.views import APIView -from rest_framework.renderers import BaseRenderer, JSONRenderer, BrowsableAPIRenderer +from rest_framework import serializers +from rest_framework.renderers import ( + BaseRenderer, JSONRenderer, BrowsableAPIRenderer, HTMLFormRenderer +) from rest_framework.settings import api_settings from rest_framework.test import APIRequestFactory from collections import MutableMapping @@ -455,3 +458,16 @@ class TestJSONIndentationStyles: renderer.compact = False data = OrderedDict([('a', 1), ('b', 2)]) assert renderer.render(data) == b'{"a": 1, "b": 2}' + + +class TestHiddenFieldHTMLFormRenderer(TestCase): + def test_hidden_field_rendering(self): + class TestSerializer(serializers.Serializer): + published = serializers.HiddenField(default=True) + + serializer = TestSerializer(data={}) + serializer.is_valid() + renderer = HTMLFormRenderer() + field = serializer['published'] + rendered = renderer.render_field(field, {}) + assert rendered == '' From 60617f876a78b5b81b47a63f9711c4b9eac03a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Dur=C3=A1=20Tar=C3=AD?= <ruben@Rubens-MacBook-Pro.local> Date: Thu, 12 Feb 2015 12:03:00 +0000 Subject: [PATCH 1608/1652] Fixes HiddenField being rendered in HTMLFormRenderer --- rest_framework/renderers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 339bd0d17..920d2bc47 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -305,7 +305,7 @@ class HTMLFormRenderer(BaseRenderer): }) def render_field(self, field, parent_style): - if isinstance(field, serializers.HiddenField): + if isinstance(field._field, serializers.HiddenField): return '' style = dict(self.default_style[field]) From c0916c2859468f4888d688217baca73747fd3bf7 Mon Sep 17 00:00:00 2001 From: aRkadeFR <contact@arkade.info> Date: Fri, 20 Feb 2015 15:59:10 +0100 Subject: [PATCH 1609/1652] Documentation test fix double word --- docs/api-guide/testing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index d9a1696dd..1b96b325e 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -14,7 +14,7 @@ Extends [Django's existing `RequestFactory` class][requestfactory]. ## Creating test requests -The `APIRequestFactory` class supports an almost identical API to Django's standard `RequestFactory` class. This means the that standard `.get()`, `.post()`, `.put()`, `.patch()`, `.delete()`, `.head()` and `.options()` methods are all available. +The `APIRequestFactory` class supports an almost identical API to Django's standard `RequestFactory` class. This means that standard `.get()`, `.post()`, `.put()`, `.patch()`, `.delete()`, `.head()` and `.options()` methods are all available. from rest_framework.test import APIRequestFactory From c8609ba652e1752e690c9e27e02b3531589d0c2c Mon Sep 17 00:00:00 2001 From: Rense VanderHoek <vanderhoek@gmail.com> Date: Fri, 20 Feb 2015 16:31:12 +0100 Subject: [PATCH 1610/1652] Set field length/values as actual attributes. The SimpleMetadata class in metadata.py tries to getattr() attributes on a field. For this to work, max_length and min_length have to be actually set as an attribute. Did the same for min_value and max_value and added those two to SimpleMetadata.get_field_info --- rest_framework/fields.py | 58 ++++++++++++++++++++------------------ rest_framework/metadata.py | 8 +++++- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index a5348922a..561ec93c2 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -556,15 +556,15 @@ class CharField(Field): def __init__(self, **kwargs): self.allow_blank = kwargs.pop('allow_blank', False) self.trim_whitespace = kwargs.pop('trim_whitespace', True) - max_length = kwargs.pop('max_length', None) - min_length = kwargs.pop('min_length', None) + self.max_length = kwargs.pop('max_length', None) + self.min_length = kwargs.pop('min_length', None) super(CharField, self).__init__(**kwargs) - if max_length is not None: - message = self.error_messages['max_length'].format(max_length=max_length) - self.validators.append(MaxLengthValidator(max_length, message=message)) - if min_length is not None: - message = self.error_messages['min_length'].format(min_length=min_length) - self.validators.append(MinLengthValidator(min_length, message=message)) + if self.max_length is not None: + message = self.error_messages['max_length'].format(max_length=self.max_length) + self.validators.append(MaxLengthValidator(self.max_length, message=message)) + if self.min_length is not None: + message = self.error_messages['min_length'].format(min_length=self.min_length) + self.validators.append(MinLengthValidator(self.min_length, message=message)) def run_validation(self, data=empty): # Test for the empty string here so that it does not get validated, @@ -658,15 +658,15 @@ class IntegerField(Field): MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. def __init__(self, **kwargs): - max_value = kwargs.pop('max_value', None) - min_value = kwargs.pop('min_value', None) + self.max_value = kwargs.pop('max_value', None) + self.min_value = kwargs.pop('min_value', None) super(IntegerField, self).__init__(**kwargs) - if max_value is not None: - message = self.error_messages['max_value'].format(max_value=max_value) - self.validators.append(MaxValueValidator(max_value, message=message)) - if min_value is not None: - message = self.error_messages['min_value'].format(min_value=min_value) - self.validators.append(MinValueValidator(min_value, message=message)) + if self.max_value is not None: + message = self.error_messages['max_value'].format(max_value=self.max_value) + self.validators.append(MaxValueValidator(self.max_value, message=message)) + if self.min_value is not None: + message = self.error_messages['min_value'].format(min_value=self.min_value) + self.validators.append(MinValueValidator(self.min_value, message=message)) def to_internal_value(self, data): if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH: @@ -692,15 +692,15 @@ class FloatField(Field): MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs. def __init__(self, **kwargs): - max_value = kwargs.pop('max_value', None) - min_value = kwargs.pop('min_value', None) + self.max_value = kwargs.pop('max_value', None) + self.min_value = kwargs.pop('min_value', None) super(FloatField, self).__init__(**kwargs) - if max_value is not None: - message = self.error_messages['max_value'].format(max_value=max_value) - self.validators.append(MaxValueValidator(max_value, message=message)) - if min_value is not None: - message = self.error_messages['min_value'].format(min_value=min_value) - self.validators.append(MinValueValidator(min_value, message=message)) + if self.max_value is not None: + message = self.error_messages['max_value'].format(max_value=self.max_value) + self.validators.append(MaxValueValidator(self.max_value, message=message)) + if self.min_value is not None: + message = self.error_messages['min_value'].format(min_value=self.min_value) + self.validators.append(MinValueValidator(self.min_value, message=message)) def to_internal_value(self, data): if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH: @@ -733,12 +733,14 @@ class DecimalField(Field): self.max_digits = max_digits self.decimal_places = decimal_places self.coerce_to_string = coerce_to_string if (coerce_to_string is not None) else self.coerce_to_string + self.max_value = kwargs.pop('max_value', None) + self.min_value = kwargs.pop('min_value', None) super(DecimalField, self).__init__(**kwargs) - if max_value is not None: - message = self.error_messages['max_value'].format(max_value=max_value) + if self.max_value is not None: + message = self.error_messages['max_value'].format(max_value=self.max_value) self.validators.append(MaxValueValidator(max_value, message=message)) - if min_value is not None: - message = self.error_messages['min_value'].format(min_value=min_value) + if self.min_value is not None: + message = self.error_messages['min_value'].format(min_value=self.min_value) self.validators.append(MinValueValidator(min_value, message=message)) def to_internal_value(self, data): diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py index 3b058fabb..bf3611aa3 100644 --- a/rest_framework/metadata.py +++ b/rest_framework/metadata.py @@ -115,7 +115,13 @@ class SimpleMetadata(BaseMetadata): field_info['type'] = self.label_lookup[field] field_info['required'] = getattr(field, 'required', False) - for attr in ['read_only', 'label', 'help_text', 'min_length', 'max_length']: + attrs = [ + 'read_only', 'label', 'help_text', + 'min_length', 'max_length', + 'min_value', 'max_value' + ] + + for attr in attrs: value = getattr(field, attr, None) if value is not None and value != '': field_info[attr] = force_text(value, strings_only=True) From bb8690cfb3208440c35a5c35eb65562f7e1729cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 20 Feb 2015 11:43:12 -0400 Subject: [PATCH 1611/1652] Disable select field if no choices available --- .../rest_framework/horizontal/select_multiple.html | 9 +++++++-- .../templates/rest_framework/inline/select_multiple.html | 9 +++++++-- .../rest_framework/vertical/select_multiple.html | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/rest_framework/templates/rest_framework/horizontal/select_multiple.html b/rest_framework/templates/rest_framework/horizontal/select_multiple.html index 01c251fb0..0735f2809 100644 --- a/rest_framework/templates/rest_framework/horizontal/select_multiple.html +++ b/rest_framework/templates/rest_framework/horizontal/select_multiple.html @@ -1,11 +1,16 @@ +{% load i18n %} +{% trans "No items to select." as no_items %} + <div class="form-group"> {% if field.label %} <label class="col-sm-2 control-label {% if style.hide_label %}sr-only{% endif %}">{{ field.label }}</label> {% endif %} <div class="col-sm-10"> - <select multiple class="form-control" name="{{ field.name }}"> + <select multiple {{ field.choices|yesno:",disabled" }} class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} - <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> + <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> + {% empty %} + <option>{{ no_items }}</option> {% endfor %} </select> {% if field.errors %} diff --git a/rest_framework/templates/rest_framework/inline/select_multiple.html b/rest_framework/templates/rest_framework/inline/select_multiple.html index feddf7abd..5a8b2494b 100644 --- a/rest_framework/templates/rest_framework/inline/select_multiple.html +++ b/rest_framework/templates/rest_framework/inline/select_multiple.html @@ -1,10 +1,15 @@ +{% load i18n %} +{% trans "No items to select." as no_items %} + <div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} <label class="sr-only">{{ field.label }}</label> {% endif %} - <select multiple class="form-control" name="{{ field.name }}"> + <select multiple {{ field.choices|yesno:",disabled" }} class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} - <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> + <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> + {% empty %} + <option>{{ no_items }}</option> {% endfor %} </select> </div> diff --git a/rest_framework/templates/rest_framework/vertical/select_multiple.html b/rest_framework/templates/rest_framework/vertical/select_multiple.html index 54839294a..81b25c2a3 100644 --- a/rest_framework/templates/rest_framework/vertical/select_multiple.html +++ b/rest_framework/templates/rest_framework/vertical/select_multiple.html @@ -1,10 +1,15 @@ +{% load i18n %} +{% trans "No items to select." as no_items %} + <div class="form-group {% if field.errors %}has-error{% endif %}"> {% if field.label %} <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label> {% endif %} - <select multiple class="form-control" name="{{ field.name }}"> + <select multiple {{ field.choices|yesno:",disabled" }} class="form-control" name="{{ field.name }}"> {% for key, text in field.choices.items %} - <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> + <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option> + {% empty %} + <option>{{ no_items }}</option> {% endfor %} </select> {% if field.errors %} From 9cb547b85f547ef3b48f45710aee43c7cdd8b547 Mon Sep 17 00:00:00 2001 From: Rense VanderHoek <vanderhoek@gmail.com> Date: Fri, 20 Feb 2015 17:34:49 +0100 Subject: [PATCH 1612/1652] Validator-fix, added min/max fields to test_metadata --- rest_framework/fields.py | 4 ++-- tests/test_metadata.py | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 561ec93c2..1474f1db4 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -738,10 +738,10 @@ class DecimalField(Field): super(DecimalField, self).__init__(**kwargs) if self.max_value is not None: message = self.error_messages['max_value'].format(max_value=self.max_value) - self.validators.append(MaxValueValidator(max_value, message=message)) + self.validators.append(MaxValueValidator(self.max_value, message=message)) if self.min_value is not None: message = self.error_messages['min_value'].format(min_value=self.min_value) - self.validators.append(MinValueValidator(min_value, message=message)) + self.validators.append(MinValueValidator(self.min_value, message=message)) def to_internal_value(self, data): """ diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 5031c0f30..3a435f02f 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -54,8 +54,12 @@ class TestMetadata: """ class ExampleSerializer(serializers.Serializer): choice_field = serializers.ChoiceField(['red', 'green', 'blue']) - integer_field = serializers.IntegerField(max_value=10) - char_field = serializers.CharField(required=False) + integer_field = serializers.IntegerField( + min_value=1, max_value=1000 + ) + char_field = serializers.CharField( + required=False, min_length=3, max_length=40 + ) class ExampleView(views.APIView): """Example view.""" @@ -96,13 +100,18 @@ class TestMetadata: 'type': 'integer', 'required': True, 'read_only': False, - 'label': 'Integer field' + 'label': 'Integer field', + 'min_value': 1, + 'max_value': 1000, + }, 'char_field': { 'type': 'string', 'required': False, 'read_only': False, - 'label': 'Char field' + 'label': 'Char field', + 'min_length': 3, + 'max_length': 40 } } } From 7345830c88615839891f12fd4ed6abee99bb1468 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Fri, 20 Feb 2015 20:12:39 +0100 Subject: [PATCH 1613/1652] Check if sessions are enabled before calling logout. Closes #2545. --- rest_framework/test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/test.py b/rest_framework/test.py index 4f4b7c201..a83d082ab 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -209,7 +209,8 @@ class APIClient(APIRequestFactory, DjangoClient): self.handler._force_user = None self.handler._force_token = None - return super(APIClient, self).logout() + if self.session: + super(APIClient, self).logout() class APITransactionTestCase(testcases.TransactionTestCase): From f29b657798d3f2223275fb33ca95fab2209fc229 Mon Sep 17 00:00:00 2001 From: ludbek <sth.srn@gmail.com> Date: Sat, 21 Feb 2015 07:52:56 +0545 Subject: [PATCH 1614/1652] updated outdated link at testing.md#APIClient --- docs/api-guide/testing.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index d9a1696dd..9dc3f2bf1 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -115,7 +115,7 @@ Extends [Django's existing `Client` class][client]. ## Making requests -The `APIClient` class supports the same request interface as `APIRequestFactory`. This means the that standard `.get()`, `.post()`, `.put()`, `.patch()`, `.delete()`, `.head()` and `.options()` methods are all available. For example: +The `APIClient` class supports the same request interface as Django's standard `Client` class. This means the that standard `.get()`, `.post()`, `.put()`, `.patch()`, `.delete()`, `.head()` and `.options()` methods are all available. For example: from rest_framework.test import APIClient @@ -269,6 +269,6 @@ For example, to add support for using `format='html'` in test requests, you migh } [cite]: http://jacobian.org/writing/django-apps-with-buildout/#s-create-a-test-wrapper -[client]: https://docs.djangoproject.com/en/dev/topics/testing/overview/#module-django.test.client +[client]: https://docs.djangoproject.com/en/dev/topics/testing/tools/#the-test-client [requestfactory]: https://docs.djangoproject.com/en/dev/topics/testing/advanced/#django.test.client.RequestFactory [configuration]: #configuration From 91416632a86f518a043ac1b82da3d1774701ba96 Mon Sep 17 00:00:00 2001 From: Rense VanderHoek <vanderhoek@gmail.com> Date: Sat, 21 Feb 2015 12:31:37 +0100 Subject: [PATCH 1615/1652] DecimalField fix max_value and min_value are not in kwargs --- rest_framework/fields.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 1474f1db4..13ea6dde7 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -733,9 +733,12 @@ class DecimalField(Field): self.max_digits = max_digits self.decimal_places = decimal_places self.coerce_to_string = coerce_to_string if (coerce_to_string is not None) else self.coerce_to_string - self.max_value = kwargs.pop('max_value', None) - self.min_value = kwargs.pop('min_value', None) + + self.max_value = max_value + self.min_value = min_value + super(DecimalField, self).__init__(**kwargs) + if self.max_value is not None: message = self.error_messages['max_value'].format(max_value=self.max_value) self.validators.append(MaxValueValidator(self.max_value, message=message)) From bdc64d4e7370575a70a167dc2ae5d159610ce184 Mon Sep 17 00:00:00 2001 From: Yannick PEROUX <yannick.peroux@gmail.com> Date: Wed, 25 Feb 2015 11:54:11 +0100 Subject: [PATCH 1616/1652] Fix removal of url_path on @detail_route and @list_route. Fix # #2583 SimpleRouter.get_routes was popping out the url_path kwarg from list_route and detail_route decorators. This was causing troubles when the route was re-used, for example if the viewset was inherited. --- rest_framework/routers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 6a4184e20..081654b8c 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -171,9 +171,9 @@ class SimpleRouter(BaseRouter): # Dynamic detail routes (@detail_route decorator) for httpmethods, methodname in detail_routes: method_kwargs = getattr(viewset, methodname).kwargs - url_path = method_kwargs.pop("url_path", None) or methodname initkwargs = route.initkwargs.copy() initkwargs.update(method_kwargs) + url_path = initkwargs.pop("url_path", None) or methodname ret.append(Route( url=replace_methodname(route.url, url_path), mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), @@ -184,9 +184,9 @@ class SimpleRouter(BaseRouter): # Dynamic list routes (@list_route decorator) for httpmethods, methodname in list_routes: method_kwargs = getattr(viewset, methodname).kwargs - url_path = method_kwargs.pop("url_path", None) or methodname initkwargs = route.initkwargs.copy() initkwargs.update(method_kwargs) + url_path = initkwargs.pop("url_path", None) or methodname ret.append(Route( url=replace_methodname(route.url, url_path), mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), From 9cafdd1854ccd5215b7a188c5896fb498a59d725 Mon Sep 17 00:00:00 2001 From: Yannick PEROUX <yannick.peroux@gmail.com> Date: Tue, 24 Feb 2015 17:14:53 +0100 Subject: [PATCH 1617/1652] Add a test for #2583 fix --- tests/test_routers.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/test_routers.py b/tests/test_routers.py index 948c69bbf..08c58ec70 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -302,12 +302,16 @@ class DynamicListAndDetailViewSet(viewsets.ViewSet): return Response({'method': 'link2'}) +class SubDynamicListAndDetailViewSet(DynamicListAndDetailViewSet): + pass + + class TestDynamicListAndDetailRouter(TestCase): def setUp(self): self.router = SimpleRouter() - def test_list_and_detail_route_decorators(self): - routes = self.router.get_routes(DynamicListAndDetailViewSet) + def _test_list_and_detail_route_decorators(self, viewset): + routes = self.router.get_routes(viewset) decorator_routes = [r for r in routes if not (r.name.endswith('-list') or r.name.endswith('-detail'))] MethodNamesMap = namedtuple('MethodNamesMap', 'method_name url_path') @@ -336,3 +340,9 @@ class TestDynamicListAndDetailRouter(TestCase): else: method_map = 'get' self.assertEqual(route.mapping[method_map], method_name) + + def test_list_and_detail_route_decorators(self): + self._test_list_and_detail_route_decorators(DynamicListAndDetailViewSet) + + def test_inherited_list_and_detail_route_decorators(self): + self._test_list_and_detail_route_decorators(SubDynamicListAndDetailViewSet) From 940cf2e2e004f913d3cc260fa2b490d33a163b51 Mon Sep 17 00:00:00 2001 From: Yannick PEROUX <yannick.peroux@gmail.com> Date: Wed, 25 Feb 2015 13:29:07 +0100 Subject: [PATCH 1618/1652] Remove duplicated code in routers.SimpleRouter --- rest_framework/routers.py | 40 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 081654b8c..b1e39ff7d 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -165,34 +165,30 @@ class SimpleRouter(BaseRouter): else: list_routes.append((httpmethods, methodname)) + def _get_dynamic_routes(route, dynamic_routes): + ret = [] + for httpmethods, methodname in dynamic_routes: + method_kwargs = getattr(viewset, methodname).kwargs + initkwargs = route.initkwargs.copy() + initkwargs.update(method_kwargs) + url_path = initkwargs.pop("url_path", None) or methodname + ret.append(Route( + url=replace_methodname(route.url, url_path), + mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), + name=replace_methodname(route.name, url_path), + initkwargs=initkwargs, + )) + + return ret + ret = [] for route in self.routes: if isinstance(route, DynamicDetailRoute): # Dynamic detail routes (@detail_route decorator) - for httpmethods, methodname in detail_routes: - method_kwargs = getattr(viewset, methodname).kwargs - initkwargs = route.initkwargs.copy() - initkwargs.update(method_kwargs) - url_path = initkwargs.pop("url_path", None) or methodname - ret.append(Route( - url=replace_methodname(route.url, url_path), - mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), - name=replace_methodname(route.name, url_path), - initkwargs=initkwargs, - )) + ret += _get_dynamic_routes(route, detail_routes) elif isinstance(route, DynamicListRoute): # Dynamic list routes (@list_route decorator) - for httpmethods, methodname in list_routes: - method_kwargs = getattr(viewset, methodname).kwargs - initkwargs = route.initkwargs.copy() - initkwargs.update(method_kwargs) - url_path = initkwargs.pop("url_path", None) or methodname - ret.append(Route( - url=replace_methodname(route.url, url_path), - mapping=dict((httpmethod, methodname) for httpmethod in httpmethods), - name=replace_methodname(route.name, url_path), - initkwargs=initkwargs, - )) + ret += _get_dynamic_routes(route, list_routes) else: # Standard route ret.append(route) From 71619a02c58df8ee56533daa70e5cc5ece278cf7 Mon Sep 17 00:00:00 2001 From: Mateusz Sikora <sikora2048@gmail.com> Date: Wed, 25 Feb 2015 17:58:54 +0100 Subject: [PATCH 1619/1652] Update third-party-resources.md --- docs/topics/third-party-resources.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index e26e3a2fa..3125601ba 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -188,6 +188,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [hawkrest][hawkrest] - Provides Hawk HTTP Authorization. * [djangorestframework-httpsignature][djangorestframework-httpsignature] - Provides an easy to use HTTP Signature Authentication mechanism. * [djoser][djoser] - Provides a set of views to handle basic actions such as registration, login, logout, password reset and account activation. +* [django-rest-auth][django-rest-auth] - Provides a set of REST API endpoints for registration, authentication (including social media authentication), password reset, retrieve and update user details, etc. ### Permissions From e51dc1855c2e0b2c079d5e248e58afea5bc016f7 Mon Sep 17 00:00:00 2001 From: Mateusz Sikora <sikora2048@gmail.com> Date: Wed, 25 Feb 2015 18:51:20 +0100 Subject: [PATCH 1620/1652] Update authentication.md --- docs/api-guide/authentication.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index 4b8110bd6..fe1be7bf0 100755 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -353,6 +353,10 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a [Djoser][djoser] library provides a set of views to handle basic actions such as registration, login, logout, password reset and account activation. The package works with a custom user model and it uses token based authentication. This is a ready to use REST implementation of Django authentication system. +## django-rest-auth + +[Django-rest-auth][django-rest-auth] library provides a set of REST API endpoints for registration, authentication (including social media authentication), password reset, retrieve and update user details, etc. By having these API endpoints, your client apps such as AngularJS, iOS, Android, and others can communicate to your Django backend site independently via REST APIs for user management. + [cite]: http://jacobian.org/writing/rest-worst-practices/ [http401]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.2 [http403]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.4 @@ -392,3 +396,4 @@ HTTP Signature (currently a [IETF draft][http-signature-ietf-draft]) provides a [mohawk]: http://mohawk.readthedocs.org/en/latest/ [mac]: http://tools.ietf.org/html/draft-hammer-oauth-v2-mac-token-05 [djoser]: https://github.com/sunscrapers/djoser +[django-rest-auth]: https://github.com/Tivix/django-rest-auth From b92d6df66a761de697557cf66168a30db167e043 Mon Sep 17 00:00:00 2001 From: Mateusz Sikora <sikora2048@gmail.com> Date: Wed, 25 Feb 2015 18:53:33 +0100 Subject: [PATCH 1621/1652] Update third-party-resources.md --- docs/topics/third-party-resources.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 3125601ba..2f46e1fc4 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -325,3 +325,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-rest-framework-and-angularjs-video]: http://www.youtube.com/watch?v=q8frbgtj020 [web-api-performance-profiling-django-rest-framework]: http://dabapps.com/blog/api-performance-profiling-django-rest-framework/ [api-development-with-django-and-django-rest-framework]: https://bnotions.com/api-development-with-django-and-django-rest-framework/ +[django-rest-auth]: https://github.com/Tivix/django-rest-auth/ From 86c5fa240131fe20121db707b0324a32967987ab Mon Sep 17 00:00:00 2001 From: Danilo Bargen <mail@dbrgn.ch> Date: Wed, 25 Feb 2015 16:20:45 +0100 Subject: [PATCH 1622/1652] Force-evaluate querysets (see #2602) --- rest_framework/serializers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 9475e119b..2eef6eeb5 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -13,6 +13,7 @@ response content is handled by parsers and renderers. from __future__ import unicode_literals from django.db import models from django.db.models.fields import FieldDoesNotExist, Field as DjangoModelField +from django.db.models import query from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import postgres_fields, unicode_to_repr from rest_framework.utils import model_meta @@ -562,7 +563,7 @@ class ListSerializer(BaseSerializer): """ # Dealing with nested relationships, data can be a Manager, # so, first get a queryset from the Manager if needed - iterable = data.all() if isinstance(data, models.Manager) else data + iterable = data.all() if isinstance(data, (models.Manager, query.QuerySet)) else data return [ self.child.to_representation(item) for item in iterable ] From 03818ed004cbe77459663f92a21691cfb7d9f010 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 26 Feb 2015 12:48:34 +0000 Subject: [PATCH 1623/1652] Pagination tweaks and docs --- docs/api-guide/pagination.md | 164 ++++++++++++++++++++++++++++++++--- rest_framework/pagination.py | 6 +- 2 files changed, 157 insertions(+), 13 deletions(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index bae579a6d..697ba38d5 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -32,14 +32,14 @@ You can also set the pagination class on an individual view by using the `pagina If you want to modify particular aspects of the pagination style, you'll want to override one of the pagination classes, and set the attributes that you want to change. class LargeResultsSetPagination(PageNumberPagination): - paginate_by = 1000 - paginate_by_param = 'page_size' - max_paginate_by = 10000 + page_size = 1000 + page_size_query_param = 'page_size' + max_page_size = 10000 class StandardResultsSetPagination(PageNumberPagination): - paginate_by = 100 - paginate_by_param = 'page_size' - max_paginate_by = 1000 + page_size = 100 + page_size_query_param = 'page_size' + max_page_size = 1000 You can then apply your new style to a view using the `.pagination_class` attribute: @@ -59,15 +59,141 @@ Or apply the style globally, using the `DEFAULT_PAGINATION_CLASS` settings key. ## PageNumberPagination -**TODO** +This pagination style accepts a single number page number in the request query parameters. + +**Request**: + + GET https://api.example.org/accounts/?page=4 + +**Response**: + + HTTP 200 OK + { + "count": 1023 + "next": "https://api.example.org/accounts/?page=5", + "previous": "https://api.example.org/accounts/?page=3", + "results": [ + … + ] + } + +#### Setup + +To enable the `PageNumberPagination` style globally, use the following configuration, modifying the `DEFAULT_PAGE_SIZE` as desired: + + REST_FRAMEWORK = { + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', + 'DEFAULT_PAGE_SIZE': 100 + } + +On `GenericAPIView` subclasses you may also set the `pagination_class` attribute to select `PageNumberPagination` on a per-view basis. + +#### Configuration + +The `PageNumberPagination` class includes a number of attributes that may be overridden to modify the pagination style. + +To set these attributes you should override the `PageNumberPagination` class, and then enable your custom pagination class as above. + +* `page_size` - A numeric value indicating the page size. If set, this overrides the `DEFAULT_PAGE_SIZE` setting. Defaults to the same value as the `DEFAULT_PAGE_SIZE` settings key. +* `page_query_param` - A string value indicating the name of the query parameter to use for the pagination control. +* `page_size_query_param` - If set, this is a string value indicating the name of a query parameter that allows the client to set the page size on a per-request basis. Defaults to `None`, indicating that the client may not control the requested page size. +* `max_page_size` - If set, this is a numeric value indicating the maximum allowable requested page size. This attribute is only valid if `page_size_query_param` is also set. +* `last_page_strings` - A list or tuple of string values indicating values that may be used with the `page_query_param` to request the final page in the set. Defaults to `('last',)` +* `template` - The name of a template to use when rendering pagination controls in the browsable API. May be overridden to modify the rendering style, or set to `None` to disable HTML pagination controls completely. Defaults to `"rest_framework/pagination/numbers.html"`. + +--- ## LimitOffsetPagination -**TODO** +This pagination style mirrors the syntax used when looking up multiple database records. The client includes both a "limit" and an +"offset" query parameter. The limit indicates the maximum number of items to return, and is equivalent to the `page_size` in other styles. The offset indicates the starting position of the query in relation to the complete set of unpaginated items. + +**Request**: + + GET https://api.example.org/accounts/?limit=100&offset=400 + +**Response**: + + HTTP 200 OK + { + "count": 1023 + "next": "https://api.example.org/accounts/?limit=100&offset=500", + "previous": "https://api.example.org/accounts/?limit=100&offset=300", + "results": [ + … + ] + } + +#### Setup + +To enable the `PageNumberPagination` style globally, use the following configuration: + + REST_FRAMEWORK = { + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination' + } + +Optionally, you may also set a `DEFAULT_PAGE_SIZE` key. If the `DEFAULT_PAGE_SIZE` parameter is also used then the `limit` query parameter will be optional, and may be omitted by the client. + +On `GenericAPIView` subclasses you may also set the `pagination_class` attribute to select `LimitOffsetPagination` on a per-view basis. + +#### Configuration + +The `LimitOffsetPagination` class includes a number of attributes that may be overridden to modify the pagination style. + +To set these attributes you should override the `LimitOffsetPagination` class, and then enable your custom pagination class as above. + +* `default_limit` - A numeric value indicating the limit to use if one is not provided by the client in a query parameter. Defaults to the same value as the `DEFAULT_PAGE_SIZE` settings key. +* `limit_query_param` - A string value indicating the name of the "limit" query parameter. Defaults to `'limit'`. +* `offset_query_param` - A string value indicating the name of the "offset" query parameter. Defaults to `'offset'`. +* `max_limit` - If set this is a numeric value indicating the maximum allowable limit that may be requested by the client. Defaults to `None`. +* `template` - The name of a template to use when rendering pagination controls in the browsable API. May be overridden to modify the rendering style, or set to `None` to disable HTML pagination controls completely. Defaults to `"rest_framework/pagination/numbers.html"`. + +--- ## CursorPagination -**TODO** +The cursor-based pagination presents an opaque "cursor" indicator that the client may use to page through the result set. This pagination style only presents forward and reverse controls, and does not allow the client to navigate to arbitrary positions. + +Cursor based pagination requires that there is a unique, unchanging ordering of items in the result set. This ordering might typically be a creation timestamp on the records, as this presents a consistent ordering to paginate against. + +Cursor based pagination is more complex than other schemes. It also requires that the result set presents a fixed ordering, and does not allow the client to arbitrarily index into the result set. However it does provide the following benefits: + +* Provides a consistent pagination view. When used properly `CursorPagination` ensures that the client will never see the same item twice when paging through records. +* Supports usage with very large datasets. With extremely large datasets pagination using offset-based pagination styles may become inefficient or unusable. Cursor based pagination schemes instead have fixed-time properties, and do not slow down as the dataset size increases. + +#### Details and limitations + +This implementation of cursor pagination uses a smart "position plus offset" style that allows it to properly support not-strictly-unique values as the ordering. + +It should be noted that using non-unique values the ordering does introduce the possibility of paging artifacts, where pagination consistency is no longer 100% guaranteed. + +**TODO**: Notes on `None`. + +The implementation also supports both forward and reverse pagination, which is often not supported in other implementations. + +For more technical details on the implementation we use for cursor pagination, the ["Building cursors for the Disqus API"][disqus-cursor-api] blog post gives a good overview of the basic approach. + +#### Setup + +To enable the `CursorPagination` style globally, use the following configuration, modifying the `DEFAULT_PAGE_SIZE` as desired: + + REST_FRAMEWORK = { + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.CursorPagination', + 'DEFAULT_PAGE_SIZE': 100 + } + +On `GenericAPIView` subclasses you may also set the `pagination_class` attribute to select `CursorPagination` on a per-view basis. + +#### Configuration + +The `CursorPagination` class includes a number of attributes that may be overridden to modify the pagination style. + +To set these attributes you should override the `CursorPagination` class, and then enable your custom pagination class as above. + +* `page_size` = A numeric value indicating the page size. If set, this overrides the `DEFAULT_PAGE_SIZE` setting. Defaults to the same value as the `DEFAULT_PAGE_SIZE` settings key. +* `cursor_query_param` = A string value indicating the name of the "cursor" query parameter. Defaults to `'cursor'`. +* `ordering` = This should be a string, or list of strings, indicating the field against which the cursor based pagination will be applied. For example: `ordering = 'created'`. Any filters on the view which define a `get_ordering` will override this attribute. Defaults to `None`. +* `template` = The name of a template to use when rendering pagination controls in the browsable API. May be overridden to modify the rendering style, or set to `None` to disable HTML pagination controls completely. Defaults to `"rest_framework/pagination/previous_and_next.html"`. --- @@ -108,7 +234,7 @@ To have your custom pagination class be used by default, use the `DEFAULT_PAGINA REST_FRAMEWORK = { 'DEFAULT_PAGINATION_CLASS': 'my_project.apps.core.pagination.LinkHeaderPagination', - 'PAGINATE_BY': 10 + 'DEFAULT_PAGE_SIZE': 10 } API responses for list endpoints will now include a `Link` header, instead of including the pagination links as part of the body of the response, for example: @@ -123,8 +249,25 @@ API responses for list endpoints will now include a `Link` header, instead of in # HTML pagination controls +By default using the pagination classes will cause HTML pagination controls to be displayed in the browsable API. There are two built-in display styles. The `PageNumberPagination` and `LimitOffsetPagination` classes display a list of page numbers with previous and next controls. The `CursorPagination` class displays a simpler style that only displays a previous and next control. + ## Customizing the controls +You can override the templates that render the HTML pagination controls. The two built-in styles are: + +* `rest_framework/pagination/numbers.html` +* `rest_framework/pagination/previous_and_next.html` + +Providing a template with either of these paths in a global template directory will override the default rendering for the relevant pagination classes. + +Alternatively you can disable HTML pagination controls completely by subclassing on of the existing classes, setting `template = None` as an attribute on the class. You'll then need to configure your `DEFAULT_PAGINATION_CLASS` settings key to use your custom class as the default pagination style. + +#### Low-level API + +The low-level API for determining if a pagination class should display the controls or not is exposed as a `display_page_controls` attribute on the pagination instance. Custom pagination classes should be set to `True` in the `paginate_queryset` method if they require the HTML pagination controls to be displayed. + +The `.to_html()` and `.get_html_context()` methods may also be overridden in a custom pagination class in order to further customize how the controls are rendered. + --- # Third party packages @@ -140,3 +283,4 @@ The [`DRF-extensions` package][drf-extensions] includes a [`PaginateByMaxMixin` [link-header]: ../img/link-header-pagination.png [drf-extensions]: http://chibisov.github.io/drf-extensions/docs/ [paginate-by-max-mixin]: http://chibisov.github.io/drf-extensions/docs/#paginatebymaxmixin +[disqus-cursor-api]: http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/ \ No newline at end of file diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 496500ba5..809858737 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -259,7 +259,7 @@ class PageNumberPagination(BasePagination): ) raise NotFound(msg) - if paginator.count > 1: + if paginator.count > 1 and self.template is not None: # The browsable API should display pagination controls. self.display_page_controls = True @@ -347,7 +347,7 @@ class LimitOffsetPagination(BasePagination): self.offset = self.get_offset(request) self.count = _get_count(queryset) self.request = request - if self.count > self.limit: + if self.count > self.limit and self.template is not None: self.display_page_controls = True return queryset[self.offset:self.offset + self.limit] @@ -518,7 +518,7 @@ class CursorPagination(BasePagination): # Display page controls in the browsable API if there is more # than one page. - if self.has_previous or self.has_next: + if (self.has_previous or self.has_next) and self.template is not None: self.display_page_controls = True return self.page From e72428214c33b889f61ac83c7f39030b4c66317d Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 26 Feb 2015 12:53:24 +0000 Subject: [PATCH 1624/1652] Formally upgrade suport to Django 1.8-beta --- README.md | 2 +- docs/index.md | 2 +- tox.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index eec809779..045cdbc46 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ There is a live example API for testing purposes, [available here][sandbox]. # Requirements * Python (2.6.5+, 2.7, 3.2, 3.3, 3.4) -* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-alpha) +* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-beta) # Installation diff --git a/docs/index.md b/docs/index.md index 23781419f..91766a0b8 100644 --- a/docs/index.md +++ b/docs/index.md @@ -50,7 +50,7 @@ Some reasons you might want to use REST framework: REST framework requires the following: * Python (2.6.5+, 2.7, 3.2, 3.3, 3.4) -* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7) +* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-beta) The following packages are optional: diff --git a/tox.ini b/tox.ini index b96b4939b..f626268c8 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ deps = django15: Django==1.5.6 # Should track minimum supported django16: Django==1.6.3 # Should track minimum supported django17: Django==1.7.2 # Should track maximum supported - django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/ + django18alpha: https://www.djangoproject.com/download/1.8b1/tarball/ -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 8f988466a594f9c0b6a7e6a2ed76c0b27a7f1895 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 26 Feb 2015 13:20:26 +0000 Subject: [PATCH 1625/1652] Docs on exception handler context. Closes #2604. --- docs/api-guide/exceptions.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index 56811ec33..3e4b3e8be 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -47,7 +47,7 @@ Any example validation error might look like this: You can implement custom exception handling by creating a handler function that converts exceptions raised in your API views into response objects. This allows you to control the style of error responses used by your API. -The function must take a single argument, which is the exception to be handled, and should either return a `Response` object, or return `None` if the exception cannot be handled. If the handler returns `None` then the exception will be re-raised and Django will return a standard HTTP 500 'server error' response. +The function must take a pair of arguments, this first is the exception to be handled, and the second is a dictionary containing any extra context such as the view currently being handled. The exception handler function should either return a `Response` object, or return `None` if the exception cannot be handled. If the handler returns `None` then the exception will be re-raised and Django will return a standard HTTP 500 'server error' response. For example, you might want to ensure that all error responses include the HTTP status code in the body of the response, like so: @@ -72,6 +72,8 @@ In order to alter the style of the response, you could write the following custo return response +The context argument is not used by the default handler, but can be useful if the exception handler needs further information such as the view currently being handled, which can be accessed as `context['view']`. + The exception handler must also be configured in your settings, using the `EXCEPTION_HANDLER` setting key. For example: REST_FRAMEWORK = { From b3956bc591e7bd2c0d1460cdbc2731a372df25a5 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 26 Feb 2015 13:23:05 +0000 Subject: [PATCH 1626/1652] Upgrade testing env name to django18beta --- .travis.yml | 8 ++++---- tox.ini | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f9297853..3eb89dc4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,10 @@ env: - TOX_ENV=py26-django15 - TOX_ENV=py27-django14 - TOX_ENV=py26-django14 - - TOX_ENV=py34-django18alpha - - TOX_ENV=py33-django18alpha - - TOX_ENV=py32-django18alpha - - TOX_ENV=py27-django18alpha + - TOX_ENV=py34-django18beta + - TOX_ENV=py33-django18beta + - TOX_ENV=py32-django18beta + - TOX_ENV=py27-django18beta install: - pip install tox diff --git a/tox.ini b/tox.ini index f626268c8..c986250c5 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist = py27-{flake8,docs}, {py26,py27}-django14, {py26,py27,py32,py33,py34}-django{15,16}, - {py27,py32,py33,py34}-django{17,18alpha} + {py27,py32,py33,py34}-django{17,18beta} [testenv] commands = ./runtests.py --fast @@ -14,7 +14,7 @@ deps = django15: Django==1.5.6 # Should track minimum supported django16: Django==1.6.3 # Should track minimum supported django17: Django==1.7.2 # Should track maximum supported - django18alpha: https://www.djangoproject.com/download/1.8b1/tarball/ + django18beta: https://www.djangoproject.com/download/1.8b1/tarball/ -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 4b745eef3a452b79bac0fc2e7703aa0ade6836fb Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 26 Feb 2015 13:25:14 +0000 Subject: [PATCH 1627/1652] Update test for more graceful 1.8 handling of malformed filename encodings --- tests/test_parsers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_parsers.py b/tests/test_parsers.py index 8816065ab..a9f32a65e 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -101,9 +101,10 @@ class TestFileUploadParser(TestCase): self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8--ÀĥƦ.txt') filename = parser.get_filename(self.stream, None, self.parser_context) - # Malformed. Either None or 'fallback.txt' will be acceptable. + + # Malformed. Either None, 'ÀĥƦ.txt' or 'fallback.txt' will be acceptable. # See also https://code.djangoproject.com/ticket/24209 - self.assertIn(filename, ('fallback.txt', None)) + self.assertIn(filename, ('fallback.txt', 'ÀĥƦ.txt', None)) def __replace_content_disposition(self, disposition): self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition From 1b398a20decbf6e10173d280bc4fccd86a94b629 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Thu, 26 Feb 2015 13:41:25 +0000 Subject: [PATCH 1628/1652] Who care what we do when it's totally malformed? Not me. --- tests/test_parsers.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/test_parsers.py b/tests/test_parsers.py index a9f32a65e..fe6aec196 100644 --- a/tests/test_parsers.py +++ b/tests/test_parsers.py @@ -99,12 +99,5 @@ class TestFileUploadParser(TestCase): filename = parser.get_filename(self.stream, None, self.parser_context) self.assertEqual(filename, 'ÀĥƦ.txt') - self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8--ÀĥƦ.txt') - filename = parser.get_filename(self.stream, None, self.parser_context) - - # Malformed. Either None, 'ÀĥƦ.txt' or 'fallback.txt' will be acceptable. - # See also https://code.djangoproject.com/ticket/24209 - self.assertIn(filename, ('fallback.txt', 'ÀĥƦ.txt', None)) - def __replace_content_disposition(self, disposition): self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition From 16ffe5e31f80058389139fe5dae5184cc22319a6 Mon Sep 17 00:00:00 2001 From: Evan Heidtmann <evan.heidtmann@gmail.com> Date: Thu, 26 Feb 2015 08:34:14 -0800 Subject: [PATCH 1629/1652] Add tests for callable attributes raising exceptions --- tests/test_fields.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/test_fields.py b/tests/test_fields.py index ab3418bd6..7f5f81029 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -93,6 +93,31 @@ class TestSource: "same as the field name. Remove the `source` keyword argument." ) + def test_callable_source(self): + class ExampleSerializer(serializers.Serializer): + example_field = serializers.CharField(source='example_callable') + + class ExampleInstance(object): + def example_callable(self): + return 'example callable value' + + serializer = ExampleSerializer(ExampleInstance()) + assert serializer.data['example_field'] == 'example callable value' + + def test_callable_source_raises(self): + class ExampleSerializer(serializers.Serializer): + example_field = serializers.CharField(source='example_callable', read_only=True) + + class ExampleInstance(object): + def example_callable(self): + raise AttributeError('method call failed') + + with pytest.raises(ValueError) as exc_info: + serializer = ExampleSerializer(ExampleInstance()) + serializer.data.items() + + assert 'method call failed' in str(exc_info.value) + class TestReadOnly: def setup(self): From bdb73d558891192c96368d5ca2266327302dba54 Mon Sep 17 00:00:00 2001 From: Evan Heidtmann <evan.heidtmann@gmail.com> Date: Thu, 26 Feb 2015 09:00:51 -0800 Subject: [PATCH 1630/1652] Avoid swallowing exceptions thrown in callable attributes --- rest_framework/fields.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index a5348922a..01e7c78c8 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -71,7 +71,11 @@ def get_attribute(instance, attrs): except ObjectDoesNotExist: return None if is_simple_callable(instance): - instance = instance() + try: + instance = instance() + except (AttributeError, KeyError) as exc: + raise ValueError('Exception raised in callable attribute "{0}"; original exception was: {1}'.format(attr, exc)) + return instance From e6b06c34c1ee526b65c92b9071c47be2ddc668c4 Mon Sep 17 00:00:00 2001 From: Evan Heidtmann <evan.heidtmann@gmail.com> Date: Thu, 26 Feb 2015 09:20:17 -0800 Subject: [PATCH 1631/1652] Add explanation for this exception mutation --- rest_framework/fields.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 01e7c78c8..f2791a13f 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -74,6 +74,9 @@ def get_attribute(instance, attrs): try: instance = instance() except (AttributeError, KeyError) as exc: + # If we raised an Attribute or KeyError here it'd get treated + # as an omitted field in `Field.get_attribute()`. Instead we + # raise a ValueError to ensure the exception is not masked. raise ValueError('Exception raised in callable attribute "{0}"; original exception was: {1}'.format(attr, exc)) return instance From 32c885c2a0ddd296b17198cbcce27f539bf39456 Mon Sep 17 00:00:00 2001 From: Ian Foote <ian@incuna.com> Date: Fri, 27 Feb 2015 15:22:19 +0000 Subject: [PATCH 1632/1652] Ensure validators are new-style classes on python2 --- rest_framework/validators.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/validators.py b/rest_framework/validators.py index ab3616149..6ae80b897 100644 --- a/rest_framework/validators.py +++ b/rest_framework/validators.py @@ -13,7 +13,7 @@ from rest_framework.exceptions import ValidationError from rest_framework.utils.representation import smart_repr -class UniqueValidator: +class UniqueValidator(object): """ Validator that corresponds to `unique=True` on a model field. @@ -67,7 +67,7 @@ class UniqueValidator: )) -class UniqueTogetherValidator: +class UniqueTogetherValidator(object): """ Validator that corresponds to `unique_together = (...)` on a model class. @@ -155,7 +155,7 @@ class UniqueTogetherValidator: )) -class BaseUniqueForValidator: +class BaseUniqueForValidator(object): message = None missing_message = _('This field is required.') From 9c359181d7e897e796bd38f0b16e6ddd5ae70d86 Mon Sep 17 00:00:00 2001 From: aRkadeFR <contact@arkade.info> Date: Fri, 27 Feb 2015 17:38:28 +0100 Subject: [PATCH 1633/1652] update for `that the` instead of `that` --- docs/api-guide/testing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index 1b96b325e..ed8bbd1d0 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -14,7 +14,7 @@ Extends [Django's existing `RequestFactory` class][requestfactory]. ## Creating test requests -The `APIRequestFactory` class supports an almost identical API to Django's standard `RequestFactory` class. This means that standard `.get()`, `.post()`, `.put()`, `.patch()`, `.delete()`, `.head()` and `.options()` methods are all available. +The `APIRequestFactory` class supports an almost identical API to Django's standard `RequestFactory` class. This means that the standard `.get()`, `.post()`, `.put()`, `.patch()`, `.delete()`, `.head()` and `.options()` methods are all available. from rest_framework.test import APIRequestFactory From 9098856d46f2bf1a5f191b48b5e7b7e07add4dc7 Mon Sep 17 00:00:00 2001 From: Janusz Harkot <jh@blueice.pl> Date: Fri, 27 Feb 2015 19:46:36 +0100 Subject: [PATCH 1634/1652] fix DictKey initial value --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index c0f93816a..13301f31b 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1191,7 +1191,7 @@ class ListField(Field): class DictField(Field): child = _UnvalidatedField() - initial = [] + initial = {} default_error_messages = { 'not_a_dict': _('Expected a dictionary of items but got type "{input_type}".') } From 78e8b1b0108bb8338aa578ea2f4a0237d4edd1d4 Mon Sep 17 00:00:00 2001 From: Kevin Wood <kevin@guidebook.com> Date: Fri, 27 Feb 2015 22:14:15 -0800 Subject: [PATCH 1635/1652] Updated CreateOnlyDefault to call set_context on its default (if callable) --- rest_framework/fields.py | 2 ++ tests/test_fields.py | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 13301f31b..c327f11bc 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -114,6 +114,8 @@ class CreateOnlyDefault: def set_context(self, serializer_field): self.is_update = serializer_field.parent.instance is not None + if callable(self.default) and hasattr(self.default, 'set_context'): + self.default.set_context(serializer_field) def __call__(self): if self.is_update: diff --git a/tests/test_fields.py b/tests/test_fields.py index 7f5f81029..2ffffd55a 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -317,6 +317,22 @@ class TestCreateOnlyDefault: 'text': 'example', } + def test_create_only_default_callable_sets_context(self): + """ CreateOnlyDefault instances with a callable default should set_context on the callable if possible """ + class TestCallableDefault: + def set_context(self, serializer_field): + self.field = serializer_field + + def __call__(self): + return "success" if hasattr(self, 'field') else "failure" + + class TestSerializer(serializers.Serializer): + context_set = serializers.CharField(default=serializers.CreateOnlyDefault(TestCallableDefault())) + + serializer = TestSerializer(data={}) + assert serializer.is_valid() + assert serializer.validated_data['context_set'] == 'success' + # Tests for field input and output values. # ---------------------------------------- From b582d52afbad81c56edad8ea3b6d2ac2d352b87e Mon Sep 17 00:00:00 2001 From: Kevin Wood <kevin@guidebook.com> Date: Sat, 28 Feb 2015 13:06:47 -0800 Subject: [PATCH 1636/1652] Fix docstring formatting --- tests/test_fields.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/test_fields.py b/tests/test_fields.py index 2ffffd55a..1aa528da6 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -318,7 +318,10 @@ class TestCreateOnlyDefault: } def test_create_only_default_callable_sets_context(self): - """ CreateOnlyDefault instances with a callable default should set_context on the callable if possible """ + """ + CreateOnlyDefault instances with a callable default should set_context + on the callable if possible + """ class TestCallableDefault: def set_context(self, serializer_field): self.field = serializer_field From 391b0ae21b29212764c4f3d079187d07228bb743 Mon Sep 17 00:00:00 2001 From: Tymur Maryokhin <maryokhin@gmail.com> Date: Tue, 3 Mar 2015 17:02:12 +0100 Subject: [PATCH 1637/1652] Call default.set_context() only on create. Refs #2619. --- rest_framework/fields.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index c327f11bc..a80862e8c 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -103,7 +103,7 @@ def set_value(dictionary, keys, value): dictionary[keys[-1]] = value -class CreateOnlyDefault: +class CreateOnlyDefault(object): """ This class may be used to provide default values that are only used for create operations, but that do not return any value for update @@ -114,7 +114,7 @@ class CreateOnlyDefault: def set_context(self, serializer_field): self.is_update = serializer_field.parent.instance is not None - if callable(self.default) and hasattr(self.default, 'set_context'): + if callable(self.default) and hasattr(self.default, 'set_context') and not self.is_update: self.default.set_context(serializer_field) def __call__(self): @@ -130,7 +130,7 @@ class CreateOnlyDefault: ) -class CurrentUserDefault: +class CurrentUserDefault(object): def set_context(self, serializer_field): self.user = serializer_field.context['request'].user From 18cc0230bff436da2f26b2b25034cece32c9f5d0 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 4 Mar 2015 15:51:00 +0000 Subject: [PATCH 1638/1652] Clean up pagination attributes --- docs/api-guide/generic-views.md | 7 +- .../5-relationships-and-hyperlinked-apis.md | 2 +- docs/tutorial/quickstart.md | 2 +- rest_framework/pagination.py | 73 ++++++++++++++----- rest_framework/settings.py | 11 ++- tests/test_pagination.py | 8 +- 6 files changed, 71 insertions(+), 32 deletions(-) diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 61c8e8d88..39e09aaa5 100755 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -84,10 +84,9 @@ The following attributes control the basic view behavior. The following attributes are used to control pagination when used with list views. -* `paginate_by` - The size of pages to use with paginated data. If set to `None` then pagination is turned off. If unset this uses the same value as the `PAGINATE_BY` setting, which defaults to `None`. -* `paginate_by_param` - The name of a query parameter, which can be used by the client to override the default page size to use for pagination. If unset this uses the same value as the `PAGINATE_BY_PARAM` setting, which defaults to `None`. -* `pagination_serializer_class` - The pagination serializer class to use when determining the style of paginated responses. Defaults to the same value as the `DEFAULT_PAGINATION_SERIALIZER_CLASS` setting. -* `page_kwarg` - The name of a URL kwarg or URL query parameter which can be used by the client to control which page is requested. Defaults to `'page'`. +* `pagination_class` - The pagination class that should be used when paginating list results. Defaults to the same value as the `DEFAULT_PAGINATION_CLASS` setting, which is `'rest_framework.pagination.PageNumberPagination'`. + +Note that usage of the `paginate_by`, `paginate_by_param` and `page_kwarg` attributes are now pending deprecation. The `pagination_serializer_class` attribute and `DEFAULT_PAGINATION_SERIALIZER_CLASS` setting have been removed completely. Pagination settings should instead be controlled by overriding a pagination class and setting any configuration attributes there. See the pagination documentation for more details. **Filtering**: diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 740a4ce21..91cdd6f10 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -141,7 +141,7 @@ The list views for users and code snippets could end up returning quite a lot of We can change the default list style to use pagination, by modifying our `tutorial/settings.py` file slightly. Add the following setting: REST_FRAMEWORK = { - 'PAGINATE_BY': 10 + 'PAGE_SIZE': 10 } Note that settings in REST framework are all namespaced into a single dictionary setting, named 'REST_FRAMEWORK', which helps keep them well separated from your other project settings. diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index a4474c34e..fe0ecbc7e 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -123,7 +123,7 @@ We'd also like to set a few global settings. We'd like to turn on pagination, a REST_FRAMEWORK = { 'DEFAULT_PERMISSION_CLASSES': ('rest_framework.permissions.IsAdminUser',), - 'PAGINATE_BY': 10 + 'PAGE_SIZE': 10 } Okay, we're done. diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 809858737..6a2f5b271 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -18,6 +18,7 @@ from rest_framework.settings import api_settings from rest_framework.utils.urls import ( replace_query_param, remove_query_param ) +import warnings def _positive_int(integer_string, strict=False, cutoff=None): @@ -203,18 +204,18 @@ class PageNumberPagination(BasePagination): """ # The default page size. # Defaults to `None`, meaning pagination is disabled. - paginate_by = api_settings.PAGINATE_BY + page_size = api_settings.PAGE_SIZE # Client can control the page using this query parameter. page_query_param = 'page' # Client can control the page size using this query parameter. # Default is 'None'. Set to eg 'page_size' to enable usage. - paginate_by_param = api_settings.PAGINATE_BY_PARAM + page_size_query_param = None # Set to an integer to limit the maximum page size the client may request. - # Only relevant if 'paginate_by_param' has also been set. - max_paginate_by = api_settings.MAX_PAGINATE_BY + # Only relevant if 'page_size_query_param' has also been set. + max_page_size = None last_page_strings = ('last',) @@ -228,12 +229,48 @@ class PageNumberPagination(BasePagination): attributes were set there. The attributes should now be set on the pagination class, but the old style is still pending deprecation. """ - for attr in ( - 'paginate_by', 'page_query_param', - 'paginate_by_param', 'max_paginate_by' + assert not ( + getattr(view, 'pagination_serializer_class', None) or + getattr(api_settings, 'DEFAULT_PAGINATION_SERIALIZER_CLASS', None) + ), ( + "The pagination_serializer_class attribute and " + "DEFAULT_PAGINATION_SERIALIZER_CLASS setting have been removed as " + "part of the 3.1 pagination API improvement. See the pagination " + "documentation for details on the new API." + ) + + for (settings_key, attr_name) in ( + ('PAGINATE_BY', 'page_size'), + ('PAGINATE_BY_PARAM', 'page_size_query_param'), + ('MAX_PAGINATE_BY', 'max_page_size') ): - if hasattr(view, attr): - setattr(self, attr, getattr(view, attr)) + value = getattr(api_settings, settings_key, None) + if value is not None: + setattr(self, attr_name, value) + warnings.warn( + "The `%s` settings key is pending deprecation. " + "Use the `%s` attribute on the pagination class instead." % ( + settings_key, attr_name + ), + PendingDeprecationWarning, + ) + + for (view_attr, attr_name) in ( + ('paginate_by', 'page_size'), + ('page_query_param', 'page_query_param'), + ('paginate_by_param', 'page_size_query_param'), + ('max_paginate_by', 'max_page_size') + ): + value = getattr(view, view_attr, None) + if value is not None: + setattr(self, attr_name, value) + warnings.warn( + "The `%s` view attribute is pending deprecation. " + "Use the `%s` attribute on the pagination class instead." % ( + view_attr, attr_name + ), + PendingDeprecationWarning, + ) def paginate_queryset(self, queryset, request, view=None): """ @@ -264,7 +301,7 @@ class PageNumberPagination(BasePagination): self.display_page_controls = True self.request = request - return self.page + return list(self.page) def get_paginated_response(self, data): return Response(OrderedDict([ @@ -275,17 +312,17 @@ class PageNumberPagination(BasePagination): ])) def get_page_size(self, request): - if self.paginate_by_param: + if self.page_size_query_param: try: return _positive_int( - request.query_params[self.paginate_by_param], + request.query_params[self.page_size_query_param], strict=True, - cutoff=self.max_paginate_by + cutoff=self.max_page_size ) except (KeyError, ValueError): pass - return self.paginate_by + return self.page_size def get_next_link(self): if not self.page.has_next(): @@ -336,7 +373,7 @@ class LimitOffsetPagination(BasePagination): http://api.example.org/accounts/?limit=100 http://api.example.org/accounts/?offset=400&limit=100 """ - default_limit = api_settings.PAGINATE_BY + default_limit = api_settings.PAGE_SIZE limit_query_param = 'limit' offset_query_param = 'offset' max_limit = None @@ -349,7 +386,7 @@ class LimitOffsetPagination(BasePagination): self.request = request if self.count > self.limit and self.template is not None: self.display_page_controls = True - return queryset[self.offset:self.offset + self.limit] + return list(queryset[self.offset:self.offset + self.limit]) def get_paginated_response(self, data): return Response(OrderedDict([ @@ -440,7 +477,7 @@ class CursorPagination(BasePagination): # Consider a max offset cap. # Tidy up the `get_ordering` API (eg remove queryset from it) cursor_query_param = 'cursor' - page_size = api_settings.PAGINATE_BY + page_size = api_settings.PAGE_SIZE invalid_cursor_message = _('Invalid cursor') ordering = None template = 'rest_framework/pagination/previous_and_next.html' @@ -484,7 +521,7 @@ class CursorPagination(BasePagination): # We also always fetch an extra item in order to determine if there is a # page following on from this one. results = list(queryset[offset:offset + self.page_size + 1]) - self.page = results[:self.page_size] + self.page = list(results[:self.page_size]) # Determine the position of the final item following the page. if len(results) > len(self.page): diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 394b12622..a3e9f5902 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -61,9 +61,7 @@ DEFAULTS = { 'NUM_PROXIES': None, # Pagination - 'PAGINATE_BY': None, - 'PAGINATE_BY_PARAM': None, - 'MAX_PAGINATE_BY': None, + 'PAGE_SIZE': None, # Filtering 'SEARCH_PARAM': 'search', @@ -117,7 +115,12 @@ DEFAULTS = { 'UNICODE_JSON': True, 'COMPACT_JSON': True, 'COERCE_DECIMAL_TO_STRING': True, - 'UPLOADED_FILES_USE_URL': True + 'UPLOADED_FILES_USE_URL': True, + + # Pending deprecation: + 'PAGINATE_BY': None, + 'PAGINATE_BY_PARAM': None, + 'MAX_PAGINATE_BY': None } diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 13bfb6272..6b39a6f22 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -24,9 +24,9 @@ class TestPaginationIntegration: return [item for item in queryset if item % 2 == 0] class BasicPagination(pagination.PageNumberPagination): - paginate_by = 5 - paginate_by_param = 'page_size' - max_paginate_by = 20 + page_size = 5 + page_size_query_param = 'page_size' + max_page_size = 20 self.view = generics.ListAPIView.as_view( serializer_class=PassThroughSerializer, @@ -185,7 +185,7 @@ class TestPageNumberPagination: def setup(self): class ExamplePagination(pagination.PageNumberPagination): - paginate_by = 5 + page_size = 5 self.pagination = ExamplePagination() self.queryset = range(1, 101) From efb42ff7d048d165b151e3b75553ef720dc49cd3 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Wed, 4 Mar 2015 16:17:30 +0000 Subject: [PATCH 1639/1652] Update docs --- docs/api-guide/pagination.md | 26 +++++++++++++++++++++++++- docs/topics/3.1-announcement.md | 9 +++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 697ba38d5..13bd57aef 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -208,6 +208,30 @@ Note that the `paginate_queryset` method may set state on the pagination instanc ## Example +Suppose we want to replace the default pagination output style with a modified format that includes the next and previous links under in a nested 'links' key. We could specify a custom pagination class like so: + + class CustomPagination(pagination.PageNumberPagination): + def get_paginated_response(self, data): + return Response({ + 'links': { + 'next': self.get_next_link(), + 'previous': self.get_previous_link() + }, + 'count': self.page.paginator.count, + 'results': data + }) + +We'd then need to setup the custom class in our configuration: + + REST_FRAMEWORK = { + 'DEFAULT_PAGINATION_CLASS': 'my_project.apps.core.pagination.CustomPagination', + 'PAGE_SIZE': 100 + } + +Note that if you care about how the ordering of keys is displayed in responses in the browsable API you might choose to use an `OrderedDict` when constructing the body of paginated responses, but this is optional. + +## Header based pagination + Let's modify the built-in `PageNumberPagination` style, so that instead of include the pagination links in the body of the response, we'll instead include a `Link` header, in a [similar style to the GitHub API][github-link-pagination]. class LinkHeaderPagination(pagination.PageNumberPagination): @@ -234,7 +258,7 @@ To have your custom pagination class be used by default, use the `DEFAULT_PAGINA REST_FRAMEWORK = { 'DEFAULT_PAGINATION_CLASS': 'my_project.apps.core.pagination.LinkHeaderPagination', - 'DEFAULT_PAGE_SIZE': 10 + 'PAGE_SIZE': 100 } API responses for list endpoints will now include a `Link` header, instead of including the pagination links as part of the body of the response, for example: diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index f500101c5..ecbc9a380 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -17,6 +17,15 @@ Some highlights include: The pagination API has been improved, making it both easier to use, and more powerful. +A guide to the headline features follows. For full details, see [the pagination documentation][pagination]. + +Note that as a result of this work a number of settings keys and generic view attributes are now moved to pending deprecation. Controlling pagination styles is now largely handled by overriding a pagination class and modifying its configuration attributes. + +* The `PAGINATE_BY` settings key will continue to work but is now pending deprecation. The more obviously named `PAGE_SIZE` settings key should now be used instead. +* The `PAGINATE_BY_PARAM`, `MAX_PAGINATE_BY` settings keys will continue to work but are now pending deprecation, in favor of setting configuration attributes on the configured pagination class. +* The `paginate_by`, `page_query_param`, `paginate_by_param` and `max_paginate_by` generic view attributes will continue to work but are now pending deprecation, in favor of setting configuration attributes on the configured pagination class. +* The `pagination_serializer_class` view attribute and `DEFAULT_PAGINATION_SERIALIZER_CLASS` settings key **are no longer valid**. The pagination API does not use serializers to determine the output format, and you'll need to instead override the `get_paginated_response` method on a pagination class in order to specify how the output format is controlled. + #### New pagination schemes. Until now, there has only been a single built-in pagination style in REST framework. We now have page, limit/offset and cursor based schemes included by default. From ce31e369734bd6db1a5a1a94bb1679e6bbbf34b3 Mon Sep 17 00:00:00 2001 From: Egor Yurtaev <yurtaev.egor@gmail.com> Date: Thu, 5 Mar 2015 18:34:42 +0600 Subject: [PATCH 1640/1652] Remove `MergeDict` The class MergeDict is deprecated and will be removed in Django 1.9 --- rest_framework/request.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index fd4f6a3e2..e4b5bc263 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -14,7 +14,6 @@ from django.http import QueryDict from django.http.multipartparser import parse_header from django.utils import six from django.utils.datastructures import MultiValueDict -from django.utils.datastructures import MergeDict as DjangoMergeDict from rest_framework import HTTP_HEADER_ENCODING from rest_framework import exceptions from rest_framework.settings import api_settings @@ -61,15 +60,6 @@ class override_method(object): self.view.action = self.action -class MergeDict(DjangoMergeDict, dict): - """ - Using this as a workaround until the parsers API is properly - addressed in 3.1. - """ - def __init__(self, *dicts): - self.dicts = dicts - - class Empty(object): """ Placeholder for unset attributes. @@ -328,7 +318,8 @@ class Request(object): if not _hasattr(self, '_data'): self._data, self._files = self._parse() if self._files: - self._full_data = MergeDict(self._data, self._files) + self._full_data = self._data.copy() + self._full_data.update(self._files) else: self._full_data = self._data @@ -392,7 +383,8 @@ class Request(object): # At this point we're committed to parsing the request as form data. self._data = self._request.POST self._files = self._request.FILES - self._full_data = MergeDict(self._data, self._files) + self._full_data = self._data.copy() + self._full_data.update(self._files) # Method overloading - change the method and remove the param from the content. if ( From 58dfde7fcd9c29530d0613161dda0cf30c56a0a4 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Mar 2015 10:22:32 +0000 Subject: [PATCH 1641/1652] Tweaks for cursor pagination and docs --- docs/api-guide/pagination.md | 12 +++++++++--- docs/topics/3.1-announcement.md | 1 + docs/topics/release-notes.md | 5 +++++ rest_framework/pagination.py | 28 ++++++++++++++++++---------- 4 files changed, 33 insertions(+), 13 deletions(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 13bd57aef..14c0b7f27 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -51,7 +51,8 @@ You can then apply your new style to a view using the `.pagination_class` attrib Or apply the style globally, using the `DEFAULT_PAGINATION_CLASS` settings key. For example: REST_FRAMEWORK = { - 'DEFAULT_PAGINATION_CLASS': 'apps.core.pagination.StandardResultsSetPagination' } + 'DEFAULT_PAGINATION_CLASS': 'apps.core.pagination.StandardResultsSetPagination' + } --- @@ -163,6 +164,10 @@ Cursor based pagination is more complex than other schemes. It also requires tha #### Details and limitations +Cursor based pagination requires a specified ordering to be applied to the queryset. This will default to `'-created'`, which requires the model being paged against to have a `'created'` field. + + + This implementation of cursor pagination uses a smart "position plus offset" style that allows it to properly support not-strictly-unique values as the ordering. It should be noted that using non-unique values the ordering does introduce the possibility of paging artifacts, where pagination consistency is no longer 100% guaranteed. @@ -192,7 +197,7 @@ To set these attributes you should override the `CursorPagination` class, and th * `page_size` = A numeric value indicating the page size. If set, this overrides the `DEFAULT_PAGE_SIZE` setting. Defaults to the same value as the `DEFAULT_PAGE_SIZE` settings key. * `cursor_query_param` = A string value indicating the name of the "cursor" query parameter. Defaults to `'cursor'`. -* `ordering` = This should be a string, or list of strings, indicating the field against which the cursor based pagination will be applied. For example: `ordering = 'created'`. Any filters on the view which define a `get_ordering` will override this attribute. Defaults to `None`. +* `ordering` = This should be a string, or list of strings, indicating the field against which the cursor based pagination will be applied. For example: `ordering = '-created'`. Any filters on the view which define a `get_ordering` will override this attribute. Defaults to `None`. * `template` = The name of a template to use when rendering pagination controls in the browsable API. May be overridden to modify the rendering style, or set to `None` to disable HTML pagination controls completely. Defaults to `"rest_framework/pagination/previous_and_next.html"`. --- @@ -236,7 +241,8 @@ Let's modify the built-in `PageNumberPagination` style, so that instead of inclu class LinkHeaderPagination(pagination.PageNumberPagination): def get_paginated_response(self, data): - next_url = self.get_next_link() previous_url = self.get_previous_link() + next_url = self.get_next_link() + previous_url = self.get_previous_link() if next_url is not None and previous_url is not None: link = '<{next_url}; rel="next">, <{previous_url}; rel="prev">' diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index ecbc9a380..6606d8431 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -203,3 +203,4 @@ The next focus will be on HTML renderings of API output and will include: This will either be made as a single 3.2 release, or split across two separate releases, with the HTML forms and filter controls coming in 3.2, and the admin-style interface coming in a 3.3 release. [custom-exception-handler]: ../api-guide/exceptions.md#custom-exception-handling +[pagination]: ../api-guide/pagination.md diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 51eb45c37..35592febe 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,11 @@ You can determine your currently installed version using `pip freeze`: ## 3.0.x series +### 3.1.0 + +**Date**: [5th March 2015][3.1.0-milestone]. + +For full details see the [3.1 release announcement](3.1-announcement.md). ### 3.0.5 diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 6a2f5b271..f41a9ae1a 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -131,12 +131,19 @@ def _decode_cursor(encoded): """ Given a string representing an encoded cursor, return a `Cursor` instance. """ + + # The offset in the cursor is used in situations where we have a + # nearly-unique index. (Eg millisecond precision creation timestamps) + # We guard against malicious users attempting to cause expensive database + # queries, by having a hard cap on the maximum possible size of the offset. + OFFSET_CUTOFF = 1000 + try: querystring = b64decode(encoded.encode('ascii')).decode('ascii') tokens = urlparse.parse_qs(querystring, keep_blank_values=True) offset = tokens.get('o', ['0'])[0] - offset = _positive_int(offset) + offset = _positive_int(offset, cutoff=OFFSET_CUTOFF) reverse = tokens.get('r', ['0'])[0] reverse = bool(int(reverse)) @@ -472,14 +479,15 @@ class LimitOffsetPagination(BasePagination): class CursorPagination(BasePagination): - # Determine how/if True, False and None positions work - do the string - # encodings work with Django queryset filters? - # Consider a max offset cap. - # Tidy up the `get_ordering` API (eg remove queryset from it) + """ + The cursor pagination implementation is neccessarily complex. + For an overview of the position/offset style we use, see this post: + http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/ + """ cursor_query_param = 'cursor' page_size = api_settings.PAGE_SIZE invalid_cursor_message = _('Invalid cursor') - ordering = None + ordering = '-created' template = 'rest_framework/pagination/previous_and_next.html' def paginate_queryset(self, queryset, request, view=None): @@ -680,12 +688,12 @@ class CursorPagination(BasePagination): ) ) else: - # The default case is to check for an `ordering` attribute, - # first on the view instance, and then on this pagination instance. - ordering = getattr(view, 'ordering', getattr(self, 'ordering', None)) + # The default case is to check for an `ordering` attribute + # on this pagination instance. + ordering = self.ordering assert ordering is not None, ( 'Using cursor pagination, but no ordering attribute was declared ' - 'on the view or on the pagination class.' + 'on the pagination class.' ) assert isinstance(ordering, (six.string_types, list, tuple)), ( From c511342047f9eea01335fec0ac9ff7f4c823b696 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Mar 2015 11:32:03 +0000 Subject: [PATCH 1642/1652] More docs on cursor pagination --- docs/api-guide/pagination.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 14c0b7f27..bc65267fb 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -159,22 +159,23 @@ Cursor based pagination requires that there is a unique, unchanging ordering of Cursor based pagination is more complex than other schemes. It also requires that the result set presents a fixed ordering, and does not allow the client to arbitrarily index into the result set. However it does provide the following benefits: -* Provides a consistent pagination view. When used properly `CursorPagination` ensures that the client will never see the same item twice when paging through records. +* Provides a consistent pagination view. When used properly `CursorPagination` ensures that the client will never see the same item twice when paging through records, even when new items are being inserted by other clients during the pagination process. * Supports usage with very large datasets. With extremely large datasets pagination using offset-based pagination styles may become inefficient or unusable. Cursor based pagination schemes instead have fixed-time properties, and do not slow down as the dataset size increases. #### Details and limitations -Cursor based pagination requires a specified ordering to be applied to the queryset. This will default to `'-created'`, which requires the model being paged against to have a `'created'` field. +Proper use of cursor based pagination a little attention to detail. You'll need to think about what ordering you want the scheme to be applied against. The default is to order by `"-created"`. This assumes that **there must be a 'created' timestamp field** on the model instances, and will present a "timeline" style paginated view, with the most recently added items first. +You can modify the ordering by overriding the `'ordering'` attribute on the pagination class, or by using the `OrderingFilter` filter class together with `CursorPagination`. When used with `OrderingFilter` you should strongly consider restricting the fields that the user may order by. +Proper usage of cursor pagination should have an ordering field that satisfies the following: -This implementation of cursor pagination uses a smart "position plus offset" style that allows it to properly support not-strictly-unique values as the ordering. +* Should be an unchanging value, such as a timestamp, slug, or other field that is only set once, on creation. +* Should be unique, or nearly unique. Millisecond precision timestamps are a good example. This implementation of cursor pagination uses a smart "position plus offset" style that allows it to properly support not-strictly-unique values as the ordering. +* Should be a non-nullable value that can be coerced to a string. +* The field should have a database index. -It should be noted that using non-unique values the ordering does introduce the possibility of paging artifacts, where pagination consistency is no longer 100% guaranteed. - -**TODO**: Notes on `None`. - -The implementation also supports both forward and reverse pagination, which is often not supported in other implementations. +Using an ordering field that does not satisfy these constraints will generally still work, but you'll be loosing some of the benefits of cursor pagination. For more technical details on the implementation we use for cursor pagination, the ["Building cursors for the Disqus API"][disqus-cursor-api] blog post gives a good overview of the basic approach. @@ -197,7 +198,7 @@ To set these attributes you should override the `CursorPagination` class, and th * `page_size` = A numeric value indicating the page size. If set, this overrides the `DEFAULT_PAGE_SIZE` setting. Defaults to the same value as the `DEFAULT_PAGE_SIZE` settings key. * `cursor_query_param` = A string value indicating the name of the "cursor" query parameter. Defaults to `'cursor'`. -* `ordering` = This should be a string, or list of strings, indicating the field against which the cursor based pagination will be applied. For example: `ordering = '-created'`. Any filters on the view which define a `get_ordering` will override this attribute. Defaults to `None`. +* `ordering` = This should be a string, or list of strings, indicating the field against which the cursor based pagination will be applied. For example: `ordering = 'slug'`. Defaults to `-created`. This value may also be overridden by using `OrderingFilter` on the view. * `template` = The name of a template to use when rendering pagination controls in the browsable API. May be overridden to modify the rendering style, or set to `None` to disable HTML pagination controls completely. Defaults to `"rest_framework/pagination/previous_and_next.html"`. --- From 7efb2fd9ed03a23b0bcf8d9fa20034bf9ef884f8 Mon Sep 17 00:00:00 2001 From: Tom Christie <tom@tomchristie.com> Date: Fri, 6 Mar 2015 12:26:09 +0000 Subject: [PATCH 1643/1652] Better docs linking --- docs/topics/3.1-announcement.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 6606d8431..9cad88e07 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -52,7 +52,7 @@ For more information, see the [custom pagination styles](../api-guide/pagination ## Versioning -We've made it easier to build versioned APIs. Built-in schemes for versioning include both URL based and Accept header based variations. +We've made it [easier to build versioned APIs][versioning]. Built-in schemes for versioning include both URL based and Accept header based variations. When using a URL based scheme, hyperlinked serializers will resolve relationships to the same API version as used on the incoming request. @@ -80,7 +80,7 @@ The output representation would match the version used on the incoming request. ## Internationalization -REST framework now includes a built-in set of translations, and supports internationalized error responses. This allows you to either change the default language, or to allow clients to specify the language via the `Accept-Language` header. +REST framework now includes a built-in set of translations, and [supports internationalized error responses][internationalization]. This allows you to either change the default language, or to allow clients to specify the language via the `Accept-Language` header. You can change the default language by using the standard Django `LANGUAGE_CODE` setting: @@ -204,3 +204,5 @@ This will either be made as a single 3.2 release, or split across two separate r [custom-exception-handler]: ../api-guide/exceptions.md#custom-exception-handling [pagination]: ../api-guide/pagination.md +[versioning]: ../api-guide/versioning.md +[internationalization]: internationalization.md From d2181cc74ccfc59edc0477017d95e8edcbecf8a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Fri, 6 Mar 2015 09:41:34 -0400 Subject: [PATCH 1644/1652] Fix customizing field mappings link --- docs/topics/3.1-announcement.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 9cad88e07..6eb3681ff 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -145,7 +145,7 @@ If you're building a new 1.8 project, then you should probably consider using `U The serializer redesign in 3.0 did not include any public API for modifying how ModelSerializer classes automatically generate a set of fields from a given mode class. We've now re-introduced an API for this, allowing you to create new ModelSerializer base classes that behave differently, such as using a different default style for relationships. -For more information, see the documentation on [customizing field mappings](../api-guide/serializers/#customizing-field-mappings) for ModelSerializer classes. +For more information, see the documentation on [customizing field mappings][customizing-field-mappings] for ModelSerializer classes. --- @@ -206,3 +206,4 @@ This will either be made as a single 3.2 release, or split across two separate r [pagination]: ../api-guide/pagination.md [versioning]: ../api-guide/versioning.md [internationalization]: internationalization.md +[customizing-field-mappings]: ../api-guide/serializers.md/#customizing-field-mappings From fb58ef043cc39d900bb8389855f07087cb0d7920 Mon Sep 17 00:00:00 2001 From: Matt d'Entremont <mattdentremont@gmail.com> Date: Wed, 4 Mar 2015 17:36:03 -0400 Subject: [PATCH 1645/1652] Add support for serializing models with m2m related fields - In both ManyRelatedField, provide an empty return when trying to access a relation field if the instance in question has no PK (so likely hasn't been inserted yet) - Add relevant tests - Without these changes, exceptions would be raised when trying to serialize the uncreated models as it is impossible to query relations without a PK - Add test to ensure RelatedField does not regress as currently supports being serialized with and unsaved model --- rest_framework/relations.py | 4 ++++ tests/test_relations_pk.py | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 0b7c9d864..3a966c5bf 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -360,6 +360,10 @@ class ManyRelatedField(Field): ] def get_attribute(self, instance): + # Can't have any relationships if not created + if not instance.pk: + return [] + relationship = get_attribute(instance, self.source_attrs) return relationship.all() if (hasattr(relationship, 'all')) else relationship diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index f872a8dc5..ca43272b0 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -143,6 +143,16 @@ class PKManyToManyTests(TestCase): ] self.assertEqual(serializer.data, expected) + def test_many_to_many_unsaved(self): + source = ManyToManySource(name='source-unsaved') + + serializer = ManyToManySourceSerializer(source) + + expected = {'id': None, 'name': 'source-unsaved', 'targets': []} + # no query if source hasn't been created yet + with self.assertNumQueries(0): + self.assertEqual(serializer.data, expected) + def test_reverse_many_to_many_create(self): data = {'id': 4, 'name': 'target-4', 'sources': [1, 3]} serializer = ManyToManyTargetSerializer(data=data) @@ -296,6 +306,16 @@ class PKForeignKeyTests(TestCase): self.assertFalse(serializer.is_valid()) self.assertEqual(serializer.errors, {'target': ['This field may not be null.']}) + def test_foreign_key_with_unsaved(self): + source = ForeignKeySource(name='source-unsaved') + expected = {'id': None, 'name': 'source-unsaved', 'target': None} + + serializer = ForeignKeySourceSerializer(source) + + # no query if source hasn't been created yet + with self.assertNumQueries(0): + self.assertEqual(serializer.data, expected) + def test_foreign_key_with_empty(self): """ Regression test for #1072 From 2ddb6bfa70036bc1182a768807362b4e46a1b67b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sat, 7 Mar 2015 10:19:25 -0400 Subject: [PATCH 1646/1652] Fix permissions on markdown files --- docs/api-guide/authentication.md | 0 docs/api-guide/generic-views.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 docs/api-guide/authentication.md mode change 100755 => 100644 docs/api-guide/generic-views.md diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md old mode 100755 new mode 100644 diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md old mode 100755 new mode 100644 From d12de927adaac6018f3e8c232307b76372fe3527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sat, 7 Mar 2015 10:49:56 -0400 Subject: [PATCH 1647/1652] Remove docs for 3.0 banners --- docs/api-guide/fields.md | 6 ------ docs/api-guide/generic-views.md | 6 ------ docs/api-guide/metadata.md | 8 +------- docs/api-guide/relations.md | 6 ------ docs/api-guide/requests.md | 6 ------ docs/api-guide/serializers.md | 8 +------- docs/api-guide/validators.md | 14 ++++---------- 7 files changed, 6 insertions(+), 48 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index f113bb232..5edc997ab 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -1,11 +1,5 @@ source: fields.py ---- - -**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. - ---- - # Serializer fields > Each field in a Form class is responsible not only for validating data, but also for "cleaning" it — normalizing it to a consistent format. diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index 39e09aaa5..7df3d6ff8 100644 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -1,12 +1,6 @@ source: mixins.py generics.py ---- - -**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. - ---- - # Generic views > Django’s generic views... were developed as a shortcut for common usage patterns... They take certain common idioms and patterns found in view development and abstract them so that you can quickly write common views of data without having to repeat yourself. diff --git a/docs/api-guide/metadata.md b/docs/api-guide/metadata.md index 247ae988f..017274405 100644 --- a/docs/api-guide/metadata.md +++ b/docs/api-guide/metadata.md @@ -1,11 +1,5 @@ source: metadata.py ---- - -**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. - ---- - # Metadata > [The `OPTIONS`] method allows a client to determine the options and/or requirements associated with a resource, or the capabilities of a server, without implying a resource action or initiating a resource retrieval. @@ -59,7 +53,7 @@ Or you can set the metadata class individually for a view: class APIRoot(APIView): metadata_class = APIRootMetadata - + def get(self, request, format=None): return Response({ ... diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index 50e3b7b59..093bbdd05 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -1,11 +1,5 @@ source: relations.py ---- - -**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. - ---- - # Serializer relations > Bad programmers worry about the code. diff --git a/docs/api-guide/requests.md b/docs/api-guide/requests.md index c993dfae5..658a5ffd6 100644 --- a/docs/api-guide/requests.md +++ b/docs/api-guide/requests.md @@ -1,11 +1,5 @@ source: request.py ---- - -**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. - ---- - # Requests > If you're doing REST-based web service stuff ... you should ignore request.POST. diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 940eb4249..aad2236f2 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1,11 +1,5 @@ source: serializers.py ---- - -**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. - ---- - # Serializers > Expanding the usefulness of the serializers is something that we would @@ -23,7 +17,7 @@ The serializers in REST framework work very similarly to Django's `Form` and `Mo Let's start by creating a simple object we can use for example purposes: from datetime import datetime - + class Comment(object): def __init__(self, email, content, created=None): self.email = email diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index 8f5a89298..40ad48570 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -1,11 +1,5 @@ source: validators.py ---- - -**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. - ---- - # Validators > Validators can be useful for re-using validation logic between different types of fields. @@ -33,7 +27,7 @@ When you're using `ModelSerializer` all of this is handled automatically for you As an example of how REST framework uses explicit validation, we'll take a simple model class that has a field with a uniqueness constraint. class CustomerReportRecord(models.Model): - time_raised = models.DateTimeField(default=timezone.now, editable=False) + time_raised = models.DateTimeField(default=timezone.now, editable=False) reference = models.CharField(unique=True, max_length=20) description = models.TextField() @@ -43,7 +37,7 @@ Here's a basic `ModelSerializer` that we can use for creating or updating instan class Meta: model = CustomerReportRecord -If we open up the Django shell using `manage.py shell` we can now +If we open up the Django shell using `manage.py shell` we can now >>> from project.example.serializers import CustomerReportSerializer >>> serializer = CustomerReportSerializer() @@ -204,7 +198,7 @@ A validator may be any callable that raises a `serializers.ValidationError` on f def even_number(value): if value % 2 != 0: - raise serializers.ValidationError('This field must be an even number.') + raise serializers.ValidationError('This field must be an even number.') ## Class based @@ -213,7 +207,7 @@ To write a class based validator, use the `__call__` method. Class based validat class MultipleOf: def __init__(self, base): self.base = base - + def __call__(self, value): if value % self.base != 0 message = 'This field must be a multiple of %d.' % self.base From 140b94c32e3964fe5cd257809bd1f1508fa31c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com> Date: Sat, 7 Mar 2015 10:50:31 -0400 Subject: [PATCH 1648/1652] Update to 3.1 release --- README.md | 20 +++++--------------- docs/index.md | 4 ++-- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 045cdbc46..5044ee0f3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,9 @@ Full documentation for the project is available at [http://www.django-rest-frame --- -**Note**: We have now released Django REST framework 3.0. For older codebases you may want to refer to the version 2.4.4 [source code](https://github.com/tomchristie/django-rest-framework/tree/version-2.4.x), and [documentation](http://tomchristie.github.io/rest-framework-2-docs/). +**Note**: We have now released Django REST framework 3.1. For older codebases you may want to refer to the version 2.4.4 [source code](https://github.com/tomchristie/django-rest-framework/tree/version-2.4.x), and [documentation](http://tomchristie.github.io/rest-framework-2-docs/). + +For more details see the [3.1 release notes][3.1-announcement] --- @@ -23,7 +25,7 @@ Some reasons you might want to use REST framework: * [Authentication policies][authentication] including optional packages for [OAuth1a][oauth1-section] and [OAuth2][oauth2-section]. * [Serialization][serializers] that supports both [ORM][modelserializer-section] and [non-ORM][serializer-section] data sources. * Customizable all the way down - just use [regular function-based views][functionview-section] if you don't need the [more][generic-views] [powerful][viewsets] [features][routers]. -* [Extensive documentation][index], and [great community support][group]. +* [Extensive documentation][docs], and [great community support][group]. There is a live example API for testing purposes, [available here][sandbox]. @@ -186,10 +188,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [pypi]: https://pypi.python.org/pypi/djangorestframework [twitter]: https://twitter.com/_tomchristie [group]: https://groups.google.com/forum/?fromgroups#!forum/django-rest-framework -[0.4]: https://github.com/tomchristie/django-rest-framework/tree/0.4.X [sandbox]: http://restframework.herokuapp.com/ -[index]: http://www.django-rest-framework.org/ [oauth1-section]: http://www.django-rest-framework.org/api-guide/authentication/#django-rest-framework-oauth [oauth2-section]: http://www.django-rest-framework.org/api-guide/authentication/#django-oauth-toolkit [serializer-section]: http://www.django-rest-framework.org/api-guide/serializers/#serializers @@ -200,18 +200,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [routers]: http://www.django-rest-framework.org/api-guide/routers/ [serializers]: http://www.django-rest-framework.org/api-guide/serializers/ [authentication]: http://www.django-rest-framework.org/api-guide/authentication/ -[rest-framework-2-announcement]: http://www.django-rest-framework.org/topics/rest-framework-2-announcement/ -[2.1.0-notes]: https://groups.google.com/d/topic/django-rest-framework/Vv2M0CMY9bg/discussion [image]: http://www.django-rest-framework.org/img/quickstart.png -[tox]: http://testrun.org/tox/latest/ - -[tehjones]: https://twitter.com/tehjones/status/294986071979196416 -[wlonk]: https://twitter.com/wlonk/status/261689665952833536 -[laserllama]: https://twitter.com/laserllama/status/328688333750407168 - [docs]: http://www.django-rest-framework.org/ -[urlobject]: https://github.com/zacharyvoase/urlobject -[markdown]: http://pypi.python.org/pypi/Markdown/ -[django-filter]: http://pypi.python.org/pypi/django-filter [security-mail]: mailto:rest-framework-security@googlegroups.com +[3.1-announcement]: http://www.django-rest-framework.org/topics/3.1-announcement/ diff --git a/docs/index.md b/docs/index.md index 91766a0b8..13f4d0c49 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,9 +9,9 @@ --- -**Note**: This is the documentation for the **version 3.0** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. +**Note**: This is the documentation for the **version 3.1** of REST framework. Documentation for [version 2.4](http://tomchristie.github.io/rest-framework-2-docs/) is also available. -For more details see the [3.0 release notes][3.0-announcement]. +For more details see the [3.1 release notes][3.1-announcement]. --- From c2cbda43b90159d4a98ad6afdb1e6594247bfcd5 Mon Sep 17 00:00:00 2001 From: jwbixby <jwbixby@iastate.edu> Date: Sun, 8 Mar 2015 00:22:28 -0500 Subject: [PATCH 1649/1652] Update documenation over PAGE_SIZE This replaces all locations of the old setting `DEFAULT_PAGE_SIZE` for the current setting `PAGE_SIZE` --- docs/api-guide/pagination.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index bc65267fb..c264ea8c7 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -80,11 +80,11 @@ This pagination style accepts a single number page number in the request query p #### Setup -To enable the `PageNumberPagination` style globally, use the following configuration, modifying the `DEFAULT_PAGE_SIZE` as desired: +To enable the `PageNumberPagination` style globally, use the following configuration, modifying the `PAGE_SIZE` as desired: REST_FRAMEWORK = { 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', - 'DEFAULT_PAGE_SIZE': 100 + 'PAGE_SIZE': 100 } On `GenericAPIView` subclasses you may also set the `pagination_class` attribute to select `PageNumberPagination` on a per-view basis. @@ -95,7 +95,7 @@ The `PageNumberPagination` class includes a number of attributes that may be ove To set these attributes you should override the `PageNumberPagination` class, and then enable your custom pagination class as above. -* `page_size` - A numeric value indicating the page size. If set, this overrides the `DEFAULT_PAGE_SIZE` setting. Defaults to the same value as the `DEFAULT_PAGE_SIZE` settings key. +* `page_size` - A numeric value indicating the page size. If set, this overrides the `PAGE_SIZE` setting. Defaults to the same value as the `PAGE_SIZE` settings key. * `page_query_param` - A string value indicating the name of the query parameter to use for the pagination control. * `page_size_query_param` - If set, this is a string value indicating the name of a query parameter that allows the client to set the page size on a per-request basis. Defaults to `None`, indicating that the client may not control the requested page size. * `max_page_size` - If set, this is a numeric value indicating the maximum allowable requested page size. This attribute is only valid if `page_size_query_param` is also set. @@ -133,7 +133,7 @@ To enable the `PageNumberPagination` style globally, use the following configura 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination' } -Optionally, you may also set a `DEFAULT_PAGE_SIZE` key. If the `DEFAULT_PAGE_SIZE` parameter is also used then the `limit` query parameter will be optional, and may be omitted by the client. +Optionally, you may also set a `PAGE_SIZE` key. If the `PAGE_SIZE` parameter is also used then the `limit` query parameter will be optional, and may be omitted by the client. On `GenericAPIView` subclasses you may also set the `pagination_class` attribute to select `LimitOffsetPagination` on a per-view basis. @@ -143,7 +143,7 @@ The `LimitOffsetPagination` class includes a number of attributes that may be ov To set these attributes you should override the `LimitOffsetPagination` class, and then enable your custom pagination class as above. -* `default_limit` - A numeric value indicating the limit to use if one is not provided by the client in a query parameter. Defaults to the same value as the `DEFAULT_PAGE_SIZE` settings key. +* `default_limit` - A numeric value indicating the limit to use if one is not provided by the client in a query parameter. Defaults to the same value as the `PAGE_SIZE` settings key. * `limit_query_param` - A string value indicating the name of the "limit" query parameter. Defaults to `'limit'`. * `offset_query_param` - A string value indicating the name of the "offset" query parameter. Defaults to `'offset'`. * `max_limit` - If set this is a numeric value indicating the maximum allowable limit that may be requested by the client. Defaults to `None`. @@ -181,11 +181,11 @@ For more technical details on the implementation we use for cursor pagination, t #### Setup -To enable the `CursorPagination` style globally, use the following configuration, modifying the `DEFAULT_PAGE_SIZE` as desired: +To enable the `CursorPagination` style globally, use the following configuration, modifying the `PAGE_SIZE` as desired: REST_FRAMEWORK = { 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.CursorPagination', - 'DEFAULT_PAGE_SIZE': 100 + 'PAGE_SIZE': 100 } On `GenericAPIView` subclasses you may also set the `pagination_class` attribute to select `CursorPagination` on a per-view basis. @@ -314,4 +314,4 @@ The [`DRF-extensions` package][drf-extensions] includes a [`PaginateByMaxMixin` [link-header]: ../img/link-header-pagination.png [drf-extensions]: http://chibisov.github.io/drf-extensions/docs/ [paginate-by-max-mixin]: http://chibisov.github.io/drf-extensions/docs/#paginatebymaxmixin -[disqus-cursor-api]: http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/ \ No newline at end of file +[disqus-cursor-api]: http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/ From 20ba47e3430a1ae18d47aee7c9e55b43db43c61b Mon Sep 17 00:00:00 2001 From: Deven Xie <devenx@gmail.com> Date: Mon, 9 Mar 2015 00:10:26 -0400 Subject: [PATCH 1650/1652] Fixed missing word in CursorPagination docs --- docs/api-guide/pagination.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index bc65267fb..4f97e7ea6 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -164,7 +164,7 @@ Cursor based pagination is more complex than other schemes. It also requires tha #### Details and limitations -Proper use of cursor based pagination a little attention to detail. You'll need to think about what ordering you want the scheme to be applied against. The default is to order by `"-created"`. This assumes that **there must be a 'created' timestamp field** on the model instances, and will present a "timeline" style paginated view, with the most recently added items first. +Proper use of cursor based pagination requires a little attention to detail. You'll need to think about what ordering you want the scheme to be applied against. The default is to order by `"-created"`. This assumes that **there must be a 'created' timestamp field** on the model instances, and will present a "timeline" style paginated view, with the most recently added items first. You can modify the ordering by overriding the `'ordering'` attribute on the pagination class, or by using the `OrderingFilter` filter class together with `CursorPagination`. When used with `OrderingFilter` you should strongly consider restricting the fields that the user may order by. @@ -314,4 +314,4 @@ The [`DRF-extensions` package][drf-extensions] includes a [`PaginateByMaxMixin` [link-header]: ../img/link-header-pagination.png [drf-extensions]: http://chibisov.github.io/drf-extensions/docs/ [paginate-by-max-mixin]: http://chibisov.github.io/drf-extensions/docs/#paginatebymaxmixin -[disqus-cursor-api]: http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/ \ No newline at end of file +[disqus-cursor-api]: http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api/ From 3e44f788b194e74777013841d18a2a035df0757d Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy <xordoquy@linovia.com> Date: Mon, 9 Mar 2015 17:28:00 +0100 Subject: [PATCH 1651/1652] Fixed a typo in the documentation's link. --- docs/topics/3.1-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 6eb3681ff..80d4007eb 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -206,4 +206,4 @@ This will either be made as a single 3.2 release, or split across two separate r [pagination]: ../api-guide/pagination.md [versioning]: ../api-guide/versioning.md [internationalization]: internationalization.md -[customizing-field-mappings]: ../api-guide/serializers.md/#customizing-field-mappings +[customizing-field-mappings]: ../api-guide/serializers.md#customizing-field-mappings From 69b6e26f06c787761bb8d6006ed6fc607fbc9d23 Mon Sep 17 00:00:00 2001 From: Bryan Alsdorf <bryan@mariadb.com> Date: Tue, 10 Mar 2015 17:30:41 -0500 Subject: [PATCH 1652/1652] Changed incorrect class name --- docs/api-guide/pagination.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index 3518fb34e..eca468b8b 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -127,7 +127,7 @@ This pagination style mirrors the syntax used when looking up multiple database #### Setup -To enable the `PageNumberPagination` style globally, use the following configuration: +To enable the `LimitOffsetPagination` style globally, use the following configuration: REST_FRAMEWORK = { 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination'