pyflakes fixes.

make pyflakes now passes.

9 files changed, 23 insertions, 21 deletions

diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
index 24e33915..4ca85e21 100644
--- a/cloudinit/config/cc_set_passwords.py
+++ b/cloudinit/config/cc_set_passwords.py
@@ -132,7 +132,7 @@ def handle(_name, cfg, cloud, log, args):
                                                      'PasswordAuthentication',
                                                      pw_auth))
 
-        lines = [str(e) for e in new_lines]
+        lines = [str(l) for l in new_lines]
         util.write_file(ssh_util.DEF_SSHD_CFG, "\n".join(lines))
 
         try:
diff --git a/cloudinit/config/cc_ssh_import_id.py b/cloudinit/config/cc_ssh_import_id.py
index 76c1663d..2d480d7e 100644
--- a/cloudinit/config/cc_ssh_import_id.py
+++ b/cloudinit/config/cc_ssh_import_id.py
@@ -85,7 +85,7 @@ def import_ssh_ids(ids, user, log):
         return
 
     try:
-        _check = pwd.getpwnam(user)
+        pwd.getpwnam(user)
     except KeyError as exc:
         raise exc
 
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 9c9211fe..2599d9f2 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -861,5 +861,5 @@ def set_etc_timezone(tz, tz_file=None, tz_conf="/etc/timezone",
     util.write_file(tz_conf, str(tz).rstrip() + "\n")
     # This ensures that the correct tz will be used for the system
     if tz_local and tz_file:
-        util.copy(tz_file, self.tz_local_fn)
+        util.copy(tz_file, tz_local)
     return
diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py
index 9f11b89c..005a0dd4 100644
--- a/cloudinit/distros/arch.py
+++ b/cloudinit/distros/arch.py
@@ -159,7 +159,7 @@ class Distro(distros.Distro):
         return hostname
 
     def set_timezone(self, tz):
-        set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
+        distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
 
     def package_command(self, command, args=None, pkgs=None):
         if pkgs is None:
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py
index 7cf4a9ef..010be67d 100644
--- a/cloudinit/distros/debian.py
+++ b/cloudinit/distros/debian.py
@@ -131,7 +131,7 @@ class Distro(distros.Distro):
         return "127.0.1.1"
 
     def set_timezone(self, tz):
-        set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
+        distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
 
     def package_command(self, command, args=None, pkgs=None):
         if pkgs is None:
diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
index 849834eb..cff10387 100644
--- a/cloudinit/distros/freebsd.py
+++ b/cloudinit/distros/freebsd.py
@@ -264,7 +264,7 @@ class Distro(distros.Distro):
                 if 'dns-nameservers' in info:
                     nameservers.extend(info['dns-nameservers'])
                 if 'dns-search' in info:
-                    searchservers.extend(info['dns-search'])
+                    searchdomains.extend(info['dns-search'])
             else:
                 ifconfig = 'DHCP'
      
diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
index c4b02de1..45c2e658 100644
--- a/cloudinit/distros/gentoo.py
+++ b/cloudinit/distros/gentoo.py
@@ -138,7 +138,7 @@ class Distro(distros.Distro):
         return hostname
 
     def set_timezone(self, tz):
-        set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
+        distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
 
     def package_command(self, command, args=None, pkgs=None):
         if pkgs is None:
diff --git a/cloudinit/sources/DataSourceOpenStack.py b/cloudinit/sources/DataSourceOpenStack.py
index 0970d07b..221759e1 100644
--- a/cloudinit/sources/DataSourceOpenStack.py
+++ b/cloudinit/sources/DataSourceOpenStack.py
@@ -64,13 +64,13 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
 
         try:
             max_wait = int(self.ds_cfg.get("max_wait", max_wait))
-        except Exception:
-            util.logexc(LOG, "Failed to get max wait. using %s", max_wait)
+        except Exception as e:
+            LOG.debug("Failed to get max wait. using %s: %s", max_wait, e)
 
         try:
             timeout = max(0, int(self.ds_cfg.get("timeout", timeout)))
-        except Exception:
-            util.logexc(LOG, "Failed to get timeout, using %s", timeout)
+        except Exception as e:
+            LOG.debug("Failed to get timeout, using %s: %s", timeout, e)
         return (max_wait, timeout)
 
     def wait_for_metadata_service(self):
@@ -82,7 +82,7 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
         if len(filtered):
             urls = filtered
         else:
-            LOG.warn("Empty metadata url list! using default list")
+            LOG.debug("Empty metadata url list! using default list")
             urls = [DEF_MD_URL]
 
         md_urls = []
@@ -123,9 +123,9 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
                                             'version': openstack.OS_HAVANA})
         except openstack.NonReadable:
             return False
-        except (openstack.BrokenMetadata, IOError):
-            util.logexc(LOG, "Broken metadata address %s",
-                        self.metadata_address)
+        except (openstack.BrokenMetadata, IOError) as e:
+            LOG.debug("Broken metadata address %s: %s",
+                      self.metadata_address, e)
             return False
 
         user_dsmode = results.get('dsmode', None)
diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py
index 3c6bb6aa..7b27621c 100644
--- a/cloudinit/sources/helpers/openstack.py
+++ b/cloudinit/sources/helpers/openstack.py
@@ -163,10 +163,10 @@ class BaseReader(object):
 
     def _find_working_version(self, version):
         try:
-            versions_available = self._fetch_available_versions(self)
+            versions_available = self._fetch_available_versions()
         except Exception as e:
-            LOG.warn("Unable to read openstack versions from %s due to: %s",
-                     self.base_path, e)
+            LOG.debug("Unable to read openstack versions from %s due to: %s",
+                      self.base_path, e)
             versions_available = []
 
         search_versions = [version] + list(OS_VERSIONS)
@@ -178,8 +178,8 @@ class BaseReader(object):
             break
 
         if selected_version != version:
-            LOG.warn("Version '%s' not available, attempting to use"
-                     " version '%s' instead", version, selected_version)
+            LOG.debug("Version '%s' not available, attempting to use"
+                      " version '%s' instead", version, selected_version)
         return selected_version
 
     def _read_content_path(self, item):
@@ -239,7 +239,8 @@ class BaseReader(object):
                     LOG.debug("Failed reading optional path %s due"
                               " to: %s", path, e)
                 else:
-                    LOG.exception("Failed reading mandatory path %s", path)
+                    LOG.debug("Failed reading mandatory path %s due"
+                              " to: %s", path, e)
             else:
                 found = True
             if required and not found:
@@ -420,6 +421,7 @@ class MetadataReader(BaseReader):
         if self._versions is not None:
             return self.os_versions
         found = []
+        version_path = self._path_join(self.base_path, "openstack")
         content = self._path_read(version_path)
         for line in content.splitlines():
             line = line.strip()