[PyObjC-svn] r2105 - in trunk/pyobjc/pyobjc-core: . Lib/PyObjCTools Modules/objc

Author: ronaldoussoren
Date: Tue Mar 10 15:36:01 2009
New Revision: 2105

Log:
- Reorder author list
- Add more test methods
- Fix issue in class-builder


Modified:
   trunk/pyobjc/pyobjc-core/Lib/PyObjCTools/TestSupport.py
   trunk/pyobjc/pyobjc-core/Modules/objc/class-builder.m
   trunk/pyobjc/pyobjc-core/setup.py

Modified: trunk/pyobjc/pyobjc-core/Lib/PyObjCTools/TestSupport.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/Lib/PyObjCTools/TestSupport.py	(original)
+++ trunk/pyobjc/pyobjc-core/Lib/PyObjCTools/TestSupport.py	Tue Mar 10 15:36:01 2009
@@ -137,6 +137,18 @@
         if value is None:
             sel.fail(message, "%r is not %r"%(value, test))
 
+    def failUnlessArgIsPrintf(self, method, argno, message = None):
+        if isinstance(method, objc.selector):
+            offset = 2
+        else:
+            offset = 0
+        info = method.__metadata__()
+        if not info.get('variadic'):
+            self.fail(message or "%r is not a variadic function"%(method,))
+
+        if not info['arguments'][argno+offset].get('printf_format'):
+            self.fail(message or "%r argument %d is not a printf format string"%(method, argno))
+
     def failUnlessArgIsCFRetained(self, method, argno, message = None):
         if isinstance(method, objc.selector):
             offset = 2

Modified: trunk/pyobjc/pyobjc-core/Modules/objc/class-builder.m
==============================================================================
--- trunk/pyobjc/pyobjc-core/Modules/objc/class-builder.m	(original)
+++ trunk/pyobjc/pyobjc-core/Modules/objc/class-builder.m	Tue Mar 10 15:36:01 2009
@@ -1523,17 +1523,17 @@
 	
 	PyObjC_END_WITH_GIL
 
-	PyObjC_DURING
+	NS_DURING
 		*presult =  [NSMethodSignature signatureWithObjCTypes:(
 				(PyObjCSelector*)pymeth)->sel_python_signature];
-	PyObjC_HANDLER
+	NS_HANDLER
 		PyObjC_BEGIN_WITH_GIL
 			Py_DECREF(pymeth);
 			Py_DECREF(pyself);
 
 		PyObjC_END_WITH_GIL
 		[localException raise];
-	PyObjC_ENDHANDLER
+	NS_ENDHANDLER
 
 	PyObjC_BEGIN_WITH_GIL
 		Py_DECREF(pymeth);

Modified: trunk/pyobjc/pyobjc-core/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/setup.py	(original)
+++ trunk/pyobjc/pyobjc-core/setup.py	Tue Mar 10 15:36:01 2009
@@ -44,10 +44,8 @@
 PyObjC also supports full introspection of Objective-C classes and
 direct invocation of Objective-C APIs from the interactive interpreter.
 
-PyObjC requires MacOS X 10.2 or later.  PyObjC works both with the Apple
-provided Python installation in MacOS X 10.2 (and later) and with
-MacPython 2.3.  Users of MacPython 2.3 can install PyObjC though the
-PackageManager application.
+PyObjC requires MacOS X 10.4 or later.  This beta release requires
+MacOS X 10.5.
 """
 
 from setuptools import setup, Extension, find_packages
@@ -302,7 +300,7 @@
     version = package_version(),
     description = "Python<->ObjC Interoperability Module",
     long_description = LONG_DESCRIPTION,
-    author = "bbum, RonaldO, SteveM, LeleG, many others stretching back through the reaches of time...",
+    author = "Ronald Oussoren, bbum, SteveM, LeleG, many others stretching back through the reaches of time...",
     author_email = "[email protected]",
     url = "http://pyobjc.sourceforge.net/",
     platforms = [ 'MacOS X' ],

------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com