From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Sun, 23 Dec 2012 13:12:19 +0000 (+0200)
Subject: Add NEWS and docs for #9856
X-Git-Tag: v3.4.0a1~1795
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0794fe0356fe58a7b7308a3aa872d9ea7d69a585;p=python

Add NEWS and docs for #9856
---

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 07765ce3be..c52dc06b30 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -543,6 +543,10 @@ are always available.  They are listed here in alphabetical order.
    :exc:`TypeError` exception is raised if the method is not found or if either
    the *format_spec* or the return value are not strings.
 
+   .. versionadded:: 3.4
+      ``object().__format__(format_spec)`` raises :exc:`TypeError`
+      if *format_spec* is not empty string.
+
 
 .. _func-frozenset:
 .. function:: frozenset([iterable])
diff --git a/Misc/NEWS b/Misc/NEWS
index b175c42d34..b9c42f475f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #9856: Replace deprecation warinigs with raising TypeError
+  in object.__format__. Patch by Florent Xicluna.
+
 - Issue #16597: In buffered and text IO, call close() on the underlying stream
   if invoking flush() fails.