summaryrefslogtreecommitdiffstats
path: root/Objects/abstract.c
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-10-26 05:06:50 (GMT)
committerTim Peters <tim.peters@gmail.com>2001-10-26 05:06:50 (GMT)
commit1fc240e85150f5cb39502a87cc9a4a0a8cbe5ab0 (patch)
treed764262205e36bcc61e7cb42895236fdca67c9d3 /Objects/abstract.c
parentb016da3b8391b7401afd95f2c90f5073976c475b (diff)
downloadcpython-1fc240e85150f5cb39502a87cc9a4a0a8cbe5ab0.zip
cpython-1fc240e85150f5cb39502a87cc9a4a0a8cbe5ab0.tar.gz
cpython-1fc240e85150f5cb39502a87cc9a4a0a8cbe5ab0.tar.bz2
Generalize dictionary() to accept a sequence of 2-sequences. At the
outer level, the iterator protocol is used for memory-efficiency (the outer sequence may be very large if fully materialized); at the inner level, PySequence_Fast() is used for time-efficiency (these should always be sequences of length 2). dictobject.c, new functions PyDict_{Merge,Update}FromSeq2. These are wholly analogous to PyDict_{Merge,Update}, but process a sequence-of-2- sequences argument instead of a mapping object. For now, I left these functions file static, so no corresponding doc changes. It's tempting to change dict.update() to allow a sequence-of-2-seqs argument too. Also changed the name of dictionary's keyword argument from "mapping" to "x". Got a better name? "mapping_or_sequence_of_pairs" isn't attractive, although more so than "mosop" <wink>. abstract.h, abstract.tex: Added new PySequence_Fast_GET_SIZE function, much faster than going thru the all-purpose PySequence_Size. libfuncs.tex: - Document dictionary(). - Fiddle tuple() and list() to admit that their argument is optional. - The long-winded repetitions of "a sequence, a container that supports iteration, or an iterator object" is getting to be a PITA. Many months ago I suggested factoring this out into "iterable object", where the definition of that could include being explicit about generators too (as is, I'm not sure a reader outside of PythonLabs could guess that "an iterator object" includes a generator call). - Please check my curly braces -- I'm going blind <0.9 wink>. abstract.c, PySequence_Tuple(): When PyObject_GetIter() fails, leave its error msg alone now (the msg it produces has improved since PySequence_Tuple was generalized to accept iterable objects, and PySequence_Tuple was also stomping on the msg in cases it shouldn't have even before PyObject_GetIter grew a better msg).
Diffstat (limited to 'Objects/abstract.c')
-rw-r--r--Objects/abstract.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 8a715c8..6b9201b 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1278,7 +1278,7 @@ PySequence_Tuple(PyObject *v)
/* Get iterator. */
it = PyObject_GetIter(v);
if (it == NULL)
- return type_error("tuple() argument must support iteration");
+ return NULL;
/* Guess result size and allocate space. */
n = PySequence_Size(v);