From 323f67cc6c6b833e122f3d7e312c8dc64629eba5 Mon Sep 17 00:00:00 2001
From: thorstenhater <24411438+thorstenhater@users.noreply.github.com>
Date: Fri, 24 Jul 2020 07:12:07 +0200
Subject: [PATCH] clean up a name collision (#1098)
Rename import method to avoid Python keyword collision.
---
python/mechanism.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python/mechanism.cpp b/python/mechanism.cpp
index 92515ef1..c710c013 100644
--- a/python/mechanism.cpp
+++ b/python/mechanism.cpp
@@ -118,7 +118,7 @@ void register_mechanisms(pybind11::module& m) {
throw std::runtime_error(util::pprintf("\nKeyError: '{}'", name));
}
})
- .def("import", &arb::mechanism_catalogue::import,
+ .def("extend", &arb::mechanism_catalogue::import,
"other"_a, "Catalogue to import into self",
"prefix"_a, "Prefix for names in other",
"Import another catalogue, possibly with a prefix. Will overwrite in case of name collisions.")
--
GitLab