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

be python3.4 compatible #19

Merged
Solvik merged 2 commits from feature/python3.5 into master 2019-08-08 10:43:10 +02:00
Conversation 2 Commits 2 Files changed 1 +3 -5
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 896a011173 - Show all commits

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()
)