diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-04 01:45:58 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-04 01:45:58 -0500 |
| commit | 8092805079d011093724d87e9485e5bf79479a72 (patch) | |
| tree | 22e58fc368bc1ec27f527c153b8fe6fe27de4997 /cloudinit/sources/helpers | |
| parent | 3400f839651d308e495d1d8a1d7c1c2b463ad98b (diff) | |
| parent | 63357ed731710b2418810535d9c991adbaea8dcb (diff) | |
| download | vyos-cloud-init-8092805079d011093724d87e9485e5bf79479a72.tar.gz vyos-cloud-init-8092805079d011093724d87e9485e5bf79479a72.zip | |
Apply pep8, pyflakes fixes for python2 and 3
Update make check target to run pep8 and run pyflakes or pyflakes3
depending on the value of 'PYVER'. This way the python3 build
environment does not need python2 and vice versa.
Also have make check run the 'yaml' test.
tox: have tox run pep8 in the pyflakes
Diffstat (limited to 'cloudinit/sources/helpers')
| -rw-r--r-- | cloudinit/sources/helpers/vmware/imc/config_nic.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cloudinit/sources/helpers/vmware/imc/config_nic.py b/cloudinit/sources/helpers/vmware/imc/config_nic.py index 6d721134..8c5c08cf 100644 --- a/cloudinit/sources/helpers/vmware/imc/config_nic.py +++ b/cloudinit/sources/helpers/vmware/imc/config_nic.py @@ -46,12 +46,12 @@ class NicConfigurator: """ primary_nics = [nic for nic in self.nics if nic.primary] if not primary_nics: - return None + return None elif len(primary_nics) > 1: - raise Exception('There can only be one primary nic', + raise Exception('There can only be one primary nic', [nic.mac for nic in primary_nics]) else: - return primary_nics[0] + return primary_nics[0] def find_devices(self): """ @@ -185,8 +185,8 @@ class NicConfigurator: lines = [] for addr in addrs: - lines.append(' up route -A inet6 add default gw %s metric 10000' % - addr.gateway) + lines.append(' up route -A inet6 add default gw ' + '%s metric 10000' % addr.gateway) return lines |