[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39212] trunk/blender: fix [#28191] Exception when enabling a script for a newer Blender build

[Campbell Barton]

Revision: 39212
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39212
Author:   campbellbarton
Date:     2011-08-09 14:16:22 +0000 (Tue, 09 Aug 2011)
Log Message:
-----------
fix [#28191] Exception when enabling a script for a newer Blender build

Modified Paths:
--------------
    trunk/blender/doc/python_api/rst/bge.logic.rst
    trunk/blender/release/scripts/startup/bl_ui/space_userpref.py

Modified: trunk/blender/doc/python_api/rst/bge.logic.rst
===================================================================
--- trunk/blender/doc/python_api/rst/bge.logic.rst	2011-08-09 14:10:32 UTC (rev 39211)
+++ trunk/blender/doc/python_api/rst/bge.logic.rst	2011-08-09 14:16:22 UTC (rev 39212)
@@ -220,8 +220,8 @@
    .. note::
 
       This function is not effective immediately, the scene is queued
-	  and added on the next logic cycle where it will be available
-	  from `getSceneList`
+      and added on the next logic cycle where it will be available
+      from `getSceneList`
 
    :arg name: The name of the scene
    :type name: string

Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref.py	2011-08-09 14:10:32 UTC (rev 39211)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref.py	2011-08-09 14:16:22 UTC (rev 39212)
@@ -1076,17 +1076,25 @@
     bl_idname = "wm.addon_enable"
     bl_label = "Enable Add-On"
 
-    module = StringProperty(name="Module", description="Module name of the addon to enable")
+    module = StringProperty(
+            name="Module",
+            description="Module name of the addon to enable",
+            )
 
     def execute(self, context):
         mod = addon_utils.enable(self.module)
 
         if mod:
-            # check if add-on is written for current blender version, or raise a warning
             info = addon_utils.module_bl_info(mod)
 
-            if info.get("blender", (0, 0, 0)) > bpy.app.version:
-                self.report("WARNING','This script was written for a newer version of Blender and might not function (correctly).\nThe script is enabled though.")
+            info_ver = info.get("blender", (0, 0, 0))
+
+            if info_ver > bpy.app.version:
+                self.report({'WARNING'}, ("This script was written Blender "
+                                          "version %d.%d.%d and might not "
+                                          "function (correctly).\n"
+                                          "The script is enabled though.") %
+                                         info_ver)
             return {'FINISHED'}
         else:
             return {'CANCELLED'}