diff --git a/src/postorius/forms.py b/src/postorius/forms.py index 58244e8..665d5ba 100644 --- a/src/postorius/forms.py +++ b/src/postorius/forms.py @@ -44,7 +44,6 @@ return result - class DomainNew(FieldsetForm): """ diff --git a/src/postorius/urls.py b/src/postorius/urls.py index 5c9a3cc..bb63702 100644 --- a/src/postorius/urls.py +++ b/src/postorius/urls.py @@ -17,13 +17,10 @@ # Postorius. If not, see . from django.conf.urls import * -from django.conf import settings -from django.conf.urls.static import static from django.contrib.auth.views import login as login_view from django.contrib.auth.views import logout as logout_view from postorius.views import * -from postorius.views.generic import * per_list_urlpatterns = patterns('postorius.views', diff --git a/src/postorius/utils.py b/src/postorius/utils.py index e07d9f0..0e3bb30 100644 --- a/src/postorius/utils.py +++ b/src/postorius/utils.py @@ -19,7 +19,7 @@ from django.conf import settings from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger -from django.shortcuts import render_to_response, redirect +from django.shortcuts import render_to_response from django.template import RequestContext from mailmanclient import Client from django.utils.translation import gettext as _ diff --git a/src/postorius/views/api.py b/src/postorius/views/api.py index c9516e5..bf167b4 100644 --- a/src/postorius/views/api.py +++ b/src/postorius/views/api.py @@ -17,34 +17,15 @@ # Postorius. If not, see . -import re -import sys import json import logging -from django.conf import settings -from django.contrib import messages -from django.contrib.auth import logout, authenticate, login -from django.contrib.auth.decorators import (login_required, - permission_required, - user_passes_test) -from django.contrib.auth.forms import AuthenticationForm -from django.contrib.auth.models import User -from django.core.urlresolvers import reverse -from django.http import HttpResponse, HttpResponseRedirect -from django.shortcuts import render_to_response, redirect -from django.template import Context, loader, RequestContext -from django.utils.decorators import method_decorator -from django.utils.translation import gettext as _ -from urllib2 import HTTPError + +from django.http import HttpResponse from postorius import utils -from postorius.models import (Domain, List, Member, MailmanUser, - MailmanApiError, Mailman404Error) -from postorius.forms import * from postorius.auth.decorators import * -from postorius.views.generic import MailingListView, MailmanUserView logger = logging.getLogger(__name__) diff --git a/src/postorius/views/domain.py b/src/postorius/views/domain.py index ff574ba..17f0b3b 100644 --- a/src/postorius/views/domain.py +++ b/src/postorius/views/domain.py @@ -17,31 +17,17 @@ # Postorius. If not, see . -import json - - -from django.conf import settings from django.contrib import messages -from django.contrib.auth import logout, authenticate, login -from django.contrib.auth.decorators import (login_required, - permission_required, - user_passes_test) -from django.contrib.auth.forms import (AuthenticationForm, PasswordResetForm, - SetPasswordForm, PasswordChangeForm) -from django.contrib.auth.models import User +from django.contrib.auth.decorators import login_required, user_passes_test from django.core.urlresolvers import reverse -from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response, redirect -from django.template import Context, loader, RequestContext -from django.utils.decorators import method_decorator +from django.template import RequestContext from django.utils.translation import gettext as _ try: from urllib2 import HTTPError except ImportError: from urllib.error import HTTPError from postorius import utils -from postorius.models import (Domain, List, Member, MailmanUser, - MailmanApiError, Mailman404Error) from postorius.forms import * from postorius.auth.decorators import * diff --git a/src/postorius/views/generic.py b/src/postorius/views/generic.py index 8391a09..6432bc5 100644 --- a/src/postorius/views/generic.py +++ b/src/postorius/views/generic.py @@ -17,13 +17,10 @@ # Postorius. If not, see . -from django.conf import settings -from django.shortcuts import render_to_response, redirect -from django.template import Context, loader, RequestContext -from django.views.generic import TemplateView, View -from postorius.models import (Domain, List, Member, MailmanUser, - MailmanApiError, Mailman404Error) +from django.views.generic import TemplateView + +from postorius.models import List, MailmanUser, MailmanApiError, Mailman404Error from postorius import utils diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py index 61e6a4a..b42ebcc 100644 --- a/src/postorius/views/list.py +++ b/src/postorius/views/list.py @@ -26,7 +26,6 @@ from django.core.urlresolvers import reverse from django.shortcuts import render, render_to_response, redirect from django.template import RequestContext -from django.core.validators import validate_email from django.core.exceptions import ValidationError from django.utils.decorators import method_decorator from django.utils.translation import gettext as _ @@ -34,8 +33,8 @@ from urllib2 import HTTPError except ImportError: from urllib.error import HTTPError + from postorius import utils -from postorius.models import (Domain, List, MailmanApiError) from postorius.forms import * from postorius.auth.decorators import * from postorius.views.generic import MailingListView diff --git a/src/postorius/views/user.py b/src/postorius/views/user.py index acc1d93..e82b16d 100644 --- a/src/postorius/views/user.py +++ b/src/postorius/views/user.py @@ -17,15 +17,9 @@ # Postorius. If not, see . -import logging - - from django.forms.formsets import formset_factory from django.contrib import messages -from django.contrib.auth import logout, authenticate, login -from django.contrib.auth.decorators import (login_required, - user_passes_test) -from django.contrib.auth.models import User +from django.contrib.auth.decorators import (login_required,user_passes_test) from django.shortcuts import render_to_response, redirect from django.template import RequestContext from django.utils.decorators import method_decorator @@ -37,9 +31,7 @@ from urllib.error import HTTPError from postorius import utils -from postorius.models import ( - MailmanUser, MailmanConnectionError, MailmanApiError, Mailman404Error, - AddressConfirmationProfile) +from postorius.models import MailmanConnectionError, AddressConfirmationProfile from postorius.forms import * from postorius.auth.decorators import * from postorius.views.generic import MailmanUserView