[telemetry] Fix types and type checks of numeric results.

Followup for http://crrev.com/236907

BUG=None.
TEST=None.
TBR=nduca

Review URL: https://codereview.chromium.org/84483002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236951 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 2 deletions

diff --git a/tools/telemetry/telemetry/value/list_of_scalar_values.py b/tools/telemetry/telemetry/value/list_of_scalar_values.py
index 055acd3..cb70be8 100644
--- a/tools/telemetry/telemetry/value/list_of_scalar_values.py
+++ b/tools/telemetry/telemetry/value/list_of_scalar_values.py
@@ -1,6 +1,9 @@
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+
+import numbers
+
 from telemetry import value as value_module
 
 def _Mean(values):
@@ -13,7 +16,7 @@ class ListOfScalarValues(value_module.Value):
     assert len(values) > 0
     assert isinstance(values, list)
     for v in values:
-      assert isinstance(v, int) or isinstance(v, float)
+      assert isinstance(v, numbers.Number)
     self.values = values
     self.same_page_merge_policy = same_page_merge_policy
 
diff --git a/tools/telemetry/telemetry/value/scalar.py b/tools/telemetry/telemetry/value/scalar.py
index 397dae4..8fec048 100644
--- a/tools/telemetry/telemetry/value/scalar.py
+++ b/tools/telemetry/telemetry/value/scalar.py
@@ -1,6 +1,9 @@
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+
+import numbers
+
 from telemetry.value import Value
 from telemetry.value.list_of_scalar_values import ListOfScalarValues
 
@@ -13,7 +16,7 @@ class ScalarValue(Value):
        ScalarValue(page, 'num_dom_elements', 'count', num_elements)
     """
     super(ScalarValue, self).__init__(page, name, units, important)
-    assert isinstance(value, int) or isinstance(value, float)
+    assert isinstance(value, numbers.Number)
     self.value = value
 
   def __repr__(self):