From 756aa6ffbe71f387ae5fa2885dce893b075db9f2 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Wed, 1 Jan 2014 15:42:30 +0100 Subject: [PATCH] Clean up imports Remove unused imports and some other completely unused code. --- pgweb/contributors/views.py | 7 ++----- pgweb/core/admin.py | 3 --- pgweb/core/struct.py | 1 - pgweb/core/views.py | 2 +- pgweb/docs/struct.py | 2 -- pgweb/docs/views.py | 3 +-- pgweb/downloads/models.py | 1 - pgweb/downloads/struct.py | 6 ------ pgweb/downloads/views.py | 4 +--- pgweb/events/models.py | 2 -- pgweb/events/struct.py | 1 - pgweb/events/views.py | 3 +-- pgweb/featurematrix/admin.py | 1 - pgweb/featurematrix/struct.py | 2 -- pgweb/featurematrix/views.py | 1 - pgweb/legacyurl/models.py | 2 +- pgweb/legacyurl/views.py | 2 +- pgweb/lists/views.py | 6 ++---- pgweb/misc/models.py | 2 +- pgweb/misc/views.py | 4 ++-- pgweb/news/struct.py | 1 - pgweb/news/views.py | 3 +-- pgweb/profserv/models.py | 1 - pgweb/profserv/views.py | 6 ++---- pgweb/pugs/views.py | 1 - pgweb/pwn/struct.py | 6 ------ pgweb/pwn/views.py | 1 - pgweb/quotes/views.py | 2 +- pgweb/search/models.py | 2 +- pgweb/search/views.py | 5 ++--- pgweb/sponsors/views.py | 6 +----- pgweb/survey/models.py | 1 - pgweb/survey/views.py | 2 +- pgweb/util/middleware.py | 2 +- tools/communityauth/test_auth.py | 1 - tools/search/crawler/lib/parsers.py | 2 -- 36 files changed, 23 insertions(+), 74 deletions(-) diff --git a/pgweb/contributors/views.py b/pgweb/contributors/views.py index 7d8c628b..8cbac84c 100644 --- a/pgweb/contributors/views.py +++ b/pgweb/contributors/views.py @@ -1,11 +1,8 @@ -from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponse, Http404, HttpResponseRedirect -from django.template import TemplateDoesNotExist, loader, Context -from django.contrib.auth.decorators import login_required +from django.shortcuts import render_to_response from pgweb.util.contexts import NavContext -from models import Contributor, ContributorType +from models import ContributorType def completelist(request): contributortypes = list(ContributorType.objects.all()) diff --git a/pgweb/core/admin.py b/pgweb/core/admin.py index ff2c44b2..9a9c7957 100644 --- a/pgweb/core/admin.py +++ b/pgweb/core/admin.py @@ -1,7 +1,4 @@ from django.contrib import admin -from django import forms -from django.db import connection -from django.http import HttpResponseRedirect, HttpResponse from pgweb.core.models import * diff --git a/pgweb/core/struct.py b/pgweb/core/struct.py index 73ccf903..61eb3125 100644 --- a/pgweb/core/struct.py +++ b/pgweb/core/struct.py @@ -1,5 +1,4 @@ import os -from datetime import datetime def get_struct(): yield ('', None) diff --git a/pgweb/core/views.py b/pgweb/core/views.py index cdfa7ac9..826eae92 100644 --- a/pgweb/core/views.py +++ b/pgweb/core/views.py @@ -25,7 +25,7 @@ from pgweb.util.sitestruct import get_all_pages_struct from news.models import NewsArticle from events.models import Event from quotes.models import Quote -from models import Version, ImportedRSSFeed, ImportedRSSItem +from models import Version, ImportedRSSItem # models needed for the pieces on the community page from survey.models import Survey diff --git a/pgweb/docs/struct.py b/pgweb/docs/struct.py index d868b30c..022f8768 100644 --- a/pgweb/docs/struct.py +++ b/pgweb/docs/struct.py @@ -1,9 +1,7 @@ -from datetime import date from django.db import connection from core.models import Version def get_struct(): - now = date.today() currentversion = Version.objects.get(current=True) # Can't use a model here, because we don't (for some reason) have a diff --git a/pgweb/docs/views.py b/pgweb/docs/views.py index 647b54f7..7b30720d 100644 --- a/pgweb/docs/views.py +++ b/pgweb/docs/views.py @@ -1,6 +1,5 @@ from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponse, Http404, HttpResponseRedirect -from django.template import TemplateDoesNotExist, loader, Context +from django.http import HttpResponseRedirect from django.template.context import RequestContext from django.contrib.auth.decorators import login_required from django.db.models import Q diff --git a/pgweb/downloads/models.py b/pgweb/downloads/models.py index 2adaf74e..854534f1 100644 --- a/pgweb/downloads/models.py +++ b/pgweb/downloads/models.py @@ -1,5 +1,4 @@ from django.db import models -from django.contrib.auth.models import User from pgweb.util.bases import PgModel from pgweb.core.models import Organisation diff --git a/pgweb/downloads/struct.py b/pgweb/downloads/struct.py index 3d451dab..0f717f2e 100644 --- a/pgweb/downloads/struct.py +++ b/pgweb/downloads/struct.py @@ -1,9 +1,3 @@ -import os -import pickle -from datetime import date - -from django.conf import settings - from models import Category def get_struct(): diff --git a/pgweb/downloads/views.py b/pgweb/downloads/views.py index 2a0a03c3..5aa50c10 100644 --- a/pgweb/downloads/views.py +++ b/pgweb/downloads/views.py @@ -1,13 +1,11 @@ from django.shortcuts import render_to_response, get_object_or_404 from django.http import HttpResponse, Http404, HttpResponseRedirect -from django.template import TemplateDoesNotExist, loader, Context from django.contrib.auth.decorators import login_required from django.views.decorators.csrf import csrf_exempt -from django.db import connection, transaction +from django.db import transaction from django.conf import settings import os -from datetime import datetime import urlparse import cPickle as pickle diff --git a/pgweb/events/models.py b/pgweb/events/models.py index 43225340..088c2771 100644 --- a/pgweb/events/models.py +++ b/pgweb/events/models.py @@ -1,6 +1,4 @@ from django.db import models -from django.contrib.auth.models import User -from datetime import date from pgweb.util.bases import PgModel from core.models import Country, Language, Organisation diff --git a/pgweb/events/struct.py b/pgweb/events/struct.py index 1472c20b..7f6c08c1 100644 --- a/pgweb/events/struct.py +++ b/pgweb/events/struct.py @@ -1,4 +1,3 @@ -import os from datetime import date from models import Event diff --git a/pgweb/events/views.py b/pgweb/events/views.py index 7e44a0de..a93a1bcd 100644 --- a/pgweb/events/views.py +++ b/pgweb/events/views.py @@ -1,6 +1,5 @@ from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponse, Http404, HttpResponseRedirect -from django.template import TemplateDoesNotExist, loader, Context +from django.http import Http404 from django.contrib.auth.decorators import login_required from datetime import date diff --git a/pgweb/featurematrix/admin.py b/pgweb/featurematrix/admin.py index 7effca7a..6606f76c 100644 --- a/pgweb/featurematrix/admin.py +++ b/pgweb/featurematrix/admin.py @@ -1,5 +1,4 @@ from django.contrib import admin -from django import forms from models import * diff --git a/pgweb/featurematrix/struct.py b/pgweb/featurematrix/struct.py index a7f987d7..c3eef315 100644 --- a/pgweb/featurematrix/struct.py +++ b/pgweb/featurematrix/struct.py @@ -1,4 +1,2 @@ -from datetime import date - def get_struct(): yield ('about/featurematrix/', None) diff --git a/pgweb/featurematrix/views.py b/pgweb/featurematrix/views.py index b4e33275..72efe073 100644 --- a/pgweb/featurematrix/views.py +++ b/pgweb/featurematrix/views.py @@ -1,5 +1,4 @@ from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponseRedirect, HttpResponse, Http404 from pgweb.util.contexts import NavContext diff --git a/pgweb/legacyurl/models.py b/pgweb/legacyurl/models.py index 71a83623..54f60fe2 100644 --- a/pgweb/legacyurl/models.py +++ b/pgweb/legacyurl/models.py @@ -1,3 +1,3 @@ -from django.db import models +#from django.db import models # Create your models here. diff --git a/pgweb/legacyurl/views.py b/pgweb/legacyurl/views.py index d9180481..28b38f39 100644 --- a/pgweb/legacyurl/views.py +++ b/pgweb/legacyurl/views.py @@ -1,4 +1,4 @@ -from django.http import HttpResponse, Http404, HttpResponseRedirect +from django.http import HttpResponseRedirect def presskit(request, version, language): return HttpResponseRedirect("/about/press/presskit%s/%s/" % ( diff --git a/pgweb/lists/views.py b/pgweb/lists/views.py index f766ac11..68de88f8 100644 --- a/pgweb/lists/views.py +++ b/pgweb/lists/views.py @@ -1,8 +1,6 @@ -from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponse, Http404, HttpResponseRedirect -from django.template import TemplateDoesNotExist, loader, Context +from django.shortcuts import render_to_response +from django.http import HttpResponse from django.views.decorators.csrf import csrf_exempt -from django.contrib.auth.decorators import login_required from django.conf import settings from email.mime.text import MIMEText diff --git a/pgweb/misc/models.py b/pgweb/misc/models.py index 71a83623..54f60fe2 100644 --- a/pgweb/misc/models.py +++ b/pgweb/misc/models.py @@ -1,3 +1,3 @@ -from django.db import models +#from django.db import models # Create your models here. diff --git a/pgweb/misc/views.py b/pgweb/misc/views.py index f1775cf2..4cfed8b2 100644 --- a/pgweb/misc/views.py +++ b/pgweb/misc/views.py @@ -1,5 +1,5 @@ -from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponseRedirect, HttpResponse, Http404 +from django.shortcuts import render_to_response +from django.http import HttpResponse from django.views.decorators.csrf import csrf_exempt from django.db import connection from django.conf import settings diff --git a/pgweb/news/struct.py b/pgweb/news/struct.py index e1112aa5..2c06c874 100644 --- a/pgweb/news/struct.py +++ b/pgweb/news/struct.py @@ -1,4 +1,3 @@ -import os from datetime import date, timedelta from models import NewsArticle diff --git a/pgweb/news/views.py b/pgweb/news/views.py index a7789a63..0ee7d77d 100644 --- a/pgweb/news/views.py +++ b/pgweb/news/views.py @@ -1,6 +1,5 @@ from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponse, Http404, HttpResponseRedirect -from django.template import TemplateDoesNotExist, loader, Context +from django.http import Http404 from django.contrib.auth.decorators import login_required from pgweb.util.decorators import ssl_required diff --git a/pgweb/profserv/models.py b/pgweb/profserv/models.py index 9946925e..ee4202e8 100644 --- a/pgweb/profserv/models.py +++ b/pgweb/profserv/models.py @@ -1,5 +1,4 @@ from django.db import models -from django.contrib.auth.models import User from pgweb.core.models import Organisation from pgweb.util.bases import PgModel diff --git a/pgweb/profserv/views.py b/pgweb/profserv/views.py index 595309ed..572f43ae 100644 --- a/pgweb/profserv/views.py +++ b/pgweb/profserv/views.py @@ -1,8 +1,6 @@ -from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponse, Http404, HttpResponseRedirect -from django.template import TemplateDoesNotExist, loader, Context +from django.shortcuts import render_to_response +from django.http import Http404 from django.contrib.auth.decorators import login_required -from django.db.models import Q from pgweb.util.decorators import ssl_required from pgweb.util.contexts import NavContext diff --git a/pgweb/pugs/views.py b/pgweb/pugs/views.py index 47bd6cae..858caac3 100644 --- a/pgweb/pugs/views.py +++ b/pgweb/pugs/views.py @@ -1,6 +1,5 @@ from django.shortcuts import render_to_response -from pgweb.util.decorators import cache from pgweb.util.contexts import NavContext from models import PUG diff --git a/pgweb/pwn/struct.py b/pgweb/pwn/struct.py index e00a1408..77b52dbf 100644 --- a/pgweb/pwn/struct.py +++ b/pgweb/pwn/struct.py @@ -1,8 +1,2 @@ -import os -from datetime import date -from models import PwnPost - def get_struct(): - now = date.today() - yield ('community/weeklynews/', None) diff --git a/pgweb/pwn/views.py b/pgweb/pwn/views.py index 4dc69265..82d1d4be 100644 --- a/pgweb/pwn/views.py +++ b/pgweb/pwn/views.py @@ -1,5 +1,4 @@ from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponse, Http404, HttpResponseRedirect from pgweb.util.contexts import NavContext diff --git a/pgweb/quotes/views.py b/pgweb/quotes/views.py index 8ba62005..41432fda 100644 --- a/pgweb/quotes/views.py +++ b/pgweb/quotes/views.py @@ -1,4 +1,4 @@ -from django.shortcuts import render_to_response, get_object_or_404 +from django.shortcuts import render_to_response from pgweb.util.contexts import NavContext diff --git a/pgweb/search/models.py b/pgweb/search/models.py index beeb3082..fe5cb304 100644 --- a/pgweb/search/models.py +++ b/pgweb/search/models.py @@ -1,2 +1,2 @@ -from django.db import models +#from django.db import models diff --git a/pgweb/search/views.py b/pgweb/search/views.py index 1b282893..46cad38d 100644 --- a/pgweb/search/views.py +++ b/pgweb/search/views.py @@ -1,12 +1,11 @@ -from django.shortcuts import render_to_response, get_object_or_404 +from django.shortcuts import render_to_response from django.template.context import RequestContext -from django.http import HttpResponse, Http404, HttpResponseRedirect +from django.http import HttpResponseRedirect from django.views.decorators.csrf import csrf_exempt from django.conf import settings from pgweb.util.decorators import cache -import datetime import httplib import urllib import psycopg2 diff --git a/pgweb/sponsors/views.py b/pgweb/sponsors/views.py index 7d25f36e..b708a2c2 100644 --- a/pgweb/sponsors/views.py +++ b/pgweb/sponsors/views.py @@ -1,10 +1,6 @@ -from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponse, Http404, HttpResponseRedirect -from django.template import TemplateDoesNotExist, loader, Context -from django.contrib.auth.decorators import login_required +from django.shortcuts import render_to_response from pgweb.util.contexts import NavContext -from pgweb.util.helpers import simple_form from pgweb.util.decorators import cache from models import Sponsor, Server diff --git a/pgweb/survey/models.py b/pgweb/survey/models.py index 6fb6b934..26346428 100644 --- a/pgweb/survey/models.py +++ b/pgweb/survey/models.py @@ -1,5 +1,4 @@ from django.db import models -from django.contrib.auth.models import User from pgweb.util.bases import PgModel diff --git a/pgweb/survey/views.py b/pgweb/survey/views.py index 5a28ee94..991801ac 100644 --- a/pgweb/survey/views.py +++ b/pgweb/survey/views.py @@ -1,5 +1,5 @@ from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponse, Http404, HttpResponseRedirect +from django.http import HttpResponseRedirect from django.db import connection, transaction from django.template.defaultfilters import slugify from django.views.decorators.csrf import csrf_exempt diff --git a/pgweb/util/middleware.py b/pgweb/util/middleware.py index a8be133f..5d970c0a 100644 --- a/pgweb/util/middleware.py +++ b/pgweb/util/middleware.py @@ -1,4 +1,4 @@ -from django.http import HttpResponseRedirect, HttpResponse +from django.http import HttpResponseRedirect from django.conf import settings # Use thread local storage to pass the username down. diff --git a/tools/communityauth/test_auth.py b/tools/communityauth/test_auth.py index cefc0635..b003b4e6 100755 --- a/tools/communityauth/test_auth.py +++ b/tools/communityauth/test_auth.py @@ -8,7 +8,6 @@ import sys from Crypto import Random from Crypto.Cipher import AES -from urllib import quote_plus import base64 import time import urllib diff --git a/tools/search/crawler/lib/parsers.py b/tools/search/crawler/lib/parsers.py index 87aeb84d..ef59cadb 100644 --- a/tools/search/crawler/lib/parsers.py +++ b/tools/search/crawler/lib/parsers.py @@ -1,8 +1,6 @@ import re -import string import urllib from StringIO import StringIO -import codecs import dateutil.parser from datetime import timedelta