[Zope-Checkins] CVS: Zope2 - Converters.py:1.11.20.1

[andreas@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/ZPublisher
In directory serenade:/tmp/cvs-serv23327/lib/python/ZPublisher

Modified Files:
      Tag: Zope-2_4-branch
	Converters.py 
Log Message:
Collector #2380: fixed regular expression in Converters.py
producing trash Control-M characters



--- Updated File Converters.py in package Zope2 --
--- Converters.py	2001/04/24 20:38:46	1.11
+++ Converters.py	2001/07/06 12:34:39	1.11.20.1
@@ -93,7 +93,7 @@
     else: v=str(v)
     return v
 
-def field2text(v, nl=re.compile('\r\n\|\n\r').search):
+def field2text(v, nl=re.compile('\r\n|\n\r').search):
     if hasattr(v,'read'): v=v.read()
     else: v=str(v)
     mo = nl(v)