[Checkins] SVN: zope.security/trunk/ merge form the branch nikhil_n-py25: made zope.security work with python2.5

[nikhil n]

Log message for revision 78089:
  merge form the branch nikhil_n-py25: made zope.security work with python2.5

Changed:
  U   zope.security/trunk/CHANGES.txt
  U   zope.security/trunk/src/zope/security/checker.py
  U   zope.security/trunk/src/zope/security/untrustedpython/tests.py

-=-
Modified: zope.security/trunk/CHANGES.txt
===================================================================
--- zope.security/trunk/CHANGES.txt	2007-07-17 17:46:46 UTC (rev 78088)
+++ zope.security/trunk/CHANGES.txt	2007-07-17 17:51:01 UTC (rev 78089)
@@ -1,5 +1,8 @@
 zope.security package changelog
 ===============================
+Next release 
+------------
+- zope.security now works on Python 2.5
 
 3.4.0b2 - 2007/06/15
 --------------------

Modified: zope.security/trunk/src/zope/security/checker.py
===================================================================
--- zope.security/trunk/src/zope/security/checker.py	2007-07-17 17:46:46 UTC (rev 78088)
+++ zope.security/trunk/src/zope/security/checker.py	2007-07-17 17:51:01 UTC (rev 78089)
@@ -701,6 +701,7 @@
     type(iter([])): _iteratorChecker, # Same types in Python 2.2.1,
     type(iter(())): _iteratorChecker, # different in Python 2.3.
     type(iter({})): _iteratorChecker,
+    type(iter(set())): _iteratorChecker,
     type({}.iteritems()): _iteratorChecker,
     type({}.iterkeys()): _iteratorChecker,
     type({}.itervalues()): _iteratorChecker,

Modified: zope.security/trunk/src/zope/security/untrustedpython/tests.py
===================================================================
--- zope.security/trunk/src/zope/security/untrustedpython/tests.py	2007-07-17 17:46:46 UTC (rev 78088)
+++ zope.security/trunk/src/zope/security/untrustedpython/tests.py	2007-07-17 17:51:01 UTC (rev 78089)
@@ -16,13 +16,18 @@
 $Id$
 """
 import unittest
-from zope.testing import doctestunit
+import re
+from zope.testing import doctestunit,renormalizing
 
 def test_suite():
+    checker = renormalizing.RENormalizing([
+       (re.compile(r"'ImmutableModule' object"),
+ 	           r'object'),
+       ])
     return unittest.TestSuite((
         doctestunit.DocFileSuite('builtins.txt',
                                  'rcompile.txt',
-                                 'interpreter.txt',
+                                 'interpreter.txt',checker=checker
                                  ),
         ))