[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33861] trunk/blender: remove reload() from builtins since python3 no longer uses this.
Campbell Barton
ideasman42 at gmail.com
Wed Dec 22 22:39:48 CET 2010
Revision: 33861
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33861
Author: campbellbarton
Date: 2010-12-22 22:39:48 +0100 (Wed, 22 Dec 2010)
Log Message:
-----------
remove reload() from builtins since python3 no longer uses this.
use imp.reload now.
Should use import hooks but for now replace imp.reload with our own reload as the builtin reload was replaced before.
Modified Paths:
--------------
trunk/blender/doc/python_api/sphinx_doc_gen.py
trunk/blender/release/scripts/io/netrender/__init__.py
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/op/animsys_update.py
trunk/blender/release/scripts/op/io_anim_bvh/__init__.py
trunk/blender/release/scripts/op/io_mesh_ply/__init__.py
trunk/blender/release/scripts/op/io_scene_3ds/__init__.py
trunk/blender/release/scripts/op/io_scene_fbx/__init__.py
trunk/blender/release/scripts/op/io_scene_obj/__init__.py
trunk/blender/release/scripts/op/io_scene_x3d/__init__.py
trunk/blender/release/scripts/op/io_shape_mdd/__init__.py
trunk/blender/release/scripts/op/nla.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/python/intern/bpy_interface.c
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -51,7 +51,6 @@
import inspect
import bpy
import rna_info
-reload(rna_info)
# lame, python wont give some access
ClassMethodDescriptorType = type(dict.__dict__['fromkeys'])
Modified: trunk/blender/release/scripts/io/netrender/__init__.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/__init__.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/release/scripts/io/netrender/__init__.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -20,17 +20,18 @@
# To support reload properly, try to access a package var, if it's there, reload everything
if "init_data" in locals():
- reload(model)
- reload(operators)
- reload(client)
- reload(slave)
- reload(master)
- reload(master_html)
- reload(utils)
- reload(balancing)
- reload(ui)
- reload(repath)
- reload(versioning)
+ import imp
+ imp.reload(model)
+ imp.reload(operators)
+ imp.reload(client)
+ imp.reload(slave)
+ imp.reload(master)
+ imp.reload(master_html)
+ imp.reload(utils)
+ imp.reload(balancing)
+ imp.reload(ui)
+ imp.reload(repath)
+ imp.reload(versioning)
else:
from netrender import model
from netrender import operators
Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/release/scripts/modules/bpy/utils.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -140,6 +140,7 @@
traceback.print_exc()
def test_reload(mod):
+ import imp
# reloading this causes internal errors
# because the classes from this module are stored internally
# possibly to refresh internal references too but for now, best not to.
@@ -147,7 +148,7 @@
return mod
try:
- return reload(mod)
+ return imp.reload(mod)
except:
traceback.print_exc()
@@ -365,6 +366,7 @@
import os
import sys
import bpy_types as _bpy_types
+ import imp
_bpy_types._register_immediate = False
@@ -385,7 +387,7 @@
print("module changed on disk:", mod.__file__, "reloading...")
try:
- reload(mod)
+ imp.reload(mod)
except:
handle_error()
del sys.modules[module_name]
@@ -477,7 +479,8 @@
"""
Sets the addon state based on the user preferences.
"""
-
+ import imp
+
# RELEASE SCRIPTS: official scripts distributed in Blender releases
paths = script_paths("addons")
@@ -496,7 +499,7 @@
if reload_scripts:
mod = _sys.modules.get(mod_name)
if mod:
- reload(mod)
+ imp.reload(mod)
if is_enabled == is_loaded:
pass
Modified: trunk/blender/release/scripts/op/animsys_update.py
===================================================================
--- trunk/blender/release/scripts/op/animsys_update.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/release/scripts/op/animsys_update.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -692,7 +692,6 @@
def execute(self, context):
import animsys_refactor
- reload(animsys_refactor)
animsys_refactor.update_data_paths(data_path_update)
return {'FINISHED'}
Modified: trunk/blender/release/scripts/op/io_anim_bvh/__init__.py
===================================================================
--- trunk/blender/release/scripts/op/io_anim_bvh/__init__.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/release/scripts/op/io_anim_bvh/__init__.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -20,9 +20,9 @@
# To support reload properly, try to access a package var, if it's there, reload everything
if "bpy" in locals():
- from imp import reload
+ import imp
if "import_bvh" in locals():
- reload(import_bvh)
+ imp.reload(import_bvh)
import bpy
Modified: trunk/blender/release/scripts/op/io_mesh_ply/__init__.py
===================================================================
--- trunk/blender/release/scripts/op/io_mesh_ply/__init__.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/release/scripts/op/io_mesh_ply/__init__.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -18,9 +18,9 @@
# To support reload properly, try to access a package var, if it's there, reload everything
if "bpy" in locals():
- from imp import reload
+ import imp
if "export_ply" in locals():
- reload(export_ply)
+ imp.reload(export_ply)
import bpy
Modified: trunk/blender/release/scripts/op/io_scene_3ds/__init__.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_3ds/__init__.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/release/scripts/op/io_scene_3ds/__init__.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -20,11 +20,11 @@
# To support reload properly, try to access a package var, if it's there, reload everything
if "bpy" in locals():
- from imp import reload
+ import imp
if "import_3ds" in locals():
- reload(import_3ds)
+ imp.reload(import_3ds)
if "export_3ds" in locals():
- reload(export_3ds)
+ imp.reload(export_3ds)
import bpy
Modified: trunk/blender/release/scripts/op/io_scene_fbx/__init__.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_fbx/__init__.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/release/scripts/op/io_scene_fbx/__init__.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -20,9 +20,9 @@
# To support reload properly, try to access a package var, if it's there, reload everything
if "bpy" in locals():
- from imp import reload
+ import imp
if "export_fbx" in locals():
- reload(export_fbx)
+ imp.reload(export_fbx)
import bpy
Modified: trunk/blender/release/scripts/op/io_scene_obj/__init__.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_obj/__init__.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/release/scripts/op/io_scene_obj/__init__.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -20,11 +20,11 @@
# To support reload properly, try to access a package var, if it's there, reload everything
if "bpy" in locals():
- from imp import reload
+ import imp
if "import_obj" in locals():
- reload(import_obj)
+ imp.reload(import_obj)
if "export_obj" in locals():
- reload(export_obj)
+ imp.reload(export_obj)
import bpy
Modified: trunk/blender/release/scripts/op/io_scene_x3d/__init__.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_x3d/__init__.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/release/scripts/op/io_scene_x3d/__init__.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -18,9 +18,9 @@
# To support reload properly, try to access a package var, if it's there, reload everything
if "bpy" in locals():
- from imp import reload
+ import imp
if "export_x3d" in locals():
- reload(export_x3d)
+ imp.reload(export_x3d)
import bpy
Modified: trunk/blender/release/scripts/op/io_shape_mdd/__init__.py
===================================================================
--- trunk/blender/release/scripts/op/io_shape_mdd/__init__.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/release/scripts/op/io_shape_mdd/__init__.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -20,11 +20,11 @@
# To support reload properly, try to access a package var, if it's there, reload everything
if "bpy" in locals():
- from imp import reload
+ import imp
if "import_mdd" in locals():
- reload(import_mdd)
+ imp.reload(import_mdd)
if "export_mdd" in locals():
- reload(export_mdd)
+ imp.reload(export_mdd)
import bpy
Modified: trunk/blender/release/scripts/op/nla.py
===================================================================
--- trunk/blender/release/scripts/op/nla.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/release/scripts/op/nla.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -75,8 +75,6 @@
def bake(frame_start, frame_end, step=1, only_selected=False):
- # import nla; reload(nla); nla.bake()
-
scene = bpy.context.scene
obj = bpy.context.object
pose = obj.pose
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2010-12-22 21:39:48 UTC (rev 33861)
@@ -2290,7 +2290,6 @@
def draw(self, context):
import rna_prop_ui
- # reload(rna_prop_ui)
member = __class__._active_context_member(context)
if member:
Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c 2010-12-22 21:38:06 UTC (rev 33860)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c 2010-12-22 21:39:48 UTC (rev 33861)
@@ -252,11 +252,24 @@
{ /* our own import and reload functions */
PyObject *item;
+ PyObject *mod;
//PyObject *m = PyImport_AddModule("__builtin__");
//PyObject *d = PyModule_GetDict(m);
PyObject *d = PyEval_GetBuiltins( );
- PyDict_SetItemString(d, "reload", item=PyCFunction_New(&bpy_reload_meth, NULL)); Py_DECREF(item);
+// PyDict_SetItemString(d, "reload", item=PyCFunction_New(&bpy_reload_meth, NULL)); Py_DECREF(item);
PyDict_SetItemString(d, "__import__", item=PyCFunction_New(&bpy_import_meth, NULL)); Py_DECREF(item);
+
+ /* move reload here
+ * XXX, use import hooks */
+ mod= PyImport_ImportModuleLevel((char *)"imp", NULL, NULL, NULL, 0);
+ if(mod) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list