[Zope-Checkins] CVS: Zope/lib/python/AccessControl - ZopeGuards.py:1.12.4.2

[Shane Hathaway]

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

Modified Files:
      Tag: Zope-2_6-branch
	ZopeGuards.py 
Log Message:
Reverted pending a security review.

=== Zope/lib/python/AccessControl/ZopeGuards.py 1.12.4.1 => 1.12.4.2 ===
--- Zope/lib/python/AccessControl/ZopeGuards.py:1.12.4.1	Tue Dec 17 13:04:58 2002
+++ Zope/lib/python/AccessControl/ZopeGuards.py	Tue Dec 17 15:39:13 2002
@@ -125,11 +125,7 @@
 
 import sys
 def guarded_import(mname, globals={}, locals={}, fromlist=None):
-    
-    # do initial import to give module a chance to make security declarations
-    __import__(mname, globals, locals, fromlist)
-
-    mnameparts = mname.split('.')    
+    mnameparts = mname.split('.')
     firstmname = mnameparts[0]
     validate = getSecurityManager().validate
     module = load_module(None, None, mnameparts, validate, globals, locals)