[Docstring-checkins] CVS: dps/dps/transforms references.py,1.3,1.4
Status: Pre-Alpha
Brought to you by:
goodger
From: David G. <go...@us...> - 2002-01-30 04:52:20
|
Update of /cvsroot/docstring/dps/dps/transforms In directory usw-pr-cvs1:/tmp/cvs-serv22909/dps/dps/transforms Modified Files: references.py Log Message: - Simplified target record keeping. Index: references.py =================================================================== RCS file: /cvsroot/docstring/dps/dps/transforms/references.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** references.py 2002/01/29 02:17:32 1.3 --- references.py 2002/01/30 04:52:17 1.4 *************** *** 149,160 **** def resolve_indirect(self): ! for name, targets in self.doctree.indirect_targets.items(): ! if len(targets) == 1: ! target = targets[-1] ! if not target.resolved: ! self.one_indirect_target(target) ! if target.hasattr('refname'): ! self.one_indirect_reference(target['name'], ! target['refname']) def one_indirect_target(self, target): --- 149,158 ---- def resolve_indirect(self): ! for name, target in self.doctree.indirect_targets.items(): ! if not target.resolved: ! self.one_indirect_target(target) ! if target.hasattr('refname'): ! self.one_indirect_reference(target['name'], ! target['refname']) def one_indirect_target(self, target): *************** *** 162,166 **** refname = target['refname'] try: ! reftargetlist = self.doctree.explicit_targets[refname] except KeyError: sw = self.doctree.reporter.warning( --- 160,164 ---- refname = target['refname'] try: ! reftarget = self.doctree.explicit_targets[refname] except KeyError: sw = self.doctree.reporter.warning( *************** *** 168,172 **** 'which does not exist.' % (name, refname)) self.doctree += sw - reftarget = reftargetlist[-1] if reftarget.hasattr('name'): if not reftarget.resolved and reftarget.hasattr('refname'): --- 166,169 ---- *************** *** 205,212 **** def resolve_external_references(self): ! for name, targets in self.doctree.external_targets.items(): ! target = targets[-1] if target.hasattr('refuri') and target.hasattr('name'): ! self.one_external_reference(name, targets[-1]['refuri']) def one_external_reference(self, name, refuri): --- 202,208 ---- def resolve_external_references(self): ! for name, target in self.doctree.external_targets.items(): if target.hasattr('refuri') and target.hasattr('name'): ! self.one_external_reference(name, target['refuri']) def one_external_reference(self, name, refuri): |