[Zope-Checkins] CVS: Zope2 - RDB.py:1.29.44.2

[Andreas Jung]

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

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



--- Updated File RDB.py in package Zope2 --
--- RDB.py	2001/04/18 19:30:06	1.29.44.1
+++ RDB.py	2001/04/19 11:41:04	1.29.44.2
@@ -173,14 +173,14 @@
         
         i=0
         self._parsers=parsers=[]
-        defre=regex.compile('\([0-9]*\)\([a-zA-Z]\)?')
+        defre=re.compile('([0-9]*)([a-zA-Z])?')
         self._data_dictionary=dd={}
         self.__items__=items=[]
         for _def in defs:
             _def=strip(_def)
             if not _def:
                 raise ValueError, ('Empty column definition for %s' % names[i])
-            if defre.match(_def) < 0:
+            if defre.match(_def) is None:
                 raise ValueError, (
                     'Invalid column definition for, %s, for %s'
                     % _def, names[i])