[Commits] (vajda) - added **values to Item() constructor

[commits at osafoundation.org]

Commit by: vajda
Modified files:
chandler/Makefile 1.103 1.104
chandler/repository/item/Item.py 1.206 1.207
chandler/repository/persistence/DBLob.py 1.5 1.6
chandler/repository/util/Streams.py 1.20 1.21

Log message:
   - added **values to Item() constructor
   - reworked java-python ref management to fix bug revealed under Wing
   - upgraded PyLucene to 0.9.8-189


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/Makefile.diff?r1=text&tr1=1.103&r2=text&tr2=1.104
http://cvs.osafoundation.org/index.cgi/chandler/repository/item/Item.py.diff?r1=text&tr1=1.206&r2=text&tr2=1.207
http://cvs.osafoundation.org/index.cgi/chandler/repository/persistence/DBLob.py.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/chandler/repository/util/Streams.py.diff?r1=text&tr1=1.20&r2=text&tr2=1.21

Index: chandler/Makefile
diff -u chandler/Makefile:1.103 chandler/Makefile:1.104
--- chandler/Makefile:1.103	Wed Apr 20 10:25:27 2005
+++ chandler/Makefile	Wed Apr 20 11:45:50 2005
@@ -27,7 +27,7 @@
          $(CHANDLERARCHIVES)/libxml2-$(SNAP)-2.6.16-3.tar.gz \
          $(CHANDLERARCHIVES)/m2crypto-$(SNAP)-0.12-9.tar.gz \
          $(CHANDLERARCHIVES)/pychecker-$(SNAP)-0.8.13-2.tar.gz \
-         $(CHANDLERARCHIVES)/pylucene-$(SNAP)-0.9.8-188-1.tar.gz \
+         $(CHANDLERARCHIVES)/pylucene-$(SNAP)-0.9.8-189-1.tar.gz \
          $(CHANDLERARCHIVES)/python-$(SNAP)-2.4-2.tar.gz \
          $(CHANDLERARCHIVES)/soappy-$(SNAP)-0.10.2-2.tar.gz \
          $(CHANDLERARCHIVES)/twisted-$(SNAP)-r11303-4.tar.gz \

Index: chandler/repository/item/Item.py
diff -u chandler/repository/item/Item.py:1.206 chandler/repository/item/Item.py:1.207
--- chandler/repository/item/Item.py:1.206	Mon Apr 18 12:41:30 2005
+++ chandler/repository/item/Item.py	Wed Apr 20 11:45:51 2005
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.206 $"
-__date__      = "$Date: 2005/04/18 19:41:30 $"
+__revision__  = "$Revision: 1.207 $"
+__date__      = "$Date: 2005/04/20 18:45:51 $"
 __copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -25,7 +25,7 @@
 class Item(CItem):
     'The root class for all items.'
     
-    def __init__(self, name=None, parent=None, kind=None, _uuid=None):
+    def __init__(self, name=None, parent=None, kind=None, _uuid=None, **values):
         """
         Construct an Item.
 
@@ -46,6 +46,9 @@
         attributes and the Chandler attributes. When an item is persisted
         only the Chandler attributes are saved.
         @type kind: an item
+        @param values: extra keyword arguments to set values on the item
+        after being constructed.
+        @type values: C{name=value} pairs
         """
 
         super(Item, self).__init__()
@@ -77,6 +80,9 @@
 
         self.setDirty(Item.NDIRTY)
 
+        for name, value in values.iteritems():
+            self.setAttributeValue(name, value)
+
     def _fillItem(self, name, parent, kind, **kwds):
 
         self._status = kwds.get('status', 0)

Index: chandler/repository/persistence/DBLob.py
diff -u chandler/repository/persistence/DBLob.py:1.5 chandler/repository/persistence/DBLob.py:1.6
--- chandler/repository/persistence/DBLob.py:1.5	Mon Apr  4 15:13:20 2005
+++ chandler/repository/persistence/DBLob.py	Wed Apr 20 11:45:51 2005
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.5 $"
-__date__      = "$Date: 2005/04/04 22:13:20 $"
+__revision__  = "$Revision: 1.6 $"
+__date__      = "$Date: 2005/04/20 18:45:51 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -56,6 +56,7 @@
                                            self._getItem().itsUUID,
                                            self._getAttribute(),
                                            self.getVersion())
+                reader.close()
             
             self._dirty = False
 

Index: chandler/repository/util/Streams.py
diff -u chandler/repository/util/Streams.py:1.20 chandler/repository/util/Streams.py:1.21
--- chandler/repository/util/Streams.py:1.20	Tue Feb 15 16:29:21 2005
+++ chandler/repository/util/Streams.py	Wed Apr 20 11:45:52 2005
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.20 $"
-__date__      = "$Date: 2005/02/16 00:29:21 $"
+__revision__  = "$Revision: 1.21 $"
+__date__      = "$Date: 2005/04/20 18:45:52 $"
 __copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -441,7 +441,7 @@
     def close(self):
 
         super(RijndaelInputStream, self).close()
-        del self.r
+        self.r = None
 
 
 class Base64InputStream(BlockInputStream):