Fix #20: Remove search query normalization.

tkem · Mar 25, 2015 · 562c64a · 562c64a
1 parent 73fe9c9
commit 562c64a
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/mopidy_internetarchive/library.py b/mopidy_internetarchive/library.py
@@ -179,13 +179,11 @@ def search(self, query=None, uris=None, exact=False):
             return self.find_exact(query, uris)
         try:
             terms = []
-            for field, value in (query.iteritems() if query else []):
+            for field, values in (query.iteritems() if query else []):
                 if field not in QUERY_MAPPING:
                     return None  # no result if unmapped field
-                elif isinstance(value, basestring):
-                    terms.append((QUERY_MAPPING[field], value))
                 else:
-                    terms.extend((QUERY_MAPPING[field], v) for v in value)
+                    terms.extend((QUERY_MAPPING[field], v) for v in values)
             if uris:
                 urisplit = uritools.urisplit
                 ids = filter(None, (urisplit(uri).path for uri in uris))
@@ -198,13 +196,11 @@ def search(self, query=None, uris=None, exact=False):
     def find_exact(self, query=None, uris=None):
         try:
             terms = []
-            for field, value in (query.iteritems() if query else []):
+            for field, values in (query.iteritems() if query else []):
                 if field not in QUERY_MAPPING:
                     return None  # no result if unmapped field
-                elif isinstance(value, basestring):
-                    terms.append((QUERY_MAPPING[field], value))
                 else:
-                    terms.extend((QUERY_MAPPING[field], v) for v in value)
+                    terms.extend((QUERY_MAPPING[field], v) for v in values)
             if uris:
                 urisplit = uritools.urisplit
                 ids = filter(None, (urisplit(uri).path for uri in uris))