From e40b8ee715356da51a8302294df91b94b3ce989d Mon Sep 17 00:00:00 2001 From: Ludwig Kraatz Date: Tue, 4 Dec 2012 17:25:25 +0100 Subject: [PATCH] polishing --- rest_framework/compat.py | 1 - rest_framework/fields.py | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index cadc2d2b6..09b763681 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -343,7 +343,6 @@ except ImportError: kw = dict((k, int(v)) for k, v in kw.iteritems() if v is not None) return datetime.datetime(**kw) - # Markdown is optional try: import markdown diff --git a/rest_framework/fields.py b/rest_framework/fields.py index c1d534046..8217dc3bf 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -562,8 +562,7 @@ class HyperlinkedRelatedField(RelatedField): return self.slug_field def to_native(self, obj): - view_name = self.view_name - + view_name = self.view_name request = self.context.get('request', None) format = self.format or self.context.get('format', None) pk = getattr(obj, 'pk', None) @@ -666,7 +665,7 @@ class HyperlinkedIdentityField(Field): self.pk_url_kwarg = kwargs.pop('pk_url_kwarg', self.pk_url_kwarg) self.slug_url_kwarg = kwargs.pop('slug_url_kwarg', default_slug_kwarg) - super(HyperlinkedIdentityField, self).__init__(*args, **kwargs) + super(HyperlinkedIdentityField, self).__init__(*args, **kwargs) def initialize(self, parent, field_name): super(HyperlinkedIdentityField, self).initialize(parent, field_name) @@ -681,8 +680,7 @@ class HyperlinkedIdentityField(Field): def field_to_native(self, obj, field_name): request = self.context.get('request', None) format = self.format or self.context.get('format', None) - view_name = self.view_name - + view_name = self.view_name kwargs = {self.pk_url_kwarg: obj.pk} try: return reverse(view_name, kwargs=kwargs, request=request, format=format)