diff options
author | Benjamin Peterson <benjamin@python.org> | 2017-10-26 06:55:14 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-26 06:55:14 (GMT) |
commit | 4eaf7f949069882e385f2297c9e70031caf9144c (patch) | |
tree | 49e06a8bb9d5893f2b70a6ed7d3338b6fb70404a /Lib | |
parent | 1896793520a49a6f97ae360c0b288967e56b005e (diff) | |
download | cpython-4eaf7f949069882e385f2297c9e70031caf9144c.zip cpython-4eaf7f949069882e385f2297c9e70031caf9144c.tar.gz cpython-4eaf7f949069882e385f2297c9e70031caf9144c.tar.bz2 |
fixes bpo-31866: remove code pertaining to AtheOS support (#4115)
We stop support this OS in 2007 with commit
19fab761b71a1687aee3415db3a937b5ce31975d. Let's finish.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/distutils/command/build_ext.py | 20 | ||||
-rw-r--r-- | Lib/test/test_os.py | 14 |
2 files changed, 4 insertions, 30 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 7444565..8fad9cd 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -215,9 +215,9 @@ class build_ext(Command): 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 @@ class build_ext(Command): 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 index 18edbcd..eb73af5 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -341,12 +341,7 @@ class StatAttributeTests(unittest.TestCase): @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 @@ class StatAttributeTests(unittest.TestCase): @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) |