make buffer auxilary variables anonymous and keep anonymous variables from...

make buffer auxilary variables anonymous and keep anonymous variables from appearing in locals() and cyfunction.func_code.varnames

Cython/Compiler/Buffer.py

@@ -65,15 +65,15 @@ class IntroduceBufferAuxiliaryVars(CythonTransform):
 
             # Declare auxiliary vars
             cname = scope.mangle(Naming.bufstruct_prefix, name)
-            bufinfo = scope.declare_var(name="$%s" % cname, cname=cname,
+            bufinfo = scope.declare_var(name=None, cname=cname,
                                         type=PyrexTypes.c_py_buffer_type, pos=node.pos)
             if entry.is_arg:
                 bufinfo.used = True # otherwise, NameNode will mark whether it is used
 
             def var(prefix, idx, initval):
                 cname = scope.mangle(prefix, "%d_%s" % (idx, name))
-                result = scope.declare_var("$%s" % cname, PyrexTypes.c_py_ssize_t_type,
-                                         node.pos, cname=cname, is_cdef=True)
+                result = scope.declare_var(None, PyrexTypes.c_py_ssize_t_type,
+                                           node.pos, cname=cname, is_cdef=True)
 
                 result.init = initval
                 if entry.is_arg:

Cython/Compiler/ExprNodes.py

@@ -5270,7 +5270,7 @@ class CodeObjectNode(ExprNode):
         if def_node.starstar_arg:
             args.append(def_node.starstar_arg)
         local_vars = [ arg for arg in def_node.local_scope.var_entries
-                       if arg.name and arg.type.is_pyobject ]
+                       if arg.name ]
         self.varnames = TupleNode(
             def_node.pos,
             args = [ IdentifierStringNode(arg.pos, unicode_value=arg.name,

Cython/Compiler/ParseTreeTransforms.py

@@ -2258,6 +2258,7 @@ class TransformBuiltinMethods(EnvTransform):
             # not the builtin
             return node
         pos = node.pos
+        local_names = [ var.name for var in lenv.entries.values() if var.name ]
         if func_name in ('locals', 'vars'):
             if func_name == 'locals' and len(node.args) > 0:
                 error(self.pos, "Builtin 'locals()' called with wrong number of args, expected 0, got %d"
@@ -2270,9 +2271,9 @@ class TransformBuiltinMethods(EnvTransform):
                 if len(node.args) > 0:
                     return node # nothing to do
             items = [ ExprNodes.DictItemNode(pos,
-                                             key=ExprNodes.StringNode(pos, value=var),
+                                             key=ExprNodes.IdentifierStringNode(pos, value=var),
                                              value=ExprNodes.NameNode(pos, name=var, allow_null=True))
-                      for var in lenv.entries ]
+                      for var in local_names ]
             return ExprNodes.DictNode(pos, key_value_pairs=items, exclude_null_values=True)
         else: # dir()
             if len(node.args) > 1:
@@ -2281,7 +2282,8 @@ class TransformBuiltinMethods(EnvTransform):
             if len(node.args) > 0:
                 # optimised in Builtin.py
                 return node
-            items = [ ExprNodes.StringNode(pos, value=var) for var in lenv.entries ]
+            items = [ ExprNodes.IdentifierStringNode(pos, value=var)
+                      for var in local_names ]
             return ExprNodes.ListNode(pos, args=items)
 
     def visit_SimpleCallNode(self, node):