diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-17 12:53:55 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-08-17 12:53:55 (GMT) |
| commit | 9a3777e525b389ec5881c3f80a482fb821ab3ea5 (patch) | |
| tree | e83520348eea751f2b02e8effa76f3cce2c644cd /Lib/platform.py | |
| parent | 07351a044960f259c8730de3f81356fbcdbe2bbf (diff) | |
| parent | 30b9d5d3af043fc2687ad11a188a34fe355e20ef (diff) | |
| download | cpython-9a3777e525b389ec5881c3f80a482fb821ab3ea5.zip cpython-9a3777e525b389ec5881c3f80a482fb821ab3ea5.tar.gz cpython-9a3777e525b389ec5881c3f80a482fb821ab3ea5.tar.bz2 | |
#18705: merge with 3.3.
Diffstat (limited to 'Lib/platform.py')
| -rwxr-xr-x | Lib/platform.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index 81e3147..cbbe6d8 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -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. """ |