diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-05-21 09:01:07 +0200 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-05-21 09:01:07 +0200 |
| commit | e446794664990c187804b720527b4897dd6bc884 (patch) | |
| tree | 52a9aba19e7f8ee36d67656a6e70d4003f2dd3b1 /hyperkitty | |
| parent | 7f9263cb285693a7516e9804221ca70e95409135 (diff) | |
| download | hyperkitty-e446794664990c187804b720527b4897dd6bc884.tar.gz hyperkitty-e446794664990c187804b720527b4897dd6bc884.tar.xz hyperkitty-e446794664990c187804b720527b4897dd6bc884.zip | |
Cleanup unused imports
Diffstat (limited to 'hyperkitty')
| -rw-r--r-- | hyperkitty/api.py | 6 | ||||
| -rw-r--r-- | hyperkitty/lib/mailman.py | 2 | ||||
| -rw-r--r-- | hyperkitty/middleware.py | 2 | ||||
| -rw-r--r-- | hyperkitty/models.py | 1 | ||||
| -rw-r--r-- | hyperkitty/tests/test_models.py | 3 | ||||
| -rw-r--r-- | hyperkitty/tests/test_views.py | 3 | ||||
| -rw-r--r-- | hyperkitty/urls.py | 3 | ||||
| -rw-r--r-- | hyperkitty/views/accounts.py | 2 | ||||
| -rw-r--r-- | hyperkitty/views/message.py | 1 | ||||
| -rw-r--r-- | hyperkitty/views/thread.py | 1 |
10 files changed, 5 insertions, 19 deletions
diff --git a/hyperkitty/api.py b/hyperkitty/api.py index f9f2f96..8b00e60 100644 --- a/hyperkitty/api.py +++ b/hyperkitty/api.py @@ -17,18 +17,12 @@ # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # -import json -import re - from rest_framework.views import APIView from rest_framework.response import Response from rest_framework import serializers from rest_framework.exceptions import ParseError -from django.conf.urls import url -from django.conf import settings from hyperkitty.lib import get_store -from kittystore.storm.model import Email, Thread class ListSerializer(serializers.Serializer): diff --git a/hyperkitty/lib/mailman.py b/hyperkitty/lib/mailman.py index 2bc245b..185f9b1 100644 --- a/hyperkitty/lib/mailman.py +++ b/hyperkitty/lib/mailman.py @@ -20,7 +20,7 @@ # from django.conf import settings -from mailmanclient import Client, MailmanConnectionError +from mailmanclient import Client def subscribe(list_address, user): diff --git a/hyperkitty/middleware.py b/hyperkitty/middleware.py index 5f43c40..a52aba2 100644 --- a/hyperkitty/middleware.py +++ b/hyperkitty/middleware.py @@ -35,7 +35,7 @@ class PaginationMiddleware(object): # http://stackoverflow.com/questions/2799450/django-https-for-just-login-page from django.conf import settings -from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect +from django.http import HttpResponsePermanentRedirect SSL = 'SSL' diff --git a/hyperkitty/models.py b/hyperkitty/models.py index 1184316..fff5637 100644 --- a/hyperkitty/models.py +++ b/hyperkitty/models.py @@ -21,7 +21,6 @@ from django.db import models from django.contrib.auth.models import User -from django.conf import settings from django.contrib import admin diff --git a/hyperkitty/tests/test_models.py b/hyperkitty/tests/test_models.py index 26c1c29..120e571 100644 --- a/hyperkitty/tests/test_models.py +++ b/hyperkitty/tests/test_models.py @@ -17,9 +17,8 @@ # HyperKitty. If not, see <http://www.gnu.org/licenses/>. # # Author: Aamir Khan <syst3m.w0rm@gmail.com> -# +# -import datetime from django.test import TestCase from hyperkitty.models import Rating, Tag diff --git a/hyperkitty/tests/test_views.py b/hyperkitty/tests/test_views.py index e7fd9b4..9351c30 100644 --- a/hyperkitty/tests/test_views.py +++ b/hyperkitty/tests/test_views.py @@ -21,9 +21,8 @@ # import datetime -import urllib -from mock import Mock, patch +from mock import Mock import django.utils.simplejson as json from django.test import TestCase diff --git a/hyperkitty/urls.py b/hyperkitty/urls.py index 336d84c..6a332c3 100644 --- a/hyperkitty/urls.py +++ b/hyperkitty/urls.py @@ -21,12 +21,10 @@ # from django.conf.urls import patterns, include, url -from django.conf import settings from django.views.generic.base import TemplateView from api import ListResource, EmailResource, ThreadResource, SearchResource from django.contrib.staticfiles.urls import staticfiles_urlpatterns -from django.contrib.auth.views import login as login_view from django.contrib.auth.views import logout as logout_view # Uncomment the next two lines to enable the admin: @@ -44,7 +42,6 @@ urlpatterns = patterns('hyperkitty.views', url(r'^lists-properties$', 'pages.list_properties', name='list_properties'), # Account - #url(r'^accounts/login/$', login_view, {'template_name': 'login.html', 'SSL': True}, name='user_login'), url(r'^accounts/login/$', 'accounts.login_view', {'template_name': 'login.html', 'SSL': True}, name='user_login'), url(r'^accounts/logout/$', logout_view, {'next_page': '/'}, name='user_logout'), url(r'^accounts/profile/$', 'accounts.user_profile', name='user_profile'), diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py index 70d7109..cd64cde 100644 --- a/hyperkitty/views/accounts.py +++ b/hyperkitty/views/accounts.py @@ -24,7 +24,7 @@ import logging from django.conf import settings from django.core.urlresolvers import reverse from django.core.exceptions import SuspiciousOperation -from django.contrib.auth import logout, authenticate, login, get_backends +from django.contrib.auth import authenticate, login, get_backends from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User from django.contrib.auth.views import login as django_login_view diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py index 25d1e6f..7508aa0 100644 --- a/hyperkitty/views/message.py +++ b/hyperkitty/views/message.py @@ -27,7 +27,6 @@ from collections import namedtuple import django.utils.simplejson as json from django.http import HttpResponse, Http404 from django.shortcuts import redirect, render -from django.conf import settings from django.core.urlresolvers import reverse from django.core.exceptions import SuspiciousOperation from django.template import RequestContext, loader diff --git a/hyperkitty/views/thread.py b/hyperkitty/views/thread.py index 87cd0ee..3694ae6 100644 --- a/hyperkitty/views/thread.py +++ b/hyperkitty/views/thread.py @@ -26,7 +26,6 @@ from collections import namedtuple import django.utils.simplejson as json from django.http import HttpResponse, Http404 -from django.conf import settings from django.template import RequestContext, loader from django.shortcuts import render from django.core.urlresolvers import reverse |
