Reverse argument order for nsmallest() and nlargest(). · java66liu/python@71df217 · GitHub

java66liu / python Public

forked from glix/python

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 71df217

Browse filesBrowse the repository at this point in the historyBrowse files

rhettinger

committed

Reverse argument order for nsmallest() and nlargest().

Reads better when the iterable is a generator expression. git-svn-id: http://svn.python.org/projects/python/trunk@36178 6015fed2-1504-0410-9fe1-9d1591cc4771

1 parent ed71722 commit 71df217
Copy full SHA for 71df217

4 files changed

+9-9Lines changed: 9 additions & 9 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Doc/lib
  • libheapq.tex
• Lib
  • difflib.py
  • test
    • test_heapq.py
• Modules
  • _heapqmodule.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Doc/lib/libheapq.tex‎

Copy file name to clipboardExpand all lines: Doc/lib/libheapq.tex

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -85,13 +85,13 @@ \section{\module{heapq} ---
85	85
86	86	The module also offers two general purpose functions based on heaps.
87	87
88		- \begin{funcdesc}{nlargest}{iterable, n}
	88	+ \begin{funcdesc}{nlargest}{n, iterable}
89	89	Return a list with the \var{n} largest elements from the dataset defined
90	90	by \var{iterable}. Equivalent to: \code{sorted(iterable, reverse=True)[:n]}
91	91	\versionadded{2.4}
92	92	\end{funcdesc}
93	93
94		- \begin{funcdesc}{nsmallest}{iterable, n}
	94	+ \begin{funcdesc}{nsmallest}{n, iterable}
95	95	Return a list with the \var{n} smallest elements from the dataset defined
96	96	by \var{iterable}. Equivalent to: \code{sorted(iterable)[:n]}
97	97	\versionadded{2.4}

Collapse file

‎Lib/difflib.py‎

Copy file name to clipboardExpand all lines: Lib/difflib.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -705,7 +705,7 @@ def get_close_matches(word, possibilities, n=3, cutoff=0.6):
705	705	result.append((s.ratio(), x))
706	706
707	707	# Move the best scorers to head of list
708		- result = heapq.nlargest(result, n)
	708	+ result = heapq.nlargest(n, result)
709	709	# Strip scores for the best n matches
710	710	return [x for score, x in result]
711	711

Collapse file

‎Lib/test/test_heapq.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_heapq.py

+4-4Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -92,13 +92,13 @@ def test_heapsort(self):
92	92
93	93	def test_nsmallest(self):
94	94	data = [random.randrange(2000) for i in range(1000)]
95		- for i in (0, 1, 2, 10, 100, 400, 999, 1000, 1100):
96		- self.assertEqual(nsmallest(data, i), sorted(data)[:i])
	95	+ for n in (0, 1, 2, 10, 100, 400, 999, 1000, 1100):
	96	+ self.assertEqual(nsmallest(n, data), sorted(data)[:n])
97	97
98	98	def test_largest(self):
99	99	data = [random.randrange(2000) for i in range(1000)]
100		- for i in (0, 1, 2, 10, 100, 400, 999, 1000, 1100):
101		- self.assertEqual(nlargest(data, i), sorted(data, reverse=True)[:i])
	100	+ for n in (0, 1, 2, 10, 100, 400, 999, 1000, 1100):
	101	+ self.assertEqual(nlargest(n, data), sorted(data, reverse=True)[:n])
102	102
103	103	def test_main(verbose=None):
104	104	test_classes = [TestHeap]

Collapse file

‎Modules/_heapqmodule.c‎

Copy file name to clipboardExpand all lines: Modules/_heapqmodule.c

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -222,7 +222,7 @@ nlargest(PyObject *self, PyObject *args)
222	222	PyObject *heap=NULL, *elem, *iterable, *sol, *it, *oldelem;
223	223	int i, n;
224	224
225		- if (!PyArg_ParseTuple(args, "Oi:nlargest", &iterable, &n))
	225	+ if (!PyArg_ParseTuple(args, "iO:nlargest", &n, &iterable))
226	226	return NULL;
227	227
228	228	it = PyObject_GetIter(iterable);
@@ -381,7 +381,7 @@ nsmallest(PyObject *self, PyObject *args)
381	381	PyObject *heap=NULL, *elem, *iterable, *los, *it, *oldelem;
382	382	int i, n;
383	383
384		- if (!PyArg_ParseTuple(args, "Oi:nsmallest", &iterable, &n))
	384	+ if (!PyArg_ParseTuple(args, "iO:nsmallest", &n, &iterable))
385	385	return NULL;
386	386
387	387	it = PyObject_GetIter(iterable);

0 commit comments

Comments

0 (0)