From fb328494b3bb212b1cb83ce7eb964e827373db2b Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Tue, 29 Jul 2014 13:16:46 +0200
Subject: [PATCH] Make the libcalamares Python API better for PEP8

---
 src/libcalamares/PythonJob.cpp    | 17 +++++++++--------
 src/libcalamares/PythonJobApi.cpp |  3 +++
 src/libcalamares/PythonJobApi.h   |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp
index 7154b5d9d..b314bbf52 100644
--- a/src/libcalamares/PythonJob.cpp
+++ b/src/libcalamares/PythonJob.cpp
@@ -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,
diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index fe7829f2a..feb05b1c8 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -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 );
diff --git a/src/libcalamares/PythonJobApi.h b/src/libcalamares/PythonJobApi.h
index 8c7eeae70..a0fadb239 100644
--- a/src/libcalamares/PythonJobApi.h
+++ b/src/libcalamares/PythonJobApi.h
@@ -36,6 +36,7 @@ class PythonJobInterface
 public:
     explicit PythonJobInterface( Calamares::PythonJob* parent );
 
+    std::string moduleName;
     std::string prettyName;
     std::string workingPath;