mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge AIX fixes from 3.5 into 3.6

Browse source
This commit is contained in:
Martin Panter 2016-11-14 05:04:12 +00:00
commit f8cebad290
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_fileio.py
View file

@ -377,7 +377,7 @@ class OtherFileTests:
self.assertEqual(f.writable(), True) self.assertEqual(f.writable(), True)
if sys.platform != "darwin" and \ if sys.platform != "darwin" and \
'bsd' not in sys.platform and \ 'bsd' not in sys.platform and \
not sys.platform.startswith('sunos'): not sys.platform.startswith(('sunos', 'aix')):
# Somehow /dev/tty appears seekable on some BSDs # Somehow /dev/tty appears seekable on some BSDs
self.assertEqual(f.seekable(), False) self.assertEqual(f.seekable(), False)
self.assertEqual(f.isatty(), True) self.assertEqual(f.isatty(), True)

1
Misc/ACKS
View file

@ -1308,6 +1308,7 @@ James Rutherford
Chris Ryland Chris Ryland
Bernt Røskar Brenna Bernt Røskar Brenna
Constantina S. Constantina S.
Matthieu S
Patrick Sabin Patrick Sabin
Sébastien Sablé Sébastien Sablé
Amit Saha Amit Saha

4
Modules/socketmodule.c
View file

@ -172,12 +172,14 @@ if_indextoname(index) -- return the corresponding interface name\n\
#endif #endif
#ifdef HAVE_GETHOSTBYNAME_R #ifdef HAVE_GETHOSTBYNAME_R
# if defined(_AIX) # if defined(_AIX) && !defined(_LINUX_SOURCE_COMPAT)
# define HAVE_GETHOSTBYNAME_R_3_ARG # define HAVE_GETHOSTBYNAME_R_3_ARG
# elif defined(__sun) || defined(__sgi) # elif defined(__sun) || defined(__sgi)
# define HAVE_GETHOSTBYNAME_R_5_ARG # define HAVE_GETHOSTBYNAME_R_5_ARG
# elif defined(__linux__) # elif defined(__linux__)
/* Rely on the configure script */ /* Rely on the configure script */
# elif defined(_LINUX_SOURCE_COMPAT) /* Linux compatibility on AIX */
# define HAVE_GETHOSTBYNAME_R_6_ARG
# else # else
# undef HAVE_GETHOSTBYNAME_R # undef HAVE_GETHOSTBYNAME_R
# endif # endif