Skip to content
Snippets Groups Projects
Commit fbd219ae authored by Conor Finn's avatar Conor Finn
Browse files

RE #27722 Replace six.text_types

parent 7026cfae
No related branches found
No related tags found
No related merge requests found
......@@ -109,7 +109,7 @@ class ConfigServiceTest(unittest.TestCase):
def test_appending_paths(self):
new_path_list = self._setup_test_areas()
try:
config.appendDataSearchDir(six.text_type(new_path_list[0]))
config.appendDataSearchDir(str(new_path_list[0]))
updated_paths = config.getDataSearchDirs()
finally:
self._clean_up_test_areas()
......
......@@ -24,7 +24,7 @@ class UnitLabelTest(unittest.TestCase):
def test_utf8_is_converted_to_unicode_object(self):
tof = UnitFactory.Instance().create("TOF")
unit_lbl = tof.symbol()
self.assertTrue(isinstance(unit_lbl.utf8(), six.text_type))
self.assertTrue(isinstance(unit_lbl.utf8(), str))
self.assertEqual(u"\u03bcs", unit_lbl.utf8())
self.assertEqual("\mu s", unit_lbl.latex())
......@@ -36,7 +36,7 @@ class UnitLabelTest(unittest.TestCase):
def test_unicode_function_produces_unicode_string_from_label_py2(self):
if sys.version_info[0] < 3:
label = UnitLabel("MyLabel", u"\u03bcs","\mu s")
self.assertTrue(isinstance(unicode(label), six.text_type))
self.assertTrue(isinstance(unicode(label), str))
self.assertEqual(u"\u03bcs", unicode(label))
else:
pass
......
......@@ -309,7 +309,7 @@ class IOmodule(object):
:param item: item to convert to unicode str if Python 2 str
:returns: laundered item
"""
if isinstance(item, six.text_type):
if isinstance(item, str):
return item.encode('utf-8')
else:
return item
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment