diff options
| author | Tom Christie | 2012-10-04 21:36:40 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-10-04 21:36:40 +0100 |
| commit | cc0d2601b8dfdf3f5fcee8591540b9cb4b2f3e44 (patch) | |
| tree | 0033f774a05a2c018995375890d96344cf06e967 | |
| parent | c91d926b0664981de0fd239a4398dd71367a5911 (diff) | |
| download | django-rest-framework-cc0d2601b8dfdf3f5fcee8591540b9cb4b2f3e44.tar.bz2 | |
Minor fixes
| -rw-r--r-- | rest_framework/fields.py | 5 | ||||
| -rw-r--r-- | rest_framework/renderers.py | 2 |
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 = {} |
