python#16135: Removal of OS/2 support (I)

jcea · jcea · commit b48925a40602 · 2012-10-05T01:04:27.000+02:00
diff --git a/Mac/Tools/bundlebuilder.py b/Mac/Tools/bundlebuilder.py
@@ -270,7 +270,7 @@ def __load():
 del __load
 """
 
-MAYMISS_MODULES = ['mac', 'os2', 'nt', 'ntpath', 'dos', 'dospath',
+MAYMISS_MODULES = ['mac', 'nt', 'ntpath', 'dos', 'dospath',
     'win32api', 'ce', '_winreg', 'nturl2path', 'sitecustomize',
     'org.python.core', 'riscos', 'riscosenviron', 'riscospath'
 ]
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -125,6 +125,8 @@ Build
 - Issue #15923: Fix a mistake in ``asdl_c.py`` that resulted in a TypeError
   after 2801bf875a24 (see #15801).
 
+- Issue #16135: Remove OS/2 support.
+
 - Issue #15819: Make sure we can build Python out-of-tree from a readonly source
   directory.  (Somewhat related to Issue #9860.)
 
diff --git a/Python/dynload_os2.c b/Python/dynload_os2.c
diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c
@@ -18,10 +18,6 @@
 
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
-#else
-#if defined(PYOS_OS2) && defined(PYCC_GCC)
-#include "dlfcn.h"
-#endif
 #endif
 
 #if (defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)
@@ -40,10 +36,6 @@ const char *_PyImport_DynLoadFiletab[] = {
 #ifdef __CYGWIN__
     ".dll",
 #else  /* !__CYGWIN__ */
-#if defined(PYOS_OS2) && defined(PYCC_GCC)
-    ".pyd",
-    ".dll",
-#else  /* !(defined(PYOS_OS2) && defined(PYCC_GCC)) */
 #ifdef __VMS
     ".exe",
     ".EXE",
@@ -52,7 +44,6 @@ const char *_PyImport_DynLoadFiletab[] = {
     ".abi" PYTHON_ABI_STRING ".so",
     ".so",
 #endif  /* __VMS */
-#endif  /* defined(PYOS_OS2) && defined(PYCC_GCC) */
 #endif  /* __CYGWIN__ */
     NULL,
 };
@@ -111,9 +102,7 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
         }
     }
 
-#if !(defined(PYOS_OS2) && defined(PYCC_GCC))
     dlopenflags = PyThreadState_GET()->interp->dlopenflags;
-#endif
 
 #ifdef __VMS
     /* VMS currently don't allow a pathname, use a logical name instead */
diff --git a/Python/importdl.h b/Python/importdl.h
@@ -18,13 +18,8 @@ extern PyObject *_PyImport_LoadDynamicModule(PyObject *name, PyObject *pathname,
 #include <windows.h>
 typedef FARPROC dl_funcptr;
 #else
-#if defined(PYOS_OS2) && !defined(PYCC_GCC)
-#include <os2def.h>
-typedef int (* APIENTRY dl_funcptr)();
-#else
 typedef void (*dl_funcptr)(void);
 #endif
-#endif
 
 
 #ifdef __cplusplus
diff --git a/Python/thread.c b/Python/thread.c
@@ -91,10 +91,6 @@ static size_t _pythread_stacksize = 0;
 #include "thread_nt.h"
 #endif
 
-#ifdef OS2_THREADS
-#define PYTHREAD_NAME "os2"
-#include "thread_os2.h"
-#endif
 
 /*
 #ifdef FOOBAR_THREADS
diff --git a/Python/thread_os2.h b/Python/thread_os2.h

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ def __load():`
`270`	`270`	`del __load`
`271`	`271`	`"""`
`272`	`272`
`273`		`-MAYMISS_MODULES = ['mac', 'os2', 'nt', 'ntpath', 'dos', 'dospath',`
	`273`	`+MAYMISS_MODULES = ['mac', 'nt', 'ntpath', 'dos', 'dospath',`
`274`	`274`	`'win32api', 'ce', '_winreg', 'nturl2path', 'sitecustomize',`
`275`	`275`	`'org.python.core', 'riscos', 'riscosenviron', 'riscospath'`
`276`	`276`	`]`