[Zope-Checkins] CVS: Zope2 - DTMLMethod.py:1.61.16.2 ObjectManager.py:1.133.4.2 SimpleItem.py:1.87.4.2

Andreas Jung andreas@dhcp165.digicool.com
Mon, 23 Apr 2001 12:24:45 -0400


Update of /cvs-repository/Zope2/lib/python/OFS
In directory yetix:/work/sandboxes/ajung-2_4-ts_regex-exterminiation-branch/lib/python/OFS

Modified Files:
      Tag: ajung-2_4-ts_regex-exterminiation-branch
	DTMLMethod.py ObjectManager.py SimpleItem.py 
Log Message:
added r".." notation for regexes



--- Updated File DTMLMethod.py in package Zope2 --
--- DTMLMethod.py	2001/04/16 18:45:01	1.61.16.1
+++ DTMLMethod.py	2001/04/23 16:24:43	1.61.16.2
@@ -402,7 +402,7 @@
 import re
 from string import find, strip
 token = "[a-zA-Z0-9!#$%&'*+\-.\\\\^_`|~]+"
-hdr_start = re.compile('(%s):(.*)' % token).match
+hdr_start = re.compile(r'(%s):(.*)' % token).match
 
 def decapitate(html, RESPONSE=None):
     headers = []

--- Updated File ObjectManager.py in package Zope2 --
--- ObjectManager.py	2001/04/17 21:51:18	1.133.4.1
+++ ObjectManager.py	2001/04/23 16:24:43	1.133.4.2
@@ -109,7 +109,7 @@
     XMLExportImport.magic: XMLExportImport.importXML,
     }
 
-bad_id=re.compile('[^a-zA-Z0-9-_~\,\. ]').search #TS
+bad_id=re.compile(r'[^a-zA-Z0-9-_~\,\. ]').search #TS
 
 # Global constants: __replaceable__ flags:
 NOT_REPLACEABLE = 0

--- Updated File SimpleItem.py in package Zope2 --
--- SimpleItem.py	2001/04/17 20:58:31	1.87.4.1
+++ SimpleItem.py	2001/04/23 16:24:44	1.87.4.2
@@ -213,7 +213,7 @@
         self, client=None, REQUEST={},
         error_type=None, error_value=None, tb=None,
         error_tb=None, error_message='',
-        tagSearch=re.compile('[a-zA-Z]>').search):
+        tagSearch=re.compile(r'[a-zA-Z]>').search):
 
         try:
             if error_type  is None: error_type =sys.exc_info()[0]