From: Stefan Behnel Date: Wed, 2 Jun 2010 06:48:40 +0000 (+0200) Subject: reverted temp name changes - wrong 'fix' X-Git-Tag: 0.13.beta0~53 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1847ab3d3f08e5f69c1fb72cb750aa292da75912;p=cython.git reverted temp name changes - wrong 'fix' --- diff --git a/Cython/Compiler/ParseTreeTransforms.py b/Cython/Compiler/ParseTreeTransforms.py index 8d66b7d1..adb41c3c 100644 --- 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 6da04ac9..66feaf09 100644 --- 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)