diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-01-31 20:40:56 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-01-31 20:40:56 +0900 |
| commit | 4647fcee456378c5001fe5ccbe7bff71fb799bf7 (patch) | |
| tree | f3ff5f85e45bd79979ddae5af2c157bdfeaa5001 /sphinx/util/osutil.py | |
| parent | 5b7432b1ab333e4fe503b08d57732da1e5a25cf3 (diff) | |
| parent | 280d2c79f835da6245c45523960b6ddf6f0088e0 (diff) | |
| download | sphinx-git-4647fcee456378c5001fe5ccbe7bff71fb799bf7.tar.gz | |
Merge branch '1.7-release'
Diffstat (limited to 'sphinx/util/osutil.py')
| -rw-r--r-- | sphinx/util/osutil.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py index 3ecfb4a1b..b52fde0d6 100644 --- a/sphinx/util/osutil.py +++ b/sphinx/util/osutil.py @@ -10,17 +10,18 @@ """ from __future__ import print_function +import contextlib +import errno +import filecmp +import locale import os import re +import shutil import sys import time -import errno -import locale -import shutil -import filecmp -from os import path -import contextlib from io import BytesIO, StringIO +from os import path + from six import PY2, PY3, text_type if False: |