From 9545a23c7ffb35417d451d24cc3b0339627965a7 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Wed, 5 May 2010 19:09:31 +0000 Subject: [PATCH] In a number of places code still revers to "sys.platform == 'mac'" and that is dead code because it refers to a platform that is no longer supported (and hasn't been supported for several releases). Fixes issue #7908 for the trunk. --- Demo/pdist/FSProxy.py | 31 ++----------- Doc/library/os.rst | 2 +- Lib/binhex.py | 13 ------ Lib/distutils/command/install.py | 14 ------ Lib/distutils/file_util.py | 11 +---- Lib/distutils/sysconfig.py | 17 ------- Lib/distutils/util.py | 9 ---- Lib/imputil.py | 10 ---- Lib/plat-mac/EasyDialogs.py | 17 +++---- Lib/plat-mac/bundlebuilder.py | 2 +- Lib/platform.py | 4 -- Lib/profile.py | 9 ---- Lib/pydoc.py | 6 +-- Lib/tarfile.py | 7 --- Lib/test/regrtest.py | 37 +-------------- Lib/test/test_frozen.py | 13 +++--- Lib/test/test_repr.py | 3 +- Lib/test/test_select.py | 2 +- Lib/test/test_socket.py | 5 +- Lib/test/test_strptime.py | 5 -- Lib/test/test_tempfile.py | 8 ++-- Lib/test/test_urllib2.py | 4 +- Lib/urllib.py | 4 +- Mac/scripts/BuildApplet.py | 3 -- Mac/scripts/zappycfiles.py | 11 +---- Misc/BeOS-setup.py | 2 +- Misc/cheatsheet | 2 +- Tools/webchecker/wcgui.py | 6 --- Tools/webchecker/websucker.py | 2 - setup.py | 78 ++++++++++++++------------------ 30 files changed, 70 insertions(+), 267 deletions(-) diff --git a/Demo/pdist/FSProxy.py b/Demo/pdist/FSProxy.py index a1ab635c08b..871c84f9c79 100644 --- a/Demo/pdist/FSProxy.py +++ b/Demo/pdist/FSProxy.py @@ -23,12 +23,7 @@ from stat import * import time import fnmatch -if os.name == 'mac': - import macfs - maxnamelen = 31 -else: - macfs = None - maxnamelen = 255 +maxnamelen = 255 skipnames = (os.curdir, os.pardir) @@ -63,16 +58,10 @@ class FSProxyLocal: return ignore def _hidden(self, name): - if os.name == 'mac': - return name[0] == '(' and name[-1] == ')' - else: - return name[0] == '.' + return name[0] == '.' def _hide(self, name): - if os.name == 'mac': - return '(%s)' % name - else: - return '.%s' % name + return '.%s' % name def visible(self, name): if len(name) > maxnamelen: return 0 @@ -81,18 +70,8 @@ class FSProxyLocal: if self._hidden(name): return 0 head, tail = os.path.split(name) if head or not tail: return 0 - if macfs: - if os.path.exists(name) and not os.path.isdir(name): - try: - fs = macfs.FSSpec(name) - c, t = fs.GetCreatorType() - if t != 'TEXT': return 0 - except macfs.error, msg: - print "***", name, msg - return 0 - else: - if os.path.islink(name): return 0 - if '\0' in open(name, 'rb').read(512): return 0 + if os.path.islink(name): return 0 + if '\0' in open(name, 'rb').read(512): return 0 for ign in self._ignore: if fnmatch.fnmatch(name, ign): return 0 return 1 diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 6777196f763..77f867bd8e7 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -47,7 +47,7 @@ Notes on the availability of these functions: .. data:: name The name of the operating system dependent module imported. The following - names have currently been registered: ``'posix'``, ``'nt'``, ``'mac'``, + names have currently been registered: ``'posix'``, ``'nt'``, ``'os2'``, ``'ce'``, ``'java'``, ``'riscos'``. diff --git a/Lib/binhex.py b/Lib/binhex.py index bd4e8b3015b..8abc9f3e14c 100644 --- a/Lib/binhex.py +++ b/Lib/binhex.py @@ -175,9 +175,6 @@ class BinHex: if type(ofp) == type(''): ofname = ofp ofp = open(ofname, 'w') - if os.name == 'mac': - fss = FSSpec(ofname) - fss.SetCreatorType('BnHq', 'TEXT') ofp.write('(This file must be converted with BinHex 4.0)\n\n:') hqxer = _Hqxcoderengine(ofp) self.ofp = _Rlecoderengine(hqxer) @@ -478,9 +475,6 @@ def hexbin(inp, out): finfo = ifp.FInfo if not out: out = ifp.FName - if os.name == 'mac': - ofss = FSSpec(out) - out = ofss.as_pathname() ofp = open(out, 'wb') # XXXX Do translation on non-mac systems @@ -501,13 +495,6 @@ def hexbin(inp, out): ofp.write(d) ofp.close() - if os.name == 'mac': - nfinfo = ofss.GetFInfo() - nfinfo.Creator = finfo.Creator - nfinfo.Type = finfo.Type - nfinfo.Flags = finfo.Flags - ofss.SetFInfo(nfinfo) - ifp.close() def _test(): diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py index 44c76926ea6..f1f3bd5c6f5 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -69,20 +69,6 @@ INSTALL_SCHEMES = { 'scripts': '$userbase/Scripts', 'data' : '$userbase', }, - 'mac': { - 'purelib': '$base/Lib/site-packages', - 'platlib': '$base/Lib/site-packages', - 'headers': '$base/Include/$dist_name', - 'scripts': '$base/Scripts', - 'data' : '$base', - }, - 'mac_user': { - 'purelib': '$usersite', - 'platlib': '$usersite', - 'headers': '$userbase/$py_version_short/include/$dist_name', - 'scripts': '$userbase/bin', - 'data' : '$userbase', - }, 'os2': { 'purelib': '$base/Lib/site-packages', 'platlib': '$base/Lib/site-packages', diff --git a/Lib/distutils/file_util.py b/Lib/distutils/file_util.py index d8e8fd5f8d9..b3d9d54ec02 100644 --- a/Lib/distutils/file_util.py +++ b/Lib/distutils/file_util.py @@ -133,18 +133,9 @@ def copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0, if dry_run: return (dst, 1) - # On Mac OS, use the native file copy routine - if os.name == 'mac': - import macostools - try: - macostools.copy(src, dst, 0, preserve_times) - except os.error, exc: - raise DistutilsFileError( - "could not copy '%s' to '%s': %s" % (src, dst, exc[-1])) - # If linking (hard or symbolic), use the appropriate system call # (Unix only, of course, but that's the caller's responsibility) - elif link == 'hard': + if link == 'hard': if not (os.path.exists(dst) and os.path.samefile(src, dst)): os.link(src, dst) elif link == 'sym': diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index bb53315bcad..4d16b2674c0 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -88,11 +88,6 @@ def get_python_inc(plat_specific=0, prefix=None): return os.path.join(prefix, "include", "python" + get_python_version()) elif os.name == "nt": return os.path.join(prefix, "include") - elif os.name == "mac": - if plat_specific: - return os.path.join(prefix, "Mac", "Include") - else: - return os.path.join(prefix, "Include") elif os.name == "os2": return os.path.join(prefix, "Include") else: @@ -135,18 +130,6 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): else: return os.path.join(prefix, "Lib", "site-packages") - elif os.name == "mac": - if plat_specific: - if standard_lib: - return os.path.join(prefix, "Lib", "lib-dynload") - else: - return os.path.join(prefix, "Lib", "site-packages") - else: - if standard_lib: - return os.path.join(prefix, "Lib") - else: - return os.path.join(prefix, "Lib", "site-packages") - elif os.name == "os2": if standard_lib: return os.path.join(prefix, "Lib") diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py index 994dd211be1..b3ec6e9606a 100644 --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -235,15 +235,6 @@ def change_root (new_root, pathname): path = path[1:] return os.path.join(new_root, path) - elif os.name == 'mac': - if not os.path.isabs(pathname): - return os.path.join(new_root, pathname) - else: - # Chop off volume name from start of path - elements = string.split(pathname, ":", 1) - pathname = ":" + elements[1] - return os.path.join(new_root, pathname) - else: raise DistutilsPlatformError, \ "nothing known about platform '%s'" % os.name diff --git a/Lib/imputil.py b/Lib/imputil.py index 600cfa51aa1..a5fa6ea4f76 100644 --- a/Lib/imputil.py +++ b/Lib/imputil.py @@ -462,16 +462,6 @@ def _os_bootstrap(): elif 'os2' in names: sep = '\\' from os2 import stat - elif 'mac' in names: - from mac import stat - def join(a, b): - if a == '': - return b - if ':' not in a: - a = ':' + a - if a[-1:] != ':': - a = a + ':' - return a + b else: raise ImportError, 'no os specific module found' diff --git a/Lib/plat-mac/EasyDialogs.py b/Lib/plat-mac/EasyDialogs.py index 785fd3bd742..129cf2cae26 100644 --- a/Lib/plat-mac/EasyDialogs.py +++ b/Lib/plat-mac/EasyDialogs.py @@ -721,16 +721,13 @@ def AskFileForSave( if issubclass(tpwanted, Carbon.File.FSSpec): return tpwanted(rr.selection[0]) if issubclass(tpwanted, (str, unicode)): - if sys.platform == 'mac': - fullpath = rr.selection[0].as_pathname() - else: - # This is gross, and probably incorrect too - vrefnum, dirid, name = rr.selection[0].as_tuple() - pardir_fss = Carbon.File.FSSpec((vrefnum, dirid, '')) - pardir_fsr = Carbon.File.FSRef(pardir_fss) - pardir_path = pardir_fsr.FSRefMakePath() # This is utf-8 - name_utf8 = unicode(name, 'macroman').encode('utf8') - fullpath = os.path.join(pardir_path, name_utf8) + # This is gross, and probably incorrect too + vrefnum, dirid, name = rr.selection[0].as_tuple() + pardir_fss = Carbon.File.FSSpec((vrefnum, dirid, '')) + pardir_fsr = Carbon.File.FSRef(pardir_fss) + pardir_path = pardir_fsr.FSRefMakePath() # This is utf-8 + name_utf8 = unicode(name, 'macroman').encode('utf8') + fullpath = os.path.join(pardir_path, name_utf8) if issubclass(tpwanted, unicode): return unicode(fullpath, 'utf8') return tpwanted(fullpath) diff --git a/Lib/plat-mac/bundlebuilder.py b/Lib/plat-mac/bundlebuilder.py index ce7ce45be9b..433991394de 100755 --- a/Lib/plat-mac/bundlebuilder.py +++ b/Lib/plat-mac/bundlebuilder.py @@ -273,7 +273,7 @@ __load() del __load """ -MAYMISS_MODULES = ['mac', 'os2', 'nt', 'ntpath', 'dos', 'dospath', +MAYMISS_MODULES = ['os2', 'nt', 'ntpath', 'dos', 'dospath', 'win32api', 'ce', '_winreg', 'nturl2path', 'sitecustomize', 'org.python.core', 'riscos', 'riscosenviron', 'riscospath' ] diff --git a/Lib/platform.py b/Lib/platform.py index 79695ba11de..66764360a10 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1171,10 +1171,6 @@ def uname(): if not version: version = vendor - elif os.name == 'mac': - release,(version,stage,nonrel),machine = mac_ver() - system = 'MacOS' - # System specific extensions if system == 'OpenVMS': # OpenVMS seems to have release and version mixed up diff --git a/Lib/profile.py b/Lib/profile.py index 3af84278bf2..9a4336ec474 100755 --- a/Lib/profile.py +++ b/Lib/profile.py @@ -97,11 +97,6 @@ def help(): print "Documentation for the profile module can be found " print "in the Python Library Reference, section 'The Python Profiler'." -if os.name == "mac": - import MacOS - def _get_time_mac(timer=MacOS.GetTicks): - return timer() / 60.0 - if hasattr(os, "times"): def _get_time_times(timer=os.times): t = timer() @@ -178,10 +173,6 @@ class Profile: self.timer = resgetrusage self.dispatcher = self.trace_dispatch self.get_time = _get_time_resource - elif os.name == 'mac': - self.timer = MacOS.GetTicks - self.dispatcher = self.trace_dispatch_mac - self.get_time = _get_time_mac elif hasattr(time, 'clock'): self.timer = self.get_time = time.clock self.dispatcher = self.trace_dispatch_i diff --git a/Lib/pydoc.py b/Lib/pydoc.py index dd7eb38f2ca..4d604367223 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -2028,7 +2028,7 @@ pydoc by Ka-Ping Yee <ping@lfw.org>''' class DocServer(BaseHTTPServer.HTTPServer): def __init__(self, port, callback): - host = (sys.platform == 'mac') and '127.0.0.1' or 'localhost' + host = 'localhost' self.address = ('', port) self.url = 'http://%s:%d/' % (host, port) self.callback = callback @@ -2145,10 +2145,6 @@ def gui(): except ImportError: # pre-webbrowser.py compatibility if sys.platform == 'win32': os.system('start "%s"' % url) - elif sys.platform == 'mac': - try: import ic - except ImportError: pass - else: ic.launchurl(url) else: rc = os.system('netscape -remote "openURL(%s)" &' % url) if rc: os.system('netscape "%s" &' % url) diff --git a/Lib/tarfile.py b/Lib/tarfile.py index b0af5b15b3e..4b03c283058 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -53,13 +53,6 @@ import copy import re import operator -if sys.platform == 'mac': - # This module needs work for MacOS9, especially in the area of pathname - # handling. In many places it is assumed a simple substitution of / by the - # local os.path.sep is good enough to convert pathnames, but this does not - # work with the mac rooted:path:name versus :nonrooted:path:name syntax - raise ImportError, "tarfile does not work for platform==mac" - try: import grp, pwd except ImportError: diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index 545e0ea2b83..a4139d313df 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -1156,41 +1156,6 @@ _expectations = { test_kqueue test_ossaudiodev """, - 'mac': - """ - test_atexit - test_bsddb - test_bsddb185 - test_bsddb3 - test_bz2 - test_commands - test_crypt - test_curses - test_dbm - test_dl - test_fcntl - test_fork1 - test_epoll - test_grp - test_ioctl - test_largefile - test_locale - test_kqueue - test_mmap - test_openpty - test_ossaudiodev - test_poll - test_popen - test_popen2 - test_posix - test_pty - test_pwd - test_resource - test_signal - test_sundry - test_tarfile - test_timing - """, 'unixware7': """ test_bsddb @@ -1477,7 +1442,7 @@ class _ExpectedSkips: if sys.maxint == 9223372036854775807L: self.expected.add('test_imageop') - if not sys.platform in ("mac", "darwin"): + if sys.platform != "darwin": MAC_ONLY = ["test_macos", "test_macostools", "test_aepack", "test_plistlib", "test_scriptpackages", "test_applesingle"] diff --git a/Lib/test/test_frozen.py b/Lib/test/test_frozen.py index 5f72a92e227..7fb53a4ba6e 100644 --- a/Lib/test/test_frozen.py +++ b/Lib/test/test_frozen.py @@ -23,13 +23,12 @@ class FrozenTests(unittest.TestCase): except ImportError, x: self.fail("import __phello__.spam failed:" + str(x)) - if sys.platform != "mac": # On the Mac this import does succeed. - try: - import __phello__.foo - except ImportError: - pass - else: - self.fail("import __phello__.foo should have failed") + try: + import __phello__.foo + except ImportError: + pass + else: + self.fail("import __phello__.foo should have failed") self.assertEquals(stdout.getvalue(), 'Hello world...\nHello world...\nHello world...\n') diff --git a/Lib/test/test_repr.py b/Lib/test/test_repr.py index 26300d37458..a8202eec595 100644 --- a/Lib/test/test_repr.py +++ b/Lib/test/test_repr.py @@ -320,8 +320,7 @@ class ClassWithFailingRepr: def test_main(): run_unittest(ReprTests) - if os.name != 'mac': - run_unittest(LongReprTest) + run_unittest(LongReprTest) if __name__ == "__main__": diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py index 647d71ef209..79b249bf411 100644 --- a/Lib/test/test_select.py +++ b/Lib/test/test_select.py @@ -4,7 +4,7 @@ import select import os import sys -@unittest.skipIf(sys.platform[:3] in ('win', 'mac', 'os2', 'riscos'), +@unittest.skipIf(sys.platform[:3] in ('win', 'os2', 'riscos'), "can't easily test on this system") class SelectTestCase(unittest.TestCase): diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 0ce329f12c5..430a6474ed1 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1383,9 +1383,8 @@ class TIPCThreadableTest (unittest.TestCase, ThreadableTest): def test_main(): tests = [GeneralModuleTests, BasicTCPTest, TCPCloserTest, TCPTimeoutTest, - TestExceptions, BufferIOTest, BasicTCPTest2] - if sys.platform != 'mac': - tests.extend([ BasicUDPTest, UDPTimeoutTest ]) + TestExceptions, BufferIOTest, BasicTCPTest2, BasicUDPTest, + UDPTimeoutTest ] tests.extend([ NonBlockingTCPTests, diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py index d2868e99e22..a233b1c3bf1 100644 --- a/Lib/test/test_strptime.py +++ b/Lib/test/test_strptime.py @@ -298,9 +298,6 @@ class StrptimeTests(unittest.TestCase): self.assertEqual(strp_output.tm_isdst, 0) strp_output = _strptime._strptime_time("GMT", "%Z") self.assertEqual(strp_output.tm_isdst, 0) - if sys.platform == "mac": - # Timezones don't really work on MacOS9 - return time_tuple = time.localtime() strf_output = time.strftime("%Z") #UTC does not have a timezone strp_output = _strptime._strptime_time(strf_output, "%Z") @@ -317,8 +314,6 @@ class StrptimeTests(unittest.TestCase): def test_bad_timezone(self): # Explicitly test possibility of bad timezone; # when time.tzname[0] == time.tzname[1] and time.daylight - if sys.platform == "mac": - return #MacOS9 has severely broken timezone support. tz_name = time.tzname[0] if tz_name.upper() in ("UTC", "GMT"): return diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py index e534d62b516..27068e3295a 100644 --- a/Lib/test/test_tempfile.py +++ b/Lib/test/test_tempfile.py @@ -23,9 +23,7 @@ has_spawnl = hasattr(os, 'spawnl') # TEST_FILES may need to be tweaked for systems depending on the maximum # number of files that can be opened at one time (see ulimit -n) -if sys.platform == 'mac': - TEST_FILES = 32 -elif sys.platform in ('openbsd3', 'openbsd4'): +if sys.platform in ('openbsd3', 'openbsd4'): TEST_FILES = 48 else: TEST_FILES = 100 @@ -257,7 +255,7 @@ class test__mkstemp_inner(TC): file = self.do_create() mode = stat.S_IMODE(os.stat(file.name).st_mode) expected = 0600 - if sys.platform in ('win32', 'os2emx', 'mac'): + if sys.platform in ('win32', 'os2emx'): # There's no distinction among 'user', 'group' and 'world'; # replicate the 'user' bits. user = expected >> 6 @@ -476,7 +474,7 @@ class test_mkdtemp(TC): mode = stat.S_IMODE(os.stat(dir).st_mode) mode &= 0777 # Mask off sticky bits inherited from /tmp expected = 0700 - if sys.platform in ('win32', 'os2emx', 'mac'): + if sys.platform in ('win32', 'os2emx'): # There's no distinction among 'user', 'group' and 'world'; # replicate the 'user' bits. user = expected >> 6 diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index c0366dd18fc..01a06fb8561 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -24,9 +24,7 @@ class TrivialTests(unittest.TestCase): # And more hacking to get it to work on MacOS. This assumes # urllib.pathname2url works, unfortunately... - if os.name == 'mac': - fname = '/' + fname.replace(':', '/') - elif os.name == 'riscos': + if os.name == 'riscos': import string fname = os.expand(fname) fname = fname.translate(string.maketrans("/.", "./")) diff --git a/Lib/urllib.py b/Lib/urllib.py index 652be754b6e..6cb95f3db8c 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -42,9 +42,7 @@ __version__ = '1.17' # XXX This version is not always updated :-( MAXFTPCACHE = 10 # Trim the ftp cache beyond this size # Helper for non-unix systems -if os.name == 'mac': - from macurl2path import url2pathname, pathname2url -elif os.name == 'nt': +if os.name == 'nt': from nturl2path import url2pathname, pathname2url elif os.name == 'riscos': from rourl2path import url2pathname, pathname2url diff --git a/Mac/scripts/BuildApplet.py b/Mac/scripts/BuildApplet.py index eeeb82bfd7c..a76ed90872d 100644 --- a/Mac/scripts/BuildApplet.py +++ b/Mac/scripts/BuildApplet.py @@ -112,9 +112,6 @@ def buildapplet(): usage() elif opt in ('-d', '--destroot'): destroot = arg - # On OS9 always be verbose - if sys.platform == 'mac' and not verbose: - verbose = 'default' # Loop over all files to be processed for filename in args: cr, tp = MacOS.GetCreatorAndType(filename) diff --git a/Mac/scripts/zappycfiles.py b/Mac/scripts/zappycfiles.py index d829159dac0..6d3574877d9 100644 --- a/Mac/scripts/zappycfiles.py +++ b/Mac/scripts/zappycfiles.py @@ -9,15 +9,8 @@ doit = 1 def main(): if not sys.argv[1:]: - if os.name == 'mac': - import EasyDialogs - dir = EasyDialogs.AskFolder(message='Directory to zap pyc files in') - if not dir: - sys.exit(0) - zappyc(dir) - else: - print 'Usage: zappyc dir ...' - sys.exit(1) + print 'Usage: zappyc dir ...' + sys.exit(1) for dir in sys.argv[1:]: zappyc(dir) diff --git a/Misc/BeOS-setup.py b/Misc/BeOS-setup.py index c5e02cc70ac..2b4cb1fda0a 100644 --- a/Misc/BeOS-setup.py +++ b/Misc/BeOS-setup.py @@ -356,7 +356,7 @@ class PyBuildExt(build_ext): libraries = dblib) ) # Unix-only modules - if platform not in ['mac', 'win32']: + if platform == 'win32': # Steen Lumholt's termios module exts.append( Extension('termios', ['termios.c']) ) # Jeremy Hylton's rlimit interface diff --git a/Misc/cheatsheet b/Misc/cheatsheet index 98e3399ff9d..d8784246fa1 100644 --- a/Misc/cheatsheet +++ b/Misc/cheatsheet @@ -1390,7 +1390,7 @@ platform.py) Some os variables Variable Meaning -name name of O/S-specific module (e.g. "posix", "mac", "nt") +name name of O/S-specific module (e.g. "posix", "nt") path O/S-specific module for path manipulations. On Unix, os.path.split() <=> posixpath.split() curdir string used to represent current directory ('.') diff --git a/Tools/webchecker/wcgui.py b/Tools/webchecker/wcgui.py index cfc4098ef84..cd5326379d6 100755 --- a/Tools/webchecker/wcgui.py +++ b/Tools/webchecker/wcgui.py @@ -64,12 +64,6 @@ from Tkinter import * import tktools import webchecker -# Override some for a weaker platform -if sys.platform == 'mac': - webchecker.DEFROOT = "http://grail.cnri.reston.va.us/" - webchecker.MAXPAGE = 50000 - webchecker.verbose = 4 - def main(): try: opts, args = getopt.getopt(sys.argv[1:], 't:m:qva') diff --git a/Tools/webchecker/websucker.py b/Tools/webchecker/websucker.py index ef2fa44d7e0..df4c8e1b2e5 100755 --- a/Tools/webchecker/websucker.py +++ b/Tools/webchecker/websucker.py @@ -97,8 +97,6 @@ class Sucker(webchecker.Checker): path = path + "index.html" if os.sep != "/": path = os.sep.join(path.split("/")) - if os.name == "mac": - path = os.sep + path path = os.path.join(host, path) return path diff --git a/setup.py b/setup.py index 08e819e9376..7d6cadaf402 100644 --- a/setup.py +++ b/setup.py @@ -127,7 +127,7 @@ class PyBuildExt(build_ext): # Platform-dependent module source and include directories incdirlist = [] platform = self.get_platform() - if platform in ('darwin', 'mac') and ("--disable-toolbox-glue" not in + if platform == 'darwin' and ("--disable-toolbox-glue" not in sysconfig.get_config_var("CONFIG_ARGS")): # Mac OS X also includes some mac-specific modules macmoddir = os.path.join(srcdir, 'Mac/Modules') @@ -160,22 +160,21 @@ class PyBuildExt(build_ext): if ext.name in sys.builtin_module_names: self.extensions.remove(ext) - if platform != 'mac': - # Parse Modules/Setup and Modules/Setup.local to figure out which - # modules are turned on in the file. - remove_modules = [] - for filename in ('Modules/Setup', 'Modules/Setup.local'): - input = text_file.TextFile(filename, join_lines=1) - while 1: - line = input.readline() - if not line: break - line = line.split() - remove_modules.append(line[0]) - input.close() + # Parse Modules/Setup and Modules/Setup.local to figure out which + # modules are turned on in the file. + remove_modules = [] + for filename in ('Modules/Setup', 'Modules/Setup.local'): + input = text_file.TextFile(filename, join_lines=1) + while 1: + line = input.readline() + if not line: break + line = line.split() + remove_modules.append(line[0]) + input.close() - for ext in self.extensions[:]: - if ext.name in remove_modules: - self.extensions.remove(ext) + for ext in self.extensions[:]: + if ext.name in remove_modules: + self.extensions.remove(ext) # When you run "make CC=altcc" or something similar, you really want # those environment variables passed into the setup.py phase. Here's @@ -397,7 +396,7 @@ class PyBuildExt(build_ext): # Check for MacOS X, which doesn't need libm.a at all math_libs = ['m'] - if platform in ['darwin', 'beos', 'mac']: + if platform in ['darwin', 'beos']: math_libs = [] # XXX Omitted modules: gl, pure, dl, SGI-specific modules @@ -485,19 +484,16 @@ class PyBuildExt(build_ext): # fcntl(2) and ioctl(2) exts.append( Extension('fcntl', ['fcntlmodule.c']) ) - if platform not in ['mac']: - # pwd(3) - exts.append( Extension('pwd', ['pwdmodule.c']) ) - # grp(3) - exts.append( Extension('grp', ['grpmodule.c']) ) - # spwd, shadow passwords - if (config_h_vars.get('HAVE_GETSPNAM', False) or - config_h_vars.get('HAVE_GETSPENT', False)): - exts.append( Extension('spwd', ['spwdmodule.c']) ) - else: - missing.append('spwd') + # pwd(3) + exts.append( Extension('pwd', ['pwdmodule.c']) ) + # grp(3) + exts.append( Extension('grp', ['grpmodule.c']) ) + # spwd, shadow passwords + if (config_h_vars.get('HAVE_GETSPNAM', False) or + config_h_vars.get('HAVE_GETSPENT', False)): + exts.append( Extension('spwd', ['spwdmodule.c']) ) else: - missing.extend(['pwd', 'grp', 'spwd']) + missing.append('spwd') # select(2); not on ancient System V exts.append( Extension('select', ['selectmodule.c']) ) @@ -510,17 +506,14 @@ class PyBuildExt(build_ext): exts.append( Extension('cPickle', ['cPickle.c']) ) # Memory-mapped files (also works on Win32). - if platform not in ['atheos', 'mac']: + if platform not in ['atheos']: exts.append( Extension('mmap', ['mmapmodule.c']) ) else: missing.append('mmap') # Lance Ellinghaus's syslog module - if platform not in ['mac']: - # syslog daemon interface - exts.append( Extension('syslog', ['syslogmodule.c']) ) - else: - missing.append('syslog') + # syslog daemon interface + exts.append( Extension('syslog', ['syslogmodule.c']) ) # George Neville-Neil's timing module: # Deprecated in PEP 4 http://www.python.org/peps/pep-0004.html @@ -592,16 +585,13 @@ class PyBuildExt(build_ext): else: missing.append('readline') - if platform not in ['mac']: - # crypt module. + # crypt module. - if self.compiler.find_library_file(lib_dirs, 'crypt'): - libs = ['crypt'] - else: - libs = [] - exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) ) + if self.compiler.find_library_file(lib_dirs, 'crypt'): + libs = ['crypt'] else: - missing.append('crypt') + libs = [] + exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) ) # CSV files exts.append( Extension('_csv', ['_csv.c']) ) @@ -1093,7 +1083,7 @@ class PyBuildExt(build_ext): missing.append('gdbm') # Unix-only modules - if platform not in ['mac', 'win32']: + if platform not in ['win32']: # Steen Lumholt's termios module exts.append( Extension('termios', ['termios.c']) ) # Jeremy Hylton's rlimit interface