mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

#18705: merge with 3.3.

Browse source
This commit is contained in:
Ezio Melotti 2013-08-17 15:53:55 +03:00
commit 9a3777e525
26 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/platform.py
View file

@ -230,7 +230,7 @@ def _dist_try_harder(distname,version,id):
return 'OpenLinux',pkg[1],id
if os.path.isdir('/usr/lib/setup'):
# Check for slackware verson tag file (thanks to Greg Andruk)
# Check for slackware version tag file (thanks to Greg Andruk)
verfiles = os.listdir('/usr/lib/setup')
for n in range(len(verfiles)-1, -1, -1):
if verfiles[n][:14] != 'slack-version-':
@ -282,7 +282,7 @@ def _parse_release_file(firstline):
if m is not None:
return tuple(m.groups())
# Unkown format... take the first two words
# Unknown format... take the first two words
l = firstline.strip().split()
if l:
version = l[0]
@ -649,7 +649,7 @@ def _mac_ver_xml():
versioninfo=('', '', '')
machine = os.uname().machine
if machine in ('ppc', 'Power Macintosh'):
# Cannonical name
# Canonical name
machine = 'PowerPC'
return release,versioninfo,machine
@ -661,7 +661,7 @@ def mac_ver(release='',versioninfo=('','',''),machine=''):
versioninfo, machine) with versioninfo being a tuple (version,
dev_stage, non_release_version).
Entries which cannot be determined are set to the paramter values
Entries which cannot be determined are set to the parameter values
which default to ''. All tuple entries are strings.
"""