From a5d7239c7a2be95816716997a8bbee7463a734ad Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Thu, 1 Aug 2013 12:18:57 +0200 Subject: Get the KittyStore using the settings object --- hyperkitty/archiver.py | 8 +++----- hyperkitty/lib/store.py | 8 ++------ hyperkitty/tests/test_views.py | 6 +++--- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/hyperkitty/archiver.py b/hyperkitty/archiver.py index a14e2ad..2732860 100644 --- a/hyperkitty/archiver.py +++ b/hyperkitty/archiver.py @@ -45,8 +45,7 @@ class Archiver(object): def __init__(self): self.store = None self.base_url = None - self.store_url = None - self.store_search_index = None + self.settings = None # will be filled by _load_conf() self._load_conf() def _load_conf(self): @@ -72,8 +71,7 @@ class Archiver(object): except ImportError: raise ImportError("Could not import Django's settings from %s" % settings_path) - self.store_url = settings.KITTYSTORE_URL - self.store_search_index = settings.KITTYSTORE_SEARCH_INDEX + self.settings = settings #if path_added: # sys.path.remove(settings_path) @@ -112,7 +110,7 @@ class Archiver(object): be calculated. """ if self.store is None: - self.store = get_store(self.store_url, search=self.store_search_index) + self.store = get_store(self.settings) msg.message_id_hash = self.store.add_to_list(mlist, msg) self.store.commit() # TODO: Update karma diff --git a/hyperkitty/lib/store.py b/hyperkitty/lib/store.py index 6af7344..400fb9a 100644 --- a/hyperkitty/lib/store.py +++ b/hyperkitty/lib/store.py @@ -51,9 +51,7 @@ class KittyStoreWSGIMiddleware(object): except AttributeError: environ['kittystore.store'] = \ self._local.__dict__.setdefault('store', - kittystore.get_store(settings.KITTYSTORE_URL, - settings.KITTYSTORE_SEARCH_INDEX, - settings.KITTYSTORE_DEBUG)) + kittystore.get_store(settings)) try: return self._app(environ, start_response) finally: @@ -77,9 +75,7 @@ class KittyStoreDjangoMiddleware(object): except AttributeError: request.environ['kittystore.store'] = \ self._local.__dict__.setdefault('store', - kittystore.get_store(settings.KITTYSTORE_URL, - settings.KITTYSTORE_SEARCH_INDEX, - settings.KITTYSTORE_DEBUG)) + kittystore.get_store(settings)) def process_response(self, request, response): if "kittystore.store" in request.environ: diff --git a/hyperkitty/tests/test_views.py b/hyperkitty/tests/test_views.py index bd672b2..fb3832c 100644 --- a/hyperkitty/tests/test_views.py +++ b/hyperkitty/tests/test_views.py @@ -33,7 +33,7 @@ from mailman.email.message import Message import kittystore from kittystore.utils import get_message_id_hash -from kittystore.test import FakeList +from kittystore.test import FakeList, SettingsModule from hyperkitty.models import Rating, LastView @@ -88,7 +88,7 @@ class LastViewsTestCase(TestCase): def setUp(self): self.user = User.objects.create_user('testuser', 'test@example.com', 'testPass') self.client.login(username='testuser', password='testPass') - store = kittystore.get_store("sqlite:", debug=False) + store = kittystore.get_store(SettingsModule(), debug=False) ml = FakeList("list@example.com") ml.subject_prefix = u"[example] " # Create 3 threads @@ -265,7 +265,7 @@ class ReattachTestCase(TestCase): self.user = User.objects.create_user('testuser', 'test@example.com', 'testPass') self.user.is_staff = True self.client.login(username='testuser', password='testPass') - self.store = kittystore.get_store("sqlite:", debug=False) + self.store = kittystore.get_store(SettingsModule(), debug=False) ml = FakeList("list@example.com") ml.subject_prefix = u"[example] " # Create 2 threads -- cgit