From 648eca9d23afb240510f324aa4828cb8e3da4210 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Wed, 5 Oct 2016 19:31:23 +0100 Subject: [PATCH] Fix non-static version string functions --- src/main.cpp | 4 ++-- src/test.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 33abd96..c2b1d9d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -103,14 +103,14 @@ PYBIND11_PLUGIN(loot_api) { .def_readonly_static("minor", &LootVersion::minor) .def_readonly_static("patch", &LootVersion::patch) .def_readonly_static("revision", &LootVersion::revision) - .def("string", LootVersion::string); + .def_static("string", LootVersion::string); class_(module, "WrapperVersion") .def_readonly_static("major", &WrapperVersion::major) .def_readonly_static("minor", &WrapperVersion::minor) .def_readonly_static("patch", &WrapperVersion::patch) .def_readonly_static("revision", &WrapperVersion::revision) - .def("string", WrapperVersion::string); + .def_static("string", WrapperVersion::string); class_>(module, "DatabaseInterface") .def("load_lists", &DatabaseInterface::LoadLists, arg("masterlist_path"), arg("userlist_path") = emptyString) diff --git a/src/test.py b/src/test.py index 57fc64e..fa11e42 100644 --- a/src/test.py +++ b/src/test.py @@ -40,6 +40,7 @@ class TestLootApi(GameFixture): self.assertEqual(Version.minor, 10) self.assertEqual(Version.patch, 0) self.assertNotEqual(Version.revision, u'') + self.assertEqual(Version.string(), "0.10.0") def test_wrapper_version(self): self.assertEqual(WrapperVersion.major, 1) @@ -47,6 +48,7 @@ class TestLootApi(GameFixture): self.assertEqual(WrapperVersion.patch, 0) self.assertNotEqual(WrapperVersion.revision, u'') self.assertNotEqual(WrapperVersion.revision, Version.revision) + self.assertEqual(WrapperVersion.string(), "1.0.0") def test_create_db(self): db = create_database(GameType.tes4, self.game_path, self.local_path)