<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[36234] trunk/dports/python/py-pyobjc2</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/macports/changeset/36234">36234</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2008-04-23 01:50:18 -0700 (Wed, 23 Apr 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-pyobjc2: fix runtime errors involving PyErr_WarnEx and elementtree</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypyobjc2Portfile">trunk/dports/python/py-pyobjc2/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/python/py-pyobjc2/files/</li>
<li><a href="#trunkdportspythonpypyobjc2filespatchPyErr_WarnExdiff">trunk/dports/python/py-pyobjc2/files/patch-PyErr_WarnEx.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpypyobjc2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyobjc2/Portfile (36233 => 36234)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -21,12 +21,15 @@
</span><span class="cx"> homepage http://pyobjc.sourceforge.net/
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:py-setuptools \
</span><del>- port:py-py2app-devel
</del><ins>+ port:py-py2app-devel \
+ port:py-elementtree
</ins><span class="cx">
</span><span class="cx"> fetch.type svn
</span><span class="cx"> svn.url http://svn.red-bean.com/pyobjc/tags/r200-leopard/pyobjc-core/
</span><span class="cx"> worksrcdir pyobjc-core
</span><span class="cx">
</span><ins>+patchfiles patch-PyErr_WarnEx.diff
+
</ins><span class="cx"> if {${os.major} < 9} {
</span><span class="cx"> pre-fetch {
</span><span class="cx"> return -code error "PyObjC 2.0 requires Mac OS X 10.5"
</span></span></pre></div>
<a id="trunkdportspythonpypyobjc2filespatchPyErr_WarnExdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-pyobjc2/files/patch-PyErr_WarnEx.diff (0 => 36234)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+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;
+ }
+ }
</ins></span></pre>
</div>
</div>
</body>
</html>