[Bf-extensions-cvs] [d47e9be] master: Fix: replaced Python module "imp" with "implib"
Sybren A. Stvel
noreply at git.blender.org
Fri Jan 23 04:40:59 CET 2015
Commit: d47e9be4fb204988ec659fc59882b2f5964afa3f
Author: Sybren A. Stvel
Date: Thu Jan 22 17:05:39 2015 +1100
Branches: master
https://developer.blender.org/rBAd47e9be4fb204988ec659fc59882b2f5964afa3f
Fix: replaced Python module "imp" with "implib"
Python 3.4.0 deprecated the "imp" module, and replaced it with
"importlib". This changes imp.reload() into implib.reload().
Reviewers: campbellbarton
Differential Revision: https://developer.blender.org/D1016
===================================================================
M add_curve_extra_objects/__init__.py
M add_curve_sapling/__init__.py
M add_mesh_BoltFactory/__init__.py
M add_mesh_extra_objects/__init__.py
M io_anim_bvh/__init__.py
M io_anim_nuke_chan/__init__.py
M io_coat3D/__init__.py
M io_convert_image_to_mesh_img/__init__.py
M io_curve_svg/__init__.py
M io_mesh_ply/__init__.py
M io_mesh_raw/__init__.py
M io_mesh_stl/__init__.py
M io_mesh_uv_layout/__init__.py
M io_scene_3ds/__init__.py
M io_scene_ms3d/__init__.py
M io_scene_obj/__init__.py
M io_scene_vrml2/__init__.py
M io_scene_x3d/__init__.py
M io_shape_mdd/__init__.py
M light_field_tools/__init__.py
M mesh_inset/__init__.py
M mocap/__init__.py
M netrender/__init__.py
M object_fracture/__init__.py
M object_fracture_cell/__init__.py
M object_print3d_utils/__init__.py
M render_copy_settings/__init__.py
M render_povray/__init__.py
M render_renderfarmfi/rpc.py
M render_renderfarmfi/utils.py
M rigify/__init__.py
M rigify/rigs/biped/arm/__init__.py
M rigify/rigs/biped/leg/__init__.py
M rigify/rigs/pitchipoy/super_widgets.py
M rigify/ui.py
M rigify/utils.py
M space_view3d_math_vis/__init__.py
M system_demo_mode/__init__.py
M ui_translate/__init__.py
M ui_translate/edit_translation.py
M ui_translate/settings.py
M ui_translate/update_addon.py
M ui_translate/update_svn.py
M ui_translate/update_ui.py
===================================================================
diff --git a/add_curve_extra_objects/__init__.py b/add_curve_extra_objects/__init__.py
index 5dffb0d..f3b2413 100644
--- a/add_curve_extra_objects/__init__.py
+++ b/add_curve_extra_objects/__init__.py
@@ -31,10 +31,10 @@ bl_info = {
"category": "Add Curve"}
if "bpy" in locals():
- import imp
- imp.reload(add_curve_aceous_galore)
- imp.reload(add_curve_spirals)
- imp.reload(add_curve_torus_knots)
+ import importlib
+ importlib.reload(add_curve_aceous_galore)
+ importlib.reload(add_curve_spirals)
+ importlib.reload(add_curve_torus_knots)
else:
from . import add_curve_aceous_galore
diff --git a/add_curve_sapling/__init__.py b/add_curve_sapling/__init__.py
index 719675e..7e09fb2 100644
--- a/add_curve_sapling/__init__.py
+++ b/add_curve_sapling/__init__.py
@@ -33,8 +33,8 @@ bl_info = {
if "bpy" in locals():
- import imp
- imp.reload(utils)
+ import importlib
+ importlib.reload(utils)
else:
from add_curve_sapling import utils
diff --git a/add_mesh_BoltFactory/__init__.py b/add_mesh_BoltFactory/__init__.py
index 0f1c691..6dd32b8 100644
--- a/add_mesh_BoltFactory/__init__.py
+++ b/add_mesh_BoltFactory/__init__.py
@@ -30,8 +30,8 @@ bl_info = {
if "bpy" in locals():
- import imp
- imp.reload(Boltfactory)
+ import importlib
+ importlib.reload(Boltfactory)
else:
from add_mesh_BoltFactory import Boltfactory
diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py
index be08604..41bebc7 100644
--- a/add_mesh_extra_objects/__init__.py
+++ b/add_mesh_extra_objects/__init__.py
@@ -32,20 +32,20 @@ bl_info = {
}
if "bpy" in locals():
- import imp
- imp.reload(add_mesh_extra_objects)
- imp.reload(add_mesh_twisted_torus)
- imp.reload(add_mesh_gemstones)
- imp.reload(add_mesh_gears)
- imp.reload(add_mesh_3d_function_surface)
- imp.reload(add_mesh_polysphere)
- imp.reload(add_mesh_supertoroid)
- imp.reload(add_mesh_pyramid)
- imp.reload(add_mesh_torusknot)
- imp.reload(add_mesh_honeycomb)
- imp.reload(add_mesh_teapot)
- imp.reload(add_mesh_pipe_joint)
- imp.reload(add_mesh_solid)
+ import importlib
+ importlib.reload(add_mesh_extra_objects)
+ importlib.reload(add_mesh_twisted_torus)
+ importlib.reload(add_mesh_gemstones)
+ importlib.reload(add_mesh_gears)
+ importlib.reload(add_mesh_3d_function_surface)
+ importlib.reload(add_mesh_polysphere)
+ importlib.reload(add_mesh_supertoroid)
+ importlib.reload(add_mesh_pyramid)
+ importlib.reload(add_mesh_torusknot)
+ importlib.reload(add_mesh_honeycomb)
+ importlib.reload(add_mesh_teapot)
+ importlib.reload(add_mesh_pipe_joint)
+ importlib.reload(add_mesh_solid)
else:
from . import add_mesh_extra_objects
diff --git a/io_anim_bvh/__init__.py b/io_anim_bvh/__init__.py
index 6e7576c..e7d6c7b 100644
--- a/io_anim_bvh/__init__.py
+++ b/io_anim_bvh/__init__.py
@@ -31,11 +31,11 @@ bl_info = {
"category": "Import-Export"}
if "bpy" in locals():
- import imp
+ import importlib
if "import_bvh" in locals():
- imp.reload(import_bvh)
+ importlib.reload(import_bvh)
if "export_bvh" in locals():
- imp.reload(export_bvh)
+ importlib.reload(export_bvh)
import bpy
from bpy.props import (StringProperty,
diff --git a/io_anim_nuke_chan/__init__.py b/io_anim_nuke_chan/__init__.py
index 5dcccfc..16c9278 100644
--- a/io_anim_nuke_chan/__init__.py
+++ b/io_anim_nuke_chan/__init__.py
@@ -35,11 +35,11 @@ bl_info = {
# To support reload properly, try to access a package var,
# if it's there, reload everything
if "bpy" in locals():
- import imp
+ import importlib
if "import_nuke_chan" in locals():
- imp.reload(import_nuke_chan)
+ importlib.reload(import_nuke_chan)
if "export_nuke_chan" in locals():
- imp.reload(export_nuke_chan)
+ importlib.reload(export_nuke_chan)
import bpy
diff --git a/io_coat3D/__init__.py b/io_coat3D/__init__.py
index 3db5b51..8cbe4e5 100644
--- a/io_coat3D/__init__.py
+++ b/io_coat3D/__init__.py
@@ -31,9 +31,9 @@ bl_info = {
if "bpy" in locals():
- import imp
- imp.reload(coat)
- imp.reload(tex)
+ import importlib
+ importlib.reload(coat)
+ importlib.reload(tex)
else:
from . import coat
from . import tex
diff --git a/io_convert_image_to_mesh_img/__init__.py b/io_convert_image_to_mesh_img/__init__.py
index a0d9212..35b6099 100644
--- a/io_convert_image_to_mesh_img/__init__.py
+++ b/io_convert_image_to_mesh_img/__init__.py
@@ -46,8 +46,8 @@ bl_info = {
if "bpy" in locals():
- import imp
- imp.reload(import_img)
+ import importlib
+ importlib.reload(import_img)
else:
from . import import_img
diff --git a/io_curve_svg/__init__.py b/io_curve_svg/__init__.py
index 629d858..d97b9b4 100644
--- a/io_curve_svg/__init__.py
+++ b/io_curve_svg/__init__.py
@@ -35,9 +35,9 @@ bl_info = {
# To support reload properly, try to access a package var,
# if it's there, reload everything
if "bpy" in locals():
- import imp
+ import importlib
if "import_svg" in locals():
- imp.reload(import_svg)
+ importlib.reload(import_svg)
import bpy
diff --git a/io_mesh_ply/__init__.py b/io_mesh_ply/__init__.py
index d85fb46..5fa9b26 100644
--- a/io_mesh_ply/__init__.py
+++ b/io_mesh_ply/__init__.py
@@ -36,11 +36,11 @@ bl_info = {
# To support reload properly, try to access a package var,
# if it's there, reload everything
if "bpy" in locals():
- import imp
+ import importlib
if "export_ply" in locals():
- imp.reload(export_ply)
+ importlib.reload(export_ply)
if "import_ply" in locals():
- imp.reload(import_ply)
+ importlib.reload(import_ply)
import os
diff --git a/io_mesh_raw/__init__.py b/io_mesh_raw/__init__.py
index 4a5ece9..6964093 100644
--- a/io_mesh_raw/__init__.py
+++ b/io_mesh_raw/__init__.py
@@ -33,11 +33,11 @@ bl_info = {
}
if "bpy" in locals():
- import imp
+ import importlib
if "import_raw" in locals():
- imp.reload(import_raw)
+ importlib.reload(import_raw)
if "export_raw" in locals():
- imp.reload(export_raw)
+ importlib.reload(export_raw)
else:
import bpy
diff --git a/io_mesh_stl/__init__.py b/io_mesh_stl/__init__.py
index c3d628d..975e52b 100644
--- a/io_mesh_stl/__init__.py
+++ b/io_mesh_stl/__init__.py
@@ -48,11 +48,11 @@ Import:
"""
if "bpy" in locals():
- import imp
+ import importlib
if "stl_utils" in locals():
- imp.reload(stl_utils)
+ importlib.reload(stl_utils)
if "blender_utils" in locals():
- imp.reload(blender_utils)
+ importlib.reload(blender_utils)
import os
diff --git a/io_mesh_uv_layout/__init__.py b/io_mesh_uv_layout/__init__.py
index 2460d26..accf675 100644
--- a/io_mesh_uv_layout/__init__.py
+++ b/io_mesh_uv_layout/__init__.py
@@ -36,13 +36,13 @@ bl_info = {
# @todo write the wiki page
if "bpy" in locals():
- import imp
+ import importlib
if "export_uv_eps" in locals():
- imp.reload(export_uv_eps)
+ importlib.reload(export_uv_eps)
if "export_uv_png" in locals():
- imp.reload(export_uv_png)
+ importlib.reload(export_uv_png)
if "export_uv_svg" in locals():
- imp.reload(export_uv_svg)
+ importlib.reload(export_uv_svg)
import bpy
diff --git a/io_scene_3ds/__init__.py b/io_scene_3ds/__init__.py
index 981b7ff..73459c1 100644
--- a/io_scene_3ds/__init__.py
+++ b/io_scene_3ds/__init__.py
@@ -32,11 +32,11 @@ bl_info = {
"category": "Import-Export"}
if "bpy" in locals():
- import imp
+ import importlib
if "import_3ds" in locals():
- imp.reload(import_3ds)
+ importlib.reload(import_3ds)
if "export_3ds" in locals():
- imp.reload(export_3ds)
+ importlib.reload(export_3ds)
import bpy
diff --git a/io_scene_ms3d/__init__.py b/io_scene_ms3d/__init__.py
index a4d04db..794aae6 100644
--- a/io_scene_ms3d/__init__.py
+++ b/io_scene_ms3d/__init__.py
@@ -48,9 +48,9 @@ bl_info = {
# To support reload properly, try to access a package var,
# if it's there, reload everything
if 'bpy' in locals():
- import imp
+ import importlib
if 'io_scene_ms3d.ms3d_ui' in locals():
- imp.reload(io_scene_ms3d.ms3d_ui)
+ importlib.reload(io_scene_ms3d.ms3d_ui)
else:
from io_scene_ms3d.ms3d_ui import (
Ms3dImportOperator,
@@ -74,8 +74,8 @@ from bpy.types import (
def register():
####################
# F8 - key
- import imp
- imp.reload(ms3d_ui)
+ import importlib
+ importlib.reload(ms3d_ui)
# F8 - key
####################
diff --git a/io_scene_obj/__init__.py b/io_scene_obj/__init__.py
index f252da6..c1eb795 100644
--- a/io_scene_obj/__init__.py
+++ b/io_scene_obj/__init__.py
@@ -33,11 +33,11 @@ bl_info = {
"category": "Import-Export"}
if "bpy" in locals():
- import imp
+ import importlib
if "import_obj" in locals():
- imp.reload(import_obj)
+ importlib.reload(import_obj)
if "export_obj" in locals():
- imp.reload(export_obj)
+ importlib.reload(export_obj)
import bpy
diff --git a/io_scene_vrml2/__init__.py b/io_scene_vrml2/__init__.py
index e16ae73..594833c 100644
--- a/io_scene_vrml2/__init__.py
+++ b/io_scene_vrml2/__init__.py
@@ -31,9 +31,9 @@ bl_info = {
"category": "Import-Export"}
if "bpy" in locals():
- import imp
+ import importlib
if "export_vrml2" in locals():
- imp.reload(export_vrml2)
+ importlib.reload(export_vrml2)
import os
diff --git a/io_scene_x3d/__init__.py b/io_scene_x3d/__init__.py
index 767b223..e12dedc 100644
--- a/io_scene_x3d/__init__.py
+++ b/io_scene_x3d/__init__.py
@@ -31,11 +31,11 @@ bl_info = {
"category": "Import-Export"}
if "bpy" in locals():
- import imp
+ import importlib
if "import_x3d" in locals():
- imp.reload(import_x3d)
+ importlib.reload(import_x3d)
if "export_x3d" in locals():
- imp.reload(export_x3d)
+ importlib.reload(export_x3d)
import bpy
from bpy.props import StringProperty, BoolProperty, EnumProperty, FloatPropert
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list