[PyObjC-svn] r2533 - in trunk/pyobjc/pyobjc-framework-WebKit: . Lib/WebKit

Author: ronaldoussoren
Date: Thu Jul  1 03:04:59 2010
New Revision: 2533

Log:
Generic setup.py; don't hardcode setuptools/distribute versions

Modified:
   trunk/pyobjc/pyobjc-framework-WebKit/   (props changed)
   trunk/pyobjc/pyobjc-framework-WebKit/Lib/WebKit/PyObjC.bridgesupport
   trunk/pyobjc/pyobjc-framework-WebKit/pyobjc_setup.py

Modified: trunk/pyobjc/pyobjc-framework-WebKit/Lib/WebKit/PyObjC.bridgesupport
==============================================================================
--- trunk/pyobjc/pyobjc-framework-WebKit/Lib/WebKit/PyObjC.bridgesupport	(original)
+++ trunk/pyobjc/pyobjc-framework-WebKit/Lib/WebKit/PyObjC.bridgesupport	Thu Jul  1 03:04:59 2010
@@ -762,9 +762,9 @@
     <method selector='webView:createWebViewModalDialogWithRequest:' type='@@:@@' />
     <method selector='webView:createWebViewWithRequest:' type='@@:@@' />
     <method selector='webView:dragDestinationActionMaskForDraggingInfo:' type='I@:@@' type64='Q@:@@' />
-    <method selector='webView:dragSourceActionMaskForPoint:' type='I@:@{_NSPoint=ff}' type64='Q@:@{_NSPoint=dd}' />
-    <method selector='webView:drawFooterInRect:' type='v@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='v@:@{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <method selector='webView:drawHeaderInRect:' type='v@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='v@:@{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <method selector='webView:dragSourceActionMaskForPoint:' type='I@:@{_NSPoint=ff}' type64='Q@:@{CGPoint=dd}' />
+    <method selector='webView:drawFooterInRect:' type='v@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='v@:@{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <method selector='webView:drawHeaderInRect:' type='v@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='v@:@{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <method selector='webView:makeFirstResponder:' type='v@:@@' />
     <method selector='webView:mouseDidMoveOverElement:modifierFlags:' type='v@:@@I' type64='v@:@@Q' />
     <method selector='webView:printFrameView:' type='v@:@@' />
@@ -776,8 +776,8 @@
     <method selector='webView:runJavaScriptTextInputPanelWithPrompt:defaultText:' type='@@:@@@' />
     <method selector='webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:' type='@@:@@@@' />
     <method selector='webView:runOpenPanelForFileButtonWithResultListener:' type='v@:@@' />
-    <method selector='webView:setContentRect:' type='v@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='v@:@{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <method selector='webView:setFrame:' type='v@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='v@:@{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <method selector='webView:setContentRect:' type='v@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='v@:@{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <method selector='webView:setFrame:' type='v@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='v@:@{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <method selector='webView:setResizable:' type='v@:@B' />
     <method selector='webView:setStatusBarVisible:' type='v@:@B' />
     <method selector='webView:setStatusText:' type='v@:@@' />
@@ -785,14 +785,14 @@
     <method selector='webView:shouldPerformAction:fromSender:' type='B@:@:@' />
     <method selector='webView:validateUserInterfaceItem:defaultValidation:' type='B@:@@B' />
     <method selector='webView:willPerformDragDestinationAction:forDraggingInfo:' type='v@:@i@' />
-    <method selector='webView:willPerformDragSourceAction:fromPoint:withPasteboard:' type='v@:@i{_NSPoint=ff}@' type64='v@:@q{_NSPoint=dd}@' />
+    <method selector='webView:willPerformDragSourceAction:fromPoint:withPasteboard:' type='v@:@i{_NSPoint=ff}@' type64='v@:@q{CGPoint=dd}@' />
     <method selector='webViewAreToolbarsVisible:' type='B@:@' />
     <method selector='webViewClose:' type='v@:@' />
-    <method selector='webViewContentRect:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}@:@' />
+    <method selector='webViewContentRect:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@' type64='{CGRect={CGPoint=dd}{CGSize=dd}}@:@' />
     <method selector='webViewFirstResponder:' type='@@:@' />
     <method selector='webViewFocus:' type='v@:@' />
     <method selector='webViewFooterHeight:' type='f@:@' />
-    <method selector='webViewFrame:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}@:@' />
+    <method selector='webViewFrame:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@' type64='{CGRect={CGPoint=dd}{CGSize=dd}}@:@' />
     <method selector='webViewHeaderHeight:' type='f@:@' />
     <method selector='webViewIsResizable:' type='B@:@' />
     <method selector='webViewIsStatusBarVisible:' type='B@:@' />

Modified: trunk/pyobjc/pyobjc-framework-WebKit/pyobjc_setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-WebKit/pyobjc_setup.py	(original)
+++ trunk/pyobjc/pyobjc-framework-WebKit/pyobjc_setup.py	Thu Jul  1 03:04:59 2010
@@ -8,57 +8,51 @@
 __all__ = ('setup', 'Extension', 'Command')
 
 import sys
-if sys.version_info[:2] < (3, 0):
-    import ez_setup
-    ez_setup.use_setuptools()
 
-    from setuptools.command.test import test as oc_test
-    from setuptools.command.build_py import build_py as oc_build_py
+try:
+    import setuptools
 
-    extra_args = {}
-
-
-else:
+except ImportError:
     import distribute_setup
     distribute_setup.use_setuptools()
 
-    from setuptools.command import test
-    from setuptools.command import build_py
+from setuptools.command import test
+from setuptools.command import build_py
 
-    from distutils import log
+from distutils import log
 
-    extra_args=dict(
-        use_2to3 = True,
-    )
+extra_args=dict(
+    use_2to3 = True,
+)
 
 
-    class oc_build_py (build_py.build_py):
-        def build_packages(self):
-            log.info("Overriding build_packages to copy PyObjCTest")
-            p = self.packages
-            self.packages = list(self.packages) + ['PyObjCTest']
-            try:
-                build_py.build_py.build_packages(self)
-            finally:
-                self.packages = p
+class oc_build_py (build_py.build_py):
+    def build_packages(self):
+        log.info("Overriding build_packages to copy PyObjCTest")
+        p = self.packages
+        self.packages = list(self.packages) + ['PyObjCTest']
+        try:
+            build_py.build_py.build_packages(self)
+        finally:
+            self.packages = p
 
 
 
-    class oc_test (test.test):
-        def run_tests(self):
-            import sys, os
+class oc_test (test.test):
+    def run_tests(self):
+        import sys, os
 
-            rootdir =  os.path.dirname(os.path.abspath(__file__))
-            if rootdir in sys.path:
-                sys.path.remove(rootdir)
+        rootdir =  os.path.dirname(os.path.abspath(__file__))
+        if rootdir in sys.path:
+            sys.path.remove(rootdir)
 
-            import PyObjCTest
-            import unittest
-            from pkg_resources import EntryPoint
-            loader_ep = EntryPoint.parse("x="+self.test_loader)
-            loader_class = loader_ep.load(require=False)
+        import PyObjCTest
+        import unittest
+        from pkg_resources import EntryPoint
+        loader_ep = EntryPoint.parse("x="+self.test_loader)
+        loader_class = loader_ep.load(require=False)
 
-            unittest.main(None, None, [unittest.__file__]+self.test_args, testLoader=loader_class())
+        unittest.main(None, None, [unittest.__file__]+self.test_args, testLoader=loader_class())
 
 
 

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first