matplotlib
diff --git a/‎lib/matplotlib/sphinxext/plot_directive.py
Copy file name to clipboardExpand all lines: lib/matplotlib/sphinxext/plot_directive.py
-4Lines changed: 0 additions & 4 deletions b/‎lib/matplotlib/sphinxext/plot_directive.py
Copy file name to clipboardExpand all lines: lib/matplotlib/sphinxext/plot_directive.py
-4Lines changed: 0 additions & 4 deletions
diff --git a/‎lib/matplotlib/sphinxext/tests/test_tinypages.py
Copy file name to clipboardExpand all lines: lib/matplotlib/sphinxext/tests/test_tinypages.py
+6Lines changed: 6 additions & 0 deletions b/‎lib/matplotlib/sphinxext/tests/test_tinypages.py
Copy file name to clipboardExpand all lines: lib/matplotlib/sphinxext/tests/test_tinypages.py
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎lib/matplotlib/sphinxext/tests/tinypages/range4.py
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions b/‎lib/matplotlib/sphinxext/tests/tinypages/range4.py
Copy file name to clipboard
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎lib/matplotlib/sphinxext/tests/tinypages/some_plots.rst
Copy file name to clipboardExpand all lines: lib/matplotlib/sphinxext/tests/tinypages/some_plots.rst
+14Lines changed: 14 additions & 0 deletions b/‎lib/matplotlib/sphinxext/tests/tinypages/some_plots.rst
Copy file name to clipboardExpand all lines: lib/matplotlib/sphinxext/tests/tinypages/some_plots.rst
+14Lines changed: 14 additions & 0 deletions
@@ -651,10 +651,6 @@ def render_figures(code, code_path, output_dir, output_base, context,
 
 
 def run(arguments, content, options, state_machine, state, lineno):
-    # The user may provide a filename *or* Python code content, but not both
-    if arguments and content:
-        raise RuntimeError("plot:: directive can't have both args and content")
-
     document = state_machine.document
     config = document.settings.env.config
     nofigs = 'nofigs' in options
 
@@ -83,3 +83,9 @@ def plot_file(num):
         with open(pjoin(self.html_dir, 'some_plots.html'), 'rt') as fobj:
             html_contents = fobj.read()
         assert_true('# Only a comment' in html_contents)
+        # check plot defined in external file.
+        assert_true(file_same(range_4, plot_file(15)))
+        assert_true(file_same(range_6, plot_file(16)))
+        assert_true(file_same(range_4, plot_file(17)))
+        # check if figure caption made it into html file
+        assert_true('This is the caption for plot 17.')
@@ -0,0 +1,8 @@
+from matplotlib import pyplot as plt
+
+plt.figure()
+plt.plot(range(4))
+
+def range6():
+    plt.figure()
+    plt.plot(range(6))
@@ -114,3 +114,17 @@ Plot 14 uses ``include-source``:
     :include-source:
 
     # Only a comment
+
+Plot 15 uses an external file with the plot commands:
+
+.. plot:: range4.py
+
+Plot 16 uses a specific function in a file with plot commands:
+
+.. plot:: range4.py range6
+	  
+Plot 17 uses an external file and a caption:
+
+.. plot:: range4.py
+
+   This is the caption for plot 17.