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

Make the libcalamares Python API better for PEP8

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-07-29 13:16:46 +02:00
parent 5369038ed6
commit fb328494b3
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcalamares/PythonJob.cpp
View File

@ -36,17 +36,18 @@ namespace bp = boost::python;
BOOST_PYTHON_MODULE( libcalamares )
{
bp::scope().attr( "organizationName" ) = CALAMARES_ORGANIZATION_NAME;
bp::scope().attr( "organizationDomain" ) = CALAMARES_ORGANIZATION_DOMAIN;
bp::scope().attr( "applicationName" ) = CALAMARES_APPLICATION_NAME;
bp::scope().attr( "version" ) = CALAMARES_VERSION;
bp::scope().attr( "shortVersion" ) = CALAMARES_VERSION_SHORT;
bp::scope().attr( "ORGANIZATION_NAME" ) = CALAMARES_ORGANIZATION_NAME;
bp::scope().attr( "ORGANIZATION_DOMAIN" ) = CALAMARES_ORGANIZATION_DOMAIN;
bp::scope().attr( "APPLICATION_NAME" ) = CALAMARES_APPLICATION_NAME;
bp::scope().attr( "VERSION" ) = CALAMARES_VERSION;
bp::scope().attr( "VERSION_SHORT" ) = CALAMARES_VERSION_SHORT;
bp::def( "debug", &CalamaresPython::debug );
bp::class_< CalamaresPython::PythonJobInterface >( "Job", bp::init< Calamares::PythonJob* >() )
.def_readonly( "prettyName", &CalamaresPython::PythonJobInterface::prettyName )
.def_readonly( "workingPath", &CalamaresPython::PythonJobInterface::workingPath )
.def_readonly( "module_name", &CalamaresPython::PythonJobInterface::moduleName )
.def_readonly( "pretty_name", &CalamaresPython::PythonJobInterface::prettyName )
.def_readonly( "working_path", &CalamaresPython::PythonJobInterface::workingPath )
.def_readonly( "configuration", &CalamaresPython::PythonJobInterface::configuration )
.def( "setprogress", &CalamaresPython::PythonJobInterface::setprogress );
@ -122,7 +123,7 @@ PythonJob::exec()
bp::dict calamaresNamespace = bp::extract< bp::dict >( calamaresModule.attr( "__dict__" ) );
calamaresNamespace[ "job" ] = CalamaresPython::PythonJobInterface( this );
calamaresNamespace[ "globalStorage" ] = bp::ptr( JobQueue::instance()->globalStorage() );
calamaresNamespace[ "globalstorage" ] = bp::ptr( JobQueue::instance()->globalStorage() );
bp::object execResult = bp::exec_file( scriptFI.absoluteFilePath().toLocal8Bit().data(),
scriptNamespace,

3
src/libcalamares/PythonJobApi.cpp
View File

@ -21,6 +21,8 @@
#include "PythonHelper.h"
#include "utils/Logger.h"
#include <QDir>
namespace CalamaresPython
{
@ -35,6 +37,7 @@ debug( const std::string& s )
PythonJobInterface::PythonJobInterface( Calamares::PythonJob* parent )
: m_parent( parent )
{
moduleName = QDir( m_parent->m_workingPath ).dirName().toStdString();
prettyName = m_parent->prettyName().toStdString();
workingPath = m_parent->m_workingPath.toStdString();
configuration = CalamaresPython::variantMapToPyDict( m_parent->m_configurationMap );

1
src/libcalamares/PythonJobApi.h
View File

@ -36,6 +36,7 @@ class PythonJobInterface
public:
explicit PythonJobInterface( Calamares::PythonJob* parent );
std::string moduleName;
std::string prettyName;
std::string workingPath;