diff options
25 files changed, 9 insertions, 35 deletions
diff --git a/django/bin/compile-messages.py b/django/bin/compile-messages.py index e33fdd780b..5f653df95d 100755 --- a/django/bin/compile-messages.py +++ b/django/bin/compile-messages.py @@ -2,7 +2,6 @@ import os import sys -import getopt def compile_messages(): basedir = None diff --git a/django/conf/__init__.py b/django/conf/__init__.py index a6a09d772f..1a04bbfb02 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -7,7 +7,6 @@ a list of all possible variables. """ import os -import sys from django.conf import global_settings ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE" diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index ca250ba433..832b3562cd 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -1,8 +1,6 @@ -from django import template from django.conf import settings -from django.contrib.admin.views.main import MAX_SHOW_ALL_ALLOWED, ALL_VAR +from django.contrib.admin.views.main import ALL_VAR, EMPTY_CHANGELIST_VALUE from django.contrib.admin.views.main import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR -from django.contrib.admin.views.main import IS_POPUP_VAR, EMPTY_CHANGELIST_VALUE from django.core.exceptions import ObjectDoesNotExist from django.db import models from django.utils import dateformat @@ -119,7 +117,7 @@ def items_for_result(cl, result): if callable(attr): attr = attr() result_repr = str(attr) - except AttributeError, ObjectDoesNotExist: + except (AttributeError, ObjectDoesNotExist): result_repr = EMPTY_CHANGELIST_VALUE else: # Strip HTML tags in the resulting text, except if the diff --git a/django/contrib/admin/templatetags/admin_modify.py b/django/contrib/admin/templatetags/admin_modify.py index 2d34452f52..7ba7bef74e 100644 --- a/django/contrib/admin/templatetags/admin_modify.py +++ b/django/contrib/admin/templatetags/admin_modify.py @@ -1,9 +1,7 @@ from django import template from django.contrib.admin.views.main import AdminBoundField from django.template import loader -from django.utils.html import escape from django.utils.text import capfirst -from django.utils.functional import curry from django.db import models from django.db.models.fields import Field from django.db.models.related import BoundRelatedObject diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py index 0242b2f32e..9adf09b6a5 100644 --- a/django/contrib/admin/utils.py +++ b/django/contrib/admin/utils.py @@ -3,7 +3,6 @@ import re from email.Parser import HeaderParser from email.Errors import HeaderParseError -from urlparse import urljoin try: import docutils.core import docutils.nodes diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index a7ee08f1c0..705dfad6c8 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -10,9 +10,6 @@ from django.shortcuts import get_object_or_404, render_to_response from django.db import models from django.db.models.query import handle_legacy_orderlist, QuerySet from django.http import Http404, HttpResponse, HttpResponseRedirect -from django.template import loader -from django.utils import dateformat -from django.utils.dates import MONTHS from django.utils.html import escape from django.utils.text import capfirst, get_text_list import operator diff --git a/django/contrib/auth/backends.py b/django/contrib/auth/backends.py index 3b46b65b0a..4b8efcca46 100644 --- a/django/contrib/auth/backends.py +++ b/django/contrib/auth/backends.py @@ -1,4 +1,4 @@ -from django.contrib.auth.models import User, check_password +from django.contrib.auth.models import User class ModelBackend: """ diff --git a/django/contrib/auth/views.py b/django/contrib/auth/views.py index 97ecd6a3fd..0ffa35bcff 100644 --- a/django/contrib/auth/views.py +++ b/django/contrib/auth/views.py @@ -4,7 +4,7 @@ from django import forms from django.shortcuts import render_to_response from django.template import RequestContext from django.contrib.sites.models import Site -from django.http import HttpResponse, HttpResponseRedirect +from django.http import HttpResponseRedirect from django.contrib.auth.decorators import login_required from django.contrib.auth import LOGIN_URL, REDIRECT_FIELD_NAME diff --git a/django/contrib/comments/feeds.py b/django/contrib/comments/feeds.py index cad8c881a1..1dcccb1abc 100644 --- a/django/contrib/comments/feeds.py +++ b/django/contrib/comments/feeds.py @@ -1,7 +1,6 @@ from django.conf import settings from django.contrib.comments.models import Comment, FreeComment from django.contrib.syndication.feeds import Feed -from django.core.exceptions import ObjectDoesNotExist from django.contrib.sites.models import Site class LatestFreeCommentsFeed(Feed): diff --git a/django/contrib/comments/views/comments.py b/django/contrib/comments/views/comments.py index 41459bf46c..c19c62fc88 100644 --- a/django/contrib/comments/views/comments.py +++ b/django/contrib/comments/views/comments.py @@ -5,7 +5,7 @@ from django.http import Http404 from django.core.exceptions import ObjectDoesNotExist from django.shortcuts import render_to_response from django.template import RequestContext -from django.contrib.comments.models import Comment, FreeComment, PHOTOS_REQUIRED, PHOTOS_OPTIONAL, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC +from django.contrib.comments.models import Comment, FreeComment, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC from django.contrib.contenttypes.models import ContentType from django.contrib.auth.forms import AuthenticationForm from django.http import HttpResponseRedirect diff --git a/django/core/cache/backends/db.py b/django/core/cache/backends/db.py index 1b54addded..4a0d44a44e 100644 --- a/django/core/cache/backends/db.py +++ b/django/core/cache/backends/db.py @@ -1,7 +1,7 @@ "Database cache backend." from django.core.cache.backends.base import BaseCache -from django.db import connection, transaction +from django.db import connection, transaction, DatabaseError import base64, time from datetime import datetime try: diff --git a/django/core/cache/backends/locmem.py b/django/core/cache/backends/locmem.py index 5bd6da5857..0e21b80ed8 100644 --- a/django/core/cache/backends/locmem.py +++ b/django/core/cache/backends/locmem.py @@ -3,10 +3,6 @@ from django.core.cache.backends.simple import CacheClass as SimpleCacheClass from django.utils.synch import RWLock import copy, time -try: - import cPickle as pickle -except ImportError: - import pickle class CacheClass(SimpleCacheClass): def __init__(self, host, params): diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py index c25ff2b14e..62217acdce 100644 --- a/django/core/handlers/base.py +++ b/django/core/handlers/base.py @@ -119,7 +119,6 @@ class BaseHandler(object): Returns an HttpResponse that displays a PUBLIC error message for a fundamental error. """ - from django.core import urlresolvers callback, param_dict = resolver.resolve500() return callback(request, **param_dict) diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py index c53e428f85..5c48c9dace 100644 --- a/django/core/handlers/wsgi.py +++ b/django/core/handlers/wsgi.py @@ -58,7 +58,6 @@ class WSGIRequest(http.HttpRequest): self.method = environ['REQUEST_METHOD'].upper() def __repr__(self): - from pprint import pformat return '<WSGIRequest\nGET:%s,\nPOST:%s,\nCOOKIES:%s,\nMETA:%s>' % \ (pformat(self.GET), pformat(self.POST), pformat(self.COOKIES), pformat(self.META)) diff --git a/django/core/management.py b/django/core/management.py index 047bdda06e..ecd1d1a68d 100644 --- a/django/core/management.py +++ b/django/core/management.py @@ -593,7 +593,6 @@ install.args = APP_ARGS def reset(app): "Executes the equivalent of 'get_sql_reset' in the current database." from django.db import connection, transaction - from cStringIO import StringIO app_name = app.__name__.split('.')[-2] disable_termcolors() diff --git a/django/core/paginator.py b/django/core/paginator.py index 195ad1009e..026fe0a675 100644 --- a/django/core/paginator.py +++ b/django/core/paginator.py @@ -1,4 +1,3 @@ -from copy import copy from math import ceil class InvalidPage(Exception): diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py index 7989e1d469..4181bc7f2b 100644 --- a/django/core/serializers/python.py +++ b/django/core/serializers/python.py @@ -79,7 +79,7 @@ def Deserializer(object_list, **options): elif field.rel and isinstance(field.rel, models.ManyToOneRel): try: data[field.name] = field.rel.to._default_manager.get(pk=field_value) - except RelatedModel.DoesNotExist: + except field.rel.to.DoesNotExist: data[field.name] = None # Handle all other fields diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py index 259a931594..7ce5706c23 100644 --- a/django/core/servers/basehttp.py +++ b/django/core/servers/basehttp.py @@ -8,7 +8,7 @@ been reviewed for security issues. Don't use it for production use. """ from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer -from types import ListType, StringType, TupleType +from types import ListType, StringType import os, re, sys, time, urllib __version__ = "0.1" diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index a522f24f2f..23ea76316f 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -40,7 +40,7 @@ class MysqlDebugWrapper: def executemany(self, sql, param_list): try: return self.cursor.executemany(sql, param_list) - except Database.Warning: + except Database.Warning, w: self.cursor.execute("SHOW WARNINGS") raise Database.Warning, "%s: %s" % (w, self.cursor.fetchall()) diff --git a/django/db/backends/mysql/introspection.py b/django/db/backends/mysql/introspection.py index e1fbfff828..2c77f76ee3 100644 --- a/django/db/backends/mysql/introspection.py +++ b/django/db/backends/mysql/introspection.py @@ -1,4 +1,3 @@ -from django.db import transaction from django.db.backends.mysql.base import quote_name from MySQLdb import ProgrammingError, OperationalError from MySQLdb.constants import FIELD_TYPE diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index 188c4bb678..dfe2df11dc 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -10,7 +10,6 @@ try: except ImportError, e: from django.core.exceptions import ImproperlyConfigured raise ImproperlyConfigured, "Error loading cx_Oracle module: %s" % e -import types DatabaseError = Database.Error diff --git a/django/db/backends/oracle/introspection.py b/django/db/backends/oracle/introspection.py index 656741e440..ecc8f372a8 100644 --- a/django/db/backends/oracle/introspection.py +++ b/django/db/backends/oracle/introspection.py @@ -1,5 +1,3 @@ -from django.db import transaction -from django.db.backends.oracle.base import quote_name import re foreign_key_re = re.compile(r"\sCONSTRAINT `[^`]*` FOREIGN KEY \(`([^`]*)`\) REFERENCES `([^`]*)` \(`([^`]*)`\)") diff --git a/django/db/backends/postgresql/introspection.py b/django/db/backends/postgresql/introspection.py index c3a16d61c3..6e1d60c4ff 100644 --- a/django/db/backends/postgresql/introspection.py +++ b/django/db/backends/postgresql/introspection.py @@ -1,4 +1,3 @@ -from django.db import transaction from django.db.backends.postgresql.base import quote_name def get_table_list(cursor): diff --git a/django/db/backends/postgresql_psycopg2/introspection.py b/django/db/backends/postgresql_psycopg2/introspection.py index b991493d39..a546da8c45 100644 --- a/django/db/backends/postgresql_psycopg2/introspection.py +++ b/django/db/backends/postgresql_psycopg2/introspection.py @@ -1,4 +1,3 @@ -from django.db import transaction from django.db.backends.postgresql_psycopg2.base import quote_name def get_table_list(cursor): diff --git a/django/db/backends/sqlite3/introspection.py b/django/db/backends/sqlite3/introspection.py index cdabffdc1c..4e22c5ea42 100644 --- a/django/db/backends/sqlite3/introspection.py +++ b/django/db/backends/sqlite3/introspection.py @@ -1,4 +1,3 @@ -from django.db import transaction from django.db.backends.sqlite3.base import quote_name def get_table_list(cursor): |