reverted temp name changes - wrong 'fix'

diff --git a/Cython/Compiler/ParseTreeTransforms.py b/Cython/Compiler/ParseTreeTransforms.py
index 8d66b7d1ab14ec733d532302cb13c34dd008b6f9..adb41c3c22ab06edaeeaea52acf05b2f43bc9704 100644 (file)
--- a/Cython/Compiler/ParseTreeTransforms.py
+++ b/Cython/Compiler/ParseTreeTransforms.py
@@ -863,7 +863,7 @@ class WithTransform(CythonTransform, SkipDeclarations):
     def visit_WithStatNode(self, node):
         # TODO: Cleanup badly needed
         TemplateTransform.temp_name_counter += 1
-        handle = EncodedString("__tmpvar_%d" % TemplateTransform.temp_name_counter)
+        handle = "__tmpvar_%d" % TemplateTransform.temp_name_counter
         
         self.visitchildren(node, ['body'])
         excinfo_temp = NameNode(node.pos, name=handle)#TempHandle(Builtin.tuple_type)

diff --git a/Cython/Compiler/TreeFragment.py b/Cython/Compiler/TreeFragment.py
index 6da04ac9f9f07bc87ce54b8a04c474c44a7dbf5f..66feaf09e611a34aebd241afba0280bdcda8bd99 100644 (file)
--- a/Cython/Compiler/TreeFragment.py
+++ b/Cython/Compiler/TreeFragment.py
@@ -14,7 +14,6 @@ from ExprNodes import NameNode
 import Parsing
 import Main
 import UtilNodes
-import StringEncoding
 
 """
 Support for parsing strings into code trees.
@@ -121,7 +120,7 @@ class TemplateTransform(VisitorTransform):
         temphandles = []
         for temp in temps:
             TemplateTransform.temp_name_counter += 1
-            handle = StringEncoding.EncodedString("__tmpvar_%d" % TemplateTransform.temp_name_counter)
+            handle = "__tmpvar_%d" % TemplateTransform.temp_name_counter
 #            handle = UtilNodes.TempHandle(PyrexTypes.py_object_type)
             tempmap[temp] = handle
 #            temphandles.append(handle)