diff options
| author | doko@ubuntu.com <doko@ubuntu.com> | 2014-04-17 19:49:00 +0200 |
|---|---|---|
| committer | doko@ubuntu.com <doko@ubuntu.com> | 2014-04-17 19:49:00 +0200 |
| commit | dc282134eed4b62322b7fac77c6c38f9b494e9ed (patch) | |
| tree | 448bb5677dd68bd14b8ee42a5b136037e7bbffc0 | |
| parent | 72f61de768dc17ad528e1b3c01a87998eff22cac (diff) | |
| parent | 4a173bc4edfbc731f227a84a26eb24b6aef91dd6 (diff) | |
| download | cpython-git-dc282134eed4b62322b7fac77c6c38f9b494e9ed.tar.gz | |
- Merge 3.4
| -rw-r--r-- | Lib/test/test_socket.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 9 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 2 | ||||
| -rw-r--r-- | Python/pythonrun.c | 4 |
4 files changed, 15 insertions, 2 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index e94f5396c5..aed10a70ac 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -867,7 +867,7 @@ class GeneralModuleTests(unittest.TestCase): # Find one service that exists, then check all the related interfaces. # I've ordered this by protocols that have both a tcp and udp # protocol, at least for modern Linuxes. - if (sys.platform.startswith(('freebsd', 'netbsd')) + if (sys.platform.startswith(('freebsd', 'netbsd', 'gnukfreebsd')) or sys.platform in ('linux', 'darwin')): # avoid the 'echo' service on this platform, as there is an # assumption breaking non-standard port/protocol entry @@ -10,6 +10,8 @@ Release date: TBA Core and Builtins ----------------- +- Issue #21274: Define PATH_MAX for GNU/Hurd in Python/pythonrun.c. + - Issue #20904: Support setting FPU precision on m68k. - Issue #21209: Fix sending tuples to custom generator objects with the yield @@ -235,6 +237,11 @@ Library - Issue #21209: Fix asyncio.tasks.CoroWrapper to workaround a bug in yield-from implementation in CPythons prior to 3.4.1. +Extension Modules +----------------- + +- Issue #21276: posixmodule: Don't define USE_XATTRS on KFreeBSD and the Hurd. + IDLE ---- @@ -280,6 +287,8 @@ Documentation Tests ----- +- Issue #21275: Fix a socket test on KFreeBSD. + - Issue #21223: Pass test_site/test_startup_imports when some of the extensions are built as builtins. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index dc9bd555b8..8cd5485ceb 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -92,7 +92,7 @@ corresponding Unix manual entries for more information on calls."); #undef HAVE_SCHED_SETAFFINITY #endif -#if defined(HAVE_SYS_XATTR_H) && defined(__GLIBC__) +#if defined(HAVE_SYS_XATTR_H) && defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__GNU__) #define USE_XATTRS #endif diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 3f460562c0..4fd51499c7 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -35,6 +35,10 @@ #define PATH_MAX MAXPATHLEN #endif +#ifdef __gnu_hurd__ +#define PATH_MAX MAXPATHLEN +#endif + _Py_IDENTIFIER(builtins); _Py_IDENTIFIER(excepthook); _Py_IDENTIFIER(flush); |