From 78b5100f8d9594afb2df9038e01ecc43ecb4abae Mon Sep 17 00:00:00 2001 From: cclauss Date: Mon, 11 Feb 2019 07:41:49 +0100 Subject: Simplify with six.text_type (#15) --- tests_feedgenerator/test_feedgenerator.py | 2 +- tests_feedgenerator/test_stringio.py | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tests_feedgenerator/test_feedgenerator.py b/tests_feedgenerator/test_feedgenerator.py index 2dfdebc..140b631 100644 --- a/tests_feedgenerator/test_feedgenerator.py +++ b/tests_feedgenerator/test_feedgenerator.py @@ -69,7 +69,7 @@ class TestFeedGenerator(unittest.TestCase): self.maxDiff = None def test_000_types(self): - ty = str if six.PY3 else unicode + ty = six.text_type for k, v in FIXT_FEED.items(): self.assertEqual(type(v), ty) for k, v in FIXT_ITEM.items(): diff --git a/tests_feedgenerator/test_stringio.py b/tests_feedgenerator/test_stringio.py index e6a1785..6689c2a 100644 --- a/tests_feedgenerator/test_stringio.py +++ b/tests_feedgenerator/test_stringio.py @@ -23,19 +23,13 @@ class TestStringIO(unittest.TestCase): # If we throw unicode into the StringIO buffer, we'll # get unicode out of it. # Thank god this is the same in Python 2 and 3. - if six.PY3: - self.assertEqual(type(S0), str) - else: - self.assertEqual(type(S0), unicode) + self.assertEqual(type(S0), six.text_type) buf = StringIO() print(S0, file=buf, end="") s1 = buf.getvalue() self.assertEqual(type(S0), type(s1)) self.assertEqual(S0, s1) - if six.PY3: - self.assertEqual(type(s1), str) - else: - self.assertEqual(type(s1), unicode) + self.assertEqual(type(s1), six.text_type) def test_002_bytes(self): buf = StringIO() -- cgit v1.2.1