be python3.4 compatible #19

Merged
Solvik merged 2 commits from feature/python3.5 into master 2019-08-08 10:43:10 +02:00

View file

@ -19,6 +19,12 @@ field_map = {
}
def merge_two_dicts(x, y):
z = x.copy()
z.update(y)
return z
ramnes commented 2019-08-08 12:10:42 +02:00 (Migrated from github.com)

You forgot to remove this apparently.

You forgot to remove this apparently.
class Ethtool():
"""
This class aims to parse ethtool output
@ -67,7 +73,6 @@ class Ethtool():
def parse(self):
if which('ethtool') is None:
return None
return {
**self._parse_ethtool_output(),
**self._parse_ethtool_module_output(),
}
output = self._parse_ethtool_output()
output.update(self._parse_ethtool_module_output())
return output