fix url rc specification

adrn · tonysyu · commit ea63c99b71ab · 2013-11-17T14:04:47.000-06:00
smoothed over conflicts

add test for URL stylesheet

whoops, remove extraneous regex I added...

move test to proper location

arg, don't need urllib2 either...didn't realize functionality was in core mpl
diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py
@@ -29,7 +29,6 @@
 STYLE_EXTENSION = 'mplstyle'
 STYLE_FILE_PATTERN = re.compile('([\S]+).%s$' % STYLE_EXTENSION)
 
-
 def is_style_file(filename):
     """Return True if the filename looks like a style file."""
     return STYLE_FILE_PATTERN.match(filename) is not None
@@ -49,15 +48,18 @@ def use(name):
         name = [name]
 
     for style in name:
-        if is_style_file(style):
-            settings = rc_params_from_file(style, use_default_template=False)
-            mpl.rcParams.update(settings)
-        elif style not in library:
-            msg = ("'%s' not found in the style library. "
-                   "See `style.available` for list of available styles.")
-            raise ValueError(msg % style)
-        else:
+        if style in library:
             mpl.rcParams.update(library[style])
+        else:
+            try:
+                settings = mpl.rc_params_in_file(style)
+                mpl.rcParams.update(settings)
+            except:
+                msg = ("'%s' not found in the style library and input is "
+                       "not a valid URL. See `style.available` for list of "
+                       "available styles.")
+                raise ValueError(msg % style)
+
 
 
 @contextlib.contextmanager
diff --git a/lib/matplotlib/tests/test_style.py b/lib/matplotlib/tests/test_style.py
@@ -46,6 +46,11 @@ def test_use():
         style.use('test')
         assert mpl.rcParams[PARAM] == VALUE
 
+def test_use_url():
+    with temp_style('test', DUMMY_SETTINGS):
+        style.use('https://gist.github.com/adrn/6590261/raw')
+
+    assert mpl.rcParams['axes.facecolor'] == "adeade"
 
 def test_context():
     mpl.rcParams[PARAM] = 'gray'
