Merge remote branch 'upstream/master'

Cython/Compiler/ModuleNode.py

@@ -168,7 +168,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
         return env.qualified_name.replace(".", "__")
     
     def generate_api_code(self, env, result):
-        def api_entries(entries, pxd=1):
+        def api_entries(entries, pxd=0):
             return [entry for entry in entries
                     if entry.api or (pxd and entry.defined_in_pxd)]
         api_vars = api_entries(env.var_entries)

Cython/Compiler/Nodes.py

@@ -1257,9 +1257,10 @@ class FuncDefNode(StatNode, BlockNode):
                     preprocessor_guard = None
 
         profile = code.globalstate.directives['profile']
+        if profile and lenv.nogil:
+            warning(self.pos, "Cannot profile nogil function.", 1)
+            profile = False
         if profile:
-            if lenv.nogil:
-                error(self.pos, "Cannot profile nogil function.")
             code.globalstate.use_utility_code(profile_utility_code)
 
         # Generate C code for header and body of function

Cython/Compiler/ParseTreeTransforms.py

@@ -320,6 +320,20 @@ class PostParse(ScopeTrackingTransform):
 
         return assign_node
 
+    def _flatten_sequence(self, seq, result):
+        for arg in seq.args:
+            if arg.is_sequence_constructor:
+                self._flatten_sequence(arg, result)
+            else:
+                result.append(arg)
+        return result
+
+    def visit_DelStatNode(self, node):
+        self.visitchildren(node)
+        node.args = self._flatten_sequence(node, [])
+        return node
+
+
 def eliminate_rhs_duplicates(expr_list_list, ref_node_sequence):
     """Replace rhs items by LetRefNodes if they appear more than once.
     Creates a sequence of LetRefNodes that set up the required temps

tests/run/delete.pyx

@@ -87,3 +87,12 @@ def del_local(a):
     """
     del a
     assert a is None # Until we have unbound locals...
+
+def del_seq(a, b, c):
+    """
+    >>> del_seq(1, 2, 3)
+    """
+    del a, (b, c)
+    assert a is None # Until we have unbound locals...
+    assert b is None # Until we have unbound locals...
+    assert c is None # Until we have unbound locals...

tests/run/pstats_profile_test.pyx

@@ -20,6 +20,23 @@ __doc__ = u"""
     KeyError: 'f_noprof'
     >>> short_stats['f_raise']
     100
+
+    >>> short_stats['withgil_prof']
+    100
+    >>> short_stats['withgil_noprof']
+    Traceback (most recent call last):
+    ...
+    KeyError: 'withgil_noprof'
+
+    >>> short_stats['nogil_prof']
+    Traceback (most recent call last):
+    ...
+    KeyError: 'nogil_prof'
+    >>> short_stats['nogil_noprof']
+    Traceback (most recent call last):
+    ...
+    KeyError: 'nogil_noprof'
+
     >>> try:
     ...    os.unlink(statsfile)
     ... except:
@@ -43,6 +60,10 @@ def test_profile(long N):
         n += f_inline(i)
         n += f_inline_prof(i)
         n += f_noprof(i)
+        n += nogil_noprof(i)
+        n += nogil_prof(i)
+        n += withgil_noprof(i)
+        n += withgil_prof(i)
         try:
             n += f_raise(i+2)
         except RuntimeError:
@@ -68,3 +89,18 @@ cdef int f_noprof(long a):
 
 cdef long f_raise(long) except -2:
     raise RuntimeError
+
+@cython.profile(False)
+cdef int withgil_noprof(long a) with gil:
+    return (a)
+@cython.profile(True)
+cdef int withgil_prof(long a) with gil:
+    return (a)
+
+@cython.profile(False)
+cdef int nogil_noprof(long a) nogil:
+    return a
+@cython.profile(True)
+cdef int nogil_prof(long a) nogil:
+    return a
+