From cd1f79340f336adbfd0b04871b28b775bec09e07 Mon Sep 17 00:00:00 2001 From: Johnny Robeson Date: Mon, 30 May 2016 03:03:36 -0400 Subject: [PATCH] remove explicit b' from sql query dict key names --- beets/dbcore/db.py | 4 ++-- beets/ui/commands.py | 2 +- test/test_dbcore.py | 2 +- test/test_library.py | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/beets/dbcore/db.py b/beets/dbcore/db.py index 61906a08d..3f701be59 100644 --- a/beets/dbcore/db.py +++ b/beets/dbcore/db.py @@ -562,13 +562,13 @@ class Results(object): 'SELECT * FROM {0} WHERE entity_id=?'.format( self.model_class._flex_table ), - (row[b'id'],) + (row['id'],) ) cols = dict(row) values = dict((k, v) for (k, v) in cols.items() if not k[:4] == 'flex') - flex_values = dict((row[b'key'], row[b'value']) for row in flex_rows) + flex_values = dict((row['key'], row['value']) for row in flex_rows) # Construct the Python object obj = self.model_class._awaken(self.db, values, flex_values) diff --git a/beets/ui/commands.py b/beets/ui/commands.py index 3f55d864e..867a47379 100644 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -85,7 +85,7 @@ def _print_keys(query): returned row, with identation of 2 spaces. """ for row in query: - print_(' ' * 2 + row[b'key']) + print_(' ' * 2 + row['key']) def fields_func(lib, opts, args): diff --git a/test/test_dbcore.py b/test/test_dbcore.py index 2ca3a6d23..bd51aea32 100644 --- a/test/test_dbcore.py +++ b/test/test_dbcore.py @@ -214,7 +214,7 @@ class ModelTest(unittest.TestCase): model.field_one = 123 model.store() row = self.db._connection().execute('select * from test').fetchone() - self.assertEqual(row[b'field_one'], 123) + self.assertEqual(row['field_one'], 123) def test_retrieve_by_id(self): model = TestModel1() diff --git a/test/test_library.py b/test/test_library.py index 17d526675..c9e007a94 100644 --- a/test/test_library.py +++ b/test/test_library.py @@ -63,7 +63,7 @@ class StoreTest(_common.LibTestCase): self.i.store() new_year = self.lib._connection().execute( 'select year from items where ' - 'title="the title"').fetchone()[b'year'] + 'title="the title"').fetchone()['year'] self.assertEqual(new_year, 1987) def test_store_only_writes_dirty_fields(self): @@ -72,7 +72,7 @@ class StoreTest(_common.LibTestCase): self.i.store() new_genre = self.lib._connection().execute( 'select genre from items where ' - 'title="the title"').fetchone()[b'genre'] + 'title="the title"').fetchone()['genre'] self.assertEqual(new_genre, original_genre) def test_store_clears_dirty_flags(self): @@ -91,7 +91,7 @@ class AddTest(_common.TestCase): self.lib.add(self.i) new_grouping = self.lib._connection().execute( 'select grouping from items ' - 'where composer="the composer"').fetchone()[b'grouping'] + 'where composer="the composer"').fetchone()['grouping'] self.assertEqual(new_grouping, self.i.grouping) def test_library_add_path_inserts_row(self): @@ -101,7 +101,7 @@ class AddTest(_common.TestCase): self.lib.add(i) new_grouping = self.lib._connection().execute( 'select grouping from items ' - 'where composer="the composer"').fetchone()[b'grouping'] + 'where composer="the composer"').fetchone()['grouping'] self.assertEqual(new_grouping, self.i.grouping)