[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1034] contrib/py/scripts/addons: misc fixes related to api updates

Campbell Barton ideasman42 at gmail.com
Mon Sep 13 06:23:24 CEST 2010


Revision: 1034
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-extensions&revision=1034
Author:   campbellbarton
Date:     2010-09-13 06:23:17 +0200 (Mon, 13 Sep 2010)

Log Message:
-----------
misc fixes related to api updates

Modified Paths:
--------------
    contrib/py/scripts/addons/io_import_scene_dxf.py
    contrib/py/scripts/addons/object_name_edit.py
    contrib/py/scripts/addons/space_view3d_index_visualiser.py
    contrib/py/scripts/addons/space_view3d_manipulator_Menu.py
    contrib/py/scripts/addons/system_keyboard_svg.py
    contrib/py/scripts/addons/text_editor_pasteall.py

Modified: contrib/py/scripts/addons/io_import_scene_dxf.py
===================================================================
--- contrib/py/scripts/addons/io_import_scene_dxf.py	2010-09-12 20:04:15 UTC (rev 1033)
+++ contrib/py/scripts/addons/io_import_scene_dxf.py	2010-09-13 04:23:17 UTC (rev 1034)
@@ -2083,10 +2083,8 @@
 
 def register():
     # registerPanels()
-    bpy.types.register(IMPORT_OT_autocad_dxf)
     menu_func = lambda self, context: self.layout.operator(IMPORT_OT_autocad_dxf.bl_idname, text="Autocad (.dxf)...")
     bpy.types.INFO_MT_file_import.append(menu_func)
-    return
  
 def unregister():
     # unregisterPanels()

Modified: contrib/py/scripts/addons/object_name_edit.py
===================================================================
--- contrib/py/scripts/addons/object_name_edit.py	2010-09-12 20:04:15 UTC (rev 1033)
+++ contrib/py/scripts/addons/object_name_edit.py	2010-09-13 04:23:17 UTC (rev 1034)
@@ -45,9 +45,11 @@
 # Base class used for all batch name edit operators,
 # since they share the same conditions for enabling
 # and invoke mechanism (open property popup)
-class BatchNameEdit(bpy.types.Operator):
+class BatchNameEdit:
     dialog_width = 250
-    def poll(self, context):
+
+    @classmethod
+    def poll(cls, context):
         return context.active_object is not None
 
     def invoke(self, context, event):
@@ -65,7 +67,7 @@
             return plural
 
 
-class BatchNameEditNewName(BatchNameEdit):
+class BatchNameEditNewName(bpy.types.Operator, BatchNameEdit):
     '''Give all selected objects a common name'''
     bl_idname = "object.batch_name_edit_newname"
     bl_label = "Rename selected"
@@ -96,7 +98,7 @@
         layout.prop(props, "new_name")
     
 
-class BatchNameEditReplace(BatchNameEdit):
+class BatchNameEditReplace(bpy.types.Operator, BatchNameEdit):
     '''Replaces occurrences of a given string in object names'''
     bl_idname = "object.batch_name_edit_replace"
     bl_label = "Replace pattern"
@@ -149,7 +151,7 @@
         layout.prop(props, "replacement")
         
 
-class BatchNameEditAdd(BatchNameEdit):
+class BatchNameEditAdd(bpy.types.Operator, BatchNameEdit):
     '''Appends and/or prepends text to object names'''
     bl_idname = "object.batch_name_edit_add"
     bl_label = "Append or prepend string"
@@ -184,7 +186,7 @@
         layout.prop(props, "suffix")
 
 
-class BatchNameEditTruncate(BatchNameEdit):
+class BatchNameEditTruncate(bpy.types.Operator, BatchNameEdit):
     '''Removes a number of characters from start and/or end of object names'''
     bl_idname = "object.batch_name_edit_truncate"
     bl_label = "Truncate"
@@ -235,7 +237,7 @@
         layout.prop(props, "trunc_end")
 
 
-class BatchNameEditTransfer(BatchNameEdit):
+class BatchNameEditTransfer(bpy.types.Operator, BatchNameEdit):
     '''Give all selected objects a common name'''
     bl_idname = "object.batch_name_edit_transfer"
     bl_label = "Copy to/from data block"
@@ -288,24 +290,12 @@
         layout.prop(props, "direction")
 
 
-classes = [
-    BatchNameEditNewName,
-    BatchNameEditReplace,
-    BatchNameEditAdd,
-    BatchNameEditTruncate,
-    BatchNameEditTransfer]
-
-
 def register():
-    register = bpy.types.register
-    for c in classes:
-        register(c)
+    pass
 
 
 def unregister():
-    unregister = bpy.types.unregister
-    for c in classes:
-        unregister(c)
+    pass
 
 
 if __name__ == "__main__":

Modified: contrib/py/scripts/addons/space_view3d_index_visualiser.py
===================================================================
--- contrib/py/scripts/addons/space_view3d_index_visualiser.py	2010-09-12 20:04:15 UTC (rev 1033)
+++ contrib/py/scripts/addons/space_view3d_index_visualiser.py	2010-09-13 04:23:17 UTC (rev 1034)
@@ -185,12 +185,15 @@
 
 # removal of ID-properties when script is disabled
 def clear_properties(full=True):
+    # can happen on reload
+    if bpy.context.scene is None:
+        return
     props = ["display_indices", "display_sel_only", "display_vert_index",
         "display_edge_index", "display_face_index", "IndexVisualiser"]
     if not full:
         props = ["IndexVisualiser"]
     for p in props:
-        if p in bpy.context.scene.keys():
+        if p in bpy.context.scene:
             del bpy.context.scene[p]
 
 

Modified: contrib/py/scripts/addons/space_view3d_manipulator_Menu.py
===================================================================
--- contrib/py/scripts/addons/space_view3d_manipulator_Menu.py	2010-09-12 20:04:15 UTC (rev 1033)
+++ contrib/py/scripts/addons/space_view3d_manipulator_Menu.py	2010-09-13 04:23:17 UTC (rev 1034)
@@ -105,9 +105,9 @@
         layout.separator()
 
 
-            
+
 def register():
-    km = bpy.context.manager.keyconfigs.active.keymaps['3D View']
+    km = bpy.context.window_manager.keyconfigs.active.keymaps['3D View']
     for kmi in km.items:
         if kmi.idname == 'wm.context_toggle':
             if kmi.ctrl and not kmi.shift and not kmi.alt and kmi.value =="PRESS":
@@ -119,7 +119,7 @@
 
 
 def unregister():
-    km = bpy.context.manager.keyconfigs.active.keymaps['3D View']
+    km = bpy.context.window_manager.keyconfigs.active.keymaps['3D View']
     for kmi in km.items:
         if kmi.idname == 'wm.call_menu':
             if kmi.properties.name == "VIEW3D_MT_ManipulatorMenu":

Modified: contrib/py/scripts/addons/system_keyboard_svg.py
===================================================================
--- contrib/py/scripts/addons/system_keyboard_svg.py	2010-09-12 20:04:15 UTC (rev 1033)
+++ contrib/py/scripts/addons/system_keyboard_svg.py	2010-09-13 04:23:17 UTC (rev 1034)
@@ -214,13 +214,6 @@
     bl_idname = "wm.keyboardlayout"
     bl_label = "Keyboard layout (SGV)"
 
-    @staticmethod
-    def poll(context):
-        """
-        export of the keyboard layout should always be possible.
-        """
-        return True
-
     def execute(self, context):
         """
         Iterate over all viewtypes to export the keyboard layout.

Modified: contrib/py/scripts/addons/text_editor_pasteall.py
===================================================================
--- contrib/py/scripts/addons/text_editor_pasteall.py	2010-09-12 20:04:15 UTC (rev 1033)
+++ contrib/py/scripts/addons/text_editor_pasteall.py	2010-09-13 04:23:17 UTC (rev 1034)
@@ -210,7 +210,7 @@
         default=True)
 
 def unregister():
-    bpy.types.Scene.RemoveProperty("use_webbrowser")
+    del bpy.types.Scene.use_webbrowser
 
 if __name__ == "__main__":
     register()




More information about the Bf-extensions-cvs mailing list