fix error supression bug in pywith

Author: Christopher Doris

Diff for: docs/src/releasenotes.md

@@ -1,6 +1,6 @@
 # Release Notes
 
-## 0.9.7
+## 0.9.7 (Unreleased)
 * If CondaPkg is using the Null backend, PythonCall will now use `python` from the PATH.
 * Bug fixes.
 

Diff for: src/compat/with.jl

@@ -14,18 +14,15 @@ function pywith(f, o, d = nothing)
     value = t.__enter__(o)
     exited = false
     try
-        f(value)
+        return f(value)
     catch exc
         if exc isa PyException
             exited = true
             if pytruth(exit(o, exc.t, exc.v, exc.b))
-                rethrow()
-            else
-                d
+                return d
             end
-        else
-            rethrow()
         end
+        rethrow()
     finally
         exited || exit(o, pybuiltins.None, pybuiltins.None, pybuiltins.None)
     end

Diff for: test/compat.jl

@@ -0,0 +1,18 @@
+@testitem "pywith" begin
+    @testset "no error" begin
+        tdir = pyimport("tempfile").TemporaryDirectory()
+        tname = pyconvert(String, tdir.name)
+        @test isdir(tname)
+        pywith(tdir) do name
+            @test pyconvert(String, name) == tname
+        end
+        @test !isdir(tname)
+    end
+    @testset "error" begin
+        tdir = pyimport("tempfile").TemporaryDirectory()
+        tname = pyconvert(String, tdir.name)
+        @test isdir(tname)
+        @test_throws PyException pywith(name -> name.invalid_attr, tdir)
+        @test !isdir(tname)
+    end
+end