From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 4 May 2017 16:52:26 +0000 (+0200)
Subject: bpo-30108: Fix test_site setUpModule() (#1460)
X-Git-Tag: v2.7.14rc1~173
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e81e355a8e43956802211115e3f99859a1a29ecb;p=python

bpo-30108: Fix test_site setUpModule() (#1460)

Oops, I forgot that PermissionError was introduced in Python 3.3!
Replace PermissionError with OSError and check on errno.
---

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 3ba5dca822..9569135c2c 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -8,6 +8,7 @@ import unittest
 from test.test_support import run_unittest, TESTFN, EnvironmentVarGuard
 from test.test_support import captured_output
 import __builtin__
+import errno
 import os
 import sys
 import re
@@ -38,9 +39,12 @@ def setUpModule():
             os.makedirs(site.USER_SITE)
             # modify sys.path: will be restored by tearDownModule()
             site.addsitedir(site.USER_SITE)
-        except PermissionError as exc:
-            raise unittest.SkipTest('unable to create user site directory (%r): %s'
-                                    % (site.USER_SITE, exc))
+        except OSError as exc:
+            if exc.errno in (errno.EACCES, errno.EPERM):
+                raise unittest.SkipTest('unable to create user site directory (%r): %s'
+                                        % (site.USER_SITE, exc))
+            else:
+                raise
 
 
 def tearDownModule():