merge

Doc/whatsnew/3.3.rst

@@ -136,6 +136,12 @@ Changes to Python's build process and to the C API include:
 * Stub
 
 
+Unsupported operating systems
+=============================
+
+OS/2 and VMS are no more supported because of the lack of maintainer.
+
+
 Porting to Python 3.3
 =====================
 

Misc/NEWS

@@ -10,6 +10,9 @@ What's New in Python 3.3 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #11918: OS/2 and VMS are no more supported because of the lack of
+  maintainer.
+
 - Issue #6780: fix starts/endswith error message to mention that tuples are
   accepted too.
 

Modules/main.c

@@ -6,6 +6,7 @@
 #include <locale.h>
 
 #ifdef __VMS
+#error "PEP 11: VMS is now unsupported, code will be removed in Python 3.4"
 #include <unixlib.h>
 #endif
 

Modules/posixmodule.c

@@ -30,6 +30,7 @@
 #include "Python.h"
 
 #if defined(__VMS)
+#    error "PEP 11: VMS is now unsupported, code will be removed in Python 3.4"
 #    include <unixio.h>
 #endif /* defined(__VMS) */
 
@@ -45,6 +46,7 @@ corresponding Unix manual entries for more information on calls.");
 
 
 #if defined(PYOS_OS2)
+#error "PEP 11: OS/2 is now unsupported, code will be removed in Python 3.4"
 #define  INCL_DOS
 #define  INCL_DOSERRORS
 #define  INCL_DOSPROCESS

PC/os2emx/pyconfig.h

@@ -1,6 +1,8 @@
 #ifndef Py_CONFIG_H
 #define Py_CONFIG_H
 
+#error "PEP 11: OS/2 is now unsupported, code will be removed in Python 3.4"
+
 /* config.h.
  * At some time in the past, generated automatically by/from configure.
  * now maintained manually.