README moves to markdown

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

diff --git a/src/nepi/resources/omf/omf_client.py b/src/nepi/resources/omf/omf_client.py
index 113bd1e..8497f3b 100644 (file)
--- a/src/nepi/resources/omf/omf_client.py
+++ b/src/nepi/resources/omf/omf_client.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
@@ -20,19 +19,22 @@
 
 from nepi.util.logger import Logger
 from nepi.resources.omf.omf6_parser import OMF6Parser
-
 try:
     import sleekxmpp
     from sleekxmpp.exceptions import IqError, IqTimeout
     class BaseOMFClient(sleekxmpp.ClientXMPP):
         pass
 except ImportError:
-    print "SleekXMPP is not installed. Without this library, \n" + \
-          " You will be not able to use OMF Resources \n"+ \
-          " If you want to install SleekXmpp : \n"+ \
-          " git clone -b develop git://github.com/fritzy/SleekXMPP.git \n"+ \
-          " cd SleekXMPP \n"+ \
-           "sudo python setup.py install\n"
+    msg = ("SleekXMPP is not installed. Without this library "
+          "you will be not able to use OMF Resources "
+          "if you want to install SleekXmpp: \n"
+          " git clone -b develop git://github.com/fritzy/SleekXMPP.git \n"
+          " cd SleekXMPP \n"
+          " sudo python setup.py install\n")
+
+    logger = Logger("BaseOMFClient")
+    logger.debug(msg)
+
     class BaseOMFClient(object):
         pass
 
@@ -40,7 +42,7 @@ import traceback
 import xml.etree.ElementTree as ET
 
 # inherit from BaseXmpp and XMLstream classes
-class OMFClient(sleekxmpp.ClientXMPP, Logger): 
+class OMFClient(BaseOMFClient, Logger): 
     """
     .. class:: Class Args :