Merge pull request #7620 from alanbernstein/add-warning-context

tacaswell · QuLogic · commit 4846dea41d9f · 2017-01-29T21:42:50.000-05:00
ENH: Add warning context to style files
diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py
@@ -188,7 +188,14 @@ def read_style_directory(style_dir):
     """Return dictionary of styles defined in `style_dir`."""
     styles = dict()
     for path, name in iter_style_files(style_dir):
-        styles[name] = rc_params_from_file(path, use_default_template=False)
+        with warnings.catch_warnings(record=True) as warns:
+            styles[name] = rc_params_from_file(path,
+                                               use_default_template=False)
+
+        for w in warns:
+            message = 'In %s: %s' % (path, w.message)
+            warnings.warn(message)
+
     return styles
 
 
diff --git a/lib/matplotlib/tests/test_style.py b/lib/matplotlib/tests/test_style.py
@@ -4,6 +4,7 @@
 import os
 import shutil
 import tempfile
+import warnings
 from collections import OrderedDict
 from contextlib import contextmanager
 
@@ -24,7 +25,8 @@
 @contextmanager
 def temp_style(style_name, settings=None):
     """Context manager to create a style sheet in a temporary directory."""
-    settings = DUMMY_SETTINGS
+    if not settings:
+        settings = DUMMY_SETTINGS
     temp_file = '%s.%s' % (style_name, STYLE_EXTENSION)
 
     # Write style settings to file in the temp directory.
@@ -44,6 +46,18 @@ def temp_style(style_name, settings=None):
         style.reload_library()
 
 
+def test_deprecated_rc_warning_includes_filename():
+    SETTINGS = {'axes.color_cycle': 'ffffff'}
+    basename = 'color_cycle'
+    with warnings.catch_warnings(record=True) as warns:
+        with temp_style(basename, SETTINGS):
+            # style.reload_library() in temp_style() triggers the warning
+            pass
+
+    for w in warns:
+        assert basename in str(w.message)
+
+
 def test_available():
     with temp_style('_test_', DUMMY_SETTINGS):
         assert '_test_' in style.available
