bpo-33671: Add support.MS_WINDOWS and support.MACOS (GH-7800)
* Add support.MS_WINDOWS: True if Python is running on Microsoft Windows.
* Add support.MACOS: True if Python is running on Apple macOS.
* Replace support.is_android with support.ANDROID
* Replace support.is_jython with support.JYTHON
* Cleanup code to initialize unix_shell
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 7e0a329..b3b3e66 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -33,7 +33,6 @@
from test.support import TESTFN, FakePath
TESTFN2 = TESTFN + "2"
-MACOS = sys.platform.startswith("darwin")
try:
import grp
import pwd
@@ -1808,7 +1807,7 @@
self.assertRaises(OSError, shutil.copyfile, 'srcfile', 'destfile')
- @unittest.skipIf(MACOS, "skipped on macOS")
+ @unittest.skipIf(support.MACOS, "skipped on macOS")
def test_w_dest_open_fails(self):
srcfile = self.Faux()
@@ -1828,7 +1827,7 @@
self.assertEqual(srcfile._exited_with[1].args,
('Cannot open "destfile"',))
- @unittest.skipIf(MACOS, "skipped on macOS")
+ @unittest.skipIf(support.MACOS, "skipped on macOS")
def test_w_dest_close_fails(self):
srcfile = self.Faux()
@@ -1851,7 +1850,7 @@
self.assertEqual(srcfile._exited_with[1].args,
('Cannot close',))
- @unittest.skipIf(MACOS, "skipped on macOS")
+ @unittest.skipIf(support.MACOS, "skipped on macOS")
def test_w_source_close_fails(self):
srcfile = self.Faux(True)
@@ -2185,7 +2184,7 @@
shutil._HAS_SENDFILE = True
-@unittest.skipIf(not MACOS, 'macOS only')
+@unittest.skipIf(not support.MACOS, 'macOS only')
class TestZeroCopyMACOS(_ZeroCopyFileTest, unittest.TestCase):
PATCHPOINT = "posix._fcopyfile"