Merge branch '1.7'

17 files changed, 18 insertions, 15 deletions

diff --git a/CHANGES b/CHANGES
index 9032dc3d2..1f412d1cf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -120,6 +120,8 @@ Features added
 Bugs fixed
 ----------
 
+* #4924: html search: Upper characters problem in any other languages
+
 Testing
 --------
 
diff --git a/setup.cfg b/setup.cfg
index ac4dafdbc..091b59bbd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -51,6 +51,7 @@ follow_imports = skip
 incremental = True
 check_untyped_defs = True
 warn_unused_ignores = True
+strict_optional = False
 
 [tool:pytest]
 filterwarnings =
diff --git a/sphinx/ext/inheritance_diagram.py b/sphinx/ext/inheritance_diagram.py
index 6f8256662..14593ac99 100644
--- a/sphinx/ext/inheritance_diagram.py
+++ b/sphinx/ext/inheritance_diagram.py
@@ -239,7 +239,7 @@ class InheritanceGraph(object):
     def get_all_class_names(self):
         # type: () -> List[unicode]
         """Get all of the class names involved in the graph."""
-        return [fullname for (_, fullname, _, _) in self.class_info]  # type: ignore
+        return [fullname for (_, fullname, _, _) in self.class_info]
 
     # These are the default attrs for graphviz
     default_graph_attrs = {
diff --git a/sphinx/search/da.py b/sphinx/search/da.py
index 26ac428fe..eb7394b5e 100644
--- a/sphinx/search/da.py
+++ b/sphinx/search/da.py
@@ -135,4 +135,4 @@ class SearchDanish(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stemWord(word)
+        return self.stemmer.stemWord(word.lower())
diff --git a/sphinx/search/es.py b/sphinx/search/es.py
index 971d0c149..6fda9caba 100644
--- a/sphinx/search/es.py
+++ b/sphinx/search/es.py
@@ -378,4 +378,4 @@ class SearchSpanish(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stemWord(word)
+        return self.stemmer.stemWord(word.lower())
diff --git a/sphinx/search/fi.py b/sphinx/search/fi.py
index b2b47781e..bf757d54a 100644
--- a/sphinx/search/fi.py
+++ b/sphinx/search/fi.py
@@ -128,4 +128,4 @@ class SearchFinnish(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stemWord(word)
+        return self.stemmer.stemWord(word.lower())
diff --git a/sphinx/search/hu.py b/sphinx/search/hu.py
index 9cdee61fe..03cbf8c29 100644
--- a/sphinx/search/hu.py
+++ b/sphinx/search/hu.py
@@ -242,4 +242,4 @@ class SearchHungarian(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stemWord(word)
+        return self.stemmer.stemWord(word.lower())
diff --git a/sphinx/search/it.py b/sphinx/search/it.py
index db86e386e..860ab9325 100644
--- a/sphinx/search/it.py
+++ b/sphinx/search/it.py
@@ -331,4 +331,4 @@ class SearchItalian(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stemWord(word)
+        return self.stemmer.stemWord(word.lower())
diff --git a/sphinx/search/nl.py b/sphinx/search/nl.py
index 49003d2d1..de4fd13ec 100644
--- a/sphinx/search/nl.py
+++ b/sphinx/search/nl.py
@@ -142,4 +142,4 @@ class SearchDutch(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stemWord(word)
+        return self.stemmer.stemWord(word.lower())
diff --git a/sphinx/search/no.py b/sphinx/search/no.py
index 7f5a73858..81876bcdd 100644
--- a/sphinx/search/no.py
+++ b/sphinx/search/no.py
@@ -217,4 +217,4 @@ class SearchNorwegian(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stemWord(word)
+        return self.stemmer.stemWord(word.lower())
diff --git a/sphinx/search/pt.py b/sphinx/search/pt.py
index 44c7e2118..9afe80870 100644
--- a/sphinx/search/pt.py
+++ b/sphinx/search/pt.py
@@ -277,4 +277,4 @@ class SearchPortuguese(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stemWord(word)
+        return self.stemmer.stemWord(word.lower())
diff --git a/sphinx/search/ro.py b/sphinx/search/ro.py
index b4beced2d..69d6edd8e 100644
--- a/sphinx/search/ro.py
+++ b/sphinx/search/ro.py
@@ -36,4 +36,4 @@ class SearchRomanian(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stemWord(word)
+        return self.stemmer.stemWord(word.lower())
diff --git a/sphinx/search/ru.py b/sphinx/search/ru.py
index b628b9866..cc189a953 100644
--- a/sphinx/search/ru.py
+++ b/sphinx/search/ru.py
@@ -266,4 +266,4 @@ class SearchRussian(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stemWord(word)
+        return self.stemmer.stemWord(word.lower())
diff --git a/sphinx/search/sv.py b/sphinx/search/sv.py
index 953ae94b5..fdb64685e 100644
--- a/sphinx/search/sv.py
+++ b/sphinx/search/sv.py
@@ -154,4 +154,4 @@ class SearchSwedish(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stemWord(word)
+        return self.stemmer.stemWord(word.lower())
diff --git a/sphinx/search/tr.py b/sphinx/search/tr.py
index 4ce42dd76..1b8a0f94f 100644
--- a/sphinx/search/tr.py
+++ b/sphinx/search/tr.py
@@ -36,4 +36,4 @@ class SearchTurkish(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stemWord(word)
+        return self.stemmer.stemWord(word.lower())
diff --git a/sphinx/search/zh.py b/sphinx/search/zh.py
index 2301e1103..6c5b65d6b 100644
--- a/sphinx/search/zh.py
+++ b/sphinx/search/zh.py
@@ -259,4 +259,4 @@ class SearchChinese(SearchLanguage):
 
     def stem(self, word):
         # type: (unicode) -> unicode
-        return self.stemmer.stem(word)
+        return self.stemmer.stem(word.lower())
diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py
index eebc70def..c54179227 100644
--- a/sphinx/setup_command.py
+++ b/sphinx/setup_command.py
@@ -16,7 +16,7 @@ from __future__ import print_function
 import os
 import sys
 from distutils.cmd import Command
-from distutils.errors import DistutilsOptionError, DistutilsExecError  # type: ignore
+from distutils.errors import DistutilsOptionError, DistutilsExecError
 
 from six import StringIO, string_types