Deprecated statvfs for removal in 3.0.
diff --git a/Doc/library/statvfs.rst b/Doc/library/statvfs.rst
index 0b32f65..63fcfa4 100644
--- a/Doc/library/statvfs.rst
+++ b/Doc/library/statvfs.rst
@@ -3,6 +3,12 @@
.. module:: statvfs
:synopsis: Constants for interpreting the result of os.statvfs().
+ :deprecated:
+
+.. deprecated:: 2.6
+ The :mod:`statvfs` module has been deprecated for removal in Python 3.0.
+
+
.. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
diff --git a/Lib/statvfs.py b/Lib/statvfs.py
index 06a323f..f572422 100644
--- a/Lib/statvfs.py
+++ b/Lib/statvfs.py
@@ -1,4 +1,7 @@
"""Constants for interpreting the results of os.statvfs() and os.fstatvfs()."""
+from warnings import warnpy3k
+warnpy3k("the statvfs module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
# Indices for statvfs struct members in the tuple returned by
# os.statvfs() and os.fstatvfs().
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 2561f2a..6864dae 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -130,7 +130,7 @@
# import side-effect.
all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new', 'rexec',
'Bastion', 'compiler', 'dircache', 'fpformat',
- 'ihooks', 'mhlib')
+ 'ihooks', 'mhlib', 'statvfs')
inclusive_platforms = {'irix' : ('pure', 'AL', 'al', 'CD', 'cd', 'cddb',
'cdplayer', 'CL', 'cl', 'DEVICE', 'GL',
'gl', 'ERRNO', 'FILE', 'FL', 'flp', 'fl',
diff --git a/Misc/NEWS b/Misc/NEWS
index 95eeb2d..3287280 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,8 @@
Library
-------
+- The statvfs module has been deprecated for removal in Python 3.0.
+
- The sunaudiodev and SUNAUDIODEV modules have been deprecated for removal in
Python 3.0.