encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-24 23:19:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
David Henderson 2012-12-14 08:32:15 +00:00
commit b1438d0deb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -6,8 +6,8 @@ python:
env: env:
- DJANGO=https://github.com/django/django/zipball/master - DJANGO=https://github.com/django/django/zipball/master
- DJANGO=django==1.4.1 --use-mirrors - DJANGO=django==1.4.3 --use-mirrors
- DJANGO=django==1.3.3 --use-mirrors - DJANGO=django==1.3.5 --use-mirrors
install: install:
- pip install $DJANGO - pip install $DJANGO

4
rest_framework/fields.py
View File

@ -581,7 +581,7 @@ class HyperlinkedRelatedField(RelatedField):
except: except:
pass pass
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)
def from_native(self, value): def from_native(self, value):
# Convert URL -> model instance pk # Convert URL -> model instance pk
@ -680,7 +680,7 @@ class HyperlinkedIdentityField(Field):
except: except:
pass pass
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)
##### Typed Fields ##### ##### Typed Fields #####