encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-27 00:19:53 +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) kw = dict((k, int(v)) for k, v in kw.iteritems() if v is not None)
return datetime.datetime(**kw) return datetime.datetime(**kw)
# Markdown is optional # Markdown is optional
try: try:
import markdown import markdown

2
rest_framework/fields.py
View File

@ -563,7 +563,6 @@ class HyperlinkedRelatedField(RelatedField):
def to_native(self, obj): def to_native(self, obj):
view_name = self.view_name view_name = self.view_name
request = self.context.get('request', None) request = self.context.get('request', None)
format = self.format or self.context.get('format', None) format = self.format or self.context.get('format', None)
pk = getattr(obj, 'pk', None) pk = getattr(obj, 'pk', None)
@ -682,7 +681,6 @@ class HyperlinkedIdentityField(Field):
request = self.context.get('request', None) request = self.context.get('request', None)
format = self.format or self.context.get('format', 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} kwargs = {self.pk_url_kwarg: obj.pk}
try: try:
return reverse(view_name, kwargs=kwargs, request=request, format=format) return reverse(view_name, kwargs=kwargs, request=request, format=format)