[Zope-Checkins] CVS: Zope/lib/python/StructuredText - DocumentWithImages.py:1.6

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/StructuredText
In directory cvs.zope.org:/tmp/cvs-serv19743/lib/python/StructuredText

Modified Files:
	DocumentWithImages.py 
Log Message:

      - Collector #278: DocumentWithImages could not handle URLs with
        underscores


=== Zope/lib/python/StructuredText/DocumentWithImages.py 1.5 => 1.6 ===
 ##############################################################################
 
-import re, ST, STDOM
-from string import split, join, replace, expandtabs, strip, find
-
+import re
 from DocumentClass import *
 
 class StructuredTextImage(StructuredTextMarkup):
@@ -32,8 +30,8 @@
 
     def doc_img(
         self, s,
-        expr1=re.compile('\"([ _a-zA-Z0-9*.:/;,\-\n\~]+)\":img:([a-zA-Z0-9\-.:/;,\n\~]+)').search,
-        expr2=re.compile('\"([ _a-zA-Z0-9*.:/;,\-\n\~]+)\":img:([a-zA-Z0-9\-.:/;,\n\~]+):([a-zA-Z0-9\-.:/;,\n\~]+)').search
+        expr1=re.compile('\"([ _a-zA-Z0-9*.:/;,\-\n\~]+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)').search,
+        expr2=re.compile('\"([ _a-zA-Z0-9*.:/;,\-\n\~]+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+):([a-zA-Z0-9\-.:/;,\n\~]+)').search
         ):
 
         r = expr2(s)