Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-14 11:24:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #25617 - zhuowei:python3-bootstrap-android, r=jdm

Browse source 
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.
This commit is contained in:
bors-servo 2020-01-27 07:45:58 -05:00 • committed by GitHub
commit f75b01f07d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/servo/util.py
View file

@ -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