Merge "Remove six and python 2.7 full support"

5 files changed, 0 insertions, 11 deletions

diff --git a/heat/engine/attributes.py b/heat/engine/attributes.py
index f5fcdf265..07d3abbdf 100644
--- a/heat/engine/attributes.py
+++ b/heat/engine/attributes.py
@@ -17,7 +17,6 @@ from oslo_utils import strutils
 import six
 
 from heat.common.i18n import _
-from heat.common.i18n import repr_wrapper
 from heat.engine import constraints as constr
 from heat.engine import support
 
@@ -139,7 +138,6 @@ BASE_ATTRIBUTES = (SHOW_ATTR, ) = ('show', )
 ALL_ATTRIBUTES = '*'
 
 
-@repr_wrapper
 class Attributes(collections.Mapping):
     """Models a collection of Resource Attributes."""
 
diff --git a/heat/engine/dependencies.py b/heat/engine/dependencies.py
index 6015670a2..3c84b9e6d 100644
--- a/heat/engine/dependencies.py
+++ b/heat/engine/dependencies.py
@@ -18,14 +18,12 @@ import six
 
 from heat.common import exception
 from heat.common.i18n import _
-from heat.common.i18n import repr_wrapper
 
 
 class CircularDependencyException(exception.HeatException):
     msg_fmt = _("Circular Dependency Found: %(cycle)s")
 
 
-@repr_wrapper
 @six.python_2_unicode_compatible
 class Node(object):
     """A node in a dependency graph."""
@@ -172,7 +170,6 @@ class Graph(collections.defaultdict):
                 raise CircularDependencyException(cycle=six.text_type(graph))
 
 
-@repr_wrapper
 @six.python_2_unicode_compatible
 class Dependencies(object):
     """Helper class for calculating a dependency graph."""
diff --git a/heat/engine/rsrc_defn.py b/heat/engine/rsrc_defn.py
index 2933631e9..1453d5b4d 100644
--- a/heat/engine/rsrc_defn.py
+++ b/heat/engine/rsrc_defn.py
@@ -18,7 +18,6 @@ import operator
 import six
 
 from heat.common import exception
-from heat.common.i18n import repr_wrapper
 from heat.engine import function
 from heat.engine import properties
 
@@ -37,7 +36,6 @@ FIELDS = (
 )
 
 
-@repr_wrapper
 class ResourceDefinition(object):
     """A definition of a resource, independent of any template format."""
 
diff --git a/heat/engine/scheduler.py b/heat/engine/scheduler.py
index 8b7e8032c..b9408366e 100644
--- a/heat/engine/scheduler.py
+++ b/heat/engine/scheduler.py
@@ -21,7 +21,6 @@ from oslo_utils import excutils
 import six
 
 from heat.common.i18n import _
-from heat.common.i18n import repr_wrapper
 from heat.common import timeutils
 
 LOG = logging.getLogger(__name__)
@@ -365,7 +364,6 @@ def wrappertask(task):  # noqa: C901
     return wrapper
 
 
-@repr_wrapper
 class DependencyTaskGroup(object):
     """Task which manages group of subtasks that have ordering dependencies."""
 
diff --git a/heat/engine/update.py b/heat/engine/update.py
index a3cf92696..2c9dc6a47 100644
--- a/heat/engine/update.py
+++ b/heat/engine/update.py
@@ -15,7 +15,6 @@ from oslo_log import log as logging
 import six
 
 from heat.common import exception
-from heat.common.i18n import repr_wrapper
 from heat.engine import dependencies
 from heat.engine import resource
 from heat.engine import scheduler
@@ -25,7 +24,6 @@ from heat.objects import resource as resource_objects
 LOG = logging.getLogger(__name__)
 
 
-@repr_wrapper
 class StackUpdate(object):
     """A Task to perform the update of an existing stack to a new template."""