DGNum/netbox-agent
6
0
Fork 0
Code Issues 28 Pull requests 9 Projects Releases 14 Packages Wiki Activity Actions

be python3.5 compatible

Browse source
This commit is contained in:
Solvik Blum 2019-08-06 18:15:08 +02:00
parent 99c205ca65
commit a22b648b8a
No known key found for this signature in database
GPG key ID: CC12B3DC262B6C47
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
netbox_agent/ethtool.py
View file

@ -19,6 +19,12 @@ field_map = {
}
def merge_two_dicts(x, y):
z = x.copy()
z.update(y)
return z
class Ethtool():
"""
This class aims to parse ethtool output
@ -67,7 +73,8 @@ class Ethtool():
def parse(self):
if which('ethtool') is None:
return None
return {
**self._parse_ethtool_output(),
**self._parse_ethtool_module_output(),
}
# TODO >= py35: return {**a, **b}
return merge_two_dicts(
self._parse_ethtool_output(),
self._parse_ethtool_module_output()
)