[Python-checkins] cpython (merge default -> default): merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/a1c99fd58049
changeset:   69583:a1c99fd58049
parent:      69582:89fcadbc49df
parent:      69580:ec754f8d2917
user:        Raymond Hettinger <python at rcn.com>
date:        Tue Apr 26 13:59:59 2011 -0700
summary:
  merge

files:
  Doc/whatsnew/3.3.rst  |  6 ++++++
  Misc/NEWS             |  3 +++
  Modules/main.c        |  1 +
  Modules/posixmodule.c |  2 ++
  PC/os2emx/pyconfig.h  |  2 ++
  5 files changed, 14 insertions(+), 0 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -136,6 +136,12 @@
 * Stub
 
 
+Unsupported operating systems
+=============================
+
+OS/2 and VMS are no more supported because of the lack of maintainer.
+
+
 Porting to Python 3.3
 =====================
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 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.
 
diff --git a/Modules/main.c b/Modules/main.c
--- a/Modules/main.c
+++ b/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
 
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/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 @@
 
 
 #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
diff --git a/PC/os2emx/pyconfig.h b/PC/os2emx/pyconfig.h
--- a/PC/os2emx/pyconfig.h
+++ b/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.

-- 
Repository URL: http://hg.python.org/cpython