diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2019-03-04 18:21:59 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-03-04 18:21:59 +0000 |
| commit | edf052c3196139169ecbfe98049c278f4babc8ca (patch) | |
| tree | ab2221815bfce6b5f30ff9ee05f0e760c3eb54fb /cloudinit/util.py | |
| parent | eee0e09ead3d11c32e8888d13d164810ee5f19d6 (diff) | |
| download | vyos-cloud-init-edf052c3196139169ecbfe98049c278f4babc8ca.tar.gz vyos-cloud-init-edf052c3196139169ecbfe98049c278f4babc8ca.zip | |
drop Python 2.6 support and our NIH version detection
- Remove the last few places that use `if PY26`
- Replace our Python version detection logic with six's (which we were
already using in most places)
Diffstat (limited to 'cloudinit/util.py')
| -rw-r--r-- | cloudinit/util.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index e5403f7d..a192091f 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -72,7 +72,6 @@ CONTAINER_TESTS = (['systemd-detect-virt', '--quiet', '--container'], PROC_CMDLINE = None _LSB_RELEASE = {} -PY26 = sys.version_info[0:2] == (2, 6) def get_architecture(target=None): @@ -2815,9 +2814,6 @@ def load_shell_content(content, add_empty=False, empty_val=None): variables. Set their value to empty_val.""" def _shlex_split(blob): - if PY26 and isinstance(blob, six.text_type): - # Older versions don't support unicode input - blob = blob.encode("utf8") return shlex.split(blob, comments=True) data = {} |