Commit: 3e8c0027a374e963e6e7e66f8a0e475af05b9943 Author: Campbell Barton Date: Fri Jan 23 12:37:58 2015 +1100 Branches: master https://developer.blender.org/rB3e8c0027a374e963e6e7e66f8a0e475af05b9943
Cleanup: replace deprecated imp -> importlib =================================================================== M release/scripts/modules/addon_utils.py M release/scripts/modules/bpy/utils.py M release/scripts/startup/bl_operators/__init__.py M release/scripts/startup/bl_operators/anim.py M release/scripts/startup/bl_ui/__init__.py =================================================================== diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py index ae9575e..56681e1 100644 --- a/release/scripts/modules/addon_utils.py +++ b/release/scripts/modules/addon_utils.py @@ -267,11 +267,11 @@ def enable(module_name, default_set=True, persistent=False, handle_error=None): mtime_orig = getattr(mod, "__time__", 0) mtime_new = os.path.getmtime(mod.__file__) if mtime_orig != mtime_new: - import imp + import importlib print("module changed on disk:", mod.__file__, "reloading...") try: - imp.reload(mod) + importlib.reload(mod) except: handle_error() del sys.modules[module_name] @@ -384,10 +384,10 @@ def reset_all(reload_scripts=False): # first check if reload is needed before changing state. if reload_scripts: - import imp + import importlib mod = sys.modules.get(mod_name) if mod: - imp.reload(mod) + importlib.reload(mod) if is_enabled == is_loaded: pass diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index b3a7a13..dd771af 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -185,7 +185,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False): traceback.print_exc() def test_reload(mod): - import imp + import importlib # 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. @@ -193,7 +193,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False): return mod try: - return imp.reload(mod) + return importlib.reload(mod) except: import traceback traceback.print_exc() diff --git a/release/scripts/startup/bl_operators/__init__.py b/release/scripts/startup/bl_operators/__init__.py index e44fce6..65f7bde 100644 --- a/release/scripts/startup/bl_operators/__init__.py +++ b/release/scripts/startup/bl_operators/__init__.py @@ -19,9 +19,10 @@ # <pep8 compliant> if "bpy" in locals(): - from imp import reload as _reload + from importlib import reload for val in _modules_loaded.values(): - _reload(val) + reload(val) + del reload _modules = [ "add_mesh_torus", "anim", diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py index 756b75b..39bb7e9 100644 --- a/release/scripts/startup/bl_operators/anim.py +++ b/release/scripts/startup/bl_operators/anim.py @@ -19,9 +19,10 @@ # <pep8-80 compliant> if "bpy" in locals(): - import imp + from importlib import reload if "anim_utils" in locals(): - imp.reload(anim_utils) + reload(anim_utils) + del reload import bpy diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py index 99b1a7a..51117f6 100644 --- a/release/scripts/startup/bl_ui/__init__.py +++ b/release/scripts/startup/bl_ui/__init__.py @@ -21,9 +21,10 @@ # note, properties_animviz is a helper module only. if "bpy" in locals(): - from imp import reload as _reload + from importlib import reload for val in _modules_loaded.values(): - _reload(val) + reload(val) + del reload _modules = [ "properties_animviz", "properties_constraint", _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs