pythoncapi
diff --git a/‎Doc/c-api/unicode.rst‎
Lines changed: 6 additions & 0 deletions b/‎Doc/c-api/unicode.rst‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎Include/object.h‎
Lines changed: 3 additions & 3 deletions b/‎Include/object.h‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎Lib/test/test_unicode.py‎
Lines changed: 4 additions & 0 deletions b/‎Lib/test/test_unicode.py‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎Objects/unicodeobject.c‎
Lines changed: 16 additions & 0 deletions b/‎Objects/unicodeobject.c‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎TODO.rst‎
Lines changed: 4 additions & 4 deletions b/‎TODO.rst‎
Lines changed: 4 additions & 4 deletions
@@ -519,6 +519,9 @@ APIs:
    | :attr:`%R`        | PyObject\*          | The result of calling          |
    |                   |                     | :c:func:`PyObject_Repr`.       |
    +-------------------+---------------------+--------------------------------+
+   | :attr:`%T`        | PyObject\*          | Object type name, equivalent   |
+   |                   |                     | to ``Py_TYPE(op)->tp_name``.   |
+   +-------------------+---------------------+--------------------------------+
 
    An unrecognized format character causes all the rest of the format string to be
    copied as-is to the result string, and any extra arguments discarded.
@@ -543,6 +546,9 @@ APIs:
       Support width and precision formatter for ``"%s"``, ``"%A"``, ``"%U"``,
       ``"%V"``, ``"%S"``, ``"%R"`` added.
 
+   .. versionchanged:: 3.7
+      Support for ``"%T"`` added.
+
 
 .. c:function:: PyObject* PyUnicode_FromFormatV(const char *format, va_list vargs)
 
 
@@ -455,10 +455,10 @@ typedef struct _typeobject {
     do { _Py_TYPE(ob) = (type); } while (0)
 
 #ifdef Py_NEWCAPI_NO_STRUCT
-PyAPI_FUNC(PyTypeObject*) _Py_TYPE_impl(PyObject *op);
-#define Py_TYPE(ob) _Py_TYPE_impl((PyObject *)(ob))
+   PyAPI_FUNC(PyTypeObject*) _Py_TYPE_impl(PyObject *op);
+#  define Py_TYPE(ob) _Py_TYPE_impl((PyObject *)(ob))
 #else
-#define Py_TYPE(ob) _Py_TYPE(ob)
+#  define Py_TYPE(ob) _Py_TYPE(ob)
 #endif
 
 
 
@@ -2655,6 +2655,10 @@ def check_format(expected, format, *args):
         check_format(r"%A:'abc\xe9\uabcd\U0010ffff'",
                      b'%%A:%A', 'abc\xe9\uabcd\U0010ffff')
 
+        # test %T (object type name)
+        check_format(r"type name: str",
+                     b'type name: %T', 'text')
+
         # test %V
         check_format('repr=abc',
                      b'repr=%V', 'abc', b'xyz')
 
@@ -2825,6 +2825,21 @@ unicode_fromformat_arg(_PyUnicodeWriter *writer,
         break;
     }
 
+    case 'T':
+    {
+        PyObject *obj = va_arg(*vargs, PyObject *);
+        PyTypeObject *type = Py_TYPE(obj);
+        Py_INCREF(type);
+        const char *type_name = type->tp_name;
+        size_t len = strlen(type_name);
+        if (unicode_fromformat_write_cstr(writer, type_name, -1, -1) < 0) {
+            Py_DECREF(type);
+            return NULL;
+        }
+        Py_DECREF(type);
+        break;
+    }
+
     case '%':
         if (_PyUnicodeWriter_WriteCharInline(writer, '%') < 0)
             return NULL;
@@ -13693,6 +13708,7 @@ _PyUnicodeWriter_WriteLatin1String(_PyUnicodeWriter *writer,
                                    const char *str, Py_ssize_t len)
 {
     Py_UCS4 maxchar;
+    assert(len >= 0);
 
     maxchar = ucs1lib_find_max_char((Py_UCS1*)str, (Py_UCS1*)str + len);
     if (_PyUnicodeWriter_Prepare(writer, len, maxchar) == -1)
 
@@ -11,10 +11,10 @@ Remove Py_TYPE()?
 
 Error::
 
-        PyErr_Format(PyExc_TypeError,
-                     "Struct() argument 1 must be a str or bytes object, "
-                     "not %.200s",
-                     Py_TYPE(format)->tp_name);
+     PyErr_Format(PyExc_TypeError,
+                  "Struct() argument 1 must be a str or bytes object, "
+                  "not %.200s",
+                  Py_TYPE(format)->tp_name);
 
 Dealloc::