Deprecated statvfs for removal in 3.0.

diff --git a/Doc/library/statvfs.rst b/Doc/library/statvfs.rst
index 0b32f654c74031dbc11b84af2618e12a0406ca05..63fcfa4b58b11e75c3d69b7c9151a86d3d5b8616 100644 (file)
--- 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 06a323fa63c81b74c8db65221fa12c698e4c2818..f572422e8a5b506c8800031a8b57c855ac80a96e 100644 (file)
--- 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 2561f2a4783f71b9b85c77a14726b6ecab7ce5c3..6864dae74bdc73328ffef210880b469a9c4c8c77 100644 (file)
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -130,7 +130,7 @@ class TestStdlibRemovals(unittest.TestCase):
     # 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 95eeb2d48027f565ab67f98e7f1a294acc0241dd..328728041929f326a48d855a02b9af43a990eef0 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,8 @@ Extension Modules
 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.