remove rest of topik

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

diff --git a/panikweb/paniktags/templatetags/paniktags.py b/panikweb/paniktags/templatetags/paniktags.py
index 77bb5bd1d758aaf80f4fbb55e8944b13397f59aa..ffd377eca3f4bd1cc0bbbb71be94119b08ca3c88 100644 (file)
--- a/panikweb/paniktags/templatetags/paniktags.py
+++ b/panikweb/paniktags/templatetags/paniktags.py
@@ -3,21 +3,21 @@ import datetime
 import json
 import re
 import time
-import urlparse
-import urllib2
 import uuid
 
 from django import template
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.db.models.query import QuerySet
+from django.utils.encoding import force_text
+from django.utils.http import quote
+from django.utils.six.moves.urllib import parse as urlparse
+
 from datetime import datetime, timedelta
 
 from emissions.models import Emission, Episode, NewsItem, SoundFile, Focus
 from emissions.utils import period_program
 
-from panikombo.models import Topik
-
 from panikweb import utils
 from panikweb import search
 
@@ -128,8 +128,12 @@ def player(context):
     }
 
 @register.inclusion_tag('includes/metaNav.html', takes_context=True)
-def metanav(context, active=None):
-    request_path = context['request'].path
+def metanav(context):
+    try:
+        request_path = context['request'].path
+    except KeyError:
+        # a context without 'requests' may happen when rendering error pages
+        request_path = 'xxx'
     section = 'About'
     if request_path == '/':
         section = 'Home'
@@ -243,7 +247,7 @@ def remove_facet(facet_id, url, facet):
         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 unicode(re.sub(r'&page=\d+', '', url), 'utf-8')
+    return force_text(re.sub(r'&page=\d+', '', url), 'utf-8')
 
 @register.filter
 def remove_tag_facet(url, facet):
@@ -264,7 +268,7 @@ def remove_format_facet(url, facet):
 
 
 def append_facet(facet_id, url, facet):
-    facet = urllib2.quote(facet.encode('utf-8'), safe='')
+    facet = quote(facet.encode('utf-8'), safe='')
     if not '?' in url:
         url = url + '?'
     return re.sub(r'&page=\d+', '', url + '&selected_facets=%s_exact:%s' % (facet_id, facet))
@@ -352,16 +356,6 @@ def facet_tag(tag):
     return tag.name
 
 
-@register.filter
-def image_file(page):
-    try:
-        matching_topik = Topik.objects.get(page=page)
-        return matching_topik.image
-    except Topik.DoesNotExist:
-        pass
-    return None
-
-
 @register.filter
 def set_absolute_urls(text):
     text = text.replace('src="/', 'src="%s' % settings.WEBSITE_BASE_URL)