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_yum_add_repo.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_yum_add_repo.py')
| -rw-r--r-- | cloudinit/config/cc_yum_add_repo.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py index 3b354a7d..3673166a 100644 --- a/cloudinit/config/cc_yum_add_repo.py +++ b/cloudinit/config/cc_yum_add_repo.py @@ -30,13 +30,9 @@ entry, the config entry will be skipped. # any repository configuration options (see man yum.conf) """ +import io import os - -try: - from configparser import ConfigParser -except ImportError: - from ConfigParser import ConfigParser -import six +from configparser import ConfigParser from cloudinit import util @@ -57,7 +53,7 @@ def _format_repo_value(val): # Can handle 'lists' in certain cases # See: https://linux.die.net/man/5/yum.conf return "\n".join([_format_repo_value(v) for v in val]) - if not isinstance(val, six.string_types): + if not isinstance(val, str): return str(val) return val @@ -72,7 +68,7 @@ def _format_repository_config(repo_id, repo_config): # For now assume that people using this know # the format of yum and don't verify keys/values further to_be.set(repo_id, k, _format_repo_value(v)) - to_be_stream = six.StringIO() + to_be_stream = io.StringIO() to_be.write(to_be_stream) to_be_stream.seek(0) lines = to_be_stream.readlines() |