diff options
| author | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2013-09-18 08:51:20 +0000 |
|---|---|---|
| committer | Takayuki Shimizukawa <shimizukawa@gmail.com> | 2013-09-18 08:51:20 +0000 |
| commit | 99008f5b7888a43c6714b2578eea540da042f9f1 (patch) | |
| tree | 4f255d1a7f9d2d7fe69a6fbd466fbe9e8f5066d2 /sphinx/util/osutil.py | |
| parent | 09457108a1c2c2ef999c972f22010d0ed620c6a6 (diff) | |
| download | sphinx-git-99008f5b7888a43c6714b2578eea540da042f9f1.tar.gz | |
Fix again: NFC/NFD normalizing problem. Closes #1142
Diffstat (limited to 'sphinx/util/osutil.py')
| -rw-r--r-- | sphinx/util/osutil.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py index f3557c3ea..f37c10222 100644 --- a/sphinx/util/osutil.py +++ b/sphinx/util/osutil.py @@ -176,3 +176,16 @@ def find_catalog_files(docname, srcdir, locale_dirs, lang, compaction): fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding() + + +if sys.version_info < (3, 0): + bytes = str +else: + bytes = bytes + + +def abspath(pathdir): + pathdir = path.abspath(pathdir) + if isinstance(pathdir, bytes): + pathdir = pathdir.decode(fs_encoding) + return pathdir |