From a627fd45d5b07d6e4dd30adb979cff071f74d816 Mon Sep 17 00:00:00 2001
From: Peter Kessen <p.kessen@kessen-peter.de>
Date: Tue, 23 Feb 2016 07:37:23 +0100
Subject: [PATCH] Removed unicode_literals from test_the

---
 test/test_the.py | 66 ++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/test/test_the.py b/test/test_the.py
index 9cfb34d63..d63faad57 100644
--- a/test/test_the.py
+++ b/test/test_the.py
@@ -2,8 +2,7 @@
 
 """Tests for the 'the' plugin"""
 
-from __future__ import (division, absolute_import, print_function,
-                        unicode_literals)
+from __future__ import (division, absolute_import, print_function)
 
 from test._common import unittest
 from test import _common
@@ -14,51 +13,52 @@ from beetsplug.the import ThePlugin, PATTERN_A, PATTERN_THE, FORMAT
 class ThePluginTest(_common.TestCase):
 
     def test_unthe_with_default_patterns(self):
-        self.assertEqual(ThePlugin().unthe('', PATTERN_THE), '')
-        self.assertEqual(ThePlugin().unthe('The Something', PATTERN_THE),
-                         'Something, The')
-        self.assertEqual(ThePlugin().unthe('The The', PATTERN_THE),
-                         'The, The')
-        self.assertEqual(ThePlugin().unthe('The    The', PATTERN_THE),
-                         'The, The')
-        self.assertEqual(ThePlugin().unthe('The   The   X', PATTERN_THE),
-                         'The   X, The')
-        self.assertEqual(ThePlugin().unthe('the The', PATTERN_THE),
-                         'The, the')
-        self.assertEqual(ThePlugin().unthe('Protected The', PATTERN_THE),
-                         'Protected The')
-        self.assertEqual(ThePlugin().unthe('A Boy', PATTERN_A),
-                         'Boy, A')
-        self.assertEqual(ThePlugin().unthe('a girl', PATTERN_A),
-                         'girl, a')
-        self.assertEqual(ThePlugin().unthe('An Apple', PATTERN_A),
-                         'Apple, An')
-        self.assertEqual(ThePlugin().unthe('An A Thing', PATTERN_A),
-                         'A Thing, An')
-        self.assertEqual(ThePlugin().unthe('the An Arse', PATTERN_A),
-                         'the An Arse')
+        self.assertEqual(ThePlugin().unthe(u'', PATTERN_THE), '')
+        self.assertEqual(ThePlugin().unthe(u'The Something', PATTERN_THE),
+                         u'Something, The')
+        self.assertEqual(ThePlugin().unthe(u'The The', PATTERN_THE),
+                         u'The, The')
+        self.assertEqual(ThePlugin().unthe(u'The    The', PATTERN_THE),
+                         u'The, The')
+        self.assertEqual(ThePlugin().unthe(u'The   The   X', PATTERN_THE),
+                         u'The   X, The')
+        self.assertEqual(ThePlugin().unthe(u'the The', PATTERN_THE),
+                         u'The, the')
+        self.assertEqual(ThePlugin().unthe(u'Protected The', PATTERN_THE),
+                         u'Protected The')
+        self.assertEqual(ThePlugin().unthe(u'A Boy', PATTERN_A),
+                         u'Boy, A')
+        self.assertEqual(ThePlugin().unthe(u'a girl', PATTERN_A),
+                         u'girl, a')
+        self.assertEqual(ThePlugin().unthe(u'An Apple', PATTERN_A),
+                         u'Apple, An')
+        self.assertEqual(ThePlugin().unthe(u'An A Thing', PATTERN_A),
+                         u'A Thing, An')
+        self.assertEqual(ThePlugin().unthe(u'the An Arse', PATTERN_A),
+                         u'the An Arse')
 
     def test_unthe_with_strip(self):
         config['the']['strip'] = True
-        self.assertEqual(ThePlugin().unthe('The Something', PATTERN_THE),
-                         'Something')
-        self.assertEqual(ThePlugin().unthe('An A', PATTERN_A), 'A')
+        self.assertEqual(ThePlugin().unthe(u'The Something', PATTERN_THE),
+                         u'Something')
+        self.assertEqual(ThePlugin().unthe(u'An A', PATTERN_A), u'A')
 
     def test_template_function_with_defaults(self):
         ThePlugin().patterns = [PATTERN_THE, PATTERN_A]
-        self.assertEqual(ThePlugin().the_template_func('The The'), 'The, The')
-        self.assertEqual(ThePlugin().the_template_func('An A'), 'A, An')
+        self.assertEqual(ThePlugin().the_template_func(u'The The'),
+                         u'The, The')
+        self.assertEqual(ThePlugin().the_template_func(u'An A'), u'A, An')
 
     def test_custom_pattern(self):
         config['the']['patterns'] = [u'^test\s']
         config['the']['format'] = FORMAT
-        self.assertEqual(ThePlugin().the_template_func('test passed'),
-                         'passed, test')
+        self.assertEqual(ThePlugin().the_template_func(u'test passed'),
+                         u'passed, test')
 
     def test_custom_format(self):
         config['the']['patterns'] = [PATTERN_THE, PATTERN_A]
         config['the']['format'] = u'{1} ({0})'
-        self.assertEqual(ThePlugin().the_template_func('The A'), 'The (A)')
+        self.assertEqual(ThePlugin().the_template_func(u'The A'), u'The (A)')
 
 
 def suite():