merge

Cython/Compiler/Code.py

@@ -511,6 +511,11 @@ class GlobalState(object):
         w.putln("}")
         w.exit_cfunc_scope()
 
+        if Options.generate_cleanup_code:
+            w = self.parts['cleanup_globals']
+            w.putln("}")
+            w.exit_cfunc_scope()
+
         if Options.generate_cleanup_code:
             w = self.parts['cleanup_module']
             w.putln("}")

Cython/Compiler/ModuleNode.py

@@ -1780,7 +1780,6 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
 #                code.putln("Py_DECREF(%s); %s = 0;" % (
 #                    code.entry_as_pyobject(entry), entry.cname))
         code.putln("Py_INCREF(Py_None); return Py_None;")
-        code.putln('}')
 
     def generate_main_method(self, env, code):
         module_is_main = "%s%s" % (Naming.module_is_main, self.full_module_name.replace('.', '__'))