[Python-checkins] r67024 - doctools/trunk/sphinx/directives/desc.py

[georg.brandl]

Author: georg.brandl
Date: Sat Oct 25 18:47:14 2008
New Revision: 67024

Log:
Respect add_module_names for index entries.


Modified:
   doctools/trunk/sphinx/directives/desc.py

Modified: doctools/trunk/sphinx/directives/desc.py
==============================================================================
--- doctools/trunk/sphinx/directives/desc.py	(original)
+++ doctools/trunk/sphinx/directives/desc.py	Sat Oct 25 18:47:14 2008
@@ -20,7 +20,7 @@
 
 # ------ information units ---------------------------------------------------------
 
-def desc_index_text(desctype, module, name):
+def desc_index_text(desctype, module, name, add_modules):
     if desctype == 'function':
         if not module:
             return _('%s() (built-in function)') % name
@@ -41,7 +41,7 @@
                 return _('%s() (in module %s)') % (name, module)
             else:
                 return '%s()' % name
-        if module:
+        if module and add_modules:
             return _('%s() (%s.%s method)') % (methname, module, clsname)
         else:
             return _('%s() (%s method)') % (methname, clsname)
@@ -53,7 +53,7 @@
                 return _('%s() (in module %s)') % (name, module)
             else:
                 return '%s()' % name
-        if module:
+        if module and add_modules:
             return _('%s() (%s.%s static method)') % (methname, module, clsname)
         else:
             return _('%s() (%s static method)') % (methname, clsname)
@@ -65,7 +65,7 @@
                 return _('%s (in module %s)') % (name, module)
             else:
                 return name
-        if module:
+        if module and add_modules:
             return _('%s (%s.%s attribute)') % (attrname, module, clsname)
         else:
             return _('%s (%s attribute)') % (attrname, clsname)
@@ -455,7 +455,8 @@
                 env.note_descref(fullname, desctype, lineno)
             names.append(name)
 
-            indextext = desc_index_text(desctype, module, name)
+            indextext = desc_index_text(desctype, module, name,
+                                        env.config.add_module_names)
             inode['entries'].append(('single', indextext, fullname, fullname))
 
     subnode = addnodes.desc_content()