summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_ssh_authkey_fingerprints.py3
-rw-r--r--cloudinit/config/cc_users_groups.py3
-rw-r--r--cloudinit/safeyaml.py1
3 files changed, 4 insertions, 3 deletions
diff --git a/cloudinit/config/cc_ssh_authkey_fingerprints.py b/cloudinit/config/cc_ssh_authkey_fingerprints.py
index 2b9a6e0e..f9bdf5fc 100644
--- a/cloudinit/config/cc_ssh_authkey_fingerprints.py
+++ b/cloudinit/config/cc_ssh_authkey_fingerprints.py
@@ -95,4 +95,5 @@ def handle(name, cfg, cloud, log, _args):
(users, _groups) = distros.normalize_users_groups(cfg, cloud.distro)
for (user_name, _cfg) in users.items():
(auth_key_fn, auth_key_entries) = extract_func(user_name, cloud.paths)
- _pprint_key_entries(user_name, auth_key_fn, auth_key_entries, hash_meth)
+ _pprint_key_entries(user_name, auth_key_fn, auth_key_entries,
+ hash_meth)
diff --git a/cloudinit/config/cc_users_groups.py b/cloudinit/config/cc_users_groups.py
index 464f55c3..aa6e0579 100644
--- a/cloudinit/config/cc_users_groups.py
+++ b/cloudinit/config/cc_users_groups.py
@@ -17,14 +17,13 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from cloudinit import distros
-from cloudinit import util
from cloudinit.settings import PER_INSTANCE
frequency = PER_INSTANCE
-def handle(name, cfg, cloud, log, _args):
+def handle(name, cfg, cloud, _log, _args):
(users, groups) = distros.normalize_users_groups(cfg, cloud.distro)
for (name, members) in groups.items():
cloud.distro.create_group(name, members)
diff --git a/cloudinit/safeyaml.py b/cloudinit/safeyaml.py
index 8b4da1fa..eba5d056 100644
--- a/cloudinit/safeyaml.py
+++ b/cloudinit/safeyaml.py
@@ -27,5 +27,6 @@ _CustomSafeLoader.add_constructor(
u'tag:yaml.org,2002:python/unicode',
_CustomSafeLoader.construct_python_unicode)
+
def load(blob):
return(yaml.load(blob, Loader=_CustomSafeLoader))