nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-11-30 21:49:37 +03:00
Code Issues Projects Releases Wiki Activity

Implement rich comparisons rather than relying on __cmp__()

Browse Source 
The __cmp__() special method is gone in Python 3 in favor of rich
comparison methods.
This commit is contained in:
Alessio Sergi 2018-01-29 19:19:19 +01:00
parent 7a0b9bcbc9
commit 32425eb205
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glances/thresholds.py
View File

@ -22,6 +22,7 @@ Thresholds classes: OK, CAREFUL, WARNING, CRITICAL
""" """
import sys import sys
from functools import total_ordering
class GlancesThresholds(object): class GlancesThresholds(object):
@ -63,6 +64,7 @@ class GlancesThresholds(object):
glances_thresholds = GlancesThresholds() glances_thresholds = GlancesThresholds()
@total_ordering
class _GlancesThreshold(object): class _GlancesThreshold(object):
"""Father class for all other Thresholds""" """Father class for all other Thresholds"""
@ -79,9 +81,11 @@ class _GlancesThreshold(object):
def __str__(self): def __str__(self):
return self.description() return self.description()
def __cmp__(self, other): def __lt__(self, other):
"""Override the default comparaison behavior""" return self.value() < other.value()
return self.value().__cmp__(other.value())
def __eq__(self, other):
return self.value() == other.value()
class GlancesThresholdOk(_GlancesThreshold): class GlancesThresholdOk(_GlancesThreshold):

9
unitest.py
View File

@ -28,7 +28,7 @@ from glances.stats import GlancesStats
from glances import __version__ from glances import __version__
from glances.globals import WINDOWS, LINUX from glances.globals import WINDOWS, LINUX
from glances.outputs.glances_bars import Bar from glances.outputs.glances_bars import Bar
from glances.compat import PY3, PY_PYPY from glances.compat import PY_PYPY
from glances.thresholds import GlancesThresholdOk from glances.thresholds import GlancesThresholdOk
from glances.thresholds import GlancesThresholdCareful from glances.thresholds import GlancesThresholdCareful
from glances.thresholds import GlancesThresholdWarning from glances.thresholds import GlancesThresholdWarning
@ -213,7 +213,6 @@ class TestGlances(unittest.TestCase):
self.assertTrue(type(stats_grab) is list, msg='GPU stats is not a list') self.assertTrue(type(stats_grab) is list, msg='GPU stats is not a list')
print('INFO: GPU stats: %s' % stats_grab) print('INFO: GPU stats: %s' % stats_grab)
@unittest.skipIf(PY3, True)
@unittest.skipIf(PY_PYPY, True) @unittest.skipIf(PY_PYPY, True)
def test_094_thresholds(self): def test_094_thresholds(self):
"""Test thresholds classes""" """Test thresholds classes"""
@ -226,11 +225,11 @@ class TestGlances(unittest.TestCase):
self.assertTrue(careful < warning) self.assertTrue(careful < warning)
self.assertTrue(warning < critical) self.assertTrue(warning < critical)
self.assertFalse(ok > careful) self.assertFalse(ok > careful)
self.assertTrue(ok == ok) self.assertEqual(ok, ok)
self.assertTrue(str(ok) == 'OK') self.assertEqual(str(ok), 'OK')
thresholds = GlancesThresholds() thresholds = GlancesThresholds()
thresholds.add('cpu_percent', 'OK') thresholds.add('cpu_percent', 'OK')
self.assertTrue(thresholds.get(stat_name='cpu_percent').description() == 'OK') self.assertEqual(thresholds.get(stat_name='cpu_percent').description(), 'OK')
def test_095_methods(self): def test_095_methods(self):
"""Test mandatories methods""" """Test mandatories methods"""