Merge pull request #929 from tue-robotics/knowledge_loader_raise

Remove sys.exit from knowledge loader
tue-robotics · Nov 14, 2019 · 2ef4ce2 · 2ef4ce2
2 parents 306ad7d + d7f16d2
commit 2ef4ce2
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/robocup_knowledge/src/robocup_knowledge/knowledge_loader.py b/robocup_knowledge/src/robocup_knowledge/knowledge_loader.py
@@ -1,12 +1,13 @@
+from __future__ import print_function
+
 # Resolve the environment variable $ROBOT_ENV
 
 def load_knowledge(knowledge_item, print_knowledge=False):
-    import os, sys, imp
+    import os, imp
     _robot_env = os.environ.get('ROBOT_ENV')
 
     if not _robot_env:
-        print "robocup_knowledge - load(): ROBOT_ENV environment variable is not set!"
-        sys.exit(1)
+        raise KeyError("robocup_knowledge - load(): ROBOT_ENV environment variable is not set!")
 
     # Look for the correct knowledge file
     try:
@@ -16,15 +17,14 @@ def load_knowledge(knowledge_item, print_knowledge=False):
         knowledge_attrs = [attr for attr in dir(knowledge) if not callable(attr) and not attr.startswith("__")]
 
         if print_knowledge:
-            print "====================================="
-            print "==          KNOWLEDGE              =="
-            print "====================================="
+            print("=====================================")
+            print("==          KNOWLEDGE              ==")
+            print("=====================================")
             for attr in knowledge_attrs:
-                print "==> %s = %s" % (attr, str(getattr(knowledge, attr)))
-            print "====================================="
+                print("==> %s = %s" % (attr, str(getattr(knowledge, attr))))
+            print("=====================================")
 
         return knowledge
 
     except Exception as e:
-        print "Knowledge item '%s' for environment '%s' is incorrect at path '%s'! [Error = %s]"%(knowledge_item, _robot_env, _knowledge_path, e)
-        sys.exit(1)
+        raise RuntimeError("Knowledge item '%s' for environment '%s' is incorrect at path '%s'! [Error = %s]"%(knowledge_item, _robot_env, _knowledge_path, e))