Introduces new API to create and import Python modules.

The Shiboken::Module namespace also provides management of module types,
including the communication of types among dependent modules.

Module::create() will call Shiboken::init(), so this can be removed
from the generated module's source code.

This deprecates the old Shiboken::importModule() function.

The generation of module initialization code was updated to use the new
Shiboken::Module functions.

1 files changed, 84 insertions, 0 deletions

diff --git a/libshiboken/sbkmodule.cpp b/libshiboken/sbkmodule.cpp
new file mode 100644
index 000000000..998ccfc8f
--- /dev/null
+++ b/libshiboken/sbkmodule.cpp
@@ -0,0 +1,84 @@
+/*
+ * This file is part of the Shiboken Python Bindings Generator project.
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "sbkmodule.h"
+#include "basewrapper.h"
+#include "bindingmanager.h"
+
+// TODO: for performance reasons this should be a sparse_hash_map,
+// because there'll be very few modules as keys. The sparse_hash_map
+// is missing from the code added in ../ext/sparsehash/google directory.
+#include "google/dense_hash_map"
+
+/// This hash maps module objects to arrays of Python types.
+typedef google::dense_hash_map<PyObject*, PyTypeObject**> ModuleTypesMap;
+
+/// All types produced in imported modules are mapped here.
+static ModuleTypesMap moduleTypes;
+
+namespace Shiboken
+{
+namespace Module
+{
+
+void init()
+{
+    // Initializes type registry for modules.
+    moduleTypes.set_empty_key((ModuleTypesMap::key_type)0);
+    moduleTypes.set_deleted_key((ModuleTypesMap::key_type)1);
+}
+
+PyObject* import(const char* moduleName)
+{
+    PyObject* sysModules = PyImport_GetModuleDict();
+    PyObject* module = PyDict_GetItemString(sysModules, moduleName);
+    if (module)
+        Py_INCREF(module);
+    else
+        module = PyImport_ImportModule(moduleName);
+
+    if (!module)
+        PyErr_Format(PyExc_ImportError,"could not import module '%s'", moduleName);
+
+    return module;
+}
+
+PyObject* create(const char* moduleName, void* moduleData)
+{
+    Shiboken::init();
+    return Py_InitModule(moduleName, (PyMethodDef*)moduleData);
+}
+
+void registerTypes(PyObject* module, PyTypeObject** types)
+{
+    ModuleTypesMap::iterator iter = moduleTypes.find(module);
+    if (iter == moduleTypes.end())
+        moduleTypes.insert(std::make_pair(module, types));
+}
+
+PyTypeObject** getTypes(PyObject* module)
+{
+    ModuleTypesMap::iterator iter = moduleTypes.find(module);
+    return (iter == moduleTypes.end()) ? 0 : iter->second;
+}
+
+} } // namespace Shiboken::Module