mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #20943 -- Weakly reference senders when caching their associated receivers

Browse Source
This commit is contained in:
Simon Charette
2013-08-19 23:14:21 -04:00
parent fdbf492946
commit e55ca60903
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
django/dispatch/dispatcher.py
View File

@@ -4,8 +4,10 @@ import threading
from django.dispatch import saferef
from django.utils.six.moves import xrange
WEAKREF_TYPES = (weakref.ReferenceType, saferef.BoundMethodWeakref)
def _make_id(target):
if hasattr(target, '__func__'):
return (id(target.__self__), id(target.__func__))
@@ -15,6 +17,7 @@ NONE_ID = _make_id(None)
# A marker for caching
NO_RECEIVERS = object()
class Signal(object):
"""
Base class for all signals
@@ -42,7 +45,7 @@ class Signal(object):
# distinct sender we cache the receivers that sender has in
# 'sender_receivers_cache'. The cache is cleaned when .connect() or
# .disconnect() is called and populated on send().
self.sender_receivers_cache = {}
self.sender_receivers_cache = weakref.WeakKeyDictionary() if use_caching else {}
def connect(self, receiver, sender=None, weak=True, dispatch_uid=None):
"""
@@ -116,7 +119,7 @@ class Signal(object):
break
else:
self.receivers.append((lookup_key, receiver))
self.sender_receivers_cache = {}
self.sender_receivers_cache.clear()
def disconnect(self, receiver=None, sender=None, weak=True, dispatch_uid=None):
"""
@@ -151,7 +154,7 @@ class Signal(object):
if r_key == lookup_key:
del self.receivers[index]
break
self.sender_receivers_cache = {}
self.sender_receivers_cache.clear()
def has_listeners(self, sender=None):
return bool(self._live_receivers(sender))
@@ -276,7 +279,8 @@ class Signal(object):
for idx, (r_key, _) in enumerate(reversed(self.receivers)):
if r_key == key:
del self.receivers[last_idx - idx]
self.sender_receivers_cache = {}
self.sender_receivers_cache.clear()
def receiver(signal, **kwargs):
"""