[pypy-svn] r75392 - in pypy/release/1.3.x: . pypy/lib/app_test/ctypes_tests

[fijal at codespeak.net]

Author: fijal
Date: Mon Jun 14 18:36:27 2010
New Revision: 75392

Modified:
   pypy/release/1.3.x/   (props changed)
   pypy/release/1.3.x/pypy/lib/app_test/ctypes_tests/test_functions.py
Log:
Merge r75366 from trunk


Modified: pypy/release/1.3.x/pypy/lib/app_test/ctypes_tests/test_functions.py
==============================================================================
--- pypy/release/1.3.x/pypy/lib/app_test/ctypes_tests/test_functions.py	(original)
+++ pypy/release/1.3.x/pypy/lib/app_test/ctypes_tests/test_functions.py	Mon Jun 14 18:36:27 2010
@@ -217,7 +217,7 @@
         class X(Structure):
             _fields_ = [("y", c_int)]
 
-        raises(TypeError, f, X()) #cannot convert parameter
+        raises(ArgumentError, f, X()) #cannot convert parameter
 
     ################################################################
     def test_shorts(self):