[checkmk-commits] Fix and unify __repr__ methods.

Module: check_mk Branch: master Commit: 414ee47b47a0a5e9f651780e2948012e08df6d7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=414ee47b47a0a5… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jun 20 12:38:33 2018 +0200 Fix and unify __repr__ methods. It does make a difference for float values, and it's more consistent now. Change-Id: I7bb1d24820e651754221a32e9c90789a76cb7d93 --- tests/unit/checks/checktestlib.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/unit/checks/checktestlib.py b/tests/unit/checks/checktestlib.py index 203e24a..c5c8558 100644 --- a/tests/unit/checks/checktestlib.py +++ b/tests/unit/checks/checktestlib.py @@ -1,7 +1,6 @@ import types - class Tuploid(object): """Base class for values with (potentially variadic) tuple representations""" @@ -59,9 +58,7 @@ class PerfValue(Tuploid): return (self.key, self.value, self.warn, self.crit, self.minimum, self.maximum) def __repr__(self): - return "PerfValue('%s', %s, %s, %s, %s, %s)" % (self.key, self.value, self.warn, - self.crit, self.minimum, self.maximum) - + return "PerfValue(%r, %r, %r, %r, %r, %r)" % self.tuple class BasicCheckResult(Tuploid): @@ -101,7 +98,7 @@ class BasicCheckResult(Tuploid): return (self.status, self.infotext, self.perfdata) def __repr__(self): - return 'BasicCheckResult(%s, "%s", %s)' % (self.status, self.infotext, self.perfdata) + return 'BasicCheckResult(%r, %r, %r)' % (self.status, self.infotext, self.perfdata) @@ -139,7 +136,7 @@ class CheckResult(object): self.subresults.append(BasicCheckResult(*result)) def __repr__(self): - return 'CheckResult(%s)' % repr(self.subresults) + return 'CheckResult(%r)' % self.subresults def __eq__(self, other): if not isinstance(other, CheckResult): @@ -157,7 +154,6 @@ class CheckResult(object): return perfdata - class DiscoveryEntry(Tuploid): """A single entry as returned by the discovery (or in oldspeak: inventory) function.""" @@ -172,7 +168,7 @@ class DiscoveryEntry(Tuploid): return (self.item, self.default_params) def __repr__(self): - return "DiscoveryEntry(%r, %r)" % (self.item, self.default_params) + return "DiscoveryEntry(%r, %r)" % self.tuple @@ -202,4 +198,5 @@ class DiscoveryResult(object): return iter(self.entries) def __repr__(self): - return "DiscoveryResult(%s)" % (",\n".join([repr(entry) for entry in self.entries])) + return "DiscoveryResult(%r)" % map(repr, self) +