From: Brett Cannon <bcannon@gmail.com>
Date: Fri, 16 May 2008 00:50:02 +0000 (+0000)
Subject: Deprecated statvfs for removal in 3.0.
X-Git-Tag: v2.6b1~390
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa40bbf6252d224fb479d051d236edf6a79a0c8d;p=python

Deprecated statvfs for removal in 3.0.
---

diff --git a/Doc/library/statvfs.rst b/Doc/library/statvfs.rst
index 0b32f654c7..63fcfa4b58 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 06a323fa63..f572422e8a 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 2561f2a478..6864dae74b 100644
--- 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 95eeb2d480..3287280419 100644
--- 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.