[Python-checkins] cpython (merge 3.4 -> default): - Merge 3.4

matthias.klose python-checkins at python.org
Thu Apr 17 19:49:13 CEST 2014


http://hg.python.org/cpython/rev/bdf002b9c20c
changeset:   90385:bdf002b9c20c
parent:      90383:4e4eb69a1724
parent:      90384:ca2edbefca35
user:        doko at ubuntu.com
date:        Thu Apr 17 19:49:00 2014 +0200
summary:
  - Merge 3.4

files:
  Lib/test/test_socket.py |  2 +-
  Misc/NEWS               |  9 +++++++++
  Modules/posixmodule.c   |  2 +-
  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
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -867,7 +867,7 @@
         # 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
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 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 @@
 - 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 @@
 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
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -92,7 +92,7 @@
 #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
--- 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);

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list