diff options
| -rw-r--r-- | Lib/os.py | 20 | ||||
| -rw-r--r-- | Lib/tempfile.py | 14 |
2 files changed, 4 insertions, 30 deletions
@@ -1,9 +1,9 @@ r"""OS routines for Mac, NT, or Posix depending on what system we're on. This exports: - - all functions from posix, nt, os2, mac, or ce, e.g. unlink, stat, etc. - - os.path is one of the modules posixpath, ntpath, or macpath - - os.name is 'posix', 'nt', 'os2', 'mac', 'ce' or 'riscos' + - all functions from posix, nt, os2, or ce, e.g. unlink, stat, etc. + - os.path is one of the modules posixpath, or ntpath + - os.name is 'posix', 'nt', 'os2', 'ce' or 'riscos' - os.curdir is a string representing the current directory ('.' or ':') - os.pardir is a string representing the parent directory ('..' or '::') - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\') @@ -84,20 +84,6 @@ elif 'os2' in _names: __all__.extend(_get_exports_list(os2)) del os2 -elif 'mac' in _names: - name = 'mac' - linesep = '\r' - from mac import * - try: - from mac import _exit - except ImportError: - pass - import macpath as path - - import mac - __all__.extend(_get_exports_list(mac)) - del mac - elif 'ce' in _names: name = 'ce' linesep = '\r\n' diff --git a/Lib/tempfile.py b/Lib/tempfile.py index 84ec6e07f4..b0fd87d3a9 100644 --- a/Lib/tempfile.py +++ b/Lib/tempfile.py @@ -33,10 +33,6 @@ import os as _os import errno as _errno from random import Random as _Random -if _os.name == 'mac': - import Carbon.Folder as _Folder - import Carbon.Folders as _Folders - try: from cStringIO import StringIO as _StringIO except ImportError: @@ -153,15 +149,7 @@ def _candidate_tempdir_list(): if dirname: dirlist.append(dirname) # Failing that, try OS-specific locations. - if _os.name == 'mac': - try: - fsr = _Folder.FSFindFolder(_Folders.kOnSystemDisk, - _Folders.kTemporaryFolderType, 1) - dirname = fsr.as_pathname() - dirlist.append(dirname) - except _Folder.error: - pass - elif _os.name == 'riscos': + if _os.name == 'riscos': dirname = _os.getenv('Wimp$ScrapDir') if dirname: dirlist.append(dirname) elif _os.name == 'nt': |