merged reverted patches from cython-devel

diff --cc Cython/Compiler/Nodes.py
Simple merge

diff --cc Cython/Compiler/ParseTreeTransforms.py
index 6aee9f0a479f69660437822e85cdcf21b6d661bf,76e7ea97ed708639dc30c32bf21a472e2acca0c3..73e72565dce8d0933dc632f1f2498c8b4a540f69
--- 1/Cython/Compiler/ParseTreeTransforms.py
--- 2/Cython/Compiler/ParseTreeTransforms.py
+++ b/Cython/Compiler/ParseTreeTransforms.py
@@@ -1451,15 -1375,13 +1467,15 @@@ class CreateClosureClasses(CythonTransf
  
          if not from_closure and (self.path or inner_node):
              if not inner_node:
-                 if not node.py_cfunc_node:
+                 if not node.assmt:
                      raise InternalError, "DefNode does not have assignment node"
-                 inner_node = node.py_cfunc_node
+                 inner_node = node.assmt.rhs
              inner_node.needs_self_code = False
              node.needs_outer_scope = False
 -        # Simple cases
 -        if not in_closure and not from_closure:
 +
 +        if node.is_generator:
 +            generator_class = self.create_generator_class(target_module_scope, node.pos)
 +        elif not in_closure and not from_closure:
              return
          elif not in_closure:
              func_scope.is_passthrough = True