misc: remove python2 encoding in facets query string manipulations

[panikweb.git] / panikweb / paniktags / templatetags / paniktags.py

diff --git a/panikweb/paniktags/templatetags/paniktags.py b/panikweb/paniktags/templatetags/paniktags.py
index 219295582b88c682f12f8adb1f356d61ff0f19c9..0ac4f3065faeb598049f614c136fea4f9d53f5f9 100644 (file)
--- a/panikweb/paniktags/templatetags/paniktags.py
+++ b/panikweb/paniktags/templatetags/paniktags.py
@@ -241,13 +241,13 @@ def replace ( string, args ):
 
 def remove_facet(facet_id, url, facet):
     scheme, netloc, path, query, fragment = list(urlparse.urlsplit(str(url)))
-    facet = '%s_exact:%s' % (facet_id, facet.encode('utf-8'))
+    facet = '%s_exact:%s' % (facet_id, facet)
     query_string = urlparse.parse_qsl(query)
     query_string = [x for x in query_string if not (
         x[0] == 'selected_facets' and x[1] == facet)]
     query = '&'.join(['%s=%s' % x for x in query_string])
     url = urlparse.urlunsplit([scheme, netloc, path, query, None])
-    return force_text(re.sub(r'&page=\d+', '', url), 'utf-8')
+    return re.sub(r'&page=\d+', '', url)
 
 @register.filter
 def remove_tag_facet(url, facet):
@@ -268,7 +268,7 @@ def remove_format_facet(url, facet):
 
 
 def append_facet(facet_id, url, facet):
-    facet = quote(facet.encode('utf-8'), safe='')
+    facet = quote(facet, safe='')
     if not '?' in url:
         url = url + '?'
     return re.sub(r'&page=\d+', '', url + '&selected_facets=%s_exact:%s' % (facet_id, facet))