mirror/glances
1
0
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2026-03-13 03:17:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct an issue on AMP module import error

Browse Source
This commit is contained in:
Nicolargo
2016-04-28 10:06:00 +02:00
parent d379ef22e9
commit eeb847fba6
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
glances/amps_list.py
View File

@@ -60,13 +60,19 @@ class AmpsList(object):
item.endswith(".py") and
item != (header + "amp.py")):
# Import the amp
amp = __import__(os.path.basename(item)[:-3])
# Add the AMP to the dictionary
# The key is the AMP name
# for example, the file glances_xxx.py
# generate self._amps_list["xxx"] = ...
amp_name = os.path.basename(item)[len(header):-3].lower()
self.__amps_dict[amp_name] = amp.Amp(self.args)
try:
amp = __import__(os.path.basename(item)[:-3])
except ImportError as e:
logger.warning("Can not load {0}, you need to install an external Python package ({1})".format(os.path.basename(item), e))
except Exception as e:
logger.warning("Can not load {0} ({1})".format(os.path.basename(item), e))
else:
# Add the AMP to the dictionary
# The key is the AMP name
# for example, the file glances_xxx.py
# generate self._amps_list["xxx"] = ...
amp_name = os.path.basename(item)[len(header):-3].lower()
self.__amps_dict[amp_name] = amp.Amp(self.args)
# Log AMPs list
logger.debug("Available AMPs list: {0}".format(self.getList()))