Commits

Ronald Oussoren committed 6dd1284

- Updates for the 10.1 port.
- The generator scripts work just fine on 10.1, therefore the generated files
can be removed from CVS.

The 10.1 port is not fully functional (it crashes during the unittests), but
should be good enough to write usefulll programs.

Comments (0)

Files changed (23)

pyobjc/Lib/objc/test/test_methods2.py

 import unittest
 import objc
 from objc import YES, NO, nil
-from Foundation import NSFTPPropertyFileOffsetKey 
+from Foundation import NSPriorDayDesignations 
 import sys
 
 NSArray = objc.runtime.NSArray
 
 	def testClsidResult(self):
 		PyObjC_TestClass1.clsReset()
-		self.assertEquals(PyObjC_TestClass1.idClsMethod(), NSFTPPropertyFileOffsetKey)
+		self.assertEquals(PyObjC_TestClass1.idClsMethod(), NSPriorDayDesignations)
 
 
 	def testClscharPtrResult(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		o.reset()
-		self.assertEquals(o.idMethod(), NSFTPPropertyFileOffsetKey)
+		self.assertEquals(o.idMethod(), NSPriorDayDesignations)
 
 
 	def testcharPtrResult(self):
 	def testidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_(NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r, NSFTPPropertyFileOffsetKey)
+		r = o.idArg_(NSPriorDayDesignations)
+		self.assertEquals(r, NSPriorDayDesignations)
 
 
 	def testcharPtrArg(self):
 	def testBOOLAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.BOOLArg_andidArg_(YES, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.BOOLArg_andidArg_(NO, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		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):
 	def testcharAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.charArg_andidArg_(-128, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], -128)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.charArg_andidArg_(0, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.charArg_andidArg_(127, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 127)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.charArg_andidArg_(-128, NSPriorDayDesignations)
+		self.assertEquals(r[0], -128)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.charArg_andidArg_(0, NSPriorDayDesignations)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.charArg_andidArg_(127, NSPriorDayDesignations)
+		self.assertEquals(r[0], 127)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcharAndcharPtrArg(self):
 	def testsignedshortAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.signedshortArg_andidArg_(-(1<<14), NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], -(1<<14))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedshortArg_andidArg_(-42, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedshortArg_andidArg_(0, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedshortArg_andidArg_(42, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedshortArg_andidArg_(1 << 14, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 1 << 14)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.signedshortArg_andidArg_(-(1<<14), NSPriorDayDesignations)
+		self.assertEquals(r[0], -(1<<14))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedshortArg_andidArg_(-42, NSPriorDayDesignations)
+		self.assertEquals(r[0], -42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedshortArg_andidArg_(0, NSPriorDayDesignations)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedshortArg_andidArg_(42, NSPriorDayDesignations)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedshortArg_andidArg_(1 << 14, NSPriorDayDesignations)
+		self.assertEquals(r[0], 1 << 14)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testsignedshortAndcharPtrArg(self):
 	def testsignedintAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.signedintArg_andidArg_(-(1<<30), NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], -(1<<30))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedintArg_andidArg_(-42, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedintArg_andidArg_(0, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedintArg_andidArg_(42, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedintArg_andidArg_(1 << 30, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.signedintArg_andidArg_(-(1<<30), NSPriorDayDesignations)
+		self.assertEquals(r[0], -(1<<30))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedintArg_andidArg_(-42, NSPriorDayDesignations)
+		self.assertEquals(r[0], -42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedintArg_andidArg_(0, NSPriorDayDesignations)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedintArg_andidArg_(42, NSPriorDayDesignations)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedintArg_andidArg_(1 << 30, NSPriorDayDesignations)
+		self.assertEquals(r[0], 1 << 30)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testsignedintAndcharPtrArg(self):
 	def testsignedlongAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.signedlongArg_andidArg_(-(1<<30), NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], -(1<<30))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedlongArg_andidArg_(-42, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedlongArg_andidArg_(0, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedlongArg_andidArg_(42, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedlongArg_andidArg_(1 << 30, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.signedlongArg_andidArg_(-(1<<30), NSPriorDayDesignations)
+		self.assertEquals(r[0], -(1<<30))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedlongArg_andidArg_(-42, NSPriorDayDesignations)
+		self.assertEquals(r[0], -42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedlongArg_andidArg_(0, NSPriorDayDesignations)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedlongArg_andidArg_(42, NSPriorDayDesignations)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedlongArg_andidArg_(1 << 30, NSPriorDayDesignations)
+		self.assertEquals(r[0], 1 << 30)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testsignedlongAndcharPtrArg(self):
 	def testsignedlonglongAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.signedlonglongArg_andidArg_(-(1L << 60), NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], -(1L << 60))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedlonglongArg_andidArg_(-42, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedlonglongArg_andidArg_(0, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedlonglongArg_andidArg_(42, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.signedlonglongArg_andidArg_(1L << 60, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 1L << 60)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.signedlonglongArg_andidArg_(-(1L << 60), NSPriorDayDesignations)
+		self.assertEquals(r[0], -(1L << 60))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedlonglongArg_andidArg_(-42, NSPriorDayDesignations)
+		self.assertEquals(r[0], -42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedlonglongArg_andidArg_(0, NSPriorDayDesignations)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedlonglongArg_andidArg_(42, NSPriorDayDesignations)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.signedlonglongArg_andidArg_(1L << 60, NSPriorDayDesignations)
+		self.assertEquals(r[0], 1L << 60)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testsignedlonglongAndcharPtrArg(self):
 	def testunsignedcharAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.unsignedcharArg_andidArg_(0, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.unsignedcharArg_andidArg_(128, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 128)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.unsignedcharArg_andidArg_(255, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 255)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.unsignedcharArg_andidArg_(0, NSPriorDayDesignations)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.unsignedcharArg_andidArg_(128, NSPriorDayDesignations)
+		self.assertEquals(r[0], 128)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.unsignedcharArg_andidArg_(255, NSPriorDayDesignations)
+		self.assertEquals(r[0], 255)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testunsignedcharAndcharPtrArg(self):
 	def testunsignedshortAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.unsignedshortArg_andidArg_(0, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.unsignedshortArg_andidArg_(42, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.unsignedshortArg_andidArg_(1<<14, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 1<<14)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.unsignedshortArg_andidArg_(0, NSPriorDayDesignations)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.unsignedshortArg_andidArg_(42, NSPriorDayDesignations)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.unsignedshortArg_andidArg_(1<<14, NSPriorDayDesignations)
+		self.assertEquals(r[0], 1<<14)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testunsignedshortAndcharPtrArg(self):
 	def testunsignedintAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.unsignedintArg_andidArg_(0, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.unsignedintArg_andidArg_(42, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.unsignedintArg_andidArg_(1 << 30, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.unsignedintArg_andidArg_(0, NSPriorDayDesignations)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.unsignedintArg_andidArg_(42, NSPriorDayDesignations)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.unsignedintArg_andidArg_(1 << 30, NSPriorDayDesignations)
+		self.assertEquals(r[0], 1 << 30)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testunsignedintAndcharPtrArg(self):
 	def testunsignedlongAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.unsignedlongArg_andidArg_(0, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.unsignedlongArg_andidArg_(42, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.unsignedlongArg_andidArg_(1L << 30, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 1L << 30)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.unsignedlongArg_andidArg_(0, NSPriorDayDesignations)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.unsignedlongArg_andidArg_(42, NSPriorDayDesignations)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.unsignedlongArg_andidArg_(1L << 30, NSPriorDayDesignations)
+		self.assertEquals(r[0], 1L << 30)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testunsignedlongAndcharPtrArg(self):
 	def testunsignedlonglongAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.unsignedlonglongArg_andidArg_(0, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.unsignedlonglongArg_andidArg_(42, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.unsignedlonglongArg_andidArg_(1L << 62, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], 1L << 62)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.unsignedlonglongArg_andidArg_(0, NSPriorDayDesignations)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.unsignedlonglongArg_andidArg_(42, NSPriorDayDesignations)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.unsignedlonglongArg_andidArg_(1L << 62, NSPriorDayDesignations)
+		self.assertEquals(r[0], 1L << 62)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testunsignedlonglongAndcharPtrArg(self):
 	def testfloatAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.floatArg_andidArg_(0.128, NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[0], 0.128)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.floatArg_andidArg_(1.0, NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[0], 1.0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.floatArg_andidArg_(42.0, NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[0], 42.0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.floatArg_andidArg_(1e10, NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[0], 1e10)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.floatArg_andidArg_(0.128, NSPriorDayDesignations)
+		self.assertAlmostEquals(r[0], 0.128)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.floatArg_andidArg_(1.0, NSPriorDayDesignations)
+		self.assertAlmostEquals(r[0], 1.0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.floatArg_andidArg_(42.0, NSPriorDayDesignations)
+		self.assertAlmostEquals(r[0], 42.0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.floatArg_andidArg_(1e10, NSPriorDayDesignations)
+		self.assertAlmostEquals(r[0], 1e10)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testfloatAndcharPtrArg(self):
 	def testdoubleAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.doubleArg_andidArg_(0.128, NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[0], 0.128)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.doubleArg_andidArg_(1.0, NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[0], 1.0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.doubleArg_andidArg_(42.0, NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[0], 42.0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.doubleArg_andidArg_(1e10, NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[0], 1e10)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.doubleArg_andidArg_(0.128, NSPriorDayDesignations)
+		self.assertAlmostEquals(r[0], 0.128)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.doubleArg_andidArg_(1.0, NSPriorDayDesignations)
+		self.assertAlmostEquals(r[0], 1.0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.doubleArg_andidArg_(42.0, NSPriorDayDesignations)
+		self.assertAlmostEquals(r[0], 42.0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.doubleArg_andidArg_(1e10, NSPriorDayDesignations)
+		self.assertAlmostEquals(r[0], 1e10)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testdoubleAndcharPtrArg(self):
 	def testidAndBOOLArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andBOOLArg_(NSFTPPropertyFileOffsetKey, YES)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], YES)
-		r = o.idArg_andBOOLArg_(NSFTPPropertyFileOffsetKey, NO)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		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 testidAndcharArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andcharArg_(NSFTPPropertyFileOffsetKey, -128)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -128)
-		r = o.idArg_andcharArg_(NSFTPPropertyFileOffsetKey, 0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = o.idArg_andcharArg_(NSFTPPropertyFileOffsetKey, 127)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andcharArg_(NSPriorDayDesignations, -128)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -128)
+		r = o.idArg_andcharArg_(NSPriorDayDesignations, 0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = o.idArg_andcharArg_(NSPriorDayDesignations, 127)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 127)
 
 
 	def testidAndsignedshortArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andsignedshortArg_(NSFTPPropertyFileOffsetKey, -(1<<14))
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -(1<<14))
-		r = o.idArg_andsignedshortArg_(NSFTPPropertyFileOffsetKey, -42)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -42)
-		r = o.idArg_andsignedshortArg_(NSFTPPropertyFileOffsetKey, 0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = o.idArg_andsignedshortArg_(NSFTPPropertyFileOffsetKey, 42)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 42)
-		r = o.idArg_andsignedshortArg_(NSFTPPropertyFileOffsetKey, 1 << 14)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andsignedshortArg_(NSPriorDayDesignations, -(1<<14))
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -(1<<14))
+		r = o.idArg_andsignedshortArg_(NSPriorDayDesignations, -42)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -42)
+		r = o.idArg_andsignedshortArg_(NSPriorDayDesignations, 0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = o.idArg_andsignedshortArg_(NSPriorDayDesignations, 42)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 42)
+		r = o.idArg_andsignedshortArg_(NSPriorDayDesignations, 1 << 14)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 1 << 14)
 
 
 	def testidAndsignedintArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andsignedintArg_(NSFTPPropertyFileOffsetKey, -(1<<30))
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -(1<<30))
-		r = o.idArg_andsignedintArg_(NSFTPPropertyFileOffsetKey, -42)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -42)
-		r = o.idArg_andsignedintArg_(NSFTPPropertyFileOffsetKey, 0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = o.idArg_andsignedintArg_(NSFTPPropertyFileOffsetKey, 42)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 42)
-		r = o.idArg_andsignedintArg_(NSFTPPropertyFileOffsetKey, 1 << 30)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andsignedintArg_(NSPriorDayDesignations, -(1<<30))
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -(1<<30))
+		r = o.idArg_andsignedintArg_(NSPriorDayDesignations, -42)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -42)
+		r = o.idArg_andsignedintArg_(NSPriorDayDesignations, 0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = o.idArg_andsignedintArg_(NSPriorDayDesignations, 42)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 42)
+		r = o.idArg_andsignedintArg_(NSPriorDayDesignations, 1 << 30)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 1 << 30)
 
 
 	def testidAndsignedlongArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andsignedlongArg_(NSFTPPropertyFileOffsetKey, -(1<<30))
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -(1<<30))
-		r = o.idArg_andsignedlongArg_(NSFTPPropertyFileOffsetKey, -42)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -42)
-		r = o.idArg_andsignedlongArg_(NSFTPPropertyFileOffsetKey, 0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = o.idArg_andsignedlongArg_(NSFTPPropertyFileOffsetKey, 42)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 42)
-		r = o.idArg_andsignedlongArg_(NSFTPPropertyFileOffsetKey, 1 << 30)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andsignedlongArg_(NSPriorDayDesignations, -(1<<30))
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -(1<<30))
+		r = o.idArg_andsignedlongArg_(NSPriorDayDesignations, -42)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -42)
+		r = o.idArg_andsignedlongArg_(NSPriorDayDesignations, 0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = o.idArg_andsignedlongArg_(NSPriorDayDesignations, 42)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 42)
+		r = o.idArg_andsignedlongArg_(NSPriorDayDesignations, 1 << 30)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 1 << 30)
 
 
 	def testidAndsignedlonglongArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andsignedlonglongArg_(NSFTPPropertyFileOffsetKey, -(1L << 60))
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -(1L << 60))
-		r = o.idArg_andsignedlonglongArg_(NSFTPPropertyFileOffsetKey, -42)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -42)
-		r = o.idArg_andsignedlonglongArg_(NSFTPPropertyFileOffsetKey, 0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = o.idArg_andsignedlonglongArg_(NSFTPPropertyFileOffsetKey, 42)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 42)
-		r = o.idArg_andsignedlonglongArg_(NSFTPPropertyFileOffsetKey, 1L << 60)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andsignedlonglongArg_(NSPriorDayDesignations, -(1L << 60))
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -(1L << 60))
+		r = o.idArg_andsignedlonglongArg_(NSPriorDayDesignations, -42)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -42)
+		r = o.idArg_andsignedlonglongArg_(NSPriorDayDesignations, 0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = o.idArg_andsignedlonglongArg_(NSPriorDayDesignations, 42)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 42)
+		r = o.idArg_andsignedlonglongArg_(NSPriorDayDesignations, 1L << 60)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 1L << 60)
 
 
 	def testidAndunsignedcharArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andunsignedcharArg_(NSFTPPropertyFileOffsetKey, 0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = o.idArg_andunsignedcharArg_(NSFTPPropertyFileOffsetKey, 128)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 128)
-		r = o.idArg_andunsignedcharArg_(NSFTPPropertyFileOffsetKey, 255)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andunsignedcharArg_(NSPriorDayDesignations, 0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = o.idArg_andunsignedcharArg_(NSPriorDayDesignations, 128)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 128)
+		r = o.idArg_andunsignedcharArg_(NSPriorDayDesignations, 255)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 255)
 
 
 	def testidAndunsignedshortArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andunsignedshortArg_(NSFTPPropertyFileOffsetKey, 0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = o.idArg_andunsignedshortArg_(NSFTPPropertyFileOffsetKey, 42)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 42)
-		r = o.idArg_andunsignedshortArg_(NSFTPPropertyFileOffsetKey, 1<<14)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andunsignedshortArg_(NSPriorDayDesignations, 0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = o.idArg_andunsignedshortArg_(NSPriorDayDesignations, 42)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 42)
+		r = o.idArg_andunsignedshortArg_(NSPriorDayDesignations, 1<<14)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 1<<14)
 
 
 	def testidAndunsignedintArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andunsignedintArg_(NSFTPPropertyFileOffsetKey, 0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = o.idArg_andunsignedintArg_(NSFTPPropertyFileOffsetKey, 42)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 42)
-		r = o.idArg_andunsignedintArg_(NSFTPPropertyFileOffsetKey, 1 << 30)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andunsignedintArg_(NSPriorDayDesignations, 0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = o.idArg_andunsignedintArg_(NSPriorDayDesignations, 42)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 42)
+		r = o.idArg_andunsignedintArg_(NSPriorDayDesignations, 1 << 30)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 1 << 30)
 
 
 	def testidAndunsignedlongArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andunsignedlongArg_(NSFTPPropertyFileOffsetKey, 0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = o.idArg_andunsignedlongArg_(NSFTPPropertyFileOffsetKey, 42)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 42)
-		r = o.idArg_andunsignedlongArg_(NSFTPPropertyFileOffsetKey, 1L << 30)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andunsignedlongArg_(NSPriorDayDesignations, 0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = o.idArg_andunsignedlongArg_(NSPriorDayDesignations, 42)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 42)
+		r = o.idArg_andunsignedlongArg_(NSPriorDayDesignations, 1L << 30)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 1L << 30)
 
 
 	def testidAndunsignedlonglongArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andunsignedlonglongArg_(NSFTPPropertyFileOffsetKey, 0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = o.idArg_andunsignedlonglongArg_(NSFTPPropertyFileOffsetKey, 42)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 42)
-		r = o.idArg_andunsignedlonglongArg_(NSFTPPropertyFileOffsetKey, 1L << 62)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andunsignedlonglongArg_(NSPriorDayDesignations, 0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = o.idArg_andunsignedlonglongArg_(NSPriorDayDesignations, 42)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 42)
+		r = o.idArg_andunsignedlonglongArg_(NSPriorDayDesignations, 1L << 62)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 1L << 62)
 
 
 	def testidAndfloatArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andfloatArg_(NSFTPPropertyFileOffsetKey, 0.128)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[1], 0.128)
-		r = o.idArg_andfloatArg_(NSFTPPropertyFileOffsetKey, 1.0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[1], 1.0)
-		r = o.idArg_andfloatArg_(NSFTPPropertyFileOffsetKey, 42.0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[1], 42.0)
-		r = o.idArg_andfloatArg_(NSFTPPropertyFileOffsetKey, 1e10)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andfloatArg_(NSPriorDayDesignations, 0.128)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertAlmostEquals(r[1], 0.128)
+		r = o.idArg_andfloatArg_(NSPriorDayDesignations, 1.0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertAlmostEquals(r[1], 1.0)
+		r = o.idArg_andfloatArg_(NSPriorDayDesignations, 42.0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertAlmostEquals(r[1], 42.0)
+		r = o.idArg_andfloatArg_(NSPriorDayDesignations, 1e10)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertAlmostEquals(r[1], 1e10)
 
 
 	def testidAnddoubleArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_anddoubleArg_(NSFTPPropertyFileOffsetKey, 0.128)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[1], 0.128)
-		r = o.idArg_anddoubleArg_(NSFTPPropertyFileOffsetKey, 1.0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[1], 1.0)
-		r = o.idArg_anddoubleArg_(NSFTPPropertyFileOffsetKey, 42.0)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertAlmostEquals(r[1], 42.0)
-		r = o.idArg_anddoubleArg_(NSFTPPropertyFileOffsetKey, 1e10)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_anddoubleArg_(NSPriorDayDesignations, 0.128)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertAlmostEquals(r[1], 0.128)
+		r = o.idArg_anddoubleArg_(NSPriorDayDesignations, 1.0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertAlmostEquals(r[1], 1.0)
+		r = o.idArg_anddoubleArg_(NSPriorDayDesignations, 42.0)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertAlmostEquals(r[1], 42.0)
+		r = o.idArg_anddoubleArg_(NSPriorDayDesignations, 1e10)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertAlmostEquals(r[1], 1e10)
 
 
 	def testidAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andidArg_(NSFTPPropertyFileOffsetKey, NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andidArg_(NSPriorDayDesignations, NSPriorDayDesignations)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testidAndcharPtrArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andcharPtrArg_(NSFTPPropertyFileOffsetKey, "hello")
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], "hello")
-		r = o.idArg_andcharPtrArg_(NSFTPPropertyFileOffsetKey, "world")
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], "world")
-		r = o.idArg_andcharPtrArg_(NSFTPPropertyFileOffsetKey, "foobar")
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andcharPtrArg_(NSPriorDayDesignations, "hello")
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], "hello")
+		r = o.idArg_andcharPtrArg_(NSPriorDayDesignations, "world")
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], "world")
+		r = o.idArg_andcharPtrArg_(NSPriorDayDesignations, "foobar")
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], "foobar")
 
 
 	def testidAndNSPointArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andNSPointArg_(NSFTPPropertyFileOffsetKey, (1, 2))
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], (1, 2))
-		r = o.idArg_andNSPointArg_(NSFTPPropertyFileOffsetKey, (3, 4))
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andNSPointArg_(NSPriorDayDesignations, (1, 2))
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], (1, 2))
+		r = o.idArg_andNSPointArg_(NSPriorDayDesignations, (3, 4))
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], (3, 4))
 
 
 	def testidAndNSRectArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idArg_andNSRectArg_(NSFTPPropertyFileOffsetKey, ((1, 2), (3, 4)))
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], ((1, 2), (3, 4)))
-		r = o.idArg_andNSRectArg_(NSFTPPropertyFileOffsetKey, ((7, 8), (9, 10)))
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = o.idArg_andNSRectArg_(NSPriorDayDesignations, ((1, 2), (3, 4)))
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], ((1, 2), (3, 4)))
+		r = o.idArg_andNSRectArg_(NSPriorDayDesignations, ((7, 8), (9, 10)))
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], ((7, 8), (9, 10)))
 
 
 	def testcharPtrAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.charPtrArg_andidArg_("hello", NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], "hello")
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.charPtrArg_andidArg_("world", NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], "world")
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.charPtrArg_andidArg_("foobar", NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], "foobar")
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.charPtrArg_andidArg_("hello", NSPriorDayDesignations)
+		self.assertEquals(r[0], "hello")
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.charPtrArg_andidArg_("world", NSPriorDayDesignations)
+		self.assertEquals(r[0], "world")
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.charPtrArg_andidArg_("foobar", NSPriorDayDesignations)
+		self.assertEquals(r[0], "foobar")
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcharPtrAndcharPtrArg(self):
 	def testNSPointAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.NSPointArg_andidArg_((1, 2), NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], (1, 2))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.NSPointArg_andidArg_((3, 4), NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], (3, 4))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.NSPointArg_andidArg_((1, 2), NSPriorDayDesignations)
+		self.assertEquals(r[0], (1, 2))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.NSPointArg_andidArg_((3, 4), NSPriorDayDesignations)
+		self.assertEquals(r[0], (3, 4))
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testNSPointAndcharPtrArg(self):
 	def testNSRectAndidArg(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.NSRectArg_andidArg_(((1, 2), (3, 4)), NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], ((1, 2), (3, 4)))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = o.NSRectArg_andidArg_(((7, 8), (9, 10)), NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], ((7, 8), (9, 10)))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.NSRectArg_andidArg_(((1, 2), (3, 4)), NSPriorDayDesignations)
+		self.assertEquals(r[0], ((1, 2), (3, 4)))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = o.NSRectArg_andidArg_(((7, 8), (9, 10)), NSPriorDayDesignations)
+		self.assertEquals(r[0], ((7, 8), (9, 10)))
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testNSRectAndcharPtrArg(self):
 	def testidIn(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
-		r = o.idInArg_(NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r, NSFTPPropertyFileOffsetKey)
+		r = o.idInArg_(NSPriorDayDesignations)
+		self.assertEquals(r, NSPriorDayDesignations)
 
 
 	def testcharPtrIn(self):
 		o.reset()
 		r = o.idOutArg_()
 		self.assertEquals(r[0], None)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcharPtrOut(self):
 		o = PyObjC_TestClass1.alloc().init()
 		self.assert_(o is not None)
 		o.reset()
-		r = o.idInOutArg_(NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = o.idInOutArg_(NSPriorDayDesignations)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcharPtrInOut(self):
 g_unsignedlonglong_values = (0, 42, 1L << 62)
 g_float_values = (0.128, 1.0, 42.0, 1e10)
 g_double_values = (0.128, 1.0, 42.0, 1e10)
-g_id_values = (NSFTPPropertyFileOffsetKey,)
+g_id_values = (NSPriorDayDesignations,)
 g_charPtr_values = ("hello", "world", "foobar")
 g_NSPoint_values = ((1, 2), (3, 4))
 g_NSRect_values = (((1, 2), (3, 4)), ((7, 8), (9, 10)))
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
 		o.reset()
-		self.assertEquals(PyObjC_TestClass2.callidMethodOf_(o), NSFTPPropertyFileOffsetKey)
+		self.assertEquals(PyObjC_TestClass2.callidMethodOf_(o), NSPriorDayDesignations)
 
 
 	def testinvokeidResult(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
 		o.reset()
-		self.assertEquals(PyObjC_TestClass2.invokeidMethodOf_(o), NSFTPPropertyFileOffsetKey)
+		self.assertEquals(PyObjC_TestClass2.invokeidMethodOf_(o), NSPriorDayDesignations)
 
 
 	def testcallcharPtrResult(self):
 	def testcallidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callidArg_of_(NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r, NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callidArg_of_(NSPriorDayDesignations, o)
+		self.assertEquals(r, NSPriorDayDesignations)
 
 
 	def testinvokeidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeidArg_of_(NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r, NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokeidArg_of_(NSPriorDayDesignations, o)
+		self.assertEquals(r, NSPriorDayDesignations)
 
 
 	def testcallcharPtrArg(self):
 	def testcallBOOLAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callBOOLArg_andidArg_of_(YES, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callBOOLArg_andidArg_of_(NO, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callBOOLArg_andidArg_of_(YES, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], YES)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callBOOLArg_andidArg_of_(NO, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], NO)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokeBOOLAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeBOOLArg_andidArg_of_(YES, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], YES)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokeBOOLArg_andidArg_of_(NO, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], NO)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokeBOOLArg_andidArg_of_(YES, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], YES)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokeBOOLArg_andidArg_of_(NO, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], NO)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcallBOOLAndcharPtrArg(self):
 	def testcallcharAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callcharArg_andidArg_of_(-128, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -128)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callcharArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callcharArg_andidArg_of_(127, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 127)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callcharArg_andidArg_of_(-128, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -128)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callcharArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callcharArg_andidArg_of_(127, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 127)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokecharAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokecharArg_andidArg_of_(-128, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -128)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokecharArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokecharArg_andidArg_of_(127, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 127)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokecharArg_andidArg_of_(-128, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -128)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokecharArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokecharArg_andidArg_of_(127, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 127)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcallcharAndcharPtrArg(self):
 	def testcallsignedshortAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callsignedshortArg_andidArg_of_(-(1<<14), NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -(1<<14))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedshortArg_andidArg_of_(-42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedshortArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedshortArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedshortArg_andidArg_of_(1 << 14, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1 << 14)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callsignedshortArg_andidArg_of_(-(1<<14), NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -(1<<14))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedshortArg_andidArg_of_(-42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedshortArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedshortArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedshortArg_andidArg_of_(1 << 14, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1 << 14)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokesignedshortAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokesignedshortArg_andidArg_of_(-(1<<14), NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -(1<<14))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedshortArg_andidArg_of_(-42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedshortArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedshortArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedshortArg_andidArg_of_(1 << 14, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1 << 14)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokesignedshortArg_andidArg_of_(-(1<<14), NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -(1<<14))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedshortArg_andidArg_of_(-42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedshortArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedshortArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedshortArg_andidArg_of_(1 << 14, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1 << 14)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcallsignedshortAndcharPtrArg(self):
 	def testcallsignedintAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callsignedintArg_andidArg_of_(-(1<<30), NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -(1<<30))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedintArg_andidArg_of_(-42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedintArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedintArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedintArg_andidArg_of_(1 << 30, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callsignedintArg_andidArg_of_(-(1<<30), NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -(1<<30))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedintArg_andidArg_of_(-42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedintArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedintArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedintArg_andidArg_of_(1 << 30, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1 << 30)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokesignedintAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokesignedintArg_andidArg_of_(-(1<<30), NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -(1<<30))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedintArg_andidArg_of_(-42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedintArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedintArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedintArg_andidArg_of_(1 << 30, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokesignedintArg_andidArg_of_(-(1<<30), NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -(1<<30))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedintArg_andidArg_of_(-42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedintArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedintArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedintArg_andidArg_of_(1 << 30, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1 << 30)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcallsignedintAndcharPtrArg(self):
 	def testcallsignedlongAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callsignedlongArg_andidArg_of_(-(1<<30), NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -(1<<30))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedlongArg_andidArg_of_(-42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedlongArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedlongArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedlongArg_andidArg_of_(1 << 30, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callsignedlongArg_andidArg_of_(-(1<<30), NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -(1<<30))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedlongArg_andidArg_of_(-42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedlongArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedlongArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedlongArg_andidArg_of_(1 << 30, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1 << 30)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokesignedlongAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokesignedlongArg_andidArg_of_(-(1<<30), NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -(1<<30))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedlongArg_andidArg_of_(-42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedlongArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedlongArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedlongArg_andidArg_of_(1 << 30, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokesignedlongArg_andidArg_of_(-(1<<30), NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -(1<<30))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedlongArg_andidArg_of_(-42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedlongArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedlongArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedlongArg_andidArg_of_(1 << 30, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1 << 30)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcallsignedlongAndcharPtrArg(self):
 	def testcallsignedlonglongAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callsignedlonglongArg_andidArg_of_(-(1L << 60), NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -(1L << 60))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedlonglongArg_andidArg_of_(-42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedlonglongArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedlonglongArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callsignedlonglongArg_andidArg_of_(1L << 60, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1L << 60)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callsignedlonglongArg_andidArg_of_(-(1L << 60), NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -(1L << 60))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedlonglongArg_andidArg_of_(-42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedlonglongArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedlonglongArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callsignedlonglongArg_andidArg_of_(1L << 60, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1L << 60)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokesignedlonglongAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokesignedlonglongArg_andidArg_of_(-(1L << 60), NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -(1L << 60))
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedlonglongArg_andidArg_of_(-42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], -42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedlonglongArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedlonglongArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokesignedlonglongArg_andidArg_of_(1L << 60, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1L << 60)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokesignedlonglongArg_andidArg_of_(-(1L << 60), NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -(1L << 60))
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedlonglongArg_andidArg_of_(-42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], -42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedlonglongArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedlonglongArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokesignedlonglongArg_andidArg_of_(1L << 60, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1L << 60)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcallsignedlonglongAndcharPtrArg(self):
 	def testcallunsignedcharAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callunsignedcharArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callunsignedcharArg_andidArg_of_(128, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 128)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callunsignedcharArg_andidArg_of_(255, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 255)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callunsignedcharArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callunsignedcharArg_andidArg_of_(128, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 128)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callunsignedcharArg_andidArg_of_(255, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 255)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokeunsignedcharAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeunsignedcharArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokeunsignedcharArg_andidArg_of_(128, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 128)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokeunsignedcharArg_andidArg_of_(255, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 255)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokeunsignedcharArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokeunsignedcharArg_andidArg_of_(128, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 128)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokeunsignedcharArg_andidArg_of_(255, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 255)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcallunsignedcharAndcharPtrArg(self):
 	def testcallunsignedshortAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callunsignedshortArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callunsignedshortArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callunsignedshortArg_andidArg_of_(1<<14, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1<<14)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callunsignedshortArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callunsignedshortArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callunsignedshortArg_andidArg_of_(1<<14, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1<<14)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokeunsignedshortAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeunsignedshortArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokeunsignedshortArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokeunsignedshortArg_andidArg_of_(1<<14, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1<<14)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokeunsignedshortArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokeunsignedshortArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokeunsignedshortArg_andidArg_of_(1<<14, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1<<14)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcallunsignedshortAndcharPtrArg(self):
 	def testcallunsignedintAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callunsignedintArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callunsignedintArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callunsignedintArg_andidArg_of_(1 << 30, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callunsignedintArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callunsignedintArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callunsignedintArg_andidArg_of_(1 << 30, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1 << 30)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokeunsignedintAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeunsignedintArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokeunsignedintArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokeunsignedintArg_andidArg_of_(1 << 30, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1 << 30)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokeunsignedintArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokeunsignedintArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokeunsignedintArg_andidArg_of_(1 << 30, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1 << 30)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcallunsignedintAndcharPtrArg(self):
 	def testcallunsignedlongAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callunsignedlongArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callunsignedlongArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callunsignedlongArg_andidArg_of_(1L << 30, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1L << 30)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callunsignedlongArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callunsignedlongArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callunsignedlongArg_andidArg_of_(1L << 30, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1L << 30)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokeunsignedlongAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeunsignedlongArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokeunsignedlongArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokeunsignedlongArg_andidArg_of_(1L << 30, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1L << 30)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokeunsignedlongArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokeunsignedlongArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokeunsignedlongArg_andidArg_of_(1L << 30, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1L << 30)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcallunsignedlongAndcharPtrArg(self):
 	def testcallunsignedlonglongAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callunsignedlonglongArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callunsignedlonglongArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callunsignedlonglongArg_andidArg_of_(1L << 62, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1L << 62)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callunsignedlonglongArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callunsignedlonglongArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callunsignedlonglongArg_andidArg_of_(1L << 62, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1L << 62)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokeunsignedlonglongAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeunsignedlonglongArg_andidArg_of_(0, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokeunsignedlonglongArg_andidArg_of_(42, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 42)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokeunsignedlonglongArg_andidArg_of_(1L << 62, NSFTPPropertyFileOffsetKey, o)
-		self.assertEquals(r[0], 1L << 62)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokeunsignedlonglongArg_andidArg_of_(0, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokeunsignedlonglongArg_andidArg_of_(42, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 42)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokeunsignedlonglongArg_andidArg_of_(1L << 62, NSPriorDayDesignations, o)
+		self.assertEquals(r[0], 1L << 62)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcallunsignedlonglongAndcharPtrArg(self):
 	def testcallfloatAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callfloatArg_andidArg_of_(0.128, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 0.128)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callfloatArg_andidArg_of_(1.0, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 1.0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callfloatArg_andidArg_of_(42.0, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 42.0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.callfloatArg_andidArg_of_(1e10, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 1e10)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callfloatArg_andidArg_of_(0.128, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 0.128)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callfloatArg_andidArg_of_(1.0, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 1.0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callfloatArg_andidArg_of_(42.0, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 42.0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.callfloatArg_andidArg_of_(1e10, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 1e10)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokefloatAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokefloatArg_andidArg_of_(0.128, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 0.128)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokefloatArg_andidArg_of_(1.0, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 1.0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokefloatArg_andidArg_of_(42.0, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 42.0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokefloatArg_andidArg_of_(1e10, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 1e10)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokefloatArg_andidArg_of_(0.128, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 0.128)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokefloatArg_andidArg_of_(1.0, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 1.0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokefloatArg_andidArg_of_(42.0, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 42.0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokefloatArg_andidArg_of_(1e10, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 1e10)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcallfloatAndcharPtrArg(self):
 	def testcalldoubleAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.calldoubleArg_andidArg_of_(0.128, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 0.128)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.calldoubleArg_andidArg_of_(1.0, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 1.0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.calldoubleArg_andidArg_of_(42.0, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 42.0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.calldoubleArg_andidArg_of_(1e10, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 1e10)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.calldoubleArg_andidArg_of_(0.128, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 0.128)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.calldoubleArg_andidArg_of_(1.0, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 1.0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.calldoubleArg_andidArg_of_(42.0, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 42.0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.calldoubleArg_andidArg_of_(1e10, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 1e10)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testinvokedoubleAndidArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokedoubleArg_andidArg_of_(0.128, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 0.128)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokedoubleArg_andidArg_of_(1.0, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 1.0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokedoubleArg_andidArg_of_(42.0, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 42.0)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
-		r = PyObjC_TestClass2.invokedoubleArg_andidArg_of_(1e10, NSFTPPropertyFileOffsetKey, o)
-		self.assertAlmostEquals(r[0], 1e10)
-		self.assertEquals(r[1], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokedoubleArg_andidArg_of_(0.128, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 0.128)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokedoubleArg_andidArg_of_(1.0, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 1.0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokedoubleArg_andidArg_of_(42.0, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 42.0)
+		self.assertEquals(r[1], NSPriorDayDesignations)
+		r = PyObjC_TestClass2.invokedoubleArg_andidArg_of_(1e10, NSPriorDayDesignations, o)
+		self.assertAlmostEquals(r[0], 1e10)
+		self.assertEquals(r[1], NSPriorDayDesignations)
 
 
 	def testcalldoubleAndcharPtrArg(self):
 	def testcallidAndBOOLArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callidArg_andBOOLArg_of_(NSFTPPropertyFileOffsetKey, YES, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], YES)
-		r = PyObjC_TestClass2.callidArg_andBOOLArg_of_(NSFTPPropertyFileOffsetKey, NO, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callidArg_andBOOLArg_of_(NSPriorDayDesignations, YES, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], YES)
+		r = PyObjC_TestClass2.callidArg_andBOOLArg_of_(NSPriorDayDesignations, NO, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], NO)
 
 
 	def testinvokeidAndBOOLArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeidArg_andBOOLArg_of_(NSFTPPropertyFileOffsetKey, YES, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], YES)
-		r = PyObjC_TestClass2.invokeidArg_andBOOLArg_of_(NSFTPPropertyFileOffsetKey, NO, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokeidArg_andBOOLArg_of_(NSPriorDayDesignations, YES, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], YES)
+		r = PyObjC_TestClass2.invokeidArg_andBOOLArg_of_(NSPriorDayDesignations, NO, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], NO)
 
 
 	def testcallidAndcharArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callidArg_andcharArg_of_(NSFTPPropertyFileOffsetKey, -128, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -128)
-		r = PyObjC_TestClass2.callidArg_andcharArg_of_(NSFTPPropertyFileOffsetKey, 0, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = PyObjC_TestClass2.callidArg_andcharArg_of_(NSFTPPropertyFileOffsetKey, 127, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callidArg_andcharArg_of_(NSPriorDayDesignations, -128, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -128)
+		r = PyObjC_TestClass2.callidArg_andcharArg_of_(NSPriorDayDesignations, 0, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = PyObjC_TestClass2.callidArg_andcharArg_of_(NSPriorDayDesignations, 127, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 127)
 
 
 	def testinvokeidAndcharArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeidArg_andcharArg_of_(NSFTPPropertyFileOffsetKey, -128, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -128)
-		r = PyObjC_TestClass2.invokeidArg_andcharArg_of_(NSFTPPropertyFileOffsetKey, 0, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = PyObjC_TestClass2.invokeidArg_andcharArg_of_(NSFTPPropertyFileOffsetKey, 127, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokeidArg_andcharArg_of_(NSPriorDayDesignations, -128, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -128)
+		r = PyObjC_TestClass2.invokeidArg_andcharArg_of_(NSPriorDayDesignations, 0, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = PyObjC_TestClass2.invokeidArg_andcharArg_of_(NSPriorDayDesignations, 127, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 127)
 
 
 	def testcallidAndsignedshortArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callidArg_andsignedshortArg_of_(NSFTPPropertyFileOffsetKey, -(1<<14), o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -(1<<14))
-		r = PyObjC_TestClass2.callidArg_andsignedshortArg_of_(NSFTPPropertyFileOffsetKey, -42, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -42)
-		r = PyObjC_TestClass2.callidArg_andsignedshortArg_of_(NSFTPPropertyFileOffsetKey, 0, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = PyObjC_TestClass2.callidArg_andsignedshortArg_of_(NSFTPPropertyFileOffsetKey, 42, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 42)
-		r = PyObjC_TestClass2.callidArg_andsignedshortArg_of_(NSFTPPropertyFileOffsetKey, 1 << 14, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callidArg_andsignedshortArg_of_(NSPriorDayDesignations, -(1<<14), o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -(1<<14))
+		r = PyObjC_TestClass2.callidArg_andsignedshortArg_of_(NSPriorDayDesignations, -42, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -42)
+		r = PyObjC_TestClass2.callidArg_andsignedshortArg_of_(NSPriorDayDesignations, 0, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = PyObjC_TestClass2.callidArg_andsignedshortArg_of_(NSPriorDayDesignations, 42, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 42)
+		r = PyObjC_TestClass2.callidArg_andsignedshortArg_of_(NSPriorDayDesignations, 1 << 14, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 1 << 14)
 
 
 	def testinvokeidAndsignedshortArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeidArg_andsignedshortArg_of_(NSFTPPropertyFileOffsetKey, -(1<<14), o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -(1<<14))
-		r = PyObjC_TestClass2.invokeidArg_andsignedshortArg_of_(NSFTPPropertyFileOffsetKey, -42, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -42)
-		r = PyObjC_TestClass2.invokeidArg_andsignedshortArg_of_(NSFTPPropertyFileOffsetKey, 0, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = PyObjC_TestClass2.invokeidArg_andsignedshortArg_of_(NSFTPPropertyFileOffsetKey, 42, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 42)
-		r = PyObjC_TestClass2.invokeidArg_andsignedshortArg_of_(NSFTPPropertyFileOffsetKey, 1 << 14, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokeidArg_andsignedshortArg_of_(NSPriorDayDesignations, -(1<<14), o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -(1<<14))
+		r = PyObjC_TestClass2.invokeidArg_andsignedshortArg_of_(NSPriorDayDesignations, -42, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -42)
+		r = PyObjC_TestClass2.invokeidArg_andsignedshortArg_of_(NSPriorDayDesignations, 0, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = PyObjC_TestClass2.invokeidArg_andsignedshortArg_of_(NSPriorDayDesignations, 42, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 42)
+		r = PyObjC_TestClass2.invokeidArg_andsignedshortArg_of_(NSPriorDayDesignations, 1 << 14, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 1 << 14)
 
 
 	def testcallidAndsignedintArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callidArg_andsignedintArg_of_(NSFTPPropertyFileOffsetKey, -(1<<30), o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -(1<<30))
-		r = PyObjC_TestClass2.callidArg_andsignedintArg_of_(NSFTPPropertyFileOffsetKey, -42, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -42)
-		r = PyObjC_TestClass2.callidArg_andsignedintArg_of_(NSFTPPropertyFileOffsetKey, 0, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = PyObjC_TestClass2.callidArg_andsignedintArg_of_(NSFTPPropertyFileOffsetKey, 42, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 42)
-		r = PyObjC_TestClass2.callidArg_andsignedintArg_of_(NSFTPPropertyFileOffsetKey, 1 << 30, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.callidArg_andsignedintArg_of_(NSPriorDayDesignations, -(1<<30), o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -(1<<30))
+		r = PyObjC_TestClass2.callidArg_andsignedintArg_of_(NSPriorDayDesignations, -42, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -42)
+		r = PyObjC_TestClass2.callidArg_andsignedintArg_of_(NSPriorDayDesignations, 0, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = PyObjC_TestClass2.callidArg_andsignedintArg_of_(NSPriorDayDesignations, 42, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 42)
+		r = PyObjC_TestClass2.callidArg_andsignedintArg_of_(NSPriorDayDesignations, 1 << 30, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 1 << 30)
 
 
 	def testinvokeidAndsignedintArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.invokeidArg_andsignedintArg_of_(NSFTPPropertyFileOffsetKey, -(1<<30), o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -(1<<30))
-		r = PyObjC_TestClass2.invokeidArg_andsignedintArg_of_(NSFTPPropertyFileOffsetKey, -42, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -42)
-		r = PyObjC_TestClass2.invokeidArg_andsignedintArg_of_(NSFTPPropertyFileOffsetKey, 0, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 0)
-		r = PyObjC_TestClass2.invokeidArg_andsignedintArg_of_(NSFTPPropertyFileOffsetKey, 42, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], 42)
-		r = PyObjC_TestClass2.invokeidArg_andsignedintArg_of_(NSFTPPropertyFileOffsetKey, 1 << 30, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
+		r = PyObjC_TestClass2.invokeidArg_andsignedintArg_of_(NSPriorDayDesignations, -(1<<30), o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -(1<<30))
+		r = PyObjC_TestClass2.invokeidArg_andsignedintArg_of_(NSPriorDayDesignations, -42, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], -42)
+		r = PyObjC_TestClass2.invokeidArg_andsignedintArg_of_(NSPriorDayDesignations, 0, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 0)
+		r = PyObjC_TestClass2.invokeidArg_andsignedintArg_of_(NSPriorDayDesignations, 42, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
+		self.assertEquals(r[1], 42)
+		r = PyObjC_TestClass2.invokeidArg_andsignedintArg_of_(NSPriorDayDesignations, 1 << 30, o)
+		self.assertEquals(r[0], NSPriorDayDesignations)
 		self.assertEquals(r[1], 1 << 30)
 
 
 	def testcallidAndsignedlongArg(self):
 		o = Python_TestClass.alloc().init()
 		self.assert_(o is not None)
-		r = PyObjC_TestClass2.callidArg_andsignedlongArg_of_(NSFTPPropertyFileOffsetKey, -(1<<30), o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -(1<<30))
-		r = PyObjC_TestClass2.callidArg_andsignedlongArg_of_(NSFTPPropertyFileOffsetKey, -42, o)
-		self.assertEquals(r[0], NSFTPPropertyFileOffsetKey)
-		self.assertEquals(r[1], -42)
-		r