merge with trunk

1 files changed, 4 insertions, 2 deletions

diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py
index 78949253..b439a7e7 100644
--- a/sphinx/util/__init__.py
+++ b/sphinx/util/__init__.py
@@ -14,6 +14,7 @@ import re
 import sys
 import stat
 import time
+import errno
 import types
 import shutil
 import fnmatch
@@ -70,7 +71,8 @@ def ensuredir(path):
     try:
         os.makedirs(path)
     except OSError, err:
-        if not err.errno == 17:
+        # 0 for Jython/Win32
+        if err.errno not in [0, getattr(errno, 'EEXIST', 0)]:
             raise
 
 
@@ -417,7 +419,7 @@ def copyfile(source, dest):
     try:
         # don't do full copystat because the source may be read-only
         copytimes(source, dest)
-    except shutil.Error:
+    except OSError:
         pass