merge 0.20.x branch into master

Cython/Compiler/PyrexTypes.py

@@ -2875,7 +2875,8 @@ class CStructOrUnionType(CType):
         if env.outer_scope is None:
             return False
 
-        if self._convert_to_py_code is False: return None  # tri-state-ish
+        if self._convert_to_py_code is False:
+            return None  # tri-state-ish
 
         if self._convert_to_py_code is None:
             for member in self.scope.var_entries:
@@ -2893,7 +2894,8 @@ class CStructOrUnionType(CType):
         if env.outer_scope is None:
             return False
 
-        if self._convert_from_py_code is False: return None  # tri-state-ish
+        if self._convert_from_py_code is False:
+            return None  # tri-state-ish
 
         if self._convert_from_py_code is None:
             for member in self.scope.var_entries:

tests/run/struct_conversion_extern.pyx

+"""
+Note: this tests if the necessary utility code is included in the module env,
+despite potentially being already created before.
+"""
+
+cdef extern from "struct_conversion_extern_header.h":
+    cdef struct my_date_t:
+        int year
+        int month
+        int day
+
+
+def test_extern_struct():
+    """
+    >>> test_extern_struct()
+    [('day', 24), ('month', 6), ('year', 2000)]
+    """
+    cdef my_date_t day = my_date_t(year=2000, month=6, day=24)
+    cdef object d = day
+    assert type(d) is dict
+    assert d == day
+    return sorted(day.items())

tests/run/struct_conversion_extern_header.h

+struct my_date_t {
+    int year;
+    int month;
+    int day;
+};