[Python-checkins] python/dist/src/Objects listobject.c,2.169,2.170

[rhettinger at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1:/tmp/cvs-serv9388/Objects

Modified Files:
	listobject.c 
Log Message:
Guido grants a Christmas wish:  
  sorted() becomes a regular function instead of a classmethod.



Index: listobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v
retrieving revision 2.169
retrieving revision 2.170
diff -C2 -d -r2.169 -r2.170
*** listobject.c	13 Dec 2003 11:26:11 -0000	2.169
--- listobject.c	17 Dec 2003 20:43:33 -0000	2.170
***************
*** 2022,2057 ****
  
  static PyObject *
- listsorted(PyObject *cls, PyObject *args, PyObject *kwds)
- {
- 	PyObject *newlist, *v, *seq, *compare=NULL, *keyfunc=NULL, *newargs;
- 	static char *kwlist[] = {"iterable", "cmp", "key", "reverse", 0};
- 	long reverse;
- 
- 	if (args != NULL) {
- 		if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|OOi:sorted",
- 			kwlist, &seq, &compare, &keyfunc, &reverse))
- 			return NULL;
- 	}
- 
- 	newlist = PyObject_CallFunctionObjArgs(cls, seq, NULL);
- 	if (newlist == NULL)
- 		return NULL;
- 	
- 	newargs = PyTuple_GetSlice(args, 1, 4);
- 	if (newargs == NULL) {
- 		Py_DECREF(newlist);
- 		return NULL;
- 	}
- 	v = listsort((PyListObject *)newlist, newargs, kwds);
- 	Py_DECREF(newargs);
- 	if (v == NULL) {
- 		Py_DECREF(newlist);
- 		return NULL;
- 	}
- 	Py_DECREF(v);
- 	return newlist;
- }
- 
- static PyObject *
  listreverse(PyListObject *self)
  {
--- 2022,2025 ----
***************
*** 2395,2401 ****
  "L.sort(cmp=None, key=None, reverse=False) -- stable sort *IN PLACE*;\n\
  cmp(x, y) -> -1, 0, 1");
- PyDoc_STRVAR(sorted_doc,
- "list.sorted(iterable, cmp=None, key=None, reverse=False) --> new sorted list;\n\
- cmp(x, y) -> -1, 0, 1");
  
  static PyObject *list_subscript(PyListObject*, PyObject*);
--- 2363,2366 ----
***************
*** 2413,2418 ****
  	{"reverse",	(PyCFunction)listreverse, METH_NOARGS, reverse_doc},
  	{"sort",	(PyCFunction)listsort, 	  METH_VARARGS | METH_KEYWORDS, sort_doc},
- 	{"sorted",	(PyCFunction)listsorted,  
- 		METH_VARARGS | METH_KEYWORDS | METH_CLASS, sorted_doc},
   	{NULL,		NULL}		/* sentinel */
  };
--- 2378,2381 ----