summaryrefslogtreecommitdiff
path: root/heat/tests/test_properties_group.py
diff options
context:
space:
mode:
authorHervé Beraud <hberaud@redhat.com>2019-11-20 19:37:27 +0100
committerHervé Beraud <hberaud@redhat.com>2020-04-23 14:49:12 +0200
commitd7d3dcbb505dff18dcfc964dbd5fca63085267cf (patch)
tree448e8dba7bda0431d32c280a15e813d320ade0a1 /heat/tests/test_properties_group.py
parentea89a2a08c1293ffd99c2e7b198a7b0e6842b174 (diff)
downloadheat-d7d3dcbb505dff18dcfc964dbd5fca63085267cf.tar.gz
Remove six and python 2.7 full support
Six is in use to help us to keep support for python 2.7. Since the ussuri cycle we decide to remove the python 2.7 support so we can go ahead and also remove six usage from the python code. Review process and help ----------------------- Removing six introduce a lot of changes and an huge amount of modified files To simplify reviews we decided to split changes into several patches to avoid painful reviews and avoid mistakes. To review this patch you can use the six documentation [1] to obtain help and understand choices. Additional informations ----------------------- Changes related to 'six.b(data)' [2] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ six.b [2] encode the given datas in latin-1 in python3 so I did the same things in this patch. Latin-1 is equal to iso-8859-1 [3]. This encoding is the default encoding [4] of certain descriptive HTTP headers. I suggest to keep latin-1 for the moment and to move to another encoding in a follow-up patch if needed to move to most powerful encoding (utf8). HTML4 support utf8 charset and utf8 is the default charset for HTML5 [5]. Note that this commit message is autogenerated and not necesserly contains changes related to 'six.b' [1] https://six.readthedocs.io/ [2] https://six.readthedocs.io/#six.b [3] https://docs.python.org/3/library/codecs.html#standard-encodings [4] https://www.w3schools.com/charsets/ref_html_8859.asp [5] https://www.w3schools.com/html/html_charset.asp Patch 26 of a serie of 28 patches Change-Id: I861e30278e66b680cd64ef659ff889414d4e55fb
Diffstat (limited to 'heat/tests/test_properties_group.py')
-rw-r--r--heat/tests/test_properties_group.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/heat/tests/test_properties_group.py b/heat/tests/test_properties_group.py
index 86ca1b23f..535157459 100644
--- a/heat/tests/test_properties_group.py
+++ b/heat/tests/test_properties_group.py
@@ -11,7 +11,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-import six
from heat.common import exception
from heat.engine import properties_group as pg
@@ -86,7 +85,7 @@ class TestSchemaSimpleValidation(common.HeatTestCase):
if self.message is not None:
ex = self.assertRaises(exception.InvalidSchemaError,
pg.PropertiesGroup, self.schema)
- self.assertEqual(self.message, six.text_type(ex))
+ self.assertEqual(self.message, str(ex))
else:
self.assertIsInstance(pg.PropertiesGroup(self.schema),
pg.PropertiesGroup)