encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-03 03:50:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Dictionary concatenation should now work with Python 3

Browse Source
This commit is contained in:
Bart Vandendriessche 2014-02-11 08:55:56 +01:00
parent 3a162b7e33
commit 2efa82d62b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest_framework/relations.py
View File

@ -363,7 +363,7 @@ class HyperlinkedRelatedField(RelatedField):
view_kwargs = self.context['view'].kwargs
lookup_field = getattr(obj, self.lookup_field)
kwargs = dict(view_kwargs.items() + {self.lookup_field: lookup_field}.items())
kwargs = dict(view_kwargs, **{self.lookup_field: lookup_field})
try:
return reverse(view_name, kwargs=kwargs, request=request, format=format)
@ -374,7 +374,7 @@ class HyperlinkedRelatedField(RelatedField):
# Only try pk if it has been explicitly set.
# Otherwise, the default `lookup_field = 'pk'` has us covered.
pk = obj.pk
kwargs = dict(view_kwargs.items() + {self.pk_url_kwarg: pk}.items())
kwargs = dict(view_kwargs, **{self.pk_url_kwarg: pk})
try:
return reverse(view_name, kwargs=kwargs, request=request, format=format)
@ -384,7 +384,7 @@ class HyperlinkedRelatedField(RelatedField):
slug = getattr(obj, self.slug_field, None)
if slug is not None:
# Only try slug if it corresponds to an attribute on the object.
kwargs = dict(view_kwargs.items() + {self.slug_url_kwarg: slug}.items())
kwargs = dict(view_kwargs, **{self.slug_url_kwarg: slug})
try:
ret = reverse(view_name, kwargs=kwargs, request=request, format=format)
@ -582,7 +582,7 @@ class HyperlinkedIdentityField(Field):
if self.context.get('view'):
view_kwargs = self.context['view'].kwargs
kwargs = dict(view_kwargs.items() + {self.lookup_field: lookup_field}.items())
kwargs = dict(view_kwargs, **{self.lookup_field: lookup_field})
try:
return reverse(view_name, kwargs=kwargs, request=request, format=format)
@ -592,7 +592,7 @@ class HyperlinkedIdentityField(Field):
if self.pk_url_kwarg != 'pk':
# Only try pk lookup if it has been explicitly set.
# Otherwise, the default `lookup_field = 'pk'` has us covered.
kwargs = dict(view_kwargs.items() + {self.pk_url_kwarg: obj.pk}.items())
kwargs = dict(view_kwargs, **{self.pk_url_kwarg: obj.pk})
try:
return reverse(view_name, kwargs=kwargs, request=request, format=format)
@ -602,7 +602,7 @@ class HyperlinkedIdentityField(Field):
slug = getattr(obj, self.slug_field, None)
if slug:
# Only use slug lookup if a slug field exists on the model
kwargs = dict(view_kwargs.items() + {self.slug_url_kwarg: slug}.items())
kwargs = dict(view_kwargs, **{self.slug_url_kwarg: slug})
try:
return reverse(view_name, kwargs=kwargs, request=request, format=format)