From 685972bbc59cc32a2d1bebb678842f882733c7d5 Mon Sep 17 00:00:00 2001
From: Philippe Mongeau <ph.mongeau@gmail.com>
Date: Sun, 10 Mar 2013 20:26:45 -0400
Subject: [PATCH] update query tests fix escape colons in the query term

---
 beets/library.py   |  2 +-
 test/test_query.py | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/beets/library.py b/beets/library.py
index 1bab392e6..b17538f5a 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -612,7 +612,7 @@ class CollectionQuery(Query):
 
         if match:
             key = match.group(1)
-            term = match.group(2)
+            term = match.group(2).replace('\:', ':')
             for p, q in cls.prefixes.items():
                 if term.startswith(p):
                     return (key, term[len(p):], q)
diff --git a/test/test_query.py b/test/test_query.py
index 8c7378518..3895ba623 100644
--- a/test/test_query.py
+++ b/test/test_query.py
@@ -27,37 +27,37 @@ some_item = _common.item()
 class QueryParseTest(unittest.TestCase):
     def test_one_basic_term(self):
         q = 'test'
-        r = (None, 'test', False)
+        r = (None, 'test', None)
         self.assertEqual(pqp(q), r)
 
     def test_one_keyed_term(self):
         q = 'test:val'
-        r = ('test', 'val', False)
+        r = ('test', 'val', None)
         self.assertEqual(pqp(q), r)
 
     def test_colon_at_end(self):
         q = 'test:'
-        r = (None, 'test:', False)
+        r = (None, 'test:', None)
         self.assertEqual(pqp(q), r)
 
     def test_one_basic_regexp(self):
         q = r':regexp'
-        r = (None, 'regexp', True)
+        r = (None, 'regexp', beets.library.RegexpQuery)
         self.assertEqual(pqp(q), r)
 
     def test_keyed_regexp(self):
         q = r'test::regexp'
-        r = ('test', 'regexp', True)
+        r = ('test', 'regexp', beets.library.RegexpQuery)
         self.assertEqual(pqp(q), r)
 
     def test_escaped_colon(self):
         q = r'test\:val'
-        r = (None, 'test:val', False)
+        r = (None, 'test:val', None)
         self.assertEqual(pqp(q), r)
 
     def test_escaped_colon_in_regexp(self):
         q = r':test\:regexp'
-        r = (None, 'test:regexp', True)
+        r = (None, 'test:regexp', beets.library.RegexpQuery)
         self.assertEqual(pqp(q), r)
 
 class AnySubstringQueryTest(unittest.TestCase):