fixes bpo-31866: remove code pertaining to AtheOS support (python#4115)

benjaminp · web-flow · commit 4eaf7f949069 · 2017-10-25T23:55:14.000-07:00
We stop support this OS in 2007 with commit 19fab76. Let's finish.
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
@@ -215,9 +215,9 @@ def finalize_options(self):
                 new_lib = os.path.join(new_lib, suffix)
             self.library_dirs.append(new_lib)
 
-        # for extensions under Cygwin and AtheOS Python's library directory must be
+        # For extensions under Cygwin, Python's library directory must be
         # appended to library_dirs
-        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
+        if sys.platform[:6] == 'cygwin':
             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
                 # building third party extensions
                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
@@ -715,22 +715,6 @@ def get_libraries(self, ext):
                 return ext.libraries + [pythonlib]
             else:
                 return ext.libraries
-        elif sys.platform[:6] == "atheos":
-            from distutils import sysconfig
-
-            template = "python%d.%d"
-            pythonlib = (template %
-                   (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
-            # Get SHLIBS from Makefile
-            extra = []
-            for lib in sysconfig.get_config_var('SHLIBS').split():
-                if lib.startswith('-l'):
-                    extra.append(lib[2:])
-                else:
-                    extra.append(lib)
-            # don't extend ext.libraries, it may be shared with other
-            # extensions, it is a reference to the original list
-            return ext.libraries + [pythonlib, "m"] + extra
         elif sys.platform == 'darwin':
             # Don't use the default code below
             return ext.libraries
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
@@ -341,12 +341,7 @@ def test_stat_result_pickle(self):
 
     @unittest.skipUnless(hasattr(os, 'statvfs'), 'test needs os.statvfs()')
     def test_statvfs_attributes(self):
-        try:
-            result = os.statvfs(self.fname)
-        except OSError as e:
-            # On AtheOS, glibc always returns ENOSYS
-            if e.errno == errno.ENOSYS:
-                self.skipTest('os.statvfs() failed with ENOSYS')
+        result = os.statvfs(self.fname)
 
         # Make sure direct access works
         self.assertEqual(result.f_bfree, result[3])
@@ -386,12 +381,7 @@ def test_statvfs_attributes(self):
     @unittest.skipUnless(hasattr(os, 'statvfs'),
                          "need os.statvfs()")
     def test_statvfs_result_pickle(self):
-        try:
-            result = os.statvfs(self.fname)
-        except OSError as e:
-            # On AtheOS, glibc always returns ENOSYS
-            if e.errno == errno.ENOSYS:
-                self.skipTest('os.statvfs() failed with ENOSYS')
+        result = os.statvfs(self.fname)
 
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
             p = pickle.dumps(result, proto)
diff --git a/Misc/NEWS.d/next/Build/2017-10-24-23-21-13.bpo-31866.MkNO66.rst b/Misc/NEWS.d/next/Build/2017-10-24-23-21-13.bpo-31866.MkNO66.rst
@@ -0,0 +1 @@
+Finish removing support for AtheOS.
diff --git a/Modules/_cryptmodule.c b/Modules/_cryptmodule.c
@@ -34,8 +34,6 @@ static PyObject *
 crypt_crypt_impl(PyObject *module, const char *word, const char *salt)
 /*[clinic end generated code: output=0512284a03d2803c input=0e8edec9c364352b]*/
 {
-    /* On some platforms (AtheOS) crypt returns NULL for an invalid
-       salt. Return None in that case. XXX Maybe raise an exception?  */
     return Py_BuildValue("s", crypt(word, salt));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ static PyObject *`
`34`	`34`	`crypt_crypt_impl(PyObject module, const char word, const char *salt)`
`35`	`35`	`/[clinic end generated code: output=0512284a03d2803c input=0e8edec9c364352b]/`
`36`	`36`	`{`
`37`		`- /* On some platforms (AtheOS) crypt returns NULL for an invalid`
`38`		`- salt. Return None in that case. XXX Maybe raise an exception? */`
`39`	`37`	`return Py_BuildValue("s", crypt(word, salt));`
`40`	`38`	`}`
`41`	`39`