Mercurial > hg > orthanc-python
annotate Sources/PythonModule.cpp @ 171:c8de83fe7faa
removed deprecation warnings
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 27 Jun 2024 15:52:51 +0200 |
| parents | 6fada29b6759 |
| children | 3678a028f1f6 |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 2 * Python plugin for Orthanc | |
|
166
6fada29b6759
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
155
diff
changeset
|
3 * Copyright (C) 2020-2023 Osimis S.A., Belgium |
|
6fada29b6759
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
155
diff
changeset
|
4 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium |
|
155
71d305c29cfa
updated year to 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
114
diff
changeset
|
5 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
| 0 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Affero General Public License | |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
| 11 * | |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 **/ | |
| 20 | |
| 21 | |
| 22 #include "PythonModule.h" | |
| 23 | |
|
68
0b3ef425db31
refactoring using ICallbackRegistration::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
56
diff
changeset
|
24 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h" |
| 0 | 25 #include "PythonString.h" |
| 26 | |
| 27 #include <boost/thread/mutex.hpp> | |
| 28 #include <set> | |
| 29 | |
| 30 | |
| 31 #if PY_VERSION_HEX < 0x03070000 /* 3.7.0 */ | |
| 32 static PythonObject* GetModule(PythonLock& lock, | |
| 33 const std::string& utf8Name) | |
| 34 { | |
| 35 static boost::mutex mutex_; | |
| 36 static std::set<std::string> loadedModules_; | |
| 37 | |
| 38 boost::mutex::scoped_lock l(mutex_); | |
| 39 | |
| 40 if (loadedModules_.find(utf8Name) == loadedModules_.end()) | |
| 41 { | |
| 42 PythonString tmp(lock, utf8Name); | |
| 43 | |
| 44 // The module is not imported yet | |
| 45 loadedModules_.insert(utf8Name); | |
| 46 return new PythonObject(lock, PyImport_Import(tmp.GetPyObject()), false); | |
| 47 } | |
| 48 else | |
| 49 { | |
| 50 // PyImport_AddModule returns a borrowed reference | |
| 51 return new PythonObject(lock, PyImport_AddModule(utf8Name.c_str()), true); | |
| 52 } | |
| 53 } | |
| 54 | |
| 55 #else | |
| 56 // The "PyImport_GetModule()" function was introduced in Python | |
| 57 // 3.7.0 | |
| 58 static PythonObject* GetModule(PythonLock& lock, | |
| 59 const std::string& utf8Name) | |
| 60 { | |
| 61 PythonString tmp(lock, utf8Name); | |
| 62 | |
| 63 PyObject* module = PyImport_GetModule(tmp.GetPyObject()); | |
| 64 if (module != NULL) | |
| 65 { | |
| 66 // The module was already imported by a previous call: Reuse it | |
| 67 return new PythonObject(lock, module); | |
| 68 } | |
| 69 else | |
| 70 { | |
| 71 // This is the first time this module is used: Import it | |
| 72 return new PythonObject(lock, PyImport_Import(tmp.GetPyObject())); | |
| 73 } | |
| 74 } | |
| 75 #endif | |
| 76 | |
| 77 | |
| 78 PythonModule::PythonModule(PythonLock& lock, | |
| 79 const std::string& utf8Name) : | |
| 80 lock_(lock), | |
| 81 name_(utf8Name) | |
| 82 { | |
| 83 module_.reset(GetModule(lock, utf8Name)); | |
| 84 } | |
| 85 | |
| 86 | |
| 87 bool PythonModule::IsValid() const | |
| 88 { | |
| 89 return (module_.get() != NULL && | |
| 90 module_->IsValid()); | |
| 91 } | |
| 92 | |
| 93 | |
| 94 PythonObject& PythonModule::GetObject() const | |
| 95 { | |
| 96 if (!IsValid()) | |
| 97 { | |
| 98 ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls); | |
| 99 } | |
| 100 else | |
| 101 { | |
| 102 return *module_; | |
| 103 } | |
| 104 } | |
| 105 | |
| 106 | |
| 107 PyObject* PythonModule::GetPyObject() const | |
| 108 { | |
| 109 if (!IsValid()) | |
| 110 { | |
| 111 ORTHANC_PLUGINS_THROW_EXCEPTION(BadSequenceOfCalls); | |
| 112 } | |
| 113 else | |
| 114 { | |
| 115 return module_->GetPyObject(); | |
| 116 } | |
| 117 } |