diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-04 01:55:28 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-04 01:55:28 -0500 |
| commit | 1a9a408a7bf6d7a1a06254ad2939bd549acba69b (patch) | |
| tree | ec4f76ea5260e269c83addbfafa4376ea2678059 /cloudinit/url_helper.py | |
| parent | bbf105baafbe788f7babbda188b513180424e256 (diff) | |
| parent | 8092805079d011093724d87e9485e5bf79479a72 (diff) | |
| download | vyos-cloud-init-1a9a408a7bf6d7a1a06254ad2939bd549acba69b.tar.gz vyos-cloud-init-1a9a408a7bf6d7a1a06254ad2939bd549acba69b.zip | |
merge with trunk
Diffstat (limited to 'cloudinit/url_helper.py')
| -rw-r--r-- | cloudinit/url_helper.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/url_helper.py b/cloudinit/url_helper.py index f2e1390e..936f7da5 100644 --- a/cloudinit/url_helper.py +++ b/cloudinit/url_helper.py @@ -252,9 +252,9 @@ def readurl(url, data=None, timeout=None, retries=0, sec_between=1, # attrs return UrlResponse(r) except exceptions.RequestException as e: - if (isinstance(e, (exceptions.HTTPError)) - and hasattr(e, 'response') # This appeared in v 0.10.8 - and hasattr(e.response, 'status_code')): + if (isinstance(e, (exceptions.HTTPError)) and + hasattr(e, 'response') and # This appeared in v 0.10.8 + hasattr(e.response, 'status_code')): excps.append(UrlError(e, code=e.response.status_code, headers=e.response.headers, url=url)) |