summaryrefslogtreecommitdiffstats
path: root/hyperkitty/views
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2013-07-15 12:02:04 +0200
committerAurélien Bompard <aurelien@bompard.org>2013-07-15 12:02:04 +0200
commit1c0db6b8e3b262b9cdba6a32e71c9bbac8b5f7cc (patch)
tree54fecd587266ebac0efe2bd777d2fc2776fa092b /hyperkitty/views
parent1a339ac1f7dac6e63b83864b6421aed1b0fdde75 (diff)
downloadhyperkitty-1c0db6b8e3b262b9cdba6a32e71c9bbac8b5f7cc.tar.gz
hyperkitty-1c0db6b8e3b262b9cdba6a32e71c9bbac8b5f7cc.tar.xz
hyperkitty-1c0db6b8e3b262b9cdba6a32e71c9bbac8b5f7cc.zip
Cleanups in the lib/__init__.py file
Diffstat (limited to 'hyperkitty/views')
-rw-r--r--hyperkitty/views/accounts.py3
-rw-r--r--hyperkitty/views/list.py7
-rw-r--r--hyperkitty/views/message.py4
-rw-r--r--hyperkitty/views/search.py3
-rw-r--r--hyperkitty/views/thread.py4
5 files changed, 13 insertions, 8 deletions
diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py
index 3a91c3d..373390b 100644
--- a/hyperkitty/views/accounts.py
+++ b/hyperkitty/views/accounts.py
@@ -36,7 +36,8 @@ from social_auth.backends import SocialAuthBackend
from hyperkitty.models import UserProfile, Rating, Favorite, LastView
from hyperkitty.views.forms import RegistrationForm, UserProfileForm
-from hyperkitty.lib import get_store, FLASH_MESSAGES, paginate
+from hyperkitty.lib import get_store
+from hyperkitty.lib.view_helpers import FLASH_MESSAGES, paginate
logger = logging.getLogger(__name__)
diff --git a/hyperkitty/views/list.py b/hyperkitty/views/list.py
index 4857c27..89c113c 100644
--- a/hyperkitty/views/list.py
+++ b/hyperkitty/views/list.py
@@ -32,9 +32,10 @@ from django.utils.timezone import utc
from django.http import Http404
from hyperkitty.models import Tag, Favorite
-from hyperkitty.lib import get_months, get_store, get_display_dates, daterange
-from hyperkitty.lib import FLASH_MESSAGES, paginate, get_category_widget
-from hyperkitty.lib import is_thread_unread
+from hyperkitty.lib import get_store
+from hyperkitty.lib.view_helpers import FLASH_MESSAGES, paginate, \
+ get_category_widget, get_months, get_display_dates, daterange, \
+ is_thread_unread
from hyperkitty.lib.voting import get_votes, set_message_votes, set_thread_votes
diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py
index 66cc314..6e3a640 100644
--- a/hyperkitty/views/message.py
+++ b/hyperkitty/views/message.py
@@ -31,7 +31,9 @@ from django.core.exceptions import SuspiciousOperation
from django.template import RequestContext, loader
from django.contrib.auth.decorators import login_required
-from hyperkitty.lib import get_store, get_months, post_to_list, PostingFailed
+from hyperkitty.lib import get_store
+from hyperkitty.lib.view_helpers import get_months
+from hyperkitty.lib.posting import post_to_list, PostingFailed
from hyperkitty.lib.voting import set_message_votes
from hyperkitty.models import Rating
from forms import ReplyForm, PostForm
diff --git a/hyperkitty/views/search.py b/hyperkitty/views/search.py
index f143876..dbef37d 100644
--- a/hyperkitty/views/search.py
+++ b/hyperkitty/views/search.py
@@ -24,7 +24,8 @@ from django.shortcuts import render
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger, Page
from hyperkitty.models import Tag
-from hyperkitty.lib import get_store, paginate
+from hyperkitty.lib import get_store
+from hyperkitty.lib.view_helpers import paginate
from hyperkitty.lib.voting import get_votes, set_message_votes
from .list import _thread_list
diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py
index ecfd6eb..1098302 100644
--- a/hyperkitty/views/thread.py
+++ b/hyperkitty/views/thread.py
@@ -35,8 +35,8 @@ import robot_detection
from hyperkitty.models import Tag, Favorite, LastView, ThreadCategory
from hyperkitty.views.forms import AddTagForm, ReplyForm, CategoryForm
-from hyperkitty.lib import get_months, get_store, stripped_subject
-from hyperkitty.lib import get_category_widget
+from hyperkitty.lib import get_store, stripped_subject
+from hyperkitty.lib.view_helpers import get_months, get_category_widget
from hyperkitty.lib.voting import set_message_votes