From c83f352c81d7e445433ecc6bc0882ddc0b313d0b Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Fri, 11 Mar 2016 11:20:59 +0100 Subject: [PATCH] Use googleapiclient import instead of apiclient apiclient alias will be removed upstream in the future according to the changelog. Change-Id: I896a52c5e17632ab7a65cf0f9b894cccf0f5687b Closes-Bug: #1556020 --- cinder/backup/drivers/google.py | 6 +++--- cinder/tests/unit/backup/fake_google_client.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cinder/backup/drivers/google.py b/cinder/backup/drivers/google.py index 6c2cb1181..f2a7c46aa 100644 --- a/cinder/backup/drivers/google.py +++ b/cinder/backup/drivers/google.py @@ -30,9 +30,9 @@ import base64 import hashlib import httplib2 -from apiclient import discovery -from apiclient import errors -from apiclient import http +from googleapiclient import discovery +from googleapiclient import errors +from googleapiclient import http from oauth2client import client from oslo_config import cfg from oslo_log import log as logging diff --git a/cinder/tests/unit/backup/fake_google_client.py b/cinder/tests/unit/backup/fake_google_client.py index b8d5ac4c4..703a030fc 100644 --- a/cinder/tests/unit/backup/fake_google_client.py +++ b/cinder/tests/unit/backup/fake_google_client.py @@ -18,7 +18,7 @@ import json import os import zlib -from apiclient import errors +from googleapiclient import errors from oauth2client import client from oslo_utils import units import six -- 2.45.2