FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Get vendored-in modules importable. · googleapis/google-cloud-python@e4ab851 · GitHub

/ google-cloud-python Public

Commit e4ab851

Browse files
tseaver
committed
Get vendored-in modules importable.
1 parent d60a679 commit e4ab851

7 files changed

Lines changed: 20 additions & 149 deletions

File tree

‎gcloud/_apitools/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Vendored-in for from google-apitools 0.4.11

‎gcloud/_apitools/buffered_stream.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
#!/usr/bin/env python
21
"""Small helper class to provide a small slice of a stream.
32
43
This class reads ahead to detect if we are at the end of the stream.
54
"""
65

7-
from apitools.base.py import exceptions
6+
from gcloud._apitools import exceptions
87

98

109
# TODO(user): Consider replacing this with a StringIO.

‎gcloud/_apitools/exceptions.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
"""Exceptions for generated client libraries."""
32

43

‎gcloud/_apitools/http_wrapper.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
"""HTTP wrapper for apitools.
32
43
This library wraps the underlying http library we use, which is
@@ -16,8 +15,8 @@
1615
from six.moves import http_client
1716
from six.moves.urllib import parse
1817

19-
from apitools.base.py import exceptions
20-
from apitools.base.py import util
18+
from gcloud._apitools import exceptions
19+
from gcloud._apitools import util
2120

2221
__all__ = [
2322
'CheckResponse',

‎gcloud/_apitools/stream_slice.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#!/usr/bin/env python
21
"""Small helper class to provide a small slice of a stream."""
32

4-
from apitools.base.py import exceptions
3+
from gcloud._apitools import exceptions
54

65

76
class StreamSlice(object):

‎gcloud/_apitools/transfer.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
"""Upload and download support for apitools."""
32
from __future__ import print_function
43

@@ -14,11 +13,11 @@
1413
import six
1514
from six.moves import http_client
1615

17-
from apitools.base.py import buffered_stream
18-
from apitools.base.py import exceptions
19-
from apitools.base.py import http_wrapper
20-
from apitools.base.py import stream_slice
21-
from apitools.base.py import util
16+
from gcloud._apitools import buffered_stream
17+
from gcloud._apitools import exceptions
18+
from gcloud._apitools import http_wrapper
19+
from gcloud._apitools import stream_slice
20+
from gcloud._apitools import util
2221

2322
__all__ = [
2423
'Download',

‎gcloud/_apitools/util.py‎

Lines changed: 10 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,20 @@
1-
#!/usr/bin/env python
2-
"""Assorted utilities shared between parts of apitools."""
1+
"""Assorted utilities shared between parts of apitools.
32
4-
import collections
5-
import os
6-
import random
7-
8-
import six
9-
from six.moves import http_client
10-
import six.moves.urllib.error as urllib_error
11-
import six.moves.urllib.parse as urllib_parse
12-
import six.moves.urllib.request as urllib_request
13-
14-
from apitools.base.protorpclite import messages
15-
from apitools.base.py import encoding
16-
from apitools.base.py import exceptions
17-
18-
__all__ = [
19-
'DetectGae',
20-
'DetectGce',
21-
]
3+
Pruned to include only helpers used by other vendored-in modules:
224
23-
_RESERVED_URI_CHARS = r":/?#[]@!$&'()*+,;="
5+
``gcloud._apidools.transfer`` uses:
246
7+
- Typecheck
8+
- AcceptableMimeType
259
26-
def DetectGae():
27-
"""Determine whether or not we're running on GAE.
10+
``gcloud._apitools.http_wrapper`` uses:
2811
29-
This is based on:
30-
https://developers.google.com/appengine/docs/python/#The_Environment
31-
32-
Returns:
33-
True iff we're running on GAE.
34-
"""
35-
server_software = os.environ.get('SERVER_SOFTWARE', '')
36-
return (server_software.startswith('Development/') or
37-
server_software.startswith('Google App Engine/'))
12+
- CalculateWaitForRetry
13+
"""
3814

15+
import random
3916

40-
def DetectGce():
41-
"""Determine whether or not we're running on GCE.
42-
43-
This is based on:
44-
https://cloud.google.com/compute/docs/metadata#runninggce
45-
46-
Returns:
47-
True iff we're running on a GCE instance.
48-
"""
49-
try:
50-
o = urllib_request.build_opener(urllib_request.ProxyHandler({})).open(
51-
urllib_request.Request('http://metadata.google.internal'))
52-
except urllib_error.URLError:
53-
return False
54-
return (o.getcode() == http_client.OK and
55-
o.headers.get('metadata-flavor') == 'Google')
56-
57-
58-
def NormalizeScopes(scope_spec):
59-
"""Normalize scope_spec to a set of strings."""
60-
if isinstance(scope_spec, six.string_types):
61-
return set(scope_spec.split(' '))
62-
elif isinstance(scope_spec, collections.Iterable):
63-
return set(scope_spec)
64-
raise exceptions.TypecheckError(
65-
'NormalizeScopes expected string or iterable, found %s' % (
66-
type(scope_spec),))
17+
from gcloud._apitools import exceptions
6718

6819

6920
def Typecheck(arg, arg_type, msg=None):
@@ -78,45 +29,6 @@ def Typecheck(arg, arg_type, msg=None):
7829
return arg
7930

8031

81-
def ExpandRelativePath(method_config, params, relative_path=None):
82-
"""Determine the relative path for request."""
83-
path = relative_path or method_config.relative_path or ''
84-
85-
for param in method_config.path_params:
86-
param_template = '{%s}' % param
87-
# For more details about "reserved word expansion", see:
88-
# http://tools.ietf.org/html/rfc6570#section-3.2.2
89-
reserved_chars = ''
90-
reserved_template = '{+%s}' % param
91-
if reserved_template in path:
92-
reserved_chars = _RESERVED_URI_CHARS
93-
path = path.replace(reserved_template, param_template)
94-
if param_template not in path:
95-
raise exceptions.InvalidUserInputError(
96-
'Missing path parameter %s' % param)
97-
try:
98-
# TODO(craigcitro): Do we want to support some sophisticated
99-
# mapping here?
100-
value = params[param]
101-
except KeyError:
102-
raise exceptions.InvalidUserInputError(
103-
'Request missing required parameter %s' % param)
104-
if value is None:
105-
raise exceptions.InvalidUserInputError(
106-
'Request missing required parameter %s' % param)
107-
try:
108-
if not isinstance(value, six.string_types):
109-
value = str(value)
110-
path = path.replace(param_template,
111-
urllib_parse.quote(value.encode('utf_8'),
112-
reserved_chars))
113-
except TypeError as e:
114-
raise exceptions.InvalidUserInputError(
115-
'Error setting required parameter %s to value %s: %s' % (
116-
param, value, e))
117-
return path
118-
119-
12032
def CalculateWaitForRetry(retry_attempt, max_wait=60):
12133
"""Calculates amount of time to wait before a retry attempt.
12234
@@ -173,40 +85,3 @@ def MimeTypeMatches(pattern, mime_type):
17385

17486
return any(MimeTypeMatches(pattern, mime_type)
17587
for pattern in accept_patterns)
176-
177-
178-
def MapParamNames(params, request_type):
179-
"""Reverse parameter remappings for URL construction."""
180-
return [encoding.GetCustomJsonFieldMapping(request_type, json_name=p) or p
181-
for p in params]
182-
183-
184-
def MapRequestParams(params, request_type):
185-
"""Perform any renames/remappings needed for URL construction.
186-
187-
Currently, we have several ways to customize JSON encoding, in
188-
particular of field names and enums. This works fine for JSON
189-
bodies, but also needs to be applied for path and query parameters
190-
in the URL.
191-
192-
This function takes a dictionary from param names to values, and
193-
performs any registered mappings. We also need the request type (to
194-
look up the mappings).
195-
196-
Args:
197-
params: (dict) Map from param names to values
198-
request_type: (protorpc.messages.Message) request type for this API call
199-
200-
Returns:
201-
A new dict of the same size, with all registered mappings applied.
202-
"""
203-
new_params = dict(params)
204-
for param_name, value in params.items():
205-
field_remapping = encoding.GetCustomJsonFieldMapping(
206-
request_type, python_name=param_name)
207-
if field_remapping is not None:
208-
new_params[field_remapping] = new_params.pop(param_name)
209-
if isinstance(value, messages.Enum):
210-
new_params[param_name] = encoding.GetCustomJsonEnumMapping(
211-
type(value), python_name=str(value)) or str(value)
212-
return new_params

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL