[cig-commits] r5597 - in cs/pythia/trunk: blade/pml pyre/inventory/pml

[leif at geodynamics.org]

Author: leif
Date: 2006-12-12 16:28:46 -0800 (Tue, 12 Dec 2006)
New Revision: 5597

Modified:
   cs/pythia/trunk/blade/pml/CodecPML.py
   cs/pythia/trunk/pyre/inventory/pml/CodecPML.py
Log:
Removed stray references to _locker (i.e. FileLocking), which
caused an exception if a .pml file was found.


Modified: cs/pythia/trunk/blade/pml/CodecPML.py
===================================================================
--- cs/pythia/trunk/blade/pml/CodecPML.py	2006-12-12 22:50:05 UTC (rev 5596)
+++ cs/pythia/trunk/blade/pml/CodecPML.py	2006-12-13 00:28:46 UTC (rev 5597)
@@ -39,9 +39,7 @@
 
         stream = file(shelf.name)
 
-        self._locker.lock(stream, self._locker.LOCK_EX)
         document = self._parser.parse(stream, self.parserFactory)
-        self._locker.unlock(stream)
 
         shelf['blade'] = document
         shelf._frozen = True

Modified: cs/pythia/trunk/pyre/inventory/pml/CodecPML.py
===================================================================
--- cs/pythia/trunk/pyre/inventory/pml/CodecPML.py	2006-12-12 22:50:05 UTC (rev 5596)
+++ cs/pythia/trunk/pyre/inventory/pml/CodecPML.py	2006-12-13 00:28:46 UTC (rev 5597)
@@ -39,9 +39,7 @@
 
         stream = file(shelf.name)
 
-        self._locker.lock(stream, self._locker.LOCK_EX)
         inventory = self._parser.parse(stream, self.parserFactory)
-        self._locker.unlock(stream)
 
         shelf['inventory'] = inventory
         shelf._frozen = True