From a77d0c36e561c3f56dee1c4b0fdd9451d6f8a894 Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Fri, 21 Mar 2014 10:52:33 -0400
Subject: [PATCH] Issue #19165: The formatter module graduates to full
 deprecation.

---
 Doc/whatsnew/3.5.rst | 3 ++-
 Lib/formatter.py     | 2 +-
 Misc/NEWS            | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
index dfd1bea24d0..f11291b2aaa 100644
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -165,7 +165,8 @@ Unsupported Operating Systems
 Deprecated Python modules, functions and methods
 ------------------------------------------------
 
-* None yet.
+* The :mod:`formatter` module has now graduated to full deprecation and is still
+  slated for removal in Python 3.6.
 
 
 Deprecated functions and types of the C API
diff --git a/Lib/formatter.py b/Lib/formatter.py
index d8cca52e307..769bd6a90a5 100644
--- a/Lib/formatter.py
+++ b/Lib/formatter.py
@@ -21,7 +21,7 @@ manage and inserting data into the output.
 import sys
 import warnings
 warnings.warn('the formatter module is deprecated and will be removed in '
-              'Python 3.6', PendingDeprecationWarning)
+              'Python 3.6', DeprecationWarning)
 
 
 AS_IS = None
diff --git a/Misc/NEWS b/Misc/NEWS
index e7dbfa7c9ee..ccc1f57ff5b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #19165: The formatter module now raises DeprecationWarning instead of
+  PendingDeprecationWarning.
+
 - Issue #13936: Remove the ability of datetime.time instances to be considered
   false in boolean contexts.