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

Merged in ngoldbaum/sphinx/stable (pull request #285)

Browse Source 
Test for subclasses of docutils node types when screening searchindex
This commit is contained in:
Takayuki Shimizukawa 2014-09-23 16:50:55 +09:00
commit cae58ac81e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sphinx/search/__init__.py
View File

@ -143,9 +143,10 @@ class WordCollector(NodeVisitor):
self.lang = lang self.lang = lang
def dispatch_visit(self, node): def dispatch_visit(self, node):
if node.__class__ is comment: nodetype = type(node)
if issubclass(nodetype, comment):
raise SkipNode raise SkipNode
if node.__class__ is raw: if issubclass(nodetype, raw):
# Some people might put content in raw HTML that should be searched, # Some people might put content in raw HTML that should be searched,
# so we just amateurishly strip HTML tags and index the remaining # so we just amateurishly strip HTML tags and index the remaining
# content # content
@ -154,9 +155,9 @@ class WordCollector(NodeVisitor):
nodetext = re.sub(r'<[^<]+?>', '', nodetext) nodetext = re.sub(r'<[^<]+?>', '', nodetext)
self.found_words.extend(self.lang.split(nodetext)) self.found_words.extend(self.lang.split(nodetext))
raise SkipNode raise SkipNode
if node.__class__ is Text: if issubclass(nodetype, Text):
self.found_words.extend(self.lang.split(node.astext())) self.found_words.extend(self.lang.split(node.astext()))
elif node.__class__ is title: elif issubclass(nodetype, title):
self.found_title_words.extend(self.lang.split(node.astext())) self.found_title_words.extend(self.lang.split(node.astext()))