[Erp5-report] r42255 nicolas - /erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Jan 12 11:52:29 2011
New Revision: 42255

URL: http://svn.erp5.org?rev=42255&view=rev
Log:
_subprocess method is responsible to stop the timeout monitor.
No need to do it twice

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py?rev=42255&r1=42254&r2=42255&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py [utf8] Wed Jan 12 11:52:29 2011
@@ -164,8 +164,6 @@ class OOHandler:
       stdout, stderr = self._callUnoConverter(*['convert'], **kw)
     finally:
       openoffice.release()
-      if self.monitor.is_alive():
-        self._stopTimeout()
     url = stdout.replace('\n', '')
     self.document.reload(url)
     content = self.document.getContent(self.zip)
@@ -188,8 +186,6 @@ class OOHandler:
       stdout, stderr = self._callUnoConverter(*feature_list, **kw)
     finally:
       openoffice.release()
-      if self.monitor.is_alive():
-        self._stopTimeout()
     metadata = json.loads(decodestring(stdout))
     if metadata.get("Data"):
       self.document.reload(metadata['Data'])
@@ -212,8 +208,6 @@ class OOHandler:
       stdout, stderr = self._callUnoConverter(*['setmetadata'], **kw)
     finally:
       openoffice.release()
-      if self.monitor.is_alive():
-        self._stopTimeout()
     doc_loaded = self.document.getContent()
     self.document.trash()
     return doc_loaded