1 files changed, 15 insertions, 4 deletions
diff --git a/Lib/os.py b/Lib/os.py
index bf31ddc..42812aa 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -95,16 +95,27 @@ elif 'dos' in _names:
 elif 'os2' in _names:
     name = 'os2'
     linesep = '\r\n'
-    curdir = '.'; pardir = '..'; sep = '\\'; pathsep = ';'
+    curdir = '.'; pardir = '..'; pathsep = ';'
+    if sys.version.find('EMX GCC') == -1:
+        # standard OS/2 compiler (VACPP or Watcom?)
+        sep = '\\'; altsep = '/'
+    else:
+        # EMX
+        sep = '/'; altsep = '\\'
     defpath = '.;C:\\bin'
     from os2 import *
     try:
         from os2 import _exit
     except ImportError:
         pass
-    import ntpath
-    path = ntpath
-    del ntpath
+    if sys.version.find('EMX GCC') == -1:
+        import ntpath
+        path = ntpath
+        del ntpath
+    else:
+        import os2emxpath
+        path = os2emxpath
+        del os2emxpath
 
     import os2
     __all__.extend(_get_exports_list(os2))