Skip to content

#1186: Revendor apitools as 'gcloud._apitools' #1189

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.

Sign up for GitHub

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

Merged
tseaver merged 5 commits into from
Oct 23, 2015
Merged

#1186: Revendor apitools as 'gcloud._apitools' #1189

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d60a679
Scrape in six used modules from apitools.
tseaver Oct 15, 2015
e4ab851
Get vendored-in modules importable.
tseaver Oct 15, 2015
d2e4f99
Drop use of external 'google-apitools' in favor of vendored-in versions.
tseaver Oct 15, 2015
b8b2766
Make pylint ignore the 'gcloud/_apitools' modules until cleanups done.
tseaver Oct 16, 2015
ad1ab44
Don't test for coverage on 'gcloud/_apitools' by default.
tseaver Oct 16, 2015
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
Prev Previous commit
Next Next commit
Drop use of external 'google-apitools' in favor of vendored-in versions.
  • Loading branch information
@tseaver
tseaver committed Oct 16, 2015
commit d2e4f9939063afb3d80df18c07fa4d50256951d8
4 changes: 2 additions & 2 deletions gcloud/storage/blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import six
from six.moves.urllib.parse import quote # pylint: disable=F0401

from apitools.base.py import http_wrapper
from apitools.base.py import transfer
from gcloud._apitools import http_wrapper
from gcloud._apitools import transfer

from gcloud._helpers import _RFC3339_MICROS
from gcloud._helpers import UTC
Expand Down
12 changes: 6 additions & 6 deletions gcloud/storage/test_blob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,8 @@ def test_upload_from_file_resumable(self):
from six.moves.urllib.parse import urlsplit
from tempfile import NamedTemporaryFile
from gcloud._testing import _Monkey
from apitools.base.py import http_wrapper
from apitools.base.py import transfer
from gcloud._apitools import http_wrapper
from gcloud._apitools import transfer
BLOB_NAME = 'blob-name'
UPLOAD_URL = 'http://example.com/upload/name/key'
DATA = b'ABCDEF'
Expand Down Expand Up @@ -470,7 +470,7 @@ def test_upload_from_file_w_slash_in_name(self):
from six.moves.urllib.parse import parse_qsl
from six.moves.urllib.parse import urlsplit
from tempfile import NamedTemporaryFile
from apitools.base.py import http_wrapper
from gcloud._apitools import http_wrapper
BLOB_NAME = 'parent/child'
UPLOAD_URL = 'http://example.com/upload/name/parent%2Fchild'
DATA = b'ABCDEF'
Expand Down Expand Up @@ -518,7 +518,7 @@ def _upload_from_filename_test_helper(self, properties=None,
from six.moves.urllib.parse import parse_qsl
from six.moves.urllib.parse import urlsplit
from tempfile import NamedTemporaryFile
from apitools.base.py import http_wrapper
from gcloud._apitools import http_wrapper
BLOB_NAME = 'blob-name'
UPLOAD_URL = 'http://example.com/upload/name/key'
DATA = b'ABCDEF'
Expand Down Expand Up @@ -584,7 +584,7 @@ def test_upload_from_string_w_bytes(self):
from six.moves.http_client import OK
from six.moves.urllib.parse import parse_qsl
from six.moves.urllib.parse import urlsplit
from apitools.base.py import http_wrapper
from gcloud._apitools import http_wrapper
BLOB_NAME = 'blob-name'
UPLOAD_URL = 'http://example.com/upload/name/key'
DATA = b'ABCDEF'
Expand Down Expand Up @@ -623,7 +623,7 @@ def test_upload_from_string_w_text(self):
from six.moves.http_client import OK
from six.moves.urllib.parse import parse_qsl
from six.moves.urllib.parse import urlsplit
from apitools.base.py import http_wrapper
from gcloud._apitools import http_wrapper
BLOB_NAME = 'blob-name'
UPLOAD_URL = 'http://example.com/upload/name/key'
DATA = u'ABCDEF\u1234'
Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@


REQUIREMENTS = [
'google-apitools',
'httplib2 >= 0.9.1',
'oauth2client >= 1.4.6',
'protobuf >= 3.0.0a3',
Expand Down