python: remove python2 function rename layer

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

Hide file tree

Showing 9 changed files with 3 additions and 92 deletions.
diff --git a/core/src/plugins/dird/python/module/bareosdir.cc b/core/src/plugins/dird/python/module/bareosdir.cc
@@ -1,7 +1,7 @@
 /*
    BAREOS® - Backup Archiving REcovery Open Sourced
 
-   Copyright (C) 2020-2022 Bareos GmbH & Co. KG
+   Copyright (C) 2020-2023 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -49,8 +49,6 @@
 
 #include "plugins/dird/python/plugin_private_context.h"
 
-#include "plugins/include/python3compat.h"
-
 #define BAREOSDIR_MODULE
 #include "bareosdir.h"
 #include "lib/edit.h"

diff --git a/core/src/plugins/dird/python/python-dir.cc b/core/src/plugins/dird/python/python-dir.cc
@@ -2,7 +2,7 @@
    BAREOS® - Backup Archiving REcovery Open Sourced
 
    Copyright (C) 2011-2014 Planets Communications B.V.
-   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2023 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -47,7 +47,6 @@
 #define LOGPREFIX PLUGIN_NAME "-" PLUGIN_DAEMON ": "
 
 #include "dird/dird.h"
-#include "plugins/include/python3compat.h"
 
 #include "python-dir.h"
 #include "module/bareosdir.h"
@@ -261,8 +260,6 @@ static bRC newPlugin(PluginContext* plugin_ctx)
   bareos_core_functions->registerBareosEvents(plugin_ctx, 1,
                                               bDirEventNewPluginOptions);
 
-#include "plugins/include/joblog_warn_about_python2_deprecation.inc"
-
   return bRC_OK;
 }
 

diff --git a/core/src/plugins/filed/python/module/bareosfd.cc b/core/src/plugins/filed/python/module/bareosfd.cc
@@ -44,11 +44,8 @@
 
 #include "filed/fd_plugins.h"
 
-#include "plugins/include/python3compat.h"
-
 #define BAREOSFD_MODULE
 #include "bareosfd.h"
-#include "plugins/include/python3compat.h"
 #include "include/filetypes.h"
 #include "lib/edit.h"
 

diff --git a/core/src/plugins/filed/python/python-fd.cc b/core/src/plugins/filed/python/python-fd.cc
@@ -47,7 +47,6 @@
 #define LOGPREFIX PLUGIN_NAME "-" PLUGIN_DAEMON ": "
 
 #include "filed/fd_plugins.h"
-#include "plugins/include/python3compat.h"
 
 #include "include/filetypes.h"
 #include "python-fd.h"
@@ -239,8 +238,6 @@ static bRC newPlugin(PluginContext* plugin_ctx)
       bEventPluginCommand, bEventJobStart, bEventRestoreCommand,
       bEventEstimateCommand, bEventBackupCommand, bEventRestoreObject);
 
-#include "plugins/include/joblog_warn_about_python2_deprecation.inc"
-
   return bRC_OK;
 }
 

diff --git a/core/src/plugins/filed/python/test/python-fd-module-tester.cc b/core/src/plugins/filed/python/test/python-fd-module-tester.cc
@@ -26,7 +26,6 @@
 #endif
 
 #include "Python.h"
-#include "plugins/include/python3compat.h"
 #include <inttypes.h>
 class PoolMem;
 #define NbytesForBits(n) ((((n)-1) >> 3) + 1)

diff --git a/core/src/plugins/include/joblog_warn_about_python2_deprecation.inc b/core/src/plugins/include/joblog_warn_about_python2_deprecation.inc
diff --git a/core/src/plugins/include/python3compat.h b/core/src/plugins/include/python3compat.h
diff --git a/core/src/plugins/stored/python/module/bareossd.cc b/core/src/plugins/stored/python/module/bareossd.cc
@@ -48,7 +48,6 @@
 
 #define BAREOSSD_MODULE
 #include "bareossd.h"
-#include "plugins/include/python3compat.h"
 #include "lib/edit.h"
 
 namespace storagedaemon {

diff --git a/core/src/plugins/stored/python/python-sd.cc b/core/src/plugins/stored/python/python-sd.cc
@@ -2,7 +2,7 @@
    BAREOS® - Backup Archiving REcovery Open Sourced
 
    Copyright (C) 2011-2014 Planets Communications B.V.
-   Copyright (C) 2013-2022 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2023 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public
@@ -48,7 +48,6 @@
 #define LOGPREFIX PLUGIN_NAME "-" PLUGIN_DAEMON ": "
 
 #include "stored/stored.h"
-#include "plugins/include/python3compat.h"
 
 #include "python-sd.h"
 #include "module/bareossd.h"
@@ -265,8 +264,6 @@ static bRC newPlugin(PluginContext* plugin_ctx)
   bareos_core_functions->registerBareosEvents(plugin_ctx, 1,
                                               bSdEventNewPluginOptions);
 
-#include "plugins/include/joblog_warn_about_python2_deprecation.inc"
-
   return bRC_OK;
 }