Closes #16135: Removal of OS/2 support

11 files changed, 9 insertions, 25 deletions

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index e977e42..1d1a695 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1621,20 +1621,6 @@ _expectations = (
         test_ossaudiodev
         test_socketserver
         """),
-    ('os2emx',
-        """
-        test_audioop
-        test_curses
-        test_epoll
-        test_kqueue
-        test_largefile
-        test_mmap
-        test_openpty
-        test_ossaudiodev
-        test_pty
-        test_resource
-        test_signal
-        """),
     ('freebsd',
         """
         test_devpoll
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py
index 257b144..92548f4 100644
--- a/Lib/test/test_bz2.py
+++ b/Lib/test/test_bz2.py
@@ -18,7 +18,7 @@ except ImportError:
 bz2 = support.import_module('bz2')
 from bz2 import BZ2File, BZ2Compressor, BZ2Decompressor
 
-has_cmdline_bunzip2 = sys.platform not in ("win32", "os2emx")
+has_cmdline_bunzip2 = (sys.platform != "win32")
 
 class BaseTest(unittest.TestCase):
     "Base for other testcases."
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index 6b1e933..d1cc92e 100644
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -596,7 +596,7 @@ class TestMaildir(TestMailbox, unittest.TestCase):
 
     def setUp(self):
         TestMailbox.setUp(self)
-        if os.name in ('nt', 'os2') or sys.platform == 'cygwin':
+        if (os.name == 'nt') or (sys.platform == 'cygwin'):
             self._box.colon = '!'
 
     def assertMailboxEmpty(self):
diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
index 8d910ed..6a810c6 100644
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -5,8 +5,7 @@ import sys
 import unittest
 from test import support
 
-@unittest.skipIf(sys.platform[:3] in ('win', 'os2') or \
-        sys.platform=='riscos'),
+@unittest.skipIf((sys.platform[:3]=='win') or (sys.platform=='riscos'),
                  "can't easily test on this system")
 class SelectTestCase(unittest.TestCase):
 
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 6be259b..1b73634 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -15,7 +15,7 @@ try:
 except ImportError:
     threading = None
 
-if sys.platform in ('os2', 'riscos'):
+if sys.platform == 'riscos':
     raise unittest.SkipTest("Can't test signal on %s" % sys.platform)
 
 
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 29286c7..5090239 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -222,7 +222,7 @@ class HelperFunctionsTests(unittest.TestCase):
         site.PREFIXES = ['xoxo']
         dirs = site.getsitepackages()
 
-        if sys.platform in ('os2emx', 'riscos'):
+        if sys.platform == 'riscos':
             self.assertEqual(len(dirs), 1)
             wanted = os.path.join('xoxo', 'Lib', 'site-packages')
             self.assertEqual(dirs[0], wanted)
diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py
index fcccdf7..48abc24 100644
--- a/Lib/test/test_sundry.py
+++ b/Lib/test/test_sundry.py
@@ -48,7 +48,6 @@ class TestUntestedModules(unittest.TestCase):
             import macurl2path
             import mailcap
             import nturl2path
-            import os2emxpath
             import pstats
             import py_compile
             import sndhdr
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 6e0c6ee..349b1ac 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -482,7 +482,7 @@ class SysModuleTest(unittest.TestCase):
     def test_thread_info(self):
         info = sys.thread_info
         self.assertEqual(len(info), 3)
-        self.assertIn(info.name, ('nt', 'os2', 'pthread', 'solaris', None))
+        self.assertIn(info.name, ('nt', 'pthread', 'solaris', None))
         self.assertIn(info.lock, ('semaphore', 'mutex+cond', None))
 
     def test_43581(self):
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index c44e192..5293649 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -234,7 +234,7 @@ class TestSysConfig(unittest.TestCase):
         self.assertTrue(os.path.isfile(config_h), config_h)
 
     def test_get_scheme_names(self):
-        wanted = ('nt', 'nt_user', 'os2', 'os2_home', 'osx_framework_user',
+        wanted = ('nt', 'nt_user', 'osx_framework_user',
                   'posix_home', 'posix_prefix', 'posix_user')
         self.assertEqual(get_scheme_names(), wanted)
 
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index a191e15..f9a721b 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -68,7 +68,7 @@ class ThreadRunningTests(BasicThreadTest):
         thread.stack_size(0)
         self.assertEqual(thread.stack_size(), 0, "stack_size not reset to default")
 
-        if os.name not in ("nt", "os2", "posix"):
+        if os.name not in ("nt", "posix"):
             return
 
         tss_supported = True
diff --git a/Lib/test/test_threadsignals.py b/Lib/test/test_threadsignals.py
index f975a75..3a0a493 100644
--- a/Lib/test/test_threadsignals.py
+++ b/Lib/test/test_threadsignals.py
@@ -8,7 +8,7 @@ from test.support import run_unittest, import_module
 thread = import_module('_thread')
 import time
 
-if sys.platform[:3] in ('win', 'os2') or sys.platform=='riscos':
+if (sys.platform[:3] == 'win') or (sys.platform=='riscos'):
     raise unittest.SkipTest("Can't test signal on %s" % sys.platform)
 
 process_pid = os.getpid()