[Checkins] SVN: zope.security/trunk/ revert 99070

[Brian Sutherland]

Log message for revision 99090:
  revert 99070

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

-=-
Modified: zope.security/trunk/CHANGES.txt
===================================================================
--- zope.security/trunk/CHANGES.txt	2009-04-10 14:30:10 UTC (rev 99089)
+++ zope.security/trunk/CHANGES.txt	2009-04-10 15:05:02 UTC (rev 99090)
@@ -5,8 +5,7 @@
 3.6.4 (unreleased)
 ------------------
 
-- Make uuid.UUID a rock, they are immutable and in the python standad library
-  from python 2.5.
+- None so far.
 
 3.6.3 (2009-03-23)
 ------------------

Modified: zope.security/trunk/src/zope/security/checker.py
===================================================================
--- zope.security/trunk/src/zope/security/checker.py	2009-04-10 14:30:10 UTC (rev 99089)
+++ zope.security/trunk/src/zope/security/checker.py	2009-04-10 15:05:02 UTC (rev 99090)
@@ -624,13 +624,6 @@
     type(pytz.UTC): NoProxy,
 })
 
-try:
-    # NOTE: remove try/except when we depend on python2.5 and up. uuid in standard library from python 2.5.
-    from uuid import UUID
-    BasicTypes[UUID] = NoProxy
-except ImportError:
-    pass
-
 # Available for tests. Located here so it can be kept in sync with BasicTypes.
 BasicTypes_examples = {
     object: object(),

Modified: zope.security/trunk/src/zope/security/tests/test_standard_checkers.py
===================================================================
--- zope.security/trunk/src/zope/security/tests/test_standard_checkers.py	2009-04-10 14:30:10 UTC (rev 99089)
+++ zope.security/trunk/src/zope/security/tests/test_standard_checkers.py	2009-04-10 15:05:02 UTC (rev 99090)
@@ -424,14 +424,6 @@
     >>> from pytz import UTC
     >>> int(type(ProxyFactory(  UTC )) is type(UTC))
     1
-    
-    >>> try:
-    ...     # NOTE: remove try/except when we depend on python 2.5 and greater (uuid in standard library)
-    ...     from uuid import UUID
-    ...     int(type(ProxyFactory(  UUID('12345678123456781234567812345678') )) is UUID)
-    ... except ImportError:
-    ...     1
-    1
     """
 
 def test_iter_of_sequences():