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

fix problems with py25,py3x for search index generation

Browse Source
This commit is contained in:
Takayuki Shimizukawa 2013-01-04 21:46:17 +09:00
parent 73b8622f09
commit 19a8c9e2e5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sphinx/search/__init__.py
View File

@ -8,6 +8,7 @@
:copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details. :license: BSD, see LICENSE for details.
""" """
from __future__ import with_statement
import re import re
import itertools import itertools
import cPickle as pickle import cPickle as pickle
@ -294,17 +295,17 @@ class IndexBuilder(object):
doctree.walk(visitor) doctree.walk(visitor)
stem = self.lang.stem stem = self.lang.stem
filter = self.lang.word_filter _filter = self.lang.word_filter
for word in itertools.chain(visitor.found_title_words, for word in itertools.chain(visitor.found_title_words,
self.lang.split(title)): self.lang.split(title)):
word = stem(word) word = stem(word)
if filter(word): if _filter(word):
self._title_mapping.setdefault(word, set()).add(filename) self._title_mapping.setdefault(word, set()).add(filename)
for word in visitor.found_words: for word in visitor.found_words:
word = stem(word) word = stem(word)
if word not in self._title_mapping and filter(word): if word not in self._title_mapping and _filter(word):
self._mapping.setdefault(word, set()).add(filename) self._mapping.setdefault(word, set()).add(filename)
def context_for_searchtool(self): def context_for_searchtool(self):

2
tests/test_search.py
View File

@ -36,7 +36,7 @@ def test_wordcollector():
doc['file'] = 'dummy' doc['file'] = 'dummy'
parser.parse(FILE_CONTENTS, doc) parser.parse(FILE_CONTENTS, doc)
ix = IndexBuilder(None, 'en', {}) ix = IndexBuilder(None, 'en', {}, None)
ix.feed('filename', 'title', doc) ix.feed('filename', 'title', doc)
assert 'boson' not in ix._mapping assert 'boson' not in ix._mapping
assert 'fermion' in ix._mapping assert 'fermion' in ix._mapping