[ctypes-commit] ctypes/unittests test_functions.py,1.38,1.39

[Thomas H. <th...@us...>]

Update of /cvsroot/ctypes/ctypes/unittests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28916

Modified Files:
	test_functions.py 
Log Message:
Make it somewhat simpler.


Index: test_functions.py
===================================================================
RCS file: /cvsroot/ctypes/ctypes/unittests/test_functions.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** test_functions.py	14 Oct 2004 13:16:13 -0000	1.38
--- test_functions.py	22 Oct 2004 19:33:52 -0000	1.39
***************
*** 15,28 ****
      WINFUNCTYPE = CFUNCTYPE
  
! def find_test_dll():
!     import _ctypes_test
!     return _ctypes_test.__file__
  
  class FunctionTestCase(unittest.TestCase):
  
-     def setUp(self):
-         global dll
-         dll = CDLL(find_test_dll())
- 
      def test_mro(self):
          # in Python 2.3, this raises TypeError: MRO conflict among bases classes,
--- 15,23 ----
      WINFUNCTYPE = CFUNCTYPE
  
! import _ctypes_test
! dll = CDLL(_ctypes_test.__file__)
  
  class FunctionTestCase(unittest.TestCase):
  
      def test_mro(self):
          # in Python 2.3, this raises TypeError: MRO conflict among bases classes,
***************
*** 162,165 ****
--- 157,161 ----
      def test_stringresult(self):
          f = dll._testfunc_p_p
+         f.argtypes = None
          f.restype = c_char_p
          result = f("123")