diff options
| author | Max Illfelder <illfelder@users.noreply.github.com> | 2019-01-24 10:20:01 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 10:20:01 -0800 |
| commit | 26de78d25cf1c471524e3f516a27bf3b32146c15 (patch) | |
| tree | 71e946f5a88d4828cd9684175a0a783edeb7b0df | |
| parent | c551c3c39bdf8cc3bceea3acf56eb28b418f084b (diff) | |
| download | google-compute-image-packages-26de78d25cf1c471524e3f516a27bf3b32146c15.tar.gz | |
Update script retrieval to support Python 3. (#729)
Python 3 returns a byte-string when calling read.
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_retriever.py b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_retriever.py index f606840..c678f99 100644 --- a/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_retriever.py +++ b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_retriever.py @@ -81,7 +81,7 @@ class ScriptRetriever(object): request = urlrequest.Request(url) request.add_unredirected_header('Metadata-Flavor', 'Google') request.add_unredirected_header('Authorization', self.token) - content = urlrequest.urlopen(request).read() + content = urlrequest.urlopen(request).read().decode('utf-8') except (httpclient.HTTPException, socket.error, urlerror.URLError) as e: self.logger.warning('Could not download %s. %s.', url, str(e)) return None diff --git a/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_retriever_test.py b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_retriever_test.py index 80616c4..f3f520a 100644 --- a/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_retriever_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_retriever_test.py @@ -60,7 +60,7 @@ class ScriptRetrieverTest(unittest.TestCase): mocked_request.add_unredirected_header.assert_called_with( 'Authorization', 'bar') mock_urlopen.assert_called_with(mocked_request) - urlopen_read = mock_urlopen().read(return_value='foo') + urlopen_read = mock_urlopen().read(return_value=b'foo').decode() self.mock_logger.warning.assert_not_called() mock_open.assert_called_once_with(self.dest, 'wb') |