+ 
+ 
-Django REST framework is a powerful and flexible toolkit that makes it easy to build Web APIs.
+Django REST framework is a powerful and flexible toolkit for building Web APIs.
Some reasons you might want to use REST framework:
@@ -49,13 +50,14 @@ Some reasons you might want to use REST framework:
REST framework requires the following:
-* Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
-* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7+, 1.8)
+* Python (2.7, 3.2, 3.3, 3.4, 3.5)
+* Django (1.7+, 1.8, 1.9)
The following packages are optional:
* [Markdown][markdown] (2.1.0+) - Markdown support for the browsable API.
* [django-filter][django-filter] (0.9.2+) - Filtering support.
+* [django-crispy-forms][django-crispy-forms] - Improved HTML display for filtering.
* [django-guardian][django-guardian] (1.1.1+) - Object level permissions support.
## Installation
@@ -84,7 +86,7 @@ If you're intending to use the browsable API you'll probably also want to add RE
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
]
-Note that the URL path can be whatever you want, but you must include `'rest_framework.urls'` with the `'rest_framework'` namespace.
+Note that the URL path can be whatever you want, but you must include `'rest_framework.urls'` with the `'rest_framework'` namespace. You may leave out the namespace in Django 1.9+, and REST framework will set it for you.
## Example
@@ -188,7 +190,9 @@ The API guide is your complete reference manual to all the functionality provide
General guides to using REST framework.
* [Documenting your API][documenting-your-api]
+* [Internationalization][internationalization]
* [AJAX, CSRF & CORS][ajax-csrf-cors]
+* [HTML & Forms][html-and-forms]
* [Browser enhancements][browser-enhancements]
* [The Browsable API][browsableapi]
* [REST, Hypermedia & HATEOAS][rest-hypermedia-hateoas]
@@ -197,6 +201,8 @@ General guides to using REST framework.
* [Project management][project-management]
* [3.0 Announcement][3.0-announcement]
* [3.1 Announcement][3.1-announcement]
+* [3.2 Announcement][3.2-announcement]
+* [3.3 Announcement][3.3-announcement]
* [Kickstarter Announcement][kickstarter-announcement]
* [Release Notes][release-notes]
@@ -248,12 +254,11 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-[travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master
-[travis-build-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master
[mozilla]: http://www.mozilla.org/en-US/about/
[eventbrite]: https://www.eventbrite.co.uk/about/
[markdown]: http://pypi.python.org/pypi/Markdown/
[django-filter]: http://pypi.python.org/pypi/django-filter
+[django-crispy-forms]: https://github.com/maraujop/django-crispy-forms
[django-guardian]: https://github.com/lukaszb/django-guardian
[0.4]: https://github.com/tomchristie/django-rest-framework/tree/0.4.X
[image]: img/quickstart.png
@@ -301,8 +306,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[settings]: api-guide/settings.md
[documenting-your-api]: topics/documenting-your-api.md
-[internationalization]: topics/documenting-your-api.md
+[internationalization]: topics/internationalization.md
[ajax-csrf-cors]: topics/ajax-csrf-cors.md
+[html-and-forms]: topics/html-and-forms.md
[browser-enhancements]: topics/browser-enhancements.md
[browsableapi]: topics/browsable-api.md
[rest-hypermedia-hateoas]: topics/rest-hypermedia-hateoas.md
@@ -311,7 +317,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[third-party-resources]: topics/third-party-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
+[3.3-announcement]: topics/3.3-announcement.md
[kickstarter-announcement]: topics/kickstarter-announcement.md
+[funding]: topics/funding.md
[release-notes]: topics/release-notes.md
[tox]: http://testrun.org/tox/latest/
diff --git a/docs/topics/3.0-announcement.md b/docs/topics/3.0-announcement.md
index 59fe779c..89f9e800 100644
--- a/docs/topics/3.0-announcement.md
+++ b/docs/topics/3.0-announcement.md
@@ -940,7 +940,7 @@ The default JSON renderer will return float objects for un-coerced `Decimal` ins
* The serializer `ChoiceField` does not currently display nested choices, as was the case in 2.4. This will be address as part of 3.1.
* Due to the new templated form rendering, the 'widget' option is no longer valid. This means there's no easy way of using third party "autocomplete" widgets for rendering select inputs that contain a large number of choices. You'll either need to use a regular select or a plain text input. We may consider addressing this in 3.1 or 3.2 if there's sufficient demand.
* Some of the default validation error messages were rewritten and might no longer be pre-translated. You can still [create language files with Django][django-localization] if you wish to localize them.
-* `APIException` subclasses could previously take could previously take any arbitrary type in the `detail` argument. These exceptions now use translatable text strings, and as a result call `force_text` on the `detail` argument, which *must be a string*. If you need complex arguments to an `APIException` class, you should subclass it and override the `__init__()` method. Typically you'll instead want to use a custom exception handler to provide for non-standard error responses.
+* `APIException` subclasses could previously take any arbitrary type in the `detail` argument. These exceptions now use translatable text strings, and as a result call `force_text` on the `detail` argument, which *must be a string*. If you need complex arguments to an `APIException` class, you should subclass it and override the `__init__()` method. Typically you'll instead want to use a custom exception handler to provide for non-standard error responses.
---
diff --git a/docs/topics/3.2-announcement.md b/docs/topics/3.2-announcement.md
new file mode 100644
index 00000000..f0cc09a4
--- /dev/null
+++ b/docs/topics/3.2-announcement.md
@@ -0,0 +1,113 @@
+# Django REST framework 3.2
+
+The 3.2 release is the first version to include an admin interface for the browsable API.
+
+
+
+This interface is intended to act as a more user-friendly interface to the API. It can be used either as a replacement to the existing `BrowsableAPIRenderer`, or used together with it, allowing you to switch between the two styles as required.
+
+We've also fixed a huge number of issues, and made numerous cleanups and improvements.
+
+Over the course of the 3.1.x series we've [resolved nearly 600 tickets](https://github.com/tomchristie/django-rest-framework/issues?utf8=%E2%9C%93&q=closed%3A%3E2015-03-05) on our GitHub issue tracker. This means we're currently running at a rate of **closing around 100 issues or pull requests per month**.
+
+None of this would have been possible without the support of our wonderful Kickstarter backers. If you're looking for a job in Django development we'd strongly recommend taking [a look through our sponsors](http://www.django-rest-framework.org/topics/kickstarter-announcement/#sponsors) and finding out who's hiring.
+
+## AdminRenderer
+
+To include `AdminRenderer` simply add it to your settings:
+
+ REST_FRAMEWORK = {
+ 'DEFAULT_RENDERER_CLASSES': [
+ 'rest_framework.renderers.JSONRenderer',
+ 'rest_framework.renderers.AdminRenderer',
+ 'rest_framework.renderers.BrowsableAPIRenderer'
+ ],
+ 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
+ 'PAGE_SIZE': 100
+ }
+
+There are some limitations to the `AdminRenderer`, in particular it is not yet able to handle list or dictionary inputs, as we do not have any HTML form fields that support those.
+
+Also note that this is an initial release and we do not yet have a public API for modifying the behavior or documentation on overriding the templates.
+
+The idea is to get this released to users early, so we can start getting feedback and release a more fully featured version in 3.3.
+
+## Supported versions
+
+This release drops support for Django 1.4.
+
+Our supported Django versions are now 1.5.6+, 1.6.3+, 1.7 and 1.8.
+
+## Deprecations
+
+There are no new deprecations in 3.2, although a number of existing deprecations have now escalated in line with our deprecation policy.
+
+* `request.DATA` was put on the deprecation path in 3.0. It has now been removed and its usage will result in an error. Use the more pythonic style of `request.data` instead.
+* `request.QUERY_PARAMS` was put on the deprecation path in 3.0. It has now been removed and its usage will result in an error. Use the more pythonic style of `request.query_params` instead.
+* The following `ModelSerializer.Meta` options have now been removed: `write_only_fields`, `view_name`, `lookup_field`. Use the more general `extra_kwargs` option instead.
+
+The following pagination view attributes and settings have been moved into attributes on the pagination class since 3.1. Their usage was formerly in 'pending deprecation', and has now escalated to 'deprecated'. They will continue to function but will raise errors.
+
+* `view.paginate_by` - Use `paginator.page_size` instead.
+* `view.page_query_param` - Use `paginator.page_query_param` instead.
+* `view.paginate_by_param` - Use `paginator.page_size_query_param` instead.
+* `view.max_paginate_by` - Use `paginator.max_page_size` instead.
+* `settings.PAGINATE_BY` - Use `paginator.page_size` instead.
+* `settings.PAGINATE_BY_PARAM` - Use `paginator.page_size_query_param` instead.
+* `settings.MAX_PAGINATE_BY` - Use `max_page_size` instead.
+
+## Modifications to list behaviors
+
+There are a couple of bug fixes that are worth calling out as they introduce differing behavior.
+
+These are a little subtle and probably won't affect most users, but are worth understanding before upgrading your project.
+
+### ManyToMany fields and blank=True
+
+We've now added an `allow_empty` argument, which can be used with `ListSerializer`, or with `many=True` relationships. This is `True` by default, but can be set to `False` if you want to disallow empty lists as valid input.
+
+As a follow-up to this we are now able to properly mirror the behavior of Django's `ModelForm` with respect to how many-to-many fields are validated.
+
+Previously a many-to-many field on a model would map to a serializer field that would allow either empty or non-empty list inputs. Now, a many-to-many field will map to a serializer field that requires at least one input, unless the model field has `blank=True` set.
+
+Here's what the mapping looks like in practice:
+
+* `models.ManyToManyField()` → `serializers.PrimaryKeyRelatedField(many=True, allow_empty=False)`
+* `models.ManyToManyField(blank=True)` → `serializers.PrimaryKeyRelatedField(many=True)`
+
+The upshot is this: If you have many to many fields in your models, then make sure you've included the argument `blank=True` if you want to allow empty inputs in the equivalent `ModelSerializer` fields.
+
+### List fields and allow_null
+
+When using `allow_null` with `ListField` or a nested `many=True` serializer the previous behavior was to allow `null` values as items in the list. The behavior is now to allow `null` values instead of the list.
+
+For example, take the following field:
+
+ NestedSerializer(many=True, allow_null=True)
+
+Previously the validation behavior would be:
+
+* `[{…}, null, {…}]` is **valid**.
+* `null` is **invalid**.
+
+Our validation behavior as of 3.2.0 is now:
+
+* `[{…}, null, {…}]` is **invalid**.
+* `null` is **valid**.
+
+If you want to allow `null` child items, you'll need to instead specify `allow_null` on the child class, using an explicit `ListField` instead of `many=True`. For example:
+
+ ListField(child=NestedSerializer(allow_null=True))
+
+## What's next?
+
+The 3.3 release is currently planned for the start of October, and will be the last Kickstarter-funded release.
+
+This release is planned to include:
+
+* Search and filtering controls in the browsable API and admin interface.
+* Improvements and public API for the admin interface.
+* Improvements and public API for our templated HTML forms and fields.
+* Nested object and list support in HTML forms.
+
+Thanks once again to all our sponsors and supporters.
\ No newline at end of file
diff --git a/docs/topics/3.3-announcement.md b/docs/topics/3.3-announcement.md
new file mode 100644
index 00000000..d1a8f4da
--- /dev/null
+++ b/docs/topics/3.3-announcement.md
@@ -0,0 +1,58 @@
+# Django REST framework 3.3
+
+The 3.3 release marks the final work in the Kickstarter funded series. We'd like to offer a final resounding **thank you** to all our wonderful sponsors and supporters.
+
+The amount of work that has been achieved as a direct result of the funding is immense. We've added a huge amounts of new functionality, resolved nearly 2,000 tickets, and redesigned & refined large parts of the project.
+
+In order to continue driving REST framework forward, we'll shortly be announcing a new set of funding plans. Follow [@_tomchristie](https://twitter.com/_tomchristie) to keep up to date with these announcements, and be among the first set of sign ups.
+
+We strongly believe that collaboratively funded software development yields outstanding results for a relatively low investment-per-head. If you or your company use REST framework commercially, then we would strongly urge you to participate in this latest funding drive, and help us continue to build an increasingly polished & professional product.
+
+---
+
+## Release notes
+
+Significant new functionality in the 3.3 release includes:
+
+* Filters presented as HTML controls in the browsable API.
+* A [forms API][forms-api], allowing serializers to be rendered as HTML forms.
+* Django 1.9 support.
+* A [`JSONField` serializer field][jsonfield], corresponding to Django 1.9's Postgres `JSONField` model field.
+* Browsable API support [via AJAX][ajax-form], rather than server side request overloading.
+
+
+
+*Example of the new filter controls*
+
+---
+
+## Supported versions
+
+This release drops support for Django 1.5 and 1.6. Django 1.7, 1.8 or 1.9 are now required.
+
+This brings our supported versions into line with Django's [currently supported versions][django-supported-versions]
+
+## Deprecations
+
+The AJAX based support for the browsable API means that there are a number of internal cleanups in the `request` class. For the vast majority of developers this should largely remain transparent:
+
+* To support form based `PUT` and `DELETE`, or to support form content types such as JSON, you should now use the [AJAX forms][ajax-form] javascript library. This replaces the previous 'method and content type overloading' that required significant internal complexity to the request class.
+* The `accept` query parameter is no longer supported by the default content negotiation class. If you require it then you'll need to [use a custom content negotiation class](browser-enhancements.md#url-based-accept-headers).
+* The custom `HTTP_X_HTTP_METHOD_OVERRIDE` header is no longer supported by default. If you require it then you'll need to [use custom middleware](browser-enhancements.md#http-header-based-method-overriding).
+
+The following pagination view attributes and settings have been moved into attributes on the pagination class since 3.1. Their usage was formerly deprecated, and has now been removed entirely, in line with the deprecation policy.
+
+* `view.paginate_by` - Use `paginator.page_size` instead.
+* `view.page_query_param` - Use `paginator.page_query_param` instead.
+* `view.paginate_by_param` - Use `paginator.page_size_query_param` instead.
+* `view.max_paginate_by` - Use `paginator.max_page_size` instead.
+* `settings.PAGINATE_BY` - Use `paginator.page_size` instead.
+* `settings.PAGINATE_BY_PARAM` - Use `paginator.page_size_query_param` instead.
+* `settings.MAX_PAGINATE_BY` - Use `paginator.max_page_size` instead.
+
+The `ModelSerializer` and `HyperlinkedModelSerializer` classes should now include either a `fields` or `exclude` option, although the `fields = '__all__'` shortcut may be used. Failing to include either of these two options is currently pending deprecation, and will be removed entirely in the 3.5 release. This behavior brings `ModelSerializer` more closely in line with Django's `ModelForm` behavior.
+
+[forms-api]: html-and-forms.md
+[ajax-form]: https://github.com/tomchristie/ajax-form
+[jsonfield]: ../../api-guide/fields#jsonfield
+[django-supported-versions]: https://www.djangoproject.com/download/#supported-versions
\ No newline at end of file
diff --git a/docs/topics/browsable-api.md b/docs/topics/browsable-api.md
index 2879db74..0e12f925 100644
--- a/docs/topics/browsable-api.md
+++ b/docs/topics/browsable-api.md
@@ -35,7 +35,7 @@ To replace the default theme, add a `bootstrap_theme` block to your `api.html` a
{% endblock %}
-A suitable replacement theme can be generated using Bootstrap's [Customize Tool][bcustomize]. There are also pre-made themes available at [Bootswatch][bswatch]. To use any of the Bootswatch themes, simply download the theme's `bootstrap.min.css` file, add it to your project, and replace the default one as described above.
+Suitable pre-made replacement themes are available at [Bootswatch][bswatch]. To use any of the Bootswatch themes, simply download the theme's `bootstrap.min.css` file, add it to your project, and replace the default one as described above.
You can also change the navbar variant, which by default is `navbar-inverse`, using the `bootstrap_navbar_variant` block. The empty `{% block bootstrap_navbar_variant %}{% endblock %}` will use the original Bootstrap navbar style.
@@ -75,7 +75,6 @@ All of the blocks available in the browsable API base template that can be used
* `bootstrap_navbar_variant` - CSS class for the navbar.
* `branding` - Branding section of the navbar, see [Bootstrap components][bcomponentsnav].
* `breadcrumbs` - Links showing resource nesting, allowing the user to go back up the resources. It's recommended to preserve these, but they can be overridden using the breadcrumbs block.
-* `footer` - Any copyright notices or similar footer materials can go here (by default right-aligned).
* `script` - JavaScript files for the page.
* `style` - CSS stylesheets for the page.
* `title` - Title of the page.
diff --git a/docs/topics/browser-enhancements.md b/docs/topics/browser-enhancements.md
index 5a172620..e1977e82 100644
--- a/docs/topics/browser-enhancements.md
+++ b/docs/topics/browser-enhancements.md
@@ -4,58 +4,36 @@
>
> — [RESTful Web Services][cite], Leonard Richardson & Sam Ruby.
+In order to allow the browsable API to function, there are a couple of browser enhancements that REST framework needs to provide.
+
+As of version 3.3.0 onwards these are enabled with javascript, using the [ajax-form][ajax-form] library.
+
## Browser based PUT, DELETE, etc...
-REST framework supports browser-based `PUT`, `DELETE` and other methods, by
-overloading `POST` requests using a hidden form field.
+The [AJAX form library][ajax-form] supports browser-based `PUT`, `DELETE` and other methods on HTML forms.
-Note that this is the same strategy as is used in [Ruby on Rails][rails].
+After including the library, use the `data-method` attribute on the form, like so:
-For example, given the following form:
-
-
-`request.method` would return `"DELETE"`.
-
-## HTTP header based method overriding
-
-REST framework also supports method overriding via the semi-standard `X-HTTP-Method-Override` header. This can be useful if you are working with non-form content such as JSON and are working with an older web server and/or hosting provider that doesn't recognise particular HTTP methods such as `PATCH`. For example [Amazon Web Services ELB][aws_elb].
-
-To use it, make a `POST` request, setting the `X-HTTP-Method-Override` header.
-
-For example, making a `PATCH` request via `POST` in jQuery:
-
- $.ajax({
- url: '/myresource/',
- method: 'POST',
- headers: {'X-HTTP-Method-Override': 'PATCH'},
- ...
- });
+Note that prior to 3.3.0, this support was server-side rather than javascript based. The method overloading style (as used in [Ruby on Rails][rails]) is no longer supported due to subtle issues that it introduces in request parsing.
## Browser based submission of non-form content
-Browser-based submission of content types other than form are supported by
-using form fields named `_content` and `_content_type`:
+Browser-based submission of content types such as JSON are supported by the [AJAX form library][ajax-form], using form fields with `data-override='content-type'` and `data-override='content'` attributes.
-For example, given the following form:
+For example:
-
+
-`request.content_type` would return `"application/json"`, and
-`request.stream` would return `"{'count': 1}"`
-
-## URL based accept headers
-
-REST framework can take `?accept=application/json` style URL parameters,
-which allow the `Accept` header to be overridden.
-
-This can be useful for testing the API from a web browser, where you don't
-have any control over what is sent in the `Accept` header.
+Note that prior to 3.3.0, this support was server-side rather than javascript based.
## URL based format suffixes
@@ -63,8 +41,37 @@ REST framework can take `?format=json` style URL parameters, which can be a
useful shortcut for determining which content type should be returned from
the view.
-This is a more concise than using the `accept` override, but it also gives
-you less control. (For example you can't specify any media type parameters)
+This behavior is controlled using the `URL_FORMAT_OVERRIDE` setting.
+
+## HTTP header based method overriding
+
+Prior to version 3.3.0 the semi extension header `X-HTTP-Method-Override` was supported for overriding the request method. This behavior is no longer in core, but can be adding if needed using middleware.
+
+For example:
+
+ METHOD_OVERRIDE_HEADER = 'HTTP_X_HTTP_METHOD_OVERRIDE'
+
+ class MethodOverrideMiddleware(object):
+ def process_view(self, request, callback, callback_args, callback_kwargs):
+ if request.method != 'POST':
+ return
+ if METHOD_OVERRIDE_HEADER not in request.META:
+ return
+ request.method = request.META[METHOD_OVERRIDE_HEADER]
+
+## URL based accept headers
+
+Until version 3.3.0 REST framework included built-in support for `?accept=application/json` style URL parameters, which would allow the `Accept` header to be overridden.
+
+Since the introduction of the content negotiation API this behavior is no longer included in core, but may be added using a custom content negotiation class, if needed.
+
+For example:
+
+ class AcceptQueryParamOverride()
+ def get_accept_list(self, request):
+ header = request.META.get('HTTP_ACCEPT', '*/*')
+ header = request.query_params.get('_accept', header)
+ return [token.strip() for token in header.split(',')]
## Doesn't HTML5 support PUT and DELETE forms?
@@ -74,7 +81,7 @@ was later [dropped from the spec][html5]. There remains
as well as how to support content types other than form-encoded data.
[cite]: http://www.amazon.com/Restful-Web-Services-Leonard-Richardson/dp/0596529260
+[ajax-form]: https://github.com/tomchristie/ajax-form
[rails]: http://guides.rubyonrails.org/form_helpers.html#how-do-forms-with-put-or-delete-methods-work
[html5]: http://www.w3.org/TR/html5-diff/#changes-2010-06-24
[put_delete]: http://amundsen.com/examples/put-delete-forms/
-[aws_elb]: https://forums.aws.amazon.com/thread.jspa?messageID=400724
diff --git a/docs/topics/funding.md b/docs/topics/funding.md
new file mode 100644
index 00000000..7857f865
--- /dev/null
+++ b/docs/topics/funding.md
@@ -0,0 +1,314 @@
+
+
+
+
+# Funding
+
+If you use REST framework commercially we strongly encourage you to invest in its continued development by signing up for a paid plan.
+
+**We believe that collaboratively funded software can offer outstanding returns on investment, by allowing users and clients to collectively share the cost of development.**
+
+Signing up for a paid plan will:
+
+* Directly contribute to faster releases, more features and higher quality software.
+* Allow more time to be invested in documentation, issue triage and community support.
+* Safeguard the future development of REST framework.
+
+REST framework will always be open source and permissively licensed, but we firmly believe it is in the commercial best-interest for users of the project to fund its ongoing development.
+
+---
+
+## Making the business case
+
+Our successful Kickstarter campaign demonstrates the cost-reward ratio of shared development funding.
+
+With *typical corporate fundings of just £100-£1000 per organization* we successfully delivered:
+
+* The comprehensive 3.0 serializer redesign.
+* Substantial improvements to the Browsable API.
+* The admin interface.
+* A new pagination API including offset/limit and cursor pagination implementations, plus on-page controls.
+* A versioning API, including URL-based and header-based versioning schemes.
+* Support for customizable exception handling.
+* Support for Django's PostgreSQL HStoreField, ArrayField and JSONField.
+* Templated HTML form support, including HTML forms with nested list and objects.
+* Internationalization support for API responses, currently with 27 languages.
+* The metadata APIs for handling `OPTIONS` requests and schema endpoints.
+* Numerous minor improvements and better quality throughout the codebase.
+* Ongoing triage and community support, closing over 1600 tickets.
+
+This incredible level of return on investment is *only possible through collaboratively funded models*, which is why we believe that supporting our paid plans is in everyone's best interest.
+
+---
+
+## Individual plan
+
+This subscription is recommended for freelancers and other individuals with an interest in seeing REST framework continue to improve.
+
+If you are using REST framework as an full-time employee, consider recommending that your company takes out a [corporate plan](#corporate-plans).
+
+
+
+
+
+*Billing is monthly and you can cancel at any time.*
+
+---
+
+## Corporate plans
+
+These subscriptions are recommended for companies and organizations using REST framework either publicly or privately.
+
+In exchange for funding you'll also receive advertising space on our site, allowing you to **promote your company or product to many tens of thousands of developers worldwide**.
+
+Our professional and premium plans also include **priority support**. At any time your engineers can escalate an issue or discussion group thread, and we'll ensure it gets a guaranteed response within the next working day.
+
+
+
+
+
+
+ $
+ 15
+ /month
+
+ Individual
+
+
+
+
+ Support ongoing development
+
+
+ Credited on the site
+
+
+
+
+
+
+*Billing is monthly and you can cancel at any time.*
+
+Once you've signed up we'll contact you via email and arrange your ad placements on the site.
+
+For further enquires please contact tom@tomchristie.com.
+
+---
+
+## Roadmap
+
+Although we're incredibly proud of REST framework in its current state we believe there is still huge scope for improvement. What we're aiming for here is a *highly polished, rock solid product*. This needs to backed up with impeccable documentation and a great third party ecosystem.
+
+The roadmap below is a broad indication of just some of the ongoing and future work we believe is important to REST framework.
+
+* Increasing our "bus factor" through documented organizational process & safeguards.
+* More time towards testing and hardening releases, with only gradual, well-documented deprecations.
+* A formal policy on security backports for non-current releases.
+* Continuing triage & community support.
+* Improved project documentation, including versioned & internationalized docs.
+* Improved third party package visibility.
+* Refining the admin interface, ensuring it has a fully customizable API and making it suitable as end-user facing application.
+* Cleaning up internal complexities including the `BrowsableAPIRenderer` and `Request` object.
+* Support for alternative backends such as SQLAlchemy.
+* Support for non-database backed services.
+* HTTP Caching API & support for conditional database lookups.
+* Benchmarking and performance improvements.
+* In depth documentation on advanced usage and best practices.
+* Documentation & support for integration with realtime systems.
+* Hypermedia support and client libraries.
+* Support for JSON schema as endpoints or `OPTIONS` responses.
+* API metric tools.
+* Debug & logging tools.
+* Third party GraphQL support.
+
+By taking out a paid plan you'll be directly contributing towards making these features happen.
diff --git a/docs/topics/html-and-forms.md b/docs/topics/html-and-forms.md
new file mode 100644
index 00000000..7b8f1ccc
--- /dev/null
+++ b/docs/topics/html-and-forms.md
@@ -0,0 +1,219 @@
+# HTML & Forms
+
+REST framework is suitable for returning both API style responses, and regular HTML pages. Additionally, serializers can used as HTML forms and rendered in templates.
+
+## Rendering HTML
+
+In order to return HTML responses you'll need to either `TemplateHTMLRenderer`, or `StaticHTMLRenderer`.
+
+The `TemplateHTMLRenderer` class expects the response to contain a dictionary of context data, and renders an HTML page based on a template that must be specified either in the view or on the response.
+
+The `StaticHTMLRender` class expects the response to contain a string of the pre-rendered HTML content.
+
+Because static HTML pages typically have different behavior from API responses you'll probably need to write any HTML views explicitly, rather than relying on the built-in generic views.
+
+Here's an example of a view that returns a list of "Profile" instances, rendered in an HTML template:
+
+**views.py**:
+
+ from my_project.example.models import Profile
+ from rest_framework.renderers import TemplateHTMLRenderer
+ from rest_framework.response import Response
+ from rest_framework.views import APIView
+
+
+ class ProfileList(APIView):
+ renderer_classes = [TemplateHTMLRenderer]
+ template_name = 'profile_list.html'
+
+ def get(self, request):
+ queryset = Profile.objects.all()
+ return Response({'profiles': queryset})
+
+**profile_list.html**:
+
+
+
+
+
+
+
+ $
+ 50
+ /month
+
+ Basic
+
+
+
+
+ Support ongoing development
+
+
+ Funding page ad placement
+
+
+
+
+
+
+ $
+ 250
+ /month
+
+ Professional
+
+
+
+
+ Add a half day per month development time to the project
+
+
+ Homepage ad placement
+
+
+ Priority support for your engineers
+
+
+
+
+
+
+ $
+ 500
+ /month
+
+ Premium
+
+
+
+
+ Add one full day per month development time to the project
+
+
+ Full site ad placement
+
+
+ Priority support for your engineers
+
+ Profiles
+-
+ {% for profile in profiles %}
+
- {{ profile.name }} + {% endfor %} +
Profile - {{ profile.name }}
+ + + + + +### Using template packs + +The `render_form` tag takes an optional `template_pack` argument, that specifies which template directory should be used for rendering the form and form fields. + +REST framework includes three built-in template packs, all based on Bootstrap 3. The built-in styles are `horizontal`, `vertical`, and `inline`. The default style is `horizontal`. To use any of these template packs you'll want to also include the Bootstrap 3 CSS. + +The following HTML will link to a CDN hosted version of the Bootstrap 3 CSS: + + + … + + + +Third party packages may include alternate template packs, by bundling a template directory containing the necessary form and field templates. + +Let's take a look at how to render each of the three available template packs. For these examples we'll use a single serializer class to present a "Login" form. + + class LoginSerializer(serializers.Serializer): + email = serializers.EmailField( + max_length=100, + style={'placeholder': 'Email'} + ) + password = serializers.CharField( + max_length=100, + style={'input_type': 'password', 'placeholder': 'Password'} + ) + remember_me = serializers.BooleanField() + +--- + +#### `rest_framework/vertical` + +Presents form labels above their corresponding control inputs, using the standard Bootstrap layout. + +*This is the default template pack.* + + {% load rest_framework %} + + ... + + + + + +--- + +#### `rest_framework/horizontal` + +Presents labels and controls alongside each other, using a 2/10 column split. + +*This is the form style used in the browsable API and admin renderers.* + + {% load rest_framework %} + + ... + + + + + +--- + +#### `rest_framework/inline` + +A compact form style that presents all the controls inline. + + {% load rest_framework %} + + ... + + + + + +## Field styles + +Serializer fields can have their rendering style customized by using the `style` keyword argument. This argument is a dictionary of options that control the template and layout used. + +The most common way to customize the field style is to use the `base_template` style keyword argument to select which template in the template pack should be use. + +For example, to render a `CharField` as an HTML textarea rather than the default HTML input, you would use something like this: + + details = serializers.CharField( + max_length=1000, + style={'base_template': 'textarea.html'} + ) + +If you instead want a field to be rendered using a custom template that is *not part of an included template pack*, you can instead use the `template` style option, to fully specify a template name: + + details = serializers.CharField( + max_length=1000, + style={'template': 'my-field-templates/custom-input.html'} + ) + +Field templates can also use additional style properties, depending on their type. For example, the `textarea.html` template also accepts a `rows` property that can be used to affect the sizing of the control. + + details = serializers.CharField( + max_length=1000, + style={'base_template': 'textarea.html', 'rows': 10} + ) + +The complete list of `base_template` options and their associated style options is listed below. + +base_template | Valid field types | Additional style options +----|----|---- +input.html | Any string, numeric or date/time field | input_type, placeholder, hide_label +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 +select_multiple.html | `MultipleChoiceField` or relational fields with `many=True` | hide_label +checkbox_multiple.html | `MultipleChoiceField` or relational fields with `many=True` | inline, hide_label +checkbox.html | `BooleanField` | hide_label +fieldset.html | Nested serializer | hide_label +list_fieldset.html | `ListField` or nested serializer with `many=True` | hide_label diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 4bfcb003..d21f8e51 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -38,6 +38,142 @@ You can determine your currently installed version using `pip freeze`: --- +## 3.3.x series + +### 3.3.2 + +**Date**: [14th December 2015][3.3.2-milestone]. + +* `ListField` enforces input is a list. ([#3513][gh3513]) +* Fix regression hiding raw data form. ([#3600][gh3600], [#3578][gh3578]) +* Fix Python 3.5 compatibility. ([#3534][gh3534], [#3626][gh3626]) +* Allow setting a custom Django Paginator in `pagination.PageNumberPagination`. ([#3631][gh3631], [#3684][gh3684]) +* Fix relational fields without `to_fields` attribute. ([#3635][gh3635], [#3634][gh3634]) +* Fix `template.render` deprecation warnings for Django 1.9. ([#3654][gh3654]) +* Sort response headers in browsable API renderer. ([#3655][gh3655]) +* Use related_objects api for Django 1.9+. ([#3656][gh3656], [#3252][gh3252]) +* Add confirm modal when deleting. ([#3228][gh3228], [#3662][gh3662]) +* Reveal previously hidden AttributeErrors and TypeErrors while calling has_[object_]permissions. ([#3668][gh3668]) +* Make DRF compatible with multi template engine in Django 1.8. ([#3672][gh3672]) +* Update `NestedBoundField` to also handle empty string when rendering its form. ([#3677][gh3677]) +* Fix UUID validation to properly catch invalid input types. ([#3687][gh3687], [#3679][gh3679]) +* Fix caching issues. ([#3628][gh3628], [#3701][gh3701]) +* Fix Admin and API browser for views without a filter_class. ([#3705][gh3705], [#3596][gh3596], [#3597][gh3597]) +* Add app_name to rest_framework.urls. ([#3714][gh3714]) +* Improve authtoken's views to support url versioning. ([#3718][gh3718], [#3723][gh3723]) + +### 3.3.1 + +**Date**: [4th November 2015][3.3.1-milestone]. + +* Resolve parsing bug when accessing `request.POST` ([#3592][gh3592]) +* Correctly deal with `to_field` referring to primary key. ([#3593][gh3593]) +* Allow filter HTML to render when no `filter_class` is defined. ([#3560][gh3560]) +* Fix admin rendering issues. ([#3564][gh3564], [#3556][gh3556]) +* Fix issue with DecimalValidator. ([#3568][gh3568]) + +### 3.3.0 + +**Date**: [28th October 2015][3.3.0-milestone]. + +* HTML controls for filters. ([#3315][gh3315]) +* Forms API. ([#3475][gh3475]) +* AJAX browsable API. ([#3410][gh3410]) +* Added JSONField. ([#3454][gh3454]) +* Correctly map `to_field` when creating `ModelSerializer` relational fields. ([#3526][gh3526]) +* Include keyword arguments when mapping `FilePathField` to a serializer field. ([#3536][gh3536]) +* Map appropriate model `error_messages` on `ModelSerializer` uniqueness constraints. ([#3435][gh3435]) +* Include `max_length` constraint for `ModelSerializer` fields mapped from TextField. ([#3509][gh3509]) +* Added support for Django 1.9. ([#3450][gh3450], [#3525][gh3525]) +* Removed support for Django 1.5 & 1.6. ([#3421][gh3421], [#3429][gh3429]) +* Removed 'south' migrations. ([#3495][gh3495]) + +## 3.2.x series + +### 3.2.5 + +**Date**: [27th October 2015][3.2.5-milestone]. + +* Escape `username` in optional logout tag. ([#3550][gh3550]) + +### 3.2.4 + +**Date**: [21th September 2015][3.2.4-milestone]. + +* Don't error on missing `ViewSet.search_fields` attribute. ([#3324][gh3324], [#3323][gh3323]) +* Fix `allow_empty` not working on serializers with `many=True`. ([#3361][gh3361], [#3364][gh3364]) +* Let `DurationField` accepts integers. ([#3359][gh3359]) +* Multi-level dictionaries not supported in multipart requests. ([#3314][gh3314]) +* Fix `ListField` truncation on HTTP PATCH ([#3415][gh3415], [#2761][gh2761]) + +### 3.2.3 + +**Date**: [24th August 2015][3.2.3-milestone]. + +* Added `html_cutoff` and `html_cutoff_text` for limiting select dropdowns. ([#3313][gh3313]) +* Added regex style to `SearchFilter`. ([#3316][gh3316]) +* Resolve issues with setting blank HTML fields. ([#3318][gh3318]) ([#3321][gh3321]) +* Correctly display existing 'select multiple' values in browsable API forms. ([#3290][gh3290]) +* Resolve duplicated validation message for `IPAddressField`. ([#3249[gh3249]) ([#3250][gh3250]) +* Fix to ensure admin renderer continues to work when pagination is disabled. ([#3275][gh3275]) +* Resolve error with `LimitOffsetPagination` when count=0, offset=0. ([#3303][gh3303]) + +### 3.2.2 + +**Date**: [13th August 2015][3.2.2-milestone]. + +* Add `display_value()` method for use when displaying relational field select inputs. ([#3254][gh3254]) +* Fix issue with `BooleanField` checkboxes incorrectly displaying as checked. ([#3258][gh3258]) +* Ensure empty checkboxes properly set `BooleanField` to `False` in all cases. ([#2776][gh2776]) +* Allow `WSGIRequest.FILES` property without raising incorrect deprecated error. ([#3261][gh3261]) +* Resolve issue with rendering nested serializers in forms. ([#3260][gh3260]) +* Raise an error if user accidentally pass a serializer instance to a response, rather than data. ([#3241][gh3241]) + +### 3.2.1 + +**Date**: [7th August 2015][3.2.1-milestone]. + +* Fix for relational select widgets rendering without any choices. ([#3237][gh3237]) +* Fix for `1`, `0` rendering as `true`, `false` in the admin interface. [#3227][gh3227]) +* Fix for ListFields with single value in HTML form input. ([#3238][gh3238]) +* Allow `request.FILES` for compat with Django's `HTTPRequest` class. ([#3239][gh3239]) + +### 3.2.0 + +**Date**: [6th August 2015][3.2.0-milestone]. + +* Add `AdminRenderer`. ([#2926][gh2926]) +* Add `FilePathField`. ([#1854][gh1854]) +* Add `allow_empty` to `ListField`. ([#2250][gh2250]) +* Support django-guardian 1.3. ([#3165][gh3165]) +* Support grouped choices. ([#3225][gh3225]) +* Support error forms in browsable API. ([#3024][gh3024]) +* Allow permission classes to customize the error message. ([#2539][gh2539]) +* Support `source=
-
{% include "nav.html" %}
+
+
+
-
-
+
@@ -172,10 +151,10 @@
diff --git a/docs_theme/css/default.css b/docs_theme/css/default.css
index c3b9e0f1..192e8686 100644
--- a/docs_theme/css/default.css
+++ b/docs_theme/css/default.css
@@ -5,11 +5,12 @@ pre {
}
.dropdown .dropdown-menu {
- display: none;
+ display: none;
+ overflow-y: scroll;
}
.dropdown.open .dropdown-menu {
- display: block;
+ display: block;
}
@media (max-width: 480px) {
@@ -36,15 +37,8 @@ body.index-page #main-content iframe.github-star-button {
margin-right: -15px;
}
-/* Tweet button */
-body.index-page #main-content iframe.twitter-share-button {
- float: right;
- margin-top: -12px;
- margin-right: 8px;
-}
-
-/* Travis CI badge */
-body.index-page #main-content img.travis-build-image {
+/* Travis CI and PyPI badge */
+body.index-page #main-content img.status-badge {
float: right;
margin-right: 8px;
margin-top: -11px;
@@ -182,7 +176,7 @@ body{
}
#main-content h3, #main-content h4, #main-content h5 {
- font-weight: 500;
+ font-weight: 300;
margin-top: 15px
}
@@ -419,3 +413,7 @@ ul.sponsor {
#mkdocs_search_modal article p{
word-wrap: break-word;
}
+
+.toclink {
+ color: #333;
+}
diff --git a/docs_theme/js/theme.js b/docs_theme/js/theme.js
index 8208f1f4..ddbd9c90 100644
--- a/docs_theme/js/theme.js
+++ b/docs_theme/js/theme.js
@@ -1,35 +1,35 @@
-function getSearchTerm()
-{
- var sPageURL = window.location.search.substring(1);
- var sURLVariables = sPageURL.split('&');
- for (var i = 0; i < sURLVariables.length; i++)
- {
- var sParameterName = sURLVariables[i].split('=');
- if (sParameterName[0] == 'q')
- {
- return sParameterName[1];
- }
+var getSearchTerm = function() {
+ var sPageURL = window.location.search.substring(1);
+ var sURLVariables = sPageURL.split('&');
+ for (var i = 0; i < sURLVariables.length; i++) {
+ var sParameterName = sURLVariables[i].split('=');
+ if (sParameterName[0] === 'q') {
+ return sParameterName[1];
}
-}
+ }
+};
+
+var initilizeSearch = function() {
+ require.config({ baseUrl: '/mkdocs/js' });
+ require(['search']);
+};
$(function() {
+ var searchTerm = getSearchTerm(),
+ $searchModal = $('#mkdocs_search_modal'),
+ $searchQuery = $searchModal.find('#mkdocs-search-query'),
+ $searchResults = $searchModal.find('#mkdocs-search-results');
- var initialise_search = function(){
- require.config({"baseUrl":"/mkdocs/js"});
- require(["search",]);
- }
+ $('pre code').parent().addClass('prettyprint well');
- var search_term = getSearchTerm();
- if(search_term){
- $('#mkdocs_search_modal').modal();
- }
-
- $('pre code').parent().addClass('prettyprint well');
-
- $(document).on("submit", "#mkdocs_search_modal form", function (e) {
- $("#mkdocs-search-results").html("Searching...");
- initialise_search();
- return false;
- });
+ if (searchTerm) {
+ $searchQuery.val(searchTerm);
+ $searchResults.text('Searching...');
+ $searchModal.modal();
+ }
+ $searchModal.on('shown', function() {
+ $searchQuery.focus();
+ initilizeSearch();
+ });
});
diff --git a/mkdocs.yml b/mkdocs.yml
index efb43f39..a2f97702 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -6,6 +6,10 @@ repo_url: https://github.com/tomchristie/django-rest-framework
theme_dir: docs_theme
+markdown_extensions:
+ - toc:
+ anchorlink: True
+
pages:
- Home: 'index.md'
- Tutorial:
@@ -47,6 +51,7 @@ pages:
- 'Documenting your API': 'topics/documenting-your-api.md'
- 'Internationalization': 'topics/internationalization.md'
- 'AJAX, CSRF & CORS': 'topics/ajax-csrf-cors.md'
+ - 'HTML & Forms': 'topics/html-and-forms.md'
- 'Browser Enhancements': 'topics/browser-enhancements.md'
- 'The Browsable API': 'topics/browsable-api.md'
- 'REST, Hypermedia & HATEOAS': 'topics/rest-hypermedia-hateoas.md'
@@ -55,5 +60,7 @@ pages:
- 'Project management': 'topics/project-management.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'
+ - '3.3 Announcement': 'topics/3.3-announcement.md'
- 'Kickstarter Announcement': 'topics/kickstarter-announcement.md'
- 'Release Notes': 'topics/release-notes.md'
diff --git a/requirements.txt b/requirements.txt
index 4ec84f68..0b41cd50 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
# The base set of requirements for REST framework is actually
# just Django, but for the purposes of development and testing
-# there are a number of packages that it is useful to install.
+# there are a number of packages that are useful to install.
# Laying these out as seperate requirements files, allows us to
# only included the relevent sets when running tox, and ensures
-# we are only ever declaring out dependancies in one place.
+# we are only ever declaring our dependencies in one place.
-r requirements/requirements-optionals.txt
-r requirements/requirements-testing.txt
diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt
index 88f61fdf..2284a4ca 100644
--- a/requirements/requirements-codestyle.txt
+++ b/requirements/requirements-codestyle.txt
@@ -1,3 +1,6 @@
# PEP8 code linting, which we run on all commits.
flake8==2.4.0
pep8==1.5.7
+
+# Sort and lint imports
+isort==4.2.2
diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt
index af9937cf..3ada43eb 100644
--- a/requirements/requirements-optionals.txt
+++ b/requirements/requirements-optionals.txt
@@ -1,4 +1,4 @@
# Optional packages which may be used with REST framework.
markdown==2.5.2
-django-guardian==1.2.5
-django-filter==0.9.2
+django-guardian==1.3.0
+django-filter==0.10.0
diff --git a/requirements/requirements-packaging.txt b/requirements/requirements-packaging.txt
index 1efb2f83..8f62ee36 100644
--- a/requirements/requirements-packaging.txt
+++ b/requirements/requirements-packaging.txt
@@ -5,4 +5,4 @@ wheel==0.24.0
twine==1.4.0
# Transifex client for managing translation resources.
-transifex-client==0.10
+transifex-client==0.11
diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt
index a8d5d322..6900028d 100644
--- a/requirements/requirements-testing.txt
+++ b/requirements/requirements-testing.txt
@@ -1,3 +1,4 @@
# PyTest for running the tests.
pytest==2.6.4
pytest-django==2.8.0
+pytest-cov==1.8.1
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 33414f76..0e519999 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -8,7 +8,7 @@ ______ _____ _____ _____ __
"""
__title__ = 'Django REST framework'
-__version__ = '3.1.3'
+__version__ = '3.3.2'
__author__ = 'Tom Christie'
__license__ = 'BSD 2-Clause'
__copyright__ = 'Copyright 2011-2015 Tom Christie'
diff --git a/rest_framework/authentication.py b/rest_framework/authentication.py
index 8b5c2009..9e73ef63 100644
--- a/rest_framework/authentication.py
+++ b/rest_framework/authentication.py
@@ -2,13 +2,15 @@
Provides various authentication policies.
"""
from __future__ import unicode_literals
+
import base64
-from django.contrib.auth import authenticate
+
+from django.contrib.auth import authenticate, get_user_model
from django.middleware.csrf import CsrfViewMiddleware
from django.utils.translation import ugettext_lazy as _
-from rest_framework import exceptions, HTTP_HEADER_ENCODING
+
+from rest_framework import HTTP_HEADER_ENCODING, exceptions
from rest_framework.authtoken.models import Token
-from rest_framework.compat import get_user_model
def get_authorization_header(request):
@@ -86,9 +88,8 @@ class BasicAuthentication(BaseAuthentication):
"""
Authenticate the userid and password against username and password.
"""
- username_field = getattr(get_user_model(), 'USERNAME_FIELD', 'username')
credentials = {
- username_field: userid,
+ get_user_model().USERNAME_FIELD: userid,
'password': password
}
user = authenticate(**credentials)
@@ -116,9 +117,8 @@ class SessionAuthentication(BaseAuthentication):
Otherwise returns `None`.
"""
- # Get the underlying HttpRequest object
- request = request._request
- user = getattr(request, 'user', None)
+ # Get the session-based user from the underlying HttpRequest object
+ user = getattr(request._request, 'user', None)
# Unauthenticated, CSRF validation not required
if not user or not user.is_active:
@@ -170,7 +170,13 @@ class TokenAuthentication(BaseAuthentication):
msg = _('Invalid token header. Token string should not contain spaces.')
raise exceptions.AuthenticationFailed(msg)
- return self.authenticate_credentials(auth[1])
+ try:
+ token = auth[1].decode()
+ except UnicodeError:
+ msg = _('Invalid token header. Token string should not contain invalid characters.')
+ raise exceptions.AuthenticationFailed(msg)
+
+ return self.authenticate_credentials(token)
def authenticate_credentials(self, key):
try:
diff --git a/rest_framework/authtoken/admin.py b/rest_framework/authtoken/admin.py
index ec28eb1c..1a507249 100644
--- a/rest_framework/authtoken/admin.py
+++ b/rest_framework/authtoken/admin.py
@@ -1,4 +1,5 @@
from django.contrib import admin
+
from rest_framework.authtoken.models import Token
diff --git a/rest_framework/authtoken/migrations/0001_initial.py b/rest_framework/authtoken/migrations/0001_initial.py
index 769f6202..0eb9fbcb 100644
--- a/rest_framework/authtoken/migrations/0001_initial.py
+++ b/rest_framework/authtoken/migrations/0001_initial.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
-from django.db import models, migrations
from django.conf import settings
+from django.db import migrations, models
class Migration(migrations.Migration):
diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py
index a1a9315f..b329ee65 100644
--- a/rest_framework/authtoken/models.py
+++ b/rest_framework/authtoken/models.py
@@ -5,7 +5,6 @@ from django.conf import settings
from django.db import models
from django.utils.encoding import python_2_unicode_compatible
-
# Prior to Django 1.5, the AUTH_USER_MODEL setting does not exist.
# Note that we don't perform this code in the compat module due to
# bug report #1297
diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py
index 597aeed2..8a295c03 100644
--- a/rest_framework/authtoken/serializers.py
+++ b/rest_framework/authtoken/serializers.py
@@ -1,7 +1,7 @@
from django.contrib.auth import authenticate
from django.utils.translation import ugettext_lazy as _
-from rest_framework import exceptions, serializers
+from rest_framework import serializers
class AuthTokenSerializer(serializers.Serializer):
@@ -18,13 +18,13 @@ class AuthTokenSerializer(serializers.Serializer):
if user:
if not user.is_active:
msg = _('User account is disabled.')
- raise exceptions.ValidationError(msg)
+ raise serializers.ValidationError(msg)
else:
msg = _('Unable to log in with provided credentials.')
- raise exceptions.ValidationError(msg)
+ raise serializers.ValidationError(msg)
else:
msg = _('Must include "username" and "password".')
- raise exceptions.ValidationError(msg)
+ raise serializers.ValidationError(msg)
attrs['user'] = user
return attrs
diff --git a/rest_framework/authtoken/south_migrations/0001_initial.py b/rest_framework/authtoken/south_migrations/0001_initial.py
deleted file mode 100644
index 5b927f3e..00000000
--- a/rest_framework/authtoken/south_migrations/0001_initial.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.db import db
-from south.v2 import SchemaMigration
-
-try:
- from django.contrib.auth import get_user_model
-except ImportError: # django < 1.5
- from django.contrib.auth.models import User
-else:
- User = get_user_model()
-
-
-class Migration(SchemaMigration):
-
- def forwards(self, orm):
- # Adding model 'Token'
- db.create_table('authtoken_token', (
- ('key', self.gf('django.db.models.fields.CharField')(max_length=40, primary_key=True)),
- ('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='auth_token', unique=True, to=orm['%s.%s' % (User._meta.app_label, User._meta.object_name)])),
- ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
- ))
- db.send_create_signal('authtoken', ['Token'])
-
- def backwards(self, orm):
- # Deleting model 'Token'
- db.delete_table('authtoken_token')
-
- models = {
- 'auth.group': {
- 'Meta': {'object_name': 'Group'},
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
- 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
- },
- 'auth.permission': {
- 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
- 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
- },
- "%s.%s" % (User._meta.app_label, User._meta.module_name): {
- 'Meta': {'object_name': User._meta.module_name, 'db_table': repr(User._meta.db_table)},
- },
- 'authtoken.token': {
- 'Meta': {'object_name': 'Token'},
- 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
- 'key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'primary_key': 'True'}),
- 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'auth_token'", 'unique': 'True', 'to': "orm['%s.%s']" % (User._meta.app_label, User._meta.object_name)})
- },
- 'contenttypes.contenttype': {
- 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
- 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
- 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
- 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
- }
- }
-
- complete_apps = ['authtoken']
diff --git a/rest_framework/authtoken/views.py b/rest_framework/authtoken/views.py
index 66bbc49b..0c6596a7 100644
--- a/rest_framework/authtoken/views.py
+++ b/rest_framework/authtoken/views.py
@@ -1,9 +1,8 @@
-from rest_framework.views import APIView
-from rest_framework import parsers
-from rest_framework import renderers
-from rest_framework.response import Response
+from rest_framework import parsers, renderers
from rest_framework.authtoken.models import Token
from rest_framework.authtoken.serializers import AuthTokenSerializer
+from rest_framework.response import Response
+from rest_framework.views import APIView
class ObtainAuthToken(APIView):
@@ -13,7 +12,7 @@ class ObtainAuthToken(APIView):
renderer_classes = (renderers.JSONRenderer,)
serializer_class = AuthTokenSerializer
- def post(self, request):
+ def post(self, request, *args, **kwargs):
serializer = self.serializer_class(data=request.data)
serializer.is_valid(raise_exception=True)
user = serializer.validated_data['user']
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 139d085d..de8e77ae 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -1,22 +1,23 @@
"""
The `compat` module provides support for backwards compatibility with older
-versions of django/python, and compatibility wrappers around optional packages.
+versions of Django/Python, and compatibility wrappers around optional packages.
"""
# flake8: noqa
from __future__ import unicode_literals
-from django.core.exceptions import ImproperlyConfigured
+
+import django
from django.conf import settings
from django.db import connection, transaction
-from django.utils.encoding import force_text
-from django.utils.six.moves.urllib.parse import urlparse as _urlparse
+from django.template import Context, RequestContext, Template
from django.utils import six
-import django
-import inspect
+from django.views.generic import View
+
try:
- import importlib
+ import importlib # Available in Python 3.1+
except ImportError:
- from django.utils import importlib
+ from django.utils import importlib # Will be removed in Django 1.9
+
def unicode_repr(instance):
# Get the repr of an instance, but ensure it is a unicode string
@@ -50,21 +51,11 @@ def total_seconds(timedelta):
return (timedelta.days * 86400.0) + float(timedelta.seconds) + (timedelta.microseconds / 1000000.0)
-# OrderedDict only available in Python 2.7.
-# This will always be the case in Django 1.7 and above, as these versions
-# no longer support Python 2.6.
-# For Django <= 1.6 and Python 2.6 fall back to SortedDict.
-try:
- from collections import OrderedDict
-except ImportError:
- from django.utils.datastructures import SortedDict as OrderedDict
-
-
-# HttpResponseBase only exists from 1.5 onwards
-try:
- from django.http.response import HttpResponseBase
-except ImportError:
- from django.http import HttpResponse as HttpResponseBase
+def distinct(queryset, base):
+ if settings.DATABASES[queryset.db]["ENGINE"] == "django.db.backends.oracle":
+ # distinct analogue for Oracle users
+ return base.filter(pk__in=set(queryset.values_list('pk', flat=True)))
+ return queryset.distinct()
# contrib.postgres only supported from 1.8 onwards.
@@ -74,14 +65,11 @@ except ImportError:
postgres_fields = None
-# request only provides `resolver_match` from 1.5 onwards.
-def get_resolver_match(request):
- try:
- return request.resolver_match
- except AttributeError:
- # Django < 1.5
- from django.core.urlresolvers import resolve
- return resolve(request.path_info)
+# JSONField is only supported from 1.9 onwards
+try:
+ from django.contrib.postgres.fields import JSONField
+except ImportError:
+ JSONField = None
# django-filter is optional
@@ -90,6 +78,14 @@ try:
except ImportError:
django_filters = None
+
+# django-crispy-forms is optional
+try:
+ import crispy_forms
+except ImportError:
+ crispy_forms = None
+
+
if django.VERSION >= (1, 6):
def clean_manytomany_helptext(text):
return text
@@ -101,42 +97,16 @@ else:
text = text[:-69]
return text
+
# Django-guardian is optional. Import only if guardian is in INSTALLED_APPS
# Fixes (#1712). We keep the try/except for the test suite.
guardian = None
-if 'guardian' in settings.INSTALLED_APPS:
- try:
+try:
+ if 'guardian' in settings.INSTALLED_APPS:
import guardian
import guardian.shortcuts # Fixes #1624
- except ImportError:
- pass
-
-
-def get_model_name(model_cls):
- try:
- return model_cls._meta.model_name
- except AttributeError:
- # < 1.6 used module_name instead of model_name
- return model_cls._meta.module_name
-
-
-# Support custom user models in Django 1.5+
-try:
- from django.contrib.auth import get_user_model
except ImportError:
- from django.contrib.auth.models import User
- get_user_model = lambda: User
-
-
-# View._allowed_methods only present from 1.5 onwards
-if django.VERSION >= (1, 5):
- from django.views.generic import View
-else:
- from django.views.generic import View as DjangoView
-
- class View(DjangoView):
- def _allowed_methods(self):
- return [m.upper() for m in self.http_method_names if hasattr(self, m)]
+ pass
# MinValueValidator, MaxValueValidator et al. only accept `message` in 1.8+
@@ -149,92 +119,41 @@ else:
from django.core.validators import MinLengthValidator as DjangoMinLengthValidator
from django.core.validators import MaxLengthValidator as DjangoMaxLengthValidator
+
class MinValueValidator(DjangoMinValueValidator):
def __init__(self, *args, **kwargs):
self.message = kwargs.pop('message', self.message)
super(MinValueValidator, self).__init__(*args, **kwargs)
+
class MaxValueValidator(DjangoMaxValueValidator):
def __init__(self, *args, **kwargs):
self.message = kwargs.pop('message', self.message)
super(MaxValueValidator, self).__init__(*args, **kwargs)
+
class MinLengthValidator(DjangoMinLengthValidator):
def __init__(self, *args, **kwargs):
self.message = kwargs.pop('message', self.message)
super(MinLengthValidator, self).__init__(*args, **kwargs)
+
class MaxLengthValidator(DjangoMaxLengthValidator):
def __init__(self, *args, **kwargs):
self.message = kwargs.pop('message', self.message)
super(MaxLengthValidator, self).__init__(*args, **kwargs)
-# URLValidator only accepts `message` in 1.6+
-if django.VERSION >= (1, 6):
- from django.core.validators import URLValidator
-else:
- from django.core.validators import URLValidator as DjangoURLValidator
-
- class URLValidator(DjangoURLValidator):
- def __init__(self, *args, **kwargs):
- self.message = kwargs.pop('message', self.message)
- super(URLValidator, self).__init__(*args, **kwargs)
-
-
-# EmailValidator requires explicit regex prior to 1.6+
-if django.VERSION >= (1, 6):
- from django.core.validators import EmailValidator
-else:
- from django.core.validators import EmailValidator as DjangoEmailValidator
- from django.core.validators import email_re
-
- class EmailValidator(DjangoEmailValidator):
- def __init__(self, *args, **kwargs):
- super(EmailValidator, self).__init__(email_re, *args, **kwargs)
-
-
# PATCH method is not implemented by Django
if 'patch' not in View.http_method_names:
View.http_method_names = View.http_method_names + ['patch']
-# RequestFactory only provides `generic` from 1.5 onwards
-from django.test.client import RequestFactory as DjangoRequestFactory
-from django.test.client import FakePayload
-
-try:
- # In 1.5 the test client uses force_bytes
- from django.utils.encoding import force_bytes as force_bytes_or_smart_bytes
-except ImportError:
- # In 1.4 the test client just uses smart_str
- from django.utils.encoding import smart_str as force_bytes_or_smart_bytes
-
-
-class RequestFactory(DjangoRequestFactory):
- def generic(self, method, path,
- data='', content_type='application/octet-stream', **extra):
- parsed = _urlparse(path)
- data = force_bytes_or_smart_bytes(data, settings.DEFAULT_CHARSET)
- r = {
- 'PATH_INFO': self._get_path(parsed),
- 'QUERY_STRING': force_text(parsed[4]),
- 'REQUEST_METHOD': six.text_type(method),
- }
- if data:
- r.update({
- 'CONTENT_LENGTH': len(data),
- 'CONTENT_TYPE': six.text_type(content_type),
- 'wsgi.input': FakePayload(data),
- })
- r.update(extra)
- return self.request(**r)
-
-
# Markdown is optional
try:
import markdown
+
def apply_markdown(text):
"""
Simple wrapper around :func:`markdown.markdown` to set the base level
@@ -260,7 +179,6 @@ else:
LONG_SEPARATORS = (b', ', b': ')
INDENT_SEPARATORS = (b',', b': ')
-
if django.VERSION >= (1, 8):
from django.db.models import DurationField
from django.utils.dateparse import parse_duration
@@ -268,13 +186,20 @@ if django.VERSION >= (1, 8):
else:
DurationField = duration_string = parse_duration = None
+try:
+ # DecimalValidator is unavailable in Django < 1.9
+ from django.core.validators import DecimalValidator
+except ImportError:
+ DecimalValidator = None
+
def set_rollback():
if hasattr(transaction, 'set_rollback'):
if connection.settings_dict.get('ATOMIC_REQUESTS', False):
# If running in >=1.6 then mark a rollback as required,
# and allow it to be handled by Django.
- transaction.set_rollback(True)
+ if connection.in_atomic_block:
+ transaction.set_rollback(True)
elif transaction.is_managed():
# Otherwise handle it explicitly if in managed mode.
if transaction.is_dirty():
@@ -283,3 +208,54 @@ def set_rollback():
else:
# transaction not managed
pass
+
+
+def template_render(template, context=None, request=None):
+ """
+ Passing Context or RequestContext to Template.render is deprecated in 1.9+,
+ see https://github.com/django/django/pull/3883 and
+ https://github.com/django/django/blob/1.9rc1/django/template/backends/django.py#L82-L84
+
+ :param template: Template instance
+ :param context: dict
+ :param request: Request instance
+ :return: rendered template as SafeText instance
+ """
+ if django.VERSION < (1, 8) or isinstance(template, Template):
+ if request:
+ context = RequestContext(request, context)
+ else:
+ context = Context(context)
+ return template.render(context)
+ # backends template, e.g. django.template.backends.django.Template
+ else:
+ return template.render(context, request=request)
+
+
+def get_all_related_objects(opts):
+ """
+ Django 1.8 changed meta api, see
+ https://docs.djangoproject.com/en/1.8/ref/models/meta/#migrating-old-meta-api
+ https://code.djangoproject.com/ticket/12663
+ https://github.com/django/django/pull/3848
+
+ :param opts: Options instance
+ :return: list of relations except many-to-many ones
+ """
+ if django.VERSION < (1, 9):
+ return opts.get_all_related_objects()
+ else:
+ return [r for r in opts.related_objects if not r.field.many_to_many]
+
+
+def get_all_related_many_to_many_objects(opts):
+ """
+ Django 1.8 changed meta api, see docstr in compat.get_all_related_objects()
+
+ :param opts: Options instance
+ :return: list of many-to-many relations
+ """
+ if django.VERSION < (1, 9):
+ return opts.get_all_related_many_to_many_objects()
+ else:
+ return [r for r in opts.related_objects if r.field.many_to_many]
diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py
index 21de1acf..4c8bda39 100644
--- a/rest_framework/decorators.py
+++ b/rest_framework/decorators.py
@@ -7,10 +7,13 @@ based views, as well as the `@detail_route` and `@list_route` decorators, which
used to annotate methods on viewsets that should be included by routers.
"""
from __future__ import unicode_literals
-from django.utils import six
-from rest_framework.views import APIView
+
import types
+from django.utils import six
+
+from rest_framework.views import APIView
+
def api_view(http_method_names=None):
diff --git a/rest_framework/exceptions.py b/rest_framework/exceptions.py
index f954c13e..8447a9de 100644
--- a/rest_framework/exceptions.py
+++ b/rest_framework/exceptions.py
@@ -5,11 +5,16 @@ In addition Django's built in 403 and 404 exceptions are handled.
(`django.http.Http404` and `django.core.exceptions.PermissionDenied`)
"""
from __future__ import unicode_literals
+
+import math
+
from django.utils import six
from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _, ungettext
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext
+
from rest_framework import status
-import math
+from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList
def _force_text_recursive(data):
@@ -18,14 +23,20 @@ def _force_text_recursive(data):
lazy translation strings into plain text.
"""
if isinstance(data, list):
- return [
+ ret = [
_force_text_recursive(item) for item in data
]
+ if isinstance(data, ReturnList):
+ return ReturnList(ret, serializer=data.serializer)
+ return data
elif isinstance(data, dict):
- return dict([
- (key, _force_text_recursive(value))
+ ret = {
+ key: _force_text_recursive(value)
for key, value in data.items()
- ])
+ }
+ if isinstance(data, ReturnDict):
+ return ReturnDict(ret, serializer=data.serializer)
+ return data
return force_text(data)
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index d9322ec2..8541bc43 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -1,30 +1,39 @@
from __future__ import unicode_literals
-from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist
-from django.core.exceptions import ValidationError as DjangoValidationError
-from django.core.validators import RegexValidator, ip_address_validators
-from django.forms import ImageField as DjangoImageField
-from django.utils import six, timezone
-from django.utils.dateparse import parse_date, parse_datetime, parse_time
-from django.utils.encoding import is_protected_type, smart_text
-from django.utils.translation import ugettext_lazy as _
-from django.utils.ipv6 import clean_ipv6_address
-from rest_framework import ISO_8601
-from rest_framework.compat import (
- EmailValidator, MinValueValidator, MaxValueValidator,
- MinLengthValidator, MaxLengthValidator, URLValidator, OrderedDict,
- unicode_repr, unicode_to_repr, parse_duration, duration_string,
-)
-from rest_framework.exceptions import ValidationError
-from rest_framework.settings import api_settings
-from rest_framework.utils import html, representation, humanize_datetime
+
import collections
import copy
import datetime
import decimal
import inspect
+import json
import re
import uuid
+from collections import OrderedDict
+
+from django.conf import settings
+from django.core.exceptions import ValidationError as DjangoValidationError
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.validators import (
+ EmailValidator, RegexValidator, URLValidator, ip_address_validators
+)
+from django.forms import FilePathField as DjangoFilePathField
+from django.forms import ImageField as DjangoImageField
+from django.utils import six, timezone
+from django.utils.dateparse import parse_date, parse_datetime, parse_time
+from django.utils.encoding import is_protected_type, smart_text
+from django.utils.functional import cached_property
+from django.utils.ipv6 import clean_ipv6_address
+from django.utils.translation import ugettext_lazy as _
+
+from rest_framework import ISO_8601
+from rest_framework.compat import (
+ MaxLengthValidator, MaxValueValidator, MinLengthValidator,
+ MinValueValidator, duration_string, parse_duration, unicode_repr,
+ unicode_to_repr
+)
+from rest_framework.exceptions import ValidationError
+from rest_framework.settings import api_settings
+from rest_framework.utils import html, humanize_datetime, representation
class empty:
@@ -104,6 +113,100 @@ def set_value(dictionary, keys, value):
dictionary[keys[-1]] = value
+def to_choices_dict(choices):
+ """
+ Convert choices into key/value dicts.
+
+ pairwise_choices([1]) -> {1: 1}
+ pairwise_choices([(1, '1st'), (2, '2nd')]) -> {1: '1st', 2: '2nd'}
+ pairwise_choices([('Group', ((1, '1st'), 2))]) -> {'Group': {1: '1st', 2: '2nd'}}
+ """
+ # Allow single, paired or grouped choices style:
+ # choices = [1, 2, 3]
+ # choices = [(1, 'First'), (2, 'Second'), (3, 'Third')]
+ # choices = [('Category', ((1, 'First'), (2, 'Second'))), (3, 'Third')]
+ ret = OrderedDict()
+ for choice in choices:
+ if (not isinstance(choice, (list, tuple))):
+ # single choice
+ ret[choice] = choice
+ else:
+ key, value = choice
+ if isinstance(value, (list, tuple)):
+ # grouped choices (category, sub choices)
+ ret[key] = to_choices_dict(value)
+ else:
+ # paired choice (key, display value)
+ ret[key] = value
+ return ret
+
+
+def flatten_choices_dict(choices):
+ """
+ Convert a group choices dict into a flat dict of choices.
+
+ flatten_choices({1: '1st', 2: '2nd'}) -> {1: '1st', 2: '2nd'}
+ flatten_choices({'Group': {1: '1st', 2: '2nd'}}) -> {1: '1st', 2: '2nd'}
+ """
+ ret = OrderedDict()
+ for key, value in choices.items():
+ if isinstance(value, dict):
+ # grouped choices (category, sub choices)
+ for sub_key, sub_value in value.items():
+ ret[sub_key] = sub_value
+ else:
+ # choice (key, display value)
+ ret[key] = value
+ return ret
+
+
+def iter_options(grouped_choices, cutoff=None, cutoff_text=None):
+ """
+ Helper function for options and option groups in templates.
+ """
+ class StartOptionGroup(object):
+ start_option_group = True
+ end_option_group = False
+
+ def __init__(self, label):
+ self.label = label
+
+ class EndOptionGroup(object):
+ start_option_group = False
+ end_option_group = True
+
+ class Option(object):
+ start_option_group = False
+ end_option_group = False
+
+ def __init__(self, value, display_text, disabled=False):
+ self.value = value
+ self.display_text = display_text
+ self.disabled = disabled
+
+ count = 0
+
+ for key, value in grouped_choices.items():
+ if cutoff and count >= cutoff:
+ break
+
+ if isinstance(value, dict):
+ yield StartOptionGroup(label=key)
+ for sub_key, sub_value in value.items():
+ if cutoff and count >= cutoff:
+ break
+ yield Option(value=sub_key, display_text=sub_value)
+ count += 1
+ yield EndOptionGroup()
+ else:
+ yield Option(value=key, display_text=value)
+ count += 1
+
+ if cutoff and count >= cutoff and cutoff_text:
+ cutoff_text = cutoff_text.format(count=cutoff)
+ yield Option(value='n/a', display_text=cutoff_text, disabled=True)
+
+
class CreateOnlyDefault(object):
"""
This class may be used to provide default values that are only used
@@ -196,9 +299,7 @@ class Field(object):
self.allow_null = allow_null
if self.default_empty_html is not empty:
- if not required:
- self.default_empty_html = empty
- elif default is not empty:
+ if default is not empty:
self.default_empty_html = default
if validators is not None:
@@ -288,6 +389,10 @@ class Field(object):
# If the field is blank, and null is a valid value then
# determine if we should use null instead.
return '' if getattr(self, 'allow_blank', False) else None
+ elif ret == '' and not self.required:
+ # If the field is blank, and emptyness is valid then
+ # determine if we should use emptyness instead.
+ return '' if getattr(self, 'allow_blank', False) else empty
return ret
return dictionary.get(self.field_name, empty)
@@ -417,10 +522,11 @@ class Field(object):
Transform the *outgoing* native value into primitive data.
"""
raise NotImplementedError(
- '{cls}.to_representation() must be implemented.\n'
- 'If you are upgrading from REST framework version 2 '
- 'you might want `ReadOnlyField`.'.format(
- cls=self.__class__.__name__
+ '{cls}.to_representation() must be implemented for field '
+ '{field_name}. If you do not need to support write operations '
+ 'you probably want to subclass `ReadOnlyField` instead.'.format(
+ cls=self.__class__.__name__,
+ field_name=self.field_name,
)
)
@@ -437,7 +543,7 @@ class Field(object):
message_string = msg.format(**kwargs)
raise ValidationError(message_string)
- @property
+ @cached_property
def root(self):
"""
Returns the top-level serializer for this field.
@@ -447,7 +553,7 @@ class Field(object):
root = root.parent
return root
- @property
+ @cached_property
def context(self):
"""
Returns the context as passed to the root serializer on initialization.
@@ -498,18 +604,21 @@ class BooleanField(Field):
}
default_empty_html = False
initial = False
- TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True))
- FALSE_VALUES = set(('f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False))
+ TRUE_VALUES = {'t', 'T', 'true', 'True', 'TRUE', '1', 1, True}
+ FALSE_VALUES = {'f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False}
def __init__(self, **kwargs):
assert 'allow_null' not in kwargs, '`allow_null` is not a valid option. Use `NullBooleanField` instead.'
super(BooleanField, self).__init__(**kwargs)
def to_internal_value(self, data):
- if data in self.TRUE_VALUES:
- return True
- elif data in self.FALSE_VALUES:
- return False
+ try:
+ if data in self.TRUE_VALUES:
+ return True
+ elif data in self.FALSE_VALUES:
+ return False
+ except TypeError: # Input is an unhashable type
+ pass
self.fail('invalid', input=data)
def to_representation(self, value):
@@ -525,9 +634,9 @@ class NullBooleanField(Field):
'invalid': _('"{input}" is not a valid boolean.')
}
initial = None
- TRUE_VALUES = set(('t', 'T', 'true', 'True', 'TRUE', '1', 1, True))
- FALSE_VALUES = set(('f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False))
- NULL_VALUES = set(('n', 'N', 'null', 'Null', 'NULL', '', None))
+ TRUE_VALUES = {'t', 'T', 'true', 'True', 'TRUE', '1', 1, True}
+ FALSE_VALUES = {'f', 'F', 'false', 'False', 'FALSE', '0', 0, 0.0, False}
+ NULL_VALUES = {'n', 'N', 'null', 'Null', 'NULL', '', None}
def __init__(self, **kwargs):
assert 'allow_null' not in kwargs, '`allow_null` is not a valid option.'
@@ -580,7 +689,7 @@ class CharField(Field):
# Test for the empty string here so that it does not get validated,
# and so that subclasses do not need to handle it explicitly
# inside the `to_internal_value()` method.
- if data == '':
+ if data == '' or (self.trim_whitespace and six.text_type(data).strip() == ''):
if not self.allow_blank:
self.fail('blank')
return ''
@@ -660,9 +769,11 @@ class UUIDField(Field):
try:
if isinstance(data, six.integer_types):
return uuid.UUID(int=data)
- else:
+ elif isinstance(data, six.string_types):
return uuid.UUID(hex=data)
- except (ValueError, TypeError):
+ else:
+ self.fail('invalid', value=data)
+ except (ValueError):
self.fail('invalid', value=data)
return data
@@ -780,16 +891,20 @@ class DecimalField(Field):
}
MAX_STRING_LENGTH = 1000 # Guard against malicious string inputs.
- coerce_to_string = api_settings.COERCE_DECIMAL_TO_STRING
-
def __init__(self, max_digits, decimal_places, coerce_to_string=None, max_value=None, min_value=None, **kwargs):
self.max_digits = max_digits
self.decimal_places = decimal_places
- self.coerce_to_string = coerce_to_string if (coerce_to_string is not None) else self.coerce_to_string
+ if coerce_to_string is not None:
+ self.coerce_to_string = coerce_to_string
self.max_value = max_value
self.min_value = min_value
+ if self.max_digits is not None and self.decimal_places is not None:
+ self.max_whole_digits = self.max_digits - self.decimal_places
+ else:
+ self.max_whole_digits = None
+
super(DecimalField, self).__init__(**kwargs)
if self.max_value is not None:
@@ -833,34 +948,41 @@ class DecimalField(Field):
values or to enhance it in any way you need to.
"""
sign, digittuple, exponent = value.as_tuple()
- decimals = exponent * decimal.Decimal(-1) if exponent < 0 else 0
- # digittuple doesn't include any leading zeros.
- digits = len(digittuple)
- if decimals > digits:
- # We have leading zeros up to or past the decimal point. Count
- # everything past the decimal point as a digit. We do not count
- # 0 before the decimal point as a digit since that would mean
- # we would not allow max_digits = decimal_places.
- digits = decimals
- whole_digits = digits - decimals
+ if exponent >= 0:
+ # 1234500.0
+ total_digits = len(digittuple) + exponent
+ whole_digits = total_digits
+ decimal_places = 0
+ elif len(digittuple) > abs(exponent):
+ # 123.45
+ total_digits = len(digittuple)
+ whole_digits = total_digits - abs(exponent)
+ decimal_places = abs(exponent)
+ else:
+ # 0.001234
+ total_digits = abs(exponent)
+ whole_digits = 0
+ decimal_places = total_digits
- if self.max_digits is not None and digits > self.max_digits:
+ if self.max_digits is not None and total_digits > self.max_digits:
self.fail('max_digits', max_digits=self.max_digits)
- if self.decimal_places is not None and decimals > self.decimal_places:
+ if self.decimal_places is not None and decimal_places > self.decimal_places:
self.fail('max_decimal_places', max_decimal_places=self.decimal_places)
- if self.max_digits is not None and self.decimal_places is not None and whole_digits > (self.max_digits - self.decimal_places):
- self.fail('max_whole_digits', max_whole_digits=self.max_digits - self.decimal_places)
+ if self.max_whole_digits is not None and whole_digits > self.max_whole_digits:
+ self.fail('max_whole_digits', max_whole_digits=self.max_whole_digits)
return value
def to_representation(self, value):
+ coerce_to_string = getattr(self, 'coerce_to_string', api_settings.COERCE_DECIMAL_TO_STRING)
+
if not isinstance(value, decimal.Decimal):
value = decimal.Decimal(six.text_type(value).strip())
quantized = self.quantize(value)
- if not self.coerce_to_string:
+ if not coerce_to_string:
return quantized
return '{0:f}'.format(quantized)
@@ -882,14 +1004,15 @@ class DateTimeField(Field):
'invalid': _('Datetime has wrong format. Use one of these formats instead: {format}.'),
'date': _('Expected a datetime but got a date.'),
}
- format = api_settings.DATETIME_FORMAT
- input_formats = api_settings.DATETIME_INPUT_FORMATS
- default_timezone = timezone.get_default_timezone() if settings.USE_TZ else None
+ datetime_parser = datetime.datetime.strptime
def __init__(self, format=empty, input_formats=None, default_timezone=None, *args, **kwargs):
- self.format = format if format is not empty else self.format
- self.input_formats = input_formats if input_formats is not None else self.input_formats
- self.default_timezone = default_timezone if default_timezone is not None else self.default_timezone
+ if format is not empty:
+ self.format = format
+ if input_formats is not None:
+ self.input_formats = input_formats
+ if default_timezone is not None:
+ self.timezone = default_timezone
super(DateTimeField, self).__init__(*args, **kwargs)
def enforce_timezone(self, value):
@@ -897,21 +1020,28 @@ class DateTimeField(Field):
When `self.default_timezone` is `None`, always return naive datetimes.
When `self.default_timezone` is not `None`, always return aware datetimes.
"""
- if (self.default_timezone is not None) and not timezone.is_aware(value):
- return timezone.make_aware(value, self.default_timezone)
- elif (self.default_timezone is None) and timezone.is_aware(value):
+ field_timezone = getattr(self, 'timezone', self.default_timezone())
+
+ if (field_timezone is not None) and not timezone.is_aware(value):
+ return timezone.make_aware(value, field_timezone)
+ elif (field_timezone is None) and timezone.is_aware(value):
return timezone.make_naive(value, timezone.UTC())
return value
+ def default_timezone(self):
+ return timezone.get_default_timezone() if settings.USE_TZ else None
+
def to_internal_value(self, value):
+ input_formats = getattr(self, 'input_formats', api_settings.DATETIME_INPUT_FORMATS)
+
if isinstance(value, datetime.date) and not isinstance(value, datetime.datetime):
self.fail('date')
if isinstance(value, datetime.datetime):
return self.enforce_timezone(value)
- for format in self.input_formats:
- if format.lower() == ISO_8601:
+ for input_format in input_formats:
+ if input_format.lower() == ISO_8601:
try:
parsed = parse_datetime(value)
except (ValueError, TypeError):
@@ -921,25 +1051,27 @@ class DateTimeField(Field):
return self.enforce_timezone(parsed)
else:
try:
- parsed = datetime.datetime.strptime(value, format)
+ parsed = self.datetime_parser(value, input_format)
except (ValueError, TypeError):
pass
else:
return self.enforce_timezone(parsed)
- humanized_format = humanize_datetime.datetime_formats(self.input_formats)
+ humanized_format = humanize_datetime.datetime_formats(input_formats)
self.fail('invalid', format=humanized_format)
def to_representation(self, value):
- if self.format is None:
+ output_format = getattr(self, 'format', api_settings.DATETIME_FORMAT)
+
+ if output_format is None:
return value
- if self.format.lower() == ISO_8601:
+ if output_format.lower() == ISO_8601:
value = value.isoformat()
if value.endswith('+00:00'):
value = value[:-6] + 'Z'
return value
- return value.strftime(self.format)
+ return value.strftime(output_format)
class DateField(Field):
@@ -947,23 +1079,26 @@ class DateField(Field):
'invalid': _('Date has wrong format. Use one of these formats instead: {format}.'),
'datetime': _('Expected a date but got a datetime.'),
}
- format = api_settings.DATE_FORMAT
- input_formats = api_settings.DATE_INPUT_FORMATS
+ datetime_parser = datetime.datetime.strptime
def __init__(self, format=empty, input_formats=None, *args, **kwargs):
- self.format = format if format is not empty else self.format
- self.input_formats = input_formats if input_formats is not None else self.input_formats
+ if format is not empty:
+ self.format = format
+ if input_formats is not None:
+ self.input_formats = input_formats
super(DateField, self).__init__(*args, **kwargs)
def to_internal_value(self, value):
+ input_formats = getattr(self, 'input_formats', api_settings.DATE_INPUT_FORMATS)
+
if isinstance(value, datetime.datetime):
self.fail('datetime')
if isinstance(value, datetime.date):
return value
- for format in self.input_formats:
- if format.lower() == ISO_8601:
+ for input_format in input_formats:
+ if input_format.lower() == ISO_8601:
try:
parsed = parse_date(value)
except (ValueError, TypeError):
@@ -973,20 +1108,22 @@ class DateField(Field):
return parsed
else:
try:
- parsed = datetime.datetime.strptime(value, format)
+ parsed = self.datetime_parser(value, input_format)
except (ValueError, TypeError):
pass
else:
return parsed.date()
- humanized_format = humanize_datetime.date_formats(self.input_formats)
+ humanized_format = humanize_datetime.date_formats(input_formats)
self.fail('invalid', format=humanized_format)
def to_representation(self, value):
+ output_format = getattr(self, 'format', api_settings.DATE_FORMAT)
+
if not value:
return None
- if self.format is None:
+ if output_format is None:
return value
# Applying a `DateField` to a datetime value is almost always
@@ -998,32 +1135,35 @@ class DateField(Field):
'read-only field and deal with timezone issues explicitly.'
)
- if self.format.lower() == ISO_8601:
+ if output_format.lower() == ISO_8601:
if (isinstance(value, str)):
value = datetime.datetime.strptime(value, '%Y-%m-%d').date()
return value.isoformat()
- return value.strftime(self.format)
+ return value.strftime(output_format)
class TimeField(Field):
default_error_messages = {
'invalid': _('Time has wrong format. Use one of these formats instead: {format}.'),
}
- format = api_settings.TIME_FORMAT
- input_formats = api_settings.TIME_INPUT_FORMATS
+ datetime_parser = datetime.datetime.strptime
def __init__(self, format=empty, input_formats=None, *args, **kwargs):
- self.format = format if format is not empty else self.format
- self.input_formats = input_formats if input_formats is not None else self.input_formats
+ if format is not empty:
+ self.format = format
+ if input_formats is not None:
+ self.input_formats = input_formats
super(TimeField, self).__init__(*args, **kwargs)
def to_internal_value(self, value):
+ input_formats = getattr(self, 'input_formats', api_settings.TIME_INPUT_FORMATS)
+
if isinstance(value, datetime.time):
return value
- for format in self.input_formats:
- if format.lower() == ISO_8601:
+ for input_format in input_formats:
+ if input_format.lower() == ISO_8601:
try:
parsed = parse_time(value)
except (ValueError, TypeError):
@@ -1033,17 +1173,19 @@ class TimeField(Field):
return parsed
else:
try:
- parsed = datetime.datetime.strptime(value, format)
+ parsed = self.datetime_parser(value, input_format)
except (ValueError, TypeError):
pass
else:
return parsed.time()
- humanized_format = humanize_datetime.time_formats(self.input_formats)
+ humanized_format = humanize_datetime.time_formats(input_formats)
self.fail('invalid', format=humanized_format)
def to_representation(self, value):
- if self.format is None:
+ output_format = getattr(self, 'format', api_settings.TIME_FORMAT)
+
+ if output_format is None:
return value
# Applying a `TimeField` to a datetime value is almost always
@@ -1055,9 +1197,9 @@ class TimeField(Field):
'read-only field and deal with timezone issues explicitly.'
)
- if self.format.lower() == ISO_8601:
+ if output_format.lower() == ISO_8601:
return value.isoformat()
- return value.strftime(self.format)
+ return value.strftime(output_format)
class DurationField(Field):
@@ -1074,7 +1216,7 @@ class DurationField(Field):
def to_internal_value(self, value):
if isinstance(value, datetime.timedelta):
return value
- parsed = parse_duration(value)
+ parsed = parse_duration(six.text_type(value))
if parsed is not None:
return parsed
self.fail('invalid', format='[DD] [HH:[MM:]]ss[.uuuuuu]')
@@ -1089,26 +1231,21 @@ class ChoiceField(Field):
default_error_messages = {
'invalid_choice': _('"{input}" is not a valid choice.')
}
+ html_cutoff = None
+ html_cutoff_text = _('More than {count} items...')
def __init__(self, choices, **kwargs):
- # Allow either single or paired choices style:
- # choices = [1, 2, 3]
- # choices = [(1, 'First'), (2, 'Second'), (3, 'Third')]
- pairs = [
- isinstance(item, (list, tuple)) and len(item) == 2
- for item in choices
- ]
- if all(pairs):
- self.choices = OrderedDict([(key, display_value) for key, display_value in choices])
- else:
- self.choices = OrderedDict([(item, item) for item in choices])
+ self.grouped_choices = to_choices_dict(choices)
+ self.choices = flatten_choices_dict(self.grouped_choices)
+ self.html_cutoff = kwargs.pop('html_cutoff', self.html_cutoff)
+ self.html_cutoff_text = kwargs.pop('html_cutoff_text', self.html_cutoff_text)
# Map the string representation of choices to the underlying value.
# Allows us to deal with eg. integer choices while supporting either
# integer or string input, but still get the correct datatype out.
- self.choice_strings_to_values = dict([
- (six.text_type(key), key) for key in self.choices.keys()
- ])
+ self.choice_strings_to_values = {
+ six.text_type(key): key for key in self.choices.keys()
+ }
self.allow_blank = kwargs.pop('allow_blank', False)
@@ -1128,38 +1265,71 @@ class ChoiceField(Field):
return value
return self.choice_strings_to_values.get(six.text_type(value), value)
+ def iter_options(self):
+ """
+ Helper method for use with templates rendering select widgets.
+ """
+ return iter_options(
+ self.grouped_choices,
+ cutoff=self.html_cutoff,
+ cutoff_text=self.html_cutoff_text
+ )
+
class MultipleChoiceField(ChoiceField):
default_error_messages = {
'invalid_choice': _('"{input}" is not a valid choice.'),
- 'not_a_list': _('Expected a list of items but got type "{input_type}".')
+ 'not_a_list': _('Expected a list of items but got type "{input_type}".'),
+ 'empty': _('This selection may not be empty.')
}
default_empty_html = []
+ def __init__(self, *args, **kwargs):
+ self.allow_empty = kwargs.pop('allow_empty', True)
+ super(MultipleChoiceField, self).__init__(*args, **kwargs)
+
def get_value(self, dictionary):
+ if self.field_name not in dictionary:
+ if getattr(self.root, 'partial', False):
+ return empty
# We override the default field access in order to support
# lists in HTML forms.
if html.is_html_input(dictionary):
- ret = dictionary.getlist(self.field_name)
- if getattr(self.root, 'partial', False) and not ret:
- ret = empty
- return ret
-
+ return dictionary.getlist(self.field_name)
return dictionary.get(self.field_name, empty)
def to_internal_value(self, data):
if isinstance(data, type('')) or not hasattr(data, '__iter__'):
self.fail('not_a_list', input_type=type(data).__name__)
+ if not self.allow_empty and len(data) == 0:
+ self.fail('empty')
- return set([
+ return {
super(MultipleChoiceField, self).to_internal_value(item)
for item in data
- ])
+ }
def to_representation(self, value):
- return set([
+ return {
self.choice_strings_to_values.get(six.text_type(item), item) for item in value
- ])
+ }
+
+
+class FilePathField(ChoiceField):
+ default_error_messages = {
+ 'invalid_choice': _('"{input}" is not a valid path choice.')
+ }
+
+ def __init__(self, path, match=None, recursive=False, allow_files=True,
+ allow_folders=False, required=None, **kwargs):
+ # Defer to Django's FilePathField implmentation to get the
+ # valid set of choices.
+ field = DjangoFilePathField(
+ path, match=match, recursive=recursive, allow_files=allow_files,
+ allow_folders=allow_folders, required=required
+ )
+ kwargs['choices'] = field.choices
+ super(FilePathField, self).__init__(**kwargs)
# File types...
@@ -1172,12 +1342,12 @@ class FileField(Field):
'empty': _('The submitted file is empty.'),
'max_length': _('Ensure this filename has at most {max_length} characters (it has {length}).'),
}
- use_url = api_settings.UPLOADED_FILES_USE_URL
def __init__(self, *args, **kwargs):
self.max_length = kwargs.pop('max_length', None)
self.allow_empty_file = kwargs.pop('allow_empty_file', False)
- self.use_url = kwargs.pop('use_url', self.use_url)
+ if 'use_url' in kwargs:
+ self.use_url = kwargs.pop('use_url')
super(FileField, self).__init__(*args, **kwargs)
def to_internal_value(self, data):
@@ -1198,8 +1368,14 @@ class FileField(Field):
return data
def to_representation(self, value):
- if self.use_url:
- if not value:
+ use_url = getattr(self, 'use_url', api_settings.UPLOADED_FILES_USE_URL)
+
+ if not value:
+ return None
+
+ if use_url:
+ if not getattr(value, 'url', None):
+ # If the file has not been saved it may not have a URL.
return None
url = value.url
request = self.context.get('request', None)
@@ -1250,19 +1426,34 @@ class ListField(Field):
child = _UnvalidatedField()
initial = []
default_error_messages = {
- 'not_a_list': _('Expected a list of items but got type "{input_type}".')
+ 'not_a_list': _('Expected a list of items but got type "{input_type}".'),
+ 'empty': _('This list may not be empty.')
}
def __init__(self, *args, **kwargs):
self.child = kwargs.pop('child', copy.deepcopy(self.child))
+ self.allow_empty = kwargs.pop('allow_empty', True)
+
assert not inspect.isclass(self.child), '`child` has not been instantiated.'
+ assert self.child.source is None, (
+ "The `source` argument is not meaningful when applied to a `child=` field. "
+ "Remove `source=` from the field declaration."
+ )
+
super(ListField, self).__init__(*args, **kwargs)
self.child.bind(field_name='', parent=self)
def get_value(self, dictionary):
+ if self.field_name not in dictionary:
+ if getattr(self.root, 'partial', False):
+ return empty
# We override the default field access in order to support
# lists in HTML forms.
if html.is_html_input(dictionary):
+ val = dictionary.getlist(self.field_name, [])
+ if len(val) > 0:
+ # Support QueryDict lists in HTML input.
+ return val
return html.parse_html_list(dictionary, prefix=self.field_name)
return dictionary.get(self.field_name, empty)
@@ -1272,8 +1463,10 @@ class ListField(Field):
"""
if html.is_html_input(data):
data = html.parse_html_list(data)
- if isinstance(data, type('')) or not hasattr(data, '__iter__'):
+ if isinstance(data, type('')) or isinstance(data, collections.Mapping) or not hasattr(data, '__iter__'):
self.fail('not_a_list', input_type=type(data).__name__)
+ if not self.allow_empty and len(data) == 0:
+ self.fail('empty')
return [self.child.run_validation(item) for item in data]
def to_representation(self, data):
@@ -1292,7 +1485,13 @@ class DictField(Field):
def __init__(self, *args, **kwargs):
self.child = kwargs.pop('child', copy.deepcopy(self.child))
+
assert not inspect.isclass(self.child), '`child` has not been instantiated.'
+ assert self.child.source is None, (
+ "The `source` argument is not meaningful when applied to a `child=` field. "
+ "Remove `source=` from the field declaration."
+ )
+
super(DictField, self).__init__(*args, **kwargs)
self.child.bind(field_name='', parent=self)
@@ -1311,19 +1510,50 @@ class DictField(Field):
data = html.parse_html_dict(data)
if not isinstance(data, dict):
self.fail('not_a_dict', input_type=type(data).__name__)
- return dict([
- (six.text_type(key), self.child.run_validation(value))
+ return {
+ six.text_type(key): self.child.run_validation(value)
for key, value in data.items()
- ])
+ }
def to_representation(self, value):
"""
List of object instances -> List of dicts of primitive datatypes.
"""
- return dict([
- (six.text_type(key), self.child.to_representation(val))
+ return {
+ six.text_type(key): self.child.to_representation(val)
for key, val in value.items()
- ])
+ }
+
+
+class JSONField(Field):
+ default_error_messages = {
+ 'invalid': _('Value must be valid JSON.')
+ }
+
+ def __init__(self, *args, **kwargs):
+ self.binary = kwargs.pop('binary', False)
+ super(JSONField, self).__init__(*args, **kwargs)
+
+ def to_internal_value(self, data):
+ try:
+ if self.binary:
+ if isinstance(data, six.binary_type):
+ data = data.decode('utf-8')
+ return json.loads(data)
+ else:
+ json.dumps(data)
+ except (TypeError, ValueError):
+ self.fail('invalid')
+ return data
+
+ def to_representation(self, value):
+ if self.binary:
+ value = json.dumps(value)
+ # On python 2.x the return type for json.dumps() is underspecified.
+ # On python 3.x json.dumps() returns unicode strings.
+ if isinstance(value, six.text_type):
+ value = bytes(value.encode('utf-8'))
+ return value
# Miscellaneous field types...
@@ -1337,7 +1567,7 @@ class ReadOnlyField(Field):
For example, the following would call `get_expiry_date()` on the object:
- class ExampleSerializer(self):
+ class ExampleSerializer(Serializer):
expiry_date = ReadOnlyField(source='get_expiry_date')
"""
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index 9a84efa2..ff541ba1 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -4,15 +4,60 @@ returned by list views.
"""
from __future__ import unicode_literals
+import operator
+from functools import reduce
+
+from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.db import models
+from django.template import loader
from django.utils import six
-from rest_framework.compat import django_filters, guardian, get_model_name
-from rest_framework.settings import api_settings
-from functools import reduce
-import operator
+from django.utils.translation import ugettext_lazy as _
-FilterSet = django_filters and django_filters.FilterSet or None
+from rest_framework.compat import (
+ crispy_forms, 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):
@@ -32,6 +77,7 @@ class DjangoFilterBackend(BaseFilterBackend):
A filter backend that uses django-filter.
"""
default_filter_set = FilterSet
+ template = filter_template
def __init__(self):
assert django_filters, 'Using DjangoFilterBackend, but django-filter is not installed'
@@ -53,10 +99,11 @@ class DjangoFilterBackend(BaseFilterBackend):
return filter_class
if filter_fields:
- class AutoFilterSet(self.default_filter_set):
+ class AutoFilterSet(FilterSet):
class Meta:
model = queryset.model
fields = filter_fields
+
return AutoFilterSet
return None
@@ -69,10 +116,22 @@ class DjangoFilterBackend(BaseFilterBackend):
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)
+
class SearchFilter(BaseFilterBackend):
# The URL query parameter used for the search.
search_param = api_settings.SEARCH_PARAM
+ template = 'rest_framework/filters/search.html'
def get_search_terms(self, request):
"""
@@ -89,30 +148,55 @@ class SearchFilter(BaseFilterBackend):
return "%s__iexact" % field_name[1:]
elif field_name.startswith('@'):
return "%s__search" % field_name[1:]
+ if field_name.startswith('$'):
+ return "%s__iregex" % field_name[1:]
else:
return "%s__icontains" % field_name
def filter_queryset(self, request, queryset, view):
search_fields = getattr(view, 'search_fields', None)
+ search_terms = self.get_search_terms(request)
- if not search_fields:
+ if not search_fields or not search_terms:
return queryset
- orm_lookups = [self.construct_search(six.text_type(search_field))
- for search_field in search_fields]
+ orm_lookups = [
+ self.construct_search(six.text_type(search_field))
+ for search_field in search_fields
+ ]
- for search_term in self.get_search_terms(request):
- or_queries = [models.Q(**{orm_lookup: search_term})
- for orm_lookup in orm_lookups]
- queryset = queryset.filter(reduce(operator.or_, or_queries)).distinct()
+ base = queryset
+ for search_term in search_terms:
+ queries = [
+ models.Q(**{orm_lookup: search_term})
+ for orm_lookup in orm_lookups
+ ]
+ queryset = queryset.filter(reduce(operator.or_, queries))
- return queryset
+ # Filtering against a many-to-many field requires us to
+ # call queryset.distinct() in order to avoid duplicate items
+ # in the resulting queryset.
+ return distinct(queryset, base)
+
+ def to_html(self, request, queryset, view):
+ if not getattr(view, 'search_fields', None):
+ return ''
+
+ term = self.get_search_terms(request)
+ term = term[0] if term else ''
+ context = {
+ 'param': self.search_param,
+ 'term': term
+ }
+ template = loader.get_template(self.template)
+ return template_render(template, context)
class OrderingFilter(BaseFilterBackend):
# The URL query parameter used for the ordering.
ordering_param = api_settings.ORDERING_PARAM
ordering_fields = None
+ template = 'rest_framework/filters/ordering.html'
def get_ordering(self, request, queryset, view):
"""
@@ -138,7 +222,7 @@ class OrderingFilter(BaseFilterBackend):
return (ordering,)
return ordering
- def remove_invalid_fields(self, queryset, fields, view):
+ def get_valid_fields(self, queryset, view):
valid_fields = getattr(view, 'ordering_fields', self.ordering_fields)
if valid_fields is None:
@@ -149,15 +233,30 @@ class OrderingFilter(BaseFilterBackend):
"'serializer_class' or 'ordering_fields' attribute.")
raise ImproperlyConfigured(msg % self.__class__.__name__)
valid_fields = [
- field.source or field_name
+ (field.source or field_name, field.label)
for field_name, field in serializer_class().fields.items()
- if not getattr(field, 'write_only', False)
+ if not getattr(field, 'write_only', False) and not field.source == '*'
]
elif valid_fields == '__all__':
# View explicitly allows filtering on any model field
- valid_fields = [field.name for field in queryset.model._meta.fields]
- valid_fields += queryset.query.aggregates.keys()
+ valid_fields = [
+ (field.name, getattr(field, 'label', field.name.title()))
+ for field in queryset.model._meta.fields
+ ]
+ valid_fields += [
+ (key, key.title().split('__'))
+ for key in queryset.query.aggregates.keys()
+ ]
+ else:
+ valid_fields = [
+ (item, item) if isinstance(item, six.string_types) else item
+ for item in valid_fields
+ ]
+ return valid_fields
+
+ def remove_invalid_fields(self, queryset, fields, view):
+ valid_fields = [item[0] for item in self.get_valid_fields(queryset, view)]
return [term for term in fields if term.lstrip('-') in valid_fields]
def filter_queryset(self, request, queryset, view):
@@ -168,6 +267,25 @@ class OrderingFilter(BaseFilterBackend):
return queryset
+ def get_template_context(self, request, queryset, view):
+ current = self.get_ordering(request, queryset, view)
+ current = None if current is None else current[0]
+ options = []
+ for key, label in self.get_valid_fields(queryset, view):
+ options.append((key, '%s - ascending' % label))
+ options.append(('-' + key, '%s - descending' % label))
+ return {
+ 'request': request,
+ 'current': current,
+ 'param': self.ordering_param,
+ 'options': options,
+ }
+
+ def to_html(self, request, queryset, view):
+ template = loader.get_template(self.template)
+ context = self.get_template_context(request, queryset, view)
+ return template_render(template, context)
+
class DjangoObjectPermissionsFilter(BaseFilterBackend):
"""
@@ -180,11 +298,17 @@ class DjangoObjectPermissionsFilter(BaseFilterBackend):
perm_format = '%(app_label)s.view_%(model_name)s'
def filter_queryset(self, request, queryset, view):
+ extra = {}
user = request.user
model_cls = queryset.model
kwargs = {
'app_label': model_cls._meta.app_label,
- 'model_name': get_model_name(model_cls)
+ 'model_name': model_cls._meta.model_name
}
permission = self.perm_format % kwargs
- return guardian.shortcuts.get_objects_for_user(user, permission, queryset)
+ if guardian.VERSION >= (1, 3):
+ # Maintain behavior compatibility with versions prior to 1.3
+ extra = {'accept_global_perms': False}
+ else:
+ extra = {}
+ return guardian.shortcuts.get_objects_for_user(user, permission, queryset, **extra)
diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 61dcb84a..88438e8c 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -2,10 +2,12 @@
Generic views that provide commonly needed behaviour.
"""
from __future__ import unicode_literals
+
from django.db.models.query import QuerySet
from django.http import Http404
from django.shortcuts import get_object_or_404 as _get_object_or_404
-from rest_framework import views, mixins
+
+from rest_framework import mixins, views
from rest_framework.settings import api_settings
diff --git a/rest_framework/locale/ach/LC_MESSAGES/django.mo b/rest_framework/locale/ach/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..a1e8e6bc
Binary files /dev/null and b/rest_framework/locale/ach/LC_MESSAGES/django.mo differ
diff --git a/rest_framework/locale/ach/LC_MESSAGES/django.po b/rest_framework/locale/ach/LC_MESSAGES/django.po
new file mode 100644
index 00000000..0a6f2cce
--- /dev/null
+++ b/rest_framework/locale/ach/LC_MESSAGES/django.po
@@ -0,0 +1,426 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: Django REST framework\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-07 18:53+0100\n"
+"PO-Revision-Date: 2015-12-07 17:55+0000\n"
+"Last-Translator: Xavier Ordoquy
-
-
-
-
+ ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(this.options.viewport.selector||this.options.viewport);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show()},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var c=a.contains(document.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!c)return;var d=this,e=this.tip(),f=this.getUID(this.type);this.setContent(),e.attr("id",f),this.$element.attr("aria-describedby",f),this.options.animation&&e.addClass("fade");var g="function"==typeof this.options.placement?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,h=/\s?auto?\s?/i,i=h.test(g);i&&(g=g.replace(h,"")||"top"),e.detach().css({top:0,left:0,display:"block"}).addClass(g).data("bs."+this.type,this),this.options.container?e.appendTo(this.options.container):e.insertAfter(this.$element);var j=this.getPosition(),k=e[0].offsetWidth,l=e[0].offsetHeight;if(i){var m=g,n=this.$element.parent(),o=this.getPosition(n);g="bottom"==g&&j.top+j.height+l-o.scroll>o.height?"top":"top"==g&&j.top-o.scroll-l<0?"bottom":"right"==g&&j.right+k>o.width?"left":"left"==g&&j.left-k
'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").empty()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},c.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){var e=a.proxy(this.process,this);this.$body=a("body"),this.$scrollElement=a(a(c).is("body")?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",e),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.2.0",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b="offset",c=0;a.isWindow(this.$scrollElement[0])||(b="position",c=this.$scrollElement.scrollTop()),this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight();var d=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[b]().top+c,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){d.offsets.push(this[0]),d.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<=e[0])return g!=(a=f[0])&&this.activate(a);for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parentsUntil(this.options.target,".active").removeClass("active");var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.2.0",c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});if(b.trigger(f),!f.isDefaultPrevented()){var g=a(d);this.activate(b.closest("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})}}},c.prototype.activate=function(b,c,d){function e(){f.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),g?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var f=c.find("> .active"),g=d&&a.support.transition&&f.hasClass("fade");g?f.one("bsTransitionEnd",e).emulateTransitionEnd(150):e(),f.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(c){c.preventDefault(),b.call(a(this),"show")})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=this.unpin=this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.2.0",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=a(document).height(),d=this.$target.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top(this.$element)),"function"==typeof h&&(h=f.bottom(this.$element));var i=null!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=b-h?"bottom":null!=g&&g>=d?"top":!1;if(this.affixed!==i){null!=this.unpin&&this.$element.css("top","");var j="affix"+(i?"-"+i:""),k=a.Event(j+".bs.affix");this.$element.trigger(k),k.isDefaultPrevented()||(this.affixed=i,this.unpin="bottom"==i?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(j).trigger(a.Event(j.replace("affix","affixed"))),"bottom"==i&&this.$element.offset({top:b-this.$element.height()-h}))}}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},d.offsetBottom&&(d.offset.bottom=d.offsetBottom),d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
\ No newline at end of file
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.5",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.5",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),a(c.target).is('input[type="radio"]')||a(c.target).is('input[type="checkbox"]')||c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.5",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.5",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.5",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j
'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.5",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b
","
"]},sa=da(y),ta=sa.appendChild(y.createElement("div"));ra.optgroup=ra.option,ra.tbody=ra.tfoot=ra.colgroup=ra.caption=ra.thead,ra.th=ra.td;function ua(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ua(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function va(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wa(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xa(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function ya(a){var b=pa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function za(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Aa(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Ba(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xa(b).text=a.text,ya(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!ga.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ta.innerHTML=a.outerHTML,ta.removeChild(f=ta.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ua(f),h=ua(a),g=0;null!=(e=h[g]);++g)d[g]&&Ba(e,d[g]);if(b)if(c)for(h=h||ua(a),d=d||ua(f),g=0;null!=(e=h[g]);g++)Aa(e,d[g]);else Aa(a,f);return d=ua(f,"script"),d.length>0&&za(d,!i&&ua(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=da(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(la.test(f)){h=h||o.appendChild(b.createElement("div")),i=(ja.exec(f)||["",""])[1].toLowerCase(),l=ra[i]||ra._default,h.innerHTML=l[1]+f.replace(ia,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&ha.test(f)&&p.push(b.createTextNode(ha.exec(f)[0])),!k.tbody){f="table"!==i||ka.test(f)?"| t |
").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cc=a.document.documentElement;function dc(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cc;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cc})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=La(k.pixelPosition,function(a,c){return c?(c=Ja(a,b),Ha.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ec=a.jQuery,fc=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fc),b&&a.jQuery===m&&(a.jQuery=ec),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/rest_framework/static/rest_framework/js/jquery-1.8.1-min.js b/rest_framework/static/rest_framework/js/jquery-1.8.1-min.js
deleted file mode 100644
index 3b8d15d0..00000000
--- a/rest_framework/static/rest_framework/js/jquery-1.8.1-min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v@1.8.1 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write(""),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bS[a]=c,c}function ci(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.1",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return typeof a=="object"?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b
a",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length||!d)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="
",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||++p.uuid:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.length,e=c.shift(),f=p._queueHooks(a,b),g=function(){p.dequeue(a,b)};e==="inprogress"&&(e=c.shift(),d--),e&&(b==="fx"&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c-1)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c-1)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,""+d),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j=0),h[l]&&j.push(k);j.length&&t.push({elem:f,matches:j})}n.length>o&&t.push({elem:this,matches:n.slice(o)});for(d=0;d0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function $(a,b,c,d){c=c||[],b=b||q;var e,f,g,j,k=b.nodeType;if(k!==1&&k!==9)return[];if(!a||typeof a!="string")return c;g=h(b);if(!g&&!d)if(e=L.exec(a))if(j=e[1]){if(k===9){f=b.getElementById(j);if(!f||!f.parentNode)return c;if(f.id===j)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(j))&&i(b,f)&&f.id===j)return c.push(f),c}else{if(e[2])return u.apply(c,t.call(b.getElementsByTagName(a),0)),c;if((j=e[3])&&X&&b.getElementsByClassName)return u.apply(c,t.call(b.getElementsByClassName(j),0)),c}return bk(a,b,c,d,g)}function _(a){return function(b){var c=b.nodeName.toLowerCase();return c==="input"&&b.type===a}}function ba(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}}function bb(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}function bc(a,b,c,d){var e,g,h,i,j,k,l,m,n,p,r=!c&&b!==q,s=(r?"":"")+a.replace(H,"$1"),u=y[o][s];if(u)return d?0:t.call(u,0);j=a,k=[],m=0,n=f.preFilter,p=f.filter;while(j){if(!e||(g=I.exec(j)))g&&(j=j.slice(g[0].length),h.selector=l),k.push(h=[]),l="",r&&(j=" "+j);e=!1;if(g=J.exec(j))l+=g[0],j=j.slice(g[0].length),e=h.push({part:g.pop().replace(H," "),string:g[0],captures:g});for(i in p)(g=S[i].exec(j))&&(!n[i]||(g=n[i](g,b,c)))&&(l+=g[0],j=j.slice(g[0].length),e=h.push({part:i,string:g.shift(),captures:g}));if(!e)break}return l&&(h.selector=l),d?j.length:j?$.error(a):t.call(y(s,k),0)}function bd(a,b,e,f){var g=b.dir,h=s++;return a||(a=function(a){return a===e}),b.first?function(b){while(b=b[g])if(b.nodeType===1)return a(b)&&b}:f?function(b){while(b=b[g])if(b.nodeType===1&&a(b))return b}:function(b){var e,f=h+"."+c,i=f+"."+d;while(b=b[g])if(b.nodeType===1){if((e=b[o])===i)return b.sizset;if(typeof e=="string"&&e.indexOf(f)===0){if(b.sizset)return b}else{b[o]=i;if(a(b))return b.sizset=!0,b;b.sizset=!1}}}}function be(a,b){return a?function(c){var d=b(c);return d&&a(d===!0?c:d)}:b}function bf(a,b,c){var d,e,g=0;for(;d=a[g];g++)f.relative[d.part]?e=bd(e,f.relative[d.part],b,c):e=be(e,f.filter[d.part].apply(null,d.captures.concat(b,c)));return e}function bg(a){return function(b){var c,d=0;for(;c=a[d];d++)if(c(b))return!0;return!1}}function bh(a,b,c,d){var e=0,f=b.length;for(;e0?i(h,c,g):[]}function bj(a,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q,r,s=0,t=a.length,v=S.POS,w=new RegExp("^"+v.source+"(?!"+A+")","i"),x=function(){var a=1,c=arguments.length-2;for(;al){g+=k.slice(l,n.index),l=p,q=[c],J.test(g)&&(m&&(q=m),m=e);if(r=O.test(g))g=g.slice(0,-5).replace(J,"$&*"),l++;n.length>1&&n[0].replace(w,x),m=bi(g,n[1],n[2],q,m,r)}g=""}}o||(g+=k),o=!1}g?J.test(g)?bh(g,m||[c],d,e):$(g,c,d,e?e.concat(m):m):u.apply(d,m)}return t===1?d:$.uniqueSort(d)}function bk(a,b,e,g,h){a=a.replace(H,"$1");var i,k,l,m,n,o,p,q,r,s,v=bc(a,b,h),w=b.nodeType;if(S.POS.test(a))return bj(v,b,e,g);if(g)i=t.call(g,0);else if(v.length===1){if((o=t.call(v[0],0)).length>2&&(p=o[0]).part==="ID"&&w===9&&!h&&f.relative[o[1].part]){b=f.find.ID(p.captures[0].replace(R,""),b,h)[0];if(!b)return e;a=a.slice(o.shift().string.length)}r=(v=N.exec(o[0].string))&&!v.index&&b.parentNode||b,q="";for(n=o.length-1;n>=0;n--){p=o[n],s=p.part,q=p.string+q;if(f.relative[s])break;if(f.order.test(s)){i=f.find[s](p.captures[0].replace(R,""),r,h);if(i==null)continue;a=a.slice(0,a.length-q.length)+q.replace(S[s],""),a||u.apply(e,t.call(i,0));break}}}if(a){k=j(a,b,h),c=k.dirruns++,i==null&&(i=f.find.TAG("*",N.test(a)&&b.parentNode||b));for(n=0;m=i[n];n++)d=k.runs++,k(m)&&e.push(m)}return e}var c,d,e,f,g,h,i,j,k,l,m=!0,n="undefined",o=("sizcache"+Math.random()).replace(".",""),q=a.document,r=q.documentElement,s=0,t=[].slice,u=[].push,v=function(a,b){return a[o]=b||!0,a},w=function(){var a={},b=[];return v(function(c,d){return b.push(c)>f.cacheLength&&delete a[b.shift()],a[c]=d},a)},x=w(),y=w(),z=w(),A="[\\x20\\t\\r\\n\\f]",B="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",C=B.replace("w","w#"),D="([*^$|!~]?=)",E="\\["+A+"*("+B+")"+A+"*(?:"+D+A+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+C+")|)|)"+A+"*\\]",F=":("+B+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+E+")|[^:]|\\\\.)*|.*))\\)|)",G=":(nth|eq|gt|lt|first|last|even|odd)(?:\\(((?:-\\d)?\\d*)\\)|)(?=[^-]|$)",H=new RegExp("^"+A+"+|((?:^|[^\\\\])(?:\\\\.)*)"+A+"+$","g"),I=new RegExp("^"+A+"*,"+A+"*"),J=new RegExp("^"+A+"*([\\x20\\t\\r\\n\\f>+~])"+A+"*"),K=new RegExp(F),L=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,M=/^:not/,N=/[\x20\t\r\n\f]*[+~]/,O=/:not\($/,P=/h\d/i,Q=/input|select|textarea|button/i,R=/\\(?!\\)/g,S={ID:new RegExp("^#("+B+")"),CLASS:new RegExp("^\\.("+B+")"),NAME:new RegExp("^\\[name=['\"]?("+B+")['\"]?\\]"),TAG:new RegExp("^("+B.replace("w","w*")+")"),ATTR:new RegExp("^"+E),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+A+"*(even|odd|(([+-]|)(\\d*)n|)"+A+"*(?:([+-]|)"+A+"*(\\d+)|))"+A+"*\\)|)","i"),POS:new RegExp(G,"ig"),needsContext:new RegExp("^"+A+"*[>+~]|"+G,"i")},T=function(a){var b=q.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},U=T(function(a){return a.appendChild(q.createComment("")),!a.getElementsByTagName("*").length}),V=T(function(a){return a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!==n&&a.firstChild.getAttribute("href")==="#"}),W=T(function(a){a.innerHTML="";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),X=T(function(a){return a.innerHTML="",!a.getElementsByClassName||!a.getElementsByClassName("e").length?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length===2)}),Y=T(function(a){a.id=o+0,a.innerHTML="",r.insertBefore(a,r.firstChild);var b=q.getElementsByName&&q.getElementsByName(o).length===2+q.getElementsByName(o+0).length;return e=!q.getElementById(o),r.removeChild(a),b});try{t.call(r.childNodes,0)[0].nodeType}catch(Z){t=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}$.matches=function(a,b){return $(a,null,null,b)},$.matchesSelector=function(a,b){return $(b,null,null,[a]).length>0},g=$.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=g(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=g(b);return c},h=$.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},i=$.contains=r.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:r.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},$.attr=function(a,b){var c,d=h(a);return d||(b=b.toLowerCase()),f.attrHandle[b]?f.attrHandle[b](a):W||d?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},f=$.selectors={cacheLength:50,createPseudo:v,match:S,order:new RegExp("ID|TAG"+(Y?"|NAME":"")+(X?"|CLASS":"")),attrHandle:V?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:e?function(a,b,c){if(typeof b.getElementById!==n&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==n&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==n&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:U?function(a,b){if(typeof b.getElementsByTagName!==n)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c},NAME:function(a,b){if(typeof b.getElementsByName!==n)return b.getElementsByName(name)},CLASS:function(a,b,c){if(typeof b.getElementsByClassName!==n&&!c)return b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(R,""),a[3]=(a[4]||a[5]||"").replace(R,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||$.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&$.error(a[0]),a},PSEUDO:function(a,b,c){var d,e;if(S.CHILD.test(a[0]))return null;if(a[3])a[2]=a[3];else if(d=a[4])K.test(d)&&(e=bc(d,b,c,!0))&&(e=d.indexOf(")",d.length-e)-d.length)&&(d=d.slice(0,e),a[0]=a[0].slice(0,e)),a[2]=d;return a.slice(0,3)}},filter:{ID:e?function(a){return a=a.replace(R,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(R,""),function(b){var c=typeof b.getAttributeNode!==n&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(R,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=x[o][a];return b||(b=x(a,new RegExp("(^|"+A+")"+a+"("+A+"|$)"))),function(a){return b.test(a.className||typeof a.getAttribute!==n&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return b?function(d){var e=$.attr(d,a),f=e+"";if(e==null)return b==="!=";switch(b){case"=":return f===c;case"!=":return f!==c;case"^=":return c&&f.indexOf(c)===0;case"*=":return c&&f.indexOf(c)>-1;case"$=":return c&&f.substr(f.length-c.length)===c;case"~=":return(" "+f+" ").indexOf(c)>-1;case"|=":return f===c||f.substr(0,c.length+1)===c+"-"}}:function(b){return $.attr(b,a)!=null}},CHILD:function(a,b,c,d){if(a==="nth"){var e=s++;return function(a){var b,f,g=0,h=a;if(c===1&&d===0)return!0;b=a.parentNode;if(b&&(b[o]!==e||!a.sizset)){for(h=b.firstChild;h;h=h.nextSibling)if(h.nodeType===1){h.sizset=++g;if(h===a)break}b[o]=e}return f=a.sizset-d,c===0?f===0:f%c===0&&f/c>=0}}return function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b,c,d){var e,g=f.pseudos[a]||f.pseudos[a.toLowerCase()];return g||$.error("unsupported pseudo: "+a),g[o]?g(b,c,d):g.length>1?(e=[a,a,"",b],function(a){return g(a,0,e)}):g}},pseudos:{not:v(function(a,b,c){var d=j(a.replace(H,"$1"),b,c);return function(a){return!d(a)}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!f.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},contains:v(function(a){return function(b){return(b.textContent||b.innerText||g(b)).indexOf(a)>-1}}),has:v(function(a){return function(b){return $(a,b).length>0}}),header:function(a){return P.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:_("radio"),checkbox:_("checkbox"),file:_("file"),password:_("password"),image:_("image"),submit:ba("submit"),reset:ba("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return Q.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b,c){return c?a.slice(1):[a[0]]},last:function(a,b,c){var d=a.pop();return c?a:[d]},even:function(a,b,c){var d=[],e=c?1:0,f=a.length;for(;e",a.querySelectorAll("[selected]").length||e.push("\\["+A+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),T(function(a){a.innerHTML="",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+A+"*(?:\"\"|'')"),a.innerHTML="",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=e.length&&new RegExp(e.join("|")),bk=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a)))if(d.nodeType===9)try{return u.apply(f,t.call(d.querySelectorAll(a),0)),f}catch(i){}else if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){var j,k,l,m=d.getAttribute("id"),n=m||o,p=N.test(a)&&d.parentNode||d;m?n=n.replace(c,"\\$&"):d.setAttribute("id",n),j=bc(a,d,h),n="[id='"+n+"']";for(k=0,l=j.length;k0})}(),f.setFilters.nth=f.setFilters.eq,f.filters=f.pseudos,$.attr=p.attr,p.find=$,p.expr=$.selectors,p.expr[":"]=p.expr.pseudos,p.unique=$.uniqueSort,p.text=$.getText,p.isXMLDoc=$.isXML,p.contains=$.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b0)for(e=d;e=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*\s*$/g,bz={option:[1,""],legend:[1,""],thead:[1,"","
"],tr:[2,"","
"],td:[3,"
"],col:[2,"
"],area:[1,""],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=b===e&&bA,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(f=0;(h=a[f])!=null;f++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{s=s||bk(b),l=b.createElement("div"),s.appendChild(l),h=h.replace(bo,"<$1>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]===""&&!m?l.childNodes:[];for(g=n.length-1;g>=0;--g)p.nodeName(n[g],"tbody")&&!n[g].childNodes.length&&n[g].parentNode.removeChild(n[g])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l.parentNode.removeChild(l)}h.nodeType?t.push(h):p.merge(t,h)}l&&(h=l=s=null);if(!p.support.appendChecked)for(f=0;(h=t[f])!=null;f++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(f=0;(h=t[f])!=null;f++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[f+1,0].concat(r)),f+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^(none|table(?!-c[ea]).+)/,bO=/^margin/,bP=new RegExp("^("+q+")(.*)$","i"),bQ=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bR=new RegExp("^([-+])=("+q+")","i"),bS={},bT={position:"absolute",visibility:"hidden",display:"block"},bU={letterSpacing:0,fontWeight:400},bV=["Top","Right","Bottom","Left"],bW=["Webkit","O","Moz","ms"],bX=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return b$(this,!0)},hide:function(){return b$(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bX.apply(this,arguments):this.each(function(){(c?a:bZ(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bY(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bR.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bY(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bU&&(f=bU[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h[c],d===""&&!p.contains(b.ownerDocument,b)&&(d=p.style(b,c)),bQ.test(d)&&bO.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bQ.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth===0&&bN.test(bH(a,"display"))?p.swap(a,bT,function(){return cb(a,b,d)}):cb(a,b,d)},set:function(a,c,d){return b_(a,c,d?ca(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bQ.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bV[d]+b]=e[d]||e[d-2]||e[0];return f}},bO.test(a)||(p.cssHooks[a+b].set=b_)});var cd=/%20/g,ce=/\[\]$/,cf=/\r?\n/g,cg=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,ch=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ch.test(this.nodeName)||cg.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(cf,"\r\n")}}):{name:b.name,value:c.replace(cf,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ci(d,a[d],c,f);return e.join("&").replace(cd,"+")};var cj,ck,cl=/#.*$/,cm=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,co=/^(?:GET|HEAD)$/,cp=/^\/\//,cq=/\?/,cr=/
| t |
","
"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1>");try{for(;d| {{ key|capfirst }} | {{ value|format_value }} |
|---|
| {{ forloop.counter0 }} | +{{ item|format_value }} | +
|---|
+ {% block navbar %}
+
+ {% endblock %}
- {% endblock %}
-
+ \d+)/$', FilterClassDetailView.as_view(), name='detail-view'),
url(r'^$', FilterClassRootView.as_view(), name='root-view'),
url(r'^get-queryset/$', GetQuerysetView.as_view(),
name='get-queryset-view'),
- )
+ ]
class CommonFilteringTestCase(TestCase):
@@ -405,6 +407,23 @@ class SearchFilterTests(TestCase):
]
)
+ def test_regexp_search(self):
+ class SearchListView(generics.ListAPIView):
+ queryset = SearchFilterModel.objects.all()
+ serializer_class = SearchFilterSerializer
+ filter_backends = (filters.SearchFilter,)
+ search_fields = ('$title', '$text')
+
+ view = SearchListView.as_view()
+ request = factory.get('/', {'search': 'z{2} ^b'})
+ response = view(request)
+ self.assertEqual(
+ response.data,
+ [
+ {'id': 2, 'title': 'zz', 'text': 'bcd'}
+ ]
+ )
+
def test_search_with_nonstandard_search_param(self):
with override_settings(REST_FRAMEWORK={'SEARCH_PARAM': 'query'}):
reload_module(filters)
diff --git a/tests/test_generics.py b/tests/test_generics.py
index 88e792ce..000adffa 100644
--- a/tests/test_generics.py
+++ b/tests/test_generics.py
@@ -1,13 +1,18 @@
from __future__ import unicode_literals
+
import django
+import pytest
from django.db import models
from django.shortcuts import get_object_or_404
from django.test import TestCase
from django.utils import six
+
from rest_framework import generics, renderers, serializers, status
+from rest_framework.response import Response
from rest_framework.test import APIRequestFactory
-from tests.models import BasicModel, RESTFrameworkModel
-from tests.models import ForeignKeySource, ForeignKeyTarget
+from tests.models import (
+ BasicModel, ForeignKeySource, ForeignKeyTarget, RESTFrameworkModel
+)
factory = APIRequestFactory()
@@ -142,6 +147,16 @@ class TestRootView(TestCase):
created = self.objects.get(id=4)
self.assertEqual(created.text, 'foobar')
+ def test_post_error_root_view(self):
+ """
+ POST requests to ListCreateAPIView in HTML should include a form error.
+ """
+ data = {'text': 'foobar' * 100}
+ 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'))
+
EXPECTED_QUERIES_FOR_PUT = 3 if django.VERSION < (1, 6) else 2
@@ -279,6 +294,16 @@ class TestInstanceView(TestCase):
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
self.assertFalse(self.objects.filter(id=999).exists())
+ def test_put_error_instance_view(self):
+ """
+ Incorrect PUT requests in HTML should include a form error.
+ """
+ data = {'text': 'foobar' * 100}
+ 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'))
+
class TestFKInstanceView(TestCase):
def setUp(self):
@@ -504,3 +529,17 @@ class TestFilterBackendAppliedToViews(TestCase):
response = view(request).render()
self.assertContains(response, 'field_b')
self.assertNotContains(response, 'field_a')
+
+
+class TestGuardedQueryset(TestCase):
+ def test_guarded_queryset(self):
+ class QuerysetAccessError(generics.ListAPIView):
+ queryset = BasicModel.objects.all()
+
+ def get(self, request):
+ return Response(list(self.queryset))
+
+ view = QuerysetAccessError.as_view()
+ request = factory.get('/')
+ with pytest.raises(RuntimeError):
+ view(request).render()
diff --git a/tests/test_htmlrenderer.py b/tests/test_htmlrenderer.py
index a33b832f..01ef46d3 100644
--- a/tests/test_htmlrenderer.py
+++ b/tests/test_htmlrenderer.py
@@ -1,15 +1,17 @@
from __future__ import unicode_literals
+
+import django.template.loader
+from django.conf.urls import url
from django.core.exceptions import PermissionDenied
-from django.conf.urls import patterns, url
from django.http import Http404
+from django.template import Template, TemplateDoesNotExist
from django.test import TestCase
-from django.template import TemplateDoesNotExist, Template
from django.utils import six
+
from rest_framework import status
from rest_framework.decorators import api_view, renderer_classes
from rest_framework.renderers import TemplateHTMLRenderer
from rest_framework.response import Response
-import django.template.loader
@api_view(('GET',))
@@ -34,12 +36,11 @@ def not_found(request):
raise Http404()
-urlpatterns = patterns(
- '',
+urlpatterns = [
url(r'^$', example),
url(r'^permission_denied$', permission_denied),
url(r'^not_found$', not_found),
-)
+]
class TemplateHTMLRendererTests(TestCase):
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index 04f4284d..6819f150 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -1,10 +1,14 @@
from __future__ import unicode_literals
+
+from django.core.validators import MaxValueValidator, MinValueValidator
from django.db import models
from django.test import TestCase
-from django.core.validators import MinValueValidator, MaxValueValidator
-from rest_framework import exceptions, metadata, serializers, status, views, versioning
-from rest_framework.request import Request
+
+from rest_framework import (
+ exceptions, metadata, serializers, status, versioning, views
+)
from rest_framework.renderers import BrowsableAPIRenderer
+from rest_framework.request import Request
from rest_framework.test import APIRequestFactory
request = Request(APIRequestFactory().options('/'))
@@ -55,6 +59,10 @@ class TestMetadata:
On generic views OPTIONS should return an 'actions' key with metadata
on the fields that may be supplied to PUT and POST requests.
"""
+ class NestedField(serializers.Serializer):
+ a = serializers.IntegerField()
+ b = serializers.IntegerField()
+
class ExampleSerializer(serializers.Serializer):
choice_field = serializers.ChoiceField(['red', 'green', 'blue'])
integer_field = serializers.IntegerField(
@@ -63,6 +71,12 @@ class TestMetadata:
char_field = serializers.CharField(
required=False, min_length=3, max_length=40
)
+ list_field = serializers.ListField(
+ child=serializers.ListField(
+ child=serializers.IntegerField()
+ )
+ )
+ nested_field = NestedField()
class ExampleView(views.APIView):
"""Example view."""
@@ -115,6 +129,42 @@ class TestMetadata:
'label': 'Char field',
'min_length': 3,
'max_length': 40
+ },
+ 'list_field': {
+ 'type': 'list',
+ 'required': True,
+ 'read_only': False,
+ 'label': 'List field',
+ 'child': {
+ 'type': 'list',
+ 'required': True,
+ 'read_only': False,
+ 'child': {
+ 'type': 'integer',
+ 'required': True,
+ 'read_only': False
+ }
+ }
+ },
+ 'nested_field': {
+ 'type': 'nested object',
+ 'required': True,
+ 'read_only': False,
+ 'label': 'Nested field',
+ 'children': {
+ 'a': {
+ 'type': 'integer',
+ 'required': True,
+ 'read_only': False,
+ 'label': 'A'
+ },
+ 'b': {
+ 'type': 'integer',
+ 'required': True,
+ 'read_only': False,
+ 'label': 'B'
+ }
+ }
}
}
}
diff --git a/tests/test_middleware.py b/tests/test_middleware.py
index 4c099fca..49124da6 100644
--- a/tests/test_middleware.py
+++ b/tests/test_middleware.py
@@ -1,16 +1,15 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
from django.contrib.auth.models import User
+
from rest_framework.authentication import TokenAuthentication
from rest_framework.authtoken.models import Token
from rest_framework.test import APITestCase
from rest_framework.views import APIView
-
-urlpatterns = patterns(
- '',
+urlpatterns = [
url(r'^$', APIView.as_view(authentication_classes=(TokenAuthentication,))),
-)
+]
class MyMiddleware(object):
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py
index a1d83190..57e540e7 100644
--- a/tests/test_model_serializer.py
+++ b/tests/test_model_serializer.py
@@ -6,15 +6,23 @@ These tests deal with ensuring that we correctly map the model fields onto
an appropriate set of serializer fields for each case.
"""
from __future__ import unicode_literals
+
+import decimal
+from collections import OrderedDict
+
import django
+import pytest
from django.core.exceptions import ImproperlyConfigured
-from django.core.validators import MaxValueValidator, MinValueValidator, MinLengthValidator
+from django.core.validators import (
+ MaxValueValidator, MinLengthValidator, MinValueValidator
+)
from django.db import models
from django.test import TestCase
from django.utils import six
-import pytest
+
from rest_framework import serializers
-from rest_framework.compat import unicode_repr, DurationField as ModelDurationField
+from rest_framework.compat import DurationField as ModelDurationField
+from rest_framework.compat import DecimalValidator, unicode_repr
def dedent(blocktext):
@@ -55,16 +63,18 @@ class RegularFieldsModel(models.Model):
positive_small_integer_field = models.PositiveSmallIntegerField()
slug_field = models.SlugField(max_length=100)
small_integer_field = models.SmallIntegerField()
- text_field = models.TextField()
+ text_field = models.TextField(max_length=100)
time_field = models.TimeField()
url_field = models.URLField(max_length=100)
custom_field = CustomField()
+ file_path_field = models.FilePathField(path='/tmp/')
def method(self):
return 'method'
COLOR_CHOICES = (('red', 'Red'), ('blue', 'Blue'), ('green', 'Green'))
+DECIMAL_CHOICES = (('low', decimal.Decimal('0.1')), ('medium', decimal.Decimal('0.5')), ('high', decimal.Decimal('0.9')))
class FieldOptionsModel(models.Model):
@@ -77,6 +87,10 @@ class FieldOptionsModel(models.Model):
choices_field = models.CharField(max_length=100, choices=COLOR_CHOICES)
+class ChoicesModel(models.Model):
+ choices_field_with_nonstandard_args = models.DecimalField(max_digits=3, decimal_places=1, choices=DECIMAL_CHOICES, verbose_name='A label')
+
+
class TestModelSerializer(TestCase):
def test_create_method(self):
class TestSerializer(serializers.ModelSerializer):
@@ -148,11 +162,13 @@ class TestRegularFieldMappings(TestCase):
positive_small_integer_field = IntegerField()
slug_field = SlugField(max_length=100)
small_integer_field = IntegerField()
- text_field = CharField(style={'base_template': 'textarea.html'})
+ text_field = CharField(max_length=100, style={'base_template': 'textarea.html'})
time_field = TimeField()
url_field = URLField(max_length=100)
custom_field = ModelField(model_field=)
+ file_path_field = FilePathField(path='/tmp/')
""")
+
self.assertEqual(unicode_repr(TestSerializer()), expected)
def test_field_options(self):
@@ -169,7 +185,7 @@ class TestRegularFieldMappings(TestCase):
null_field = IntegerField(allow_null=True, required=False)
default_field = IntegerField(required=False)
descriptive_field = IntegerField(help_text='Some help text', label='A label')
- choices_field = ChoiceField(choices=[('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')])
+ choices_field = ChoiceField(choices=(('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')))
""")
if six.PY2:
# This particular case is too awkward to resolve fully across
@@ -230,6 +246,23 @@ class TestRegularFieldMappings(TestCase):
""")
self.assertEqual(repr(TestSerializer()), expected)
+ def test_extra_field_kwargs_required(self):
+ """
+ Ensure `extra_kwargs` are passed to generated fields.
+ """
+ class TestSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = RegularFieldsModel
+ fields = ('auto_field', 'char_field')
+ extra_kwargs = {'auto_field': {'required': False, 'read_only': False}}
+
+ expected = dedent("""
+ TestSerializer():
+ auto_field = IntegerField(read_only=False, required=False)
+ char_field = CharField(max_length=100)
+ """)
+ self.assertEqual(repr(TestSerializer()), expected)
+
def test_invalid_field(self):
"""
Field names that do not map to a model field or relationship should
@@ -285,6 +318,28 @@ class TestRegularFieldMappings(TestCase):
ChildSerializer().fields
+ def test_choices_with_nonstandard_args(self):
+ class ExampleSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = ChoicesModel
+
+ ExampleSerializer()
+
+ def test_fields_and_exclude_behavior(self):
+ class ImplicitFieldsSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = RegularFieldsModel
+
+ class ExplicitFieldsSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = RegularFieldsModel
+ fields = '__all__'
+
+ implicit = ImplicitFieldsSerializer()
+ explicit = ExplicitFieldsSerializer()
+
+ assert implicit.data == explicit.data
+
@pytest.mark.skipif(django.VERSION < (1, 8),
reason='DurationField is only available for django1.8+')
@@ -308,6 +363,22 @@ class TestDurationFieldMapping(TestCase):
self.assertEqual(unicode_repr(TestSerializer()), expected)
+class TestGenericIPAddressFieldValidation(TestCase):
+ def test_ip_address_validation(self):
+ class IPAddressFieldModel(models.Model):
+ address = models.GenericIPAddressField()
+
+ class TestSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = IPAddressFieldModel
+
+ s = TestSerializer(data={'address': 'not an ip address'})
+ self.assertFalse(s.is_valid())
+ self.assertEquals(1, len(s.errors['address']),
+ 'Unexpected number of validation errors: '
+ '{0}'.format(s.errors))
+
+
# Tests for relational field mappings.
# ------------------------------------
@@ -359,7 +430,7 @@ class TestRelationalFieldMappings(TestCase):
id = IntegerField(label='ID', read_only=True)
foreign_key = PrimaryKeyRelatedField(queryset=ForeignKeyTargetModel.objects.all())
one_to_one = PrimaryKeyRelatedField(queryset=OneToOneTargetModel.objects.all(), validators=[])
- many_to_many = PrimaryKeyRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all())
+ many_to_many = PrimaryKeyRelatedField(allow_empty=False, many=True, queryset=ManyToManyTargetModel.objects.all())
through = PrimaryKeyRelatedField(many=True, read_only=True)
""")
self.assertEqual(unicode_repr(TestSerializer()), expected)
@@ -398,7 +469,7 @@ class TestRelationalFieldMappings(TestCase):
url = HyperlinkedIdentityField(view_name='relationalmodel-detail')
foreign_key = HyperlinkedRelatedField(queryset=ForeignKeyTargetModel.objects.all(), view_name='foreignkeytargetmodel-detail')
one_to_one = HyperlinkedRelatedField(queryset=OneToOneTargetModel.objects.all(), validators=[], view_name='onetoonetargetmodel-detail')
- many_to_many = HyperlinkedRelatedField(many=True, queryset=ManyToManyTargetModel.objects.all(), view_name='manytomanytargetmodel-detail')
+ many_to_many = HyperlinkedRelatedField(allow_empty=False, many=True, queryset=ManyToManyTargetModel.objects.all(), view_name='manytomanytargetmodel-detail')
through = HyperlinkedRelatedField(many=True, read_only=True, view_name='throughtargetmodel-detail')
""")
self.assertEqual(unicode_repr(TestSerializer()), expected)
@@ -510,6 +581,50 @@ class TestRelationalFieldMappings(TestCase):
self.assertEqual(unicode_repr(TestSerializer()), expected)
+class DisplayValueTargetModel(models.Model):
+ name = models.CharField(max_length=100)
+
+ def __str__(self):
+ return '%s Color' % (self.name)
+
+
+class DisplayValueModel(models.Model):
+ color = models.ForeignKey(DisplayValueTargetModel)
+
+
+class TestRelationalFieldDisplayValue(TestCase):
+ def setUp(self):
+ DisplayValueTargetModel.objects.bulk_create([
+ DisplayValueTargetModel(name='Red'),
+ DisplayValueTargetModel(name='Yellow'),
+ DisplayValueTargetModel(name='Green'),
+ ])
+
+ def test_default_display_value(self):
+ class TestSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = DisplayValueModel
+
+ serializer = TestSerializer()
+ expected = OrderedDict([('1', 'Red Color'), ('2', 'Yellow Color'), ('3', 'Green Color')])
+ self.assertEqual(serializer.fields['color'].choices, expected)
+
+ def test_custom_display_value(self):
+ class TestField(serializers.PrimaryKeyRelatedField):
+ def display_value(self, instance):
+ return 'My %s Color' % (instance.name)
+
+ class TestSerializer(serializers.ModelSerializer):
+ color = TestField(queryset=DisplayValueTargetModel.objects.all())
+
+ class Meta:
+ model = DisplayValueModel
+
+ serializer = TestSerializer()
+ expected = OrderedDict([('1', 'My Red Color'), ('2', 'My Yellow Color'), ('3', 'My Green Color')])
+ self.assertEqual(serializer.fields['color'].choices, expected)
+
+
class TestIntegration(TestCase):
def setUp(self):
self.foreign_key_target = ForeignKeyTargetModel.objects.create(
@@ -721,3 +836,66 @@ class TestSerializerMetaClass(TestCase):
str(exception),
"Cannot set both 'fields' and 'exclude' options on serializer ExampleSerializer."
)
+
+
+class Issue2704TestCase(TestCase):
+ def test_queryset_all(self):
+ class TestSerializer(serializers.ModelSerializer):
+ additional_attr = serializers.CharField()
+
+ class Meta:
+ model = OneFieldModel
+ fields = ('char_field', 'additional_attr')
+
+ OneFieldModel.objects.create(char_field='abc')
+ qs = OneFieldModel.objects.all()
+
+ for o in qs:
+ o.additional_attr = '123'
+
+ serializer = TestSerializer(instance=qs, many=True)
+
+ expected = [{
+ 'char_field': 'abc',
+ 'additional_attr': '123',
+ }]
+
+ assert serializer.data == expected
+
+
+class DecimalFieldModel(models.Model):
+ decimal_field = models.DecimalField(
+ max_digits=3,
+ decimal_places=1,
+ validators=[MinValueValidator(1), MaxValueValidator(3)]
+ )
+
+
+class TestDecimalFieldMappings(TestCase):
+ @pytest.mark.skipif(DecimalValidator is not None,
+ reason='DecimalValidator is available in Django 1.9+')
+ def test_decimal_field_has_no_decimal_validator(self):
+ """
+ Test that a DecimalField has no validators before Django 1.9.
+ """
+ class TestSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = DecimalFieldModel
+
+ serializer = TestSerializer()
+
+ assert len(serializer.fields['decimal_field'].validators) == 0
+
+ @pytest.mark.skipif(DecimalValidator is None,
+ reason='DecimalValidator is available in Django 1.9+')
+ def test_decimal_field_has_decimal_validator(self):
+ """
+ Test that a DecimalField has DecimalValidator in Django 1.9+.
+ """
+ class TestSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = DecimalFieldModel
+
+ serializer = TestSerializer()
+
+ assert len(serializer.fields['decimal_field'].validators) == 2
diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py
index 15627e1d..340d4966 100644
--- a/tests/test_multitable_inheritance.py
+++ b/tests/test_multitable_inheritance.py
@@ -1,6 +1,8 @@
from __future__ import unicode_literals
+
from django.db import models
from django.test import TestCase
+
from rest_framework import serializers
from tests.models import RESTFrameworkModel
diff --git a/tests/test_negotiation.py b/tests/test_negotiation.py
index 04b89eb6..434fba49 100644
--- a/tests/test_negotiation.py
+++ b/tests/test_negotiation.py
@@ -1,10 +1,11 @@
from __future__ import unicode_literals
-from django.test import TestCase
-from rest_framework.negotiation import DefaultContentNegotiation
-from rest_framework.request import Request
-from rest_framework.renderers import BaseRenderer
-from rest_framework.test import APIRequestFactory
+from django.test import TestCase
+
+from rest_framework.negotiation import DefaultContentNegotiation
+from rest_framework.renderers import BaseRenderer
+from rest_framework.request import Request
+from rest_framework.test import APIRequestFactory
factory = APIRequestFactory()
diff --git a/tests/test_pagination.py b/tests/test_pagination.py
index 6b39a6f2..c6caaf64 100644
--- a/tests/test_pagination.py
+++ b/tests/test_pagination.py
@@ -1,10 +1,15 @@
# coding: utf-8
from __future__ import unicode_literals
-from rest_framework import exceptions, generics, pagination, serializers, status, filters
-from rest_framework.request import Request
-from rest_framework.pagination import PageLink, PAGE_BREAK
-from rest_framework.test import APIRequestFactory
+
import pytest
+from django.core.paginator import Paginator as DjangoPaginator
+
+from rest_framework import (
+ exceptions, filters, generics, pagination, serializers, status
+)
+from rest_framework.pagination import PAGE_BREAK, PageLink
+from rest_framework.request import Request
+from rest_framework.test import APIRequestFactory
factory = APIRequestFactory()
@@ -143,41 +148,6 @@ class TestPaginationDisabledIntegration:
assert response.data == list(range(1, 101))
-class TestDeprecatedStylePagination:
- """
- Integration tests for deprecated style of setting pagination
- attributes on the view.
- """
-
- def setup(self):
- class PassThroughSerializer(serializers.BaseSerializer):
- def to_representation(self, item):
- return item
-
- class ExampleView(generics.ListAPIView):
- serializer_class = PassThroughSerializer
- queryset = range(1, 101)
- pagination_class = pagination.PageNumberPagination
- paginate_by = 20
- page_query_param = 'page_number'
-
- self.view = ExampleView.as_view()
-
- def test_paginate_by_attribute_on_view(self):
- request = factory.get('/?page_number=2')
- response = self.view(request)
- assert response.status_code == status.HTTP_200_OK
- assert response.data == {
- 'results': [
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40
- ],
- 'previous': 'http://testserver/',
- 'next': 'http://testserver/?page_number=3',
- 'count': 100
- }
-
-
class TestPageNumberPagination:
"""
Unit tests for `pagination.PageNumberPagination`.
@@ -186,6 +156,7 @@ class TestPageNumberPagination:
def setup(self):
class ExamplePagination(pagination.PageNumberPagination):
page_size = 5
+
self.pagination = ExamplePagination()
self.queryset = range(1, 101)
@@ -279,6 +250,64 @@ class TestPageNumberPagination:
self.paginate_queryset(request)
+class TestPageNumberPaginationOverride:
+ """
+ Unit tests for `pagination.PageNumberPagination`.
+
+ the Django Paginator Class is overridden.
+ """
+
+ def setup(self):
+ class OverriddenDjangoPaginator(DjangoPaginator):
+ # override the count in our overriden Django Paginator
+ # we will only return one page, with one item
+ count = 1
+
+ class ExamplePagination(pagination.PageNumberPagination):
+ django_paginator_class = OverriddenDjangoPaginator
+ page_size = 5
+
+ self.pagination = ExamplePagination()
+ self.queryset = range(1, 101)
+
+ def paginate_queryset(self, request):
+ return list(self.pagination.paginate_queryset(self.queryset, request))
+
+ def get_paginated_content(self, queryset):
+ response = self.pagination.get_paginated_response(queryset)
+ return response.data
+
+ def get_html_context(self):
+ return self.pagination.get_html_context()
+
+ def test_no_page_number(self):
+ request = Request(factory.get('/'))
+ queryset = self.paginate_queryset(request)
+ content = self.get_paginated_content(queryset)
+ context = self.get_html_context()
+ assert queryset == [1]
+ assert content == {
+ 'results': [1, ],
+ 'previous': None,
+ 'next': None,
+ 'count': 1
+ }
+ assert context == {
+ 'previous_url': None,
+ 'next_url': None,
+ 'page_links': [
+ PageLink('http://testserver/', 1, True, False),
+ ]
+ }
+ assert not self.pagination.display_page_controls
+ assert isinstance(self.pagination.to_html(), type(''))
+
+ def test_invalid_page(self):
+ request = Request(factory.get('/', {'page': 'invalid'}))
+ with pytest.raises(exceptions.NotFound):
+ self.paginate_queryset(request)
+
+
class TestLimitOffset:
"""
Unit tests for `pagination.LimitOffsetPagination`.
@@ -287,6 +316,8 @@ class TestLimitOffset:
def setup(self):
class ExamplePagination(pagination.LimitOffsetPagination):
default_limit = 10
+ max_limit = 15
+
self.pagination = ExamplePagination()
self.queryset = range(1, 101)
@@ -428,6 +459,12 @@ class TestLimitOffset:
]
}
+ def test_erronous_offset(self):
+ request = Request(factory.get('/', {'limit': 5, 'offset': 1000}))
+ queryset = self.paginate_queryset(request)
+ self.get_paginated_content(queryset)
+ self.get_html_context()
+
def test_invalid_offset(self):
"""
An invalid offset query param should be treated as 0.
@@ -442,7 +479,31 @@ class TestLimitOffset:
"""
request = Request(factory.get('/', {'limit': 'invalid', 'offset': 0}))
queryset = self.paginate_queryset(request)
+ content = self.get_paginated_content(queryset)
+ next_limit = self.pagination.default_limit
+ next_offset = self.pagination.default_limit
+ next_url = 'http://testserver/?limit={0}&offset={1}'.format(next_limit, next_offset)
assert queryset == [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+ assert content.get('next') == next_url
+
+ def test_max_limit(self):
+ """
+ The limit defaults to the max_limit when there is a max_limit and the
+ requested limit is greater than the max_limit
+ """
+ offset = 50
+ request = Request(factory.get('/', {'limit': '11235', 'offset': offset}))
+ queryset = self.paginate_queryset(request)
+ content = self.get_paginated_content(queryset)
+ max_limit = self.pagination.max_limit
+ next_offset = offset + max_limit
+ prev_offset = offset - max_limit
+ base_url = 'http://testserver/?limit={0}'.format(max_limit)
+ next_url = base_url + '&offset={0}'.format(next_offset)
+ prev_url = base_url + '&offset={0}'.format(prev_offset)
+ assert queryset == list(range(51, 66))
+ assert content.get('next') == next_url
+ assert content.get('previous') == prev_url
class TestCursorPagination:
diff --git a/tests/test_parsers.py b/tests/test_parsers.py
index fe6aec19..1e0f2e17 100644
--- a/tests/test_parsers.py
+++ b/tests/test_parsers.py
@@ -1,12 +1,14 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
+
from django import forms
from django.core.files.uploadhandler import MemoryFileUploadHandler
from django.test import TestCase
from django.utils.six.moves import StringIO
+
from rest_framework.exceptions import ParseError
-from rest_framework.parsers import FormParser, FileUploadParser
+from rest_framework.parsers import FileUploadParser, FormParser
class Form(forms.Form):
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
index fe758755..e04c72ec 100644
--- a/tests/test_permissions.py
+++ b/tests/test_permissions.py
@@ -1,16 +1,22 @@
from __future__ import unicode_literals
-from django.contrib.auth.models import User, Permission, Group
+
+import base64
+import unittest
+
+from django.contrib.auth.models import Group, Permission, User
+from django.core.urlresolvers import ResolverMatch
from django.db import models
from django.test import TestCase
-from django.utils import unittest
-from rest_framework import generics, serializers, status, permissions, authentication, HTTP_HEADER_ENCODING
-from rest_framework.compat import guardian, get_model_name
-from django.core.urlresolvers import ResolverMatch
+
+from rest_framework import (
+ HTTP_HEADER_ENCODING, authentication, generics, permissions, serializers,
+ status
+)
+from rest_framework.compat import guardian
from rest_framework.filters import DjangoObjectPermissionsFilter
from rest_framework.routers import DefaultRouter
from rest_framework.test import APIRequestFactory
from tests.models import BasicModel
-import base64
factory = APIRequestFactory()
@@ -273,7 +279,7 @@ class ObjectPermissionsIntegrationTests(TestCase):
# give everyone model level permissions, as we are not testing those
everyone = Group.objects.create(name='everyone')
- model_name = get_model_name(BasicPermModel)
+ model_name = BasicPermModel._meta.model_name
app_label = BasicPermModel._meta.app_label
f = '{0}_{1}'.format
perms = {
@@ -376,3 +382,89 @@ class ObjectPermissionsIntegrationTests(TestCase):
response = object_permissions_list_view(request)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertListEqual(response.data, [])
+
+
+class BasicPerm(permissions.BasePermission):
+ def has_permission(self, request, view):
+ return False
+
+
+class BasicPermWithDetail(permissions.BasePermission):
+ message = 'Custom: You cannot access this resource'
+
+ def has_permission(self, request, view):
+ return False
+
+
+class BasicObjectPerm(permissions.BasePermission):
+ def has_object_permission(self, request, view, obj):
+ return False
+
+
+class BasicObjectPermWithDetail(permissions.BasePermission):
+ message = 'Custom: You cannot access this resource'
+
+ def has_object_permission(self, request, view, obj):
+ return False
+
+
+class PermissionInstanceView(generics.RetrieveUpdateDestroyAPIView):
+ queryset = BasicModel.objects.all()
+ serializer_class = BasicSerializer
+
+
+class DeniedView(PermissionInstanceView):
+ permission_classes = (BasicPerm,)
+
+
+class DeniedViewWithDetail(PermissionInstanceView):
+ permission_classes = (BasicPermWithDetail,)
+
+
+class DeniedObjectView(PermissionInstanceView):
+ permission_classes = (BasicObjectPerm,)
+
+
+class DeniedObjectViewWithDetail(PermissionInstanceView):
+ permission_classes = (BasicObjectPermWithDetail,)
+
+denied_view = DeniedView.as_view()
+
+denied_view_with_detail = DeniedViewWithDetail.as_view()
+
+denied_object_view = DeniedObjectView.as_view()
+
+denied_object_view_with_detail = DeniedObjectViewWithDetail.as_view()
+
+
+class CustomPermissionsTests(TestCase):
+ def setUp(self):
+ BasicModel(text='foo').save()
+ User.objects.create_user('username', 'username@example.com', 'password')
+ credentials = basic_auth_header('username', 'password')
+ self.request = factory.get('/1', format='json', HTTP_AUTHORIZATION=credentials)
+ self.custom_message = 'Custom: You cannot access this resource'
+
+ def test_permission_denied(self):
+ response = denied_view(self.request, pk=1)
+ detail = response.data.get('detail')
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+ self.assertNotEqual(detail, self.custom_message)
+
+ def test_permission_denied_with_custom_detail(self):
+ response = denied_view_with_detail(self.request, pk=1)
+ detail = response.data.get('detail')
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+ self.assertEqual(detail, self.custom_message)
+
+ def test_permission_denied_for_object(self):
+ response = denied_object_view(self.request, pk=1)
+ detail = response.data.get('detail')
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+ self.assertNotEqual(detail, self.custom_message)
+
+ def test_permission_denied_for_object_with_custom_detail(self):
+ response = denied_object_view_with_detail(self.request, pk=1)
+ detail = response.data.get('detail')
+ self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+ self.assertEqual(detail, self.custom_message)
diff --git a/tests/test_relations.py b/tests/test_relations.py
index fbe176e2..9469cd06 100644
--- a/tests/test_relations.py
+++ b/tests/test_relations.py
@@ -1,10 +1,16 @@
-from .utils import mock_reverse, fail_reverse, BadType, MockObject, MockQueryset
+import uuid
+
+import pytest
from django.core.exceptions import ImproperlyConfigured
from django.utils.datastructures import MultiValueDict
+
from rest_framework import serializers
from rest_framework.fields import empty
from rest_framework.test import APISimpleTestCase
-import pytest
+
+from .utils import (
+ BadType, MockObject, MockQueryset, fail_reverse, mock_reverse
+)
class TestStringRelatedField(APISimpleTestCase):
@@ -47,6 +53,39 @@ class TestPrimaryKeyRelatedField(APISimpleTestCase):
representation = self.field.to_representation(self.instance)
assert representation == self.instance.pk
+ def test_explicit_many_false(self):
+ field = serializers.PrimaryKeyRelatedField(queryset=self.queryset, many=False)
+ instance = field.to_internal_value(self.instance.pk)
+ assert instance is self.instance
+
+
+class TestProxiedPrimaryKeyRelatedField(APISimpleTestCase):
+ def setUp(self):
+ self.queryset = MockQueryset([
+ MockObject(pk=uuid.UUID(int=0), name='foo'),
+ MockObject(pk=uuid.UUID(int=1), name='bar'),
+ MockObject(pk=uuid.UUID(int=2), name='baz')
+ ])
+ self.instance = self.queryset.items[2]
+ self.field = serializers.PrimaryKeyRelatedField(
+ queryset=self.queryset,
+ pk_field=serializers.UUIDField(format='int')
+ )
+
+ def test_pk_related_lookup_exists(self):
+ instance = self.field.to_internal_value(self.instance.pk.int)
+ assert instance is self.instance
+
+ def test_pk_related_lookup_does_not_exist(self):
+ with pytest.raises(serializers.ValidationError) as excinfo:
+ self.field.to_internal_value(4)
+ msg = excinfo.value.detail[0]
+ assert msg == 'Invalid pk "00000000-0000-0000-0000-000000000004" - object does not exist.'
+
+ def test_pk_representation(self):
+ representation = self.field.to_representation(self.instance)
+ assert representation == self.instance.pk.int
+
class TestHyperlinkedIdentityField(APISimpleTestCase):
def setUp(self):
@@ -167,3 +206,14 @@ class TestManyRelatedField(APISimpleTestCase):
mvd = MultiValueDict({'baz': ['bar1', 'bar2']})
assert empty == self.field.get_value(mvd)
+
+
+class TestHyperlink:
+ def setup(self):
+ self.default_hyperlink = serializers.Hyperlink('http://example.com', 'test')
+
+ def test_can_be_pickled(self):
+ import pickle
+ upkled = pickle.loads(pickle.dumps(self.default_hyperlink))
+ assert upkled == self.default_hyperlink
+ assert upkled.name == self.default_hyperlink.name
diff --git a/tests/test_relations_generic.py b/tests/test_relations_generic.py
index b600b333..340d4d1d 100644
--- a/tests/test_relations_generic.py
+++ b/tests/test_relations_generic.py
@@ -1,9 +1,13 @@
from __future__ import unicode_literals
+
+from django.contrib.contenttypes.fields import (
+ GenericForeignKey, GenericRelation
+)
from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes.generic import GenericRelation, GenericForeignKey
from django.db import models
from django.test import TestCase
from django.utils.encoding import python_2_unicode_compatible
+
from rest_framework import serializers
diff --git a/tests/test_relations_hyperlink.py b/tests/test_relations_hyperlink.py
index 33b09713..c0642eda 100644
--- a/tests/test_relations_hyperlink.py
+++ b/tests/test_relations_hyperlink.py
@@ -1,11 +1,13 @@
from __future__ import unicode_literals
+
from django.conf.urls import url
from django.test import TestCase
+
from rest_framework import serializers
from rest_framework.test import APIRequestFactory
from tests.models import (
- ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource,
- NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource
+ ForeignKeySource, ForeignKeyTarget, ManyToManySource, ManyToManyTarget,
+ NullableForeignKeySource, NullableOneToOneSource, OneToOneTarget
)
factory = APIRequestFactory()
diff --git a/tests/test_relations_pk.py b/tests/test_relations_pk.py
index ca43272b..169f7d9c 100644
--- a/tests/test_relations_pk.py
+++ b/tests/test_relations_pk.py
@@ -1,10 +1,12 @@
from __future__ import unicode_literals
+
from django.test import TestCase
from django.utils import six
+
from rest_framework import serializers
from tests.models import (
- ManyToManyTarget, ManyToManySource, ForeignKeyTarget, ForeignKeySource,
- NullableForeignKeySource, OneToOneTarget, NullableOneToOneSource,
+ ForeignKeySource, ForeignKeyTarget, ManyToManySource, ManyToManyTarget,
+ NullableForeignKeySource, NullableOneToOneSource, OneToOneTarget
)
diff --git a/tests/test_relations_slug.py b/tests/test_relations_slug.py
index cd2cb1ed..680aee41 100644
--- a/tests/test_relations_slug.py
+++ b/tests/test_relations_slug.py
@@ -1,6 +1,9 @@
from django.test import TestCase
+
from rest_framework import serializers
-from tests.models import NullableForeignKeySource, ForeignKeySource, ForeignKeyTarget
+from tests.models import (
+ ForeignKeySource, ForeignKeyTarget, NullableForeignKeySource
+)
class ForeignKeyTargetSerializer(serializers.ModelSerializer):
diff --git a/tests/test_renderers.py b/tests/test_renderers.py
index cb76f683..b4b2db22 100644
--- a/tests/test_renderers.py
+++ b/tests/test_renderers.py
@@ -1,25 +1,25 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
-from django.conf.urls import patterns, url, include
+
+import json
+import re
+from collections import MutableMapping, OrderedDict
+
+from django.conf.urls import include, url
from django.core.cache import cache
from django.db import models
from django.test import TestCase
from django.utils import six
from django.utils.translation import ugettext_lazy as _
-from rest_framework import status, permissions
-from rest_framework.compat import OrderedDict
-from rest_framework.response import Response
-from rest_framework.views import APIView
-from rest_framework import serializers
+
+from rest_framework import permissions, serializers, status
from rest_framework.renderers import (
- BaseRenderer, JSONRenderer, BrowsableAPIRenderer, HTMLFormRenderer
+ BaseRenderer, BrowsableAPIRenderer, HTMLFormRenderer, JSONRenderer
)
+from rest_framework.response import Response
from rest_framework.settings import api_settings
from rest_framework.test import APIRequestFactory
-from collections import MutableMapping
-import json
-import re
-
+from rest_framework.views import APIView
DUMMYSTATUS = status.HTTP_200_OK
DUMMYCONTENT = 'dummycontent'
@@ -80,7 +80,7 @@ class MockGETView(APIView):
class MockPOSTView(APIView):
def post(self, request, **kwargs):
- return Response({'foo': request.DATA})
+ return Response({'foo': request.data})
class EmptyGETView(APIView):
@@ -103,8 +103,7 @@ class HTMLView1(APIView):
def get(self, request, **kwargs):
return Response('text')
-urlpatterns = patterns(
- '',
+urlpatterns = [
url(r'^.*\.(?P.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB])),
url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB])),
url(r'^cache$', MockGETView.as_view()),
@@ -113,7 +112,7 @@ urlpatterns = patterns(
url(r'^html1$', HTMLView1.as_view()),
url(r'^empty$', EmptyGETView.as_view()),
url(r'^api', include('rest_framework.urls', namespace='rest_framework'))
-)
+]
class POSTDeniedPermission(permissions.BasePermission):
@@ -192,17 +191,6 @@ class RendererEndToEndTests(TestCase):
self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
self.assertEqual(resp.status_code, DUMMYSTATUS)
- def test_specified_renderer_serializes_content_on_accept_query(self):
- """The '_accept' query string should behave in the same way as the Accept header."""
- param = '?%s=%s' % (
- api_settings.URL_ACCEPT_OVERRIDE,
- RendererB.media_type
- )
- resp = self.client.get('/' + param)
- self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
- self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
- self.assertEqual(resp.status_code, DUMMYSTATUS)
-
def test_unsatisfiable_accept_header_on_request_returns_406_status(self):
"""If the Accept header is unsatisfiable we should return a 406 Not Acceptable response."""
resp = self.client.get('/', HTTP_ACCEPT='foo/bar')
diff --git a/tests/test_request.py b/tests/test_request.py
index c274ab69..24be368b 100644
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -2,29 +2,23 @@
Tests for content parsing, and form-overloaded content parsing.
"""
from __future__ import unicode_literals
-from django.conf.urls import patterns
-from django.contrib.auth.models import User
+
+import django
+import pytest
+from django.conf.urls import url
from django.contrib.auth import authenticate, login, logout
+from django.contrib.auth.models import User
from django.contrib.sessions.middleware import SessionMiddleware
-from django.core.handlers.wsgi import WSGIRequest
from django.test import TestCase
from django.utils import six
+
from rest_framework import status
from rest_framework.authentication import SessionAuthentication
-from rest_framework.parsers import (
- BaseParser,
- FormParser,
- MultiPartParser,
- JSONParser
-)
-from rest_framework.request import Request, Empty
+from rest_framework.parsers import BaseParser, FormParser, MultiPartParser
+from rest_framework.request import Request
from rest_framework.response import Response
-from rest_framework.settings import api_settings
-from rest_framework.test import APIRequestFactory, APIClient
+from rest_framework.test import APIClient, APIRequestFactory
from rest_framework.views import APIView
-from io import BytesIO
-import json
-
factory = APIRequestFactory()
@@ -42,70 +36,40 @@ class PlainTextParser(BaseParser):
return stream.read()
-class TestMethodOverloading(TestCase):
- def test_method(self):
- """
- Request methods should be same as underlying request.
- """
- request = Request(factory.get('/'))
- self.assertEqual(request.method, 'GET')
- request = Request(factory.post('/'))
- self.assertEqual(request.method, 'POST')
-
- def test_overloaded_method(self):
- """
- POST requests can be overloaded to another method by setting a
- reserved form field
- """
- request = Request(factory.post('/', {api_settings.FORM_METHOD_OVERRIDE: 'DELETE'}))
- self.assertEqual(request.method, 'DELETE')
-
- def test_x_http_method_override_header(self):
- """
- POST requests can also be overloaded to another method by setting
- the X-HTTP-Method-Override header.
- """
- request = Request(factory.post('/', {'foo': 'bar'}, HTTP_X_HTTP_METHOD_OVERRIDE='DELETE'))
- self.assertEqual(request.method, 'DELETE')
-
- request = Request(factory.get('/', {'foo': 'bar'}, HTTP_X_HTTP_METHOD_OVERRIDE='DELETE'))
- self.assertEqual(request.method, 'DELETE')
-
-
class TestContentParsing(TestCase):
def test_standard_behaviour_determines_no_content_GET(self):
"""
- Ensure request.DATA returns empty QueryDict for GET request.
+ Ensure request.data returns empty QueryDict for GET request.
"""
request = Request(factory.get('/'))
- self.assertEqual(request.DATA, {})
+ self.assertEqual(request.data, {})
def test_standard_behaviour_determines_no_content_HEAD(self):
"""
- Ensure request.DATA returns empty QueryDict for HEAD request.
+ Ensure request.data returns empty QueryDict for HEAD request.
"""
request = Request(factory.head('/'))
- self.assertEqual(request.DATA, {})
+ self.assertEqual(request.data, {})
def test_request_DATA_with_form_content(self):
"""
- Ensure request.DATA returns content for POST request with form content.
+ Ensure request.data returns content for POST request with form content.
"""
data = {'qwerty': 'uiop'}
request = Request(factory.post('/', data))
request.parsers = (FormParser(), MultiPartParser())
- self.assertEqual(list(request.DATA.items()), list(data.items()))
+ self.assertEqual(list(request.data.items()), list(data.items()))
def test_request_DATA_with_text_content(self):
"""
- Ensure request.DATA returns content for POST request with
+ Ensure request.data returns content for POST request with
non-form content.
"""
content = six.b('qwerty')
content_type = 'text/plain'
request = Request(factory.post('/', content, content_type=content_type))
request.parsers = (PlainTextParser(),)
- self.assertEqual(request.DATA, content)
+ self.assertEqual(request.data, content)
def test_request_POST_with_form_content(self):
"""
@@ -118,66 +82,23 @@ class TestContentParsing(TestCase):
def test_standard_behaviour_determines_form_content_PUT(self):
"""
- Ensure request.DATA returns content for PUT request with form content.
+ Ensure request.data returns content for PUT request with form content.
"""
data = {'qwerty': 'uiop'}
request = Request(factory.put('/', data))
request.parsers = (FormParser(), MultiPartParser())
- self.assertEqual(list(request.DATA.items()), list(data.items()))
+ self.assertEqual(list(request.data.items()), list(data.items()))
def test_standard_behaviour_determines_non_form_content_PUT(self):
"""
- Ensure request.DATA returns content for PUT request with
+ Ensure request.data returns content for PUT request with
non-form content.
"""
content = six.b('qwerty')
content_type = 'text/plain'
request = Request(factory.put('/', content, content_type=content_type))
request.parsers = (PlainTextParser(), )
- self.assertEqual(request.DATA, content)
-
- def test_overloaded_behaviour_allows_content_tunnelling(self):
- """
- Ensure request.DATA returns content for overloaded POST request.
- """
- json_data = {'foobar': 'qwerty'}
- content = json.dumps(json_data)
- content_type = 'application/json'
- form_data = {
- api_settings.FORM_CONTENT_OVERRIDE: content,
- api_settings.FORM_CONTENTTYPE_OVERRIDE: content_type
- }
- request = Request(factory.post('/', form_data))
- request.parsers = (JSONParser(), )
- self.assertEqual(request.DATA, json_data)
-
- def test_form_POST_unicode(self):
- """
- JSON POST via default web interface with unicode data
- """
- # Note: environ and other variables here have simplified content compared to real Request
- CONTENT = b'_content_type=application%2Fjson&_content=%7B%22request%22%3A+4%2C+%22firm%22%3A+1%2C+%22text%22%3A+%22%D0%9F%D1%80%D0%B8%D0%B2%D0%B5%D1%82%21%22%7D'
- environ = {
- 'REQUEST_METHOD': 'POST',
- 'CONTENT_TYPE': 'application/x-www-form-urlencoded',
- 'CONTENT_LENGTH': len(CONTENT),
- 'wsgi.input': BytesIO(CONTENT),
- }
- wsgi_request = WSGIRequest(environ=environ)
- wsgi_request._load_post_and_files()
- parsers = (JSONParser(), FormParser(), MultiPartParser())
- parser_context = {
- 'encoding': 'utf-8',
- 'kwargs': {},
- 'args': (),
- }
- request = Request(wsgi_request, parsers=parsers, parser_context=parser_context)
- method = request.method
- self.assertEqual(method, 'POST')
- self.assertEqual(request._content_type, 'application/json')
- self.assertEqual(request._stream.getvalue(), b'{"request": 4, "firm": 1, "text": "\xd0\x9f\xd1\x80\xd0\xb8\xd0\xb2\xd0\xb5\xd1\x82!"}')
- self.assertEqual(request._data, Empty)
- self.assertEqual(request._files, Empty)
+ self.assertEqual(request.data, content)
class MockView(APIView):
@@ -189,10 +110,9 @@ class MockView(APIView):
return Response(status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-urlpatterns = patterns(
- '',
- (r'^$', MockView.as_view()),
-)
+urlpatterns = [
+ url(r'^$', MockView.as_view()),
+]
class TestContentParsingWithAuthentication(TestCase):
@@ -266,7 +186,10 @@ class TestUserSetter(TestCase):
try:
self.request.user
except AttributeError as error:
- self.assertEqual(str(error), "'module' object has no attribute 'MISSPELLED_NAME_THAT_DOESNT_EXIST'")
+ assert str(error) in (
+ "'module' object has no attribute 'MISSPELLED_NAME_THAT_DOESNT_EXIST'", # Python < 3.5
+ "module 'rest_framework' has no attribute 'MISSPELLED_NAME_THAT_DOESNT_EXIST'", # Python >= 3.5
+ )
else:
assert False, 'AttributeError not raised'
@@ -276,3 +199,16 @@ class TestAuthSetter(TestCase):
request = Request(factory.get('/'))
request.auth = 'DUMMY'
self.assertEqual(request.auth, 'DUMMY')
+
+
+@pytest.mark.skipif(django.VERSION < (1, 7),
+ reason='secure argument is only available for django1.7+')
+class TestSecure(TestCase):
+
+ def test_default_secure_false(self):
+ request = Request(factory.get('/', secure=False))
+ self.assertEqual(request.scheme, 'http')
+
+ def test_default_secure_true(self):
+ request = Request(factory.get('/', secure=True))
+ self.assertEqual(request.scheme, 'https')
diff --git a/tests/test_response.py b/tests/test_response.py
index 4a9deaa2..df2d7b4e 100644
--- a/tests/test_response.py
+++ b/tests/test_response.py
@@ -1,21 +1,17 @@
from __future__ import unicode_literals
-from django.conf.urls import patterns, url, include
+
+from django.conf.urls import include, url
from django.test import TestCase
from django.utils import six
-from tests.models import BasicModel
+
+from rest_framework import generics, routers, serializers, status, viewsets
+from rest_framework.parsers import JSONParser
+from rest_framework.renderers import (
+ BaseRenderer, BrowsableAPIRenderer, JSONRenderer
+)
from rest_framework.response import Response
from rest_framework.views import APIView
-from rest_framework import generics
-from rest_framework import routers
-from rest_framework import serializers
-from rest_framework import status
-from rest_framework.renderers import (
- BaseRenderer,
- JSONRenderer,
- BrowsableAPIRenderer
-)
-from rest_framework import viewsets
-from rest_framework.settings import api_settings
+from tests.models import BasicModel
# Serializer used to test BasicModel
@@ -83,6 +79,14 @@ class MockViewSettingContentType(APIView):
return Response(DUMMYCONTENT, status=DUMMYSTATUS, content_type='setbyview')
+class JSONView(APIView):
+ parser_classes = (JSONParser,)
+
+ def post(self, request, **kwargs):
+ assert request.data
+ return Response(DUMMYCONTENT)
+
+
class HTMLView(APIView):
renderer_classes = (BrowsableAPIRenderer, )
@@ -113,17 +117,17 @@ new_model_viewset_router = routers.DefaultRouter()
new_model_viewset_router.register(r'', HTMLNewModelViewSet)
-urlpatterns = patterns(
- '',
+urlpatterns = [
url(r'^setbyview$', MockViewSettingContentType.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
url(r'^.*\.(?P.+)$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
url(r'^$', MockView.as_view(renderer_classes=[RendererA, RendererB, RendererC])),
url(r'^html$', HTMLView.as_view()),
+ url(r'^json$', JSONView.as_view()),
url(r'^html1$', HTMLView1.as_view()),
url(r'^html_new_model$', HTMLNewModelView.as_view()),
url(r'^html_new_model_viewset', include(new_model_viewset_router.urls)),
url(r'^restframework', include('rest_framework.urls', namespace='rest_framework'))
-)
+]
# TODO: Clean tests bellow - remove duplicates with above, better unit testing, ...
@@ -171,17 +175,6 @@ class RendererIntegrationTests(TestCase):
self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
self.assertEqual(resp.status_code, DUMMYSTATUS)
- def test_specified_renderer_serializes_content_on_accept_query(self):
- """The '_accept' query string should behave in the same way as the Accept header."""
- param = '?%s=%s' % (
- api_settings.URL_ACCEPT_OVERRIDE,
- RendererB.media_type
- )
- resp = self.client.get('/' + param)
- self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
- self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
- self.assertEqual(resp.status_code, DUMMYSTATUS)
-
def test_specified_renderer_serializes_content_on_format_query(self):
"""If a 'format' query is specified, the renderer with the matching
format attribute should serialize the response."""
@@ -208,6 +201,25 @@ class RendererIntegrationTests(TestCase):
self.assertEqual(resp.status_code, DUMMYSTATUS)
+class UnsupportedMediaTypeTests(TestCase):
+ urls = 'tests.test_response'
+
+ def test_should_allow_posting_json(self):
+ response = self.client.post('/json', data='{"test": 123}', content_type='application/json')
+
+ self.assertEqual(response.status_code, 200)
+
+ def test_should_not_allow_posting_xml(self):
+ response = self.client.post('/json', data='123 ', content_type='application/xml')
+
+ self.assertEqual(response.status_code, 415)
+
+ def test_should_not_allow_posting_a_form(self):
+ response = self.client.post('/json', data={'test': 123})
+
+ self.assertEqual(response.status_code, 415)
+
+
class Issue122Tests(TestCase):
"""
Tests that covers #122.
@@ -275,16 +287,6 @@ class Issue807Tests(TestCase):
resp = self.client.get('/setbyview', **headers)
self.assertEqual('setbyview', resp['Content-Type'])
- def test_viewset_label_help_text(self):
- param = '?%s=%s' % (
- api_settings.URL_ACCEPT_OVERRIDE,
- 'text/html'
- )
- resp = self.client.get('/html_new_model_viewset/' + param)
- self.assertEqual(resp['Content-Type'], 'text/html; charset=utf-8')
- # self.assertContains(resp, 'Text comes here')
- # self.assertContains(resp, 'Text description.')
-
def test_form_has_label_and_help_text(self):
resp = self.client.get('/html_new_model')
self.assertEqual(resp['Content-Type'], 'text/html; charset=utf-8')
diff --git a/tests/test_reverse.py b/tests/test_reverse.py
index 08c27023..c5486e5d 100644
--- a/tests/test_reverse.py
+++ b/tests/test_reverse.py
@@ -1,7 +1,9 @@
from __future__ import unicode_literals
-from django.conf.urls import patterns, url
+
+from django.conf.urls import url
from django.core.urlresolvers import NoReverseMatch
from django.test import TestCase
+
from rest_framework.reverse import reverse
from rest_framework.test import APIRequestFactory
@@ -11,10 +13,9 @@ factory = APIRequestFactory()
def null_view(request):
pass
-urlpatterns = patterns(
- '',
+urlpatterns = [
url(r'^view$', null_view, name='view'),
-)
+]
class MockVersioningScheme(object):
diff --git a/tests/test_routers.py b/tests/test_routers.py
index 19eeb868..ae2639bf 100644
--- a/tests/test_routers.py
+++ b/tests/test_routers.py
@@ -1,14 +1,17 @@
from __future__ import unicode_literals
-from django.conf.urls import url, include
+
+from collections import namedtuple
+
+from django.conf.urls import include, url
+from django.core.exceptions import ImproperlyConfigured
from django.db import models
from django.test import TestCase
-from django.core.exceptions import ImproperlyConfigured
-from rest_framework import serializers, viewsets, permissions
+
+from rest_framework import permissions, serializers, viewsets
from rest_framework.decorators import detail_route, list_route
from rest_framework.response import Response
-from rest_framework.routers import SimpleRouter, DefaultRouter
+from rest_framework.routers import DefaultRouter, SimpleRouter
from rest_framework.test import APIRequestFactory
-from collections import namedtuple
factory = APIRequestFactory()
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
index b7a0484b..741c6ab1 100644
--- a/tests/test_serializer.py
+++ b/tests/test_serializer.py
@@ -1,10 +1,14 @@
# coding: utf-8
from __future__ import unicode_literals
-from .utils import MockObject
+
+import pickle
+
+import pytest
+
from rest_framework import serializers
from rest_framework.compat import unicode_repr
-import pickle
-import pytest
+
+from .utils import MockObject
# Tests for core functionality.
@@ -47,6 +51,16 @@ class TestSerializer:
with pytest.raises(AttributeError):
serializer.data
+ def test_data_access_before_save_raises_error(self):
+ def create(validated_data):
+ return validated_data
+ serializer = self.Serializer(data={'char': 'abc', 'integer': 123})
+ serializer.create = create
+ assert serializer.is_valid()
+ assert serializer.data == {'char': 'abc', 'integer': 123}
+ with pytest.raises(AssertionError):
+ serializer.save()
+
class TestValidateMethod:
def test_non_field_error_validate_method(self):
diff --git a/tests/test_serializer_bulk_update.py b/tests/test_serializer_bulk_update.py
index bc955b2e..8d7240a7 100644
--- a/tests/test_serializer_bulk_update.py
+++ b/tests/test_serializer_bulk_update.py
@@ -2,8 +2,10 @@
Tests to cover bulk create and update using serializers.
"""
from __future__ import unicode_literals
+
from django.test import TestCase
from django.utils import six
+
from rest_framework import serializers
diff --git a/tests/test_serializer_lists.py b/tests/test_serializer_lists.py
index 35b68ae7..607ddba0 100644
--- a/tests/test_serializer_lists.py
+++ b/tests/test_serializer_lists.py
@@ -1,6 +1,7 @@
-from rest_framework import serializers
from django.utils.datastructures import MultiValueDict
+from rest_framework import serializers
+
class BasicObject:
"""
@@ -288,3 +289,32 @@ class TestListSerializerClass:
serializer = TestSerializer(data=[], many=True)
assert not serializer.is_valid()
assert serializer.errors == {'non_field_errors': ['Non field error']}
+
+
+class TestSerializerPartialUsage:
+ """
+ When not submitting key for list fields or multiple choice, partial
+ serialization should result in an empty state (key not there), not
+ an empty list.
+
+ Regression test for Github issue #2761.
+ """
+ def test_partial_listfield(self):
+ class ListSerializer(serializers.Serializer):
+ listdata = serializers.ListField()
+ serializer = ListSerializer(data=MultiValueDict(), partial=True)
+ result = serializer.to_internal_value(data={})
+ assert "listdata" not in result
+ assert serializer.is_valid()
+ assert serializer.validated_data == {}
+ assert serializer.errors == {}
+
+ def test_partial_multiplechoice(self):
+ class MultipleChoiceSerializer(serializers.Serializer):
+ multiplechoice = serializers.MultipleChoiceField(choices=[1, 2, 3])
+ serializer = MultipleChoiceSerializer(data=MultiValueDict(), partial=True)
+ result = serializer.to_internal_value(data={})
+ assert "multiplechoice" not in result
+ assert serializer.is_valid()
+ assert serializer.validated_data == {}
+ assert serializer.errors == {}
diff --git a/tests/test_serializer_nested.py b/tests/test_serializer_nested.py
index f5e4b26a..aeb092ee 100644
--- a/tests/test_serializer_nested.py
+++ b/tests/test_serializer_nested.py
@@ -1,3 +1,5 @@
+from django.http import QueryDict
+
from rest_framework import serializers
@@ -38,3 +40,130 @@ class TestNestedSerializer:
}
serializer = self.Serializer()
assert serializer.data == expected_data
+
+
+class TestNotRequiredNestedSerializer:
+ def setup(self):
+ class NestedSerializer(serializers.Serializer):
+ one = serializers.IntegerField(max_value=10)
+
+ class TestSerializer(serializers.Serializer):
+ nested = NestedSerializer(required=False)
+
+ self.Serializer = TestSerializer
+
+ def test_json_validate(self):
+ input_data = {}
+ serializer = self.Serializer(data=input_data)
+ assert serializer.is_valid()
+
+ input_data = {'nested': {'one': '1'}}
+ serializer = self.Serializer(data=input_data)
+ assert serializer.is_valid()
+
+ def test_multipart_validate(self):
+ input_data = QueryDict('')
+ serializer = self.Serializer(data=input_data)
+ assert serializer.is_valid()
+
+ input_data = QueryDict('nested[one]=1')
+ serializer = self.Serializer(data=input_data)
+ assert serializer.is_valid()
+
+
+class TestNestedSerializerWithMany:
+ def setup(self):
+ class NestedSerializer(serializers.Serializer):
+ example = serializers.IntegerField(max_value=10)
+
+ class TestSerializer(serializers.Serializer):
+ allow_null = NestedSerializer(many=True, allow_null=True)
+ not_allow_null = NestedSerializer(many=True)
+ allow_empty = NestedSerializer(many=True, allow_empty=True)
+ not_allow_empty = NestedSerializer(many=True, allow_empty=False)
+
+ self.Serializer = TestSerializer
+
+ def test_null_allowed_if_allow_null_is_set(self):
+ input_data = {
+ 'allow_null': None,
+ 'not_allow_null': [{'example': '2'}, {'example': '3'}],
+ 'allow_empty': [{'example': '2'}],
+ 'not_allow_empty': [{'example': '2'}],
+ }
+ expected_data = {
+ 'allow_null': None,
+ 'not_allow_null': [{'example': 2}, {'example': 3}],
+ 'allow_empty': [{'example': 2}],
+ 'not_allow_empty': [{'example': 2}],
+ }
+ serializer = self.Serializer(data=input_data)
+
+ assert serializer.is_valid(), serializer.errors
+ assert serializer.validated_data == expected_data
+
+ def test_null_is_not_allowed_if_allow_null_is_not_set(self):
+ input_data = {
+ 'allow_null': None,
+ 'not_allow_null': None,
+ 'allow_empty': [{'example': '2'}],
+ 'not_allow_empty': [{'example': '2'}],
+ }
+ serializer = self.Serializer(data=input_data)
+
+ assert not serializer.is_valid()
+
+ expected_errors = {'not_allow_null': [serializer.error_messages['null']]}
+ assert serializer.errors == expected_errors
+
+ def test_run_the_field_validation_even_if_the_field_is_null(self):
+ class TestSerializer(self.Serializer):
+ validation_was_run = False
+
+ def validate_allow_null(self, value):
+ TestSerializer.validation_was_run = True
+ return value
+
+ input_data = {
+ 'allow_null': None,
+ 'not_allow_null': [{'example': 2}],
+ 'allow_empty': [{'example': 2}],
+ 'not_allow_empty': [{'example': 2}],
+ }
+ serializer = TestSerializer(data=input_data)
+
+ assert serializer.is_valid()
+ assert serializer.validated_data == input_data
+ assert TestSerializer.validation_was_run
+
+ def test_empty_allowed_if_allow_empty_is_set(self):
+ input_data = {
+ 'allow_null': [{'example': '2'}],
+ 'not_allow_null': [{'example': '2'}],
+ 'allow_empty': [],
+ 'not_allow_empty': [{'example': '2'}],
+ }
+ expected_data = {
+ 'allow_null': [{'example': 2}],
+ 'not_allow_null': [{'example': 2}],
+ 'allow_empty': [],
+ 'not_allow_empty': [{'example': 2}],
+ }
+ serializer = self.Serializer(data=input_data)
+
+ assert serializer.is_valid(), serializer.errors
+ assert serializer.validated_data == expected_data
+
+ def test_empty_not_allowed_if_allow_empty_is_set_to_false(self):
+ input_data = {
+ 'allow_null': [{'example': '2'}],
+ 'not_allow_null': [{'example': '2'}],
+ 'allow_empty': [],
+ 'not_allow_empty': [],
+ }
+ serializer = self.Serializer(data=input_data)
+
+ assert not serializer.is_valid()
+
+ expected_errors = {'not_allow_empty': {'non_field_errors': [serializers.ListSerializer.default_error_messages['empty']]}}
+ assert serializer.errors == expected_errors
diff --git a/tests/test_settings.py b/tests/test_settings.py
index f2ff4ca1..cc8d0d51 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,5 +1,7 @@
from __future__ import unicode_literals
+
from django.test import TestCase
+
from rest_framework.settings import APISettings
@@ -15,3 +17,16 @@ class TestSettings(TestCase):
})
with self.assertRaises(ImportError):
settings.DEFAULT_RENDERER_CLASSES
+
+
+class TestSettingTypes(TestCase):
+ def test_settings_consistently_coerced_to_list(self):
+ settings = APISettings({
+ 'DEFAULT_THROTTLE_CLASSES': ('rest_framework.throttling.BaseThrottle',)
+ })
+ self.assertTrue(isinstance(settings.DEFAULT_THROTTLE_CLASSES, list))
+
+ settings = APISettings({
+ 'DEFAULT_THROTTLE_CLASSES': ()
+ })
+ self.assertTrue(isinstance(settings.DEFAULT_THROTTLE_CLASSES, list))
diff --git a/tests/test_status.py b/tests/test_status.py
index 721a6e30..1cd6e229 100644
--- a/tests/test_status.py
+++ b/tests/test_status.py
@@ -1,7 +1,10 @@
from __future__ import unicode_literals
+
from django.test import TestCase
+
from rest_framework.status import (
- is_informational, is_success, is_redirect, is_client_error, is_server_error
+ is_client_error, is_informational, is_redirect, is_server_error,
+ is_success
)
diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py
index 0cee91f1..746f51b7 100644
--- a/tests/test_templatetags.py
+++ b/tests/test_templatetags.py
@@ -1,9 +1,12 @@
# encoding: utf-8
from __future__ import unicode_literals
-from django.test import TestCase
-from rest_framework.test import APIRequestFactory
-from rest_framework.templatetags.rest_framework import add_query_param, urlize_quoted_links
+from django.test import TestCase
+
+from rest_framework.templatetags.rest_framework import (
+ add_query_param, urlize_quoted_links
+)
+from rest_framework.test import APIRequestFactory
factory = APIRequestFactory()
diff --git a/tests/test_testing.py b/tests/test_testing.py
index 87d2b61f..e0bf759a 100644
--- a/tests/test_testing.py
+++ b/tests/test_testing.py
@@ -1,13 +1,18 @@
# encoding: utf-8
from __future__ import unicode_literals
-from django.conf.urls import patterns, url
+
+from io import BytesIO
+
+from django.conf.urls import url
from django.contrib.auth.models import User
from django.shortcuts import redirect
from django.test import TestCase
+
from rest_framework.decorators import api_view
from rest_framework.response import Response
-from rest_framework.test import APIClient, APIRequestFactory, force_authenticate
-from io import BytesIO
+from rest_framework.test import (
+ APIClient, APIRequestFactory, force_authenticate
+)
@api_view(['GET', 'POST'])
@@ -32,12 +37,11 @@ def redirect_view(request):
return redirect('/view/')
-urlpatterns = patterns(
- '',
+urlpatterns = [
url(r'^view/$', view),
url(r'^session-view/$', session_view),
url(r'^redirect-view/$', redirect_view),
-)
+]
class TestAPITestClient(TestCase):
@@ -168,6 +172,16 @@ class TestAPITestClient(TestCase):
self.assertIsNotNone(response.redirect_chain)
self.assertEqual(response.status_code, 200)
+ def test_invalid_multipart_data(self):
+ """
+ MultiPart encoding cannot support nested data, so raise a helpful
+ error if the user attempts to do so.
+ """
+ self.assertRaises(
+ AssertionError, self.client.post,
+ path='/view/', data={'valid': 123, 'invalid': {'a': 123}}
+ )
+
class TestAPIRequestFactory(TestCase):
def test_csrf_exempt_by_default(self):
diff --git a/tests/test_throttling.py b/tests/test_throttling.py
index 50a53b3e..6d8d05a3 100644
--- a/tests/test_throttling.py
+++ b/tests/test_throttling.py
@@ -2,14 +2,18 @@
Tests for the throttling implementations in the permissions module.
"""
from __future__ import unicode_literals
-from django.test import TestCase
+
from django.contrib.auth.models import User
from django.core.cache import cache
+from django.test import TestCase
+
+from rest_framework.response import Response
from rest_framework.settings import api_settings
from rest_framework.test import APIRequestFactory
+from rest_framework.throttling import (
+ BaseThrottle, ScopedRateThrottle, UserRateThrottle
+)
from rest_framework.views import APIView
-from rest_framework.throttling import BaseThrottle, UserRateThrottle, ScopedRateThrottle
-from rest_framework.response import Response
class User3SecRateThrottle(UserRateThrottle):
diff --git a/tests/test_urlpatterns.py b/tests/test_urlpatterns.py
index e0060e69..78d37c1a 100644
--- a/tests/test_urlpatterns.py
+++ b/tests/test_urlpatterns.py
@@ -1,12 +1,14 @@
from __future__ import unicode_literals
+
from collections import namedtuple
-from django.conf.urls import patterns, url, include
+
+from django.conf.urls import include, url
from django.core import urlresolvers
from django.test import TestCase
+
from rest_framework.test import APIRequestFactory
from rest_framework.urlpatterns import format_suffix_patterns
-
# A container class for test paths for the test case
URLTestPath = namedtuple('URLTestPath', ['path', 'args', 'kwargs'])
@@ -17,7 +19,8 @@ def dummy_view(request, *args, **kwargs):
class FormatSuffixTests(TestCase):
"""
- Tests `format_suffix_patterns` against different URLPatterns to ensure the URLs still resolve properly, including any captured parameters.
+ Tests `format_suffix_patterns` against different URLPatterns to ensure the
+ URLs still resolve properly, including any captured parameters.
"""
def _resolve_urlpatterns(self, urlpatterns, test_paths):
factory = APIRequestFactory()
@@ -35,11 +38,36 @@ class FormatSuffixTests(TestCase):
self.assertEqual(callback_args, test_path.args)
self.assertEqual(callback_kwargs, test_path.kwargs)
+ def test_trailing_slash(self):
+ factory = APIRequestFactory()
+ urlpatterns = format_suffix_patterns([
+ url(r'^test/$', dummy_view),
+ ])
+ resolver = urlresolvers.RegexURLResolver(r'^/', urlpatterns)
+
+ test_paths = [
+ (URLTestPath('/test.api', (), {'format': 'api'}), True),
+ (URLTestPath('/test/.api', (), {'format': 'api'}), False),
+ (URLTestPath('/test.api/', (), {'format': 'api'}), True),
+ ]
+
+ for test_path, expected_resolved in test_paths:
+ request = factory.get(test_path.path)
+ try:
+ callback, callback_args, callback_kwargs = resolver.resolve(request.path_info)
+ except urlresolvers.Resolver404:
+ callback, callback_args, callback_kwargs = (None, None, None)
+ if not expected_resolved:
+ assert callback is None
+ continue
+
+ assert callback_args == test_path.args
+ assert callback_kwargs == test_path.kwargs
+
def test_format_suffix(self):
- urlpatterns = patterns(
- '',
+ urlpatterns = [
url(r'^test$', dummy_view),
- )
+ ]
test_paths = [
URLTestPath('/test', (), {}),
URLTestPath('/test.api', (), {'format': 'api'}),
@@ -48,10 +76,9 @@ class FormatSuffixTests(TestCase):
self._resolve_urlpatterns(urlpatterns, test_paths)
def test_default_args(self):
- urlpatterns = patterns(
- '',
+ urlpatterns = [
url(r'^test$', dummy_view, {'foo': 'bar'}),
- )
+ ]
test_paths = [
URLTestPath('/test', (), {'foo': 'bar', }),
URLTestPath('/test.api', (), {'foo': 'bar', 'format': 'api'}),
@@ -60,14 +87,12 @@ class FormatSuffixTests(TestCase):
self._resolve_urlpatterns(urlpatterns, test_paths)
def test_included_urls(self):
- nested_patterns = patterns(
- '',
+ nested_patterns = [
url(r'^path$', dummy_view)
- )
- urlpatterns = patterns(
- '',
+ ]
+ urlpatterns = [
url(r'^test/', include(nested_patterns), {'foo': 'bar'}),
- )
+ ]
test_paths = [
URLTestPath('/test/path', (), {'foo': 'bar', }),
URLTestPath('/test/path.api', (), {'foo': 'bar', 'format': 'api'}),
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 8c286ea4..fdc61a4a 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,14 +1,15 @@
from __future__ import unicode_literals
+
+from django.conf.urls import url
from django.core.exceptions import ImproperlyConfigured
-from django.conf.urls import patterns, url
from django.test import TestCase
from django.utils import six
-from rest_framework.utils.model_meta import _resolve_model
-from rest_framework.utils.breadcrumbs import get_breadcrumbs
-from rest_framework.views import APIView
-from tests.models import BasicModel
import rest_framework.utils.model_meta
+from rest_framework.utils.breadcrumbs import get_breadcrumbs
+from rest_framework.utils.model_meta import _resolve_model
+from rest_framework.views import APIView
+from tests.models import BasicModel
class Root(APIView):
@@ -31,14 +32,13 @@ class NestedResourceInstance(APIView):
pass
-urlpatterns = patterns(
- '',
+urlpatterns = [
url(r'^$', Root.as_view()),
url(r'^resource/$', ResourceRoot.as_view()),
url(r'^resource/(?P[0-9]+)$', ResourceInstance.as_view()),
url(r'^resource/(?P[0-9]+)/$', NestedResourceRoot.as_view()),
url(r'^resource/(?P[0-9]+)/(?P[A-Za-z]+)$', NestedResourceInstance.as_view()),
-)
+]
class BreadcrumbTests(TestCase):
@@ -150,16 +150,16 @@ class ResolveModelWithPatchedDjangoTests(TestCase):
def setUp(self):
"""Monkeypatch get_model."""
- self.get_model = rest_framework.utils.model_meta.models.get_model
+ self.get_model = rest_framework.utils.model_meta.apps.get_model
def get_model(app_label, model_name):
return None
- rest_framework.utils.model_meta.models.get_model = get_model
+ rest_framework.utils.model_meta.apps.get_model = get_model
def tearDown(self):
"""Revert monkeypatching."""
- rest_framework.utils.model_meta.models.get_model = self.get_model
+ rest_framework.utils.model_meta.apps.get_model = self.get_model
def test_blows_up_if_model_does_not_resolve(self):
with self.assertRaises(ImproperlyConfigured):
diff --git a/tests/test_validation.py b/tests/test_validation.py
index 4234efd3..855ff20e 100644
--- a/tests/test_validation.py
+++ b/tests/test_validation.py
@@ -1,10 +1,13 @@
from __future__ import unicode_literals
-from django.core.validators import RegexValidator, MaxValueValidator
+
+import re
+
+from django.core.validators import MaxValueValidator, RegexValidator
from django.db import models
from django.test import TestCase
+
from rest_framework import generics, serializers, status
from rest_framework.test import APIRequestFactory
-import re
factory = APIRequestFactory()
@@ -138,6 +141,8 @@ class TestMaxValueValidatorValidation(TestCase):
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+# regression tests for issue: 1533
+
class TestChoiceFieldChoicesValidate(TestCase):
CHOICES = [
(0, 'Small'),
@@ -145,6 +150,8 @@ class TestChoiceFieldChoicesValidate(TestCase):
(2, 'Large'),
]
+ SINGLE_CHOICES = [0, 1, 2]
+
CHOICES_NESTED = [
('Category', (
(1, 'First'),
@@ -154,6 +161,15 @@ class TestChoiceFieldChoicesValidate(TestCase):
(4, 'Fourth'),
]
+ MIXED_CHOICES = [
+ ('Category', (
+ (1, 'First'),
+ (2, 'Second'),
+ )),
+ 3,
+ (4, 'Fourth'),
+ ]
+
def test_choices(self):
"""
Make sure a value for choices works as expected.
@@ -165,6 +181,39 @@ class TestChoiceFieldChoicesValidate(TestCase):
except serializers.ValidationError:
self.fail("Value %s does not validate" % str(value))
+ def test_single_choices(self):
+ """
+ Make sure a single value for choices works as expected.
+ """
+ f = serializers.ChoiceField(choices=self.SINGLE_CHOICES)
+ value = self.SINGLE_CHOICES[0]
+ try:
+ f.to_internal_value(value)
+ except serializers.ValidationError:
+ self.fail("Value %s does not validate" % str(value))
+
+ def test_nested_choices(self):
+ """
+ Make sure a nested value for choices works as expected.
+ """
+ f = serializers.ChoiceField(choices=self.CHOICES_NESTED)
+ value = self.CHOICES_NESTED[0][1][0][0]
+ try:
+ f.to_internal_value(value)
+ except serializers.ValidationError:
+ self.fail("Value %s does not validate" % str(value))
+
+ def test_mixed_choices(self):
+ """
+ Make sure mixed values for choices works as expected.
+ """
+ f = serializers.ChoiceField(choices=self.MIXED_CHOICES)
+ value = self.MIXED_CHOICES[1]
+ try:
+ f.to_internal_value(value)
+ except serializers.ValidationError:
+ self.fail("Value %s does not validate" % str(value))
+
class RegexSerializer(serializers.Serializer):
pin = serializers.CharField(
diff --git a/tests/test_validators.py b/tests/test_validators.py
index 127ec6f8..acaaf574 100644
--- a/tests/test_validators.py
+++ b/tests/test_validators.py
@@ -1,7 +1,9 @@
+import datetime
+
from django.db import models
from django.test import TestCase
+
from rest_framework import serializers
-import datetime
def dedent(blocktext):
@@ -46,7 +48,7 @@ class TestUniquenessValidation(TestCase):
data = {'username': 'existing'}
serializer = UniquenessSerializer(data=data)
assert not serializer.is_valid()
- assert serializer.errors == {'username': ['This field must be unique.']}
+ assert serializer.errors == {'username': ['UniquenessModel with this username already exists.']}
def test_is_unique(self):
data = {'username': 'other'}
diff --git a/tests/test_versioning.py b/tests/test_versioning.py
index 065385ad..4029e0e4 100644
--- a/tests/test_versioning.py
+++ b/tests/test_versioning.py
@@ -1,14 +1,15 @@
-from .utils import UsingURLPatterns
+import pytest
from django.conf.urls import include, url
-from rest_framework import serializers
-from rest_framework import status, versioning
+
+from rest_framework import serializers, status, versioning
from rest_framework.decorators import APIView
+from rest_framework.relations import PKOnlyObject
from rest_framework.response import Response
from rest_framework.reverse import reverse
from rest_framework.test import APIRequestFactory, APITestCase
from rest_framework.versioning import NamespaceVersioning
-from rest_framework.relations import PKOnlyObject
-import pytest
+
+from .utils import UsingURLPatterns
class RequestVersionView(APIView):
@@ -128,7 +129,7 @@ class TestURLReversing(UsingURLPatterns, APITestCase):
urlpatterns = [
url(r'^v1/', include(included, namespace='v1')),
url(r'^another/$', dummy_view, name='another'),
- url(r'^(?P[^/]+)/another/$', dummy_view, name='another'),
+ url(r'^(?P[v1|v2]+)/another/$', dummy_view, name='another'),
]
def test_reverse_unversioned(self):
diff --git a/tests/test_views.py b/tests/test_views.py
index 77b113ee..05c49948 100644
--- a/tests/test_views.py
+++ b/tests/test_views.py
@@ -1,8 +1,10 @@
from __future__ import unicode_literals
-import sys
import copy
+import sys
+
from django.test import TestCase
+
from rest_framework import status
from rest_framework.decorators import api_view
from rest_framework.response import Response
@@ -23,7 +25,7 @@ class BasicView(APIView):
return Response({'method': 'GET'})
def post(self, request, *args, **kwargs):
- return Response({'method': 'POST', 'data': request.DATA})
+ return Response({'method': 'POST', 'data': request.data})
@api_view(['GET', 'POST', 'PUT', 'PATCH'])
@@ -31,11 +33,11 @@ def basic_view(request):
if request.method == 'GET':
return {'method': 'GET'}
elif request.method == 'POST':
- return {'method': 'POST', 'data': request.DATA}
+ return {'method': 'POST', 'data': request.data}
elif request.method == 'PUT':
- return {'method': 'PUT', 'data': request.DATA}
+ return {'method': 'PUT', 'data': request.data}
elif request.method == 'PATCH':
- return {'method': 'PATCH', 'data': request.DATA}
+ return {'method': 'PATCH', 'data': request.data}
class ErrorView(APIView):
@@ -72,21 +74,6 @@ class ClassBasedViewIntegrationTests(TestCase):
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEqual(sanitise_json_error(response.data), expected)
- def test_400_parse_error_tunneled_content(self):
- content = 'f00bar'
- content_type = 'application/json'
- form_data = {
- api_settings.FORM_CONTENT_OVERRIDE: content,
- api_settings.FORM_CONTENTTYPE_OVERRIDE: content_type
- }
- request = factory.post('/', form_data)
- response = self.view(request)
- expected = {
- 'detail': JSON_ERROR
- }
- self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
- self.assertEqual(sanitise_json_error(response.data), expected)
-
class FunctionBasedViewIntegrationTests(TestCase):
def setUp(self):
@@ -101,27 +88,12 @@ class FunctionBasedViewIntegrationTests(TestCase):
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEqual(sanitise_json_error(response.data), expected)
- def test_400_parse_error_tunneled_content(self):
- content = 'f00bar'
- content_type = 'application/json'
- form_data = {
- api_settings.FORM_CONTENT_OVERRIDE: content,
- api_settings.FORM_CONTENTTYPE_OVERRIDE: content_type
- }
- request = factory.post('/', form_data)
- response = self.view(request)
- expected = {
- 'detail': JSON_ERROR
- }
- self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
- self.assertEqual(sanitise_json_error(response.data), expected)
-
class TestCustomExceptionHandler(TestCase):
def setUp(self):
self.DEFAULT_HANDLER = api_settings.EXCEPTION_HANDLER
- def exception_handler(exc):
+ def exception_handler(exc, request):
return Response('Error!', status=status.HTTP_400_BAD_REQUEST)
api_settings.EXCEPTION_HANDLER = exception_handler
diff --git a/tests/test_viewsets.py b/tests/test_viewsets.py
index 4d18a955..0d9b6b31 100644
--- a/tests/test_viewsets.py
+++ b/tests/test_viewsets.py
@@ -1,10 +1,10 @@
from django.test import TestCase
+
from rest_framework import status
from rest_framework.response import Response
from rest_framework.test import APIRequestFactory
from rest_framework.viewsets import GenericViewSet
-
factory = APIRequestFactory()
diff --git a/tests/test_write_only_fields.py b/tests/test_write_only_fields.py
index dd3bbd6e..83ef366a 100644
--- a/tests/test_write_only_fields.py
+++ b/tests/test_write_only_fields.py
@@ -1,4 +1,5 @@
from django.test import TestCase
+
from rest_framework import serializers
diff --git a/tests/urls.py b/tests/urls.py
index 41f527df..f5a26177 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,6 +1,4 @@
"""
Blank URLConf just to keep the test suite happy
"""
-from django.conf.urls import patterns
-
-urlpatterns = patterns('')
+urlpatterns = []
diff --git a/tox.ini b/tox.ini
index 9ffbcedc..a027fa0d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,33 +3,51 @@ addopts=--tb=short
[tox]
envlist =
- py27-{flake8,docs},
- {py26,py27}-django14,
- {py26,py27,py32,py33,py34}-django{15,16},
- {py27,py32,py33,py34}-django{17,18,master}
+ py27-{lint,docs},
+ {py27,py32,py33,py34}-django{17,18},
+ {py27,py34,py35}-django{19}
[testenv]
-commands = ./runtests.py --fast {posargs}
+commands = ./runtests.py --fast {posargs} --coverage
setenv =
PYTHONDONTWRITEBYTECODE=1
deps =
- django14: Django==1.4.11 # Should track minimum supported
- django15: Django==1.5.6 # Should track minimum supported
- django16: Django==1.6.3 # Should track minimum supported
- django17: Django==1.7.2 # Should track maximum supported
- django18: Django==1.8 # Should track maximum supported
- djangomaster: https://github.com/django/django/archive/master.tar.gz
- -rrequirements/requirements-testing.txt
- -rrequirements/requirements-optionals.txt
+ django17: Django==1.7.11
+ django18: Django==1.8.7
+ django19: Django==1.9
+ -rrequirements/requirements-testing.txt
+ -rrequirements/requirements-optionals.txt
-[testenv:py27-flake8]
-deps =
- -rrequirements/requirements-codestyle.txt
- -rrequirements/requirements-testing.txt
+[testenv:py27-lint]
commands = ./runtests.py --lintonly
+deps =
+ -rrequirements/requirements-codestyle.txt
+ -rrequirements/requirements-testing.txt
[testenv:py27-docs]
+commands = mkdocs build
deps =
-rrequirements/requirements-testing.txt
-rrequirements/requirements-documentation.txt
-commands = mkdocs build
+
+# Specify explicitly to exclude Django Guardian against Django 1.9
+[testenv:py27-django19]
+deps =
+ Django==1.9
+ -rrequirements/requirements-testing.txt
+ markdown==2.5.2
+ django-filter==0.10.0
+
+[testenv:py34-django19]
+deps =
+ Django==1.9
+ -rrequirements/requirements-testing.txt
+ markdown==2.5.2
+ django-filter==0.10.0
+
+[testenv:py35-django19]
+deps =
+ Django==1.9
+ -rrequirements/requirements-testing.txt
+ markdown==2.5.2
+ django-filter==0.10.0
+ {% block breadcrumbs %}
+
+ {% endblock %}
- {% block body %}
-
+
+
+
+ {% block script %}
+
+
+
+
+
+
+
+ {% endblock %}
+
+ {% if filter_form %}
+ {{ filter_form }}
+ {% endif %}
+
+
+{% endblock %}
diff --git a/rest_framework/templates/rest_framework/filters/base.html b/rest_framework/templates/rest_framework/filters/base.html
new file mode 100644
index 00000000..f830e16b
--- /dev/null
+++ b/rest_framework/templates/rest_framework/filters/base.html
@@ -0,0 +1,16 @@
+
diff --git a/rest_framework/templates/rest_framework/filters/django_filter.html b/rest_framework/templates/rest_framework/filters/django_filter.html
new file mode 100644
index 00000000..b116e353
--- /dev/null
+++ b/rest_framework/templates/rest_framework/filters/django_filter.html
@@ -0,0 +1,6 @@
+{% load i18n %}
+
-
+
+ {% if 'GET' in allowed_methods %}
+
+ {% trans "Field filters" %}
+ diff --git a/rest_framework/templates/rest_framework/filters/django_filter_crispyforms.html b/rest_framework/templates/rest_framework/filters/django_filter_crispyforms.html new file mode 100644 index 00000000..171767c0 --- /dev/null +++ b/rest_framework/templates/rest_framework/filters/django_filter_crispyforms.html @@ -0,0 +1,5 @@ +{% load crispy_forms_tags %} +{% load i18n %} + +{% trans "Field filters" %}
+{% crispy filter.form %} diff --git a/rest_framework/templates/rest_framework/filters/ordering.html b/rest_framework/templates/rest_framework/filters/ordering.html new file mode 100644 index 00000000..b71b2a5b --- /dev/null +++ b/rest_framework/templates/rest_framework/filters/ordering.html @@ -0,0 +1,14 @@ +{% load rest_framework %} +{% load i18n %} +{% trans "Ordering" %}
+
+ {% for key, label in options %}
+ {% if key == current %}
+
+ {{ label }}
+
+ {% else %}
+ {{ label }}
+ {% endif %}
+ {% endfor %}
+
diff --git a/rest_framework/templates/rest_framework/filters/search.html b/rest_framework/templates/rest_framework/filters/search.html
new file mode 100644
index 00000000..edb28d45
--- /dev/null
+++ b/rest_framework/templates/rest_framework/filters/search.html
@@ -0,0 +1,12 @@
+{% load i18n %}
+{% trans "Search" %}
+ diff --git a/rest_framework/templates/rest_framework/horizontal/checkbox.html b/rest_framework/templates/rest_framework/horizontal/checkbox.html index 07a7308f..d8453958 100644 --- a/rest_framework/templates/rest_framework/horizontal/checkbox.html +++ b/rest_framework/templates/rest_framework/horizontal/checkbox.html @@ -1,16 +1,21 @@ -
- '
+ ''
+ ''
+ '
'
+ ''
+ )
+ rendered_packed = ''.join(rendered.split())
+ assert rendered_packed == expected_packed
diff --git a/tests/test_decorators.py b/tests/test_decorators.py
index 195f0ba3..46e4a6ad 100644
--- a/tests/test_decorators.py
+++ b/tests/test_decorators.py
@@ -1,22 +1,20 @@
from __future__ import unicode_literals
+
from django.test import TestCase
+
from rest_framework import status
from rest_framework.authentication import BasicAuthentication
+from rest_framework.decorators import (
+ api_view, authentication_classes, parser_classes, permission_classes,
+ renderer_classes, throttle_classes
+)
from rest_framework.parsers import JSONParser
from rest_framework.permissions import IsAuthenticated
-from rest_framework.response import Response
from rest_framework.renderers import JSONRenderer
+from rest_framework.response import Response
from rest_framework.test import APIRequestFactory
from rest_framework.throttling import UserRateThrottle
from rest_framework.views import APIView
-from rest_framework.decorators import (
- api_view,
- renderer_classes,
- parser_classes,
- authentication_classes,
- throttle_classes,
- permission_classes,
-)
class DecoratorTestCase(TestCase):
diff --git a/tests/test_description.py b/tests/test_description.py
index 78ce2350..d0ca4076 100644
--- a/tests/test_description.py
+++ b/tests/test_description.py
@@ -1,12 +1,17 @@
# -- coding: utf-8 --
from __future__ import unicode_literals
+
from django.test import TestCase
from django.utils.encoding import python_2_unicode_compatible, smart_text
+
from rest_framework.compat import apply_markdown
from rest_framework.views import APIView
-from .description import ViewWithNonASCIICharactersInDocstring
-from .description import UTF8_TEST_DOCSTRING
+
+from .description import (
+ UTF8_TEST_DOCSTRING, ViewWithNonASCIICharactersInDocstring
+)
+
# We check that docstrings get nicely un-indented.
DESCRIPTION = """an example docstring
diff --git a/tests/test_fields.py b/tests/test_fields.py
index fd2e1466..9cb59f7d 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -1,11 +1,15 @@
-from decimal import Decimal
-from django.utils import timezone
-from rest_framework import serializers
-import rest_framework
import datetime
+import os
+import uuid
+from decimal import Decimal
+
import django
import pytest
-import uuid
+from django.http import QueryDict
+from django.utils import timezone
+
+import rest_framework
+from rest_framework import serializers
# Tests for field keyword arguments and core functionality.
@@ -222,46 +226,86 @@ class TestInvalidErrorKey:
assert str(exc_info.value) == expected
-class MockHTMLDict(dict):
- """
- This class mocks up a dictionary like object, that behaves
- as if it was returned for multipart or urlencoded data.
- """
- getlist = None
-
-
class TestBooleanHTMLInput:
- def setup(self):
- class TestSerializer(serializers.Serializer):
- archived = serializers.BooleanField()
- self.Serializer = TestSerializer
-
def test_empty_html_checkbox(self):
"""
HTML checkboxes do not send any value, but should be treated
as `False` by BooleanField.
"""
- # This class mocks up a dictionary like object, that behaves
- # as if it was returned for multipart or urlencoded data.
- serializer = self.Serializer(data=MockHTMLDict())
+ class TestSerializer(serializers.Serializer):
+ archived = serializers.BooleanField()
+
+ serializer = TestSerializer(data=QueryDict(''))
+ assert serializer.is_valid()
+ assert serializer.validated_data == {'archived': False}
+
+ def test_empty_html_checkbox_not_required(self):
+ """
+ HTML checkboxes do not send any value, but should be treated
+ as `False` by BooleanField, even if the field is required=False.
+ """
+ class TestSerializer(serializers.Serializer):
+ archived = serializers.BooleanField(required=False)
+
+ serializer = TestSerializer(data=QueryDict(''))
assert serializer.is_valid()
assert serializer.validated_data == {'archived': False}
class TestHTMLInput:
- def test_empty_html_charfield(self):
+ def test_empty_html_charfield_with_default(self):
class TestSerializer(serializers.Serializer):
message = serializers.CharField(default='happy')
- serializer = TestSerializer(data=MockHTMLDict())
+ serializer = TestSerializer(data=QueryDict(''))
assert serializer.is_valid()
assert serializer.validated_data == {'message': 'happy'}
+ def test_empty_html_charfield_without_default(self):
+ class TestSerializer(serializers.Serializer):
+ message = serializers.CharField(allow_blank=True)
+
+ serializer = TestSerializer(data=QueryDict('message='))
+ assert serializer.is_valid()
+ assert serializer.validated_data == {'message': ''}
+
+ def test_empty_html_charfield_without_default_not_required(self):
+ class TestSerializer(serializers.Serializer):
+ message = serializers.CharField(allow_blank=True, required=False)
+
+ serializer = TestSerializer(data=QueryDict('message='))
+ assert serializer.is_valid()
+ assert serializer.validated_data == {'message': ''}
+
+ def test_empty_html_integerfield(self):
+ class TestSerializer(serializers.Serializer):
+ message = serializers.IntegerField(default=123)
+
+ serializer = TestSerializer(data=QueryDict('message='))
+ assert serializer.is_valid()
+ assert serializer.validated_data == {'message': 123}
+
+ def test_empty_html_uuidfield_with_default(self):
+ class TestSerializer(serializers.Serializer):
+ message = serializers.UUIDField(default=uuid.uuid4)
+
+ serializer = TestSerializer(data=QueryDict('message='))
+ assert serializer.is_valid()
+ assert list(serializer.validated_data.keys()) == ['message']
+
+ def test_empty_html_uuidfield_with_optional(self):
+ class TestSerializer(serializers.Serializer):
+ message = serializers.UUIDField(required=False)
+
+ serializer = TestSerializer(data=QueryDict('message='))
+ assert serializer.is_valid()
+ assert list(serializer.validated_data.keys()) == []
+
def test_empty_html_charfield_allow_null(self):
class TestSerializer(serializers.Serializer):
message = serializers.CharField(allow_null=True)
- serializer = TestSerializer(data=MockHTMLDict({'message': ''}))
+ serializer = TestSerializer(data=QueryDict('message='))
assert serializer.is_valid()
assert serializer.validated_data == {'message': None}
@@ -269,7 +313,7 @@ class TestHTMLInput:
class TestSerializer(serializers.Serializer):
expiry = serializers.DateField(allow_null=True)
- serializer = TestSerializer(data=MockHTMLDict({'expiry': ''}))
+ serializer = TestSerializer(data=QueryDict('expiry='))
assert serializer.is_valid()
assert serializer.validated_data == {'expiry': None}
@@ -277,7 +321,7 @@ class TestHTMLInput:
class TestSerializer(serializers.Serializer):
message = serializers.CharField(allow_null=True, allow_blank=True)
- serializer = TestSerializer(data=MockHTMLDict({'message': ''}))
+ serializer = TestSerializer(data=QueryDict('message='))
assert serializer.is_valid()
assert serializer.validated_data == {'message': ''}
@@ -285,10 +329,26 @@ class TestHTMLInput:
class TestSerializer(serializers.Serializer):
message = serializers.CharField(required=False)
- serializer = TestSerializer(data=MockHTMLDict())
+ serializer = TestSerializer(data=QueryDict(''))
assert serializer.is_valid()
assert serializer.validated_data == {}
+ def test_querydict_list_input(self):
+ class TestSerializer(serializers.Serializer):
+ scores = serializers.ListField(child=serializers.IntegerField())
+
+ serializer = TestSerializer(data=QueryDict('scores=1&scores=3'))
+ assert serializer.is_valid()
+ assert serializer.validated_data == {'scores': [1, 3]}
+
+ def test_querydict_list_input_only_one_input(self):
+ class TestSerializer(serializers.Serializer):
+ scores = serializers.ListField(child=serializers.IntegerField())
+
+ serializer = TestSerializer(data=QueryDict('scores=1&'))
+ assert serializer.is_valid()
+ assert serializer.validated_data == {'scores': [1]}
+
class TestCreateOnlyDefault:
def setup(self):
@@ -406,6 +466,18 @@ class TestBooleanField(FieldValues):
}
field = serializers.BooleanField()
+ def test_disallow_unhashable_collection_types(self):
+ inputs = (
+ [],
+ {},
+ )
+ field = serializers.BooleanField()
+ for input_value in inputs:
+ with pytest.raises(serializers.ValidationError) as exc_info:
+ field.run_validation(input_value)
+ expected = ['"{0}" is not a valid boolean.'.format(input_value)]
+ assert exc_info.value.detail == expected
+
class TestNullBooleanField(FieldValues):
"""
@@ -461,6 +533,13 @@ class TestCharField(FieldValues):
field = serializers.CharField(trim_whitespace=False)
assert field.to_internal_value(' abc ') == ' abc '
+ def test_disallow_blank_with_trim_whitespace(self):
+ field = serializers.CharField(allow_blank=False, trim_whitespace=True)
+
+ with pytest.raises(serializers.ValidationError) as exc_info:
+ field.run_validation(' ')
+ assert exc_info.value.detail == ['This field may not be blank.']
+
class TestEmailField(FieldValues):
"""
@@ -530,7 +609,8 @@ class TestUUIDField(FieldValues):
284758210125106368185219588917561929842: uuid.UUID('d63a6fb6-88d5-40c7-a91c-9edf73283072')
}
invalid_inputs = {
- '825d7aeb-05a9-45b5-a5b7': ['"825d7aeb-05a9-45b5-a5b7" is not a valid UUID.']
+ '825d7aeb-05a9-45b5-a5b7': ['"825d7aeb-05a9-45b5-a5b7" is not a valid UUID.'],
+ (1, 2, 3): ['"(1, 2, 3)" is not a valid UUID.']
}
outputs = {
uuid.UUID('825d7aeb-05a9-45b5-a5b7-05df87923cda'): '825d7aeb-05a9-45b5-a5b7-05df87923cda'
@@ -603,6 +683,24 @@ class TestIPv6AddressField(FieldValues):
field = serializers.IPAddressField(protocol='IPv6')
+class TestFilePathField(FieldValues):
+ """
+ Valid and invalid values for `FilePathField`
+ """
+
+ valid_inputs = {
+ __file__: __file__,
+ }
+ invalid_inputs = {
+ 'wrong_path': ['"wrong_path" is not a valid path choice.']
+ }
+ outputs = {
+ }
+ field = serializers.FilePathField(
+ path=os.path.abspath(os.path.dirname(__file__))
+ )
+
+
# Number types...
class TestIntegerField(FieldValues):
@@ -713,15 +811,17 @@ class TestDecimalField(FieldValues):
0: Decimal('0'),
12.3: Decimal('12.3'),
0.1: Decimal('0.1'),
- '2E+2': Decimal('200'),
+ '2E+1': Decimal('20'),
}
invalid_inputs = (
('abc', ["A valid number is required."]),
(Decimal('Nan'), ["A valid number is required."]),
(Decimal('Inf'), ["A valid number is required."]),
('12.345', ["Ensure that there are no more than 3 digits in total."]),
+ (200000000000.0, ["Ensure that there are no more than 3 digits in total."]),
('0.01', ["Ensure that there are no more than 1 decimal places."]),
- (123, ["Ensure that there are no more than 2 digits before the decimal point."])
+ (123, ["Ensure that there are no more than 2 digits before the decimal point."]),
+ ('2E+2', ["Ensure that there are no more than 2 digits before the decimal point."])
)
outputs = {
'1': '1.0',
@@ -982,6 +1082,7 @@ class TestDurationField(FieldValues):
'3 08:32:01.000123': datetime.timedelta(days=3, hours=8, minutes=32, seconds=1, microseconds=123),
'08:01': datetime.timedelta(minutes=8, seconds=1),
datetime.timedelta(days=3, hours=8, minutes=32, seconds=1, microseconds=123): datetime.timedelta(days=3, hours=8, minutes=32, seconds=1, microseconds=123),
+ 3600: datetime.timedelta(hours=1),
}
invalid_inputs = {
'abc': ['Duration has wrong format. Use one of these formats instead: [DD] [HH:[MM:]]ss[.uuuuuu].'],
@@ -1036,6 +1137,50 @@ class TestChoiceField(FieldValues):
output = field.run_validation('')
assert output == ''
+ def test_allow_null(self):
+ """
+ If `allow_null=True` then '' on HTML forms is treated as None.
+ """
+ field = serializers.ChoiceField(
+ allow_null=True,
+ choices=[
+ 1, 2, 3
+ ]
+ )
+ field.field_name = 'example'
+ value = field.get_value(QueryDict('example='))
+ assert value is None
+ output = field.run_validation(None)
+ assert output is None
+
+ def test_iter_options(self):
+ """
+ iter_options() should return a list of options and option groups.
+ """
+ field = serializers.ChoiceField(
+ choices=[
+ ('Numbers', ['integer', 'float']),
+ ('Strings', ['text', 'email', 'url']),
+ 'boolean'
+ ]
+ )
+ items = list(field.iter_options())
+
+ assert items[0].start_option_group
+ assert items[0].label == 'Numbers'
+ assert items[1].value == 'integer'
+ assert items[2].value == 'float'
+ assert items[3].end_option_group
+
+ assert items[4].start_option_group
+ assert items[4].label == 'Strings'
+ assert items[5].value == 'text'
+ assert items[6].value == 'email'
+ assert items[7].value == 'url'
+ assert items[8].end_option_group
+
+ assert items[9].value == 'boolean'
+
class TestChoiceFieldWithType(FieldValues):
"""
@@ -1082,6 +1227,66 @@ class TestChoiceFieldWithListChoices(FieldValues):
field = serializers.ChoiceField(choices=('poor', 'medium', 'good'))
+class TestChoiceFieldWithGroupedChoices(FieldValues):
+ """
+ Valid and invalid values for a `Choice` field that uses a grouped list for the
+ choices, rather than a list of pairs of (`value`, `description`).
+ """
+ valid_inputs = {
+ 'poor': 'poor',
+ 'medium': 'medium',
+ 'good': 'good',
+ }
+ invalid_inputs = {
+ 'awful': ['"awful" is not a valid choice.']
+ }
+ outputs = {
+ 'good': 'good'
+ }
+ field = serializers.ChoiceField(
+ choices=[
+ (
+ 'Category',
+ (
+ ('poor', 'Poor quality'),
+ ('medium', 'Medium quality'),
+ ),
+ ),
+ ('good', 'Good quality'),
+ ]
+ )
+
+
+class TestChoiceFieldWithMixedChoices(FieldValues):
+ """
+ Valid and invalid values for a `Choice` field that uses a single paired or
+ grouped.
+ """
+ valid_inputs = {
+ 'poor': 'poor',
+ 'medium': 'medium',
+ 'good': 'good',
+ }
+ invalid_inputs = {
+ 'awful': ['"awful" is not a valid choice.']
+ }
+ outputs = {
+ 'good': 'good'
+ }
+ field = serializers.ChoiceField(
+ choices=[
+ (
+ 'Category',
+ (
+ ('poor', 'Poor quality'),
+ ),
+ ),
+ 'medium',
+ ('good', 'Good quality'),
+ ]
+ )
+
+
class TestMultipleChoiceField(FieldValues):
"""
Valid and invalid values for `MultipleChoiceField`.
@@ -1107,8 +1312,6 @@ class TestMultipleChoiceField(FieldValues):
)
def test_against_partial_and_full_updates(self):
- # serializer = self.Serializer(data=MockHTMLDict())
- from django.http import QueryDict
field = serializers.MultipleChoiceField(choices=(('a', 'a'), ('b', 'b')))
field.partial = False
assert field.get_value(QueryDict({})) == []
@@ -1116,6 +1319,27 @@ class TestMultipleChoiceField(FieldValues):
assert field.get_value(QueryDict({})) == rest_framework.fields.empty
+class TestEmptyMultipleChoiceField(FieldValues):
+ """
+ Invalid values for `MultipleChoiceField(allow_empty=False)`.
+ """
+ valid_inputs = {
+ }
+ invalid_inputs = (
+ ([], ['This selection may not be empty.']),
+ )
+ outputs = [
+ ]
+ field = serializers.MultipleChoiceField(
+ choices=[
+ ('consistency', 'Consistency'),
+ ('availability', 'Availability'),
+ ('partition', 'Partition tolerance'),
+ ],
+ allow_empty=False
+ )
+
+
# File serializers...
class MockFile:
@@ -1209,11 +1433,13 @@ class TestListField(FieldValues):
"""
valid_inputs = [
([1, 2, 3], [1, 2, 3]),
- (['1', '2', '3'], [1, 2, 3])
+ (['1', '2', '3'], [1, 2, 3]),
+ ([], [])
]
invalid_inputs = [
('not a list', ['Expected a list of items but got type "str".']),
- ([1, 2, 'error'], ['A valid integer is required.'])
+ ([1, 2, 'error'], ['A valid integer is required.']),
+ ({'one': 'two'}, ['Expected a list of items but got type "dict".'])
]
outputs = [
([1, 2, 3], [1, 2, 3]),
@@ -1221,6 +1447,35 @@ class TestListField(FieldValues):
]
field = serializers.ListField(child=serializers.IntegerField())
+ def test_no_source_on_child(self):
+ with pytest.raises(AssertionError) as exc_info:
+ serializers.ListField(child=serializers.IntegerField(source='other'))
+
+ assert str(exc_info.value) == (
+ "The `source` argument is not meaningful when applied to a `child=` field. "
+ "Remove `source=` from the field declaration."
+ )
+
+ def test_collection_types_are_invalid_input(self):
+ field = serializers.ListField(child=serializers.CharField())
+ input_value = ({'one': 'two'})
+
+ with pytest.raises(serializers.ValidationError) as exc_info:
+ field.to_internal_value(input_value)
+ assert exc_info.value.detail == ['Expected a list of items but got type "dict".']
+
+
+class TestEmptyListField(FieldValues):
+ """
+ Values for `ListField` with allow_empty=False flag.
+ """
+ valid_inputs = {}
+ invalid_inputs = [
+ ([], ['This list may not be empty.'])
+ ]
+ outputs = {}
+ field = serializers.ListField(child=serializers.IntegerField(), allow_empty=False)
+
class TestUnvalidatedListField(FieldValues):
"""
@@ -1254,6 +1509,15 @@ class TestDictField(FieldValues):
]
field = serializers.DictField(child=serializers.CharField())
+ def test_no_source_on_child(self):
+ with pytest.raises(AssertionError) as exc_info:
+ serializers.DictField(child=serializers.CharField(source='other'))
+
+ assert str(exc_info.value) == (
+ "The `source` argument is not meaningful when applied to a `child=` field. "
+ "Remove `source=` from the field declaration."
+ )
+
class TestUnvalidatedDictField(FieldValues):
"""
@@ -1271,6 +1535,58 @@ class TestUnvalidatedDictField(FieldValues):
field = serializers.DictField()
+class TestJSONField(FieldValues):
+ """
+ Values for `JSONField`.
+ """
+ valid_inputs = [
+ ({
+ 'a': 1,
+ 'b': ['some', 'list', True, 1.23],
+ '3': None
+ }, {
+ 'a': 1,
+ 'b': ['some', 'list', True, 1.23],
+ '3': None
+ }),
+ ]
+ invalid_inputs = [
+ ({'a': set()}, ['Value must be valid JSON.']),
+ ]
+ outputs = [
+ ({
+ 'a': 1,
+ 'b': ['some', 'list', True, 1.23],
+ '3': 3
+ }, {
+ 'a': 1,
+ 'b': ['some', 'list', True, 1.23],
+ '3': 3
+ }),
+ ]
+ field = serializers.JSONField()
+
+
+class TestBinaryJSONField(FieldValues):
+ """
+ Values for `JSONField` with binary=True.
+ """
+ valid_inputs = [
+ (b'{"a": 1, "3": null, "b": ["some", "list", true, 1.23]}', {
+ 'a': 1,
+ 'b': ['some', 'list', True, 1.23],
+ '3': None
+ }),
+ ]
+ invalid_inputs = [
+ ('{"a": "unterminated string}', ['Value must be valid JSON.']),
+ ]
+ outputs = [
+ (['some', 'list', True, 1.23], b'["some", "list", true, 1.23]'),
+ ]
+ field = serializers.JSONField(binary=True)
+
+
# Tests for FieldField.
# ---------------------
diff --git a/tests/test_filters.py b/tests/test_filters.py
index e7cb0c79..729a7b75 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -1,19 +1,22 @@
from __future__ import unicode_literals
+
import datetime
+import unittest
from decimal import Decimal
-from django.db import models
-from django.conf.urls import patterns, url
+
+from django.conf.urls import url
from django.core.urlresolvers import reverse
+from django.db import models
from django.test import TestCase
from django.test.utils import override_settings
-from django.utils import unittest
from django.utils.dateparse import parse_date
from django.utils.six.moves import reload_module
-from rest_framework import generics, serializers, status, filters
+
+from rest_framework import filters, generics, serializers, status
from rest_framework.compat import django_filters
from rest_framework.test import APIRequestFactory
-from .models import BaseFilterableItem, FilterableItem, BasicModel
+from .models import BaseFilterableItem, BasicModel, FilterableItem
factory = APIRequestFactory()
@@ -94,13 +97,12 @@ if django_filters:
def get_queryset(self):
return FilterableItem.objects.all()
- urlpatterns = patterns(
- '',
+ urlpatterns = [
url(r'^(?P
-
+
-
-
- {% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
- {% endif %}
- {% if field.help_text %}
- {{ field.help_text }}
- {% endif %}
-
+ {% if field.label %}
+
+ {% endif %}
+
+
diff --git a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
index ec7d5935..59a9acd8 100644
--- a/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
+++ b/rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
@@ -1,30 +1,37 @@
+
+
+ {% if field.errors %}
+ {% for error in field.errors %}
+ {{ error }}
+ {% endfor %}
+ {% endif %}
+
+ {% if field.help_text %}
+ {{ field.help_text }}
+ {% endif %}
+
- {% if field.label %}
-
- {% endif %}
-
diff --git a/rest_framework/templates/rest_framework/horizontal/fieldset.html b/rest_framework/templates/rest_framework/horizontal/fieldset.html
index ba3e3aba..1747d255 100644
--- a/rest_framework/templates/rest_framework/horizontal/fieldset.html
+++ b/rest_framework/templates/rest_framework/horizontal/fieldset.html
@@ -1,13 +1,16 @@
{% load rest_framework %}
diff --git a/rest_framework/templates/rest_framework/horizontal/form.html b/rest_framework/templates/rest_framework/horizontal/form.html
index fd15b626..13fc807e 100644
--- a/rest_framework/templates/rest_framework/horizontal/form.html
+++ b/rest_framework/templates/rest_framework/horizontal/form.html
@@ -1,15 +1,6 @@
{% load rest_framework %}
-
+{% for field in form %}
+ {% if not field.read_only %}
+ {% render_field field style=style %}
+ {% endif %}
+{% endfor %}
diff --git a/rest_framework/templates/rest_framework/horizontal/input.html b/rest_framework/templates/rest_framework/horizontal/input.html
index c41cd523..82e6dc67 100644
--- a/rest_framework/templates/rest_framework/horizontal/input.html
+++ b/rest_framework/templates/rest_framework/horizontal/input.html
@@ -1,14 +1,21 @@
+ {% if field.label %}
+
+ {% endif %}
+
+
{% if style.inline %}
- {% for key, text in field.choices.items %}
-
- {% endfor %}
+ {% for key, text in field.choices.items %}
+
+ {% endfor %}
{% else %}
- {% for key, text in field.choices.items %}
-
+
+ {% if field.errors %}
+ {% for error in field.errors %}
+ {{ error }}
+ {% endfor %}
+ {% endif %}
+
+ {% if field.help_text %}
+ {{ field.help_text }}
+ {% endif %}
+
-
-
- {% endfor %}
+ {% for key, text in field.choices.items %}
+
+
+
+ {% endfor %}
{% endif %}
- {% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
- {% endif %}
- {% if field.help_text %}
- {{ field.help_text }}
- {% endif %}
-
- {% if field.label %}
-
+ {% if field.label %}
+
+ {% endif %}
+
+
diff --git a/rest_framework/templates/rest_framework/horizontal/list_fieldset.html b/rest_framework/templates/rest_framework/horizontal/list_fieldset.html
index a9ff04a6..962c333c 100644
--- a/rest_framework/templates/rest_framework/horizontal/list_fieldset.html
+++ b/rest_framework/templates/rest_framework/horizontal/list_fieldset.html
@@ -1,16 +1,13 @@
{% load rest_framework %}
+
diff --git a/rest_framework/templates/rest_framework/horizontal/radio.html b/rest_framework/templates/rest_framework/horizontal/radio.html
index cabd09d2..0b494854 100644
--- a/rest_framework/templates/rest_framework/horizontal/radio.html
+++ b/rest_framework/templates/rest_framework/horizontal/radio.html
@@ -2,46 +2,54 @@
{% trans "None" as none_choice %}
+
+
+ {% if field.errors %}
+ {% for error in field.errors %}
+ {{ error }}
+ {% endfor %}
{% endif %}
-
-
- {% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
- {% endif %}
- {% if field.help_text %}
- {{ field.help_text }}
- {% endif %}
-
+
+ {% if field.help_text %}
+ {{ field.help_text }}
+ {% endif %}
+
- {% if field.label %}
-
- {% endif %}
-
diff --git a/rest_framework/templates/rest_framework/horizontal/select.html b/rest_framework/templates/rest_framework/horizontal/select.html
index 8a7fca37..1ea5c16e 100644
--- a/rest_framework/templates/rest_framework/horizontal/select.html
+++ b/rest_framework/templates/rest_framework/horizontal/select.html
@@ -1,21 +1,34 @@
+ {% if field.label %}
+
+ {% endif %}
+
+
{% if style.inline %}
- {% if field.allow_null or field.allow_blank %}
-
- {% endif %}
- {% for key, text in field.choices.items %}
-
- {% endfor %}
+ {% if field.allow_null or field.allow_blank %}
+
+ {% endif %}
+
+ {% for key, text in field.choices.items %}
+
+ {% endfor %}
{% else %}
- {% if field.allow_null or field.allow_blank %}
-
+
-
-
- {% endif %}
+ {% if field.allow_null or field.allow_blank %}
+
+
+
+ {% endif %}
{% for key, text in field.choices.items %}
-
-
-
+
+
+
{% endfor %}
{% endif %}
+
{% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
+ {% for error in field.errors %}
+ {{ error }}
+ {% endfor %}
{% endif %}
+
{% if field.help_text %}
- {{ field.help_text }}
+ {{ field.help_text }}
{% endif %}
-
- {% if field.label %}
-
+ {% if field.label %}
+
+ {% endif %}
+
+
diff --git a/rest_framework/templates/rest_framework/horizontal/select_multiple.html b/rest_framework/templates/rest_framework/horizontal/select_multiple.html
index 0735f280..b00a63fb 100644
--- a/rest_framework/templates/rest_framework/horizontal/select_multiple.html
+++ b/rest_framework/templates/rest_framework/horizontal/select_multiple.html
@@ -2,22 +2,35 @@
{% trans "No items to select." as no_items %}
+
+
+ {% if field.errors %}
+ {% for error in field.errors %}
+ {{ error }}
+ {% endfor %}
{% endif %}
-
-
- {% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
- {% endif %}
- {% if field.help_text %}
- {{ field.help_text }}
- {% endif %}
-
+
+ {% if field.help_text %}
+ {{ field.help_text }}
+ {% endif %}
+
- {% if field.label %}
-
+ {% if field.label %}
+
+ {% endif %}
+
+
diff --git a/rest_framework/templates/rest_framework/horizontal/textarea.html b/rest_framework/templates/rest_framework/horizontal/textarea.html
index ec107549..ab083807 100644
--- a/rest_framework/templates/rest_framework/horizontal/textarea.html
+++ b/rest_framework/templates/rest_framework/horizontal/textarea.html
@@ -1,14 +1,21 @@
+
+
+ {% if field.errors %}
+ {% for error in field.errors %}
+ {{ error }}
+ {% endfor %}
{% endif %}
-
-
- {% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
- {% endif %}
- {% if field.help_text %}
- {{ field.help_text }}
- {% endif %}
-
+
+ {% if field.help_text %}
+ {{ field.help_text }}
+ {% endif %}
+
- {% if field.label %}
-
+ {% if field.label %}
+
+ {% endif %}
+
+
diff --git a/rest_framework/templates/rest_framework/inline/checkbox.html b/rest_framework/templates/rest_framework/inline/checkbox.html
index 71737f15..665249a5 100644
--- a/rest_framework/templates/rest_framework/inline/checkbox.html
+++ b/rest_framework/templates/rest_framework/inline/checkbox.html
@@ -1,8 +1,8 @@
+
+
+ {% if field.errors %}
+ {% for error in field.errors %}
+ {{ error }}
+ {% endfor %}
{% endif %}
-
-
- {% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
- {% endif %}
- {% if field.help_text %}
- {{ field.help_text }}
- {% endif %}
-
+
+ {% if field.help_text %}
+ {{ field.help_text }}
+ {% endif %}
+
-
diff --git a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
index 09349686..b02425a6 100644
--- a/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
+++ b/rest_framework/templates/rest_framework/inline/checkbox_multiple.html
@@ -1,13 +1,14 @@
-
-
+
+
+
- {% if field.label %}
-
- {% endif %}
- {% for key, text in field.choices.items %}
+ {% if field.label %}
+
+ {% endif %}
+
+ {% for key, text in field.choices.items %}
diff --git a/rest_framework/templates/rest_framework/inline/fieldset.html b/rest_framework/templates/rest_framework/inline/fieldset.html
index e49b42fd..44feef88 100644
--- a/rest_framework/templates/rest_framework/inline/fieldset.html
+++ b/rest_framework/templates/rest_framework/inline/fieldset.html
@@ -1,6 +1,6 @@
{% load rest_framework %}
{% for nested_field in field %}
- {% if not nested_field.read_only %}
- {% render_field nested_field style=style %}
- {% endif %}
+ {% if not nested_field.read_only %}
+ {% render_field nested_field style=style %}
+ {% endif %}
{% endfor %}
diff --git a/rest_framework/templates/rest_framework/inline/form.html b/rest_framework/templates/rest_framework/inline/form.html
index 6a0ea81d..13fc807e 100644
--- a/rest_framework/templates/rest_framework/inline/form.html
+++ b/rest_framework/templates/rest_framework/inline/form.html
@@ -1,11 +1,6 @@
{% load rest_framework %}
-
+{% for field in form %}
+ {% if not field.read_only %}
+ {% render_field field style=style %}
+ {% endif %}
+{% endfor %}
diff --git a/rest_framework/templates/rest_framework/inline/input.html b/rest_framework/templates/rest_framework/inline/input.html
index de85ba48..f28e8f11 100644
--- a/rest_framework/templates/rest_framework/inline/input.html
+++ b/rest_framework/templates/rest_framework/inline/input.html
@@ -1,6 +1,9 @@
-
+
- {% endfor %}
+ {% endfor %}
- {% if field.label %}
-
- {% endif %}
-
+ {% if field.label %}
+
+ {% endif %}
+
+
diff --git a/rest_framework/templates/rest_framework/inline/radio.html b/rest_framework/templates/rest_framework/inline/radio.html
index b6501671..efaef6c9 100644
--- a/rest_framework/templates/rest_framework/inline/radio.html
+++ b/rest_framework/templates/rest_framework/inline/radio.html
@@ -2,23 +2,27 @@
{% trans "None" as none_choice %}
- {% if field.label %}
-
- {% endif %}
- {% if field.allow_null or field.allow_blank %}
-
diff --git a/rest_framework/templates/rest_framework/inline/select.html b/rest_framework/templates/rest_framework/inline/select.html
index 6b30e4d6..99f10ae7 100644
--- a/rest_framework/templates/rest_framework/inline/select.html
+++ b/rest_framework/templates/rest_framework/inline/select.html
@@ -1,13 +1,22 @@
-
-
- {% endif %}
- {% for key, text in field.choices.items %}
-
-
-
- {% endfor %}
+ {% if field.label %}
+
+ {% endif %}
+
+ {% if field.allow_null or field.allow_blank %}
+
+
+
+ {% endif %}
+
+ {% for key, text in field.choices.items %}
+
+
+
+ {% endfor %}
- {% if field.label %}
-
+ {% if field.label %}
+
+ {% endif %}
+
+
diff --git a/rest_framework/templates/rest_framework/inline/select_multiple.html b/rest_framework/templates/rest_framework/inline/select_multiple.html
index 5a8b2494..1c0e96b3 100644
--- a/rest_framework/templates/rest_framework/inline/select_multiple.html
+++ b/rest_framework/templates/rest_framework/inline/select_multiple.html
@@ -2,14 +2,23 @@
{% trans "No items to select." as no_items %}
- {% if field.label %}
-
- {% endif %}
-
+ {% if field.label %}
+
+ {% endif %}
+
+
diff --git a/rest_framework/templates/rest_framework/inline/textarea.html b/rest_framework/templates/rest_framework/inline/textarea.html
index 0766a01c..bce427fa 100644
--- a/rest_framework/templates/rest_framework/inline/textarea.html
+++ b/rest_framework/templates/rest_framework/inline/textarea.html
@@ -1,6 +1,9 @@
- {% if field.label %}
-
- {% endif %}
-
+ {% if field.label %}
+
+ {% endif %}
+
+
diff --git a/rest_framework/templates/rest_framework/login_base.html b/rest_framework/templates/rest_framework/login_base.html
index 8e6240a6..7f2bfb51 100644
--- a/rest_framework/templates/rest_framework/login_base.html
+++ b/rest_framework/templates/rest_framework/login_base.html
@@ -1,68 +1,66 @@
{% extends "rest_framework/base.html" %}
-{% load url from future %}
{% load staticfiles %}
{% load rest_framework %}
- {% block body %}
-
+{% block body %}
+
+
+
+
+{% endblock %}
diff --git a/rest_framework/templates/rest_framework/pagination/numbers.html b/rest_framework/templates/rest_framework/pagination/numbers.html
index 04045810..4ff9385f 100644
--- a/rest_framework/templates/rest_framework/pagination/numbers.html
+++ b/rest_framework/templates/rest_framework/pagination/numbers.html
@@ -1,27 +1,47 @@
+
+
+
+
+
-
+ {% block branding %}
+ Django REST framework
{% endblock %} +
-
-
- {% endblock %}
+
-
-
-
-
-
-
-
- {% block branding %}
- Django REST framework
{% endblock %} -
-
-
-
-
-
+
+
+
+
+ -
- {% if previous_url %}
-
- - {% else %} -
- - {% endif %} + {% if previous_url %} +
- + + + + + {% else %} +
- + + + + + {% endif %} - {% for page_link in page_links %} - {% if page_link.is_break %} -
- - - - {% else %} - {% if page_link.is_active %} -
- {{ page_link.number }} - {% else %} -
- {{ page_link.number }} - {% endif %} - {% endif %} - {% endfor %} - - {% if next_url %} -
- + {% for page_link in page_links %} + {% if page_link.is_break %} +
- + + {% else %} -
- + {% if page_link.is_active %} +
- + {{ page_link.number }} + + {% else %} +
- + {{ page_link.number }} + + {% endif %} {% endif %} + {% endfor %} + + {% if next_url %} +
- + + + + + {% else %} +
- + + + + + {% endif %}
-
-{% if previous_url %}
-
- « Previous -{% else %} -
- « Previous -{% endif %} -{% if next_url %} -
- Next » -{% else %} -
- Next » -{% endif %} + {% if previous_url %} +
- + « Previous + + {% else %} +
- + « Previous + + {% endif %} + + {% if next_url %} +
- + Next » + + {% else %} +
- + Next » + + {% endif %}
- {{ field.label_tag|add_class:"col-sm-2 control-label" }}
-
diff --git a/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
index 134cca66..a3a3a08a 100644
--- a/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
+++ b/rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
@@ -1,30 +1,35 @@
- {{ field|add_class:"form-control" }}
- {{ field.help_text }}
-
+
+ {{ field.label_tag|add_class:"col-sm-2 control-label" }}
+
{% endfor %}
diff --git a/rest_framework/templates/rest_framework/vertical/checkbox.html b/rest_framework/templates/rest_framework/vertical/checkbox.html
index e21a8e90..69f19dfb 100644
--- a/rest_framework/templates/rest_framework/vertical/checkbox.html
+++ b/rest_framework/templates/rest_framework/vertical/checkbox.html
@@ -1,14 +1,18 @@
+ {{ field|add_class:"form-control" }}
+ {{ field.help_text }}
+
-
\ No newline at end of file
+
-
-
- {% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
- {% endif %}
- {% if field.help_text %}
- {{ field.help_text }}
- {% endif %}
-
+
+
+
+ {% if field.errors %}
+ {% for error in field.errors %}
+ {{ error }}
+ {% endfor %}
+ {% endif %}
+
+ {% if field.help_text %}
+ {{ field.help_text }}
+ {% endif %}
+
- {% if field.label %}
-
- {% endif %}
- {% if style.inline %}
-
diff --git a/rest_framework/templates/rest_framework/vertical/fieldset.html b/rest_framework/templates/rest_framework/vertical/fieldset.html
index 3eb5191c..4ec2a5d4 100644
--- a/rest_framework/templates/rest_framework/vertical/fieldset.html
+++ b/rest_framework/templates/rest_framework/vertical/fieldset.html
@@ -1,9 +1,15 @@
{% load rest_framework %}
+
diff --git a/rest_framework/templates/rest_framework/vertical/form.html b/rest_framework/templates/rest_framework/vertical/form.html
index e68835c0..13fc807e 100644
--- a/rest_framework/templates/rest_framework/vertical/form.html
+++ b/rest_framework/templates/rest_framework/vertical/form.html
@@ -1,11 +1,6 @@
{% load rest_framework %}
-
+{% for field in form %}
+ {% if not field.read_only %}
+ {% render_field field style=style %}
+ {% endif %}
+{% endfor %}
diff --git a/rest_framework/templates/rest_framework/vertical/input.html b/rest_framework/templates/rest_framework/vertical/input.html
index 43cccd3e..71e132fe 100644
--- a/rest_framework/templates/rest_framework/vertical/input.html
+++ b/rest_framework/templates/rest_framework/vertical/input.html
@@ -1,12 +1,17 @@
-
- {% for key, text in field.choices.items %}
-
- {% endfor %}
-
- {% else %}
- {% for key, text in field.choices.items %}
-
-
-
- {% endfor %}
- {% endif %}
- {% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
- {% endif %}
- {% if field.help_text %}
- {{ field.help_text }}
- {% endif %}
+ {% if field.label %}
+
+ {% endif %}
+
+ {% if style.inline %}
+
+ {% for key, text in field.choices.items %}
+
+ {% endfor %}
+
+ {% else %}
+ {% for key, text in field.choices.items %}
+
+
+
+ {% endfor %}
+ {% endif %}
+
+ {% if field.errors %}
+ {% for error in field.errors %}
+ {{ error }}
+ {% endfor %}
+ {% endif %}
+
+ {% if field.help_text %}
+ {{ field.help_text }}
+ {% endif %}
- {% if field.label %}
-
- {% endif %}
-
- {% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
- {% endif %}
- {% if field.help_text %}
- {{ field.help_text }}
- {% endif %}
+Log in ".format(href=login_url, next=escape(request.path))
- return snippet
+ snippet = "Log in "
+ snippet = format_html(snippet, href=login_url, next=escape(request.path))
+
+ return mark_safe(snippet)
@register.simple_tag
@@ -50,7 +62,8 @@ def optional_logout(request, user):
try:
logout_url = reverse('rest_framework:logout')
except NoReverseMatch:
- return '{user} '.format(user=user)
+ snippet = format_html('{user} ', user=escape(user))
+ return mark_safe(snippet)
snippet = """
@@ -61,8 +74,9 @@ def optional_logout(request, user):
Log out
"""
+ snippet = format_html(snippet, user=escape(user), href=logout_url, next=escape(request.path))
- return snippet.format(user=user, href=logout_url, next=escape(request.path))
+ return mark_safe(snippet)
@register.simple_tag
@@ -104,6 +118,45 @@ def add_class(value, css_class):
return value
+@register.filter
+def format_value(value):
+ if getattr(value, 'is_hyperlink', False):
+ return mark_safe('%s' % (value, escape(value.name)))
+ if value is None or isinstance(value, bool):
+ return mark_safe('
# Should be presented as
#
- value = re.sub(' at 0x[0-9a-f]{4,32}>', '>', value)
+ value = re.sub(' at 0x[0-9A-Fa-f]{4,32}>', '>', value)
return value
diff --git a/rest_framework/utils/serializer_helpers.py b/rest_framework/utils/serializer_helpers.py
index 87bb3ac0..cfaeb25e 100644
--- a/rest_framework/utils/serializer_helpers.py
+++ b/rest_framework/utils/serializer_helpers.py
@@ -1,6 +1,11 @@
from __future__ import unicode_literals
+
import collections
-from rest_framework.compat import OrderedDict, unicode_to_repr
+from collections import OrderedDict
+
+from django.utils.encoding import force_text
+
+from rest_framework.compat import unicode_to_repr
class ReturnDict(OrderedDict):
@@ -9,6 +14,7 @@ class ReturnDict(OrderedDict):
Includes a backlink to the serializer instance for renderers
to use if they need richer field information.
"""
+
def __init__(self, *args, **kwargs):
self.serializer = kwargs.pop('serializer')
super(ReturnDict, self).__init__(*args, **kwargs)
@@ -31,6 +37,7 @@ class ReturnList(list):
Includes a backlink to the serializer instance for renderers
to use if they need richer field information.
"""
+
def __init__(self, *args, **kwargs):
self.serializer = kwargs.pop('serializer')
super(ReturnList, self).__init__(*args, **kwargs)
@@ -50,8 +57,10 @@ class BoundField(object):
Returned when iterating over a serializer instance,
providing an API similar to Django forms and form fields.
"""
+
def __init__(self, field, value, errors, prefix=''):
self._field = field
+ self._prefix = prefix
self.value = value
self.errors = errors
self.name = prefix + self.field_name
@@ -68,6 +77,10 @@ class BoundField(object):
self.__class__.__name__, self.value, self.errors
))
+ def as_form_field(self):
+ value = '' if (self.value is None or self.value is False) else force_text(self.value)
+ return self.__class__(self._field, value, self.errors, self._prefix)
+
class NestedBoundField(BoundField):
"""
@@ -75,6 +88,12 @@ class NestedBoundField(BoundField):
in order to support nested bound fields. This class is the type of
`BoundField` that is used for serializer fields.
"""
+
+ def __init__(self, field, value, errors, prefix=''):
+ if value is None or value is '':
+ value = {}
+ super(NestedBoundField, self).__init__(field, value, errors, prefix)
+
def __iter__(self):
for field in self.fields.values():
yield self[field.field_name]
@@ -87,6 +106,15 @@ class NestedBoundField(BoundField):
return NestedBoundField(field, value, error, prefix=self.name + '.')
return BoundField(field, value, error, prefix=self.name + '.')
+ def as_form_field(self):
+ values = {}
+ for key, value in self.value.items():
+ if isinstance(value, (list, dict)):
+ values[key] = value
+ else:
+ values[key] = '' if (value is None or value is False) else force_text(value)
+ return self.__class__(self._field, values, self.errors, self._prefix)
+
class BindingDict(collections.MutableMapping):
"""
@@ -96,6 +124,7 @@ class BindingDict(collections.MutableMapping):
`field.bind()` so that the `field_name` and `parent` attributes
can be set correctly.
"""
+
def __init__(self, serializer):
self.serializer = serializer
self.fields = OrderedDict()
diff --git a/rest_framework/validators.py b/rest_framework/validators.py
index 6ae80b89..a21f67e6 100644
--- a/rest_framework/validators.py
+++ b/rest_framework/validators.py
@@ -7,7 +7,9 @@ object creation, and makes it possible to switch between using the implicit
`ModelSerializer` class and an equivalent explicit `Serializer` class.
"""
from __future__ import unicode_literals
+
from django.utils.translation import ugettext_lazy as _
+
from rest_framework.compat import unicode_to_repr
from rest_framework.exceptions import ValidationError
from rest_framework.utils.representation import smart_repr
@@ -98,11 +100,11 @@ class UniqueTogetherValidator(object):
if self.instance is not None:
return
- missing = dict([
- (field_name, self.missing_message)
+ missing = {
+ field_name: self.missing_message
for field_name in self.fields
if field_name not in attrs
- ])
+ }
if missing:
raise ValidationError(missing)
@@ -118,10 +120,10 @@ class UniqueTogetherValidator(object):
attrs[field_name] = getattr(self.instance, field_name)
# Determine the filter keyword arguments and filter the queryset.
- filter_kwargs = dict([
- (field_name, attrs[field_name])
+ filter_kwargs = {
+ field_name: attrs[field_name]
for field_name in self.fields
- ])
+ }
return queryset.filter(**filter_kwargs)
def exclude_current_instance(self, attrs, queryset):
@@ -182,11 +184,11 @@ class BaseUniqueForValidator(object):
The `UniqueForValidator` classes always force an implied
'required' state on the fields they are applied to.
"""
- missing = dict([
- (field_name, self.missing_message)
+ missing = {
+ field_name: self.missing_message
for field_name in [self.field, self.date_field]
if field_name not in attrs
- ])
+ }
if missing:
raise ValidationError(missing)
diff --git a/rest_framework/versioning.py b/rest_framework/versioning.py
index 51b886f3..7b1422c9 100644
--- a/rest_framework/versioning.py
+++ b/rest_framework/versioning.py
@@ -1,13 +1,16 @@
# coding: utf-8
from __future__ import unicode_literals
+
+import re
+
from django.utils.translation import ugettext_lazy as _
+
from rest_framework import exceptions
from rest_framework.compat import unicode_http_header
from rest_framework.reverse import _reverse
from rest_framework.settings import api_settings
from rest_framework.templatetags.rest_framework import replace_query_param
from rest_framework.utils.mediatypes import _MediaType
-import re
class BaseVersioning(object):
@@ -59,8 +62,8 @@ class URLPathVersioning(BaseVersioning):
An example URL conf for two views that accept two different versions.
urlpatterns = [
- url(r'^(?P{v1,v2})/users/$', users_list, name='users-list'),
- url(r'^(?P{v1,v2})/users/(?P[0-9]+)/$', users_detail, name='users-detail')
+ url(r'^(?P[v1|v2]+)/users/$', users_list, name='users-list'),
+ url(r'^(?P[v1|v2]+)/users/(?P[0-9]+)/$', users_detail, name='users-detail')
]
GET /1.0/something/ HTTP/1.1
diff --git a/rest_framework/views.py b/rest_framework/views.py
index ce2e74b3..56e3c4e4 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -2,20 +2,23 @@
Provides an APIView class that is the base of all views in REST framework.
"""
from __future__ import unicode_literals
+
from django.core.exceptions import PermissionDenied
+from django.db import models
from django.http import Http404
+from django.http.response import HttpResponseBase
from django.utils import six
from django.utils.encoding import smart_text
from django.utils.translation import ugettext_lazy as _
from django.views.decorators.csrf import csrf_exempt
-from rest_framework import status, exceptions
-from rest_framework.compat import HttpResponseBase, View, set_rollback
+from django.views.generic import View
+
+from rest_framework import exceptions, status
+from rest_framework.compat import set_rollback
from rest_framework.request import Request
from rest_framework.response import Response
from rest_framework.settings import api_settings
from rest_framework.utils import formatting
-import inspect
-import warnings
def get_view_name(view_cls, suffix=None):
@@ -115,8 +118,19 @@ class APIView(View):
This allows us to discover information about the view when we do URL
reverse lookups. Used for breadcrumb generation.
"""
+ if isinstance(getattr(cls, 'queryset', None), models.query.QuerySet):
+ def force_evaluation():
+ raise RuntimeError(
+ 'Do not evaluate the `.queryset` attribute directly, '
+ 'as the result will be cached and reused between requests. '
+ 'Use `.all()` or call `.get_queryset()` instead.'
+ )
+ cls.queryset._fetch_all = force_evaluation
+ cls.queryset._result_iter = force_evaluation # Django <= 1.5
+
view = super(APIView, cls).as_view(**initkwargs)
view.cls = cls
+
# Note: session based authentication is explicitly CSRF validated,
# all other authentication is CSRF exempt.
return csrf_exempt(view)
@@ -144,13 +158,13 @@ class APIView(View):
"""
raise exceptions.MethodNotAllowed(request.method)
- def permission_denied(self, request):
+ def permission_denied(self, request, message=None):
"""
If request is not permitted, determine what kind of exception to raise.
"""
if not request.successful_authenticator:
raise exceptions.NotAuthenticated()
- raise exceptions.PermissionDenied()
+ raise exceptions.PermissionDenied(detail=message)
def throttled(self, request, wait):
"""
@@ -302,7 +316,9 @@ class APIView(View):
"""
for permission in self.get_permissions():
if not permission.has_permission(request, self):
- self.permission_denied(request)
+ self.permission_denied(
+ request, message=getattr(permission, 'message', None)
+ )
def check_object_permissions(self, request, obj):
"""
@@ -311,7 +327,9 @@ class APIView(View):
"""
for permission in self.get_permissions():
if not permission.has_object_permission(request, self, obj):
- self.permission_denied(request)
+ self.permission_denied(
+ request, message=getattr(permission, 'message', None)
+ )
def check_throttles(self, request):
"""
@@ -409,16 +427,8 @@ class APIView(View):
exception_handler = self.settings.EXCEPTION_HANDLER
- if len(inspect.getargspec(exception_handler).args) == 1:
- warnings.warn(
- 'The `exception_handler(exc)` call signature is deprecated. '
- 'Use `exception_handler(exc, context) instead.',
- DeprecationWarning
- )
- response = exception_handler(exc)
- else:
- context = self.get_exception_handler_context()
- response = exception_handler(exc, context)
+ context = self.get_exception_handler_context()
+ response = exception_handler(exc, context)
if response is None:
raise
diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py
index 88c763da..05434b72 100644
--- a/rest_framework/viewsets.py
+++ b/rest_framework/viewsets.py
@@ -19,9 +19,11 @@ automatically.
from __future__ import unicode_literals
from functools import update_wrapper
+
from django.utils.decorators import classonlymethod
from django.views.decorators.csrf import csrf_exempt
-from rest_framework import views, generics, mixins
+
+from rest_framework import generics, mixins, views
class ViewSetMixin(object):
@@ -104,7 +106,14 @@ class ViewSetMixin(object):
depending on the request method.
"""
request = super(ViewSetMixin, self).initialize_request(request, *args, **kwargs)
- self.action = self.action_map.get(request.method.lower())
+ method = request.method.lower()
+ if method == 'options':
+ # This is a special case as we always provide handling for the
+ # options method in the base `View` class.
+ # Unlike the other explicitly defined actions, 'metadata' is implict.
+ self.action = 'metadata'
+ else:
+ self.action = self.action_map.get(method)
return request
diff --git a/runtests.py b/runtests.py
index 0008bfae..504cd1d3 100755
--- a/runtests.py
+++ b/runtests.py
@@ -1,19 +1,20 @@
#! /usr/bin/env python
from __future__ import print_function
-import pytest
-import sys
import os
import subprocess
+import sys
+import pytest
PYTEST_ARGS = {
- 'default': ['tests', '--tb=short'],
- 'fast': ['tests', '--tb=short', '-q'],
+ 'default': ['tests', '--tb=short', '-s'],
+ 'fast': ['tests', '--tb=short', '-q', '-s'],
}
FLAKE8_ARGS = ['rest_framework', 'tests', '--ignore=E501']
+ISORT_ARGS = ['--recursive', '--check-only', 'rest_framework', 'tests']
sys.path.append(os.path.dirname(__file__))
@@ -30,6 +31,18 @@ def flake8_main(args):
return ret
+def isort_main(args):
+ print('Running isort code checking')
+ ret = subprocess.call(['isort'] + args)
+
+ if ret:
+ print('isort failed: Some modules have incorrectly ordered imports. Fix by running `isort --recursive .`')
+ else:
+ print('isort passed')
+
+ return ret
+
+
def split_class_and_function(string):
class_string, function_string = string.split('.', 1)
return "%s and %s" % (class_string, function_string)
@@ -50,8 +63,10 @@ if __name__ == "__main__":
sys.argv.remove('--nolint')
except ValueError:
run_flake8 = True
+ run_isort = True
else:
run_flake8 = False
+ run_isort = False
try:
sys.argv.remove('--lintonly')
@@ -67,10 +82,23 @@ if __name__ == "__main__":
else:
style = 'fast'
run_flake8 = False
+ run_isort = False
if len(sys.argv) > 1:
pytest_args = sys.argv[1:]
first_arg = pytest_args[0]
+
+ try:
+ pytest_args.remove('--coverage')
+ except ValueError:
+ pass
+ else:
+ pytest_args = [
+ '--cov-report',
+ 'xml',
+ '--cov',
+ 'rest_framework'] + pytest_args
+
if first_arg.startswith('-'):
# `runtests.py [flags]`
pytest_args = ['tests'] + pytest_args
@@ -79,7 +107,7 @@ if __name__ == "__main__":
expression = split_class_and_function(first_arg)
pytest_args = ['tests', '-k', expression] + pytest_args[1:]
elif is_class(first_arg) or is_function(first_arg):
- # `runtests.py TestCase [flags]`
+ # `runtests.py TestCase [flags]`
# `runtests.py test_function [flags]`
pytest_args = ['tests', '-k', pytest_args[0]] + pytest_args[1:]
else:
@@ -87,5 +115,9 @@ if __name__ == "__main__":
if run_tests:
exit_on_failure(pytest.main(pytest_args))
+
if run_flake8:
exit_on_failure(flake8_main(FLAKE8_ARGS))
+
+ if run_isort:
+ exit_on_failure(isort_main(ISORT_ARGS))
diff --git a/setup.py b/setup.py
index 4cdcfa86..8e9d0a9a 100755
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,11 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+import os
+import re
+import shutil
+import sys
from setuptools import setup
-from setuptools.command.test import test as TestCommand
-import re
-import os
-import sys
def get_version(package):
@@ -56,6 +56,9 @@ if sys.argv[-1] == 'publish':
print("You probably want to also tag the version now:")
print(" git tag -a %s -m 'version %s'" % (version, version))
print(" git push --tags")
+ shutil.rmtree('dist')
+ shutil.rmtree('build')
+ shutil.rmtree('djangorestframework.egg-info')
sys.exit()
diff --git a/tests/browsable_api/auth_urls.py b/tests/browsable_api/auth_urls.py
index 97bc1036..0e937971 100644
--- a/tests/browsable_api/auth_urls.py
+++ b/tests/browsable_api/auth_urls.py
@@ -1,11 +1,10 @@
from __future__ import unicode_literals
-from django.conf.urls import patterns, url, include
+
+from django.conf.urls import include, url
from .views import MockView
-
-urlpatterns = patterns(
- '',
- (r'^$', MockView.as_view()),
+urlpatterns = [
+ url(r'^$', MockView.as_view()),
url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')),
-)
+]
diff --git a/tests/browsable_api/no_auth_urls.py b/tests/browsable_api/no_auth_urls.py
index 5e3604a6..5fc95c72 100644
--- a/tests/browsable_api/no_auth_urls.py
+++ b/tests/browsable_api/no_auth_urls.py
@@ -1,9 +1,9 @@
from __future__ import unicode_literals
-from django.conf.urls import patterns
+
+from django.conf.urls import url
from .views import MockView
-urlpatterns = patterns(
- '',
- (r'^$', MockView.as_view()),
-)
+urlpatterns = [
+ url(r'^$', MockView.as_view()),
+]
diff --git a/tests/browsable_api/test_browsable_api.py b/tests/browsable_api/test_browsable_api.py
index 5f264783..a9e14f67 100644
--- a/tests/browsable_api/test_browsable_api.py
+++ b/tests/browsable_api/test_browsable_api.py
@@ -1,4 +1,5 @@
from __future__ import unicode_literals
+
from django.contrib.auth.models import User
from django.test import TestCase
diff --git a/tests/browsable_api/test_browsable_nested_api.py b/tests/browsable_api/test_browsable_nested_api.py
new file mode 100644
index 00000000..dbbd11ee
--- /dev/null
+++ b/tests/browsable_api/test_browsable_nested_api.py
@@ -0,0 +1,42 @@
+from __future__ import unicode_literals
+
+from django.conf.urls import url
+from django.test import TestCase
+from django.test.utils import override_settings
+
+from rest_framework import serializers
+from rest_framework.generics import ListCreateAPIView
+from rest_framework.renderers import BrowsableAPIRenderer
+
+
+class NestedSerializer(serializers.Serializer):
+ one = serializers.IntegerField(max_value=10)
+ two = serializers.IntegerField(max_value=10)
+
+
+class TestNestedSerializerSerializer(serializers.Serializer):
+ nested = NestedSerializer()
+
+
+class NestedSerializersView(ListCreateAPIView):
+ renderer_classes = (BrowsableAPIRenderer, )
+ serializer_class = TestNestedSerializerSerializer
+ queryset = [{'nested': {'one': 1, 'two': 2}}]
+
+
+urlpatterns = [
+ url(r'^api/$', NestedSerializersView.as_view(), name='api'),
+]
+
+
+class DropdownWithAuthTests(TestCase):
+ """Tests correct dropdown behaviour with Auth views enabled."""
+
+ @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)
+ 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)
diff --git a/tests/browsable_api/views.py b/tests/browsable_api/views.py
index 000f4e80..cd020cd3 100644
--- a/tests/browsable_api/views.py
+++ b/tests/browsable_api/views.py
@@ -1,9 +1,8 @@
from __future__ import unicode_literals
-from rest_framework.views import APIView
-from rest_framework import authentication
-from rest_framework import renderers
+from rest_framework import authentication, renderers
from rest_framework.response import Response
+from rest_framework.views import APIView
class MockView(APIView):
diff --git a/tests/description.py b/tests/description.py
index b46d7f54..55a55a9f 100644
--- a/tests/description.py
+++ b/tests/description.py
@@ -8,7 +8,6 @@
from rest_framework.views import APIView
-
# test strings snatched from http://www.columbia.edu/~fdc/utf8/,
# http://winrus.com/utf8-jap.htm and memory
UTF8_TEST_DOCSTRING = (
diff --git a/tests/models.py b/tests/models.py
index 456b0a0b..c265182b 100644
--- a/tests/models.py
+++ b/tests/models.py
@@ -1,4 +1,5 @@
from __future__ import unicode_literals
+
from django.db import models
from django.utils.translation import ugettext_lazy as _
diff --git a/tests/test_atomic_requests.py b/tests/test_atomic_requests.py
index 9410fea5..8342ad3a 100644
--- a/tests/test_atomic_requests.py
+++ b/tests/test_atomic_requests.py
@@ -1,8 +1,13 @@
from __future__ import unicode_literals
+import unittest
+
+from django.conf.urls import url
from django.db import connection, connections, transaction
-from django.test import TestCase
-from django.utils.unittest import skipUnless
+from django.http import Http404
+from django.test import TestCase, TransactionTestCase
+from django.utils.decorators import method_decorator
+
from rest_framework import status
from rest_framework.exceptions import APIException
from rest_framework.response import Response
@@ -10,7 +15,6 @@ from rest_framework.test import APIRequestFactory
from rest_framework.views import APIView
from tests.models import BasicModel
-
factory = APIRequestFactory()
@@ -32,8 +36,10 @@ class APIExceptionView(APIView):
raise APIException
-@skipUnless(connection.features.uses_savepoints,
- "'atomic' requires transactions and savepoints.")
+@unittest.skipUnless(
+ connection.features.uses_savepoints,
+ "'atomic' requires transactions and savepoints."
+)
class DBTransactionTests(TestCase):
def setUp(self):
self.view = BasicView.as_view()
@@ -42,7 +48,7 @@ class DBTransactionTests(TestCase):
def tearDown(self):
connections.databases['default']['ATOMIC_REQUESTS'] = False
- def test_no_exception_conmmit_transaction(self):
+ def test_no_exception_commit_transaction(self):
request = factory.post('/')
with self.assertNumQueries(1):
@@ -52,8 +58,10 @@ class DBTransactionTests(TestCase):
assert BasicModel.objects.count() == 1
-@skipUnless(connection.features.uses_savepoints,
- "'atomic' requires transactions and savepoints.")
+@unittest.skipUnless(
+ connection.features.uses_savepoints,
+ "'atomic' requires transactions and savepoints."
+)
class DBTransactionErrorTests(TestCase):
def setUp(self):
self.view = ErrorView.as_view()
@@ -80,8 +88,10 @@ class DBTransactionErrorTests(TestCase):
assert BasicModel.objects.count() == 1
-@skipUnless(connection.features.uses_savepoints,
- "'atomic' requires transactions and savepoints.")
+@unittest.skipUnless(
+ connection.features.uses_savepoints,
+ "'atomic' requires transactions and savepoints."
+)
class DBTransactionAPIExceptionTests(TestCase):
def setUp(self):
self.view = APIExceptionView.as_view()
@@ -108,3 +118,38 @@ class DBTransactionAPIExceptionTests(TestCase):
self.assertEqual(response.status_code,
status.HTTP_500_INTERNAL_SERVER_ERROR)
assert BasicModel.objects.count() == 0
+
+
+@unittest.skipUnless(
+ connection.features.uses_savepoints,
+ "'atomic' requires transactions and savepoints."
+)
+class NonAtomicDBTransactionAPIExceptionTests(TransactionTestCase):
+ @property
+ def urls(self):
+ class NonAtomicAPIExceptionView(APIView):
+ @method_decorator(transaction.non_atomic_requests)
+ def dispatch(self, *args, **kwargs):
+ return super(NonAtomicAPIExceptionView, self).dispatch(*args, **kwargs)
+
+ def get(self, request, *args, **kwargs):
+ BasicModel.objects.all()
+ raise Http404
+
+ return (
+ url(r'^$', NonAtomicAPIExceptionView.as_view()),
+ )
+
+ def setUp(self):
+ connections.databases['default']['ATOMIC_REQUESTS'] = True
+
+ def tearDown(self):
+ connections.databases['default']['ATOMIC_REQUESTS'] = False
+
+ def test_api_exception_rollback_transaction_non_atomic_view(self):
+ response = self.client.get('/')
+
+ # 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)
diff --git a/tests/test_authentication.py b/tests/test_authentication.py
index 91e49f9d..91434124 100644
--- a/tests/test_authentication.py
+++ b/tests/test_authentication.py
@@ -1,25 +1,26 @@
+# coding: utf-8
+
from __future__ import unicode_literals
-from django.conf.urls import patterns, url, include
+
+import base64
+
+from django.conf.urls import include, url
from django.contrib.auth.models import User
from django.http import HttpResponse
from django.test import TestCase
from django.utils import six
-from rest_framework import HTTP_HEADER_ENCODING
-from rest_framework import exceptions
-from rest_framework import permissions
-from rest_framework import renderers
-from rest_framework.response import Response
-from rest_framework import status
+
+from rest_framework import (
+ HTTP_HEADER_ENCODING, exceptions, permissions, renderers, status
+)
from rest_framework.authentication import (
- BaseAuthentication,
- TokenAuthentication,
- BasicAuthentication,
- SessionAuthentication,
+ BaseAuthentication, BasicAuthentication, SessionAuthentication,
+ TokenAuthentication
)
from rest_framework.authtoken.models import Token
-from rest_framework.test import APIRequestFactory, APIClient
+from rest_framework.response import Response
+from rest_framework.test import APIClient, APIRequestFactory
from rest_framework.views import APIView
-import base64
factory = APIRequestFactory()
@@ -37,14 +38,13 @@ class MockView(APIView):
return HttpResponse({'a': 1, 'b': 2, 'c': 3})
-urlpatterns = patterns(
- '',
- (r'^session/$', MockView.as_view(authentication_classes=[SessionAuthentication])),
- (r'^basic/$', MockView.as_view(authentication_classes=[BasicAuthentication])),
- (r'^token/$', MockView.as_view(authentication_classes=[TokenAuthentication])),
- (r'^auth-token/$', 'rest_framework.authtoken.views.obtain_auth_token'),
- url(r'^auth/', include('rest_framework.urls', namespace='rest_framework'))
-)
+urlpatterns = [
+ url(r'^session/$', MockView.as_view(authentication_classes=[SessionAuthentication])),
+ url(r'^basic/$', MockView.as_view(authentication_classes=[BasicAuthentication])),
+ url(r'^token/$', MockView.as_view(authentication_classes=[TokenAuthentication])),
+ url(r'^auth-token/$', 'rest_framework.authtoken.views.obtain_auth_token'),
+ url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')),
+]
class BasicAuthTests(TestCase):
@@ -162,6 +162,12 @@ class TokenAuthTests(TestCase):
response = self.csrf_client.post('/token/', {'example': 'example'}, HTTP_AUTHORIZATION=auth)
self.assertEqual(response.status_code, status.HTTP_200_OK)
+ def test_fail_post_form_passing_invalid_token_auth(self):
+ # add an 'invalid' unicode character
+ auth = 'Token ' + self.key + "¸"
+ response = self.csrf_client.post('/token/', {'example': 'example'}, HTTP_AUTHORIZATION=auth)
+ self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
+
def test_post_json_passing_token_auth(self):
"""Ensure POSTing form over token auth with correct credentials passes and does not require CSRF"""
auth = "Token " + self.key
diff --git a/tests/test_bound_fields.py b/tests/test_bound_fields.py
index bfc54b23..f2fac8f0 100644
--- a/tests/test_bound_fields.py
+++ b/tests/test_bound_fields.py
@@ -45,6 +45,16 @@ class TestSimpleBoundField:
assert serializer['amount'].errors is None
assert serializer['amount'].name == 'amount'
+ def test_as_form_fields(self):
+ class ExampleSerializer(serializers.Serializer):
+ bool_field = serializers.BooleanField()
+ null_field = serializers.IntegerField(allow_null=True)
+
+ serializer = ExampleSerializer(data={'bool_field': False, 'null_field': None})
+ assert serializer.is_valid()
+ assert serializer['bool_field'].as_form_field().value == ''
+ assert serializer['null_field'].as_form_field().value == ''
+
class TestNestedBoundField:
def test_nested_empty_bound_field(self):
@@ -67,3 +77,53 @@ class TestNestedBoundField:
assert serializer['nested']['amount'].value is None
assert serializer['nested']['amount'].errors is None
assert serializer['nested']['amount'].name == 'nested.amount'
+
+ def test_as_form_fields(self):
+ class Nested(serializers.Serializer):
+ bool_field = serializers.BooleanField()
+ null_field = serializers.IntegerField(allow_null=True)
+
+ class ExampleSerializer(serializers.Serializer):
+ nested = Nested()
+
+ serializer = ExampleSerializer(data={'nested': {'bool_field': False, 'null_field': None}})
+ assert serializer.is_valid()
+ assert serializer['nested']['bool_field'].as_form_field().value == ''
+ assert serializer['nested']['null_field'].as_form_field().value == ''
+
+ def test_rendering_nested_fields_with_none_value(self):
+ from rest_framework.renderers import HTMLFormRenderer
+
+ class Nested1(serializers.Serializer):
+ text_field = serializers.CharField()
+
+ class Nested2(serializers.Serializer):
+ nested1 = Nested1(allow_null=True)
+ text_field = serializers.CharField()
+
+ class ExampleSerializer(serializers.Serializer):
+ nested2 = Nested2()
+
+ serializer = ExampleSerializer(data={'nested2': {'nested1': None, 'text_field': 'test'}})
+ assert serializer.is_valid()
+ renderer = HTMLFormRenderer()
+ for field in serializer:
+ rendered = renderer.render_field(field, {})
+ expected_packed = (
+ '
'
+ ''
+ '
+ {% if field.label %}
+
+ {% endif %}
+
+
+
+ {% if field.errors %}
+ {% for error in field.errors %}
+ {{ error }}
+ {% endfor %}
+ {% endif %}
+
+ {% if field.help_text %}
+ {{ field.help_text }}
+ {% endif %}
diff --git a/rest_framework/templates/rest_framework/vertical/list_fieldset.html b/rest_framework/templates/rest_framework/vertical/list_fieldset.html
index 82d7b5f4..f2b615fe 100644
--- a/rest_framework/templates/rest_framework/vertical/list_fieldset.html
+++ b/rest_framework/templates/rest_framework/vertical/list_fieldset.html
@@ -1,4 +1,9 @@
diff --git a/rest_framework/templates/rest_framework/vertical/radio.html b/rest_framework/templates/rest_framework/vertical/radio.html
index dea03e54..bfee4e92 100644
--- a/rest_framework/templates/rest_framework/vertical/radio.html
+++ b/rest_framework/templates/rest_framework/vertical/radio.html
@@ -2,46 +2,55 @@
{% trans "None" as none_choice %}
- {% if field.label %}
-
- {% endif %}
+ {% if field.label %}
+
+ {% endif %}
+
{% if style.inline %}
-
diff --git a/rest_framework/templates/rest_framework/vertical/select.html b/rest_framework/templates/rest_framework/vertical/select.html
index 1d1109f6..973efb67 100644
--- a/rest_framework/templates/rest_framework/vertical/select.html
+++ b/rest_framework/templates/rest_framework/vertical/select.html
@@ -1,19 +1,32 @@
+
{% else %}
- {% if field.allow_null or field.allow_blank %}
-
{% if field.allow_null or field.allow_blank %}
-
+
{% endif %}
+
{% for key, text in field.choices.items %}
-
+
{% endfor %}
-
+
-
-
- {% endif %}
- {% for key, text in field.choices.items %}
-
-
-
- {% endfor %}
+ {% if field.allow_null or field.allow_blank %}
+
+
+
+ {% endif %}
+
+ {% for key, text in field.choices.items %}
+
+
+
+ {% endfor %}
{% endif %}
+
{% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
+ {% for error in field.errors %}
+ {{ error }}
+ {% endfor %}
{% endif %}
+
{% if field.help_text %}
- {{ field.help_text }}
+ {{ field.help_text }}
{% endif %}
- {% if field.label %}
-
+ {% if field.label %}
+
+ {% endif %}
+
+
+
+ {% if field.errors %}
+ {% for error in field.errors %}
+ {{ error }}
+ {% endfor %}
+ {% endif %}
+
+ {% if field.help_text %}
+ {{ field.help_text }}
+ {% endif %}
diff --git a/rest_framework/templates/rest_framework/vertical/select_multiple.html b/rest_framework/templates/rest_framework/vertical/select_multiple.html
index 81b25c2a..dcbee2ed 100644
--- a/rest_framework/templates/rest_framework/vertical/select_multiple.html
+++ b/rest_framework/templates/rest_framework/vertical/select_multiple.html
@@ -2,20 +2,31 @@
{% trans "No items to select." as no_items %}
- {% if field.label %}
-
- {% endif %}
-
+ {% if field.label %}
+
+ {% endif %}
+
+
+
{% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
+ {% for error in field.errors %}{{ error }}{% endfor %}
{% endif %}
+
{% if field.help_text %}
- {{ field.help_text }}
+ {{ field.help_text }}
{% endif %}
diff --git a/rest_framework/templates/rest_framework/vertical/textarea.html b/rest_framework/templates/rest_framework/vertical/textarea.html
index 840ea853..93a27f92 100644
--- a/rest_framework/templates/rest_framework/vertical/textarea.html
+++ b/rest_framework/templates/rest_framework/vertical/textarea.html
@@ -1,12 +1,17 @@
- {% if field.label %}
-
- {% endif %}
-
- {% if field.errors %}
- {% for error in field.errors %}{{ error }}{% endfor %}
- {% endif %}
- {% if field.help_text %}
- {{ field.help_text }}
- {% endif %}
+ {% if field.label %}
+
+ {% endif %}
+
+
+
+ {% if field.errors %}
+ {% for error in field.errors %}{{ error }}{% endfor %}
+ {% endif %}
+
+ {% if field.help_text %}
+ {{ field.help_text }}
+ {% endif %}
diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py
index bf0dc7b8..05a7ce04 100644
--- a/rest_framework/templatetags/rest_framework.py
+++ b/rest_framework/templatetags/rest_framework.py
@@ -1,14 +1,18 @@
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
+
+import re
+
from django import template
-from django.core.urlresolvers import reverse, NoReverseMatch
+from django.core.urlresolvers import NoReverseMatch, reverse
+from django.template import loader
from django.utils import six
-from django.utils.encoding import iri_to_uri, force_text
-from django.utils.html import escape
+from django.utils.encoding import force_text, iri_to_uri
+from django.utils.html import escape, format_html, smart_urlquote
from django.utils.safestring import SafeData, mark_safe
-from django.utils.html import smart_urlquote
+
+from rest_framework.compat import template_render
from rest_framework.renderers import HTMLFormRenderer
from rest_framework.utils.urls import replace_query_param
-import re
register = template.Library()
@@ -22,8 +26,14 @@ def get_pagination_html(pager):
@register.simple_tag
-def render_field(field, style=None):
- style = style or {}
+def render_form(serializer, template_pack=None):
+ style = {'template_pack': template_pack} if template_pack else {}
+ renderer = HTMLFormRenderer()
+ return renderer.render(serializer.data, None, {'style': style})
+
+
+@register.simple_tag
+def render_field(field, style):
renderer = style.get('renderer', HTMLFormRenderer())
return renderer.render_field(field, style)
@@ -38,8 +48,10 @@ def optional_login(request):
except NoReverseMatch:
return ''
- snippet = "%s' % {True: 'true', False: 'false', None: 'null'}[value])
+ elif isinstance(value, list):
+ if any([isinstance(item, (list, dict)) for item in value]):
+ template = loader.get_template('rest_framework/admin/list_value.html')
+ else:
+ template = loader.get_template('rest_framework/admin/simple_list_value.html')
+ context = {'value': value}
+ return template_render(template, context)
+ elif isinstance(value, dict):
+ template = loader.get_template('rest_framework/admin/dict_value.html')
+ context = {'value': value}
+ return template_render(template, context)
+ elif isinstance(value, six.string_types):
+ if (
+ (value.startswith('http:') or value.startswith('https:')) and not
+ re.search(r'\s', value)
+ ):
+ return mark_safe('{value}'.format(value=escape(value)))
+ elif '@' in value and not re.search(r'\s', value):
+ return mark_safe('{value}'.format(value=escape(value)))
+ elif '\n' in value:
+ return mark_safe('%s' % escape(value)) + return six.text_type(value) + + +@register.filter +def add_nested_class(value): + if isinstance(value, dict): + return 'class=nested' + if isinstance(value, list) and any([isinstance(item, (list, dict)) for item in value]): + return 'class=nested' + return '' + + # Bunch of stuff cloned from urlize TRAILING_PUNCTUATION = ['.', ',', ':', ';', '.)', '"', "']", "'}", "'"] WRAPPING_PUNCTUATION = [('(', ')'), ('<', '>'), ('[', ']'), ('<', '>'), diff --git a/rest_framework/test.py b/rest_framework/test.py index a83d082a..e0670365 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -3,16 +3,18 @@ # Note that we import as `DjangoRequestFactory` and `DjangoClient` in order # to make it harder for the user to import the wrong thing without realizing. from __future__ import unicode_literals + import django from django.conf import settings -from django.test.client import Client as DjangoClient -from django.test.client import ClientHandler from django.test import testcases +from django.test.client import Client as DjangoClient +from django.test.client import RequestFactory as DjangoRequestFactory +from django.test.client import ClientHandler from django.utils import six +from django.utils.encoding import force_bytes from django.utils.http import urlencode + from rest_framework.settings import api_settings -from rest_framework.compat import RequestFactory as DjangoRequestFactory -from rest_framework.compat import force_bytes_or_smart_bytes def force_authenticate(request, user=None, token=None): @@ -45,7 +47,7 @@ class APIRequestFactory(DjangoRequestFactory): if content_type: # Content type specified explicitly, treat data as a raw bytestring - ret = force_bytes_or_smart_bytes(data, settings.DEFAULT_CHARSET) + ret = force_bytes(data, settings.DEFAULT_CHARSET) else: format = format or self.default_format diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py index 261fc246..abb35346 100644 --- a/rest_framework/throttling.py +++ b/rest_framework/throttling.py @@ -2,10 +2,13 @@ Provides various throttling policies. """ from __future__ import unicode_literals + +import time + from django.core.cache import cache as default_cache from django.core.exceptions import ImproperlyConfigured + from rest_framework.settings import api_settings -import time class BaseThrottle(object): diff --git a/rest_framework/urlpatterns.py b/rest_framework/urlpatterns.py index 038e9ee3..5347b3bc 100644 --- a/rest_framework/urlpatterns.py +++ b/rest_framework/urlpatterns.py @@ -1,6 +1,8 @@ from __future__ import unicode_literals -from django.conf.urls import url, include + +from django.conf.urls import include, url from django.core.urlresolvers import RegexURLResolver + from rest_framework.settings import api_settings @@ -21,7 +23,7 @@ def apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required): else: # Regular URL pattern - regex = urlpattern.regex.pattern.rstrip('$') + suffix_pattern + regex = urlpattern.regex.pattern.rstrip('$').rstrip('/') + suffix_pattern view = urlpattern._callback or urlpattern._callback_str kwargs = urlpattern.default_args name = urlpattern.name @@ -55,8 +57,8 @@ def format_suffix_patterns(urlpatterns, suffix_required=False, allowed=None): allowed_pattern = allowed[0] else: allowed_pattern = '(%s)' % '|'.join(allowed) - suffix_pattern = r'\.(?P<%s>%s)$' % (suffix_kwarg, allowed_pattern) + suffix_pattern = r'\.(?P<%s>%s)/?$' % (suffix_kwarg, allowed_pattern) else: - suffix_pattern = r'\.(?P<%s>[a-z0-9]+)$' % suffix_kwarg + suffix_pattern = r'\.(?P<%s>[a-z0-9]+)/?$' % suffix_kwarg return apply_suffix_patterns(urlpatterns, suffix_pattern, suffix_required) diff --git a/rest_framework/urls.py b/rest_framework/urls.py index cfcee534..bdc1d77d 100644 --- a/rest_framework/urls.py +++ b/rest_framework/urls.py @@ -4,23 +4,23 @@ Login and logout views for the browsable API. Add these to your root URLconf if you're using the browsable API and your API requires authentication: - urlpatterns = patterns('', + urlpatterns = [ ... url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')) - ) + ] -The urls must be namespaced as 'rest_framework', and you should make sure -your authentication settings include `SessionAuthentication`. +In Django versions older than 1.9, the urls must be namespaced as 'rest_framework', +and you should make sure your authentication settings include `SessionAuthentication`. """ from __future__ import unicode_literals -from django.conf.urls import patterns, url -from django.contrib.auth import views +from django.conf.urls import url +from django.contrib.auth import views template_name = {'template_name': 'rest_framework/login.html'} -urlpatterns = patterns( - '', +app_name = 'rest_framework' +urlpatterns = [ url(r'^login/$', views.login, template_name, name='login'), - url(r'^logout/$', views.logout, template_name, name='logout') -) + url(r'^logout/$', views.logout, template_name, name='logout'), +] diff --git a/rest_framework/utils/breadcrumbs.py b/rest_framework/utils/breadcrumbs.py index e6690d17..950e9695 100644 --- a/rest_framework/utils/breadcrumbs.py +++ b/rest_framework/utils/breadcrumbs.py @@ -1,13 +1,14 @@ from __future__ import unicode_literals -from django.core.urlresolvers import resolve, get_script_prefix + +from django.core.urlresolvers import get_script_prefix, resolve -def get_breadcrumbs(url): +def get_breadcrumbs(url, request=None): """ Given a url returns a list of breadcrumbs, which are each a tuple of (name, url). """ - + from rest_framework.reverse import preserve_builtin_query_params from rest_framework.settings import api_settings from rest_framework.views import APIView @@ -33,7 +34,8 @@ def get_breadcrumbs(url): if not seen or seen[-1] != view: suffix = getattr(view, 'suffix', None) name = view_name_func(cls, suffix) - breadcrumbs_list.insert(0, (name, prefix + url)) + insert_url = preserve_builtin_query_params(prefix + url, request) + breadcrumbs_list.insert(0, (name, insert_url)) seen.append(view) if url == '': diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py index 2160d18b..949c99ed 100644 --- a/rest_framework/utils/encoders.py +++ b/rest_framework/utils/encoders.py @@ -2,16 +2,19 @@ Helper classes for parsers. """ from __future__ import unicode_literals -from django.db.models.query import QuerySet -from django.utils import six, timezone -from django.utils.encoding import force_text -from django.utils.functional import Promise -from rest_framework.compat import total_seconds + import datetime import decimal import json import uuid +from django.db.models.query import QuerySet +from django.utils import six, timezone +from django.utils.encoding import force_text +from django.utils.functional import Promise + +from rest_framework.compat import total_seconds + class JSONEncoder(json.JSONEncoder): """ diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index c97ec5d0..1d8cb22f 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -2,13 +2,14 @@ Helper functions for mapping model fields to a dictionary of default keyword arguments that should be used for their equivelent serializer fields. """ +import inspect + from django.core import validators from django.db import models from django.utils.text import capfirst -from rest_framework.compat import clean_manytomany_helptext -from rest_framework.validators import UniqueValidator -import inspect +from rest_framework.compat import DecimalValidator +from rest_framework.validators import UniqueValidator NUMERIC_FIELD_TYPES = ( models.IntegerField, models.FloatField, models.DecimalField @@ -36,7 +37,7 @@ class ClassLookupDict(object): for cls in inspect.getmro(base_class): if cls in self.mapping: return self.mapping[cls] - raise KeyError('Class %s not found in lookup.', cls.__name__) + raise KeyError('Class %s not found in lookup.' % base_class.__name__) def __setitem__(self, key, value): self.mapping[key] = value @@ -102,19 +103,44 @@ def get_field_kwargs(field_name, model_field): if model_field.null and not isinstance(model_field, models.NullBooleanField): kwargs['allow_null'] = True - if model_field.blank: + if model_field.blank and (isinstance(model_field, models.CharField) or + isinstance(model_field, models.TextField)): kwargs['allow_blank'] = True - if model_field.flatchoices: + if isinstance(model_field, models.FilePathField): + kwargs['path'] = model_field.path + + if model_field.match is not None: + kwargs['match'] = model_field.match + + if model_field.recursive is not False: + kwargs['recursive'] = model_field.recursive + + if model_field.allow_files is not True: + kwargs['allow_files'] = model_field.allow_files + + if model_field.allow_folders is not False: + kwargs['allow_folders'] = model_field.allow_folders + + if model_field.choices: # If this model field contains choices, then return early. # Further keyword arguments are not valid. - kwargs['choices'] = model_field.flatchoices + kwargs['choices'] = model_field.choices return kwargs + # Our decimal validation is handled in the field code, not validator code. + # (In Django 1.9+ this differs from previous style) + if isinstance(model_field, models.DecimalField): + validator_kwarg = [ + validator for validator in validator_kwarg + if DecimalValidator and not isinstance(validator, DecimalValidator) + ] + # Ensure that max_length is passed explicitly as a keyword arg, # rather than as a validator. max_length = getattr(model_field, 'max_length', None) - if max_length is not None and isinstance(model_field, models.CharField): + if max_length is not None and (isinstance(model_field, models.CharField) or + isinstance(model_field, models.TextField)): kwargs['max_length'] = max_length validator_kwarg = [ validator for validator in validator_kwarg @@ -183,8 +209,23 @@ def get_field_kwargs(field_name, model_field): if validator is not validators.validate_slug ] + # IPAddressField do not need to include the 'validate_ipv46_address' argument, + if isinstance(model_field, models.GenericIPAddressField): + validator_kwarg = [ + validator for validator in validator_kwarg + if validator is not validators.validate_ipv46_address + ] + if getattr(model_field, 'unique', False): - validator = UniqueValidator(queryset=model_field.model._default_manager) + unique_error_message = model_field.error_messages.get('unique', None) + if unique_error_message: + unique_error_message = unique_error_message % { + 'model_name': model_field.model._meta.object_name, + 'field_label': model_field.verbose_name + } + validator = UniqueValidator( + queryset=model_field.model._default_manager, + message=unique_error_message) validator_kwarg.append(validator) if validator_kwarg: @@ -197,7 +238,7 @@ def get_relation_kwargs(field_name, relation_info): """ Creates a default instance of a flat relational field. """ - model_field, related_model, to_many, has_through_model = relation_info + model_field, related_model, to_many, to_field, has_through_model = relation_info kwargs = { 'queryset': related_model._default_manager, 'view_name': get_detail_view_name(related_model) @@ -206,6 +247,9 @@ def get_relation_kwargs(field_name, relation_info): if to_many: kwargs['many'] = True + if to_field: + kwargs['to_field'] = to_field + if has_through_model: kwargs['read_only'] = True kwargs.pop('queryset', None) @@ -213,7 +257,7 @@ def get_relation_kwargs(field_name, relation_info): if model_field: if model_field.verbose_name and needs_label(model_field, field_name): kwargs['label'] = capfirst(model_field.verbose_name) - help_text = clean_manytomany_helptext(model_field.help_text) + help_text = model_field.help_text if help_text: kwargs['help_text'] = help_text if not model_field.editable: @@ -223,7 +267,8 @@ def get_relation_kwargs(field_name, relation_info): # If this field is read-only, then return early. # No further keyword arguments are valid. return kwargs - if model_field.has_default() or model_field.null: + + if model_field.has_default() or model_field.blank or model_field.null: kwargs['required'] = False if model_field.null: kwargs['allow_null'] = True @@ -232,6 +277,8 @@ def get_relation_kwargs(field_name, relation_info): if getattr(model_field, 'unique', False): validator = UniqueValidator(queryset=model_field.model._default_manager) kwargs['validators'] = kwargs.get('validators', []) + [validator] + if to_many and not model_field.blank: + kwargs['allow_empty'] = False return kwargs diff --git a/rest_framework/utils/formatting.py b/rest_framework/utils/formatting.py index 8b6f005e..67aabd3f 100644 --- a/rest_framework/utils/formatting.py +++ b/rest_framework/utils/formatting.py @@ -2,10 +2,14 @@ Utility functions to return a formatted name and description for a given view. """ from __future__ import unicode_literals + +import re + +from django.utils.encoding import force_text from django.utils.html import escape from django.utils.safestring import mark_safe -from rest_framework.compat import apply_markdown, force_text -import re + +from rest_framework.compat import apply_markdown def remove_trailing_string(content, trailing): diff --git a/rest_framework/utils/html.py b/rest_framework/utils/html.py index d773952d..3b871027 100644 --- a/rest_framework/utils/html.py +++ b/rest_framework/utils/html.py @@ -2,6 +2,7 @@ Helpers for dealing with HTML input. """ import re + from django.utils.datastructures import MultiValueDict @@ -61,7 +62,7 @@ def parse_html_list(dictionary, prefix=''): return [ret[item] for item in sorted(ret.keys())] -def parse_html_dict(dictionary, prefix): +def parse_html_dict(dictionary, prefix=''): """ Used to support dictionary values in HTML forms. @@ -77,7 +78,7 @@ def parse_html_dict(dictionary, prefix): } } """ - ret = {} + ret = MultiValueDict() regex = re.compile(r'^%s\.(.+)$' % re.escape(prefix)) for field, value in dictionary.items(): match = regex.match(field) diff --git a/rest_framework/utils/mediatypes.py b/rest_framework/utils/mediatypes.py index de2931c2..def4b964 100644 --- a/rest_framework/utils/mediatypes.py +++ b/rest_framework/utils/mediatypes.py @@ -4,8 +4,10 @@ Handling of media types, as found in HTTP Content-Type and Accept headers. See http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7 """ from __future__ import unicode_literals + from django.http.multipartparser import parse_header from django.utils.encoding import python_2_unicode_compatible + from rest_framework import HTTP_HEADER_ENCODING diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py index 19f751b0..f151c6f3 100644 --- a/rest_framework/utils/model_meta.py +++ b/rest_framework/utils/model_meta.py @@ -5,13 +5,17 @@ relationships and their associated metadata. Usage: `get_field_info(model)` returns a `FieldInfo` instance. """ -from collections import namedtuple +import inspect +from collections import OrderedDict, namedtuple + +from django.apps import apps from django.core.exceptions import ImproperlyConfigured from django.db import models from django.utils import six -from rest_framework.compat import OrderedDict -import inspect +from rest_framework.compat import ( + get_all_related_many_to_many_objects, get_all_related_objects +) FieldInfo = namedtuple('FieldResult', [ 'pk', # Model field instance @@ -26,6 +30,7 @@ RelationInfo = namedtuple('RelationInfo', [ 'model_field', 'related_model', 'to_many', + 'to_field', 'has_through_model' ]) @@ -44,7 +49,7 @@ def _resolve_model(obj): """ if isinstance(obj, six.string_types) and len(obj.split('.')) == 2: app_name, model_name = obj.split('.') - resolved_model = models.get_model(app_name, model_name) + resolved_model = apps.get_model(app_name, model_name) if resolved_model is None: msg = "Django did not return a model for {0}.{1}" raise ImproperlyConfigured(msg.format(app_name, model_name)) @@ -90,6 +95,10 @@ def _get_fields(opts): return fields +def _get_to_field(field): + return getattr(field, 'to_fields', None) and field.to_fields[0] + + def _get_forward_relationships(opts): """ Returns an `OrderedDict` of field names to `RelationInfo`. @@ -100,6 +109,7 @@ def _get_forward_relationships(opts): model_field=field, related_model=_resolve_model(field.rel.to), to_many=False, + to_field=_get_to_field(field), has_through_model=False ) @@ -109,6 +119,8 @@ def _get_forward_relationships(opts): model_field=field, related_model=_resolve_model(field.rel.to), to_many=True, + # manytomany do not have to_fields + to_field=None, has_through_model=( not field.rel.through._meta.auto_created ) @@ -126,24 +138,27 @@ def _get_reverse_relationships(opts): # See: https://code.djangoproject.com/ticket/24208 reverse_relations = OrderedDict() - for relation in opts.get_all_related_objects(): + for relation in get_all_related_objects(opts): accessor_name = relation.get_accessor_name() related = getattr(relation, 'related_model', relation.model) reverse_relations[accessor_name] = RelationInfo( model_field=None, related_model=related, to_many=relation.field.rel.multiple, + to_field=_get_to_field(relation.field), has_through_model=False ) # Deal with reverse many-to-many relationships. - for relation in opts.get_all_related_many_to_many_objects(): + for relation in get_all_related_many_to_many_objects(opts): accessor_name = relation.get_accessor_name() related = getattr(relation, 'related_model', relation.model) reverse_relations[accessor_name] = RelationInfo( model_field=None, related_model=related, to_many=True, + # manytomany do not have to_fields + to_field=None, has_through_model=( (getattr(relation.field.rel, 'through', None) is not None) and not relation.field.rel.through._meta.auto_created diff --git a/rest_framework/utils/representation.py b/rest_framework/utils/representation.py index 1bfc64c1..49f829c1 100644 --- a/rest_framework/utils/representation.py +++ b/rest_framework/utils/representation.py @@ -3,11 +3,14 @@ Helper functions for creating user-friendly representations of serializer classes and serializer fields. """ from __future__ import unicode_literals + +import re + from django.db import models from django.utils.encoding import force_text from django.utils.functional import Promise + from rest_framework.compat import unicode_repr -import re def manager_repr(value): @@ -37,7 +40,7 @@ def smart_repr(value): #