summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2015-07-08 10:58:07 +0100
committerLuke Plant <L.Plant.98@cantab.net>2015-07-08 11:07:52 +0100
commitf23656cd1a1bb675dd65ef6548117811f35d3388 (patch)
tree54aa875bf1dbf7015e1970a6fb2929621ee9a407
parent2baf6826c9e730e56363e2f812e521835d35a872 (diff)
downloaddjango-f23656cd1a1bb675dd65ef6548117811f35d3388.tar.gz
[1.7.x] Corrected example code for get_query_set upgrade in 1.6 release notes
The conditional setting of `get_query_set` is required for correct behaviour if running Django 1.8. The full gory details are here: http://lukeplant.me.uk/blog/posts/handling-django%27s-get_query_set-rename-is-hard/ Backport of f87e552d9842ff9591a9c51ebdb5f96e4dd54b00 from master
-rw-r--r--docs/releases/1.6.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index dc03d7a5a9..9549c19c70 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -1133,7 +1133,8 @@ a ``get_queryset_compat`` method as below and use it internally to your manager:
def get_queryset(self):
return YourCustomQuerySet() # for example
- get_query_set = get_queryset
+ if django.VERSION < (1, 6):
+ get_query_set = get_queryset
def active(self): # for example
return self.get_queryset_compat().filter(active=True)