Fixed typos, using Naming for temp prefixes

diff --git a/Cython/Compiler/Naming.py b/Cython/Compiler/Naming.py
index 3b89f7575b9756eb920f580a63b59ba7a5d8226b..4598e5b72eb69182bfd709a109c2ba8dd4179b4c 100644 (file)
--- a/Cython/Compiler/Naming.py
+++ b/Cython/Compiler/Naming.py
@@ -8,7 +8,7 @@
 
 pyrex_prefix    = "__pyx_"
 
-temp_prefix       = "__pyxtmp_"
+temp_prefix       = u"__cyt_"
 
 builtin_prefix    = pyrex_prefix + "builtin_"
 arg_prefix        = pyrex_prefix + "arg_"

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index c985e0d1954dd9c93fce936f9d8a0b906c8e4213..3541e67e56e314cfe4ffdb07f0120c4d71056504 100644 (file)
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -3330,17 +3330,19 @@ class ExceptClauseNode(Node):
     #  target         ExprNode or None
     #  body           StatNode
     #  excinfo_target NameNode or None   optional target for exception info
-    #  excinfo_target NameNode or None   used internally
     #  match_flag     string             result of exception match
     #  exc_value      ExcValueNode       used internally
     #  function_name  string             qualified name of enclosing function
     #  exc_vars       (string * 3)       local exception variables
+
+    # excinfo_target is never set by the parser, but can be set by a transform
+    # in order to extract more extensive information about the exception as a
+    # sys.exc_info()-style tuple into a target variable
     
     child_attrs = ["pattern", "target", "body", "exc_value", "excinfo_target"]
 
     exc_value = None
     excinfo_target = None
-    excinfo_assignment = None
 
     def analyse_declarations(self, env):
         if self.target:

diff --git a/Cython/Compiler/Visitor.py b/Cython/Compiler/Visitor.py
index 7dcfcf2d20e15b07929484e3082a34530c545847..0f9623d235a1c13921ef2cbc4c2a9e37fa53185e 100644 (file)
--- a/Cython/Compiler/Visitor.py
+++ b/Cython/Compiler/Visitor.py
@@ -1,9 +1,10 @@
 #
 #   Tree visitor and transform framework
 #
+import inspect
 import Nodes
 import ExprNodes
-import inspect
+import Naming
 from Cython.Utils import EncodedString
 
 class BasicVisitor(object):
@@ -171,7 +172,7 @@ tmpnamectr = 0
 def temp_name_handle(description):
     global tmpnamectr
     tmpnamectr += 1
-    return EncodedString(u"__cyt_%d_%s" % (tmpnamectr, description))
+    return EncodedString(Naming.temp_prefix + u"%d_%s" % (tmpnamectr, description))
 
 def get_temp_name_handle_desc(handle):
     if not handle.startswith(u"__cyt_"):