summaryrefslogtreecommitdiff
path: root/lib/ansible/modules/packaging/language
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2018-03-05 12:11:27 -0800
committerGitHub <noreply@github.com>2018-03-05 12:11:27 -0800
commit1bc860fafd9fc25c5bbe2fdcf0db9195a21d380b (patch)
tree981658b51e833562b941a7a5bfabeb053b6721e1 /lib/ansible/modules/packaging/language
parent2d98a2de6802122fc1b495ccb91481db2dac7f24 (diff)
downloadansible-1bc860fafd9fc25c5bbe2fdcf0db9195a21d380b.tar.gz
Python3 issues in maven_artifact (#37035)
Fixes #33761
Diffstat (limited to 'lib/ansible/modules/packaging/language')
-rw-r--r--lib/ansible/modules/packaging/language/maven_artifact.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/ansible/modules/packaging/language/maven_artifact.py b/lib/ansible/modules/packaging/language/maven_artifact.py
index c1370abab5..b5f842c7f8 100644
--- a/lib/ansible/modules/packaging/language/maven_artifact.py
+++ b/lib/ansible/modules/packaging/language/maven_artifact.py
@@ -349,8 +349,7 @@ class MavenDownloader:
if not self.verify_md5(filename, url + ".md5"):
response = self._request(url, "Failed to download artifact " + str(artifact), lambda r: r)
if response:
- f = open(filename, 'w')
- # f.write(response.read())
+ f = open(filename, 'wb')
self._write_chunks(response, f, report_hook=self.chunk_report)
f.close()
else:
@@ -366,19 +365,19 @@ class MavenDownloader:
if bytes_so_far >= total_size:
sys.stdout.write('\n')
- def _write_chunks(self, response, file, chunk_size=8192, report_hook=None):
- total_size = response.info().getheader('Content-Length').strip()
+ def _write_chunks(self, response, filehandle, chunk_size=8192, report_hook=None):
+ total_size = response.info().get('Content-Length').strip()
total_size = int(total_size)
bytes_so_far = 0
- while 1:
+ while True:
chunk = response.read(chunk_size)
bytes_so_far += len(chunk)
if not chunk:
break
- file.write(chunk)
+ filehandle.write(chunk)
if report_hook:
report_hook(bytes_so_far, chunk_size, total_size)