[PyObjC-svn] r2457 - in trunk/pyobjc/pyobjc-framework-XgridFoundation: . PyObjCTest
[email protected] Mon, 05 Apr 2010 04:52:39 -0500
| Newsgroups | gmane.comp.python.pyobjc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: ronaldoussoren
Date: Mon Apr 5 04:52:39 2010
New Revision: 2457
Log:
Port to py3k
Added:
trunk/pyobjc/pyobjc-framework-XgridFoundation/distribute_setup.py (contents, props changed)
Modified:
trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgactionmonitor.py
trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgauthenticator.py
trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgconnection.py
trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgcontroller.py
trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgfile.py
trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgfiledownload.py
trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xggrid.py
trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgjob.py
trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgresource.py
trunk/pyobjc/pyobjc-framework-XgridFoundation/pyobjc_setup.py
Modified: trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgactionmonitor.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgactionmonitor.py (original)
+++ trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgactionmonitor.py Mon Apr 5 04:52:39 2010
@@ -4,29 +4,29 @@
class TestXGActionMonitor (TestCase):
def testConstants(self):
- self.failUnlessEqual(XGResourceActionNone, 0)
- self.failUnlessEqual(XGResourceActionStop, 1)
- self.failUnlessEqual(XGResourceActionRestart, 2)
- self.failUnlessEqual(XGResourceActionSuspend, 3)
- self.failUnlessEqual(XGResourceActionResume, 4)
- self.failUnlessEqual(XGResourceActionDelete, 5)
- self.failUnlessEqual(XGResourceActionRename, 6)
- self.failUnlessEqual(XGResourceActionMakeDefault, 7)
- self.failUnlessEqual(XGResourceActionSubmitJob, 8)
- self.failUnlessEqual(XGResourceActionGetOutputStreams, 9)
- self.failUnlessEqual(XGResourceActionGetOutputFiles, 10)
- self.failUnlessEqual(XGResourceActionGetSpecification, 11)
-
- self.failUnlessEqual(XGActionMonitorOutcomeNone, 0)
- self.failUnlessEqual(XGActionMonitorOutcomeSuccess, 1)
- self.failUnlessEqual(XGActionMonitorOutcomeFailure, 2)
+ self.assertEqual(XGResourceActionNone, 0)
+ self.assertEqual(XGResourceActionStop, 1)
+ self.assertEqual(XGResourceActionRestart, 2)
+ self.assertEqual(XGResourceActionSuspend, 3)
+ self.assertEqual(XGResourceActionResume, 4)
+ self.assertEqual(XGResourceActionDelete, 5)
+ self.assertEqual(XGResourceActionRename, 6)
+ self.assertEqual(XGResourceActionMakeDefault, 7)
+ self.assertEqual(XGResourceActionSubmitJob, 8)
+ self.assertEqual(XGResourceActionGetOutputStreams, 9)
+ self.assertEqual(XGResourceActionGetOutputFiles, 10)
+ self.assertEqual(XGResourceActionGetSpecification, 11)
+
+ self.assertEqual(XGActionMonitorOutcomeNone, 0)
+ self.assertEqual(XGActionMonitorOutcomeSuccess, 1)
+ self.assertEqual(XGActionMonitorOutcomeFailure, 2)
- self.failUnlessIsInstance(XGActionMonitorResultsOutputStreamsKey, unicode)
- self.failUnlessIsInstance(XGActionMonitorResultsOutputFilesKey, unicode)
+ self.assertIsInstance(XGActionMonitorResultsOutputStreamsKey, unicode)
+ self.assertIsInstance(XGActionMonitorResultsOutputFilesKey, unicode)
def testMethods(self):
- self.failUnlessResultIsBOOL(XGActionMonitor.actionDidSucceed)
- self.failUnlessResultIsBOOL(XGActionMonitor.actionDidFail)
+ self.assertResultIsBOOL(XGActionMonitor.actionDidSucceed)
+ self.assertResultIsBOOL(XGActionMonitor.actionDidFail)
if __name__ == "__main__":
Modified: trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgauthenticator.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgauthenticator.py (original)
+++ trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgauthenticator.py Mon Apr 5 04:52:39 2010
@@ -4,10 +4,10 @@
class TestXGAuthenticator (TestCase):
def testConstants(self):
- self.failUnlessEqual(XGAuthenticatorStateUnauthenticated, 0)
- self.failUnlessEqual(XGAuthenticatorStateAuthenticating, 1)
- self.failUnlessEqual(XGAuthenticatorStateAuthenticated, 2)
- self.failUnlessEqual(XGAuthenticatorStateFailed, 3)
+ self.assertEqual(XGAuthenticatorStateUnauthenticated, 0)
+ self.assertEqual(XGAuthenticatorStateAuthenticating, 1)
+ self.assertEqual(XGAuthenticatorStateAuthenticated, 2)
+ self.assertEqual(XGAuthenticatorStateFailed, 3)
if __name__ == "__main__":
main()
Modified: trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgconnection.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgconnection.py (original)
+++ trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgconnection.py Mon Apr 5 04:52:39 2010
@@ -4,21 +4,21 @@
class TestXGConnection (TestCase):
def testConstants(self):
- self.failUnlessEqual(XGConnectionStateClosed, 0)
- self.failUnlessEqual(XGConnectionStateOpening, 1)
- self.failUnlessEqual(XGConnectionStateOpen, 2)
- self.failUnlessEqual(XGConnectionStateClosing, 3)
+ self.assertEqual(XGConnectionStateClosed, 0)
+ self.assertEqual(XGConnectionStateOpening, 1)
+ self.assertEqual(XGConnectionStateOpen, 2)
+ self.assertEqual(XGConnectionStateClosing, 3)
- self.failUnlessIsInstance(XGConnectionKeyIsOpened, unicode)
- self.failUnlessIsInstance(XGConnectionKeyIsClosed, unicode)
- self.failUnlessIsInstance(XGConnectionKeyState, unicode)
+ self.assertIsInstance(XGConnectionKeyIsOpened, unicode)
+ self.assertIsInstance(XGConnectionKeyIsClosed, unicode)
+ self.assertIsInstance(XGConnectionKeyState, unicode)
def testMethods(self):
- self.failUnlessResultIsBOOL(XGConnection.isOpened)
- self.failUnlessResultIsBOOL(XGConnection.isClosed)
+ self.assertResultIsBOOL(XGConnection.isOpened)
+ self.assertResultIsBOOL(XGConnection.isClosed)
def testProtocols(self):
- self.failUnlessIsInstance(protocols.XGConnectionDelegate, objc.informal_protocol)
+ self.assertIsInstance(protocols.XGConnectionDelegate, objc.informal_protocol)
if __name__ == "__main__":
main()
Modified: trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgcontroller.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgcontroller.py (original)
+++ trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgcontroller.py Mon Apr 5 04:52:39 2010
@@ -4,7 +4,7 @@
class TestXGController (TestCase):
def testConstants(self):
- self.failUnlessIsInstance(XGControllerWillDeallocNotification, unicode)
+ self.assertIsInstance(XGControllerWillDeallocNotification, unicode)
if __name__ == "__main__":
Modified: trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgfile.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgfile.py (original)
+++ trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgfile.py Mon Apr 5 04:52:39 2010
@@ -4,11 +4,11 @@
class TestXGFile (TestCase):
def testConstants(self):
- self.failUnlessEqual(XGFileTypeNone, 0)
- self.failUnlessEqual(XGFileTypeRegular, 1)
- self.failUnlessEqual(XGFileTypeStream, 2)
- self.failUnlessIsInstance(XGFileStandardOutputPath, unicode)
- self.failUnlessIsInstance(XGFileStandardErrorPath, unicode)
+ self.assertEqual(XGFileTypeNone, 0)
+ self.assertEqual(XGFileTypeRegular, 1)
+ self.assertEqual(XGFileTypeStream, 2)
+ self.assertIsInstance(XGFileStandardOutputPath, unicode)
+ self.assertIsInstance(XGFileStandardErrorPath, unicode)
if __name__ == "__main__":
main()
Modified: trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgfiledownload.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgfiledownload.py (original)
+++ trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgfiledownload.py Mon Apr 5 04:52:39 2010
@@ -4,10 +4,10 @@
class TestXGFileDownload (TestCase):
def testMethods(self):
- self.failUnlessArgIsBOOL(XGFileDownload.setDestination_allowOverwrite_, 1)
+ self.assertArgIsBOOL(XGFileDownload.setDestination_allowOverwrite_, 1)
def testProtocols(self):
- self.failUnlessIsInstance(protocols.XGFileDownloadDelegate, objc.informal_protocol)
+ self.assertIsInstance(protocols.XGFileDownloadDelegate, objc.informal_protocol)
if __name__ == "__main__":
Modified: trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xggrid.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xggrid.py (original)
+++ trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xggrid.py Mon Apr 5 04:52:39 2010
@@ -4,7 +4,7 @@
class TestXGGrid (TestCase):
def testMethods(self):
- self.failUnlessResultIsBOOL(XGGrid.isDefault)
+ self.assertResultIsBOOL(XGGrid.isDefault)
if __name__ == "__main__":
Modified: trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgjob.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgjob.py (original)
+++ trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgjob.py Mon Apr 5 04:52:39 2010
@@ -4,39 +4,39 @@
class TestXGJob (TestCase):
def testConstants(self):
- self.failUnlessIsInstance(XGJobSpecificationNameKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationTypeKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationSubmissionIdentifierKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationSchedulerParametersKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationGridIdentifierKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationDependsOnJobsKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationInputFilesKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationFileDataKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationIsExecutableKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationTaskPrototypesKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationInputFileMapKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationCommandKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationArgumentsKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationArgumentTypeKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationPathIdentifierKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationEnvironmentKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationInputStreamKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationTaskSpecificationsKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationTaskPrototypeIdentifierKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationDependsOnTasksKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationNotificationEmailKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationApplicationIdentifierKey, unicode)
+ self.assertIsInstance(XGJobSpecificationNameKey, unicode)
+ self.assertIsInstance(XGJobSpecificationTypeKey, unicode)
+ self.assertIsInstance(XGJobSpecificationSubmissionIdentifierKey, unicode)
+ self.assertIsInstance(XGJobSpecificationSchedulerParametersKey, unicode)
+ self.assertIsInstance(XGJobSpecificationGridIdentifierKey, unicode)
+ self.assertIsInstance(XGJobSpecificationDependsOnJobsKey, unicode)
+ self.assertIsInstance(XGJobSpecificationInputFilesKey, unicode)
+ self.assertIsInstance(XGJobSpecificationFileDataKey, unicode)
+ self.assertIsInstance(XGJobSpecificationIsExecutableKey, unicode)
+ self.assertIsInstance(XGJobSpecificationTaskPrototypesKey, unicode)
+ self.assertIsInstance(XGJobSpecificationInputFileMapKey, unicode)
+ self.assertIsInstance(XGJobSpecificationCommandKey, unicode)
+ self.assertIsInstance(XGJobSpecificationArgumentsKey, unicode)
+ self.assertIsInstance(XGJobSpecificationArgumentTypeKey, unicode)
+ self.assertIsInstance(XGJobSpecificationPathIdentifierKey, unicode)
+ self.assertIsInstance(XGJobSpecificationEnvironmentKey, unicode)
+ self.assertIsInstance(XGJobSpecificationInputStreamKey, unicode)
+ self.assertIsInstance(XGJobSpecificationTaskSpecificationsKey, unicode)
+ self.assertIsInstance(XGJobSpecificationTaskPrototypeIdentifierKey, unicode)
+ self.assertIsInstance(XGJobSpecificationDependsOnTasksKey, unicode)
+ self.assertIsInstance(XGJobSpecificationNotificationEmailKey, unicode)
+ self.assertIsInstance(XGJobSpecificationApplicationIdentifierKey, unicode)
@min_os_level('10.5')
def testConstants10_5(self):
- self.failUnlessIsInstance(XGJobSpecificationSchedulerHintsKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationARTSpecificationsKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationARTConditionsKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationARTDataKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationARTMinimumKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationARTMaximumKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationARTEqualKey, unicode)
- self.failUnlessIsInstance(XGJobSpecificationTypeTaskListValue, unicode)
+ self.assertIsInstance(XGJobSpecificationSchedulerHintsKey, unicode)
+ self.assertIsInstance(XGJobSpecificationARTSpecificationsKey, unicode)
+ self.assertIsInstance(XGJobSpecificationARTConditionsKey, unicode)
+ self.assertIsInstance(XGJobSpecificationARTDataKey, unicode)
+ self.assertIsInstance(XGJobSpecificationARTMinimumKey, unicode)
+ self.assertIsInstance(XGJobSpecificationARTMaximumKey, unicode)
+ self.assertIsInstance(XGJobSpecificationARTEqualKey, unicode)
+ self.assertIsInstance(XGJobSpecificationTypeTaskListValue, unicode)
if __name__ == "__main__":
Modified: trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgresource.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgresource.py (original)
+++ trunk/pyobjc/pyobjc-framework-XgridFoundation/PyObjCTest/test_xgresource.py Mon Apr 5 04:52:39 2010
@@ -4,25 +4,25 @@
class TestXGResource (TestCase):
def testConstants(self):
- self.failUnlessEqual(XGResourceStateUninitialized, 0)
- self.failUnlessEqual(XGResourceStateOffline, 1)
- self.failUnlessEqual(XGResourceStateConnecting, 2)
- self.failUnlessEqual(XGResourceStateUnavailable, 3)
- self.failUnlessEqual(XGResourceStateAvailable, 4)
- self.failUnlessEqual(XGResourceStateWorking, 5)
- self.failUnlessEqual(XGResourceStatePending, 6)
- self.failUnlessEqual(XGResourceStateStarting, 7)
- self.failUnlessEqual(XGResourceStateStagingIn, 8)
- self.failUnlessEqual(XGResourceStateRunning, 9)
- self.failUnlessEqual(XGResourceStateSuspended, 10)
- self.failUnlessEqual(XGResourceStateStagingOut, 11)
- self.failUnlessEqual(XGResourceStateCanceled, 12)
- self.failUnlessEqual(XGResourceStateFailed, 13)
- self.failUnlessEqual(XGResourceStateFinished, 14)
+ self.assertEqual(XGResourceStateUninitialized, 0)
+ self.assertEqual(XGResourceStateOffline, 1)
+ self.assertEqual(XGResourceStateConnecting, 2)
+ self.assertEqual(XGResourceStateUnavailable, 3)
+ self.assertEqual(XGResourceStateAvailable, 4)
+ self.assertEqual(XGResourceStateWorking, 5)
+ self.assertEqual(XGResourceStatePending, 6)
+ self.assertEqual(XGResourceStateStarting, 7)
+ self.assertEqual(XGResourceStateStagingIn, 8)
+ self.assertEqual(XGResourceStateRunning, 9)
+ self.assertEqual(XGResourceStateSuspended, 10)
+ self.assertEqual(XGResourceStateStagingOut, 11)
+ self.assertEqual(XGResourceStateCanceled, 12)
+ self.assertEqual(XGResourceStateFailed, 13)
+ self.assertEqual(XGResourceStateFinished, 14)
def testMethods(self):
- self.failUnlessResultIsBOOL(XGResource.isUpdating)
- self.failUnlessResultIsBOOL(XGResource.isUpdated)
+ self.assertResultIsBOOL(XGResource.isUpdating)
+ self.assertResultIsBOOL(XGResource.isUpdated)
if __name__ == "__main__":
Modified: trunk/pyobjc/pyobjc-framework-XgridFoundation/pyobjc_setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-XgridFoundation/pyobjc_setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-XgridFoundation/pyobjc_setup.py Mon Apr 5 04:52:39 2010
@@ -7,13 +7,68 @@
__all__ = ('setup', 'Extension', 'Command')
-import ez_setup
-ez_setup.use_setuptools()
+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
+
+ extra_args = {}
+
+
+else:
+ import distribute_setup
+ distribute_setup.use_setuptools()
+
+ from setuptools.command import test
+ from setuptools.command import build_py
+
+ from distutils import log
+
+ 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_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)
+
+ 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())
+
+
from setuptools import setup as _setup, Extension as _Extension, Command
from distutils.errors import DistutilsPlatformError
from distutils.command import build, install, install_lib
from setuptools.command import develop, test, build_ext
+import pkg_resources
+import shutil
+import os
import plistlib
import sys
import __main__
@@ -34,7 +89,35 @@
class pyobjc_build_ext (build_ext.build_ext):
def run(self):
+
+ # Ensure that the PyObjC header files are available
+ # in 2.3 and later the headers are in the egg,
+ # before that we ship a copy.
+ dist, = pkg_resources.require('pyobjc-core')
+
+ include_root = os.path.join(self.build_temp, 'pyobjc-include')
+ if os.path.exists(include_root):
+ shutil.rmtree(include_root)
+
+ os.makedirs(include_root)
+ if dist.has_metadata('include'):
+ for fn in dist.metadata_listdir('include'):
+ data = dist.get_metadata('include/%s'%(fn,))
+ open(os.path.join(include_root, fn), 'w').write(data)
+
+ else:
+ data = gPyObjCAPI_H
+ open(os.path.join(include_rot, 'pyobjc-api.h'), 'w').write(data)
+
+ for e in self.extensions:
+ if include_root not in e.include_dirs:
+ e.include_dirs.append(include_root)
+
+ # Run the actual build
build_ext.build_ext.run(self)
+
+ # Then tweak the copy_extensions bit to ensure PyObjCTest gets
+ # copied to the right place.
extensions = self.extensions
self.extensions = [
e for e in extensions if e.name.startswith('PyObjCTest') ]
@@ -76,6 +159,10 @@
cmdclass=None,
**kwds):
+
+ k = kwds.copy()
+ k.update(extra_args)
+
os_level = get_os_level()
os_compatible = True
if sys.platform != 'darwin':
@@ -114,12 +201,17 @@
return subcommand
cmdclass['build'] = create_command_subclass(build.build)
- cmdclass['test'] = create_command_subclass(test.test)
+ cmdclass['test'] = create_command_subclass(oc_test)
cmdclass['install'] = create_command_subclass(install.install)
cmdclass['develop'] = create_command_subclass(develop.develop)
+ cmdclass['build_py'] = create_command_subclass(oc_build_py)
else:
cmdclass['build_ext'] = pyobjc_build_ext
cmdclass['install_lib'] = pyobjc_install_lib
+ cmdclass['test'] = oc_test
+ cmdclass['build_py'] = oc_build_py
+
+
_setup(
cmdclass=cmdclass,
@@ -133,5 +225,495 @@
package_data = { '': ['*.bridgesupport'] },
test_suite='PyObjCTest',
zip_safe = True,
- **kwds
+ **k
)
+
+
+gPyObjCAPI_H="""\
+#ifndef PyObjC_API_H
+#define PyObjC_API_H
+
+/*
+ * Use this in helper modules for the objc package, and in wrappers
+ * for functions that deal with objective-C objects/classes
+ *
+ * This header defines some utility wrappers for importing and using
+ * the core bridge.
+ *
+ * This is the *only* header file that should be used to access
+ * functionality in the core bridge.
+ *
+ * WARNING: this file is not part of the public interface of PyObjC and
+ * might change or be removed without warning or regard for backward
+ * compatibility.
+ */
+
+#include "Python.h"
+#include <objc/objc.h>
+
+#import <Foundation/Foundation.h>
+
+#ifndef CGFLOAT_DEFINED
+
+#ifdef __LP64__
+# error "Huh? 64-bit but no CFFloat available???"
+#endif
+
+typedef float CGFloat;
+#define CGFLOAT_MIN FLT_MIN
+#define CGFLOAT_MAX FLT_MAX
+#define CGFLOAT_IS_DOUBLE 0
+#define CGFLOAT_DEFINED
+
+#endif /* CGFLOAT_DEFINED */
+
+
+#ifndef NSINTEGER_DEFINED
+
+#ifdef __LP64__
+# error "Huh? 64-bit but no NSINTEGER available???"
+#endif
+
+typedef int NSInteger;
+typedef unsigned int NSUInteger;
+
+#define NSIntegerMax LONG_MAX
+#define NSIntegerMin LONG_MIN
+#define NSUIntegerMax ULONG_MAX
+
+#define NSINTEGER_DEFINED
+
+#endif
+
+
+#ifndef PyObjC_COMPAT_H
+#if (PY_VERSION_HEX < 0x02050000)
+typedef int Py_ssize_t;
+#define PY_FORMAT_SIZE_T ""
+#define Py_ARG_SIZE_T "n"
+#define PY_SSIZE_T_MAX INT_MAX
+
+#else
+
+#define Py_ARG_SIZE_T "i"
+#endif
+#endif
+
+#import <Foundation/NSException.h>
+
+struct PyObjC_WeakLink {
+ const char* name;
+ void (*func)(void);
+};
+
+
+/* threading support */
+#ifdef NO_OBJC2_RUNTIME
+#define PyObjC_DURING \
+ Py_BEGIN_ALLOW_THREADS \
+ NS_DURING
+
+#define PyObjC_HANDLER NS_HANDLER
+
+#define PyObjC_ENDHANDLER \
+ NS_ENDHANDLER \
+ Py_END_ALLOW_THREADS
+#else
+
+#define PyObjC_DURING \
+ Py_BEGIN_ALLOW_THREADS \
+ @try {
+
+#define PyObjC_HANDLER } @catch(volatile NSObject* _localException) { \
+ NSException* localException __attribute__((__unused__))= (NSException*)_localException;
+
+#define PyObjC_ENDHANDLER \
+ } \
+ Py_END_ALLOW_THREADS
+
+#endif
+
+#define PyObjC_BEGIN_WITH_GIL \
+ { \
+ PyGILState_STATE _GILState; \
+ _GILState = PyGILState_Ensure();
+
+#define PyObjC_GIL_FORWARD_EXC() \
+ do { \
+ PyObjCErr_ToObjCWithGILState(&_GILState); \
+ } while (0)
+
+
+#define PyObjC_GIL_RETURN(val) \
+ do { \
+ PyGILState_Release(_GILState); \
+ return (val); \
+ } while (0)
+
+#define PyObjC_GIL_RETURNVOID \
+ do { \
+ PyGILState_Release(_GILState); \
+ return; \
+ } while (0)
+
+
+#define PyObjC_END_WITH_GIL \
+ PyGILState_Release(_GILState); \
+ }
+
+
+
+#include <objc/objc-runtime.h>
+
+/* On 10.1 there are no defines for the OS version. */
+#ifndef MAC_OS_X_VERSION_10_1
+#define MAC_OS_X_VERSION_10_1 1010
+#define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_1
+
+#error "MAC_OS_X_VERSION_10_1 not defined. You aren't running 10.1 are you?"
+
+#endif
+
+#ifndef MAC_OS_X_VERSION_10_2
+#define MAC_OS_X_VERSION_10_2 1020
+#endif
+
+#ifndef MAC_OS_X_VERSION_10_3
+#define MAC_OS_X_VERSION_10_3 1030
+#endif
+
+#ifndef MAC_OS_X_VERSION_10_4
+#define MAC_OS_X_VERSION_10_4 1040
+#endif
+
+#ifndef MAC_OS_X_VERSION_10_5
+#define MAC_OS_X_VERSION_10_5 1050
+#endif
+
+/* Current API version, increase whenever:
+ * - Semantics of current functions change
+ * - Functions are removed
+ * Do not increase when adding a new function, the struct_len field
+ * can be used for detecting if a function has been added.
+ *
+ * HISTORY:
+ * - Version 2.2 adds PyObjCUnsupportedMethod_IMP
+ * and PyObjCUnsupportedMethod_Caller
+ * - Version 2.1 adds PyObjCPointerWrapper_Register
+ * - Version 2 adds an argument to PyObjC_InitSuper
+ * - Version 3 adds another argument to PyObjC_CallPython
+ * - Version 4 adds PyObjCErr_ToObjCGILState
+ * - Version 4.1 adds PyObjCRT_AlignOfType and PyObjCRT_SizeOfType
+ * (PyObjC_SizeOfType is now deprecated)
+ * - Version 4.2 adds PyObjCRT_SELName
+ * - Version 4.3 adds PyObjCRT_SimplifySignature
+ * - Version 4.4 adds PyObjC_FreeCArray, PyObjC_PythonToCArray and
+ * PyObjC_CArrayToPython
+ * - Version 5 modifies the signature for PyObjC_RegisterMethodMapping,
+ * PyObjC_RegisterSignatureMapping and PyObjCUnsupportedMethod_IMP,
+ * adds PyObjC_RegisterStructType and removes PyObjC_CallPython
+ * - Version 6 adds PyObjCIMP_Type, PyObjCIMP_GetIMP and PyObjCIMP_GetSelector
+ * - Version 7 adds PyObjCErr_AsExc, PyGILState_Ensure
+ * - Version 8 adds PyObjCObject_IsUninitialized,
+ removes PyObjCSelector_IsInitializer
+ * - Version 9 (???)
+ * - Version 10 changes the signature of PyObjCRT_SimplifySignature
+ * - Version 11 adds PyObjCObject_Convert, PyObjCSelector_Convert,
+ PyObjCClass_Convert, PyObjC_ConvertBOOL, and PyObjC_ConvertChar
+ * - Version 12 adds PyObjCObject_New
+ * - Version 13 adds PyObjCCreateOpaquePointerType
+ * - Version 14 adds PyObjCObject_NewTransient, PyObjCObject_ReleaseTransient
+ * - Version 15 changes the interface of PyObjCObject_New
+ * - Version 16 adds PyObjC_PerformWeaklinking
+ * - Version 17 introduces Py_ssize_t support
+ * - Version 18 introduces several API incompatibilities
+ */
+#define PYOBJC_API_VERSION 18
+
+#define PYOBJC_API_NAME "__C_API__"
+
+/*
+ * Only add items to the end of this list!
+ */
+typedef int (RegisterMethodMappingFunctionType)(
+ Class,
+ SEL,
+ PyObject *(*)(PyObject*, PyObject*, PyObject*),
+ void (*)(void*, void*, void**, void*));
+
+struct pyobjc_api {
+ int api_version; /* API version */
+ size_t struct_len; /* Length of this struct */
+ PyTypeObject* class_type; /* PyObjCClass_Type */
+ PyTypeObject* object_type; /* PyObjCObject_Type */
+ PyTypeObject* select_type; /* PyObjCSelector_Type */
+
+ /* PyObjC_RegisterMethodMapping */
+ RegisterMethodMappingFunctionType *register_method_mapping;
+
+ /* PyObjC_RegisterSignatureMapping */
+ int (*register_signature_mapping)(
+ char*,
+ PyObject *(*)(PyObject*, PyObject*, PyObject*),
+ void (*)(void*, void*, void**, void*));
+
+ /* PyObjCObject_GetObject */
+ id (*obj_get_object)(PyObject*);
+
+ /* PyObjCObject_ClearObject */
+ void (*obj_clear_object)(PyObject*);
+
+ /* PyObjCClass_GetClass */
+ Class (*cls_get_class)(PyObject*);
+
+ /* PyObjCClass_New */
+ PyObject* (*cls_to_python)(Class cls);
+
+ /* PyObjC_PythonToId */
+ id (*python_to_id)(PyObject*);
+
+ /* PyObjC_IdToPython */
+ PyObject* (*id_to_python)(id);
+
+ /* PyObjCErr_FromObjC */
+ void (*err_objc_to_python)(NSException*);
+
+ /* PyObjCErr_ToObjC */
+ void (*err_python_to_objc)(void);
+
+ /* PyObjC_PythonToObjC */
+ int (*py_to_objc)(const char*, PyObject*, void*);
+
+ /* PyObjC_ObjCToPython */
+ PyObject* (*objc_to_py)(const char*, void*);
+
+ /* PyObjC_SizeOfType */
+ Py_ssize_t (*sizeof_type)(const char*);
+
+ /* PyObjCSelector_GetClass */
+ Class (*sel_get_class)(PyObject* sel);
+
+ /* PyObjCSelector_GetSelector */
+ SEL (*sel_get_sel)(PyObject* sel);
+
+ /* PyObjC_InitSuper */
+ void (*fill_super)(struct objc_super*, Class, id);
+
+ /* PyObjC_InitSuperCls */
+ void (*fill_super_cls)(struct objc_super*, Class, Class);
+
+ /* PyObjCPointerWrapper_Register */
+ int (*register_pointer_wrapper)(
+ const char*, PyObject* (*pythonify)(void*),
+ int (*depythonify)(PyObject*, void*)
+ );
+
+ void (*unsupported_method_imp)(void*, void*, void**, void*);
+ PyObject* (*unsupported_method_caller)(PyObject*, PyObject*, PyObject*);
+
+ /* PyObjCErr_ToObjCWithGILState */
+ void (*err_python_to_objc_gil)(PyGILState_STATE* state);
+
+ /* PyObjCRT_AlignOfType */
+ Py_ssize_t (*alignof_type)(const char* typestr);
+
+ /* PyObjCRT_SELName */
+ const char* (*selname)(SEL sel);
+
+ /* PyObjCRT_SimplifySignature */
+ int (*simplify_sig)(char* signature, char* buf, size_t buflen);
+
+ /* PyObjC_FreeCArray */
+ void (*free_c_array)(int,void*);
+
+ /* PyObjC_PythonToCArray */
+ int (*py_to_c_array)(BOOL, BOOL, const char*, PyObject*, void**, Py_ssize_t*, PyObject**);
+
+ /* PyObjC_CArrayToPython */
+ PyObject* (*c_array_to_py)(const char*, void*, Py_ssize_t);
+
+ /* PyObjC_RegisterStructType */
+ PyObject* (*register_struct)(const char*, const char*, const char*, initproc, Py_ssize_t, const char**);
+
+ /* PyObjCIMP_Type */
+ PyTypeObject* imp_type;
+
+ /* PyObjCIMP_GetIMP */
+ IMP (*imp_get_imp)(PyObject*);
+
+ /* PyObjCIMP_GetSelector */
+ SEL (*imp_get_sel)(PyObject*);
+
+ /* PyObjCErr_AsExc */
+ NSException* (*err_python_to_nsexception)(void);
+
+ /* PyGILState_Ensure */
+ PyGILState_STATE (*gilstate_ensure)(void);
+
+ /* PyObjCObject_IsUninitialized */
+ int (*obj_is_uninitialized)(PyObject*);
+
+ /* PyObjCObject_Convert */
+ int (*pyobjcobject_convert)(PyObject*,void*);
+
+ /* PyObjCSelector_Convert */
+ int (*pyobjcselector_convert)(PyObject*,void*);
+
+ /* PyObjCClass_Convert */
+ int (*pyobjcclass_convert)(PyObject*,void*);
+
+ /* PyObjC_ConvertBOOL */
+ int (*pyobjc_convertbool)(PyObject*,void*);
+
+ /* PyObjC_ConvertChar */
+ int (*pyobjc_convertchar)(PyObject*,void*);
+
+ /* PyObjCObject_New */
+ PyObject* (*pyobjc_object_new)(id, int , int);
+
+ /* PyObjCCreateOpaquePointerType */
+ PyObject* (*pointer_type_new)(const char*, const char*, const char*);
+
+ /* PyObject* PyObjCObject_NewTransient(id objc_object, int* cookie); */
+ PyObject* (*newtransient)(id objc_object, int* cookie);
+
+ /* void PyObjCObject_ReleaseTransient(PyObject* proxy, int cookie); */
+ void (*releasetransient)(PyObject* proxy, int cookie);
+
+ void (*doweaklink)(PyObject*, struct PyObjC_WeakLink*);
+
+ const char* (*removefields)(char*, const char*);
+
+ PyObject** pyobjc_null;
+
+ int (*dep_c_array_count)(const char* type, Py_ssize_t count, BOOL strict, PyObject* value, void* datum);
+
+ PyObject* (*varlistnew)(const char* tp, void* array);
+};
+
+#ifndef PYOBJC_BUILD
+
+#ifndef PYOBJC_METHOD_STUB_IMPL
+static struct pyobjc_api* PyObjC_API;
+#endif /* PYOBJC_METHOD_STUB_IMPL */
+
+#define PyObjCObject_Check(obj) PyObject_TypeCheck(obj, PyObjC_API->object_type)
+#define PyObjCClass_Check(obj) PyObject_TypeCheck(obj, PyObjC_API->class_type)
+#define PyObjCSelector_Check(obj) PyObject_TypeCheck(obj, PyObjC_API->select_type)
+#define PyObjCIMP_Check(obj) PyObject_TypeCheck(obj, PyObjC_API->imp_type)
+#define PyObjCObject_GetObject (PyObjC_API->obj_get_object)
+#define PyObjCObject_ClearObject (PyObjC_API->obj_clear_object)
+#define PyObjCClass_GetClass (PyObjC_API->cls_get_class)
+#define PyObjCClass_New (PyObjC_API->cls_to_python)
+#define PyObjCSelector_GetClass (PyObjC_API->sel_get_class)
+#define PyObjCSelector_GetSelector (PyObjC_API->sel_get_sel)
+#define PyObjC_PythonToId (PyObjC_API->python_to_id)
+#define PyObjC_IdToPython (PyObjC_API->id_to_python)
+#define PyObjCErr_FromObjC (PyObjC_API->err_objc_to_python)
+#define PyObjCErr_ToObjC (PyObjC_API->err_python_to_objc)
+#define PyObjCErr_ToObjCWithGILState (PyObjC_API->err_python_to_objc_gil)
+#define PyObjCErr_AsExc (PyObjC_API->err_python_to_nsexception)
+#define PyObjC_PythonToObjC (PyObjC_API->py_to_objc)
+#define PyObjC_ObjCToPython (PyObjC_API->objc_to_py)
+#define PyObjC_RegisterMethodMapping (PyObjC_API->register_method_mapping)
+#define PyObjC_RegisterSignatureMapping (PyObjC_API->register_signature_mapping)
+#define PyObjC_SizeOfType (PyObjC_API->sizeof_type)
+#define PyObjC_PythonToObjC (PyObjC_API->py_to_objc)
+#define PyObjC_ObjCToPython (PyObjC_API->objc_to_py)
+#define PyObjC_InitSuper (PyObjC_API->fill_super)
+#define PyObjC_InitSuperCls (PyObjC_API->fill_super_cls)
+#define PyObjCPointerWrapper_Register (PyObjC_API->register_pointer_wrapper)
+#define PyObjCUnsupportedMethod_IMP (PyObjC_API->unsupported_method_imp)
+#define PyObjCUnsupportedMethod_Caller (PyObjC_API->unsupported_method_caller)
+#define PyObjCRT_SizeOfType (PyObjC_API->sizeof_type)
+#define PyObjCRT_AlignOfType (PyObjC_API->alignof_type)
+#define PyObjCRT_SELName (PyObjC_API->selname)
+#define PyObjCRT_SimplifySignature (PyObjC_API->simplify_sig)
+#define PyObjC_FreeCArray (PyObjC_API->free_c_array)
+#define PyObjC_PythonToCArray (PyObjC_API->py_to_c_array)
+#define PyObjC_CArrayToPython (PyObjC_API->c_array_to_py)
+#define PyObjC_RegisterStructType (PyObjC_API->register_struct)
+#define PyObjCIMP_GetIMP (PyObjC_API->imp_get_imp)
+#define PyObjCIMP_GetSelector (PyObjC_API->imp_get_sel)
+#define PyObjCObject_IsUninitialized (PyObjC_API->obj_is_uninitialized)
+#define PyObjCObject_Convert (PyObjC_API->pyobjcobject_convert)
+#define PyObjCSelector_Convert (PyObjC_API->pyobjcselector_convert)
+#define PyObjCClass_Convert (PyObjC_API->pyobjcselector_convert)
+#define PyObjC_ConvertBOOL (PyObjC_API->pyobjc_convertbool)
+#define PyObjC_ConvertChar (PyObjC_API->pyobjc_convertchar)
+#define PyObjCObject_New (PyObjC_API->pyobjc_object_new)
+#define PyObjCCreateOpaquePointerType (PyObjC_API->pointer_type_new)
+#define PyObjCObject_NewTransient (PyObjC_API->newtransient)
+#define PyObjCObject_ReleaseTransient (PyObjC_API->releasetransient)
+#define PyObjC_PerformWeaklinking (PyObjC_API->doweaklink)
+#define PyObjCRT_RemoveFieldNames (PyObjC_API->removefields)
+#define PyObjC_NULL (*(PyObjC_API->pyobjc_null))
+#define PyObjC_DepythonifyCArray (PyObjC_API->dep_c_array_count)
+#define PyObjC_VarList_New (PyObjC_API->varlistnew)
+
+
+#ifndef PYOBJC_METHOD_STUB_IMPL
+
+static int
+PyObjC_ImportAPI(PyObject* calling_module)
+{
+ PyObject* m;
+ PyObject* d;
+ PyObject* api_obj;
+ PyObject* name = PyString_FromString("objc");
+
+ m = PyImport_Import(name);
+ Py_DECREF(name);
+ if (m == NULL) {
+ return -1;
+ }
+
+ d = PyModule_GetDict(m);
+ if (d == NULL) {
+ PyErr_SetString(PyExc_RuntimeError,
+ "No dict in objc module");
+ return -1;
+ }
+
+ api_obj = PyDict_GetItemString(d, PYOBJC_API_NAME);
+ if (api_obj == NULL) {
+ PyErr_SetString(PyExc_RuntimeError,
+ "No C_API in objc module");
+ return -1;
+ }
+ PyObjC_API = PyCObject_AsVoidPtr(api_obj);
+ if (PyObjC_API == NULL) {
+ return 0;
+ }
+ if (PyObjC_API->api_version != PYOBJC_API_VERSION) {
+ PyErr_SetString(PyExc_RuntimeError,
+ "Wrong version of PyObjC C API");
+ return -1;
+ }
+
+ if (PyObjC_API->struct_len < sizeof(struct pyobjc_api)) {
+ PyErr_SetString(PyExc_RuntimeError,
+ "Wrong struct-size of PyObjC C API");
+ return -1;
+ }
+
+ Py_INCREF(api_obj);
+
+ /* Current pyobjc implementation doesn't allow deregistering
+ * information, avoid unloading of users of the C-API.
+ * (Yes this is ugle, patches to fix this situation are apriciated)
+ */
+ Py_INCREF(calling_module);
+
+ return 0;
+}
+#endif /* PYOBJC_METHOD_STUB_IMPL */
+
+#else /* PyObjC_BUILD */
+
+extern struct pyobjc_api objc_api;
+
+#endif /* !PYOBJC_BUILD */
+
+#endif /* PyObjC_API_H */
+"""
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev