[Zope-Checkins] CVS: Zope2 - ZClass.py:1.57.4.1

[andreas@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/ZClasses
In directory serenade.digicool.com:/tmp/cvs-serv26904/ZClasses

Modified Files:
      Tag: ajung-2_4-ts_regex-exterminiation-branch
	ZClass.py 
Log Message:
ts_regex/regex free zone



--- Updated File ZClass.py in package Zope2 --
--- ZClass.py	2001/04/01 18:59:38	1.57
+++ ZClass.py	2001/04/17 21:48:59	1.57.4.1
@@ -85,7 +85,7 @@
 """Zope Classes
 """
 import Globals, string, OFS.SimpleItem, OFS.PropertySheets, Products
-import Method, Basic, Property, AccessControl.Role, ts_regex
+import Method, Basic, Property, AccessControl.Role, re
 
 from ZPublisher.mapply import mapply
 from ExtensionClass import Base
@@ -190,14 +190,14 @@
        Globals.DatabaseVersion == ver
 
 
-bad_id=ts_regex.compile('[^a-zA-Z0-9_]').search
+bad_id=re.compile('[^a-zA-Z0-9_]').search
 
 def manage_addZClass(self, id, title='', baseclasses=[],
                      meta_type='', CreateAFactory=0, REQUEST=None,
                      zope_object=0):
     """Add a Z Class
     """
-    if bad_id(id) != -1:
+    if bad_id(id) is not None:
         raise 'Bad Request', (
             'The id %s is invalid as a class name.' % id)
     if not meta_type: meta_type=id