diff options
Diffstat (limited to 'google/auth/compute_engine/_metadata.py')
| -rw-r--r-- | google/auth/compute_engine/_metadata.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/google/auth/compute_engine/_metadata.py b/google/auth/compute_engine/_metadata.py index af0d849..9db7bea 100644 --- a/google/auth/compute_engine/_metadata.py +++ b/google/auth/compute_engine/_metadata.py @@ -18,11 +18,13 @@ See https://cloud.google.com/compute/docs/metadata for more details. """ import datetime -import http.client import json import logging import os -from urllib import parse as urlparse + +import six +from six.moves import http_client +from six.moves.urllib import parse as urlparse from google.auth import _helpers from google.auth import environment_vars @@ -89,7 +91,7 @@ def ping(request, timeout=_METADATA_DEFAULT_TIMEOUT, retry_count=3): metadata_flavor = response.headers.get(_METADATA_FLAVOR_HEADER) return ( - response.status == http.client.OK + response.status == http_client.OK and metadata_flavor == _METADATA_FLAVOR_VALUE ) @@ -163,7 +165,7 @@ def get( "metadata service. Compute Engine Metadata server unavailable".format(url) ) - if response.status == http.client.OK: + if response.status == http_client.OK: content = _helpers.from_bytes(response.data) if response.headers["content-type"] == "application/json": try: @@ -173,7 +175,7 @@ def get( "Received invalid JSON from the Google Compute Engine" "metadata service: {:.20}".format(content) ) - raise new_exc from caught_exc + six.raise_from(new_exc, caught_exc) else: return content else: |