encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-26 16:09:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

polishing

Browse Source
This commit is contained in:
Ludwig Kraatz 2012-12-04 17:25:25 +01:00
parent 2771b596d1
commit e40b8ee715
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rest_framework/compat.py
View File

@ -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

8
rest_framework/fields.py
View File

@ -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)