From e3814f27dd3975b5be5a2f328353fe7d144ce23b Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Tue, 6 Dec 2011 19:53:07 -0200
Subject: Replace private.py file by an inject code.

---
 PySide/CMakeLists.txt             |  5 +----
 PySide/QtCore/typesystem_core.xml | 11 +++++++++++
 PySide/__init__.py.in             |  6 ------
 PySide/private.py                 |  4 ----
 4 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 PySide/private.py

(limited to 'PySide')

diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt
index 62c806858..d8371c0b3 100644
--- a/PySide/CMakeLists.txt
+++ b/PySide/CMakeLists.txt
@@ -9,9 +9,6 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/global.h.in"
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in"
                "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" @ONLY)
 
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/private.py"
-                                                              "${CMAKE_BINARY_DIR}/PySide/private.py")
-
 HAS_QT_MODULE(QT_QTCORE_FOUND QtCore)
 HAS_QT_MODULE(QT_QTGUI_FOUND QtGui)
 HAS_QT_MODULE(QT_QTNETWORK_FOUND QtNetwork)
@@ -34,7 +31,7 @@ HAS_QT_MODULE(QT_PHONON_FOUND phonon)
 HAS_QT_MODULE(QT_QTDECLARATIVE_FOUND QtDeclarative)
 
 # install
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" "${CMAKE_CURRENT_BINARY_DIR}/private.py"
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py"
         DESTINATION "${SITE_PACKAGE}/${BINDING_NAME}${pyside_SUFFIX}")
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_templates.xml
         DESTINATION share/PySide${pyside_SUFFIX}/typesystems)
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 5af8fe538..9ac07f6fe 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -401,6 +401,17 @@
   </inject-code>
 
   <inject-code class="target" position="end" file="glue/qt_version.cpp" />
+  <inject-code class="target" position="end">
+    { // Avoid name clash
+        Shiboken::AutoDecRef atexit(Shiboken::Module::import("atexit"));
+        Shiboken::AutoDecRef regFunc(PyObject_GetAttrString(atexit, "register"));
+        Shiboken::AutoDecRef shutDownFunc(PyObject_GetAttrString(module, "__moduleShutdown"));
+        Shiboken::AutoDecRef args(PyTuple_New(1));
+        PyTuple_SET_ITEM(args, 0, shutDownFunc);
+        Shiboken::AutoDecRef retval(PyObject_Call(regFunc, args, 0));
+        Q_ASSERT(!retval.isNull());
+    }
+  </inject-code>
 
   <add-function signature="__moduleShutdown()">
       <inject-code class="target" position="beginning">
diff --git a/PySide/__init__.py.in b/PySide/__init__.py.in
index 9536718f8..da6cd692a 100644
--- a/PySide/__init__.py.in
+++ b/PySide/__init__.py.in
@@ -1,9 +1,3 @@
-import sys
-
 __all__ = ['QtCore', 'QtGui', 'QtNetwork', 'QtOpenGL', 'QtSql', 'QtSvg', 'QtTest', 'QtWebKit', 'QtScript']
-
-if sys.version_info[0] < 3:
-    import private
-
 __version__         = "@BINDING_API_VERSION_FULL@"
 __version_info__    = (@BINDING_API_MAJOR_VERSION@, @BINDING_API_MINOR_VERSION@, @BINDING_API_MICRO_VERSION@, "@BINDING_API_RELEASE_LEVEL@", @BINDING_API_SERIAL@)
diff --git a/PySide/private.py b/PySide/private.py
deleted file mode 100644
index 0fe1c1326..000000000
--- a/PySide/private.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import atexit
-from QtCore import __moduleShutdown
-
-atexit.register(__moduleShutdown)
-- 
cgit v1.2.3