os2 patch by Jeff Rush

3 files changed, 15 insertions, 4 deletions

diff --git a/Lib/os.py b/Lib/os.py
index 7f9e696..16d0af9 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -59,6 +59,18 @@ elif 'dos' in _names:
 	import dospath
 	path = dospath
 	del dospath
+elif 'os2' in _names:
+	name = 'os2'
+	curdir = '.'; pardir = '..'; sep = '\\'; pathsep = ';'
+	defpath = '.;C:\\bin'
+	from os2 import *
+	try:
+		from os2 import _exit
+	except ImportError:
+		pass
+	import ntpath
+	path = ntpath
+	del ntpath
 elif 'mac' in _names:
 	name = 'mac'
 	curdir = ':'; pardir = '::'; sep = ':'; pathsep = '\n'
diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
index 85bfa41..53185b1 100644
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -35,7 +35,7 @@ else:
 
 def test():
 	import sys
-	if sys.platform[:3] in ('win', 'mac'):
+	if sys.platform[:3] in ('win', 'mac', 'os2'):
 		if verbose:
 			print "Can't test select easily on", sys.platform
 		return
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 51b120b..2d33635 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -4,9 +4,8 @@ import signal
 import os
 import sys
 
-if sys.platform[:3] == 'win':
-    raise ImportError, "Can't test signal on Windows"
-
+if sys.platform[:3] in ('win', 'os2'):
+    raise ImportError, "Can't test signal on %s" % sys.platform[:3]
 
 if verbose:
 	x = '-x'