From 880d9fc2f9c62abf19b1506595aa81e5417dea45 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@gmail.com>
Date: Thu, 19 May 2016 14:13:07 -0700
Subject: Adjust net module to be more isolated

This allows it to be used outside of cloudinit
more easily in the future.
---
 cloudinit/util.py | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'cloudinit/util.py')

diff --git a/cloudinit/util.py b/cloudinit/util.py
index 7562b97a..2bec476e 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -37,7 +37,6 @@ import pwd
 import random
 import re
 import shutil
-import shlex
 import socket
 import stat
 import string
@@ -82,7 +81,6 @@ CONTAINER_TESTS = (['systemd-detect-virt', '--quiet', '--container'],
                    ['lxc-is-container'])
 
 PROC_CMDLINE = None
-PY26 = sys.version_info[0:2] == (2, 6)
 
 
 def decode_binary(blob, encoding='utf-8'):
@@ -1202,13 +1200,6 @@ def load_file(fname, read_cb=None, quiet=False, decode=True):
         return contents
 
 
-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)
-
-
 def get_cmdline():
     if 'DEBUG_PROC_CMDLINE' in os.environ:
         return os.environ["DEBUG_PROC_CMDLINE"]
-- 
cgit v1.2.3