From 7e19dbc92ec06a987eaae72f7cdfd32006aa4960 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 13 May 2017 12:40:52 +0300
Subject: [PATCH] bpo-28974: `object.__format__(x, '')` is now equivalent to
 `str(x)` (#506)

rather than `format(str(self), '')`.
---
 Doc/reference/datamodel.rst |  4 ++++
 Doc/whatsnew/3.7.rst        |  4 ++++
 Misc/NEWS                   |  3 +++
 Objects/typeobject.c        | 10 +---------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 25afc351e8b..36bd71a7703 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1282,6 +1282,10 @@ Basic customization
       The __format__ method of ``object`` itself raises a :exc:`TypeError`
       if passed any non-empty string.
 
+   .. versionchanged:: 3.7
+      ``object.__format__(x, '')`` is now equivalent to ``str(x)`` rather
+      than ``format(str(self), '')``.
+
 
 .. _richcmpfuncs:
 .. method:: object.__lt__(self, other)
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 57fd4e42a54..3a001d7b448 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -89,6 +89,10 @@ Other Language Changes
   a name are now supported.
   (Contributed by Serhiy Storchaka in :issue:`30024`.)
 
+* ``object.__format__(x, '')`` is now equivalent to ``str(x)`` rather than
+  ``format(str(self), '')``.
+  (Contributed by Serhiy Storchaka in :issue:`28974`.)
+
 
 New Modules
 ===========
diff --git a/Misc/NEWS b/Misc/NEWS
index 4e17a66bd96..73cd82c8b6b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.7.0 alpha 1?
 Core and Builtins
 -----------------
 
+- bpo-28974: ``object.__format__(x, '')`` is now equivalent to ``str(x)``
+  rather than ``format(str(self), '')``.
+
 - bpo-30024: Circular imports involving absolute imports with binding
   a submodule to a name are now supported.
 
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 9eb725f062b..121d66d8bca 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4493,9 +4493,6 @@ static PyObject *
 object___format___impl(PyObject *self, PyObject *format_spec)
 /*[clinic end generated code: output=34897efb543a974b input=7c3b3bc53a6fb7fa]*/
 {
-    PyObject *self_as_str = NULL;
-    PyObject *result = NULL;
-
     /* Issue 7994: If we're converting to a string, we
        should reject format specifications */
     if (PyUnicode_GET_LENGTH(format_spec) > 0) {
@@ -4504,12 +4501,7 @@ object___format___impl(PyObject *self, PyObject *format_spec)
                      self->ob_type->tp_name);
         return NULL;
     }
-    self_as_str = PyObject_Str(self);
-    if (self_as_str != NULL) {
-        result = PyObject_Format(self_as_str, format_spec);
-        Py_DECREF(self_as_str);
-    }
-    return result;
+    return PyObject_Str(self);
 }
 
 /*[clinic input]