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

doc/CHANGES.txt

@@ -67,6 +67,9 @@ Zope Changes
       - Collector #259: walkandscrub.py did not delete all .pyc and .pyo
         files during installation. Fixed.
 
+      - Collector #278: DocumentWithImages could not handle URLs with
+        underscores
+
   Zope 2.5.1 beta 1
     
     Bugs Fixed

lib/python/StructuredText/DocumentWithImages.py

@@ -11,9 +11,7 @@
 # 
 ##############################################################################
 
-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 @@ class DocumentWithImages(DocumentClass):
 
     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)