summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-11-16 17:00:11 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-11-16 17:00:11 (GMT)
commit6ce4a9a9f2d690e9ce7121154fd9cc04082d7f59 (patch)
tree4aacd6f6dd48c7fdd464cfb274108b5e5d16a725 /Modules
parent260bd3e5578008682f009530faa615f74c6bcf82 (diff)
downloadcpython-6ce4a9a9f2d690e9ce7121154fd9cc04082d7f59.zip
cpython-6ce4a9a9f2d690e9ce7121154fd9cc04082d7f59.tar.gz
cpython-6ce4a9a9f2d690e9ce7121154fd9cc04082d7f59.tar.bz2
Merged revisions 76308 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76308 | mark.dickinson | 2009-11-15 16:18:58 +0000 (Sun, 15 Nov 2009) | 3 lines Issue #7228: Add '%lld' and '%llu' support to PyFormat_FromString, PyFormat_FromStringV and PyErr_Format. ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_testcapimodule.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 7e0e95c..0ed2111 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -1037,6 +1037,12 @@ test_string_from_format(PyObject *self, PyObject *args)
CHECK_1_FORMAT("%lu", unsigned long);
CHECK_1_FORMAT("%zu", size_t);
+ /* "%lld" and "%llu" support added in Python 2.7. */
+#ifdef HAVE_LONG_LONG
+ CHECK_1_FORMAT("%llu", unsigned PY_LONG_LONG);
+ CHECK_1_FORMAT("%lld", PY_LONG_LONG);
+#endif
+
Py_RETURN_NONE;
Fail: