mirror of https://github.com/scrapy/scrapy.git
revert warning filter on deprecated class instantiation
This commit is contained in:
parent
23c37dee36
commit
8c81d6c6a9
|
|
@ -99,11 +99,13 @@ class WarnWhenSubclassedTest(unittest.TestCase):
|
|||
self.assertEqual(len(w), 1)
|
||||
assert issubclass(w[0].category, MyWarning)
|
||||
|
||||
# warns once instantations in the same lineno
|
||||
with warnings.catch_warnings(record=True) as w:
|
||||
_i1 = Deprecated()
|
||||
_i2 = Deprecated()
|
||||
for _ in range(10):
|
||||
_i1 = Deprecated()
|
||||
_i2 = Deprecated()
|
||||
|
||||
self.assertEqual(len(w), 1)
|
||||
self.assertEqual(len(w), 2)
|
||||
assert issubclass(w[0].category, MyWarning)
|
||||
|
||||
def test_warning_auto_message(self):
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ def create_deprecated_class(name, new_class, clsdict=None,
|
|||
|
||||
deprecated_class = None
|
||||
warned_on_subclass = False
|
||||
warned_on_instance = False
|
||||
|
||||
def __new__(metacls, name, bases, clsdict_):
|
||||
cls = super(DeprecatedClass, metacls).__new__(metacls, name, bases, clsdict_)
|
||||
|
|
@ -86,8 +85,7 @@ def create_deprecated_class(name, new_class, clsdict=None,
|
|||
def __call__(cls, *args, **kwargs):
|
||||
meta = cls.__class__
|
||||
old = meta.deprecated_class
|
||||
if (cls is old) and not (warn_once and meta.warned_on_instance):
|
||||
meta.warned_on_instance = True
|
||||
if cls is old:
|
||||
msg = instance_warn_message.format(cls=_clspath(cls),
|
||||
new=_clspath(new_class))
|
||||
warnings.warn(msg, warn_category, stacklevel=2)
|
||||
|
|
|
|||
Loading…
Reference in New Issue