Merge pull request #899 from Kojoley/move-warning-to-user-context

Move warnings to user context
python-jsonschema · Jan 1, 2022 · 480f357 · 480f357
2 parents 405f735 + 15d7cb9
commit 480f357
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/jsonschema/__init__.py b/jsonschema/__init__.py
@@ -46,6 +46,7 @@ def __getattr__(name):
             "removed in a future release. Use importlib.metadata directly "
             "to query for jsonschema's version.",
             DeprecationWarning,
+            stacklevel=2,
         )
 
         try:

diff --git a/jsonschema/tests/test_deprecations.py b/jsonschema/tests/test_deprecations.py
@@ -12,6 +12,7 @@ def test_version(self):
         with self.assertWarns(DeprecationWarning) as w:
             from jsonschema import __version__  # noqa
 
+        self.assertEqual(w.filename, __file__)
         self.assertTrue(
             str(w.warning).startswith(
                 "Accessing jsonschema.__version__ is deprecated",
@@ -27,6 +28,7 @@ def test_validators_ErrorTree(self):
         with self.assertWarns(DeprecationWarning) as w:
             from jsonschema.validators import ErrorTree  # noqa
 
+        self.assertEqual(w.filename, __file__)
         self.assertTrue(
             str(w.warning).startswith(
                 "Importing ErrorTree from jsonschema.validators is deprecated",
@@ -43,6 +45,7 @@ def test_validators_validators(self):
             value = validators.validators
         self.assertEqual(value, validators._VALIDATORS)
 
+        self.assertEqual(w.filename, __file__)
         self.assertTrue(
             str(w.warning).startswith(
                 "Accessing jsonschema.validators.validators is deprecated",
@@ -59,6 +62,7 @@ def test_validators_meta_schemas(self):
             value = validators.meta_schemas
         self.assertEqual(value, validators._META_SCHEMAS)
 
+        self.assertEqual(w.filename, __file__)
         self.assertTrue(
             str(w.warning).startswith(
                 "Accessing jsonschema.validators.meta_schemas is deprecated",
@@ -75,6 +79,7 @@ def test_RefResolver_in_scope(self):
             with resolver.in_scope("foo"):
                 pass
 
+        self.assertEqual(w.filename, __file__)
         self.assertTrue(
             str(w.warning).startswith(
                 "jsonschema.RefResolver.in_scope is deprecated ",
@@ -92,6 +97,7 @@ def test_Validator_is_valid_two_arguments(self):
             result = validator.is_valid("foo", {"type": "number"})
 
         self.assertFalse(result)
+        self.assertEqual(w.filename, __file__)
         self.assertTrue(
             str(w.warning).startswith(
                 "Passing a schema to Validator.is_valid is deprecated ",
@@ -109,6 +115,7 @@ def test_Validator_iter_errors_two_arguments(self):
             error, = validator.iter_errors("foo", {"type": "number"})
 
         self.assertEqual(error.validator, "type")
+        self.assertEqual(w.filename, __file__)
         self.assertTrue(
             str(w.warning).startswith(
                 "Passing a schema to Validator.iter_errors is deprecated ",

diff --git a/jsonschema/validators.py b/jsonschema/validators.py
@@ -33,6 +33,7 @@ def __getattr__(name):
             "Importing ErrorTree from jsonschema.validators is deprecated. "
             "Instead import it from jsonschema.exceptions.",
             DeprecationWarning,
+            stacklevel=2,
         )
         from jsonschema.exceptions import ErrorTree
         return ErrorTree
@@ -41,13 +42,15 @@ def __getattr__(name):
             "Accessing jsonschema.validators.validators is deprecated. "
             "Use jsonschema.validators.validator_for with a given schema.",
             DeprecationWarning,
+            stacklevel=2,
         )
         return _VALIDATORS
     elif name == "meta_schemas":
         warnings.warn(
             "Accessing jsonschema.validators.meta_schemas is deprecated. "
             "Use jsonschema.validators.validator_for with a given schema.",
             DeprecationWarning,
+            stacklevel=2,
         )
         return _META_SCHEMAS
     raise AttributeError(f"module {__name__} has no attribute {name}")
@@ -193,6 +196,7 @@ def iter_errors(self, instance, _schema=None):
                         "iter_errors(...) instead."
                     ),
                     DeprecationWarning,
+                    stacklevel=2,
                 )
             else:
                 _schema = self.schema
@@ -262,6 +266,7 @@ def is_valid(self, instance, _schema=None):
                         "instead."
                     ),
                     DeprecationWarning,
+                    stacklevel=2,
                 )
                 self = self.evolve(schema=_schema)
 
@@ -727,6 +732,7 @@ def in_scope(self, scope):
             "jsonschema.RefResolver.in_scope is deprecated and will be "
             "removed in a future release.",
             DeprecationWarning,
+            stacklevel=3,
         )
         self.push_scope(scope)
         try: