From 6fff7a954cd46ef54f151930ab6ada1bfa2a0c67 Mon Sep 17 00:00:00 2001
From: Bruno Cauet <brunocauet@gmail.com>
Date: Mon, 19 Jan 2015 15:09:04 +0100
Subject: [PATCH] Import unicode_literals in beets.dbcore

---
 beets/dbcore/__init__.py | 2 +-
 beets/dbcore/db.py       | 7 ++++---
 beets/dbcore/query.py    | 3 ++-
 beets/dbcore/types.py    | 3 ++-
 test/test_dbcore.py      | 5 +++--
 test/test_query.py       | 3 ++-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/beets/dbcore/__init__.py b/beets/dbcore/__init__.py
index 5913c580b..100f546b5 100644
--- a/beets/dbcore/__init__.py
+++ b/beets/dbcore/__init__.py
@@ -15,7 +15,7 @@
 """DBCore is an abstract database package that forms the basis for beets'
 Library.
 """
-from __future__ import division, absolute_import, print_function
+from __future__ import absolute_import
 
 from .db import Model, Database
 from .query import Query, FieldQuery, MatchQuery, AndQuery, OrQuery
diff --git a/beets/dbcore/db.py b/beets/dbcore/db.py
index 6670d1827..6fb259607 100644
--- a/beets/dbcore/db.py
+++ b/beets/dbcore/db.py
@@ -14,7 +14,8 @@
 
 """The central Model and Database constructs for DBCore.
 """
-from __future__ import division, absolute_import, print_function
+from __future__ import (division, absolute_import, print_function,
+                        unicode_literals)
 
 import time
 import os
@@ -547,13 +548,13 @@ class Results(object):
                 'SELECT * FROM {0} WHERE entity_id=?'.format(
                     self.model_class._flex_table
                 ),
-                (row['id'],)
+                (row[b'id'],)
             )
 
         cols = dict(row)
         values = dict((k, v) for (k, v) in cols.items()
                       if not k[:4] == 'flex')
-        flex_values = dict((row['key'], row['value']) for row in flex_rows)
+        flex_values = dict((row[b'key'], row[b'value']) for row in flex_rows)
 
         # Construct the Python object
         obj = self.model_class._awaken(self.db, values, flex_values)
diff --git a/beets/dbcore/query.py b/beets/dbcore/query.py
index 3dfe30429..f615d645b 100644
--- a/beets/dbcore/query.py
+++ b/beets/dbcore/query.py
@@ -14,7 +14,8 @@
 
 """The Query type hierarchy for DBCore.
 """
-from __future__ import division, absolute_import, print_function
+from __future__ import (division, absolute_import, print_function,
+                        unicode_literals)
 
 import re
 from operator import attrgetter
diff --git a/beets/dbcore/types.py b/beets/dbcore/types.py
index 7ebd42a0a..90c1d7c2e 100644
--- a/beets/dbcore/types.py
+++ b/beets/dbcore/types.py
@@ -14,7 +14,8 @@
 
 """Representation of type information for DBCore model fields.
 """
-from __future__ import division, absolute_import, print_function
+from __future__ import (division, absolute_import, print_function,
+                        unicode_literals)
 
 from . import query
 from beets.util import str2bool
diff --git a/test/test_dbcore.py b/test/test_dbcore.py
index 836bc9a9e..5e00ec343 100644
--- a/test/test_dbcore.py
+++ b/test/test_dbcore.py
@@ -14,7 +14,8 @@
 
 """Tests for the DBCore database abstraction.
 """
-from __future__ import division, absolute_import, print_function
+from __future__ import (division, absolute_import, print_function,
+                        unicode_literals)
 
 import os
 import sqlite3
@@ -189,7 +190,7 @@ class ModelTest(unittest.TestCase):
         model.field_one = 123
         model.store()
         row = self.db._connection().execute('select * from test').fetchone()
-        self.assertEqual(row['field_one'], 123)
+        self.assertEqual(row[b'field_one'], 123)
 
     def test_retrieve_by_id(self):
         model = TestModel1()
diff --git a/test/test_query.py b/test/test_query.py
index 57e2742d9..b002e048a 100644
--- a/test/test_query.py
+++ b/test/test_query.py
@@ -14,7 +14,8 @@
 
 """Various tests for querying the library database.
 """
-from __future__ import division, absolute_import, print_function
+from __future__ import (division, absolute_import, print_function,
+                        unicode_literals)
 
 from test import _common
 from test._common import unittest