diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-01-21 18:02:42 -0500 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2020-01-21 16:02:42 -0700 |
| commit | bb71a9d08d25193836eda91c328760305285574e (patch) | |
| tree | 50a1f2f4a61e04255c5a8129e7a2a26d9d4cecd4 /tests/unittests/test_merging.py | |
| parent | 8c4fd886931abcf2cc8627a47463907d655b35c3 (diff) | |
| download | vyos-cloud-init-bb71a9d08d25193836eda91c328760305285574e.tar.gz vyos-cloud-init-bb71a9d08d25193836eda91c328760305285574e.zip | |
Drop most of the remaining use of six (#179)
Diffstat (limited to 'tests/unittests/test_merging.py')
| -rw-r--r-- | tests/unittests/test_merging.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/unittests/test_merging.py b/tests/unittests/test_merging.py index 3a5072c7..10871bcf 100644 --- a/tests/unittests/test_merging.py +++ b/tests/unittests/test_merging.py @@ -13,13 +13,11 @@ import glob import os import random import re -import six import string SOURCE_PAT = "source*.*yaml" EXPECTED_PAT = "expected%s.yaml" -TYPES = [dict, str, list, tuple, None] -TYPES.extend(six.integer_types) +TYPES = [dict, str, list, tuple, None, int] def _old_mergedict(src, cand): @@ -85,7 +83,7 @@ def _make_dict(current_depth, max_depth, rand): pass if t in [tuple]: base = tuple(base) - elif t in six.integer_types: + elif t in [int]: base = rand.randint(0, 2 ** 8) elif t in [str]: base = _random_str(rand) |