Merge 020dfce into 7a65fc9

discogs_client/client.py

@@ -141,8 +141,14 @@ def search(self, *query, **fields):
         function are serialized into the request's query string.
         """
         if query:
-            fields['q'] = ' '.join(query)
-
+            unicode_query = []
+            for q in query:
+                try:
+                    unicode_q = q.decode('utf8')
+                except (UnicodeDecodeError, UnicodeEncodeError, AttributeError):
+                    unicode_q = q
+                unicode_query.append(unicode_q)
+            fields['q'] = ' '.join(unicode_query)
         return models.MixedPaginatedList(
             self,
             update_qs(self._base_url + '/database/search', fields),

discogs_client/tests/test_models.py

@@ -34,6 +34,13 @@ def test_search(self):
         self.assertTrue(isinstance(results[0], Artist))
         self.assertTrue(isinstance(results[1], Release))
 
+    def test_utf8_search(self):
+        uni_string = 'caf\xe9'.encode('utf8')
+        try:
+            results = self.d.search(uni_string)
+        except Exception as e:
+            self.fail('exception {} was raised'.format(e))
+
     def test_fee(self):
         fee = self.d.fee_for(20.5, currency='EUR')
         self.assertEqual(fee.currency, 'USD')