x/cloud-init
Code Issues Proposed changes

pylint and long line fixes.

Browse Source 
This fixes up many long lines to be < 80 chars and some other
pylint issues.  pylint 1.1 (in trusty) is now complaining about
the lazy logging, so I'll clean that up when I touch things.
This commit is contained in:
Scott Moser
2014-01-24 15:29:09 -05:00
parent 16cfb37ac7
commit 34490c2645
6 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cloudinit/config/cc_growpart.py
View File

@@ -223,7 +223,8 @@ def resize_devices(resizer, devices):
"stat of '%s' failed: %s" % (blockdev, e),))
continue
if not stat.S_ISBLK(statret.st_mode) and not stat.S_ISCHR(statret.st_mode):
if (not stat.S_ISBLK(statret.st_mode) and
not stat.S_ISCHR(statret.st_mode)):
info.append((devent, RESIZE.SKIPPED,
"device '%s' not a block device" % blockdev,))
continue

47
cloudinit/distros/freebsd.py
View File

@@ -16,15 +16,14 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import re
from cloudinit import distros
from cloudinit import helpers
from cloudinit import log as logging
from cloudinit import netinfo
from cloudinit import ssh_util
from cloudinit import util
from cloudinit.settings import PER_INSTANCE
LOG = logging.getLogger(__name__)
@@ -39,26 +38,27 @@ class Distro(distros.Distro):
# Updates a key in /etc/rc.conf.
def updatercconf(self, key, value):
LOG.debug("updatercconf: %s => %s" % (key, value))
LOG.debug("updatercconf: %s => %s", key, value)
conf = self.loadrcconf()
configchanged = False
for item in conf:
if item == key and conf[item] != value:
conf[item] = value
LOG.debug("[rc.conf]: Value %s for key %s needs to be changed" % (value, key))
LOG.debug("[rc.conf]: Value %s for key %s needs to be changed",
value, key)
configchanged = True
if configchanged:
LOG.debug("Writing new /etc/rc.conf file")
with open('/etc/rc.conf', 'w') as file:
with open('/etc/rc.conf', 'w') as fp:
for keyval in conf.items():
file.write("%s=%s\n" % keyval)
fp.write("%s=%s\n" % keyval)
# Load the contents of /etc/rc.conf and store all keys in a dict.
def loadrcconf(self):
conf = {}
with open("/etc/rc.conf") as file:
for line in file:
with open("/etc/rc.conf") as fp:
for line in fp:
tok = line.split('=')
conf[tok[0]] = tok[1].rstrip()
return conf
@@ -75,7 +75,7 @@ class Distro(distros.Distro):
sys_hostname = self._read_hostname()
return ('rc.conf', sys_hostname)
def _read_hostname(self, default=None):
def _read_hostname(self, filename, default=None):
hostname = None
try:
hostname = self.readrcconf('hostname')
@@ -90,17 +90,17 @@ class Distro(distros.Distro):
return fqdn
return hostname
def _write_hostname(self, your_hostname, out_fn):
self.updatercconf('hostname', your_hostname)
def _write_hostname(self, hostname, filename):
self.updatercconf('hostname', hostname)
def create_group(self, name, members):
group_add_cmd = ['pw', '-n', name]
if util.is_group(name):
LOG.warn("Skipping creation of existing group '%s'" % name)
LOG.warn("Skipping creation of existing group '%s'", name)
else:
try:
util.subp(group_add_cmd)
LOG.info("Created new group %s" % name)
LOG.info("Created new group %s", name)
except Exception:
util.logexc("Failed to create group %s", name)
@@ -111,11 +111,11 @@ class Distro(distros.Distro):
"; user does not exist.", member, name)
continue
util.subp(['pw', 'usermod', '-n', name, '-G', member])
LOG.info("Added user '%s' to group '%s'" % (member, name))
LOG.info("Added user '%s' to group '%s'", member, name)
def add_user(self, name, **kwargs):
if util.is_user(name):
LOG.info("User %s already exists, skipping." % name)
LOG.info("User %s already exists, skipping.", name)
return False
adduser_cmd = ['pw', 'useradd', '-n', name]
@@ -170,7 +170,7 @@ class Distro(distros.Distro):
raise e
# TODO:
def set_passwd(self, name, **kwargs):
def set_passwd(self, user, passwd, hashed=False):
return False
def lock_passwd(self, name):
@@ -182,7 +182,7 @@ class Distro(distros.Distro):
# TODO:
def write_sudo_rules(self, name, rules, sudo_file=None):
LOG.debug("[write_sudo_rules] Name: %s" % name)
LOG.debug("[write_sudo_rules] Name: %s", name)
def create_user(self, name, **kwargs):
self.add_user(name, **kwargs)
@@ -217,7 +217,8 @@ class Distro(distros.Distro):
origconf = open(loginconf, 'r')
for line in origconf:
newconf.write(re.sub('^default:', r'default:lang=%s:' % locale, line))
newconf.write(re.sub(r'^default:',
r'default:lang=%s:' % locale, line))
newconf.close()
origconf.close()
# Make a backup of login.conf.
@@ -233,14 +234,14 @@ class Distro(distros.Distro):
util.logexc("Failed to apply locale %s", locale)
copyfile(backupconf, loginconf)
def install_packages():
def install_packages(self, pkglist):
return
def package_command():
def package_command(self, cmd, args=None, pkgs=None):
return
def set_timezone():
def set_timezone(self, tz):
return
def update_package_sources():
def update_package_sources(self):
return

30
cloudinit/netinfo.py
View File

@@ -44,7 +44,7 @@ def netdev_info(empty=""):
# If the output of ifconfig doesn't contain the required info in the
# obvious place, use a regex filter to be sure.
elif len(toks) > 1:
if re.search("flags=\d+<up,", toks[1]):
if re.search(r"flags=\d+<up,", toks[1]):
devs[curdev]['up'] = True
fieldpost = ""
@@ -58,11 +58,8 @@ def netdev_info(empty=""):
except IndexError:
pass
"""
Couple the different items we're interested in with the correct field
since FreeBSD/CentOS/Fedora differ in the output.
"""
# Couple the different items we're interested in with the correct
# field since FreeBSD/CentOS/Fedora differ in the output.
ifconfigfields = {
"addr:": "addr", "inet": "addr",
"bcast:": "bcast", "broadcast": "bcast",
@@ -98,17 +95,16 @@ def route_info():
continue
toks = line.split()
"""
FreeBSD shows 6 items in the routing table:
Destination Gateway Flags Refs Use Netif Expire
default 10.65.0.1 UGS 0 34920 vtnet0
Linux netstat shows 2 more:
Destination Gateway Genmask Flags MSS Window irtt Iface
0.0.0.0 10.65.0.1 0.0.0.0 UG 0 0 0 eth0
"""
if len(toks) < 6 or toks[0] == "Kernel" or toks[0] == "Destination" or toks[0] == "Internet" or toks[0] == "Internet6" or toks[0] == "Routing":
# FreeBSD shows 6 items in the routing table:
# Destination Gateway Flags Refs Use Netif Expire
# default 10.65.0.1 UGS 0 34920 vtnet0
#
# Linux netstat shows 2 more:
# Destination Gateway Genmask Flags MSS Window irtt Iface
# 0.0.0.0 10.65.0.1 0.0.0.0 UG 0 0 0 eth0
if (len(toks) < 6 or toks[0] == "Kernel" or
toks[0] == "Destination" or toks[0] == "Internet" or
toks[0] == "Internet6" or toks[0] == "Routing"):
continue
if len(toks) < 8:

3
cloudinit/user_data.py
View File

@@ -311,7 +311,8 @@ class UserDataProcessor(object):
def _attach_part(self, outer_msg, part):
"""
Attach a message to an outer message. outermsg must be a MIMEMultipart.
Modifies a header in the outer message to keep track of number of attachments.
Modifies a header in the outer message to keep track of number of
attachments.
"""
part_count = self._multi_part_count(outer_msg)
self._process_before_attach(part, part_count + 1)

12
cloudinit/util.py
View File

@@ -963,7 +963,7 @@ def is_resolvable(name):
pass
_DNS_REDIRECT_IP = badips
if badresults:
LOG.debug("detected dns redirection: %s" % badresults)
LOG.debug("detected dns redirection: %s", badresults)
try:
result = socket.getaddrinfo(name, None)
@@ -1322,6 +1322,7 @@ def mounts():
(mountoutput, _err) = subp("mount")
mount_locs = mountoutput.splitlines()
method = 'mount'
mountre = r'^(/dev/[\S]+) on (/.*) \((.+), .+, (.+)\)$'
for mpline in mount_locs:
# Linux: /dev/sda1 on /boot type ext4 (rw,relatime,data=ordered)
# FreeBSD: /dev/vtbd0p2 on / (ufs, local, journaled soft-updates)
@@ -1329,7 +1330,7 @@ def mounts():
if method == 'proc':
(dev, mp, fstype, opts, _freq, _passno) = mpline.split()
else:
m = re.search('^(/dev/[\S]+) on (/.*) \((.+), .+, (.+)\)$', mpline)
m = re.search(mountre, mpline)
dev = m.group(1)
mp = m.group(2)
fstype = m.group(3)
@@ -1403,7 +1404,7 @@ def get_builtin_cfg():
def sym_link(source, link):
LOG.debug("Creating symbolic link from %r => %r" % (link, source))
LOG.debug("Creating symbolic link from %r => %r", link, source)
os.symlink(source, link)
@@ -1444,7 +1445,8 @@ def uptime():
size = ctypes.c_size_t()
buf = ctypes.c_int()
size.value = ctypes.sizeof(buf)
libc.sysctlbyname("kern.boottime", ctypes.byref(buf), ctypes.byref(size), None, 0)
libc.sysctlbyname("kern.boottime", ctypes.byref(buf),
ctypes.byref(size), None, 0)
now = time.time()
bootup = buf.value
uptime_str = now - bootup
@@ -1793,7 +1795,7 @@ def parse_mount(path):
(mountoutput, _err) = subp("mount")
mount_locs = mountoutput.splitlines()
for line in mount_locs:
m = re.search('^(/dev/[\S]+) on (/.*) \((.+), .+, (.+)\)$', line)
m = re.search(r'^(/dev/[\S]+) on (/.*) \((.+), .+, (.+)\)$', line)
devpth = m.group(1)
mount_point = m.group(2)
fs_type = m.group(3)

2
tests/unittests/test_datasource/test_configdrive.py
View File

@@ -285,7 +285,7 @@ class TestConfigDriveDataSource(MockerTestCase):
self.assertEqual(["/dev/vdb", "/dev/zdd"],
ds.find_candidate_devs())
# verify that partitions are considered, but only if they have a label.
# verify that partitions are considered, that have correct label.
devs_with_answers = {"TYPE=vfat": ["/dev/sda1"],
"TYPE=iso9660": [], "LABEL=config-2": ["/dev/vdb3"]}
self.assertEqual(["/dev/vdb3"],