Merge remote-tracking branch 'ivanov/rc_context-in-pyplot'

dmcdougall · dmcdougall · commit 5ac976f6da06 · 2013-01-16T19:21:26.000-06:00
Conflicts:
	CHANGELOG
diff --git a/CHANGELOG b/CHANGELOG
@@ -20,6 +20,8 @@
 2012-11-26 deprecate matplotlib/mpl.py, which was used only in pylab.py and is
            now replaced by the more suitable `import matplotlib as mpl`. - PI
 
+2012-11-25 Make rc_context available via pyplot interface - PI
+
 2012-11-16 plt.set_cmap no longer throws errors if there is not already
            an active colorable artist, such as an image, and just sets
            up the colormap to use from that point forward. - PI
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -28,6 +28,7 @@
 from matplotlib.image import imread as _imread
 from matplotlib.image import imsave as _imsave
 from matplotlib import rcParams, rcParamsDefault, get_backend
+from matplotlib import rc_context
 from matplotlib.rcsetup import interactive_bk as _interactive_bk
 from matplotlib.artist import getp, get, Artist
 from matplotlib.artist import setp as _setp
@@ -194,6 +195,10 @@ def pause(interval):
 def rc(*args, **kwargs):
     matplotlib.rc(*args, **kwargs)
 
+@docstring.copy_dedent(matplotlib.rc_context)
+def rc_context(rc=None, fname=None):
+    matplotlib.rc_context(rc, fname)
+
 @docstring.copy_dedent(matplotlib.rcdefaults)
 def rcdefaults():
     matplotlib.rcdefaults()
