summaryrefslogtreecommitdiff
path: root/Lib/platform.py
diff options
context:
space:
mode:
authorHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2008-09-01 14:35:47 +0000
committerHirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>2008-09-01 14:35:47 +0000
commitbc729515fccfca22f59d5c0610b34efff2401528 (patch)
treeed31b90b3dfaa41a42d8d5a587f14c6c2545e00a /Lib/platform.py
parent1f9e8b70d1a70d8d0c0a6c5d8f62206a45672b9e (diff)
downloadcpython-bc729515fccfca22f59d5c0610b34efff2401528.tar.gz
Merged revisions 66104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r66104 | hirokazu.yamamoto | 2008-09-01 23:32:58 +0900 | 2 lines Issue #3748: platform.architecture() printed vogus message on windows. Reviewed by Marc-Andre Lemburg. ........
Diffstat (limited to 'Lib/platform.py')
-rwxr-xr-xLib/platform.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index 0182180353..27ea1b490f 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -940,6 +940,9 @@ def _syscmd_file(target,default=''):
case the command should fail.
"""
+ if sys.platform in ('dos','win32','win16','os2'):
+ # XXX Others too ?
+ return default
target = _follow_symlinks(target)
try:
f = os.popen('file %s 2> /dev/null' % target)