napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcalamares: one more round with module

Browse Source 
Tested with:

- python -c 'import libcalamares ; print(libcalamares.VERSION);'
- loadmodule dummypython
- full install of KaOS
This commit is contained in:
Adriaan de Groot 2023-10-24 23:44:57 +02:00
parent 1c0559affa
commit c5139e62bc
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcalamares/python/PythonJob.cpp
View File

@ -239,11 +239,13 @@ Job::exec()
} }
py::scoped_interpreter guard {}; py::scoped_interpreter guard {};
auto scope = py::module_::import( "__main__" ).attr( "__dict__" ); // Import, but do not keep the handle lying around
auto calamaresModule = py::module::import( "libcalamares" ); {
calamaresModule.attr( "job" ) = Calamares::Python::JobProxy( this ); auto calamaresModule = py::module_::import( "libcalamares" );
calamaresModule.attr( "globalstorage" ) calamaresModule.attr( "job" ) = Calamares::Python::JobProxy( this );
= Calamares::Python::GlobalStorageProxy( JobQueue::instance()->globalStorage() ); calamaresModule.attr( "globalstorage" )
= Calamares::Python::GlobalStorageProxy( JobQueue::instance()->globalStorage() );
}
if ( s_preScript ) if ( s_preScript )
{ {
@ -263,7 +265,7 @@ Job::exec()
try try
{ {
py::eval_file( scriptFI.absoluteFilePath().toUtf8().constData(), scope ); py::eval_file( scriptFI.absoluteFilePath().toUtf8().constData() );
} }
catch ( const py::error_already_set& e ) catch ( const py::error_already_set& e )
{ {
@ -276,6 +278,7 @@ Job::exec()
JobResult::PythonUncaughtException ); JobResult::PythonUncaughtException );
} }
auto scope = py::module_::import( "__main__" ).attr( "__dict__" );
m_d->description = getPrettyNameFromScope( scope ); m_d->description = getPrettyNameFromScope( scope );
Q_EMIT progress( 0 ); Q_EMIT progress( 0 );
@ -374,7 +377,7 @@ Job::setInjectedPreScript( const char* script )
} // namespace Python } // namespace Python
} // namespace Calamares } // namespace Calamares
PYBIND11_EMBEDDED_MODULE( libcalamares, m ) PYBIND11_MODULE( libcalamares, m )
{ {
populate_libcalamares( m ); populate_libcalamares( m );
} }