GET
- {% for media_type in resource.renderted_media_types %}
+ {% for media_type in resource.rendered_media_types %}
{% with resource.ACCEPT_QUERY_PARAM|add:"="|add:media_type as param %}
[
{{ media_type }}]
{% endwith %}
diff --git a/djangorestframework/tests/resource.py b/djangorestframework/tests/resource.py
new file mode 100644
index 000000000..0ed41951b
--- /dev/null
+++ b/djangorestframework/tests/resource.py
@@ -0,0 +1,31 @@
+"""Tests for the resource module"""
+from django.test import TestCase
+from djangorestframework.resource import _object_to_data
+
+import datetime
+import decimal
+
+class TestObjectToData(TestCase):
+ """Tests for the _object_to_data function"""
+
+ def test_decimal(self):
+ """Decimals need to be converted to a string representation."""
+ self.assertEquals(_object_to_data(decimal.Decimal('1.5')), '1.5')
+
+ def test_function(self):
+ """Functions with no arguments should be called."""
+ def foo():
+ return 1
+ self.assertEquals(_object_to_data(foo), 1)
+
+ def test_method(self):
+ """Methods with only a ``self`` argument should be called."""
+ class Foo(object):
+ def foo(self):
+ return 1
+ self.assertEquals(_object_to_data(Foo().foo), 1)
+
+ def test_datetime(self):
+ """datetime objects are left as-is."""
+ now = datetime.datetime.now()
+ self.assertEquals(_object_to_data(now), now)
\ No newline at end of file
diff --git a/djangorestframework/validators.py b/djangorestframework/validators.py
index d806a6146..bef85af77 100644
--- a/djangorestframework/validators.py
+++ b/djangorestframework/validators.py
@@ -31,20 +31,24 @@ class FormValidator(BaseValidator):
def validate(self, content):
- """Given some content as input return some cleaned, validated content.
+ """
+ Given some content as input return some cleaned, validated content.
Raises a ErrorResponse with status code 400 (Bad Request) on failure.
Validation is standard form validation, with an additional constraint that no extra unknown fields may be supplied.
On failure the ErrorResponse content is a dict which may contain 'errors' and 'field-errors' keys.
If the 'errors' key exists it is a list of strings of non-field errors.
- If the 'field-errors' key exists it is a dict of {field name as string: list of errors as strings}."""
+ If the 'field-errors' key exists it is a dict of {field name as string: list of errors as strings}.
+ """
return self._validate(content)
def _validate(self, content, allowed_extra_fields=()):
- """Wrapped by validate to hide the extra_fields option that the ModelValidatorMixin uses.
+ """
+ Wrapped by validate to hide the extra_fields option that the ModelValidatorMixin uses.
extra_fields is a list of fields which are not defined by the form, but which we still
- expect to see on the input."""
+ expect to see on the input.
+ """
bound_form = self.get_bound_form(content)
if bound_form is None:
@@ -138,7 +142,8 @@ class ModelFormValidator(FormValidator):
# TODO: test the different validation here to allow for get get_absolute_url to be supplied on input and not bork out
# TODO: be really strict on fields - check they match in the handler methods. (this isn't a validator thing tho.)
def validate(self, content):
- """Given some content as input return some cleaned, validated content.
+ """
+ Given some content as input return some cleaned, validated content.
Raises a ErrorResponse with status code 400 (Bad Request) on failure.
Validation is standard form or model form validation,
@@ -148,7 +153,8 @@ class ModelFormValidator(FormValidator):
On failure the ErrorResponse content is a dict which may contain 'errors' and 'field-errors' keys.
If the 'errors' key exists it is a list of strings of non-field errors.
- If the 'field-errors' key exists it is a dict of {field name as string: list of errors as strings}."""
+ If the 'field-errors' key exists it is a dict of {field name as string: list of errors as strings}.
+ """
return self._validate(content, allowed_extra_fields=self._property_fields_set)