Merge pull request googleapis#2632 from dhermes/fix-grpc-rel

dhermes · web-flow · commit 0838d143258f · 2016-10-27T11:34:32.000-07:00
Using absolute imports in core modules that import grpc.
diff --git a/core/google/cloud/_helpers.py b/core/google/cloud/_helpers.py
@@ -17,6 +17,9 @@
 This module is not part of the public API surface.
 """
 
+# Avoid the grpc and google.cloud.grpc collision.
+from __future__ import absolute_import
+
 import calendar
 import datetime
 import json
diff --git a/core/google/cloud/_testing.py b/core/google/cloud/_testing.py
@@ -15,6 +15,10 @@
 """Shared testing utilities."""
 
 
+# Avoid the grpc and google.cloud.grpc collision.
+from __future__ import absolute_import
+
+
 class _Monkey(object):
     # context-manager for replacing module names in the scope of a test.
 
diff --git a/core/google/cloud/exceptions.py b/core/google/cloud/exceptions.py
@@ -17,6 +17,9 @@
 See: https://cloud.google.com/storage/docs/json_api/v1/status-codes
 """
 
+# Avoid the grpc and google.cloud.grpc collision.
+from __future__ import absolute_import
+
 import copy
 import json
 import six
