remove checks for PY_VERSION_HEX < VERSION_HEX(3, 0, 0)

bareos · Aug 24, 2023 · df32720 · df32720
1 parent 85f9b59
commit df32720
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 38 deletions.
diff --git a/core/src/plugins/dird/python/module/bareosdir.cc b/core/src/plugins/dird/python/module/bareosdir.cc
@@ -35,11 +35,7 @@
 
 #include "include/version_hex.h"
 
-#if PY_VERSION_HEX < VERSION_HEX(3, 0, 0)
-#  define LOGPREFIX "python-dir-mod: "
-#else
-#  define LOGPREFIX "python3-dir-mod: "
-#endif
+#define LOGPREFIX "python3-dir-mod: "
 
 #include "dird/dird.h"
 #include "dird/dir_plugins.h"

diff --git a/core/src/plugins/dird/python/python-dir.cc b/core/src/plugins/dird/python/python-dir.cc
@@ -37,13 +37,8 @@
 
 #define PLUGIN_DAEMON "dir"
 
-#if PY_VERSION_HEX < VERSION_HEX(3, 0, 0)
-#  define PLUGIN_NAME "python"
-#  define PLUGIN_DIR PY2MODDIR
-#else
-#  define PLUGIN_NAME "python3"
-#  define PLUGIN_DIR PY3MODDIR
-#endif
+#define PLUGIN_NAME "python3"
+#define PLUGIN_DIR PY3MODDIR
 #define LOGPREFIX PLUGIN_NAME "-" PLUGIN_DAEMON ": "
 
 #include "dird/dird.h"

diff --git a/core/src/plugins/filed/python/module/bareosfd.cc b/core/src/plugins/filed/python/module/bareosfd.cc
@@ -35,12 +35,7 @@
 
 #include "include/version_hex.h"
 
-#if PY_VERSION_HEX < VERSION_HEX(3, 0, 0)
-#  define LOGPREFIX "python-fd-mod: "
-#else
-#  define LOGPREFIX "python3-fd-mod: "
-#endif
-
+#define LOGPREFIX "python3-fd-mod: "
 
 #include "filed/fd_plugins.h"
 

diff --git a/core/src/plugins/filed/python/python-fd.cc b/core/src/plugins/filed/python/python-fd.cc
@@ -37,13 +37,8 @@
 
 #define PLUGIN_DAEMON "fd"
 
-#if PY_VERSION_HEX < VERSION_HEX(3, 0, 0)
-#  define PLUGIN_NAME "python"
-#  define PLUGIN_DIR PY2MODDIR
-#else
-#  define PLUGIN_NAME "python3"
-#  define PLUGIN_DIR PY3MODDIR
-#endif
+#define PLUGIN_NAME "python3"
+#define PLUGIN_DIR PY3MODDIR
 #define LOGPREFIX PLUGIN_NAME "-" PLUGIN_DAEMON ": "
 
 #include "filed/fd_plugins.h"

diff --git a/core/src/plugins/stored/python/module/bareossd.cc b/core/src/plugins/stored/python/module/bareossd.cc
@@ -35,12 +35,7 @@
 
 #include "include/version_hex.h"
 
-#if PY_VERSION_HEX < VERSION_HEX(3, 0, 0)
-#  define LOGPREFIX "python-sd-mod: "
-#else
-#  define LOGPREFIX "python3-sd-mod: "
-#endif
-
+#define LOGPREFIX "python3-sd-mod: "
 
 #include "filed/fd_plugins.h"
 

diff --git a/core/src/plugins/stored/python/python-sd.cc b/core/src/plugins/stored/python/python-sd.cc
@@ -37,13 +37,8 @@
 
 #define PLUGIN_DAEMON "sd"
 
-#if PY_VERSION_HEX < VERSION_HEX(3, 0, 0)
-#  define PLUGIN_NAME "python"
-#  define PLUGIN_DIR PY2MODDIR
-#else
-#  define PLUGIN_NAME "python3"
-#  define PLUGIN_DIR PY3MODDIR
-#endif
+#define PLUGIN_NAME "python3"
+#define PLUGIN_DIR PY3MODDIR
 
 #define LOGPREFIX PLUGIN_NAME "-" PLUGIN_DAEMON ": "