Update string handling

Author: sebastinas

examples/gameexample.py

@@ -4,15 +4,6 @@
 from curtsies import FullscreenWindow, Input, FSArray
 from curtsies.fmtfuncs import red, bold, green, on_blue, yellow, on_red
 
-PY2 = sys.version_info[0] == 2
-
-
-def unicode_str(obj):
-    """Get unicode str in Python 2 or 3"""
-    if PY2:
-        return str(obj).decode('utf8')
-    return str(obj)
-
 
 class Entity:
     def __init__(self, display, x, y, speed=1):
@@ -78,7 +69,7 @@ def tick(self):
         self.turn += 1
         if self.turn % 20 == 0:
             self.player.speed = max(1, self.player.speed - 1)
-            self.player.display = on_blue(green(bold(unicode_str(self.player.speed))))
+            self.player.display = on_blue(green(bold(str(self.player.speed))))
 
     def get_array(self):
         a = FSArray(self.height, self.width)

tests/test_events.py

@@ -28,7 +28,7 @@ def test_all_values_unicode(self):
 
     def test_all_keys_bytes(self):
         for seq, e in events.CURTSIES_NAMES.items():
-            self.assertEqual(type(e), type(""))
+            self.assertEqual(type(e), str)
 
 
 class TestDecodable(unittest.TestCase):

tests/test_fmtstr.py

@@ -32,20 +32,11 @@ def skip(f):
 
 PY2 = sys.version_info[0] == 2
 
-try:
-    unicode = unicode
-except:
-    unicode = str
 
 
 def repr_without_leading_u(s):
-    assert isinstance(s, type(""))
-    if PY2:
-        r = repr(s)
-        assert r[0] == "u"
-        return r[1:]
-    else:
-        return repr(s)
+    assert isinstance(s, str)
+    return repr(s)
 
 
 class TestFmtStrInitialization(unittest.TestCase):
@@ -381,19 +372,16 @@ def test_simple_composition(self):
 class TestUnicode(unittest.TestCase):
     def test_output_type(self):
         self.assertEqual(type(str(fmtstr("hello", "blue"))), str)
-        self.assertEqual(type(unicode(fmtstr("hello", "blue"))), unicode)
 
     def test_normal_chars(self):
         fmtstr("a", "blue")
         str(fmtstr("a", "blue"))
-        unicode(fmtstr("a", "blue"))
         self.assertTrue(True)
 
     def test_funny_chars(self):
         fmtstr("⁇", "blue")
         str(Chunk("⁇", {"fg": "blue"}))
         str(fmtstr("⁇", "blue"))
-        unicode(fmtstr("⁇", "blue"))
         self.assertTrue(True)
 
     def test_right_sequence_in_py3(self):