From 0954765e910ec9fb01f9ac0285a3a51cde586949 Mon Sep 17 00:00:00 2001 From: "Sean C. Farley" Date: Mon, 20 Feb 2012 12:56:27 -0500 Subject: [PATCH] Chase changes to URLObject's API in v2.0.0 URLObject v2.0.0 removed parse() from its API. --- djangorestframework/mixins.py | 2 +- djangorestframework/templatetags/add_query_param.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/djangorestframework/mixins.py b/djangorestframework/mixins.py index cb0b913a7..c10ac1edc 100644 --- a/djangorestframework/mixins.py +++ b/djangorestframework/mixins.py @@ -685,7 +685,7 @@ class PaginatorMixin(object): """ 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) limit = self.get_limit() diff --git a/djangorestframework/templatetags/add_query_param.py b/djangorestframework/templatetags/add_query_param.py index 117097303..4cf0133be 100644 --- a/djangorestframework/templatetags/add_query_param.py +++ b/djangorestframework/templatetags/add_query_param.py @@ -4,8 +4,7 @@ register = Library() def add_query_param(url, param): - (key, sep, val) = param.partition('=') - return unicode(URLObject.parse(url) & (key, val)) + return unicode(URLObject(url).with_query(param)) register.filter('add_query_param', add_query_param)