|
|
@ -34,7 +34,7 @@ import time
|
|
|
|
import uuid
|
|
|
|
import uuid
|
|
|
|
import yaml
|
|
|
|
import yaml
|
|
|
|
|
|
|
|
|
|
|
|
from collections import Mapping, MutableMapping, MutableSequence
|
|
|
|
from collections import MutableMapping, MutableSequence
|
|
|
|
import datetime
|
|
|
|
import datetime
|
|
|
|
from functools import partial
|
|
|
|
from functools import partial
|
|
|
|
from random import Random, SystemRandom, shuffle
|
|
|
|
from random import Random, SystemRandom, shuffle
|
|
|
@ -326,7 +326,7 @@ def combine(*terms, **kwargs):
|
|
|
|
|
|
|
|
|
|
|
|
dicts = []
|
|
|
|
dicts = []
|
|
|
|
for t in terms:
|
|
|
|
for t in terms:
|
|
|
|
if isinstance(t, (MutableMapping, Mapping)):
|
|
|
|
if isinstance(t, MutableMapping):
|
|
|
|
dicts.append(t)
|
|
|
|
dicts.append(t)
|
|
|
|
elif isinstance(t, list):
|
|
|
|
elif isinstance(t, list):
|
|
|
|
dicts.append(combine(*t, **kwargs))
|
|
|
|
dicts.append(combine(*t, **kwargs))
|
|
|
|