From d5dbaeff7ab9b0d84210e61bd07804c482ef065e Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Sun, 27 Apr 2014 13:54:32 -0700
Subject: [PATCH] lastgenre: Restore default whitelist

---
 beetsplug/lastgenre/__init__.py | 2 +-
 test/test_lastgenre.py          | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/beetsplug/lastgenre/__init__.py b/beetsplug/lastgenre/__init__.py
index 581772519..d15850d2e 100644
--- a/beetsplug/lastgenre/__init__.py
+++ b/beetsplug/lastgenre/__init__.py
@@ -121,7 +121,7 @@ class LastGenrePlugin(plugins.BeetsPlugin):
         super(LastGenrePlugin, self).__init__()
 
         self.config.add({
-            'whitelist': None,
+            'whitelist': WHITELIST,
             'min_weight': 10,
             'count': 1,
             'fallback': None,
diff --git a/test/test_lastgenre.py b/test/test_lastgenre.py
index 89fb6eec9..047773f31 100644
--- a/test/test_lastgenre.py
+++ b/test/test_lastgenre.py
@@ -15,7 +15,6 @@
 """Tests for the 'lastgenre' plugin."""
 
 import logging
-import os
 from _common import unittest
 from beetsplug import lastgenre
 from beets import config
@@ -30,7 +29,7 @@ class LastGenrePluginTest(unittest.TestCase):
     def _setup_config(self, whitelist=None, canonical=None, count=1):
         config['lastgenre']['canonical'] = canonical
         config['lastgenre']['count'] = count
-        if whitelist == '':
+        if not whitelist:  # Either None or default ('').
             config['lastgenre']['whitelist'] = whitelist
         lastGenrePlugin.setup()
         if whitelist: