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 branch '1.8'

Browse Source
This commit is contained in:
Takeshi KOMIYA 2019-01-13 22:05:13 +09:00
commit 71dd5f6a3a
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -213,6 +213,7 @@ Bugs fixed
* #5928: KeyError: 'DOCUTILSCONFIG' when running build * #5928: KeyError: 'DOCUTILSCONFIG' when running build
* #5936: LaTeX: PDF build broken by inclusion of image taller than page height * #5936: LaTeX: PDF build broken by inclusion of image taller than page height
in an admonition in an admonition
* #5231: "make html" does not read and build "po" files in "locale" dir
Testing Testing
-------- --------

3
sphinx/util/matching.py
View File

@ -10,6 +10,8 @@
import re import re
from sphinx.util.osutil import canon_path
if False: if False:
# For type annotation # For type annotation
from typing import Callable, Dict, List, Match, Pattern # NOQA from typing import Callable, Dict, List, Match, Pattern # NOQA
@ -85,6 +87,7 @@ class Matcher:
def match(self, string): def match(self, string):
# type: (str) -> bool # type: (str) -> bool
string = canon_path(string)
return any(pat(string) for pat in self.patterns) return any(pat(string) for pat in self.patterns)