[PyObjC-svn] r2562 - in branches/pyobjc-2.3.x: . pyobjc-framework-CFNetwork/Modules pyobjc-framework-Quartz/Lib/Quartz pyobjc-framework-Quartz/Lib/Quartz/QuickLookUI

Author: ronaldoussoren
Date: Tue Aug 10 05:48:43 2010
New Revision: 2562

Log:
Merged revisions 2561 via svnmerge from 
https://svn.red-bean.com/pyobjc/trunk/pyobjc

........
  r2561 | ronaldoussoren | 2010-08-10 12:44:26 +0200 (Tue, 10 Aug 2010) | 3 lines
  
  CFNetwork: fix for 10.5 compilation
  Quartz: remove debug prints
........


Modified:
   branches/pyobjc-2.3.x/   (props changed)
   branches/pyobjc-2.3.x/pyobjc-framework-CFNetwork/Modules/_manual.m
   branches/pyobjc-2.3.x/pyobjc-framework-Quartz/Lib/Quartz/QuickLookUI/__init__.py
   branches/pyobjc-2.3.x/pyobjc-framework-Quartz/Lib/Quartz/__init__.py

Modified: branches/pyobjc-2.3.x/pyobjc-framework-CFNetwork/Modules/_manual.m
==============================================================================
--- branches/pyobjc-2.3.x/pyobjc-framework-CFNetwork/Modules/_manual.m	(original)
+++ branches/pyobjc-2.3.x/pyobjc-framework-CFNetwork/Modules/_manual.m	Tue Aug 10 05:48:43 2010
@@ -179,7 +179,9 @@
 
 	return rv;
 }
+#endif
 
+#if PyObjC_BUILD_RELEASE >= 1005
 static PyObject*
 m_CFNetworkExecuteProxyAutoConfigurationURL(PyObject* mod __attribute__((__unused__)),
 		PyObject* args)

Modified: branches/pyobjc-2.3.x/pyobjc-framework-Quartz/Lib/Quartz/QuickLookUI/__init__.py
==============================================================================
--- branches/pyobjc-2.3.x/pyobjc-framework-Quartz/Lib/Quartz/QuickLookUI/__init__.py	(original)
+++ branches/pyobjc-2.3.x/pyobjc-framework-Quartz/Lib/Quartz/QuickLookUI/__init__.py	Tue Aug 10 05:48:43 2010
@@ -4,22 +4,15 @@
 This module does not contain docstrings for the wrapped code, check Apple's
 documentation for details on how to use these functions and classes. 
 '''
-try:
+import objc as _objc
+from AppKit import *
+from Foundation import *
+#from QuickLook import *
 
-    import objc as _objc
-    from AppKit import *
-    from Foundation import *
-    #from QuickLook import *
-
-    __bundle__ = _objc.initFrameworkWrapper("QuickLookUI",
-        frameworkIdentifier="com.apple.QuickLookUIFramework",
-        frameworkPath=_objc.pathForFramework(
-            "/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"),
-        globals=globals(),
-        frameworkResourceName="Quartz.QuickLookUI",
-        )
-
-except Exception, e:
-    import traceback
-    traceback.print_exc()
-    raise
+__bundle__ = _objc.initFrameworkWrapper("QuickLookUI",
+    frameworkIdentifier="com.apple.QuickLookUIFramework",
+    frameworkPath=_objc.pathForFramework(
+        "/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"),
+    globals=globals(),
+    frameworkResourceName="Quartz.QuickLookUI",
+    )

Modified: branches/pyobjc-2.3.x/pyobjc-framework-Quartz/Lib/Quartz/__init__.py
==============================================================================
--- branches/pyobjc-2.3.x/pyobjc-framework-Quartz/Lib/Quartz/__init__.py	(original)
+++ branches/pyobjc-2.3.x/pyobjc-framework-Quartz/Lib/Quartz/__init__.py	Tue Aug 10 05:48:43 2010
@@ -40,6 +40,4 @@
 try:
     from Quartz.QuickLookUI import *
 except ImportError, msg:
-    import traceback
-    traceback.print_exc()
     pass

------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev