[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50563] trunk/blender: modifications needed to get a URL from an RNA id from the testing script

[Campbell Barton]

Revision: 50563
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50563
Author:   campbellbarton
Date:     2012-09-13 00:26:01 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
modifications needed to get a URL from an RNA id from the testing script

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_operators/wm.py
    trunk/blender/source/tests/rna_info_dump.py

Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py	2012-09-13 00:17:38 UTC (rev 50562)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py	2012-09-13 00:26:01 UTC (rev 50563)
@@ -847,29 +847,36 @@
     doc_id = doc_id
 
     @staticmethod
-    def _find_reference(rna_id, url_mapping):
-        print("online manual check for: '%s'... " % rna_id)
+    def _find_reference(rna_id, url_mapping, verbose=True):
+        if verbose:
+            print("online manual check for: '%s'... " % rna_id)
         from fnmatch import fnmatch
         for pattern, url_suffix in url_mapping:
             if fnmatch(rna_id, pattern):
-                print("            match found: '%s' --> '%s'" % (pattern, url_suffix))
+                if verbose:
+                    print("            match found: '%s' --> '%s'" % (pattern, url_suffix))
                 return url_suffix
-        print("match not found")
+        if verbose:
+            print("match not found")
         return None
 
+    @staticmethod
+    def _lookup_rna_url(rna_id, verbose=True):
+        url = None
+        for prefix, url_manual_mapping in bpy.utils.manual_map():
+            rna_ref = WM_OT_doc_view_manual._find_reference(rna_id, url_manual_mapping, verbose=verbose)
+            if rna_ref is not None:
+                url = prefix + rna_ref
+                break
+        return url
+
     def execute(self, context):
         rna_id = _wm_doc_get_id(self.doc_id, do_url=False)
         if rna_id is None:
             return {'PASS_THROUGH'}
 
-        url = None
+        url = self._lookup_rna_url(rna_id)
 
-        for prefix, url_manual_mapping in bpy.utils.manual_map():
-            rna_ref = self._find_reference(rna_id, url_manual_mapping)
-            if rna_ref is not None:
-                url = prefix + rna_ref
-                break
-
         if url is None:
             self.report({'WARNING'}, "No reference available %r, "
                                      "Update info in 'rna_wiki_reference.py' "

Modified: trunk/blender/source/tests/rna_info_dump.py
===================================================================
--- trunk/blender/source/tests/rna_info_dump.py	2012-09-13 00:17:38 UTC (rev 50562)
+++ trunk/blender/source/tests/rna_info_dump.py	2012-09-13 00:26:01 UTC (rev 50563)
@@ -19,7 +19,7 @@
 # <pep8 compliant>
 
 # Used for generating API diff's between releases
-#  ./blender.bin --background -noaudio --python release/test/rna_info_dump.py
+#  ./blender.bin --background -noaudio --python source/tests/rna_info_dump.py
 
 import bpy