More broken imports

googledatalab · Aug 15, 2018 · 4c9a048 · 4c9a048
1 parent 1fca882
commit 4c9a048
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/google/datalab/stackdriver/monitoring/_query_metadata.py b/google/datalab/stackdriver/monitoring/_query_metadata.py
@@ -17,7 +17,7 @@
 from __future__ import unicode_literals
 from builtins import object
 
-import google.cloud.monitoring
+from google.cloud.monitoring_v3 import _dataframe
 import pandas
 
 
@@ -78,7 +78,7 @@ def as_dataframe(self, max_rows=None):
            for col in dataframe.columns])
 
       # Re-order the columns.
-      resource_keys = google.cloud.monitoring._dataframe._sorted_resource_labels(
+      resource_keys = _dataframe._sorted_resource_labels(
           dataframe['resource.labels'].columns)
       sorted_columns = [('resource.type', '')]
       sorted_columns += [('resource.labels', key) for key in resource_keys]

diff --git a/google/datalab/stackdriver/monitoring/_utils.py b/google/datalab/stackdriver/monitoring/_utils.py
@@ -14,14 +14,14 @@
 
 from __future__ import absolute_import
 
-import google.cloud.monitoring
+from google.cloud.logging.client import Client
 
 import google.datalab
 
 
 def make_client(context=None):
   context = context or google.datalab.Context.default()
-  client = google.cloud.monitoring.Client(
+  client = Client(
       project=context.project_id,
       credentials=context.credentials,
   )

diff --git a/tests/stackdriver/monitoring/metric_tests.py b/tests/stackdriver/monitoring/metric_tests.py
@@ -14,7 +14,7 @@
 import mock
 import unittest
 
-import google.cloud.monitoring
+import google.cloud.logging.client
 
 import google.auth
 import google.datalab
@@ -70,7 +70,7 @@ def test_constructor_maximal(self):
     self.assertEqual(descriptors._type_prefix, TYPE_PREFIX)
     self.assertIsNone(descriptors._descriptors)
 
-  @mock.patch('google.cloud.monitoring.Client.list_metric_descriptors')
+  @mock.patch('google.cloud.logging.client.Client.list_metric_descriptors')
   def test_list(self, mock_gcloud_list_descriptors):
     mock_gcloud_list_descriptors.return_value = self._list_metrics_get_result(
         context=self.context)
@@ -83,7 +83,7 @@ def test_list(self, mock_gcloud_list_descriptors):
     self.assertEqual(metric_descriptor_list[0].type, METRIC_TYPES[0])
     self.assertEqual(metric_descriptor_list[1].type, METRIC_TYPES[1])
 
-  @mock.patch('google.cloud.monitoring.Client.list_metric_descriptors')
+  @mock.patch('google.cloud.logging.client.Client.list_metric_descriptors')
   def test_list_w_api_filter(self, mock_gcloud_list_descriptors):
     mock_gcloud_list_descriptors.return_value = self._list_metrics_get_result(
         context=self.context)
@@ -99,7 +99,7 @@ def test_list_w_api_filter(self, mock_gcloud_list_descriptors):
     self.assertEqual(metric_descriptor_list[0].type, METRIC_TYPES[0])
     self.assertEqual(metric_descriptor_list[1].type, METRIC_TYPES[1])
 
-  @mock.patch('google.cloud.monitoring.Client.list_metric_descriptors')
+  @mock.patch('google.cloud.logging.client.Client.list_metric_descriptors')
   def test_list_w_pattern_match(self, mock_gcloud_list_descriptors):
     mock_gcloud_list_descriptors.return_value = self._list_metrics_get_result(
         context=self.context)
@@ -111,7 +111,7 @@ def test_list_w_pattern_match(self, mock_gcloud_list_descriptors):
     self.assertEqual(len(metric_descriptor_list), 1)
     self.assertEqual(metric_descriptor_list[0].type, METRIC_TYPES[1])
 
-  @mock.patch('google.cloud.monitoring.Client.list_metric_descriptors')
+  @mock.patch('google.cloud.logging.client.Client.list_metric_descriptors')
   def test_list_caching(self, mock_gcloud_list_descriptors):
     mock_gcloud_list_descriptors.return_value = self._list_metrics_get_result(
         context=self.context)