[Zope-CVS] CVS: Packages/FunctionalTests/FunctionalTests - Request.py:1.2

Tres Seaver tseaver@zope.com
Sat, 24 May 2003 18:06:47 -0400


Update of /cvs-repository/Packages/FunctionalTests/FunctionalTests
In directory cvs.zope.org:/tmp/cvs-serv19727/FunctionalTests

Modified Files:
	Request.py 
Log Message:
 - Allow ZPublisher's ':record' syntax, which embeds periods in field names.

=== Packages/FunctionalTests/FunctionalTests/Request.py 1.1 => 1.2 ===
--- Packages/FunctionalTests/FunctionalTests/Request.py:1.1	Tue May 20 21:05:05 2003
+++ Packages/FunctionalTests/FunctionalTests/Request.py	Sat May 24 18:06:46 2003
@@ -5,7 +5,9 @@
 """
 import re
 import httplib
+import urllib
 import urlparse
+import base64
 
 from Invocation import HTTPRequestInvocation
 from Invocation import ZEORequestInvocation
@@ -497,7 +499,7 @@
     raise RequestError, 'Invalid cookie_spec: %s' % cookie_spec
 
 _FKEY    = re.compile( r'Field_[0-9]+', re.IGNORECASE )
-_FDESC   = re.compile( r'([A-Za-z_][\w_]*):(\w+)[ ]*=[ ]*(.*)' )
+_FDESC   = re.compile( r'([A-Za-z_][\w_.]*)(?:\:(\w+))*[ ]*=[ ]*(.*)' )
 _FDESC2  = re.compile( r'([A-Za-z_][\w_]*)[ ]*=[ ]*(.*)' )
 
 def _buildField( field_desc ):