For now just remove compat.py module

Let's reduce the size of this change for now.

1 files changed, 7 insertions, 3 deletions

diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py
index 187f7026..822a020b 100644
--- a/cloudinit/net/cmdline.py
+++ b/cloudinit/net/cmdline.py
@@ -21,16 +21,20 @@ import glob
 import gzip
 import io
 import shlex
+import sys
+
+import six
 
-from . import compat
 from . import get_devicelist
 from . import sys_netdev_info
 
 from cloudinit import util
 
+PY26 = sys.version_info[0:2] == (2, 6)
+
 
 def _shlex_split(blob):
-    if compat.PY26 and isinstance(blob, compat.text_type):
+    if PY26 and isinstance(blob, six.text_type):
         # Older versions don't support unicode input
         blob = blob.encode("utf8")
     return shlex.split(blob)
@@ -42,7 +46,7 @@ def _load_shell_content(content, add_empty=False, empty_val=None):
        then add entries in to the returned dictionary for 'VAR='
        variables.  Set their value to empty_val."""
     data = {}
-    for line in shlex.split(content):
+    for line in _shlex_split(content):
         key, value = line.split("=", 1)
         if not value:
             value = empty_val