Merge pull request #104 from tongwang/master

Fix content extraction (thanks @tongwang)
django-haystack · Dec 6, 2013 · 65ac0ab · 65ac0ab
2 parents 02e7b65 + 7c98409
commit 65ac0ab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/pysolr.py b/pysolr.py
@@ -298,9 +298,6 @@ def _send_request(self, method, path='', body=None, headers=None, files=None):
             if bytes_body is not None:
                 bytes_body = force_bytes(body)
 
-            if not 'content-type' in [key.lower() for key in headers.keys()]:
-                headers['Content-type'] = 'application/xml; charset=UTF-8'
-
             resp = requests_method(url, data=bytes_body, headers=headers, files=files,
                                    timeout=self.timeout)
         except requests.exceptions.Timeout as err:

diff --git a/start-test-solr.sh b/start-test-solr.sh
@@ -2,15 +2,15 @@
 
 set -e
 
-if [ ! -f solr-4.1.0.tgz ]; then
-    curl -O http://archive.apache.org/dist/lucene/solr/4.1.0/solr-4.1.0.tgz
+if [ ! -f solr-4.6.0.tgz ]; then
+    curl -O http://archive.apache.org/dist/lucene/solr/4.6.0/solr-4.6.0.tgz
 fi
 
-echo "Extracting Solr 4.1.0 to solr4/"
+echo "Extracting Solr 4.6.0 to solr4/"
 rm -rf solr4
 mkdir solr4
-tar -C solr4 -xf solr-4.1.0.tgz --strip-components 2 solr-4.1.0/example
-tar -C solr4 -xf solr-4.1.0.tgz --strip-components 1 solr-4.1.0/dist solr-4.1.0/contrib
+tar -C solr4 -xf solr-4.6.0.tgz --strip-components 2 solr-4.6.0/example
+tar -C solr4 -xf solr-4.6.0.tgz --strip-components 1 solr-4.6.0/dist solr-4.6.0/contrib
 
 echo "Configuring Solr"
 cd solr4

diff --git a/tests/client.py b/tests/client.py
@@ -425,7 +425,6 @@ def test_optimize(self):
         self.solr.optimize()
         self.assertEqual(len(self.solr.search('doc')), 4)
 
-    @unittest.expectedFailure
     def test_extract(self):
         fake_f = StringIO("""
             <html>