Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214

  • django/branches/gis/django/dispatch/dispatcher.py

    r4669 r8215  
    2626        vs. the original code.) 
    2727""" 
    28 import types, weakref 
     28import weakref 
    2929from django.dispatch import saferef, robustapply, errors 
    3030 
    …… 
    130130    if signal is None: 
    131131        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) 
    133133        ) 
    134134    if weak: 
    …… 
    160160        receivers = signals[signal] = [] 
    161161    try: 
    162         current = sendersBack.get( receiverID ) 
     162        current = sendersBack.get(receiverID) 
    163163        if current is None: 
    164164            sendersBack[ receiverID ] = current = [] 
    …… 
    200200    if signal is None: 
    201201        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) 
    203203        ) 
    204204    if weak: receiver = saferef.safeRef(receiver) 
    …… 
    227227    _cleanupConnections(senderkey, signal) 
    228228 
    229 def getReceivers( sender = Any, signal = Any ): 
     229def getReceivers(sender=Any, signal=Any): 
    230230    """Get list of receivers from global tables 
    231231 
    …… 
    241241        might append new records. 
    242242 
    243     Normally you would use liveReceivers( getReceivers( ...)) 
     243    Normally you would use liveReceivers(getReceivers(...)) 
    244244    to retrieve the actual receiver objects as an iterable 
    245245    object. 
    …… 
    259259    """ 
    260260    for receiver in receivers: 
    261         if isinstance( receiver, WEAKREF_TYPES): 
     261        if isinstance(receiver, WEAKREF_TYPES): 
    262262            # Dereference the weak reference. 
    263263            receiver = receiver() 
    …… 
    269269 
    270270 
    271 def getAllReceivers( sender = Any, signal = Any ): 
     271def getAllReceivers(sender=Any, signal=Any): 
    272272    """Get list of all receivers from global tables 
    273273 
    …… 
    364364 
    365365 
    366 def sendExact( signal=Any, sender=Anonymous, *arguments, **named ): 
     366def sendExact(signal=Any, sender=Anonymous, *arguments, **named ): 
    367367    """Send signal only to those receivers registered for exact message 
    368368 
    …… 
    404404                else: 
    405405                    try: 
    406                         receivers.remove( receiver ) 
     406                        receivers.remove(receiver) 
    407407                    except Exception, err: 
    408408                        pass 
    …… 
    440440 
    441441 
    442 def _removeBackrefs( senderkey): 
     442def _removeBackrefs(senderkey): 
    443443    """Remove all back-references to this senderkey""" 
    444444    for receiver_list in connections.pop(senderkey, {}).values(): 
    445445        for receiver in receiver_list: 
    446             _killBackref( receiver, senderkey ) 
     446            _killBackref(receiver, senderkey) 
    447447 
    448448 
    …… 
    474474                            break 
    475475        if not found: 
    476             _killBackref( oldReceiver, senderkey ) 
     476            _killBackref(oldReceiver, senderkey) 
    477477            return True 
    478478        return False 
    479479         
    480480         
    481 def _killBackref( receiver, senderkey ): 
     481def _killBackref(receiver, senderkey): 
    482482    """Do the actual removal of back reference from receiver to senderkey""" 
    483483    receiverkey = id(receiver) 
    484     receivers_list = sendersBack.get( receiverkey, () ) 
     484    receivers_list = sendersBack.get(receiverkey, ()) 
    485485    while senderkey in receivers_list: 
    486486        try: 
    487             receivers_list.remove( senderkey ) 
     487            receivers_list.remove(senderkey) 
    488488        except: 
    489489            break