Skip to content

Make make.py build docs under python 3 #1361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dmcdougall wants to merge 2 commits into from
Closed

Make make.py build docs under python 3 #1361

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6df938a
Make make.py build docs under python 3
dmcdougall Oct 10, 2012
e5680ab
Make call to raise py3 compatible
dmcdougall Oct 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions doc/make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,20 +89,20 @@ def copytree(src, dst, symlinks=False, ignore=None):
copy2(srcname, dstname)
# catch the Error from the recursive copytree so that we can
# continue with other files
except Error, err:
except Error as err:
errors.extend(err.args[0])
except EnvironmentError, why:
except EnvironmentError as why:
errors.append((srcname, dstname, str(why)))
try:
copystat(src, dst)
except OSError, why:
except OSError as why:
if WindowsError is not None and isinstance(why, WindowsError):
# Copying file access times may fail on Windows
pass
else:
errors.extend((src, dst, str(why)))
if errors:
raise Error, errors
raise Error(errors)

### End compatibility block for pre-v2.6 ###

Expand Down