Merge pull request #138 from nokia/New_pyyaml_API

Change due to new pyyaml API - add Loader for yaml.load method

moler/command_scheduler.py

@@ -123,7 +123,7 @@ def _wait_for_slot_for_command(self, cmd):
         while cmd.timeout >= (time.time() - start_time):
             time.sleep(0.005)
             with lock:
-                if conn_atr['current_cmd'] is None and cmd == conn_atr['queue'][0]:
+                if conn_atr['current_cmd'] is None and len(conn_atr['queue']) >= 1 and cmd == conn_atr['queue'][0]:
                     conn_atr['queue'].pop(0)
                     conn_atr['current_cmd'] = cmd
                     cmd._log(logging.DEBUG,

moler/config/__init__.py

@@ -42,7 +42,7 @@ def read_yaml_configfile(path):
     """
     if os.path.isabs(path):
         with read_configfile(path) as content:
-            return yaml.load(content)
+            return yaml.load(content, Loader=yaml.FullLoader)
     else:
         error = "Loading configuration requires absolute path and not '{}'".format(path)
         raise MolerException(error)

requirements.txt

@@ -1,6 +1,6 @@
 futures >= 3.0.0; python_version == "2.7"
 ptyprocess
-pyyaml
+pyyaml >= 5.1
 six
 transitions
 apscheduler