From 0858c844e87772db81b8247261a17e26f7718f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 18 May 2023 20:54:24 +0200 Subject: [PATCH] python: minor, doc++ --- src/python/magnum/test/test_trade.py | 15 +++++---------- src/python/magnum/trade.cpp | 3 ++- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/python/magnum/test/test_trade.py b/src/python/magnum/test/test_trade.py index eb69e9a..34421b4 100644 --- a/src/python/magnum/test/test_trade.py +++ b/src/python/magnum/test/test_trade.py @@ -1887,8 +1887,7 @@ class SceneConverter(unittest.TestCase): converter = trade.SceneConverterManager().load_and_instantiate('GltfSceneConverter') with tempfile.TemporaryDirectory() as tmp: - filename = os.path.join(tmp, "scene.gltf") - converter.begin_file(filename) + converter.begin_file(os.path.join(tmp, "scene.gltf")) with self.assertRaisesRegex(RuntimeError, "adding the scene failed"): converter.add(scene) @@ -1915,8 +1914,7 @@ class SceneConverter(unittest.TestCase): converter = trade.SceneConverterManager().load_and_instantiate('GltfSceneConverter') with tempfile.TemporaryDirectory() as tmp: - filename = os.path.join(tmp, "scene.gltf") - converter.begin_file(filename) + converter.begin_file(os.path.join(tmp, "scene.gltf")) with self.assertRaisesRegex(AssertionError, "index 1 out of range for 0 scenes"): converter.set_default_scene(1) @@ -1951,8 +1949,7 @@ class SceneConverter(unittest.TestCase): converter = trade.SceneConverterManager().load_and_instantiate('GltfSceneConverter') with tempfile.TemporaryDirectory() as tmp: - filename = os.path.join(tmp, "scene.gltf") - converter.begin_file(filename) + converter.begin_file(os.path.join(tmp, "scene.gltf")) with self.assertRaisesRegex(AssertionError, "not a custom field"): converter.set_scene_field_name(trade.SceneField.SCALING, 'foo') @@ -1964,8 +1961,7 @@ class SceneConverter(unittest.TestCase): converter = trade.SceneConverterManager().load_and_instantiate('GltfSceneConverter') with tempfile.TemporaryDirectory() as tmp: - filename = os.path.join(tmp, "two-meshes.gltf") - converter.begin_file(filename) + converter.begin_file(os.path.join(tmp, "two-meshes.gltf")) self.assertEqual(converter.mesh_count, 0) # Nothing like that in the file @@ -1982,8 +1978,7 @@ class SceneConverter(unittest.TestCase): converter = trade.SceneConverterManager().load_and_instantiate('StanfordSceneConverter') with tempfile.TemporaryDirectory() as tmp: - filename = os.path.join(tmp, "two-meshes.gltf") - converter.begin_file(filename) + converter.begin_file(os.path.join(tmp, "file.ply")) with self.assertRaisesRegex(RuntimeError, "adding importer contents failed"): converter.add_importer_contents(importer) diff --git a/src/python/magnum/trade.cpp b/src/python/magnum/trade.cpp index 107d2e8..0238f8a 100644 --- a/src/python/magnum/trade.cpp +++ b/src/python/magnum/trade.cpp @@ -1775,7 +1775,8 @@ void trade(py::module_& m) { PyErr_SetString(PyExc_RuntimeError, "conversion failed"); throw py::error_already_set{}; } - }, "Convert a mesh", py::arg("mesh")) + }, "Convert a mesh in-place", py::arg("mesh")) + /** @todo conversion to data */ /** @todo drop std::string in favor of our own string caster */ .def("convert_to_file", [](Trade::AbstractSceneConverter& self, const Trade::MeshData& mesh, const std::string& filename) { /** @todo log redirection -- but we'd need assertions to not be