From d5e63d2d7f6570d6306e755bd7366c75dd1b845b Mon Sep 17 00:00:00 2001 From: Fa773N M0nK Date: Tue, 18 Oct 2016 15:36:04 +0530 Subject: [PATCH 001/190] Reflect that '@detail_route' responds to GET only by default. (#4582) --- 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 6e1321093..f4eb918bf 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -51,7 +51,7 @@ This time we've used the `ModelViewSet` class in order to get the complete set o 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 `@detail_route` decorator will respond to `GET` requests. We can use the `methods` argument if we wanted an action that responded to `POST` requests. +Custom actions which use the `@detail_route` decorator will respond to `GET` requests by default. We can use the `methods` argument if we wanted an action that responded to `POST` requests. 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. From fcff16c5c658fc3033b7ecefdd74221a596ae24c Mon Sep 17 00:00:00 2001 From: Zach Wernberg Date: Tue, 18 Oct 2016 23:14:55 -0500 Subject: [PATCH 002/190] minor typo --- 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 65233978e..c377cec0d 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -222,7 +222,7 @@ class SearchFilter(BaseFilterBackend): # Filtering against a many-to-many field requires us to # call queryset.distinct() in order to avoid duplicate items # in the resulting queryset. - # We try to avoid this is possible, for performance reasons. + # We try to avoid this if possible, for performance reasons. queryset = distinct(queryset, base) return queryset From 3f6004c5a9edab6336e93da85ce3849dee0b1311 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 20 Oct 2016 09:42:40 +0100 Subject: [PATCH 003/190] Use pk for URL conf and views. (#4592) --- docs/tutorial/1-serialization.md | 6 +++--- docs/tutorial/2-requests-and-responses.md | 8 ++++---- docs/tutorial/3-class-based-views.md | 18 +++++++++--------- .../4-authentication-and-permissions.md | 2 +- .../5-relationships-and-hyperlinked-apis.md | 8 ++++---- docs/tutorial/6-viewsets-and-routers.md | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index 434072e11..04fb6914a 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -259,12 +259,12 @@ Note that because we want to be able to POST to this view from clients that won' We'll also need a view which corresponds to an individual snippet, and can be used to retrieve, update or delete the snippet. @csrf_exempt - def snippet_detail(request, id): + def snippet_detail(request, pk): """ Retrieve, update or delete a code snippet. """ try: - snippet = Snippet.objects.get(id=id) + snippet = Snippet.objects.get(pk=pk) except Snippet.DoesNotExist: return HttpResponse(status=404) @@ -291,7 +291,7 @@ Finally we need to wire these views up. Create the `snippets/urls.py` file: urlpatterns = [ url(r'^snippets/$', views.snippet_list), - url(r'^snippets/(?P[0-9]+)/$', views.snippet_detail), + url(r'^snippets/(?P[0-9]+)/$', views.snippet_detail), ] We also need to wire up the root urlconf, in the `tutorial/urls.py` file, to include our snippet app's URLs. diff --git a/docs/tutorial/2-requests-and-responses.md b/docs/tutorial/2-requests-and-responses.md index 4aa0062a3..5c020a1f7 100644 --- a/docs/tutorial/2-requests-and-responses.md +++ b/docs/tutorial/2-requests-and-responses.md @@ -66,12 +66,12 @@ Our instance view is an improvement over the previous example. It's a little mo Here is the view for an individual snippet, in the `views.py` module. @api_view(['GET', 'PUT', 'DELETE']) - def snippet_detail(request, id): + def snippet_detail(request, pk): """ Retrieve, update or delete a snippet instance. """ try: - snippet = Snippet.objects.get(id=id) + snippet = Snippet.objects.get(pk=pk) except Snippet.DoesNotExist: return Response(status=status.HTTP_404_NOT_FOUND) @@ -104,7 +104,7 @@ Start by adding a `format` keyword argument to both of the views, like so. and - def snippet_detail(request, id, format=None): + def snippet_detail(request, pk, format=None): Now update the `urls.py` file slightly, to append a set of `format_suffix_patterns` in addition to the existing URLs. @@ -114,7 +114,7 @@ Now update the `urls.py` file slightly, to append a set of `format_suffix_patter urlpatterns = [ url(r'^snippets/$', views.snippet_list), - url(r'^snippets/(?P[0-9]+)$', views.snippet_detail), + url(r'^snippets/(?P[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 6303994cd..f018666f5 100644 --- a/docs/tutorial/3-class-based-views.md +++ b/docs/tutorial/3-class-based-views.md @@ -36,27 +36,27 @@ So far, so good. It looks pretty similar to the previous case, but we've got be """ Retrieve, update or delete a snippet instance. """ - def get_object(self, id): + def get_object(self, pk): try: - return Snippet.objects.get(id=id) + return Snippet.objects.get(pk=pk) except Snippet.DoesNotExist: raise Http404 - def get(self, request, id, format=None): - snippet = self.get_object(id) + def get(self, request, pk, format=None): + snippet = self.get_object(pk) serializer = SnippetSerializer(snippet) return Response(serializer.data) - def put(self, request, id, format=None): - snippet = self.get_object(id) + def put(self, request, pk, format=None): + snippet = self.get_object(pk) serializer = SnippetSerializer(snippet, data=request.data) if serializer.is_valid(): serializer.save() return Response(serializer.data) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) - def delete(self, request, id, format=None): - snippet = self.get_object(id) + def delete(self, request, pk, format=None): + snippet = self.get_object(pk) snippet.delete() return Response(status=status.HTTP_204_NO_CONTENT) @@ -70,7 +70,7 @@ We'll also need to refactor our `urls.py` slightly now we're using class-based v urlpatterns = [ url(r'^snippets/$', views.SnippetList.as_view()), - url(r'^snippets/(?P[0-9]+)/$', views.SnippetDetail.as_view()), + url(r'^snippets/(?P[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 958f9d3f0..098194c29 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -88,7 +88,7 @@ Make sure to also import the `UserSerializer` class 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()), + url(r'^users/(?P[0-9]+)/$', views.UserDetail.as_view()), ## Associating Snippets with Users diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index 9fb6c53e0..9fd61b414 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -48,7 +48,7 @@ We'll add a url pattern for our new API root in `snippets/urls.py`: And then add a url pattern for the snippet highlights: - url(r'^snippets/(?P[0-9]+)/highlight/$', views.SnippetHighlight.as_view()), + url(r'^snippets/(?P[0-9]+)/highlight/$', views.SnippetHighlight.as_view()), ## Hyperlinking our API @@ -116,16 +116,16 @@ After adding all those names into our URLconf, our final `snippets/urls.py` file url(r'^snippets/$', views.SnippetList.as_view(), name='snippet-list'), - url(r'^snippets/(?P[0-9]+)/$', + url(r'^snippets/(?P[0-9]+)/$', views.SnippetDetail.as_view(), name='snippet-detail'), - url(r'^snippets/(?P[0-9]+)/highlight/$', + url(r'^snippets/(?P[0-9]+)/highlight/$', views.SnippetHighlight.as_view(), name='snippet-highlight'), url(r'^users/$', views.UserList.as_view(), name='user-list'), - url(r'^users/(?P[0-9]+)/$', + url(r'^users/(?P[0-9]+)/$', views.UserDetail.as_view(), name='user-detail') ]) diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index f4eb918bf..6189c7771 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -92,10 +92,10 @@ Now that we've bound our resources into concrete views, we can register the view urlpatterns = format_suffix_patterns([ url(r'^$', api_root), url(r'^snippets/$', snippet_list, name='snippet-list'), - url(r'^snippets/(?P[0-9]+)/$', snippet_detail, name='snippet-detail'), - url(r'^snippets/(?P[0-9]+)/highlight/$', snippet_highlight, name='snippet-highlight'), + url(r'^snippets/(?P[0-9]+)/$', snippet_detail, name='snippet-detail'), + url(r'^snippets/(?P[0-9]+)/highlight/$', snippet_highlight, name='snippet-highlight'), url(r'^users/$', user_list, name='user-list'), - url(r'^users/(?P[0-9]+)/$', user_detail, name='user-detail') + url(r'^users/(?P[0-9]+)/$', user_detail, name='user-detail') ]) ## Using Routers From 2395fb53867538ad83db335f3aaaef472eb2f0f4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 20 Oct 2016 10:47:09 +0100 Subject: [PATCH 004/190] Deprecate DjangoFilter backend (#4593) Deprecate the built-in `rest_framework.filters.DjangoFilterBackend` in favour of the third-party `django_filters.rest_framework.DjangoFilterBackend`. --- docs/api-guide/filtering.md | 40 +++++--- requirements/requirements-optionals.txt | 2 +- rest_framework/filters.py | 128 ++++-------------------- tests/test_filters.py | 34 +++++++ 4 files changed, 83 insertions(+), 121 deletions(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 40a097174..1b49d3a73 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -89,24 +89,24 @@ Generic filters can also present themselves as HTML controls in the browsable AP ## Setting filter backends -The default filter backends may be set globally, using the `DEFAULT_FILTER_BACKENDS` setting. For example. +The default filter backends may be set globally, using the `DEFAULT_FILTER_BACKENDS` setting. For example. REST_FRAMEWORK = { - 'DEFAULT_FILTER_BACKENDS': ('rest_framework.filters.DjangoFilterBackend',) + 'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',) } You can also set the filter backends on a per-view, or per-viewset basis, using the `GenericAPIView` class-based views. + import django_filters 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_class = UserSerializer - filter_backends = (filters.DjangoFilterBackend,) + filter_backends = (django_filters.rest_framework.DjangoFilterBackend,) ## Filtering and object lookups @@ -139,12 +139,27 @@ 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 `django-filter` library includes a `DjangoFilterBackend` class which +supports highly customizable field filtering for REST framework. -To use REST framework's `DjangoFilterBackend`, first install `django-filter`. +To use `DjangoFilterBackend`, first install `django-filter`. pip install django-filter +You should now either add the filter backend to your settings: + + REST_FRAMEWORK = { + 'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',) + } + +Or add the filter backend to an individual View or ViewSet. + + from django_filters.rest_framework import DjangoFilterBackend + + class UserListView(generics.ListAPIView): + ... + filter_backends = (DjangoFilterBackend,) + If you are using the browsable API or admin API you may also want to install `django-crispy-forms`, which will enhance the presentation of the filter forms in HTML views, by allowing them to render Bootstrap 3 HTML. pip install django-crispy-forms @@ -174,10 +189,9 @@ For more advanced filtering requirements you can specify a `FilterSet` class tha import django_filters from myapp.models import Product from myapp.serializers import ProductSerializer - from rest_framework import filters from rest_framework import generics - class ProductFilter(filters.FilterSet): + class ProductFilter(django_filters.rest_framework.FilterSet): min_price = django_filters.NumberFilter(name="price", lookup_expr='gte') max_price = django_filters.NumberFilter(name="price", lookup_expr='lte') class Meta: @@ -187,7 +201,7 @@ For more advanced filtering requirements you can specify a `FilterSet` class tha class ProductList(generics.ListAPIView): queryset = Product.objects.all() serializer_class = ProductSerializer - filter_backends = (filters.DjangoFilterBackend,) + filter_backends = (django_filters.rest_framework.DjangoFilterBackend,) filter_class = ProductFilter @@ -199,12 +213,12 @@ 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 filters from rest_framework import generics - class ProductFilter(filters.FilterSet): + class ProductFilter(django_filters.rest_framework.FilterSet): class Meta: model = Product fields = ['category', 'in_stock', 'manufacturer__name'] @@ -218,10 +232,9 @@ This is nice, but it exposes the Django's double underscore convention as part o import django_filters from myapp.models import Product from myapp.serializers import ProductSerializer - from rest_framework import filters from rest_framework import generics - class ProductFilter(filters.FilterSet): + class ProductFilter(django_filters.rest_framework.FilterSet): manufacturer = django_filters.CharFilter(name="manufacturer__name") class Meta: @@ -454,4 +467,3 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter] [django-rest-framework-word-search-filter]: https://github.com/trollknurr/django-rest-framework-word-search-filter [django-url-filter]: https://github.com/miki725/django-url-filter [drf-url-filter]: https://github.com/manjitkumar/drf-url-filters - diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index 31f24f4b7..86c4f7709 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -1,5 +1,5 @@ # Optional packages which may be used with REST framework. markdown==2.6.4 django-guardian==1.4.6 -django-filter==0.14.0 +django-filter==0.15.3 coreapi==2.0.8 diff --git a/rest_framework/filters.py b/rest_framework/filters.py index c377cec0d..f55297b39 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -5,9 +5,9 @@ returned by list views. from __future__ import unicode_literals import operator +import warnings from functools import reduce -from django.conf import settings from django.core.exceptions import ImproperlyConfigured from django.db import models from django.db.models.constants import LOOKUP_SEP @@ -16,50 +16,10 @@ from django.utils import six from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import ( - coreapi, crispy_forms, distinct, django_filters, guardian, template_render + coreapi, distinct, django_filters, guardian, template_render ) from rest_framework.settings import api_settings -if 'crispy_forms' in settings.INSTALLED_APPS and crispy_forms and django_filters: - # If django-crispy-forms is installed, use it to get a bootstrap3 rendering - # of the DjangoFilterBackend controls when displayed as HTML. - from crispy_forms.helper import FormHelper - from crispy_forms.layout import Layout, Submit - - class FilterSet(django_filters.FilterSet): - def __init__(self, *args, **kwargs): - super(FilterSet, self).__init__(*args, **kwargs) - for field in self.form.fields.values(): - field.help_text = None - - layout_components = list(self.form.fields.keys()) + [ - Submit('', _('Submit'), css_class='btn-default'), - ] - - helper = FormHelper() - helper.form_method = 'GET' - helper.template_pack = 'bootstrap3' - helper.layout = Layout(*layout_components) - - self.form.helper = helper - - filter_template = 'rest_framework/filters/django_filter_crispyforms.html' - -elif django_filters: - # If django-crispy-forms is not installed, use the standard - # 'form.as_p' rendering when DjangoFilterBackend is displayed as HTML. - class FilterSet(django_filters.FilterSet): - def __init__(self, *args, **kwargs): - super(FilterSet, self).__init__(*args, **kwargs) - for field in self.form.fields.values(): - field.help_text = None - - filter_template = 'rest_framework/filters/django_filter.html' - -else: - FilterSet = None - filter_template = None - class BaseFilterBackend(object): """ @@ -77,78 +37,34 @@ class BaseFilterBackend(object): return [] +class FilterSet(object): + def __new__(cls, *args, **kwargs): + warnings.warn( + "The built in 'rest_framework.filters.FilterSet' is pending deprecation. " + "You should use 'django_filters.rest_framework.FilterSet' instead.", + PendingDeprecationWarning + ) + from django_filters.rest_framework import FilterSet + return FilterSet(*args, **kwargs) + + class DjangoFilterBackend(BaseFilterBackend): """ A filter backend that uses django-filter. """ - default_filter_set = FilterSet - template = filter_template - - def __init__(self): + def __new__(cls, *args, **kwargs): assert django_filters, 'Using DjangoFilterBackend, but django-filter is not installed' + assert django_filters.VERSION >= (0, 15, 3), 'django-filter 0.15.3 and above is required' - def get_filter_class(self, view, queryset=None): - """ - Return the django-filters `FilterSet` used to filter the queryset. - """ - filter_class = getattr(view, 'filter_class', None) - filter_fields = getattr(view, 'filter_fields', None) + warnings.warn( + "The built in 'rest_framework.filters.DjangoFilterBackend' is pending deprecation. " + "You should use 'django_filters.rest_framework.DjangoFilterBackend' instead.", + PendingDeprecationWarning + ) - if filter_class: - filter_model = filter_class.Meta.model + from django_filters.rest_framework import DjangoFilterBackend - assert issubclass(queryset.model, filter_model), \ - 'FilterSet model %s does not match queryset model %s' % \ - (filter_model, queryset.model) - - return filter_class - - if filter_fields: - class AutoFilterSet(self.default_filter_set): - class Meta: - model = queryset.model - fields = filter_fields - - return AutoFilterSet - - return None - - def filter_queryset(self, request, queryset, view): - filter_class = self.get_filter_class(view, queryset) - - if filter_class: - return filter_class(request.query_params, queryset=queryset).qs - - return queryset - - def to_html(self, request, queryset, view): - filter_class = self.get_filter_class(view, queryset) - if not filter_class: - return None - filter_instance = filter_class(request.query_params, queryset=queryset) - context = { - 'filter': filter_instance - } - template = loader.get_template(self.template) - return template_render(template, context) - - def get_schema_fields(self, view): - assert coreapi is not None, 'coreapi must be installed to use `get_schema_fields()`' - filter_class = getattr(view, 'filter_class', None) - if filter_class: - return [ - coreapi.Field(name=field_name, required=False, location='query') - for field_name in filter_class().filters.keys() - ] - - filter_fields = getattr(view, 'filter_fields', None) - if filter_fields: - return [ - coreapi.Field(name=field_name, required=False, location='query') - for field_name in filter_fields - ] - - return [] + return DjangoFilterBackend(*args, **kwargs) class SearchFilter(BaseFilterBackend): diff --git a/tests/test_filters.py b/tests/test_filters.py index c67412dd7..9795230d6 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals import datetime import unittest +import warnings from decimal import Decimal from django.conf.urls import url @@ -134,6 +135,39 @@ class IntegrationTestFiltering(CommonFilteringTestCase): Integration tests for filtered list views. """ + @unittest.skipUnless(django_filters, 'django-filter not installed') + def test_backend_deprecation(self): + with warnings.catch_warnings(record=True) as w: + warnings.simplefilter("always") + + view = FilterFieldsRootView.as_view() + request = factory.get('/') + response = view(request).render() + + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data, self.data) + + self.assertTrue(issubclass(w[-1].category, PendingDeprecationWarning)) + self.assertIn("'rest_framework.filters.DjangoFilterBackend' is pending deprecation.", str(w[-1].message)) + + @unittest.skipUnless(django_filters, 'django-filter not installed') + def test_no_df_deprecation(self): + with warnings.catch_warnings(record=True) as w: + warnings.simplefilter("always") + + import django_filters.rest_framework + + class DFFilterFieldsRootView(FilterFieldsRootView): + filter_backends = (django_filters.rest_framework.DjangoFilterBackend,) + + view = DFFilterFieldsRootView.as_view() + request = factory.get('/') + response = view(request).render() + + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data, self.data) + self.assertEqual(len(w), 0) + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_get_filtered_fields_root_view(self): """ From 3b9afb571b6e7c2a445be675163c9f43d680d899 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 20 Oct 2016 16:25:40 +0100 Subject: [PATCH 005/190] Version 3.5.0 (#4596) --- docs/api-guide/schemas.md | 47 +++++- docs/api-guide/testing.md | 4 +- docs/img/raml.png | Bin 0 -> 37216 bytes docs/index.md | 2 + docs/topics/3.5-announcement.md | 266 ++++++++++++++++++++++++++++++++ docs/topics/api-clients.md | 2 +- docs/topics/release-notes.md | 9 ++ mkdocs.yml | 1 + 8 files changed, 324 insertions(+), 7 deletions(-) create mode 100644 docs/img/raml.png create mode 100644 docs/topics/3.5-announcement.md diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 16d2bbb01..7da619034 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -344,12 +344,12 @@ Typically you'll instantiate `SchemaGenerator` with a single argument, like so: Arguments: -* `title` - The name of the API. **required** +* `title` **required** - The name of the API. * `url` - The root URL of the API schema. This option is not required unless the schema is included under path prefix. * `patterns` - A list of URLs to inspect when generating the schema. Defaults to the project's URL conf. * `urlconf` - A URL conf module name to use when generating the schema. Defaults to `settings.ROOT_URLCONF`. -### get_schema() +### get_schema(self, request) Returns a `coreapi.Document` instance that represents the API schema. @@ -359,9 +359,48 @@ Returns a `coreapi.Document` instance that represents the API schema. generator = schemas.SchemaGenerator(title='Bookings API') return Response(generator.get_schema()) -Arguments: +The `request` argument is optional, and may be used if you want to apply per-user +permissions to the resulting schema generation. -* `request` - The incoming request. Optionally used if you want to apply per-user permissions to the schema-generation. +### get_links(self, request) + +Return a nested dictionary containing all the links that should be included in the API schema. + +This is a good point to override if you want to modify the resulting structure of the generated schema, +as you can build a new dictionary with a different layout. + +### get_link(self, path, method, view) + +Returns a `coreapi.Link` instance corresponding to the given view. + +You can override this if you need to provide custom behaviors for particular views. + +### get_description(self, path, method, view) + +Returns a string to use as the link description. By default this is based on the +view docstring as described in the "Schemas as Documentation" section above. + +### get_encoding(self, path, method, view) + +Returns a string to indicate the encoding for any request body, when interacting +with the given view. Eg. `'application/json'`. May return a blank string for views +that do not expect a request body. + +### get_path_fields(self, path, method, view): + +Return a list of `coreapi.Link()` instances. One for each path parameter in the URL. + +### get_serializer_fields(self, path, method, view) + +Return a list of `coreapi.Link()` instances. One for each field in the serializer class used by the view. + +### get_pagination_fields(self, path, method, view + +Return a list of `coreapi.Link()` instances, as returned by the `get_schema_fields()` method on any pagination class used by the view. + +### get_filter_fields(self, path, method, view) + +Return a list of `coreapi.Link()` instances, as returned by the `get_schema_fields()` method of any filter classes used by the view. --- diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index fdd60b7f4..1f8c89233 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -194,6 +194,7 @@ directly. client = RequestsClient() response = client.get('http://testserver/users/') + assert response.status_code == 200 Note that the requests client requires you to pass fully qualified URLs. @@ -251,9 +252,8 @@ The CoreAPIClient allows you to interact with your API using the Python `coreapi` client library. # Fetch the API schema - url = reverse('schema') client = CoreAPIClient() - schema = client.get(url) + schema = client.get('http://testserver/schema/') # Create a new organisation params = {'name': 'MegaCorp', 'status': 'active'} diff --git a/docs/img/raml.png b/docs/img/raml.png new file mode 100644 index 0000000000000000000000000000000000000000..87790dc484f9c6c0617189ae2766bdc1e00a3bfa GIT binary patch literal 37216 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 literal 0 HcmV?d00001 diff --git a/docs/index.md b/docs/index.md index 3019467ed..9b0913f00 100644 --- a/docs/index.md +++ b/docs/index.md @@ -244,6 +244,7 @@ General guides to using REST framework. * [3.2 Announcement][3.2-announcement] * [3.3 Announcement][3.3-announcement] * [3.4 Announcement][3.4-announcement] +* [3.5 Announcement][3.5-announcement] * [Kickstarter Announcement][kickstarter-announcement] * [Mozilla Grant][mozilla-grant] * [Funding][funding] @@ -370,6 +371,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [3.2-announcement]: topics/3.2-announcement.md [3.3-announcement]: topics/3.3-announcement.md [3.4-announcement]: topics/3.4-announcement.md +[3.5-announcement]: topics/3.5-announcement.md [kickstarter-announcement]: topics/kickstarter-announcement.md [mozilla-grant]: topics/mozilla-grant.md [funding]: topics/funding.md diff --git a/docs/topics/3.5-announcement.md b/docs/topics/3.5-announcement.md new file mode 100644 index 000000000..2ed8adf8e --- /dev/null +++ b/docs/topics/3.5-announcement.md @@ -0,0 +1,266 @@ + + +# Django REST framework 3.5 + +The 3.5 release is the second in a planned series that is addressing schema +generation, hypermedia support, API client libraries, and finally realtime support. + +--- + +## Funding + +The 3.5 release would not have been possible without our [collaborative funding model][funding]. +If you use REST framework commercially and would like to see this work continue, +we strongly encourage you to invest in its continued development by +**[signing up for a paid plan][funding]**. + + +
+ +*Many thanks to all our [sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](http://www.machinalis.com/#services).* + +--- + +## Improved schema generation + +Docstrings on views are now pulled through into schema definitions, allowing +you to [use the schema definition to document your API][schema-docs]. + +There is now also a shortcut function, `get_schema_view()`, which makes it easier to +[adding schema views][schema-view] to your API. + +For example, to include a swagger schema to your API, you would do the following: + +* Run `pip install django-rest-swagger`. + +* Add `'rest_framework_swagger'` to your `INSTALLED_APPS` setting. + +* Include the schema view in your URL conf: + +```py +from rest_framework.schemas import get_schema_view +from rest_framework_swagger.renderers import OpenAPIRenderer, SwaggerUIRenderer + +schema_view = get_schema_view( + title='Example API', + renderer_classes=[OpenAPIRenderer, SwaggerUIRenderer] +) + +urlpatterns = [ + url(r'^swagger/$', schema_view), + ... +] +``` + +There have been a large number of fixes to the schema generation. These should +resolve issues for anyone using the latest version of the `django-rest-swagger` +package. + +Some of these changes do affect the resulting schema structure, +so if you're already using schema generation you should make sure to review +[the deprecation notes](#deprecations), particularly if you're currently using +a dynamic client library to interact with your API. + +Finally, we're also now exposing the schema generation as a +[publicly documented API][schema-generation-api], allowing you to more easily +override the behaviour. + +## Requests test client + +You can now test your project using the `requests` library. + +This exposes exactly the same interface as if you were using a standard +requests session instance. + + client = RequestsClient() + response = client.get('http://testserver/users/') + assert response.status_code == 200 + +Rather than sending any HTTP requests to the network, this interface will +coerce all outgoing requests into WSGI, and call into your application directly. + +## Core API client + +You can also now test your project by interacting with it using the `coreapi` +client library. + + # Fetch the API schema + client = CoreAPIClient() + schema = client.get('http://testserver/schema/') + + # Create a new organisation + params = {'name': 'MegaCorp', 'status': 'active'} + client.action(schema, ['organisations', 'create'], params) + + # Ensure that the organisation exists in the listing + data = client.action(schema, ['organisations', 'list']) + assert(len(data) == 1) + assert(data == [{'name': 'MegaCorp', 'status': 'active'}]) + +Again, this will call directly into the application using the WSGI interface, +rather than making actual network calls. + +This is a good option if you are planning for clients to mainly interact with +your API using the `coreapi` client library, or some other auto-generated client. + +## Live tests + +One interesting aspect of both the `requests` client and the `coreapi` client +is that they allow you to write tests in such a way that they can also be made +to run against a live service. + +By switching the WSGI based client instances to actual instances of `requests.Session` +or `coreapi.Client` you can have the test cases make actual network calls. + +Being able to write test cases that can exercise your staging or production +environment is a powerful tool. However in order to do this, you'll need to pay +close attention to how you handle setup and teardown to ensure a strict isolation +of test data from other live or staging data. + +## RAML support + +We now have preliminary support for [RAML documentation generation][django-rest-raml]. + +![RAML Example][raml-image] + +Further work on the encoding and documentation generation is planned, in order to +make features such as the 'Try it now' support available at a later date. + +This work also now means that you can use the Core API client libraries to interact +with APIs that expose a RAML specification. The [RAML codec][raml-codec] gives some examples of +interacting with the Spotify API in this way. + +## Validation codes + +Exceptions raised by REST framework now include short code identifiers. +When used together with our customizable error handling, this now allows you to +modify the style of API error messages. + +As an example, this allows for the following style of error responses: + + { + "message": "You do not have permission to perform this action.", + "code": "permission_denied" + } + +This is particularly useful with validation errors, which use appropriate +codes to identify differing kinds of failure... + + { + "name": {"message": "This field is required.", "code": "required"}, + "age": {"message": "A valid integer is required.", "code": "invalid"} + } + +## Client upload & download support + +The Python `coreapi` client library and the Core API command line tool both +now fully support file [uploads][uploads] and [downloads][downloads]. + +--- + +## Deprecations + +### Generating schemas from Router + +The router arguments for generating a schema view, such as `schema_title`, +are now pending deprecation. + +Instead of using `DefaultRouter(schema_title='Example API')`, you should use +the `get_schema_view()` function, and include the view in your URL conf. + +Make sure to include the view before your router urls. For example: + + from rest_framework.schemas import get_schema_view + from my_project.routers import router + + schema_view = get_schema_view(title='Example API') + + urlpatterns = [ + url('^$', schema_view), + url(r'^', include(router.urls)), + ] + +### Schema path representations + +The `'pk'` identifier in schema paths is now mapped onto the actually model field +name by default. This will typically be `'id'`. + +This gives a better external representation for schemas, with less implementation +detail being exposed. It also reflects the behaviour of using a ModelSerializer +class with `fields = '__all__'`. + +You can revert to the previous behaviour by setting `'SCHEMA_COERCE_PATH_PK': False` +in the REST framework settings. + +### Schema action name representations + +The internal `retrieve()` and `destroy()` method names are now coerced to an +external representation of `read` and `delete`. + +You can revert to the previous behaviour by setting `'SCHEMA_COERCE_METHOD_NAMES': {}` +in the REST framework settings. + +### DjangoFilterBackend + +The functionality of the built-in `DjangoFilterBackend` is now completely +included by the `django-filter` package. + +You should change your imports and REST framework filter settings as follows: + +* `rest_framework.filters.DjangoFilterBackend` becomes `django_filters.rest_framework.DjangoFilterBackend`. +* `rest_framework.filters.FilterSet` becomes `django_filters.rest_framework.FilterSet`. + +The existing imports will continue to work but are now pending deprecation. + +### CoreJSON media type + +The media type for `CoreJSON` is now `application/json+coreapi`, rather than +the previous `application/vnd.json+coreapi`. This brings it more into line with +other custom media types, such as those used by Swagger and RAML. + +The clients currently accept either media type. The old style-media type will +be deprecated at a later date. + +### ModelSerializer 'fields' and 'exclude' + +ModelSerializer and HyperlinkedModelSerializer must include either a fields +option, or an exclude option. The fields = '__all__' shortcut may be used to +explicitly include all fields. + +Failing to set either `fields` or `exclude` raised a pending deprecation warning +in version 3.3 and raised a deprecation warning in 3.4. Its usage is now mandatory. + +--- + +[sponsors]: https://fund.django-rest-framework.org/topics/funding/#our-sponsors +[funding]: funding.md +[uploads]: http://core-api.github.io/python-client/api-guide/utils/#file +[downloads]: http://core-api.github.io/python-client/api-guide/codecs/#downloadcodec +[schema-generation-api]: ../api-guide/schemas/#schemagenerator +[schema-docs]: ../api-guide/schemas/#schemas-as-documentation +[schema-view]: ../api-guide/schemas/#the-get_schema_view-shortcut +[django-rest-raml]: https://github.com/tomchristie/django-rest-raml +[raml-image]: ../img/raml.png +[raml-codec]: https://github.com/core-api/python-raml-codec diff --git a/docs/topics/api-clients.md b/docs/topics/api-clients.md index f17f5e4d4..c12551aa6 100644 --- a/docs/topics/api-clients.md +++ b/docs/topics/api-clients.md @@ -257,7 +257,7 @@ Codecs are responsible for encoding or decoding Documents. The decoding process is used by a client to take a bytestring of an API schema definition, and returning the Core API `Document` that represents that interface. -A codec should be associated with a particular media type, such as **TODO**. +A codec should be associated with a particular media type, such as `'application/coreapi+json'`. This media type is used by the server in the response `Content-Type` header, in order to indicate what kind of data is being returned in the response. diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 446abdd14..30244f6d2 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -38,6 +38,14 @@ You can determine your currently installed version using `pip freeze`: --- +## 3.5.x series + +### 3.5.0 + +**Date**: [20th October 2016][3.5.0-milestone] + +--- + ## 3.4.x series ### 3.4.7 @@ -596,6 +604,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.4.5-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.5+Release%22 [3.4.6-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.6+Release%22 [3.4.7-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.7+Release%22 +[3.5.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.0+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 diff --git a/mkdocs.yml b/mkdocs.yml index 0b89988b1..01c59caaa 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -66,6 +66,7 @@ pages: - '3.2 Announcement': 'topics/3.2-announcement.md' - '3.3 Announcement': 'topics/3.3-announcement.md' - '3.4 Announcement': 'topics/3.4-announcement.md' + - '3.5 Announcement': 'topics/3.5-announcement.md' - 'Kickstarter Announcement': 'topics/kickstarter-announcement.md' - 'Mozilla Grant': 'topics/mozilla-grant.md' - 'Funding': 'topics/funding.md' From c6f1686571026d1f2f3bb6bf9d73ca9a61b93182 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 20 Oct 2016 16:26:56 +0100 Subject: [PATCH 006/190] Remove erronous file [ci skip] --- schema-support | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 schema-support diff --git a/schema-support b/schema-support deleted file mode 100644 index e69de29bb..000000000 From 1aa6dff0b54e39d1fe7a0c7058f6f74ee01475fd Mon Sep 17 00:00:00 2001 From: Maxime Lorant Date: Thu, 20 Oct 2016 17:47:59 +0200 Subject: [PATCH 007/190] Fix code formatting missing in 3.5 announcement (#4597) ... in section ModelSerializer 'fields' and 'exclude' --- docs/topics/3.5-announcement.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/3.5-announcement.md b/docs/topics/3.5-announcement.md index 2ed8adf8e..ea50b2418 100644 --- a/docs/topics/3.5-announcement.md +++ b/docs/topics/3.5-announcement.md @@ -246,7 +246,7 @@ be deprecated at a later date. ### ModelSerializer 'fields' and 'exclude' ModelSerializer and HyperlinkedModelSerializer must include either a fields -option, or an exclude option. The fields = '__all__' shortcut may be used to +option, or an exclude option. The `fields = '__all__'` shortcut may be used to explicitly include all fields. Failing to set either `fields` or `exclude` raised a pending deprecation warning From 856f086ce35e1b8e2abda16c860371543a8b12f2 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 14:42:42 +0100 Subject: [PATCH 008/190] Remove broken wheel check in setup.py [ci skip] --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py index 86870489f..ca62366ed 100755 --- a/setup.py +++ b/setup.py @@ -61,9 +61,6 @@ if sys.argv[-1] == 'publish': import pypandoc except ImportError: print("pypandoc not installed.\nUse `pip install pypandoc`.\nExiting.") - 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"): print("twine not installed.\nUse `pip install twine`.\nExiting.") sys.exit() From e3686aca93a8224280b38b7669342bcadb24176e Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 14:47:26 +0100 Subject: [PATCH 009/190] Don't use bare 'raise'. [ci skip] --- 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 a8710c7a0..07575fba7 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -445,7 +445,7 @@ class APIView(View): renderer_format = getattr(request.accepted_renderer, 'format') use_plaintext_traceback = renderer_format not in ('html', 'api', 'admin') request.force_plaintext_errors(use_plaintext_traceback) - raise + raise exc # Note: Views are made CSRF exempt from within `as_view` as to prevent # accidental removal of this exemption in cases where `dispatch` needs to From 0b346e94b1ed3016e79dd39be3ee48691cecb035 Mon Sep 17 00:00:00 2001 From: Lukasz Karolewski Date: Fri, 21 Oct 2016 07:00:25 -0700 Subject: [PATCH 010/190] changing order of imports (#4601) when using with django-filter and rest_framework_swagger need to import coreapi before django-filter as django filter tries to load rest_framework.coreapi which is undefined at this point --- rest_framework/compat.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 7ec39ba63..2d6e7843c 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -170,6 +170,16 @@ except ImportError: JSONField = None +# coreapi is optional (Note that uritemplate is a dependency of coreapi) +try: + import coreapi + import uritemplate +except (ImportError, SyntaxError): + # SyntaxError is possible under python 3.2 + coreapi = None + uritemplate = None + + # django-filter is optional try: import django_filters @@ -184,16 +194,6 @@ except ImportError: crispy_forms = None -# coreapi is optional (Note that uritemplate is a dependency of coreapi) -try: - import coreapi - import uritemplate -except (ImportError, SyntaxError): - # SyntaxError is possible under python 3.2 - coreapi = None - uritemplate = None - - # requests is optional try: import requests From f1bdce17b547859a6d59e5c0fe85b9c46d061f44 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 15:21:23 +0100 Subject: [PATCH 011/190] Fix for case of ListSerializer with single item (#4609) --- rest_framework/serializers.py | 4 ++-- tests/test_serializer.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 098c3cd23..39987cd07 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -507,7 +507,7 @@ class Serializer(BaseSerializer): @property def errors(self): ret = super(Serializer, self).errors - if isinstance(ret, list) and len(ret) == 1 and ret[0].code == 'null': + if isinstance(ret, list) and len(ret) == 1 and getattr(ret[0], 'code', None) == 'null': # Edge case. Provide a more descriptive error than # "this field may not be null", when no data is passed. detail = ErrorDetail('No data provided', code='null') @@ -705,7 +705,7 @@ class ListSerializer(BaseSerializer): @property def errors(self): ret = super(ListSerializer, self).errors - if isinstance(ret, list) and len(ret) == 1 and ret[0].code == 'null': + if isinstance(ret, list) and len(ret) == 1 and getattr(ret[0], 'code', None) == 'null': # Edge case. Provide a more descriptive error than # "this field may not be null", when no data is passed. detail = ErrorDetail('No data provided', code='null') diff --git a/tests/test_serializer.py b/tests/test_serializer.py index a2817f6a4..32be39faa 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -357,3 +357,16 @@ class TestSerializerValidationWithCompiledRegexField: assert serializer.is_valid() assert serializer.validated_data == {'name': '2'} assert serializer.errors == {} + + +class Test4606Regression: + def setup(self): + class ExampleSerializer(serializers.Serializer): + name = serializers.CharField(required=True) + choices = serializers.CharField(required=True) + self.Serializer = ExampleSerializer + + def test_4606_regression(self): + serializer = self.Serializer(data=[{"name": "liz"}], many=True) + with pytest.raises(serializers.ValidationError): + serializer.is_valid(raise_exception=True) From d647d37a99df3673000f17f7d565a8dab0770805 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 15:45:28 +0100 Subject: [PATCH 012/190] Fix Accept header in tutorial. Closes #4604. [ci skip] --- docs/tutorial/7-schemas-and-client-libraries.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorial/7-schemas-and-client-libraries.md b/docs/tutorial/7-schemas-and-client-libraries.md index 705b79da6..eb1982955 100644 --- a/docs/tutorial/7-schemas-and-client-libraries.md +++ b/docs/tutorial/7-schemas-and-client-libraries.md @@ -53,10 +53,10 @@ representation become available as an option. We can also request the schema from the command line, by specifying the desired content type in the `Accept` header. - $ http http://127.0.0.1:8000/schema/ Accept:application/vnd.coreapi+json + $ http http://127.0.0.1:8000/schema/ Accept:application/coreapi+json HTTP/1.0 200 OK Allow: GET, HEAD, OPTIONS - Content-Type: application/vnd.coreapi+json + Content-Type: application/coreapi+json { "_meta": { From 0fe0e1e7038e74f071e93a77bd5900dc191b086d Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 16:59:34 +0100 Subject: [PATCH 013/190] Fix schema base paths (#4611) --- rest_framework/schemas.py | 15 +++++++++++++-- tests/test_schemas.py | 11 +++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index af861426c..9b9984699 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -1,4 +1,3 @@ -import os import re from collections import OrderedDict from importlib import import_module @@ -37,6 +36,18 @@ types_lookup = ClassLookupDict({ }) +def common_path(paths): + split_paths = [path.strip('/').split('/') for path in paths] + s1 = min(split_paths) + s2 = max(split_paths) + common = s1 + for i, c in enumerate(s1): + if c != s2[i]: + common = s1[:i] + break + return '/' + '/'.join(common) + + def get_pk_name(model): meta = model._meta.concrete_model._meta return _get_pk(meta).name @@ -292,7 +303,7 @@ class SchemaGenerator(object): # one URL that doesn't have a path prefix. return '/' prefixes.append('/' + prefix + '/') - return os.path.commonprefix(prefixes) + return common_path(prefixes) def create_view(self, callback, method, request=None): """ diff --git a/tests/test_schemas.py b/tests/test_schemas.py index 7188087c4..80b456ea0 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -335,3 +335,14 @@ class TestSchemaGeneratorNotAtRoot(TestCase): } ) self.assertEqual(schema, expected) + + +@unittest.skipUnless(coreapi, 'coreapi is not installed') +class Test4605Regression(TestCase): + def test_4605_regression(self): + generator = SchemaGenerator() + prefix = generator.determine_path_prefix([ + '/api/v1/items/', + '/auth/convert-token/' + ]) + assert prefix == '/' From 30bf9df5d0dc983d180000e413ec2254d7946ff8 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 16:59:43 +0100 Subject: [PATCH 014/190] Fix guardian import (#4612) --- rest_framework/compat.py | 1 - rest_framework/filters.py | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 2d6e7843c..b0e076203 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -207,7 +207,6 @@ guardian = None try: if 'guardian' in settings.INSTALLED_APPS: import guardian - import guardian.shortcuts # Fixes #1624 except ImportError: pass diff --git a/rest_framework/filters.py b/rest_framework/filters.py index f55297b39..47d9a0342 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -289,6 +289,11 @@ class DjangoObjectPermissionsFilter(BaseFilterBackend): perm_format = '%(app_label)s.view_%(model_name)s' def filter_queryset(self, request, queryset, view): + # We want to defer this import until run-time, rather than import-time. + # See https://github.com/tomchristie/django-rest-framework/issues/4608 + # (Also see #1624 for why we need to make this import explicitly) + from guardian.shortcuts import get_objects_for_user + extra = {} user = request.user model_cls = queryset.model @@ -302,4 +307,4 @@ class DjangoObjectPermissionsFilter(BaseFilterBackend): extra = {'accept_global_perms': False} else: extra = {} - return guardian.shortcuts.get_objects_for_user(user, permission, queryset, **extra) + return get_objects_for_user(user, permission, queryset, **extra) From 3b39d2d13a227b1f159663530ad754b183b7225c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Oct 2016 17:10:38 +0100 Subject: [PATCH 015/190] Version 3.5.1 [ci skip] --- docs/topics/release-notes.md | 21 +++++++++++++++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 30244f6d2..3d3935684 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,15 @@ You can determine your currently installed version using `pip freeze`: ## 3.5.x series +### 3.5.1 + +**Date**: [21st October 2016][3.5.1-milestone] + +* Make `rest_framework/compat.py` imports. ([#4612][gh4612], [#4608][gh4608], [#4601][gh4601]) +* Fix bug in schema base path generation. ([#4611][gh4611], [#4605][gh4605]) +* Fix broken case of ListSerializer with single item. ([#4609][gh4609], [#4606][gh4606]) +* Remove bare `raise` for Python 3.5 compat. ([#4600][gh4600]) + ### 3.5.0 **Date**: [20th October 2016][3.5.0-milestone] @@ -605,6 +614,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.4.6-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.6+Release%22 [3.4.7-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.7+Release%22 [3.5.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.0+Release%22 +[3.5.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.1+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -1146,3 +1156,14 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh4465]: https://github.com/tomchristie/django-rest-framework/issues/4465 [gh4462]: https://github.com/tomchristie/django-rest-framework/issues/4462 [gh4458]: https://github.com/tomchristie/django-rest-framework/issues/4458 + + + +[gh4612]: https://github.com/tomchristie/django-rest-framework/issues/4612 +[gh4608]: https://github.com/tomchristie/django-rest-framework/issues/4608 +[gh4601]: https://github.com/tomchristie/django-rest-framework/issues/4601 +[gh4611]: https://github.com/tomchristie/django-rest-framework/issues/4611 +[gh4605]: https://github.com/tomchristie/django-rest-framework/issues/4605 +[gh4609]: https://github.com/tomchristie/django-rest-framework/issues/4609 +[gh4606]: https://github.com/tomchristie/django-rest-framework/issues/4606 +[gh4600]: https://github.com/tomchristie/django-rest-framework/issues/4600 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 68e96703f..0a520bf80 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.5.0' +__version__ = '3.5.1' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' From 8ac524915ca3759d7728206da101b63c6f33b6d3 Mon Sep 17 00:00:00 2001 From: Mads Jensen Date: Sat, 22 Oct 2016 17:37:23 +0200 Subject: [PATCH 016/190] added on_delete=models.CASCADE to models.ForeignKey in the documentation (#4614) --- docs/api-guide/relations.md | 6 +++--- docs/tutorial/4-authentication-and-permissions.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index aeefae8b1..aabe49412 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 artist = models.CharField(max_length=100) class Track(models.Model): - album = models.ForeignKey(Album, related_name='tracks') + album = models.ForeignKey(Album, related_name='tracks', on_delete=models.CASCADE) order = models.IntegerField() title = models.CharField(max_length=100) duration = models.IntegerField() @@ -484,7 +484,7 @@ Note that reverse relationships are not automatically included by the `ModelSeri You'll normally want to ensure that you've set an appropriate `related_name` argument on the relationship, that you can use as the field name. For example: class Track(models.Model): - album = models.ForeignKey(Album, related_name='tracks') + album = models.ForeignKey(Album, related_name='tracks', on_delete=models.CASCADE) ... If you have not set a related name for the reverse relationship, you'll need to use the automatically generated related name in the `fields` argument. For example: @@ -508,7 +508,7 @@ For example, given the following model for a tag, which has a generic relationsh See: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/ """ tag_name = models.SlugField() - content_type = models.ForeignKey(ContentType) + content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) object_id = models.PositiveIntegerField() tagged_object = GenericForeignKey('content_type', 'object_id') diff --git a/docs/tutorial/4-authentication-and-permissions.md b/docs/tutorial/4-authentication-and-permissions.md index 098194c29..43ccf9186 100644 --- a/docs/tutorial/4-authentication-and-permissions.md +++ b/docs/tutorial/4-authentication-and-permissions.md @@ -14,7 +14,7 @@ First, let's add a couple of fields. One of those fields will be used to repres Add the following two fields to the `Snippet` model in `models.py`. - owner = models.ForeignKey('auth.User', related_name='snippets') + owner = models.ForeignKey('auth.User', related_name='snippets', on_delete=models.CASCADE) highlighted = models.TextField() We'd also need to make sure that when the model is saved, that we populate the highlighted field, using the `pygments` code highlighting library. From 72dc6d1d5cae32353e87b7724e666afbd8f04312 Mon Sep 17 00:00:00 2001 From: Phil Krylov Date: Sun, 23 Oct 2016 04:36:36 +0300 Subject: [PATCH 017/190] Add `drf-proxy-pagination` reference to Pagination docs --- docs/api-guide/pagination.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index f990128c5..f82614eca 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -321,9 +321,14 @@ 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. +## drf-proxy-pagination + +The [`drf-proxy-pagination` package][drf-proxy-pagination] includes a `ProxyPagination` class which allows to choose pagination class with a query parameter. + [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 +[drf-proxy-pagination]: https://github.com/tuffnatty/drf-proxy-pagination [disqus-cursor-api]: http://cramer.io/2011/03/08/building-cursors-for-the-disqus-api From eafc9a2393139445815feafe0392c170f1172532 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Tue, 25 Oct 2016 15:47:24 -0400 Subject: [PATCH 018/190] Fix is_simple_callable with variable args, kwargs (#4622) --- rest_framework/fields.py | 9 +++++++-- tests/test_fields.py | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index e48285005..f75fcfe05 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -54,12 +54,17 @@ if six.PY3: """ True if the object is a callable that takes no arguments. """ - if not callable(obj): + if not (inspect.isfunction(obj) or inspect.ismethod(obj)): return False sig = inspect.signature(obj) params = sig.parameters.values() - return all(param.default != param.empty for param in params) + return all( + param.kind == param.VAR_POSITIONAL or + param.kind == param.VAR_KEYWORD or + param.default != param.empty + for param in params + ) else: def is_simple_callable(obj): diff --git a/tests/test_fields.py b/tests/test_fields.py index 6fea249ba..92030e3ca 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -37,6 +37,9 @@ class TestIsSimpleCallable: def valid_kwargs(self, param='value'): pass + def valid_vargs_kwargs(self, *args, **kwargs): + pass + def invalid(self, param): pass @@ -45,11 +48,13 @@ class TestIsSimpleCallable: # unbound methods assert not is_simple_callable(Foo.valid) assert not is_simple_callable(Foo.valid_kwargs) + assert not is_simple_callable(Foo.valid_vargs_kwargs) assert not is_simple_callable(Foo.invalid) # bound methods assert is_simple_callable(Foo().valid) assert is_simple_callable(Foo().valid_kwargs) + assert is_simple_callable(Foo().valid_vargs_kwargs) assert not is_simple_callable(Foo().invalid) def test_function(self): @@ -59,13 +64,31 @@ class TestIsSimpleCallable: def valid(param='value', param2='value'): pass + def valid_vargs_kwargs(*args, **kwargs): + pass + def invalid(param, param2='value'): pass assert is_simple_callable(simple) assert is_simple_callable(valid) + assert is_simple_callable(valid_vargs_kwargs) assert not is_simple_callable(invalid) + def test_4602_regression(self): + from django.db import models + + class ChoiceModel(models.Model): + choice_field = models.CharField( + max_length=1, default='a', + choices=(('a', 'A'), ('b', 'B')), + ) + + class Meta: + app_label = 'tests' + + assert is_simple_callable(ChoiceModel().get_choice_field_display) + @unittest.skipUnless(typings, 'requires python 3.5') def test_type_annotation(self): # The annotation will otherwise raise a syntax error in python < 3.5 From 46f837a9d13d5f02fabfa49aef33c16c561a68cf Mon Sep 17 00:00:00 2001 From: Josep Cugat Date: Fri, 28 Oct 2016 13:05:32 +0200 Subject: [PATCH 019/190] Fix APIException full_details() typo in documentation (#4633) APIException has a get_full_details() method but the documentation refers to full_details(). --- docs/api-guide/exceptions.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/exceptions.md b/docs/api-guide/exceptions.md index f0f178d92..df8cad42d 100644 --- a/docs/api-guide/exceptions.md +++ b/docs/api-guide/exceptions.md @@ -119,7 +119,7 @@ The available attributes and methods are: * `.detail` - Return the textual description of the error. * `.get_codes()` - Return the code identifier of the error. -* `.full_details()` - Return both the textual description and the code identifier. +* `.get_full_details()` - Return both the textual description and the code identifier. In most cases the error detail will be a simple item: @@ -127,7 +127,7 @@ In most cases the error detail will be a simple item: You do not have permission to perform this action. >>> print(exc.get_codes()) permission_denied - >>> print(exc.full_details()) + >>> print(exc.get_full_details()) {'message':'You do not have permission to perform this action.','code':'permission_denied'} In the case of validation errors the error detail will be either a list or From 895c67c9a22eff1057703a8c578c4833f63a9d70 Mon Sep 17 00:00:00 2001 From: Alex Kahan Date: Mon, 31 Oct 2016 16:41:54 -0400 Subject: [PATCH 020/190] Fixes #4532 (#4636) --- .../rest_framework/admin/dict_value.html | 11 +++ tests/test_templatetags.py | 75 +++++++++++++++---- 2 files changed, 73 insertions(+), 13 deletions(-) diff --git a/rest_framework/templates/rest_framework/admin/dict_value.html b/rest_framework/templates/rest_framework/admin/dict_value.html index e69de29bb..3392c901b 100644 --- a/rest_framework/templates/rest_framework/admin/dict_value.html +++ b/rest_framework/templates/rest_framework/admin/dict_value.html @@ -0,0 +1,11 @@ +{% load rest_framework %} + + + {% for key, value in value.items %} + + + + + {% endfor %} + +
{{ key|format_value }}{{ value|format_value }}
diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index 28390320b..cac1abf50 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -41,6 +41,9 @@ class TemplateTagTests(TestCase): self.assertEqual(format_value(None), 'null') def test_format_value_hyperlink(self): + """ + Tests format_value with a URL + """ url = 'http://url.com' name = 'name_of_url' hyperlink = Hyperlink(url, name) @@ -54,6 +57,25 @@ class TemplateTagTests(TestCase): self.assertEqual(format_value(list_items), '\n item1, item2, item3\n') self.assertEqual(format_value([]), '\n\n') + def test_format_value_dict(self): + """ + Tests format_value with a dict + """ + test_dict = {'a': 'b'} + expected_dict_format = """ + + + + + + + +
ab
""" + self.assertEqual( + format_html(format_value(test_dict)), + format_html(expected_dict_format) + ) + def test_format_value_table(self): """ Tests format_value with a list of lists/dicts @@ -84,20 +106,47 @@ class TemplateTagTests(TestCase): expected_dict_format = """ - - 0 - - - - 1 - - - - 2 - - + + 0 + + + + + item1 + value1 + + + + + + + 1 + + + + + item2 + value2 + + + + + + + 2 + + + + + item3 + value3 + + + + + - """ + """ list_of_dicts = [{'item1': 'value1'}, {'item2': 'value2'}, {'item3': 'value3'}] self.assertEqual( From 7eb6cdca0080e0f321e660c48fa1d4ac5a6e7dab Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 1 Nov 2016 10:22:30 +0000 Subject: [PATCH 021/190] Don't lose exception info (#4638) --- 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 07575fba7..a8710c7a0 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -445,7 +445,7 @@ class APIView(View): renderer_format = getattr(request.accepted_renderer, 'format') use_plaintext_traceback = renderer_format not in ('html', 'api', 'admin') request.force_plaintext_errors(use_plaintext_traceback) - raise exc + raise # Note: Views are made CSRF exempt from within `as_view` as to prevent # accidental removal of this exemption in cases where `dispatch` needs to From 5c54b227c11688f12ce17f8aa9575e4ab52463d3 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 1 Nov 2016 10:24:53 +0000 Subject: [PATCH 022/190] Drop redundant requests adapter (#4639) --- rest_framework/test.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/rest_framework/test.py b/rest_framework/test.py index 16b1b4cd5..241f94c91 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -106,15 +106,6 @@ if requests is not None: def close(self): pass - class NoExternalRequestsAdapter(requests.adapters.HTTPAdapter): - def send(self, request, *args, **kwargs): - msg = ( - 'RequestsClient refusing to make an outgoing network request ' - 'to "%s". Only "testserver" or hostnames in your ALLOWED_HOSTS ' - 'setting are valid.' % request.url - ) - raise RuntimeError(msg) - class RequestsClient(requests.Session): def __init__(self, *args, **kwargs): super(RequestsClient, self).__init__(*args, **kwargs) From d92b24a0b74f681a538f6faff59bb00c6cd447e2 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Tue, 1 Nov 2016 06:27:11 -0400 Subject: [PATCH 023/190] Make serializer fields import explicit (#4628) --- rest_framework/serializers.py | 29 +++++++++++++++++++--- tests/test_serializer.py | 45 ++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 39987cd07..1bdcd12c3 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -12,18 +12,27 @@ response content is handled by parsers and renderers. """ from __future__ import unicode_literals +import copy +import inspect import traceback +from collections import OrderedDict +from django.core.exceptions import ValidationError as DjangoValidationError +from django.core.exceptions import ImproperlyConfigured from django.db import models from django.db.models import DurationField as ModelDurationField from django.db.models.fields import Field as DjangoModelField from django.db.models.fields import FieldDoesNotExist +from django.utils import six, timezone from django.utils.functional import cached_property from django.utils.translation import ugettext_lazy as _ from rest_framework.compat import JSONField as ModelJSONField from rest_framework.compat import postgres_fields, set_many, unicode_to_repr -from rest_framework.utils import model_meta +from rest_framework.exceptions import ErrorDetail, ValidationError +from rest_framework.fields import get_error_detail, set_value +from rest_framework.settings import api_settings +from rest_framework.utils import html, model_meta, representation from rest_framework.utils.field_mapping import ( ClassLookupDict, get_field_kwargs, get_nested_relation_kwargs, get_relation_kwargs, get_url_kwargs @@ -42,9 +51,23 @@ from rest_framework.validators import ( # # This helps keep the separation between model fields, form fields, and # serializer fields more explicit. +from rest_framework.fields import ( # NOQA # isort:skip + BooleanField, CharField, ChoiceField, DateField, DateTimeField, DecimalField, + DictField, DurationField, EmailField, Field, FileField, FilePathField, FloatField, + HiddenField, IPAddressField, ImageField, IntegerField, JSONField, ListField, + ModelField, MultipleChoiceField, NullBooleanField, ReadOnlyField, RegexField, + SerializerMethodField, SlugField, TimeField, URLField, UUIDField, +) +from rest_framework.relations import ( # NOQA # isort:skip + HyperlinkedIdentityField, HyperlinkedRelatedField, ManyRelatedField, + PrimaryKeyRelatedField, RelatedField, SlugRelatedField, StringRelatedField, +) -from rest_framework.fields import * # NOQA # isort:skip -from rest_framework.relations import * # NOQA # isort:skip +# Non-field imports, but public API +from rest_framework.fields import ( # NOQA # isort:skip + CreateOnlyDefault, CurrentUserDefault, SkipField, empty +) +from rest_framework.relations import Hyperlink, PKOnlyObject # NOQA # isort:skip # We assume that 'validators' are intended for the child serializer, # rather than the parent serializer. diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 32be39faa..8c8b5b163 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -1,17 +1,60 @@ # coding: utf-8 from __future__ import unicode_literals +import inspect import pickle import re import pytest -from rest_framework import serializers +from rest_framework import fields, relations, serializers from rest_framework.compat import unicode_repr +from rest_framework.fields import Field from .utils import MockObject +# Test serializer fields imports. +# ------------------------------- + +class TestFieldImports: + def is_field(self, name, value): + return ( + isinstance(value, type) and + issubclass(value, Field) and + not name.startswith('_') + ) + + def test_fields(self): + msg = "Expected `fields.%s` to be imported in `serializers`" + field_classes = [ + key for key, value + in inspect.getmembers(fields) + if self.is_field(key, value) + ] + + # sanity check + assert 'Field' in field_classes + assert 'BooleanField' in field_classes + + for field in field_classes: + assert hasattr(serializers, field), msg % field + + def test_relations(self): + msg = "Expected `relations.%s` to be imported in `serializers`" + field_classes = [ + key for key, value + in inspect.getmembers(relations) + if self.is_field(key, value) + ] + + # sanity check + assert 'RelatedField' in field_classes + + for field in field_classes: + assert hasattr(serializers, field), msg % field + + # Tests for core functionality. # ----------------------------- From 98df932194722d6fc81becedc55eb695a32f925f Mon Sep 17 00:00:00 2001 From: Kieran Spear Date: Tue, 1 Nov 2016 18:30:17 +0800 Subject: [PATCH 024/190] Fix FilterSet proxy (#4620) --- rest_framework/filters.py | 35 ++++++++++++++++++++++++++--------- tests/test_filters.py | 23 +++++++++++++++++++++++ 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 47d9a0342..531531efc 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -37,15 +37,32 @@ class BaseFilterBackend(object): return [] -class FilterSet(object): - def __new__(cls, *args, **kwargs): - warnings.warn( - "The built in 'rest_framework.filters.FilterSet' is pending deprecation. " - "You should use 'django_filters.rest_framework.FilterSet' instead.", - PendingDeprecationWarning - ) - from django_filters.rest_framework import FilterSet - return FilterSet(*args, **kwargs) +if django_filters: + from django_filters.filterset import FilterSetMetaclass as DFFilterSetMetaclass + from django_filters.rest_framework.filterset import FilterSet as DFFilterSet + + class FilterSetMetaclass(DFFilterSetMetaclass): + def __new__(cls, name, bases, attrs): + warnings.warn( + "The built in 'rest_framework.filters.FilterSet' is pending deprecation. " + "You should use 'django_filters.rest_framework.FilterSet' instead.", + PendingDeprecationWarning + ) + return super(FilterSetMetaclass, cls).__new__(cls, name, bases, attrs) + _BaseFilterSet = DFFilterSet +else: + # Dummy metaclass just so we can give a user-friendly error message. + class FilterSetMetaclass(type): + def __init__(self, name, bases, attrs): + # Assert only on subclasses, so we can define FilterSet below. + if bases != (object,): + assert False, 'django-filter must be installed to use the `FilterSet` class' + super(FilterSetMetaclass, self).__init__(name, bases, attrs) + _BaseFilterSet = object + + +class FilterSet(six.with_metaclass(FilterSetMetaclass, _BaseFilterSet)): + pass class DjangoFilterBackend(BaseFilterBackend): diff --git a/tests/test_filters.py b/tests/test_filters.py index 9795230d6..12fb85895 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -79,12 +79,23 @@ if django_filters: model = BaseFilterableItem fields = '__all__' + # Test the same filter using the deprecated internal FilterSet class. + class BaseFilterableItemFilterWithProxy(filters.FilterSet): + text = django_filters.CharFilter() + + class Meta: + model = BaseFilterableItem + fields = '__all__' + class BaseFilterableItemFilterRootView(generics.ListCreateAPIView): queryset = FilterableItem.objects.all() serializer_class = FilterableItemSerializer filter_class = BaseFilterableItemFilter filter_backends = (filters.DjangoFilterBackend,) + class BaseFilterableItemFilterWithProxyRootView(BaseFilterableItemFilterRootView): + filter_class = BaseFilterableItemFilterWithProxy + # Regression test for #814 class FilterFieldsQuerysetView(generics.ListCreateAPIView): queryset = FilterableItem.objects.all() @@ -296,6 +307,18 @@ class IntegrationTestFiltering(CommonFilteringTestCase): self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(len(response.data), 1) + @unittest.skipUnless(django_filters, 'django-filter not installed') + def test_base_model_filter_with_proxy(self): + """ + The `get_filter_class` model checks should allow base model filters. + """ + view = BaseFilterableItemFilterWithProxyRootView.as_view() + + request = factory.get('/?text=aaa') + response = view(request).render() + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(len(response.data), 1) + @unittest.skipUnless(django_filters, 'django-filter not installed') def test_unknown_filter(self): """ From 97d848413e5e13e9de83b7e840fc719b9ec0d9c7 Mon Sep 17 00:00:00 2001 From: Nicolas Delaby Date: Tue, 1 Nov 2016 11:38:56 +0100 Subject: [PATCH 025/190] Fix support of get_full_details() for Throttled exceptions (#4627) Since `str` objects are immutable, appending to existing `str` creates in fact a new `str` instance. Thus `ErrorDetail.detail.code` attribute is lost after `str` concatenation operation. --- rest_framework/exceptions.py | 20 ++++++++++---------- tests/test_exceptions.py | 20 +++++++++++++++++++- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py index e41655fef..e84074a07 100644 --- a/rest_framework/exceptions.py +++ b/rest_framework/exceptions.py @@ -210,14 +210,14 @@ class Throttled(APIException): default_code = 'throttled' def __init__(self, wait=None, detail=None, code=None): + if detail is None: + detail = force_text(self.default_detail) + if wait is not None: + wait = math.ceil(wait) + detail = ' '.join(( + detail, + force_text(ungettext(self.extra_detail_singular.format(wait=wait), + self.extra_detail_plural.format(wait=wait), + wait)))) + self.wait = wait super(Throttled, self).__init__(detail, code) - - if wait is None: - self.wait = None - else: - self.wait = math.ceil(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/tests/test_exceptions.py b/tests/test_exceptions.py index 29703cb77..f1d172211 100644 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -1,9 +1,12 @@ from __future__ import unicode_literals from django.test import TestCase +from django.utils import six from django.utils.translation import ugettext_lazy as _ -from rest_framework.exceptions import ErrorDetail, _get_error_details +from rest_framework.exceptions import ( + ErrorDetail, Throttled, _get_error_details +) class ExceptionTestCase(TestCase): @@ -39,3 +42,18 @@ class ExceptionTestCase(TestCase): _get_error_details([[lazy_example]])[0][0], ErrorDetail ) + + def test_get_full_details_with_throttling(self): + exception = Throttled() + assert exception.get_full_details() == { + 'message': 'Request was throttled.', 'code': 'throttled'} + + exception = Throttled(wait=2) + assert exception.get_full_details() == { + 'message': 'Request was throttled. Expected available in {} seconds.'.format(2 if six.PY3 else 2.), + 'code': 'throttled'} + + exception = Throttled(wait=2, detail='Slow down!') + assert exception.get_full_details() == { + 'message': 'Slow down! Expected available in {} seconds.'.format(2 if six.PY3 else 2.), + 'code': 'throttled'} From 70385711572e7ea141644f349b7180c68b4c15d2 Mon Sep 17 00:00:00 2001 From: Kennedy Mwenja Date: Tue, 1 Nov 2016 13:42:01 +0300 Subject: [PATCH 026/190] Enable cursor pagination of value querysets. (#4569) To do `GROUP_BY` queries in django requires one to use `.values()` eg this groups posts by user getting a count of posts per user. ``` Posts.objects.order_by('user').values('user').annotate(post_count=Count('post')) ``` This would produce a value queryset which serializes its result objects as dictionaries while `CursorPagination` requires a queryset with result objects that are model instances. This commit enables cursor pagination for value querysets. - had to mangle the tests a bit to test it out. They might need some refactoring. - tried the same for `.values_list()` but it turned out to be trickier than I expected since you have to use tuple indexes. --- rest_framework/pagination.py | 6 +- tests/test_pagination.py | 221 ++++++++++++++++++++++------------- 2 files changed, 147 insertions(+), 80 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index 708da29cd..8ccdc342c 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -711,7 +711,11 @@ class CursorPagination(BasePagination): return replace_query_param(self.base_url, self.cursor_query_param, encoded) def _get_position_from_instance(self, instance, ordering): - attr = getattr(instance, ordering[0].lstrip('-')) + field_name = ordering[0].lstrip('-') + if isinstance(instance, dict): + attr = instance[field_name] + else: + attr = getattr(instance, field_name) return six.text_type(attr) def get_paginated_response(self, data): diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 170d95899..9f2e1c57c 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -3,6 +3,8 @@ from __future__ import unicode_literals import pytest from django.core.paginator import Paginator as DjangoPaginator +from django.db import models +from django.test import TestCase from rest_framework import ( exceptions, filters, generics, pagination, serializers, status @@ -530,85 +532,7 @@ class TestLimitOffset: assert content.get('previous') == prev_url -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=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[0].startswith('-'): - return MockQuerySet(list(reversed(self.items))) - return self - - def __getitem__(self, sliced): - return self.items[sliced] - - class ExamplePagination(pagination.CursorPagination): - page_size = 5 - ordering = 'created' - - self.pagination = ExamplePagination() - self.queryset = MockQuerySet([ - MockObject(idx) for idx in [ - 1, 1, 1, 1, 1, - 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 get_pages(self, url): - """ - Given a URL return a tuple of: - - (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() - previous_url = self.pagination.get_previous_link() - - 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 - - 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 - - return (previous, current, next, previous_url, next_url) +class CursorPaginationTestsMixin: def test_invalid_cursor(self): request = Request(factory.get('/', {'cursor': '123'})) @@ -703,6 +627,145 @@ class TestCursorPagination: assert isinstance(self.pagination.to_html(), type('')) +class TestCursorPagination(CursorPaginationTestsMixin): + """ + 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[0].startswith('-'): + return MockQuerySet(list(reversed(self.items))) + return self + + def __getitem__(self, sliced): + return self.items[sliced] + + class ExamplePagination(pagination.CursorPagination): + page_size = 5 + ordering = 'created' + + self.pagination = ExamplePagination() + self.queryset = MockQuerySet([ + MockObject(idx) for idx in [ + 1, 1, 1, 1, 1, + 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 get_pages(self, url): + """ + Given a URL return a tuple of: + + (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() + previous_url = self.pagination.get_previous_link() + + 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 + + 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 + + return (previous, current, next, previous_url, next_url) + + +class CursorPaginationModel(models.Model): + created = models.IntegerField() + + +class TestCursorPaginationWithValueQueryset(CursorPaginationTestsMixin, TestCase): + """ + Unit tests for `pagination.CursorPagination` for value querysets. + """ + + def setUp(self): + class ExamplePagination(pagination.CursorPagination): + page_size = 5 + ordering = 'created' + + self.pagination = ExamplePagination() + data = [ + 1, 1, 1, 1, 1, + 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 + ] + for idx in data: + CursorPaginationModel.objects.create(created=idx) + + self.queryset = CursorPaginationModel.objects.values() + + def get_pages(self, url): + """ + Given a URL return a tuple of: + + (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() + previous_url = self.pagination.get_previous_link() + + 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 + + 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 + + return (previous, current, next, previous_url, next_url) + + def test_get_displayed_page_numbers(): """ Test our contextual page display function. From 276ed80fd302184dddb3af01e53d43be4aef15e4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 1 Nov 2016 11:11:34 +0000 Subject: [PATCH 027/190] Support 'on'/'off' literals with BooleanField. Closes #4624 (#4640) --- rest_framework/fields.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index f75fcfe05..13b5145ba 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -644,8 +644,20 @@ class BooleanField(Field): } default_empty_html = False initial = False - TRUE_VALUES = {'t', 'T', 'true', 'True', 'TRUE', '1', 1, True} - FALSE_VALUES = {'f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False} + TRUE_VALUES = { + 't', 'T', + 'true', 'True', 'TRUE', + 'on', 'On', 'ON', + '1', 1, + True + } + FALSE_VALUES = { + 'f', 'F', + 'false', 'False', 'FALSE', + 'off', 'Off', 'OFF', + '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.' From 2bf082a6236cf979d2d125f1f5a60f18509323fc Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 1 Nov 2016 11:31:20 +0000 Subject: [PATCH 028/190] Version 3.5.2 [ci skip] (#4641) --- docs/topics/release-notes.md | 31 +++++++++++++++++++++++++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 3d3935684..d25a46ba0 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,20 @@ You can determine your currently installed version using `pip freeze`: ## 3.5.x series +### 3.5.2 + +**Date**: [1st November 2016][3.5.2-milestone] + +* Restore exception tracebacks in Python 2.7. ([#4631][gh4631], [#4638][gh4638]) +* Properly display dicts in the admin console. ([#4532][gh4532], [#4636][gh4636]) +* Fix is_simple_callable with variable args, kwargs. ([#4622][gh4622], [#4602][gh4602]) +* Support 'on'/'off' literals with BooleanField. ([#4640][gh4640], [#4624][gh4624]) +* Enable cursor pagination of value querysets. ([#4569][gh4569]) +* Fix support of get_full_details() for Throttled exceptions. ([#4627][gh4627]) +* Fix FilterSet proxy. ([#4620][gh4620]) +* Make serializer fields import explicit. ([#4628][gh4628]) +* Drop redundant requests adapter. ([#4639][gh4639]) + ### 3.5.1 **Date**: [21st October 2016][3.5.1-milestone] @@ -615,6 +629,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.4.7-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.4.7+Release%22 [3.5.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.0+Release%22 [3.5.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.1+Release%22 +[3.5.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.2+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -1167,3 +1182,19 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh4609]: https://github.com/tomchristie/django-rest-framework/issues/4609 [gh4606]: https://github.com/tomchristie/django-rest-framework/issues/4606 [gh4600]: https://github.com/tomchristie/django-rest-framework/issues/4600 + + + +[gh4631]: https://github.com/tomchristie/django-rest-framework/issues/4631 +[gh4638]: https://github.com/tomchristie/django-rest-framework/issues/4638 +[gh4532]: https://github.com/tomchristie/django-rest-framework/issues/4532 +[gh4636]: https://github.com/tomchristie/django-rest-framework/issues/4636 +[gh4622]: https://github.com/tomchristie/django-rest-framework/issues/4622 +[gh4602]: https://github.com/tomchristie/django-rest-framework/issues/4602 +[gh4640]: https://github.com/tomchristie/django-rest-framework/issues/4640 +[gh4624]: https://github.com/tomchristie/django-rest-framework/issues/4624 +[gh4569]: https://github.com/tomchristie/django-rest-framework/issues/4569 +[gh4627]: https://github.com/tomchristie/django-rest-framework/issues/4627 +[gh4620]: https://github.com/tomchristie/django-rest-framework/issues/4620 +[gh4628]: https://github.com/tomchristie/django-rest-framework/issues/4628 +[gh4639]: https://github.com/tomchristie/django-rest-framework/issues/4639 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index 0a520bf80..fe82763a9 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.5.1' +__version__ = '3.5.2' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' From 45e058d7bace860300d3edf537b86996aec15c33 Mon Sep 17 00:00:00 2001 From: Andrzej Pragacz Date: Wed, 2 Nov 2016 10:04:01 +0100 Subject: [PATCH 029/190] Fix unhandled Http404, PermissionDenied in schema generation (#4645) (#4646) --- rest_framework/schemas.py | 4 ++- tests/test_schemas.py | 68 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 9b9984699..9439cb691 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -4,6 +4,8 @@ from importlib import import_module from django.conf import settings from django.contrib.admindocs.views import simplify_regex +from django.core.exceptions import PermissionDenied +from django.http import Http404 from django.utils import six from django.utils.encoding import force_text, smart_text @@ -339,7 +341,7 @@ class SchemaGenerator(object): try: view.check_permissions(view.request) - except exceptions.APIException: + except (exceptions.APIException, Http404, PermissionDenied): return False return True diff --git a/tests/test_schemas.py b/tests/test_schemas.py index 80b456ea0..e196a1f61 100644 --- a/tests/test_schemas.py +++ b/tests/test_schemas.py @@ -1,17 +1,22 @@ import unittest from django.conf.urls import include, url +from django.core.exceptions import PermissionDenied +from django.http import Http404 from django.test import TestCase, override_settings from rest_framework import filters, pagination, permissions, serializers from rest_framework.compat import coreapi from rest_framework.decorators import detail_route, list_route +from rest_framework.request import Request from rest_framework.routers import DefaultRouter from rest_framework.schemas import SchemaGenerator, get_schema_view -from rest_framework.test import APIClient +from rest_framework.test import APIClient, APIRequestFactory from rest_framework.views import APIView from rest_framework.viewsets import ModelViewSet +factory = APIRequestFactory() + class MockUser(object): def is_authenticated(self): @@ -215,6 +220,32 @@ class TestRouterGeneratedSchema(TestCase): self.assertEqual(response.data, expected) +class DenyAllUsingHttp404(permissions.BasePermission): + + def has_permission(self, request, view): + raise Http404() + + def has_object_permission(self, request, view, obj): + raise Http404() + + +class DenyAllUsingPermissionDenied(permissions.BasePermission): + + def has_permission(self, request, view): + raise PermissionDenied() + + def has_object_permission(self, request, view, obj): + raise PermissionDenied() + + +class Http404ExampleViewSet(ExampleViewSet): + permission_classes = [DenyAllUsingHttp404] + + +class PermissionDeniedExampleViewSet(ExampleViewSet): + permission_classes = [DenyAllUsingPermissionDenied] + + class ExampleListView(APIView): permission_classes = [permissions.IsAuthenticatedOrReadOnly] @@ -337,6 +368,41 @@ class TestSchemaGeneratorNotAtRoot(TestCase): self.assertEqual(schema, expected) +@unittest.skipUnless(coreapi, 'coreapi is not installed') +class TestSchemaGeneratorWithRestrictedViewSets(TestCase): + def setUp(self): + router = DefaultRouter() + router.register('example1', Http404ExampleViewSet, base_name='example1') + router.register('example2', PermissionDeniedExampleViewSet, base_name='example2') + self.patterns = [ + url('^example/?$', ExampleListView.as_view()), + url(r'^', include(router.urls)) + ] + + def test_schema_for_regular_views(self): + """ + Ensure that schema generation works for ViewSet classes + with permission classes raising exceptions. + """ + generator = SchemaGenerator(title='Example API', patterns=self.patterns) + request = factory.get('/') + schema = generator.get_schema(Request(request)) + expected = coreapi.Document( + url='', + title='Example API', + content={ + 'example': { + 'list': coreapi.Link( + url='/example/', + action='get', + fields=[] + ), + }, + } + ) + self.assertEqual(schema, expected) + + @unittest.skipUnless(coreapi, 'coreapi is not installed') class Test4605Regression(TestCase): def test_4605_regression(self): From d55e176a1e882d498b63b46a01f0ac389428f084 Mon Sep 17 00:00:00 2001 From: Carlos de la Torre Date: Wed, 2 Nov 2016 11:03:53 -0300 Subject: [PATCH 030/190] Fix documentation error: removed unused variable (#4647) --- docs/api-guide/fields.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index f986f1508..17168b721 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -626,7 +626,6 @@ The `.fail()` method is a shortcut for raising `ValidationError` that takes a me 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): From 7f437123bdd6f81c3f6c1216e6308aad4aac5068 Mon Sep 17 00:00:00 2001 From: pkrzyzaniak Date: Mon, 7 Nov 2016 06:12:52 +0800 Subject: [PATCH 031/190] Added "drf_tweaks" to third party packages (#4659) --- 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 3fba9b5da..1713da1a1 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -251,6 +251,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [ember-django-adapter][ember-django-adapter] - An adapter for working with Ember.js * [django-versatileimagefield][django-versatileimagefield] - Provides a drop-in replacement for Django's stock `ImageField` that makes it easy to serve images in multiple sizes/renditions from a single field. For DRF-specific implementation docs, [click here][django-versatileimagefield-drf-docs]. * [drf-tracking][drf-tracking] - Utilities to track requests to DRF API views. +* [drf_tweaks][drf_tweaks] - Serializers with one-step validation (and more), pagination without counts and other tweaks. * [django-rest-framework-braces][django-rest-framework-braces] - Collection of utilities for working with Django Rest Framework. The most notable ones are [FormSerializer](https://django-rest-framework-braces.readthedocs.io/en/latest/overview.html#formserializer) and [SerializerForm](https://django-rest-framework-braces.readthedocs.io/en/latest/overview.html#serializerform), which are adapters between DRF serializers and Django forms. * [drf-haystack][drf-haystack] - Haystack search for Django Rest Framework * [django-rest-framework-version-transforms][django-rest-framework-version-transforms] - Enables the use of delta transformations for versioning of DRF resource representations. @@ -363,3 +364,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-rest-messaging-js]: https://github.com/raphaelgyory/django-rest-messaging-js [medium-django-rest-framework]: https://medium.com/django-rest-framework [django-rest-framework-course]: https://teamtreehouse.com/library/django-rest-framework +[drf_tweaks]: https://github.com/ArabellaTech/drf_tweaks From 0b9304014d4505cec6c4a7df09bc66616d3827b8 Mon Sep 17 00:00:00 2001 From: Aaron Lelevier Date: Mon, 7 Nov 2016 12:30:46 +0100 Subject: [PATCH 032/190] Add documentation link for single 'field-level validation' to the Validator docs page (#3772) (#4657) --- docs/api-guide/validators.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index 9df15ec15..1af9f02a5 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -272,6 +272,12 @@ A validator may be any callable that raises a `serializers.ValidationError` on f if value % 2 != 0: raise serializers.ValidationError('This field must be an even number.') +#### Field-level validation + +You can specify custom field-level validation by adding `.validate_` methods +to your `Serializer` subclass. This is documented in the +[Serializer docs](http://www.django-rest-framework.org/api-guide/serializers/#field-level-validation) + ## 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. From befacfb00d4c39436a307ddc4bf1edb6f82a1a5e Mon Sep 17 00:00:00 2001 From: James Beith Date: Mon, 7 Nov 2016 22:34:53 +1100 Subject: [PATCH 033/190] Add autofocus support for input.html templates (#4650) This change adds support to use `'autofocus': True` in the style options and have the `autofocus` attribute included on the input field when rendered. --- docs/topics/html-and-forms.md | 6 +++--- .../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 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/topics/html-and-forms.md b/docs/topics/html-and-forms.md index 6660607fe..f77ae3af7 100644 --- a/docs/topics/html-and-forms.md +++ b/docs/topics/html-and-forms.md @@ -108,7 +108,7 @@ Let's take a look at how to render each of the three available template packs. F class LoginSerializer(serializers.Serializer): email = serializers.EmailField( max_length=100, - style={'placeholder': 'Email'} + style={'placeholder': 'Email', 'autofocus': True} ) password = serializers.CharField( max_length=100, @@ -207,9 +207,9 @@ Field templates can also use additional style properties, depending on their typ The complete list of `base_template` options and their associated style options is listed below. -base_template | Valid field types | Additional style options +base_template | Valid field types | Additional style options ----|----|---- -input.html | Any string, numeric or date/time field | input_type, placeholder, hide_label +input.html | Any string, numeric or date/time field | input_type, placeholder, hide_label, autofocus textarea.html | `CharField` | rows, placeholder, hide_label select.html | `ChoiceField` or relational field types | hide_label radio.html | `ChoiceField` or relational field types | inline, hide_label diff --git a/rest_framework/templates/rest_framework/horizontal/input.html b/rest_framework/templates/rest_framework/horizontal/input.html index 9e5bbd0f7..a6d657d7d 100644 --- a/rest_framework/templates/rest_framework/horizontal/input.html +++ b/rest_framework/templates/rest_framework/horizontal/input.html @@ -6,7 +6,7 @@ {% endif %}
- + {% if field.errors %} {% for error in field.errors %} diff --git a/rest_framework/templates/rest_framework/inline/input.html b/rest_framework/templates/rest_framework/inline/input.html index f28e8f11c..085c63cb3 100644 --- a/rest_framework/templates/rest_framework/inline/input.html +++ b/rest_framework/templates/rest_framework/inline/input.html @@ -5,5 +5,5 @@ {% endif %} - +
diff --git a/rest_framework/templates/rest_framework/vertical/input.html b/rest_framework/templates/rest_framework/vertical/input.html index 504dcc28e..a7cff2ca6 100644 --- a/rest_framework/templates/rest_framework/vertical/input.html +++ b/rest_framework/templates/rest_framework/vertical/input.html @@ -3,7 +3,7 @@ {% endif %} - + {% if field.errors %} {% for error in field.errors %} From ee60aaa945213723f9574317fa81ca43b7170454 Mon Sep 17 00:00:00 2001 From: Angel Velasquez Date: Mon, 7 Nov 2016 08:37:58 -0300 Subject: [PATCH 034/190] Update versions of Django on tox.ini (#4651) Bump release versions to 1.10.3, 1.9.11 and 1.8.16 More info on: https://www.djangoproject.com/weblog/2016/nov/01/security-releases/ --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index bac1569a0..e89274661 100644 --- a/tox.ini +++ b/tox.ini @@ -15,9 +15,9 @@ setenv = PYTHONDONTWRITEBYTECODE=1 PYTHONWARNINGS=once deps = - django18: Django==1.8.15 - django19: Django==1.9.10 - django110: Django==1.10.2 + django18: Django==1.8.16 + django19: Django==1.9.11 + django110: Django==1.10.3 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 06df61e38c6ed99732007b0e9f3cc26e8317389e Mon Sep 17 00:00:00 2001 From: Rex Salisbury Date: Mon, 7 Nov 2016 03:41:10 -0800 Subject: [PATCH 035/190] handle error when no links are found (#4649) This is to address https://github.com/tomchristie/django-rest-raml/issues/5 The problem is that if you try to generate RAML docs when you haven't set up any views, you get the above error (min called on an empty list). unfortunately, this PR is not very helpful since it doesn't actually surface a readable error to the user. Not sure what the best way to address this would be... --- rest_framework/schemas.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 9439cb691..773df6261 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -263,6 +263,8 @@ class SchemaGenerator(object): view_endpoints.append((path, method, view)) # Only generate the path prefix for paths that will be included + if not paths: + return None prefix = self.determine_path_prefix(paths) for path, method, view in view_endpoints: From 8d72535be9d7ab31c8a46ce5fbbdb39a6d8e0209 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 7 Nov 2016 12:55:18 +0000 Subject: [PATCH 036/190] Fix FilterSet warnings. (#4660) --- rest_framework/filters.py | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 531531efc..00e753d42 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -38,31 +38,19 @@ class BaseFilterBackend(object): if django_filters: - from django_filters.filterset import FilterSetMetaclass as DFFilterSetMetaclass from django_filters.rest_framework.filterset import FilterSet as DFFilterSet - class FilterSetMetaclass(DFFilterSetMetaclass): - def __new__(cls, name, bases, attrs): + class FilterSet(DFFilterSet): + def __init__(self, *args, **kwargs): warnings.warn( "The built in 'rest_framework.filters.FilterSet' is pending deprecation. " "You should use 'django_filters.rest_framework.FilterSet' instead.", PendingDeprecationWarning ) - return super(FilterSetMetaclass, cls).__new__(cls, name, bases, attrs) - _BaseFilterSet = DFFilterSet + return super(FilterSet, self).__init__(*args, **kwargs) else: - # Dummy metaclass just so we can give a user-friendly error message. - class FilterSetMetaclass(type): - def __init__(self, name, bases, attrs): - # Assert only on subclasses, so we can define FilterSet below. - if bases != (object,): - assert False, 'django-filter must be installed to use the `FilterSet` class' - super(FilterSetMetaclass, self).__init__(name, bases, attrs) - _BaseFilterSet = object - - -class FilterSet(six.with_metaclass(FilterSetMetaclass, _BaseFilterSet)): - pass + def FilterSet(): + assert False, 'django-filter must be installed to use the `FilterSet` class' class DjangoFilterBackend(BaseFilterBackend): From ea60872e9e18909577a2603f5ff630a7c9d04b16 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 7 Nov 2016 13:38:48 +0000 Subject: [PATCH 037/190] Version 3.5.3 [ci skip] --- docs/topics/release-notes.md | 18 ++++++++++++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index d25a46ba0..e5683360b 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,14 @@ You can determine your currently installed version using `pip freeze`: ## 3.5.x series +### 3.5.3 + +**Date**: [7th November 2016][3.5.3-milestone] + +* Don't raise incorrect FilterSet deprecation warnings. ([#4660][gh4660], [#4643][gh4643], [#4644][gh4644]) +* Schema generation should not raise 404 when a view permission class does. ([#4645][gh4645], [#4646][gh4646]) +* Add `autofocus` support for input controls. ([#4650][gh4650]) + ### 3.5.2 **Date**: [1st November 2016][3.5.2-milestone] @@ -630,6 +638,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.5.0-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.0+Release%22 [3.5.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.1+Release%22 [3.5.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.2+Release%22 +[3.5.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.3+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -1198,3 +1207,12 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh4620]: https://github.com/tomchristie/django-rest-framework/issues/4620 [gh4628]: https://github.com/tomchristie/django-rest-framework/issues/4628 [gh4639]: https://github.com/tomchristie/django-rest-framework/issues/4639 + + + +[gh4660]: https://github.com/tomchristie/django-rest-framework/issues/4660 +[gh4643]: https://github.com/tomchristie/django-rest-framework/issues/4643 +[gh4644]: https://github.com/tomchristie/django-rest-framework/issues/4644 +[gh4645]: https://github.com/tomchristie/django-rest-framework/issues/4645 +[gh4646]: https://github.com/tomchristie/django-rest-framework/issues/4646 +[gh4650]: https://github.com/tomchristie/django-rest-framework/issues/4650 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index fe82763a9..795b84e95 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.5.2' +__version__ = '3.5.3' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' From 388cf7622c24fee33f998cbe44198bada1872ebb Mon Sep 17 00:00:00 2001 From: Michael Barr Date: Wed, 9 Nov 2016 07:59:11 -0500 Subject: [PATCH 038/190] Adds Django/Python Trove Classifiers (#4662) --- setup.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/setup.py b/setup.py index ca62366ed..5d14ddf6a 100755 --- a/setup.py +++ b/setup.py @@ -92,11 +92,19 @@ setup( 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', 'Framework :: Django', + 'Framework :: Django :: 1.8', + 'Framework :: Django :: 1.9', + 'Framework :: Django :: 1.10', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', 'Topic :: Internet :: WWW/HTTP', ] ) From 8bab7f8d582c6c8c25e913ec4092899c78875a2c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 10 Nov 2016 16:36:56 +0000 Subject: [PATCH 039/190] Only apply the nested writes test to writable fields. (#4669) --- 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 1bdcd12c3..02c24b70e 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -769,7 +769,7 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data): isinstance(field, BaseSerializer) and (field.source in validated_data) and isinstance(validated_data[field.source], (list, dict)) - for key, field in serializer.fields.items() + for field in serializer._writable_fields ), ( 'The `.{method_name}()` method does not support writable nested ' 'fields by default.\nWrite an explicit `.{method_name}()` method for ' From 24791cb353d1924086b30abe2188280547d9a6c4 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 11 Nov 2016 09:44:35 +0000 Subject: [PATCH 040/190] Invalidate any existing prefetch cache on PUT requests. (#4668) --- docs/api-guide/testing.md | 11 ++++++++++- rest_framework/mixins.py | 5 ++--- tests/test_prefetch_related.py | 20 +++++++++++++++++++- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index 1f8c89233..de79a1e2f 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -187,7 +187,12 @@ As usual CSRF validation will only apply to any session authenticated views. Th # RequestsClient REST framework also includes a client for interacting with your application -using the popular Python library, `requests`. +using the popular Python library, `requests`. This may be useful if: + +* You are expecting to interface with the API primarily from another Python service, +and want to test the service at the same level as the client will see. +* You want to write tests in such a way that they can also be run against a staging or +live environment. (See "Live tests" below.) This exposes exactly the same interface as if you were using a requests session directly. @@ -198,6 +203,10 @@ directly. Note that the requests client requires you to pass fully qualified URLs. +## `RequestsClient` and working with the database + +The `RequestsClient` class is useful if + ## Headers & Authentication Custom headers and authentication credentials can be provided in the same way diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 47a4923a1..f3695e665 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -71,9 +71,8 @@ class UpdateModelMixin(object): if getattr(instance, '_prefetched_objects_cache', None): # If 'prefetch_related' has been applied to a queryset, we need to - # refresh the instance from the database. - instance = self.get_object() - serializer = self.get_serializer(instance) + # forcibly invalidate the prefetch cache on the instance. + instance._prefetched_objects_cache = {} return Response(serializer.data) diff --git a/tests/test_prefetch_related.py b/tests/test_prefetch_related.py index fc697adc1..a9fa238ea 100644 --- a/tests/test_prefetch_related.py +++ b/tests/test_prefetch_related.py @@ -14,7 +14,7 @@ class UserSerializer(serializers.ModelSerializer): class UserUpdate(generics.UpdateAPIView): - queryset = User.objects.all().prefetch_related('groups') + queryset = User.objects.exclude(username='exclude').prefetch_related('groups') serializer_class = UserSerializer @@ -39,3 +39,21 @@ class TestPrefetchRelatedUpdates(TestCase): 'email': 'tom@example.com' } assert response.data == expected + + def test_prefetch_related_excluding_instance_from_original_queryset(self): + """ + Regression test for https://github.com/tomchristie/django-rest-framework/issues/4661 + """ + view = UserUpdate.as_view() + pk = self.user.pk + groups_pk = self.groups[0].pk + request = factory.put('/', {'username': 'exclude', 'groups': [groups_pk]}, format='json') + response = view(request, pk=pk) + assert User.objects.get(pk=pk).groups.count() == 1 + expected = { + 'id': pk, + 'username': 'exclude', + 'groups': [1], + 'email': 'tom@example.com' + } + assert response.data == expected From 0c02bbbfa728267909ea73aeac57b2e99aba5857 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 14 Nov 2016 16:58:16 +0000 Subject: [PATCH 041/190] Correct a small typo in exceptions documentation --- 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 df8cad42d..03f16222d 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 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. +The function must take a pair of arguments, the 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: From 1b9013ebae6f4b28de6b88c65a97b5ab0e817200 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 22 Nov 2016 19:46:12 +0600 Subject: [PATCH 042/190] update django-filter to version 1.0.0 --- requirements/requirements-optionals.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index 86c4f7709..a59f153d1 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -1,5 +1,5 @@ # Optional packages which may be used with REST framework. markdown==2.6.4 django-guardian==1.4.6 -django-filter==0.15.3 +django-filter==1.0.0 coreapi==2.0.8 From 8030f5b74f49e3144e8fb45f367227bac1192aec Mon Sep 17 00:00:00 2001 From: Vinay Anantharaman Date: Tue, 22 Nov 2016 14:50:47 -0800 Subject: [PATCH 043/190] Edit to the import in Setting filter backends `django_filters` doesn't export `rest_framework` by default so it's required to import it. --- docs/api-guide/filtering.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 1b49d3a73..3f212ced3 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -98,7 +98,7 @@ 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. - import django_filters + import django_filters.rest_framework from django.contrib.auth.models import User from myapp.serializers import UserSerializer from rest_framework import generics From 4b59ec27fa725a83646792b560fae1b646baadcd Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 23 Nov 2016 19:17:00 +0600 Subject: [PATCH 044/190] convert tests asserts to pytest style (#4696) --- tests/test_views.py | 16 ++++++++-------- tests/test_viewsets.py | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/test_views.py b/tests/test_views.py index 05c499481..adafa1cd7 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -71,8 +71,8 @@ class ClassBasedViewIntegrationTests(TestCase): expected = { 'detail': JSON_ERROR } - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(sanitise_json_error(response.data), expected) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert sanitise_json_error(response.data) == expected class FunctionBasedViewIntegrationTests(TestCase): @@ -85,8 +85,8 @@ class FunctionBasedViewIntegrationTests(TestCase): expected = { 'detail': JSON_ERROR } - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(sanitise_json_error(response.data), expected) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert sanitise_json_error(response.data) == expected class TestCustomExceptionHandler(TestCase): @@ -107,8 +107,8 @@ class TestCustomExceptionHandler(TestCase): 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) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data == expected def test_function_based_view_exception_handler(self): view = error_view @@ -116,5 +116,5 @@ class TestCustomExceptionHandler(TestCase): 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) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data == expected diff --git a/tests/test_viewsets.py b/tests/test_viewsets.py index 0d9b6b310..a3c4e6be5 100644 --- a/tests/test_viewsets.py +++ b/tests/test_viewsets.py @@ -21,15 +21,15 @@ class InitializeViewSetsTestCase(TestCase): }) response = my_view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, {'ACTION': 'LIST'}) + assert response.status_code == status.HTTP_200_OK + assert 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'})`") + assert 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 5ec223bca0f2df5be06b583f58012e115d2f52a2 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 23 Nov 2016 20:05:34 +0600 Subject: [PATCH 045/190] converted validators and write_only_fields test to pytest style (#4697) --- tests/test_validators.py | 13 +++++-------- tests/test_write_only_fields.py | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/test_validators.py b/tests/test_validators.py index ab2c87c11..37e662b8e 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -94,23 +94,20 @@ class TestUniquenessValidation(TestCase): def test_doesnt_pollute_model(self): instance = AnotherUniquenessModel.objects.create(code='100') serializer = AnotherUniquenessSerializer(instance) - self.assertEqual( - AnotherUniquenessModel._meta.get_field('code').validators, []) + assert 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, []) + assert AnotherUniquenessModel._meta.get_field('code').validators == [] def test_related_model_is_unique(self): data = {'username': 'Existing', 'email': 'new-email@example.com'} rs = RelatedModelSerializer(data=data) - self.assertFalse(rs.is_valid()) - self.assertEqual(rs.errors, - {'username': ['This field must be unique.']}) + assert not rs.is_valid() + assert rs.errors == {'username': ['This field must be unique.']} data = {'username': 'new-username', 'email': 'new-email@example.com'} rs = RelatedModelSerializer(data=data) - self.assertTrue(rs.is_valid()) + assert rs.is_valid() def test_value_error_treated_as_not_unique(self): serializer = UniquenessIntegerSerializer(data={'integer': 'abc'}) diff --git a/tests/test_write_only_fields.py b/tests/test_write_only_fields.py index 3a289afab..272a05ff3 100644 --- a/tests/test_write_only_fields.py +++ b/tests/test_write_only_fields.py @@ -20,8 +20,8 @@ class WriteOnlyFieldTests(TestCase): 'password': '123' } serializer = self.Serializer(data=data) - self.assertTrue(serializer.is_valid()) - self.assertEqual(serializer.validated_data, data) + assert serializer.is_valid() + assert serializer.validated_data == data def write_only_fields_are_not_present_on_output(self): instance = { @@ -29,4 +29,4 @@ class WriteOnlyFieldTests(TestCase): 'password': '123' } serializer = self.Serializer(instance) - self.assertEqual(serializer.data, {'email': 'foo@example.com'}) + assert serializer.data == {'email': 'foo@example.com'} From a13b8d5560845612318fb030eb610bd34d986955 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Wed, 23 Nov 2016 10:13:03 -0500 Subject: [PATCH 046/190] docs: grammar fix --- 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 1af9f02a5..e5b949496 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -159,7 +159,7 @@ If you want the date field to be entirely hidden from the user, then use `Hidden --- -**Note**: The `UniqueForValidation` 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. +**Note**: The `UniqueForValidation` classes impose 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. --- From eaec60ae1d4e34cfef115df6c626cf96f6750e56 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Wed, 23 Nov 2016 11:10:39 -0500 Subject: [PATCH 047/190] docs: grammar fix - it's -> its (#4698) --- 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 e5b949496..d6350ae5e 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -153,7 +153,7 @@ The field will not be writable to the user, but the default value will still be #### 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. +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 its default value to the `validated_data` in the serializer. published = serializers.HiddenField(default=timezone.now) From abc62afddb9e49b199ee5f4f491093014515da0e Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Thu, 24 Nov 2016 04:39:18 -0500 Subject: [PATCH 048/190] docs typo fix (#4701) Remove unnecessary "a" --- 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 d6350ae5e..e041e9072 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -20,7 +20,7 @@ With `ModelForm` the validation is performed partially on the form, and partiall * 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. +When you're using `ModelSerializer` all of this is handled automatically for you. If you want to drop down to using `Serializer` classes instead, then you need to define the validation rules explicitly. #### Example From cd3fd36d0e5fa7e2d4907a7f74cd45641a8ddd03 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Sun, 27 Nov 2016 23:55:09 +0600 Subject: [PATCH 049/190] converted generic relations assert to pytest style --- tests/test_relations_generic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_relations_generic.py b/tests/test_relations_generic.py index babc2269c..a3798b0a3 100644 --- a/tests/test_relations_generic.py +++ b/tests/test_relations_generic.py @@ -75,7 +75,7 @@ class TestGenericRelations(TestCase): 'tags': ['django', 'python'], 'url': 'https://www.djangoproject.com/' } - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_generic_fk(self): """ @@ -105,4 +105,4 @@ class TestGenericRelations(TestCase): 'tagged_item': 'Note: Remember the milk' } ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected From 42d6098c74e3c8536458f4d423bedb652da16db7 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Mon, 28 Nov 2016 15:43:48 +0600 Subject: [PATCH 050/190] converted primary key relations test asserts to pytest (#4709) --- tests/test_relations_pk.py | 118 ++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py index 7a3d45927..ea02f2577 100644 --- a/tests/test_relations_pk.py +++ b/tests/test_relations_pk.py @@ -84,7 +84,7 @@ class PKManyToManyTests(TestCase): {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]} ] with self.assertNumQueries(4): - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_many_to_many_retrieve_prefetch_related(self): queryset = ManyToManySource.objects.all().prefetch_related('targets') @@ -101,15 +101,15 @@ class PKManyToManyTests(TestCase): {'id': 3, 'name': 'target-3', 'sources': [3]} ] with self.assertNumQueries(4): - self.assertEqual(serializer.data, expected) + assert 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()) + assert serializer.is_valid() serializer.save() - self.assertEqual(serializer.data, data) + assert serializer.data == data # Ensure source 1 is updated, and everything else is as expected queryset = ManyToManySource.objects.all() @@ -119,15 +119,15 @@ 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) + assert 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()) + assert serializer.is_valid() serializer.save() - self.assertEqual(serializer.data, data) + assert serializer.data == data # Ensure target 1 is updated, and everything else is as expected queryset = ManyToManyTarget.objects.all() @@ -137,15 +137,15 @@ class PKManyToManyTests(TestCase): {'id': 2, 'name': 'target-2', 'sources': [2, 3]}, {'id': 3, 'name': 'target-3', 'sources': [3]} ] - self.assertEqual(serializer.data, expected) + assert 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()) + assert serializer.is_valid() obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') + assert serializer.data == data + assert obj.name == 'source-4' # Ensure source 4 is added, and everything else is as expected queryset = ManyToManySource.objects.all() @@ -156,7 +156,7 @@ class PKManyToManyTests(TestCase): {'id': 3, 'name': 'source-3', 'targets': [1, 2, 3]}, {'id': 4, 'name': 'source-4', 'targets': [1, 3]}, ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_many_to_many_unsaved(self): source = ManyToManySource(name='source-unsaved') @@ -166,15 +166,15 @@ class PKManyToManyTests(TestCase): 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) + assert 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.assertTrue(serializer.is_valid()) + assert serializer.is_valid() obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-4') + assert serializer.data == data + assert obj.name == 'target-4' # Ensure target 4 is added, and everything else is as expected queryset = ManyToManyTarget.objects.all() @@ -185,7 +185,7 @@ class PKManyToManyTests(TestCase): {'id': 3, 'name': 'target-3', 'sources': [3]}, {'id': 4, 'name': 'target-4', 'sources': [1, 3]} ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected class PKForeignKeyTests(TestCase): @@ -207,7 +207,7 @@ class PKForeignKeyTests(TestCase): {'id': 3, 'name': 'source-3', 'target': 1} ] with self.assertNumQueries(1): - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_reverse_foreign_key_retrieve(self): queryset = ForeignKeyTarget.objects.all() @@ -217,7 +217,7 @@ class PKForeignKeyTests(TestCase): {'id': 2, 'name': 'target-2', 'sources': []}, ] with self.assertNumQueries(3): - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_reverse_foreign_key_retrieve_prefetch_related(self): queryset = ForeignKeyTarget.objects.all().prefetch_related('sources') @@ -229,9 +229,9 @@ class PKForeignKeyTests(TestCase): data = {'id': 1, 'name': 'source-1', 'target': 2} instance = ForeignKeySource.objects.get(pk=1) serializer = ForeignKeySourceSerializer(instance, data=data) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() serializer.save() - self.assertEqual(serializer.data, data) + assert serializer.data == data # Ensure source 1 is updated, and everything else is as expected queryset = ForeignKeySource.objects.all() @@ -241,20 +241,20 @@ class PKForeignKeyTests(TestCase): {'id': 2, 'name': 'source-2', 'target': 1}, {'id': 3, 'name': 'source-3', 'target': 1} ] - self.assertEqual(serializer.data, expected) + assert 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__]}) + assert not serializer.is_valid() + assert 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()) + assert serializer.is_valid() # We shouldn't have saved anything to the db yet since save # hasn't been called. queryset = ForeignKeyTarget.objects.all() @@ -263,10 +263,10 @@ class PKForeignKeyTests(TestCase): {'id': 1, 'name': 'target-1', 'sources': [1, 2, 3]}, {'id': 2, 'name': 'target-2', 'sources': []}, ] - self.assertEqual(new_serializer.data, expected) + assert new_serializer.data == expected serializer.save() - self.assertEqual(serializer.data, data) + assert serializer.data == data # Ensure target 2 is update, and everything else is as expected queryset = ForeignKeyTarget.objects.all() @@ -275,15 +275,15 @@ class PKForeignKeyTests(TestCase): {'id': 1, 'name': 'target-1', 'sources': [2]}, {'id': 2, 'name': 'target-2', 'sources': [1, 3]}, ] - self.assertEqual(serializer.data, expected) + assert 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()) + assert serializer.is_valid() obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') + assert serializer.data == data + assert obj.name == 'source-4' # Ensure source 4 is added, and everything else is as expected queryset = ForeignKeySource.objects.all() @@ -294,15 +294,15 @@ class PKForeignKeyTests(TestCase): {'id': 3, 'name': 'source-3', 'target': 1}, {'id': 4, 'name': 'source-4', 'target': 2}, ] - self.assertEqual(serializer.data, expected) + assert 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()) + assert serializer.is_valid() obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'target-3') + assert serializer.data == data + assert obj.name == 'target-3' # Ensure target 3 is added, and everything else is as expected queryset = ForeignKeyTarget.objects.all() @@ -312,14 +312,14 @@ class PKForeignKeyTests(TestCase): {'id': 2, 'name': 'target-2', 'sources': []}, {'id': 3, 'name': 'target-3', 'sources': [1, 3]}, ] - self.assertEqual(serializer.data, expected) + assert 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 may not be null.']}) + assert not serializer.is_valid() + assert serializer.errors == {'target': ['This field may not be null.']} def test_foreign_key_with_unsaved(self): source = ForeignKeySource(name='source-unsaved') @@ -329,7 +329,7 @@ class PKForeignKeyTests(TestCase): # no query if source hasn't been created yet with self.assertNumQueries(0): - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_foreign_key_with_empty(self): """ @@ -338,7 +338,7 @@ class PKForeignKeyTests(TestCase): https://github.com/tomchristie/django-rest-framework/issues/1072 """ serializer = NullableForeignKeySourceSerializer() - self.assertEqual(serializer.data['target'], None) + assert serializer.data['target'] is None def test_foreign_key_not_required(self): """ @@ -350,7 +350,7 @@ class PKForeignKeyTests(TestCase): extra_kwargs = {'target': {'required': False}} serializer = ModelSerializer(data={'name': 'test'}) serializer.is_valid(raise_exception=True) - self.assertNotIn('target', serializer.validated_data) + assert 'target' not in serializer.validated_data class PKNullableForeignKeyTests(TestCase): @@ -371,15 +371,15 @@ class PKNullableForeignKeyTests(TestCase): {'id': 2, 'name': 'source-2', 'target': 1}, {'id': 3, 'name': 'source-3', 'target': None}, ] - self.assertEqual(serializer.data, expected) + assert 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()) + assert serializer.is_valid() obj = serializer.save() - self.assertEqual(serializer.data, data) - self.assertEqual(obj.name, 'source-4') + assert serializer.data == data + assert obj.name == 'source-4' # Ensure source 4 is created, and everything else is as expected queryset = NullableForeignKeySource.objects.all() @@ -390,7 +390,7 @@ class PKNullableForeignKeyTests(TestCase): {'id': 3, 'name': 'source-3', 'target': None}, {'id': 4, 'name': 'source-4', 'target': None} ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_foreign_key_create_with_valid_emptystring(self): """ @@ -400,10 +400,10 @@ class PKNullableForeignKeyTests(TestCase): 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()) + assert serializer.is_valid() obj = serializer.save() - self.assertEqual(serializer.data, expected_data) - self.assertEqual(obj.name, 'source-4') + assert serializer.data == expected_data + assert obj.name == 'source-4' # Ensure source 4 is created, and everything else is as expected queryset = NullableForeignKeySource.objects.all() @@ -414,15 +414,15 @@ class PKNullableForeignKeyTests(TestCase): {'id': 3, 'name': 'source-3', 'target': None}, {'id': 4, 'name': 'source-4', 'target': None} ] - self.assertEqual(serializer.data, expected) + assert 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()) + assert serializer.is_valid() serializer.save() - self.assertEqual(serializer.data, data) + assert serializer.data == data # Ensure source 1 is updated, and everything else is as expected queryset = NullableForeignKeySource.objects.all() @@ -432,7 +432,7 @@ class PKNullableForeignKeyTests(TestCase): {'id': 2, 'name': 'source-2', 'target': 1}, {'id': 3, 'name': 'source-3', 'target': None} ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_foreign_key_update_with_valid_emptystring(self): """ @@ -443,9 +443,9 @@ class PKNullableForeignKeyTests(TestCase): 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()) + assert serializer.is_valid() serializer.save() - self.assertEqual(serializer.data, expected_data) + assert serializer.data == expected_data # Ensure source 1 is updated, and everything else is as expected queryset = NullableForeignKeySource.objects.all() @@ -455,18 +455,18 @@ class PKNullableForeignKeyTests(TestCase): {'id': 2, 'name': 'source-2', 'target': 1}, {'id': 3, 'name': 'source-3', 'target': None} ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected def test_null_uuid_foreign_key_serializes_as_none(self): source = NullableUUIDForeignKeySource(name='Source') serializer = NullableUUIDForeignKeySourceSerializer(source) data = serializer.data - self.assertEqual(data["target"], None) + assert data["target"] is None def test_nullable_uuid_foreign_key_is_valid_when_none(self): data = {"name": "Source", "target": None} serializer = NullableUUIDForeignKeySourceSerializer(data=data) - self.assertTrue(serializer.is_valid(), serializer.errors) + assert serializer.is_valid(), serializer.errors class PKNullableOneToOneTests(TestCase): @@ -485,4 +485,4 @@ class PKNullableOneToOneTests(TestCase): {'id': 1, 'name': 'target-1', 'nullable_source': None}, {'id': 2, 'name': 'target-2', 'nullable_source': 1}, ] - self.assertEqual(serializer.data, expected) + assert serializer.data == expected From 9f4c9691f47c534338cdaa4d8a22efc201c8fb62 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Mon, 28 Nov 2016 20:31:27 +0600 Subject: [PATCH 051/190] converted filters tests asserts to pytest style (#4711) --- tests/test_filters.py | 300 +++++++++++++++++------------------------- 1 file changed, 124 insertions(+), 176 deletions(-) diff --git a/tests/test_filters.py b/tests/test_filters.py index 12fb85895..0cc326239 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -155,8 +155,8 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/') response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data self.assertTrue(issubclass(w[-1].category, PendingDeprecationWarning)) self.assertIn("'rest_framework.filters.DjangoFilterBackend' is pending deprecation.", str(w[-1].message)) @@ -175,9 +175,9 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/') response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) - self.assertEqual(len(w), 0) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data + assert len(w) == 0 @unittest.skipUnless(django_filters, 'django-filter not installed') def test_get_filtered_fields_root_view(self): @@ -189,24 +189,24 @@ class IntegrationTestFiltering(CommonFilteringTestCase): # Basic test with no filter. request = factory.get('/') response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data # Tests that the decimal filter works. search_decimal = Decimal('2.25') request = factory.get('/', {'decimal': '%s' % search_decimal}) response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if Decimal(f['decimal']) == search_decimal] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data # Tests that the date filter works. search_date = datetime.date(2012, 9, 22) 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) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if parse_date(f['date']) == search_date] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data @unittest.skipUnless(django_filters, 'django-filter not installed') def test_filter_with_queryset(self): @@ -219,9 +219,9 @@ class IntegrationTestFiltering(CommonFilteringTestCase): search_decimal = Decimal('2.25') request = factory.get('/', {'decimal': '%s' % search_decimal}) response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if Decimal(f['decimal']) == search_decimal] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data @unittest.skipUnless(django_filters, 'django-filter not installed') def test_filter_with_get_queryset_only(self): @@ -245,32 +245,32 @@ class IntegrationTestFiltering(CommonFilteringTestCase): # Basic test with no filter. request = factory.get('/') response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data # Tests that the decimal filter set with 'lt' in the filter class works. search_decimal = Decimal('4.25') request = factory.get('/', {'decimal': '%s' % search_decimal}) response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if Decimal(f['decimal']) < search_decimal] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data # Tests that the date filter set with 'gt' in the filter class works. search_date = datetime.date(2012, 10, 2) 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) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if parse_date(f['date']) > search_date] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data # Tests that the text filter set with 'icontains' in the filter class works. search_text = 'ff' request = factory.get('/', {'text': '%s' % search_text}) response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK expected_data = [f for f in self.data if search_text in f['text'].lower()] - self.assertEqual(response.data, expected_data) + assert response.data == expected_data # Tests that multiple filters works. search_decimal = Decimal('5.25') @@ -280,10 +280,10 @@ class IntegrationTestFiltering(CommonFilteringTestCase): 'date': '%s' % (search_date,) }) response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK 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) + assert response.data == expected_data @unittest.skipUnless(django_filters, 'django-filter not installed') def test_incorrectly_configured_filter(self): @@ -304,8 +304,8 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/?text=aaa') response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(len(response.data), 1) + assert response.status_code == status.HTTP_200_OK + assert len(response.data) == 1 @unittest.skipUnless(django_filters, 'django-filter not installed') def test_base_model_filter_with_proxy(self): @@ -316,8 +316,8 @@ class IntegrationTestFiltering(CommonFilteringTestCase): request = factory.get('/?text=aaa') response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(len(response.data), 1) + assert response.status_code == status.HTTP_200_OK + assert len(response.data) == 1 @unittest.skipUnless(django_filters, 'django-filter not installed') def test_unknown_filter(self): @@ -329,7 +329,7 @@ class IntegrationTestFiltering(CommonFilteringTestCase): search_integer = 10 request = factory.get('/', {'integer': '%s' % search_integer}) response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK @override_settings(ROOT_URLCONF='tests.test_filters') @@ -351,8 +351,8 @@ class IntegrationTestDetailFiltering(CommonFilteringTestCase): # Basic test with no filter. response = self.client.get(self._get_url(item)) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, data) + assert response.status_code == status.HTTP_200_OK + assert response.data == data # Tests that the decimal filter set that should fail. search_decimal = Decimal('4.25') @@ -360,7 +360,7 @@ class IntegrationTestDetailFiltering(CommonFilteringTestCase): response = self.client.get( '{url}'.format(url=self._get_url(high_item)), {'decimal': '{param}'.format(param=search_decimal)}) - self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + assert response.status_code == status.HTTP_404_NOT_FOUND # Tests that the decimal filter set that should succeed. search_decimal = Decimal('4.25') @@ -369,8 +369,8 @@ class IntegrationTestDetailFiltering(CommonFilteringTestCase): response = self.client.get( '{url}'.format(url=self._get_url(low_item)), {'decimal': '{param}'.format(param=search_decimal)}) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, low_item_data) + assert response.status_code == status.HTTP_200_OK + assert response.data == low_item_data # Tests that multiple filters works. search_decimal = Decimal('5.25') @@ -382,8 +382,8 @@ class IntegrationTestDetailFiltering(CommonFilteringTestCase): 'decimal': '{decimal}'.format(decimal=search_decimal), 'date': '{date}'.format(date=search_date) }) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, valid_item_data) + assert response.status_code == status.HTTP_200_OK + assert response.data == valid_item_data class SearchFilterModel(models.Model): @@ -424,13 +424,10 @@ class SearchFilterTests(TestCase): view = SearchListView.as_view() request = factory.get('/', {'search': 'b'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 1, 'title': 'z', 'text': 'abc'}, - {'id': 2, 'title': 'zz', 'text': 'bcd'} - ] - ) + assert response.data == [ + {'id': 1, 'title': 'z', 'text': 'abc'}, + {'id': 2, 'title': 'zz', 'text': 'bcd'} + ] def test_exact_search(self): class SearchListView(generics.ListAPIView): @@ -442,12 +439,9 @@ class SearchFilterTests(TestCase): view = SearchListView.as_view() request = factory.get('/', {'search': 'zzz'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 3, 'title': 'zzz', 'text': 'cde'} - ] - ) + assert response.data == [ + {'id': 3, 'title': 'zzz', 'text': 'cde'} + ] def test_startswith_search(self): class SearchListView(generics.ListAPIView): @@ -459,12 +453,9 @@ class SearchFilterTests(TestCase): view = SearchListView.as_view() request = factory.get('/', {'search': 'b'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 2, 'title': 'zz', 'text': 'bcd'} - ] - ) + assert response.data == [ + {'id': 2, 'title': 'zz', 'text': 'bcd'} + ] def test_regexp_search(self): class SearchListView(generics.ListAPIView): @@ -476,12 +467,9 @@ class SearchFilterTests(TestCase): view = SearchListView.as_view() request = factory.get('/', {'search': 'z{2} ^b'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 2, 'title': 'zz', 'text': 'bcd'} - ] - ) + assert response.data == [ + {'id': 2, 'title': 'zz', 'text': 'bcd'} + ] def test_search_with_nonstandard_search_param(self): with override_settings(REST_FRAMEWORK={'SEARCH_PARAM': 'query'}): @@ -496,13 +484,10 @@ class SearchFilterTests(TestCase): view = SearchListView.as_view() request = factory.get('/', {'query': 'b'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 1, 'title': 'z', 'text': 'abc'}, - {'id': 2, 'title': 'zz', 'text': 'bcd'} - ] - ) + assert response.data == [ + {'id': 1, 'title': 'z', 'text': 'abc'}, + {'id': 2, 'title': 'zz', 'text': 'bcd'} + ] reload_module(filters) @@ -528,15 +513,13 @@ class SearchFilterFkTests(TestCase): filter_ = filters.SearchFilter() prefixes = [''] + list(filter_.lookup_prefixes) for prefix in prefixes: - self.assertFalse( - filter_.must_call_distinct( - SearchFilterModelFk._meta, ["%stitle" % prefix] - ) + assert not filter_.must_call_distinct( + SearchFilterModelFk._meta, + ["%stitle" % prefix] ) - self.assertFalse( - filter_.must_call_distinct( - SearchFilterModelFk._meta, ["%stitle" % prefix, "%sattribute__label" % prefix] - ) + assert not filter_.must_call_distinct( + SearchFilterModelFk._meta, + ["%stitle" % prefix, "%sattribute__label" % prefix] ) def test_must_call_distinct_restores_meta_for_each_field(self): @@ -545,10 +528,9 @@ class SearchFilterFkTests(TestCase): filter_ = filters.SearchFilter() prefixes = [''] + list(filter_.lookup_prefixes) for prefix in prefixes: - self.assertFalse( - filter_.must_call_distinct( - SearchFilterModelFk._meta, ["%sattribute__label" % prefix, "%stitle" % prefix] - ) + assert not filter_.must_call_distinct( + SearchFilterModelFk._meta, + ["%sattribute__label" % prefix, "%stitle" % prefix] ) @@ -596,21 +578,20 @@ class SearchFilterM2MTests(TestCase): view = SearchListView.as_view() request = factory.get('/', {'search': 'zz'}) response = view(request) - self.assertEqual(len(response.data), 1) + assert len(response.data) == 1 def test_must_call_distinct(self): filter_ = filters.SearchFilter() prefixes = [''] + list(filter_.lookup_prefixes) for prefix in prefixes: - self.assertFalse( - filter_.must_call_distinct( - SearchFilterModelM2M._meta, ["%stitle" % prefix] - ) + assert not filter_.must_call_distinct( + SearchFilterModelM2M._meta, + ["%stitle" % prefix] ) - self.assertTrue( - filter_.must_call_distinct( - SearchFilterModelM2M._meta, ["%stitle" % prefix, "%sattributes__label" % prefix] - ) + + assert filter_.must_call_distinct( + SearchFilterModelM2M._meta, + ["%stitle" % prefix, "%sattributes__label" % prefix] ) @@ -672,14 +653,11 @@ class DjangoFilterOrderingTests(TestCase): request = factory.get('/') response = view(request) - self.assertEqual( - response.data, - [ - {'id': 3, 'date': '2014-10-08', 'text': 'cde'}, - {'id': 2, 'date': '2013-10-08', 'text': 'bcd'}, - {'id': 1, 'date': '2012-10-08', 'text': 'abc'} - ] - ) + assert response.data == [ + {'id': 3, 'date': '2014-10-08', 'text': 'cde'}, + {'id': 2, 'date': '2013-10-08', 'text': 'bcd'}, + {'id': 1, 'date': '2012-10-08', 'text': 'abc'} + ] class OrderingFilterTests(TestCase): @@ -713,14 +691,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('/', {'ordering': 'text'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - ] - ) + assert response.data == [ + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + ] def test_reverse_ordering(self): class OrderingListView(generics.ListAPIView): @@ -733,14 +708,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('/', {'ordering': '-text'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - ] - ) + assert response.data == [ + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + ] def test_incorrectfield_ordering(self): class OrderingListView(generics.ListAPIView): @@ -753,14 +725,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('/', {'ordering': 'foobar'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - ] - ) + assert response.data == [ + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + ] def test_default_ordering(self): class OrderingListView(generics.ListAPIView): @@ -773,14 +742,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('') response = view(request) - self.assertEqual( - response.data, - [ - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - ] - ) + assert response.data == [ + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + ] def test_default_ordering_using_string(self): class OrderingListView(generics.ListAPIView): @@ -793,14 +759,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('') response = view(request) - self.assertEqual( - response.data, - [ - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - ] - ) + assert response.data == [ + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + ] def test_ordering_by_aggregate_field(self): # create some related models to aggregate order by @@ -824,14 +787,11 @@ class OrderingFilterTests(TestCase): 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'}, - ] - ) + assert response.data == [ + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + ] def test_ordering_with_nonstandard_ordering_param(self): with override_settings(REST_FRAMEWORK={'ORDERING_PARAM': 'order'}): @@ -847,14 +807,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('/', {'order': 'text'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - ] - ) + assert response.data == [ + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + ] reload_module(filters) @@ -884,14 +841,11 @@ class OrderingFilterTests(TestCase): view = OrderingListView.as_view() request = factory.get('/', {'ordering': 'text'}) response = view(request) - self.assertEqual( - response.data, - [ - {'id': 1, 'title': 'zyx', 'text': 'abc'}, - {'id': 2, 'title': 'yxw', 'text': 'bcd'}, - {'id': 3, 'title': 'xwv', 'text': 'cde'}, - ] - ) + assert response.data == [ + {'id': 1, 'title': 'zyx', 'text': 'abc'}, + {'id': 2, 'title': 'yxw', 'text': 'bcd'}, + {'id': 3, 'title': 'xwv', 'text': 'cde'}, + ] def test_ordering_with_improper_configuration(self): class OrderingListView(generics.ListAPIView): @@ -967,14 +921,11 @@ class SensitiveOrderingFilterTests(TestCase): username_field = 'username' # Note: Inverse username ordering correctly applied. - self.assertEqual( - response.data, - [ - {'id': 3, username_field: 'userC'}, - {'id': 2, username_field: 'userB'}, - {'id': 1, username_field: 'userA'}, - ] - ) + assert response.data == [ + {'id': 3, username_field: 'userC'}, + {'id': 2, username_field: 'userB'}, + {'id': 1, username_field: 'userA'}, + ] def test_cannot_order_by_non_serializer_fields(self): for serializer_cls in [ @@ -997,11 +948,8 @@ class SensitiveOrderingFilterTests(TestCase): username_field = 'username' # Note: The passwords are not in order. Default ordering is used. - self.assertEqual( - response.data, - [ - {'id': 1, username_field: 'userA'}, # PassB - {'id': 2, username_field: 'userB'}, # PassC - {'id': 3, username_field: 'userC'}, # PassA - ] - ) + assert response.data == [ + {'id': 1, username_field: 'userA'}, # PassB + {'id': 2, username_field: 'userB'}, # PassC + {'id': 3, username_field: 'userC'}, # PassA + ] From 649876674933c7c05225e8f33a278ce4210df598 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Tue, 29 Nov 2016 04:49:18 -0500 Subject: [PATCH 052/190] Fix django deprecation warnings (#4712) --- tests/test_model_serializer.py | 4 ++-- tests/test_prefetch_related.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index 06848302f..b839f56ca 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -94,7 +94,7 @@ class Issue3674ParentModel(models.Model): class Issue3674ChildModel(models.Model): - parent = models.ForeignKey(Issue3674ParentModel, related_name='children') + parent = models.ForeignKey(Issue3674ParentModel, related_name='children', on_delete=models.CASCADE) value = models.CharField(primary_key=True, max_length=64) @@ -1013,7 +1013,7 @@ class Issue3674Test(TestCase): title = models.CharField(max_length=64) class TestChildModel(models.Model): - parent = models.ForeignKey(TestParentModel, related_name='children') + parent = models.ForeignKey(TestParentModel, related_name='children', on_delete=models.CASCADE) value = models.CharField(primary_key=True, max_length=64) class TestChildModelSerializer(serializers.ModelSerializer): diff --git a/tests/test_prefetch_related.py b/tests/test_prefetch_related.py index a9fa238ea..750173b38 100644 --- a/tests/test_prefetch_related.py +++ b/tests/test_prefetch_related.py @@ -2,6 +2,7 @@ from django.contrib.auth.models import Group, User from django.test import TestCase from rest_framework import generics, serializers +from rest_framework.compat import set_many from rest_framework.test import APIRequestFactory factory = APIRequestFactory() @@ -22,7 +23,7 @@ class TestPrefetchRelatedUpdates(TestCase): def setUp(self): self.user = User.objects.create(username='tom', email='tom@example.com') self.groups = [Group.objects.create(name='a'), Group.objects.create(name='b')] - self.user.groups = self.groups + set_many(self.user, 'groups', self.groups) self.user.save() def test_prefetch_related_updates(self): From 1e0988686cda1f9c150e239b945c1d9a0ea9b19c Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Tue, 29 Nov 2016 13:27:00 +0100 Subject: [PATCH 053/190] Update the Python doc links to use https and point to Python 3 (#4713) --- docs/api-guide/fields.md | 2 +- docs/api-guide/settings.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 17168b721..3dcc9d0a5 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -669,7 +669,7 @@ The [django-rest-framework-hstore][django-rest-framework-hstore] package provide [html-and-forms]: ../topics/html-and-forms.md [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 +[strftime]: https://docs.python.org/3/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]: https://drf-compound-fields.readthedocs.io diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index 58ceeeeb4..a1ea12d6e 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -456,7 +456,7 @@ 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/ +[cite]: https://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 +[strftime]: https://docs.python.org/3/library/time.html#time.strftime From aed8387e05a7a665439044d90b7fac5d1fd61225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Larra=C3=ADn?= Date: Tue, 29 Nov 2016 12:35:43 -0300 Subject: [PATCH 054/190] docs: Fix description of `DecimalField`'s `max_digits` (#4714) As of PR #4377, `max_digits=None` is allowed for `DecimalField`. --- 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 3dcc9d0a5..6b6ae612d 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -261,7 +261,7 @@ 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. +- `max_digits` The maximum number of digits allowed in the number. It must be either `None` or an integer 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. Note that setting `localize` will force the value to `True`. - `max_value` Validate that the number provided is no greater than this value. From 27641e07b5b56ea6fcd4676419e8fd99c58e9c66 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 01:13:21 +0600 Subject: [PATCH 055/190] converted test asserts of generics-test to pytest --- tests/test_generics.py | 102 ++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/tests/test_generics.py b/tests/test_generics.py index 247237584..2c3679c46 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -98,8 +98,8 @@ class TestRootView(TestCase): request = factory.get('/') with self.assertNumQueries(1): response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data def test_post_root_view(self): """ @@ -109,10 +109,10 @@ class TestRootView(TestCase): request = factory.post('/', data, format='json') with self.assertNumQueries(1): response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_201_CREATED) - self.assertEqual(response.data, {'id': 4, 'text': 'foobar'}) + assert response.status_code == status.HTTP_201_CREATED + assert response.data == {'id': 4, 'text': 'foobar'} created = self.objects.get(id=4) - self.assertEqual(created.text, 'foobar') + assert created.text == 'foobar' def test_put_root_view(self): """ @@ -122,8 +122,8 @@ class TestRootView(TestCase): request = factory.put('/', data, format='json') 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.'}) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + assert response.data == {"detail": 'Method "PUT" not allowed.'} def test_delete_root_view(self): """ @@ -132,8 +132,8 @@ class TestRootView(TestCase): request = factory.delete('/') 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.'}) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + assert response.data == {"detail": 'Method "DELETE" not allowed.'} def test_post_cannot_set_id(self): """ @@ -143,10 +143,10 @@ class TestRootView(TestCase): request = factory.post('/', data, format='json') with self.assertNumQueries(1): response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_201_CREATED) - self.assertEqual(response.data, {'id': 4, 'text': 'foobar'}) + assert response.status_code == status.HTTP_201_CREATED + assert response.data == {'id': 4, 'text': 'foobar'} created = self.objects.get(id=4) - self.assertEqual(created.text, 'foobar') + assert created.text == 'foobar' def test_post_error_root_view(self): """ @@ -156,7 +156,7 @@ class TestRootView(TestCase): request = factory.post('/', data, HTTP_ACCEPT='text/html') response = self.view(request).render() expected_error = 'Ensure this field has no more than 100 characters.' - self.assertIn(expected_error, response.rendered_content.decode('utf-8')) + assert expected_error in response.rendered_content.decode('utf-8') EXPECTED_QUERIES_FOR_PUT = 2 @@ -185,8 +185,8 @@ class TestInstanceView(TestCase): request = factory.get('/1') with self.assertNumQueries(1): response = self.view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data[0]) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data[0] def test_post_instance_view(self): """ @@ -196,8 +196,8 @@ class TestInstanceView(TestCase): request = factory.post('/', data, format='json') 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.'}) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED + assert response.data == {"detail": 'Method "POST" not allowed.'} def test_put_instance_view(self): """ @@ -207,10 +207,10 @@ class TestInstanceView(TestCase): request = factory.put('/1', data, format='json') 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'}) + assert response.status_code == status.HTTP_200_OK + assert dict(response.data) == {'id': 1, 'text': 'foobar'} updated = self.objects.get(id=1) - self.assertEqual(updated.text, 'foobar') + assert updated.text == 'foobar' def test_patch_instance_view(self): """ @@ -221,10 +221,10 @@ class TestInstanceView(TestCase): 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'}) + assert response.status_code == status.HTTP_200_OK + assert response.data == {'id': 1, 'text': 'foobar'} updated = self.objects.get(id=1) - self.assertEqual(updated.text, 'foobar') + assert updated.text == 'foobar' def test_delete_instance_view(self): """ @@ -233,10 +233,10 @@ class TestInstanceView(TestCase): request = factory.delete('/1') with self.assertNumQueries(2): response = self.view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) - self.assertEqual(response.content, six.b('')) + assert response.status_code == status.HTTP_204_NO_CONTENT + assert response.content == six.b('') ids = [obj.id for obj in self.objects.all()] - self.assertEqual(ids, [2, 3]) + assert ids == [2, 3] def test_get_instance_view_incorrect_arg(self): """ @@ -246,7 +246,7 @@ class TestInstanceView(TestCase): request = factory.get('/a') with self.assertNumQueries(0): response = self.view(request, pk='a').render() - self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + assert response.status_code == status.HTTP_404_NOT_FOUND def test_put_cannot_set_id(self): """ @@ -256,10 +256,10 @@ class TestInstanceView(TestCase): request = factory.put('/1', data, format='json') 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'}) + assert response.status_code == status.HTTP_200_OK + assert response.data == {'id': 1, 'text': 'foobar'} updated = self.objects.get(id=1) - self.assertEqual(updated.text, 'foobar') + assert updated.text == 'foobar' def test_put_to_deleted_instance(self): """ @@ -271,7 +271,7 @@ class TestInstanceView(TestCase): request = factory.put('/1', data, format='json') with self.assertNumQueries(1): response = self.view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) + assert response.status_code == status.HTTP_404_NOT_FOUND def test_put_to_filtered_out_instance(self): """ @@ -282,7 +282,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_404_NOT_FOUND) + assert response.status_code == status.HTTP_404_NOT_FOUND def test_patch_cannot_create_an_object(self): """ @@ -292,8 +292,8 @@ class TestInstanceView(TestCase): 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()) + assert response.status_code == status.HTTP_404_NOT_FOUND + assert not self.objects.filter(id=999).exists() def test_put_error_instance_view(self): """ @@ -303,7 +303,7 @@ class TestInstanceView(TestCase): request = factory.put('/', data, HTTP_ACCEPT='text/html') response = self.view(request, pk=1).render() expected_error = 'Ensure this field has no more than 100 characters.' - self.assertIn(expected_error, response.rendered_content.decode('utf-8')) + assert expected_error in response.rendered_content.decode('utf-8') class TestFKInstanceView(TestCase): @@ -363,8 +363,8 @@ class TestOverriddenGetObject(TestCase): request = factory.get('/1') with self.assertNumQueries(1): response = self.view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, self.data[0]) + assert response.status_code == status.HTTP_200_OK + assert response.data == self.data[0] # Regression test for #285 @@ -394,9 +394,9 @@ class TestCreateModelWithAutoNowAddField(TestCase): data = {'email': 'foobar@example.com', 'content': 'foobar'} request = factory.post('/', data, format='json') response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_201_CREATED) + assert response.status_code == status.HTTP_201_CREATED created = self.objects.get(id=1) - self.assertEqual(created.content, 'foobar') + assert created.content == 'foobar' # Test for particularly ugly regression with m2m in browsable API @@ -432,7 +432,7 @@ class TestM2MBrowsableAPI(TestCase): request = factory.get('/', HTTP_ACCEPT='text/html') view = ExampleView().as_view() response = view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK class InclusiveFilterBackend(object): @@ -489,9 +489,9 @@ class TestFilterBackendAppliedToViews(TestCase): root_view = RootView.as_view(filter_backends=(InclusiveFilterBackend,)) request = factory.get('/') response = root_view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(len(response.data), 1) - self.assertEqual(response.data, [{'id': 1, 'text': 'foo'}]) + assert response.status_code == status.HTTP_200_OK + assert len(response.data) == 1 + assert response.data == [{'id': 1, 'text': 'foo'}] def test_get_root_view_filters_out_all_models_with_exclusive_filter_backend(self): """ @@ -500,8 +500,8 @@ class TestFilterBackendAppliedToViews(TestCase): root_view = RootView.as_view(filter_backends=(ExclusiveFilterBackend,)) request = factory.get('/') response = root_view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, []) + assert response.status_code == status.HTTP_200_OK + assert response.data == [] def test_get_instance_view_filters_out_name_with_filter_backend(self): """ @@ -510,8 +510,8 @@ class TestFilterBackendAppliedToViews(TestCase): instance_view = InstanceView.as_view(filter_backends=(ExclusiveFilterBackend,)) 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.'}) + assert response.status_code == status.HTTP_404_NOT_FOUND + assert response.data == {'detail': 'Not found.'} def test_get_instance_view_will_return_single_object_when_filter_does_not_exclude_it(self): """ @@ -520,8 +520,8 @@ class TestFilterBackendAppliedToViews(TestCase): instance_view = InstanceView.as_view(filter_backends=(InclusiveFilterBackend,)) request = factory.get('/1') response = instance_view(request, pk=1).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data, {'id': 1, 'text': 'foo'}) + assert response.status_code == status.HTTP_200_OK + assert response.data == {'id': 1, 'text': 'foo'} def test_dynamic_serializer_form_in_browsable_api(self): """ @@ -530,8 +530,8 @@ class TestFilterBackendAppliedToViews(TestCase): view = DynamicSerializerView.as_view() request = factory.get('/') response = view(request).render() - self.assertContains(response, 'field_b') - self.assertNotContains(response, 'field_a') + assert 'field_b' in response + assert 'field_a' not in response class TestGuardedQueryset(TestCase): From 4a0829d6ec58b8b2fd12c36a34cdcc319def2695 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 02:08:37 +0600 Subject: [PATCH 056/190] attempt to fix test --- tests/test_generics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_generics.py b/tests/test_generics.py index 2c3679c46..67191d329 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -530,7 +530,7 @@ class TestFilterBackendAppliedToViews(TestCase): view = DynamicSerializerView.as_view() request = factory.get('/') response = view(request).render() - assert 'field_b' in response + assert response is 'field_b' assert 'field_a' not in response From a5c8a8c2265c6462208c2defc0b943bc51ace6df Mon Sep 17 00:00:00 2001 From: Jeff Fein-Worton Date: Tue, 29 Nov 2016 18:00:10 -0800 Subject: [PATCH 057/190] 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 7cdb59531..f2d2fcaae 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -164,7 +164,7 @@ 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. +As with `DjangoModelPermissions` you can use custom model permissions by overriding `DjangoObjectPermissions` and setting the `.perms_map` property. Refer to the source code for details. --- From a5bb9825f3b238d89fdb5d8754d057116fff56a9 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 09:56:22 +0600 Subject: [PATCH 058/190] attempt to fix test again --- tests/test_generics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_generics.py b/tests/test_generics.py index 67191d329..2c3679c46 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -530,7 +530,7 @@ class TestFilterBackendAppliedToViews(TestCase): view = DynamicSerializerView.as_view() request = factory.get('/') response = view(request).render() - assert response is 'field_b' + assert 'field_b' in response assert 'field_a' not in response From f5a900a404a85163ba36ec34034d0bacd626b010 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 10:01:37 +0600 Subject: [PATCH 059/190] some reverts to fix test --- 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 2c3679c46..aa3951154 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -530,8 +530,8 @@ class TestFilterBackendAppliedToViews(TestCase): view = DynamicSerializerView.as_view() request = factory.get('/') response = view(request).render() - assert 'field_b' in response - assert 'field_a' not in response + self.assertContains(response, 'field_b') + self.assertNotContains(response, 'field_a') class TestGuardedQueryset(TestCase): From 10b5f36fec92871e1d96c85a008324683a32f6b5 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 12:35:34 +0600 Subject: [PATCH 060/190] added fixes --- tests/test_generics.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_generics.py b/tests/test_generics.py index aa3951154..c24cda006 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -530,8 +530,9 @@ class TestFilterBackendAppliedToViews(TestCase): view = DynamicSerializerView.as_view() request = factory.get('/') response = view(request).render() - self.assertContains(response, 'field_b') - self.assertNotContains(response, 'field_a') + content = response.content.decode('utf8') + assert 'field_b' in content + assert 'field_a' not in content class TestGuardedQueryset(TestCase): From e03d88ced7f2b22f96f50c2a885264147b242b4a Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 15:48:33 +0600 Subject: [PATCH 061/190] more pytest style assert (#4719) --- tests/test_validation.py | 38 +++++++++++++++++++--------------- tests/test_validation_error.py | 16 +++++++------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/tests/test_validation.py b/tests/test_validation.py index bc950dd22..8ff4aaf38 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -60,11 +60,11 @@ class TestNestedValidationError(TestCase): } }) - self.assertEqual(serializers.as_serializer_error(e), { + assert serializers.as_serializer_error(e) == { 'nested': { 'field': ['error'], } - }) + } class TestPreSaveValidationExclusionsSerializer(TestCase): @@ -75,20 +75,20 @@ class TestPreSaveValidationExclusionsSerializer(TestCase): # We've set `required=False` on the serializer, but the model # 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) + assert serializer.is_valid() is False + assert 'renamed' in serializer.errors + assert 'should_validate_field' not in serializer.errors 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) + assert not serializer.is_valid() + assert 'renamed' in serializer.errors def test_custom_validation_method_passing(self): serializer = ShouldValidateModelSerializer(data={'renamed': 'foo'}) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() class ValidationSerializer(serializers.Serializer): @@ -108,12 +108,12 @@ 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, { + assert not serializer.is_valid() + assert serializer.errors == { 'non_field_errors': [ 'Invalid data. Expected a dictionary, but got %s.' % type('').__name__ ] - }) + } # regression tests for issue: 1493 @@ -137,27 +137,31 @@ class TestMaxValueValidatorValidation(TestCase): def test_max_value_validation_serializer_success(self): serializer = ValidationMaxValueValidatorModelSerializer(data={'number_value': 99}) - self.assertTrue(serializer.is_valid()) + assert serializer.is_valid() def test_max_value_validation_serializer_fails(self): serializer = ValidationMaxValueValidatorModelSerializer(data={'number_value': 101}) - self.assertFalse(serializer.is_valid()) - self.assertDictEqual({'number_value': ['Ensure this value is less than or equal to 100.']}, serializer.errors) + assert not serializer.is_valid() + assert serializer.errors == { + 'number_value': [ + 'Ensure this value is less than or equal to 100.' + ] + } def test_max_value_validation_success(self): obj = ValidationMaxValueValidatorModel.objects.create(number_value=100) request = factory.patch('/{0}'.format(obj.pk), {'number_value': 98}, format='json') view = UpdateMaxValueValidationModel().as_view() response = view(request, pk=obj.pk).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_max_value_validation_fail(self): obj = ValidationMaxValueValidatorModel.objects.create(number_value=100) 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.status_code, status.HTTP_400_BAD_REQUEST) + assert response.content == b'{"number_value":["Ensure this value is less than or equal to 100."]}' + assert response.status_code == status.HTTP_400_BAD_REQUEST # regression tests for issue: 1533 diff --git a/tests/test_validation_error.py b/tests/test_validation_error.py index 8e371a349..562fe37e6 100644 --- a/tests/test_validation_error.py +++ b/tests/test_validation_error.py @@ -54,16 +54,16 @@ class TestValidationErrorWithFullDetails(TestCase): request = factory.get('/', content_type='application/json') response = view(request) - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(response.data, self.expected_response_data) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data == self.expected_response_data def test_function_based_view_exception_handler(self): view = error_view request = factory.get('/', content_type='application/json') response = view(request) - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(response.data, self.expected_response_data) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data == self.expected_response_data class TestValidationErrorWithCodes(TestCase): @@ -89,13 +89,13 @@ class TestValidationErrorWithCodes(TestCase): request = factory.get('/', content_type='application/json') response = view(request) - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(response.data, self.expected_response_data) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data == self.expected_response_data def test_function_based_view_exception_handler(self): view = error_view request = factory.get('/', content_type='application/json') response = view(request) - self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) - self.assertEqual(response.data, self.expected_response_data) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data == self.expected_response_data From 504f4b44c6dc96e1c1dd2cece3e9d3ac1052011d Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 16:17:30 +0600 Subject: [PATCH 062/190] converted asserts of atomic requests test to pytest --- tests/test_atomic_requests.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py index 09d7f2fb1..9085bfc89 100644 --- a/tests/test_atomic_requests.py +++ b/tests/test_atomic_requests.py @@ -67,8 +67,8 @@ class DBTransactionTests(TestCase): with self.assertNumQueries(1): response = self.view(request) - self.assertFalse(transaction.get_rollback()) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert not transaction.get_rollback() + assert response.status_code == status.HTTP_200_OK assert BasicModel.objects.count() == 1 @@ -98,7 +98,7 @@ class DBTransactionErrorTests(TestCase): # 3 - release savepoint with transaction.atomic(): self.assertRaises(Exception, self.view, request) - self.assertFalse(transaction.get_rollback()) + assert not transaction.get_rollback() assert BasicModel.objects.count() == 1 @@ -128,9 +128,8 @@ class DBTransactionAPIExceptionTests(TestCase): # 4 - release savepoint (django>=1.8 only) with transaction.atomic(): response = self.view(request) - self.assertTrue(transaction.get_rollback()) - self.assertEqual(response.status_code, - status.HTTP_500_INTERNAL_SERVER_ERROR) + assert transaction.get_rollback() + assert response.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR assert BasicModel.objects.count() == 0 @@ -151,5 +150,4 @@ class NonAtomicDBTransactionAPIExceptionTests(TransactionTestCase): # without checking connection.in_atomic_block view raises 500 # due attempt to rollback without transaction - self.assertEqual(response.status_code, - status.HTTP_404_NOT_FOUND) + assert response.status_code == status.HTTP_404_NOT_FOUND From a9b6c974852c7b5c6fb95c586fdab9fbe29e73f7 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 16:24:48 +0600 Subject: [PATCH 063/190] converted asserts of decorators test to pytest --- tests/test_decorators.py | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/tests/test_decorators.py b/tests/test_decorators.py index 46e4a6ad7..b187e5fd6 100644 --- a/tests/test_decorators.py +++ b/tests/test_decorators.py @@ -56,11 +56,11 @@ class DecoratorTestCase(TestCase): request = self.factory.get('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK request = self.factory.post('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED def test_calling_put_method(self): @@ -70,11 +70,11 @@ class DecoratorTestCase(TestCase): request = self.factory.put('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK request = self.factory.post('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED def test_calling_patch_method(self): @@ -84,11 +84,11 @@ class DecoratorTestCase(TestCase): request = self.factory.patch('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK request = self.factory.post('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED) + assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED def test_renderer_classes(self): @@ -99,16 +99,15 @@ class DecoratorTestCase(TestCase): request = self.factory.get('/') response = view(request) - self.assertTrue(isinstance(response.accepted_renderer, JSONRenderer)) + assert isinstance(response.accepted_renderer, JSONRenderer) def test_parser_classes(self): @api_view(['GET']) @parser_classes([JSONParser]) def view(request): - self.assertEqual(len(request.parsers), 1) - self.assertTrue(isinstance(request.parsers[0], - JSONParser)) + assert len(request.parsers) == 1 + assert isinstance(request.parsers[0], JSONParser) return Response({}) request = self.factory.get('/') @@ -119,9 +118,8 @@ class DecoratorTestCase(TestCase): @api_view(['GET']) @authentication_classes([BasicAuthentication]) def view(request): - self.assertEqual(len(request.authenticators), 1) - self.assertTrue(isinstance(request.authenticators[0], - BasicAuthentication)) + assert len(request.authenticators) == 1 + assert isinstance(request.authenticators[0], BasicAuthentication) return Response({}) request = self.factory.get('/') @@ -136,7 +134,7 @@ class DecoratorTestCase(TestCase): request = self.factory.get('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) + assert response.status_code == status.HTTP_403_FORBIDDEN def test_throttle_classes(self): class OncePerDayUserThrottle(UserRateThrottle): @@ -149,7 +147,7 @@ class DecoratorTestCase(TestCase): request = self.factory.get('/') response = view(request) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK response = view(request) - self.assertEqual(response.status_code, status.HTTP_429_TOO_MANY_REQUESTS) + assert response.status_code == status.HTTP_429_TOO_MANY_REQUESTS From 9a3f8d9a9c63fc14a4e13738407f2b262de6649a Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 16:42:43 +0600 Subject: [PATCH 064/190] converted asserts of descriptions test to pytest --- tests/test_description.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_description.py b/tests/test_description.py index fcb88287b..08d8bddec 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -60,7 +60,7 @@ class TestViewNamesAndDescriptions(TestCase): """ class MockView(APIView): pass - self.assertEqual(MockView().get_view_name(), 'Mock') + assert MockView().get_view_name() == 'Mock' def test_view_description_uses_docstring(self): """Ensure view descriptions are based on the docstring.""" @@ -80,7 +80,7 @@ class TestViewNamesAndDescriptions(TestCase): # hash style header #""" - self.assertEqual(MockView().get_view_description(), DESCRIPTION) + assert MockView().get_view_description() == DESCRIPTION def test_view_description_can_be_empty(self): """ @@ -89,7 +89,7 @@ class TestViewNamesAndDescriptions(TestCase): """ class MockView(APIView): pass - self.assertEqual(MockView().get_view_description(), '') + assert MockView().get_view_description() == '' def test_view_description_can_be_promise(self): """ @@ -111,7 +111,7 @@ class TestViewNamesAndDescriptions(TestCase): class MockView(APIView): __doc__ = MockLazyStr("a gettext string") - self.assertEqual(MockView().get_view_description(), 'a gettext string') + assert MockView().get_view_description() == 'a gettext string' def test_markdown(self): """ @@ -120,7 +120,7 @@ class TestViewNamesAndDescriptions(TestCase): if apply_markdown: gte_21_match = apply_markdown(DESCRIPTION) == MARKED_DOWN_gte_21 lt_21_match = apply_markdown(DESCRIPTION) == MARKED_DOWN_lt_21 - self.assertTrue(gte_21_match or lt_21_match) + assert gte_21_match or lt_21_match def test_dedent_tabs(): From 7e8b01dbd2e780b1204d8c362dcb40d31d1b27d5 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 16:45:48 +0600 Subject: [PATCH 065/190] converted asserts of encoders test to pytest --- tests/test_encoders.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_encoders.py b/tests/test_encoders.py index d6f681932..687141476 100644 --- a/tests/test_encoders.py +++ b/tests/test_encoders.py @@ -20,21 +20,21 @@ class JSONEncoderTests(TestCase): Tests encoding a decimal """ d = Decimal(3.14) - self.assertEqual(d, float(d)) + assert d == float(d) def test_encode_datetime(self): """ Tests encoding a datetime object """ current_time = datetime.now() - self.assertEqual(self.encoder.default(current_time), current_time.isoformat()) + assert self.encoder.default(current_time) == current_time.isoformat() def test_encode_time(self): """ Tests encoding a timezone """ current_time = datetime.now().time() - self.assertEqual(self.encoder.default(current_time), current_time.isoformat()[:12]) + assert self.encoder.default(current_time) == current_time.isoformat()[:12] def test_encode_time_tz(self): """ @@ -64,18 +64,18 @@ class JSONEncoderTests(TestCase): Tests encoding a date object """ current_date = date.today() - self.assertEqual(self.encoder.default(current_date), current_date.isoformat()) + assert self.encoder.default(current_date) == current_date.isoformat() def test_encode_timedelta(self): """ Tests encoding a timedelta object """ delta = timedelta(hours=1) - self.assertEqual(self.encoder.default(delta), str(delta.total_seconds())) + assert self.encoder.default(delta) == str(delta.total_seconds()) def test_encode_uuid(self): """ Tests encoding a UUID object """ unique_id = uuid4() - self.assertEqual(self.encoder.default(unique_id), str(unique_id)) + assert self.encoder.default(unique_id) == str(unique_id) From 1a741bb2a2759d9b20afc6160b5c7d58ec5ff382 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 17:12:01 +0600 Subject: [PATCH 066/190] converted asserts of exceptions test to pytest (#4723) --- tests/test_exceptions.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py index f1d172211..8b5628ef2 100644 --- a/tests/test_exceptions.py +++ b/tests/test_exceptions.py @@ -16,28 +16,22 @@ class ExceptionTestCase(TestCase): example = "string" lazy_example = _(example) - self.assertEqual( - _get_error_details(lazy_example), - example - ) + assert _get_error_details(lazy_example) == example + assert isinstance( _get_error_details(lazy_example), ErrorDetail ) - self.assertEqual( - _get_error_details({'nested': lazy_example})['nested'], - example - ) + assert _get_error_details({'nested': lazy_example})['nested'] == example + assert isinstance( _get_error_details({'nested': lazy_example})['nested'], ErrorDetail ) - self.assertEqual( - _get_error_details([[lazy_example]])[0][0], - example - ) + assert _get_error_details([[lazy_example]])[0][0] == example + assert isinstance( _get_error_details([[lazy_example]])[0][0], ErrorDetail From 4f6c326a9955e70e64eb83499015bba10175468a Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 30 Nov 2016 18:52:32 +0600 Subject: [PATCH 067/190] converted remaining unittes asserts of fields test to pytest (#4724) --- tests/test_fields.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_fields.py b/tests/test_fields.py index 92030e3ca..069ba879d 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1014,16 +1014,16 @@ class TestLocalizedDecimalField(TestCase): @override_settings(USE_L10N=True, LANGUAGE_CODE='pl') def test_to_internal_value(self): field = serializers.DecimalField(max_digits=2, decimal_places=1, localize=True) - self.assertEqual(field.to_internal_value('1,1'), Decimal('1.1')) + assert field.to_internal_value('1,1') == Decimal('1.1') @override_settings(USE_L10N=True, LANGUAGE_CODE='pl') def test_to_representation(self): field = serializers.DecimalField(max_digits=2, decimal_places=1, localize=True) - self.assertEqual(field.to_representation(Decimal('1.1')), '1,1') + assert field.to_representation(Decimal('1.1')) == '1,1' def test_localize_forces_coerce_to_string(self): field = serializers.DecimalField(max_digits=2, decimal_places=1, coerce_to_string=False, localize=True) - self.assertTrue(isinstance(field.to_representation(Decimal('1.1')), six.string_types)) + assert isinstance(field.to_representation(Decimal('1.1')), six.string_types) class TestQuantizedValueForDecimal(TestCase): @@ -1031,19 +1031,19 @@ class TestQuantizedValueForDecimal(TestCase): field = serializers.DecimalField(max_digits=4, decimal_places=2) value = field.to_internal_value(12).as_tuple() expected_digit_tuple = (0, (1, 2, 0, 0), -2) - self.assertEqual(value, expected_digit_tuple) + assert value == expected_digit_tuple def test_string_quantized_value_for_decimal(self): field = serializers.DecimalField(max_digits=4, decimal_places=2) value = field.to_internal_value('12').as_tuple() expected_digit_tuple = (0, (1, 2, 0, 0), -2) - self.assertEqual(value, expected_digit_tuple) + assert value == expected_digit_tuple def test_part_precision_string_quantized_value_for_decimal(self): field = serializers.DecimalField(max_digits=4, decimal_places=2) value = field.to_internal_value('12.0').as_tuple() expected_digit_tuple = (0, (1, 2, 0, 0), -2) - self.assertEqual(value, expected_digit_tuple) + assert value == expected_digit_tuple class TestNoDecimalPlaces(FieldValues): From 22578525eff075e329e8840c42c358d59105a0d3 Mon Sep 17 00:00:00 2001 From: Xavier Ordoquy Date: Wed, 30 Nov 2016 13:58:34 +0100 Subject: [PATCH 068/190] Documentation update (#4717) --- docs/api-guide/authentication.md | 2 +- docs/api-guide/fields.md | 6 +++--- docs/api-guide/filtering.md | 4 ++-- docs/api-guide/generic-views.md | 2 +- docs/api-guide/pagination.md | 2 +- docs/api-guide/parsers.md | 2 +- docs/api-guide/permissions.md | 4 ++-- docs/api-guide/relations.md | 6 +++--- docs/api-guide/renderers.md | 4 ++-- docs/api-guide/responses.md | 2 +- docs/api-guide/reverse.md | 4 ++-- docs/api-guide/schemas.md | 4 ++-- docs/api-guide/serializers.md | 2 +- docs/api-guide/testing.md | 4 ++-- docs/api-guide/throttling.md | 4 ++-- docs/api-guide/validators.md | 2 +- docs/topics/2.2-announcement.md | 8 ++++---- docs/topics/2.4-announcement.md | 2 +- docs/topics/3.0-announcement.md | 4 ++-- docs/topics/ajax-csrf-cors.md | 2 +- docs/topics/release-notes.md | 2 +- 21 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md index bf3a31eb7..4a01188f3 100644 --- a/docs/api-guide/authentication.md +++ b/docs/api-guide/authentication.md @@ -363,7 +363,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/csrf/#ajax +[csrf-ajax]: https://docs.djangoproject.com/en/stable/ref/csrf/#ajax [mod_wsgi_official]: http://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIPassAuthorization [django-oauth-toolkit-getting-started]: https://django-oauth-toolkit.readthedocs.io/en/latest/rest-framework/getting_started.html [django-rest-framework-oauth]: http://jpadilla.github.io/django-rest-framework-oauth/ diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 6b6ae612d..b527b016b 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -665,12 +665,12 @@ The [django-rest-framework-gis][django-rest-framework-gis] package provides geog 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 +[cite]: https://docs.djangoproject.com/en/stable/ref/forms/api/#django.forms.Form.cleaned_data [html-and-forms]: ../topics/html-and-forms.md -[FILE_UPLOAD_HANDLERS]: https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-FILE_UPLOAD_HANDLERS +[FILE_UPLOAD_HANDLERS]: https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-FILE_UPLOAD_HANDLERS [ecma262]: http://ecma-international.org/ecma-262/5.1/#sec-15.9.1.15 [strftime]: https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior -[django-widgets]: https://docs.djangoproject.com/en/dev/ref/forms/widgets/ +[django-widgets]: https://docs.djangoproject.com/en/stable/ref/forms/widgets/ [iso8601]: http://www.w3.org/TR/NOTE-datetime [drf-compound-fields]: https://drf-compound-fields.readthedocs.io [drf-extra-fields]: https://github.com/Hipo/drf-extra-fields diff --git a/docs/api-guide/filtering.md b/docs/api-guide/filtering.md index 3f212ced3..8a23a2ea3 100644 --- a/docs/api-guide/filtering.md +++ b/docs/api-guide/filtering.md @@ -455,14 +455,14 @@ The [djangorestframework-word-filter][django-rest-framework-word-search-filter] [drf-url-filter][drf-url-filter] is a simple Django app to apply filters on drf `ModelViewSet`'s `Queryset` in a clean, simple and configurable way. It also supports validations on incoming query params and their values. A beautiful python package `Voluptuous` is being used for validations on the incoming query parameters. The best part about voluptuous is you can define your own validations as per your query params requirements. -[cite]: https://docs.djangoproject.com/en/dev/topics/db/queries/#retrieving-specific-objects-with-filters +[cite]: https://docs.djangoproject.com/en/stable/topics/db/queries/#retrieving-specific-objects-with-filters [django-filter]: https://github.com/alex/django-filter [django-filter-docs]: https://django-filter.readthedocs.io/en/latest/index.html [guardian]: https://django-guardian.readthedocs.io/ [view-permissions]: https://django-guardian.readthedocs.io/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 +[search-django-admin]: https://docs.djangoproject.com/en/stable/ref/contrib/admin/#django.contrib.admin.ModelAdmin.search_fields [django-rest-framework-filters]: https://github.com/philipn/django-rest-framework-filters [django-rest-framework-word-search-filter]: https://github.com/trollknurr/django-rest-framework-word-search-filter [django-url-filter]: https://github.com/miki725/django-url-filter diff --git a/docs/api-guide/generic-views.md b/docs/api-guide/generic-views.md index c368d0b46..606a3787a 100644 --- a/docs/api-guide/generic-views.md +++ b/docs/api-guide/generic-views.md @@ -382,7 +382,7 @@ The [django-rest-framework-bulk package][django-rest-framework-bulk] implements [Django Rest Multiple Models][django-rest-multiple-models] provides a generic view (and mixin) for sending multiple serialized models and/or querysets via a single API request. -[cite]: https://docs.djangoproject.com/en/dev/ref/class-based-views/#base-vs-generic-views +[cite]: https://docs.djangoproject.com/en/stable/ref/class-based-views/#base-vs-generic-views [GenericAPIView]: #genericapiview [ListModelMixin]: #listmodelmixin [CreateModelMixin]: #createmodelmixin diff --git a/docs/api-guide/pagination.md b/docs/api-guide/pagination.md index f82614eca..bc7a5602d 100644 --- a/docs/api-guide/pagination.md +++ b/docs/api-guide/pagination.md @@ -325,7 +325,7 @@ The [`DRF-extensions` package][drf-extensions] includes a [`PaginateByMaxMixin` The [`drf-proxy-pagination` package][drf-proxy-pagination] includes a `ProxyPagination` class which allows to choose pagination class with a query parameter. -[cite]: https://docs.djangoproject.com/en/dev/topics/pagination/ +[cite]: https://docs.djangoproject.com/en/stable/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/ diff --git a/docs/api-guide/parsers.md b/docs/api-guide/parsers.md index ef2859fe1..7bf932d06 100644 --- a/docs/api-guide/parsers.md +++ b/docs/api-guide/parsers.md @@ -224,7 +224,7 @@ Modify your REST framework settings. [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 +[upload-handlers]: https://docs.djangoproject.com/en/stable/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/ diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index f2d2fcaae..be2981327 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -269,8 +269,8 @@ The [Django Rest Framework Roles][django-rest-framework-roles] package makes it [authentication]: authentication.md [throttling]: throttling.md [filtering]: filtering.md -[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 +[contribauth]: https://docs.djangoproject.com/en/stable/topics/auth/customizing/#custom-permissions +[objectpermissions]: https://docs.djangoproject.com/en/stable/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 [2.2-announcement]: ../topics/2.2-announcement.md diff --git a/docs/api-guide/relations.md b/docs/api-guide/relations.md index aabe49412..662fd4809 100644 --- a/docs/api-guide/relations.md +++ b/docs/api-guide/relations.md @@ -505,7 +505,7 @@ For example, given the following model for a tag, which has a generic relationsh """ Tags arbitrary model instances using a generic relation. - See: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/ + See: https://docs.djangoproject.com/en/stable/ref/contrib/contenttypes/ """ tag_name = models.SlugField() content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) @@ -593,9 +593,9 @@ The [drf-nested-routers package][drf-nested-routers] provides routers and relati The [rest-framework-generic-relations][drf-nested-relations] library provides read/write serialization for generic foreign keys. [cite]: http://lwn.net/Articles/193245/ -[reverse-relationships]: https://docs.djangoproject.com/en/dev/topics/db/queries/#following-relationships-backward +[reverse-relationships]: https://docs.djangoproject.com/en/stable/topics/db/queries/#following-relationships-backward [routers]: http://www.django-rest-framework.org/api-guide/routers#defaultrouter -[generic-relations]: https://docs.djangoproject.com/en/dev/ref/contrib/contenttypes/#id1 +[generic-relations]: https://docs.djangoproject.com/en/stable/ref/contrib/contenttypes/#id1 [2.2-announcement]: ../topics/2.2-announcement.md [drf-nested-routers]: https://github.com/alanjds/drf-nested-routers [drf-nested-relations]: https://github.com/Ian-Foote/rest-framework-generic-relations diff --git a/docs/api-guide/renderers.md b/docs/api-guide/renderers.md index a95778350..648eafdde 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -476,7 +476,7 @@ Comma-separated values are a plain-text tabular data format, that can be easily [Rest Framework Latex] provides a renderer that outputs PDFs using Laulatex. It is maintained by [Pebble (S/F Software)][mypebble]. -[cite]: https://docs.djangoproject.com/en/dev/ref/template-response/#the-rendering-process +[cite]: https://docs.djangoproject.com/en/stable/stable/template-response/#the-rendering-process [conneg]: content-negotiation.md [html-and-forms]: ../topics/html-and-forms.md [browser-accept-headers]: http://www.gethifi.com/blog/browser-rest-http-accept-headers @@ -485,7 +485,7 @@ Comma-separated values are a plain-text tabular data format, that can be easily [quote]: http://roy.gbiv.com/untangled/2008/rest-apis-must-be-hypertext-driven [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 +[django-error-views]: https://docs.djangoproject.com/en/stable/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/ diff --git a/docs/api-guide/responses.md b/docs/api-guide/responses.md index 97f312710..8ee14eefa 100644 --- a/docs/api-guide/responses.md +++ b/docs/api-guide/responses.md @@ -91,5 +91,5 @@ As with any other `TemplateResponse`, this method is called to render the serial 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/ +[cite]: https://docs.djangoproject.com/en/stable/stable/template-response/ [statuscodes]: status-codes.md diff --git a/docs/api-guide/reverse.md b/docs/api-guide/reverse.md index 35d88e2db..ee0b2054f 100644 --- a/docs/api-guide/reverse.md +++ b/docs/api-guide/reverse.md @@ -51,5 +51,5 @@ As with the `reverse` function, you should **include the request as a keyword ar api_root = reverse_lazy('api-root', request=request) [cite]: http://www.ics.uci.edu/~fielding/pubs/dissertation/rest_arch_style.htm#sec_5_1_5 -[reverse]: https://docs.djangoproject.com/en/dev/topics/http/urls/#reverse -[reverse-lazy]: https://docs.djangoproject.com/en/dev/topics/http/urls/#reverse-lazy +[reverse]: https://docs.djangoproject.com/en/stable/topics/http/urls/#reverse +[reverse-lazy]: https://docs.djangoproject.com/en/stable/topics/http/urls/#reverse-lazy diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 7da619034..c89c100fe 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -541,5 +541,5 @@ A short description of the meaning and intended usage of the input field. [open-api]: https://openapis.org/ [json-hyperschema]: http://json-schema.org/latest/json-schema-hypermedia.html [api-blueprint]: https://apiblueprint.org/ -[static-files]: https://docs.djangoproject.com/en/dev/howto/static-files/ -[named-arguments]: https://docs.djangoproject.com/en/dev/topics/http/urls/#named-groups +[static-files]: https://docs.djangoproject.com/en/stable/howto/static-files/ +[named-arguments]: https://docs.djangoproject.com/en/stable/topics/http/urls/#named-groups diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 290e32f4f..d36812f3f 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1118,7 +1118,7 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [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/ +[model-managers]: https://docs.djangoproject.com/en/stable/topics/db/managers/ [encapsulation-blogpost]: http://www.dabapps.com/blog/django-models-and-encapsulation/ [django-rest-marshmallow]: http://tomchristie.github.io/django-rest-marshmallow/ [marshmallow]: https://marshmallow.readthedocs.io/en/latest/ diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index de79a1e2f..410f6d78a 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -373,6 +373,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/tools/#the-test-client -[requestfactory]: https://docs.djangoproject.com/en/dev/topics/testing/advanced/#django.test.client.RequestFactory +[client]: https://docs.djangoproject.com/en/stable/topics/testing/tools/#the-test-client +[requestfactory]: https://docs.djangoproject.com/en/stable/topics/testing/advanced/#django.test.client.RequestFactory [configuration]: #configuration diff --git a/docs/api-guide/throttling.md b/docs/api-guide/throttling.md index da4d5f725..2a6337e81 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -193,5 +193,5 @@ 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 +[cache-setting]: https://docs.djangoproject.com/en/stable/stable/settings/#caches +[cache-docs]: https://docs.djangoproject.com/en/stable/topics/cache/#setting-up-the-cache diff --git a/docs/api-guide/validators.md b/docs/api-guide/validators.md index e041e9072..0e58c6fff 100644 --- a/docs/api-guide/validators.md +++ b/docs/api-guide/validators.md @@ -300,4 +300,4 @@ In some advanced cases you might want a validator to be passed the serializer fi # 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/ +[cite]: https://docs.djangoproject.com/en/stable/ref/validators/ diff --git a/docs/topics/2.2-announcement.md b/docs/topics/2.2-announcement.md index e6220f427..ca4ed2efa 100644 --- a/docs/topics/2.2-announcement.md +++ b/docs/topics/2.2-announcement.md @@ -147,10 +147,10 @@ When using a serializer with a `HyperlinkedRelatedField` or `HyperlinkedIdentity 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 -[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 +[django-python-3]: https://docs.djangoproject.com/en/stable/faq/install/#can-i-use-django-with-python-3 +[porting-python-3]: https://docs.djangoproject.com/en/stable/topics/python3/ +[python-compat]: https://docs.djangoproject.com/en/stable/releases/1.5/#python-compatibility +[django-deprecation-policy]: https://docs.djangoproject.com/en/stable/internals/release-process/#internal-release-deprecation-policy [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 diff --git a/docs/topics/2.4-announcement.md b/docs/topics/2.4-announcement.md index 3009daa49..96f68c865 100644 --- a/docs/topics/2.4-announcement.md +++ b/docs/topics/2.4-announcement.md @@ -162,7 +162,7 @@ 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 +[lts-releases]: https://docs.djangoproject.com/en/stable/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 diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md index e6cbf7238..25ab4fd5b 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -870,7 +870,7 @@ 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](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). +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/stable/ref/settings/#std:setting-MEDIA_URL) appropriately, and ensure your application [serves the uploaded files](https://docs.djangoproject.com/en/stable/howto/static-files/#serving-uploaded-files-in-development). You can revert this behavior, and display filenames in the representation by using the `UPLOADED_FILES_USE_URL` settings key: @@ -962,4 +962,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 +[django-localization]: https://docs.djangoproject.com/en/stable/topics/i18n/translation/#localization-how-to-create-language-files diff --git a/docs/topics/ajax-csrf-cors.md b/docs/topics/ajax-csrf-cors.md index ad88810da..4960e0881 100644 --- a/docs/topics/ajax-csrf-cors.md +++ b/docs/topics/ajax-csrf-cors.md @@ -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/csrf/#ajax +[csrf-ajax]: https://docs.djangoproject.com/en/stable/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/ diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index e5683360b..5628bcaec 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -598,7 +598,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [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 +[django-deprecation-policy]: https://docs.djangoproject.com/en/stable/internals/release-process/#internal-release-deprecation-policy [defusedxml-announce]: http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html [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 From 16f5d42cbc3e966ab2d4d8dc00163942f2769e43 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Thu, 1 Dec 2016 10:11:25 +0100 Subject: [PATCH 069/190] Add additional link to HTML & Forms topic page (#4726) Just makes the topic page easier to find. Closes #1673 --- 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 648eafdde..236504850 100644 --- a/docs/api-guide/renderers.md +++ b/docs/api-guide/renderers.md @@ -123,6 +123,8 @@ You can use `TemplateHTMLRenderer` either to return regular HTML pages using RES 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. +See the [_HTML & Forms_ Topic Page][html-and-forms] for further examples of `TemplateHTMLRenderer` usage. + **.media_type**: `text/html` **.format**: `'.html'` From 932d04a4beb79afa7a52bfec7f66bb6ccfe53814 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Thu, 1 Dec 2016 22:17:36 +0600 Subject: [PATCH 070/190] Browsable API tests asserts to pytest (#4725) --- tests/browsable_api/test_browsable_api.py | 18 ++++++++++++------ .../browsable_api/test_browsable_nested_api.py | 8 ++++---- tests/browsable_api/test_form_rendering.py | 4 ++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/tests/browsable_api/test_browsable_api.py b/tests/browsable_api/test_browsable_api.py index 3d49c353b..684d7ae14 100644 --- a/tests/browsable_api/test_browsable_api.py +++ b/tests/browsable_api/test_browsable_api.py @@ -26,16 +26,19 @@ class DropdownWithAuthTests(TestCase): 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') + content = response.content.decode('utf8') + assert 'john' in content 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<') + content = response.content.decode('utf8') + assert '>Log out<' in content def test_login_shown_when_logged_out(self): response = self.client.get('/') - self.assertContains(response, '>Log in<') + content = response.content.decode('utf8') + assert '>Log in<' in content @override_settings(ROOT_URLCONF='tests.browsable_api.no_auth_urls') @@ -58,13 +61,16 @@ class NoDropdownWithoutAuthTests(TestCase): 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') + content = response.content.decode('utf8') + assert 'john' in content 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, '
  • ') + content = response.content.decode('utf8') + assert '
  • ' not in content def test_dropdown_not_shown_when_logged_out(self): response = self.client.get('/') - self.assertNotContains(response, '
  • ') + content = response.content.decode('utf8') + assert '
  • ' not in content diff --git a/tests/browsable_api/test_browsable_nested_api.py b/tests/browsable_api/test_browsable_nested_api.py index 9e5538efc..8f38b3c4e 100644 --- a/tests/browsable_api/test_browsable_nested_api.py +++ b/tests/browsable_api/test_browsable_nested_api.py @@ -35,8 +35,8 @@ class DropdownWithAuthTests(TestCase): @override_settings(ROOT_URLCONF='tests.browsable_api.test_browsable_nested_api') def test_login(self): response = self.client.get('/api/') - self.assertEqual(200, response.status_code) + assert 200 == response.status_code content = response.content.decode('utf-8') - self.assertIn('form action="/api/"', content) - self.assertIn('input name="nested.one"', content) - self.assertIn('input name="nested.two"', content) + assert 'form action="/api/"' in content + assert 'input name="nested.one"' in content + assert 'input name="nested.two"' in content diff --git a/tests/browsable_api/test_form_rendering.py b/tests/browsable_api/test_form_rendering.py index 8b79ab6ff..30e113db7 100644 --- a/tests/browsable_api/test_form_rendering.py +++ b/tests/browsable_api/test_form_rendering.py @@ -50,5 +50,5 @@ class TestManyPostView(TestCase): request = factory.post('/', data, format='json') with self.assertNumQueries(1): response = self.view(request).render() - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(len(response.data), 3) + assert response.status_code == status.HTTP_200_OK + assert len(response.data) == 3 From 238783f2edc8fa337117b8c24e8c303b124903c3 Mon Sep 17 00:00:00 2001 From: Raphael Pierzina Date: Fri, 2 Dec 2016 17:01:37 +0000 Subject: [PATCH 071/190] Change DEFAULT_PERMISSION_CLASSES to a list in quickstart.md (#4733) --- docs/tutorial/quickstart.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index 96fed2767..e8a4c8ef6 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -118,7 +118,9 @@ 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',), + 'DEFAULT_PERMISSION_CLASSES': [ + 'rest_framework.permissions.IsAdminUser', + ], 'PAGE_SIZE': 10 } From 761d53e923ea1e58f226c513bcc8d8d5b39db324 Mon Sep 17 00:00:00 2001 From: Daniel Rech Date: Mon, 5 Dec 2016 11:36:03 +0100 Subject: [PATCH 072/190] Updated Link ti Django Docs The Url to the settings/#caches Link changed in Django documentation. --- 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 2a6337e81..58578a23e 100644 --- a/docs/api-guide/throttling.md +++ b/docs/api-guide/throttling.md @@ -193,5 +193,5 @@ 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/stable/stable/settings/#caches +[cache-setting]: https://docs.djangoproject.com/en/stable/ref/settings/#caches [cache-docs]: https://docs.djangoproject.com/en/stable/topics/cache/#setting-up-the-cache From 85807e195859d740be8f49b21aaa8b63d18ec0d0 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 6 Dec 2016 00:33:13 +0600 Subject: [PATCH 073/190] converted authentication_test asserts to pytest --- tests/test_authentication.py | 69 ++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 6f17ea14f..21d2583bf 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -106,7 +106,7 @@ class BasicAuthTests(TestCase): {'example': 'example'}, HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_post_json_passing_basic_auth(self): """Ensure POSTing form over basic auth with correct credentials passes and does not require CSRF""" @@ -121,7 +121,7 @@ class BasicAuthTests(TestCase): format='json', HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_regression_handle_bad_base64_basic_auth_header(self): """Ensure POSTing JSON over basic auth with incorrectly padded Base64 string is handled correctly""" @@ -134,12 +134,12 @@ class BasicAuthTests(TestCase): format='json', HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + assert response.status_code == status.HTTP_401_UNAUTHORIZED def test_post_form_failing_basic_auth(self): """Ensure POSTing form over basic auth without correct credentials fails""" response = self.csrf_client.post('/basic/', {'example': 'example'}) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + assert response.status_code == status.HTTP_401_UNAUTHORIZED def test_post_json_failing_basic_auth(self): """Ensure POSTing json over basic auth without correct credentials fails""" @@ -148,8 +148,8 @@ class BasicAuthTests(TestCase): {'example': 'example'}, format='json' ) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) - self.assertEqual(response['WWW-Authenticate'], 'Basic realm="api"') + assert response.status_code == status.HTTP_401_UNAUTHORIZED + assert response['WWW-Authenticate'] == 'Basic realm="api"' @override_settings(ROOT_URLCONF='tests.test_authentication') @@ -175,9 +175,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, '' - ) + assert '' in response def test_post_form_session_auth_failing_csrf(self): """ @@ -185,7 +183,7 @@ class SessionAuthTests(TestCase): """ self.csrf_client.login(username=self.username, password=self.password) response = self.csrf_client.post('/session/', {'example': 'example'}) - self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) + assert response.status_code == status.HTTP_403_FORBIDDEN def test_post_form_session_auth_passing(self): """ @@ -198,7 +196,7 @@ class SessionAuthTests(TestCase): response = self.non_csrf_client.post( '/session/', {'example': 'example'} ) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_put_form_session_auth_passing(self): """ @@ -211,14 +209,14 @@ class SessionAuthTests(TestCase): response = self.non_csrf_client.put( '/session/', {'example': 'example'} ) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_post_form_session_auth_failing(self): """ Ensure POSTing form over session authentication without logged in user fails. """ response = self.csrf_client.post('/session/', {'example': 'example'}) - self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) + assert response.status_code == status.HTTP_403_FORBIDDEN class BaseTokenAuthTests(object): @@ -248,7 +246,7 @@ class BaseTokenAuthTests(object): response = self.csrf_client.post( self.path, {'example': 'example'}, HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_fail_post_form_passing_nonexistent_token_auth(self): # use a nonexistent token key @@ -256,7 +254,7 @@ class BaseTokenAuthTests(object): response = self.csrf_client.post( self.path, {'example': 'example'}, HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + assert response.status_code == status.HTTP_401_UNAUTHORIZED def test_fail_post_form_passing_invalid_token_auth(self): # add an 'invalid' unicode character @@ -264,7 +262,7 @@ class BaseTokenAuthTests(object): response = self.csrf_client.post( self.path, {'example': 'example'}, HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + assert response.status_code == status.HTTP_401_UNAUTHORIZED def test_post_json_passing_token_auth(self): """ @@ -276,7 +274,7 @@ class BaseTokenAuthTests(object): self.path, {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth ) - self.assertEqual(response.status_code, status.HTTP_200_OK) + assert response.status_code == status.HTTP_200_OK def test_post_json_makes_one_db_query(self): """ @@ -298,7 +296,7 @@ class BaseTokenAuthTests(object): Ensure POSTing form over token auth without correct credentials fails """ response = self.csrf_client.post(self.path, {'example': 'example'}) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + assert response.status_code == status.HTTP_401_UNAUTHORIZED def test_post_json_failing_token_auth(self): """ @@ -307,7 +305,7 @@ class BaseTokenAuthTests(object): response = self.csrf_client.post( self.path, {'example': 'example'}, format='json' ) - self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) + assert response.status_code == status.HTTP_401_UNAUTHORIZED @override_settings(ROOT_URLCONF='tests.test_authentication') @@ -319,13 +317,13 @@ class TokenAuthTests(BaseTokenAuthTests, TestCase): """Ensure creating a token with no key will auto-assign a key""" self.token.delete() token = self.model.objects.create(user=self.user) - self.assertTrue(bool(token.key)) + assert bool(token.key) def test_generate_key_returns_string(self): """Ensure generate_key returns a string""" token = self.model() key = token.generate_key() - self.assertTrue(isinstance(key, six.string_types)) + assert isinstance(key, six.string_types) def test_token_login_json(self): """Ensure token login view using JSON POST works.""" @@ -335,8 +333,8 @@ class TokenAuthTests(BaseTokenAuthTests, TestCase): {'username': self.username, 'password': self.password}, format='json' ) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['token'], self.key) + assert response.status_code == status.HTTP_200_OK + assert response.data['token'] == self.key def test_token_login_json_bad_creds(self): """ @@ -349,22 +347,24 @@ class TokenAuthTests(BaseTokenAuthTests, TestCase): {'username': self.username, 'password': "badpass"}, format='json' ) - self.assertEqual(response.status_code, 400) + assert response.status_code == 400 def test_token_login_json_missing_fields(self): """Ensure token login view using JSON POST fails if missing fields.""" client = APIClient(enforce_csrf_checks=True) response = client.post('/auth-token/', {'username': self.username}, format='json') - self.assertEqual(response.status_code, 400) + assert response.status_code == 400 def test_token_login_form(self): """Ensure token login view using form POST works.""" client = APIClient(enforce_csrf_checks=True) - response = client.post('/auth-token/', - {'username': self.username, 'password': self.password}) - self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['token'], self.key) + response = client.post( + '/auth-token/', + {'username': self.username, 'password': self.password} + ) + assert response.status_code == status.HTTP_200_OK + assert response.data['token'] == self.key @override_settings(ROOT_URLCONF='tests.test_authentication') @@ -397,8 +397,8 @@ class IncorrectCredentialsTests(TestCase): permission_classes=() ) response = view(request) - self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) - self.assertEqual(response.data, {'detail': 'Bad credentials'}) + assert response.status_code == status.HTTP_403_FORBIDDEN + assert response.data == {'detail': 'Bad credentials'} class FailingAuthAccessedInRenderer(TestCase): @@ -435,7 +435,7 @@ class FailingAuthAccessedInRenderer(TestCase): request = factory.get('/') response = self.view(request) content = response.render().content - self.assertEqual(content, b'not authenticated') + assert content == b'not authenticated' class NoAuthenticationClassesTests(TestCase): @@ -458,6 +458,5 @@ class NoAuthenticationClassesTests(TestCase): permission_classes=(DummyPermission,), ) response = view(request) - self.assertEqual(response.status_code, - status.HTTP_403_FORBIDDEN) - self.assertEqual(response.data, {'detail': 'Dummy permission message'}) + assert response.status_code == status.HTTP_403_FORBIDDEN + assert response.data == {'detail': 'Dummy permission message'} From 841a91e9504447b6d6dc7f5ec42ab428ccffdb3e Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 6 Dec 2016 00:47:58 +0600 Subject: [PATCH 074/190] fix authentication_test pytest failure --- tests/test_authentication.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_authentication.py b/tests/test_authentication.py index 21d2583bf..151fabad5 100644 --- a/tests/test_authentication.py +++ b/tests/test_authentication.py @@ -175,7 +175,8 @@ class SessionAuthTests(TestCase): cf. [#1810](https://github.com/tomchristie/django-rest-framework/pull/1810) """ response = self.csrf_client.get('/auth/login/') - assert '' in response + content = response.content.decode('utf8') + assert '' in content def test_post_form_session_auth_failing_csrf(self): """ From 38bde343f86cd77a08cb0b6620203a90edf59f09 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 9 Dec 2016 16:06:59 +0000 Subject: [PATCH 075/190] Update sponsor link --- README.md | 2 +- docs/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 155f8dead..7bf90ba6a 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The initial aim is to provide a single full-time position on REST framework.

    - +

    diff --git a/docs/index.md b/docs/index.md index 9b0913f00..b035c4a7c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -73,7 +73,7 @@ The initial aim is to provide a single full-time position on REST framework.
    From 89d22942a6f2c91ad02e56f9eb9dbe316fe8f985 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 12 Dec 2016 10:08:54 +0000 Subject: [PATCH 076/190] Add missing docs on RequestsClient. Closes #4747. --- docs/api-guide/testing.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/testing.md b/docs/api-guide/testing.md index 410f6d78a..13c746017 100644 --- a/docs/api-guide/testing.md +++ b/docs/api-guide/testing.md @@ -205,7 +205,9 @@ Note that the requests client requires you to pass fully qualified URLs. ## `RequestsClient` and working with the database -The `RequestsClient` class is useful if +The `RequestsClient` class is useful if you want to write tests that solely interact with the service interface. This is a little stricter than using the standard Django test client, as it means that all interactions should be via the API. + +If you're using `RequestsClient` you'll want to ensure that test setup, and results assertions are performed as regular API calls, rather than interacting with the database models directly. For example, rather than checking that `Customer.objects.count() == 3` you would list the customers endpoint, and ensure that it contains three records. ## Headers & Authentication From 0175ea48090afaa727669ebcb01ce08b703d0acb Mon Sep 17 00:00:00 2001 From: Allard Hoeve Date: Wed, 14 Dec 2016 20:15:39 +0100 Subject: [PATCH 077/190] Add drf-oidc-auth to 3rd party mods --- 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 1713da1a1..96dfed602 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -189,6 +189,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [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. +* [drf-oidc-auth][drf-oidc-auth] - Implements OpenID Connect token authentication for DRF. ### Permissions @@ -365,3 +366,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [medium-django-rest-framework]: https://medium.com/django-rest-framework [django-rest-framework-course]: https://teamtreehouse.com/library/django-rest-framework [drf_tweaks]: https://github.com/ArabellaTech/drf_tweaks +[drf-oidc-auth]: https://github.com/ByteInternet/drf-oidc-auth From ebe174c0d7cc15bf3024c4a73bf96493992941f6 Mon Sep 17 00:00:00 2001 From: Eduard Iskandarov Date: Thu, 15 Dec 2016 15:36:40 +0300 Subject: [PATCH 078/190] add per-view custom exception handler support (#4753) --- docs/api-guide/views.md | 2 ++ rest_framework/views.py | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/views.md b/docs/api-guide/views.md index 55f6664e0..c0c4f67e4 100644 --- a/docs/api-guide/views.md +++ b/docs/api-guide/views.md @@ -73,6 +73,8 @@ The following methods are used by REST framework to instantiate the various plug ### .get_content_negotiator(self) +### .get_exception_handler(self) + ## API policy implementation methods The following methods are called before dispatching to the handler method. diff --git a/rest_framework/views.py b/rest_framework/views.py index a8710c7a0..92911e8df 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -286,6 +286,12 @@ class APIView(View): self._negotiator = self.content_negotiation_class() return self._negotiator + def get_exception_handler(self): + """ + Returns the exception handler that this view uses. + """ + return api_settings.EXCEPTION_HANDLER + # API policy implementation methods def perform_content_negotiation(self, request, force=False): @@ -428,7 +434,7 @@ class APIView(View): else: exc.status_code = status.HTTP_403_FORBIDDEN - exception_handler = self.settings.EXCEPTION_HANDLER + exception_handler = self.get_exception_handler() context = self.get_exception_handler_context() response = exception_handler(exc, context) From c2367fb0179b18b00bb42c18f33874408e0952c4 Mon Sep 17 00:00:00 2001 From: Masashi SHIBATA Date: Sat, 17 Dec 2016 22:00:29 +0900 Subject: [PATCH 079/190] Fix documentation's sample code in API Guide (#4756) --- docs/api-guide/schemas.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index c89c100fe..95eb05a40 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -281,8 +281,8 @@ A generic view with sections in the class docstring, using single-line style. class UserList(generics.ListCreateAPIView): """ - get: Create a new user. - post: List all the users. + get: List all the users. + post: Create a new user. """ queryset = User.objects.all() serializer_class = UserSerializer From f38734ef981663a2eeb088625a6623ccf2f1ec42 Mon Sep 17 00:00:00 2001 From: Christian Hess Date: Tue, 20 Dec 2016 14:26:18 -0200 Subject: [PATCH 080/190] Add new line correctly in docstring sections (#4759) The order of the line break was wrong --- rest_framework/schemas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 773df6261..44da83063 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -414,7 +414,7 @@ class SchemaGenerator(object): current_section, seperator, lead = line.partition(':') sections[current_section] = lead.strip() else: - sections[current_section] += line + '\n' + sections[current_section] += '\n' + line header = getattr(view, 'action', method.lower()) if header in sections: From 93fe531dea161c614ccabdcd9effc158e7c2b611 Mon Sep 17 00:00:00 2001 From: Matthew Medal Date: Tue, 20 Dec 2016 14:19:00 -0800 Subject: [PATCH 081/190] Breadcrumb view name suffix fix (#4750) * add failing testcase for breadcrumb suffixes missing when using ModelViewSets * fix get_breadcrumbs to honor overridden get_view_name and keep viewset suffixes * ensure suffixes are appended in breadcrumb util --- rest_framework/utils/breadcrumbs.py | 4 +++- tests/test_utils.py | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/rest_framework/utils/breadcrumbs.py b/rest_framework/utils/breadcrumbs.py index 74f4f7840..e6e7e3cc3 100644 --- a/rest_framework/utils/breadcrumbs.py +++ b/rest_framework/utils/breadcrumbs.py @@ -28,7 +28,9 @@ def get_breadcrumbs(url, request=None): # Don't list the same view twice in a row. # Probably an optional trailing slash. if not seen or seen[-1] != view: - name = cls().get_view_name() + c = cls() + c.suffix = getattr(view, 'suffix', None) + name = c.get_view_name() insert_url = preserve_builtin_query_params(prefix + url, request) breadcrumbs_list.insert(0, (name, insert_url)) seen.append(view) diff --git a/tests/test_utils.py b/tests/test_utils.py index 23b0013b2..aec0b1ef6 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -7,8 +7,11 @@ from django.utils import six import rest_framework.utils.model_meta from rest_framework.compat import _resolve_model +from rest_framework.routers import SimpleRouter +from rest_framework.serializers import ModelSerializer from rest_framework.utils.breadcrumbs import get_breadcrumbs from rest_framework.views import APIView +from rest_framework.viewsets import ModelViewSet from tests.models import BasicModel @@ -37,6 +40,13 @@ class CustomNameResourceInstance(APIView): return "Foo" +class ResourceViewSet(ModelViewSet): + serializer_class = ModelSerializer + queryset = BasicModel.objects.all() + + +router = SimpleRouter() +router.register(r'resources', ResourceViewSet) urlpatterns = [ url(r'^$', Root.as_view()), url(r'^resource/$', ResourceRoot.as_view()), @@ -45,6 +55,7 @@ urlpatterns = [ url(r'^resource/(?P[0-9]+)/$', NestedResourceRoot.as_view()), url(r'^resource/(?P[0-9]+)/(?P[A-Za-z]+)$', NestedResourceInstance.as_view()), ] +urlpatterns += router.urls @override_settings(ROOT_URLCONF='tests.test_utils') @@ -123,6 +134,17 @@ class BreadcrumbTests(TestCase): [('Root', '/')] ) + def test_modelviewset_resource_instance_breadcrumbs(self): + url = '/resources/1/' + self.assertEqual( + get_breadcrumbs(url), + [ + ('Root', '/'), + ('Resource List', '/resources/'), + ('Resource Instance', '/resources/1/') + ] + ) + class ResolveModelTests(TestCase): """ From 24e082b14222fb20aea93eb2f51bb99be88c4455 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Thu, 22 Dec 2016 12:44:43 -0500 Subject: [PATCH 082/190] docs: typo fix: it's -> its --- 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 13b5145ba..f68b5eaf3 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1652,7 +1652,7 @@ 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. + and its return value used as the representation. For example, the following would call `get_expiry_date()` on the object: From f1cbf51b43005724a26e15e8c2235dd9622b0b33 Mon Sep 17 00:00:00 2001 From: Emmanuelle Delescolle Date: Sun, 25 Dec 2016 10:06:47 +0100 Subject: [PATCH 083/190] Add drf-schema-adapter to 3rd party metadata mods --- docs/api-guide/metadata.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/api-guide/metadata.md b/docs/api-guide/metadata.md index e12aeb7fd..e98a9a311 100644 --- a/docs/api-guide/metadata.md +++ b/docs/api-guide/metadata.md @@ -104,6 +104,18 @@ Then configure your settings to use this custom class: 'DEFAULT_METADATA_CLASS': 'myproject.apps.core.MinimalMetadata' } +# Third party packages + +The following third party packages provide additional metadata implementations. + +## DRF-schema-adapter + +[drf-schema-adapter][drf-schema-adapter] is a set of tools that makes it easier to provide schema information to frontend frameworks and libraries. It provides a metadata mixin as well as 2 metadata classes and several adapters suitable to generate [json-schema][json-schema] as well as schema information readable by various libraries. + +You can also write your own adapter to work with your specific frontend. +If you whish to do so, it also provides an exporter that can export those schema information to json files. + [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/ +[drf-schema-adapter]: https://github.com/drf-forms/drf-schema-adapter From d98a0772d0423b8f5f49b8198af72020fad2d570 Mon Sep 17 00:00:00 2001 From: Emmanuelle Delescolle Date: Sat, 31 Dec 2016 08:16:45 +0100 Subject: [PATCH 084/190] Add DRF-Base64 to third-party serializers Add DRF-Base64, which provides serializers to handle base64-encoded files, to third-party serializers packages --- 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 d36812f3f..1368f89a6 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1116,6 +1116,10 @@ The [drf-dynamic-fields][drf-dynamic-fields] package provides a mixin to dynamic The [html-json-forms][html-json-forms] package provides an algorithm and serializer for processing `
    ` submissions per the (inactive) [HTML JSON Form specification][json-form-spec]. The serializer facilitates processing of arbitrarily nested JSON structures within HTML. For example, `` will be interpreted as `{"items": [{"id": "5"}]}`. +## DRF-Base64 + +[DRF-Base64][drf-base64] provides a set of field and model serializers that handles the upload of base64-encoded files. + [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion [relations]: relations.md [model-managers]: https://docs.djangoproject.com/en/stable/topics/db/managers/ @@ -1131,3 +1135,4 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [html-json-forms]: https://github.com/wq/html-json-forms [json-form-spec]: https://www.w3.org/TR/html-json-forms/ [drf-dynamic-fields]: https://github.com/dbrgn/drf-dynamic-fields +[drf-base64]: https://bitbucket.org/levit_scs/drf_base64 From 492444eb2e46bfbdb23546e67a73f7363cc88c94 Mon Sep 17 00:00:00 2001 From: robert Date: Mon, 2 Jan 2017 17:03:03 -0600 Subject: [PATCH 085/190] added drf-flexfields addon info --- 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 1368f89a6..96063bd81 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1112,6 +1112,10 @@ The [dynamic-rest][dynamic-rest] package extends the ModelSerializer and ModelVi The [drf-dynamic-fields][drf-dynamic-fields] package provides a mixin to dynamically limit the fields per serializer to a subset specified by an URL parameter. +## DRF FlexFields + +The [drf-flex-fields][drf-flex-fields] package extends the ModelSerializer and ModelViewSet to provide commonly used functionality for dynamically setting fields and expanding primitive fields to nested models, both from URL parameters and your serializer class definitions. + ## HTML JSON Forms The [html-json-forms][html-json-forms] package provides an algorithm and serializer for processing `` submissions per the (inactive) [HTML JSON Form specification][json-form-spec]. The serializer facilitates processing of arbitrarily nested JSON structures within HTML. For example, `` will be interpreted as `{"items": [{"id": "5"}]}`. @@ -1133,6 +1137,7 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [django-hstore]: https://github.com/djangonauts/django-hstore [dynamic-rest]: https://github.com/AltSchool/dynamic-rest [html-json-forms]: https://github.com/wq/html-json-forms +[drf-flex-fields]: https://github.com/rsinger86/drf-flex-fields [json-form-spec]: https://www.w3.org/TR/html-json-forms/ [drf-dynamic-fields]: https://github.com/dbrgn/drf-dynamic-fields [drf-base64]: https://bitbucket.org/levit_scs/drf_base64 From 69366a11d721fd5f43dda6226cf33d83eabb4db4 Mon Sep 17 00:00:00 2001 From: Makedonsky Date: Tue, 3 Jan 2017 13:17:07 +0200 Subject: [PATCH 086/190] modify documenting-your-api docs topic --- docs/topics/documenting-your-api.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/docs/topics/documenting-your-api.md b/docs/topics/documenting-your-api.md index e7d2cde0c..38f365d7d 100644 --- a/docs/topics/documenting-your-api.md +++ b/docs/topics/documenting-your-api.md @@ -38,6 +38,34 @@ Both this package and DRF docs are fully documented, well supported, and come hi --- +### DRF AutoDocs + +Oleksander Mashianovs' [DRF Auto Docs][drfautodocs-repo] automated api renderer. + +Collects almost all the code you written into documentation effortlessly. + +Supports: + + * functional view docs + * tree-like structure + * Docstrings: + * markdown + * preserve space & newlines + * formatting with nice syntax + * Fields: + * choices rendering + * help_text (to specify SerializerMethodField output, etc) + * smart read_only/required rendering + * Endpoint properties: + * filter_backends + * authentication_classes + * permission_classes + * extra url params(GET params) + +![whole structure](http://joxi.ru/52aBGNI4k3oyA0.jpg) + +--- + #### Apiary There are various other online tools and services for providing API documentation. One notable service is [Apiary][apiary]. With Apiary, you describe your API using a simple markdown-like syntax. The generated documentation includes API interaction, a mock server for testing & prototyping, and various other tools. @@ -109,6 +137,7 @@ To implement a hypermedia API you'll need to decide on an appropriate media type [drfdocs-repo]: https://github.com/ekonstantinidis/django-rest-framework-docs [drfdocs-website]: http://www.drfdocs.com/ [drfdocs-demo]: http://demo.drfdocs.com/ +[drfautodocs-repo]: https://github.com/iMakedonsky/drf-autodocs [django-rest-swagger]: https://github.com/marcgibbons/django-rest-swagger [swagger]: https://developers.helloreverb.com/swagger/ [rest-framework-docs]: https://github.com/marcgibbons/django-rest-framework-docs From 11fd3bf1085e51f1b753953a495a6ba8aa1b5421 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Tue, 3 Jan 2017 16:14:19 -0500 Subject: [PATCH 087/190] Add disabling of declared fields on serializer subclasses (#4764) * Add test for disabling declared fields on child * Check that declared base field is not in attrs * Update meta inheritance docs to include serializer * Test that meta fields cannot be declared as None * Add docs example for declarative field disabling --- docs/api-guide/serializers.md | 44 +++++++++++++++++++++++++++-------- rest_framework/serializers.py | 6 ++++- tests/test_serializer.py | 41 ++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 11 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 96063bd81..dd4ea8a90 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -578,16 +578,6 @@ 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 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): - model = Account - -Typically we would recommend *not* using inheritance on inner Meta classes, but instead declaring all options explicitly. - ## 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. @@ -1025,6 +1015,40 @@ If any of the validation fails, then the method should raise a `serializers.Vali 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. +## Serializer Inheritance + +Similar to Django forms, you can extend and reuse serializers through inheritance. This allows you to declare a common set of fields or methods on a parent class that can then be used in a number of serializers. For example, + + class MyBaseSerializer(Serializer): + my_field = serializers.CharField() + + def validate_my_field(self): + ... + + class MySerializer(MyBaseSerializer): + ... + +Like Django's `Model` and `ModelForm` classes, the inner `Meta` class on serializers does not implicitly inherit from it's parents' inner `Meta` 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. + +Additionally, the following caveats apply to serializer inheritance: + +* Normal Python name resolution rules apply. If you have multiple base classes that declare a `Meta` inner class, only the first one will be used. This means the child’s `Meta`, if it exists, otherwise the `Meta` of the first parent, etc. +* It’s possible to declaratively remove a `Field` inherited from a parent class by setting the name to be `None` on the subclass. + + class MyBaseSerializer(ModelSerializer): + my_field = serializers.CharField() + + class MySerializer(MyBaseSerializer): + my_field = None + + However, you can only use this technique to opt out from a field defined declaratively by a parent class; it won’t prevent the `ModelSerializer` from generating a default field. To opt-out from default fields, see [Specifying which fields to include](#specifying-which-fields-to-include). + ## 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. diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 02c24b70e..3556447bb 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -305,7 +305,11 @@ class SerializerMetaclass(type): # in order to maintain the correct order of fields. for base in reversed(bases): if hasattr(base, '_declared_fields'): - fields = list(base._declared_fields.items()) + fields + fields = [ + (field_name, obj) for field_name, obj + in base._declared_fields.items() + if field_name not in attrs + ] + fields return OrderedDict(fields) diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 8c8b5b163..47258fdd1 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -7,6 +7,8 @@ import re import pytest +from django.db import models + from rest_framework import fields, relations, serializers from rest_framework.compat import unicode_repr from rest_framework.fields import Field @@ -413,3 +415,42 @@ class Test4606Regression: serializer = self.Serializer(data=[{"name": "liz"}], many=True) with pytest.raises(serializers.ValidationError): serializer.is_valid(raise_exception=True) + + +class TestDeclaredFieldInheritance: + def test_declared_field_disabling(self): + class Parent(serializers.Serializer): + f1 = serializers.CharField() + f2 = serializers.CharField() + + class Child(Parent): + f1 = None + + class Grandchild(Child): + pass + + assert len(Parent._declared_fields) == 2 + assert len(Child._declared_fields) == 1 + assert len(Grandchild._declared_fields) == 1 + + def test_meta_field_disabling(self): + # Declaratively setting a field on a child class will *not* prevent + # the ModelSerializer from generating a default field. + class MyModel(models.Model): + f1 = models.CharField(max_length=10) + f2 = models.CharField(max_length=10) + + class Parent(serializers.ModelSerializer): + class Meta: + model = MyModel + fields = ['f1', 'f2'] + + class Child(Parent): + f1 = None + + class Grandchild(Child): + pass + + assert len(Parent().get_fields()) == 2 + assert len(Child().get_fields()) == 2 + assert len(Grandchild().get_fields()) == 2 From eddc34f4c81e1a0d188356c0d3d81f482a37f367 Mon Sep 17 00:00:00 2001 From: Ian Clark Date: Wed, 4 Jan 2017 08:40:42 +0000 Subject: [PATCH 088/190] Add Serializer Extensions documentation (#4777) --- docs/api-guide/serializers.md | 8 ++++++++ docs/topics/third-party-resources.md | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index dd4ea8a90..b5aa78875 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1140,6 +1140,13 @@ The [drf-dynamic-fields][drf-dynamic-fields] package provides a mixin to dynamic The [drf-flex-fields][drf-flex-fields] package extends the ModelSerializer and ModelViewSet to provide commonly used functionality for dynamically setting fields and expanding primitive fields to nested models, both from URL parameters and your serializer class definitions. +## Serializer Extensions + +The [django-rest-framework-serializer-extensions][drf-serializer-extensions] +package provides a collection of tools to DRY up your serializers, by allowing +fields to be defined on a per-view/request basis. Fields can be whitelisted, +blacklisted and child serializers can be optionally expanded. + ## HTML JSON Forms The [html-json-forms][html-json-forms] package provides an algorithm and serializer for processing `` submissions per the (inactive) [HTML JSON Form specification][json-form-spec]. The serializer facilitates processing of arbitrarily nested JSON structures within HTML. For example, `` will be interpreted as `{"items": [{"id": "5"}]}`. @@ -1165,3 +1172,4 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [json-form-spec]: https://www.w3.org/TR/html-json-forms/ [drf-dynamic-fields]: https://github.com/dbrgn/drf-dynamic-fields [drf-base64]: https://bitbucket.org/levit_scs/drf_base64 +[drf-serializer-extensions]: https://github.com/evenicoulddoit/django-rest-framework-serializer-extensions diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 96dfed602..462bd922a 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -204,7 +204,9 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [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. * [djangorestframework-jsonapi][djangorestframework-jsonapi] - Provides a parser, renderer, serializers, and other tools to help build an API that is compliant with the jsonapi.org spec. -* [html-json-forms][html-json-forms]: Provides an algorithm and serializer to process HTML JSON Form submissions per the (inactive) spec. +* [html-json-forms][html-json-forms] - Provides an algorithm and serializer to process HTML JSON Form submissions per the (inactive) spec. +* [django-rest-framework-serializer-extensions][drf-serializer-extensions] - + Enables black/whitelisting fields, and conditionally expanding child serializers on a per-view/request basis. ### Serializer fields @@ -367,3 +369,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-rest-framework-course]: https://teamtreehouse.com/library/django-rest-framework [drf_tweaks]: https://github.com/ArabellaTech/drf_tweaks [drf-oidc-auth]: https://github.com/ByteInternet/drf-oidc-auth +[drf-serializer-extensions]: https://github.com/evenicoulddoit/django-rest-framework-serializer-extensions From 7874bcabe99a321a9f20377d8540c3433f5f79b5 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 4 Jan 2017 15:13:32 +0600 Subject: [PATCH 089/190] convert some more test asserts to pytest (#4778) * converted urlpatterns test asserts to pytest * converted test utils asserts to pytest * removed extra newlines --- tests/test_urlpatterns.py | 4 +- tests/test_utils.py | 97 +++++++++++++++------------------------ 2 files changed, 38 insertions(+), 63 deletions(-) diff --git a/tests/test_urlpatterns.py b/tests/test_urlpatterns.py index 33d367e1d..7d5aecfe5 100644 --- a/tests/test_urlpatterns.py +++ b/tests/test_urlpatterns.py @@ -35,8 +35,8 @@ class FormatSuffixTests(TestCase): callback, callback_args, callback_kwargs = resolver.resolve(request.path_info) except Exception: self.fail("Failed to resolve URL: %s" % request.path_info) - self.assertEqual(callback_args, test_path.args) - self.assertEqual(callback_kwargs, test_path.kwargs) + assert callback_args == test_path.args + assert callback_kwargs == test_path.kwargs def test_trailing_slash(self): factory = APIRequestFactory() diff --git a/tests/test_utils.py b/tests/test_utils.py index aec0b1ef6..11c9e9bb0 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -65,85 +65,60 @@ class BreadcrumbTests(TestCase): """ def test_root_breadcrumbs(self): url = '/' - self.assertEqual( - get_breadcrumbs(url), - [('Root', '/')] - ) + assert get_breadcrumbs(url) == [('Root', '/')] def test_resource_root_breadcrumbs(self): url = '/resource/' - self.assertEqual( - get_breadcrumbs(url), - [ - ('Root', '/'), - ('Resource Root', '/resource/') - ] - ) + assert 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') - ] - ) + assert get_breadcrumbs(url) == [ + ('Root', '/'), + ('Resource Root', '/resource/'), + ('Resource Instance', '/resource/123') + ] def test_resource_instance_customname_breadcrumbs(self): url = '/resource/customname' - self.assertEqual( - get_breadcrumbs(url), - [ - ('Root', '/'), - ('Resource Root', '/resource/'), - ('Foo', '/resource/customname') - ] - ) + assert get_breadcrumbs(url) == [ + ('Root', '/'), + ('Resource Root', '/resource/'), + ('Foo', '/resource/customname') + ] 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/') - ] - ) + assert 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') - ] - ) + assert 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', '/')] - ) + assert get_breadcrumbs(url) == [('Root', '/')] def test_modelviewset_resource_instance_breadcrumbs(self): url = '/resources/1/' - self.assertEqual( - get_breadcrumbs(url), - [ - ('Root', '/'), - ('Resource List', '/resources/'), - ('Resource Instance', '/resources/1/') - ] - ) + assert get_breadcrumbs(url) == [ + ('Root', '/'), + ('Resource List', '/resources/'), + ('Resource Instance', '/resources/1/') + ] class ResolveModelTests(TestCase): @@ -154,15 +129,15 @@ class ResolveModelTests(TestCase): """ def test_resolve_django_model(self): resolved_model = _resolve_model(BasicModel) - self.assertEqual(resolved_model, BasicModel) + assert resolved_model == BasicModel def test_resolve_string_representation(self): resolved_model = _resolve_model('tests.BasicModel') - self.assertEqual(resolved_model, BasicModel) + assert resolved_model == BasicModel def test_resolve_unicode_representation(self): resolved_model = _resolve_model(six.text_type('tests.BasicModel')) - self.assertEqual(resolved_model, BasicModel) + assert resolved_model == BasicModel def test_resolve_non_django_model(self): with self.assertRaises(ValueError): From a7d33f45193fdef669060d8ba1045a5fa10daeae Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 4 Jan 2017 15:59:21 +0600 Subject: [PATCH 090/190] conerted throttling tests asserts to pytest --- tests/test_throttling.py | 51 ++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/tests/test_throttling.py b/tests/test_throttling.py index 6d8d05a32..8d256ac92 100644 --- a/tests/test_throttling.py +++ b/tests/test_throttling.py @@ -70,7 +70,7 @@ class ThrottlingTests(TestCase): request = self.factory.get('/') for dummy in range(4): response = MockView.as_view()(request) - self.assertEqual(429, response.status_code) + assert response.status_code == 429 def set_throttle_timer(self, view, value): """ @@ -87,13 +87,13 @@ class ThrottlingTests(TestCase): request = self.factory.get('/') for dummy in range(4): response = MockView.as_view()(request) - self.assertEqual(429, response.status_code) + assert response.status_code == 429 # Advance the timer by one second self.set_throttle_timer(MockView, 1) response = MockView.as_view()(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 def ensure_is_throttled(self, view, expect): request = self.factory.get('/') @@ -102,7 +102,7 @@ class ThrottlingTests(TestCase): view.as_view()(request) request.user = User.objects.create(username='b') response = view.as_view()(request) - self.assertEqual(expect, response.status_code) + assert response.status_code == expect def test_request_throttling_is_per_user(self): """ @@ -121,9 +121,9 @@ class ThrottlingTests(TestCase): self.set_throttle_timer(view, timer) response = view.as_view()(request) if expect is not None: - self.assertEqual(response['Retry-After'], expect) + assert response['Retry-After'] == expect else: - self.assertFalse('Retry-After' in response) + assert not'Retry-After' in response def test_seconds_fields(self): """ @@ -230,56 +230,55 @@ class ScopedRateThrottleTests(TestCase): # Should be able to hit x view 3 times per minute. response = self.x_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.x_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.x_view(request) - self.assertEqual(200, response.status_code) - + assert response.status_code == 200 self.increment_timer() response = self.x_view(request) - self.assertEqual(429, response.status_code) + assert response.status_code == 429 # Should be able to hit y view 1 time per minute. self.increment_timer() response = self.y_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.y_view(request) - self.assertEqual(429, response.status_code) + assert response.status_code == 429 # Ensure throttles properly reset by advancing the rest of the minute self.increment_timer(55) # Should still be able to hit x view 3 times per minute. response = self.x_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.x_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.x_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.x_view(request) - self.assertEqual(429, response.status_code) + assert response.status_code == 429 # Should still be able to hit y view 1 time per minute. self.increment_timer() response = self.y_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 self.increment_timer() response = self.y_view(request) - self.assertEqual(429, response.status_code) + assert response.status_code == 429 def test_unscoped_view_not_throttled(self): request = self.factory.get('/') @@ -287,7 +286,7 @@ class ScopedRateThrottleTests(TestCase): for idx in range(10): self.increment_timer() response = self.unscoped_view(request) - self.assertEqual(200, response.status_code) + assert response.status_code == 200 class XffTestingBase(TestCase): @@ -321,12 +320,12 @@ class XffTestingBase(TestCase): class IdWithXffBasicTests(XffTestingBase): def test_accepts_request_under_limit(self): self.config_proxy(0) - self.assertEqual(200, self.view(self.request).status_code) + assert self.view(self.request).status_code == 200 def test_denies_request_over_limit(self): self.config_proxy(0) self.view(self.request) - self.assertEqual(429, self.view(self.request).status_code) + assert self.view(self.request).status_code == 429 class XffSpoofingTests(XffTestingBase): @@ -334,13 +333,13 @@ class XffSpoofingTests(XffTestingBase): 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) + assert self.view(self.request).status_code == 429 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) + assert self.view(self.request).status_code == 429 class XffUniqueMachinesTest(XffTestingBase): @@ -348,10 +347,10 @@ class XffUniqueMachinesTest(XffTestingBase): 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) + assert self.view(self.request).status_code == 200 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) + assert self.view(self.request).status_code == 200 From 8fa5846e513247ba90ce95a31587e3592e8aab30 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 4 Jan 2017 17:46:55 +0600 Subject: [PATCH 091/190] conerted multi-table-inheritence test asserts to pytest --- tests/test_multitable_inheritance.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py index 611333aa8..a63e07fac 100644 --- a/tests/test_multitable_inheritance.py +++ b/tests/test_multitable_inheritance.py @@ -44,8 +44,7 @@ class InheritedModelSerializationTests(TestCase): """ child = ChildModel(name1='parent name', name2='child name') serializer = DerivedModelSerializer(child) - self.assertEqual(set(serializer.data.keys()), - set(['name1', 'name2', 'id'])) + assert set(serializer.data.keys()) == set(['name1', 'name2', 'id']) def test_onetoone_primary_key_model_fields_as_expected(self): """ @@ -55,8 +54,7 @@ class InheritedModelSerializationTests(TestCase): 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'])) + assert set(serializer.data.keys()) == set(['name', 'ref']) def test_data_is_valid_without_parent_ptr(self): """ @@ -68,4 +66,5 @@ class InheritedModelSerializationTests(TestCase): 'name2': 'child name', } serializer = DerivedModelSerializer(data=data) - self.assertEqual(serializer.is_valid(), True) + assert serializer.is_valid() is True + From 43677b8baf279367bbf27a1544c7423cc2db9dee Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 4 Jan 2017 17:54:14 +0600 Subject: [PATCH 092/190] flake8 fix --- tests/test_multitable_inheritance.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py index a63e07fac..2aacbc348 100644 --- a/tests/test_multitable_inheritance.py +++ b/tests/test_multitable_inheritance.py @@ -67,4 +67,3 @@ class InheritedModelSerializationTests(TestCase): } serializer = DerivedModelSerializer(data=data) assert serializer.is_valid() is True - From 88a910ebc85e191ace1f520d85645515ec5cb66c Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 4 Jan 2017 18:58:01 +0600 Subject: [PATCH 093/190] converted negotiation tests asserts to pytest --- tests/test_negotiation.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_negotiation.py b/tests/test_negotiation.py index 96ef83eab..6b8fd5060 100644 --- a/tests/test_negotiation.py +++ b/tests/test_negotiation.py @@ -38,20 +38,20 @@ class TestAcceptedMediaType(TestCase): def test_client_without_accept_use_renderer(self): request = Request(factory.get('/')) accepted_renderer, accepted_media_type = self.select_renderer(request) - self.assertEqual(accepted_media_type, 'application/json') + assert accepted_media_type == 'application/json' def test_client_underspecifies_accept_use_renderer(self): request = Request(factory.get('/', HTTP_ACCEPT='*/*')) accepted_renderer, accepted_media_type = self.select_renderer(request) - self.assertEqual(accepted_media_type, 'application/json') + assert accepted_media_type == 'application/json' def test_client_overspecifies_accept_use_client(self): request = Request(factory.get('/', HTTP_ACCEPT='application/json; indent=8')) accepted_renderer, accepted_media_type = self.select_renderer(request) - self.assertEqual(accepted_media_type, 'application/json; indent=8') + assert accepted_media_type == 'application/json; indent=8' def test_client_specifies_parameter(self): request = Request(factory.get('/', HTTP_ACCEPT='application/openapi+json;version=2.0')) accepted_renderer, accepted_media_type = self.select_renderer(request) - self.assertEqual(accepted_media_type, 'application/openapi+json;version=2.0') - self.assertEqual(accepted_renderer.format, 'swagger') + assert accepted_media_type == 'application/openapi+json;version=2.0' + assert accepted_renderer.format == 'swagger' From cd6acfcfcf0c7a4e2777d1c79ce59162070f44ba Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Thu, 5 Jan 2017 16:30:04 +0600 Subject: [PATCH 094/190] updated django minor versions --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index e89274661..81531dc71 100644 --- a/tox.ini +++ b/tox.ini @@ -15,9 +15,9 @@ setenv = PYTHONDONTWRITEBYTECODE=1 PYTHONWARNINGS=once deps = - django18: Django==1.8.16 - django19: Django==1.9.11 - django110: Django==1.10.3 + django18: Django==1.8.17 + django19: Django==1.9.12 + django110: Django==1.10.5 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From 7ef6e967251bc36f234099e3498a901ab70ef178 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 5 Jan 2017 11:14:57 +0000 Subject: [PATCH 095/190] Fixes documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Django==1.8.17 chokes on this unless it’s just `snippets`. --- 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 04fb6914a..d7d6bafba 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -45,7 +45,7 @@ We'll need to add our new `snippets` app and the `rest_framework` app to `INSTAL INSTALLED_APPS = ( ... 'rest_framework', - 'snippets.apps.SnippetsConfig', + 'snippets', ) Okay, we're ready to roll. From eed8f5bb4269a29017380a57eec18dcc14c2756c Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 5 Jan 2017 12:06:08 +0000 Subject: [PATCH 096/190] Fixes comment from @xordoquy. --- docs/tutorial/1-serialization.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index d7d6bafba..710dfb8e7 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -45,9 +45,11 @@ We'll need to add our new `snippets` app and the `rest_framework` app to `INSTAL INSTALLED_APPS = ( ... 'rest_framework', - 'snippets', + 'snippets.apps.SnippetsConfig', ) +Please note that if you're using Django <1.9, you need to replace `snippets.apps.SnippetsConfig` with `snippets`. + Okay, we're ready to roll. ## Creating a model to work with From 718764f591aba99e2cabcc56a8d8c88a8feac949 Mon Sep 17 00:00:00 2001 From: wim glenn Date: Fri, 6 Jan 2017 00:40:50 -0600 Subject: [PATCH 097/190] add links to djangorestframework-queryfields to docs (#4786) --- docs/api-guide/serializers.md | 6 ++++++ docs/topics/third-party-resources.md | 2 ++ 2 files changed, 8 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index b5aa78875..15e92ee72 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1155,6 +1155,11 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [DRF-Base64][drf-base64] provides a set of field and model serializers that handles the upload of base64-encoded files. +## QueryFields + +[djangorestframework-queryfields][djangorestframework-queryfields] allows API clients to specify which fields will be sent in the response via inclusion or exclusion query paramaters. + + [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion [relations]: relations.md [model-managers]: https://docs.djangoproject.com/en/stable/topics/db/managers/ @@ -1173,3 +1178,4 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [drf-dynamic-fields]: https://github.com/dbrgn/drf-dynamic-fields [drf-base64]: https://bitbucket.org/levit_scs/drf_base64 [drf-serializer-extensions]: https://github.com/evenicoulddoit/django-rest-framework-serializer-extensions +[djangorestframework-queryfields]: http://djangorestframework-queryfields.readthedocs.io/ diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-resources.md index 462bd922a..1ccedbc01 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-resources.md @@ -207,6 +207,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [html-json-forms][html-json-forms] - Provides an algorithm and serializer to process HTML JSON Form submissions per the (inactive) spec. * [django-rest-framework-serializer-extensions][drf-serializer-extensions] - Enables black/whitelisting fields, and conditionally expanding child serializers on a per-view/request basis. +* [djangorestframework-queryfields][djangorestframework-queryfields] - Serializer mixin allowing clients to control which fields will be sent in the API response. ### Serializer fields @@ -370,3 +371,4 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [drf_tweaks]: https://github.com/ArabellaTech/drf_tweaks [drf-oidc-auth]: https://github.com/ByteInternet/drf-oidc-auth [drf-serializer-extensions]: https://github.com/evenicoulddoit/django-rest-framework-serializer-extensions +[djangorestframework-queryfields]: https://github.com/wimglenn/djangorestframework-queryfields From cf3862d56dddaf826c0a30913c4aebd6fdaba442 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 6 Jan 2017 07:24:28 +0000 Subject: [PATCH 098/190] Update 3.0-announcement.md Closes #4785 --- 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 25ab4fd5b..f09788f56 100644 --- a/docs/topics/3.0-announcement.md +++ b/docs/topics/3.0-announcement.md @@ -894,11 +894,11 @@ If the request is omitted from the context, the returned URLs will be of the for 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 as ISO-8601 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. +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-8601'` will result in native objects being returned in serializer data. REST_FRAMEWORK = { # Return native `Date` and `Time` objects in `serializer.data` From a5fcf10c0ee269f77d04f41bc087a8c4d2ba6b59 Mon Sep 17 00:00:00 2001 From: Artem Muterko Date: Sat, 7 Jan 2017 00:32:13 +0200 Subject: [PATCH 099/190] Raise RuntimeError when trying to encode coreapi objects (#4790) --- rest_framework/utils/encoders.py | 10 +++++----- tests/test_encoders.py | 11 +++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 8203a7bc8..8896e4f2c 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -55,6 +55,11 @@ class JSONEncoder(json.JSONEncoder): elif hasattr(obj, 'tolist'): # Numpy arrays and array scalars. return obj.tolist() + elif (coreapi is not None) and isinstance(obj, (coreapi.Document, coreapi.Error)): + raise RuntimeError( + 'Cannot return a coreapi object from a JSON view. ' + 'You should be using a schema renderer instead for this view.' + ) elif hasattr(obj, '__getitem__'): try: return dict(obj) @@ -62,9 +67,4 @@ class JSONEncoder(json.JSONEncoder): pass elif hasattr(obj, '__iter__'): return tuple(item for item in obj) - elif (coreapi is not None) and isinstance(obj, (coreapi.Document, coreapi.Error)): - raise RuntimeError( - 'Cannot return a coreapi object from a JSON view. ' - 'You should be using a schema renderer instead for this view.' - ) return super(JSONEncoder, self).default(obj) diff --git a/tests/test_encoders.py b/tests/test_encoders.py index 687141476..403b1e9b2 100644 --- a/tests/test_encoders.py +++ b/tests/test_encoders.py @@ -4,6 +4,7 @@ from uuid import uuid4 from django.test import TestCase +from rest_framework.compat import coreapi from rest_framework.utils.encoders import JSONEncoder @@ -79,3 +80,13 @@ class JSONEncoderTests(TestCase): """ unique_id = uuid4() assert self.encoder.default(unique_id) == str(unique_id) + + def test_encode_coreapi_raises_error(self): + """ + Tests encoding a coreapi objects raises proper error + """ + with self.assertRaises(RuntimeError): + self.encoder.default(coreapi.Document()) + + with self.assertRaises(RuntimeError): + self.encoder.default(coreapi.Error()) From 64e801e479c1f111d8e4af43c55f9f22e76ebd06 Mon Sep 17 00:00:00 2001 From: Roman Vasilyev Date: Fri, 6 Jan 2017 14:46:36 -0800 Subject: [PATCH 100/190] get view for django 'virtual hosts' (#4776) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Brill, thanks! 👍 --- docs/api-guide/schemas.md | 12 ++++++++++++ rest_framework/schemas.py | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/schemas.md b/docs/api-guide/schemas.md index 95eb05a40..f43ff56bd 100644 --- a/docs/api-guide/schemas.md +++ b/docs/api-guide/schemas.md @@ -145,6 +145,18 @@ May be used to pass a canonical URL for the schema. url='https://www.example.org/api/' ) +#### `urlconf` + +A string representing the import path to the URL conf that you want +to generate an API schema for. This defaults to the value of Django's +ROOT_URLCONF setting. + + schema_view = get_schema_view( + title='Server Monitoring API', + url='https://www.example.org/api/', + urlconf='myproject.urls' + ) + #### `renderer_classes` May be used to pass the set of renderer classes that can be used to render the API root endpoint. diff --git a/rest_framework/schemas.py b/rest_framework/schemas.py index 44da83063..112f4d8c4 100644 --- a/rest_framework/schemas.py +++ b/rest_framework/schemas.py @@ -571,11 +571,11 @@ class SchemaGenerator(object): return named_path_components + [action] -def get_schema_view(title=None, url=None, renderer_classes=None): +def get_schema_view(title=None, url=None, urlconf=None, renderer_classes=None): """ Return a schema view. """ - generator = SchemaGenerator(title=title, url=url) + generator = SchemaGenerator(title=title, url=url, urlconf=urlconf) if renderer_classes is None: if renderers.BrowsableAPIRenderer in api_settings.DEFAULT_RENDERER_CLASSES: rclasses = [renderers.CoreJSONRenderer, renderers.BrowsableAPIRenderer] From e2c35920d180be47c835ee24a99440cb89dec58c Mon Sep 17 00:00:00 2001 From: wim glenn Date: Fri, 6 Jan 2017 16:46:56 -0600 Subject: [PATCH 101/190] fix a spelling error in api-guide (#4788) --- 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 15e92ee72..6602d5e2c 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1157,7 +1157,7 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali ## QueryFields -[djangorestframework-queryfields][djangorestframework-queryfields] allows API clients to specify which fields will be sent in the response via inclusion or exclusion query paramaters. +[djangorestframework-queryfields][djangorestframework-queryfields] allows API clients to specify which fields will be sent in the response via inclusion/exclusion query parameters. [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion From d7c00e8b7a8a17bc069be63fbf68d32f86d20f05 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Sat, 7 Jan 2017 21:51:59 +0600 Subject: [PATCH 102/190] updated version of test dependencies in test requirements text --- requirements/requirements-testing.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index 177d677d8..b9e168442 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -1,4 +1,4 @@ # PyTest for running the tests. -pytest==2.9.1 -pytest-django==2.9.1 -pytest-cov==1.8.1 +pytest==3.0.5 +pytest-django==3.1.2 +pytest-cov==2.4.0 From b352c8a24cde5af5f99c758e5024e6288ac064b3 Mon Sep 17 00:00:00 2001 From: Artem Muterko Date: Sun, 8 Jan 2017 15:34:52 +0200 Subject: [PATCH 103/190] Fix some typos in documentation --- docs/api-guide/metadata.md | 2 +- docs/api-guide/permissions.md | 2 +- docs/api-guide/settings.md | 2 +- docs/topics/3.1-announcement.md | 2 +- docs/topics/3.4-announcement.md | 2 +- docs/topics/api-clients.md | 2 +- docs/topics/kickstarter-announcement.md | 2 +- docs/topics/release-notes.md | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/api-guide/metadata.md b/docs/api-guide/metadata.md index e98a9a311..de28ffd8a 100644 --- a/docs/api-guide/metadata.md +++ b/docs/api-guide/metadata.md @@ -113,7 +113,7 @@ The following third party packages provide additional metadata implementations. [drf-schema-adapter][drf-schema-adapter] is a set of tools that makes it easier to provide schema information to frontend frameworks and libraries. It provides a metadata mixin as well as 2 metadata classes and several adapters suitable to generate [json-schema][json-schema] as well as schema information readable by various libraries. You can also write your own adapter to work with your specific frontend. -If you whish to do so, it also provides an exporter that can export those schema information to json files. +If you wish to do so, it also provides an exporter that can export those schema information to json files. [cite]: http://tools.ietf.org/html/rfc7231#section-4.3.7 [no-options]: https://www.mnot.net/blog/2012/10/29/NO_OPTIONS diff --git a/docs/api-guide/permissions.md b/docs/api-guide/permissions.md index be2981327..344e33c86 100644 --- a/docs/api-guide/permissions.md +++ b/docs/api-guide/permissions.md @@ -259,7 +259,7 @@ The [REST Condition][rest-condition] package is another extension for building c ## DRY Rest Permissions -The [DRY Rest Permissions][dry-rest-permissions] package provides the ability to define different permissions for individual default and custom actions. This package is made for apps with permissions that are derived from relationships defined in the app's data model. It also supports permission checks being returned to a client app through the API's serializer. Additionally it supports adding permissions to the default and custom list actions to restrict the data they retrive per user. +The [DRY Rest Permissions][dry-rest-permissions] package provides the ability to define different permissions for individual default and custom actions. This package is made for apps with permissions that are derived from relationships defined in the app's data model. It also supports permission checks being returned to a client app through the API's serializer. Additionally it supports adding permissions to the default and custom list actions to restrict the data they retrieve per user. ## Django Rest Framework Roles diff --git a/docs/api-guide/settings.md b/docs/api-guide/settings.md index a1ea12d6e..aaedd463e 100644 --- a/docs/api-guide/settings.md +++ b/docs/api-guide/settings.md @@ -241,7 +241,7 @@ Default: If set, this maps the `'pk'` identifier in the URL conf onto the actual field name when generating a schema path parameter. Typically this will be `'id'`. This gives a more suitable representation as "primary key" is an implementation -detail, wheras "identifier" is a more general concept. +detail, whereas "identifier" is a more general concept. Default: `True` diff --git a/docs/topics/3.1-announcement.md b/docs/topics/3.1-announcement.md index 9eb93fcd7..6cca40665 100644 --- a/docs/topics/3.1-announcement.md +++ b/docs/topics/3.1-announcement.md @@ -153,7 +153,7 @@ For more information, see the documentation on [customizing field mappings][cust 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 help 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 maintenance 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) has now been promoted as our recommended option for integrating OAuth support. diff --git a/docs/topics/3.4-announcement.md b/docs/topics/3.4-announcement.md index 69343c75e..438192c9c 100644 --- a/docs/topics/3.4-announcement.md +++ b/docs/topics/3.4-announcement.md @@ -89,7 +89,7 @@ Name | Support | PyPI pa ---------------------------------|-------------------------------------|-------------------------------- [Core JSON][core-json] | Schema generation & client support. | Built-in support in `coreapi`. [Swagger / OpenAPI][swagger] | Schema generation & client support. | The `openapi-codec` package. -[JSON Hyper-Schema][hyperschema] | Currrently client support only. | The `hyperschema-codec` package. +[JSON Hyper-Schema][hyperschema] | Currently client support only. | The `hyperschema-codec` package. [API Blueprint][api-blueprint] | Not yet available. | Not yet available. --- diff --git a/docs/topics/api-clients.md b/docs/topics/api-clients.md index c12551aa6..fa7b60d3e 100644 --- a/docs/topics/api-clients.md +++ b/docs/topics/api-clients.md @@ -217,7 +217,7 @@ credentials, headers and bookmarks: # Python client library -The `coreapi` Python package allows you to programatically interact with any +The `coreapi` Python package allows you to programmatically interact with any API that exposes a supported schema format. ## Getting started diff --git a/docs/topics/kickstarter-announcement.md b/docs/topics/kickstarter-announcement.md index 78c5cce6f..6b7b428d1 100644 --- a/docs/topics/kickstarter-announcement.md +++ b/docs/topics/kickstarter-announcement.md @@ -102,7 +102,7 @@ Our gold sponsors include companies large and small. Many thanks for their signi ### 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. +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 chosen to privately support the project at this level.
    -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](http://www.machinalis.com/#services).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](https://hello.machinalis.co.uk/).* --- From b1eade4e32627c25dad2535c6bde2076f1385372 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 27 Jan 2017 12:57:26 +0000 Subject: [PATCH 164/190] Update machinalis links --- README.md | 2 +- docs/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2afb70502..c26252ce5 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ The initial aim is to provide a single full-time position on REST framework.

    -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](http://www.machinalis.com/#services).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](https://hello.machinalis.co.uk/).* --- diff --git a/docs/index.md b/docs/index.md index 006ae8221..29a11791e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -74,7 +74,7 @@ The initial aim is to provide a single full-time position on REST framework.
  • Rover.com
  • Sentry
  • Stream
    • -
  • Machinalis
    • +
  • Machinalis
    • From 220be31791693f056591e2b9593b80d17c31830c Mon Sep 17 00:00:00 2001 From: Artem Muterko Date: Fri, 27 Jan 2017 17:44:00 +0200 Subject: [PATCH 165/190] Git add remaining tests for BaseSerializer (#4857) --- tests/test_serializer.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 47258fdd1..04fa39c0d 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -159,6 +159,32 @@ class TestBaseSerializer: self.Serializer = ExampleSerializer + def test_abstract_methods_raise_proper_errors(self): + serializer = serializers.BaseSerializer() + with pytest.raises(NotImplementedError): + serializer.to_internal_value(None) + with pytest.raises(NotImplementedError): + serializer.to_representation(None) + with pytest.raises(NotImplementedError): + serializer.update(None, None) + with pytest.raises(NotImplementedError): + serializer.create(None) + + def test_access_to_data_attribute_before_validation_raises_error(self): + serializer = serializers.BaseSerializer(data={'foo': 'bar'}) + with pytest.raises(AssertionError): + serializer.data + + def test_access_to_errors_attribute_before_validation_raises_error(self): + serializer = serializers.BaseSerializer(data={'foo': 'bar'}) + with pytest.raises(AssertionError): + serializer.errors + + def test_access_to_validated_data_attribute_before_validation_raises_error(self): + serializer = serializers.BaseSerializer(data={'foo': 'bar'}) + with pytest.raises(AssertionError): + serializer.validated_data + def test_serialize_instance(self): instance = {'id': 1, 'name': 'tom', 'domain': 'example.com'} serializer = self.Serializer(instance) From a8dbc2202811c85b84b3112dc2f317154906da57 Mon Sep 17 00:00:00 2001 From: Anna Ossowski Date: Sat, 28 Jan 2017 23:41:21 +0100 Subject: [PATCH 166/190] Updated Support section and added funding email (#4860) --- docs/index.md | 2 +- docs/topics/funding.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.md b/docs/index.md index 29a11791e..f3897696f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -260,7 +260,7 @@ Framework. 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. +For priority support please sign up for a [professional or premium sponsorship plan](https://fund.django-rest-framework.org/topics/funding/). For updates on REST framework development, you may also want to follow [the author][twitter] on Twitter. diff --git a/docs/topics/funding.md b/docs/topics/funding.md index 814de0a3c..91099cb3f 100644 --- a/docs/topics/funding.md +++ b/docs/topics/funding.md @@ -308,7 +308,7 @@ Our professional and premium plans also include **priority support**. At any tim Once you've signed up I'll contact you via email and arrange your ad placements on the site. -For further enquires please contact tom@tomchristie.com. +For further enquires please contact funding@django-rest-framework.org. --- From 1c437a793c3f3cedb1aa53f0cccec23a96cc3f34 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Sun, 29 Jan 2017 20:38:39 +0100 Subject: [PATCH 167/190] Removed unnecessary importlib wrapper. --- rest_framework/compat.py | 5 ----- rest_framework/settings.py | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index b0e076203..872441abc 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -17,11 +17,6 @@ from django.template import Context, RequestContext, Template from django.utils import six from django.views.generic import View -try: - import importlib # Available in Python 3.1+ -except ImportError: - from django.utils import importlib # Will be removed in Django 1.9 - try: from django.urls import ( diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 6d9ed2355..b699d7caf 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -18,13 +18,13 @@ REST framework settings, checking for user settings first, then falling back to the defaults. """ from __future__ import unicode_literals +from importlib import import_module from django.conf import settings from django.test.signals import setting_changed from django.utils import six from rest_framework import ISO_8601 -from rest_framework.compat import importlib DEFAULTS = { # Base API policies @@ -174,7 +174,7 @@ def import_from_string(val, setting_name): # Nod to tastypie's use of importlib. parts = val.split('.') module_path, class_name = '.'.join(parts[:-1]), parts[-1] - module = importlib.import_module(module_path) + module = import_module(module_path) return getattr(module, class_name) except (ImportError, AttributeError) as e: msg = "Could not import '%s' for API setting '%s'. %s: %s." % (val, setting_name, e.__class__.__name__, e) From 31e9f7dfbba7ad967d7f912e2014d9ad291fca3e Mon Sep 17 00:00:00 2001 From: Artem Muterko Date: Mon, 30 Jan 2017 13:08:03 +0200 Subject: [PATCH 168/190] Add remaining tests for generics (#4865) --- tests/test_generics.py | 91 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/tests/test_generics.py b/tests/test_generics.py index c24cda006..59278572e 100644 --- a/tests/test_generics.py +++ b/tests/test_generics.py @@ -547,3 +547,94 @@ class TestGuardedQueryset(TestCase): request = factory.get('/') with pytest.raises(RuntimeError): view(request).render() + + +class ApiViewsTests(TestCase): + + def test_create_api_view_post(self): + class MockCreateApiView(generics.CreateAPIView): + def create(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockCreateApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.post('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_destroy_api_view_delete(self): + class MockDestroyApiView(generics.DestroyAPIView): + def destroy(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockDestroyApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.delete('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_update_api_view_partial_update(self): + class MockUpdateApiView(generics.UpdateAPIView): + def partial_update(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockUpdateApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.patch('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_retrieve_update_api_view_get(self): + class MockRetrieveUpdateApiView(generics.RetrieveUpdateAPIView): + def retrieve(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockRetrieveUpdateApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.get('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_retrieve_update_api_view_put(self): + class MockRetrieveUpdateApiView(generics.RetrieveUpdateAPIView): + def update(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockRetrieveUpdateApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.put('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_retrieve_update_api_view_patch(self): + class MockRetrieveUpdateApiView(generics.RetrieveUpdateAPIView): + def partial_update(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockRetrieveUpdateApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.patch('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_retrieve_destroy_api_view_get(self): + class MockRetrieveDestroyUApiView(generics.RetrieveDestroyAPIView): + def retrieve(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockRetrieveDestroyUApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.get('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data + + def test_retrieve_destroy_api_view_delete(self): + class MockRetrieveDestroyUApiView(generics.RetrieveDestroyAPIView): + def destroy(self, request, *args, **kwargs): + self.called = True + self.call_args = (request, args, kwargs) + view = MockRetrieveDestroyUApiView() + data = ('test request', ('test arg',), {'test_kwarg': 'test'}) + view.delete('test request', 'test arg', test_kwarg='test') + assert view.called is True + assert view.call_args == data From 3001b56e069a8aee118c2cd0977d04aa16733af4 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 30 Jan 2017 17:11:19 +0100 Subject: [PATCH 169/190] Fixed Django 2.0 compatibility due to `django.conf.urls.include` parameters change. (#4866) --- rest_framework/compat.py | 7 +++++++ rest_framework/urlpatterns.py | 4 ++-- tests/test_routers.py | 5 +++-- tests/test_versioning.py | 11 ++++++----- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 872441abc..16bc41f3a 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -307,3 +307,10 @@ def set_many(instance, field, value): else: field = getattr(instance, field) field.set(value) + +def include(module, namespace=None, app_name=None): + from django.conf.urls import include + if django.VERSION < (1,9): + return include(module, namespace, app_name) + else: + return include((module, app_name), namespace) diff --git a/rest_framework/urlpatterns.py b/rest_framework/urlpatterns.py index 4ea55300e..2ce4ba52d 100644 --- a/rest_framework/urlpatterns.py +++ b/rest_framework/urlpatterns.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals -from django.conf.urls import include, url +from django.conf.urls import url -from rest_framework.compat import RegexURLResolver +from rest_framework.compat import RegexURLResolver, include from rest_framework.settings import api_settings diff --git a/tests/test_routers.py b/tests/test_routers.py index 99e4391c0..dc3df2e7b 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -4,12 +4,13 @@ import json from collections import namedtuple import pytest -from django.conf.urls import include, url +from django.conf.urls import url from django.core.exceptions import ImproperlyConfigured from django.db import models from django.test import TestCase, override_settings from rest_framework import permissions, serializers, viewsets +from rest_framework.compat import include from rest_framework.decorators import detail_route, list_route from rest_framework.response import Response from rest_framework.routers import DefaultRouter, SimpleRouter @@ -81,7 +82,7 @@ empty_prefix_urls = [ urlpatterns = [ url(r'^non-namespaced/', include(namespaced_router.urls)), - url(r'^namespaced/', include(namespaced_router.urls, namespace='example')), + url(r'^namespaced/', include(namespaced_router.urls, namespace='example', app_name='example')), url(r'^example/', include(notes_router.urls)), url(r'^example2/', include(kwarged_notes_router.urls)), diff --git a/tests/test_versioning.py b/tests/test_versioning.py index 195f3fec1..098b09b65 100644 --- a/tests/test_versioning.py +++ b/tests/test_versioning.py @@ -1,8 +1,9 @@ import pytest -from django.conf.urls import include, url +from django.conf.urls import url from django.test import override_settings from rest_framework import serializers, status, versioning +from rest_framework.compat import include from rest_framework.decorators import APIView from rest_framework.relations import PKOnlyObject from rest_framework.response import Response @@ -170,7 +171,7 @@ class TestURLReversing(URLPatternsTestCase): ] urlpatterns = [ - url(r'^v1/', include(included, namespace='v1')), + url(r'^v1/', include(included, namespace='v1', app_name='v1')), url(r'^another/$', dummy_view, name='another'), url(r'^(?P[v1|v2]+)/another/$', dummy_view, name='another'), ] @@ -335,8 +336,8 @@ class TestHyperlinkedRelatedField(URLPatternsTestCase): ] urlpatterns = [ - url(r'^v1/', include(included, namespace='v1')), - url(r'^v2/', include(included, namespace='v2')) + url(r'^v1/', include(included, namespace='v1', app_name='v1')), + url(r'^v2/', include(included, namespace='v2', app_name='v2')) ] def setUp(self): @@ -367,7 +368,7 @@ class TestNamespaceVersioningHyperlinkedRelatedFieldScheme(URLPatternsTestCase): ] included = [ url(r'^namespaced/(?P\d+)/$', dummy_pk_view, name='namespaced'), - url(r'^nested/', include(nested, namespace='nested-namespace')) + url(r'^nested/', include(nested, namespace='nested-namespace', app_name='nested-namespace')) ] urlpatterns = [ From d610d150f1f2bceb7769c15c0214567870013a41 Mon Sep 17 00:00:00 2001 From: Artem Muterko Date: Tue, 31 Jan 2017 16:51:09 +0200 Subject: [PATCH 170/190] Add test for pagination when limit not set --- tests/test_pagination.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/test_pagination.py b/tests/test_pagination.py index 9f2e1c57c..dd7f70330 100644 --- a/tests/test_pagination.py +++ b/tests/test_pagination.py @@ -370,6 +370,13 @@ class TestLimitOffset: assert self.pagination.display_page_controls assert isinstance(self.pagination.to_html(), type('')) + def test_pagination_not_applied_if_limit_or_default_limit_not_set(self): + class MockPagination(pagination.LimitOffsetPagination): + default_limit = None + request = Request(factory.get('/')) + queryset = MockPagination().paginate_queryset(self.queryset, request) + assert queryset is None + def test_single_offset(self): """ When the offset is not a multiple of the limit we get some edge cases: From b99272c4251b718a1ea3715205abf1fd3be89039 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Tue, 31 Jan 2017 20:57:52 +0100 Subject: [PATCH 171/190] Fixed `dedent` for tab indent. --- rest_framework/utils/formatting.py | 25 ++++++++++--------------- tests/test_description.py | 6 +++++- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index ca5b33c5e..78cb37e56 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -32,23 +32,18 @@ def dedent(content): unindented text on the initial line. """ content = force_text(content) - whitespace_counts = [ - len(line) - len(line.lstrip(' ')) - for line in content.splitlines()[1:] if line.lstrip() - ] - tab_counts = [ - len(line) - len(line.lstrip('\t')) - for line in content.splitlines()[1:] if line.lstrip() - ] + lines = [line 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), '', content) - elif tab_counts: - whitespace_pattern = '^' + ('\t' * min(whitespace_counts)) - content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) - + if lines: + whitespace_counts = min([len(line) - len(line.lstrip(' ')) for line in lines]) + tab_counts = min([len(line) - len(line.lstrip('\t')) for line in lines]) + if whitespace_counts: + whitespace_pattern = '^' + (' ' * whitespace_counts) + content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) + elif tab_counts: + whitespace_pattern = '^' + ('\t' * tab_counts) + content = re.sub(re.compile(whitespace_pattern, re.MULTILINE), '', content) return content.strip() diff --git a/tests/test_description.py b/tests/test_description.py index 08d8bddec..001a3ea21 100644 --- a/tests/test_description.py +++ b/tests/test_description.py @@ -124,4 +124,8 @@ class TestViewNamesAndDescriptions(TestCase): def test_dedent_tabs(): - assert dedent("\tfirst string\n\n\tsecond string") == 'first string\n\n\tsecond string' + result = 'first string\n\nsecond string' + assert dedent(" first string\n\n second string") == result + assert dedent("first string\n\n second string") == result + assert dedent("\tfirst string\n\n\tsecond string") == result + assert dedent("first string\n\n\tsecond string") == result From 2ec3db81777234c7038c0d6a4edde5162fc1edc6 Mon Sep 17 00:00:00 2001 From: Mohammad Ashraful Islam Date: Wed, 1 Feb 2017 18:20:06 +0600 Subject: [PATCH 172/190] fixed url checker ':' to 'http' (#4678) --- 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 241f94c91..87255bca0 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -114,7 +114,7 @@ if requests is not None: self.mount('https://', adapter) def request(self, method, url, *args, **kwargs): - if ':' not in url: + if not url.startswith('http'): raise ValueError('Missing "http:" or "https:". Use a fully qualified URL, eg "http://testserver%s"' % url) return super(RequestsClient, self).request(method, url, *args, **kwargs) From 3c93c3f7b44b878f9970f9f89a5237b6aabf0794 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 3 Feb 2017 16:54:13 +0000 Subject: [PATCH 173/190] Added Rollbar to premium sponsors --- docs/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 29a11791e..b9806c544 100644 --- a/docs/index.md +++ b/docs/index.md @@ -75,10 +75,11 @@ The initial aim is to provide a single full-time position on REST framework.
  • Sentry
  • Stream
  • Machinalis
    • +
  • Rollbar
    • -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](https://hello.machinalis.co.uk/).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), and [Rollbar](https://rollbar.com).* --- From 79f431c44a215aeab2aa2cacb8587995dad9e709 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 3 Feb 2017 17:10:52 +0000 Subject: [PATCH 174/190] Update sponsors on README to include rollbar (#4876) --- README.md | 3 ++- docs/img/premium/machinalis-readme.png | Bin 14046 -> 12872 bytes docs/img/premium/rollbar-readme.png | Bin 0 -> 12367 bytes docs/img/premium/rover-readme.png | Bin 55611 -> 53118 bytes docs/img/premium/sentry-readme.png | Bin 26353 -> 24584 bytes docs/img/premium/stream-readme.png | Bin 20667 -> 19341 bytes 6 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 docs/img/premium/rollbar-readme.png diff --git a/README.md b/README.md index c26252ce5..609f99184 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,10 @@ The initial aim is to provide a single full-time position on REST framework. +

    -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), and [Machinalis](https://hello.machinalis.co.uk/).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), and [Rollbar](https://rollbar.com).* --- diff --git a/docs/img/premium/machinalis-readme.png b/docs/img/premium/machinalis-readme.png index 4bdb020c2ecee7861668bb45e42f8eec304781f7..cd98c23c7b4dd2fd1bd8e79f401707bb7ba8d416 100644 GIT binary patch literal 12872 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 Pul!}D6{N}}-Us|Ikovn{ literal 0 HcmV?d00001 diff --git a/docs/img/premium/rover-readme.png b/docs/img/premium/rover-readme.png index c9865f2a93c1d67adc2f175cd422e764f7fe3a66..b8055d62e5804df24f131ae27ca142655faa4441 100644 GIT binary patch delta 52468 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 C>*S1s<>*FY2{omKg$)QGFZ4CETEr#h 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 diff --git a/docs/img/premium/sentry-readme.png b/docs/img/premium/sentry-readme.png index 1e869f3b1dd36442faed67d15705890aff7d4dd1..5536ce52fa15e0b9e20b3f8a7f3f6b6df3fa9759 100644 GIT binary patch delta 23710 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 literal 26353 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 diff --git a/docs/img/premium/stream-readme.png b/docs/img/premium/stream-readme.png index 955c11429c53bd18cbfbf888dca7663e134264eb..fc3733c704818f68eb52c453df9ba06eb288d21c 100644 GIT binary patch literal 19341 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 literal 20667 zcmeEuWmKHYvM4gRyTf21!3THOU;IwTEQx#a&!GBG%Fvw{{`(&&;N>MY4P7uxp=xc{3Vm61(%hBm7|rD zhdUe(^dHH=b^G6l{}+=!W-fmd`%8&`%O>`Ra}iA|cV`FBKPu36vh$GO5&KJ^e{cRD zjr@%z>+I;_X65b( z4zKs02>i409|(U`FY?OH$I3xh&JM27zog*f6%yn6k3Ij6DeLUu?55>nW?}V*v%gUO z(e&@of6>wVA38jI!vCc6kDh;ET3U#>dzyo-EIj@(U+`J`%lc)^Y`Ff>EXMU8p~c{~ zAfo1MX=m*#XXarg!NUy_5aAXQ;o%4J@cen;77*k5H<*8L@TW)C&C1Nf+3k(9vxCH6 zVmSVJ1@dyjXZ+v$|Ai{X^~aC?;a7h#M*&OB^j+-z9qH3J@Qu3WiV zG%%h+wdWXqUnZwa%p6Os9D}I}#J~qiF)4DAS-FDZHGJJfbz;_)V+bN8uSjc|LpW~N}iWVTtNTH)6 z(gOiQ+j;cV;k!QZ1nl0u?6=!j?t{(z!~@+e64yzNUZt;9n7Gn$kH5<`7}s)yYF zC;UgX|6kSr?;02SC)c$ZPkQckg6MGYS57c#(yXpprXK5*wc2Os9O9a<=PUI0FW~0P zlP%=wzs`ssH$C5SMh{!>N~_2rsCzZwu#{XYUMFltg-SE~X8 zvGCUQw)R_~pSGf=dwx0}g9BbwSxxh<0tYJ6d$=c0)W99rk5r@X?KXP2y?tJO#9=Di zX1&kLZ_<|57V{EqVoq!};WP|i-RAiM=qC#QKohI;za2#nKW(?W`>hYr&#uU!sLROc zTAc41B!B_<8g7YX6=ePzoEIG+sR>nuf#uQPpdf7(pLNSXW3*kHv7Yt4N|vhwEA&)8 zJNWuy(g8MR$+4tQ;$jDp$Bb?$b7fG!GkypCo`$Ng&wz|zT=X_=ISm6tb_I9oPgm?skvZJk0MWBb>$gv4=O{DJLQ}J)<+aUa3 zvctawzUPxZ8_C(vUL-)8iILiS!YU_XNzg~XVR)6)aR4JIg(4`~=?2a{i6-Npm{8Z? zam6gG3k{53gGHXhwF*M_cnCHJRUA;$zv@KqAqWW^AARlb;yXea1-$!_$%C}Gh^(^d zwZ=ifqNOaDIW-<3HNyZjFJJsT*U=n?FdF4O;&ctp68W+l@U0IIZ=wI=i@pj`_rf(y zM1ss?MEX|@NZ1|5kqCzx9TmaHH(f=uu{{h;If((|77=nFr-+G3Z<#!I_{y4XQN$bG z;Rzsj?z>OQl|g`}AR*4*OA}%w;bjfZ52`F2v`e}($64svA2WUUXue!2TOufvX9>q- zmMx)s!v-gl^VSlJeu4nLZ77OeDx+`FOUc+p&j>Zqh+=i@JT7oT7Vzc- zMT_muDVx1a`>W$+ot$aLJm$kLa!&dhE7D2o{4S-pcI1_EBj7tigm>G;_#6TKD{XX$ zlCF+p?`3pgSt`Pz0A!Kg)*`8O)xqAoRJ7Ob;gN6P3q_Hhvta&vHAqu3$jPL&8TWI8 z{?V29Pxb1b>h~HVt@Y~oNFU-u`08Kg7$sCJp-&*YO>TXAIBPy|ApbS;E?mz2T(exf zz6}Lt^J18EP>kzDeIaSKZr<#$JDEJp5~&NJ%}*zLg$Dy8b&@3pzCw4R1D-T+9uwLK zkhDWX4iIli@P|e~g0T^IIFB+~- zWYt`2dd}{BUnoN)GelSci*V!KgR>}sKH+LHo2C!@MRPSVUm#(#EabsIX|3V-axwL0 z6Q&s0J1lj8( zS43PV%AtEihD2BJhF`YU;3rTLf9Ludvk;~

    pjlIcQ4o>(`XbcjU>*qQ2?ZI)oLo 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 From cbad236f6d817d992873cd4df6527d46ab243ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=89=AC?= Date: Mon, 6 Feb 2017 17:36:03 +0800 Subject: [PATCH 175/190] Add max_length and min_length arguments for ListField (#4877) --- docs/api-guide/fields.md | 4 +++- rest_framework/fields.py | 12 +++++++++++- tests/test_fields.py | 10 ++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index b527b016b..22ce7dd77 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -434,9 +434,11 @@ Requires either the `Pillow` package or `PIL` package. The `Pillow` package is A field class that validates a list of objects. -**Signature**: `ListField(child)` +**Signature**: `ListField(child, min_length=None, max_length=None)` - `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. +- `min_length` - Validates that the list contains no fewer than this number of elements. +- `max_length` - Validates that the list contains no more than this number of elements. For example, to validate a list of integers you might use something like the following: diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 6d21d670a..f46edef1e 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1505,12 +1505,16 @@ class ListField(Field): initial = [] default_error_messages = { 'not_a_list': _('Expected a list of items but got type "{input_type}".'), - 'empty': _('This list may not be empty.') + 'empty': _('This list may not be empty.'), + 'min_length': _('Ensure this field has at least {min_length} elements.'), + 'max_length': _('Ensure this field has no more than {max_length} elements.') } def __init__(self, *args, **kwargs): self.child = kwargs.pop('child', copy.deepcopy(self.child)) self.allow_empty = kwargs.pop('allow_empty', True) + self.max_length = kwargs.pop('max_length', None) + self.min_length = kwargs.pop('min_length', None) assert not inspect.isclass(self.child), '`child` has not been instantiated.' assert self.child.source is None, ( @@ -1520,6 +1524,12 @@ class ListField(Field): super(ListField, self).__init__(*args, **kwargs) self.child.bind(field_name='', parent=self) + 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 get_value(self, dictionary): if self.field_name not in dictionary: diff --git a/tests/test_fields.py b/tests/test_fields.py index 5de6546fc..16221d4cc 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -1668,6 +1668,16 @@ class TestEmptyListField(FieldValues): field = serializers.ListField(child=serializers.IntegerField(), allow_empty=False) +class TestListFieldLengthLimit(FieldValues): + valid_inputs = () + invalid_inputs = [ + ((0, 1), ['Ensure this field has at least 3 elements.']), + ((0, 1, 2, 3, 4, 5), ['Ensure this field has no more than 4 elements.']), + ] + outputs = () + field = serializers.ListField(child=serializers.IntegerField(), min_length=3, max_length=4) + + class TestUnvalidatedListField(FieldValues): """ Values for `ListField` with no `child` argument. From 176831e22b14379ac780491ec0c16834e598f4e1 Mon Sep 17 00:00:00 2001 From: Michael Borisov Date: Wed, 8 Feb 2017 18:17:58 +0300 Subject: [PATCH 176/190] Missing comma (#4889) --- 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 6602d5e2c..e157845a9 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -700,7 +700,7 @@ You can override a URL field view name and lookup field by using either, or both model = Account fields = ('account_url', 'account_name', 'users', 'created') extra_kwargs = { - 'url': {'view_name': 'accounts', 'lookup_field': 'account_name'} + 'url': {'view_name': 'accounts', 'lookup_field': 'account_name'}, 'users': {'lookup_field': 'username'} } From eb5774229ff1562218f73fd885eff7dd8668ea37 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 10 Feb 2017 11:15:39 +0000 Subject: [PATCH 177/190] Version 3.5.4 (#4894) --- docs/topics/release-notes.md | 38 ++++++++++++++++++++++++++++++++++++ rest_framework/__init__.py | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index af6ad7a74..085f888b7 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -40,6 +40,24 @@ You can determine your currently installed version using `pip freeze`: ## 3.5.x series +### 3.5.4 + +**Date**: [10th February 2017][3.5.4-milestone] + +* Add max_length and min_length arguments for ListField. ([#4877][gh4877]) +* Add per-view custom exception handler support. ([#4753][gh4753]) +* Support disabling of declared fields on serializer subclasses. ([#4764][gh4764]) +* Support custom view names on `@list_route` and `@detail_route` endpoints. ([#4821][gh4821]) +* Correct labels for fields in login template when custom user model is used. ([#4841][gh4841]) +* Whitespace fixes for descriptions generated from docstrings. ([#4759][gh4759], [#4869][gh4869], [#4870][gh4870]) +* Better error reporting when schemas are returned by views without a schema renderer. ([#4790][gh4790]) +* Fix for returned response of `PUT` requests when `prefetch_related` is used. ([#4661][gh4661], [#4668][gh4668]) +* Fix for breadcrumb view names. ([#4750][gh4750]) +* Fix for RequestsClient ensuring fully qualified URLs. ([#4678][gh4678]) +* Fix for incorrect behavior of writable-nested fields check in some cases. ([#4634][gh4634], [#4669][gh4669]) +* Resolve Django deprecation warnings. ([#4712][gh4712]) +* Various cleanup of test cases. + ### 3.5.3 **Date**: [7th November 2016][3.5.3-milestone] @@ -639,6 +657,7 @@ For older release notes, [please see the version 2.x documentation][old-release- [3.5.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.1+Release%22 [3.5.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.2+Release%22 [3.5.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.3+Release%22 +[3.5.4-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.5.4+Release%22 [gh2013]: https://github.com/tomchristie/django-rest-framework/issues/2013 @@ -1216,3 +1235,22 @@ For older release notes, [please see the version 2.x documentation][old-release- [gh4645]: https://github.com/tomchristie/django-rest-framework/issues/4645 [gh4646]: https://github.com/tomchristie/django-rest-framework/issues/4646 [gh4650]: https://github.com/tomchristie/django-rest-framework/issues/4650 + + + +[gh4877]: https://github.com/tomchristie/django-rest-framework/issues/4877 +[gh4753]: https://github.com/tomchristie/django-rest-framework/issues/4753 +[gh4764]: https://github.com/tomchristie/django-rest-framework/issues/4764 +[gh4821]: https://github.com/tomchristie/django-rest-framework/issues/4821 +[gh4841]: https://github.com/tomchristie/django-rest-framework/issues/4841 +[gh4759]: https://github.com/tomchristie/django-rest-framework/issues/4759 +[gh4869]: https://github.com/tomchristie/django-rest-framework/issues/4869 +[gh4870]: https://github.com/tomchristie/django-rest-framework/issues/4870 +[gh4790]: https://github.com/tomchristie/django-rest-framework/issues/4790 +[gh4661]: https://github.com/tomchristie/django-rest-framework/issues/4661 +[gh4668]: https://github.com/tomchristie/django-rest-framework/issues/4668 +[gh4750]: https://github.com/tomchristie/django-rest-framework/issues/4750 +[gh4678]: https://github.com/tomchristie/django-rest-framework/issues/4678 +[gh4634]: https://github.com/tomchristie/django-rest-framework/issues/4634 +[gh4669]: https://github.com/tomchristie/django-rest-framework/issues/4669 +[gh4712]: https://github.com/tomchristie/django-rest-framework/issues/4712 diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index d9aa7718c..7a5df6804 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -8,7 +8,7 @@ ______ _____ _____ _____ __ """ __title__ = 'Django REST framework' -__version__ = '3.5.3' +__version__ = '3.5.4' __author__ = 'Tom Christie' __license__ = 'BSD 2-Clause' __copyright__ = 'Copyright 2011-2016 Tom Christie' From 40e34627676286918084c3f8c467ba60f37fd80e Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Sat, 11 Feb 2017 17:37:27 +0100 Subject: [PATCH 178/190] Reverted "Removed multi-table inheritance auto created PK from serialize" 1ecbeebbe5e1f4ac5f7f8112d80f3ea13972cc0f. --- rest_framework/utils/model_meta.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py index f8200c98f..3e3e434e6 100644 --- a/rest_framework/utils/model_meta.py +++ b/rest_framework/utils/model_meta.py @@ -76,12 +76,7 @@ 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 get_remote_field(field) and not (field.primary_key and field.one_to_one) - # If the field is a OneToOneField and it's been marked as PK, then this - # is a multi-table inheritance auto created PK ('%_ptr'). - ]: + for field in [field for field in opts.fields if field.serialize and get_remote_field(field)]: forward_relations[field.name] = RelationInfo( model_field=field, related_model=get_related_model(field), From de8fcbf6968a30405ada6647bc12d7819f4cf62c Mon Sep 17 00:00:00 2001 From: Eduard Iskandarov Date: Tue, 14 Feb 2017 13:27:33 +0300 Subject: [PATCH 179/190] Refs: #4256 delete unrelevant documentation --- docs/api-guide/fields.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/api-guide/fields.md b/docs/api-guide/fields.md index 22ce7dd77..677598205 100644 --- a/docs/api-guide/fields.md +++ b/docs/api-guide/fields.md @@ -303,8 +303,6 @@ Format strings may either be [Python strftime formats][strftime] which explicitl 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. From cd469f616ae78107497a0e74827c4fdbda97d184 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Wed, 15 Feb 2017 07:14:49 +0100 Subject: [PATCH 180/190] Increased utils/encoders.py test coverage. --- tests/test_encoders.py | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/tests/test_encoders.py b/tests/test_encoders.py index 5c6915d0c..8f8694c47 100644 --- a/tests/test_encoders.py +++ b/tests/test_encoders.py @@ -1,14 +1,20 @@ -from datetime import date, datetime, timedelta, tzinfo +from datetime import date, datetime, timedelta from decimal import Decimal from uuid import uuid4 import pytest from django.test import TestCase +from django.utils.timezone import utc from rest_framework.compat import coreapi from rest_framework.utils.encoders import JSONEncoder +class MockList(object): + def tolist(self): + return [1, 2, 3] + + class JSONEncoderTests(TestCase): """ Tests the JSONEncoder method @@ -22,7 +28,7 @@ class JSONEncoderTests(TestCase): Tests encoding a decimal """ d = Decimal(3.14) - assert d == float(d) + assert self.encoder.default(d) == float(d) def test_encode_datetime(self): """ @@ -30,6 +36,8 @@ class JSONEncoderTests(TestCase): """ current_time = datetime.now() assert self.encoder.default(current_time) == current_time.isoformat() + current_time_utc = current_time.replace(tzinfo=utc) + assert self.encoder.default(current_time_utc) == current_time.isoformat() + 'Z' def test_encode_time(self): """ @@ -42,22 +50,8 @@ class JSONEncoderTests(TestCase): """ Tests encoding a timezone aware timestamp """ - - class UTC(tzinfo): - """ - Class extending tzinfo to mimic UTC time - """ - def utcoffset(self, dt): - return timedelta(0) - - def tzname(self, dt): - return "UTC" - - def dst(self, dt): - return timedelta(0) - current_time = datetime.now().time() - current_time = current_time.replace(tzinfo=UTC()) + current_time = current_time.replace(tzinfo=utc) with pytest.raises(ValueError): self.encoder.default(current_time) @@ -91,3 +85,10 @@ class JSONEncoderTests(TestCase): with pytest.raises(RuntimeError): self.encoder.default(coreapi.Error()) + + def test_encode_object_with_tolist(self): + """ + Tests encoding a object with tolist method + """ + foo = MockList() + assert self.encoder.default(foo) == [1, 2, 3] From 963cb4cdc6a814d2d62480f4e2a3b94db44cdce3 Mon Sep 17 00:00:00 2001 From: Akhil Lawrence Date: Sat, 18 Feb 2017 13:20:03 +0530 Subject: [PATCH 181/190] Corrected documentation --- docs/api-guide/serializers.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index e157845a9..75d429eb4 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1100,8 +1100,6 @@ This API included the `.get_field()`, `.get_pk_field()` and other methods. 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. -A new interface for controlling this behavior is currently planned for REST framework 3.1. - --- # Third party packages From 289e1e440ef6b18ffcfbc74823d69af61ea97529 Mon Sep 17 00:00:00 2001 From: Isaac Stone Date: Sun, 19 Feb 2017 13:00:41 -0800 Subject: [PATCH 182/190] Check for collection.Mapping instead of dict issue #4901 --- rest_framework/serializers.py | 8 ++++---- tests/test_serializer.py | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index a8f6e9df2..80e384c22 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -15,7 +15,7 @@ from __future__ import unicode_literals import copy import inspect import traceback -from collections import OrderedDict +from collections import Mapping, OrderedDict from django.core.exceptions import ValidationError as DjangoValidationError from django.core.exceptions import ImproperlyConfigured @@ -326,11 +326,11 @@ def as_serializer_error(exc): else: detail = exc.detail - if isinstance(detail, dict): + if isinstance(detail, Mapping): # 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 { - key: value if isinstance(value, (list, dict)) else [value] + key: value if isinstance(value, (list, Mapping)) else [value] for key, value in detail.items() } elif isinstance(detail, list): @@ -442,7 +442,7 @@ class Serializer(BaseSerializer): """ Dict of native values <- Dict of primitive datatypes. """ - if not isinstance(data, dict): + if not isinstance(data, Mapping): message = self.error_messages['invalid'].format( datatype=type(data).__name__ ) diff --git a/tests/test_serializer.py b/tests/test_serializer.py index 04fa39c0d..cd82ba3df 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -4,9 +4,10 @@ from __future__ import unicode_literals import inspect import pickle import re +import unittest +from collections import Mapping import pytest - from django.db import models from rest_framework import fields, relations, serializers @@ -15,6 +16,11 @@ from rest_framework.fields import Field from .utils import MockObject +try: + from collections import ChainMap +except ImportError: + ChainMap = False + # Test serializer fields imports. # ------------------------------- @@ -113,6 +119,31 @@ class TestSerializer: assert not serializer.is_valid() assert serializer.errors == {'non_field_errors': ['No data provided']} + @unittest.skipUnless(ChainMap, 'requires python 3.3') + def test_serialize_chainmap(self): + data = ChainMap({'char': 'abc'}, {'integer': 123}) + serializer = self.Serializer(data=data) + assert serializer.is_valid() + assert serializer.validated_data == {'char': 'abc', 'integer': 123} + assert serializer.errors == {} + + def test_serialize_custom_mapping(self): + class SinglePurposeMapping(Mapping): + def __getitem__(self, key): + return 'abc' if key == 'char' else 123 + + def __iter__(self): + yield 'char' + yield 'integer' + + def __len__(self): + return 2 + + serializer = self.Serializer(data=SinglePurposeMapping()) + assert serializer.is_valid() + assert serializer.validated_data == {'char': 'abc', 'integer': 123} + assert serializer.errors == {} + class TestValidateMethod: def test_non_field_error_validate_method(self): From eacb93d453db25df11c873b50743910101e383cb Mon Sep 17 00:00:00 2001 From: Pavlin Gergov Date: Mon, 20 Feb 2017 11:33:54 +0200 Subject: [PATCH 183/190] Update _not_authenticated's docstring (#4906) --- rest_framework/request.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index b4bd2d020..9428708ed 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -353,10 +353,9 @@ class Request(object): def _not_authenticated(self): """ - Return a three-tuple of (authenticator, user, authtoken), representing - an unauthenticated request. + Set authenticator, user & authtoken representing an unauthenticated request. - By default this will be (None, AnonymousUser, None). + Defaults are None, AnonymousUser & None. """ self._authenticator = None From 5986f95c8dd1c9b9172ffa121564cfbee869c532 Mon Sep 17 00:00:00 2001 From: Lanrik Date: Mon, 20 Feb 2017 13:48:19 +0400 Subject: [PATCH 184/190] Rearrange code (#4908) Minor refactor. Move assignment to after `None` check. --- 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 f46edef1e..2efe89610 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1446,11 +1446,11 @@ class FileField(Field): return data def to_representation(self, value): - use_url = getattr(self, 'use_url', api_settings.UPLOADED_FILES_USE_URL) - if not value: return None + use_url = getattr(self, 'use_url', api_settings.UPLOADED_FILES_USE_URL) + if use_url: if not getattr(value, 'url', None): # If the file has not been saved it may not have a URL. From d390762e18484bb82951db4f0ffd7c65dae7a71d Mon Sep 17 00:00:00 2001 From: Vadim Date: Mon, 20 Feb 2017 22:16:27 +0700 Subject: [PATCH 185/190] Add drf-writable-nested package to third-party serializers (#4913) --- docs/api-guide/serializers.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/api-guide/serializers.md b/docs/api-guide/serializers.md index 75d429eb4..a3f7fdcc1 100644 --- a/docs/api-guide/serializers.md +++ b/docs/api-guide/serializers.md @@ -1157,6 +1157,9 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [djangorestframework-queryfields][djangorestframework-queryfields] allows API clients to specify which fields will be sent in the response via inclusion/exclusion query parameters. +## DRF Writable Nested + +The [drf-writable-nested][drf-writable-nested] package provides writable nested model serializer which allows to create/update models with nested related data. [cite]: https://groups.google.com/d/topic/django-users/sVFaOfQi4wY/discussion [relations]: relations.md @@ -1177,3 +1180,4 @@ The [html-json-forms][html-json-forms] package provides an algorithm and seriali [drf-base64]: https://bitbucket.org/levit_scs/drf_base64 [drf-serializer-extensions]: https://github.com/evenicoulddoit/django-rest-framework-serializer-extensions [djangorestframework-queryfields]: http://djangorestframework-queryfields.readthedocs.io/ +[drf-writable-nested]: http://github.com/Brogency/drf-writable-nested From 1a493185228ad24a1f938b8414df7f6a7913873f Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 21 Feb 2017 10:31:05 +0600 Subject: [PATCH 186/190] added django 1.11 beta 1 for testing --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index abe045e15..b1be1a83c 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,7 @@ deps = django18: Django>=1.8,<1.9 django19: Django>=1.9,<1.10 django110: Django>=1.10,<1.11 - django111: Django>=1.11a1,<2.0 + django111: Django>=1.11b1,<2.0 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt From d82dbc09257a521e8d912880855e5758c758dafb Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 21 Feb 2017 21:18:53 +0000 Subject: [PATCH 187/190] Add MicroPyramid --- README.md | 3 ++- docs/img/premium/micropyramid-readme.png | Bin 0 -> 23782 bytes docs/index.md | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 docs/img/premium/micropyramid-readme.png diff --git a/README.md b/README.md index 609f99184..7d11aa081 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,10 @@ The initial aim is to provide a single full-time position on REST framework. +

    -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), and [Rollbar](https://rollbar.com).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), [Rollbar](https://rollbar.com), and [MicroPyramid](https://micropyramid.com/django-rest-framework-development-services/).* --- diff --git a/docs/img/premium/micropyramid-readme.png b/docs/img/premium/micropyramid-readme.png new file mode 100644 index 0000000000000000000000000000000000000000..9fa9500e14b2a9c215a112ef7ddb1f4f377538db GIT binary patch literal 23782 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

    0VM1Hnz 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 literal 0 HcmV?d00001 diff --git a/docs/index.md b/docs/index.md index 1760ce916..aada80737 100644 --- a/docs/index.md +++ b/docs/index.md @@ -76,10 +76,11 @@ The initial aim is to provide a single full-time position on REST framework.

  • Stream
  • Machinalis
  • Rollbar
    • +
  • MicroPyramid
    • -*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), and [Rollbar](https://rollbar.com).* +*Many thanks to all our [wonderful sponsors][sponsors], and in particular to our premium backers, [Rover](http://jobs.rover.com/), [Sentry](https://getsentry.com/welcome/), [Stream](https://getstream.io/?utm_source=drf&utm_medium=banner&utm_campaign=drf), [Machinalis](https://hello.machinalis.co.uk/), [Rollbar](https://rollbar.com), and [MicroPyramid](https://micropyramid.com/django-rest-framework-development-services/).* --- From 7a408f6cd2b67fd9c4f0d3a2240dec20d2a87a7b Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Wed, 22 Feb 2017 13:06:48 +0200 Subject: [PATCH 188/190] Guard against the possible misspelling `readonly_fields` in model serializers Fixes #4897. --- rest_framework/serializers.py | 9 +++++++++ tests/test_model_serializer.py | 16 ++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 80e384c22..94c37321f 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -1290,6 +1290,15 @@ class ModelSerializer(Serializer): kwargs['read_only'] = True extra_kwargs[field_name] = kwargs + else: + # Guard against the possible misspelling `readonly_fields` (used + # by the Django admin and others). + assert not hasattr(self.Meta, 'readonly_fields'), ( + 'Serializer `%s.%s` has field `readonly_fields`; ' + 'the correct spelling for the option is `read_only_fields`.' % + (self.__class__.__module__, self.__class__.__name__) + ) + return extra_kwargs def get_uniqueness_extra_kwargs(self, field_names, declared_fields, extra_kwargs): diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py index b839f56ca..cfa671125 100644 --- a/tests/test_model_serializer.py +++ b/tests/test_model_serializer.py @@ -10,6 +10,7 @@ from __future__ import unicode_literals import decimal from collections import OrderedDict +import pytest from django.core.exceptions import ImproperlyConfigured from django.core.validators import ( MaxValueValidator, MinLengthValidator, MinValueValidator @@ -1064,3 +1065,18 @@ class Issue3674Test(TestCase): child_expected = {'parent': 1, 'value': 'def'} self.assertEqual(child_serializer.data, child_expected) + + +class Issue4897TestCase(TestCase): + def test_should_assert_if_writing_readonly_fields(self): + class TestSerializer(serializers.ModelSerializer): + class Meta: + model = OneFieldModel + fields = ('char_field',) + readonly_fields = fields + + obj = OneFieldModel.objects.create(char_field='abc') + + with pytest.raises(AssertionError) as cm: + TestSerializer(obj).fields + cm.match(r'readonly_fields') From e922d916146701808c663844ed0c695279d8b508 Mon Sep 17 00:00:00 2001 From: Anna Ossowski Date: Fri, 24 Feb 2017 13:55:34 +0100 Subject: [PATCH 189/190] Created Tutorials and Resources, cleaned up Third Party Packages (#4910) * Updated Support section and added funding email * Created new tutorials and resources section, cleaned up third party packages section * Created Jobs section --- LICENSE.md | 2 +- docs/index.md | 8 +- docs/topics/jobs.md | 38 ++++++ ...y-resources.md => third-party-packages.md} | 48 +------- docs/topics/tutorials-and-resources.md | 109 ++++++++++++++++++ mkdocs.yml | 4 +- 6 files changed, 160 insertions(+), 49 deletions(-) create mode 100644 docs/topics/jobs.md rename docs/topics/{third-party-resources.md => third-party-packages.md} (85%) create mode 100644 docs/topics/tutorials-and-resources.md diff --git a/LICENSE.md b/LICENSE.md index aca195ec4..4c599a394 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # License -Copyright (c) 2011-2016, Tom Christie +Copyright (c) 2011-2017, 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 aada80737..4abfba587 100644 --- a/docs/index.md +++ b/docs/index.md @@ -238,7 +238,8 @@ 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] +* [Third Party Packages][third-party-packages] +* [Tutorials and Resources][tutorials-and-resources] * [Contributing to REST framework][contributing] * [Project management][project-management] * [3.0 Announcement][3.0-announcement] @@ -251,6 +252,7 @@ General guides to using REST framework. * [Mozilla Grant][mozilla-grant] * [Funding][funding] * [Release Notes][release-notes] +* [Jobs][jobs] ## Development @@ -367,7 +369,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [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 +[third-party-packages]: topics/third-party-packages.md +[tutorials-and-resources]: topics/tutorials-and-resources.md [3.0-announcement]: topics/3.0-announcement.md [3.1-announcement]: topics/3.1-announcement.md [3.2-announcement]: topics/3.2-announcement.md @@ -378,6 +381,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [mozilla-grant]: topics/mozilla-grant.md [funding]: topics/funding.md [release-notes]: topics/release-notes.md +[jobs]: topics/jobs.md [tox]: http://testrun.org/tox/latest/ diff --git a/docs/topics/jobs.md b/docs/topics/jobs.md new file mode 100644 index 000000000..9c5e95c59 --- /dev/null +++ b/docs/topics/jobs.md @@ -0,0 +1,38 @@ +# Jobs + +Looking for a new Django REST Framework related role? On this site we provide a list of job resources that may be helpful. It's also worth checking out if any of [our sponsors are hiring][drf-funding]. + + +## Places to Look for Django REST Framework Jobs + +* [https://www.djangoproject.com/community/jobs/][djangoproject-website] +* [https://www.python.org/jobs/][python-org-jobs] +* [https://djangogigs.com][django-gigs-com] +* [https://djangojobs.net/jobs/][django-jobs-net] +* [http://djangojobbers.com][django-jobbers-com] +* [https://www.indeed.com/q-Django-jobs.html][indeed-com] +* [http://stackoverflow.com/jobs/developer-jobs-using-django][stackoverflow-com] +* [https://www.upwork.com/o/jobs/browse/skill/django-framework/][upwork-com] +* [https://www.technojobs.co.uk/django-jobs][technobjobs-co-uk] +* [https://remoteok.io/remote-django-jobs][remoteok-io] +* [https://www.remotepython.com/jobs/][remotepython-com] + + +Know of any other great resources for Django REST Framework jobs that are missing in our list? Please [submit a pull request][submit-pr] or [email us][mailto:anna@django-rest-framework.org]. + +Wonder how else you can help? One of the best ways you can help Django REST Framework is to ask interviewers if their company is signed up for [REST Framework sponsorship][drf-funding] yet. + + +[djangoproject-website]: https://www.djangoproject.com/community/jobs/ +[python-org-jobs]: https://www.python.org/jobs/ +[django-gigs-com]: https://djangogigs.com +[django-jobs-net]: https://djangojobs.net/jobs/ +[django-jobbers-com]: http://djangojobbers.com +[indeed-com]: https://www.indeed.com/q-Django-jobs.html +[stackoverflow-com]: http://stackoverflow.com/jobs/developer-jobs-using-django +[upwork-com]: https://www.upwork.com/o/jobs/browse/skill/django-framework/ +[technobjobs-co-uk]: https://www.technojobs.co.uk/django-jobs +[remoteok-io]: https://remoteok.io/remote-django-jobs +[remotepython-com]: https://www.remotepython.com/jobs/ +[drf-funding]: https://fund.django-rest-framework.org/topics/funding/ +[submit-pr]: https://github.com/tomchristie/django-rest-framework diff --git a/docs/topics/third-party-resources.md b/docs/topics/third-party-packages.md similarity index 85% rename from docs/topics/third-party-resources.md rename to docs/topics/third-party-packages.md index 1ccedbc01..d092e163e 100644 --- a/docs/topics/third-party-resources.md +++ b/docs/topics/third-party-packages.md @@ -1,4 +1,4 @@ -# Third Party Resources +# Third Party Packages > Software ecosystems […] establish a community that further accelerates the sharing of knowledge, content, issues, expertise and skills. > @@ -165,7 +165,7 @@ We suggest adding your package to the [REST Framework][rest-framework-grid] grid #### 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. +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 Packages][third-party-packages] section. #### Announce on the discussion group. @@ -261,33 +261,6 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque * [django-rest-framework-version-transforms][django-rest-framework-version-transforms] - Enables the use of delta transformations for versioning of DRF resource representations. * [django-rest-messaging][django-rest-messaging], [django-rest-messaging-centrifugo][django-rest-messaging-centrifugo] and [django-rest-messaging-js][django-rest-messaging-js] - A real-time pluggable messaging service using DRM. -## Other Resources - -### Tutorials - -* [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] -* [Django REST Framework course][django-rest-framework-course] - -### Videos - -* [Ember and Django Part 1 (Video)][ember-and-django-part 1-video] -* [Django Rest Framework Part 1 (Video)][django-rest-framework-part-1-video] - -### 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] -* [Blog posts about Django REST framework][medium-django-rest-framework] - -### Documentations -* [Classy Django REST Framework][cdrf.co] [cite]: http://www.software-ecosystems.com/Software_Ecosystems/Ecosystems.html [cookiecutter]: https://github.com/jpadilla/cookiecutter-django-rest-framework @@ -304,7 +277,7 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [drf-create-issue]: https://github.com/tomchristie/django-rest-framework/issues/new [authentication]: ../api-guide/authentication.md [permissions]: ../api-guide/permissions.md -[third-party-resources]: ../topics/third-party-resources/#existing-third-party-packages +[third-party-packages]: ../topics/third-party-packages/#existing-third-party-packages [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 @@ -337,22 +310,9 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [gaiarestframework]: https://github.com/AppsFuel/gaiarestframework [drf-extensions]: https://github.com/chibisov/drf-extensions [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://mourafiq.com/2013/07/01/end-to-end-web-app-with-django-angular-1.html -[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 -[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/ [django-versatileimagefield]: https://github.com/WGBH/django-versatileimagefield [django-versatileimagefield-drf-docs]:https://django-versatileimagefield.readthedocs.io/en/latest/drf_integration.html -[cdrf.co]:http://www.cdrf.co [drf-tracking]: https://github.com/aschn/drf-tracking [django-rest-framework-braces]: https://github.com/dealertrack/django-rest-framework-braces [dry-rest-permissions]: https://github.com/Helioscene/dry-rest-permissions @@ -366,8 +326,6 @@ To submit new content, [open an issue][drf-create-issue] or [create a pull reque [django-rest-messaging]: https://github.com/raphaelgyory/django-rest-messaging [django-rest-messaging-centrifugo]: https://github.com/raphaelgyory/django-rest-messaging-centrifugo [django-rest-messaging-js]: https://github.com/raphaelgyory/django-rest-messaging-js -[medium-django-rest-framework]: https://medium.com/django-rest-framework -[django-rest-framework-course]: https://teamtreehouse.com/library/django-rest-framework [drf_tweaks]: https://github.com/ArabellaTech/drf_tweaks [drf-oidc-auth]: https://github.com/ByteInternet/drf-oidc-auth [drf-serializer-extensions]: https://github.com/evenicoulddoit/django-rest-framework-serializer-extensions diff --git a/docs/topics/tutorials-and-resources.md b/docs/topics/tutorials-and-resources.md new file mode 100644 index 000000000..3bbe52e44 --- /dev/null +++ b/docs/topics/tutorials-and-resources.md @@ -0,0 +1,109 @@ +# Tutorials and Resources + +There are a wide range of resources available for learning and using Django REST framework. We try to keep a comprehensive list available here. + +## Tutorials + +* [Beginner's Guide to the Django REST Framework][beginners-guide-to-the-django-rest-framework] +* [Django REST Framework - An Introduction][drf-an-intro] +* [Django REST Framework Tutorial][drf-tutorial] +* [Django REST Framework Course][django-rest-framework-course] +* [Building a RESTful API with Django REST Framework][building-a-restful-api-with-drf] +* [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] +* [Creating a Production Ready API with Python and Django REST Framework – Part 1][creating-a-production-ready-api-with-python-and-drf-part1] +* [Creating a Production Ready API with Python and Django REST Framework – Part 2][creating-a-production-ready-api-with-python-and-drf-part2] + + +## Videos + +### Talks + +* [How to Make a Full Fledged REST API with Django OAuth Toolkit][full-fledged-rest-api-with-django-oauth-tookit] +* [Django REST API - So Easy You Can Learn It in 25 Minutes][django-rest-api-so-easy] +* [Tom Christie about Django Rest Framework at Django: Under The Hood][django-under-hood-2014] +* [Django REST Framework: Schemas, Hypermedia & Client Libraries][pycon-uk-2016] + + +### Tutorials + + +* [Django REST Framework Part 1][django-rest-framework-part-1-video] +* [Django REST Framework in Your PJ's!][drf-in-your-pjs] +* [Building a REST API Using Django & Django REST Framework][building-a-rest-api-using-django-and-drf] +* [Blog API with Django REST Framework][blog-api-with-drf] +* [Ember and Django Part 1][ember-and-django-part 1-video] +* [Django REST Framework Image Upload Tutorial (with AngularJS)][drf-image-upload-tutorial-with-angularjs] +* [Django REST Framework Tutorials][drf-tutorials] + + +## 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] +* [Integrating Pandas, Django REST Framework and Bokeh][integrating-pandas-drf-and-bokeh] +* [Controlling Uncertainty on Web Applications and APIs][controlling-uncertainty-on-web-apps-and-apis] +* [Full Text Search in Django REST Framework with Database Backends][full-text-search-in-drf] +* [OAuth2 Authentication with Django REST Framework and Custom Third-Party OAuth2 Backends][oauth2-authentication-with-drf] +* [Nested Resources with Django REST Framework][nested-resources-with-drf] +* [Image Fields with Django REST Framework][image-fields-with-drf] +* [Chatbot Using Django REST Framework + api.ai + Slack — Part 1/3][chatbot-using-drf-part1] +* [New Django Admin with DRF and EmberJS... What are the News?][new-django-admin-with-drf-and-emberjs] +* [Blog posts about Django REST Framework][medium-django-rest-framework] + +## Books + +* [Hello Web App: Intermediate Concepts, Chapter 10][hello-web-app-intermediate] + +### Documentations +* [Classy Django REST Framework][cdrf.co] +* [DRF-schema-adapter][drf-schema] + +Want your Django REST Framework talk/tutorial/article to be added to our website? Or know of a resource that's not yet included here? Please [submit a pull request][submit-pr] or [email us][mailto:anna@django-rest-framework.org]! + + +[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://mourafiq.com/2013/07/01/end-to-end-web-app-with-django-angular-1.html +[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 +[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/ +[cdrf.co]:http://www.cdrf.co +[medium-django-rest-framework]: https://medium.com/django-rest-framework +[django-rest-framework-course]: https://teamtreehouse.com/library/django-rest-framework +[pycon-uk-2016]: https://www.youtube.com/watch?v=FjmiGh7OqVg +[django-under-hood-2014]: https://www.youtube.com/watch?v=3cSsbe-tA0E +[integrating-pandas-drf-and-bokeh]: http://machinalis.com/blog/pandas-django-rest-framework-bokeh/ +[controlling-uncertainty-on-web-apps-and-apis]: http://machinalis.com/blog/controlling-uncertainty-on-web-applications-and-apis/ +[full-text-search-in-drf]: http://machinalis.com/blog/full-text-search-on-django-rest-framework/ +[oauth2-authentication-with-drf]: http://machinalis.com/blog/oauth2-authentication/ +[nested-resources-with-drf]: http://machinalis.com/blog/nested-resources-with-django/ +[image-fields-with-drf]: http://machinalis.com/blog/image-fields-with-django-rest-framework/ +[chatbot-using-drf-part1]: https://chatbotslife.com/chatbot-using-django-rest-framework-api-ai-slack-part-1-3-69c7e38b7b1e#.g2aceuncf +[new-django-admin-with-drf-and-emberjs]: https://blog.levit.be/new-django-admin-with-emberjs-what-are-the-news/ +[drf-schema]: http://drf-schema-adapter.readthedocs.io/en/latest/ +[creating-a-production-ready-api-with-python-and-drf-part1]: https://www.andreagrandi.it/2016/09/28/creating-production-ready-api-python-django-rest-framework-part-1/ +[creating-a-production-ready-api-with-python-and-drf-part2]: https://www.andreagrandi.it/2016/10/01/creating-a-production-ready-api-with-python-and-django-rest-framework-part-2/ +[hello-web-app-intermediate]: https://hellowebapp.com/order/ +[django-rest-api-so-easy]: https://www.youtube.com/watch?v=cqP758k1BaQ +[full-fledged-rest-api-with-django-oauth-tookit]: https://www.youtube.com/watch?v=M6Ud3qC2tTk +[drf-in-your-pjs]: https://www.youtube.com/watch?v=xMtHsWa72Ww +[building-a-rest-api-using-django-and-drf]: https://www.youtube.com/watch?v=PwssEec3IRw +[drf-tutorials]: https://www.youtube.com/watch?v=axRCBgbOJp8&list=PLJtp8Jm8EDzjgVg9vVyIUMoGyqtegj7FH +[drf-image-upload-tutorial-with-angularjs]: https://www.youtube.com/watch?v=hMiNTCIY7dw&list=PLUe5s-xycYk_X0vDjYBmKuIya2a2myF8O +[blog-api-with-drf]: https://www.youtube.com/watch?v=XMu0T6L2KRQ&list=PLEsfXFp6DpzTOcOVdZF-th7BS_GYGguAS +[drf-an-intro]: https://realpython.com/blog/python/django-rest-framework-quick-start/ +[drf-tutorial]: https://tests4geeks.com/django-rest-framework-tutorial/ +[building-a-restful-api-with-drf]: http://agiliq.com/blog/2014/12/building-a-restful-api-with-django-rest-framework/ +[submit-pr]: https://github.com/tomchristie/django-rest-framework diff --git a/mkdocs.yml b/mkdocs.yml index 01c59caaa..6c57618ae 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -58,7 +58,8 @@ pages: - 'Browser Enhancements': 'topics/browser-enhancements.md' - 'The Browsable API': 'topics/browsable-api.md' - 'REST, Hypermedia & HATEOAS': 'topics/rest-hypermedia-hateoas.md' - - 'Third Party Resources': 'topics/third-party-resources.md' + - 'Third Party Packages': 'topics/third-party-packages.md' + - 'Tutorials and Resources': 'topics/tutorials-and-resources.md' - 'Contributing to REST framework': 'topics/contributing.md' - 'Project management': 'topics/project-management.md' - '3.0 Announcement': 'topics/3.0-announcement.md' @@ -71,3 +72,4 @@ pages: - 'Mozilla Grant': 'topics/mozilla-grant.md' - 'Funding': 'topics/funding.md' - 'Release Notes': 'topics/release-notes.md' + - 'Jobs': 'topics/jobs.md' From b936d829a6b77fe344d2021ae41e89dd66eba4d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Padilla?= Date: Sun, 26 Feb 2017 04:08:03 -0500 Subject: [PATCH 190/190] Fix mailto link (#4923) --- docs/topics/jobs.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/topics/jobs.md b/docs/topics/jobs.md index 9c5e95c59..9c67483a8 100644 --- a/docs/topics/jobs.md +++ b/docs/topics/jobs.md @@ -18,7 +18,7 @@ Looking for a new Django REST Framework related role? On this site we provide a * [https://www.remotepython.com/jobs/][remotepython-com] -Know of any other great resources for Django REST Framework jobs that are missing in our list? Please [submit a pull request][submit-pr] or [email us][mailto:anna@django-rest-framework.org]. +Know of any other great resources for Django REST Framework jobs that are missing in our list? Please [submit a pull request][submit-pr] or [email us][anna-email]. Wonder how else you can help? One of the best ways you can help Django REST Framework is to ask interviewers if their company is signed up for [REST Framework sponsorship][drf-funding] yet. @@ -36,3 +36,4 @@ Wonder how else you can help? One of the best ways you can help Django REST Fram [remotepython-com]: https://www.remotepython.com/jobs/ [drf-funding]: https://fund.django-rest-framework.org/topics/funding/ [submit-pr]: https://github.com/tomchristie/django-rest-framework +[anna-email]: mailto:anna@django-rest-framework.org