X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fomf%2Fomf6_api.py;h=3401c322503b4b185dd4e513ed84abd381fd4673;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=f3574a287e9e590ecea1b2b86166dc97392d05ce;hpb=ecdd7ec5a216f5faf46ec9f1c7eb5c2454c14d27;p=nepi.git diff --git a/src/nepi/resources/omf/omf6_api.py b/src/nepi/resources/omf/omf6_api.py index f3574a28..3401c322 100644 --- 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):