[36234] trunk/dports/python/py-pyobjc2

[jmr at macports.org]

Revision: 36234
          http://trac.macosforge.org/projects/macports/changeset/36234
Author:   jmr at macports.org
Date:     2008-04-23 01:50:18 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
py-pyobjc2: fix runtime errors involving PyErr_WarnEx and elementtree

Modified Paths:
--------------
    trunk/dports/python/py-pyobjc2/Portfile

Added Paths:
-----------
    trunk/dports/python/py-pyobjc2/files/
    trunk/dports/python/py-pyobjc2/files/patch-PyErr_WarnEx.diff

Modified: trunk/dports/python/py-pyobjc2/Portfile
===================================================================
--- trunk/dports/python/py-pyobjc2/Portfile	2008-04-23 08:08:01 UTC (rev 36233)
+++ trunk/dports/python/py-pyobjc2/Portfile	2008-04-23 08:50:18 UTC (rev 36234)
@@ -21,12 +21,15 @@
 homepage		http://pyobjc.sourceforge.net/
 
 depends_lib-append     port:py-setuptools \
-                port:py-py2app-devel
+                port:py-py2app-devel \
+                port:py-elementtree
 
 fetch.type      svn
 svn.url         http://svn.red-bean.com/pyobjc/tags/r200-leopard/pyobjc-core/
 worksrcdir      pyobjc-core
 
+patchfiles      patch-PyErr_WarnEx.diff
+
 if {${os.major} < 9} {
     pre-fetch {
         return -code error "PyObjC 2.0 requires Mac OS X 10.5"

Added: trunk/dports/python/py-pyobjc2/files/patch-PyErr_WarnEx.diff
===================================================================
--- trunk/dports/python/py-pyobjc2/files/patch-PyErr_WarnEx.diff	                        (rev 0)
+++ trunk/dports/python/py-pyobjc2/files/patch-PyErr_WarnEx.diff	2008-04-23 08:50:18 UTC (rev 36234)
@@ -0,0 +1,63 @@
+Index: Modules/objc/function.m
+===================================================================
+--- Modules/objc/function.m	(revision 1995)
++++ Modules/objc/function.m	(working copy)
+@@ -132,8 +132,8 @@
+ 			plain_count + byref_in_count, PyTuple_Size(args));
+ 		return NULL;
+ 	} else {
+-		if (PyErr_WarnEx(PyExc_DeprecationWarning, 
+-			"Not all arguments to an Objective-C function are present", 1) < 0) {
++		if (PyErr_Warn(PyExc_DeprecationWarning, 
++			"Not all arguments to an Objective-C function are present") < 0) {
+ 			return NULL;
+ 		}
+ 	}
+Index: Modules/objc/module.m
+===================================================================
+--- Modules/objc/module.m	(revision 1995)
++++ Modules/objc/module.m	(working copy)
+@@ -495,8 +495,8 @@
+ 		return NULL;
+ 	}
+ 
+-	if (PyErr_WarnEx(PyExc_DeprecationWarning,
+-		"Use the new metadata machinery", 1) < 0) {
++	if (PyErr_Warn(PyExc_DeprecationWarning,
++		"Use the new metadata machinery") < 0) {
+ 
+ 		return NULL;
+ 	}
+Index: Modules/objc/libffi_support.m
+===================================================================
+--- Modules/objc/libffi_support.m	(revision 1995)
++++ Modules/objc/libffi_support.m	(working copy)
+@@ -1708,7 +1708,7 @@
+ 				"Not all Objective-C arguments are present in the Python argument-list of %s", PyString_AsString(repr));
+ 			Py_DECREF(repr);
+ 
+-			if (PyErr_WarnEx(PyExc_DeprecationWarning, buffer, 1) < 0) {
++			if (PyErr_Warn(PyExc_DeprecationWarning, buffer) < 0) {
+ 				Py_DECREF(methinfo);
+ 				PyMem_Free(stubUserdata);
+ 				return NULL;
+@@ -1769,8 +1769,8 @@
+ 			snprintf(buffer, sizeof(buffer),
+ 				"Not all Objective-C arguments are present in the Python argument-list of %s", PyString_AsString(repr));
+ 			Py_DECREF(repr);
+-			if (PyErr_WarnEx(PyExc_DeprecationWarning,
+-				buffer, 1) < 0) {
++			if (PyErr_Warn(PyExc_DeprecationWarning,
++				buffer) < 0) {
+ 				Py_DECREF(methinfo);
+ 				PyMem_Free(stubUserdata);
+ 				return NULL;
+@@ -3413,7 +3413,7 @@
+ 			plain_count + byref_in_count, PyTuple_Size(args));
+ 		goto error_cleanup;
+ 	} else {
+-		if (PyErr_WarnEx(PyExc_DeprecationWarning, "Not all arguments to an Objective-C method are present", 1) < 0) {
++		if (PyErr_Warn(PyExc_DeprecationWarning, "Not all arguments to an Objective-C method are present") < 0) {
+ 			goto error_cleanup;
+ 		}
+ 	}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080423/f7331c01/attachment.html