[Zope-Checkins] CVS: Zope2 - Product.py:1.47.10.1

[Andreas Jung]

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

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



--- Updated File Product.py in package Zope2 --
--- Product.py	2001/02/14 16:13:00	1.47
+++ Product.py	2001/04/18 18:44:44	1.47.10.1
@@ -107,7 +107,7 @@
 
 
 import Globals, OFS.Folder, OFS.SimpleItem, os, string, Acquisition, Products
-import regex, zlib, Globals, cPickle, marshal, rotor
+import re, zlib, Globals, cPickle, marshal, rotor
 import ZClasses, ZClasses.ZClass, AccessControl.Owned
 
 from OFS.Folder import Folder
@@ -157,12 +157,12 @@
     _isBeingUsedAsAMethod_=1
 
     def new_version(self,
-                    _intending=regex.compile("[.]?[0-9]+$").search, #TS
+                    _intending=re.compile("[.]?[0-9]+$").search, #TS
                     ):
         # Return a new version number based on the existing version.
         v=str(self.version)
         if not v: return '1.0'
-        if _intending(v) < 0: return v
+        if _intending(v) is None: return v
         l=rfind(v,'.')
         return v[:l+1]+str(1+atoi(v[l+1:]))