summaryrefslogtreecommitdiff
path: root/sphinx/make_mode.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2016-07-16 00:53:21 +0900
committerGitHub <noreply@github.com>2016-07-16 00:53:21 +0900
commit9916518feec34ecd5e4193a5e63ffb156b0b1738 (patch)
tree626c5f6a319c0397c3665ed748b3702af42c92c9 /sphinx/make_mode.py
parent736615c18c56f91beb7525f97ed8dabacc215ec4 (diff)
parente9f5d9666557678b9dbdbc4330cfe1c09bdafc58 (diff)
downloadsphinx-git-9916518feec34ecd5e4193a5e63ffb156b0b1738.tar.gz
Merge pull request #2782 from shibukawa/fix/make_clean
fix make clean abort when build dir contains files like .DS_Store.
Diffstat (limited to 'sphinx/make_mode.py')
-rw-r--r--sphinx/make_mode.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/sphinx/make_mode.py b/sphinx/make_mode.py
index 67ba9e1e1..75c5ab8b2 100644
--- a/sphinx/make_mode.py
+++ b/sphinx/make_mode.py
@@ -18,13 +18,12 @@ from __future__ import print_function
import os
import sys
-import shutil
from os import path
from subprocess import call
import sphinx
from sphinx.util.console import bold, blue
-from sphinx.util.osutil import cd
+from sphinx.util.osutil import cd, rmtree
proj_name = os.getenv('SPHINXPROJ', '<project>')
@@ -75,7 +74,7 @@ class Make(object):
return 1
print("Removing everything under %r..." % self.builddir)
for item in os.listdir(self.builddir):
- shutil.rmtree(self.builddir_join(item))
+ rmtree(self.builddir_join(item))
def build_help(self):
print(bold("Sphinx v%s" % sphinx.__display_version__))