[Python-3000-checkins] r66106 - in python/branches/py3k: Lib/platform.py

hirokazu.yamamoto python-3000-checkins at python.org
Mon Sep 1 16:35:47 CEST 2008


Author: hirokazu.yamamoto
Date: Mon Sep  1 16:35:47 2008
New Revision: 66106

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


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	Mon Sep  1 16:35:47 2008
@@ -940,6 +940,9 @@
         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)


More information about the Python-3000-checkins mailing list