Fixing things up to a point where "list" and "show" commands work.

wlauto/utils/misc.py

@@ -492,7 +492,7 @@ def merge_config_values(base, other):
            are treated as atomic, and not mergeable.
         s: A sequence. Anything iterable that is not a dict or
            a string (strings are considered scalars).
-        m: A key-value mapping. ``dict`` and it's derivatives.
+        m: A key-value mapping. ``dict`` and its derivatives.
         n: ``None``.
         o: A mergeable object; this is an object that implements both
           ``merge_with`` and ``merge_into`` methods.

wlauto/utils/serializer.py

@@ -51,7 +51,7 @@ import yaml as _yaml
 import dateutil.parser
 
 from wlauto.exceptions import SerializerSyntaxError
-from wlauto.utils.types import regex_type
+from wlauto.utils.types import regex_type, none_type
 from wlauto.utils.misc import isiterable
 
 
@@ -70,12 +70,14 @@ POD_TYPES = [
     tuple,
     dict,
     set,
-    basestring,
+    str,
+    unicode,
     int,
     float,
     bool,
     datetime,
-    regex_type
+    regex_type,
+    none_type,
 ]
 
 class WAJSONEncoder(_json.JSONEncoder):
@@ -257,3 +259,4 @@ def _read_pod(fh, fmt=None):
 
 def is_pod(obj):
     return type(obj) in POD_TYPES
+

wlauto/utils/types.py

@@ -169,6 +169,7 @@ list_or_bool = list_or(boolean)
 
 
 regex_type = type(re.compile(''))
+none_type = type(None)
 
 
 def regex(value):