remove IRIX support (closes bpo-31341) · python/cpython@f473263 · GitHub
Skip to content

Commit f473263

Browse files
benjaminpbenjaminp
committed
remove IRIX support (closes bpo-31341)
See PEP 11.
1 parent f801322 commit f473263

16 files changed

Lines changed: 36 additions & 115 deletions

File tree

‎Doc/distutils/apiref.rst‎

Lines changed: 4 additions & 7 deletions

‎Doc/library/sysconfig.rst‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,18 +173,15 @@ Other functions
173173

174174
This is used mainly to distinguish platform-specific build directories and
175175
platform-specific built distributions. Typically includes the OS name and
176-
version and the architecture (as supplied by :func:`os.uname`), although the
177-
exact information included depends on the OS; e.g. for IRIX the architecture
178-
isn't particularly important (IRIX only runs on SGI hardware), but for Linux
179-
the kernel version isn't particularly important.
176+
version and the architecture (as supplied by 'os.uname()'), although the
177+
exact information included depends on the OS; e.g., on Linux, the kernel
178+
version isn't particularly important.
180179

181180
Examples of returned values:
182181

183182
- linux-i586
184183
- linux-alpha (?)
185184
- solaris-2.6-sun4u
186-
- irix-5.3
187-
- irix64-6.2
188185

189186
Windows will return one of:
190187

‎Lib/distutils/tests/test_unixccompiler.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,6 @@ def gcv(v):
5151

5252
sysconfig.get_config_var = old_gcv
5353

54-
# irix646
55-
sys.platform = 'irix646'
56-
self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
57-
58-
# osf1V5
59-
sys.platform = 'osf1V5'
60-
self.assertEqual(self.cc.rpath_foo(), ['-rpath', '/foo'])
61-
6254
# GCC GNULD
6355
sys.platform = 'bar'
6456
def gcv(v):

‎Lib/distutils/unixccompiler.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,6 @@ def runtime_library_dir_option(self, dir):
233233
if self._is_gcc(compiler):
234234
return ["-Wl,+s", "-L" + dir]
235235
return ["+s", "-L" + dir]
236-
elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
237-
return ["-rpath", dir]
238236
else:
239237
if self._is_gcc(compiler):
240238
# gcc on non-GNU systems does not need -Wl, but can

‎Lib/distutils/util.py‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,25 @@
1616
from distutils.errors import DistutilsByteCompileError
1717

1818
def get_platform ():
19-
"""Return a string that identifies the current platform. This is used
20-
mainly to distinguish platform-specific build directories and
21-
platform-specific built distributions. Typically includes the OS name
22-
and version and the architecture (as supplied by 'os.uname()'),
23-
although the exact information included depends on the OS; eg. for IRIX
24-
the architecture isn't particularly important (IRIX only runs on SGI
25-
hardware), but for Linux the kernel version isn't particularly
26-
important.
19+
"""Return a string that identifies the current platform. This is used mainly to
20+
distinguish platform-specific build directories and platform-specific built
21+
distributions. Typically includes the OS name and version and the
22+
architecture (as supplied by 'os.uname()'), although the exact information
23+
included depends on the OS; eg. on Linux, the kernel version isn't
24+
particularly important.
2725
2826
Examples of returned values:
2927
linux-i586
3028
linux-alpha (?)
3129
solaris-2.6-sun4u
32-
irix-5.3
33-
irix64-6.2
3430
3531
Windows will return one of:
3632
win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
3733
win-ia64 (64bit Windows on Itanium)
3834
win32 (all others - specifically, sys.platform is returned)
3935
4036
For other non-POSIX platforms, currently just returns 'sys.platform'.
37+
4138
"""
4239
if os.name == 'nt':
4340
# sniff sys.version for architecture.
@@ -87,8 +84,6 @@ def get_platform ():
8784
bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
8885
machine += ".%s" % bitness[sys.maxsize]
8986
# fall through to standard osname-release-machine representation
90-
elif osname[:4] == "irix": # could be "irix64"!
91-
return "%s-%s" % (osname, release)
9287
elif osname[:3] == "aix":
9388
return "%s-%s.%s" % (osname, version, release)
9489
elif osname[:6] == "cygwin":

‎Lib/sysconfig.py‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -599,26 +599,23 @@ def get_platform():
599599
"""Return a string that identifies the current platform.
600600
601601
This is used mainly to distinguish platform-specific build directories and
602-
platform-specific built distributions. Typically includes the OS name
603-
and version and the architecture (as supplied by 'os.uname()'),
604-
although the exact information included depends on the OS; eg. for IRIX
605-
the architecture isn't particularly important (IRIX only runs on SGI
606-
hardware), but for Linux the kernel version isn't particularly
607-
important.
602+
platform-specific built distributions. Typically includes the OS name and
603+
version and the architecture (as supplied by 'os.uname()'), although the
604+
exact information included depends on the OS; on Linux, the kernel version
605+
isn't particularly important.
608606
609607
Examples of returned values:
610608
linux-i586
611609
linux-alpha (?)
612610
solaris-2.6-sun4u
613-
irix-5.3
614-
irix64-6.2
615611
616612
Windows will return one of:
617613
win-amd64 (64bit Windows on AMD64 (aka x86_64, Intel64, EM64T, etc)
618614
win-ia64 (64bit Windows on Itanium)
619615
win32 (all others - specifically, sys.platform is returned)
620616
621617
For other non-POSIX platforms, currently just returns 'sys.platform'.
618+
622619
"""
623620
if os.name == 'nt':
624621
# sniff sys.version for architecture.
@@ -666,8 +663,6 @@ def get_platform():
666663
bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
667664
machine += ".%s" % bitness[sys.maxsize]
668665
# fall through to standard osname-release-machine representation
669-
elif osname[:4] == "irix": # could be "irix64"!
670-
return "%s-%s" % (osname, release)
671666
elif osname[:3] == "aix":
672667
return "%s-%s.%s" % (osname, version, release)
673668
elif osname[:6] == "cygwin":

‎Lib/test/test_pty.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ def debug(msg):
2424

2525

2626
def normalize_output(data):
27-
# Some operating systems do conversions on newline. We could possibly
28-
# fix that by doing the appropriate termios.tcsetattr()s. I couldn't
29-
# figure out the right combo on Tru64 and I don't have an IRIX box.
30-
# So just normalize the output and doc the problem O/Ses by allowing
31-
# certain combinations for some platforms, but avoid allowing other
32-
# differences (like extra whitespace, trailing garbage, etc.)
27+
# Some operating systems do conversions on newline. We could possibly fix
28+
# that by doing the appropriate termios.tcsetattr()s. I couldn't figure out
29+
# the right combo on Tru64. So, just normalize the output and doc the
30+
# problem O/Ses by allowing certain combinations for some platforms, but
31+
# avoid allowing other differences (like extra whitespace, trailing garbage,
32+
# etc.)
3333

3434
# This is about the best we can do without getting some feedback
3535
# from someone more knowledgable.
@@ -38,7 +38,6 @@ def normalize_output(data):
3838
if data.endswith(b'\r\r\n'):
3939
return data.replace(b'\r\r\n', b'\n')
4040

41-
# IRIX apparently turns \n into \r\n.
4241
if data.endswith(b'\r\n'):
4342
return data.replace(b'\r\n', b'\n')
4443

‎Lib/uuid.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ def _lanscan_getnode():
399399

400400
def _netstat_getnode():
401401
"""Get the hardware address on Unix by running netstat."""
402-
# This might work on AIX, Tru64 UNIX and presumably on IRIX.
402+
# This might work on AIX, Tru64 UNIX.
403403
try:
404404
proc = _popen('netstat', '-ia')
405405
if not proc:

‎Misc/NEWS.d/next/Build/2017-09-04-14-43-46.bpo-31341.XLuZFk.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Per PEP 11, support for the IRIX operating system was removed.

‎Modules/Setup.dist‎

Lines changed: 0 additions & 3 deletions

0 commit comments

Comments
 (0)