[pypy-svn] r57906 - in pypy/dist/pypy/lib: _ctypes app_test/ctypes_tests

[fijal at codespeak.net]

Author: fijal
Date: Sat Sep  6 21:26:37 2008
New Revision: 57906

Modified:
   pypy/dist/pypy/lib/_ctypes/function.py
   pypy/dist/pypy/lib/app_test/ctypes_tests/test_guess_argtypes.py
Log:
Minor fix for guessing types


Modified: pypy/dist/pypy/lib/_ctypes/function.py
==============================================================================
--- pypy/dist/pypy/lib/_ctypes/function.py	(original)
+++ pypy/dist/pypy/lib/_ctypes/function.py	Sat Sep  6 21:26:37 2008
@@ -150,7 +150,7 @@
         for arg in args:
             if hasattr(arg, '_as_parameter_'):
                 arg = arg._as_parameter_
-            if isinstance(arg, str):
+            if isinstance(arg, basestring):
                 res.append(c_char_p)
             elif isinstance(arg, _CData):
                 res.append(type(arg))

Modified: pypy/dist/pypy/lib/app_test/ctypes_tests/test_guess_argtypes.py
==============================================================================
--- pypy/dist/pypy/lib/app_test/ctypes_tests/test_guess_argtypes.py	(original)
+++ pypy/dist/pypy/lib/app_test/ctypes_tests/test_guess_argtypes.py	Sat Sep  6 21:26:37 2008
@@ -18,6 +18,7 @@
     assert guess(['xca']) == [c_char_p]
     assert guess([None]) == [c_void_p]
     assert guess([c_int(3)]) == [c_int]
+    assert guess([u'xca']) == [c_char_p]
 
     class Stuff:
         pass