Skip to content

Commit 1972e53

Browse files
author
pilkibun
committed
undo rename
1 parent 1115bec commit 1972e53

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

pandas/_libs/lib.pyx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -312,18 +312,18 @@ def fast_unique_multiple_list_gen(object gen, bint sort=True):
312312

313313
@cython.wraparound(False)
314314
@cython.boundscheck(False)
315-
def dicts_to_array(dicts: list, _columns : list):
315+
def dicts_to_array(dicts: list, columns : list):
316316
cdef:
317317
Py_ssize_t i, j, n
318-
object result, columns
318+
object result, result_columns
319319
object row
320320
object col, onan = np.nan
321321
dict d, nt_lookup
322322

323323
n = len(dicts)
324-
have_columns = len(_columns) > 0
325-
columns = OrderedDict.fromkeys(list(_columns or []))
326-
result = OrderedDict((k, np.full(n, np.nan, dtype='O')) for k in _columns)
324+
have_columns = len(columns) > 0
325+
result_columns = OrderedDict.fromkeys(list(columns or []))
326+
result = OrderedDict((k, np.full(n, np.nan, dtype='O')) for k in columns)
327327

328328
nt_lookup = {}
329329
for i in range(n):
@@ -332,22 +332,22 @@ def dicts_to_array(dicts: list, _columns : list):
332332
d = row
333333
for k in d:
334334
v = d[k]
335-
if k not in columns:
335+
if k not in result_columns:
336336
if have_columns:
337337
continue
338-
columns[k] = None
338+
result_columns[k] = None
339339
result[k] = np.full(n, np.nan, dtype='O')
340340
result[k][i] = v
341341
elif hasattr(row, "_fields"):
342342
if type(row) not in nt_lookup:
343343
l = []
344344
for j, k in enumerate(row._fields):
345-
if k in columns or not have_columns:
345+
if k in result_columns or not have_columns:
346346
# include this field in result
347347
l.append((k, j))
348348
# create an array to store it
349-
if k not in columns:
350-
columns[k] = None
349+
if k not in result_columns:
350+
result_columns[k] = None
351351
result[k] = np.full(n, np.nan, dtype='O')
352352
# save (column_name, index) pairs
353353
nt_lookup[type(row)] = l
@@ -358,7 +358,7 @@ def dicts_to_array(dicts: list, _columns : list):
358358
msg = "'%s' at row %d is not a valid record type"
359359
raise ValueError(msg % (type(row), i))
360360

361-
return list(columns), list(result.values())
361+
return list(result_columns), list(result.values())
362362

363363

364364
def fast_zip(list ndarrays):

0 commit comments

Comments
 (0)