diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-01-27 07:45:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-27 07:45:58 -0500 |
| commit | f75b01f07d6645021ffd2811f02db376e9c2259c (patch) | |
| tree | 8b77b8463fddbb5e3c7e56afae01c307fff738ff /python/servo | |
| parent | 72adff2ed235a37cc3b251223eda8e49ba54d137 (diff) | |
| parent | 634a1127c077542083c9e11f8284cfe92c634c7c (diff) | |
| download | servo-f75b01f07d6645021ffd2811f02db376e9c2259c.tar.gz servo-f75b01f07d6645021ffd2811f02db376e9c2259c.zip | |
Auto merge of #25617 - zhuowei:python3-bootstrap-android, r=jdm
mach: fix `bootstrap-android` on Python 3
When running `python3 ./mach bootstrap-android`, this error occurs:
```
AttributeError: 'HTTPMessage' object has no attribute 'getheader'
File "/servo/python/servo/bootstrap_commands.py", line 136, in bootstrap_android
download("sdk", tools.format(system=system))
File "/servo/python/servo/bootstrap_commands.py", line 117, in download
download_file(filename, url, archive)
File "/servo/python/servo/util.py", line 170, in download_file
download(desc, src, fd)
File "/servo/python/servo/util.py", line 110, in download
if resp.info().getheader('Content-Length'):
```
Use the `get()` function instead, which exists in both Python 3 and 2
(where it is a synonym for `getheader()`).
Fixes #25616.
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/servo/util.py b/python/servo/util.py index 38127093ae8..d0f0f811889 100644 --- a/python/servo/util.py +++ b/python/servo/util.py @@ -107,8 +107,8 @@ def download(desc, src, writer, start_byte=0): resp = urllib.request.urlopen(req, **get_urlopen_kwargs()) fsize = None - if resp.info().getheader('Content-Length'): - fsize = int(resp.info().getheader('Content-Length').strip()) + start_byte + if resp.info().get('Content-Length'): + fsize = int(resp.info().get('Content-Length').strip()) + start_byte recved = start_byte chunk_size = 64 * 1024 |