From: Christian Heimes <christian@cheimes.de>
Date: Fri, 22 Aug 2008 20:10:27 +0000 (+0000)
Subject: Fixed two format strings in the _collections module. For example
X-Git-Tag: v2.6rc1~145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1cc69636effca5c74c49044b2c120aeaffacada9;p=thirdparty%2FPython%2Fcpython.git

Fixed two format strings in the _collections module. For example
Modules/_collectionsmodule.c:674: warning: format '%i' expects type 'int', but argument 2 has type 'Py_ssize_t'
Reviewed by Benjamin Peterson
---

diff --git a/Misc/NEWS b/Misc/NEWS
index e5b37a95b0a2..07fc1f350431 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,8 @@ Library
 
 - Silenced a trivial compiler warning in the sqlite module.
 
+- Fixed two format strings in the _collections module.
+
 
 What's New in Python 2.6 beta 3?
 ================================
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index 4517811479d4..82bfb14e69dd 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -670,7 +670,7 @@ deque_repr(PyObject *deque)
 		return NULL;
 	}
 	if (((dequeobject *)deque)->maxlen != -1)
-		fmt = PyString_FromFormat("deque(%%r, maxlen=%i)", 
+		fmt = PyString_FromFormat("deque(%%r, maxlen=%" PY_FORMAT_SIZE_T "i)", 
 					((dequeobject *)deque)->maxlen);
 	else
 		fmt = PyString_FromString("deque(%r)");  
@@ -733,7 +733,7 @@ deque_tp_print(PyObject *deque, FILE *fp, int flags)
 	if (((dequeobject *)deque)->maxlen == -1)
 		fputs("])", fp);
 	else
-		fprintf(fp, "], maxlen=%d)", ((dequeobject *)deque)->maxlen);
+		fprintf(fp, "], maxlen=%" PY_FORMAT_SIZE_T "d)", ((dequeobject *)deque)->maxlen);
 	Py_END_ALLOW_THREADS
 	return 0;
 }