merge

diff --cc Cython/Compiler/Code.py
index 7d4d3d0df7ec98e65596f1c6ccaf0aaa37b94f06,f87039bcc1fb1e3a2f627e73e2193a8f32664d2f..803d0c8556d1f68ed7a2b35b09ddbe5ce1706737
--- 1/Cython/Compiler/Code.py
--- 2/Cython/Compiler/Code.py
+++ b/Cython/Compiler/Code.py
@@@ -474,19 -219,19 +477,19 @@@ class CCodeWriter(object)
      labels_used = funccontext_property("labels_used")
      continue_label = funccontext_property("continue_label")
      break_label = funccontext_property("break_label")
 -
 +    return_from_error_cleanup_label = funccontext_property("return_from_error_cleanup_label")
  
      # Functions delegated to function scope
-     def new_label(self):               return self.funcstate.new_label()
 -    def new_label(self, name=None):    return self.func.new_label(name)
 -    def new_error_label(self):         return self.func.new_error_label()
 -    def get_loop_labels(self):         return self.func.get_loop_labels()
 -    def set_loop_labels(self, labels): return self.func.set_loop_labels(labels)
 -    def new_loop_labels(self):         return self.func.new_loop_labels()
 -    def get_all_labels(self):          return self.func.get_all_labels()
 -    def set_all_labels(self, labels):  return self.func.set_all_labels(labels)
 -    def all_new_labels(self):          return self.func.all_new_labels()
 -    def use_label(self, lbl):          return self.func.use_label(lbl)
 -    def label_used(self, lbl):         return self.func.label_used(lbl)
++    def new_label(self, name=None):    return self.funcstate.new_label(name)
 +    def new_error_label(self):         return self.funcstate.new_error_label()
 +    def get_loop_labels(self):         return self.funcstate.get_loop_labels()
 +    def set_loop_labels(self, labels): return self.funcstate.set_loop_labels(labels)
 +    def new_loop_labels(self):         return self.funcstate.new_loop_labels()
 +    def get_all_labels(self):          return self.funcstate.get_all_labels()
 +    def set_all_labels(self, labels):  return self.funcstate.set_all_labels(labels)
 +    def all_new_labels(self):          return self.funcstate.all_new_labels()
 +    def use_label(self, lbl):          return self.funcstate.use_label(lbl)
 +    def label_used(self, lbl):         return self.funcstate.label_used(lbl)
  
  
      def enter_cfunc_scope(self):

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

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