[Jython-checkins] jython (2.5): Fix #1899: Fix to platform.py to correctly avoid a warning message on Windows.

[alan.kennedy]

http://hg.python.org/jython/rev/ce225289358a
changeset:   7053:ce225289358a
branch:      2.5
parent:      7050:1a672388105b
user:        Alan Kennedy <alan at xhaus.com>
date:        Sat Feb 16 13:13:40 2013 +0000
summary:
  Fix #1899: Fix to platform.py to correctly avoid a warning message on Windows. Updating NEWS

files:
  Lib/platform.py |  3 ++-
  NEWS            |  2 ++
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/platform.py b/Lib/platform.py
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -803,7 +803,8 @@
 
     """ Interface to the system's uname command.
     """
-    if sys.platform in ('dos','win32','win16','os2'):
+    if sys.platform in ('dos','win32','win16','os2') or \
+       (sys.platform.startswith('java') and os._name == 'nt'):
         # XXX Others too ?
         return default
     try:
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@
 
 Jython 2.5.4rc2
   Bugs Fixed
+    - [ 1899 ] Fix to platform.py to correctly avoid a warning message on Windows.
+    - [ 1988 ] API for threading.condition fails to accept *args for acquire
     - [ 1753 ] zlib doesn't call end() on compress and decompress
     - [ 1971 ] platform.py - 'NoneType' object has no attribute 'groups'
     - [ 1988 ] API for threading.condition fails to accept *args for acquire

-- 
Repository URL: http://hg.python.org/jython