Cleanups

7 files changed, 8 insertions, 58 deletions

diff --git a/hyperkitty/lib/__init__.py b/hyperkitty/lib/__init__.py
index ba83513..d9a24ff 100644
--- a/hyperkitty/lib/__init__.py
+++ b/hyperkitty/lib/__init__.py
@@ -23,9 +23,9 @@ import urllib
 from hashlib import md5
 import datetime
 
-from django.conf import settings
 from django.core.exceptions import SuspiciousOperation
 from django.core.mail import EmailMessage
+from mailmanclient import MailmanConnectionError
 
 from hyperkitty.lib import mailman
 
@@ -111,7 +111,7 @@ def post_to_list(request, mlist, subject, message, headers={}):
     # Check that the user is subscribed
     try:
         mailman.subscribe(mlist.name, request.user)
-    except mailman.MailmanConnectionError:
+    except MailmanConnectionError:
         raise PostingFailed("Can't connect to Mailman's REST server, "
                             "your message has not been sent.")
     # send the message
diff --git a/hyperkitty/templatetags/hk_generic.py b/hyperkitty/templatetags/hk_generic.py
index f117b60..07c1a77 100644
--- a/hyperkitty/templatetags/hk_generic.py
+++ b/hyperkitty/templatetags/hk_generic.py
@@ -151,7 +151,7 @@ def snip_quoted(content, quotemsg="...", autoescape=None):
     quoted = []
     current_quote = []
     current_quote_orig = []
-    lastline = None
+    #lastline = None
     for line in content.split("\n"):
         match = SNIPPED_RE.match(line)
         if match is not None:
@@ -166,7 +166,7 @@ def snip_quoted(content, quotemsg="...", autoescape=None):
                 quoted.append( (current_quote_orig[:], current_quote[:]) )
                 current_quote = []
                 current_quote_orig = []
-        lastline = line
+        #lastline = line
     for quote_orig, quote in quoted:
         replaced = ('<div class="quoted-switch"><a href="#">%s</a></div>' % quotemsg
                    +'<div class="quoted-text">'
diff --git a/hyperkitty/urls.py b/hyperkitty/urls.py
index 8956c6e..a640ae2 100644
--- a/hyperkitty/urls.py
+++ b/hyperkitty/urls.py
@@ -86,12 +86,6 @@ urlpatterns = patterns('hyperkitty.views',
     url(r'^list/(?P<mlist_fqdn>[^/@]+@[^/@]+)/tag/(?P<tag>.*)/$',
         'list.search_tag', name='search_tag'),
 
-    # Search
-    url(r'^list/(?P<mlist_fqdn>[^/@]+@[^/@]+)/search/(?P<target>.*)/(?P<keyword>.*)/$',
-        'list.search_keyword', name="search_keyword"),
-    url(r'^list/(?P<mlist_fqdn>[^/@]+@[^/@]+)/search/$',
-        'list.search', name="search_list"),
-
 
     # REST API
     url(r'^api/$', TemplateView.as_view(template_name="api.html")),
diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py
index e35b6eb..42edd49 100644
--- a/hyperkitty/views/accounts.py
+++ b/hyperkitty/views/accounts.py
@@ -31,8 +31,7 @@ from django.contrib.auth.models import User
 from django.contrib.auth.views import login as django_login_view
 from django.shortcuts import render, redirect
 from django.utils.http import is_safe_url
-from django.utils.translation import gettext as _
-from django.template import RequestContext, loader
+#from django.utils.translation import gettext as _
 from social_auth.backends import SocialAuthBackend
 
 from hyperkitty.models import UserProfile, Rating, Favorite, LastView
diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py
index ef01b65..f4f75dd 100644
--- a/hyperkitty/views/list.py
+++ b/hyperkitty/views/list.py
@@ -142,7 +142,6 @@ def _thread_list(request, mlist, threads, template_name='thread_list.html', extr
                 if thread.date_active > last_view_obj.view_date:
                     thread.unread = True
 
-    all_threads = threads
     paginator = Paginator(threads, 10)
     page_num = request.GET.get('page')
     try:
@@ -260,46 +259,6 @@ def overview(request, mlist_fqdn=None):
     return render(request, "recent_activities.html", context)
 
 
-def search(request, mlist_fqdn):
-    keyword = request.GET.get('keyword')
-    target = request.GET.get('target')
-    page = request.GET.get('page')
-    if keyword and target:
-        url = reverse('search_keyword',
-                      kwargs={'mlist_fqdn': mlist_fqdn,
-                              'target': target,
-                              'keyword': keyword})
-        if page:
-            url += '%s/' % page
-    else:
-        url = reverse('search_list', kwargs={"mlist_fqdn": mlist_fqdn})
-    return redirect(url)
-
-
-def search_keyword(request, mlist_fqdn, target, keyword, page=1):
-    store = get_store(request)
-    ## Should we remove the code below?
-    ## If urls.py does it job we should never need it
-    if not keyword:
-        keyword = request.GET.get('keyword')
-    if not target:
-        target = request.GET.get('target')
-    if not target:
-        target = 'Subject'
-    regex = '%%%s%%' % keyword
-    list_name = mlist_fqdn.split('@')[0]
-    if target.lower() == 'subjectcontent':
-        threads = store.search_content_subject(mlist_fqdn, keyword)
-    elif target.lower() == 'subject':
-        threads = store.search_subject(mlist_fqdn, keyword)
-    elif target.lower() == 'content':
-        threads = store.search_content(mlist_fqdn, keyword)
-    elif target.lower() == 'from':
-        threads = store.search_sender(mlist_fqdn, keyword)
-
-    return _search_results_page(request, mlist_fqdn, threads, 'Search', page)
-
-
 def search_tag(request, mlist_fqdn, tag):
     '''Returns threads having a particular tag'''
     store = get_store(request)
@@ -320,4 +279,3 @@ def search_tag(request, mlist_fqdn, tag):
         "no_results_text": "for this tag",
     }
     return _thread_list(request, mlist, threads, extra_context=extra_context)
-
diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index 2cf2f29..1e48eba 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -35,7 +35,7 @@ from django.contrib.auth.decorators import login_required
 from hyperkitty.lib import get_store, get_months, post_to_list, PostingFailed
 from hyperkitty.lib.voting import set_message_votes
 from hyperkitty.models import Rating
-from forms import SearchForm, ReplyForm, PostForm
+from forms import ReplyForm, PostForm
 
 
 def index(request, mlist_fqdn, message_id_hash):
@@ -43,7 +43,6 @@ def index(request, mlist_fqdn, message_id_hash):
     Displays a single message identified by its message_id_hash (derived from
     message_id)
     '''
-    search_form = SearchForm(auto_id=False)
     store = get_store(request)
     message = store.get_message_by_hash_from_list(mlist_fqdn, message_id_hash)
     if message is None:
diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py
index cc4e23a..22710d7 100644
--- a/hyperkitty/views/thread.py
+++ b/hyperkitty/views/thread.py
@@ -216,8 +216,8 @@ def add_tag(request, mlist_fqdn, threadid):
     # Now refresh the tag list
     tags = Tag.objects.filter(threadid=threadid, list_address=mlist_fqdn)
     FakeMList = namedtuple("MailingList", ["name"])
-    t = loader.get_template('threads/tags.html')
-    html = t.render(RequestContext(request, {
+    tpl = loader.get_template('threads/tags.html')
+    html = tpl.render(RequestContext(request, {
             "tags": tags,
             "mlist": FakeMList(name=mlist_fqdn)}))