nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-11-29 15:32:25 +03:00
Code Issues Projects Releases Wiki Activity

Python3 compliance for decorator

Browse Source
This commit is contained in:
Nicolargo 2014-10-26 12:29:45 +01:00
parent 412b8afc0c
commit bc660feb2e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glances/plugins/glances_plugin.py
View File

@ -29,7 +29,7 @@ import json
from operator import itemgetter
# Import Glances lib
from glances.core.glances_globals import glances_logs, logger
from glances.core.glances_globals import is_py3, glances_logs, logger
class GlancesPlugin(object):
@ -499,8 +499,12 @@ class GlancesPlugin(object):
"""Log (DEBUG) the result of the function fct"""
def wrapper(*args, **kw):
ret = fct(*args, **kw)
logger.debug("%s %s %s return %s" % (args[0].__class__.__name__, args[
0].__class__.__module__[len('glances_'):], fct.func_name, ret))
if is_py3:
logger.debug("%s %s %s return %s" % (args[0].__class__.__name__, args[
0].__class__.__module__[len('glances_'):], fct.__name__, ret))
else:
logger.debug("%s %s %s return %s" % (args[0].__class__.__name__, args[
0].__class__.__module__[len('glances_'):], fct.func_name, ret))
return ret
return wrapper