Commits

Ronald Oussoren committed bd7e060

- Update documentation for the new example
- Deprecate objc.pyobjc_unicode.syncNSString
- Some gnustep fixes

Comments (0)

Files changed (16)

pyobjc/Doc/gnustep.txt

 make the GNUstep port as stable as the MacOS X "port".
 
 The GNUstep port was primarily developed on Linux i86 (specifically 
-the Debian testing distribution), using python 2.2.3, gcc 3.3.2 and 
+the Debian testing distribution), using python 2.3.2,  gcc 3.3.2 and 
 gnustep-base 1.7.3-1. The code in setup.py works for this configuration,
 but probably not for other configurations.
 

pyobjc/Examples/00ReadMe.txt

   port of Apple's "CocoaGL" example.  Note that this requires `PyOpenGL`_ to 
   be installed.
 
+* `SillyBallsSaver`_
+
+  A simple screensaver written in Python. This example requires a framework
+  install of Python, that is either MacOS X 10.3 or a MacPython 2.3 
+  installation.
+
 .. _`PyOpenGL`:  http://pyopengl.sourceforge.net/
 .. _`ClassBrowser`: ClassBrowser
 .. _`CurrencyConverter`: CurrencyConverter
 .. _`FieldGraph`: FieldGraph
 .. _`PyInterpreter`: PyInterpreter
 .. _`OpenGLDemo`: OpenGLDemo
+.. _`SillyBallsSaver`: SillyBallsSaver

pyobjc/Lib/Foundation/test/test_keyvalue.py

 """
 import objc
 import unittest
+import sys
 from objc.test.testbndl import PyObjC_TestClass3 as STUB
 
 class KeyValueClass1 (objc.runtime.NSObject):
             o.takeStoredValue_forKey_, "value", "unknownKey")
 
     def testKVO(self):
+        # MacOS X 10.3 ?
         o = KVOClass.alloc().init()
         o.addObserver_forKeyPath_options_context_(self, "test", 0, 0)
 

pyobjc/Lib/objc/test/test_classandinst.py

 import unittest
 import objc
-from testclassandinst import PyObjC_TestClassAndInstance
+from objc.test.testclassandinst import PyObjC_TestClassAndInstance
 
 class PyObjC_TestClassAndInstanceSubclass(PyObjC_TestClassAndInstance):
     """Simple subclass, just make sure it still works"""

pyobjc/Lib/objc/test/test_methods2.py

 
 # First make sure that the pass-by-reference methods have the correct signature
 setSignature = objc.setSignatureForSelector
-setSignature("PyObjC_TestClass1", "boolInOutArg:", "@@:N^B")
-setSignature("PyObjC_TestClass1", "boolOutArg:", "v@:o^B")
-setSignature("PyObjC_TestClass1", "boolInArg:", "@@:n^B")
-setSignature("PyObjC_TestClass2", "callboolInOutArg:of:", "@@:N^B@")
-setSignature("PyObjC_TestClass2", "callboolOutArg:of:", "v@:o^B@")
-setSignature("PyObjC_TestClass2", "callboolInArg:of:", "@@:n^B@")
-setSignature("PyObjC_TestClass2", "invokeboolInOutArg:of:", "@@:N^B@")
-setSignature("PyObjC_TestClass2", "invokeboolOutArg:of:", "v@:o^B@")
-setSignature("PyObjC_TestClass2", "invokeboolInArg:of:", "@@:n^B@")
-setSignature("PyObjC_TestClass1", "BOOLInOutArg:", "@@:N^c")
-setSignature("PyObjC_TestClass1", "BOOLOutArg:", "v@:o^c")
-setSignature("PyObjC_TestClass1", "BOOLInArg:", "@@:n^c")
-setSignature("PyObjC_TestClass2", "callBOOLInOutArg:of:", "@@:N^c@")
-setSignature("PyObjC_TestClass2", "callBOOLOutArg:of:", "v@:o^c@")
-setSignature("PyObjC_TestClass2", "callBOOLInArg:of:", "@@:n^c@")
-setSignature("PyObjC_TestClass2", "invokeBOOLInOutArg:of:", "@@:N^c@")
-setSignature("PyObjC_TestClass2", "invokeBOOLOutArg:of:", "v@:o^c@")
-setSignature("PyObjC_TestClass2", "invokeBOOLInArg:of:", "@@:n^c@")
+setSignature("PyObjC_TestClass1", "BOOLInOutArg:", "@@:N^C")
+setSignature("PyObjC_TestClass1", "BOOLOutArg:", "v@:o^C")
+setSignature("PyObjC_TestClass1", "BOOLInArg:", "@@:n^C")
+setSignature("PyObjC_TestClass2", "callBOOLInOutArg:of:", "@@:N^C@")
+setSignature("PyObjC_TestClass2", "callBOOLOutArg:of:", "v@:o^C@")
+setSignature("PyObjC_TestClass2", "callBOOLInArg:of:", "@@:n^C@")
+setSignature("PyObjC_TestClass2", "invokeBOOLInOutArg:of:", "@@:N^C@")
+setSignature("PyObjC_TestClass2", "invokeBOOLOutArg:of:", "v@:o^C@")
+setSignature("PyObjC_TestClass2", "invokeBOOLInArg:of:", "@@:n^C@")
 setSignature("PyObjC_TestClass1", "charInOutArg:", "@@:N^c")
 setSignature("PyObjC_TestClass1", "charOutArg:", "v@:o^c")
 setSignature("PyObjC_TestClass1", "charInArg:", "@@:n^c")
 	# Test calling Objective-C from Python
 	# Simple returns from class methods
 
-	def testClsboolResult(self):
-		PyObjC_TestClass1.clsReset()
-		self.assertEquals(PyObjC_TestClass1.boolClsMethod(), YES)
-		self.assertEquals(PyObjC_TestClass1.boolClsMethod(), NO)
-
-
 	def testClsBOOLResult(self):
 		PyObjC_TestClass1.clsReset()
 		self.assertEquals(PyObjC_TestClass1.BOOLClsMethod(), YES)
 
 	# Simple returns from instance methods
 
-	def testboolResult(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		o.reset()
-		self.assertEquals(o.boolMethod(), YES)
-		self.assertEquals(o.boolMethod(), NO)
-
-
 	def testBOOLResult(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 
 	# One argument
 
-	def testboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_(YES)
-		self.assertEquals(r, YES)
-		r = o.boolArg_(NO)
-		self.assertEquals(r, NO)
-
-
 	def testBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 
 	# Two arguments
 
-	def testboolAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andboolArg_(YES, YES)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], YES)
-		r = o.boolArg_andboolArg_(YES, NO)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], NO)
-		r = o.boolArg_andboolArg_(NO, YES)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], YES)
-		r = o.boolArg_andboolArg_(NO, NO)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], NO)
-
-
-	def testboolAndBOOLArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andBOOLArg_(YES, YES)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], YES)
-		r = o.boolArg_andBOOLArg_(YES, NO)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], NO)
-		r = o.boolArg_andBOOLArg_(NO, YES)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], YES)
-		r = o.boolArg_andBOOLArg_(NO, NO)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], NO)
-
-
-	def testboolAndcharArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andcharArg_(YES, -128)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], -128)
-		r = o.boolArg_andcharArg_(YES, 0)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andcharArg_(YES, 127)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 127)
-		r = o.boolArg_andcharArg_(NO, -128)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], -128)
-		r = o.boolArg_andcharArg_(NO, 0)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andcharArg_(NO, 127)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 127)
-
-
-	def testboolAndsignedshortArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andsignedshortArg_(YES, -(1<<14))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], -(1<<14))
-		r = o.boolArg_andsignedshortArg_(YES, -42)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], -42)
-		r = o.boolArg_andsignedshortArg_(YES, 0)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andsignedshortArg_(YES, 42)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andsignedshortArg_(YES, 1 << 14)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 1 << 14)
-		r = o.boolArg_andsignedshortArg_(NO, -(1<<14))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], -(1<<14))
-		r = o.boolArg_andsignedshortArg_(NO, -42)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], -42)
-		r = o.boolArg_andsignedshortArg_(NO, 0)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andsignedshortArg_(NO, 42)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andsignedshortArg_(NO, 1 << 14)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 1 << 14)
-
-
-	def testboolAndsignedintArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andsignedintArg_(YES, -(1<<30))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], -(1<<30))
-		r = o.boolArg_andsignedintArg_(YES, -42)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], -42)
-		r = o.boolArg_andsignedintArg_(YES, 0)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andsignedintArg_(YES, 42)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andsignedintArg_(YES, 1 << 30)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 1 << 30)
-		r = o.boolArg_andsignedintArg_(NO, -(1<<30))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], -(1<<30))
-		r = o.boolArg_andsignedintArg_(NO, -42)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], -42)
-		r = o.boolArg_andsignedintArg_(NO, 0)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andsignedintArg_(NO, 42)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andsignedintArg_(NO, 1 << 30)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 1 << 30)
-
-
-	def testboolAndsignedlongArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andsignedlongArg_(YES, -(1<<30))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], -(1<<30))
-		r = o.boolArg_andsignedlongArg_(YES, -42)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], -42)
-		r = o.boolArg_andsignedlongArg_(YES, 0)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andsignedlongArg_(YES, 42)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andsignedlongArg_(YES, 1 << 30)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 1 << 30)
-		r = o.boolArg_andsignedlongArg_(NO, -(1<<30))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], -(1<<30))
-		r = o.boolArg_andsignedlongArg_(NO, -42)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], -42)
-		r = o.boolArg_andsignedlongArg_(NO, 0)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andsignedlongArg_(NO, 42)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andsignedlongArg_(NO, 1 << 30)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 1 << 30)
-
-
-	def testboolAndsignedlonglongArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andsignedlonglongArg_(YES, -(1L << 60))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], -(1L << 60))
-		r = o.boolArg_andsignedlonglongArg_(YES, -42)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], -42)
-		r = o.boolArg_andsignedlonglongArg_(YES, 0)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andsignedlonglongArg_(YES, 42)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andsignedlonglongArg_(YES, 1L << 60)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 1L << 60)
-		r = o.boolArg_andsignedlonglongArg_(NO, -(1L << 60))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], -(1L << 60))
-		r = o.boolArg_andsignedlonglongArg_(NO, -42)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], -42)
-		r = o.boolArg_andsignedlonglongArg_(NO, 0)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andsignedlonglongArg_(NO, 42)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andsignedlonglongArg_(NO, 1L << 60)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 1L << 60)
-
-
-	def testboolAndunsignedcharArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andunsignedcharArg_(YES, 0)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andunsignedcharArg_(YES, 128)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 128)
-		r = o.boolArg_andunsignedcharArg_(YES, 255)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 255)
-		r = o.boolArg_andunsignedcharArg_(NO, 0)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andunsignedcharArg_(NO, 128)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 128)
-		r = o.boolArg_andunsignedcharArg_(NO, 255)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 255)
-
-
-	def testboolAndunsignedshortArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andunsignedshortArg_(YES, 0)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andunsignedshortArg_(YES, 42)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andunsignedshortArg_(YES, 1<<14)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 1<<14)
-		r = o.boolArg_andunsignedshortArg_(NO, 0)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andunsignedshortArg_(NO, 42)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andunsignedshortArg_(NO, 1<<14)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 1<<14)
-
-
-	def testboolAndunsignedintArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andunsignedintArg_(YES, 0)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andunsignedintArg_(YES, 42)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andunsignedintArg_(YES, 1 << 30)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 1 << 30)
-		r = o.boolArg_andunsignedintArg_(NO, 0)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andunsignedintArg_(NO, 42)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andunsignedintArg_(NO, 1 << 30)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 1 << 30)
-
-
-	def testboolAndunsignedlongArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andunsignedlongArg_(YES, 0)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andunsignedlongArg_(YES, 42)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andunsignedlongArg_(YES, 1L << 30)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 1L << 30)
-		r = o.boolArg_andunsignedlongArg_(NO, 0)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andunsignedlongArg_(NO, 42)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andunsignedlongArg_(NO, 1L << 30)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 1L << 30)
-
-
-	def testboolAndunsignedlonglongArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andunsignedlonglongArg_(YES, 0)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andunsignedlonglongArg_(YES, 42)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andunsignedlonglongArg_(YES, 1L << 62)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], 1L << 62)
-		r = o.boolArg_andunsignedlonglongArg_(NO, 0)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 0)
-		r = o.boolArg_andunsignedlonglongArg_(NO, 42)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 42)
-		r = o.boolArg_andunsignedlonglongArg_(NO, 1L << 62)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], 1L << 62)
-
-
-	def testboolAndfloatArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andfloatArg_(YES, 0.128)
-		self.assertEquals(r[0], YES)
-		self.assertAlmostEquals(r[1], 0.128)
-		r = o.boolArg_andfloatArg_(YES, 1.0)
-		self.assertEquals(r[0], YES)
-		self.assertAlmostEquals(r[1], 1.0)
-		r = o.boolArg_andfloatArg_(YES, 42.0)
-		self.assertEquals(r[0], YES)
-		self.assertAlmostEquals(r[1], 42.0)
-		r = o.boolArg_andfloatArg_(YES, 1e10)
-		self.assertEquals(r[0], YES)
-		self.assertAlmostEquals(r[1], 1e10)
-		r = o.boolArg_andfloatArg_(NO, 0.128)
-		self.assertEquals(r[0], NO)
-		self.assertAlmostEquals(r[1], 0.128)
-		r = o.boolArg_andfloatArg_(NO, 1.0)
-		self.assertEquals(r[0], NO)
-		self.assertAlmostEquals(r[1], 1.0)
-		r = o.boolArg_andfloatArg_(NO, 42.0)
-		self.assertEquals(r[0], NO)
-		self.assertAlmostEquals(r[1], 42.0)
-		r = o.boolArg_andfloatArg_(NO, 1e10)
-		self.assertEquals(r[0], NO)
-		self.assertAlmostEquals(r[1], 1e10)
-
-
-	def testboolAnddoubleArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_anddoubleArg_(YES, 0.128)
-		self.assertEquals(r[0], YES)
-		self.assertAlmostEquals(r[1], 0.128)
-		r = o.boolArg_anddoubleArg_(YES, 1.0)
-		self.assertEquals(r[0], YES)
-		self.assertAlmostEquals(r[1], 1.0)
-		r = o.boolArg_anddoubleArg_(YES, 42.0)
-		self.assertEquals(r[0], YES)
-		self.assertAlmostEquals(r[1], 42.0)
-		r = o.boolArg_anddoubleArg_(YES, 1e10)
-		self.assertEquals(r[0], YES)
-		self.assertAlmostEquals(r[1], 1e10)
-		r = o.boolArg_anddoubleArg_(NO, 0.128)
-		self.assertEquals(r[0], NO)
-		self.assertAlmostEquals(r[1], 0.128)
-		r = o.boolArg_anddoubleArg_(NO, 1.0)
-		self.assertEquals(r[0], NO)
-		self.assertAlmostEquals(r[1], 1.0)
-		r = o.boolArg_anddoubleArg_(NO, 42.0)
-		self.assertEquals(r[0], NO)
-		self.assertAlmostEquals(r[1], 42.0)
-		r = o.boolArg_anddoubleArg_(NO, 1e10)
-		self.assertEquals(r[0], NO)
-		self.assertAlmostEquals(r[1], 1e10)
-
-
-	def testboolAndidArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andidArg_(YES, NSPriorDayDesignations)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], NSPriorDayDesignations)
-		r = o.boolArg_andidArg_(NO, NSPriorDayDesignations)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], NSPriorDayDesignations)
-
-
-	def testboolAndcharPtrArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andcharPtrArg_(YES, "hello")
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], "hello")
-		r = o.boolArg_andcharPtrArg_(YES, "world")
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], "world")
-		r = o.boolArg_andcharPtrArg_(YES, "foobar")
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], "foobar")
-		r = o.boolArg_andcharPtrArg_(NO, "hello")
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], "hello")
-		r = o.boolArg_andcharPtrArg_(NO, "world")
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], "world")
-		r = o.boolArg_andcharPtrArg_(NO, "foobar")
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], "foobar")
-
-
-	def testboolAndNSPointArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andNSPointArg_(YES, (1, 2))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], (1, 2))
-		r = o.boolArg_andNSPointArg_(YES, (3, 4))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], (3, 4))
-		r = o.boolArg_andNSPointArg_(NO, (1, 2))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], (1, 2))
-		r = o.boolArg_andNSPointArg_(NO, (3, 4))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], (3, 4))
-
-
-	def testboolAndNSRectArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andNSRectArg_(YES, ((1, 2), (3, 4)))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], ((1, 2), (3, 4)))
-		r = o.boolArg_andNSRectArg_(YES, ((7, 8), (9, 10)))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], ((7, 8), (9, 10)))
-		r = o.boolArg_andNSRectArg_(NO, ((1, 2), (3, 4)))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], ((1, 2), (3, 4)))
-		r = o.boolArg_andNSRectArg_(NO, ((7, 8), (9, 10)))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], ((7, 8), (9, 10)))
-
-
-	def testboolAndstructTestStruct1Arg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andstructTestStruct1Arg_(YES, (1, 2, (1, 2, 3, 4, 5)))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], (1, 2, (1, 2, 3, 4, 5)))
-		r = o.boolArg_andstructTestStruct1Arg_(YES, (9, 8, (-1, -2, -3, -4, -5)))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], (9, 8, (-1, -2, -3, -4, -5)))
-		r = o.boolArg_andstructTestStruct1Arg_(NO, (1, 2, (1, 2, 3, 4, 5)))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], (1, 2, (1, 2, 3, 4, 5)))
-		r = o.boolArg_andstructTestStruct1Arg_(NO, (9, 8, (-1, -2, -3, -4, -5)))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], (9, 8, (-1, -2, -3, -4, -5)))
-
-
-	def testboolAndstructTestStruct2Arg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andstructTestStruct2Arg_(YES, (1, 2, (1, 2, 3, 4, 5)))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], (1, 2, (1, 2, 3, 4, 5)))
-		r = o.boolArg_andstructTestStruct2Arg_(YES, (9, 8, (-1, -2, -3, -4, -5)))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], (9, 8, (-1, -2, -3, -4, -5)))
-		r = o.boolArg_andstructTestStruct2Arg_(NO, (1, 2, (1, 2, 3, 4, 5)))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], (1, 2, (1, 2, 3, 4, 5)))
-		r = o.boolArg_andstructTestStruct2Arg_(NO, (9, 8, (-1, -2, -3, -4, -5)))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], (9, 8, (-1, -2, -3, -4, -5)))
-
-
-	def testboolAndstructTestStruct3Arg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolArg_andstructTestStruct3Arg_(YES, (1, 2))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], (1, 2))
-		r = o.boolArg_andstructTestStruct3Arg_(YES, (2, 4))
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], (2, 4))
-		r = o.boolArg_andstructTestStruct3Arg_(NO, (1, 2))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], (1, 2))
-		r = o.boolArg_andstructTestStruct3Arg_(NO, (2, 4))
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], (2, 4))
-
-
-	def testBOOLAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.BOOLArg_andboolArg_(YES, YES)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], YES)
-		r = o.BOOLArg_andboolArg_(YES, NO)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], NO)
-		r = o.BOOLArg_andboolArg_(NO, YES)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], YES)
-		r = o.BOOLArg_andboolArg_(NO, NO)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], NO)
-
-
 	def testBOOLAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testcharAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.charArg_andboolArg_(-128, YES)
-		self.assertEquals(r[0], -128)
-		self.assertEquals(r[1], YES)
-		r = o.charArg_andboolArg_(-128, NO)
-		self.assertEquals(r[0], -128)
-		self.assertEquals(r[1], NO)
-		r = o.charArg_andboolArg_(0, YES)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], YES)
-		r = o.charArg_andboolArg_(0, NO)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NO)
-		r = o.charArg_andboolArg_(127, YES)
-		self.assertEquals(r[0], 127)
-		self.assertEquals(r[1], YES)
-		r = o.charArg_andboolArg_(127, NO)
-		self.assertEquals(r[0], 127)
-		self.assertEquals(r[1], NO)
-
-
 	def testcharAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testsignedshortAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.signedshortArg_andboolArg_(-(1<<14), YES)
-		self.assertEquals(r[0], -(1<<14))
-		self.assertEquals(r[1], YES)
-		r = o.signedshortArg_andboolArg_(-(1<<14), NO)
-		self.assertEquals(r[0], -(1<<14))
-		self.assertEquals(r[1], NO)
-		r = o.signedshortArg_andboolArg_(-42, YES)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], YES)
-		r = o.signedshortArg_andboolArg_(-42, NO)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NO)
-		r = o.signedshortArg_andboolArg_(0, YES)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], YES)
-		r = o.signedshortArg_andboolArg_(0, NO)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NO)
-		r = o.signedshortArg_andboolArg_(42, YES)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], YES)
-		r = o.signedshortArg_andboolArg_(42, NO)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NO)
-		r = o.signedshortArg_andboolArg_(1 << 14, YES)
-		self.assertEquals(r[0], 1 << 14)
-		self.assertEquals(r[1], YES)
-		r = o.signedshortArg_andboolArg_(1 << 14, NO)
-		self.assertEquals(r[0], 1 << 14)
-		self.assertEquals(r[1], NO)
-
-
 	def testsignedshortAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testsignedintAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.signedintArg_andboolArg_(-(1<<30), YES)
-		self.assertEquals(r[0], -(1<<30))
-		self.assertEquals(r[1], YES)
-		r = o.signedintArg_andboolArg_(-(1<<30), NO)
-		self.assertEquals(r[0], -(1<<30))
-		self.assertEquals(r[1], NO)
-		r = o.signedintArg_andboolArg_(-42, YES)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], YES)
-		r = o.signedintArg_andboolArg_(-42, NO)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NO)
-		r = o.signedintArg_andboolArg_(0, YES)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], YES)
-		r = o.signedintArg_andboolArg_(0, NO)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NO)
-		r = o.signedintArg_andboolArg_(42, YES)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], YES)
-		r = o.signedintArg_andboolArg_(42, NO)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NO)
-		r = o.signedintArg_andboolArg_(1 << 30, YES)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], YES)
-		r = o.signedintArg_andboolArg_(1 << 30, NO)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], NO)
-
-
 	def testsignedintAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testsignedlongAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.signedlongArg_andboolArg_(-(1<<30), YES)
-		self.assertEquals(r[0], -(1<<30))
-		self.assertEquals(r[1], YES)
-		r = o.signedlongArg_andboolArg_(-(1<<30), NO)
-		self.assertEquals(r[0], -(1<<30))
-		self.assertEquals(r[1], NO)
-		r = o.signedlongArg_andboolArg_(-42, YES)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], YES)
-		r = o.signedlongArg_andboolArg_(-42, NO)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NO)
-		r = o.signedlongArg_andboolArg_(0, YES)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], YES)
-		r = o.signedlongArg_andboolArg_(0, NO)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NO)
-		r = o.signedlongArg_andboolArg_(42, YES)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], YES)
-		r = o.signedlongArg_andboolArg_(42, NO)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NO)
-		r = o.signedlongArg_andboolArg_(1 << 30, YES)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], YES)
-		r = o.signedlongArg_andboolArg_(1 << 30, NO)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], NO)
-
-
 	def testsignedlongAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testsignedlonglongAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.signedlonglongArg_andboolArg_(-(1L << 60), YES)
-		self.assertEquals(r[0], -(1L << 60))
-		self.assertEquals(r[1], YES)
-		r = o.signedlonglongArg_andboolArg_(-(1L << 60), NO)
-		self.assertEquals(r[0], -(1L << 60))
-		self.assertEquals(r[1], NO)
-		r = o.signedlonglongArg_andboolArg_(-42, YES)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], YES)
-		r = o.signedlonglongArg_andboolArg_(-42, NO)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NO)
-		r = o.signedlonglongArg_andboolArg_(0, YES)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], YES)
-		r = o.signedlonglongArg_andboolArg_(0, NO)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NO)
-		r = o.signedlonglongArg_andboolArg_(42, YES)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], YES)
-		r = o.signedlonglongArg_andboolArg_(42, NO)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NO)
-		r = o.signedlonglongArg_andboolArg_(1L << 60, YES)
-		self.assertEquals(r[0], 1L << 60)
-		self.assertEquals(r[1], YES)
-		r = o.signedlonglongArg_andboolArg_(1L << 60, NO)
-		self.assertEquals(r[0], 1L << 60)
-		self.assertEquals(r[1], NO)
-
-
 	def testsignedlonglongAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testunsignedcharAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.unsignedcharArg_andboolArg_(0, YES)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedcharArg_andboolArg_(0, NO)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NO)
-		r = o.unsignedcharArg_andboolArg_(128, YES)
-		self.assertEquals(r[0], 128)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedcharArg_andboolArg_(128, NO)
-		self.assertEquals(r[0], 128)
-		self.assertEquals(r[1], NO)
-		r = o.unsignedcharArg_andboolArg_(255, YES)
-		self.assertEquals(r[0], 255)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedcharArg_andboolArg_(255, NO)
-		self.assertEquals(r[0], 255)
-		self.assertEquals(r[1], NO)
-
-
 	def testunsignedcharAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testunsignedshortAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.unsignedshortArg_andboolArg_(0, YES)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedshortArg_andboolArg_(0, NO)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NO)
-		r = o.unsignedshortArg_andboolArg_(42, YES)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedshortArg_andboolArg_(42, NO)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NO)
-		r = o.unsignedshortArg_andboolArg_(1<<14, YES)
-		self.assertEquals(r[0], 1<<14)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedshortArg_andboolArg_(1<<14, NO)
-		self.assertEquals(r[0], 1<<14)
-		self.assertEquals(r[1], NO)
-
-
 	def testunsignedshortAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testunsignedintAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.unsignedintArg_andboolArg_(0, YES)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedintArg_andboolArg_(0, NO)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NO)
-		r = o.unsignedintArg_andboolArg_(42, YES)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedintArg_andboolArg_(42, NO)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NO)
-		r = o.unsignedintArg_andboolArg_(1 << 30, YES)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedintArg_andboolArg_(1 << 30, NO)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], NO)
-
-
 	def testunsignedintAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testunsignedlongAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.unsignedlongArg_andboolArg_(0, YES)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedlongArg_andboolArg_(0, NO)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NO)
-		r = o.unsignedlongArg_andboolArg_(42, YES)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedlongArg_andboolArg_(42, NO)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NO)
-		r = o.unsignedlongArg_andboolArg_(1L << 30, YES)
-		self.assertEquals(r[0], 1L << 30)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedlongArg_andboolArg_(1L << 30, NO)
-		self.assertEquals(r[0], 1L << 30)
-		self.assertEquals(r[1], NO)
-
-
 	def testunsignedlongAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testunsignedlonglongAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.unsignedlonglongArg_andboolArg_(0, YES)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedlonglongArg_andboolArg_(0, NO)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NO)
-		r = o.unsignedlonglongArg_andboolArg_(42, YES)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedlonglongArg_andboolArg_(42, NO)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NO)
-		r = o.unsignedlonglongArg_andboolArg_(1L << 62, YES)
-		self.assertEquals(r[0], 1L << 62)
-		self.assertEquals(r[1], YES)
-		r = o.unsignedlonglongArg_andboolArg_(1L << 62, NO)
-		self.assertEquals(r[0], 1L << 62)
-		self.assertEquals(r[1], NO)
-
-
 	def testunsignedlonglongAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testfloatAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.floatArg_andboolArg_(0.128, YES)
-		self.assertAlmostEquals(r[0], 0.128)
-		self.assertEquals(r[1], YES)
-		r = o.floatArg_andboolArg_(0.128, NO)
-		self.assertAlmostEquals(r[0], 0.128)
-		self.assertEquals(r[1], NO)
-		r = o.floatArg_andboolArg_(1.0, YES)
-		self.assertAlmostEquals(r[0], 1.0)
-		self.assertEquals(r[1], YES)
-		r = o.floatArg_andboolArg_(1.0, NO)
-		self.assertAlmostEquals(r[0], 1.0)
-		self.assertEquals(r[1], NO)
-		r = o.floatArg_andboolArg_(42.0, YES)
-		self.assertAlmostEquals(r[0], 42.0)
-		self.assertEquals(r[1], YES)
-		r = o.floatArg_andboolArg_(42.0, NO)
-		self.assertAlmostEquals(r[0], 42.0)
-		self.assertEquals(r[1], NO)
-		r = o.floatArg_andboolArg_(1e10, YES)
-		self.assertAlmostEquals(r[0], 1e10)
-		self.assertEquals(r[1], YES)
-		r = o.floatArg_andboolArg_(1e10, NO)
-		self.assertAlmostEquals(r[0], 1e10)
-		self.assertEquals(r[1], NO)
-
-
 	def testfloatAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testdoubleAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.doubleArg_andboolArg_(0.128, YES)
-		self.assertAlmostEquals(r[0], 0.128)
-		self.assertEquals(r[1], YES)
-		r = o.doubleArg_andboolArg_(0.128, NO)
-		self.assertAlmostEquals(r[0], 0.128)
-		self.assertEquals(r[1], NO)
-		r = o.doubleArg_andboolArg_(1.0, YES)
-		self.assertAlmostEquals(r[0], 1.0)
-		self.assertEquals(r[1], YES)
-		r = o.doubleArg_andboolArg_(1.0, NO)
-		self.assertAlmostEquals(r[0], 1.0)
-		self.assertEquals(r[1], NO)
-		r = o.doubleArg_andboolArg_(42.0, YES)
-		self.assertAlmostEquals(r[0], 42.0)
-		self.assertEquals(r[1], YES)
-		r = o.doubleArg_andboolArg_(42.0, NO)
-		self.assertAlmostEquals(r[0], 42.0)
-		self.assertEquals(r[1], NO)
-		r = o.doubleArg_andboolArg_(1e10, YES)
-		self.assertAlmostEquals(r[0], 1e10)
-		self.assertEquals(r[1], YES)
-		r = o.doubleArg_andboolArg_(1e10, NO)
-		self.assertAlmostEquals(r[0], 1e10)
-		self.assertEquals(r[1], NO)
-
-
 	def testdoubleAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testidAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.idArg_andboolArg_(NSPriorDayDesignations, YES)
-		self.assertEquals(r[0], NSPriorDayDesignations)
-		self.assertEquals(r[1], YES)
-		r = o.idArg_andboolArg_(NSPriorDayDesignations, NO)
-		self.assertEquals(r[0], NSPriorDayDesignations)
-		self.assertEquals(r[1], NO)
-
-
 	def testidAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testcharPtrAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.charPtrArg_andboolArg_("hello", YES)
-		self.assertEquals(r[0], "hello")
-		self.assertEquals(r[1], YES)
-		r = o.charPtrArg_andboolArg_("hello", NO)
-		self.assertEquals(r[0], "hello")
-		self.assertEquals(r[1], NO)
-		r = o.charPtrArg_andboolArg_("world", YES)
-		self.assertEquals(r[0], "world")
-		self.assertEquals(r[1], YES)
-		r = o.charPtrArg_andboolArg_("world", NO)
-		self.assertEquals(r[0], "world")
-		self.assertEquals(r[1], NO)
-		r = o.charPtrArg_andboolArg_("foobar", YES)
-		self.assertEquals(r[0], "foobar")
-		self.assertEquals(r[1], YES)
-		r = o.charPtrArg_andboolArg_("foobar", NO)
-		self.assertEquals(r[0], "foobar")
-		self.assertEquals(r[1], NO)
-
-
 	def testcharPtrAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testNSPointAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.NSPointArg_andboolArg_((1, 2), YES)
-		self.assertEquals(r[0], (1, 2))
-		self.assertEquals(r[1], YES)
-		r = o.NSPointArg_andboolArg_((1, 2), NO)
-		self.assertEquals(r[0], (1, 2))
-		self.assertEquals(r[1], NO)
-		r = o.NSPointArg_andboolArg_((3, 4), YES)
-		self.assertEquals(r[0], (3, 4))
-		self.assertEquals(r[1], YES)
-		r = o.NSPointArg_andboolArg_((3, 4), NO)
-		self.assertEquals(r[0], (3, 4))
-		self.assertEquals(r[1], NO)
-
-
 	def testNSPointAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def testNSRectAndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.NSRectArg_andboolArg_(((1, 2), (3, 4)), YES)
-		self.assertEquals(r[0], ((1, 2), (3, 4)))
-		self.assertEquals(r[1], YES)
-		r = o.NSRectArg_andboolArg_(((1, 2), (3, 4)), NO)
-		self.assertEquals(r[0], ((1, 2), (3, 4)))
-		self.assertEquals(r[1], NO)
-		r = o.NSRectArg_andboolArg_(((7, 8), (9, 10)), YES)
-		self.assertEquals(r[0], ((7, 8), (9, 10)))
-		self.assertEquals(r[1], YES)
-		r = o.NSRectArg_andboolArg_(((7, 8), (9, 10)), NO)
-		self.assertEquals(r[0], ((7, 8), (9, 10)))
-		self.assertEquals(r[1], NO)
-
-
 	def testNSRectAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def teststructTestStruct1AndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.structTestStruct1Arg_andboolArg_((1, 2, (1, 2, 3, 4, 5)), YES)
-		self.assertEquals(r[0], (1, 2, (1, 2, 3, 4, 5)))
-		self.assertEquals(r[1], YES)
-		r = o.structTestStruct1Arg_andboolArg_((1, 2, (1, 2, 3, 4, 5)), NO)
-		self.assertEquals(r[0], (1, 2, (1, 2, 3, 4, 5)))
-		self.assertEquals(r[1], NO)
-		r = o.structTestStruct1Arg_andboolArg_((9, 8, (-1, -2, -3, -4, -5)), YES)
-		self.assertEquals(r[0], (9, 8, (-1, -2, -3, -4, -5)))
-		self.assertEquals(r[1], YES)
-		r = o.structTestStruct1Arg_andboolArg_((9, 8, (-1, -2, -3, -4, -5)), NO)
-		self.assertEquals(r[0], (9, 8, (-1, -2, -3, -4, -5)))
-		self.assertEquals(r[1], NO)
-
-
 	def teststructTestStruct1AndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def teststructTestStruct2AndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.structTestStruct2Arg_andboolArg_((1, 2, (1, 2, 3, 4, 5)), YES)
-		self.assertEquals(r[0], (1, 2, (1, 2, 3, 4, 5)))
-		self.assertEquals(r[1], YES)
-		r = o.structTestStruct2Arg_andboolArg_((1, 2, (1, 2, 3, 4, 5)), NO)
-		self.assertEquals(r[0], (1, 2, (1, 2, 3, 4, 5)))
-		self.assertEquals(r[1], NO)
-		r = o.structTestStruct2Arg_andboolArg_((9, 8, (-1, -2, -3, -4, -5)), YES)
-		self.assertEquals(r[0], (9, 8, (-1, -2, -3, -4, -5)))
-		self.assertEquals(r[1], YES)
-		r = o.structTestStruct2Arg_andboolArg_((9, 8, (-1, -2, -3, -4, -5)), NO)
-		self.assertEquals(r[0], (9, 8, (-1, -2, -3, -4, -5)))
-		self.assertEquals(r[1], NO)
-
-
 	def teststructTestStruct2AndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		self.assertEquals(r[1], (2, 4))
 
 
-	def teststructTestStruct3AndboolArg(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.structTestStruct3Arg_andboolArg_((1, 2), YES)
-		self.assertEquals(r[0], (1, 2))
-		self.assertEquals(r[1], YES)
-		r = o.structTestStruct3Arg_andboolArg_((1, 2), NO)
-		self.assertEquals(r[0], (1, 2))
-		self.assertEquals(r[1], NO)
-		r = o.structTestStruct3Arg_andboolArg_((2, 4), YES)
-		self.assertEquals(r[0], (2, 4))
-		self.assertEquals(r[1], YES)
-		r = o.structTestStruct3Arg_andboolArg_((2, 4), NO)
-		self.assertEquals(r[0], (2, 4))
-		self.assertEquals(r[1], NO)
-
-
 	def teststructTestStruct3AndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 
 	# Pass by reference arguments (in)
 
-	def testboolIn(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		r = o.boolInArg_(YES)
-		self.assertEquals(r, YES)
-		r = o.boolInArg_(NO)
-		self.assertEquals(r, NO)
-
-
 	def testBOOLIn(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 
 	# Pass by reference arguments (out)
 
-	def testboolOut(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		o.reset()
-		r = o.boolOutArg_()
-		self.assertEquals(r, YES)
-		r = o.boolOutArg_()
-		self.assertEquals(r, NO)
-
-
 	def testBOOLOut(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 
 	# Pass by reference arguments (inout)
 
-	def testboolInOut(self):
-		o = PyObjC_TestClass1.alloc().init()
-		self.assert_(o is not None)
-		o.reset()
-		r = o.boolInOutArg_(NO)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], YES)
-		r = o.boolInOutArg_(YES)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], NO)
-
-
 	def testBOOLInOut(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 
 
 # Helper arrays
-g_bool_values = (YES, NO)
 g_BOOL_values = (YES, NO)
 g_char_values = (-128, 0, 127)
 g_signedshort_values = (-(1<<14), -42, 0, 42, 1 << 14)
 		self.counter = 0
 
 
-	def boolMethod(self):
-		if self.counter > 2: self.reset()
-		idx = self.counter
-		self.counter += 1
-		return g_bool_values[idx]
-	boolMethod = objc.selector(boolMethod, signature="B@:")
-
-
 	def BOOLMethod(self):
 		if self.counter > 2: self.reset()
 		idx = self.counter
 		self.counter += 1
 		return g_BOOL_values[idx]
-	BOOLMethod = objc.selector(BOOLMethod, signature="c@:")
+	BOOLMethod = objc.selector(BOOLMethod, signature="C@:")
 
 
 	def charMethod(self):
 	structTestStruct3Method = objc.selector(structTestStruct3Method, signature="{_TestStruct3=ci}@:")
 
 
-	def boolArg_(self, arg):
-		return arg # return the same
-	boolArg_ = objc.selector(boolArg_, signature="@@:B")
-
-
 	def BOOLArg_(self, arg):
 		return arg # return the same
-	BOOLArg_ = objc.selector(BOOLArg_, signature="@@:c")
+	BOOLArg_ = objc.selector(BOOLArg_, signature="@@:C")
 
 
 	def charArg_(self, arg):
 	structTestStruct3Arg_ = objc.selector(structTestStruct3Arg_, signature="@@:{_TestStruct3=ci}")
 
 
-	def boolArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andboolArg_ = objc.selector(boolArg_andboolArg_, signature="@@:BB")
-
-
-	def boolArg_andBOOLArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andBOOLArg_ = objc.selector(boolArg_andBOOLArg_, signature="@@:Bc")
-
-
-	def boolArg_andcharArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andcharArg_ = objc.selector(boolArg_andcharArg_, signature="@@:Bc")
-
-
-	def boolArg_andsignedshortArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andsignedshortArg_ = objc.selector(boolArg_andsignedshortArg_, signature="@@:Bs")
-
-
-	def boolArg_andsignedintArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andsignedintArg_ = objc.selector(boolArg_andsignedintArg_, signature="@@:Bi")
-
-
-	def boolArg_andsignedlongArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andsignedlongArg_ = objc.selector(boolArg_andsignedlongArg_, signature="@@:Bl")
-
-
-	def boolArg_andsignedlonglongArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andsignedlonglongArg_ = objc.selector(boolArg_andsignedlonglongArg_, signature="@@:Bq")
-
-
-	def boolArg_andunsignedcharArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andunsignedcharArg_ = objc.selector(boolArg_andunsignedcharArg_, signature="@@:BC")
-
-
-	def boolArg_andunsignedshortArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andunsignedshortArg_ = objc.selector(boolArg_andunsignedshortArg_, signature="@@:BS")
-
-
-	def boolArg_andunsignedintArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andunsignedintArg_ = objc.selector(boolArg_andunsignedintArg_, signature="@@:BI")
-
-
-	def boolArg_andunsignedlongArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andunsignedlongArg_ = objc.selector(boolArg_andunsignedlongArg_, signature="@@:BL")
-
-
-	def boolArg_andunsignedlonglongArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andunsignedlonglongArg_ = objc.selector(boolArg_andunsignedlonglongArg_, signature="@@:BQ")
-
-
-	def boolArg_andfloatArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andfloatArg_ = objc.selector(boolArg_andfloatArg_, signature="@@:Bf")
-
-
-	def boolArg_anddoubleArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_anddoubleArg_ = objc.selector(boolArg_anddoubleArg_, signature="@@:Bd")
-
-
-	def boolArg_andidArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andidArg_ = objc.selector(boolArg_andidArg_, signature="@@:B@")
-
-
-	def boolArg_andcharPtrArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andcharPtrArg_ = objc.selector(boolArg_andcharPtrArg_, signature="@@:B*")
-
-
-	def boolArg_andNSPointArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andNSPointArg_ = objc.selector(boolArg_andNSPointArg_, signature="@@:B{_NSPoint=ff}")
-
-
-	def boolArg_andNSRectArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andNSRectArg_ = objc.selector(boolArg_andNSRectArg_, signature="@@:B{_NSRect={_NSPoint=ff}{_NSSize=ff}}")
-
-
-	def boolArg_andstructTestStruct1Arg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andstructTestStruct1Arg_ = objc.selector(boolArg_andstructTestStruct1Arg_, signature="@@:B{_TestStruct1=ii[5s]}")
-
-
-	def boolArg_andstructTestStruct2Arg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andstructTestStruct2Arg_ = objc.selector(boolArg_andstructTestStruct2Arg_, signature="@@:B{_TestStruct2=id[5s]}")
-
-
-	def boolArg_andstructTestStruct3Arg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	boolArg_andstructTestStruct3Arg_ = objc.selector(boolArg_andstructTestStruct3Arg_, signature="@@:B{_TestStruct3=ci}")
-
-
-	def BOOLArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	BOOLArg_andboolArg_ = objc.selector(BOOLArg_andboolArg_, signature="@@:cB")
-
-
 	def BOOLArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andBOOLArg_ = objc.selector(BOOLArg_andBOOLArg_, signature="@@:cc")
+	BOOLArg_andBOOLArg_ = objc.selector(BOOLArg_andBOOLArg_, signature="@@:CC")
 
 
 	def BOOLArg_andcharArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andcharArg_ = objc.selector(BOOLArg_andcharArg_, signature="@@:cc")
+	BOOLArg_andcharArg_ = objc.selector(BOOLArg_andcharArg_, signature="@@:Cc")
 
 
 	def BOOLArg_andsignedshortArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andsignedshortArg_ = objc.selector(BOOLArg_andsignedshortArg_, signature="@@:cs")
+	BOOLArg_andsignedshortArg_ = objc.selector(BOOLArg_andsignedshortArg_, signature="@@:Cs")
 
 
 	def BOOLArg_andsignedintArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andsignedintArg_ = objc.selector(BOOLArg_andsignedintArg_, signature="@@:ci")
+	BOOLArg_andsignedintArg_ = objc.selector(BOOLArg_andsignedintArg_, signature="@@:Ci")
 
 
 	def BOOLArg_andsignedlongArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andsignedlongArg_ = objc.selector(BOOLArg_andsignedlongArg_, signature="@@:cl")
+	BOOLArg_andsignedlongArg_ = objc.selector(BOOLArg_andsignedlongArg_, signature="@@:Cl")
 
 
 	def BOOLArg_andsignedlonglongArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andsignedlonglongArg_ = objc.selector(BOOLArg_andsignedlonglongArg_, signature="@@:cq")
+	BOOLArg_andsignedlonglongArg_ = objc.selector(BOOLArg_andsignedlonglongArg_, signature="@@:Cq")
 
 
 	def BOOLArg_andunsignedcharArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andunsignedcharArg_ = objc.selector(BOOLArg_andunsignedcharArg_, signature="@@:cC")
+	BOOLArg_andunsignedcharArg_ = objc.selector(BOOLArg_andunsignedcharArg_, signature="@@:CC")
 
 
 	def BOOLArg_andunsignedshortArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andunsignedshortArg_ = objc.selector(BOOLArg_andunsignedshortArg_, signature="@@:cS")
+	BOOLArg_andunsignedshortArg_ = objc.selector(BOOLArg_andunsignedshortArg_, signature="@@:CS")
 
 
 	def BOOLArg_andunsignedintArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andunsignedintArg_ = objc.selector(BOOLArg_andunsignedintArg_, signature="@@:cI")
+	BOOLArg_andunsignedintArg_ = objc.selector(BOOLArg_andunsignedintArg_, signature="@@:CI")
 
 
 	def BOOLArg_andunsignedlongArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andunsignedlongArg_ = objc.selector(BOOLArg_andunsignedlongArg_, signature="@@:cL")
+	BOOLArg_andunsignedlongArg_ = objc.selector(BOOLArg_andunsignedlongArg_, signature="@@:CL")
 
 
 	def BOOLArg_andunsignedlonglongArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andunsignedlonglongArg_ = objc.selector(BOOLArg_andunsignedlonglongArg_, signature="@@:cQ")
+	BOOLArg_andunsignedlonglongArg_ = objc.selector(BOOLArg_andunsignedlonglongArg_, signature="@@:CQ")
 
 
 	def BOOLArg_andfloatArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andfloatArg_ = objc.selector(BOOLArg_andfloatArg_, signature="@@:cf")
+	BOOLArg_andfloatArg_ = objc.selector(BOOLArg_andfloatArg_, signature="@@:Cf")
 
 
 	def BOOLArg_anddoubleArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_anddoubleArg_ = objc.selector(BOOLArg_anddoubleArg_, signature="@@:cd")
+	BOOLArg_anddoubleArg_ = objc.selector(BOOLArg_anddoubleArg_, signature="@@:Cd")
 
 
 	def BOOLArg_andidArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andidArg_ = objc.selector(BOOLArg_andidArg_, signature="@@:c@")
+	BOOLArg_andidArg_ = objc.selector(BOOLArg_andidArg_, signature="@@:C@")
 
 
 	def BOOLArg_andcharPtrArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andcharPtrArg_ = objc.selector(BOOLArg_andcharPtrArg_, signature="@@:c*")
+	BOOLArg_andcharPtrArg_ = objc.selector(BOOLArg_andcharPtrArg_, signature="@@:C*")
 
 
 	def BOOLArg_andNSPointArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andNSPointArg_ = objc.selector(BOOLArg_andNSPointArg_, signature="@@:c{_NSPoint=ff}")
+	BOOLArg_andNSPointArg_ = objc.selector(BOOLArg_andNSPointArg_, signature="@@:C{_NSPoint=ff}")
 
 
 	def BOOLArg_andNSRectArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andNSRectArg_ = objc.selector(BOOLArg_andNSRectArg_, signature="@@:c{_NSRect={_NSPoint=ff}{_NSSize=ff}}")
+	BOOLArg_andNSRectArg_ = objc.selector(BOOLArg_andNSRectArg_, signature="@@:C{_NSRect={_NSPoint=ff}{_NSSize=ff}}")
 
 
 	def BOOLArg_andstructTestStruct1Arg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andstructTestStruct1Arg_ = objc.selector(BOOLArg_andstructTestStruct1Arg_, signature="@@:c{_TestStruct1=ii[5s]}")
+	BOOLArg_andstructTestStruct1Arg_ = objc.selector(BOOLArg_andstructTestStruct1Arg_, signature="@@:C{_TestStruct1=ii[5s]}")
 
 
 	def BOOLArg_andstructTestStruct2Arg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andstructTestStruct2Arg_ = objc.selector(BOOLArg_andstructTestStruct2Arg_, signature="@@:c{_TestStruct2=id[5s]}")
+	BOOLArg_andstructTestStruct2Arg_ = objc.selector(BOOLArg_andstructTestStruct2Arg_, signature="@@:C{_TestStruct2=id[5s]}")
 
 
 	def BOOLArg_andstructTestStruct3Arg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	BOOLArg_andstructTestStruct3Arg_ = objc.selector(BOOLArg_andstructTestStruct3Arg_, signature="@@:c{_TestStruct3=ci}")
-
-
-	def charArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	charArg_andboolArg_ = objc.selector(charArg_andboolArg_, signature="@@:cB")
+	BOOLArg_andstructTestStruct3Arg_ = objc.selector(BOOLArg_andstructTestStruct3Arg_, signature="@@:C{_TestStruct3=ci}")
 
 
 	def charArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	charArg_andBOOLArg_ = objc.selector(charArg_andBOOLArg_, signature="@@:cc")
+	charArg_andBOOLArg_ = objc.selector(charArg_andBOOLArg_, signature="@@:cC")
 
 
 	def charArg_andcharArg_(self, arg1, arg2):
 	charArg_andstructTestStruct3Arg_ = objc.selector(charArg_andstructTestStruct3Arg_, signature="@@:c{_TestStruct3=ci}")
 
 
-	def signedshortArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	signedshortArg_andboolArg_ = objc.selector(signedshortArg_andboolArg_, signature="@@:sB")
-
-
 	def signedshortArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	signedshortArg_andBOOLArg_ = objc.selector(signedshortArg_andBOOLArg_, signature="@@:sc")
+	signedshortArg_andBOOLArg_ = objc.selector(signedshortArg_andBOOLArg_, signature="@@:sC")
 
 
 	def signedshortArg_andcharArg_(self, arg1, arg2):
 	signedshortArg_andstructTestStruct3Arg_ = objc.selector(signedshortArg_andstructTestStruct3Arg_, signature="@@:s{_TestStruct3=ci}")
 
 
-	def signedintArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	signedintArg_andboolArg_ = objc.selector(signedintArg_andboolArg_, signature="@@:iB")
-
-
 	def signedintArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	signedintArg_andBOOLArg_ = objc.selector(signedintArg_andBOOLArg_, signature="@@:ic")
+	signedintArg_andBOOLArg_ = objc.selector(signedintArg_andBOOLArg_, signature="@@:iC")
 
 
 	def signedintArg_andcharArg_(self, arg1, arg2):
 	signedintArg_andstructTestStruct3Arg_ = objc.selector(signedintArg_andstructTestStruct3Arg_, signature="@@:i{_TestStruct3=ci}")
 
 
-	def signedlongArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	signedlongArg_andboolArg_ = objc.selector(signedlongArg_andboolArg_, signature="@@:lB")
-
-
 	def signedlongArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	signedlongArg_andBOOLArg_ = objc.selector(signedlongArg_andBOOLArg_, signature="@@:lc")
+	signedlongArg_andBOOLArg_ = objc.selector(signedlongArg_andBOOLArg_, signature="@@:lC")
 
 
 	def signedlongArg_andcharArg_(self, arg1, arg2):
 	signedlongArg_andstructTestStruct3Arg_ = objc.selector(signedlongArg_andstructTestStruct3Arg_, signature="@@:l{_TestStruct3=ci}")
 
 
-	def signedlonglongArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	signedlonglongArg_andboolArg_ = objc.selector(signedlonglongArg_andboolArg_, signature="@@:qB")
-
-
 	def signedlonglongArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	signedlonglongArg_andBOOLArg_ = objc.selector(signedlonglongArg_andBOOLArg_, signature="@@:qc")
+	signedlonglongArg_andBOOLArg_ = objc.selector(signedlonglongArg_andBOOLArg_, signature="@@:qC")
 
 
 	def signedlonglongArg_andcharArg_(self, arg1, arg2):
 	signedlonglongArg_andstructTestStruct3Arg_ = objc.selector(signedlonglongArg_andstructTestStruct3Arg_, signature="@@:q{_TestStruct3=ci}")
 
 
-	def unsignedcharArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	unsignedcharArg_andboolArg_ = objc.selector(unsignedcharArg_andboolArg_, signature="@@:CB")
-
-
 	def unsignedcharArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	unsignedcharArg_andBOOLArg_ = objc.selector(unsignedcharArg_andBOOLArg_, signature="@@:Cc")
+	unsignedcharArg_andBOOLArg_ = objc.selector(unsignedcharArg_andBOOLArg_, signature="@@:CC")
 
 
 	def unsignedcharArg_andcharArg_(self, arg1, arg2):
 	unsignedcharArg_andstructTestStruct3Arg_ = objc.selector(unsignedcharArg_andstructTestStruct3Arg_, signature="@@:C{_TestStruct3=ci}")
 
 
-	def unsignedshortArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	unsignedshortArg_andboolArg_ = objc.selector(unsignedshortArg_andboolArg_, signature="@@:SB")
-
-
 	def unsignedshortArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	unsignedshortArg_andBOOLArg_ = objc.selector(unsignedshortArg_andBOOLArg_, signature="@@:Sc")
+	unsignedshortArg_andBOOLArg_ = objc.selector(unsignedshortArg_andBOOLArg_, signature="@@:SC")
 
 
 	def unsignedshortArg_andcharArg_(self, arg1, arg2):
 	unsignedshortArg_andstructTestStruct3Arg_ = objc.selector(unsignedshortArg_andstructTestStruct3Arg_, signature="@@:S{_TestStruct3=ci}")
 
 
-	def unsignedintArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	unsignedintArg_andboolArg_ = objc.selector(unsignedintArg_andboolArg_, signature="@@:IB")
-
-
 	def unsignedintArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	unsignedintArg_andBOOLArg_ = objc.selector(unsignedintArg_andBOOLArg_, signature="@@:Ic")
+	unsignedintArg_andBOOLArg_ = objc.selector(unsignedintArg_andBOOLArg_, signature="@@:IC")
 
 
 	def unsignedintArg_andcharArg_(self, arg1, arg2):
 	unsignedintArg_andstructTestStruct3Arg_ = objc.selector(unsignedintArg_andstructTestStruct3Arg_, signature="@@:I{_TestStruct3=ci}")
 
 
-	def unsignedlongArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	unsignedlongArg_andboolArg_ = objc.selector(unsignedlongArg_andboolArg_, signature="@@:LB")
-
-
 	def unsignedlongArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	unsignedlongArg_andBOOLArg_ = objc.selector(unsignedlongArg_andBOOLArg_, signature="@@:Lc")
+	unsignedlongArg_andBOOLArg_ = objc.selector(unsignedlongArg_andBOOLArg_, signature="@@:LC")
 
 
 	def unsignedlongArg_andcharArg_(self, arg1, arg2):
 	unsignedlongArg_andstructTestStruct3Arg_ = objc.selector(unsignedlongArg_andstructTestStruct3Arg_, signature="@@:L{_TestStruct3=ci}")
 
 
-	def unsignedlonglongArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	unsignedlonglongArg_andboolArg_ = objc.selector(unsignedlonglongArg_andboolArg_, signature="@@:QB")
-
-
 	def unsignedlonglongArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	unsignedlonglongArg_andBOOLArg_ = objc.selector(unsignedlonglongArg_andBOOLArg_, signature="@@:Qc")
+	unsignedlonglongArg_andBOOLArg_ = objc.selector(unsignedlonglongArg_andBOOLArg_, signature="@@:QC")
 
 
 	def unsignedlonglongArg_andcharArg_(self, arg1, arg2):
 	unsignedlonglongArg_andstructTestStruct3Arg_ = objc.selector(unsignedlonglongArg_andstructTestStruct3Arg_, signature="@@:Q{_TestStruct3=ci}")
 
 
-	def floatArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	floatArg_andboolArg_ = objc.selector(floatArg_andboolArg_, signature="@@:fB")
-
-
 	def floatArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	floatArg_andBOOLArg_ = objc.selector(floatArg_andBOOLArg_, signature="@@:fc")
+	floatArg_andBOOLArg_ = objc.selector(floatArg_andBOOLArg_, signature="@@:fC")
 
 
 	def floatArg_andcharArg_(self, arg1, arg2):
 	floatArg_andstructTestStruct3Arg_ = objc.selector(floatArg_andstructTestStruct3Arg_, signature="@@:f{_TestStruct3=ci}")
 
 
-	def doubleArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	doubleArg_andboolArg_ = objc.selector(doubleArg_andboolArg_, signature="@@:dB")
-
-
 	def doubleArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	doubleArg_andBOOLArg_ = objc.selector(doubleArg_andBOOLArg_, signature="@@:dc")
+	doubleArg_andBOOLArg_ = objc.selector(doubleArg_andBOOLArg_, signature="@@:dC")
 
 
 	def doubleArg_andcharArg_(self, arg1, arg2):
 	doubleArg_andstructTestStruct3Arg_ = objc.selector(doubleArg_andstructTestStruct3Arg_, signature="@@:d{_TestStruct3=ci}")
 
 
-	def idArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	idArg_andboolArg_ = objc.selector(idArg_andboolArg_, signature="@@:@B")
-
-
 	def idArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	idArg_andBOOLArg_ = objc.selector(idArg_andBOOLArg_, signature="@@:@c")
+	idArg_andBOOLArg_ = objc.selector(idArg_andBOOLArg_, signature="@@:@C")
 
 
 	def idArg_andcharArg_(self, arg1, arg2):
 	idArg_andstructTestStruct3Arg_ = objc.selector(idArg_andstructTestStruct3Arg_, signature="@@:@{_TestStruct3=ci}")
 
 
-	def charPtrArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	charPtrArg_andboolArg_ = objc.selector(charPtrArg_andboolArg_, signature="@@:*B")
-
-
 	def charPtrArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	charPtrArg_andBOOLArg_ = objc.selector(charPtrArg_andBOOLArg_, signature="@@:*c")
+	charPtrArg_andBOOLArg_ = objc.selector(charPtrArg_andBOOLArg_, signature="@@:*C")
 
 
 	def charPtrArg_andcharArg_(self, arg1, arg2):
 	charPtrArg_andstructTestStruct3Arg_ = objc.selector(charPtrArg_andstructTestStruct3Arg_, signature="@@:*{_TestStruct3=ci}")
 
 
-	def NSPointArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	NSPointArg_andboolArg_ = objc.selector(NSPointArg_andboolArg_, signature="@@:{_NSPoint=ff}B")
-
-
 	def NSPointArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	NSPointArg_andBOOLArg_ = objc.selector(NSPointArg_andBOOLArg_, signature="@@:{_NSPoint=ff}c")
+	NSPointArg_andBOOLArg_ = objc.selector(NSPointArg_andBOOLArg_, signature="@@:{_NSPoint=ff}C")
 
 
 	def NSPointArg_andcharArg_(self, arg1, arg2):
 	NSPointArg_andstructTestStruct3Arg_ = objc.selector(NSPointArg_andstructTestStruct3Arg_, signature="@@:{_NSPoint=ff}{_TestStruct3=ci}")
 
 
-	def NSRectArg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	NSRectArg_andboolArg_ = objc.selector(NSRectArg_andboolArg_, signature="@@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}B")
-
-
 	def NSRectArg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	NSRectArg_andBOOLArg_ = objc.selector(NSRectArg_andBOOLArg_, signature="@@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}c")
+	NSRectArg_andBOOLArg_ = objc.selector(NSRectArg_andBOOLArg_, signature="@@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}C")
 
 
 	def NSRectArg_andcharArg_(self, arg1, arg2):
 	NSRectArg_andstructTestStruct3Arg_ = objc.selector(NSRectArg_andstructTestStruct3Arg_, signature="@@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}{_TestStruct3=ci}")
 
 
-	def structTestStruct1Arg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	structTestStruct1Arg_andboolArg_ = objc.selector(structTestStruct1Arg_andboolArg_, signature="@@:{_TestStruct1=ii[5s]}B")
-
-
 	def structTestStruct1Arg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	structTestStruct1Arg_andBOOLArg_ = objc.selector(structTestStruct1Arg_andBOOLArg_, signature="@@:{_TestStruct1=ii[5s]}c")
+	structTestStruct1Arg_andBOOLArg_ = objc.selector(structTestStruct1Arg_andBOOLArg_, signature="@@:{_TestStruct1=ii[5s]}C")
 
 
 	def structTestStruct1Arg_andcharArg_(self, arg1, arg2):
 	structTestStruct1Arg_andstructTestStruct3Arg_ = objc.selector(structTestStruct1Arg_andstructTestStruct3Arg_, signature="@@:{_TestStruct1=ii[5s]}{_TestStruct3=ci}")
 
 
-	def structTestStruct2Arg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	structTestStruct2Arg_andboolArg_ = objc.selector(structTestStruct2Arg_andboolArg_, signature="@@:{_TestStruct2=id[5s]}B")
-
-
 	def structTestStruct2Arg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	structTestStruct2Arg_andBOOLArg_ = objc.selector(structTestStruct2Arg_andBOOLArg_, signature="@@:{_TestStruct2=id[5s]}c")
+	structTestStruct2Arg_andBOOLArg_ = objc.selector(structTestStruct2Arg_andBOOLArg_, signature="@@:{_TestStruct2=id[5s]}C")
 
 
 	def structTestStruct2Arg_andcharArg_(self, arg1, arg2):
 	structTestStruct2Arg_andstructTestStruct3Arg_ = objc.selector(structTestStruct2Arg_andstructTestStruct3Arg_, signature="@@:{_TestStruct2=id[5s]}{_TestStruct3=ci}")
 
 
-	def structTestStruct3Arg_andboolArg_(self, arg1, arg2):
-		return [ arg1, arg2 ]
-	structTestStruct3Arg_andboolArg_ = objc.selector(structTestStruct3Arg_andboolArg_, signature="@@:{_TestStruct3=ci}B")
-
-
 	def structTestStruct3Arg_andBOOLArg_(self, arg1, arg2):
 		return [ arg1, arg2 ]
-	structTestStruct3Arg_andBOOLArg_ = objc.selector(structTestStruct3Arg_andBOOLArg_, signature="@@:{_TestStruct3=ci}c")
+	structTestStruct3Arg_andBOOLArg_ = objc.selector(structTestStruct3Arg_andBOOLArg_, signature="@@:{_TestStruct3=ci}C")
 
 
 	def structTestStruct3Arg_andcharArg_(self, arg1, arg2):
 	structTestStruct3Arg_andstructTestStruct3Arg_ = objc.selector(structTestStruct3Arg_andstructTestStruct3Arg_, signature="@@:{_TestStruct3=ci}{_TestStruct3=ci}")
 
 
-	def boolInArg_(self, arg):
-		return arg
-	boolInArg_ = objc.selector(boolInArg_, signature="@@:n^B")
-
-
-	def boolOutArg_(self):
-		if (self.counter > 2): self.reset()
-		res = g_bool_values[self.counter]
-		self.counter += 1
-		return res
-	boolOutArg_ = objc.selector(boolOutArg_, signature="v@:o^B")
-
-
-	def boolInOutArg_(self, arg):
-		if (self.counter > 2): self.reset()
-		res = g_bool_values[self.counter];
-		self.counter += 1
-		return (arg, res)
-	boolInOutArg_ = objc.selector(boolInOutArg_, signature="@@:N^B")
-
-
 	def BOOLInArg_(self, arg):
 		return arg
-	BOOLInArg_ = objc.selector(BOOLInArg_, signature="@@:n^c")
+	BOOLInArg_ = objc.selector(BOOLInArg_, signature="@@:n^C")
 
 
 	def BOOLOutArg_(self):
 		res = g_BOOL_values[self.counter]
 		self.counter += 1
 		return res
-	BOOLOutArg_ = objc.selector(BOOLOutArg_, signature="v@:o^c")
+	BOOLOutArg_ = objc.selector(BOOLOutArg_, signature="v@:o^C")
 
 
 	def BOOLInOutArg_(self, arg):
 		res = g_BOOL_values[self.counter];
 		self.counter += 1
 		return (arg, res)
-	BOOLInOutArg_ = objc.selector(BOOLInOutArg_, signature="@@:N^c")
+	BOOLInOutArg_ = objc.selector(BOOLInOutArg_, signature="@@:N^C")
 
 
 	def charInArg_(self, arg):
 	# Test calling Python from Objective-C
 	# Simple returns from instance methods
 
-	def testcallboolResult(self):
-		o = Python_TestClass.alloc().init()
-		self.assert_(o is not None)
-		o.reset()
-		self.assertEquals(PyObjC_TestClass2.callboolMethodOf_(o), YES)
-		self.assertEquals(PyObjC_TestClass2.callboolMethodOf_(o), NO)
-
-
-	def testinvokeboolResult(self):
-		o = Python_TestClass.alloc().init()
-		self.assert_(o is not None)
-		o.reset()
-		self.assertEquals(PyObjC_TestClass2.invokeboolMethodOf_(o), YES)
-		self.assertEquals(PyObjC_TestClass2.invokeboolMethodOf_(o), NO)
-
-
 	def testcallBOOLResult(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
 
 	# One argument
 
-	def testcallboolArg(self):
-		o = Python_TestClass.alloc().init()
-		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeboolArg_of_(YES, o)
-		self.assertEquals(r, YES)
-		r = PyObjC_TestClass2.invokeboolArg_of_(NO, o)
-		self.assertEquals(r, NO)
-
-
-	def testinvokeboolArg(self):
-		o = Python_TestClass.alloc().init()
-		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeboolArg_of_(YES, o)
-		self.assertEquals(r, YES)
-		r = PyObjC_TestClass2.invokeboolArg_of_(NO, o)
-		self.assertEquals(r, NO)
-
-
 	def testcallBOOLArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
 
 	# Two arguments
 
-	def testcallboolAndboolArg(self):
-		o = Python_TestClass.alloc().init()
-		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callboolArg_andboolArg_of_(YES, YES, o)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], YES)
-		r = PyObjC_TestClass2.callboolArg_andboolArg_of_(YES, NO, o)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], NO)
-		r = PyObjC_TestClass2.callboolArg_andboolArg_of_(NO, YES, o)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], YES)
-		r = PyObjC_TestClass2.callboolArg_andboolArg_of_(NO, NO, o)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], NO)
-
-
<