[Python-checkins] r61390 - doctools/trunk/sphinx/directives.py
georg.brandl
python-checkins at python.org
Fri Mar 14 23:39:37 CET 2008
Author: georg.brandl
Date: Fri Mar 14 23:39:36 2008
New Revision: 61390
Modified:
doctools/trunk/sphinx/directives.py
Log:
Fix behavior for .. method directives inside a .. class.
Modified: doctools/trunk/sphinx/directives.py
==============================================================================
--- doctools/trunk/sphinx/directives.py (original)
+++ doctools/trunk/sphinx/directives.py Fri Mar 14 23:39:36 2008
@@ -133,10 +133,12 @@
if m is None: raise ValueError
classname, name, arglist = m.groups()
+ add_module = True
if env.currclass:
if classname and classname.startswith(env.currclass):
fullname = classname + name
classname = classname[len(env.currclass):].lstrip('.')
+ add_module = False
elif classname:
fullname = env.currclass + '.' + classname + name
else:
@@ -148,7 +150,7 @@
signode += addnodes.desc_classname(classname, classname)
# exceptions are a special case, since they are documented in the
# 'exceptions' module.
- elif env.config.add_module_names and \
+ elif add_module and env.config.add_module_names and \
env.currmodule and env.currmodule != 'exceptions':
nodetext = env.currmodule + '.'
signode += addnodes.desc_classname(nodetext, nodetext)
More information about the Python-checkins
mailing list