[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2118] trunk/py/scripts/addons: py3. 3 compat, __class__ is no longer in default namespace

[Campbell Barton]

Revision: 2118
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2118
Author:   campbellbarton
Date:     2011-07-11 05:51:27 +0000 (Mon, 11 Jul 2011)
Log Message:
-----------
py3.3 compat, __class__ is no longer in default namespace

Modified Paths:
--------------
    trunk/py/scripts/addons/development_api_navigator.py
    trunk/py/scripts/addons/development_icon_get.py
    trunk/py/scripts/addons/io_anim_bvh/export_bvh.py
    trunk/py/scripts/addons/io_anim_bvh/import_bvh.py
    trunk/py/scripts/addons/system_demo_mode/demo_mode.py

Modified: trunk/py/scripts/addons/development_api_navigator.py
===================================================================
--- trunk/py/scripts/addons/development_api_navigator.py	2011-07-10 22:59:09 UTC (rev 2117)
+++ trunk/py/scripts/addons/development_api_navigator.py	2011-07-11 05:51:27 UTC (rev 2118)
@@ -259,7 +259,7 @@
         else :
             too_long = False
         
-        __class__.generate_api_doc()
+        ApiNavigator.generate_api_doc()
         return {'FINISHED'}
 
     @staticmethod

Modified: trunk/py/scripts/addons/development_icon_get.py
===================================================================
--- trunk/py/scripts/addons/development_icon_get.py	2011-07-10 22:59:09 UTC (rev 2117)
+++ trunk/py/scripts/addons/development_icon_get.py	2011-07-11 05:51:27 UTC (rev 2118)
@@ -162,8 +162,8 @@
     def draw(self, context):
         props = context.scene.icon_props
         # polling for updates
-        if props.search != __class__._search_old:
-            __class__._search_old = props.search
+        if props.search != self.__class__._search_old:
+            self.__class__._search_old = props.search
             self.icon_list = create_icon_list()
             # adjusting max value of scroller
 #            IconProps.scroll = bpy.props.IntProperty(default=1, min=1,

Modified: trunk/py/scripts/addons/io_anim_bvh/export_bvh.py
===================================================================
--- trunk/py/scripts/addons/io_anim_bvh/export_bvh.py	2011-07-10 22:59:09 UTC (rev 2117)
+++ trunk/py/scripts/addons/io_anim_bvh/export_bvh.py	2011-07-11 05:51:27 UTC (rev 2118)
@@ -140,7 +140,7 @@
     # redefine bones as sorted by serialized_names
     # so we can write motion
 
-    class decorated_bone(object):
+    class DecoratedBone(object):
         __slots__ = (\
         "name",  # bone name, used as key in many places
         "parent",  # decorated bone parent, set in a later loop
@@ -176,7 +176,7 @@
             else:
                 self.rot_order_str = rotate_mode
 
-            self.rot_order = __class__._eul_order_lookup[self.rot_order_str]
+            self.rot_order = DecoratedBone._eul_order_lookup[self.rot_order_str]
 
             self.pose_mat = self.pose_bone.matrix
 
@@ -203,7 +203,7 @@
             else:
                 return "[\"%s\" root bone]\n" % (self.name)
 
-    bones_decorated = [decorated_bone(bone_name) for bone_name in serialized_names]
+    bones_decorated = [DecoratedBone(bone_name) for bone_name in serialized_names]
 
     # Assign parents
     bones_decorated_dict = {}

Modified: trunk/py/scripts/addons/io_anim_bvh/import_bvh.py
===================================================================
--- trunk/py/scripts/addons/io_anim_bvh/import_bvh.py	2011-07-10 22:59:09 UTC (rev 2117)
+++ trunk/py/scripts/addons/io_anim_bvh/import_bvh.py	2011-07-11 05:51:27 UTC (rev 2118)
@@ -26,10 +26,10 @@
 from mathutils import Vector, Euler, Matrix
 
 
-class bvh_node_class(object):
+class BVH_Node(object):
     __slots__ = (
     'name',  # bvh joint name
-    'parent',  # bvh_node_class type or None for no parent
+    'parent',  # BVH_Node type or None for no parent
     'children',  # a list of children of this type.
     'rest_head_world',  # worldspace rest location for the head of this node
     'rest_head_local',  # localspace rest location for the head of this node
@@ -60,7 +60,7 @@
         self.parent = parent
         self.channels = channels
         self.rot_order = tuple(rot_order)
-        self.rot_order_str = __class__._eul_order_lookup[self.rot_order]
+        self.rot_order_str = BVH_Node._eul_order_lookup[self.rot_order]
 
         # convenience functions
         self.has_loc = channels[0] != -1 or channels[1] != -1 or channels[2] != -1
@@ -167,7 +167,7 @@
             else:
                 rest_head_world = my_parent.rest_head_world + rest_head_local
 
-            bvh_node = bvh_nodes[name] = bvh_node_class(name, rest_head_world, rest_head_local, my_parent, my_channel, my_rot_order)
+            bvh_node = bvh_nodes[name] = BVH_Node(name, rest_head_world, rest_head_local, my_parent, my_channel, my_rot_order)
 
             # If we have another child then we can call ourselves a parent, else
             bvh_nodes_serial.append(bvh_node)

Modified: trunk/py/scripts/addons/system_demo_mode/demo_mode.py
===================================================================
--- trunk/py/scripts/addons/system_demo_mode/demo_mode.py	2011-07-10 22:59:09 UTC (rev 2117)
+++ trunk/py/scripts/addons/system_demo_mode/demo_mode.py	2011-07-11 05:51:27 UTC (rev 2118)
@@ -297,15 +297,15 @@
 
     def cleanup(self, disable=False):
         demo_mode_timer_remove()
-        __class__.first_run = True
+        DemoMode.first_run = True
 
         if disable:
-            __class__.enabled = False
+            DemoMode.enabled = False
             DemoKeepAlive.remove()
 
     def modal(self, context, event):
         # print("DemoMode.modal", global_state["anim_cycles"])
-        if not __class__.enabled:
+        if not DemoMode.enabled:
             self.cleanup(disable=True)
             return {'CANCELLED'}
 
@@ -316,8 +316,8 @@
             return {'CANCELLED'}
 
         # print(event.type)
-        if __class__.first_run:
-            __class__.first_run = False
+        if DemoMode.first_run:
+            DemoMode.first_run = False
 
             demo_mode_init()
         else:
@@ -336,12 +336,12 @@
             return {'CANCELLED'}
 
         # toggle
-        if __class__.enabled and __class__.first_run == False:
+        if DemoMode.enabled and DemoMode.first_run == False:
             # this actually cancells the previous running instance
             # should never happen now, DemoModeControl is for this.
             return {'CANCELLED'}
         else:
-            __class__.enabled = True
+            DemoMode.enabled = True
             context.window_manager.modal_handler_add(self)
 
             return {'RUNNING_MODAL'}