chore: consolidate python utils

hoffstadt · Oct 31, 2022 · 6cc2ab1 · 6cc2ab1
1 parent 988c1fe
commit 6cc2ab1
Show file tree

Hide file tree

Showing 51 changed files with 3,149 additions and 3,279 deletions.
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 import shutil
 import subprocess
 
-wip_version = "1.7.3"
+wip_version = "1.8.0"
 
 def version_number():
     """This function reads the version number which is populated by github actions"""

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -23,13 +23,8 @@ set(MARVEL_SOURCES
 	"$<$<PLATFORM_ID:Linux>:mvGraphics_linux.cpp>"
 
 	# python
-	"mvPyObject.cpp"
-	"mvPythonTranslator.cpp"
-	"mvPythonParser.cpp"
-	"mvPythonExceptions.cpp"
-	"mvGlobalIntepreterLock.cpp"
-	"mvPythonTypeChecker.cpp"
-    "mvCustomTypes.cpp"
+	"mvPyUtils.cpp"
+		"mvCustomTypes.cpp"
 
 	# ui
 	"mvBasicWidgets.cpp"

diff --git a/src/composite/mvFileDialog.cpp b/src/composite/mvFileDialog.cpp
@@ -1,7 +1,7 @@
 #include "mvFileDialog.h"
 #include "mvFileExtension.h"
 #include "mvItemRegistry.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvLog.h"
 
 static void Panel(const char* vFilter, IGFDUserDatas vUserDatas, bool* vCantContinue)

diff --git a/src/composite/mvFileExtension.cpp b/src/composite/mvFileExtension.cpp
@@ -1,7 +1,7 @@
 #include "mvFileExtension.h"
 #include "mvFileDialog.h"
 #include "mvItemRegistry.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvLog.h"
 
 void mvFileExtension::applySpecificTemplate(mvAppItem* item)

diff --git a/src/custom/mvDatePicker.cpp b/src/custom/mvDatePicker.cpp
@@ -4,7 +4,7 @@
 #include <implot_internal.h>
 #include <misc/cpp/imgui_stdlib.h>
 #include "mvItemRegistry.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvFontItems.h"
 #include "mvThemes.h"
 #include "mvContainers.h"

diff --git a/src/custom/mvSlider3D.cpp b/src/custom/mvSlider3D.cpp
@@ -1,5 +1,5 @@
 #include "mvSlider3D.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvFontItems.h"
 #include "mvThemes.h"
 #include "mvContainers.h"

diff --git a/src/custom/mvTimePicker.cpp b/src/custom/mvTimePicker.cpp
@@ -4,7 +4,7 @@
 #include <misc/cpp/imgui_stdlib.h>
 #include "mvContext.h"
 #include "mvItemRegistry.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvFontItems.h"
 #include "mvThemes.h"
 #include "mvContainers.h"

diff --git a/src/dearpygui.cpp b/src/dearpygui.cpp
@@ -6,12 +6,11 @@
 #include <cstdlib>
 #include "mvToolManager.h"
 #include "mvCustomTypes.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvViewport.h"
 #include <stb_image.h>
 #include "mvLog.h"
 #include "mvProfiler.h"
-
 #include "dearpygui_commands.h"
 #include "dearpygui_parsers.h"
 

diff --git a/src/dearpygui.h b/src/dearpygui.h
@@ -2,10 +2,7 @@
 
 #include <map>
 #include <vector>
-#include "mvPythonParser.h"
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
+#include "mvPyUtils.h"
 
 PyMODINIT_FUNC PyInit__dearpygui(void);
 

diff --git a/src/dearpygui_commands.h b/src/dearpygui_commands.h
@@ -5,7 +5,7 @@
 #include <cstdlib>
 #include "mvToolManager.h"
 #include "mvCustomTypes.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvViewport.h"
 #include "stb_image.h"
 #include "stb_image_write.h"

diff --git a/src/dearpygui_parsers.h b/src/dearpygui_parsers.h
@@ -5,7 +5,7 @@
 #include <cstdlib>
 #include "mvToolManager.h"
 #include "mvCustomTypes.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvViewport.h"
 #include <stb_image.h>
 #include "mvLog.h"

diff --git a/src/mvAppItem.cpp b/src/mvAppItem.cpp
@@ -2,12 +2,9 @@
 #include "mvContext.h"
 #include "mvItemRegistry.h"
 #include "mvCore.h"
-#include "mvPythonExceptions.h"
-#include "mvGlobalIntepreterLock.h"
 #include "mvAppItemCommons.h"
 #include "mvLog.h"
-#include "mvPythonTypeChecker.h"
-#include "mvPyObject.h"
+#include "mvPyUtils.h"
 
 static void
 UpdateLocations(std::vector<std::shared_ptr<mvAppItem>>* children, i32 slots)

diff --git a/src/mvAppItem.h b/src/mvAppItem.h
@@ -13,7 +13,7 @@
 #include <imgui.h>
 #include "mvAppItemState.h"
 #include "mvCallbackRegistry.h"
-#include "mvPythonTranslator.h"
+#include "mvPyUtils.h"
 #include <implot_internal.h>
 #include "mvAppItemTypes.inc"
 

diff --git a/src/mvAppItemState.cpp b/src/mvAppItemState.cpp
@@ -2,7 +2,7 @@
 #include <imgui.h>
 #include "mvAppItem.h"
 #include "mvContext.h"
-#include "mvPyObject.h"
+#include "mvPyUtils.h"
 
 void 
 ResetAppItemState(mvAppItemState& state)

diff --git a/src/mvBasicWidgets.cpp b/src/mvBasicWidgets.cpp
@@ -2,9 +2,8 @@
 #include "mvFontItems.h"
 #include "mvThemes.h"
 #include "mvContainers.h"
-#include "mvPyObject.h"
+#include "mvPyUtils.h"
 #include "mvItemHandlers.h"
-#include "mvPythonExceptions.h"
 #include <misc/cpp/imgui_stdlib.h>
 #include "mvTextureItems.h"
 

diff --git a/src/mvCallbackRegistry.cpp b/src/mvCallbackRegistry.cpp
@@ -5,9 +5,7 @@
 #include <iostream>
 #include "mvItemRegistry.h"
 #include "mvAppItemCommons.h"
-#include "mvGlobalIntepreterLock.h"
-#include "mvPythonExceptions.h"
-#include "mvPyObject.h"
+#include "mvPyUtils.h"
 
 void mvRunTasks()
 {

diff --git a/src/mvColors.cpp b/src/mvColors.cpp
@@ -2,7 +2,7 @@
 #include "mvContext.h"
 #include <array>
 #include "mvItemRegistry.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvFontItems.h"
 #include "mvThemes.h"
 #include "mvContainers.h"

diff --git a/src/mvContainers.cpp b/src/mvContainers.cpp
@@ -3,9 +3,8 @@
 #include "mvFontItems.h"
 #include "mvThemes.h"
 #include "mvContainers.h"
-#include "mvPyObject.h"
+#include "mvPyUtils.h"
 #include "mvItemHandlers.h"
-#include "mvPythonExceptions.h"
 #include <misc/cpp/imgui_stdlib.h>
 #include "mvTextureItems.h"
 

diff --git a/src/mvContext.cpp b/src/mvContext.cpp
@@ -9,9 +9,7 @@
 #include <implot.h>
 #include "mvFontManager.h"
 #include "mvCallbackRegistry.h"
-#include "mvPythonTranslator.h"
-#include "mvPythonExceptions.h"
-#include "mvGlobalIntepreterLock.h"
+#include "mvPyUtils.h"
 #include <frameobject.h>
 #include "mvLog.h"
 #include "mvToolManager.h"

diff --git a/src/mvContext.h b/src/mvContext.h
@@ -10,13 +10,10 @@
 #include <atomic>
 #include <memory>
 #include "mvCore.h"
-#include "mvPythonParser.h"
+#include "mvPyUtils.h"
 #include "mvTypes.h"
 #include "mvGraphics.h"
 
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
 //-----------------------------------------------------------------------------
 // forward declarations
 //-----------------------------------------------------------------------------

diff --git a/src/mvCustomTypes.cpp b/src/mvCustomTypes.cpp
@@ -1,9 +1,7 @@
 #include "mvCustomTypes.h"
 #include <string>
 #include "mvTypes.h"
-#include "mvPythonTranslator.h"
-#include "mvPythonExceptions.h"
-#include "mvPythonTypeChecker.h"
+#include "mvPyUtils.h"
 
 static void
 intialize_mvMat4(mvMat4* a,

diff --git a/src/mvDocWindow.cpp b/src/mvDocWindow.cpp
@@ -1,5 +1,5 @@
 #include <map>
-#include "mvPythonParser.h"
+#include "mvPyUtils.h"
 #include "mvDocWindow.h"
 #include "dearpygui.h"
 

diff --git a/src/mvDrawings.cpp b/src/mvDrawings.cpp
@@ -1,7 +1,7 @@
 #include "mvDrawings.h"
 #include "mvLog.h"
 #include "mvItemRegistry.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvAppItemCommons.h"
 #include <math.h>
 #include "mvContext.h"

diff --git a/src/mvFontItems.cpp b/src/mvFontItems.cpp
@@ -1,6 +1,6 @@
 #include "mvFontItems.h"
 #include "mvTextureItems.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvLog.h"
 #include "mvToolManager.h"
 #include "mvFontManager.h"

diff --git a/src/mvFontManager.cpp b/src/mvFontManager.cpp
@@ -8,7 +8,7 @@
 #include "mvCore.h"
 #include "mvItemRegistry.h"
 #include "mvViewport.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include <frameobject.h>
 #include "mvTextureItems.h"
 #include <CustomFont.cpp>

diff --git a/src/mvGlobalHandlers.cpp b/src/mvGlobalHandlers.cpp
@@ -1,5 +1,5 @@
 #include "mvGlobalHandlers.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvLog.h"
 #include "mvUtilities.h"
 

diff --git a/src/mvGlobalIntepreterLock.cpp b/src/mvGlobalIntepreterLock.cpp
diff --git a/src/mvGlobalIntepreterLock.h b/src/mvGlobalIntepreterLock.h
diff --git a/src/mvItemHandlers.cpp b/src/mvItemHandlers.cpp
@@ -1,5 +1,5 @@
 #include "mvItemHandlers.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvLog.h"
 
 void mvItemHandlerRegistry::checkEvents(void* data)

diff --git a/src/mvItemRegistry.cpp b/src/mvItemRegistry.cpp
@@ -1,16 +1,11 @@
 #include "mvItemRegistry.h"
 #include "mvProfiler.h"
 #include "mvContext.h"
-#include "mvItemRegistry.h"
 #include "mvAppItemCommons.h"
 #include "mvLog.h"
-#include "mvPythonExceptions.h"
-#include "mvToolManager.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvToolManager.h"
 #include "mvFontManager.h"
-#include "mvPythonTypeChecker.h"
-#include "mvGlobalIntepreterLock.h"
 
 mvItemRegistry::mvItemRegistry()
 {

diff --git a/src/mvItemRegistry.h b/src/mvItemRegistry.h
@@ -8,7 +8,7 @@
 #include <mutex>
 #include <map>
 #include "mvAppItem.h"
-#include "mvPyObject.h"
+#include "mvPyUtils.h"
 
 //-----------------------------------------------------------------------------
 // forward declarations

diff --git a/src/mvNodes.cpp b/src/mvNodes.cpp
@@ -3,8 +3,7 @@
 #include "mvContext.h"
 #include "mvItemRegistry.h"
 #include "mvLog.h"
-#include "mvPythonExceptions.h"
-#include "mvPyObject.h"
+#include "mvPyUtils.h"
 #include "mvItemHandlers.h"
 #include "mvThemes.h"
 #include "mvContainers.h"

diff --git a/src/mvPlotting.cpp b/src/mvPlotting.cpp
@@ -3,11 +3,10 @@
 #include "mvCore.h"
 #include "mvContext.h"
 #include "mvItemRegistry.h"
-#include "mvPythonExceptions.h"
+#include "mvPyUtils.h"
 #include "mvFontItems.h"
 #include "mvThemes.h"
 #include "mvContainers.h"
-#include "mvPyObject.h"
 #include "mvTextureItems.h"
 #include "mvItemHandlers.h"