MAINT: fix up after the rebase

Author: ev-br

array_api_strict/_array_object.py

@@ -40,7 +40,10 @@
     _real_to_complex_map,
     _result_type,
 )
-from ._devices import CPU_DEVICE, Device, device_supports_dtype
+from ._devices import (
+    CPU_DEVICE, Device, device_supports_dtype, _normalize_dl_device, _DLPACK_DEVICE_FOR,
+    DLDeviceType
+)
 from ._flags import get_array_api_strict_flags, set_array_api_strict_flags
 from ._typing import PyCapsule
 

array_api_strict/_creation_functions.py

@@ -247,7 +247,7 @@ def from_dlpack(
     else:
         device = None
         if hasattr(x, "__dlpack_device__"):
-            from ._array_object import _device_from_dlpack_device
+            from ._devices import _device_from_dlpack_device
 
             dl_type, dl_id = x.__dlpack_device__()
             device = _device_from_dlpack_device(dl_type, dl_id)

array_api_strict/tests/test_array_object.py

@@ -9,7 +9,8 @@
 import pytest
 
 from .. import ones, arange, reshape, asarray, result_type, all, equal, stack
-from .._array_object import Array, CPU_DEVICE, Device, DLDeviceType
+from .._array_object import Array
+from .._devices import CPU_DEVICE, Device, DLDeviceType
 from .._dtypes import (
     _all_dtypes,
     _boolean_dtypes,