From df32720023cfe2c03e33bd0ca8fff6d8c7737193 Mon Sep 17 00:00:00 2001
From: Philipp Storz <philipp.storz@bareos.com>
Date: Tue, 8 Aug 2023 18:28:11 +0200
Subject: [PATCH] remove checks for PY_VERSION_HEX < VERSION_HEX(3, 0, 0)

---
 core/src/plugins/dird/python/module/bareosdir.cc  | 6 +-----
 core/src/plugins/dird/python/python-dir.cc        | 9 ++-------
 core/src/plugins/filed/python/module/bareosfd.cc  | 7 +------
 core/src/plugins/filed/python/python-fd.cc        | 9 ++-------
 core/src/plugins/stored/python/module/bareossd.cc | 7 +------
 core/src/plugins/stored/python/python-sd.cc       | 9 ++-------
 6 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/core/src/plugins/dird/python/module/bareosdir.cc b/core/src/plugins/dird/python/module/bareosdir.cc
index 36b3f765245..b638fc83c54 100644
--- 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
index 4b3116e1303..ac1e1f753d3 100644
--- 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
index 2ddf041d08d..b915d4bbebb 100644
--- 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
index e4f7f44e951..396218d2bf8 100644
--- 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
index cae02738889..6b5eed11545 100644
--- 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
index afe81f4b00d..167a2f0a1a2 100644
--- 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 ": "