Merge pull request #434 from ch2ohch2oh/enhance-select-wt

Set wt=json in _select only if the user has not set it

Author: acdha

pysolr.py

@@ -464,8 +464,8 @@ def _select(self, params, handler=None):
         :param handler: defaults to self.search_handler (fallback to 'select')
         :return:
         """
-        # specify json encoding of results
-        params["wt"] = "json"
+        # Returns json docs unless otherwise specified
+        params.setdefault("wt", "json")
         custom_handler = handler or self.search_handler
         handler = "select"
         if custom_handler:

tests/test_client.py

@@ -366,6 +366,11 @@ def test__select(self):
         self.assertEqual(len(resp_data["response"]["docs"]), 2)
         self.assertIn("nextCursorMark", resp_data)
 
+    def test__select_wt_xml(self):
+        resp_body = self.solr._select({"q": "doc", "wt": "xml"})
+        response = ElementTree.fromstring(resp_body)
+        self.assertEqual(int(response.find("result").get("numFound")), 3)
+
     def test__mlt(self):
         resp_body = self.solr._mlt({"q": "id:doc_1", "mlt.fl": "title"})
         resp_data = json.loads(resp_body)