From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Mon, 1 Sep 2008 14:35:47 +0000 (+0000)
Subject: Merged revisions 66104 via svnmerge from
X-Git-Tag: v3.0rc1~147
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d26782e8639df937fac1ef3f208986274138d5c1;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/platform.py b/Lib/platform.py
index 018218035355..27ea1b490fad 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)