remove pyyaml2 (netdata#18404)

webfutureiorepo · Aug 24, 2024 · 313f18b · 313f18b
1 parent bb29dbf
commit 313f18b
Show file tree

Hide file tree

Showing 19 changed files with 2 additions and 5,855 deletions.
diff --git a/.codacy.yml b/.codacy.yml
@@ -1,6 +1,5 @@
 ---
 exclude_paths:
-  - src/collectors/python.d.plugin/python_modules/pyyaml2/**
   - src/collectors/python.d.plugin/python_modules/pyyaml3/**
   - src/collectors/python.d.plugin/python_modules/urllib3/**
   - src/collectors/python.d.plugin/python_modules/third_party/**

diff --git a/src/collectors/python.d.plugin/python_modules/bases/loaders.py b/src/collectors/python.d.plugin/python_modules/bases/loaders.py
@@ -3,27 +3,17 @@
 # Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-
-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
+    from pyyaml3 import SafeLoader as YamlSafeLoader
 except ImportError:
     from yaml import SafeLoader as YamlSafeLoader
 
-
 try:
     from collections import OrderedDict
 except ImportError:
     from third_party.ordereddict import OrderedDict
 
-
-DEFAULT_MAPPING_TAG = 'tag:yaml.org,2002:map' if PY_VERSION > (3, 1) else u'tag:yaml.org,2002:map'
+DEFAULT_MAPPING_TAG = 'tag:yaml.org,2002:map'
 
 
 def dict_constructor(loader, node):

diff --git a/src/collectors/python.d.plugin/python_modules/pyyaml2/__init__.py b/src/collectors/python.d.plugin/python_modules/pyyaml2/__init__.py