From f1defc59ca7a7b15e17e8a59c72a726ae937d8e5 Mon Sep 17 00:00:00 2001 From: jordan Date: Fri, 15 Jul 2011 11:41:58 +0000 Subject: [PATCH] removing unused imports that confuse and reorganizing them in the views module git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1120 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/views/admin.py | 6 +++--- forum/views/auth.py | 31 +++++++++++++------------------ forum/views/commands.py | 10 ++++------ forum/views/decorators.py | 14 +++++++++----- forum/views/meta.py | 23 +++++++++++------------ forum/views/readers.py | 14 ++++---------- forum/views/users.py | 2 -- forum/views/writers.py | 6 ------ 8 files changed, 44 insertions(+), 62 deletions(-) diff --git a/forum/views/admin.py b/forum/views/admin.py index 6dffa51..c46bf1e 100644 --- a/forum/views/admin.py +++ b/forum/views/admin.py @@ -1,20 +1,20 @@ from datetime import datetime, timedelta -import os, time, csv, random +import time from django.shortcuts import render_to_response, get_object_or_404 from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect, HttpResponse, Http404 -from forum.http_responses import HttpResponseUnauthorized from django.template import RequestContext from django.utils.translation import ugettext as _ from django.utils import simplejson from django.db import models + +from forum.http_responses import HttpResponseUnauthorized from forum.settings.base import Setting from forum.forms import MaintenanceModeForm, PageForm, CreateUserForm from forum.settings.forms import SettingsSetForm from forum.utils import pagination, html from forum.utils.mail import send_template_email - from forum.models import Question, Answer, User, Node, Action, Page, NodeState, Tag from forum.models.node import NodeMetaClass from forum.actions import NewPageAction, EditPageAction, PublishAction, DeleteAction, UserJoinsAction, CloseAction diff --git a/forum/views/auth.py b/forum/views/auth.py index c0fecc1..c64aa1d 100644 --- a/forum/views/auth.py +++ b/forum/views/auth.py @@ -1,36 +1,31 @@ +# -*- coding: utf-8 -*- + +import datetime +import logging + from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext from django.core.urlresolvers import reverse -from forum.models import User from django.http import HttpResponseRedirect, Http404 -from forum.http_responses import HttpResponseUnauthorized from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ -from django.utils.http import urlquote_plus from django.utils.encoding import smart_unicode -from forum.views.decorators import login_required -from forum.modules import decorate from django.contrib.auth import login, logout -from django.http import get_host -from forum.actions import SuspendAction -from forum.utils import html -from forum import settings + from writers import manage_pending_data -import types -import datetime -import logging -from forum.forms import SimpleRegistrationForm, TemporaryLoginRequestForm, \ - ChangePasswordForm, SetPasswordForm +from forum.utils import html +from forum.views.decorators import login_required +from forum.modules import decorate +from forum.forms import SimpleRegistrationForm, TemporaryLoginRequestForm, ChangePasswordForm, SetPasswordForm +from forum.http_responses import HttpResponseUnauthorized from forum.utils.mail import send_template_email - from forum.authentication.base import InvalidAuthentication from forum.authentication import AUTH_PROVIDERS - -from forum.models import AuthKeyUserAssociation, ValidationHash, Question, Answer +from forum.models import User, AuthKeyUserAssociation, ValidationHash from forum.actions import UserJoinsAction +from forum import settings -from forum.settings import REP_GAIN_BY_EMAIL_VALIDATION from vars import ON_SIGNIN_SESSION_ATTR, PENDING_SUBMISSION_SESSION_ATTR def signin_page(request): diff --git a/forum/views/commands.py b/forum/views/commands.py index 0e01086..c4c0326 100644 --- a/forum/views/commands.py +++ b/forum/views/commands.py @@ -1,20 +1,18 @@ +# -*- coding: utf-8 -*- + import datetime import logging -from forum import settings from django.core.exceptions import ObjectDoesNotExist from django.core.urlresolvers import reverse from django.utils import simplejson from django.utils.encoding import smart_unicode from django.utils.translation import ungettext, ugettext as _ -from django.http import HttpResponse, HttpResponseRedirect, Http404 +from django.http import HttpResponse, Http404 from django.shortcuts import get_object_or_404, render_to_response -from django.template import RequestContext -from django.template.loader import render_to_string from forum.models import * -from forum.models.node import NodeMetaClass -from forum.utils.decorators import ajax_method, ajax_login_required +from forum.utils.decorators import ajax_login_required from forum.actions import * from forum.modules import decorate from forum import settings diff --git a/forum/views/decorators.py b/forum/views/decorators.py index 20eb45c..9cb8cbd 100644 --- a/forum/views/decorators.py +++ b/forum/views/decorators.py @@ -1,14 +1,18 @@ -from django.http import HttpResponse, HttpResponseRedirect, Http404 +# -*- coding: utf-8 -*- + +import logging + +from datetime import datetime + +from django.http import HttpResponse, HttpResponseRedirect from django.utils import simplejson -from django.core.paginator import Paginator, EmptyPage from django.shortcuts import render_to_response from django.core.urlresolvers import reverse from django.template import RequestContext -from django.utils.translation import ungettext, ugettext as _ +from django.utils.translation import ugettext as _ + from forum.modules import ui, decorate -from datetime import datetime, date from forum.settings import ONLINE_USERS -import logging def login_required(func, request, *args, **kwargs): if not request.user.is_authenticated(): diff --git a/forum/views/meta.py b/forum/views/meta.py index 8f924fe..f4f1a80 100644 --- a/forum/views/meta.py +++ b/forum/views/meta.py @@ -1,28 +1,27 @@ import os from itertools import groupby -from django.shortcuts import render_to_response, get_object_or_404 -from django.core.urlresolvers import reverse -from django.template import RequestContext, loader -from django.http import HttpResponseRedirect, HttpResponse, Http404 + +from django.shortcuts import render_to_response +from django.template import RequestContext +from django.http import HttpResponseRedirect, HttpResponse from django.views.static import serve -from forum import settings -from forum.modules import decorate from django.views.decorators.cache import cache_page +from django.utils.translation import ugettext as _ +from django.utils.safestring import mark_safe + +from forum import settings from forum.views.decorators import login_required from forum.forms import FeedbackForm -from django.core.urlresolvers import reverse -from django.utils.translation import ugettext as _ -from django.db.models import Count +from forum.modules import decorate from forum.forms import get_next_url from forum.models import Badge, Award, User, Page from forum.badges.base import BadgesMeta from forum.http_responses import HttpResponseNotFound, HttpResponseIntServerError -from forum import settings from forum.utils.mail import send_template_email -from django.utils.safestring import mark_safe from forum.templatetags.extra_filters import or_preview + import decorators -import re, sys, logging, traceback +import logging, traceback def favicon(request): return HttpResponseRedirect(str(settings.APP_FAVICON)) diff --git a/forum/views/readers.py b/forum/views/readers.py index 0f05d2f..d757e51 100644 --- a/forum/views/readers.py +++ b/forum/views/readers.py @@ -2,35 +2,29 @@ import datetime import logging from urllib import unquote -from forum import settings as django_settings from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponseRedirect, HttpResponse, Http404, HttpResponsePermanentRedirect +from django.http import HttpResponseRedirect, Http404, HttpResponsePermanentRedirect from django.core.paginator import Paginator, EmptyPage, InvalidPage from django.template import RequestContext from django import template from django.utils.html import * -from django.utils import simplejson -from django.utils.encoding import smart_unicode from django.db.models import Q, Count from django.utils.translation import ugettext as _ -from django.template.defaultfilters import slugify from django.core.urlresolvers import reverse -from django.utils.datastructures import SortedDict -from django.views.decorators.cache import cache_page -from django.utils.http import urlquote as django_urlquote from django.template.defaultfilters import slugify from django.utils.safestring import mark_safe -from forum.utils.html import sanitize_html, hyperlink +from forum import settings as django_settings +from forum.utils.html import hyperlink from forum.utils.diff import textDiff as htmldiff from forum.utils import pagination from forum.forms import * from forum.models import * -from forum.forms import get_next_url from forum.actions import QuestionViewAction from forum.http_responses import HttpResponseUnauthorized from forum.feed import RssQuestionFeed, RssAnswerFeed from forum.utils.pagination import generate_uri + import decorators class HottestQuestionsSort(pagination.SortBase): diff --git a/forum/views/users.py b/forum/views/users.py index 0eeb122..6686a26 100644 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -24,11 +24,9 @@ from forum.utils import pagination from forum.views.readers import QuestionListPaginatorContext, AnswerPaginatorContext from forum.settings import ONLINE_USERS -import bisect import time import datetime import decorators -import unicodedata class UserReputationSort(pagination.SimpleSort): def apply(self, objects): diff --git a/forum/views/writers.py b/forum/views/writers.py index 60fc30f..41a1320 100644 --- a/forum/views/writers.py +++ b/forum/views/writers.py @@ -1,7 +1,5 @@ # encoding:utf-8 import os.path -import time, datetime, random -import logging from django.views.decorators.csrf import csrf_exempt from django.core.files.storage import FileSystemStorage @@ -9,15 +7,11 @@ from django.shortcuts import render_to_response, get_object_or_404 from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.template import RequestContext from django.utils.html import * -from django.utils import simplejson from django.utils.translation import ugettext as _ -from django.core.urlresolvers import reverse -from django.core.exceptions import PermissionDenied from forum.actions import AskAction, AnswerAction, ReviseAction, RollbackAction, RetagAction, AnswerToQuestionAction, CommentToQuestionAction from forum.forms import * from forum.models import * -from forum.forms import get_next_url from forum.utils import html from forum.http_responses import HttpResponseUnauthorized -- 2.45.1