From: Christian Heimes <christian@cheimes.de>
Date: Fri, 25 Oct 2013 06:31:19 +0000 (+0200)
Subject: Issue #16595: prlimit() needs Linux kernel 2.6.36+
X-Git-Tag: v3.4.0b1~552
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4a4b346a6caa46a5df0c9a7adf5c52fe3008d73;p=thirdparty%2FPython%2Fcpython.git

Issue #16595: prlimit() needs Linux kernel 2.6.36+
---

diff --git a/Doc/library/resource.rst b/Doc/library/resource.rst
index d49e13c5ad82..9bb5848e3a3c 100644
--- a/Doc/library/resource.rst
+++ b/Doc/library/resource.rst
@@ -90,7 +90,7 @@ this module for those platforms.
    :exc:`PermissionError` when the user doesn't have ``CAP_SYS_RESOURCE`` for
    the process.
 
-   Availability: Linux (glibc 2.13+)
+   Availability: Linux 2.6.36 or later with glibc 2.13 or later
 
    .. versionadded:: 3.4
 
diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py
index 239d8d5e8d8c..218465522084 100644
--- a/Lib/test/test_resource.py
+++ b/Lib/test/test_resource.py
@@ -141,6 +141,7 @@ class ResourceTest(unittest.TestCase):
 
 
     @unittest.skipUnless(hasattr(resource, 'prlimit'), 'no prlimit')
+    @support.requires_linux_version(2, 6, 36)
     def test_prlimit(self):
         self.assertRaises(TypeError, resource.prlimit)
         if os.geteuid() != 0: