Merge pull request #3889 from daeun503/fix-with-test

youknowone · web-flow · commit ebed7280b7d1 · 2022-07-17T21:46:10.000+09:00
Fix testEnterAttributeError2 in test_with.py
diff --git a/Lib/test/test_with.py b/Lib/test/test_with.py
@@ -119,8 +119,6 @@ def fooLacksEnter():
             with foo: pass
         self.assertRaisesRegex(AttributeError, '__enter__', fooLacksEnter)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def testEnterAttributeError2(self):
         class LacksEnterAndExit(object):
             pass
diff --git a/extra_tests/snippets/syntax_async.py b/extra_tests/snippets/syntax_async.py
@@ -1,5 +1,5 @@
 import asyncio
-
+import unittest
 
 class ContextManager:
     async def __aenter__(self):
@@ -70,3 +70,44 @@ async def a(s, m):
     "hello3",
     "hello4",
 ]
+
+
+class TestAsyncWith(unittest.TestCase):
+    def testAenterAttributeError1(self):
+        class LacksAenter(object):
+            async def __aexit__(self, *exc):
+                pass
+
+        async def foo():
+            async with LacksAenter():
+                pass
+        
+        with self.assertRaisesRegex(AttributeError, '__aenter__'):
+            foo().send(None)
+
+    def testAenterAttributeError2(self):
+        class LacksAenterAndAexit(object):
+            pass
+
+        async def foo():
+            async with LacksAenterAndAexit():
+                pass
+
+        with self.assertRaisesRegex(AttributeError, '__aenter__'):
+            foo().send(None)
+
+    def testAexitAttributeError(self):
+        class LacksAexit(object):
+            async def __aenter__(self):
+                pass
+
+        async def foo():
+            async with LacksAexit():
+                pass
+            
+        with self.assertRaisesRegex(AttributeError, '__aexit__'):
+            foo().send(None)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -775,20 +775,23 @@ impl ExecutingFrame<'_> {
             }
             bytecode::Instruction::SetupWith { end } => {
                 let context_manager = self.pop_value();
+                let enter_res = vm.call_special_method(
+                    context_manager.clone(),
+                    identifier!(vm, __enter__),
+                    (),
+                )?;
                 let exit = context_manager.get_attr(identifier!(vm, __exit__), vm)?;
                 self.push_value(exit);
-                // Call enter:
-                let enter_res =
-                    vm.call_special_method(context_manager, identifier!(vm, __enter__), ())?;
                 self.push_block(BlockType::Finally { handler: *end });
                 self.push_value(enter_res);
                 Ok(None)
             }
             bytecode::Instruction::BeforeAsyncWith => {
                 let mgr = self.pop_value();
+                let aenter_res =
+                    vm.call_special_method(mgr.clone(), identifier!(vm, __aenter__), ())?;
                 let aexit = mgr.get_attr(identifier!(vm, __aexit__), vm)?;
                 self.push_value(aexit);
-                let aenter_res = vm.call_special_method(mgr, identifier!(vm, __aenter__), ())?;
                 self.push_value(aenter_res);
 
                 Ok(None)
