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

Merge pull request #171 from scfarley/master

Browse Source 
URLObject v2.0.0 changed its API
This commit is contained in:
Tom Christie 2012-02-20 11:55:54 -08:00
commit fb6df53394
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
djangorestframework/mixins.py
View File

@ -685,7 +685,7 @@ class PaginatorMixin(object):
""" """
Constructs a url used for getting the next/previous urls Constructs a url used for getting the next/previous urls
""" """
url = URLObject.parse(self.request.get_full_path()) url = URLObject(self.request.get_full_path())
url = url.set_query_param('page', page_number) url = url.set_query_param('page', page_number)
limit = self.get_limit() limit = self.get_limit()

3
djangorestframework/templatetags/add_query_param.py
View File

@ -4,8 +4,7 @@ register = Library()
def add_query_param(url, param): def add_query_param(url, param):
(key, sep, val) = param.partition('=') return unicode(URLObject(url).with_query(param))
return unicode(URLObject.parse(url) & (key, val))
register.filter('add_query_param', add_query_param) register.filter('add_query_param', add_query_param)