Merge "Remove six and python 2.7 full support"

10 files changed, 16 insertions, 29 deletions

diff --git a/heat/engine/resources/openstack/heat/structured_config.py b/heat/engine/resources/openstack/heat/structured_config.py
index 836e2ef92..a23bfceda 100644
--- a/heat/engine/resources/openstack/heat/structured_config.py
+++ b/heat/engine/resources/openstack/heat/structured_config.py
@@ -15,8 +15,6 @@ import collections
 import copy
 import functools
 
-import six
-
 from heat.common import exception
 from heat.common.i18n import _
 from heat.engine import constraints
@@ -150,8 +148,8 @@ class StructuredDeployment(sd.SoftwareDeployment):
     def get_input_key_arg(snippet, input_key):
         if len(snippet) != 1:
             return None
-        fn_name, fn_arg = next(six.iteritems(snippet))
-        if (fn_name == input_key and isinstance(fn_arg, six.string_types)):
+        fn_name, fn_arg = next(iter(snippet.items()))
+        if (fn_name == input_key and isinstance(fn_arg, str)):
             return fn_arg
 
     @staticmethod
@@ -175,8 +173,8 @@ class StructuredDeployment(sd.SoftwareDeployment):
                                                                 check_input_val
                                                                 )
 
-            return dict((k, parse(v)) for k, v in six.iteritems(snippet))
-        elif (not isinstance(snippet, six.string_types) and
+            return dict((k, parse(v)) for k, v in snippet.items())
+        elif (not isinstance(snippet, str) and
               isinstance(snippet, collections.Iterable)):
             return [parse(v) for v in snippet]
         else:
diff --git a/heat/engine/resources/openstack/heat/swiftsignal.py b/heat/engine/resources/openstack/heat/swiftsignal.py
index d8c33296b..dc78b9310 100644
--- a/heat/engine/resources/openstack/heat/swiftsignal.py
+++ b/heat/engine/resources/openstack/heat/swiftsignal.py
@@ -14,8 +14,7 @@
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
-import six
-from six.moves.urllib import parse
+from urllib import parse
 
 from heat.common import exception
 from heat.common.i18n import _
@@ -344,7 +343,7 @@ class SwiftSignal(resource.Resource):
 
     def _resolve_attribute(self, key):
         if key == self.DATA:
-            return six.text_type(jsonutils.dumps(self.get_data()))
+            return str(jsonutils.dumps(self.get_data()))
 
 
 def resource_mapping():
diff --git a/heat/engine/resources/openstack/heat/test_resource.py b/heat/engine/resources/openstack/heat/test_resource.py
index 3af8b46b0..dc8b6234b 100644
--- a/heat/engine/resources/openstack/heat/test_resource.py
+++ b/heat/engine/resources/openstack/heat/test_resource.py
@@ -14,7 +14,6 @@
 import datetime
 import eventlet
 from oslo_utils import timeutils
-import six
 
 from heat.common.i18n import _
 from heat.engine import attributes
@@ -218,12 +217,12 @@ class TestResource(resource.Resource):
                     obj.get(entity_id)
                 except Exception as exc:
                     LOG.debug('%s.%s(%s) %s' % (client_name, self.entity,
-                                                entity_id, six.text_type(exc)))
+                                                entity_id, str(exc)))
             else:
                 # just sleep some more
                 eventlet.sleep(1)
 
-        if isinstance(started_at, six.string_types):
+        if isinstance(started_at, str):
             started_at = timeutils.parse_isotime(started_at)
 
         started_at = timeutils.normalize_time(started_at)
diff --git a/heat/engine/resources/openstack/heat/wait_condition.py b/heat/engine/resources/openstack/heat/wait_condition.py
index bea9c38d8..db8ff844e 100644
--- a/heat/engine/resources/openstack/heat/wait_condition.py
+++ b/heat/engine/resources/openstack/heat/wait_condition.py
@@ -14,7 +14,6 @@
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
-import six
 
 from heat.common.i18n import _
 from heat.engine import attributes
@@ -158,7 +157,7 @@ class HeatWaitCondition(resource.Resource):
                          'key': key,
                          'res': res})
 
-            return six.text_type(jsonutils.dumps(res))
+            return str(jsonutils.dumps(res))
 
 
 def resource_mapping():
diff --git a/heat/engine/resources/openstack/keystone/region.py b/heat/engine/resources/openstack/keystone/region.py
index b52cf009d..63ed6b3e6 100644
--- a/heat/engine/resources/openstack/keystone/region.py
+++ b/heat/engine/resources/openstack/keystone/region.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from six.moves.urllib import parse
+from urllib import parse
 
 from heat.common.i18n import _
 from heat.engine import constraints
diff --git a/heat/engine/resources/openstack/magnum/bay.py b/heat/engine/resources/openstack/magnum/bay.py
index fd2ed643c..1837dd552 100644
--- a/heat/engine/resources/openstack/magnum/bay.py
+++ b/heat/engine/resources/openstack/magnum/bay.py
@@ -11,8 +11,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 from heat.common import exception
 from heat.common.i18n import _
 from heat.engine import constraints
@@ -129,7 +127,7 @@ class Bay(resource.Resource):
     def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         if prop_diff:
             patch = [{'op': 'replace', 'path': '/' + k, 'value': v}
-                     for k, v in six.iteritems(prop_diff)]
+                     for k, v in prop_diff.items()]
             self.client().bays.update(self.resource_id, patch)
             return self.resource_id
 
diff --git a/heat/engine/resources/openstack/magnum/cluster.py b/heat/engine/resources/openstack/magnum/cluster.py
index 58e465d3e..ac2ae5dc9 100644
--- a/heat/engine/resources/openstack/magnum/cluster.py
+++ b/heat/engine/resources/openstack/magnum/cluster.py
@@ -11,8 +11,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 from heat.common import exception
 from heat.common.i18n import _
 from heat.engine import attributes
@@ -218,7 +216,7 @@ class Cluster(resource.Resource):
     def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         if prop_diff:
             patch = [{'op': 'replace', 'path': '/' + k, 'value': v}
-                     for k, v in six.iteritems(prop_diff)]
+                     for k, v in prop_diff.items()]
             self.client().clusters.update(self.resource_id, patch)
             return self.resource_id
 
diff --git a/heat/engine/resources/openstack/magnum/cluster_template.py b/heat/engine/resources/openstack/magnum/cluster_template.py
index d394492b3..d51162e54 100644
--- a/heat/engine/resources/openstack/magnum/cluster_template.py
+++ b/heat/engine/resources/openstack/magnum/cluster_template.py
@@ -11,8 +11,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
 from heat.common import exception
 from heat.common.i18n import _
 from heat.engine import constraints
@@ -290,7 +288,7 @@ class ClusterTemplate(resource.Resource):
     def handle_update(self, json_snippet, tmpl_diff, prop_diff):
         if prop_diff:
             patch = [{'op': 'replace', 'path': '/' + k, 'value': v}
-                     for k, v in six.iteritems(prop_diff)]
+                     for k, v in prop_diff.items()]
             self.client().cluster_templates.update(self.resource_id, patch)
             return self.resource_id
 
diff --git a/heat/engine/resources/openstack/manila/share.py b/heat/engine/resources/openstack/manila/share.py
index ce89f7863..17b164a7c 100644
--- a/heat/engine/resources/openstack/manila/share.py
+++ b/heat/engine/resources/openstack/manila/share.py
@@ -13,7 +13,6 @@
 
 from oslo_log import log as logging
 from oslo_utils import encodeutils
-import six
 
 from heat.common import exception
 from heat.common.i18n import _
@@ -197,7 +196,7 @@ class ManilaShare(resource.Resource):
         if self.resource_id is None:
             return
         share = self._request_share()
-        return six.text_type(getattr(share, name))
+        return str(getattr(share, name))
 
     def handle_create(self):
         # Request IDs of entities from manila
@@ -345,7 +344,7 @@ class ManilaShare(resource.Resource):
         result[self.ACCESS_RULES] = []
         for rule in rules:
             result[self.ACCESS_RULES].append(
-                {(k, v) for (k, v) in six.iteritems(rule)
+                {(k, v) for (k, v) in rule.items()
                  if k in self._ACCESS_RULE_PROPERTIES})
         return result
 
diff --git a/heat/engine/resources/openstack/mistral/external_resource.py b/heat/engine/resources/openstack/mistral/external_resource.py
index 9e8f1b70e..a38e35b4e 100644
--- a/heat/engine/resources/openstack/mistral/external_resource.py
+++ b/heat/engine/resources/openstack/mistral/external_resource.py
@@ -13,7 +13,6 @@
 
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
-import six
 
 from heat.common import exception
 from heat.common.i18n import _
@@ -212,7 +211,7 @@ class MistralExternalResource(resource.Resource):
                 LOG.debug('ExternalResource id set to %(rid)s from Mistral '
                           'execution %(eid)s output' % {'eid': execution_id,
                                                         'rid': rsrc_id})
-            self.resource_id_set(six.text_type(rsrc_id)[:255])
+            self.resource_id_set(str(rsrc_id)[:255])
         return success
 
     def _resolve_attribute(self, name):