Merge pull request #811 from kevin1024/graingert-patch-1

return values from generator decorator

tests/unit/test_vcr.py

@@ -372,3 +372,19 @@ def test_path_class_as_cassette():
     )
     with use_cassette(path):
         pass
+
+
+def test_use_cassette_generator_return():
+    ret_val = object()
+
+    vcr = VCR()
+
+    @vcr.use_cassette("test")
+    def gen():
+        return ret_val
+        yield
+
+    with pytest.raises(StopIteration) as exc_info:
+        next(gen())
+
+    assert exc_info.value.value is ret_val

vcr/cassette.py

@@ -125,7 +125,7 @@ class CassetteContextDecorator:
         duration of the generator.
         """
         with self as cassette:
-            yield from fn(cassette)
+            return (yield from fn(cassette))
 
     def _handle_function(self, fn):
         with self as cassette: