diff options
| author | Tom Christie | 2012-02-20 11:55:54 -0800 |
|---|---|---|
| committer | Tom Christie | 2012-02-20 11:55:54 -0800 |
| commit | fb6df53394a87f87df5bbc124cbd5236a6fa1501 (patch) | |
| tree | 6604a728f011f08961f9544f4008f4ce81d80e27 | |
| parent | 45cf5260acc4e03c6557367b5621f943d1b22d41 (diff) | |
| parent | 0954765e910ec9fb01f9ac0285a3a51cde586949 (diff) | |
| download | django-rest-framework-fb6df53394a87f87df5bbc124cbd5236a6fa1501.tar.bz2 | |
Merge pull request #171 from scfarley/master
URLObject v2.0.0 changed its API
| -rw-r--r-- | djangorestframework/mixins.py | 2 | ||||
| -rw-r--r-- | 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 cb0b913a..c10ac1ed 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 11709730..4cf0133b 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) |