[pypy-commit] cffi default: Revert this case to a TypeError.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r945:9dd27fd230ca
Date: 2012-09-19 01:01 +0200
http://bitbucket.org/cffi/cffi/changeset/9dd27fd230ca/

Log:	Revert this case to a TypeError.

diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c
--- a/c/_cffi_backend.c
+++ b/c/_cffi_backend.c
@@ -4019,10 +4019,9 @@
             ct = ct->ct_itemdescr;
         if (!(ct->ct_flags & (CT_STRUCT|CT_UNION)))
             goto typeerror;
-        if (ct->ct_flags & CT_IS_OPAQUE)
-            cf = NULL;
-        else
-            cf = (CFieldObject *)PyDict_GetItem(ct->ct_stuff, fieldname);
+        if (ct->ct_stuff == NULL)
+            goto typeerror;
+        cf = (CFieldObject *)PyDict_GetItem(ct->ct_stuff, fieldname);
         if (cf == NULL) {
             PyErr_SetObject(PyExc_KeyError, fieldname);
             return NULL;
@@ -4037,7 +4036,9 @@
     return Py_BuildValue("(On)", res, offset);
 
  typeerror:
-    PyErr_SetString(PyExc_TypeError, "expected a struct or union ctype");
+    PyErr_SetString(PyExc_TypeError,
+                    "expected an initialized struct or union ctype, "
+                    "or a pointer to it");
     return NULL;
 }
 
diff --git a/c/test_c.py b/c/test_c.py
--- a/c/test_c.py
+++ b/c/test_c.py
@@ -750,7 +750,7 @@
     BInt = new_primitive_type("int")
     BStruct = new_struct_type("foo")
     py.test.raises(TypeError, offsetof, BInt, "abc")
-    py.test.raises(KeyError, offsetof, BStruct, "abc")
+    py.test.raises(TypeError, offsetof, BStruct, "abc")
     complete_struct_or_union(BStruct, [('abc', BInt, -1), ('def', BInt, -1)])
     assert offsetof(BStruct, 'abc') == 0
     assert offsetof(BStruct, 'def') == size_of_int()