diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2008-09-01 14:35:47 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2008-09-01 14:35:47 (GMT) |
| commit | d26782e8639df937fac1ef3f208986274138d5c1 (patch) | |
| tree | 1ab2944fd846ed432ed4f7acc3a2f25ff7753bb7 | |
| parent | af21b17387fb5c7a47a280b0bac640ebfd938996 (diff) | |
| download | cpython-d26782e8639df937fac1ef3f208986274138d5c1.zip cpython-d26782e8639df937fac1ef3f208986274138d5c1.tar.gz cpython-d26782e8639df937fac1ef3f208986274138d5c1.tar.bz2 | |
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.
........
| -rwxr-xr-x | Lib/platform.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index 0182180..27ea1b4 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) |