diff options
-rw-r--r-- | hyperkitty/api.py | 4 | ||||
-rw-r--r-- | hyperkitty/models.py | 4 | ||||
-rw-r--r-- | hyperkitty/views/list.py | 5 | ||||
-rw-r--r-- | hyperkitty/views/message.py | 5 | ||||
-rw-r--r-- | hyperkitty/views/thread.py | 4 |
5 files changed, 10 insertions, 12 deletions
diff --git a/hyperkitty/api.py b/hyperkitty/api.py index 09fa240..81061fc 100644 --- a/hyperkitty/api.py +++ b/hyperkitty/api.py @@ -4,13 +4,13 @@ from djangorestframework.views import View from django.conf.urls.defaults import url from django.conf import settings from django.http import HttpResponseNotModified, HttpResponse -from kittystore.kittysastore import KittySAStore import json import re from hyperkitty.utils import log -STORE = KittySAStore(settings.KITTYSTORE_URL) +import kittystore +STORE = kittystore.get_store(settings.KITTYSTORE_URL) class EmailResource(View): diff --git a/hyperkitty/models.py b/hyperkitty/models.py index dc1bcb4..54ef688 100644 --- a/hyperkitty/models.py +++ b/hyperkitty/models.py @@ -23,11 +23,11 @@ from django.db import models from django.contrib.auth.models import User from django.conf import settings -from kittystore.kittysastore import KittySAStore from hyperkitty.utils import log -STORE = KittySAStore(settings.KITTYSTORE_URL) +import kittystore +STORE = kittystore.get_store(settings.KITTYSTORE_URL) class Rating(models.Model): diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py index 87dec29..26bdbf1 100644 --- a/hyperkitty/views/list.py +++ b/hyperkitty/views/list.py @@ -16,15 +16,14 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, Invali from django.contrib.auth.decorators import (login_required, permission_required, user_passes_test) -from kittystore.kittysastore import KittySAStore from hyperkitty.models import Rating, Tag from hyperkitty.lib.mockup import * from forms import * from hyperkitty.utils import log - -STORE = KittySAStore(settings.KITTYSTORE_URL) +import kittystore +STORE = kittystore.get_store(settings.KITTYSTORE_URL) # @TODO : Move this into settings.py diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py index 9feec6c..d193f2c 100644 --- a/hyperkitty/views/message.py +++ b/hyperkitty/views/message.py @@ -10,14 +10,13 @@ from django.contrib.auth.decorators import (login_required, permission_required, user_passes_test) -from kittystore.kittysastore import KittySAStore - from hyperkitty.models import Rating from hyperkitty.lib.mockup import * from forms import * from hyperkitty.utils import log -STORE = KittySAStore(settings.KITTYSTORE_URL) +import kittystore +STORE = kittystore.get_store(settings.KITTYSTORE_URL) def index (request, mlist_fqdn, messageid): diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py index 4cafa37..48eba09 100644 --- a/hyperkitty/views/thread.py +++ b/hyperkitty/views/thread.py @@ -7,14 +7,14 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, Invali from django.contrib.auth.decorators import (login_required, permission_required, user_passes_test) -from kittystore.kittysastore import KittySAStore from hyperkitty.models import Rating, Tag from hyperkitty.lib.mockup import * from forms import * from hyperkitty.utils import log -STORE = KittySAStore(settings.KITTYSTORE_URL) +import kittystore +STORE = kittystore.get_store(settings.KITTYSTORE_URL) |