{"id":15965,"url":"https://patchwork.libcamera.org/api/patches/15965/?format=json","web_url":"https://patchwork.libcamera.org/patch/15965/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20220518131329.66994-16-tomi.valkeinen@ideasonboard.com>","date":"2022-05-18T13:13:26","name":"[libcamera-devel,v3,15/18] py: rename pyxyz to py_xyz","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"bc4930494eda8c66afa54c489b4af3f2b5991bd1","submitter":{"id":109,"url":"https://patchwork.libcamera.org/api/people/109/?format=json","name":"Tomi Valkeinen","email":"tomi.valkeinen@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15965/mbox/","series":[{"id":3122,"url":"https://patchwork.libcamera.org/api/series/3122/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3122","date":"2022-05-18T13:13:11","name":"Misc Python bindings patches","version":3,"mbox":"https://patchwork.libcamera.org/series/3122/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15965/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15965/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 693E1C3274\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 18 May 2022 13:14:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F1A206567D;\n\tWed, 18 May 2022 15:14:08 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1F6A065675\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 18 May 2022 15:13:54 +0200 (CEST)","from deskari.lan (91-156-85-209.elisa-laajakaista.fi\n\t[91.156.85.209])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8D4D82FE3;\n\tWed, 18 May 2022 15:13:53 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652879649;\n\tbh=ADJ4CtCHm4hVdF+HGnyBnjk6Sdw3ATPP2dpWo/YuFjU=;\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=GkwwlIVv6FRAn+FlUrBfZ9zKH9c+rmDp5Yhkctrt4mEkmw6l9wY1ow/qzXa9Ph84U\n\tYK/00R0tBiLAuiUZDu2fBOYf/7D/RnCUqKTHRrexHRxEXvdqi2QeZ/yDNJrd1UezCO\n\t2SV2zlJgs7VtYH4nhj3fWNHDyQUmKrSAhyzJAZ5z+pOi/6y8kILc0hUP9HWqWjip8X\n\t4cQyKTiXk0+RGnJwykD1cGjDOhSg376kMcGq7AbBzZCqNsv90sWQo04pV5Bg17bVYa\n\tyXz/kNCcbj8hJiVk8BBImmYvsUAmkkTo9gjWrjgoUhXNyMY/XkGpUMl9j7a2J+iJLk\n\tBuAX+tFNvOz1Q==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652879633;\n\tbh=ADJ4CtCHm4hVdF+HGnyBnjk6Sdw3ATPP2dpWo/YuFjU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=eVB6BNt4ODx5ZitRdKyVgQAB1vyMZnJ6+mmeAcebsVu4gihDCRw75dGiZOEiKsvJm\n\tGrgyik+KQC37PhZVl3GXI0ae62U9Y/peNBPDd0kLlugJY6BFN0BeNzRI+ZqpzaCKck\n\tKDKccOHEUbuFl1B32mz7+TWaujELHTDF9yPjrmYI="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"eVB6BNt4\"; 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, 18 May 2022 16:13:26 +0300","Message-Id":"<20220518131329.66994-16-tomi.valkeinen@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220518131329.66994-1-tomi.valkeinen@ideasonboard.com>","References":"<20220518131329.66994-1-tomi.valkeinen@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 15/18] py: rename pyxyz to py_xyz","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":"Having the underscore makes the names more readable, especially when\nthere are multiple words in the name.\n\nSigned-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>\n---\n src/py/libcamera/meson.build                         | 10 +++++-----\n src/py/libcamera/{pyenums.cpp => py_enums.cpp}       |  2 +-\n ...ms_generated.cpp.in => py_enums_generated.cpp.in} |  2 +-\n src/py/libcamera/{pygeometry.cpp => py_geometry.cpp} |  2 +-\n src/py/libcamera/{pymain.cpp => py_main.cpp}         | 12 ++++++------\n 5 files changed, 14 insertions(+), 14 deletions(-)\n rename src/py/libcamera/{pyenums.cpp => py_enums.cpp} (96%)\n rename src/py/libcamera/{pyenums_generated.cpp.in => py_enums_generated.cpp.in} (89%)\n rename src/py/libcamera/{pygeometry.cpp => py_geometry.cpp} (99%)\n rename src/py/libcamera/{pymain.cpp => py_main.cpp} (99%)","diff":"diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build\nindex de66bb48..55957252 100644\n--- a/src/py/libcamera/meson.build\n+++ b/src/py/libcamera/meson.build\n@@ -13,21 +13,21 @@ pybind11_proj = subproject('pybind11')\n pybind11_dep = pybind11_proj.get_variable('pybind11_dep')\n \n pycamera_sources = files([\n-    'pyenums.cpp',\n-    'pygeometry.cpp',\n-    'pymain.cpp',\n+    'py_enums.cpp',\n+    'py_geometry.cpp',\n+    'py_main.cpp',\n ])\n \n gen_input_files = files([\n     '../../libcamera/control_ids.yaml',\n-    'pyenums_generated.cpp.in',\n+    'py_enums_generated.cpp.in',\n ])\n \n gen_py_control_enums = files('gen-py-control-enums.py')\n \n generated_sources = custom_target('py_gen_controls',\n                                   input : gen_input_files,\n-                                  output : ['pyenums_generated.cpp'],\n+                                  output : ['py_enums_generated.cpp'],\n                                   command : [gen_py_control_enums, '-o', '@OUTPUT@', '@INPUT@'])\n \n pycamera_sources += generated_sources\ndiff --git a/src/py/libcamera/pyenums.cpp b/src/py/libcamera/py_enums.cpp\nsimilarity index 96%\nrename from src/py/libcamera/pyenums.cpp\nrename to src/py/libcamera/py_enums.cpp\nindex b655e622..e55318f1 100644\n--- a/src/py/libcamera/pyenums.cpp\n+++ b/src/py/libcamera/py_enums.cpp\n@@ -13,7 +13,7 @@ namespace py = pybind11;\n \n using namespace libcamera;\n \n-void init_pyenums(py::module &m)\n+void init_py_enums(py::module &m)\n {\n \tpy::enum_<StreamRole>(m, \"StreamRole\")\n \t\t.value(\"StillCapture\", StreamRole::StillCapture)\ndiff --git a/src/py/libcamera/pyenums_generated.cpp.in b/src/py/libcamera/py_enums_generated.cpp.in\nsimilarity index 89%\nrename from src/py/libcamera/pyenums_generated.cpp.in\nrename to src/py/libcamera/py_enums_generated.cpp.in\nindex 6aaf4795..20e07528 100644\n--- a/src/py/libcamera/pyenums_generated.cpp.in\n+++ b/src/py/libcamera/py_enums_generated.cpp.in\n@@ -15,7 +15,7 @@ namespace py = pybind11;\n \n using namespace libcamera;\n \n-void init_pyenums_generated(py::module& m)\n+void init_py_enums_generated(py::module& m)\n {\n ${enums}\n }\ndiff --git a/src/py/libcamera/pygeometry.cpp b/src/py/libcamera/py_geometry.cpp\nsimilarity index 99%\nrename from src/py/libcamera/pygeometry.cpp\nrename to src/py/libcamera/py_geometry.cpp\nindex d77de144..84b0cb08 100644\n--- a/src/py/libcamera/pygeometry.cpp\n+++ b/src/py/libcamera/py_geometry.cpp\n@@ -18,7 +18,7 @@ namespace py = pybind11;\n \n using namespace libcamera;\n \n-void init_pygeometry(py::module &m)\n+void init_py_geometry(py::module &m)\n {\n \tauto pyPoint = py::class_<Point>(m, \"Point\");\n \tauto pySize = py::class_<Size>(m, \"Size\");\ndiff --git a/src/py/libcamera/pymain.cpp b/src/py/libcamera/py_main.cpp\nsimilarity index 99%\nrename from src/py/libcamera/pymain.cpp\nrename to src/py/libcamera/py_main.cpp\nindex ef3f157a..b05bbb22 100644\n--- a/src/py/libcamera/pymain.cpp\n+++ b/src/py/libcamera/py_main.cpp\n@@ -130,15 +130,15 @@ static void handleRequestCompleted(Request *req)\n \t\tLOG(Fatal) << \"Unable to write to eventfd\";\n }\n \n-void init_pyenums(py::module &m);\n-void init_pyenums_generated(py::module &m);\n-void init_pygeometry(py::module &m);\n+void init_py_enums(py::module &m);\n+void init_py_enums_generated(py::module &m);\n+void init_py_geometry(py::module &m);\n \n PYBIND11_MODULE(_libcamera, m)\n {\n-\tinit_pyenums(m);\n-\tinit_pyenums_generated(m);\n-\tinit_pygeometry(m);\n+\tinit_py_enums(m);\n+\tinit_py_enums_generated(m);\n+\tinit_py_geometry(m);\n \n \t/* Forward declarations */\n \n","prefixes":["libcamera-devel","v3","15/18"]}