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

diff --git a/forum/views/admin.py b/forum/views/admin.py
index 6dffa5120a9add77f5f1dc97d651da2512a14c08..c46bf1e50223e7f43da9f25b2223bba33847be96 100644 (file)
--- 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 c0fecc1d5c0a315cfde32af24a0ec85705fc4aeb..c64aa1d513428d387a20cf61090cd3160a934bb5 100644 (file)
--- 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 0e0108670a8cf016c17705509b3c910a197fd3e9..c4c0326e704f20651e1842371dff46251d860fb0 100644 (file)
--- 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 20eb45cbfb544c3dd76d0da8b5ef05f1c7324d81..9cb8cbd4ca08d622f0a3edb9f8cd18e1a4eae629 100644 (file)
--- a/forum/views/decorators.py
+++ b/forum/views/decorators.py
@@ -1,14 +1,18 @@
-from django.http import HttpResponse, HttpResponseRedirect, Http404\r
+# -*- coding: utf-8 -*-\r
+\r
+import logging\r
+\r
+from datetime import datetime\r
+\r
+from django.http import HttpResponse, HttpResponseRedirect\r
 from django.utils import simplejson\r
-from django.core.paginator import Paginator, EmptyPage\r
 from django.shortcuts import render_to_response\r
 from django.core.urlresolvers import reverse\r
 from django.template import RequestContext\r
-from django.utils.translation import ungettext, ugettext as _\r
+from django.utils.translation import ugettext as _\r
+\r
 from forum.modules import ui, decorate\r
-from datetime import datetime, date\r
 from forum.settings import ONLINE_USERS\r
-import logging\r
 \r
 def login_required(func, request, *args, **kwargs):\r
     if not request.user.is_authenticated():\r

diff --git a/forum/views/meta.py b/forum/views/meta.py
index 8f924feb02e8589ef740dc5ae42e0e3134583e9e..f4f1a80121c84e8091034ac53bc9ac8303b2246c 100644 (file)
--- 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 0f05d2fd291d8ac1eb8447992fab82e9a27ad301..d757e51da1bca65df3b3f35b23ba731840d3b90e 100644 (file)
--- 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 0eeb122d29e8ff74d47762d4da60e6db16717e29..6686a265d5f15c27e842aee008aa6ad12404cbfb 100644 (file)
--- 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\r
 from forum.settings import ONLINE_USERS\r
  \r
-import bisect\r
 import time\r
 import datetime\r
 import decorators\r
-import unicodedata\r
 \r
 class UserReputationSort(pagination.SimpleSort):\r
     def apply(self, objects):\r

diff --git a/forum/views/writers.py b/forum/views/writers.py
index 60fc30fe4dee2a8bffb9514fda264576af0b6d0b..41a1320012de0be60288981c0cb1e6e3f48473bc 100644 (file)
--- 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