1 files changed, 10 insertions, 19 deletions
diff --git a/libs/guessit/test/test_api_unicode_literals.py b/libs/guessit/test/test_api_unicode_literals.py
index 826f7cd16..79bbbca15 100644
--- a/libs/guessit/test/test_api_unicode_literals.py
+++ b/libs/guessit/test/test_api_unicode_literals.py
@@ -3,12 +3,9 @@
 # pylint: disable=no-self-use, pointless-statement, missing-docstring, invalid-name, pointless-string-statement
 
 
-from __future__ import unicode_literals
-
 import os
 
 import pytest
-import six
 
 from ..api import guessit, properties, GuessitException
 
@@ -21,13 +18,13 @@ def test_default():
 
 
 def test_forced_unicode():
-    ret = guessit(u'Fear.and.Loathing.in.Las.Vegas.FRENCH.ENGLISH.720p.HDDVD.DTS.x264-ESiR.mkv')
-    assert ret and 'title' in ret and isinstance(ret['title'], six.text_type)
+    ret = guessit('Fear.and.Loathing.in.Las.Vegas.FRENCH.ENGLISH.720p.HDDVD.DTS.x264-ESiR.mkv')
+    assert ret and 'title' in ret and isinstance(ret['title'], str)
 
 
 def test_forced_binary():
     ret = guessit(b'Fear.and.Loathing.in.Las.Vegas.FRENCH.ENGLISH.720p.HDDVD.DTS.x264-ESiR.mkv')
-    assert ret and 'title' in ret and isinstance(ret['title'], six.binary_type)
+    assert ret and 'title' in ret and isinstance(ret['title'], bytes)
 
 
 def test_unicode_japanese():
@@ -41,24 +38,18 @@ def test_unicode_japanese_options():
 
 
 def test_forced_unicode_japanese_options():
-    ret = guessit(u"[阿维达].Avida.2006.FRENCH.DVDRiP.XViD-PROD.avi", options={"expected_title": [u"阿维达"]})
-    assert ret and 'title' in ret and ret['title'] == u"阿维达"
-
-# TODO: This doesn't compile on python 3, but should be tested on python 2.
-"""
-if six.PY2:
-    def test_forced_binary_japanese_options():
-        ret = guessit(b"[阿维达].Avida.2006.FRENCH.DVDRiP.XViD-PROD.avi", options={"expected_title": [b"阿维达"]})
-        assert ret and 'title' in ret and ret['title'] == b"阿维达"
-"""
+    ret = guessit("[阿维达].Avida.2006.FRENCH.DVDRiP.XViD-PROD.avi", options={"expected_title": ["阿维达"]})
+    assert ret and 'title' in ret and ret['title'] == "阿维达"
 
 
-def test_ensure_standard_string_class():
+def test_ensure_custom_string_class():
     class CustomStr(str):
         pass
 
-    ret = guessit(CustomStr('1080p'), options={'advanced': True})
-    assert ret and 'screen_size' in ret and not isinstance(ret['screen_size'].input_string, CustomStr)
+    ret = guessit(CustomStr('some.title.1080p.mkv'), options={'advanced': True})
+    assert ret and 'screen_size' in ret and isinstance(ret['screen_size'].input_string, CustomStr)
+    assert ret and 'title' in ret and isinstance(ret['title'].input_string, CustomStr)
+    assert ret and 'container' in ret and isinstance(ret['container'].input_string, CustomStr)
 
 
 def test_properties():