Changeset 8046
- Timestamp:
- 07/21/08 22:24:09 (5 months ago)
- Files:
-
- django/trunk/django/contrib/admindocs/views.py (modified) (1 diff)
- django/trunk/django/contrib/admin/options.py (modified) (1 diff)
- django/trunk/django/contrib/admin/views/main.py (modified) (1 diff)
- django/trunk/django/contrib/admin/widgets.py (modified) (1 diff)
- django/trunk/django/contrib/auth/admin.py (modified) (1 diff)
- django/trunk/django/contrib/auth/decorators.py (modified) (1 diff)
- django/trunk/django/contrib/auth/forms.py (modified) (1 diff)
- django/trunk/django/contrib/auth/management/commands/createsuperuser.py (modified) (1 diff)
- django/trunk/django/contrib/databrowse/plugins/calendars.py (modified) (1 diff)
- django/trunk/django/contrib/databrowse/plugins/fieldchoices.py (modified) (1 diff)
- django/trunk/django/contrib/databrowse/sites.py (modified) (1 diff)
- django/trunk/django/contrib/databrowse/views.py (modified) (1 diff)
- django/trunk/django/contrib/formtools/tests.py (modified) (1 diff)
- django/trunk/django/contrib/sessions/backends/cache.py (modified) (1 diff)
- django/trunk/django/contrib/sessions/backends/db.py (modified) (1 diff)
- django/trunk/django/contrib/syndication/feeds.py (modified) (1 diff)
- django/trunk/django/core/files/uploadhandler.py (modified) (1 diff)
- django/trunk/django/core/management/commands/compilemessages.py (modified) (1 diff)
- django/trunk/django/core/management/commands/test.py (modified) (1 diff)
- django/trunk/django/core/management/commands/testserver.py (modified) (1 diff)
- django/trunk/django/db/backends/oracle/base.py (modified) (1 diff)
- django/trunk/django/db/models/base.py (modified) (2 diffs)
- django/trunk/django/db/models/fields/related.py (modified) (1 diff)
- django/trunk/django/db/models/__init__.py (modified) (1 diff)
- django/trunk/django/db/models/sql/query.py (modified) (1 diff)
- django/trunk/django/dispatch/dispatcher.py (modified) (12 diffs)
- django/trunk/django/dispatch/saferef.py (modified) (1 diff)
- django/trunk/django/forms/fields.py (modified) (1 diff)
- django/trunk/django/forms/formsets.py (modified) (1 diff)
- django/trunk/django/forms/models.py (modified) (1 diff)
- django/trunk/django/forms/util.py (modified) (1 diff)
- django/trunk/django/utils/dateformat.py (modified) (1 diff)
- django/trunk/django/utils/encoding.py (modified) (1 diff)
- django/trunk/django/views/generic/simple.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/django/contrib/admindocs/views.py
r7967 r8046 6 6 from django.shortcuts import render_to_response 7 7 from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist 8 from django.http import Http404 , get_host8 from django.http import Http404 9 9 from django.core import urlresolvers 10 10 from django.contrib.admindocs import utils django/trunk/django/contrib/admin/options.py
r8011 r8046 1 from django import oldforms, template 2 from django import forms 1 from django import forms, template 3 2 from django.forms.formsets import all_valid 4 3 from django.forms.models import modelform_factory, inlineformset_factory django/trunk/django/contrib/admin/views/main.py
r7967 r8046 7 7 from django.utils.encoding import force_unicode, smart_str 8 8 from django.utils.translation import ugettext 9 from django.utils.safestring import mark_safe10 9 from django.utils.http import urlencode 11 10 import operator django/trunk/django/contrib/admin/widgets.py
r7974 r8046 8 8 from django.forms.widgets import RadioFieldRenderer 9 9 from django.forms.util import flatatt 10 from django.utils.datastructures import MultiValueDict 11 from django.utils.text import capfirst, truncate_words 10 from django.utils.text import truncate_words 12 11 from django.utils.translation import ugettext as _ 13 12 from django.utils.safestring import mark_safe django/trunk/django/contrib/auth/admin.py
r7967 r8046 1 1 from django.contrib.auth.models import User, Group 2 2 from django.core.exceptions import PermissionDenied 3 from django import oldforms,template3 from django import template 4 4 from django.shortcuts import render_to_response 5 5 from django.http import HttpResponseRedirect django/trunk/django/contrib/auth/decorators.py
r7153 r8046 1 1 try: 2 from functools import wraps,update_wrapper2 from functools import update_wrapper 3 3 except ImportError: 4 from django.utils.functional import wraps,update_wrapper # Python 2.3, 2.4 fallback.4 from django.utils.functional import update_wrapper # Python 2.3, 2.4 fallback. 5 5 6 6 from django.contrib.auth import REDIRECT_FIELD_NAME django/trunk/django/contrib/auth/forms.py
r7971 r8046 3 3 from django.contrib.sites.models import Site 4 4 from django.template import Context, loader 5 from django.core import validators6 5 from django import forms 7 6 from django.utils.translation import ugettext_lazy as _ django/trunk/django/contrib/auth/management/commands/createsuperuser.py
r7598 r8046 8 8 import sys 9 9 from optparse import make_option 10 from django.contrib.auth.models import User , UNUSABLE_PASSWORD10 from django.contrib.auth.models import User 11 11 from django.core import validators 12 12 from django.core.management.base import BaseCommand, CommandError django/trunk/django/contrib/databrowse/plugins/calendars.py
r7946 r8046 5 5 from django.shortcuts import render_to_response 6 6 from django.utils.text import capfirst 7 from django.utils.translation import get_date_formats8 7 from django.utils.encoding import force_unicode 9 8 from django.utils.safestring import mark_safe django/trunk/django/contrib/databrowse/plugins/fieldchoices.py
r7131 r8046 7 7 from django.utils.encoding import smart_str, force_unicode 8 8 from django.utils.safestring import mark_safe 9 from django.views.generic import date_based10 9 import urllib 11 10 django/trunk/django/contrib/databrowse/sites.py
r6671 r8046 1 1 from django import http 2 2 from django.db import models 3 from django.contrib.databrowse.datastructures import EasyModel , EasyChoice3 from django.contrib.databrowse.datastructures import EasyModel 4 4 from django.shortcuts import render_to_response 5 5 from django.utils.safestring import mark_safe django/trunk/django/contrib/databrowse/views.py
r7131 r8046 1 from django.db.models import FieldDoesNotExist, DateTimeField2 1 from django.http import Http404 3 2 from django.shortcuts import render_to_response 4 from django.contrib.databrowse.datastructures import EasyModel, EasyChoice5 3 6 4 ########### django/trunk/django/contrib/formtools/tests.py
r7971 r8046 2 2 from django.contrib.formtools import preview 3 3 from django import http 4 from django.conf import settings5 4 from django.test import TestCase 6 5 django/trunk/django/contrib/sessions/backends/cache.py
r7725 r8046 1 from django.conf import settings2 1 from django.contrib.sessions.backends.base import SessionBase 3 2 from django.core.cache import cache 4 5 3 6 4 class SessionStore(SessionBase): django/trunk/django/contrib/sessions/backends/db.py
r7725 r8046 1 1 import datetime 2 3 from django.conf import settings4 2 from django.contrib.sessions.models import Session 5 3 from django.contrib.sessions.backends.base import SessionBase 6 4 from django.core.exceptions import SuspiciousOperation 7 8 5 9 6 class SessionStore(SessionBase): django/trunk/django/contrib/syndication/feeds.py
r7324 r8046 1 1 from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist 2 from django.template import Context,loader, Template, TemplateDoesNotExist2 from django.template import loader, Template, TemplateDoesNotExist 3 3 from django.contrib.sites.models import Site, RequestSite 4 4 from django.utils import feedgenerator django/trunk/django/core/files/uploadhandler.py
r7859 r8046 2 2 Base file upload handler classes, and the built-in concrete subclasses 3 3 """ 4 import os 5 import tempfile 4 6 5 try: 7 6 from cStringIO import StringIO django/trunk/django/core/management/commands/compilemessages.py
r7844 r8046 3 3 from optparse import make_option 4 4 from django.core.management.base import BaseCommand 5 from django.core.management.color import no_style6 5 7 6 try: django/trunk/django/core/management/commands/test.py
r7294 r8046 18 18 def handle(self, *test_labels, **options): 19 19 from django.conf import settings 20 from django.db.models import get_app, get_apps21 20 22 21 verbosity = int(options.get('verbosity', 1)) django/trunk/django/core/management/commands/testserver.py
r7294 r8046 18 18 19 19 def handle(self, *fixture_labels, **options): 20 from django.conf import settings21 20 from django.core.management import call_command 22 21 from django.test.utils import create_test_db django/trunk/django/db/backends/oracle/base.py
r7852 r8046 9 9 from django.db.backends import BaseDatabaseWrapper, BaseDatabaseFeatures, BaseDatabaseOperations, util 10 10 from django.db.backends.oracle import query 11 from django.utils.datastructures import SortedDict12 11 from django.utils.encoding import smart_str, force_unicode 13 12 django/trunk/django/db/models/base.py
r8033 r8046 13 13 from django.core import validators 14 14 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, FieldError 15 from django.db.models.fields import AutoField, ImageField , FieldDoesNotExist15 from django.db.models.fields import AutoField, ImageField 16 16 from django.db.models.fields.related import OneToOneRel, ManyToOneRel, OneToOneField 17 17 from django.db.models.query import delete_objects, Q, CollectedObjects … … 21 21 from django.db.models.loading import register_models, get_model 22 22 from django.dispatch import dispatcher 23 from django.utils.datastructures import SortedDict24 23 from django.utils.functional import curry 25 24 from django.utils.encoding import smart_str, force_unicode, smart_unicode django/trunk/django/db/models/fields/related.py
r8033 r8046 5 5 from django.db.models.query import QuerySet 6 6 from django.db.models.query_utils import QueryWrapper 7 from django.utils.text import capfirst8 7 from django.utils.translation import ugettext_lazy, string_concat, ungettext, ugettext as _ 9 8 from django.utils.functional import curry 10 from django.utils.encoding import smart_unicode11 9 from django.core import validators 12 10 from django import oldforms django/trunk/django/db/models/__init__.py
r7967 r8046 11 11 from django.db.models.fields.related import ForeignKey, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel, TABULAR, STACKED 12 12 from django.db.models import signals 13 from django.utils.functional import curry14 from django.utils.text import capfirst15 13 16 14 # Admin stages. django/trunk/django/db/models/sql/query.py
r7926 r8046 8 8 """ 9 9 10 import datetime11 10 from copy import deepcopy 12 11 django/trunk/django/dispatch/dispatcher.py
r4588 r8046 26 26 vs. the original code.) 27 27 """ 28 import types,weakref28 import weakref 29 29 from django.dispatch import saferef, robustapply, errors 30 30 … … 130 130 if signal is None: 131 131 raise errors.DispatcherTypeError( 132 'Signal cannot be None (receiver=%r sender=%r)' %( receiver,sender)132 'Signal cannot be None (receiver=%r sender=%r)' % (receiver, sender) 133 133 ) 134 134 if weak: … … 160 160 receivers = signals[signal] = [] 161 161 try: 162 current = sendersBack.get( receiverID)162 current = sendersBack.get(receiverID) 163 163 if current is None: 164 164 sendersBack[ receiverID ] = current = [] … … 200 200 if signal is None: 201 201 raise errors.DispatcherTypeError( 202 'Signal cannot be None (receiver=%r sender=%r)' %( receiver,sender)202 'Signal cannot be None (receiver=%r sender=%r)' % (receiver, sender) 203 203 ) 204 204 if weak: receiver = saferef.safeRef(receiver) … … 227 227 _cleanupConnections(senderkey, signal) 228 228 229 def getReceivers( sender = Any, signal = Any):229 def getReceivers(sender=Any, signal=Any): 230 230 """Get list of receivers from global tables 231 231 … … 241 241 might append new records. 242 242 243 Normally you would use liveReceivers( getReceivers(...))243 Normally you would use liveReceivers(getReceivers(...)) 244 244 to retrieve the actual receiver objects as an iterable 245 245 object. … … 259 259 """ 260 260 for receiver in receivers: 261 if isinstance( receiver, WEAKREF_TYPES):261 if isinstance(receiver, WEAKREF_TYPES): 262 262 # Dereference the weak reference. 263 263 receiver = receiver() … … 269 269 270 270 271 def getAllReceivers( sender = Any, signal = Any):271 def getAllReceivers(sender=Any, signal=Any): 272 272 """Get list of all receivers from global tables 273 273 … … 364 364 365 365 366 def sendExact( signal=Any, sender=Anonymous, *arguments, **named ):366 def sendExact(signal=Any, sender=Anonymous, *arguments, **named ): 367 367 """Send signal only to those receivers registered for exact message 368 368 … … 404 404 else: 405 405 try: 406 receivers.remove( receiver)406 receivers.remove(receiver) 407 407 except Exception, err: 408 408 pass … … 440 440 441 441 442 def _removeBackrefs( senderkey):442 def _removeBackrefs(senderkey): 443 443 """Remove all back-references to this senderkey""" 444 444 for receiver_list in connections.pop(senderkey, {}).values(): 445 445 for receiver in receiver_list: 446 _killBackref( receiver, senderkey)446 _killBackref(receiver, senderkey) 447 447 448 448 … … 474 474 break 475 475 if not found: 476 _killBackref( oldReceiver, senderkey)476 _killBackref(oldReceiver, senderkey) 477 477 return True 478 478 return False 479 479 480 480 481 def _killBackref( receiver, senderkey):481 def _killBackref(receiver, senderkey): 482 482 """Do the actual removal of back reference from receiver to senderkey""" 483 483 receiverkey = id(receiver) 484 receivers_list = sendersBack.get( receiverkey, ())484 receivers_list = sendersBack.get(receiverkey, ()) 485 485 while senderkey in receivers_list: 486 486 try: 487 receivers_list.remove( senderkey)487 receivers_list.remove(senderkey) 488 488 except: 489 489 break django/trunk/django/dispatch/saferef.py
r6586 r8046 1 1 """Refactored "safe reference" from dispatcher.py""" 2 2 import weakref, traceback 3 from django.utils.functional import curry4 3 5 4 def safeRef(target, onDelete = None): django/trunk/django/forms/fields.py
r8016 r8046 24 24 25 25 from django.utils.translation import ugettext_lazy as _ 26 from django.utils.encoding import StrAndUnicode,smart_unicode, smart_str26 from django.utils.encoding import smart_unicode, smart_str 27 27 28 28 from util import ErrorList, ValidationError django/trunk/django/forms/formsets.py
r7971 r8046 3 3 from django.utils.safestring import mark_safe 4 4 from fields import IntegerField, BooleanField 5 from widgets import Media, HiddenInput , TextInput5 from widgets import Media, HiddenInput 6 6 from util import ErrorList, ValidationError 7 7 django/trunk/django/forms/models.py
r7971 r8046 9 9 from django.utils.encoding import smart_unicode 10 10 from django.utils.datastructures import SortedDict 11 from django.core.exceptions import ImproperlyConfigured12 11 13 12 from util import ValidationError, ErrorList django/trunk/django/forms/util.py
r7971 r8046 1 1 from django.utils.html import escape 2 2 from django.utils.encoding import smart_unicode, StrAndUnicode, force_unicode 3 from django.utils.functional import Promise4 3 from django.utils.safestring import mark_safe 5 4 django/trunk/django/utils/dateformat.py
r6640 r8046 14 14 from django.utils.dates import MONTHS, MONTHS_3, MONTHS_AP, WEEKDAYS, WEEKDAYS_ABBR 15 15 from django.utils.tzinfo import LocalTimezone 16 from django.utils.translation import string_concat,ugettext as _16 from django.utils.translation import ugettext as _ 17 17 from django.utils.encoding import force_unicode 18 18 from calendar import isleap, monthrange django/trunk/django/utils/encoding.py
r7064 r8046 2 2 import urllib 3 3 import datetime 4 5 4 from django.utils.functional import Promise 6 from django.utils.safestring import SafeData, mark_safe7 5 8 6 class DjangoUnicodeDecodeError(UnicodeDecodeError): django/trunk/django/views/generic/simple.py
r6278 r8046 1 from django.shortcuts import render_to_response2 1 from django.template import loader, RequestContext 3 2 from django.http import HttpResponse, HttpResponsePermanentRedirect, HttpResponseGone
