diff options
| -rw-r--r-- | astroid/bases.py | 3 | ||||
| -rw-r--r-- | astroid/manager.py | 1 | ||||
| -rw-r--r-- | astroid/mixins.py | 12 | ||||
| -rw-r--r-- | astroid/node_classes.py | 4 | ||||
| -rw-r--r-- | astroid/tests/unittest_inference.py | 17 | ||||
| -rw-r--r-- | astroid/tests/unittest_nodes.py | 32 |
6 files changed, 55 insertions, 14 deletions
diff --git a/astroid/bases.py b/astroid/bases.py index 1d2083d5..b32da908 100644 --- a/astroid/bases.py +++ b/astroid/bases.py @@ -642,7 +642,8 @@ class NodeNG(object): return list(self.infer()) def infered(self): - warnings.warn('%s.infered() is deprecated, use %s.inferred() instead.' + warnings.warn('%s.infered() is deprecated and slated for removal ' + 'in astroid 2.0, use %s.inferred() instead.' % (type(self).__name__, type(self).__name__), PendingDeprecationWarning) return self.inferred() diff --git a/astroid/manager.py b/astroid/manager.py index ede213b0..baf5a673 100644 --- a/astroid/manager.py +++ b/astroid/manager.py @@ -23,7 +23,6 @@ from __future__ import print_function import imp import os -import warnings import zipimport from astroid import exceptions diff --git a/astroid/mixins.py b/astroid/mixins.py index 87834f10..0882268f 100644 --- a/astroid/mixins.py +++ b/astroid/mixins.py @@ -59,8 +59,8 @@ class FilterStmtsMixin(object): return self def ass_type(self): - warnings.warn('%s.ass_type() is deprecated, ' - 'use %s.assign_type() instead.' + warnings.warn('%s.ass_type() is deprecated and slated for removal ' + 'in astroid 2.0, use %s.assign_type() instead.' % (type(self).__name__, type(self).__name__), PendingDeprecationWarning) return self.assign_type() @@ -72,8 +72,8 @@ class AssignTypeMixin(object): return self def ass_type(self): - warnings.warn('%s.ass_type() is deprecated, ' - 'use %s.assign_type() instead.' + warnings.warn('%s.ass_type() is deprecated and slated for removal ' + 'in astroid 2.0, use %s.assign_type() instead.' % (type(self).__name__, type(self).__name__), PendingDeprecationWarning) return self.assign_type() @@ -95,8 +95,8 @@ class ParentAssignTypeMixin(AssignTypeMixin): return self.parent.assign_type() def ass_type(self): - warnings.warn('%s.ass_type() is deprecated, ' - 'use %s.assign_type() instead.' + warnings.warn('%s.ass_type() is deprecated and slated for removal ' + 'in astroid 2.0, use %s.assign_type() instead.' % (type(self).__name__, type(self).__name__), PendingDeprecationWarning) return self.assign_type() diff --git a/astroid/node_classes.py b/astroid/node_classes.py index 5d5cf405..6548007f 100644 --- a/astroid/node_classes.py +++ b/astroid/node_classes.py @@ -665,8 +665,8 @@ class Comprehension(bases.NodeNG): return self def ass_type(self): - warnings.warn('%s.ass_type() is deprecated, ' - 'use %s.assign_type() instead.' + warnings.warn('%s.ass_type() is deprecated and slated for removal' + 'in astroid 2.0, use %s.assign_type() instead.' % (type(self).__name__, type(self).__name__), PendingDeprecationWarning) return self.assign_type() diff --git a/astroid/tests/unittest_inference.py b/astroid/tests/unittest_inference.py index e88e5145..bbbf3ebc 100644 --- a/astroid/tests/unittest_inference.py +++ b/astroid/tests/unittest_inference.py @@ -21,6 +21,7 @@ import os import sys from functools import partial import unittest +import warnings import six @@ -356,7 +357,6 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase): self.assertIs(a2_ancestors[0], b) self.assertIs(a2_ancestors[1], a1) - def test_f_arg_f(self): code = ''' def f(f=1): @@ -370,6 +370,21 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase): self.assertEqual(a_inferred[0].value, 1) self.assertEqual(len(a_inferred), 1) + def test_infered_warning(self): + code = ''' + def f(f=1): + return f + + a = f() + ''' + ast = parse(code, __name__) + a = ast['a'] + + warnings.simplefilter('always') + with warnings.catch_warnings(record=True) as w: + a.infered() + self.assertIsInstance(w[0].message, PendingDeprecationWarning) + def test_exc_ancestors(self): code = ''' def f(): diff --git a/astroid/tests/unittest_nodes.py b/astroid/tests/unittest_nodes.py index afc4fecf..cb79a114 100644 --- a/astroid/tests/unittest_nodes.py +++ b/astroid/tests/unittest_nodes.py @@ -21,6 +21,7 @@ import os import sys import textwrap import unittest +import warnings import six @@ -442,9 +443,9 @@ class NameNodeTest(unittest.TestCase): builder.parse(code) else: ast = builder.parse(code) - ass_true = ast['True'] - self.assertIsInstance(ass_true, nodes.AssignName) - self.assertEqual(ass_true.name, "True") + assign_true = ast['True'] + self.assertIsInstance(assign_true, nodes.AssignName) + self.assertEqual(assign_true.name, "True") del_true = ast.body[2].targets[0] self.assertIsInstance(del_true, nodes.DelName) self.assertEqual(del_true.name, "True") @@ -654,5 +655,30 @@ class AliasesTest(unittest.TestCase): self.assertIsInstance(module.body[0].value, nodes.Backquote) +class DeprecationWarningsTest(unittest.TestCase): + def test_asstype_warnings(self): + string = ''' + class C: pass + c = C() + with warnings.catch_warnings(record=True) as w: + pass + ''' + module = parse(string) + filter_stmts_mixin = module.body[0] + assign_type_mixin = module.body[1].targets[0] + parent_assign_type_mixin = module.body[2] + + warnings.simplefilter('always') + + with warnings.catch_warnings(record=True) as w: + filter_stmts_mixin.ass_type() + self.assertIsInstance(w[0].message, PendingDeprecationWarning) + with warnings.catch_warnings(record=True) as w: + assign_type_mixin.ass_type() + self.assertIsInstance(w[0].message, PendingDeprecationWarning) + with warnings.catch_warnings(record=True) as w: + parent_assign_type_mixin.ass_type() + self.assertIsInstance(w[0].message, PendingDeprecationWarning) + if __name__ == '__main__': unittest.main() |