summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-11-07 14:46:42 +0000
committerTim Graham <timograham@gmail.com>2017-01-17 14:09:28 -0500
commit03087f80d14969ebfc7b81f54096941c60c9b52b (patch)
tree2a8d49d30cb7d77d0b1dfd5525410b2c585221a9 /django
parente8dac72a553a0deedfef6ae90495d89d9bc089c8 (diff)
Refs #24205 -- Removed Signal.disconnect()'s weak argument.
Per deprecation timeline.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/signals.py6
-rw-r--r--django/dispatch/dispatcher.py6
2 files changed, 2 insertions, 10 deletions
diff --git a/django/db/models/signals.py b/django/db/models/signals.py
index 5047f11743..9f9fbccde3 100644
--- a/django/db/models/signals.py
+++ b/django/db/models/signals.py
@@ -1,10 +1,8 @@
-import warnings
from functools import partial
from django.db.models.utils import make_model_tuple
from django.dispatch import Signal
from django.utils import six
-from django.utils.deprecation import RemovedInDjango20Warning
class_prepared = Signal(providing_args=["class"])
@@ -32,9 +30,7 @@ class ModelSignal(Signal):
weak=weak, dispatch_uid=dispatch_uid,
)
- def disconnect(self, receiver=None, sender=None, weak=None, dispatch_uid=None, apps=None):
- if weak is not None:
- warnings.warn("Passing `weak` to disconnect has no effect.", RemovedInDjango20Warning, stacklevel=2)
+ def disconnect(self, receiver=None, sender=None, dispatch_uid=None, apps=None):
return self._lazy_method(
super(ModelSignal, self).disconnect, apps, receiver, sender, dispatch_uid=dispatch_uid
)
diff --git a/django/dispatch/dispatcher.py b/django/dispatch/dispatcher.py
index 742acd198b..db2f6839f8 100644
--- a/django/dispatch/dispatcher.py
+++ b/django/dispatch/dispatcher.py
@@ -1,10 +1,8 @@
import sys
import threading
-import warnings
import weakref
from django.utils import six
-from django.utils.deprecation import RemovedInDjango20Warning
from django.utils.inspect import func_accepts_kwargs
from django.utils.six.moves import range
@@ -126,7 +124,7 @@ class Signal(object):
self.receivers.append((lookup_key, receiver))
self.sender_receivers_cache.clear()
- def disconnect(self, receiver=None, sender=None, weak=None, dispatch_uid=None):
+ def disconnect(self, receiver=None, sender=None, dispatch_uid=None):
"""
Disconnect receiver from sender for signal.
@@ -145,8 +143,6 @@ class Signal(object):
dispatch_uid
the unique identifier of the receiver to disconnect
"""
- if weak is not None:
- warnings.warn("Passing `weak` to disconnect has no effect.", RemovedInDjango20Warning, stacklevel=2)
if dispatch_uid:
lookup_key = (dispatch_uid, _make_id(sender))
else: