From 8c4fd886931abcf2cc8627a47463907d655b35c3 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <oddbloke@ubuntu.com>
Date: Tue, 21 Jan 2020 17:15:30 -0500
Subject: Start removing dependency on six (#178)

* url_helper: drop six

* url_helper: sort imports

* log: drop six

* log: sort imports

* handlers/__init__: drop six

* handlers/__init__: sort imports

* user_data: drop six

* user_data: sort imports

* sources/__init__: drop six

* sources/__init__: sort imports

* DataSourceOVF: drop six

* DataSourceOVF: sort imports

* sources/helpers/openstack: drop six

* sources/helpers/openstack: sort imports

* mergers/m_str: drop six

This also allowed simplification of the logic, as we will never
encounter a non-string text type.

* type_utils: drop six

* mergers/m_dict: drop six

* mergers/m_list: drop six

* cmd/query: drop six

* mergers/__init__: drop six

* net/cmdline: drop six

* reporting/handlers: drop six

* reporting/handlers: sort imports
---
 cloudinit/cmd/query.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'cloudinit/cmd/query.py')

diff --git a/cloudinit/cmd/query.py b/cloudinit/cmd/query.py
index 1d888b9d..e3db8679 100644
--- a/cloudinit/cmd/query.py
+++ b/cloudinit/cmd/query.py
@@ -5,7 +5,6 @@
 import argparse
 from errno import EACCES
 import os
-import six
 import sys
 
 from cloudinit.handlers.jinja_template import (
@@ -149,7 +148,7 @@ def handle_args(name, args):
             response = '\n'.join(sorted(response.keys()))
     elif args.list_keys:
         response = '\n'.join(sorted(response.keys()))
-    if not isinstance(response, six.string_types):
+    if not isinstance(response, str):
         response = util.json_dumps(response)
     print(response)
     return 0
-- 
cgit v1.2.3