[Zope-Checkins] CVS: Zope/lib/python/ZTUtils - Zope.py:1.11.42.5

Tres Seaver tseaver at zope.com
Tue Jan 27 09:28:51 EST 2004


Update of /cvs-repository/Zope/lib/python/ZTUtils
In directory cvs.zope.org:/tmp/cvs-serv31849/lib/python/ZTUtils

Modified Files:
      Tag: Zope-2_7-branch
	Zope.py 
Log Message:
 - Remove buglet introduced by unneeded backwards compatibility.


=== Zope/lib/python/ZTUtils/Zope.py 1.11.42.4 => 1.11.42.5 ===
--- Zope/lib/python/ZTUtils/Zope.py:1.11.42.4	Fri Jan 16 16:05:01 2004
+++ Zope/lib/python/ZTUtils/Zope.py	Tue Jan 27 09:28:50 2004
@@ -36,11 +36,7 @@
 else:
     from AccessControl import Unauthorized
 
-# Support pre-Python 2.3 :-(
-try:
-    from types import BooleanType
-except ImportError:
-    BooleanType = None
+from types import BooleanType
 
 class LazyFilter(Lazy):
     # A LazyFilter that checks with the security policy
@@ -261,7 +257,7 @@
 def simple_marshal(v):
     if isinstance(v, StringType):
         return ''
-    if BooleanType and isinstance(v, BooleanType):
+    if isinstance(v, BooleanType):
         return ':boolean'
     if isinstance(v, IntType):
         return ':int'




More information about the Zope-Checkins mailing list