1 files changed, 19 insertions, 2 deletions
diff --git a/python.d/python_modules/bases/loaders.py b/collectors/python.d.plugin/python_modules/bases/loaders.py
index d18b9dcd0..9eb268ce7 100644
--- a/python.d/python_modules/bases/loaders.py
+++ b/collectors/python.d.plugin/python_modules/bases/loaders.py
@@ -1,18 +1,27 @@
 # -*- coding: utf-8 -*-
 # Description:
 # Author: Ilya Mashchenko (l2isbad)
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import types
+
 from sys import version_info
 
 PY_VERSION = version_info[:2]
 
+try:
+    if PY_VERSION > (3, 1):
+        from pyyaml3 import SafeLoader as YamlSafeLoader
+    else:
+        from pyyaml2 import SafeLoader as YamlSafeLoader
+except ImportError:
+    from yaml import SafeLoader as YamlSafeLoader
+
+
 if PY_VERSION > (3, 1):
-    from pyyaml3 import SafeLoader as YamlSafeLoader
     from importlib.machinery import SourceFileLoader
     DEFAULT_MAPPING_TAG = 'tag:yaml.org,2002:map'
 else:
-    from pyyaml2 import SafeLoader as YamlSafeLoader
     from imp import load_source as SourceFileLoader
     DEFAULT_MAPPING_TAG = u'tag:yaml.org,2002:map'
 
@@ -26,6 +35,14 @@ def dict_constructor(loader, node):
     return OrderedDict(loader.construct_pairs(node))
 
 
+def safe_load(stream):
+    loader = YamlSafeLoader(stream)
+    try:
+        return loader.get_single_data()
+    finally:
+        loader.dispose()
+
+
 YamlSafeLoader.add_constructor(DEFAULT_MAPPING_TAG, dict_constructor)