Django

Code

Changeset 3411

Show
Ignore:
Timestamp:
07/21/06 12:11:13 (2 years ago)
Author:
jacob
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/bin/compile-messages.py

    r2352 r3411  
    33import os 
    44import sys 
    5 import getopt 
    65 
    76def compile_messages(): 

  • django/trunk/django/conf/__init__.py

    r3271 r3411  
    88 
    99import os 
    10 import sys 
    1110from django.conf import global_settings 
    1211 

  • django/trunk/django/contrib/admin/templatetags/admin_list.py

    r3333 r3411  
    1 from django import template 
    21from django.conf import settings 
    3 from django.contrib.admin.views.main import MAX_SHOW_ALL_ALLOWED, ALL_VAR 
     2from django.contrib.admin.views.main import ALL_VAR, EMPTY_CHANGELIST_VALUE 
    43from django.contrib.admin.views.main import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR 
    5 from django.contrib.admin.views.main import IS_POPUP_VAR, EMPTY_CHANGELIST_VALUE 
    64from django.core.exceptions import ObjectDoesNotExist 
    75from django.db import models 
    …… 
    120118                    attr = attr() 
    121119                result_repr = str(attr) 
    122             except AttributeError, ObjectDoesNotExist: 
     120            except (AttributeError, ObjectDoesNotExist): 
    123121                result_repr = EMPTY_CHANGELIST_VALUE 
    124122            else: 

  • django/trunk/django/contrib/admin/templatetags/admin_modify.py

    r3147 r3411  
    22from django.contrib.admin.views.main import AdminBoundField 
    33from django.template import loader 
    4 from django.utils.html import escape 
    54from django.utils.text import capfirst 
    6 from django.utils.functional import curry 
    75from django.db import models 
    86from django.db.models.fields import Field 

  • django/trunk/django/contrib/admin/utils.py

    r3070 r3411  
    44from email.Parser import HeaderParser 
    55from email.Errors import HeaderParseError 
    6 from urlparse import urljoin 
    76try: 
    87    import docutils.core 

  • django/trunk/django/contrib/admin/views/main.py

    r3194 r3411  
    1111from django.db.models.query import handle_legacy_orderlist, QuerySet 
    1212from django.http import Http404, HttpResponse, HttpResponseRedirect 
    13 from django.template import loader 
    14 from django.utils import dateformat 
    15 from django.utils.dates import MONTHS 
    1613from django.utils.html import escape 
    1714from django.utils.text import capfirst, get_text_list 

  • django/trunk/django/contrib/auth/backends.py

    r3226 r3411  
    1 from django.contrib.auth.models import User, check_password 
     1from django.contrib.auth.models import User 
    22 
    33class ModelBackend: 

  • django/trunk/django/contrib/auth/views.py

    r3226 r3411  
    55from django.template import RequestContext 
    66from django.contrib.sites.models import Site 
    7 from django.http import HttpResponse, HttpResponseRedirect 
     7from django.http import HttpResponseRedirect 
    88from django.contrib.auth.decorators import login_required 
    99from django.contrib.auth import LOGIN_URL, REDIRECT_FIELD_NAME 

  • django/trunk/django/contrib/comments/feeds.py

    r2983 r3411  
    22from django.contrib.comments.models import Comment, FreeComment 
    33from django.contrib.syndication.feeds import Feed 
    4 from django.core.exceptions import ObjectDoesNotExist 
    54from django.contrib.sites.models import Site 
    65 

  • django/trunk/django/contrib/comments/views/comments.py

    r3360 r3411  
    66from django.shortcuts import render_to_response 
    77from django.template import RequestContext 
    8 from django.contrib.comments.models import Comment, FreeComment, PHOTOS_REQUIRED, PHOTOS_OPTIONAL, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC 
     8from django.contrib.comments.models import Comment, FreeComment, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC 
    99from django.contrib.contenttypes.models import ContentType 
    1010from django.contrib.auth.forms import AuthenticationForm 

  • django/trunk/django/core/cache/backends/db.py

    r2809 r3411  
    22 
    33from django.core.cache.backends.base import BaseCache 
    4 from django.db import connection, transaction 
     4from django.db import connection, transaction, DatabaseError 
    55import base64, time 
    66from datetime import datetime 

  • django/trunk/django/core/cache/backends/locmem.py

    r2378 r3411  
    44from django.utils.synch import RWLock 
    55import copy, time 
    6 try: 
    7     import cPickle as pickle 
    8 except ImportError: 
    9     import pickle 
    106 
    117class CacheClass(SimpleCacheClass): 

  • django/trunk/django/core/handlers/base.py

    r3113 r3411  
    120120        fundamental error. 
    121121        """ 
    122         from django.core import urlresolvers 
    123122        callback, param_dict = resolver.resolve500() 
    124123        return callback(request, **param_dict) 

  • django/trunk/django/core/handlers/wsgi.py

    r3410 r3411  
    5959 
    6060    def __repr__(self): 
    61         from pprint import pformat 
    6261        return '<WSGIRequest\nGET:%s,\nPOST:%s,\nCOOKIES:%s,\nMETA:%s>' % \ 
    6362            (pformat(self.GET), pformat(self.POST), pformat(self.COOKIES), 

  • django/trunk/django/core/management.py

    r3405 r3411  
    594594    "Executes the equivalent of 'get_sql_reset' in the current database." 
    595595    from django.db import connection, transaction 
    596     from cStringIO import StringIO 
    597596    app_name = app.__name__.split('.')[-2] 
    598597 

  • django/trunk/django/core/paginator.py

    r3113 r3411  
    1 from copy import copy 
    21from math import ceil 
    32 

  • django/trunk/django/core/serializers/python.py

    r3237 r3411  
    8080                try: 
    8181                    data[field.name] = field.rel.to._default_manager.get(pk=field_value) 
    82                 except RelatedModel.DoesNotExist: 
     82                except field.rel.to.DoesNotExist: 
    8383                    data[field.name] = None 
    8484                     

  • django/trunk/django/core/servers/basehttp.py

    r3113 r3411  
    99 
    1010from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer 
    11 from types import ListType, StringType, TupleType 
     11from types import ListType, StringType 
    1212import os, re, sys, time, urllib 
    1313 

  • django/trunk/django/db/backends/mysql/base.py

    r3115 r3411  
    4141        try: 
    4242            return self.cursor.executemany(sql, param_list) 
    43         except Database.Warning: 
     43        except Database.Warning, w: 
    4444            self.cursor.execute("SHOW WARNINGS") 
    4545            raise Database.Warning, "%s: %s" % (w, self.cursor.fetchall()) 

  • django/trunk/django/db/backends/mysql/introspection.py

    r2922 r3411  
    1 from django.db import transaction 
    21from django.db.backends.mysql.base import quote_name 
    32from MySQLdb import ProgrammingError, OperationalError 

  • django/trunk/django/db/backends/oracle/base.py

    r3254 r3411  
    1111    from django.core.exceptions import ImproperlyConfigured 
    1212    raise ImproperlyConfigured, "Error loading cx_Oracle module: %s" % e 
    13 import types 
    1413 
    1514DatabaseError = Database.Error 

  • django/trunk/django/db/backends/oracle/introspection.py

    r2986 r3411  
    1 from django.db import transaction 
    2 from django.db.backends.oracle.base import quote_name 
    31import re 
    42 

  • django/trunk/django/db/backends/postgresql/introspection.py

    r3047 r3411  
    1 from django.db import transaction 
    21from django.db.backends.postgresql.base import quote_name 
    32 

  • django/trunk/django/db/backends/postgresql_psycopg2/introspection.py

    r3047 r3411  
    1 from django.db import transaction 
    21from django.db.backends.postgresql_psycopg2.base import quote_name 
    32 

  • django/trunk/django/db/backends/sqlite3/introspection.py

    r3285 r3411  
    1 from django.db import transaction 
    21from django.db.backends.sqlite3.base import quote_name 
    32