nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-12-30 20:58:09 +03:00
Code Issues Projects Releases Wiki Activity

Cosmetic change

Browse Source
This commit is contained in:
Nicolas Hennion 2012-12-05 22:23:39 +01:00
parent 21c02d1814
commit da2d2b4534
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glances/glances.py
View File

@ -51,10 +51,10 @@ except ImportError:
from xmlrpc.server import SimpleXMLRPCServer from xmlrpc.server import SimpleXMLRPCServer
try: try:
# python2 # For Python v2.x
from xmlrpclib import ServerProxy from xmlrpclib import ServerProxy
except ImportError: except ImportError:
# python3 # For Python v3.x
from xmlrpc.client import ServerProxy from xmlrpc.client import ServerProxy
if platform.system() != 'Windows': if platform.system() != 'Windows':
@ -142,7 +142,6 @@ except Exception:
else: else:
psutil_network_io_tag = True psutil_network_io_tag = True
try: try:
# Sensors (optionnal) # Sensors (optionnal)
import sensors import sensors
@ -585,7 +584,7 @@ class GlancesStats:
Get process (proc) statistics Get process (proc) statistics
""" """
procstat = {} procstat = {}
procstat['memory_info'] = proc.get_memory_info() procstat['memory_info'] = proc.get_memory_info()
if psutil_get_cpu_percent_tag: if psutil_get_cpu_percent_tag: