Update of /cvs-repository/Packages/StructuredText
In directory cvs.zope.org:/tmp/cvs-serv19711/lib/python/StructuredText
Modified Files:
Tag: Zope-2_7-branch
DocumentWithImages.py HTMLWithImages.py
Log Message:
- Collector #1750: StructuredText: fixed handling of image URLs
with query string
- some more unittests
=== Packages/StructuredText/DocumentWithImages.py 1.10.2.1 => 1.10.2.2 ===
--- Packages/StructuredText/DocumentWithImages.py:1.10.2.1 Sun Nov 28
04:40:09 2004
+++ Packages/StructuredText/DocumentWithImages.py Sat Apr 9 04:50:53 2005
@@ -18,10 +18,7 @@
"A simple embedded image"
class DocumentWithImages(DocumentClass):
- """
-
- """
-
+ """ Document with images """
text_types = [
'doc_img',
@@ -30,7 +27,7 @@
def doc_img(
self, s,
- expr1=re.compile('\"([
_a-zA-Z0-9*.:/;,\-\n\~]+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)').search,
+ expr1=re.compile('\"([
_a-zA-Z0-9*.:/;,\-\n\~]+)\":img:([a-zA-Z0-9%\_\-.:/\?=;,\n\~]+)').search,
):
=== Packages/StructuredText/HTMLWithImages.py 1.10 => 1.10.68.1 ===
--- Packages/StructuredText/HTMLWithImages.py:1.10 Wed Aug 14 17:58:22 2002
+++ Packages/StructuredText/HTMLWithImages.py Sat Apr 9 04:50:53 2005
@@ -21,7 +21,6 @@
element_types = ets
-
def image(self, doc, level, output):
if hasattr(doc, 'key'):
output('<a name="%s"></a>\n' % doc.key)
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
