Merge pull request #1095 from charlesfrye/1091_regexremove

Change RegExRemove to remove code cells with output

nbconvert/preprocessors/regexremove.py

@@ -40,8 +40,7 @@ class RegexRemovePreprocessor(Preprocessor):
 
     def check_conditions(self, cell):
         """
-        Checks that a cell matches the pattern and that (if a code cell)
-        it does not have any outputs.
+        Checks that a cell matches the pattern.
 
         Returns: Boolean.
         True means cell should *not* be removed.
@@ -54,7 +53,7 @@ def check_conditions(self, cell):
                              for pattern in self.patterns))
 
         # Filter out cells that meet the pattern and have no outputs
-        return cell.get('outputs') or not pattern.match(cell.source)
+        return not pattern.match(cell.source)
 
     def preprocess(self, nb, resources):
         """

nbconvert/preprocessors/tests/test_regexremove.py

@@ -69,24 +69,3 @@ def test_output(self):
                 for pattern in patterns:
                     self.assertFalse(pattern.match(cell.source))
 
-    def test_nosource_with_output(self):
-        """
-        Test that the check_conditions returns true when given a code-cell
-        that has non-empty outputs but no source.
-        """
-
-        cell = {
-            'cell_type': 'code',
-            'execution_count': 2,
-            'metadata': {},
-            'outputs': [{
-                'name': 'stdout',
-                'output_type': 'stream',
-                'text': 'I exist.\n'
-            }],
-            'source': ''
-        }
-        preprocessor = self.build_preprocessor()
-        node = from_dict(cell)
-        assert preprocessor.check_conditions(node)
-