merge

tests/bugs.txt

@@ -20,6 +20,7 @@ slice2_T636
 builtin_subtype_methods_T653
 dict_values_in_expression
 builtin_float
+inherited_final_method
 
 # CPython regression tests that don't current work:
 pyregr.test_signal

tests/run/and.pyx

@@ -59,3 +59,19 @@ def and2_literal():
     5
     """
     return True and 5
+
+def c_int_results(int x):
+    """
+    >>> c_int_results(7)
+    (0, 0)
+    >>> c_int_results(5)
+    (1, 1)
+    """
+    cdef int expr1, expr2, r1, r2
+
+    expr1 = x == 5
+    expr2 = 1
+    r1 = expr1 and expr2
+
+    r2 = (x==5) and 1
+    return r1, r2

tests/run/cmethod_inline_T474.pyx

@@ -10,8 +10,9 @@ cdef class TestInlineMethod(object):
     0
     """
 
-    @cython.test_assert_path_exists("//AttributeNode[@entry.is_final_cmethod=True]")
-    @cython.test_assert_path_exists("//AttributeNode[@entry.is_inline_cmethod=True]")
+    @cython.test_assert_path_exists(
+        "//AttributeNode[@entry.is_inline_cmethod=True]",
+        "//AttributeNode[@entry.is_final_cmethod=True]")
     def test_cdef_method(self):
         return self.cdef_inline_method()
 
@@ -23,7 +24,8 @@ cdef class Subtyping(TestInlineMethod):
     0
     """
 
-    @cython.test_assert_path_exists("//AttributeNode[@entry.is_final_cmethod=True]")
-    @cython.test_assert_path_exists("//AttributeNode[@entry.is_inline_cmethod=True]")
+    @cython.test_assert_path_exists(
+        "//AttributeNode[@entry.is_inline_cmethod=True]",
+        "//AttributeNode[@entry.is_final_cmethod=True]")
     def test_cdef_subtyping(self):
         return self.cdef_inline_method()