use print() - import print_function - should be fine for both py2 and py3

[nepi.git] / src / nepi / __init__.py

diff --git a/src/nepi/__init__.py b/src/nepi/__init__.py
index 4cf488f..18764d0 100644 (file)
--- a/src/nepi/__init__.py
+++ b/src/nepi/__init__.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
@@ -17,12 +16,12 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+from __future__ import print_function
+
 import logging
 import os
 import traceback
 
-__version__ = "3.0"
-
 LOGLEVEL = os.environ.get("NEPI_LOGLEVEL", "INFO").upper()
 LOGLEVEL = getattr(logging, LOGLEVEL)
 FORMAT = "%(asctime)s %(name)s %(levelname)-4s %(message)s"
@@ -43,9 +42,16 @@ if LOG != 'ALL':
            log.setLevel(LOGLEVEL)
         except:
             err = traceback.format_exc()
-            print "ERROR ", err
+            print("ERROR ", err)
 else:
     # Set the logging level defined by the user for all
     # components
     logging.basicConfig(format = FORMAT, level = LOGLEVEL)
 
+
+# Add RMs to ResourceFactory. Use NEPI_SEARCH_PATH to 
+# override the default path to search for RMs
+from nepi.execution.resource import populate_factory
+populate_factory()
+
+