[Zope-Checkins] CVS: Zope2 - ClassicDocumentClass.py:1.12.10.2

chrism@serenade.digicool.com chrism@serenade.digicool.com
Mon, 2 Jul 2001 15:16:58 -0400


Update of /cvs-repository/Zope2/lib/python/StructuredText
In directory serenade:/home/chrism/sandboxes/Zope24Branch/lib/python/StructuredText

Modified Files:
      Tag: Zope-2_4-branch
	ClassicDocumentClass.py 
Log Message:
Fixed named link dispatch method.  Collector 2266.


--- Updated File ClassicDocumentClass.py in package Zope2 --
--- ClassicDocumentClass.py	2001/06/25 20:30:28	1.12.10.1
+++ ClassicDocumentClass.py	2001/07/02 19:16:57	1.12.10.2
@@ -616,17 +616,14 @@
     
     def doc_named_link(self,
                        s,
-                       expr=re.compile("(\.\.\s)(\[[%s0-9]+\])" % letters).search):
+                       expr=re.compile(r"(\.\.\s)(\[[%s0-9]+\])" % letters).search):
         
         result = expr(s)
         if result:
             start,end   = result.span(2)
-            a,b         = result.span(1)
-            str         = strip(s[a:b]) + s[start:end]
-            str         = s[start+1:end-1]
+            str = s[start+1:end-1]
             st,en       = result.span()
             return (StructuredTextNamedLink(str),st,en)
-            #return (StructuredTextNamedLink(s[st:en]),st,en)
         return None
     
     def doc_underline(self,