[#217] Remove Python 2 support code

Author: SwooshyCueb

CMakeLists.txt

@@ -46,16 +46,11 @@ if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
   message(STATUS "Setting unspecified CMAKE_BUILD_TYPE to '${CMAKE_BUILD_TYPE}'")
 endif()
 
-if (NOT IRODS_PYTHON_VERSION)
-  set(IRODS_PYTHON_VERSION "3" CACHE STRING "The version of python to link against" FORCE)
-  message(STATUS "Setting unspecified IRODS_PYTHON_VERSION to '${IRODS_PYTHON_VERSION}'. This is the correct setting for normal builds.")
-endif()
-
 find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL)
 find_package(nlohmann_json "3.6.1" REQUIRED)
 find_package(fmt "8.1.1"
   HINTS "${IRODS_EXTERNALS_FULLPATH_FMT}")
-find_package(Python "${IRODS_PYTHON_VERSION}" REQUIRED COMPONENTS Development)
+find_package(Python 3 REQUIRED COMPONENTS Development)
 
 set(
   PLUGIN

include/irods/private/re/python/irods_errors.hpp

@@ -4,13 +4,8 @@
 // include this first to fix macro redef warnings
 #include <pyconfig.h>
 
-#include <patchlevel.h>
+#include <Python.h>
 
-#if PY_VERSION_HEX < 0x03000000
-extern "C" void initirods_errors();
-#else
-#  include <Python.h>
 extern "C" PyObject* PyInit_irods_errors();
-#endif
 
 #endif // RE_PYTHON_IRODS_ERRORS_HPP

include/irods/private/re/python/irods_types.hpp

@@ -36,12 +36,9 @@
 
 #include "irods/private/re/python/types/type_sequence.hpp"
 
-#if PY_VERSION_HEX < 0x03000000
-extern "C" void initirods_types();
-#else
-#  include <Python.h>
+#include <Python.h>
+
 extern "C" PyObject* PyInit_irods_types();
-#endif
 
 void init_irods_types();
 

src/main.cpp

@@ -193,11 +193,7 @@ namespace
 			bp::handle<> h_encoded(PyUnicode_AsUTF8String(py_obj));
 			void* storage = reinterpret_cast<boost::python::converter::rvalue_from_python_storage<std::string>*>(data)
 			                    ->storage.bytes;
-#if PY_VERSION_HEX < 0x03000000
-			new (storage) std::string(PyString_AsString(h_encoded.get()));
-#else
 			new (storage) std::string(PyBytes_AsString(h_encoded.get()));
-#endif
 			data->convertible = storage;
 		}
 
@@ -343,15 +339,9 @@ namespace
 static irods::error start(irods::default_re_ctx&, const std::string& _instance_name)
 {
 	try {
-#if PY_VERSION_HEX < 0x03000000
-		PyImport_AppendInittab("plugin_wrappers", &initplugin_wrappers);
-		PyImport_AppendInittab("irods_types", &initirods_types);
-		PyImport_AppendInittab("irods_errors", &initirods_errors);
-#else
 		PyImport_AppendInittab("plugin_wrappers", &PyInit_plugin_wrappers);
 		PyImport_AppendInittab("irods_types", &PyInit_irods_types);
 		PyImport_AppendInittab("irods_errors", &PyInit_irods_errors);
-#endif
 		Py_InitializeEx(0);
 		std::lock_guard<std::recursive_mutex> lock{python_mutex};
 		boost::filesystem::path etc_irods_path = irods::get_irods_config_directory();