aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/mixins.py
diff options
context:
space:
mode:
authorSébastien Piquemal2012-01-31 23:21:55 +0200
committerSébastien Piquemal2012-01-31 23:21:55 +0200
commit279fa0d371b73974b87267edabe2a4f76a198ebb (patch)
tree28b3a7aa6d489ad1e93acb14c3e890c8733f85cf /djangorestframework/mixins.py
parent152c385f4de37558fe4e522abad5b97f0cf7ddce (diff)
parentb2fcfffb3bdaed89d39ee563c58dc0ede5e857ac (diff)
downloaddjango-rest-framework-279fa0d371b73974b87267edabe2a4f76a198ebb.tar.bz2
merge
Diffstat (limited to 'djangorestframework/mixins.py')
-rw-r--r--djangorestframework/mixins.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/djangorestframework/mixins.py b/djangorestframework/mixins.py
index e53f8e6a..afdf71ec 100644
--- a/djangorestframework/mixins.py
+++ b/djangorestframework/mixins.py
@@ -384,11 +384,6 @@ class ModelMixin(object):
if BaseRenderer._FORMAT_QUERY_PARAM in tmp:
del tmp[BaseRenderer._FORMAT_QUERY_PARAM]
- if args:
- # If we have any no kwargs then assume the last arg represents the
- # primrary key. Otherwise assume the kwargs uniquely identify the
- # model.
- tmp.update({'pk': args[-1]})
return Q(**tmp)
def get_instance_data(self, model, content, **kwargs):