remove support for BSD/OS (closes bpo-31624) (#3812)

diff --git a/Include/pyport.h b/Include/pyport.h
index dbf6db687681e2973dca7dcbb0f84945fb0b668f..2742e477fd4e8eeec6548824f30671d4a6979410 100644 (file)
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -556,16 +556,6 @@ extern char * _getpty(int *, int, mode_t, int);
 #include <sys/termio.h>
 #endif
 
-#if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY)
-#if !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H)
-/* BSDI does not supply a prototype for the 'openpty' and 'forkpty'
-   functions, even though they are included in libutil. */
-#include <termios.h>
-extern int openpty(int *, int *, char *, struct termios *, struct winsize *);
-extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
-#endif /* !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) */
-#endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) */
-
 
 /* On 4.4BSD-descendants, ctype functions serves the whole range of
  * wchar_t character set rather than single byte code points only.

diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index 5ca1f87013f5e2b21fc01132a14c98d72c9eca0b..d2a8ec281f1a6436992ed2459fecc65c6f5f7f9a 100644 (file)
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -104,10 +104,6 @@ typedef wchar_t Py_UNICODE /* Py_DEPRECATED(3.3) */;
 #endif
 
 #ifdef HAVE_WCHAR_H
-/* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */
-# ifdef _HAVE_BSDI
-#  include <time.h>
-# endif
 #  include <wchar.h>
 #endif
 

diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
index 9394c1e056476abf5e6d7030bda7790563237ab7..83682628ba680cfc261c0aeb81d9bf0043c8554d 100644 (file)
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -53,8 +53,8 @@ def get_platform ():
 
     (osname, host, release, version, machine) = os.uname()
 
-    # Convert the OS name to lowercase, remove '/' characters
-    # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh")
+    # Convert the OS name to lowercase, remove '/' characters, and translate
+    # spaces (for "Power Macintosh")
     osname = osname.lower().replace('/', '')
     machine = machine.replace(' ', '_')
     machine = machine.replace('/', '-')

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index 8dfe1a714d5e6273bdefe258c49653d099da366c..9ee4d3185a71276137a39481244846453a12f262 100644 (file)
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -632,8 +632,8 @@ def get_platform():
     # Try to distinguish various flavours of Unix
     osname, host, release, version, machine = os.uname()
 
-    # Convert the OS name to lowercase, remove '/' characters
-    # (to accommodate BSD/OS), and translate spaces (for "Power Macintosh")
+    # Convert the OS name to lowercase, remove '/' characters, and translate
+    # spaces (for "Power Macintosh")
     osname = osname.lower().replace('/', '')
     machine = machine.replace(' ', '_')
     machine = machine.replace('/', '-')

diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py
index e3b7ed20a08d24733605b2f54aa72c7b9bd596da..acd5c7cc586472d255d07255eb1a5d8b75791db8 100644 (file)
--- a/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@ -22,7 +22,7 @@ def get_lockdata():
     else:
         start_len = "qq"
 
-    if (sys.platform.startswith(('netbsd', 'freebsd', 'openbsd', 'bsdos'))
+    if (sys.platform.startswith(('netbsd', 'freebsd', 'openbsd'))
         or sys.platform == 'darwin'):
         if struct.calcsize('l') == 8:
             off_t = 'l'

diff --git a/Misc/NEWS.d/next/Build/2017-09-28-20-54-52.bpo-31624.11w91_.rst b/Misc/NEWS.d/next/Build/2017-09-28-20-54-52.bpo-31624.11w91_.rst
new file mode 100644 (file)
index 0000000..c329b43
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2017-09-28-20-54-52.bpo-31624.11w91_.rst
@@ -0,0 +1 @@
+Remove support for BSD/OS.

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 83135e536a51b23b775fa854b8b512295ae397ca..13ff9166e71add72cc316a3bae00115f86454e88 100644 (file)
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -3967,7 +3967,7 @@ os_nice_impl(PyObject *module, int increment)
 
     /* There are two flavours of 'nice': one that returns the new
        priority (as required by almost all standards out there) and the
-       Linux/FreeBSD/BSDI one, which returns '0' on success and advices
+       Linux/FreeBSD one, which returns '0' on success and advices
        the use of getpriority() to get the new priority.
 
        If we are of the nice family that returns the new priority, we

diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index ea05b6fbcfe52a7c0f2fe9704483c2578aecbe8d..2dcd107c2ce2812aede80eee6c99b6a845967b71 100644 (file)
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -149,25 +149,6 @@ typedef struct {
 /*
  * Initialization.
  */
-
-#if defined(_HAVE_BSDI)
-static
-void _noop(void)
-{
-}
-
-static void
-PyThread__init_thread(void)
-{
-    /* DO AN INIT BY STARTING THE THREAD */
-    static int dummy = 0;
-    pthread_t thread1;
-    pthread_create(&thread1, NULL, (void *) _noop, &dummy);
-    pthread_join(thread1, NULL);
-}
-
-#else /* !_HAVE_BSDI */
-
 static void
 PyThread__init_thread(void)
 {
@@ -177,8 +158,6 @@ PyThread__init_thread(void)
 #endif
 }
 
-#endif /* !_HAVE_BSDI */
-
 /*
  * Thread support.
  */

diff --git a/configure b/configure
index 819dc7a0c163386c4c1dd6d5c78fb366b0b54f21..cef9b6f2189fa29834c615195b097be41ae6f622 100755 (executable)
--- a/configure
+++ b/configure
@@ -5703,13 +5703,6 @@ $as_echo "no" >&6; }
 fi
 rmdir CaseSensitiveTestDir
 
-case $MACHDEP in
-bsdos*)
-    case $CC in
-    gcc) CC="$CC -D_HAVE_BSDI";;
-    esac;;
-esac
-
 case $ac_sys_system in
 hp*|HP*)
     case $CC in
@@ -6263,8 +6256,8 @@ fi
 
 
 case $MACHDEP in
-bsdos*|hp*|HP*)
-       # install -d does not work on BSDI or HP-UX
+hp*|HP*)
+       # install -d does not work on HP-UX
        if test -z "$INSTALL"
        then
                INSTALL="${srcdir}/install-sh -c"
@@ -9228,9 +9221,6 @@ then
        Linux*|GNU*|QNX*)
                LDSHARED='$(CC) -shared'
                LDCXXSHARED='$(CXX) -shared';;
-       BSD/OS*/4*)
-               LDSHARED="gcc -shared"
-               LDCXXSHARED="g++ -shared";;
        FreeBSD*)
                if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
                then
@@ -9298,7 +9288,6 @@ then
                 fi;;
        Linux-android*) ;;
        Linux*|GNU*) CCSHARED="-fPIC";;
-       BSD/OS*/4*) CCSHARED="-fpic";;
        FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes"
@@ -9325,7 +9314,6 @@ then
        hp*|HP*)
            LINKFORSHARED="-Wl,-E -Wl,+s";;
 #          LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
-       BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
        Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
        Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
        # -u libsys_s pulls in all symbols in libsys

diff --git a/configure.ac b/configure.ac
index e90d05d1c8dab8c67cc9e599b15cf74ceb478604..3218162f1be9dcac254d04e2638c02a165ee14bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -948,13 +948,6 @@ else
 fi
 rmdir CaseSensitiveTestDir
 
-case $MACHDEP in
-bsdos*)
-    case $CC in
-    gcc) CC="$CC -D_HAVE_BSDI";;
-    esac;;
-esac
-
 case $ac_sys_system in
 hp*|HP*)
     case $CC in
@@ -1191,8 +1184,8 @@ AC_SUBST(READELF)
 
 
 case $MACHDEP in
-bsdos*|hp*|HP*)
-       # install -d does not work on BSDI or HP-UX
+hp*|HP*)
+       # install -d does not work on HP-UX
        if test -z "$INSTALL"
        then
                INSTALL="${srcdir}/install-sh -c"
@@ -2492,9 +2485,6 @@ then
        Linux*|GNU*|QNX*)
                LDSHARED='$(CC) -shared'
                LDCXXSHARED='$(CXX) -shared';;
-       BSD/OS*/4*)
-               LDSHARED="gcc -shared"
-               LDCXXSHARED="g++ -shared";;
        FreeBSD*)
                if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
                then
@@ -2560,7 +2550,6 @@ then
                 fi;;
        Linux-android*) ;;
        Linux*|GNU*) CCSHARED="-fPIC";;
-       BSD/OS*/4*) CCSHARED="-fpic";;
        FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
        OpenUNIX*|UnixWare*)
                if test "$GCC" = "yes"
@@ -2585,7 +2574,6 @@ then
        hp*|HP*)
            LINKFORSHARED="-Wl,-E -Wl,+s";;
 #          LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
-       BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";;
        Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
        Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";;
        # -u libsys_s pulls in all symbols in libsys