[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1305] contrib/py/scripts/addons: use imp.reload() rather then reload().
Campbell Barton
ideasman42 at gmail.com
Wed Dec 22 22:42:29 CET 2010
Revision: 1305
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-extensions&revision=1305
Author: campbellbarton
Date: 2010-12-22 22:42:28 +0100 (Wed, 22 Dec 2010)
Log Message:
-----------
use imp.reload() rather then reload().
Modified Paths:
--------------
contrib/py/scripts/addons/game_engine_ragdolls_kit/__init__.py
contrib/py/scripts/addons/io_import_scene_dxf.py
contrib/py/scripts/addons/io_scene_m3/__init__.py
contrib/py/scripts/addons/mesh_bevel/__init__.py
contrib/py/scripts/addons/mesh_vertex_align_25/__init__.py
Modified: contrib/py/scripts/addons/game_engine_ragdolls_kit/__init__.py
===================================================================
--- contrib/py/scripts/addons/game_engine_ragdolls_kit/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
+++ contrib/py/scripts/addons/game_engine_ragdolls_kit/__init__.py 2010-12-22 21:42:28 UTC (rev 1305)
@@ -32,17 +32,14 @@
"tracker_url": "https://projects.blender.org/tracker/index.php?func=detail&aid=24946&group_id=153&atid=468",
"category": "Game Engine"}
+if "bpy" in locals():
+ import imp
+ imp.reload(brik)
+else:
+ from . import brik
+
import bpy
-try:
- init_data
-
- reload(brik)
-except:
- from game_engine_ragdolls_kit import brik
-
-init_data = True
-
################################################################################
##### REGISTER #####
def register():
Modified: contrib/py/scripts/addons/io_import_scene_dxf.py
===================================================================
--- contrib/py/scripts/addons/io_import_scene_dxf.py 2010-12-22 21:41:21 UTC (rev 1304)
+++ contrib/py/scripts/addons/io_import_scene_dxf.py 2010-12-22 21:42:28 UTC (rev 1305)
@@ -2058,7 +2058,7 @@
verbose = BoolProperty(name="Verbose", description="Print debug info", default=toggle&T_Verbose)
codecs = tripleList(['iso-8859-15', 'utf-8', 'ascii'])
- codec = EnumProperty(name="Codec", description="Codec", items=codecs, default = '1')
+ codec = EnumProperty(name="Codec", description="Codec", items=codecs, default='utf-8')
def execute(self, context):
Modified: contrib/py/scripts/addons/io_scene_m3/__init__.py
===================================================================
--- contrib/py/scripts/addons/io_scene_m3/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
+++ contrib/py/scripts/addons/io_scene_m3/__init__.py 2010-12-22 21:42:28 UTC (rev 1305)
@@ -29,20 +29,16 @@
"tracker_url": "http://github.com/muraj/m3_import/issues",
"category": "Import/Export"}
+if "bpy" in locals():
+ import imp
+ imp.reload(import_m3)
+ #imp.reload(export_m3)
+else:
+ from . import import_m3
+ #from . import export_m3
+
import bpy
-
-try:
- init_data
-
- reload(import_m3)
- #reload(export_m3)
-except:
- from io_scene_m3 import import_m3
- #from io_mesh_m3 import export_m3
-
-init_data = True
-
def menu_import(self, context):
from io_scene_pmd import import_pmd
self.layout.operator(
Modified: contrib/py/scripts/addons/mesh_bevel/__init__.py
===================================================================
--- contrib/py/scripts/addons/mesh_bevel/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
+++ contrib/py/scripts/addons/mesh_bevel/__init__.py 2010-12-22 21:42:28 UTC (rev 1305)
@@ -26,19 +26,15 @@
'wiki_url': '',
'category': 'Mesh'}
+if "bpy" in locals():
+ import imp
+ imp.reload(bevel)
+else:
+ from . import bevel
+
import bpy
-try:
- init_data
-
- reload(bevel)
-except:
- from mesh_bevel import bevel
-
-init_data = True
-
def menu_func(self, context):
- from mesh_bevel import bevel
self.layout.operator(bevel.Bevel.bl_idname, text="Bevel")
def register():
Modified: contrib/py/scripts/addons/mesh_vertex_align_25/__init__.py
===================================================================
--- contrib/py/scripts/addons/mesh_vertex_align_25/__init__.py 2010-12-22 21:41:21 UTC (rev 1304)
+++ contrib/py/scripts/addons/mesh_vertex_align_25/__init__.py 2010-12-22 21:42:28 UTC (rev 1305)
@@ -26,16 +26,15 @@
'wiki_url': '',
'category': 'Mesh'}
-import bpy
-try:
- init_data
+if "bpy" in locals():
+ import imp
+ imp.reload(vertex_align_25)
+else:
+ from . import vertex_align_25
- reload(vertex_align_25)
-except:
- from mesh_vertex_align_25 import vertex_align_25
+import bpy
-init_data = True
def register():
km = bpy.context.window_manager.keyconfigs.default.keymaps['Mesh']
More information about the Bf-extensions-cvs
mailing list