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

simpler way to be python3.4 compatibble

Browse source
This commit is contained in:
Solvik Blum 2019-08-08 10:42:43 +02:00
parent a22b648b8a
commit 896a011173
No known key found for this signature in database
GPG key ID: CC12B3DC262B6C47
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
netbox_agent/ethtool.py
View file

@ -73,8 +73,6 @@ class Ethtool():
def parse(self): def parse(self):
if which('ethtool') is None: if which('ethtool') is None:
return None return None
# TODO >= py35: return {**a, **b} output = self._parse_ethtool_output()
return merge_two_dicts( output.update(self._parse_ethtool_module_output())
self._parse_ethtool_output(), return output
self._parse_ethtool_module_output()
)