[telemetry] Avoid importing classes in telemetry/value/

Google Python Style Guide doesn't like them. Also may have unintended side-effects, since the same class could be defined under two different modules.
http://google-styleguide.googlecode.com/svn/trunk/pyguide.html#Imports


BUG=None.
TEST=None.

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

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

6 files changed, 60 insertions, 56 deletions

diff --git a/tools/telemetry/telemetry/value/histogram_unittest.py b/tools/telemetry/telemetry/value/histogram_unittest.py
index 6e76bb9..faf50ab 100644
--- a/tools/telemetry/telemetry/value/histogram_unittest.py
+++ b/tools/telemetry/telemetry/value/histogram_unittest.py
@@ -6,7 +6,7 @@ import unittest
 
 from telemetry import value
 from telemetry.page import page_set
-from telemetry.value.histogram import HistogramValue
+from telemetry.value import histogram as histogram_module
 
 class TestBase(unittest.TestCase):
   def setUp(self):
@@ -27,7 +27,7 @@ class TestBase(unittest.TestCase):
 class ValueTest(TestBase):
   def testHistogramBasic(self):
     page0 = self.pages[0]
-    histogram = HistogramValue(
+    histogram = histogram_module.HistogramValue(
         page0, 'x', 'counts',
         raw_value_json='{"buckets": [{"low": 1, "high": 2, "count": 1}]}',
         important=False)
diff --git a/tools/telemetry/telemetry/value/list_of_scalar_values_unittest.py b/tools/telemetry/telemetry/value/list_of_scalar_values_unittest.py
index d223bc8..c54ca26 100644
--- a/tools/telemetry/telemetry/value/list_of_scalar_values_unittest.py
+++ b/tools/telemetry/telemetry/value/list_of_scalar_values_unittest.py
@@ -6,7 +6,7 @@ import unittest
 
 from telemetry import value
 from telemetry.page import page_set
-from telemetry.value.list_of_scalar_values import ListOfScalarValues
+from telemetry.value import list_of_scalar_values
 
 class TestBase(unittest.TestCase):
   def setUp(self):
@@ -27,15 +27,16 @@ class TestBase(unittest.TestCase):
 class ValueTest(TestBase):
   def testListSamePageMergingWithSamePageConcatenatePolicy(self):
     page0 = self.pages[0]
-    v0 = ListOfScalarValues(
+    v0 = list_of_scalar_values.ListOfScalarValues(
         page0, 'x', 'unit',
         [1,2], same_page_merge_policy=value.CONCATENATE)
-    v1 = ListOfScalarValues(
+    v1 = list_of_scalar_values.ListOfScalarValues(
         page0, 'x', 'unit',
         [3,4], same_page_merge_policy=value.CONCATENATE)
     self.assertTrue(v1.IsMergableWith(v0))
 
-    vM = ListOfScalarValues.MergeLikeValuesFromSamePage([v0, v1])
+    vM = (list_of_scalar_values.ListOfScalarValues.
+          MergeLikeValuesFromSamePage([v0, v1]))
     self.assertEquals(page0, vM.page)
     self.assertEquals('x', vM.name)
     self.assertEquals('unit', vM.units)
@@ -45,15 +46,16 @@ class ValueTest(TestBase):
 
   def testListSamePageMergingWithPickFirstPolicy(self):
     page0 = self.pages[0]
-    v0 = ListOfScalarValues(
+    v0 = list_of_scalar_values.ListOfScalarValues(
         page0, 'x', 'unit',
         [1,2], same_page_merge_policy=value.PICK_FIRST)
-    v1 = ListOfScalarValues(
+    v1 = list_of_scalar_values.ListOfScalarValues(
         page0, 'x', 'unit',
         [3,4], same_page_merge_policy=value.PICK_FIRST)
     self.assertTrue(v1.IsMergableWith(v0))
 
-    vM = ListOfScalarValues.MergeLikeValuesFromSamePage([v0, v1])
+    vM = (list_of_scalar_values.ListOfScalarValues.
+          MergeLikeValuesFromSamePage([v0, v1]))
     self.assertEquals(page0, vM.page)
     self.assertEquals('x', vM.name)
     self.assertEquals('unit', vM.units)
@@ -63,15 +65,16 @@ class ValueTest(TestBase):
 
   def testListDifferentPageMerging(self):
     page0 = self.pages[0]
-    v0 = ListOfScalarValues(
+    v0 = list_of_scalar_values.ListOfScalarValues(
         page0, 'x', 'unit',
         [1, 2], same_page_merge_policy=value.PICK_FIRST)
-    v1 = ListOfScalarValues(
+    v1 = list_of_scalar_values.ListOfScalarValues(
         page0, 'x', 'unit',
         [3, 4], same_page_merge_policy=value.PICK_FIRST)
     self.assertTrue(v1.IsMergableWith(v0))
 
-    vM = ListOfScalarValues.MergeLikeValuesFromDifferentPages([v0, v1])
+    vM = (list_of_scalar_values.ListOfScalarValues.
+          MergeLikeValuesFromDifferentPages([v0, v1]))
     self.assertEquals(None, vM.page)
     self.assertEquals('x', vM.name)
     self.assertEquals('unit', vM.units)
diff --git a/tools/telemetry/telemetry/value/merge_values_unittest.py b/tools/telemetry/telemetry/value/merge_values_unittest.py
index 1b8e8d3..781595c 100644
--- a/tools/telemetry/telemetry/value/merge_values_unittest.py
+++ b/tools/telemetry/telemetry/value/merge_values_unittest.py
@@ -5,9 +5,9 @@ import os
 import unittest
 
 from telemetry.page import page_set
+from telemetry.value import list_of_scalar_values
 from telemetry.value import merge_values
-from telemetry.value.list_of_scalar_values import ListOfScalarValues
-from telemetry.value.scalar import ScalarValue
+from telemetry.value import scalar
 
 class TestBase(unittest.TestCase):
   def setUp(self):
@@ -30,10 +30,10 @@ class MergeValueTest(TestBase):
     page0 = self.pages[0]
     page1 = self.pages[1]
 
-    all_values = [ScalarValue(page0, 'x', 'units', 1),
-                  ScalarValue(page1, 'x', 'units', 4),
-                  ScalarValue(page0, 'x', 'units', 2),
-                  ScalarValue(page1, 'x', 'units', 5)]
+    all_values = [scalar.ScalarValue(page0, 'x', 'units', 1),
+                  scalar.ScalarValue(page1, 'x', 'units', 4),
+                  scalar.ScalarValue(page0, 'x', 'units', 2),
+                  scalar.ScalarValue(page1, 'x', 'units', 5)]
 
     merged_values = merge_values.MergeLikeValuesFromSamePage(all_values)
     # Sort the results so that their order is predictable for the subsequent
@@ -53,7 +53,7 @@ class MergeValueTest(TestBase):
   def testSamePageMergeOneValue(self):
     page0 = self.pages[0]
 
-    all_values = [ScalarValue(page0, 'x', 'units', 1)]
+    all_values = [scalar.ScalarValue(page0, 'x', 'units', 1)]
 
     # Sort the results so that their order is predictable for the subsequent
     # assertions.
@@ -66,10 +66,10 @@ class MergeValueTest(TestBase):
     page0 = self.pages[0]
     page1 = self.pages[1]
 
-    all_values = [ScalarValue(page0, 'x', 'units', 1),
-                  ScalarValue(page1, 'x', 'units', 2),
-                  ScalarValue(page0, 'y', 'units', 10),
-                  ScalarValue(page1, 'y', 'units', 20)]
+    all_values = [scalar.ScalarValue(page0, 'x', 'units', 1),
+                  scalar.ScalarValue(page1, 'x', 'units', 2),
+                  scalar.ScalarValue(page0, 'y', 'units', 10),
+                  scalar.ScalarValue(page1, 'y', 'units', 20)]
 
     # Sort the results so that their order is predictable for the subsequent
     # assertions.
@@ -88,7 +88,7 @@ class MergeValueTest(TestBase):
   def testDifferentPageMergeSingleValueStillMerges(self):
     page0 = self.pages[0]
 
-    all_values = [ScalarValue(page0, 'x', 'units', 1)]
+    all_values = [scalar.ScalarValue(page0, 'x', 'units', 1)]
 
     # Sort the results so that their order is predictable for the subsequent
     # assertions.
@@ -97,15 +97,16 @@ class MergeValueTest(TestBase):
 
     self.assertEquals((None, 'x'),
                       (merged_values[0].page, merged_values[0].name))
-    self.assertTrue(isinstance(merged_values[0], ListOfScalarValues))
+    self.assertTrue(
+        isinstance(merged_values[0], list_of_scalar_values.ListOfScalarValues))
     self.assertEquals([1], merged_values[0].values)
 
   def testDifferentPageMergeBasicIgnoreTraceName(self):
     page0 = self.pages[0]
     page1 = self.pages[1]
 
-    all_values = [ScalarValue(page0, 'x.score', 'units', 1),
-                  ScalarValue(page1, 'y.score', 'units', 2)]
+    all_values = [scalar.ScalarValue(page0, 'x.score', 'units', 1),
+                  scalar.ScalarValue(page1, 'y.score', 'units', 2)]
     # Sort the results so that their order is predictable for the subsequent
     # assertions.
     merged_values = merge_values.MergeLikeValuesFromDifferentPages(
diff --git a/tools/telemetry/telemetry/value/scalar.py b/tools/telemetry/telemetry/value/scalar.py
index 8fec048..4b57654 100644
--- a/tools/telemetry/telemetry/value/scalar.py
+++ b/tools/telemetry/telemetry/value/scalar.py
@@ -4,10 +4,10 @@
 
 import numbers
 
-from telemetry.value import Value
-from telemetry.value.list_of_scalar_values import ListOfScalarValues
+from telemetry import value as value_module
+from telemetry.value import list_of_scalar_values
 
-class ScalarValue(Value):
+class ScalarValue(value_module.Value):
   def __init__(self, page, name, units, value, important=True):
     """A single value (float or integer) result from a test.
 
@@ -50,7 +50,7 @@ class ScalarValue(Value):
   def MergeLikeValuesFromSamePage(cls, values):
     assert len(values) > 0
     v0 = values[0]
-    return ListOfScalarValues(
+    return list_of_scalar_values.ListOfScalarValues(
         v0.page, v0.name, v0.units,
         [v.value for v in values],
         important=v0.important)
@@ -64,7 +64,7 @@ class ScalarValue(Value):
       name = v0.name
     else:
       name = v0.name_suffix
-    return ListOfScalarValues(
+    return list_of_scalar_values.ListOfScalarValues(
         None, name, v0.units,
         [v.value for v in values],
         important=v0.important)
diff --git a/tools/telemetry/telemetry/value/scalar_unittest.py b/tools/telemetry/telemetry/value/scalar_unittest.py
index bb6d1d3..e375d01 100644
--- a/tools/telemetry/telemetry/value/scalar_unittest.py
+++ b/tools/telemetry/telemetry/value/scalar_unittest.py
@@ -6,7 +6,7 @@ import unittest
 
 from telemetry import value
 from telemetry.page import page_set
-from telemetry.value.scalar import ScalarValue
+from telemetry.value import scalar
 
 class TestBase(unittest.TestCase):
   def setUp(self):
@@ -27,25 +27,25 @@ class TestBase(unittest.TestCase):
 class ValueTest(TestBase):
   def testBuildbotValueType(self):
     page0 = self.pages[0]
-    v = ScalarValue(page0, 'x', 'unit', 3, important=True)
+    v = scalar.ScalarValue(page0, 'x', 'unit', 3, important=True)
     self.assertEquals('default', v.GetBuildbotDataType(
         value.MERGED_PAGES_RESULT_OUTPUT_CONTEXT))
     self.assertEquals([3], v.GetBuildbotValue())
     self.assertEquals(('x_by_url', page0.display_name),
                       v.GetBuildbotMeasurementAndTraceNameForPerPageResult())
 
-    v = ScalarValue(page0, 'x', 'unit', 3, important=False)
+    v = scalar.ScalarValue(page0, 'x', 'unit', 3, important=False)
     self.assertEquals(
         'unimportant',
         v.GetBuildbotDataType(value.MERGED_PAGES_RESULT_OUTPUT_CONTEXT))
 
   def testScalarSamePageMerging(self):
     page0 = self.pages[0]
-    v0 = ScalarValue(page0, 'x', 'unit', 1)
-    v1 = ScalarValue(page0, 'x', 'unit', 2)
+    v0 = scalar.ScalarValue(page0, 'x', 'unit', 1)
+    v1 = scalar.ScalarValue(page0, 'x', 'unit', 2)
     self.assertTrue(v1.IsMergableWith(v0))
 
-    vM = ScalarValue.MergeLikeValuesFromSamePage([v0, v1])
+    vM = scalar.ScalarValue.MergeLikeValuesFromSamePage([v0, v1])
     self.assertEquals(page0, vM.page)
     self.assertEquals('x', vM.name)
     self.assertEquals('unit', vM.units)
@@ -55,10 +55,10 @@ class ValueTest(TestBase):
   def testScalarDifferentSiteMerging(self):
     page0 = self.pages[0]
     page1 = self.pages[1]
-    v0 = ScalarValue(page0, 'x', 'unit', 1)
-    v1 = ScalarValue(page1, 'x', 'unit', 2)
+    v0 = scalar.ScalarValue(page0, 'x', 'unit', 1)
+    v1 = scalar.ScalarValue(page1, 'x', 'unit', 2)
 
-    vM = ScalarValue.MergeLikeValuesFromDifferentPages([v0, v1])
+    vM = scalar.ScalarValue.MergeLikeValuesFromDifferentPages([v0, v1])
     self.assertEquals(None, vM.page)
     self.assertEquals('x', vM.name)
     self.assertEquals('unit', vM.units)
diff --git a/tools/telemetry/telemetry/value/value_backcompat.py b/tools/telemetry/telemetry/value/value_backcompat.py
index 0b6d9ce..6d970de 100644
--- a/tools/telemetry/telemetry/value/value_backcompat.py
+++ b/tools/telemetry/telemetry/value/value_backcompat.py
@@ -9,9 +9,9 @@ implementation and update the PageMeasurementResults API once we know the
 underlying implementation is solid.
 """
 from telemetry import value as value_module
-from telemetry.value.histogram import HistogramValue
-from telemetry.value.list_of_scalar_values import ListOfScalarValues
-from telemetry.value.scalar import ScalarValue
+from telemetry.value import histogram
+from telemetry.value import list_of_scalar_values
+from telemetry.value import scalar
 
 
 def ConvertOldCallingConventionToValue(page, trace_name, units,
@@ -20,26 +20,26 @@ def ConvertOldCallingConventionToValue(page, trace_name, units,
       trace_name, chart_name)
   if data_type == 'default':
     if isinstance(value, list):
-      return ListOfScalarValues(page, value_name, units,
-                                value, important=True)
+      return list_of_scalar_values.ListOfScalarValues(
+          page, value_name, units, value, important=True)
     else:
-      return ScalarValue(page, value_name, units,
-                         value, important=True)
+      return scalar.ScalarValue(page, value_name, units,
+                                value, important=True)
   elif data_type == 'unimportant':
     if isinstance(value, list):
-      return ListOfScalarValues(page, value_name, units,
-                                value, important=False)
+      return list_of_scalar_values.ListOfScalarValues(
+          page, value_name, units, value, important=False)
     else:
-      return ScalarValue(page, value_name, units,
-                         value, important=False)
+      return scalar.ScalarValue(page, value_name, units,
+                                value, important=False)
   elif data_type == 'histogram':
     assert isinstance(value, basestring)
-    return HistogramValue(page, value_name, units,
-                          raw_value_json=value, important=True)
+    return histogram.HistogramValue(
+        page, value_name, units, raw_value_json=value, important=True)
   elif data_type == 'unimportant-histogram':
     assert isinstance(value, basestring)
-    return HistogramValue(page, value_name, units,
-                          raw_value_json=value, important=False)
+    return histogram.HistogramValue(
+        page, value_name, units, raw_value_json=value, important=False)
   elif data_type == 'informational':
     raise NotImplementedError()
   else: