File make_python_3.6_compatible.patch of Package blender

Overview Repositories Revisions Requests Users Attributes Meta

File make_python_3.6_compatible.patch of Package blender (Revision 6c2b06cb1e53134707a0a58aff7b8f04)

Currently displaying revision 6c2b06cb1e53134707a0a58aff7b8f04 , Show latest

Index: b/CMakeLists.txt
===================================================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -789,8 +789,8 @@ if(WITH_PYTHON)
   # Do this before main 'platform_*' checks,
   # because UNIX will search for the old Python paths which may not exist.
   # giving errors about missing paths before this case is met.
-  if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.7")
-    message(FATAL_ERROR "At least Python 3.7 is required to build")
+  if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.6")
+    message(FATAL_ERROR "At least Python 3.6 is required to build")
   endif()
 
   file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/scripts/addons")
Index: b/source/blender/python/intern/bpy_rna.c
===================================================================
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -8685,9 +8685,11 @@ static PyObject *pyrna_register_class(Py
   }
 
   /* Call classed register method. */
-  switch (_PyObject_LookupAttr(py_class, bpy_intern_str_register, &py_cls_meth)) {
+  switch (PyObject_HasAttr(py_class, bpy_intern_str_register)) {
     case 1: {
+      py_cls_meth = PyObject_GetAttr(py_class, bpy_intern_str_register);
       PyObject *ret = PyObject_CallObject(py_cls_meth, NULL);
+      Py_DECREF(py_cls_meth);
       if (ret) {
         Py_DECREF(ret);
       }
@@ -8696,8 +8698,8 @@ static PyObject *pyrna_register_class(Py
       }
       break;
     }
-    case -1: {
-      return NULL;
+    case 0: {
+      break;
     }
   }
 
@@ -8791,9 +8793,11 @@ static PyObject *pyrna_unregister_class(
   }
 
   /* Call classed unregister method. */
-  switch (_PyObject_LookupAttr(py_class, bpy_intern_str_unregister, &py_cls_meth)) {
+  switch (PyObject_HasAttr(py_class, bpy_intern_str_unregister)) {
+    py_cls_meth = PyObject_GetAttr(py_class, bpy_intern_str_unregister);
     case 1: {
       PyObject *ret = PyObject_CallObject(py_cls_meth, NULL);
+      Py_DECREF(py_cls_meth);
       if (ret) {
         Py_DECREF(ret);
       }
@@ -8802,8 +8806,8 @@ static PyObject *pyrna_unregister_class(
       }
       break;
     }
-    case -1: {
-      return NULL;
+    case 0: {
+      break;
     }
   }
 
Index: b/source/blender/python/intern/bpy_capi_utils.h
===================================================================
--- a/source/blender/python/intern/bpy_capi_utils.h
+++ b/source/blender/python/intern/bpy_capi_utils.h
@@ -21,8 +21,8 @@
 #ifndef __BPY_CAPI_UTILS_H__
 #define __BPY_CAPI_UTILS_H__
 
-#if PY_VERSION_HEX < 0x03070000
-#  error "Python 3.7 or greater is required, you'll need to update your Python."
+#if PY_VERSION_HEX < 0x03060000
+#  error "Python 3.6 or greater is required, you'll need to update your Python."
 #endif
 
 struct EnumPropertyItem;

Places

File make_python_3.6_compatible.patch of Package blender (Revision 6c2b06cb1e53134707a0a58aff7b8f04)

Places