aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/fields.py5
-rw-r--r--rest_framework/renderers.py2
2 files changed, 2 insertions, 5 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 9dbc1194..be918235 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -319,7 +319,7 @@ class HyperlinkedRelatedField(RelatedField):
slug = getattr(obj, self.slug_field, None)
if not slug:
- raise ValidationError('Could not resolve URL for field using view name "%s"', view_name)
+ raise ValidationError('Could not resolve URL for field using view name "%s"' % view_name)
kwargs = {self.slug_url_kwarg: slug}
try:
@@ -374,9 +374,6 @@ class HyperlinkedIdentityField(Field):
"""
A field that represents the model's identity using a hyperlink.
"""
- def __init__(self, *args, **kwargs):
- pass
-
def field_to_native(self, obj, field_name):
request = self.context.get('request', None)
view_name = self.parent.opts.view_name
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 5bc5d5f8..e33fa30e 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -260,7 +260,7 @@ class DocumentingHTMLRenderer(BaseRenderer):
serializer = view.get_serializer(instance=obj)
for k, v in serializer.get_fields(True).items():
print k, v
- if v.readonly:
+ if getattr(v, 'readonly', True):
continue
kwargs = {}