From 536aea83e9467d09d73b055723195297161bb8d5 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@gmail.com>
Date: Sun, 7 Apr 2013 00:20:26 +0200
Subject: [PATCH 1/2] Update dependency to latest mutagen version

Mutagen 0.20 has a bug when querying bitrate of Musepack files. Let's make life
easier on everyone and make sure they have up to date version. As a bonus
mediafile tests don't fail with 0.21
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 09d95968a..8e1b6efe6 100755
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@ setup(name='beets',
       },
 
       install_requires=[
-          'mutagen>=1.20',
+          'mutagen>=1.21',
           'munkres',
           'unidecode',
           'musicbrainzngs>=0.3',

From 1666f883e3f6a497971b484c9ba875df2f6693a2 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@gmail.com>
Date: Sun, 7 Apr 2013 01:32:47 +0200
Subject: [PATCH 2/2] Fix python namespaces for test runs

We need to make sure we don't use namespaced versions that are already installed
on the system but rather use local version from current sources
---
 test/testall.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/testall.py b/test/testall.py
index f0ed0b857..c91deba55 100755
--- a/test/testall.py
+++ b/test/testall.py
@@ -24,6 +24,13 @@ pkgpath = os.path.dirname(__file__) or '.'
 sys.path.append(pkgpath)
 os.chdir(pkgpath)
 
+# Make sure we use local version of beetsplug and not system namespaced version
+# for tests
+try:
+    del sys.modules["beetsplug"]
+except KeyError:
+    pass
+
 def suite():
     s = unittest.TestSuite()
     # Get the suite() of every module in this directory beginning with