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

---
 test/test_zero.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/test/test_zero.py b/test/test_zero.py
index 623a7801b..78290b6ba 100644
--- a/test/test_zero.py
+++ b/test/test_zero.py
@@ -2,8 +2,7 @@
 
 """Tests for the 'zero' 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.helper import TestHelper
@@ -24,7 +23,7 @@ class ZeroPluginTest(unittest.TestCase, TestHelper):
 
     def test_no_patterns(self):
         tags = {
-            'comments': 'test comment',
+            'comments': u'test comment',
             'day': 13,
             'month': 3,
             'year': 2012,
@@ -32,9 +31,9 @@ class ZeroPluginTest(unittest.TestCase, TestHelper):
         z = ZeroPlugin()
         z.debug = False
         z.fields = ['comments', 'month', 'day']
-        z.patterns = {'comments': ['.'],
-                      'month': ['.'],
-                      'day': ['.']}
+        z.patterns = {'comments': [u'.'],
+                      'month': [u'.'],
+                      'day': [u'.']}
         z.write_event(None, None, tags)
         self.assertEqual(tags['comments'], None)
         self.assertEqual(tags['day'], None)
@@ -45,11 +44,11 @@ class ZeroPluginTest(unittest.TestCase, TestHelper):
         z = ZeroPlugin()
         z.debug = False
         z.fields = ['comments', 'year']
-        z.patterns = {'comments': 'eac lame'.split(),
-                      'year': '2098 2099'.split()}
+        z.patterns = {'comments': u'eac lame'.split(),
+                      'year': u'2098 2099'.split()}
 
         tags = {
-            'comments': 'from lame collection, ripped by eac',
+            'comments': u'from lame collection, ripped by eac',
             'year': 2012,
         }
         z.write_event(None, None, tags)
@@ -97,7 +96,7 @@ class ZeroPluginTest(unittest.TestCase, TestHelper):
         self.assertEqual(2000, mediafile.year)
 
         config['zero'] = {
-            'fields': ['year'],
+            'fields': [u'year'],
             'update_database': True,
         }
         self.load_plugins('zero')
@@ -114,7 +113,7 @@ class ZeroPluginTest(unittest.TestCase, TestHelper):
         mediafile = MediaFile(item.path)
         self.assertNotEqual(0, len(mediafile.images))
 
-        config['zero'] = {'fields': ['images']}
+        config['zero'] = {'fields': [u'images']}
         self.load_plugins('zero')
 
         item.write()