{"id":16415,"url":"https://patchwork.libcamera.org/api/1.1/patches/16415/?format=json","web_url":"https://patchwork.libcamera.org/patch/16415/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220629070416.17550-10-tomi.valkeinen@ideasonboard.com>","date":"2022-06-29T07:04:11","name":"[libcamera-devel,v2,09/14] py: Use exceptions instead of returning error codes","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"3d3e00a87ce5b7ed405d122bb98ecb6f2367e0db","submitter":{"id":109,"url":"https://patchwork.libcamera.org/api/1.1/people/109/?format=json","name":"Tomi Valkeinen","email":"tomi.valkeinen@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16415/mbox/","series":[{"id":3230,"url":"https://patchwork.libcamera.org/api/1.1/series/3230/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3230","date":"2022-06-29T07:04:02","name":"Python bindings event handling","version":2,"mbox":"https://patchwork.libcamera.org/series/3230/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16415/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16415/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 2E85BBE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 29 Jun 2022 07:04:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CD82065651;\n\tWed, 29 Jun 2022 09:04:55 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8830A65644\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 29 Jun 2022 09:04:45 +0200 (CEST)","from deskari.lan (91-158-154-79.elisa-laajakaista.fi\n\t[91.158.154.79])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A49006F0;\n\tWed, 29 Jun 2022 09:04:44 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656486295;\n\tbh=ZqYHwWRhUBynORUrnYf3eXOKW55fHL0ZwI7nz+RVte0=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=Zv63ghXbfBBy5cGy13GQE3yTKo4VyPiYQmb/5sVDpBQ2h4FJDbUBJIR3XJhEnmCLy\n\tmFDLnYHARhcIKcy9PAHUaBgiDl2VdD8SDw+nJPlSz78GRLoV4a0iV5r/3xHQoVqAAz\n\t3Nz5wvOYDryf+eHnDIlHLjwd/PKSEV5g9yDaJgeJlXlDPYQKV+B76mmNvD2M6ExxtE\n\tfBF9eoDhNKc61mPy9+D632EojCc3xwdDvnWIOuIdaX5FF92JeAim5rowqzZ9jGACzb\n\t7Vpf1ufZ9UxDNOpLVm/G/7TXPOzEoiGIB6lRAW4yexdY4vKpLpQwPWaxoVtfrwEwsI\n\tgjWuhIZND7EaQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1656486285;\n\tbh=ZqYHwWRhUBynORUrnYf3eXOKW55fHL0ZwI7nz+RVte0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Rzd6PkwpfWxATPzSxDOOZKNhhonkWypPo6EBunNXptZ4lw/WWhP1kVl4Qg2anubwn\n\t7gZp125cLUgxRF+Yw3zscVKCDsy7yui1eyS7TEg5A22If6JIz7rk3Xg8RCoodBvMmD\n\tRHsP3oy3dx5skPxabC3R5RtYYGyRyhNKb5oAIMgc="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Rzd6Pkwp\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org,\n\tDavid Plowman <david.plowman@raspberrypi.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tJacopo Mondi <jacopo@jmondi.org>","Date":"Wed, 29 Jun 2022 10:04:11 +0300","Message-Id":"<20220629070416.17550-10-tomi.valkeinen@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220629070416.17550-1-tomi.valkeinen@ideasonboard.com>","References":"<20220629070416.17550-1-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 09/14] py: Use exceptions instead of\n\treturning error codes","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","From":"Tomi Valkeinen via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>","Reply-To":"Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"We have multiple methods which return an error code, mimicing the C++\nAPI. Using exceptions is more natural in the Python API, so change all\nthose methods to raise an Exception instead.\n\nSigned-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n---\n src/py/cam/cam.py                            | 16 +----\n src/py/examples/simple-cam.py                | 15 +---\n src/py/examples/simple-capture.py            | 21 ++----\n src/py/examples/simple-continuous-capture.py | 21 ++----\n src/py/libcamera/py_main.cpp                 | 62 ++++++++++++----\n test/py/unittests.py                         | 76 +++++++-------------\n 6 files changed, 93 insertions(+), 118 deletions(-)","diff":"diff --git a/src/py/cam/cam.py b/src/py/cam/cam.py\nindex 2701d937..6b6b678b 100755\n--- a/src/py/cam/cam.py\n+++ b/src/py/cam/cam.py\n@@ -158,9 +158,7 @@ class CameraContext:\n \n             print('Camera configuration adjusted')\n \n-        r = self.camera.configure(camconfig)\n-        if r != 0:\n-            raise Exception('Configure failed')\n+        self.camera.configure(camconfig)\n \n         self.stream_names = {}\n         self.streams = []\n@@ -175,12 +173,7 @@ class CameraContext:\n         allocator = libcam.FrameBufferAllocator(self.camera)\n \n         for stream in self.streams:\n-            ret = allocator.allocate(stream)\n-            if ret < 0:\n-                print('Cannot allocate buffers')\n-                exit(-1)\n-\n-            allocated = len(allocator.buffers(stream))\n+            allocated = allocator.allocate(stream)\n \n             print('{}-{}: Allocated {} buffers'.format(self.id, self.stream_names[stream], allocated))\n \n@@ -205,10 +198,7 @@ class CameraContext:\n                 buffers = self.allocator.buffers(stream)\n                 buffer = buffers[buf_num]\n \n-                ret = request.add_buffer(stream, buffer)\n-                if ret < 0:\n-                    print('Can not set buffer for request')\n-                    exit(-1)\n+                request.add_buffer(stream, buffer)\n \n             requests.append(request)\n \ndiff --git a/src/py/examples/simple-cam.py b/src/py/examples/simple-cam.py\nindex 2b81bb65..e88a4737 100755\n--- a/src/py/examples/simple-cam.py\n+++ b/src/py/examples/simple-cam.py\n@@ -258,12 +258,7 @@ def main():\n     allocator = libcam.FrameBufferAllocator(camera)\n \n     for cfg in config:\n-        ret = allocator.allocate(cfg.stream)\n-        if ret < 0:\n-            print('Can\\'t allocate buffers')\n-            return -1\n-\n-        allocated = len(allocator.buffers(cfg.stream))\n+        allocated = allocator.allocate(cfg.stream)\n         print(f'Allocated {allocated} buffers for stream')\n \n     # --------------------------------------------------------------------\n@@ -288,15 +283,9 @@ def main():\n     requests = []\n     for i in range(len(buffers)):\n         request = camera.create_request()\n-        if not request:\n-            print('Can\\'t create request')\n-            return -1\n \n         buffer = buffers[i]\n-        ret = request.add_buffer(stream, buffer)\n-        if ret < 0:\n-            print('Can\\'t set buffer for request')\n-            return -1\n+        request.add_buffer(stream, buffer)\n \n         # Controls can be added to a request on a per frame basis.\n         request.set_control(libcam.controls.Brightness, 0.5)\ndiff --git a/src/py/examples/simple-capture.py b/src/py/examples/simple-capture.py\nindex a6a9b33e..07d12dae 100755\n--- a/src/py/examples/simple-capture.py\n+++ b/src/py/examples/simple-capture.py\n@@ -42,8 +42,7 @@ def main():\n \n     # Acquire the camera for our use\n \n-    ret = cam.acquire()\n-    assert ret == 0\n+    cam.acquire()\n \n     # Configure the camera\n \n@@ -59,8 +58,7 @@ def main():\n         w, h = [int(v) for v in args.size.split('x')]\n         stream_config.size = libcam.Size(w, h)\n \n-    ret = cam.configure(cam_config)\n-    assert ret == 0\n+    cam.configure(cam_config)\n \n     print(f'Capturing {TOTAL_FRAMES} frames with {stream_config}')\n \n@@ -82,15 +80,13 @@ def main():\n         req = cam.create_request(i)\n \n         buffer = allocator.buffers(stream)[i]\n-        ret = req.add_buffer(stream, buffer)\n-        assert ret == 0\n+        req.add_buffer(stream, buffer)\n \n         reqs.append(req)\n \n     # Start the camera\n \n-    ret = cam.start()\n-    assert ret == 0\n+    cam.start()\n \n     # frames_queued and frames_done track the number of frames queued and done\n \n@@ -100,8 +96,7 @@ def main():\n     # Queue the requests to the camera\n \n     for req in reqs:\n-        ret = cam.queue_request(req)\n-        assert ret == 0\n+        cam.queue_request(req)\n         frames_queued += 1\n \n     # The main loop. Wait for the queued Requests to complete, process them,\n@@ -147,13 +142,11 @@ def main():\n \n     # Stop the camera\n \n-    ret = cam.stop()\n-    assert ret == 0\n+    cam.stop()\n \n     # Release the camera\n \n-    ret = cam.release()\n-    assert ret == 0\n+    cam.release()\n \n     return 0\n \ndiff --git a/src/py/examples/simple-continuous-capture.py b/src/py/examples/simple-continuous-capture.py\nindex fe78a2dd..ef3f87d1 100755\n--- a/src/py/examples/simple-continuous-capture.py\n+++ b/src/py/examples/simple-continuous-capture.py\n@@ -28,8 +28,7 @@ class CameraCaptureContext:\n \n         # Acquire the camera for our use\n \n-        ret = cam.acquire()\n-        assert ret == 0\n+        cam.acquire()\n \n         # Configure the camera\n \n@@ -37,8 +36,7 @@ class CameraCaptureContext:\n \n         stream_config = cam_config.at(0)\n \n-        ret = cam.configure(cam_config)\n-        assert ret == 0\n+        cam.configure(cam_config)\n \n         stream = stream_config.stream\n \n@@ -62,8 +60,7 @@ class CameraCaptureContext:\n             req = cam.create_request(idx)\n \n             buffer = allocator.buffers(stream)[i]\n-            ret = req.add_buffer(stream, buffer)\n-            assert ret == 0\n+            req.add_buffer(stream, buffer)\n \n             self.reqs.append(req)\n \n@@ -73,13 +70,11 @@ class CameraCaptureContext:\n     def uninit_camera(self):\n         # Stop the camera\n \n-        ret = self.cam.stop()\n-        assert ret == 0\n+        self.cam.stop()\n \n         # Release the camera\n \n-        ret = self.cam.release()\n-        assert ret == 0\n+        self.cam.release()\n \n \n # A container class for our state\n@@ -144,8 +139,7 @@ class CaptureContext:\n \n         for cam_ctx in self.camera_contexts:\n             for req in cam_ctx.reqs:\n-                ret = cam_ctx.cam.queue_request(req)\n-                assert ret == 0\n+                cam_ctx.cam.queue_request(req)\n \n         # Use Selector to wait for events from the camera and from the keyboard\n \n@@ -176,8 +170,7 @@ def main():\n     # Start the cameras\n \n     for cam_ctx in ctx.camera_contexts:\n-        ret = cam_ctx.cam.start()\n-        assert ret == 0\n+        cam_ctx.cam.start()\n \n     ctx.capture()\n \ndiff --git a/src/py/libcamera/py_main.cpp b/src/py/libcamera/py_main.cpp\nindex e7d078b5..1ef1384e 100644\n--- a/src/py/libcamera/py_main.cpp\n+++ b/src/py/libcamera/py_main.cpp\n@@ -111,8 +111,19 @@ PYBIND11_MODULE(_libcamera, m)\n \n \tpyCamera\n \t\t.def_property_readonly(\"id\", &Camera::id)\n-\t\t.def(\"acquire\", &Camera::acquire)\n-\t\t.def(\"release\", &Camera::release)\n+\t\t.def(\"acquire\", [](Camera &self) {\n+\t\t\tint ret = self.acquire();\n+\t\t\tif (ret)\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t                        \"Failed to acquire camera\");\n+\t\t})\n+\t\t.def(\"release\",  [](Camera &self) {\n+\t\t\tint ret = self.release();\n+\t\t\t/* \\todo Should we ignore the error? */\n+\t\t\tif (ret)\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t                        \"Failed to release camera\");\n+\t\t})\n \t\t.def(\"start\", [](Camera &self,\n \t\t                 const std::unordered_map<const ControlId *, py::object> &controls) {\n \t\t\t/* \\todo What happens if someone calls start() multiple times? */\n@@ -132,20 +143,20 @@ PYBIND11_MODULE(_libcamera, m)\n \t\t\tint ret = self.start(&controlList);\n \t\t\tif (ret) {\n \t\t\t\tself.requestCompleted.disconnect();\n-\t\t\t\treturn ret;\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t                        \"Failed to start camera\");\n \t\t\t}\n-\n-\t\t\treturn 0;\n \t\t}, py::arg(\"controls\") = std::unordered_map<const ControlId *, py::object>())\n \n \t\t.def(\"stop\", [](Camera &self) {\n \t\t\tint ret = self.stop();\n-\t\t\tif (ret)\n-\t\t\t\treturn ret;\n \n \t\t\tself.requestCompleted.disconnect();\n \n-\t\t\treturn 0;\n+\t\t\t/* \\todo Should we just ignore the error? */\n+\t\t\tif (ret)\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t                        \"Failed to start camera\");\n \t\t})\n \n \t\t.def(\"__str__\", [](Camera &self) {\n@@ -154,9 +165,20 @@ PYBIND11_MODULE(_libcamera, m)\n \n \t\t/* Keep the camera alive, as StreamConfiguration contains a Stream* */\n \t\t.def(\"generate_configuration\", &Camera::generateConfiguration, py::keep_alive<0, 1>())\n-\t\t.def(\"configure\", &Camera::configure)\n+\t\t.def(\"configure\", [](Camera &self, CameraConfiguration *config) {\n+\t\t\tint ret = self.configure(config);\n+\t\t\tif (ret)\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t                        \"Failed to configure camera\");\n+\t\t})\n \n-\t\t.def(\"create_request\", &Camera::createRequest, py::arg(\"cookie\") = 0)\n+\t\t.def(\"create_request\", [](Camera &self, uint64_t cookie) {\n+\t\t\tstd::unique_ptr<Request> req = self.createRequest(cookie);\n+\t\t\tif (!req)\n+\t\t\t\tthrow std::system_error(ENOMEM, std::generic_category(),\n+\t\t\t\t                        \"Failed to create request\");\n+\t\t\treturn req;\n+\t\t}, py::arg(\"cookie\") = 0)\n \n \t\t.def(\"queue_request\", [](Camera &self, Request *req) {\n \t\t\tpy::object py_req = py::cast(req);\n@@ -169,10 +191,11 @@ PYBIND11_MODULE(_libcamera, m)\n \t\t\tpy_req.inc_ref();\n \n \t\t\tint ret = self.queueRequest(req);\n-\t\t\tif (ret)\n+\t\t\tif (ret) {\n \t\t\t\tpy_req.dec_ref();\n-\n-\t\t\treturn ret;\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t\t\t\t\"Failed to queue request\");\n+\t\t\t}\n \t\t})\n \n \t\t.def_property_readonly(\"streams\", [](Camera &self) {\n@@ -250,7 +273,13 @@ PYBIND11_MODULE(_libcamera, m)\n \n \tpyFrameBufferAllocator\n \t\t.def(py::init<std::shared_ptr<Camera>>(), py::keep_alive<1, 2>())\n-\t\t.def(\"allocate\", &FrameBufferAllocator::allocate)\n+\t\t.def(\"allocate\", [](FrameBufferAllocator &self, Stream *stream) {\n+\t\t\tint ret = self.allocate(stream);\n+\t\t\tif (ret < 0)\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t                        \"Failed to queue request\");\n+\t\t\treturn ret;\n+\t\t})\n \t\t.def_property_readonly(\"allocated\", &FrameBufferAllocator::allocated)\n \t\t/* Create a list of FrameBuffers, where each FrameBuffer has a keep-alive to FrameBufferAllocator */\n \t\t.def(\"buffers\", [](FrameBufferAllocator &self, Stream *stream) {\n@@ -327,7 +356,10 @@ PYBIND11_MODULE(_libcamera, m)\n \tpyRequest\n \t\t/* \\todo Fence is not supported, so we cannot expose addBuffer() directly */\n \t\t.def(\"add_buffer\", [](Request &self, const Stream *stream, FrameBuffer *buffer) {\n-\t\t\treturn self.addBuffer(stream, buffer);\n+\t\t\tint ret =  self.addBuffer(stream, buffer);\n+\t\t\tif (ret)\n+\t\t\t\tthrow std::system_error(-ret, std::generic_category(),\n+\t\t\t\t                        \"Failed to add buffer\");\n \t\t}, py::keep_alive<1, 3>()) /* Request keeps Framebuffer alive */\n \t\t.def_property_readonly(\"status\", &Request::status)\n \t\t.def_property_readonly(\"buffers\", &Request::buffers)\ndiff --git a/test/py/unittests.py b/test/py/unittests.py\nindex 9adc4337..b90b5fec 100755\n--- a/test/py/unittests.py\n+++ b/test/py/unittests.py\n@@ -42,31 +42,26 @@ class SimpleTestMethods(BaseTestCase):\n         cam = cm.get('platform/vimc.0 Sensor B')\n         self.assertIsNotNone(cam)\n \n-        ret = cam.acquire()\n-        self.assertZero(ret)\n+        cam.acquire()\n \n-        ret = cam.release()\n-        self.assertZero(ret)\n+        cam.release()\n \n     def test_double_acquire(self):\n         cm = libcam.CameraManager.singleton()\n         cam = cm.get('platform/vimc.0 Sensor B')\n         self.assertIsNotNone(cam)\n \n-        ret = cam.acquire()\n-        self.assertZero(ret)\n+        cam.acquire()\n \n         libcam.log_set_level('Camera', 'FATAL')\n-        ret = cam.acquire()\n-        self.assertEqual(ret, -errno.EBUSY)\n+        with self.assertRaises(RuntimeError):\n+            cam.acquire()\n         libcam.log_set_level('Camera', 'ERROR')\n \n-        ret = cam.release()\n-        self.assertZero(ret)\n+        cam.release()\n \n-        ret = cam.release()\n-        # I expected EBUSY, but looks like double release works fine\n-        self.assertZero(ret)\n+        # I expected exception here, but looks like double release works fine\n+        cam.release()\n \n \n class CameraTesterBase(BaseTestCase):\n@@ -80,11 +75,7 @@ class CameraTesterBase(BaseTestCase):\n             self.cm = None\n             self.skipTest('No vimc found')\n \n-        ret = self.cam.acquire()\n-        if ret != 0:\n-            self.cam = None\n-            self.cm = None\n-            raise Exception('Failed to acquire camera')\n+        self.cam.acquire()\n \n         self.wr_cam = weakref.ref(self.cam)\n         self.wr_cm = weakref.ref(self.cm)\n@@ -93,9 +84,7 @@ class CameraTesterBase(BaseTestCase):\n         # If a test fails, the camera may be in running state. So always stop.\n         self.cam.stop()\n \n-        ret = self.cam.release()\n-        if ret != 0:\n-            raise Exception('Failed to release camera')\n+        self.cam.release()\n \n         self.cam = None\n         self.cm = None\n@@ -115,8 +104,7 @@ class AllocatorTestMethods(CameraTesterBase):\n         streamconfig = camconfig.at(0)\n         wr_streamconfig = weakref.ref(streamconfig)\n \n-        ret = cam.configure(camconfig)\n-        self.assertZero(ret)\n+        cam.configure(camconfig)\n \n         stream = streamconfig.stream\n         wr_stream = weakref.ref(stream)\n@@ -129,8 +117,8 @@ class AllocatorTestMethods(CameraTesterBase):\n         self.assertIsNotNone(wr_streamconfig())\n \n         allocator = libcam.FrameBufferAllocator(cam)\n-        ret = allocator.allocate(stream)\n-        self.assertTrue(ret > 0)\n+        num_bufs = allocator.allocate(stream)\n+        self.assertTrue(num_bufs > 0)\n         wr_allocator = weakref.ref(allocator)\n \n         buffers = allocator.buffers(stream)\n@@ -173,14 +161,13 @@ class SimpleCaptureMethods(CameraTesterBase):\n         self.assertIsNotNone(fmts)\n         fmts = None\n \n-        ret = cam.configure(camconfig)\n-        self.assertZero(ret)\n+        cam.configure(camconfig)\n \n         stream = streamconfig.stream\n \n         allocator = libcam.FrameBufferAllocator(cam)\n-        ret = allocator.allocate(stream)\n-        self.assertTrue(ret > 0)\n+        num_bufs = allocator.allocate(stream)\n+        self.assertTrue(num_bufs > 0)\n \n         num_bufs = len(allocator.buffers(stream))\n \n@@ -190,19 +177,16 @@ class SimpleCaptureMethods(CameraTesterBase):\n             self.assertIsNotNone(req)\n \n             buffer = allocator.buffers(stream)[i]\n-            ret = req.add_buffer(stream, buffer)\n-            self.assertZero(ret)\n+            req.add_buffer(stream, buffer)\n \n             reqs.append(req)\n \n         buffer = None\n \n-        ret = cam.start()\n-        self.assertZero(ret)\n+        cam.start()\n \n         for req in reqs:\n-            ret = cam.queue_request(req)\n-            self.assertZero(ret)\n+            cam.queue_request(req)\n \n         reqs = None\n         gc.collect()\n@@ -223,8 +207,7 @@ class SimpleCaptureMethods(CameraTesterBase):\n         reqs = None\n         gc.collect()\n \n-        ret = cam.stop()\n-        self.assertZero(ret)\n+        cam.stop()\n \n     def test_select(self):\n         cm = self.cm\n@@ -238,14 +221,13 @@ class SimpleCaptureMethods(CameraTesterBase):\n         self.assertIsNotNone(fmts)\n         fmts = None\n \n-        ret = cam.configure(camconfig)\n-        self.assertZero(ret)\n+        cam.configure(camconfig)\n \n         stream = streamconfig.stream\n \n         allocator = libcam.FrameBufferAllocator(cam)\n-        ret = allocator.allocate(stream)\n-        self.assertTrue(ret > 0)\n+        num_bufs = allocator.allocate(stream)\n+        self.assertTrue(num_bufs > 0)\n \n         num_bufs = len(allocator.buffers(stream))\n \n@@ -255,19 +237,16 @@ class SimpleCaptureMethods(CameraTesterBase):\n             self.assertIsNotNone(req)\n \n             buffer = allocator.buffers(stream)[i]\n-            ret = req.add_buffer(stream, buffer)\n-            self.assertZero(ret)\n+            req.add_buffer(stream, buffer)\n \n             reqs.append(req)\n \n         buffer = None\n \n-        ret = cam.start()\n-        self.assertZero(ret)\n+        cam.start()\n \n         for req in reqs:\n-            ret = cam.queue_request(req)\n-            self.assertZero(ret)\n+            cam.queue_request(req)\n \n         reqs = None\n         gc.collect()\n@@ -296,8 +275,7 @@ class SimpleCaptureMethods(CameraTesterBase):\n         reqs = None\n         gc.collect()\n \n-        ret = cam.stop()\n-        self.assertZero(ret)\n+        cam.stop()\n \n \n # Recursively expand slist's objects into olist, using seen to track already\n","prefixes":["libcamera-devel","v2","09/14"]}