diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2008-09-04 11:24:53 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2008-09-04 11:24:53 (GMT) |
| commit | b12716b9460f1592506943b6934a4873edaca846 (patch) | |
| tree | 5ccc55cb11bfdcb07b2b993dc9701234c83f785f /Lib/platform.py | |
| parent | b212b75c226482ea119140d908e808fd9e75c46c (diff) | |
| download | cpython-b12716b9460f1592506943b6934a4873edaca846.zip cpython-b12716b9460f1592506943b6934a4873edaca846.tar.gz cpython-b12716b9460f1592506943b6934a4873edaca846.tar.bz2 | |
Merged revisions 66213 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66213 | hirokazu.yamamoto | 2008-09-04 20:15:14 +0900 | 1 line
Issue #3762: platform.architecture() fails if python is lanched via its symbolic link.
Reviewed by Amaury Forgeot d'Arc.
........
Diffstat (limited to 'Lib/platform.py')
| -rwxr-xr-x | Lib/platform.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index 56ab759..740983b 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -909,7 +909,7 @@ def _follow_symlinks(filepath): filepath = os.path.abspath(filepath) while os.path.islink(filepath): filepath = os.path.normpath( - os.path.join(filepath,os.readlink(filepath))) + os.path.join(os.path.dirname(filepath),os.readlink(filepath))) return filepath def _syscmd_uname(option,default=''): |