diff options
| -rw-r--r-- | Lib/site.py | 4 | ||||
| -rw-r--r-- | Lib/sysconfig.py | 1 | ||||
| -rw-r--r-- | Lib/test/test_select.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_signal.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_site.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_threadsignals.py | 2 |
6 files changed, 4 insertions, 14 deletions
diff --git a/Lib/site.py b/Lib/site.py index 468d83e..41bea42 100644 --- 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 e06e82a..295a0a6 100644 --- 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 496709c..dee5921 100644 --- 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 1b73634..c973be8 100644 --- 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 5090239..9c7840f 100644 --- 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 3a0a493..b1004e6 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] == '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() |