From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Thu, 4 Sep 2008 11:24:53 +0000 (+0000)
Subject: Merged revisions 66213 via svnmerge from
X-Git-Tag: v3.0rc1~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b12716b9460f1592506943b6934a4873edaca846;p=python

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.
........
---

diff --git a/Lib/platform.py b/Lib/platform.py
index 56ab759cfc..740983b2cf 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=''):