[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22330] branches/blender2.5/blender: remove python2.x support
Campbell Barton
ideasman42 at gmail.com
Mon Aug 10 02:07:37 CEST 2009
Revision: 22330
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22330
Author: campbellbarton
Date: 2009-08-10 02:07:34 +0200 (Mon, 10 Aug 2009)
Log Message:
-----------
remove python2.x support
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_material.py
branches/blender2.5/blender/release/ui/buttons_scene.py
branches/blender2.5/blender/release/ui/buttons_world.py
branches/blender2.5/blender/release/ui/space_console.py
branches/blender2.5/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
branches/blender2.5/blender/source/blender/python/generic/BGL.c
branches/blender2.5/blender/source/blender/python/generic/BGL.h
branches/blender2.5/blender/source/blender/python/generic/Geometry.c
branches/blender2.5/blender/source/blender/python/generic/Geometry.h
branches/blender2.5/blender/source/blender/python/generic/Mathutils.c
branches/blender2.5/blender/source/blender/python/generic/Mathutils.h
branches/blender2.5/blender/source/blender/python/generic/bpy_internal_import.c
branches/blender2.5/blender/source/blender/python/generic/bpy_internal_import.h
branches/blender2.5/blender/source/blender/python/generic/euler.c
branches/blender2.5/blender/source/blender/python/generic/euler.h
branches/blender2.5/blender/source/blender/python/generic/matrix.c
branches/blender2.5/blender/source/blender/python/generic/quat.c
branches/blender2.5/blender/source/blender/python/generic/quat.h
branches/blender2.5/blender/source/blender/python/generic/vector.c
branches/blender2.5/blender/source/blender/python/generic/vector.h
branches/blender2.5/blender/source/blender/python/intern/bpy_interface.c
branches/blender2.5/blender/source/blender/python/intern/bpy_operator.c
branches/blender2.5/blender/source/blender/python/intern/bpy_operator_wrap.c
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
branches/blender2.5/blender/source/blender/python/intern/bpy_ui.c
branches/blender2.5/blender/source/blender/python/intern/bpy_util.c
branches/blender2.5/blender/source/blender/python/intern/bpy_util.h
branches/blender2.5/blender/source/gameengine/Converter/BL_ActionActuator.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/blender2.5/blender/source/gameengine/Expressions/ListValue.cpp
branches/blender2.5/blender/source/gameengine/Expressions/PyObjectPlus.cpp
branches/blender2.5/blender/source/gameengine/Expressions/PyObjectPlus.h
branches/blender2.5/blender/source/gameengine/Expressions/Value.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ANDController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_IController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_IObject.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NANDController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_NORController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_ORController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XNORController.cpp
branches/blender2.5/blender/source/gameengine/GameLogic/SCA_XORController.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/BL_Shader.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_CDActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_Camera.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameObject.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_Light.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_Scene.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_StateActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/FilterBlueScreen.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/FilterColor.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/FilterNormal.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/FilterSource.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/ImageBuff.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/ImageMix.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/ImageRender.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/ImageViewport.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/Texture.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/blender2.5/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
Removed Paths:
-------------
branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
Modified: branches/blender2.5/blender/release/ui/buttons_material.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_material.py 2009-08-09 23:31:16 UTC (rev 22329)
+++ branches/blender2.5/blender/release/ui/buttons_material.py 2009-08-10 00:07:34 UTC (rev 22330)
@@ -1,12 +1,6 @@
import bpy
-# If python version is less than 2.4, try to get set stuff from module
-try:
- set
-except:
- from sets import Set as set
-
class MaterialButtonsPanel(bpy.types.Panel):
__space_type__ = "BUTTONS_WINDOW"
__region_type__ = "WINDOW"
Modified: branches/blender2.5/blender/release/ui/buttons_scene.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_scene.py 2009-08-09 23:31:16 UTC (rev 22329)
+++ branches/blender2.5/blender/release/ui/buttons_scene.py 2009-08-10 00:07:34 UTC (rev 22330)
@@ -1,12 +1,6 @@
import bpy
-# If python version is less than 2.4, try to get set stuff from module
-try:
- set
-except:
- from sets import Set as set
-
class RenderButtonsPanel(bpy.types.Panel):
__space_type__ = "BUTTONS_WINDOW"
__region_type__ = "WINDOW"
Modified: branches/blender2.5/blender/release/ui/buttons_world.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_world.py 2009-08-09 23:31:16 UTC (rev 22329)
+++ branches/blender2.5/blender/release/ui/buttons_world.py 2009-08-10 00:07:34 UTC (rev 22330)
@@ -1,12 +1,6 @@
import bpy
-# If python version is less than 2.4, try to get set stuff from module
-try:
- set
-except:
- from sets import Set as set
-
class WorldButtonsPanel(bpy.types.Panel):
__space_type__ = "BUTTONS_WINDOW"
__region_type__ = "WINDOW"
Modified: branches/blender2.5/blender/release/ui/space_console.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_console.py 2009-08-09 23:31:16 UTC (rev 22329)
+++ branches/blender2.5/blender/release/ui/space_console.py 2009-08-10 00:07:34 UTC (rev 22330)
@@ -99,19 +99,9 @@
console = code.InteractiveConsole(namespace)
- if sys.version.startswith('3'):
- import io
- stdout = io.StringIO()
- stderr = io.StringIO()
- elif sys.version.startswith('2.6'):
- import io
- stdout = io.BytesIO() # Py2x support
- stderr = io.BytesIO()
- else:
- import cStringIO
- stdout = cStringIO.StringIO()
- stderr = cStringIO.StringIO()
-
+ import io
+ stdout = io.StringIO()
+ stderr = io.StringIO()
consoles[console_id]= namespace, console, stdout, stderr
Modified: branches/blender2.5/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
===================================================================
--- branches/blender2.5/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c 2009-08-09 23:31:16 UTC (rev 22329)
+++ branches/blender2.5/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c 2009-08-10 00:07:34 UTC (rev 22330)
@@ -34,9 +34,7 @@
#endif
/* TODO, support python3.x */
-#if PY_VERSION_HEX >= 0x03000000
#define DISABLE_PYTHON 1
-#endif
#include "DNA_text_types.h"
#include "BKE_text.h"
Modified: branches/blender2.5/blender/source/blender/python/generic/BGL.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/generic/BGL.c 2009-08-09 23:31:16 UTC (rev 22329)
+++ branches/blender2.5/blender/source/blender/python/generic/BGL.c 2009-08-10 00:07:34 UTC (rev 22330)
@@ -83,13 +83,7 @@
static PyObject *Buffer_repr( PyObject * self );
PyTypeObject buffer_Type = {
-#if (PY_VERSION_HEX >= 0x02060000)
PyVarObject_HEAD_INIT(NULL, 0)
-#else
- /* python 2.5 and below */
- PyObject_HEAD_INIT( NULL ) /* required py macro */
- 0, /* ob_size */
-#endif
"buffer", /*tp_name */
sizeof( Buffer ), /*tp_basicsize */
0, /*tp_itemsize */
@@ -1090,7 +1084,6 @@
{NULL, NULL, 0, NULL}
};
-#if (PY_VERSION_HEX >= 0x03000000)
static struct PyModuleDef BGL_module_def = {
PyModuleDef_HEAD_INIT,
"BGL", /* m_name */
@@ -1102,17 +1095,13 @@
0, /* m_clear */
0, /* m_free */
};
-#endif
-PyObject *BGL_Init(const char *from)
+
+PyObject *BGL_Init(void)
{
PyObject *mod, *dict, *item;
-#if (PY_VERSION_HEX >= 0x03000000)
mod = PyModule_Create(&BGL_module_def);
PyDict_SetItemString(PySys_GetObject("modules"), BGL_module_def.m_name, mod);
-#else
- mod= Py_InitModule(from, BGL_methods);
-#endif
dict= PyModule_GetDict(mod);
if( PyType_Ready( &buffer_Type) < 0)
Modified: branches/blender2.5/blender/source/blender/python/generic/BGL.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/generic/BGL.h 2009-08-09 23:31:16 UTC (rev 22329)
+++ branches/blender2.5/blender/source/blender/python/generic/BGL.h 2009-08-10 00:07:34 UTC (rev 22330)
@@ -42,9 +42,8 @@
#include <Python.h>
#include <GL/glew.h>
-#include "../intern/bpy_compat.h"
-PyObject *BGL_Init( const char *from );
+PyObject *BGL_Init(void);
/*@ Buffer Object */
/*@ For Python access to OpenGL functions requiring a pointer. */
Modified: branches/blender2.5/blender/source/blender/python/generic/Geometry.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/generic/Geometry.c 2009-08-09 23:31:16 UTC (rev 22329)
+++ branches/blender2.5/blender/source/blender/python/generic/Geometry.c 2009-08-10 00:07:34 UTC (rev 22330)
@@ -78,7 +78,6 @@
{NULL, NULL, 0, NULL}
};
-#if (PY_VERSION_HEX >= 0x03000000)
static struct PyModuleDef M_Geometry_module_def = {
PyModuleDef_HEAD_INIT,
"Geometry", /* m_name */
@@ -90,19 +89,14 @@
0, /* m_clear */
0, /* m_free */
};
-#endif
/*----------------------------MODULE INIT-------------------------*/
-PyObject *Geometry_Init(const char *from)
+PyObject *Geometry_Init(void)
{
PyObject *submodule;
-#if (PY_VERSION_HEX >= 0x03000000)
submodule = PyModule_Create(&M_Geometry_module_def);
PyDict_SetItemString(PySys_GetObject("modules"), M_Geometry_module_def.m_name, submodule);
-#else
- submodule = Py_InitModule3(from, M_Geometry_methods, M_Geometry_doc);
-#endif
return (submodule);
}
Modified: branches/blender2.5/blender/source/blender/python/generic/Geometry.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/generic/Geometry.h 2009-08-09 23:31:16 UTC (rev 22329)
+++ branches/blender2.5/blender/source/blender/python/generic/Geometry.h 2009-08-10 00:07:34 UTC (rev 22330)
@@ -34,6 +34,6 @@
#include <Python.h>
#include "Mathutils.h"
-PyObject *Geometry_Init( const char *from );
+PyObject *Geometry_Init(void);
#endif /* EXPP_Geometry_H */
Modified: branches/blender2.5/blender/source/blender/python/generic/Mathutils.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/generic/Mathutils.c 2009-08-09 23:31:16 UTC (rev 22329)
+++ branches/blender2.5/blender/source/blender/python/generic/Mathutils.c 2009-08-10 00:07:34 UTC (rev 22330)
@@ -94,7 +94,6 @@
/*----------------------------MODULE INIT-------------------------*/
/* from can be Blender.Mathutils or GameLogic.Mathutils for the BGE */
-#if (PY_VERSION_HEX >= 0x03000000)
static struct PyModuleDef M_Mathutils_module_def = {
PyModuleDef_HEAD_INIT,
"Mathutils", /* m_name */
@@ -106,21 +105,13 @@
0, /* m_clear */
0, /* m_free */
};
-#endif
-PyObject *Mathutils_Init(const char *from)
+PyObject *Mathutils_Init(void)
{
PyObject *submodule;
//seed the generator for the rand function
BLI_srand((unsigned int) (PIL_check_seconds_timer() * 0x7FFFFFFF));
-
-#if (PY_VERSION_HEX < 0x03000000)
- vector_Type.tp_flags |= Py_TPFLAGS_CHECKTYPES;
- matrix_Type.tp_flags |= Py_TPFLAGS_CHECKTYPES;
- euler_Type.tp_flags |= Py_TPFLAGS_CHECKTYPES;
- quaternion_Type.tp_flags |= Py_TPFLAGS_CHECKTYPES;
-#endif
if( PyType_Ready( &vector_Type ) < 0 )
return NULL;
@@ -131,12 +122,8 @@
if( PyType_Ready( &quaternion_Type ) < 0 )
return NULL;
-#if (PY_VERSION_HEX >= 0x03000000)
submodule = PyModule_Create(&M_Mathutils_module_def);
PyDict_SetItemString(PySys_GetObject("modules"), M_Mathutils_module_def.m_name, submodule);
-#else
- submodule = Py_InitModule3(from, M_Mathutils_methods, M_Mathutils_doc);
-#endif
/* each type has its own new() function */
PyModule_AddObject( submodule, "Vector", (PyObject *)&vector_Type );
Modified: branches/blender2.5/blender/source/blender/python/generic/Mathutils.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/generic/Mathutils.h 2009-08-09 23:31:16 UTC (rev 22329)
+++ branches/blender2.5/blender/source/blender/python/generic/Mathutils.h 2009-08-10 00:07:34 UTC (rev 22330)
@@ -32,7 +32,6 @@
#define EXPP_Mathutils_H
#include <Python.h>
-#include "../intern/bpy_compat.h"
#include "vector.h"
#include "matrix.h"
#include "quat.h"
@@ -55,11 +54,8 @@
PyObject *BaseMathObject_getWrapped( BaseMathObject *self, void * );
void BaseMathObject_dealloc(BaseMathObject * self);
+PyObject *Mathutils_Init(void);
-
-
-PyObject *Mathutils_Init( const char * from );
-
PyObject *quat_rotation(PyObject *arg1, PyObject *arg2);
int EXPP_FloatsAreEqual(float A, float B, int floatSteps);
Modified: branches/blender2.5/blender/source/blender/python/generic/bpy_internal_import.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/generic/bpy_internal_import.c 2009-08-09 23:31:16 UTC (rev 22329)
+++ branches/blender2.5/blender/source/blender/python/generic/bpy_internal_import.c 2009-08-10 00:07:34 UTC (rev 22330)
@@ -179,20 +179,12 @@
PyObject *newmodule;
//PyObject_Print(args, stderr, 0);
-#if (PY_VERSION_HEX >= 0x02060000)
int dummy_val; /* what does this do?*/
static char *kwlist[] = {"name", "globals", "locals", "fromlist", "level", 0};
if( !PyArg_ParseTupleAndKeywords( args, kw, "s|OOOi:bpy_import_meth", kwlist,
&name, &globals, &locals, &fromlist, &dummy_val) )
return NULL;
-#else
- static char *kwlist[] = {"name", "globals", "locals", "fromlist", 0};
-
- if( !PyArg_ParseTupleAndKeywords( args, kw, "s|OOO:bpy_import_meth", kwlist,
- &name, &globals, &locals, &fromlist ) )
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list