some RiscOS stuff I missed before (was only looking for "RISCOS")
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index e7596a5..58b2c0b 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -947,33 +947,6 @@
test_threadedtempfile
test_threading
""",
- 'riscos':
- """
- test_asynchat
- test_atexit
- test_bsddb
- test_bsddb3
- test_commands
- test_crypt
- test_dbm
- test_dl
- test_fcntl
- test_fork1
- test_gdbm
- test_grp
- test_largefile
- test_locale
- test_mmap
- test_openpty
- test_poll
- test_pty
- test_pwd
- test_sundry
- test_thread
- test_threaded_import
- test_threadedtempfile
- test_threading
- """,
'darwin':
"""
test__locale
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py
index 32c9cef..2233f84 100644
--- a/Lib/test/test_bz2.py
+++ b/Lib/test/test_bz2.py
@@ -11,7 +11,7 @@
import bz2
from bz2 import BZ2File, BZ2Compressor, BZ2Decompressor
-has_cmdline_bunzip2 = sys.platform not in ("win32", "os2emx", "riscos")
+has_cmdline_bunzip2 = sys.platform not in ("win32", "os2emx")
class BaseTest(unittest.TestCase):
"Base for other testcases."
diff --git a/Lib/test/test_mhlib.py b/Lib/test/test_mhlib.py
index ad66ede..09522f7 100644
--- a/Lib/test/test_mhlib.py
+++ b/Lib/test/test_mhlib.py
@@ -13,8 +13,7 @@
import sys
import mhlib
-if (sys.platform.startswith("win") or sys.platform=="riscos" or
- sys.platform.startswith("atheos")):
+if sys.platform.startswith("win") or sys.platform.startswith("atheos"):
# mhlib.updateline() renames a file to the name of a file that already
# exists. That causes a reasonable OS <wink> to complain in test_sequence
# here, like the "OSError: [Errno 17] File exists" raised on Windows.
diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
index fd76674..b45ec7f 100644
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -42,7 +42,7 @@
def test():
import sys
- if sys.platform[:3] in ('win', 'mac', 'os2', 'riscos'):
+ if sys.platform[:3] in ('win', 'mac', 'os2'):
if verbose:
print("Can't test select easily on", sys.platform)
return
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 9093965..15c6e9c 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -3,7 +3,7 @@
import signal
import os, sys, time
-if sys.platform[:3] in ('win', 'os2') or sys.platform=='riscos':
+if sys.platform[:3] in ('win', 'os2'):
raise TestSkipped, "Can't test signal on %s" % sys.platform
MAX_DURATION = 20 # Entire test should last at most 20 sec.
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index fa4c3ef..2d9612e 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -142,8 +142,6 @@
if os.name == 'java':
# Jython disallows @ in module names
TESTFN = '$test'
-elif os.name == 'riscos':
- TESTFN = 'testfile'
else:
TESTFN = '@test'
diff --git a/Lib/test/test_threadsignals.py b/Lib/test/test_threadsignals.py
index 286c2e4..9f076ef 100644
--- a/Lib/test/test_threadsignals.py
+++ b/Lib/test/test_threadsignals.py
@@ -7,7 +7,7 @@
import sys
from test.test_support import run_unittest, TestSkipped
-if sys.platform[:3] in ('win', 'os2') or sys.platform=='riscos':
+if sys.platform[:3] in ('win', 'os2'):
raise TestSkipped, "Can't test signal on %s" % sys.platform
process_pid = os.getpid()
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 91d6ba7..dff840e 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -26,10 +26,6 @@
# urllib.pathname2url works, unfortunately...
if os.name == 'mac':
fname = '/' + fname.replace(':', '/')
- elif os.name == 'riscos':
- import string
- fname = os.expand(fname)
- fname = fname.translate(string.maketrans("/.", "./"))
file_url = "file://%s" % fname
f = urllib2.urlopen(file_url)