hirokazu.yamamoto
2008-09-04 11:24:54 UTC
Author: hirokazu.yamamoto
Date: Thu Sep 4 13:24:53 2008
New Revision: 66216
Log:
Merged revisions 66213 via svnmerge from
svn+ssh://pythondev at 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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/platform.py
Modified: python/branches/py3k/Lib/platform.py
==============================================================================
--- python/branches/py3k/Lib/platform.py (original)
+++ python/branches/py3k/Lib/platform.py Thu Sep 4 13:24:53 2008
@@ -909,7 +909,7 @@
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=''):
Date: Thu Sep 4 13:24:53 2008
New Revision: 66216
Log:
Merged revisions 66213 via svnmerge from
svn+ssh://pythondev at 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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/platform.py
Modified: python/branches/py3k/Lib/platform.py
==============================================================================
--- python/branches/py3k/Lib/platform.py (original)
+++ python/branches/py3k/Lib/platform.py Thu Sep 4 13:24:53 2008
@@ -909,7 +909,7 @@
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=''):