Merge branch 'master' of github.com:vitek/cython

Cython/Compiler/ModuleNode.py

@@ -139,7 +139,11 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
             h_code.putln("")
             h_code.putln("#endif")
 
-            h_code.copyto(open_new_file(result.h_file))
+            f = open_new_file(result.h_file)
+            try:
+                h_code.copyto(f)
+            finally:
+                f.close()
 
     def generate_public_declaration(self, entry, h_code, i_code):
         h_code.putln("%s %s;" % (
@@ -222,7 +226,11 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
             h_code.putln("")
             h_code.putln("#endif")
 
-            h_code.copyto(open_new_file(result.api_file))
+            f = open_new_file(result.api_file)
+            try:
+                h_code.copyto(f)
+            finally:
+                f.close()
 
     def generate_cclass_header_code(self, type, h_code):
         h_code.putln("%s DL_IMPORT(PyTypeObject) %s;" % (

tests/bugs.txt

@@ -18,6 +18,7 @@ ipow_crash_T562
 pure_mode_cmethod_inheritance_T583
 genexpr_iterable_lookup_T600
 for_from_pyvar_loop_T601
+decorators_T593
 
 # CPython regression tests that don't current work:
 pyregr.test_threadsignals

tests/run/decorators_T593.pyx

+"""
+>>> am_i_buggy
+False
+>>> Foo
+False
+"""
+def testme(func):
+    try:
+        am_i_buggy
+        return True
+    except NameError:
+        return False
+
+@testme
+def am_i_buggy():
+    pass
+
+def testclass(klass):
+    try:
+        Foo
+        return True
+    except NameError:
+        return False
+@testclass
+class Foo:
+    pass
+
+
+def called_deco(a,b,c):
+    def count(f):
+        a.append( (b,c) )
+        return f
+    return count
+
+L = []
+
+@called_deco(L, 5, c=6)
+@called_deco(L, c=3, b=4)
+@called_deco(L, 1, 2)
+def wrapped_func(x):
+    """
+    >>> L
+    [(1, 2), (4, 3), (5, 6)]
+    >>> wrapped_func(99)
+    99
+    >>> L
+    [(1, 2), (4, 3), (5, 6)]
+    """
+    return x
+
+
+def class_in_closure(x):
+    """
+    >>> C1, c0 = class_in_closure(5)
+    >>> C1().smeth1()
+    (5, ())
+    >>> C1.smeth1(1,2)
+    (5, (1, 2))
+    >>> C1.smeth1()
+    (5, ())
+    >>> c0.smeth0()
+    1
+    >>> c0.__class__.smeth0()
+    1
+    """
+    class ClosureClass1(object):
+        @staticmethod
+        def smeth1(*args):
+            return x, args
+
+    class ClosureClass0(object):
+        @staticmethod
+        def smeth0():
+            return 1
+
+    return ClosureClass1, ClosureClass0()
+
+def class_not_in_closure():
+    """
+    >>> c = class_not_in_closure()
+    >>> c.smeth0()
+    1
+    >>> c.__class__.smeth0()
+    1
+    """
+    class ClosureClass0(object):
+        @staticmethod
+        def smeth0():
+            return 1
+
+    return ClosureClass0()
+
+class ODict(dict):
+   def __init__(self):
+       dict.__init__(self)
+       self._order = []
+       dict.__setitem__(self, '_order', self._order)
+   def __setitem__(self, key, value):
+       dict.__setitem__(self, key, value)
+       self._order.append(key)
+
+class Base(type):
+   @staticmethod
+   def __prepare__(*args, **kwargs):
+       return ODict()
+
+class Bar(metaclass=Base):
+   """
+   >>> Bar._order
+   ['__module__', '__doc__', 'bar']
+   """
+   @property
+   def bar(self):
+       return 0