[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4742] trunk/py/scripts/addons/ io_import_scene_mhx.py: Changed back an exec statement.

[Thomas Larsson]

Revision: 4742
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4742
Author:   thomasl
Date:     2013-09-06 01:31:13 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
Changed back an exec statement. Safe because only called from this file.

Modified Paths:
--------------
    trunk/py/scripts/addons/io_import_scene_mhx.py

Modified: trunk/py/scripts/addons/io_import_scene_mhx.py
===================================================================
--- trunk/py/scripts/addons/io_import_scene_mhx.py	2013-09-05 17:37:51 UTC (rev 4741)
+++ trunk/py/scripts/addons/io_import_scene_mhx.py	2013-09-06 01:31:13 UTC (rev 4742)
@@ -38,7 +38,7 @@
 bl_info = {
     'name': 'Import: MakeHuman (.mhx)',
     'author': 'Thomas Larsson',
-    'version': (1, 16, 5),
+    'version': (1, 16, 6),
     "blender": (2, 68, 0),
     'location': "File > Import > MakeHuman (.mhx)",
     'description': 'Import files in the MakeHuman eXchange format (.mhx)',
@@ -126,7 +126,7 @@
 loadedData = None
 
 #
-#   mhxEval(expr) - an attempt at a reasonably safe mhxEval.
+#   mhxEval(expr) - an attempt at a reasonably safe eval.
 #   Note that expr never contains any whitespace due to the behavior
 #   of the mhx tokenizer.
 #
@@ -2939,8 +2939,8 @@
     scale = FloatProperty(name="Scale", description="Default meter, decimeter = 1.0", default = theScale)
     advanced = BoolProperty(name="Advanced settings", description="Use advanced import settings", default=False)
     for (prop, name, desc, flag) in MhxBoolProps:
-        expr = 'BoolProperty(name="%s", description="%s", default=(toggleSettings&%s != 0))' % (name, desc, flag)
-        prop = eval(expr)   # Trusted source: this file.
+        expr = '%s = BoolProperty(name="%s", description="%s", default=(toggleSettings&%s != 0))' % (prop, name, desc, flag)
+        exec(expr)   # Trusted source: this file.
 
 
     def draw(self, context):
@@ -2960,7 +2960,7 @@
             toggle = T_Armature
             for (prop, name, desc, flag) in MhxBoolProps:
                 expr = '(%s if self.%s else 0)' % (flag, prop)
-                toggle |=  mhxEval(expr)
+                toggle |=  eval(expr)   # trusted source: this file
             toggleSettings = toggle
         print("execute flags %x" % toggle)
         theScale = self.scale