From: Andrew M. Kuchling <amk@amk.ca>
Date: Fri, 29 Sep 2006 17:52:32 +0000 (+0000)
Subject: [Backport rev. 41696 by neal.norwitz]
X-Git-Tag: v2.4.4c1~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21e2af3562024d3bdf0bb90eb6f766bc16ec97ca;p=thirdparty%2FPython%2Fcpython.git

[Backport rev. 41696 by neal.norwitz]

Fix an int/long mismatch identified here:
        http://www.tortall.net/mu/blog/2005/12/01

Pointed out from SF #1365916.

Backport candidate.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 4e454bec1ad3..80aeba9156bc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.4.4c1?
 Core and builtins
 -----------------
 
+- Bug #1365916: Fix an int/long mismatch in the sorted() built-in.
+
 - Fix memory leak of coding spec in Parser/tokenizer.c.
  
 - Overflow checking code in integer division ran afoul of new gcc
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 6d30391712c6..bf61640b30ba 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1811,9 +1811,10 @@ builtin_sorted(PyObject *self, PyObject *args, PyObject *kwds)
 	PyObject *newlist, *v, *seq, *compare=NULL, *keyfunc=NULL, *newargs;
 	PyObject *callable;
 	static char *kwlist[] = {"iterable", "cmp", "key", "reverse", 0};
-	long reverse;
+	int reverse;
 
 	if (args != NULL) {
+	        /* args 1-4 should match listsort in Objects/listobject.c */
 		if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|OOi:sorted",
 			kwlist, &seq, &compare, &keyfunc, &reverse))
 			return NULL;