Merge pull request #114 from manu-chroma/master

minor refactor: create utils.py

schema_salad/jsonld_context.py

@@ -18,7 +18,7 @@
 from rdflib.namespace import RDF, RDFS
 import urlparse
 import logging
-from .aslist import aslist
+from schema_salad.utils import aslist
 from typing import (cast, Any, Dict, Iterable, List, Optional, Text, Tuple,
     Union)
 from .ref_resolver import Loader, ContextType

schema_salad/makedoc.py

@@ -8,8 +8,7 @@
 from StringIO import StringIO
 import logging
 import urlparse
-from .aslist import aslist
-from .add_dictlist import add_dictlist
+from schema_salad.utils import add_dictlist, aslist
 import re
 import argparse
 from typing import cast, Any, Dict, IO, List, Optional, Set, Text, Union

schema_salad/ref_resolver.py

@@ -12,8 +12,7 @@
 from StringIO import StringIO
 
 from . import validate
-from .aslist import aslist
-from .flatten import flatten
+from schema_salad.utils import aslist, flatten
 from .sourceline import SourceLine, add_lc_filename, relname
 
 import requests

schema_salad/schema.py

@@ -1,6 +1,6 @@
 import avro
 import copy
-from .add_dictlist import add_dictlist
+from schema_salad.utils import add_dictlist, aslist, flatten
 import sys
 import pprint
 from pkg_resources import resource_stream
@@ -15,9 +15,7 @@
 from avro.schema import Names, SchemaParseException
 from . import ref_resolver
 from .ref_resolver import Loader, DocumentType
-from .flatten import flatten
 import logging
-from .aslist import aslist
 from . import jsonld_context
 from .sourceline import SourceLine, strip_dup_lineno, add_lc_filename, bullets, relname
 from typing import cast, Any, AnyStr, Dict, List, Set, Tuple, TypeVar, Union

schema_salad/flatten.py → schema_salad/utils.py

@@ -1,8 +1,23 @@
-import sys
-from typing import Any, Tuple
+from __future__ import absolute_import
+
+from typing import Any, Dict, List
+
+
+def add_dictlist(di, key, val):  # type: (Dict, Any, Any) -> None
+    if key not in di:
+        di[key] = []
+    di[key].append(val)
 
-# http://rightfootin.blogspot.com/2006/09/more-on-python-flatten.html
 
+def aslist(l):  # type: (Any) -> List
+    """Convenience function to wrap single items and lists, and return lists unchanged."""
+
+    if isinstance(l, list):
+        return l
+    else:
+        return [l]
+
+# http://rightfootin.blogspot.com/2006/09/more-on-python-flatten.html
 
 def flatten(l, ltypes=(list, tuple)):
     # type: (Any, Any) -> Any