x/cloud-init
Code Issues Proposed changes

tools/run-pep8: remove leading ',' fed to --ignore

Browse Source 
--ignore was being called with ',E121,E...' rather than
'E121,E...'.

that resulted in odd behavior, missing the pep8 errors that are fixed
here.
This commit is contained in:
Scott Moser
2015-01-06 12:02:38 -05:00
parent d90bfd6268
commit 28abcf1dfc
15 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cloudinit/distros/freebsd.py
View File

@@ -119,7 +119,8 @@ class Distro(distros.Distro):
index = n.group(0)
(out, err) = util.subp(['ifconfig', '-a'])
ifconfigoutput = [x for x in (out.strip()).splitlines() if len(x.split()) > 0]
ifconfigoutput = [x for x in (out.strip()).splitlines()
if len(x.split()) > 0]
for line in ifconfigoutput:
m = re.match('^\w+', line)
if m:

1
cloudinit/distros/net_util.py
View File

@@ -180,4 +180,3 @@ def translate_network(settings):
if cmd == 'iface' and 'inet6' in args:
real_ifaces[dev_name]['inet6'] = True
return real_ifaces

2
cloudinit/distros/rhel.py
View File

@@ -91,7 +91,7 @@ class Distro(distros.Distro):
'IPV6INIT': _make_sysconfig_bool(True),
'IPV6ADDR': info.get('ipv6').get('address'),
'IPV6_DEFAULTGW': info.get('ipv6').get('gateway'),
})
})
rhel_util.update_sysconfig_file(net_fn, net_cfg)
if 'dns-nameservers' in info:
nameservers.extend(info['dns-nameservers'])

4
cloudinit/sources/DataSourceConfigDrive.py
View File

@@ -79,8 +79,8 @@ class DataSourceConfigDrive(openstack.SourceMixin, sources.DataSource):
else:
mtype = None
sync = True
results = util.mount_cb(dev, read_config_drive, mtype=mtype,
sync=sync)
results = util.mount_cb(dev, read_config_drive,
mtype=mtype, sync=sync)
found = dev
except openstack.NonReadable:
pass

11
cloudinit/sources/DataSourceDigitalOcean.py
View File

@@ -31,6 +31,7 @@ BUILTIN_DS_CONFIG = {
MD_RETRIES = 0
MD_TIMEOUT = 1
class DataSourceDigitalOcean(sources.DataSource):
def __init__(self, sys_cfg, distro, paths):
sources.DataSource.__init__(self, sys_cfg, distro, paths)
@@ -51,10 +52,10 @@ class DataSourceDigitalOcean(sources.DataSource):
self.timeout = MD_TIMEOUT
def get_data(self):
caller = functools.partial(util.read_file_or_url, timeout=self.timeout,
retries=self.retries)
caller = functools.partial(util.read_file_or_url,
timeout=self.timeout, retries=self.retries)
md = ec2_utils.MetadataMaterializer(str(caller(self.metadata_address)),
base_url=self.metadata_address,
base_url=self.metadata_address,
caller=caller)
self.metadata = md.materialize()
@@ -72,9 +73,9 @@ class DataSourceDigitalOcean(sources.DataSource):
def get_public_ssh_keys(self):
if type(self.metadata['public-keys']) is StringType:
return [self.metadata['public-keys']]
return [self.metadata['public-keys']]
else:
return self.metadata['public-keys']
return self.metadata['public-keys']
@property
def availability_zone(self):

2
cloudinit/util.py
View File

@@ -1966,7 +1966,7 @@ def pathprefix2dict(base, required=None, optional=None, delim=os.path.sep):
def read_meminfo(meminfo="/proc/meminfo", raw=False):
# read a /proc/meminfo style file and return
# a dict with 'total', 'free', and 'available'
mpliers = {'kB': 2**10, 'mB': 2 ** 20, 'B': 1, 'gB': 2 ** 30}
mpliers = {'kB': 2 ** 10, 'mB': 2 ** 20, 'B': 1, 'gB': 2 ** 30}
kmap = {'MemTotal:': 'total', 'MemFree:': 'free',
'MemAvailable:': 'available'}
ret = {}

6
doc/rtd/conf.py
View File

@@ -12,8 +12,8 @@ sys.path.insert(0, os.path.abspath('.'))
from cloudinit import version
# Supress warnings for docs that aren't used yet
#unused_docs = [
#]
# unused_docs = [
# ]
# General information about the project.
project = 'Cloud-Init'
@@ -21,7 +21,7 @@ project = 'Cloud-Init'
# -- General configuration ----------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here.
#needs_sphinx = '1.0'
# needs_sphinx = '1.0'
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.

2
setup.py
View File

@@ -164,7 +164,7 @@ else:
(USR + '/share/doc/cloud-init', [f for f in glob('doc/*') if is_f(f)]),
(USR + '/share/doc/cloud-init/examples',
[f for f in glob('doc/examples/*') if is_f(f)]),
(USR + '/share/doc/cloud-init/examples/seed',
(USR + '/share/doc/cloud-init/examples/seed',
[f for f in glob('doc/examples/seed/*') if is_f(f)]),
]
# Use a subclass for install that handles

1
tests/unittests/test_datasource/test_digitalocean.py
View File

@@ -51,6 +51,7 @@ DO_META = {
MD_URL_RE = re.compile(r'http://169.254.169.254/metadata/v1/.*')
def _request_callback(method, uri, headers):
url_path = urlparse(uri).path
if url_path.startswith('/metadata/v1/'):

3
tests/unittests/test_datasource/test_gce.py
View File

@@ -40,7 +40,8 @@ GCE_META_PARTIAL = {
}
HEADERS = {'X-Google-Metadata-Request': 'True'}
MD_URL_RE = re.compile(r'http://metadata.google.internal./computeMetadata/v1/.*')
MD_URL_RE = re.compile(
r'http://metadata.google.internal./computeMetadata/v1/.*')
def _request_callback(method, uri, headers):

4
tests/unittests/test_datasource/test_smartos.py
View File

@@ -342,8 +342,8 @@ class TestSmartOSDataSource(helpers.FilesystemMockingTestCase):
"""
User-data in the SmartOS world is supposed to be written to a file
each and every boot. This tests to make sure that in the event the
legacy user-data is removed, the existing user-data is backed-up and
there is no /var/db/user-data left.
legacy user-data is removed, the existing user-data is backed-up
and there is no /var/db/user-data left.
"""
user_data_f = "%s/mdata-user-data" % self.legacy_user_d

2
tests/unittests/test_distros/test_netconfig.py
View File

@@ -294,7 +294,6 @@ IPV6_AUTOCONF=no
self.assertCfgEquals(expected_buf, str(write_buf))
self.assertEquals(write_buf.mode, 0644)
def test_simple_write_freebsd(self):
fbsd_distro = self._get_distro('freebsd')
util_mock = self.mocker.replace(util.write_file,
@@ -357,4 +356,3 @@ defaultrouter="192.168.1.254"
'''
self.assertCfgEquals(expected_buf, str(write_buf))
self.assertEquals(write_buf.mode, 0644)

2
tests/unittests/test_handler/test_handler_yum_add_repo.py
View File

@@ -24,7 +24,7 @@ class TestConfig(helpers.FilesystemMockingTestCase):
'epel-testing': {
'name': 'Extra Packages for Enterprise Linux 5 - Testing',
# Missing this should cause the repo not to be written
# 'baseurl': 'http://blah.org/pub/epel/testing/5/$basearch',
# 'baseurl': 'http://blah.org/pub/epel/testing/5/$barch',
'enabled': False,
'gpgcheck': True,
'gpgkey': 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL',

3
tests/unittests/test_templating.py
View File

@@ -100,7 +100,8 @@ $a,$b'''
mirror = "mymirror"
codename = "zany"
in_data = "deb $mirror $codename-updates main contrib non-free"
ex_data = "deb %s %s-updates main contrib non-free" % (mirror, codename)
ex_data = "deb %s %s-updates main contrib non-free" % (mirror,
codename)
out_data = templater.basic_render(in_data,
{'mirror': mirror, 'codename': codename})

1
tools/run-pep8
View File

@@ -24,6 +24,7 @@ IGNORE="$IGNORE,E126" # Continuation line over-indented for hanging indent
IGNORE="$IGNORE,E127" # Continuation line over-indented for visual indent
IGNORE="$IGNORE,E128" # Continuation line under-indented for visual indent
IGNORE="$IGNORE,E502" # The backslash is redundant between brackets
IGNORE="${IGNORE#,}" # remove the leading ',' added above
cmd=(
${base}/hacking.py