4 files changed, 11 insertions, 13 deletions

diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py
index 8825511..a8cae9b 100644
--- a/hyperkitty/views/list.py
+++ b/hyperkitty/views/list.py
@@ -16,11 +16,10 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, Invali
 from django.contrib.auth.decorators import (login_required,
                                             permission_required,
                                             user_passes_test)
-from kittystore import get_store
 
 from hyperkitty.models import Rating, Tag
 #from hyperkitty.lib.mockup import *
-from hyperkitty.lib import get_months
+from hyperkitty.lib import get_months, get_store
 from forms import *
 from hyperkitty.utils import log
 
@@ -69,7 +68,7 @@ def archives(request, mlist_fqdn, year=None, month=None, day=None):
 
     search_form = SearchForm(auto_id=False)
     t = loader.get_template('month_view.html')
-    store = get_store(settings.KITTYSTORE_URL)
+    store = get_store(request)
     threads = store.get_threads(mlist_fqdn, start=begin_date,
         end=end_date)
 
@@ -174,7 +173,7 @@ def list(request, mlist_fqdn=None):
     end_date = datetime(today.year, today.month, today.day)
     begin_date = end_date - timedelta(days=32)
 
-    store = get_store(settings.KITTYSTORE_URL)
+    store = get_store(request)
     threads = store.get_threads(list_name=mlist_fqdn, start=begin_date,
         end=end_date)
 
@@ -272,7 +271,7 @@ def _search_results_page(request, mlist_fqdn, threads, search_type,
     except (EmptyPage, InvalidPage):
         threads = paginator.page(paginator.num_pages)
 
-    store = get_store(settings.KITTYSTORE_URL)
+    store = get_store(request)
     cnt = 0
     for msg in threads.object_list:
         msg.email = msg.sender_email.strip()
@@ -318,7 +317,7 @@ def search(request, mlist_fqdn):
 def search_keyword(request, mlist_fqdn, target, keyword, page=1):
     ## Should we remove the code below? 
     ## If urls.py does it job we should never need it
-    store = get_store(settings.KITTYSTORE_URL)
+    store = get_store(request)
     if not keyword:
         keyword = request.GET.get('keyword')
     if not target:
diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index 86ae139..dd80709 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -9,10 +9,10 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, Invali
 from django.contrib.auth.decorators import (login_required,
                                             permission_required,
                                             user_passes_test)
-from kittystore import get_store
 
 from hyperkitty.models import Rating
 #from hyperkitty.lib.mockup import *
+from hyperkitty.lib import get_store
 from forms import *
 from hyperkitty.utils import log
 
@@ -26,7 +26,7 @@ def index (request, mlist_fqdn, hashid):
 
     search_form = SearchForm(auto_id=False)
     t = loader.get_template('message.html')
-    store = get_store(settings.KITTYSTORE_URL)
+    store = get_store(request)
     message = store.get_message_by_hash_from_list(mlist_fqdn, hashid)
     message.sender_email = message.sender_email.strip()
     # Extract all the votes for this message
diff --git a/hyperkitty/views/pages.py b/hyperkitty/views/pages.py
index a3de806..c9d6e19 100644
--- a/hyperkitty/views/pages.py
+++ b/hyperkitty/views/pages.py
@@ -17,10 +17,10 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, Invali
 from django.contrib.auth.decorators import (login_required,
                                             permission_required,
                                             user_passes_test)
-from kittystore import get_store
 
 from hyperkitty.models import Rating
 #from hyperkitty.lib.mockup import *
+from hyperkitty.lib import get_store
 from forms import *
 from hyperkitty.utils import log
 
@@ -31,7 +31,7 @@ def index(request):
     base_url = settings.MAILMAN_API_URL % {
         'username': settings.MAILMAN_USER, 'password': settings.MAILMAN_PASS}
 
-    store = get_store(settings.KITTYSTORE_URL)
+    store = get_store(request)
     list_data = store.get_list_names()
     log("warn", repr(list_data))
 
diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py
index bef9c40..b5bf80a 100644
--- a/hyperkitty/views/thread.py
+++ b/hyperkitty/views/thread.py
@@ -9,13 +9,12 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, Invali
 from django.contrib.auth.decorators import (login_required,
                                             permission_required,
                                             user_passes_test)
-from kittystore import get_store
 
 from hyperkitty.models import Rating, Tag
 #from hyperkitty.lib.mockup import *
 from forms import *
 from hyperkitty.utils import log
-from hyperkitty.lib import get_months
+from hyperkitty.lib import get_months, get_store
 
 
 
@@ -25,7 +24,7 @@ def thread_index (request, mlist_fqdn, threadid):
 
     search_form = SearchForm(auto_id=False)
     t = loader.get_template('thread.html')
-    store = get_store(settings.KITTYSTORE_URL)
+    store = get_store(request)
     messages = store.get_messages_in_thread(mlist_fqdn, threadid)
     #prev_thread = mongo.get_thread_name(list_name, int(threadid) - 1)
     prev_thread = []