diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-20 08:35:24 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-20 08:35:24 -0400 |
| commit | 41190448decad51cf76a85d727e6935a8a206cca (patch) | |
| tree | f4548e8595cafff2ffc13d914dbadef7b8c737db /cloudinit/distros | |
| parent | f8318f8eec9c8f1c1676ce6a5b5c2c77fa2f7cc5 (diff) | |
| parent | ab71760d7e127ae9a3cf31a4f6d7600c945f0dd7 (diff) | |
| download | vyos-cloud-init-41190448decad51cf76a85d727e6935a8a206cca.tar.gz vyos-cloud-init-41190448decad51cf76a85d727e6935a8a206cca.zip | |
use 'requests' rather than urllib2.
This re-works the urlhelper and users of it to use requests rather
than urllib2. The primary benefit is that now when using recent
versions of python-requests (>= 0.8.8) https certificates will be checked.
Diffstat (limited to 'cloudinit/distros')
| -rw-r--r-- | cloudinit/distros/parsers/resolv_conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/distros/parsers/resolv_conf.py b/cloudinit/distros/parsers/resolv_conf.py index 5733c25a..1be9d46b 100644 --- a/cloudinit/distros/parsers/resolv_conf.py +++ b/cloudinit/distros/parsers/resolv_conf.py @@ -137,8 +137,8 @@ class ResolvConf(object): self._contents.append(('option', ['search', s_list, ''])) return flat_sds - @local_domain.setter - def local_domain(self, domain): + @local_domain.setter # pl51222 pylint: disable=E1101 + def local_domain(self, domain): # pl51222 pylint: disable=E0102 self.parse() self._remove_option('domain') self._contents.append(('option', ['domain', str(domain), ''])) |