[PyObjC-svn] r1982 - in trunk/pyobjc/pyobjc-core: . Modules/objc libffi-src/x86 setup-lib

Author: ronaldoussoren
Date: Sun Jan 20 05:34:15 2008
New Revision: 1982

Log:
Drop some debug printf statements


Modified:
   trunk/pyobjc/pyobjc-core/Modules/objc/OC_PythonArray.m
   trunk/pyobjc/pyobjc-core/Modules/objc/OC_PythonDictionary.m
   trunk/pyobjc/pyobjc-core/Modules/objc/libffi_support.m
   trunk/pyobjc/pyobjc-core/Modules/objc/objc-runtime-compat.m
   trunk/pyobjc/pyobjc-core/Modules/objc/objc_util.m
   trunk/pyobjc/pyobjc-core/libffi-src/x86/x86-ffi_darwin.c
   trunk/pyobjc/pyobjc-core/setup-lib/macosx_version.py
   trunk/pyobjc/pyobjc-core/setup.py

Modified: trunk/pyobjc/pyobjc-core/Modules/objc/OC_PythonArray.m
==============================================================================
--- trunk/pyobjc/pyobjc-core/Modules/objc/OC_PythonArray.m	(original)
+++ trunk/pyobjc/pyobjc-core/Modules/objc/OC_PythonArray.m	Sun Jan 20 05:34:15 2008
@@ -298,6 +298,7 @@
 	 * encoded streams.
 	 */        
 	[NSException raise:NSInvalidArgumentException format:@"PyObjC: Encoding python objects of type %s is not supported", value->ob_type->tp_name, coder];
+	
 }
 
 - initWithCoder:(NSCoder*)coder

Modified: trunk/pyobjc/pyobjc-core/Modules/objc/OC_PythonDictionary.m
==============================================================================
--- trunk/pyobjc/pyobjc-core/Modules/objc/OC_PythonDictionary.m	(original)
+++ trunk/pyobjc/pyobjc-core/Modules/objc/OC_PythonDictionary.m	Sun Jan 20 05:34:15 2008
@@ -372,7 +372,6 @@
 	 * Forcefully disable coding for now, to avoid generating invalid
 	 * encoded streams.
 	 */        
-	//abort();
 	[NSException raise:NSInvalidArgumentException format:@"PyObjC: Encoding python objects of type %s is not supported", value->ob_type->tp_name, coder];
 }
 

Modified: trunk/pyobjc/pyobjc-core/Modules/objc/libffi_support.m
==============================================================================
--- trunk/pyobjc/pyobjc-core/Modules/objc/libffi_support.m	(original)
+++ trunk/pyobjc/pyobjc-core/Modules/objc/libffi_support.m	Sun Jan 20 05:34:15 2008
@@ -3604,7 +3604,6 @@
 		}
 
 	PyObjC_HANDLER
-		NSLog(@"caught exception: %@", localException);
 		PyObjCErr_FromObjC(localException);
 
 	PyObjC_ENDHANDLER

Modified: trunk/pyobjc/pyobjc-core/Modules/objc/objc-runtime-compat.m
==============================================================================
--- trunk/pyobjc/pyobjc-core/Modules/objc/objc-runtime-compat.m	(original)
+++ trunk/pyobjc/pyobjc-core/Modules/objc/objc-runtime-compat.m	Sun Jan 20 05:34:15 2008
@@ -821,7 +821,7 @@
 	 */
 	PyObjC_class_addMethodList  = compat_class_addMethodList;
 	PyObjC_methodlist_magic     = compat_methodlist_magic;
-	PyObjC_objc_disposeClassPair   = compat_objc_freeClassPair;
+	PyObjC_objc_disposeClassPair   = compat_objc_disposeClassPair;
 	PyObjC_preclass_addMethod   = compat_preclass_addMethod;
 	PyObjC_preclass_addIvar     = compat_preclass_addIvar;
 	PyObjC_preclass_addProtocol = compat_preclass_addProtocol;

Modified: trunk/pyobjc/pyobjc-core/Modules/objc/objc_util.m
==============================================================================
--- trunk/pyobjc/pyobjc-core/Modules/objc/objc_util.m	(original)
+++ trunk/pyobjc/pyobjc-core/Modules/objc/objc_util.m	Sun Jan 20 05:34:15 2008
@@ -39,7 +39,6 @@
 ObjCErr_PyExcForName(const char* value)
 {
 	/* XXX: This table should be changeable from python */
-	printf("finding exception for '%s'\n", value);
 	if (strcmp(value, "NSRangeException") == 0) {
 		return PyExc_IndexError;
 	}  else if (strcmp(value, "NSInvalidArgumentException") == 0) {

Modified: trunk/pyobjc/pyobjc-core/libffi-src/x86/x86-ffi_darwin.c
==============================================================================
--- trunk/pyobjc/pyobjc-core/libffi-src/x86/x86-ffi_darwin.c	(original)
+++ trunk/pyobjc/pyobjc-core/libffi-src/x86/x86-ffi_darwin.c	Sun Jan 20 05:34:15 2008
@@ -62,6 +62,7 @@
 /* ffi_prep_args is called by the assembly routine once stack space
    has been allocated for the function's arguments */
 /*@-exportheader@*/
+extern void ffi_prep_args(char*, extended_cif*);
 void
 ffi_prep_args(
 	char*			stack,
@@ -228,7 +229,7 @@
 void
 ffi_call(
 /*@dependent@*/	ffi_cif*	cif, 
-				void		(*fn)(), 
+				void		(*fn)(void), 
 /*@out@*/		void*		rvalue, 
 /*@dependent@*/	void**		avalue)
 {
@@ -565,4 +566,4 @@
 
 #endif	// !FFI_NO_RAW_API
 //#endif	// !__x86_64__
-#endif	// __i386__
\ No newline at end of file
+#endif	// __i386__

Modified: trunk/pyobjc/pyobjc-core/setup-lib/macosx_version.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/setup-lib/macosx_version.py	(original)
+++ trunk/pyobjc/pyobjc-core/setup-lib/macosx_version.py	Sun Jan 20 05:34:15 2008
@@ -10,6 +10,15 @@
         return LooseVersion(s)
 
 def sw_vers(_cache=[]):
+    # Using os.popen makes it annoyinly hard to debug using gdb...
+    try:
+        import plistlib
+
+        pl = plistlib.readPlist('/System/Library/CoreServices/SystemVersion.plist')
+        _cache.append(Version(pl['ProductVersion']))
+    except (ImportError, KeyError):
+        pass
+
     if not _cache:
         info = os.popen('/usr/bin/sw_vers').read().splitlines()
         for line in info:

Modified: trunk/pyobjc/pyobjc-core/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/setup.py	(original)
+++ trunk/pyobjc/pyobjc-core/setup.py	Sun Jan 20 05:34:15 2008
@@ -140,6 +140,7 @@
     CFLAGS.append('-DNO_OBJC2_RUNTIME')
 
 
+
 OBJC_LDFLAGS = frameworks('CoreFoundation', 'Foundation', 'Carbon')
 FND_LDFLAGS = frameworks('CoreFoundation', 'Foundation')
 APPKIT_LDFLAGS = frameworks('CoreFoundation', 'AppKit')

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/