[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47342] trunk/blender/release/scripts/ startup/bl_operators/wm.py: change to last commit evaluate regex in order.

Campbell Barton ideasman42 at gmail.com
Fri Jun 1 23:29:40 CEST 2012


Revision: 47342
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47342
Author:   campbellbarton
Date:     2012-06-01 21:29:39 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
change to last commit evaluate regex in order.

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

Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py	2012-06-01 20:38:40 UTC (rev 47341)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py	2012-06-01 21:29:39 UTC (rev 47342)
@@ -801,19 +801,19 @@
 
 
 def _wm_doc_get_id(doc_id, do_url=True, url_prefix=""):
-    id_split = doc_id.split('.')
+    id_split = doc_id.split(".")
     url = rna = None
 
     if len(id_split) == 1:  # rna, class
         if do_url:
-            url = '%s/bpy.types.%s.html' % (url_prefix, id_split[0])
+            url = "%s/bpy.types.%s.html" % (url_prefix, id_split[0])
         else:
-            rna = 'bpy.types.%s' % id_split[0]
+            rna = "bpy.types.%s" % id_split[0]
 
     elif len(id_split) == 2:  # rna, class.prop
         class_name, class_prop = id_split
 
-        if hasattr(bpy.types, class_name.upper() + '_OT_' + class_prop):
+        if hasattr(bpy.types, class_name.upper() + "_OT_" + class_prop):
             if do_url:
                 url = ("%s/bpy.ops.%s.html#bpy.ops.%s.%s" % (url_prefix, class_name, class_name, class_prop))
             else:
@@ -845,11 +845,10 @@
 
     @staticmethod
     def _find_reference(rna_id, url_mapping):
-        import re
-        for key, value in sorted(url_mapping.items()):
-            match = re.match(key, rna_id)
-            if match:
-                return value
+        from re import match
+        for pattern, url_suffix in url_mapping:
+            if match(pattern, rna_id):
+                return url_suffix
         return None
 
     def execute(self, context):
@@ -858,7 +857,6 @@
             return {'PASS_THROUGH'}
 
         import rna_wiki_reference
-        # rna_ref = rna_wiki_reference.url_mapping.get(rna_id)
         rna_ref = self._find_reference(rna_id, rna_wiki_reference.url_manual_mapping)
 
         if rna_ref is None:
@@ -894,7 +892,6 @@
                    "_".join(str(v) for v in bpy.app.version))
 
     def execute(self, context):
-        id_split = self.doc_id.split('.')
         url = _wm_doc_get_id(self.doc_id, do_url=True, url_prefix=self._prefix)
         if url is None:
             return {'PASS_THROUGH'}




More information about the Bf-blender-cvs mailing list