Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed a bunch of spurious imports, typos, and other small errors turn…

…ed up by a pass through PyFlakes. This covers about the first third of the errors.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 17d0bd151265eb284c93350a3ede632b2b23b835 1 parent e9a236d
@jacobian jacobian authored
Showing with 9 additions and 35 deletions.
  1. +0 −1  django/bin/compile-messages.py
  2. +0 −1  django/conf/__init__.py
  3. +2 −4 django/contrib/admin/templatetags/admin_list.py
  4. +0 −2  django/contrib/admin/templatetags/admin_modify.py
  5. +0 −1  django/contrib/admin/utils.py
  6. +0 −3  django/contrib/admin/views/main.py
  7. +1 −1  django/contrib/auth/backends.py
  8. +1 −1  django/contrib/auth/views.py
  9. +0 −1  django/contrib/comments/feeds.py
  10. +1 −1  django/contrib/comments/views/comments.py
  11. +1 −1  django/core/cache/backends/db.py
  12. +0 −4 django/core/cache/backends/locmem.py
  13. +0 −1  django/core/handlers/base.py
  14. +0 −1  django/core/handlers/wsgi.py
  15. +0 −1  django/core/management.py
  16. +0 −1  django/core/paginator.py
  17. +1 −1  django/core/serializers/python.py
  18. +1 −1  django/core/servers/basehttp.py
  19. +1 −1  django/db/backends/mysql/base.py
  20. +0 −1  django/db/backends/mysql/introspection.py
  21. +0 −1  django/db/backends/oracle/base.py
  22. +0 −2  django/db/backends/oracle/introspection.py
  23. +0 −1  django/db/backends/postgresql/introspection.py
  24. +0 −1  django/db/backends/postgresql_psycopg2/introspection.py
  25. +0 −1  django/db/backends/sqlite3/introspection.py
View
1  django/bin/compile-messages.py
@@ -2,7 +2,6 @@
import os
import sys
-import getopt
def compile_messages():
basedir = None
View
1  django/conf/__init__.py
@@ -7,7 +7,6 @@
"""
import os
-import sys
from django.conf import global_settings
ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
View
6 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
View
2  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
View
1  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
View
3  django/contrib/admin/views/main.py
@@ -10,9 +10,6 @@
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
View
2  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:
"""
View
2  django/contrib/auth/views.py
@@ -4,7 +4,7 @@
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
View
1  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):
View
2  django/contrib/comments/views/comments.py
@@ -5,7 +5,7 @@
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
View
2  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:
View
4 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):
View
1  django/core/handlers/base.py
@@ -119,7 +119,6 @@ def get_friendly_error_response(self, request, resolver):
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)
View
1  django/core/handlers/wsgi.py
@@ -58,7 +58,6 @@ def __init__(self, environ):
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))
View
1  django/core/management.py
@@ -593,7 +593,6 @@ def install(app):
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()
View
1  django/core/paginator.py
@@ -1,4 +1,3 @@
-from copy import copy
from math import ceil
class InvalidPage(Exception):
View
2  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
View
2  django/core/servers/basehttp.py
@@ -8,7 +8,7 @@
"""
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"
View
2  django/db/backends/mysql/base.py
@@ -40,7 +40,7 @@ def execute(self, sql, params=()):
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())
View
1  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
View
1  django/db/backends/oracle/base.py
@@ -10,7 +10,6 @@
except ImportError, e:
from django.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured, "Error loading cx_Oracle module: %s" % e
-import types
DatabaseError = Database.Error
View
2  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 `([^`]*)` \(`([^`]*)`\)")
View
1  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):
View
1  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):
View
1  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):
Please sign in to comment.
Something went wrong with that request. Please try again.