Renaming modules inside _bindings subpackage to not include underscor…

…e. This seems redundant since the subpackage _bindings already has an underscore.

src/python/k4a/src/k4a/_bindings/__init__.py

@@ -1,2 +1,2 @@
-from ._k4atypes import *
-from ._k4a import *
+from .k4a import *
+from .device import *

src/python/k4a/src/k4a/_bindings/_k4a.py → src/python/k4a/src/k4a/_bindings/k4a.py

@@ -13,8 +13,8 @@
 import os.path as _os_path
 import sys as _sys
 
-from ._k4atypes import *
-from ._k4atypes import _DeviceHandle, _CaptureHandle, _ImageHandle, _TransformationHandle, _memory_allocate_cb, _memory_destroy_cb
+from .k4atypes import *
+from .k4atypes import _DeviceHandle, _CaptureHandle, _ImageHandle, _TransformationHandle, _memory_allocate_cb, _memory_destroy_cb
 
 
 # Load the k4a.dll.

src/python/k4a/tests/test_k4a_AzureKinect.py

@@ -27,10 +27,10 @@ def glb_print_message(context:ctypes.c_void_p,
     print(str(level) + " in " + str(src_file) + " at line " + str(src_line) + ": " + str(message))
 
 
-def get_capture(device_handle:k4a._bindings._k4a._DeviceHandle,
+def get_capture(device_handle:k4a._bindings.k4a._DeviceHandle,
                 color_format:k4a.EImageFormat,
                 color_resolution:k4a.EColorResolution,
-                depth_mode:k4a.EDepthMode)->k4a._bindings._k4a._CaptureHandle:
+                depth_mode:k4a.EDepthMode)->k4a._bindings.k4a._CaptureHandle:
 
     global glb_capture
     global glb_color_format
@@ -65,7 +65,7 @@ def get_capture(device_handle:k4a._bindings._k4a._DeviceHandle,
         if(k4a.K4A_SUCCEEDED(status)):
 
             # Get a capture. Ignore the retured status.
-            capture = k4a._bindings._k4a._CaptureHandle()
+            capture = k4a._bindings.k4a._CaptureHandle()
             timeout_ms = ctypes.c_int32(1000)
             status = k4a.k4a_device_get_capture(
                 device_handle,
@@ -92,7 +92,7 @@ def get_1080p_bgr32_nfov_2x2binned(device_handle):
 
 
 def k4a_device_get_color_control_capability(
-    device_handle:k4a._bindings._k4a._DeviceHandle,
+    device_handle:k4a._bindings.k4a._DeviceHandle,
     color_control_command:k4a.EColorControlCommand
     )->k4a.EStatus:
 
@@ -117,7 +117,7 @@ def k4a_device_get_color_control_capability(
     return status
 
 def k4a_device_set_and_get_color_control(
-    device_handle:k4a._bindings._k4a._DeviceHandle,
+    device_handle:k4a._bindings.k4a._DeviceHandle,
     color_control_command:k4a.EColorControlCommand):
 
     mode = ctypes.c_int32(k4a.EColorControlMode.MANUAL.value)
@@ -198,7 +198,7 @@ class TestDevice_AzureKinect(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.device_handle = k4a._bindings._k4a._DeviceHandle()
+        cls.device_handle = k4a._bindings.k4a._DeviceHandle()
         status = k4a.k4a_device_open(ctypes.c_uint32(0), ctypes.byref(cls.device_handle))
         assert(k4a.K4A_SUCCEEDED(status))
 
@@ -216,7 +216,7 @@ def tearDownClass(cls):
         k4a.k4a_device_close(cls.device_handle)
 
     def test_k4a_device_open_twice_expected_fail(self):
-        device_handle_2 = k4a._bindings._k4a._DeviceHandle()
+        device_handle_2 = k4a._bindings.k4a._DeviceHandle()
         status = k4a.k4a_device_open(ctypes.c_uint32(0), ctypes.byref(device_handle_2))
         self.assertTrue(k4a.K4A_FAILED(status))
 
@@ -282,7 +282,7 @@ def test_k4a_device_get_imu_sample(self):
             self.assertNotEqual(imu_samplew.gyro_timestamp_usec, 0.0)
 
     def test_k4a_capture_create(self):
-        capture = k4a._bindings._k4a._CaptureHandle()
+        capture = k4a._bindings.k4a._CaptureHandle()
         status = k4a.k4a_capture_create(ctypes.byref(capture))
         self.assertTrue(k4a.K4A_SUCCEEDED(status))
 
@@ -296,7 +296,7 @@ def test_k4a_capture_get_color_image(self):
             self.assertIsNotNone(capture)
 
             color_image = k4a.k4a_capture_get_color_image(capture)
-            self.assertIsInstance(color_image, k4a._bindings._k4a._ImageHandle)
+            self.assertIsInstance(color_image, k4a._bindings.k4a._ImageHandle)
             k4a.k4a_image_release(color_image)
 
     def test_k4a_capture_get_depth_image(self):
@@ -305,7 +305,7 @@ def test_k4a_capture_get_depth_image(self):
             self.assertIsNotNone(capture)
 
             depth_image = k4a.k4a_capture_get_depth_image(capture)
-            self.assertIsInstance(depth_image, k4a._bindings._k4a._ImageHandle)
+            self.assertIsInstance(depth_image, k4a._bindings.k4a._ImageHandle)
             k4a.k4a_image_release(depth_image)
 
     def test_k4a_capture_get_ir_image(self):
@@ -314,7 +314,7 @@ def test_k4a_capture_get_ir_image(self):
             self.assertIsNotNone(capture)
 
             ir_image = k4a.k4a_capture_get_ir_image(capture)
-            self.assertIsInstance(ir_image, k4a._bindings._k4a._ImageHandle)
+            self.assertIsInstance(ir_image, k4a._bindings.k4a._ImageHandle)
             k4a.k4a_image_release(ir_image)
 
     def test_k4a_image_create(self):
@@ -323,7 +323,7 @@ def test_k4a_image_create(self):
         width_pixels = 512
         height_pixels = 512
         stride_pixels = 4*512
-        image_handle = k4a._bindings._k4a._ImageHandle()
+        image_handle = k4a._bindings.k4a._ImageHandle()
 
         status = k4a.k4a_image_create(ctypes.c_int(image_format.value), 
             width_pixels, height_pixels, stride_pixels, ctypes.byref(image_handle))
@@ -356,7 +356,7 @@ def test_k4a_capture_set_color_image(self):
             width_pixels = ctypes.c_int(512)
             height_pixels = ctypes.c_int(512)
             stride_bytes = ctypes.c_int(4*512)
-            image_handle = k4a._bindings._k4a._ImageHandle()
+            image_handle = k4a._bindings.k4a._ImageHandle()
             status = k4a.k4a_image_create(ctypes.c_int(image_format.value), 
                 width_pixels, height_pixels, stride_bytes, ctypes.byref(image_handle))
             self.assertEqual(k4a.EStatus.SUCCEEDED, status)
@@ -411,7 +411,7 @@ def test_k4a_capture_set_depth_image(self):
             width_pixels = ctypes.c_int(512)
             height_pixels = ctypes.c_int(512)
             stride_bytes = ctypes.c_int(4*512)
-            image_handle = k4a._bindings._k4a._ImageHandle()
+            image_handle = k4a._bindings.k4a._ImageHandle()
             status = k4a.k4a_image_create(ctypes.c_int(image_format.value), 
                 width_pixels, height_pixels, stride_bytes, ctypes.byref(image_handle))
             self.assertEqual(k4a.EStatus.SUCCEEDED, status)
@@ -466,7 +466,7 @@ def test_k4a_capture_set_ir_image(self):
             width_pixels = ctypes.c_int(512)
             height_pixels = ctypes.c_int(512)
             stride_bytes = ctypes.c_int(4*512)
-            image_handle = k4a._bindings._k4a._ImageHandle()
+            image_handle = k4a._bindings.k4a._ImageHandle()
             status = k4a.k4a_image_create(ctypes.c_int(image_format.value), 
                 width_pixels, height_pixels, stride_bytes, ctypes.byref(image_handle))
             self.assertEqual(k4a.EStatus.SUCCEEDED, status)
@@ -1433,7 +1433,7 @@ def test_k4a_transformation_depth_image_to_color_camera(self):
                         stride_bytes = width_pixels * 2
 
                         # Create an output depth image.
-                        transformed_image = k4a._bindings._k4a._ImageHandle()
+                        transformed_image = k4a._bindings.k4a._ImageHandle()
                         status = k4a.k4a_image_create(
                             image_format,
                             width_pixels,
@@ -1510,7 +1510,7 @@ def test_k4a_transformation_depth_image_to_color_camera_custom(self):
                         input_height_pixels = k4a.k4a_image_get_height_pixels(depth_image)
 
                         # Create an output depth image.
-                        transformed_depth_image = k4a._bindings._k4a._ImageHandle()
+                        transformed_depth_image = k4a._bindings.k4a._ImageHandle()
                         status = k4a.k4a_image_create(
                             image_format,
                             output_width_pixels,
@@ -1522,7 +1522,7 @@ def test_k4a_transformation_depth_image_to_color_camera_custom(self):
 
                         # Create a custom image.
                         image_format = k4a.EImageFormat.CUSTOM16
-                        custom_image = k4a._bindings._k4a._ImageHandle()
+                        custom_image = k4a._bindings.k4a._ImageHandle()
                         status = k4a.k4a_image_create(
                             image_format.value, 
                             input_width_pixels, 
@@ -1533,7 +1533,7 @@ def test_k4a_transformation_depth_image_to_color_camera_custom(self):
 
                         # Create a transformed custom image.
                         image_format = k4a.EImageFormat.CUSTOM16
-                        transformed_custom_image = k4a._bindings._k4a._ImageHandle()
+                        transformed_custom_image = k4a._bindings.k4a._ImageHandle()
                         status = k4a.k4a_image_create(
                             image_format.value,
                             output_width_pixels,
@@ -1611,7 +1611,7 @@ def test_k4a_transformation_color_image_to_depth_camera(self):
                         height_pixels = k4a.k4a_image_get_height_pixels(depth_image)
                         stride_bytes = width_pixels * 4
 
-                        transformed_image = k4a._bindings._k4a._ImageHandle()
+                        transformed_image = k4a._bindings.k4a._ImageHandle()
                         status = k4a.k4a_image_create(
                             image_format,
                             width_pixels,
@@ -1676,7 +1676,7 @@ def test_k4a_transformation_depth_image_to_point_cloud(self):
                     height_pixels = k4a.k4a_image_get_height_pixels(depth_image)
                     stride_bytes = width_pixels * 6
 
-                    xyz_image = k4a._bindings._k4a._ImageHandle()
+                    xyz_image = k4a._bindings.k4a._ImageHandle()
                     status = k4a.k4a_image_create(
                         image_format,
                         width_pixels,

src/python/k4a/tests/test_k4atypes.py

@@ -171,20 +171,20 @@ def tearDownClass(cls):
         pass
 
     def test_k4a_device_t(self):
-        device_handle = k4a._bindings._k4a._DeviceHandle()
-        self.assertIsInstance(device_handle, k4a._bindings._k4a._DeviceHandle)
+        device_handle = k4a._bindings.k4a._DeviceHandle()
+        self.assertIsInstance(device_handle, k4a._bindings.k4a._DeviceHandle)
 
     def test_k4a_capture_t(self):
-        capture_handle = k4a._bindings._k4a._CaptureHandle()
-        self.assertIsInstance(capture_handle, k4a._bindings._k4a._CaptureHandle)
+        capture_handle = k4a._bindings.k4a._CaptureHandle()
+        self.assertIsInstance(capture_handle, k4a._bindings.k4a._CaptureHandle)
 
     def test_k4a_image_t(self):
-        image_handle = k4a._bindings._k4a._ImageHandle()
-        self.assertIsInstance(image_handle, k4a._bindings._k4a._ImageHandle)
+        image_handle = k4a._bindings.k4a._ImageHandle()
+        self.assertIsInstance(image_handle, k4a._bindings.k4a._ImageHandle)
 
     def test_k4a_transformation_t(self):
-        transformation_handle = k4a._bindings._k4a._TransformationHandle()
-        self.assertIsInstance(transformation_handle, k4a._bindings._k4a._TransformationHandle)
+        transformation_handle = k4a._bindings.k4a._TransformationHandle()
+        self.assertIsInstance(transformation_handle, k4a._bindings.k4a._TransformationHandle)
 
     def test_k4a_device_configuration_t(self):
         device_config = k4a.DeviceConfiguration()
@@ -227,7 +227,7 @@ def test_k4a_hardware_version_t(self):
         self.assertEqual(len(version._fields_), 6)
 
     def test__k4a_xy(self):
-        xy = k4a._bindings._k4atypes._XY()
+        xy = k4a._bindings.k4atypes._XY()
         self.assertIsNotNone(xy)
         self.assertEqual(len(xy._fields_), 2)
 
@@ -237,7 +237,7 @@ def test_k4a_float2_t(self):
         self.assertEqual(len(xy._fields_), 2)
 
     def test__k4a_xyz(self):
-        xyz = k4a._bindings._k4atypes._XYZ()
+        xyz = k4a._bindings.k4atypes._XYZ()
         self.assertIsNotNone(xyz)
         self.assertEqual(len(xyz._fields_), 3)