Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 289bc05

Browse files
author
Skip Montanaro
committed
some RiscOS stuff I missed before (was only looking for "RISCOS")
1 parent ceaafa6 commit 289bc05

15 files changed

Lines changed: 57 additions & 117 deletions

‎Doc/library/tempfile.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@ function arguments, instead.
171171

172172
#. A platform-specific location:
173173

174-
* On RiscOS, the directory named by the :envvar:`Wimp$ScrapDir` environment
175-
variable.
176-
177174
* On Windows, the directories :file:`C:\\TEMP`, :file:`C:\\TMP`,
178175
:file:`\\TEMP`, and :file:`\\TMP`, in that order.
179176

‎Lib/os.py‎

Lines changed: 49 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This exports:
44
- all functions from posix, nt, os2, mac, or ce, e.g. unlink, stat, etc.
55
- os.path is one of the modules posixpath, ntpath, or macpath
6-
- os.name is 'posix', 'nt', 'os2', 'mac', 'ce' or 'riscos'
6+
- os.name is 'posix', 'nt', 'os2', 'mac' or 'ce'
77
- os.curdir is a string representing the current directory ('.' or ':')
88
- os.pardir is a string representing the parent directory ('..' or '::')
99
- os.sep is the (or a most common) pathname separator ('/' or ':' or '\\')
@@ -112,20 +112,6 @@ def _get_exports_list(module):
112112
__all__.extend(_get_exports_list(ce))
113113
del ce
114114

115-
elif 'riscos' in _names:
116-
name = 'riscos'
117-
linesep = '\n'
118-
from riscos import *
119-
try:
120-
from riscos import _exit
121-
except ImportError:
122-
pass
123-
import riscospath as path
124-
125-
import riscos
126-
__all__.extend(_get_exports_list(riscos))
127-
del riscos
128-
129115
else:
130116
raise ImportError, 'no os specific module found'
131117

@@ -404,62 +390,58 @@ def _execvpe(file, args, env=None):
404390
raise error, last_exc, tb
405391

406392

407-
if name == "riscos":
408-
# On RISC OS, all env access goes through getenv and putenv
409-
from riscosenviron import _Environ
410-
else:
411-
# Change environ to automatically call putenv(), unsetenv if they exist.
412-
from _abcoll import MutableMapping # Can't use collections (bootstrap)
413-
414-
class _Environ(MutableMapping):
415-
def __init__(self, environ, keymap, putenv, unsetenv):
416-
self.keymap = keymap
417-
self.putenv = putenv
418-
self.unsetenv = unsetenv
419-
self.data = data = {}
420-
for key, value in environ.items():
421-
data[keymap(key)] = str(value)
422-
def __getitem__(self, key):
423-
return self.data[self.keymap(key)]
424-
def __setitem__(self, key, value):
425-
value = str(value)
426-
self.putenv(key, value)
427-
self.data[self.keymap(key)] = value
428-
def __delitem__(self, key):
429-
self.unsetenv(key)
430-
del self.data[self.keymap(key)]
431-
def __iter__(self):
432-
for key in self.data:
433-
yield key
434-
def __len__(self):
435-
return len(self.data)
436-
def copy(self):
437-
return dict(self)
438-
def setdefault(self, key, value):
439-
if key not in self:
440-
self[key] = value
441-
return self[key]
393+
# Change environ to automatically call putenv(), unsetenv if they exist.
394+
from _abcoll import MutableMapping # Can't use collections (bootstrap)
395+
396+
class _Environ(MutableMapping):
397+
def __init__(self, environ, keymap, putenv, unsetenv):
398+
self.keymap = keymap
399+
self.putenv = putenv
400+
self.unsetenv = unsetenv
401+
self.data = data = {}
402+
for key, value in environ.items():
403+
data[keymap(key)] = str(value)
404+
def __getitem__(self, key):
405+
return self.data[self.keymap(key)]
406+
def __setitem__(self, key, value):
407+
value = str(value)
408+
self.putenv(key, value)
409+
self.data[self.keymap(key)] = value
410+
def __delitem__(self, key):
411+
self.unsetenv(key)
412+
del self.data[self.keymap(key)]
413+
def __iter__(self):
414+
for key in self.data:
415+
yield key
416+
def __len__(self):
417+
return len(self.data)
418+
def copy(self):
419+
return dict(self)
420+
def setdefault(self, key, value):
421+
if key not in self:
422+
self[key] = value
423+
return self[key]
442424

443-
try:
444-
_putenv = putenv
445-
except NameError:
446-
_putenv = lambda key, value: None
447-
else:
448-
__all__.append("putenv")
425+
try:
426+
_putenv = putenv
427+
except NameError:
428+
_putenv = lambda key, value: None
429+
else:
430+
__all__.append("putenv")
449431

450-
try:
451-
_unsetenv = unsetenv
452-
except NameError:
453-
_unsetenv = lambda key: _putenv(key, "")
454-
else:
455-
__all__.append("unsetenv")
432+
try:
433+
_unsetenv = unsetenv
434+
except NameError:
435+
_unsetenv = lambda key: _putenv(key, "")
436+
else:
437+
__all__.append("unsetenv")
456438

457-
if name in ('os2', 'nt'): # Where Env Var Names Must Be UPPERCASE
458-
_keymap = lambda key: str(key.upper())
459-
else: # Where Env Var Names Can Be Mixed Case
460-
_keymap = lambda key: str(key)
439+
if name in ('os2', 'nt'): # Where Env Var Names Must Be UPPERCASE
440+
_keymap = lambda key: str(key.upper())
441+
else: # Where Env Var Names Can Be Mixed Case
442+
_keymap = lambda key: str(key)
461443

462-
environ = _Environ(environ, _keymap, _putenv, _unsetenv)
444+
environ = _Environ(environ, _keymap, _putenv, _unsetenv)
463445

464446

465447
def getenv(key, default=None):

‎Lib/plat-mac/bundlebuilder.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def __load():
272272

273273
MAYMISS_MODULES = ['mac', 'os2', 'nt', 'ntpath', 'dos', 'dospath',
274274
'win32api', 'ce', '_winreg', 'nturl2path', 'sitecustomize',
275-
'org.python.core', 'riscos', 'riscosenviron', 'riscospath'
275+
'org.python.core'
276276
]
277277

278278
STRIP_EXEC = "/usr/bin/strip"

‎Lib/site.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def addsitepackages(known_paths):
180180
prefixes.append(sys.exec_prefix)
181181
for prefix in prefixes:
182182
if prefix:
183-
if sys.platform in ('os2emx', 'riscos'):
183+
if sys.platform == 'os2emx':
184184
sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
185185
elif os.sep == '/':
186186
sitedirs = [os.path.join(prefix,

‎Lib/tempfile.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,6 @@ def _candidate_tempdir_list():
159159
dirlist.append(dirname)
160160
except _Folder.error:
161161
pass
162-
elif _os.name == 'riscos':
163-
dirname = _os.getenv('Wimp$ScrapDir')
164-
if dirname: dirlist.append(dirname)
165162
elif _os.name == 'nt':
166163
dirlist.extend([ r'c:\temp', r'c:\tmp', r'\temp', r'\tmp' ])
167164
else:

‎Lib/test/regrtest.py‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -947,33 +947,6 @@ def printlist(x, width=70, indent=4):
947947
test_threadedtempfile
948948
test_threading
949949
""",
950-
'riscos':
951-
"""
952-
test_asynchat
953-
test_atexit
954-
test_bsddb
955-
test_bsddb3
956-
test_commands
957-
test_crypt
958-
test_dbm
959-
test_dl
960-
test_fcntl
961-
test_fork1
962-
test_gdbm
963-
test_grp
964-
test_largefile
965-
test_locale
966-
test_mmap
967-
test_openpty
968-
test_poll
969-
test_pty
970-
test_pwd
971-
test_sundry
972-
test_thread
973-
test_threaded_import
974-
test_threadedtempfile
975-
test_threading
976-
""",
977950
'darwin':
978951
"""
979952
test__locale

‎Lib/test/test_bz2.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import bz2
1212
from bz2 import BZ2File, BZ2Compressor, BZ2Decompressor
1313

14-
has_cmdline_bunzip2 = sys.platform not in ("win32", "os2emx", "riscos")
14+
has_cmdline_bunzip2 = sys.platform not in ("win32", "os2emx")
1515

1616
class BaseTest(unittest.TestCase):
1717
"Base for other testcases."

‎Lib/test/test_mhlib.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
import sys
1414
import mhlib
1515

16-
if (sys.platform.startswith("win") or sys.platform=="riscos" or
17-
sys.platform.startswith("atheos")):
16+
if sys.platform.startswith("win") or sys.platform.startswith("atheos"):
1817
# mhlib.updateline() renames a file to the name of a file that already
1918
# exists. That causes a reasonable OS <wink> to complain in test_sequence
2019
# here, like the "OSError: [Errno 17] File exists" raised on Windows.

‎Lib/test/test_select.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def fileno(self):
4242

4343
def test():
4444
import sys
45-
if sys.platform[:3] in ('win', 'mac', 'os2', 'riscos'):
45+
if sys.platform[:3] in ('win', 'mac', 'os2'):
4646
if verbose:
4747
print("Can't test select easily on", sys.platform)
4848
return

‎Lib/test/test_signal.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import signal
44
import os, sys, time
55

6-
if sys.platform[:3] in ('win', 'os2') or sys.platform=='riscos':
6+
if sys.platform[:3] in ('win', 'os2'):
77
raise TestSkipped, "Can't test signal on %s" % sys.platform
88

99
MAX_DURATION = 20 # Entire test should last at most 20 sec.

0 commit comments

Comments
 (0)