Remove sys.platform == 'riscos' checks from some Python and test files. #16501

diff --git a/Lib/site.py b/Lib/site.py
index 468d83efb9450309de290639f2d7c0676c412ffa..41bea423157d06b83fdacf50a51a37734deb1f51 100644 (file)
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -300,9 +300,7 @@ def getsitepackages(prefixes=None):
             continue
         seen.add(prefix)
 
-        if sys.platform == 'riscos':
-            sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
-        elif os.sep == '/':
+        if os.sep == '/':
             sitepackages.append(os.path.join(prefix, "lib",
                                         "python" + sys.version[:3],
                                         "site-packages"))

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index e06e82a89f05723624d87d699a7386b49a1a7431..295a0a6ecd89cb19a171a3bbef9fac4591ff1205 100644 (file)
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -191,7 +191,6 @@ def _getuserbase():
     def joinuser(*args):
         return os.path.expanduser(os.path.join(*args))
 
-    # what about 'riscos' ?
     if os.name == "nt":
         base = os.environ.get("APPDATA") or "~"
         if env_base:

diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
index 496709cc5684fe4c17040995eeb3db7d18e0f0a8..dee59210756f55d2582bd6a55129dd31e0fcde51 100644 (file)
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -5,7 +5,7 @@ import sys
 import unittest
 from test import support
 
-@unittest.skipIf((sys.platform[:3]=='win') or (sys.platform=='riscos'),
+@unittest.skipIf((sys.platform[:3]=='win'),
                  "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 1b7363475559c55f2a1aa98d7e2ba8f57cfc9d9e..c973be8b6ece388a14ee2d825dc7c1ff39b53a05 100644 (file)
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -15,9 +15,6 @@ try:
 except ImportError:
     threading = None
 
-if sys.platform == 'riscos':
-    raise unittest.SkipTest("Can't test signal on %s" % sys.platform)
-
 
 class HandlerBCalled(Exception):
     pass

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 5090239ba949fe36fca6ac13f65ea8cbde478b91..9c7840f7baa22d82c9cdd15a12c15f1f09422d59 100644 (file)
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -222,11 +222,7 @@ class HelperFunctionsTests(unittest.TestCase):
         site.PREFIXES = ['xoxo']
         dirs = site.getsitepackages()
 
-        if sys.platform == 'riscos':
-            self.assertEqual(len(dirs), 1)
-            wanted = os.path.join('xoxo', 'Lib', 'site-packages')
-            self.assertEqual(dirs[0], wanted)
-        elif (sys.platform == "darwin" and
+        if (sys.platform == "darwin" and
             sysconfig.get_config_var("PYTHONFRAMEWORK")):
             # OS X framework builds
             site.PREFIXES = ['Python.framework']

diff --git a/Lib/test/test_threadsignals.py b/Lib/test/test_threadsignals.py
index 3a0a493c0da5ef896a5c7cc21466d5d2f59b63dc..b1004e668903ae3899863c38aa12d1ea52e92e13 100644 (file)
--- 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] == 'win') or (sys.platform=='riscos'):
+if (sys.platform[:3] == 'win'):
     raise unittest.SkipTest("Can't test signal on %s" % sys.platform)
 
 process_pid = os.getpid()