diff options
| author | Jay Faulkner <jay@jvf.cc> | 2014-08-26 16:05:58 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-08-26 16:05:58 -0400 |
| commit | 31f9129c8a77aec8d3eb6fa649d1caa9b6df347e (patch) | |
| tree | 10d634bc7732390c5043bd2ff1a678b5289abb93 /cloudinit/distros | |
| parent | 190cacc430900d9d2dd4dd45c59d01e30e469720 (diff) | |
| parent | 5fb6482692cfffba5ba45102858b14ba3acc5bc7 (diff) | |
| download | vyos-cloud-init-31f9129c8a77aec8d3eb6fa649d1caa9b6df347e.tar.gz vyos-cloud-init-31f9129c8a77aec8d3eb6fa649d1caa9b6df347e.zip | |
Fix pep8 issues, drop pylint.
pep8: passes on pylint 1.5.7 (and 1.5.6 utopic).
intent is that is to be the target for future changes.
pylint: remove as more hassle than its worth.
Intent is to move to pyflakes at some point.
Diffstat (limited to 'cloudinit/distros')
| -rw-r--r-- | cloudinit/distros/__init__.py | 4 | ||||
| -rw-r--r-- | cloudinit/distros/parsers/resolv_conf.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 1a56dfb3..4b41220e 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -167,7 +167,7 @@ class Distro(object): def expand_osfamily(family_list): distros = [] for family in family_list: - if not family in OSFAMILIES: + if family not in OSFAMILIES: raise ValueError("No distibutions found for osfamily %s" % (family)) distros.extend(OSFAMILIES[family]) @@ -218,7 +218,7 @@ class Distro(object): fn) if (sys_hostname and prev_hostname and - sys_hostname != prev_hostname): + sys_hostname != prev_hostname): LOG.debug("%s differs from %s, assuming user maintained hostname.", prev_hostname_fn, sys_fn) diff --git a/cloudinit/distros/parsers/resolv_conf.py b/cloudinit/distros/parsers/resolv_conf.py index 1be9d46b..5733c25a 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 # pl51222 pylint: disable=E1101 - def local_domain(self, domain): # pl51222 pylint: disable=E0102 + @local_domain.setter + def local_domain(self, domain): self.parse() self._remove_option('domain') self._contents.append(('option', ['domain', str(domain), ''])) |