Skip to content

Commit f57c278

Browse files
committed
adapt to upstream PR changes
1 parent 66e9d81 commit f57c278

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

stringdtype/stringdtype/src/casts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ string_to_string_resolve_descriptors(PyObject *NPY_UNUSED(self),
4242
npy_intp *view_offset)
4343
{
4444
if (given_descrs[1] == NULL) {
45-
loop_descrs[1] = stringdtype_get_unique_array_descr(given_descrs[0]);
45+
loop_descrs[1] = stringdtype_finalize_descr(given_descrs[0]);
4646
}
4747
else {
4848
Py_INCREF(given_descrs[1]);

stringdtype/stringdtype/src/dtype.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ stringdtype_is_known_scalar_type(PyArray_DTypeMeta *NPY_UNUSED(cls),
599599
}
600600

601601
PyArray_Descr *
602-
stringdtype_get_unique_array_descr(PyArray_Descr *dtype)
602+
stringdtype_finalize_descr(PyArray_Descr *dtype)
603603
{
604604
StringDTypeObject *sdtype = (StringDTypeObject *)dtype;
605605
if (sdtype->array_owned == 0) {
@@ -626,7 +626,7 @@ static PyType_Slot StringDType_Slots[] = {
626626
{NPY_DT_PyArray_ArrFuncs_argmax, &argmax},
627627
{NPY_DT_PyArray_ArrFuncs_argmin, &argmin},
628628
{NPY_DT_get_clear_loop, &stringdtype_get_clear_loop},
629-
{NPY_DT_get_unique_array_descr, &stringdtype_get_unique_array_descr},
629+
{NPY_DT_finalize_descr, &stringdtype_finalize_descr},
630630
{_NPY_DT_is_known_scalar_type, &stringdtype_is_known_scalar_type},
631631
{0, NULL}};
632632

@@ -851,7 +851,7 @@ init_string_dtype(void)
851851
PyArrayMethod_Spec **StringDType_casts = get_casts();
852852

853853
PyArrayDTypeMeta_Spec StringDType_DTypeSpec = {
854-
.flags = NPY_DT_PARAMETRIC | NPY_DT_UNIQUE_ARRAY_DESCRIPTOR,
854+
.flags = NPY_DT_PARAMETRIC,
855855
.typeobj = StringScalar_Type,
856856
.slots = StringDType_Slots,
857857
.casts = StringDType_casts,

stringdtype/stringdtype/src/dtype.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ free_and_copy(npy_string_allocator *in_allocator,
7070
npy_packed_static_string *out, const char *location);
7171

7272
PyArray_Descr *
73-
stringdtype_get_unique_array_descr(PyArray_Descr *dtype);
73+
stringdtype_finalize_descr(PyArray_Descr *dtype);
7474

7575
int
7676
_eq_comparison(int scoerce, int ocoerce, PyObject *sna, PyObject *ona);

0 commit comments

Comments
 (0)