summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-10-25 06:31:19 (GMT)
committerChristian Heimes <christian@cheimes.de>2013-10-25 06:31:19 (GMT)
commitc4a4b346a6caa46a5df0c9a7adf5c52fe3008d73 (patch)
tree44e004abb811c7eb409ea9f2815be96323eb8772
parent2bcb1f68b65239ea08ee400af3823924124f94ce (diff)
downloadcpython-c4a4b346a6caa46a5df0c9a7adf5c52fe3008d73.zip
cpython-c4a4b346a6caa46a5df0c9a7adf5c52fe3008d73.tar.gz
cpython-c4a4b346a6caa46a5df0c9a7adf5c52fe3008d73.tar.bz2
Issue #16595: prlimit() needs Linux kernel 2.6.36+
-rw-r--r--Doc/library/resource.rst2
-rw-r--r--Lib/test/test_resource.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/resource.rst b/Doc/library/resource.rst
index d49e13c..9bb5848 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 239d8d5..2184655 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: