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

Remove unused except UnicodeDecodeError block

Browse Source 
Both `self.srcdir` and `rel_fn` are defined as type str. Calling
os.path.join() on two str values will always return a str value without
the need to decode it. Therefore, the except block is never executed.
This commit is contained in:
Jon Dufresne 2018-12-09 15:45:11 -08:00
parent b62bf0e0fc
commit 17067ed6dc
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sphinx/environment/__init__.py
View File

@ -10,7 +10,6 @@
import os
import pickle
import sys
import warnings
from collections import defaultdict
from copy import copy
@ -364,15 +363,9 @@ class BuildEnvironment:
docdir = path.dirname(self.doc2path(docname or self.docname,
base=None))
rel_fn = path.join(docdir, filename)
try:
# the path.abspath() might seem redundant, but otherwise artifacts
# such as ".." will remain in the path
return rel_fn, path.abspath(path.join(self.srcdir, rel_fn))
except UnicodeDecodeError:
# the source directory is a bytestring with non-ASCII characters;
# let's try to encode the rel_fn in the file system encoding
enc_rel_fn = rel_fn.encode(sys.getfilesystemencoding())
return rel_fn, path.abspath(path.join(self.srcdir, enc_rel_fn)) # type: ignore
# the path.abspath() might seem redundant, but otherwise artifacts
# such as ".." will remain in the path
return rel_fn, path.abspath(path.join(self.srcdir, rel_fn))
@property
def found_docs(self):