Index: Lib/test/test_platform.py
===================================================================
--- Lib/test/test_platform.py	(revision 82791)
+++ Lib/test/test_platform.py	(working copy)
@@ -194,6 +194,25 @@
 else:
 self.assertEquals(res[2], 'PowerPC')
 
+
+ @unittest.skipUnless(sys.platform == 'darwin', "OSX only test")
+ def test_mac_ver_with_fork(self):
+ # Issue7895: platform.mac_ver() crashes when using fork without exec
+ #
+ # This test checks that the fix for that issue works.
+ #
+ pid = os.fork()
+ if pid == 0:
+ # child
+ info = platform.mac_ver()
+ os._exit(0)
+
+ else:
+ # parent
+ cpid, sts = os.waitpid(pid, 0)
+ self.assertEquals(cpid, pid)
+ self.assertEquals(sts, 0)
+
 def test_dist(self):
 res = platform.dist()
 
Index: Lib/platform.py
===================================================================
--- Lib/platform.py	(revision 82791)
+++ Lib/platform.py	(working copy)
@@ -724,27 +724,19 @@
 
 return hex(bcd)[2:]
 
-def mac_ver(release='',versioninfo=('','',''),machine=''):
-
- """ Get MacOS version information and return it as tuple (release,
- versioninfo, machine) with versioninfo being a tuple (version,
- dev_stage, non_release_version).
-
- Entries which cannot be determined are set to the paramter values
- which default to ''. All tuple entries are strings.
-
+def _mac_ver_gestalt():
+ """
 Thanks to Mark R. Levinson for mailing documentation links and
 code examples for this function. Documentation for the
 gestalt() API is available online at:
 
 http://www.rgaros.nl/gestalt/
-
 """
 # Check whether the version info module is available
 try:
 import _gestalt
 except ImportError:
- return release,versioninfo,machine
+ return None
 # Get the infos
 sysv, sysa = _mac_ver_lookup(('sysv','sysa'))
 # Decode the infos
@@ -768,8 +760,55 @@
 machine = {0x1: '68k',
 0x2: 'PowerPC',
 0xa: 'i386'}.get(sysa,'')
+
 return release,versioninfo,machine
 
+def _mac_ver_xml():
+ fn = '/System/Library/CoreServices/SystemVersion.plist'
+ if not os.path.exists(fn):
+ return None
+
+ try:
+ import plistlib
+ except ImportError:
+ return None
+
+ pl = plistlib.readPlist(fn)
+ release = pl['ProductVersion']
+ versioninfo=('', '', '')
+ machine = os.uname()[4]
+ if machine == 'ppc':
+ # for compatibility with the gestalt based code
+ machine = 'PowerPC'
+
+ return release,versioninfo,machine
+
+
+def mac_ver(release='',versioninfo=('','',''),machine=''):
+
+ """ Get MacOS version information and return it as tuple (release,
+ versioninfo, machine) with versioninfo being a tuple (version,
+ dev_stage, non_release_version).
+
+ Entries which cannot be determined are set to the paramter values
+ which default to ''. All tuple entries are strings.
+ """
+
+ # First try reading the information from an XML file which should
+ # always be present
+ info = _mac_ver_xml()
+ if info is not None:
+ return info
+
+ # If that doesn't work for some reason fall back to reading the
+ # information using gestalt calls.
+ info = _mac_ver_gestalt()
+ if info is not None:
+ return info
+
+ # If that also doesn't work return the default values
+ return release,versioninfo,machine
+
 def _java_getprop(name,default):
 
 from java.lang import System
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://bugs.python.org/file17941/issue-7895-platform.txt">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file17941/issue-7895-platform.txt" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>