Deprecate the user module for removal in 3.0.

4 files changed, 8 insertions, 1 deletions

diff --git a/Doc/library/user.rst b/Doc/library/user.rst
index aa09b67..4fdd9cf 100644
--- a/Doc/library/user.rst
+++ b/Doc/library/user.rst
@@ -4,7 +4,9 @@
 
 .. module:: user
    :synopsis: A standard way to reference user-specific modules.
+   :deprecated:
 
+.. deprecated:: The user module has been removed in Python 3.0.
 
 .. index::
    pair: .pythonrc.py; file
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 7e284e5..ab8e316 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -126,7 +126,7 @@ class TestPy3KWarnings(unittest.TestCase):
 
 class TestStdlibRemovals(unittest.TestCase):
 
-    all_platforms = ('audiodev', 'imputil', 'mutex')
+    all_platforms = ('audiodev', 'imputil', 'mutex', 'user')
 
     def check_removal(self, module_name):
         """Make sure the specified module, when imported, raises a
diff --git a/Lib/user.py b/Lib/user.py
index e550e52..596f0a7 100644
--- a/Lib/user.py
+++ b/Lib/user.py
@@ -20,6 +20,9 @@ The user's .pythonrc.py could conceivably test for sys.version if it
 wishes to do different things depending on the Python version.
 
 """
+from warnings import warnpy3k
+warnpy3k("the user module has been removed in Python 3.0", stacklevel=2)
+del warnpy3k
 
 import os
 
diff --git a/Misc/NEWS b/Misc/NEWS
index d51e128..5c7d304 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,8 @@ Extension Modules
 Library
 -------
 
+- The user module has been deprecated for removal in Python 3.0.
+
 - The stringold module has been deprecated for removal in Python 3.0.
 
 - The mutex module has been deprecated for removal in Python 3.0.