diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-14 14:16:49 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-14 14:16:49 -0400 |
| commit | 92db1b884bf34339a4536a20123c45b01c9c49ce (patch) | |
| tree | 22be0de3d0496212d26015c3b30423da9338aa5c /cloudinit/mergers/__init__.py | |
| parent | 91ccf1b55b5b79694449446b029dd7c4570517a5 (diff) | |
| parent | 72f826bff694b612d54b177635ca7e0dc83aed2f (diff) | |
| download | vyos-cloud-init-92db1b884bf34339a4536a20123c45b01c9c49ce.tar.gz vyos-cloud-init-92db1b884bf34339a4536a20123c45b01c9c49ce.zip | |
merge with trunk
Diffstat (limited to 'cloudinit/mergers/__init__.py')
| -rw-r--r-- | cloudinit/mergers/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/mergers/__init__.py b/cloudinit/mergers/__init__.py index 03aa1ee1..e13f55ac 100644 --- a/cloudinit/mergers/__init__.py +++ b/cloudinit/mergers/__init__.py @@ -18,6 +18,8 @@ import re +import six + from cloudinit import importer from cloudinit import log as logging from cloudinit import type_utils @@ -95,7 +97,7 @@ def dict_extract_mergers(config): raw_mergers = config.pop('merge_type', None) if raw_mergers is None: return parsed_mergers - if isinstance(raw_mergers, (str, basestring)): + if isinstance(raw_mergers, six.string_types): return string_extract_mergers(raw_mergers) for m in raw_mergers: if isinstance(m, (dict)): |