Added(yaml): specified SafeLoader everywhere to avoid warning (strizh…

…echenko#220)
Znuff · Feb 19, 2021 · 9561efe · 9561efe
1 parent dfcb090
commit 9561efe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/netutils_linux_hardware/disk.py b/netutils_linux_hardware/disk.py
@@ -68,7 +68,8 @@ def parse(text):
  types = ['SSD', 'HDD']
  if not text:
  return dict()
- data = yaml.load(text.replace(':', ': ').replace('/sys/block/', '').replace('/queue/rotational', ''))
+ _text = text.replace(':', ': ').replace('/sys/block/', '').replace('/queue/rotational', '')
+ data = yaml.load(_text, yaml.loader.SafeLoader)
  return dict((k, types[v]) for k, v in data.items())
 
  class DiskSizeInfo(Parser):

diff --git a/netutils_linux_hardware/memory.py b/netutils_linux_hardware/memory.py
@@ -59,7 +59,8 @@ class MemInfo(YAMLLike):
  )
 
  def parse(self, text):
- return dict((k, int(v.replace(' kB', ''))) for k, v in iteritems(yaml.load(text)) if k in self.keys_required)
+ data = yaml.load(text, yaml.loader.SafeLoader)
+ return dict((k, int(v.replace(' kB', ''))) for k, v in iteritems(data) if k in self.keys_required)
 
 
 class MemInfoDMIDevice(object):

diff --git a/netutils_linux_hardware/parser.py b/netutils_linux_hardware/parser.py
@@ -25,4 +25,4 @@ def parse_file_safe(self, filepath, **kwargs):
 class YAMLLike(Parser):
  @staticmethod
  def parse(text):
- return yaml.load(text)
+ return yaml.load(text, yaml.loader.SafeLoader)