| g.b...@opengroup.org |
by deleting the end time). |
Wed, 24 Aug, 19:47 |
| lco...@vh-s.de> |
Š |
Fri, 26 Jul, 11:50 |
| m.@kahuna.osafoundation.org> |
/cvsrep/external/persistence/xerces-c/win32/InitTermTest added to the repository |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
/cvsrep/external/persistence/xerces-c/win32/InitTermTest added to the repository |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
/cvsrep/external/persistence/xerces-c/win32/InitTermTest added to the repository |
Mon, 03 May, 09:42 |
| m.@osafoundation.org> |
/cvsrep/external/persistence/xerces-c/win32/InitTermTest added to the repository |
Mon, 03 May, 09:42 |
| s |
ion</dt> <dd><a href="http://viewcvs.osafoundation.org/chandler?view=rev&amp;rev=15918">15918</a></dd>
<dt>Author</dt> <dd>vajda</dd>
<dt>Date</dt> <dd>2007-11-26 21:27:23 -0800 (Mon, 26 Nov 2007)</dd>
</dl>
<h3>Log Message</h3>
<div class="commit-msg">applied patch for <a href="http://bugzilla.osafoundation.org/show_bug.cgi?id=11421">bug
11421</a></div>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkinternalchandlerdbMakefile">trunk/internal/chandlerdb/Makefile</a></li>
<li><a href="#trunkinternalchandlerdbchandlerdbitemItemErrorpy">trunk/internal/chandlerdb/chandlerdb/item/ItemError.py</a></li>
<li><a href="#trunkinternalchandlerdbchandlerdbitemcc">trunk/internal/chandlerdb/chandlerdb/item/c.c</a></li>
<li><a href="#trunkinternalchandlerdbchandlerdbitemch">trunk/internal/chandlerdb/chandlerdb/item/c.h</a></li>
<li><a href="#trunkinternalchandlerdbchandlerdbitemitemc">trunk/internal/chandlerdb/chandlerdb/item/item.c</a></li>
<li><a href="#trunkinternalchandlerdbchandlerdbschemacc">trunk/internal/chandlerdb/chandlerdb/schema/c.c</a></li>
<li><a href="#trunkinternalchandlerdbchandlerdbschemach">trunk/internal/chandlerdb/chandlerdb/schema/c.h</a></li>
<li><a href="#trunkinternalchandlerdbchandlerdbschemadescriptorc">trunk/internal/chandlerdb/chandlerdb/schema/descriptor.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkinternalchandlerdbMakefile"></a>
<div class="modfile"><h4>Modified: trunk/internal/chandlerdb/Makefile (15917 =>
15918)</h4>
<pre class="diff">
<span class="info">--- trunk/internal/chandlerdb/Makefile 2007-11-27 05:18:07 UTC (rev
15917)
+++ trunk/internal/chandlerdb/Makefile 2007-11-27 05:27:23 UTC (rev 15918)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx">
</span><span class="rem">-RELVER=0.7-$(BRANCH_REV_PREFIX)29
</span><span class="add">+RELVER=0.7-$(BRANCH_REV_PREFIX)30
</span><span class="cx"> CHANDLERDB=$(INTERNAL)/chandlerdb
DB_VER=4.6
SRC=$(CHANDLERDB)
</span></pre></div>
<a id="trunkinternalchandlerdbchandlerdbitemItemErrorpy"></a>
<div class="modfile"><h4>Modified: trunk/internal/chandlerdb/chandlerdb/item/ItemError.py
(15917 => 15918)</h4>
<pre class="diff">
<span class="info">--- trunk/internal/chandlerdb/chandlerdb/item/ItemError.py 2007-11-27
05:18:07 UTC (rev 15917)
+++ trunk/internal/chandlerdb/chandlerdb/item/ItemError.py 2007-11-27 05:27:23 UTC (rev 15918)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">
class NoValueForAttributeError(AttributeError, ItemError):
</span><span class="rem">- __doc__ = &quot;%s (Kind: %s) has no value for
'%s'&quot;
</span><span class="add">+ __doc__ = &quot;%s (%s) has no value for '%s'&quot;
</span><span class="cx">
def getAttribute(self):
return self.args[1]
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx">
class NoLocalValueForAttributeError(NoValueForAttributeError):
</span><span class="rem">- __doc__ = &quot;%s (Kind: %s) has no local value
for '%s'&quot;
</span><span class="add">+ __doc__ = &quot;%s (%s) has no local value for
'%s'&quot;
</span><span class="cx">
def __str__(self):
return self.__doc__ %(self.getItem()._repr_(),
</span><span class="lines">@@ -138,6 +138,16 @@
</span><span class="cx"> self.getAttribute())
</span><span class="add">+class NoDescriptorForAttributeError(AttributeError,
ItemError):
+ __doc__ = &quot;%s of %s (%s) has no descriptor for attribute '%s'&quot;
+
+ def __str__(self):
+ return self.__doc__ %(type(self.getItem()),
+ self.getItem()._repr_(),
+ self.getItem()._kind,
+ self.getAttribute())
+
+
</span><span class="cx"> class ReadOnlyAttributeError(AttributeError, ItemError):
__doc__ = 'Item %s: value for %s is read-only'
</span></pre></div>
<a id="trunkinternalchandlerdbchandlerdbitemcc"></a>
<div class="modfile"><h4>Modified: trunk/internal/chandlerdb/chandlerdb/item/c.c
(15917 => 15918)</h4>
<pre class="diff">
<span class="info">--- trunk/internal/chandlerdb/chandlerdb/item/c.c 2007-11-27 05:18:07
UTC (rev 15917)
+++ trunk/internal/chandlerdb/chandlerdb/item/c.c 2007-11-27 05:27:23 UTC (rev 15918)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> PyTypeObject *ReadOnlyAttributeError = NULL;
PyTypeObject *ChangeDuringCommitError = NULL;
PyTypeObject *KindlessItemError = NULL;
</span><span class="add">+PyTypeObject *NoLocalValueForAttributeError = NULL;
+PyTypeObject *NoDescriptorForAttributeError = NULL;
</span><span class="cx"> PyTypeObject *CView = NULL;
PyObject *Nil = NULL;
PyObject *Default = NULL;
</span><span class="lines">@@ -184,6 +186,8 @@
</span><span class="cx"> LOAD_TYPE(m, ReadOnlyAttributeError);
LOAD_TYPE(m, ChangeDuringCommitError);
LOAD_TYPE(m, KindlessItemError);
</span><span class="add">+ LOAD_TYPE(m, NoLocalValueForAttributeError);
+ LOAD_TYPE(m, NoDescriptorForAttributeError);
</span><span class="cx"> Py_DECREF(m);
if (!(m = PyImport_ImportModule(&quot;chandlerdb.schema.c&quot;)))
</span></pre></div>
<a id="trunkinternalchandlerdbchandlerdbitemch"></a>
<div class="modfile"><h4>Modified: trunk/internal/chandlerdb/chandlerdb/item/c.h
(15917 => 15918)</h4>
<pre class="diff">
<span class="info">--- trunk/internal/chandlerdb/chandlerdb/item/c.h 2007-11-27 05:18:07
UTC (rev 15917)
+++ trunk/internal/chandlerdb/chandlerdb/item/c.h 2007-11-27 05:27:23 UTC (rev 15918)
</span><span class="lines">@@ -57,6 +57,8 @@
</span><span class="cx"> extern PyTypeObject *ReadOnlyAttributeError;
extern PyTypeObject *ChangeDuringCommitError;
extern PyTypeObject *KindlessItemError;
</span><span class="add">+extern PyTypeObject *NoLocalValueForAttributeError;
+extern PyTypeObject *NoDescriptorForAttributeError;
</span><span class="cx"> extern PyTypeObject *CView;
extern PyObject *Nil;
</span></pre></div>
<a id="trunkinternalchandlerdbchandlerdbitemitemc"></a>
<div class="modfile"><h4>Modified: trunk/internal/chandlerdb/chandlerdb/item/item.c
(15917 => 15918)</h4>
<pre class="diff">
<span class="info">--- trunk/internal/chandlerdb/chandlerdb/item/item.c 2007-11-27 05:18:07
UTC (rev 15917)
+++ trunk/internal/chandlerdb/chandlerdb/item/item.c 2007-11-27 05:27:23 UTC (rev 15918)
</span><span class="lines">@@ -779,7 +779,10 @@
</span><span class="cx"> return defaultValue;
}
</span><span class="rem">- PyErr_SetObject(PyExc_AttributeError, name);
</span><span class="add">+ value = PyTuple_Pack(2, self, name);
+ PyErr_SetObject((PyObject *) NoLocalValueForAttributeError, value);
+ Py_DECREF(value);
+
</span><span class="cx"> return NULL;
}
</span><span class="lines">@@ -956,7 +959,12 @@
</span><span class="cx">
if (!descriptor)
{
</span><span class="rem">- PyErr_SetObject(PyExc_AttributeError,
name);
</span><span class="add">+ PyObject *tuple = PyTuple_Pack(2, self,
name);
+
+ PyErr_SetObject((PyObject *) NoDescriptorForAttributeError,
+ tuple);
+ Py_DECREF(tuple);
+
</span><span class="cx"> return NULL;
}
</span></pre></div>
<a id="trunkinternalchandlerdbchandlerdbschemacc"></a>
<div class="modfile"><h4>Modified: trunk/internal/chandlerdb/chandlerdb/schema/c.c
(15917 => 15918)</h4>
<pre class="diff">
<span class="info">--- trunk/internal/chandlerdb/chandlerdb/schema/c.c 2007-11-27 05:18:07
UTC (rev 15917)
+++ trunk/internal/chandlerdb/chandlerdb/schema/c.c 2007-11-27 05:27:23 UTC (rev 15918)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx"> PyTypeObject *CValues = NULL;
PyTypeObject *CLinkedMap = NULL;
PyTypeObject *PersistentSequence = NULL;
</span><span class="rem">-PyObject *PyExc_StaleItemError = NULL;
</span><span class="add">+PyTypeObject *StaleItemError = NULL;
+PyTypeObject *NoValueForAttributeError = NULL;
</span><span class="cx"> PyObject *True_TUPLE = NULL;
PyObject *Empty_TUPLE = NULL;
PyObject *Empty = NULL;
</span><span class="lines">@@ -79,7 +80,8 @@
</span><span class="cx">
if (!(m = PyImport_ImportModule(&quot;chandlerdb.item.ItemError&quot;)))
return;
</span><span class="rem">- PyExc_StaleItemError = PyObject_GetAttrString(m,
&quot;StaleItemError&quot;);
</span><span class="add">+ LOAD_TYPE(m, StaleItemError);
+ LOAD_TYPE(m, NoValueForAttributeError);
</span><span class="cx"> Py_DECREF(m);
if (!(m = PyImport_ImportModule(&quot;chandlerdb.item.c&quot;)))
</span></pre></div>
<a id="trunkinternalchandlerdbchandlerdbschemach"></a>
<div class="modfile"><h4>Modified: trunk/internal/chandlerdb/chandlerdb/schema/c.h
(15917 => 15918)</h4>
<pre class="diff">
<span class="info">--- trunk/internal/chandlerdb/chandlerdb/schema/c.h 2007-11-27 05:18:07
UTC (rev 15917)
+++ trunk/internal/chandlerdb/chandlerdb/schema/c.h 2007-11-27 05:27:23 UTC (rev 15918)
</span><span class="lines">@@ -41,7 +41,8 @@
</span><span class="cx"> extern PyTypeObject *CValues;
extern PyTypeObject *CLinkedMap;
extern PyTypeObject *PersistentSequence;
</span><span class="rem">-extern PyObject *PyExc_StaleItemError;
</span><span class="add">+extern PyTypeObject *StaleItemError;
+extern PyTypeObject *NoValueForAttributeError;
</span><span class="cx"> extern PyObject *True_TUPLE, *Empty_TUPLE;
extern PyObject *Empty;
</span></pre></div>
<a id="trunkinternalchandlerdbchandlerdbschemadescriptorc"></a>
<div class="modfile"><h4>Modified: trunk/internal/chandlerdb/chandlerdb/schema/descriptor.c
(15917 => 15918)</h4>
<pre class="diff">
<span class="info">--- trunk/internal/chandlerdb/chandlerdb/schema/descriptor.c 2007-11-27
05:18:07 UTC (rev 15917)
+++ trunk/internal/chandlerdb/chandlerdb/schema/descriptor.c 2007-11-27 05:27:23 UTC (rev
15918)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> }
else if (item-&gt;status &amp; STALE)
{
</span><span class="rem">- PyErr_SetObject(PyExc_StaleItemError, (PyObject
*) item);
</span><span class="add">+ PyErr_SetObject((PyObject *) StaleItemError,
(PyObject *) item);
</span><span class="cx"> return NULL;
}
else
</span><span class="lines">@@ -272,15 +272,26 @@
</span><span class="cx"> Py_INCREF(value);
}
else
</span><span class="rem">- PyErr_SetObject(PyExc_AttributeError,
self-&gt;name);
- }
</span><span class="add">+ {
+ PyObject *tuple = PyTuple_Pack(2, item, self-&gt;name);
+
+ PyErr_SetObject((PyObject *) NoValueForAttributeError,
+ tuple);
+ Py_DECREF(tuple);
+ }
+ }
</span><span class="cx"> else
value = PyObject_CallMethodObjArgs((PyObject *) item, getAttributeValue_NAME,
self-&gt;name, attrDict, attr-&gt;attrID, NULL);
return value;
}
</span><span class="rem">- PyErr_SetObject(PyExc_AttributeError, self-&gt;name);
</span><span class="add">+ {
+ PyObject *tuple = PyTuple_Pack(2, item, self-&gt;name);
+
+ PyErr_SetObject((PyObject *) NoValueForAttributeError, tuple);
+ Py_DECREF(tuple);
+ }
</span><span class="cx"> return NULL;
}
}
</span><spa class="cx"> return NULL;
}
else
</span><span class="lines">@@ -272,15 +272,26 @@
</span><span class="cx"> Py_INCREF(value);
}
else
</span><span class="rem">- PyErr_SetObject(PyExc_AttributeError, self->name);
- }
</span><span class="add">+ {
+ PyObject *tuple = PyTuple_Pack(2, item, self->name);
+
+ PyErr_SetObject((PyObject *) NoValueForAttributeError,
+ tuple);
+ Py_DECREF(tuple);
+ }
+ }
</span><span class="cx"> else
value = PyObject_CallMethodObjArgs((PyObject *) item, getAttributeValue_NAME, self->name, attrDict, attr->attrID, NULL);
return value;
}
</span><span class="rem">- PyErr_SetObject(PyExc_AttributeError, self->name);
</span><span class="add">+ {
+ PyObject *tuple = PyTuple_Pack(2, item, self->name);
+
+ PyErr_SetObject((PyObject *) NoValueForAttributeError, tuple);
+ Py_DECREF(tuple);
+ }
</span><span class="cx"> return NULL;
}
}
</span><span class="lines">@@ -295,7 +306,7 @@
</span><span class="cx"> }
else if (item->status & STALE)
{
</span><span class="rem">- PyErr_SetObject(PyExc_StaleItemError, (PyObject *) item);
</span><span class="add">+ PyErr_SetObject((PyObject *) StaleItemError, (PyObject *) item);
</span><span class="cx"> return -1;
}
else if (value == NULL)
</span>
</pre>
</div>
</div>
</body>
</html>
--===============0496649103==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits
|
Sat, 07 Apr, 21:37 |
| sky |
[No Subject] |
Sun, 11 Apr, 13:06 |
| va...@yahoo.ca> |
200403181924.i2IJOESc023666@hula.osafoundation.org> |
Tue, 22 Feb, 04:55 |
| va...@yahoo.ca> |
200403181924.i2IJOESc023666@hula.osafoundation.org> |
Tue, 22 Feb, 04:55 |
| va...@yahoo.ca> |
200403181924.i2IJOESc023666@hula.osafoundation.org> |
Tue, 22 Feb, 04:55 |
| va...@yahoo.ca> |
200403181924.i2IJOESc023666@hula.osafoundation.org> |
Tue, 22 Feb, 04:55 |
| va...@yahoo.ca> |
200403181924.i2IJOESc023666@hula.osafoundation.org> |
Tue, 22 Feb, 04:55 |
| y |
.mbox.msgsum |
Wed, 06 May, 16:56 |