commit ab49684f550ce6b12614b8a329f4d280e20e1277
author Georg Brandl <georg@python.org> Sat Jan 27 17:43:02 2007 +0000
committer Georg Brandl <georg@python.org> Sat Jan 27 17:43:02 2007 +0000
tree f813125ca6d4bbda770e4e3566e470069f917f09
parent 7a7cbae77b417b855bdfe5f7c536893cbefcbb1d

Patch #1638243: the compiler package is now able to correctly compile
a with statement; previously, executing code containing a with statement
compiled by the compiler package crashed the interpreter.

Lib/compiler/pycodegen.py

diff --git a/Lib/compiler/pycodegen.py b/Lib/compiler/pycodegen.py
index 8cf7d77..b46b1c1 100644
--- a/Lib/compiler/pycodegen.py
+++ b/Lib/compiler/pycodegen.py
@@ -849,6 +849,8 @@
         self.emit('LOAD_CONST', None)
         self.nextBlock(final)
         self.setups.push((END_FINALLY, final))
+        self._implicitNameOp('LOAD', exitvar)
+        self._implicitNameOp('DELETE', exitvar)
         self.emit('WITH_CLEANUP')
         self.emit('END_FINALLY')
         self.setups.pop()

Lib/compiler/transformer.py

diff --git a/Lib/compiler/transformer.py b/Lib/compiler/transformer.py
index a16dc55..ac23ad1 100644
--- a/Lib/compiler/transformer.py
+++ b/Lib/compiler/transformer.py
@@ -960,7 +960,7 @@
         if nodelist[2][0] == token.COLON:
             var = None
         else:
-            var = self.com_node(nodelist[2])
+            var = self.com_assign(nodelist[2][2], OP_ASSIGN)
         return With(expr, var, body, lineno=nodelist[0][2])
 
     def com_with_var(self, nodelist):