applied the except and raise fixers to the master branch to close the gap with py3

[nepi.git] / src / nepi / resources / omf / omf6_api.py

diff --git a/src/nepi/resources/omf/omf6_api.py b/src/nepi/resources/omf/omf6_api.py
index 352a18e..3401c32 100644 (file)
--- a/src/nepi/resources/omf/omf6_api.py
+++ b/src/nepi/resources/omf/omf6_api.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -115,7 +114,7 @@ class OMF6API(Logger):
 
     def check_ready(self, xmpp):
         delay = 1.0
-        for i in xrange(10):
+        for i in xrange(15):
             if xmpp.ready:
                 break
             else:
@@ -124,7 +123,7 @@ class OMF6API(Logger):
         else:
             msg = "XMPP Client is not ready after long time"
             self.error(msg)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     @property
     def _nepi_topic(self):
@@ -249,6 +248,9 @@ class OMF6API(Logger):
         """ Delete the session and logger topics. Then disconnect 
 
         """
+        # To receive the last messages
+        time.sleep(2)
+
         self._client.delete(self._nepi_topic)
        
         # Wait the send queue to be empty before disconnect