Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Using absolute imports in core modules that import grpc. #2632

Merged
merged 1 commit into from
Oct 27, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/google/cloud/_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions core/google/cloud/_testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
3 changes: 3 additions & 0 deletions core/google/cloud/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down