Refactor and clean up str.format() code (and helpers) in advance of optimizations.
diff --git a/Include/longobject.h b/Include/longobject.h
index 237e2e6..73ca951 100644
--- a/Include/longobject.h
+++ b/Include/longobject.h
@@ -127,6 +127,12 @@
    appending a base prefix of 0[box] if base is 2, 8 or 16. */
 PyAPI_FUNC(PyObject *) _PyLong_Format(PyObject *aa, int base);
 
+/* Format the object based on the format_spec, as defined in PEP 3101
+   (Advanced String Formatting). */
+PyAPI_FUNC(PyObject *) _PyLong_FormatAdvanced(PyObject *obj,
+					      Py_UNICODE *format_spec,
+					      Py_ssize_t format_spec_len);
+
 /* These aren't really part of the long object, but they're handy. The
    functions are in Python/mystrtoul.c.
  */