merged in latest cython-devel

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

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

diff --cc Cython/Compiler/ParseTreeTransforms.py
index 73e72565dce8d0933dc632f1f2498c8b4a540f69,6ea7cc02a257b033088355eddccc0cf354649c8a..6aee9f0a479f69660437822e85cdcf21b6d661bf
--- 1/Cython/Compiler/ParseTreeTransforms.py
--- 2/Cython/Compiler/ParseTreeTransforms.py
+++ b/Cython/Compiler/ParseTreeTransforms.py
@@@ -1467,15 -1359,13 +1451,15 @@@ class CreateClosureClasses(CythonTransf
  
          if not from_closure and (self.path or inner_node):
              if not inner_node:
-                 if not node.assmt:
+                 if not node.py_cfunc_node:
                      raise InternalError, "DefNode does not have assignment node"
-                 inner_node = node.assmt.rhs
+                 inner_node = node.py_cfunc_node
              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

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