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 /cloudinit/config/cc_rsyslog.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 'cloudinit/config/cc_rsyslog.py')
| -rw-r--r-- | cloudinit/config/cc_rsyslog.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cloudinit/config/cc_rsyslog.py b/cloudinit/config/cc_rsyslog.py index ff211f65..5df0137d 100644 --- a/cloudinit/config/cc_rsyslog.py +++ b/cloudinit/config/cc_rsyslog.py @@ -180,7 +180,6 @@ config entries. Legacy to new mappings are as follows: import os import re -import six from cloudinit import log as logging from cloudinit import util @@ -233,9 +232,9 @@ def load_config(cfg): fillup = ( (KEYNAME_CONFIGS, [], list), - (KEYNAME_DIR, DEF_DIR, six.string_types), - (KEYNAME_FILENAME, DEF_FILENAME, six.string_types), - (KEYNAME_RELOAD, DEF_RELOAD, six.string_types + (list,)), + (KEYNAME_DIR, DEF_DIR, str), + (KEYNAME_FILENAME, DEF_FILENAME, str), + (KEYNAME_RELOAD, DEF_RELOAD, (str, list)), (KEYNAME_REMOTES, DEF_REMOTES, dict)) for key, default, vtypes in fillup: |