From 6df938ac10c8f3231813b8c76af847b018243f8d Mon Sep 17 00:00:00 2001 From: Damon McDougall Date: Wed, 10 Oct 2012 23:19:14 +0200 Subject: [PATCH 1/2] Make make.py build docs under python 3 --- doc/make.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/make.py b/doc/make.py index 7df050d13ad4..4629e2667d48 100755 --- a/doc/make.py +++ b/doc/make.py @@ -89,13 +89,13 @@ 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 From e5680ab8c3faa5c4b10b405c4d845cde20812d88 Mon Sep 17 00:00:00 2001 From: Damon McDougall Date: Fri, 12 Oct 2012 20:18:09 +0200 Subject: [PATCH 2/2] Make call to raise py3 compatible --- doc/make.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/make.py b/doc/make.py index 4629e2667d48..8e37ec7f6e36 100755 --- a/doc/make.py +++ b/doc/make.py @@ -102,7 +102,7 @@ def copytree(src, dst, symlinks=False, ignore=None): else: errors.extend((src, dst, str(why))) if errors: - raise Error, errors + raise Error(errors) ### End compatibility block for pre-v2.6 ###