[Jython-checkins] SF.net SVN: jython:[6189] trunk/jython/Lib

[<pj...@us...>]

Revision: 6189
          http://jython.svn.sourceforge.net/jython/?rev=6189&view=rev
Author:   pjenvey
Date:     2009-04-08 01:27:07 +0000 (Wed, 08 Apr 2009)

Log Message:
-----------
relax the Windows platform matching, don't bother special casing ce
fixes #1162

Modified Paths:
--------------
    trunk/jython/Lib/os.py
    trunk/jython/Lib/subprocess.py

Modified: trunk/jython/Lib/os.py
===================================================================
--- trunk/jython/Lib/os.py	2009-04-08 01:23:13 UTC (rev 6188)
+++ trunk/jython/Lib/os.py	2009-04-08 01:27:07 UTC (rev 6189)
@@ -57,17 +57,9 @@
 
 # Mapping of: os._name: [name list, shell command list]
 _os_map = dict(nt=[
-        ['Windows 95', 'Windows 98', 'Windows ME', 'Windows NT',
-         'Windows NT 4.0', 'WindowsNT', 'Windows 2000', 'Windows 2003',
-         'Windows XP', 'Windows Vista'],
+        ['Windows'],
         [['cmd.exe', '/c'], ['command.com', '/c']]
         ],
-
-               ce=[
-        ['Windows CE'],
-        [['cmd.exe', '/c']]
-        ],
-
                posix=[
         [], # posix is a fallback, instead of matching names
         [['/bin/sh', '-c']]
@@ -133,7 +125,7 @@
 _posix = POSIXFactory.getPOSIX(PythonPOSIXHandler(), True)
 _native_posix = not isinstance(_posix, JavaPOSIX)
 
-if _name in ('nt', 'ce'):
+if _name == 'nt':
     import ntpath as path
 else:
     import posixpath as path

Modified: trunk/jython/Lib/subprocess.py
===================================================================
--- trunk/jython/Lib/subprocess.py	2009-04-08 01:23:13 UTC (rev 6188)
+++ trunk/jython/Lib/subprocess.py	2009-04-08 01:27:07 UTC (rev 6189)
@@ -545,7 +545,7 @@
 
 if jython:
     # Escape the command line arguments with list2cmdline on Windows
-    escape_args_oses = ['nt', 'ce']
+    escape_args_oses = ['nt']
 
     escape_args = None
     shell_command = None


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.