[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51297] trunk/blender/release/scripts: code cleanup: minor edits on recent commit.

[Campbell Barton]

Revision: 51297
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51297
Author:   campbellbarton
Date:     2012-10-13 11:23:04 +0000 (Sat, 13 Oct 2012)
Log Message:
-----------
code cleanup: minor edits on recent commit.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/addon_utils.py
    trunk/blender/release/scripts/startup/bl_ui/space_userpref.py

Modified: trunk/blender/release/scripts/modules/addon_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/addon_utils.py	2012-10-13 11:08:00 UTC (rev 51296)
+++ trunk/blender/release/scripts/modules/addon_utils.py	2012-10-13 11:23:04 UTC (rev 51297)
@@ -323,9 +323,8 @@
             import traceback
             traceback.print_exc()
     else:
-        if mod: state = "enabled"
-        else:   state = "loaded"
-        print("addon_utils.disable: %s not %s." % (module_name, state))
+        print("addon_utils.disable: %s not %s." %
+              (module_name, "disabled" if mod is None else "loaded"))
 
     # could be in more then once, unlikely but better do this just in case.
     addons = _bpy.context.user_preferences.addons

Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref.py	2012-10-13 11:08:00 UTC (rev 51296)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref.py	2012-10-13 11:23:04 UTC (rev 51297)
@@ -1040,7 +1040,7 @@
         userpref = context.user_preferences
         used_ext = {ext.module for ext in userpref.addons}
 
-        userpref_addons_folder = os.path.join(bpy.context.user_preferences.filepaths.script_directory,"addons")
+        userpref_addons_folder = os.path.join(userpref.filepaths.script_directory, "addons")
         scripts_addons_folder  = bpy.utils.user_resource('SCRIPTS', "addons")
         
         # collect the categories that can be filtered on
@@ -1092,9 +1092,7 @@
                     (filter == info["category"]) or
                     (filter == "Enabled" and is_enabled) or
                     (filter == "Disabled" and not is_enabled) or
-                    (filter == "User" and 
-                                ( mod.__file__.startswith(userpref_addons_folder) or
-                                  mod.__file__.startswith(scripts_addons_folder)))
+                    (filter == "User" and (mod.__file__.startswith(scripts_addons_folder, userpref_addons_folder)))
                    ):
 
                 if search and search not in info["name"].lower():