[Checkins] SVN: zope.app.security/trunk/ - Bug: It turned out that checking for regex was not much better of an idea,

[Stephan Richter]

Log message for revision 89100:
  - Bug: It turned out that checking for regex was not much better of an idea,
    since it causes deprecation warnings in Python 2.4. Thus let's look for a
    library that was added in Python 2.5.
  

Changed:
  U   zope.app.security/trunk/CHANGES.txt
  U   zope.app.security/trunk/setup.py
  U   zope.app.security/trunk/src/zope/app/security/globalmodules.zcml

-=-
Modified: zope.app.security/trunk/CHANGES.txt
===================================================================
--- zope.app.security/trunk/CHANGES.txt	2008-07-31 16:08:00 UTC (rev 89099)
+++ zope.app.security/trunk/CHANGES.txt	2008-07-31 16:08:57 UTC (rev 89100)
@@ -2,10 +2,12 @@
 CHANGES
 =======
 
-3.6.0 (unreleased)
+3.5.2 (2008-07-31)
 ------------------
 
-- ...
+- Bug: It turned out that checking for regex was not much better of an idea,
+  since it causes deprecation warnings in Python 2.4. Thus let's look for a
+  library that was added in Python 2.5.
 
 3.5.1 (2008-06-24)
 ------------------

Modified: zope.app.security/trunk/setup.py
===================================================================
--- zope.app.security/trunk/setup.py	2008-07-31 16:08:00 UTC (rev 89099)
+++ zope.app.security/trunk/setup.py	2008-07-31 16:08:57 UTC (rev 89100)
@@ -22,7 +22,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.app.security',
-      version = '3.6.0dev',
+      version = '3.5.2',
       author='Zope Corporation and Contributors',
       author_email='zope3-dev at zope.org',
       description='Security Components for Zope 3 Applications',

Modified: zope.app.security/trunk/src/zope/app/security/globalmodules.zcml
===================================================================
--- zope.app.security/trunk/src/zope/app/security/globalmodules.zcml	2008-07-31 16:08:00 UTC (rev 89099)
+++ zope.app.security/trunk/src/zope/app/security/globalmodules.zcml	2008-07-31 16:08:57 UTC (rev 89100)
@@ -226,10 +226,10 @@
   </module>
 
   <!-- This package has been deprecated in Python 2.5; let's use a cheap way
-       of detecting Python 2.5 by checking whether the package "regex" exists,
-       which has been deleted in that version. -->
+       of detecting Python 2.4 by checking whether the package "hashlib" is
+       not available, which has been added only in Python 2.5. -->
   <module module="gopherlib"
-          zcml:condition="installed regex">
+          zcml:condition="not-installed hashlib">
     <allow attributes="send_selection send_query" />
   </module>