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 #3669: gettext builder fails with "ValueError: substring not found"

Browse Source
This commit is contained in:
Takeshi KOMIYA 2017-04-27 00:17:07 +09:00
parent 50609f2000
commit f8b58e41cd
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -16,6 +16,7 @@ Bugs fixed
---------- ----------
* #3661: sphinx-build crashes on parallel build * #3661: sphinx-build crashes on parallel build
* #3669: gettext builder fails with "ValueError: substring not found"
Testing Testing
-------- --------

20
sphinx/builders/gettext.py
View File

@ -194,14 +194,18 @@ ltz = LocalTimeZone()
def should_write(filepath, new_content): def should_write(filepath, new_content):
if not path.exists(filepath): if not path.exists(filepath):
return True return True
with open(filepath, 'r', encoding='utf-8') as oldpot: # type: ignore try:
old_content = oldpot.read() with open(filepath, 'r', encoding='utf-8') as oldpot: # type: ignore
old_header_index = old_content.index('"POT-Creation-Date:') old_content = oldpot.read()
new_header_index = new_content.index('"POT-Creation-Date:') old_header_index = old_content.index('"POT-Creation-Date:')
old_body_index = old_content.index('"PO-Revision-Date:') new_header_index = new_content.index('"POT-Creation-Date:')
new_body_index = new_content.index('"PO-Revision-Date:') old_body_index = old_content.index('"PO-Revision-Date:')
return ((old_content[:old_header_index] != new_content[:new_header_index]) or new_body_index = new_content.index('"PO-Revision-Date:')
(new_content[new_body_index:] != old_content[old_body_index:])) return ((old_content[:old_header_index] != new_content[:new_header_index]) or
(new_content[new_body_index:] != old_content[old_body_index:]))
except ValueError:
pass
return True return True