@@ -2427,8 +2427,7 @@ cpdef object _concat_date_cols(tuple date_cols,
2427
2427
for i, item in enumerate (array):
2428
2428
convert_and_set_item(item, i, result_view, keep_numbers)
2429
2429
else :
2430
- for i in range (sequence_size):
2431
- array = date_cols[i]
2430
+ for i, array in enumerate (date_cols):
2432
2431
if not PyArray_Check(array):
2433
2432
all_numpy = 0
2434
2433
if len (array) < min_size or min_size == 0 :
@@ -2437,24 +2436,26 @@ cpdef object _concat_date_cols(tuple date_cols,
2437
2436
if all_numpy:
2438
2437
iters = np.zeros(sequence_size, dtype = object )
2439
2438
iters_view = iters
2440
- for i in range (sequence_size ):
2441
- iters_view[i] = PyArray_IterNew(date_cols[i] )
2439
+ for i, array in enumerate (date_cols ):
2440
+ iters_view[i] = PyArray_IterNew(array )
2442
2441
2443
2442
result = np.zeros(min_size, dtype = object )
2444
2443
result_view = result
2445
2444
2446
2445
list_to_join = [None ] * sequence_size
2447
2446
2448
- for i in range (min_size) :
2449
- if all_numpy :
2450
- for j in range (sequence_size ):
2447
+ if all_numpy :
2448
+ for i in range (min_size) :
2449
+ for j, array in enumerate (date_cols ):
2451
2450
it = < flatiter> iters_view[j]
2452
- item = PyArray_GETITEM(date_cols[j] , PyArray_ITER_DATA(it))
2451
+ item = PyArray_GETITEM(array , PyArray_ITER_DATA(it))
2453
2452
put_object_as_unicode(list_to_join, j, item)
2454
2453
PyArray_ITER_NEXT(it)
2455
- else :
2456
- for j in range (sequence_size):
2457
- put_object_as_unicode(list_to_join, j, date_cols[j][i])
2458
- result_view[i] = PyUnicode_Join(' ' , list_to_join)
2454
+ result_view[i] = PyUnicode_Join(' ' , list_to_join)
2455
+ else :
2456
+ for i in range (min_size):
2457
+ for j, array in enumerate (date_cols):
2458
+ put_object_as_unicode(list_to_join, j, array[i])
2459
+ result_view[i] = PyUnicode_Join(' ' , list_to_join)
2459
2460
2460
2461
return result
0 commit comments