be python3.4 compatible #19

Merged
Solvik merged 2 commits from feature/python3.5 into master 2019-08-08 10:43:10 +02:00
Showing only changes of commit 896a011173 - Show all commits

View file

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