Skip to content

bpo-35346: Drop Mac OS 9 support from platform #10959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 2 commits into from
Dec 12, 2018
Merged

bpo-35346: Drop Mac OS 9 support from platform #10959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7bb40f
bpo-35346: Drop Mac OS 9 support from platform
vstinner Dec 5, 2018
720f137
Merge branch 'master' into platform_macos9
vstinner Dec 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions Lib/platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ def _mac_ver_xml():

def mac_ver(release='', versioninfo=('', '', ''), machine=''):

""" Get MacOS version information and return it as tuple (release,
""" Get macOS version information and return it as tuple (release,
versioninfo, machine) with versioninfo being a tuple (version,
dev_stage, non_release_version).

Expand Down Expand Up @@ -478,12 +478,7 @@ def system_alias(system, release, version):
where it would otherwise cause confusion.

"""
if system == 'Rhapsody':
# Apple's BSD derivative
# XXX How can we determine the marketing release number ?
return 'MacOS X Server', system+release, version

elif system == 'SunOS':
if system == 'SunOS':
# Sun's OS
if release < '5':
# These releases use the old name SunOS
Expand Down Expand Up @@ -1166,7 +1161,6 @@ def platform(aliased=0, terse=0):
# macOS (darwin kernel)
macos_release = mac_ver()[0]
if macos_release:
# note: 'macOS' is different than 'MacOS' used below
system = 'macOS'
release = macos_release

Expand Down Expand Up @@ -1194,13 +1188,6 @@ def platform(aliased=0, terse=0):
'on',
os_name, os_version, os_arch)

elif system == 'MacOS':
# MacOS platforms
if terse:
platform = _platform(system, release)
else:
platform = _platform(system, release, machine)

else:
# Generic handler
if terse:
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-12-05-22-52-21.bpo-35346.Okm9-S.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Drop Mac OS 9 and Rhapsody support from the :mod:`platform` module. Rhapsody
last release was in 2000. Mac OS 9 last release was in 2001.