Skip to content

Commit cfd9c87

Browse files
committed
Only treat Python Lists as array dimensions.
Instead of treating all python sequence types as array dimensions, except for tuples and various kinds of strings, only treat Python lists as dimensions. The PyBytes_Check() function used previously is only available on Python 2.6 and newer, and it was a bit fiddly anyway. The list of exceptions would require adjustment if Python got a new kind of a sequence similar to bytes/unicodes/strings, so only checking for Lists seems more future-proof. The documentation only mentioned using Lists, so this is closer to what was documented, anyway. This should fix the buildfarm failures on systems building with Python 2.5, although I don't have Python 2.5 installed myself to test with.
1 parent 73c8e85 commit cfd9c87

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

src/pl/plpython/plpy_typeio.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -999,15 +999,7 @@ PLySequence_ToArray(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarra
999999

10001000
for (;;)
10011001
{
1002-
if (!PySequence_Check(pyptr))
1003-
break;
1004-
1005-
/* composite type */
1006-
if (PyTuple_Check(pyptr))
1007-
break;
1008-
1009-
/* string */
1010-
if (PyString_Check(pyptr) || PyBytes_Check(pyptr) || PyUnicode_Check(pyptr))
1002+
if (!PyList_Check(pyptr))
10111003
break;
10121004

10131005
if (ndim == MAXDIM)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy