Merge pull request #171 from scfarley/master

URLObject v2.0.0 changed its API

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()

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)