From stefan at epy.co.at  Thu Jan 27 09:55:32 2005
From: stefan at epy.co.at (Stefan H. Holek)
Date: Sun Aug 10 17:05:20 2008
Subject: [ZPT-CVS] CVS: Packages/ZTUtils - __init__.py:1.6.66.1
Message-ID: <20050127145532.7C9A120328A@mail.zope.org>

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

Modified Files:
      Tag: Zope-2_7-branch
	__init__.py 
Log Message:
Got rid of import order dependencies in PageTemplates, TAL, and ZTUtils.


=== Packages/ZTUtils/__init__.py 1.6 => 1.6.66.1 ===
--- Packages/ZTUtils/__init__.py:1.6	Wed Aug 14 18:10:12 2002
+++ Packages/ZTUtils/__init__.py	Thu Jan 27 09:55:28 2005
@@ -15,16 +15,12 @@
 $Id$'''
 __version__='$Revision$'[11:-2]
 
-from Batch import Batch
 from Iterator import Iterator
-from Tree import TreeMaker, encodeExpansion, decodeExpansion, a2b, b2a
+from Tree import encodeExpansion, decodeExpansion, a2b, b2a
 from SimpleTree import SimpleTreeMaker
 
-import sys
-if sys.modules.has_key('Zope'):
-    del sys
-    __allow_access_to_unprotected_subobjects__ = 1
-    __roles__ = None
+__allow_access_to_unprotected_subobjects__ = 1
+__roles__ = None
 
-    from Zope import Batch, TreeMaker, SimpleTreeMaker, LazyFilter
-    from Zope import url_query, make_query, make_hidden_input
+from Zope import Batch, TreeMaker, SimpleTreeMaker, LazyFilter
+from Zope import url_query, make_query, make_hidden_input


From stefan at epy.co.at  Thu Jan 27 09:55:58 2005
From: stefan at epy.co.at (Stefan H. Holek)
Date: Sun Aug 10 17:05:20 2008
Subject: [ZPT-CVS] CVS: Products/PageTemplates - Expressions.py:1.43.44.4
Message-ID: <20050127145558.059682032E0@mail.zope.org>

Update of /cvs-repository/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv10838/lib/python/Products/PageTemplates

Modified Files:
      Tag: Zope-2_7-branch
	Expressions.py 
Log Message:
Got rid of import order dependencies in PageTemplates, TAL, and ZTUtils.


=== Products/PageTemplates/Expressions.py 1.43.44.3 => 1.43.44.4 ===
--- Products/PageTemplates/Expressions.py:1.43.44.3	Fri Jan 16 16:05:01 2004
+++ Products/PageTemplates/Expressions.py	Thu Jan 27 09:55:28 2005
@@ -44,42 +44,13 @@
     reg('not', NotExpr)
     reg('defer', DeferExpr)
 
-if sys.modules.has_key('Zope'):
-    import AccessControl
-    import AccessControl.cAccessControl
-    acquisition_security_filter = AccessControl.cAccessControl.aq_validate
-    from AccessControl import getSecurityManager
-    from AccessControl.ZopeGuards import guarded_getattr
-    try:
-        from AccessControl import Unauthorized
-    except ImportError:
-        Unauthorized = "Unauthorized"
-    from ZRPythonExpr import PythonExpr, _SecureModuleImporter, call_with_ns
-else:
-    from PythonExpr import getSecurityManager, PythonExpr
-    guarded_getattr = getattr
-    try:
-        from zExceptions import Unauthorized
-    except ImportError:
-        Unauthorized = "Unauthorized"
-
-    def acquisition_security_filter(orig, inst, name, v, real_validate):
-        if real_validate(orig, inst, name, v):
-            return 1
-        raise Unauthorized, name
-
-    def call_with_ns(f, ns, arg=1):
-        if arg==2:
-            return f(None, ns)
-        else:
-            return f(ns)
-
-    class _SecureModuleImporter:
-        """Simple version of the importer for use with trusted code."""
-        __allow_access_to_unprotected_subobjects__ = 1
-        def __getitem__(self, module):
-            __import__(module)
-            return sys.modules[module]
+import AccessControl
+import AccessControl.cAccessControl
+acquisition_security_filter = AccessControl.cAccessControl.aq_validate
+from AccessControl import getSecurityManager
+from AccessControl.ZopeGuards import guarded_getattr
+from AccessControl import Unauthorized
+from ZRPythonExpr import PythonExpr, _SecureModuleImporter, call_with_ns
 
 SecureModuleImporter = _SecureModuleImporter()
 


From stefan at epy.co.at  Thu Jan 27 09:55:59 2005
From: stefan at epy.co.at (Stefan H. Holek)
Date: Sun Aug 10 17:05:20 2008
Subject: [ZPT-CVS] CVS: Packages/TAL - DummyEngine.py:1.37.4.1
Message-ID: <20050127145559.4E765203313@mail.zope.org>

Update of /cvs-repository/Packages/TAL
In directory cvs.zope.org:/tmp/cvs-serv10838/lib/python/TAL

Modified Files:
      Tag: Zope-2_7-branch
	DummyEngine.py 
Log Message:
Got rid of import order dependencies in PageTemplates, TAL, and ZTUtils.


=== Packages/TAL/DummyEngine.py 1.37 => 1.37.4.1 ===
--- Packages/TAL/DummyEngine.py:1.37	Mon Apr  7 13:38:27 2003
+++ Packages/TAL/DummyEngine.py	Thu Jan 27 09:55:28 2005
@@ -23,12 +23,11 @@
 from DocumentTemplate.DT_Util import ustr
 
 IDomain = None
-if sys.modules.has_key('Zope'):
-    try:
-        from Zope.I18n.ITranslationService import ITranslationService
-        from Zope.I18n.IDomain import IDomain
-    except ImportError:
-        pass
+try:
+    from Zope.I18n.ITranslationService import ITranslationService
+    from Zope.I18n.IDomain import IDomain
+except ImportError:
+    pass
 if IDomain is None:
     # Before 2.7, or not in Zope
     class ITranslationService: pass