Author: jacob
Date: 2006-07-21 12:11:13 -0500 (Fri, 21 Jul 2006)
New Revision: 3411
Modified:
django/trunk/django/bin/compile-messages.py
django/trunk/django/conf/__init__.py
django/trunk/django/contrib/admin/templatetags/admin_list.py
django/trunk/django/contrib/admin/templatetags/admin_modify.py
django/trunk/django/contrib/admin/utils.py
django/trunk/django/contrib/admin/views/main.py
django/trunk/django/contrib/auth/backends.py
django/trunk/django/contrib/auth/views.py
django/trunk/django/contrib/comments/feeds.py
django/trunk/django/contrib/comments/views/comments.py
django/trunk/django/core/cache/backends/db.py
django/trunk/django/core/cache/backends/locmem.py
django/trunk/django/core/handlers/base.py
django/trunk/django/core/handlers/wsgi.py
django/trunk/django/core/management.py
django/trunk/django/core/paginator.py
django/trunk/django/core/serializers/python.py
django/trunk/django/core/servers/basehttp.py
django/trunk/django/db/backends/mysql/base.py
django/trunk/django/db/backends/mysql/introspection.py
django/trunk/django/db/backends/oracle/base.py
django/trunk/django/db/backends/oracle/introspection.py
django/trunk/django/db/backends/postgresql/introspection.py
django/trunk/django/db/backends/postgresql_psycopg2/introspection.py
django/trunk/django/db/backends/sqlite3/introspection.py
Log:
Fixed a bunch of spurious imports, typos, and other small errors turned up by a
pass through PyFlakes. This covers about the first third of the errors.
Modified: django/trunk/django/bin/compile-messages.py
===================================================================
--- django/trunk/django/bin/compile-messages.py 2006-07-21 16:20:22 UTC (rev
3410)
+++ django/trunk/django/bin/compile-messages.py 2006-07-21 17:11:13 UTC (rev
3411)
@@ -2,7 +2,6 @@
import os
import sys
-import getopt
def compile_messages():
basedir = None
Modified: django/trunk/django/conf/__init__.py
===================================================================
--- django/trunk/django/conf/__init__.py 2006-07-21 16:20:22 UTC (rev
3410)
+++ django/trunk/django/conf/__init__.py 2006-07-21 17:11:13 UTC (rev
3411)
@@ -7,7 +7,6 @@
"""
import os
-import sys
from django.conf import global_settings
ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
Modified: django/trunk/django/contrib/admin/templatetags/admin_list.py
===================================================================
--- django/trunk/django/contrib/admin/templatetags/admin_list.py
2006-07-21 16:20:22 UTC (rev 3410)
+++ django/trunk/django/contrib/admin/templatetags/admin_list.py
2006-07-21 17:11:13 UTC (rev 3411)
@@ -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 @@
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
Modified: django/trunk/django/contrib/admin/templatetags/admin_modify.py
===================================================================
--- django/trunk/django/contrib/admin/templatetags/admin_modify.py
2006-07-21 16:20:22 UTC (rev 3410)
+++ django/trunk/django/contrib/admin/templatetags/admin_modify.py
2006-07-21 17:11:13 UTC (rev 3411)
@@ -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
Modified: django/trunk/django/contrib/admin/utils.py
===================================================================
--- django/trunk/django/contrib/admin/utils.py 2006-07-21 16:20:22 UTC (rev
3410)
+++ django/trunk/django/contrib/admin/utils.py 2006-07-21 17:11:13 UTC (rev
3411)
@@ -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
Modified: django/trunk/django/contrib/admin/views/main.py
===================================================================
--- django/trunk/django/contrib/admin/views/main.py 2006-07-21 16:20:22 UTC
(rev 3410)
+++ django/trunk/django/contrib/admin/views/main.py 2006-07-21 17:11:13 UTC
(rev 3411)
@@ -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
Modified: django/trunk/django/contrib/auth/backends.py
===================================================================
--- django/trunk/django/contrib/auth/backends.py 2006-07-21 16:20:22 UTC
(rev 3410)
+++ django/trunk/django/contrib/auth/backends.py 2006-07-21 17:11:13 UTC
(rev 3411)
@@ -1,4 +1,4 @@
-from django.contrib.auth.models import User, check_password
+from django.contrib.auth.models import User
class ModelBackend:
"""
Modified: django/trunk/django/contrib/auth/views.py
===================================================================
--- django/trunk/django/contrib/auth/views.py 2006-07-21 16:20:22 UTC (rev
3410)
+++ django/trunk/django/contrib/auth/views.py 2006-07-21 17:11:13 UTC (rev
3411)
@@ -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
Modified: django/trunk/django/contrib/comments/feeds.py
===================================================================
--- django/trunk/django/contrib/comments/feeds.py 2006-07-21 16:20:22 UTC
(rev 3410)
+++ django/trunk/django/contrib/comments/feeds.py 2006-07-21 17:11:13 UTC
(rev 3411)
@@ -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):
Modified: django/trunk/django/contrib/comments/views/comments.py
===================================================================
--- django/trunk/django/contrib/comments/views/comments.py 2006-07-21
16:20:22 UTC (rev 3410)
+++ django/trunk/django/contrib/comments/views/comments.py 2006-07-21
17:11:13 UTC (rev 3411)
@@ -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
Modified: django/trunk/django/core/cache/backends/db.py
===================================================================
--- django/trunk/django/core/cache/backends/db.py 2006-07-21 16:20:22 UTC
(rev 3410)
+++ django/trunk/django/core/cache/backends/db.py 2006-07-21 17:11:13 UTC
(rev 3411)
@@ -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:
Modified: django/trunk/django/core/cache/backends/locmem.py
===================================================================
--- django/trunk/django/core/cache/backends/locmem.py 2006-07-21 16:20:22 UTC
(rev 3410)
+++ django/trunk/django/core/cache/backends/locmem.py 2006-07-21 17:11:13 UTC
(rev 3411)
@@ -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):
Modified: django/trunk/django/core/handlers/base.py
===================================================================
--- django/trunk/django/core/handlers/base.py 2006-07-21 16:20:22 UTC (rev
3410)
+++ django/trunk/django/core/handlers/base.py 2006-07-21 17:11:13 UTC (rev
3411)
@@ -119,7 +119,6 @@
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)
Modified: django/trunk/django/core/handlers/wsgi.py
===================================================================
--- django/trunk/django/core/handlers/wsgi.py 2006-07-21 16:20:22 UTC (rev
3410)
+++ django/trunk/django/core/handlers/wsgi.py 2006-07-21 17:11:13 UTC (rev
3411)
@@ -58,7 +58,6 @@
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))
Modified: django/trunk/django/core/management.py
===================================================================
--- django/trunk/django/core/management.py 2006-07-21 16:20:22 UTC (rev
3410)
+++ django/trunk/django/core/management.py 2006-07-21 17:11:13 UTC (rev
3411)
@@ -593,7 +593,6 @@
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()
Modified: django/trunk/django/core/paginator.py
===================================================================
--- django/trunk/django/core/paginator.py 2006-07-21 16:20:22 UTC (rev
3410)
+++ django/trunk/django/core/paginator.py 2006-07-21 17:11:13 UTC (rev
3411)
@@ -1,4 +1,3 @@
-from copy import copy
from math import ceil
class InvalidPage(Exception):
Modified: django/trunk/django/core/serializers/python.py
===================================================================
--- django/trunk/django/core/serializers/python.py 2006-07-21 16:20:22 UTC
(rev 3410)
+++ django/trunk/django/core/serializers/python.py 2006-07-21 17:11:13 UTC
(rev 3411)
@@ -79,7 +79,7 @@
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
Modified: django/trunk/django/core/servers/basehttp.py
===================================================================
--- django/trunk/django/core/servers/basehttp.py 2006-07-21 16:20:22 UTC
(rev 3410)
+++ django/trunk/django/core/servers/basehttp.py 2006-07-21 17:11:13 UTC
(rev 3411)
@@ -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"
Modified: django/trunk/django/db/backends/mysql/base.py
===================================================================
--- django/trunk/django/db/backends/mysql/base.py 2006-07-21 16:20:22 UTC
(rev 3410)
+++ django/trunk/django/db/backends/mysql/base.py 2006-07-21 17:11:13 UTC
(rev 3411)
@@ -40,7 +40,7 @@
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())
Modified: django/trunk/django/db/backends/mysql/introspection.py
===================================================================
--- django/trunk/django/db/backends/mysql/introspection.py 2006-07-21
16:20:22 UTC (rev 3410)
+++ django/trunk/django/db/backends/mysql/introspection.py 2006-07-21
17:11:13 UTC (rev 3411)
@@ -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
Modified: django/trunk/django/db/backends/oracle/base.py
===================================================================
--- django/trunk/django/db/backends/oracle/base.py 2006-07-21 16:20:22 UTC
(rev 3410)
+++ django/trunk/django/db/backends/oracle/base.py 2006-07-21 17:11:13 UTC
(rev 3411)
@@ -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
Modified: django/trunk/django/db/backends/oracle/introspection.py
===================================================================
--- django/trunk/django/db/backends/oracle/introspection.py 2006-07-21
16:20:22 UTC (rev 3410)
+++ django/trunk/django/db/backends/oracle/introspection.py 2006-07-21
17:11:13 UTC (rev 3411)
@@ -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 `([^`]*)` \(`([^`]*)`\)")
Modified: django/trunk/django/db/backends/postgresql/introspection.py
===================================================================
--- django/trunk/django/db/backends/postgresql/introspection.py 2006-07-21
16:20:22 UTC (rev 3410)
+++ django/trunk/django/db/backends/postgresql/introspection.py 2006-07-21
17:11:13 UTC (rev 3411)
@@ -1,4 +1,3 @@
-from django.db import transaction
from django.db.backends.postgresql.base import quote_name
def get_table_list(cursor):
Modified: django/trunk/django/db/backends/postgresql_psycopg2/introspection.py
===================================================================
--- django/trunk/django/db/backends/postgresql_psycopg2/introspection.py
2006-07-21 16:20:22 UTC (rev 3410)
+++ django/trunk/django/db/backends/postgresql_psycopg2/introspection.py
2006-07-21 17:11:13 UTC (rev 3411)
@@ -1,4 +1,3 @@
-from django.db import transaction
from django.db.backends.postgresql_psycopg2.base import quote_name
def get_table_list(cursor):
Modified: django/trunk/django/db/backends/sqlite3/introspection.py
===================================================================
--- django/trunk/django/db/backends/sqlite3/introspection.py 2006-07-21
16:20:22 UTC (rev 3410)
+++ django/trunk/django/db/backends/sqlite3/introspection.py 2006-07-21
17:11:13 UTC (rev 3411)
@@ -1,4 +1,3 @@
-from django.db import transaction
from django.db.backends.sqlite3.base import quote_name
def get_table_list(cursor):
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates
-~----------~----~----~----~------~----~------~--~---
