IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2556 from mitya57/xapian-python3

Browse Source 
Make Xapian search work with Python 3
This commit is contained in:
Takeshi KOMIYA 2016-05-26 00:57:58 +09:00
commit 581a26168d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sphinx/websupport/search/xapiansearch.py
View File

@ -11,6 +11,8 @@
import xapian import xapian
from six import string_types
from sphinx.util.osutil import ensuredir from sphinx.util.osutil import ensuredir
from sphinx.websupport.search import BaseSearch from sphinx.websupport.search import BaseSearch
@ -73,7 +75,10 @@ class XapianSearch(BaseSearch):
results = [] results = []
for m in matches: for m in matches:
context = self.extract_context(m.document.get_data()) data = m.document.get_data()
if not isinstance(data, string_types):
data = data.decode("utf-8")
context = self.extract_context(data)
results.append((m.document.get_value(self.DOC_PATH), results.append((m.document.get_value(self.DOC_PATH),
m.document.get_value(self.DOC_TITLE), m.document.get_value(self.DOC_TITLE),
''.join(context))) ''.join(context)))